docxmlater 10.1.0 → 10.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docxmlater",
-  "version": "10.1.0",
+  "version": "10.1.2",
   "description": "A comprehensive DOCX editing framework for creating, reading, and manipulating Microsoft Word documents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/Document.ts

@@ -430,6 +430,8 @@ export class Document {
   private _decimalSymbol?: string;
   /** List separator for locale (w:listSeparator) per ECMA-376 Part 1 §17.15.1.55 */
   private _listSeparator?: string;
+  /** Document view type (w:view) per ECMA-376 Part 1 §17.15.1.92 — element #1 in CT_Settings */
+  private _documentView?: string;
 
   /** When true, _postProcessDocumentXml() strips INCLUDEPICTURE field markup from document.xml */
   private _flattenIncludePictureFields = false;
@@ -847,6 +849,12 @@ export class Document {
       }
     }
 
+    // Parse w:view per ECMA-376 Part 1 §17.15.1.92 (element #1 in CT_Settings)
+    const viewMatch = /<w:view\s+w:val\s*=\s*"([^"]*)"[^>]*\/?>/.exec(settingsXml);
+    if (viewMatch?.[1]) {
+      this._documentView = viewMatch[1];
+    }
+
     // Parse w:evenAndOddHeaders per ECMA-376 Part 1 §17.15.1.28
     if (/<w:evenAndOddHeaders\b[^>]*\/?>/.test(settingsXml)) {
       this._evenAndOddHeaders = true;
@@ -3303,6 +3311,7 @@ export class Document {
       });
       // Apply settings merges to the generated XML for new documents
       if (this._settingsModified) {
+        xml = this.mergeViewIntoSettings(xml);
         xml = this.mergeTrackChangesIntoSettings(xml);
         xml = this.mergeBooleanSettingsIntoSettings(xml);
       }
@@ -3316,6 +3325,7 @@ export class Document {
 
     // Start from original XML and selectively merge changed settings
     let xml = this._originalSettingsXml;
+    xml = this.mergeViewIntoSettings(xml);
     xml = this.mergeTrackChangesIntoSettings(xml);
     xml = this.mergeProtectionIntoSettings(xml);
     xml = this.mergeRsidsIntoSettings(xml);
@@ -3324,6 +3334,29 @@ export class Document {
     return xml;
   }
 
+  /**
+   * Merges the document view (w:view) into settings.xml.
+   *
+   * Per CT_Settings schema: w:view is element #1 — must be the first child
+   * of w:settings. Only modifies if setDocumentView() was called.
+   *
+   * @private
+   */
+  private mergeViewIntoSettings(xml: string): string {
+    if (this._documentView === undefined) {
+      return xml;
+    }
+
+    // Remove any existing w:view element
+    xml = xml.replace(/<w:view\b[^>]*\/?>\s*/g, '');
+
+    // Insert as first child of w:settings (element #1 per CT_Settings)
+    const viewXml = `<w:view w:val="${XMLBuilder.escapeXmlAttribute(this._documentView)}"/>`;
+    xml = xml.replace(/(<w:settings\b[^>]*>)/, `$1\n  ${viewXml}`);
+
+    return xml;
+  }
+
   /**
    * Merges track changes settings (w:trackRevisions, w:doNotTrackFormatting,
    * w:trackFormatting, w:revisionView) into settings.xml.
@@ -10949,6 +10982,26 @@ export class Document {
   /**
    * Gets whether even and odd headers/footers are enabled (w:evenAndOddHeaders)
    */
+  /**
+   * Gets the document view type (w:view) per ECMA-376 Part 1 §17.15.1.92.
+   * Common values: 'print', 'web', 'outline', 'masterPages', 'normal', 'none'.
+   * @returns The view type string, or undefined if not set
+   */
+  getDocumentView(): string | undefined {
+    return this._documentView;
+  }
+
+  /**
+   * Sets the document view type (w:view) per ECMA-376 Part 1 §17.15.1.92.
+   * Controls which view mode Word uses when opening the document.
+   * Common values: 'print' (Print Layout), 'web' (Web Layout), 'outline', 'normal' (Draft).
+   * @param view - The view type to set
+   */
+  setDocumentView(view: string): void {
+    this._documentView = view;
+    this._settingsModified = true;
+  }
+
   getEvenAndOddHeaders(): boolean {
     return this._evenAndOddHeaders ?? false;
   }

package/src/core/DocumentParser.ts

@@ -6099,14 +6099,14 @@ export class DocumentParser {
       table.setBidiVisual(true);
     }
 
-    // Parse table width
+    // Parse table width — always set when w:tblW is present, including w:w="0" w:type="auto"
+    // (auto-sized tables). Skipping w:w="0" would leave the constructor default (9360/dxa),
+    // causing tblPrChange snapshots to capture wrong "previous" width values.
     if (tblPrObj["w:tblW"]) {
-      const width = parseInt(tblPrObj["w:tblW"]["@_w:w"] || "0", 10);
+      const width = safeParseInt(tblPrObj["w:tblW"]["@_w:w"], 0);
       const widthType = tblPrObj["w:tblW"]["@_w:type"] || "dxa";
-      if (width > 0) {
-        table.setWidth(width);
-        table.setWidthType(widthType);
-      }
+      table.setWidth(width);
+      table.setWidthType(widthType);
     }
 
     // Parse table caption
@@ -6142,6 +6142,12 @@ export class DocumentParser {
       }
     }
 
