docxdriver 0.3.2__tar.gz → 0.4.0__tar.gz

{docxdriver-0.3.2 → docxdriver-0.4.0}/Cargo.lock

@@ -416,7 +416,7 @@ dependencies = [
 
 [[package]]
 name = "docxdriver-cli"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "clap",
  "docxdriver-core",
@@ -427,7 +427,7 @@ dependencies = [
 
 [[package]]
 name = "docxdriver-core"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "hex",
  "latex2mathml",
@@ -444,7 +444,7 @@ dependencies = [
 
 [[package]]
 name = "docxdriver-mcp"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "axum",
  "cap-std",
@@ -460,18 +460,26 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "docxdriver-monty-repl"
+version = "0.4.0"
+dependencies = [
+ "docxdriver-core",
+]
+
 [[package]]
 name = "docxdriver-python"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "docxdriver-core",
  "pyo3",
+ "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "docxdriver-wasm"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "docxdriver-core",
  "js-sys",

{docxdriver-0.3.2 → docxdriver-0.4.0}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/docxdriver-python"]
 
 [workspace.package]
-version = "0.3.2"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/jhnoel/docxdriver"

{docxdriver-0.3.2 → docxdriver-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docxdriver
-Version: 0.3.2
+Version: 0.4.0
 Summary: Python SDK for the native Rust DOCX engine
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -18,38 +18,44 @@ Install from PyPI:
 python -m pip install docxdriver
 ```
 
-The core API exposes `execute_request`, `canonical_plan_json`, and the convenience
-functions `run_command`, `run_plan`, and `run_request`. Results preserve document
-contents as Python `bytes`.
-
-The optional sandbox REPL harness is available as a subpackage in the same
-distribution:
+`Document` works on `.docx` bytes; typed plan builders live in
+`docxdriver.plan`:
 
 ```python
-from docxdriver.repl import NativeBridge, PRELUDE, REFERENCE
+from pathlib import Path
+from docxdriver import Document, create
+from docxdriver.plan import Plan, ReplaceText
+
+doc = Document(Path("contract.docx").read_bytes())
+doc.markup()                      # body with the ids plans address
+doc.comments(); doc.revisions(); doc.styles(); doc.assets()
+doc.find("thirty")
+review = doc.review(Plan(author="Reviewer", ops=[
+    ReplaceText(at="0F537164", select="thirty", with_="sixty"),
+]))
+review.report                     # preview: each op's outcome
+Path("contract.docx").write_bytes(doc.commit(review.key).data)
+
+new = create(paragraphs=["Hello"])  # or create(html="<p>Hello</p>")
 ```
 
-`NativeBridge` provides async `init`, `call`, and `reset` requests for a host
-running a Python sandbox. The sandbox receives authoring classes and async
-wrappers from `PRELUDE`; `REFERENCE` provides their API documentation. The
-sandbox itself does not import the native extension. Native work runs through
-host callbacks outside the server event loop.
-
-The host confines reads and writes to the provided workspace, verifies source
-hashes and candidate output before commit, and performs atomic file replacement
-with read-back verification. Commit keys are bounded and single-use. Cancellation
-is drained before another host call so a write callback cannot be abandoned.
+Commit keys are single-use. Natively `review.key` carries the key; in a
+sandbox it is `None` and the host shows the key only to the model, so a
+commit proves the review was read. Sandbox hosts written in Python build on
+the stateless `review_plan(data, plan_json)` and
+`commit_plan(data, plan_json, key)`, keeping each plan under a key they issue.
 
-Set `DOCXDRIVER_QUOTE_AUDIT_COMMENTS=1` to enable structured Quote/Term/Inline plan
-values and protected quotation audit comments. The provenance policy defaults to
-`permissive`; `controlled` and `authoritative` fail closed.
+Engine diagnostics raise `ValueError`. The lower-level `execute_request`,
+`canonical_plan_json`, `run_command`, `run_plan` and `run_request` remain.
 
-The prelude and API reference are generated from shared Pi templates. After
-changing those templates, regenerate them from the repository root:
+`plan.py` and `document.py` stay within Monty's Python subset. Rust hosts get
+the same text as `docxdriver_monty_repl::PLAN` and `DOCUMENT`, so sandbox code
+and native code are interchangeable. The op dataclasses are generated from the
+core schema; regenerate from the repository root with
+`python scripts/generate-python-plan.py`.
 
-```sh
-python scripts/generate-docxdriver-repl-prelude.py
-```
+Version 0.4.0 removed the `docxdriver.repl` sandbox host from this package. Its
+source remains in `experimental/python-repl-host` for hosts to vendor.
 
 Build and install a wheel from the repository root:
 

docxdriver-0.4.0/README.md

@@ -0,0 +1,87 @@
+# docxdriver
+
+Python SDK for the Rust DOCX engine. It supports Python 3.10 and later and has no
+Python runtime dependencies.
+
+Install from PyPI:
+
+```sh
+python -m pip install docxdriver
+```
+
+`Document` works on `.docx` bytes; typed plan builders live in
+`docxdriver.plan`:
+
+```python
+from pathlib import Path
+from docxdriver import Document, create
+from docxdriver.plan import Plan, ReplaceText
+
+doc = Document(Path("contract.docx").read_bytes())
+doc.markup()                      # body with the ids plans address
+doc.comments(); doc.revisions(); doc.styles(); doc.assets()
+doc.find("thirty")
+review = doc.review(Plan(author="Reviewer", ops=[
+    ReplaceText(at="0F537164", select="thirty", with_="sixty"),
+]))
+review.report                     # preview: each op's outcome
+Path("contract.docx").write_bytes(doc.commit(review.key).data)
+
+new = create(paragraphs=["Hello"])  # or create(html="<p>Hello</p>")
+```
+
+Commit keys are single-use. Natively `review.key` carries the key; in a
+sandbox it is `None` and the host shows the key only to the model, so a
+commit proves the review was read. Sandbox hosts written in Python build on
+the stateless `review_plan(data, plan_json)` and
+`commit_plan(data, plan_json, key)`, keeping each plan under a key they issue.
+
+Engine diagnostics raise `ValueError`. The lower-level `execute_request`,
+`canonical_plan_json`, `run_command`, `run_plan` and `run_request` remain.
+
+`plan.py` and `document.py` stay within Monty's Python subset. Rust hosts get
+the same text as `docxdriver_monty_repl::PLAN` and `DOCUMENT`, so sandbox code
+and native code are interchangeable. The op dataclasses are generated from the
+core schema; regenerate from the repository root with
+`python scripts/generate-python-plan.py`.
+
+Version 0.4.0 removed the `docxdriver.repl` sandbox host from this package. Its
+source remains in `experimental/python-repl-host` for hosts to vendor.
+
+Build and install a wheel from the repository root:
+
+```sh
+python -m pip install "maturin>=1.9,<2"
+maturin build --profile python --locked --manifest-path crates/docxdriver-python/Cargo.toml --out /tmp/docxdriver-wheels
+python -m pip install /tmp/docxdriver-wheels/*.whl
+```
+
+## Publish to PyPI
+
+The `Publish Python SDK` GitHub Actions workflow builds a source distribution
+and wheels for Linux x86_64 and aarch64, macOS universal2, and Windows x86_64
+when a `v*` tag is pushed. The tag must match the version in the root
+`Cargo.toml` workspace package.
+
+Before the first release, configure a PyPI trusted publisher for the
+`docxdriver` project with these values:
+
+- Owner: `jhnoel`
+- Repository: `docxdriver`
+- Workflow filename: `pypi.yml`
+- GitHub environment: `pypi`
+
+Create the `pypi` GitHub environment under the repository settings if you want
+to add release approvals. Then update the workspace version, commit the change,
+and push the matching tag (for example, `v0.2.7`). GitHub Actions publishes the
+built distributions using PyPI's trusted publishing; no long-lived PyPI token is
+needed.
+
+The `python` Cargo profile keeps release optimizations and enables panic unwinding
+so PyO3 can turn Rust panics into Python exceptions. ABI3 wheels support Python
+3.10 and later on the built operating system and architecture. To run the Python
+SDK and host tests after installing the wheel:
+
+```sh
+python -m unittest discover -s crates/docxdriver-python/tests
+```

{docxdriver-0.3.2 → docxdriver-0.4.0}/crates/docxdriver-core/Cargo.toml

@@ -4,7 +4,13 @@ description = "Artifact-first DOCX engine: (bytes, DocxCommand JSON) -> (bytes,
 version.workspace = true
 edition.workspace = true
 license.workspace = true
+repository.workspace = true
 readme = "README.md"
+keywords = ["docx", "ooxml", "word", "document", "track-changes"]
+categories = ["text-processing", "parser-implementations"]
+# Library sources and the runtime template only; tests, examples and the
+# schema generator stay in the repository.
+include = ["/src/**/*.rs", "!/src/bin/**", "/assets/blank.docx", "/README.md", "/LICENSE"]
 
 [dependencies]
 xmloxide = { version = "0.4.3", default-features = false }

docxdriver-0.4.0/crates/docxdriver-core/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 docxdriver contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{docxdriver-0.3.2 → docxdriver-0.4.0}/crates/docxdriver-core/src/api.rs

@@ -159,9 +159,9 @@ pub struct RowFormat {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
 pub enum TableEdit {
-    InsertRows { row: u32, position: InsertPosition, count: u32 },
+    InsertRows { row: u32, position: InsertPosition, count: u32, #[serde(rename = "as", default)] alias: Option<String> },
     DeleteRows { row: u32, count: u32 },
-    InsertColumns { column: u32, position: InsertPosition, count: u32 },
+    InsertColumns { column: u32, position: InsertPosition, count: u32, #[serde(rename = "as", default)] alias: Option<String> },
     DeleteColumns { column: u32, count: u32 },
     MergeCells { row: u32, column: u32, row_span: u32, column_span: u32 },
     SplitCell { row: u32, column: u32 },
@@ -665,7 +665,9 @@ pub enum EditOp {
         gutter: Option<Points>,
     },
     /// Selective section-property edits. Dimensions are points; omitted fields preserve source.
+    SetSectionBoundary { at: ParagraphAddress, #[serde(default)] remove: bool, #[serde(default)] break_type: Option<String> },
     SetSectionLayout {
+        #[serde(default)] section_handle: Option<String>,
         #[serde(default)]
         section: Option<u32>,
         #[serde(default)]
@@ -1480,7 +1482,7 @@ fn normalize_op(op: &mut EditOp) -> Result<(), String> {
                     return Err("levels requires a new list with 1..9 definitions covering the selected level".into());
                 }
                 for (i, def) in defs.iter().enumerate() {
-                    if !["bullet","decimal","lowerLetter","upperLetter","lowerRoman","upperRoman"].contains(&def.format.as_str()) || def.start == Some(0) || def.label.is_empty() || def.label.len() > 255 || def.restart_after.is_some_and(|v| v as usize >= i) {
+                    if !["bullet","decimal","lowerLetter","upperLetter","lowerRoman","upperRoman"].contains(&def.format.as_str()) || def.start.is_some_and(|v|v == 0 || v > i32::MAX as u32) || def.label.is_empty() || def.label.len() > 255 || def.restart_after.is_some_and(|v| v as usize >= i) {
                         return Err("invalid list level format, label, start or restart ancestor".into());
                     }
                     if [def.indent_left,def.indent_right,def.first_line_indent].into_iter().flatten().any(|v| v.0.unsigned_abs() > 2_000_000) { return Err("list indentation is out of range".into()); }
@@ -1491,8 +1493,8 @@ fn normalize_op(op: &mut EditOp) -> Result<(), String> {
                     if def.marker_font.as_ref().is_some_and(|v| v.is_empty()) || def.marker_color.as_ref().is_some_and(|v| v.len() != 6 || !v.bytes().all(|c| c.is_ascii_hexdigit())) { return Err("invalid list marker font or six-digit RGB color".into()); }
                 }
             }
-            if at.is_empty() || *level > 8 || *start == Some(0) || *num_id == Some(0) {
-                return Err("set_list requires paragraphs, level 0..8 and positive IDs/starts".into());
+            if at.is_empty() || *level > 8 || start.is_some_and(|v|v == 0 || v > i32::MAX as u32) || num_id.is_some_and(|v|v == 0 || v > i32::MAX as u32) {
+                return Err("set_list requires paragraphs, level 0..8 and IDs/starts in 1..2147483647".into());
             }
             if *remove && (num_id.is_some() || format.is_some() || start.is_some() || *level != 0) {
                 return Err("set_list remove cannot be combined with list settings".into());
@@ -1516,7 +1518,13 @@ fn normalize_op(op: &mut EditOp) -> Result<(), String> {
                 return Err("at must not be empty".into());
             }
         }
-        EditOp::SetSectionLayout { section, page_size, width, height, orientation, columns, column_spacing, column_widths, column_separator, break_type, page_number_format, page_number_start, page_number_continue } => {
+        EditOp::SetSectionBoundary {remove,break_type,..} => {
+            if *remove && break_type.is_some(){return Err("removing a boundary cannot set break_type".into());}
+            if break_type.as_ref().is_some_and(|v|!matches!(v.as_str(),"nextPage"|"continuous"|"oddPage"|"evenPage"|"nextColumn")){return Err("unsupported section break_type".into());}
+        }
+        EditOp::SetSectionLayout { section, section_handle, page_size, width, height, orientation, columns, column_spacing, column_widths, column_separator, break_type, page_number_format, page_number_start, page_number_continue } => {
+            if section.is_some() && section_handle.is_some() {return Err("section and section_handle are mutually exclusive".into());}
+            if section_handle.as_ref().is_some_and(|v|!v.starts_with("section:")){return Err("section_handle must use an inventory handle".into());}
             if section == &Some(0) { return Err("section must be positive".into()); }
             if let Some(size) = page_size { if !matches!(size.as_str(), "letter" | "legal" | "a4" | "a3" | "a5") { return Err("page_size must be letter/legal/a4/a3/a5".into()); } }
             if page_size.is_some() && (width.is_some() || height.is_some()) { return Err("page_size conflicts with width/height".into()); }
@@ -1524,11 +1532,13 @@ fn normalize_op(op: &mut EditOp) -> Result<(), String> {
             if [width.as_ref(), height.as_ref()].into_iter().flatten().any(|value| value.0 <= 0 || value.0 > 31680) { return Err("page dimensions must be >0 and <=1584 points".into()); }
             if orientation.as_ref().is_some_and(|v| !matches!(v.as_str(), "portrait" | "landscape")) { return Err("orientation must be portrait/landscape".into()); }
             if columns.is_some_and(|v| v == 0 || v > 45) { return Err("columns must be between 1 and 45".into()); }
-            if column_widths.as_ref().is_some_and(|v| v.is_empty() || v.len() > 45 || v.iter().any(|p| p.0 <= 0)) { return Err("column_widths requires 1..45 positive widths".into()); }
+            if column_spacing.is_some_and(|p| !(0..=31680).contains(&p.0)) { return Err("column_spacing must be between 0 and 1584 points".into()); }
+            if column_widths.as_ref().is_some_and(|v| v.is_empty() || v.len() > 45 || v.iter().any(|p| p.0 <= 0 || p.0 > 31680)) { return Err("column_widths requires 1..45 positive widths of at most 1584 points".into()); }
             if let (Some(count), Some(widths)) = (columns.as_ref(), column_widths.as_ref()) { if *count as usize != widths.len() { return Err("columns must match column_widths length".into()); } }
             if break_type.as_ref().is_some_and(|v| !matches!(v.as_str(), "nextPage" | "continuous" | "oddPage" | "evenPage" | "nextColumn")) { return Err("unsupported section break_type".into()); }
             if page_number_format.as_ref().is_some_and(|v| !matches!(v.as_str(), "decimal" | "upperRoman" | "lowerRoman" | "upperLetter" | "lowerLetter")) { return Err("unsupported page_number_format".into()); }
-            if page_number_start == &Some(0) { return Err("page_number_start must be positive".into()); }
+            if page_number_continue == &Some(false) { return Err("page_number_continue only accepts true; use page_number_start to restart".into()); }
+            if page_number_start.is_some_and(|value| value == 0 || value > i32::MAX as u32) { return Err("page_number_start must be between 1 and 2147483647".into()); }
             if page_number_start.is_some() && page_number_continue == &Some(true) { return Err("page_number_start conflicts with page_number_continue".into()); }
             if page_size.is_none() && width.is_none() && orientation.is_none() && columns.is_none() && column_spacing.is_none() && column_widths.is_none() && column_separator.is_none() && break_type.is_none() && page_number_format.is_none() && page_number_start.is_none() && page_number_continue.is_none() { return Err("set_section_layout requires a property".into()); }
         }
@@ -1833,6 +1843,7 @@ fn fold_typed(
         let resolved = match resolve_typed_aliases(op, &aliases) {
             Ok(value) => value,
             Err(error) => {
+                attach_affected(&mut state, &mut reports, &affected_ids);
                 let report = PlanReport {
                     completed: index,
                     stopped_at: Some(index),
@@ -1872,7 +1883,7 @@ fn fold_typed(
                     report.summary.push_str(&note);
                 }
             }
-            attach_affected(&state, &mut reports, &affected_ids);
+            attach_affected(&mut state, &mut reports, &affected_ids);
             let report = PlanReport {
                 completed: index,
                 stopped_at: Some(index),
@@ -1892,10 +1903,11 @@ fn fold_typed(
             );
         }
         if let EditOp::InsertParagraph { alias: Some(alias), .. }
-            | EditOp::InsertTable { alias: Some(alias), .. } = op
+            | EditOp::InsertTable { alias: Some(alias), .. }
+            | EditOp::EditTable { action: TableEdit::InsertRows { alias: Some(alias), .. } | TableEdit::InsertColumns { alias: Some(alias), .. }, .. } = op
         {
             if aliases.contains_key(alias) {
-                attach_affected(&state, &mut reports, &affected_ids);
+                attach_affected(&mut state, &mut reports, &affected_ids);
                 let report = PlanReport {
                     completed: index,
                     stopped_at: Some(index),
@@ -1917,7 +1929,7 @@ fn fold_typed(
                     )),
                 );
             }
-            if let EditOp::InsertTable { .. } = op {
+            if matches!(op, EditOp::InsertTable { .. } | EditOp::EditTable { .. }) {
                 aliases.insert(alias.clone(), Value::String(format!("${alias}")));
             }
             if let Some(id) = outcome
@@ -1931,7 +1943,7 @@ fn fold_typed(
             }
         }
     }
-    attach_affected(&state, &mut reports, &affected_ids);
+    attach_affected(&mut state, &mut reports, &affected_ids);
     let report = PlanReport {
         completed: plan.ops.len(),
         stopped_at: None,
@@ -2013,10 +2025,11 @@ fn explain_selector_drift(
 /// Fill each operation report with the rendered markup of the paragraphs it
 /// affected, as they stand in `state`, from one render of the document.
 fn attach_affected(
-    state: &crate::commands::WorkState,
+    state: &mut crate::commands::WorkState,
     reports: &mut [OperationReport],
     affected_ids: &[Vec<String>],
 ) {
+    state.flush_lists();
     let wanted = affected_ids.iter().flatten().cloned().collect();
     let markup = crate::commands::affected_markup(state, &wanted);
     for (report, ids) in reports.iter_mut().zip(affected_ids) {
@@ -2058,6 +2071,7 @@ fn operation_name(op: &EditOp) -> &'static str {
         EditOp::InsertParagraph { .. } => "insert_paragraph",
         EditOp::DeleteParagraphs { .. } => "delete_paragraphs",
         EditOp::SetPageMargins { .. } => "set_page_margins",
+        EditOp::SetSectionBoundary { .. } => "set_section_boundary",
         EditOp::SetSectionLayout { .. } => "set_section_layout",
         EditOp::SetFirstPageMode { .. } => "set_first_page_mode",
         EditOp::SetEvenAndOddHeaders { .. } => "set_even_and_odd_headers",
@@ -2097,6 +2111,7 @@ fn resolve_typed_aliases(
         | EditOp::ReplaceParagraph { at, .. }
         | EditOp::FormatText { at, .. }
         | EditOp::InsertTable { at, .. }
+        | EditOp::SetSectionBoundary { at, .. }
         | EditOp::FormatParagraph { at, .. }
         | EditOp::CommentAdd { at, .. } => resolve(at)?,
         EditOp::ReviseText { at: Some(at), .. } => resolve(at)?,
@@ -2110,6 +2125,12 @@ fn resolve_typed_aliases(
                 resolve(address)?;
             }
         }
+        EditOp::SetSectionLayout { section_handle:Some(handle),.. } => {
+            if let Some(alias)=handle.strip_prefix("section:$") {
+                let Some(Value::String(id))=aliases.get(alias) else { return Err(diag("unknown_alias",format!("unknown section paragraph alias ${alias}"),None)); };
+                *handle=format!("section:{id}");
+            }
+        }
         _ => {}
     }
     Ok(resolved)
@@ -2305,6 +2326,7 @@ fn typed_read(input: Option<&[u8]>, kind: &str, view: Option<&str>) -> crate::ou
                 map.insert("markup".into(), serde_json::json!(markup));
                 map.insert("css".into(), serde_json::json!(css));
                 map.insert("tables".into(), crate::commands::tables::inventory(&state.xml));
+                map.insert("sections".into(), crate::commands::sections::inventory(&state.package,&state.xml,&paragraph_ids,view==Some("original")));
                 map.insert("styles".into(), serde_json::json!(crate::html::styles::Styles::load(&state.package).catalog()));
                 if !equations.is_empty() {
                     map.insert("equations".into(), serde_json::json!(equations));
@@ -2379,6 +2401,7 @@ fn typed_read(input: Option<&[u8]>, kind: &str, view: Option<&str>) -> crate::ou
             }).collect();
             let mut result = result;
             if let Some(map) = result.result.as_mut().and_then(Value::as_object_mut) {
+                map.insert("sections".into(),crate::commands::sections::inventory(&state.package,&state.xml,&paragraph_ids,view==Some("original")));
                 if let Some(Value::Array(paragraphs)) = map.get("paragraphs") {
                     let equations: Vec<Value> = paragraphs
                         .iter()
@@ -2409,6 +2432,7 @@ fn typed_read(input: Option<&[u8]>, kind: &str, view: Option<&str>) -> crate::ou
                     serde_json::json!(crate::html::assets::manifest(&state.package, false)),
                 );
                 map.insert("tables".into(), crate::commands::tables::inventory(&state.xml));
+                map.insert("sections".into(), crate::commands::sections::inventory(&state.package,&state.xml,&paragraph_ids,view==Some("original")));
                 map.insert("html".into(), Value::String(rendered.html));
             }
             if let Some(map) = result.result.as_mut().and_then(Value::as_object_mut) {

{docxdriver-0.3.2 → docxdriver-0.4.0}/crates/docxdriver-core/src/commands/layout.rs

@@ -346,19 +346,22 @@ pub fn set_section_layout(
     if page_size.is_some() || width.is_some() || orientation.is_some() {
         if (orient == "landscape" && w < h) || (orient == "portrait" && w > h) { std::mem::swap(&mut w, &mut h); }
     }
-    let area = w - dimension("pgMar", "left", 1440) - dimension("pgMar", "right", 1440) - dimension("pgMar", "gutter", 0);
+    let area = w.saturating_sub(dimension("pgMar", "left", 1440)).saturating_sub(dimension("pgMar", "right", 1440)).saturating_sub(dimension("pgMar", "gutter", 0));
     let cols = xml.child_w(sect, "cols");
     let old_widths: Vec<i64> = cols.map(|n| xml.doc.children(n).filter(|&n| xml.is_w(n, "col")).filter_map(|n| xml.attr(n, "w").and_then(|v| v.parse().ok())).collect()).unwrap_or_default();
     let count = columns.map(|v| v as i64).or_else(|| column_widths.as_ref().map(|v| v.len() as i64)).unwrap_or_else(|| dimension("cols", "num", if old_widths.is_empty() { 1 } else { old_widths.len() as i64 }));
     let gap = column_spacing.map(|p| p.0).unwrap_or_else(|| dimension("cols", "space", 720));
+    let original_gaps = cols.map(|n| xml.doc.children(n).filter(|&n| xml.is_w(n, "col")).collect::<Vec<_>>()).unwrap_or_default();
+    let inherited_gap_total = original_gaps.iter().take(original_gaps.len().saturating_sub(1)).fold(0_i64, |total, &n| total.saturating_add(xml.attr(n, "space").and_then(|v| v.parse::<i64>().ok()).unwrap_or(gap)));
+    let gap_total = if column_spacing.is_none() && column_widths.is_none() && columns.is_none() && !old_widths.is_empty() { inherited_gap_total } else { gap.saturating_mul(count.saturating_sub(1)) };
     let unequal: Vec<i64> = column_widths.as_ref().map(|v| v.iter().map(|p| p.0).collect()).unwrap_or_else(|| old_widths.clone());
     let changes_columns = columns.is_some() || column_spacing.is_some() || column_widths.is_some() || column_separator.is_some();
     if changes_columns || width.is_some() || orientation.is_some() || page_size.is_some() {
-        if area <= 0 || gap.saturating_mul(count - 1) >= area { return Err(Outcome::blocked("columns do not fit the section text area")); }
-        if !unequal.is_empty() && columns.is_none() && (unequal.iter().sum::<i64>() + gap * (count - 1) > area) {
+        if area <= 0 || gap_total >= area { return Err(Outcome::blocked("columns do not fit the section text area")); }
+        if !unequal.is_empty() && columns.is_none() && (unequal.iter().fold(0_i64, |total, width| total.saturating_add(*width)).saturating_add(gap_total) > area) {
             return Err(Outcome::blocked("column widths and spacing exceed the section text area"));
         }
-        if let Some(widths) = column_widths { if widths.iter().map(|p| p.0).sum::<i64>() + gap * (count - 1) > area { return Err(Outcome::blocked("column widths and spacing exceed the section text area")); } }
+        if let Some(widths) = column_widths { if widths.iter().fold(0_i64, |total, p| total.saturating_add(p.0)).saturating_add(gap_total) > area { return Err(Outcome::blocked("column widths and spacing exceed the section text area")); } }
     }
     if tracked { snapshot_section_properties(xml, sect, author, ctx)?; }
     if page_size.is_some() || width.is_some() || orientation.is_some() {
@@ -375,6 +378,10 @@ pub fn set_section_layout(
             for child in xml.doc.children(node).collect::<Vec<_>>() { if xml.is_w(child, "col") { xml.doc.remove_node(child); } }
             set_attr(xml, node, "w:equalWidth", if column_widths.is_some() { "0" } else { "1" });
         }
+        if column_spacing.is_some() && column_widths.is_none() && columns.is_none() {
+            let children: Vec<_> = xml.doc.children(node).filter(|&n| xml.is_w(n, "col")).collect();
+            for (index, &col) in children.iter().enumerate() { set_twips_attr(xml, col, "space", if index + 1 == children.len() { 0 } else { gap }); }
+        }
         if let Some(widths) = column_widths {
             for (index, width) in widths.iter().enumerate() {
                 let col = xml.doc.create_element("w:col");