+    // Parse table indentation (w:tblInd) per ECMA-376 Part 1 §17.4.43
+    if (tblPrObj["w:tblInd"]) {
+      const indentVal = safeParseInt(tblPrObj["w:tblInd"]["@_w:w"], 0);
+      table.setIndent(indentVal);
+    }
+
     // Parse table cell margins (w:tblCellMar) per ECMA-376 Part 1 §17.4.42
     if (tblPrObj["w:tblCellMar"]) {
       const cellMar = tblPrObj["w:tblCellMar"];

package/src/elements/Run.ts

@@ -2073,24 +2073,29 @@ export class Run {
         const prevRPr = this.propertyChangeRevision.previousProperties
           ? Run.generateRunPropertiesXML(this.propertyChangeRevision.previousProperties as RunFormatting)
           : null;
-        const rPrChangeChildren: XMLElement[] = prevRPr ? [prevRPr] : [];
-
-        // Create w:rPrChange element with attributes
-        const rPrChange: XMLElement = {
-          name: 'w:rPrChange',
-          attributes: {
-            'w:id': this.propertyChangeRevision.id.toString(),
-            'w:author': this.propertyChangeRevision.author,
-            'w:date': formatDateForXml(this.propertyChangeRevision.date),
-          },
-          children: rPrChangeChildren,
-        };
-
-        // Add rPrChange to rPr children (must come last per ECMA-376)
-        if (rPrElement.children) {
-          rPrElement.children.push(rPrChange);
-        } else {
-          rPrElement.children = [rPrChange];
+
+        // Only emit rPrChange if there are actual previous properties to serialize.
+        // Per ECMA-376 §17.13.5.32, rPrChange requires a child w:rPr (minOccurs=1).
+        // When previous properties are all undefined (inherited from styles, not explicit),
+        // emitting an empty or self-closing rPrChange causes Word to strip all formatting
+        // in "Original" markup view, which is visually destructive.
+        if (prevRPr) {
+          const rPrChange: XMLElement = {
+            name: 'w:rPrChange',
+            attributes: {
+              'w:id': this.propertyChangeRevision.id.toString(),
+              'w:author': this.propertyChangeRevision.author,
+              'w:date': formatDateForXml(this.propertyChangeRevision.date),
+            },
+            children: [prevRPr],
+          };
+
+          // Add rPrChange to rPr children (must come last per ECMA-376)
+          if (rPrElement.children) {
+            rPrElement.children.push(rPrChange);
+          } else {
+            rPrElement.children = [rPrChange];
+          }
         }
       }