docxmlater 10.4.0 → 11.0.4

package/dist/elements/Paragraph.js

@@ -10,46 +10,47 @@ exports.isRevision = isRevision;
 exports.isRangeMarker = isRangeMarker;
 exports.isShape = isShape;
 exports.isTextBox = isTextBox;
-const deepClone_1 = require("../utils/deepClone");
-const dateFormatting_1 = require("../utils/dateFormatting");
-const diagnostics_1 = require("../utils/diagnostics");
-const formatting_1 = require("../utils/formatting");
-const logger_1 = require("../utils/logger");
-const XMLBuilder_1 = require("../xml/XMLBuilder");
-const CommonTypes_1 = require("./CommonTypes");
-const Field_1 = require("./Field");
-const Hyperlink_1 = require("./Hyperlink");
-const RangeMarker_1 = require("./RangeMarker");
-const Revision_1 = require("./Revision");
-const Run_1 = require("./Run");
-const Shape_1 = require("./Shape");
-const TextBox_1 = require("./TextBox");
+const deepClone_js_1 = require("../utils/deepClone.js");
+const deepEqual_js_1 = require("../utils/deepEqual.js");
+const dateFormatting_js_1 = require("../utils/dateFormatting.js");
+const diagnostics_js_1 = require("../utils/diagnostics.js");
+const formatting_js_1 = require("../utils/formatting.js");
+const logger_js_1 = require("../utils/logger.js");
+const XMLBuilder_js_1 = require("../xml/XMLBuilder.js");
+const CommonTypes_js_1 = require("./CommonTypes.js");
+const Field_js_1 = require("./Field.js");
+const Hyperlink_js_1 = require("./Hyperlink.js");
+const RangeMarker_js_1 = require("./RangeMarker.js");
+const Revision_js_1 = require("./Revision.js");
+const Run_js_1 = require("./Run.js");
+const Shape_js_1 = require("./Shape.js");
+const TextBox_js_1 = require("./TextBox.js");
 function isRun(content) {
-    return content instanceof Run_1.Run;
+    return content instanceof Run_js_1.Run;
 }
 function isField(content) {
-    return content instanceof Field_1.Field || content instanceof Field_1.ComplexField;
+    return content instanceof Field_js_1.Field || content instanceof Field_js_1.ComplexField;
 }
 function isSimpleField(content) {
-    return content instanceof Field_1.Field && !(content instanceof Field_1.ComplexField);
+    return content instanceof Field_js_1.Field && !(content instanceof Field_js_1.ComplexField);
 }
 function isComplexField(content) {
-    return content instanceof Field_1.ComplexField;
+    return content instanceof Field_js_1.ComplexField;
 }
 function isHyperlink(content) {
-    return content instanceof Hyperlink_1.Hyperlink;
+    return content instanceof Hyperlink_js_1.Hyperlink;
 }
 function isRevision(content) {
-    return content instanceof Revision_1.Revision;
+    return content instanceof Revision_js_1.Revision;
 }
 function isRangeMarker(content) {
-    return content instanceof RangeMarker_1.RangeMarker;
+    return content instanceof RangeMarker_js_1.RangeMarker;
 }
 function isShape(content) {
-    return content instanceof Shape_1.Shape;
+    return content instanceof Shape_js_1.Shape;
 }
 function isTextBox(content) {
-    return content instanceof TextBox_1.TextBox;
+    return content instanceof TextBox_js_1.TextBox;
 }
 class Paragraph {
     content = [];
@@ -119,7 +120,7 @@ class Paragraph {
     addRun(run) {
         run._setParentParagraph(this);
         if (this.trackingContext?.isEnabled()) {
-            const revision = Revision_1.Revision.createInsertion(this.trackingContext.getAuthor(), run, new Date());
+            const revision = Revision_js_1.Revision.createInsertion(this.trackingContext.getAuthor(), run, new Date());
             this.trackingContext.getRevisionManager().register(revision);
             this.content.push(revision);
         }
@@ -143,10 +144,10 @@ class Paragraph {
     }
     addHyperlink(urlOrHyperlink) {
         if (typeof urlOrHyperlink === 'string') {
-            const hyperlink = new Hyperlink_1.Hyperlink({ url: urlOrHyperlink, text: urlOrHyperlink });
+            const hyperlink = new Hyperlink_js_1.Hyperlink({ url: urlOrHyperlink, text: urlOrHyperlink });
             hyperlink._setParentParagraph(this);
             if (this.trackingContext?.isEnabled()) {
-                const revision = Revision_1.Revision.createInsertion(this.trackingContext.getAuthor(), hyperlink, new Date());
+                const revision = Revision_js_1.Revision.createInsertion(this.trackingContext.getAuthor(), hyperlink, new Date());
                 this.trackingContext.getRevisionManager().register(revision);
                 this.content.push(revision);
             }
@@ -155,10 +156,10 @@ class Paragraph {
             }
             return hyperlink;
         }
-        else if (urlOrHyperlink instanceof Hyperlink_1.Hyperlink) {
+        else if (urlOrHyperlink instanceof Hyperlink_js_1.Hyperlink) {
             urlOrHyperlink._setParentParagraph(this);
             if (this.trackingContext?.isEnabled()) {
-                const revision = Revision_1.Revision.createInsertion(this.trackingContext.getAuthor(), urlOrHyperlink, new Date());
+                const revision = Revision_js_1.Revision.createInsertion(this.trackingContext.getAuthor(), urlOrHyperlink, new Date());
                 this.trackingContext.getRevisionManager().register(revision);
                 this.content.push(revision);
             }
@@ -168,10 +169,10 @@ class Paragraph {
             return this;
         }
         else {
-            const hyperlink = new Hyperlink_1.Hyperlink({ text: 'Link' });
+            const hyperlink = new Hyperlink_js_1.Hyperlink({ text: 'Link' });
             hyperlink._setParentParagraph(this);
             if (this.trackingContext?.isEnabled()) {
-                const revision = Revision_1.Revision.createInsertion(this.trackingContext.getAuthor(), hyperlink, new Date());
+                const revision = Revision_js_1.Revision.createInsertion(this.trackingContext.getAuthor(), hyperlink, new Date());
                 this.trackingContext.getRevisionManager().register(revision);
                 this.content.push(revision);
             }
@@ -248,31 +249,31 @@ class Paragraph {
         return [...this.commentsEnd];
     }
     addPageNumber(formatting) {
-        return this.addField(Field_1.Field.createPageNumber(formatting));
+        return this.addField(Field_js_1.Field.createPageNumber(formatting));
     }
     addTotalPages(formatting) {
-        return this.addField(Field_1.Field.createTotalPages(formatting));
+        return this.addField(Field_js_1.Field.createTotalPages(formatting));
     }
     addDate(format, formatting) {
-        return this.addField(Field_1.Field.createDate(format, formatting));
+        return this.addField(Field_js_1.Field.createDate(format, formatting));
     }
     addTime(format, formatting) {
-        return this.addField(Field_1.Field.createTime(format, formatting));
+        return this.addField(Field_js_1.Field.createTime(format, formatting));
     }
     addFilename(includePath = false, formatting) {
-        return this.addField(Field_1.Field.createFilename(includePath, formatting));
+        return this.addField(Field_js_1.Field.createFilename(includePath, formatting));
     }
     addAuthor(formatting) {
-        return this.addField(Field_1.Field.createAuthor(formatting));
+        return this.addField(Field_js_1.Field.createAuthor(formatting));
     }
     addTitle(formatting) {
-        return this.addField(Field_1.Field.createTitle(formatting));
+        return this.addField(Field_js_1.Field.createTitle(formatting));
     }
     addText(text, formatting) {
-        const run = new Run_1.Run(text, formatting);
+        const run = new Run_js_1.Run(text, formatting);
         run._setParentParagraph(this);
         if (this.trackingContext?.isEnabled()) {
-            const revision = Revision_1.Revision.createInsertion(this.trackingContext.getAuthor(), run, new Date());
+            const revision = Revision_js_1.Revision.createInsertion(this.trackingContext.getAuthor(), run, new Date());
             this.trackingContext.getRevisionManager().register(revision);
             this.content.push(revision);
         }
@@ -282,38 +283,38 @@ class Paragraph {
         return this;
     }
     addLineBreak() {
-        const run = new Run_1.Run('');
+        const run = new Run_js_1.Run('');
         run.addBreak();
         this.content.push(run);
         return this;
     }
     addColumnBreak() {
-        const run = new Run_1.Run('');
+        const run = new Run_js_1.Run('');
         run.addBreak('column');
         this.content.push(run);
         return this;
     }
     setText(text, formatting) {
-        this.content = [new Run_1.Run(text, formatting)];
+        this.content = [new Run_js_1.Run(text, formatting)];
         return this;
     }
     getRuns() {
         const runs = [];
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 runs.push(item);
             }
-            else if (item instanceof Revision_1.Revision) {
+            else if (item instanceof Revision_js_1.Revision) {
                 runs.push(...item.getRuns());
             }
-            else if (item instanceof Hyperlink_1.Hyperlink) {
+            else if (item instanceof Hyperlink_js_1.Hyperlink) {
                 runs.push(item.getRun());
             }
         }
         return runs;
     }
     getRevisions() {
-        return this.content.filter((item) => item instanceof Revision_1.Revision);
+        return this.content.filter((item) => item instanceof Revision_js_1.Revision);
     }
     getContent() {
         return [...this.content];
@@ -322,11 +323,11 @@ class Paragraph {
         if (this.trackingContext?.isEnabled() && this.content.length > 0) {
             const deletedContent = [];
             for (const item of this.content) {
-                if (item instanceof Revision_1.Revision) {
+                if (item instanceof Revision_js_1.Revision) {
                     deletedContent.push(item);
                 }
-                else if (item instanceof Run_1.Run || item instanceof Hyperlink_1.Hyperlink) {
-                    const revision = Revision_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
+                else if (item instanceof Run_js_1.Run || item instanceof Hyperlink_js_1.Hyperlink) {
+                    const revision = Revision_js_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
                     this.trackingContext.getRevisionManager().register(revision);
                     deletedContent.push(revision);
                 }
@@ -353,11 +354,11 @@ class Paragraph {
         if (this.trackingContext?.isEnabled() && this.content.length > 0) {
             const deletedContent = [];
             for (const item of this.content) {
-                if (item instanceof Revision_1.Revision) {
+                if (item instanceof Revision_js_1.Revision) {
                     deletedContent.push(item);
                 }
-                else if (item instanceof Run_1.Run || item instanceof Hyperlink_1.Hyperlink) {
-                    const revision = Revision_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
+                else if (item instanceof Run_js_1.Run || item instanceof Hyperlink_js_1.Hyperlink) {
+                    const revision = Revision_js_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
                     this.trackingContext.getRevisionManager().register(revision);
                     deletedContent.push(revision);
                 }
@@ -368,10 +369,10 @@ class Paragraph {
             this.content = [...content];
         }
         for (const item of this.content) {
-            if (item instanceof Hyperlink_1.Hyperlink) {
+            if (item instanceof Hyperlink_js_1.Hyperlink) {
                 item._setParentParagraph(this);
             }
-            else if (item instanceof Run_1.Run) {
+            else if (item instanceof Run_js_1.Run) {
                 item._setParentParagraph(this);
             }
         }
@@ -382,8 +383,8 @@ class Paragraph {
         }
         const item = this.content[index];
         if (this.trackingContext?.isEnabled()) {
-            if (item instanceof Run_1.Run || item instanceof Hyperlink_1.Hyperlink) {
-                const revision = Revision_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
+            if (item instanceof Run_js_1.Run || item instanceof Hyperlink_js_1.Hyperlink) {
+                const revision = Revision_js_1.Revision.createDeletion(this.trackingContext.getAuthor(), item, new Date());
                 this.trackingContext.getRevisionManager().register(revision);
                 this.content[index] = revision;
             }
@@ -395,12 +396,12 @@ class Paragraph {
     }
     getText() {
         return this.content
-            .filter((item) => item instanceof Run_1.Run || item instanceof Hyperlink_1.Hyperlink)
+            .filter((item) => item instanceof Run_js_1.Run || item instanceof Hyperlink_js_1.Hyperlink)
             .map((item) => item.getText())
             .join('');
     }
     getFields() {
-        return this.content.filter((item) => item instanceof Field_1.Field || item instanceof Field_1.ComplexField);
+        return this.content.filter((item) => item instanceof Field_js_1.Field || item instanceof Field_js_1.ComplexField);
     }
     findFieldsByInstruction(pattern) {
         const regex = typeof pattern === 'string' ? new RegExp(pattern, 'i') : pattern;
@@ -411,7 +412,7 @@ class Paragraph {
     }
     removeAllFields() {
         const originalLength = this.content.length;
-        this.content = this.content.filter((item) => !(item instanceof Field_1.Field || item instanceof Field_1.ComplexField));
+        this.content = this.content.filter((item) => !(item instanceof Field_js_1.Field || item instanceof Field_js_1.ComplexField));
         return originalLength - this.content.length;
     }
     replaceField(oldField, replacement) {
@@ -419,7 +420,7 @@ class Paragraph {
         if (index === -1)
             return false;
         if (typeof replacement === 'string') {
-            this.content[index] = new Run_1.Run(replacement);
+            this.content[index] = new Run_js_1.Run(replacement);
         }
         else {
             this.content[index] = replacement;
@@ -500,7 +501,7 @@ class Paragraph {
         let mergeCount = 0;
         let currentMergeGroup = null;
         for (const item of this.content) {
-            if (item instanceof Revision_1.Revision) {
+            if (item instanceof Revision_js_1.Revision) {
                 if (currentMergeGroup && this.canMergeRevisions(currentMergeGroup, item, timeWindowMs)) {
                     for (const content of item.getContent()) {
                         currentMergeGroup.addContent(content);
@@ -548,7 +549,7 @@ class Paragraph {
         return true;
     }
     cloneRevision(revision) {
-        const cloned = new Revision_1.Revision({
+        const cloned = new Revision_js_1.Revision({
             id: revision.getId(),
             author: revision.getAuthor(),
             date: revision.getDate(),
@@ -624,7 +625,7 @@ class Paragraph {
     }
     setLeftIndent(twips) {
         if (this.formatting.numbering) {
-            logger_1.defaultLogger.warn('Setting left indentation on a numbered paragraph has no effect. ' +
+            logger_js_1.defaultLogger.warn('Setting left indentation on a numbered paragraph has no effect. ' +
                 'Numbering controls indentation. Use different numbering levels to change indent.');
         }
         const previousValue = this.formatting.indentation?.left;
@@ -650,7 +651,7 @@ class Paragraph {
     }
     setFirstLineIndent(twips) {
         if (this.formatting.numbering) {
-            logger_1.defaultLogger.warn('Setting first line indentation on a numbered paragraph has no effect. ' +
+            logger_js_1.defaultLogger.warn('Setting first line indentation on a numbered paragraph has no effect. ' +
                 'Numbering controls indentation using hanging indent.');
         }
         const previousValue = this.formatting.indentation?.firstLine;
@@ -668,7 +669,7 @@ class Paragraph {
             throw new Error('Hanging indent must be non-negative');
         }
         if (this.formatting.numbering) {
-            logger_1.defaultLogger.warn('Setting hanging indentation on a numbered paragraph has no effect. ' +
+            logger_js_1.defaultLogger.warn('Setting hanging indentation on a numbered paragraph has no effect. ' +
                 'Numbering controls indentation.');
         }
         const previousValue = this.formatting.indentation?.hanging;
@@ -1010,22 +1011,22 @@ class Paragraph {
             text: run.getText(),
             rtl: run.isRTL(),
         }));
-        (0, diagnostics_1.logParagraphContent)('serialization', -1, runData, this.formatting.bidi);
+        (0, diagnostics_js_1.logParagraphContent)('serialization', -1, runData, this.formatting.bidi);
         if (this.formatting.bidi) {
-            (0, diagnostics_1.logTextDirection)(`Serializing paragraph with BiDi enabled`);
+            (0, diagnostics_js_1.logTextDirection)(`Serializing paragraph with BiDi enabled`);
         }
         const pPrChildren = [];
         if (this.formatting.style) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pStyle', { 'w:val': this.formatting.style }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('pStyle', { 'w:val': this.formatting.style }));
         }
         if (this.formatting.keepNext !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepNext', { 'w:val': this.formatting.keepNext ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('keepNext', { 'w:val': this.formatting.keepNext ? '1' : '0' }));
         }
         if (this.formatting.keepLines !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepLines', { 'w:val': this.formatting.keepLines ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('keepLines', { 'w:val': this.formatting.keepLines ? '1' : '0' }));
         }
         if (this.formatting.pageBreakBefore !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pageBreakBefore', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('pageBreakBefore', {
                 'w:val': this.formatting.pageBreakBefore ? '1' : '0',
             }));
         }
@@ -1063,34 +1064,34 @@ class Paragraph {
             if (f.anchorLock !== undefined)
                 attrs['w:anchorLock'] = f.anchorLock ? '1' : '0';
             if (Object.keys(attrs).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('framePr', attrs));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('framePr', attrs));
             }
         }
         if (this.formatting.widowControl !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('widowControl', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('widowControl', {
                 'w:val': this.formatting.widowControl ? '1' : '0',
             }));
         }
         if (this.formatting.numbering) {
-            const numPr = XMLBuilder_1.XMLBuilder.w('numPr', undefined, [
-                XMLBuilder_1.XMLBuilder.wSelf('ilvl', {
+            const numPr = XMLBuilder_js_1.XMLBuilder.w('numPr', undefined, [
+                XMLBuilder_js_1.XMLBuilder.wSelf('ilvl', {
                     'w:val': this.formatting.numbering.level.toString(),
                 }),
-                XMLBuilder_1.XMLBuilder.wSelf('numId', {
+                XMLBuilder_js_1.XMLBuilder.wSelf('numId', {
                     'w:val': this.formatting.numbering.numId.toString(),
                 }),
             ]);
             pPrChildren.push(numPr);
         }
         else if (this.formatting.numberingSuppressed) {
-            const numPr = XMLBuilder_1.XMLBuilder.w('numPr', undefined, [
-                XMLBuilder_1.XMLBuilder.wSelf('ilvl', { 'w:val': '0' }),
-                XMLBuilder_1.XMLBuilder.wSelf('numId', { 'w:val': '0' }),
+            const numPr = XMLBuilder_js_1.XMLBuilder.w('numPr', undefined, [
+                XMLBuilder_js_1.XMLBuilder.wSelf('ilvl', { 'w:val': '0' }),
+                XMLBuilder_js_1.XMLBuilder.wSelf('numId', { 'w:val': '0' }),
             ]);
             pPrChildren.push(numPr);
         }
         if (this.formatting.suppressLineNumbers !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressLineNumbers', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressLineNumbers', {
                 'w:val': this.formatting.suppressLineNumbers ? '1' : '0',
             }));
         }
@@ -1100,19 +1101,26 @@ class Paragraph {
             const createBorder = (borderType, border) => {
                 if (!border)
                     return null;
-                const attributes = {};
-                if (border.style)
-                    attributes['w:val'] = border.style;
+                const attributes = {
+                    'w:val': border.style ?? 'nil',
+                };
                 if (border.size !== undefined)
                     attributes['w:sz'] = border.size;
                 if (border.color)
                     attributes['w:color'] = border.color;
                 if (border.space !== undefined)
                     attributes['w:space'] = border.space;
-                if (Object.keys(attributes).length > 0) {
-                    return XMLBuilder_1.XMLBuilder.wSelf(borderType, attributes);
-                }
-                return null;
+                if (border.themeColor)
+                    attributes['w:themeColor'] = border.themeColor;
+                if (border.themeTint)
+                    attributes['w:themeTint'] = border.themeTint;
+                if (border.themeShade)
+                    attributes['w:themeShade'] = border.themeShade;
+                if (border.shadow !== undefined)
+                    attributes['w:shadow'] = border.shadow ? '1' : '0';
+                if (border.frame !== undefined)
+                    attributes['w:frame'] = border.frame ? '1' : '0';
+                return XMLBuilder_js_1.XMLBuilder.wSelf(borderType, attributes);
             };
             const topBorder = createBorder('top', borders.top);
             if (topBorder)
@@ -1133,58 +1141,58 @@ class Paragraph {
             if (barBorder)
                 borderChildren.push(barBorder);
             if (borderChildren.length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.w('pBdr', undefined, borderChildren));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('pBdr', undefined, borderChildren));
             }
         }
         if (this.formatting.shading) {
-            const shdAttrs = (0, CommonTypes_1.buildShadingAttributes)(this.formatting.shading);
+            const shdAttrs = (0, CommonTypes_js_1.buildShadingAttributes)(this.formatting.shading);
             if (Object.keys(shdAttrs).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('shd', shdAttrs));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('shd', shdAttrs));
             }
         }
         if (this.formatting.tabs && this.formatting.tabs.length > 0) {
             const tabChildren = [];
             for (const tab of this.formatting.tabs) {
-                const attributes = {};
-                attributes['w:pos'] = tab.position;
-                if (tab.val)
-                    attributes['w:val'] = tab.val;
+                const attributes = {
+                    'w:val': tab.val ?? 'left',
+                    'w:pos': tab.position,
+                };
                 if (tab.leader)
                     attributes['w:leader'] = tab.leader;
-                tabChildren.push(XMLBuilder_1.XMLBuilder.wSelf('tab', attributes));
+                tabChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('tab', attributes));
             }
             if (tabChildren.length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.w('tabs', undefined, tabChildren));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tabs', undefined, tabChildren));
             }
         }
         if (this.formatting.suppressAutoHyphens !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressAutoHyphens', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressAutoHyphens', {
                 'w:val': this.formatting.suppressAutoHyphens ? '1' : '0',
             }));
         }
         if (this.formatting.kinsoku !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('kinsoku', { 'w:val': this.formatting.kinsoku ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('kinsoku', { 'w:val': this.formatting.kinsoku ? '1' : '0' }));
         }
         if (this.formatting.wordWrap !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wordWrap', { 'w:val': this.formatting.wordWrap ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wordWrap', { 'w:val': this.formatting.wordWrap ? '1' : '0' }));
         }
         if (this.formatting.overflowPunct !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('overflowPunct', { 'w:val': this.formatting.overflowPunct ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('overflowPunct', { 'w:val': this.formatting.overflowPunct ? '1' : '0' }));
         }
         if (this.formatting.topLinePunct !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('topLinePunct', { 'w:val': this.formatting.topLinePunct ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('topLinePunct', { 'w:val': this.formatting.topLinePunct ? '1' : '0' }));
         }
         if (this.formatting.autoSpaceDE !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('autoSpaceDE', { 'w:val': this.formatting.autoSpaceDE ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoSpaceDE', { 'w:val': this.formatting.autoSpaceDE ? '1' : '0' }));
         }
         if (this.formatting.autoSpaceDN !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('autoSpaceDN', { 'w:val': this.formatting.autoSpaceDN ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoSpaceDN', { 'w:val': this.formatting.autoSpaceDN ? '1' : '0' }));
         }
         if (this.formatting.bidi !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('bidi', { 'w:val': this.formatting.bidi ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('bidi', { 'w:val': this.formatting.bidi ? '1' : '0' }));
         }
         if (this.formatting.adjustRightInd !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('adjustRightInd', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('adjustRightInd', {
                 'w:val': this.formatting.adjustRightInd ? '1' : '0',
             }));
         }
@@ -1208,7 +1216,7 @@ class Paragraph {
             if (spc.lineRule)
                 attributes['w:lineRule'] = spc.lineRule;
             if (Object.keys(attributes).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('spacing', attributes));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('spacing', attributes));
             }
         }
         if (this.formatting.indentation) {
@@ -1224,85 +1232,114 @@ class Paragraph {
             else if (ind.firstLine !== undefined) {
                 attributes['w:firstLine'] = ind.firstLine;
             }
+            if (ind.leftChars !== undefined)
+                attributes['w:leftChars'] = ind.leftChars;
+            if (ind.rightChars !== undefined)
+                attributes['w:rightChars'] = ind.rightChars;
+            if (ind.hangingChars !== undefined) {
+                attributes['w:hangingChars'] = ind.hangingChars;
+            }
+            else if (ind.firstLineChars !== undefined) {
+                attributes['w:firstLineChars'] = ind.firstLineChars;
+            }
             if (Object.keys(attributes).length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ind', attributes));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ind', attributes));
             }
         }
         if (this.formatting.contextualSpacing !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('contextualSpacing', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('contextualSpacing', {
                 'w:val': this.formatting.contextualSpacing ? '1' : '0',
             }));
         }
         if (this.formatting.mirrorIndents !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('mirrorIndents', { 'w:val': this.formatting.mirrorIndents ? '1' : '0' }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('mirrorIndents', { 'w:val': this.formatting.mirrorIndents ? '1' : '0' }));
         }
         if (this.formatting.suppressOverlap !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressOverlap', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressOverlap', {
                 'w:val': this.formatting.suppressOverlap ? '1' : '0',
             }));
         }
         if (this.formatting.alignment) {
             const alignmentValue = this.formatting.alignment === 'justify' ? 'both' : this.formatting.alignment;
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
         }
         if (this.formatting.textDirection) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textDirection', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textDirection', {
                 'w:val': this.formatting.textDirection,
             }));
         }
         if (this.formatting.textAlignment) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textAlignment', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textAlignment', {
                 'w:val': this.formatting.textAlignment,
             }));
         }
         if (this.formatting.textboxTightWrap) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textboxTightWrap', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textboxTightWrap', {
                 'w:val': this.formatting.textboxTightWrap,
             }));
         }
         if (this.formatting.outlineLevel !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('outlineLvl', {
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('outlineLvl', {
                 'w:val': this.formatting.outlineLevel.toString(),
             }));
         }
         if (this.formatting.divId !== undefined) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('divId', { 'w:val': this.formatting.divId.toString() }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('divId', { 'w:val': this.formatting.divId.toString() }));
         }
         if (this.formatting.cnfStyle) {
-            pPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': this.formatting.cnfStyle }));
+            pPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': this.formatting.cnfStyle }));
         }
         if (this.formatting.paragraphMarkRunProperties ||
             this.formatting.paragraphMarkDeletion ||
-            this.formatting.paragraphMarkInsertion) {
+            this.formatting.paragraphMarkInsertion ||
+            this.formatting.paragraphMarkRunPropertiesChange) {
             const rPrChildren = [];
-            if (this.formatting.paragraphMarkRunProperties) {
-                const rPr = Run_1.Run.generateRunPropertiesXML(this.formatting.paragraphMarkRunProperties);
-                if (rPr?.children) {
-                    for (const child of rPr.children) {
-                        if (typeof child !== 'string') {
-                            rPrChildren.push(child);
-                        }
-                    }
-                }
-            }
             if (this.formatting.paragraphMarkInsertion) {
                 const ins = this.formatting.paragraphMarkInsertion;
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ins', {
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ins', {
                     'w:id': ins.id.toString(),
                     'w:author': ins.author,
-                    'w:date': (0, dateFormatting_1.formatDateForXml)(ins.date),
+                    'w:date': (0, dateFormatting_js_1.formatDateForXml)(ins.date),
                 }));
             }
             if (this.formatting.paragraphMarkDeletion) {
                 const del = this.formatting.paragraphMarkDeletion;
-                rPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('del', {
+                rPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('del', {
                     'w:id': del.id.toString(),
                     'w:author': del.author,
-                    'w:date': (0, dateFormatting_1.formatDateForXml)(del.date),
+                    'w:date': (0, dateFormatting_js_1.formatDateForXml)(del.date),
                 }));
             }
+            if (this.formatting.paragraphMarkRunProperties) {
+                const rPr = Run_js_1.Run.generateRunPropertiesXML(this.formatting.paragraphMarkRunProperties);
+                if (rPr?.children) {
+                    for (const child of rPr.children) {
+                        if (typeof child !== 'string') {
+                            rPrChildren.push(child);
+                        }
+                    }
+                }
+            }
+            const paraRPrChange = this.formatting.paragraphMarkRunPropertiesChange;
+            if (paraRPrChange) {
+                const prevRPr = Run_js_1.Run.generateRunPropertiesXML(paraRPrChange.previousProperties);
+                const prevRPrElement = prevRPr ?? {
+                    name: 'w:rPr',
+                    attributes: {},
+                    children: [],
+                };
+                rPrChildren.push({
+                    name: 'w:rPrChange',
+                    attributes: {
+                        'w:id': paraRPrChange.id.toString(),
+                        'w:author': paraRPrChange.author,
+                        'w:date': (0, dateFormatting_js_1.formatDateForXml)(paraRPrChange.date),
+                    },
+                    children: [prevRPrElement],
+                });
+            }
             if (rPrChildren.length > 0) {
-                pPrChildren.push(XMLBuilder_1.XMLBuilder.w('rPr', undefined, rPrChildren));
+                pPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('rPr', undefined, rPrChildren));
             }
         }
         if (this.formatting.sectPr) {
@@ -1326,16 +1363,16 @@ class Paragraph {
             if (change.previousProperties) {
                 const prev = change.previousProperties;
                 if (prev.style) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pStyle', { 'w:val': prev.style }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('pStyle', { 'w:val': prev.style }));
                 }
                 if (prev.keepNext !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepNext', prev.keepNext ? { 'w:val': '1' } : { 'w:val': '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('keepNext', prev.keepNext ? { 'w:val': '1' } : { 'w:val': '0' }));
                 }
                 if (prev.keepLines !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('keepLines', prev.keepLines ? { 'w:val': '1' } : { 'w:val': '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('keepLines', prev.keepLines ? { 'w:val': '1' } : { 'w:val': '0' }));
                 }
                 if (prev.pageBreakBefore !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('pageBreakBefore', prev.pageBreakBefore ? { 'w:val': '1' } : { 'w:val': '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('pageBreakBefore', prev.pageBreakBefore ? { 'w:val': '1' } : { 'w:val': '0' }));
                 }
                 if (prev.framePr) {
                     const fAttrs = {};
@@ -1371,36 +1408,36 @@ class Paragraph {
                     if (f.anchorLock !== undefined)
                         fAttrs['w:anchorLock'] = f.anchorLock ? '1' : '0';
                     if (Object.keys(fAttrs).length > 0) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('framePr', fAttrs));
+                        prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('framePr', fAttrs));
                     }
                 }
                 if (prev.widowControl !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('widowControl', {
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('widowControl', {
                         'w:val': prev.widowControl ? '1' : '0',
                     }));
                 }
                 if (prev.numbering) {
                     const numPrChildren = [];
                     if (prev.numbering.level !== undefined) {
-                        numPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ilvl', { 'w:val': prev.numbering.level.toString() }));
+                        numPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ilvl', { 'w:val': prev.numbering.level.toString() }));
                     }
                     if (prev.numbering.numId !== undefined) {
-                        numPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('numId', { 'w:val': prev.numbering.numId.toString() }));
+                        numPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('numId', { 'w:val': prev.numbering.numId.toString() }));
                     }
                     if (numPrChildren.length > 0) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.w('numPr', undefined, numPrChildren));
+                        prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('numPr', undefined, numPrChildren));
                     }
                 }
                 else if (prev.numberingSuppressed) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.w('numPr', undefined, [
-                        XMLBuilder_1.XMLBuilder.wSelf('ilvl', { 'w:val': '0' }),
-                        XMLBuilder_1.XMLBuilder.wSelf('numId', { 'w:val': '0' }),
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('numPr', undefined, [
+                        XMLBuilder_js_1.XMLBuilder.wSelf('ilvl', { 'w:val': '0' }),
+                        XMLBuilder_js_1.XMLBuilder.wSelf('numId', { 'w:val': '0' }),
                     ]));
                 }
                 if (prev.suppressLineNumbers !== undefined) {
-                    if (prev.suppressLineNumbers) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressLineNumbers'));
-                    }
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressLineNumbers', {
+                        'w:val': prev.suppressLineNumbers ? '1' : '0',
+                    }));
                 }
                 if (prev.borders) {
                     const borderChildren = [];
@@ -1408,71 +1445,76 @@ class Paragraph {
                     for (const side of borderSides) {
                         const border = prev.borders[side];
                         if (border) {
-                            const attrs = {};
-                            if (border.style)
-                                attrs['w:val'] = border.style;
+                            const attrs = { 'w:val': border.style ?? 'nil' };
                             if (border.size !== undefined)
                                 attrs['w:sz'] = border.size.toString();
                             if (border.color)
                                 attrs['w:color'] = border.color;
                             if (border.space !== undefined)
                                 attrs['w:space'] = border.space.toString();
-                            if (Object.keys(attrs).length > 0) {
-                                borderChildren.push(XMLBuilder_1.XMLBuilder.wSelf(side, attrs));
-                            }
+                            if (border.themeColor)
+                                attrs['w:themeColor'] = border.themeColor;
+                            if (border.themeTint)
+                                attrs['w:themeTint'] = border.themeTint;
+                            if (border.themeShade)
+                                attrs['w:themeShade'] = border.themeShade;
+                            if (border.shadow !== undefined)
+                                attrs['w:shadow'] = border.shadow ? '1' : '0';
+                            if (border.frame !== undefined)
+                                attrs['w:frame'] = border.frame ? '1' : '0';
+                            borderChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf(side, attrs));
                         }
                     }
                     if (borderChildren.length > 0) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.w('pBdr', undefined, borderChildren));
+                        prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('pBdr', undefined, borderChildren));
                     }
                 }
                 if (prev.shading) {
-                    const shdAttrs = (0, CommonTypes_1.buildShadingAttributes)(prev.shading);
+                    const shdAttrs = (0, CommonTypes_js_1.buildShadingAttributes)(prev.shading);
                     if (Object.keys(shdAttrs).length > 0) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('shd', shdAttrs));
+                        prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('shd', shdAttrs));
                     }
                 }
                 if (prev.tabs && prev.tabs.length > 0) {
                     const tabChildren = prev.tabs.map((tab) => {
                         const tabAttrs = {
+                            'w:val': tab.val ?? 'left',
                             'w:pos': tab.position.toString(),
                         };
-                        if (tab.val)
-                            tabAttrs['w:val'] = tab.val;
                         if (tab.leader)
                             tabAttrs['w:leader'] = tab.leader;
-                        return XMLBuilder_1.XMLBuilder.wSelf('tab', tabAttrs);
+                        return XMLBuilder_js_1.XMLBuilder.wSelf('tab', tabAttrs);
                     });
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.w('tabs', undefined, tabChildren));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.w('tabs', undefined, tabChildren));
                 }
                 if (prev.suppressAutoHyphens !== undefined) {
-                    if (prev.suppressAutoHyphens) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressAutoHyphens', { 'w:val': '1' }));
-                    }
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressAutoHyphens', {
+                        'w:val': prev.suppressAutoHyphens ? '1' : '0',
+                    }));
                 }
                 if (prev.kinsoku !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('kinsoku', { 'w:val': prev.kinsoku ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('kinsoku', { 'w:val': prev.kinsoku ? '1' : '0' }));
                 }
                 if (prev.wordWrap !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('wordWrap', { 'w:val': prev.wordWrap ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('wordWrap', { 'w:val': prev.wordWrap ? '1' : '0' }));
                 }
                 if (prev.overflowPunct !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('overflowPunct', { 'w:val': prev.overflowPunct ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('overflowPunct', { 'w:val': prev.overflowPunct ? '1' : '0' }));
                 }
                 if (prev.topLinePunct !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('topLinePunct', { 'w:val': prev.topLinePunct ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('topLinePunct', { 'w:val': prev.topLinePunct ? '1' : '0' }));
                 }
                 if (prev.autoSpaceDE !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('autoSpaceDE', { 'w:val': prev.autoSpaceDE ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoSpaceDE', { 'w:val': prev.autoSpaceDE ? '1' : '0' }));
                 }
                 if (prev.autoSpaceDN !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('autoSpaceDN', { 'w:val': prev.autoSpaceDN ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('autoSpaceDN', { 'w:val': prev.autoSpaceDN ? '1' : '0' }));
                 }
                 if (prev.bidi !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('bidi', { 'w:val': prev.bidi ? '1' : '0' }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('bidi', { 'w:val': prev.bidi ? '1' : '0' }));
                 }
                 if (prev.adjustRightInd !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('adjustRightInd', {
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('adjustRightInd', {
                         'w:val': prev.adjustRightInd ? '1' : '0',
                     }));
                 }
@@ -1495,57 +1537,70 @@ class Paragraph {
                     if (prev.spacing.lineRule)
                         spacingAttrs['w:lineRule'] = prev.spacing.lineRule;
                     if (Object.keys(spacingAttrs).length > 0) {
-                        prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('spacing', spacingAttrs));
+                        prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('spacing', spacingAttrs));
                     }
                 }
                 if (prev.indentation) {
                     const indAttrs = {};
-                    if (prev.indentation.left !== undefined)
-                        indAttrs['w:left'] = prev.indentation.left.toString();
-                    if (prev.indentation.right !== undefined)
-                        indAttrs['w:right'] = prev.indentation.right.toString();
-                    if (prev.indentation.firstLine !== undefined)
-                        indAttrs['w:firstLine'] = prev.indentation.firstLine.toString();
-                    if (prev.indentation.hanging !== undefined)
-                        indAttrs['w:hanging'] = prev.indentation.hanging.toString();
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('ind', indAttrs));
+                    const indentation = prev.indentation;
+                    if (indentation.left !== undefined)
+                        indAttrs['w:left'] = indentation.left.toString();
+                    if (indentation.right !== undefined)
+                        indAttrs['w:right'] = indentation.right.toString();
+                    if (indentation.hanging !== undefined) {
+                        indAttrs['w:hanging'] = indentation.hanging.toString();
+                    }
+                    else if (indentation.firstLine !== undefined) {
+                        indAttrs['w:firstLine'] = indentation.firstLine.toString();
+                    }
+                    if (indentation.leftChars !== undefined)
+                        indAttrs['w:leftChars'] = indentation.leftChars.toString();
+                    if (indentation.rightChars !== undefined)
+                        indAttrs['w:rightChars'] = indentation.rightChars.toString();
+                    if (indentation.hangingChars !== undefined) {
+                        indAttrs['w:hangingChars'] = indentation.hangingChars.toString();
+                    }
+                    else if (indentation.firstLineChars !== undefined) {
+                        indAttrs['w:firstLineChars'] = indentation.firstLineChars.toString();
+                    }
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('ind', indAttrs));
                 }
                 if (prev.contextualSpacing !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('contextualSpacing', {
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('contextualSpacing', {
                         'w:val': prev.contextualSpacing ? '1' : '0',
                     }));
                 }
                 if (prev.mirrorIndents !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('mirrorIndents', {
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('mirrorIndents', {
                         'w:val': prev.mirrorIndents ? '1' : '0',
                     }));
                 }
                 if (prev.suppressOverlap !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('suppressOverlap', {
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('suppressOverlap', {
                         'w:val': prev.suppressOverlap ? '1' : '0',
                     }));
                 }
                 if (prev.alignment) {
                     const alignmentValue = prev.alignment === 'justify' ? 'both' : prev.alignment;
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('jc', { 'w:val': alignmentValue }));
                 }
                 if (prev.textDirection) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textDirection', { 'w:val': prev.textDirection }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textDirection', { 'w:val': prev.textDirection }));
                 }
                 if (prev.textAlignment) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textAlignment', { 'w:val': prev.textAlignment }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textAlignment', { 'w:val': prev.textAlignment }));
                 }
                 if (prev.textboxTightWrap) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('textboxTightWrap', { 'w:val': prev.textboxTightWrap }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('textboxTightWrap', { 'w:val': prev.textboxTightWrap }));
                 }
                 if (prev.outlineLevel !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('outlineLvl', { 'w:val': prev.outlineLevel.toString() }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('outlineLvl', { 'w:val': prev.outlineLevel.toString() }));
                 }
                 if (prev.divId !== undefined) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('divId', { 'w:val': prev.divId.toString() }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('divId', { 'w:val': prev.divId.toString() }));
                 }
                 if (prev.cnfStyle) {
-                    prevPPrChildren.push(XMLBuilder_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': prev.cnfStyle }));
+                    prevPPrChildren.push(XMLBuilder_js_1.XMLBuilder.wSelf('cnfStyle', { 'w:val': prev.cnfStyle }));
                 }
             }
             if (prevPPrChildren.length > 0) {
@@ -1565,7 +1620,7 @@ class Paragraph {
         }
         const paragraphChildren = [];
         if (pPrChildren.length > 0) {
-            paragraphChildren.push(XMLBuilder_1.XMLBuilder.w('pPr', undefined, pPrChildren));
+            paragraphChildren.push(XMLBuilder_js_1.XMLBuilder.w('pPr', undefined, pPrChildren));
         }
         for (const bookmark of this.bookmarksStart) {
             paragraphChildren.push(bookmark.toStartXML());
@@ -1575,22 +1630,22 @@ class Paragraph {
         }
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
-            if (item instanceof Field_1.Field) {
+            if (item instanceof Field_js_1.Field) {
                 paragraphChildren.push(item.toXML());
             }
-            else if (item instanceof Field_1.ComplexField) {
+            else if (item instanceof Field_js_1.ComplexField) {
                 const fieldXml = item.toXML();
                 if (Array.isArray(fieldXml)) {
                     paragraphChildren.push(...fieldXml);
                 }
                 else {
-                    paragraphChildren.push(XMLBuilder_1.XMLBuilder.w('r', undefined, [fieldXml]));
+                    paragraphChildren.push(XMLBuilder_js_1.XMLBuilder.w('r', undefined, [fieldXml]));
                 }
             }
-            else if (item instanceof Hyperlink_1.Hyperlink) {
+            else if (item instanceof Hyperlink_js_1.Hyperlink) {
                 paragraphChildren.push(item.toXML());
             }
-            else if (item instanceof Revision_1.Revision) {
+            else if (item instanceof Revision_js_1.Revision) {
                 const revType = item.getType();
                 if (revType === 'runPropertiesChange' ||
                     revType === 'paragraphPropertiesChange' ||
@@ -1607,21 +1662,21 @@ class Paragraph {
                     paragraphChildren.push(revisionXml);
                 }
             }
-            else if (item instanceof RangeMarker_1.RangeMarker) {
+            else if (item instanceof RangeMarker_js_1.RangeMarker) {
                 paragraphChildren.push(item.toXML());
             }
-            else if (item instanceof Shape_1.Shape) {
-                paragraphChildren.push(XMLBuilder_1.XMLBuilder.w('r', undefined, [item.toXML()]));
+            else if (item instanceof Shape_js_1.Shape) {
+                paragraphChildren.push(XMLBuilder_js_1.XMLBuilder.w('r', undefined, [item.toXML()]));
             }
-            else if (item instanceof TextBox_1.TextBox) {
-                paragraphChildren.push(XMLBuilder_1.XMLBuilder.w('r', undefined, [item.toXML()]));
+            else if (item instanceof TextBox_js_1.TextBox) {
+                paragraphChildren.push(XMLBuilder_js_1.XMLBuilder.w('r', undefined, [item.toXML()]));
             }
             else if (item) {
                 paragraphChildren.push(item.toXML());
             }
         }
         if (this.content.length === 0) {
-            paragraphChildren.push(new Run_1.Run('').toXML());
+            paragraphChildren.push(new Run_js_1.Run('').toXML());
         }
         for (const comment of this.commentsEnd) {
             paragraphChildren.push(comment.toRangeEndXML());
@@ -1639,7 +1694,7 @@ class Paragraph {
         if (this.formatting.textId) {
             paragraphAttributes['w14:textId'] = this.formatting.textId;
         }
-        return XMLBuilder_1.XMLBuilder.w('p', Object.keys(paragraphAttributes).length > 0 ? paragraphAttributes : undefined, paragraphChildren);
+        return XMLBuilder_js_1.XMLBuilder.w('p', Object.keys(paragraphAttributes).length > 0 ? paragraphAttributes : undefined, paragraphChildren);
     }
     getWordCount() {
         const text = this.getText().trim();
@@ -1658,12 +1713,12 @@ class Paragraph {
         }
     }
     clone() {
-        const clonedFormatting = (0, deepClone_1.deepClone)(this.formatting);
+        const clonedFormatting = (0, deepClone_js_1.deepClone)(this.formatting);
         const clonedParagraph = new Paragraph(clonedFormatting);
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const runFormatting = item.getFormatting();
-                const clonedRun = new Run_1.Run(item.getText(), (0, deepClone_1.deepClone)(runFormatting));
+                const clonedRun = new Run_js_1.Run(item.getText(), (0, deepClone_js_1.deepClone)(runFormatting));
                 clonedParagraph.addRun(clonedRun);
             }
             else {
@@ -1741,7 +1796,7 @@ class Paragraph {
         return para;
     }
     splitAt(offset) {
-        const tailPara = new Paragraph((0, deepClone_1.deepClone)(this.formatting));
+        const tailPara = new Paragraph((0, deepClone_js_1.deepClone)(this.formatting));
         const totalLength = this.getText().length;
         if (offset >= totalLength) {
             return tailPara;
@@ -1755,7 +1810,7 @@ class Paragraph {
         let splitContentIndex = -1;
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const runLen = item.getText().length;
                 const runEnd = charPos + runLen;
                 if (runEnd <= offset) {
@@ -1821,7 +1876,7 @@ class Paragraph {
     removeRunAt(index) {
         if (index >= 0 && index < this.content.length) {
             const item = this.content[index];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 this.content.splice(index, 1);
                 return true;
             }
@@ -1831,7 +1886,7 @@ class Paragraph {
     replaceRunAt(index, run) {
         if (index >= 0 && index < this.content.length) {
             const item = this.content[index];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 this.content[index] = run;
                 return true;
             }
@@ -1845,7 +1900,7 @@ class Paragraph {
         const searchText = caseSensitive ? text : text.toLowerCase();
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const runText = caseSensitive ? item.getText() : item.getText().toLowerCase();
                 if (wholeWord) {
                     const wordPattern = new RegExp(`\\b${searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
@@ -1867,7 +1922,7 @@ class Paragraph {
         const caseSensitive = options?.caseSensitive || false;
         const wholeWord = options?.wholeWord || false;
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const originalText = item.getText();
                 let newText = originalText;
                 if (wholeWord) {
@@ -1900,7 +1955,7 @@ class Paragraph {
         const caseSensitive = options?.caseSensitive ?? false;
         let fullText = '';
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 fullText += item.getText();
             }
         }
@@ -1921,7 +1976,7 @@ class Paragraph {
         let charPos = 0;
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const len = item.getText().length;
                 if (len > 0) {
                     runMap.push({ run: item, contentIndex: i, start: charPos, end: charPos + len });
@@ -1972,7 +2027,7 @@ class Paragraph {
         let charPos = 0;
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 const len = item.getText().length;
                 if (len > 0) {
                     runMap.push({ index: i, start: charPos, end: charPos + len });
@@ -2014,11 +2069,11 @@ class Paragraph {
     }
     wrap(prefix, suffix, formatting) {
         if (prefix) {
-            const prefixRun = new Run_1.Run(prefix, formatting);
+            const prefixRun = new Run_js_1.Run(prefix, formatting);
             this.content.unshift(prefixRun);
         }
         if (suffix) {
-            const suffixRun = new Run_1.Run(suffix, formatting);
+            const suffixRun = new Run_js_1.Run(suffix, formatting);
             this.content.push(suffixRun);
         }
         return this;
@@ -2028,7 +2083,7 @@ class Paragraph {
             return undefined;
         let charPos = 0;
         for (const item of this.content) {
-            if (!(item instanceof Run_1.Run))
+            if (!(item instanceof Run_js_1.Run))
                 continue;
             const len = item.getText().length;
             if (charPos + len > offset) {
@@ -2050,7 +2105,7 @@ class Paragraph {
         for (let i = 0; i < this.content.length; i++) {
             const item = this.content[i];
             let len = 0;
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 len = item.getText().length;
             }
             if (len > 0) {
@@ -2126,15 +2181,15 @@ class Paragraph {
         const consolidated = [];
         let eliminated = 0;
         for (const item of this.content) {
-            if (!(item instanceof Run_1.Run)) {
+            if (!(item instanceof Run_js_1.Run)) {
                 consolidated.push(item);
                 continue;
             }
             const prev = consolidated.length > 0 ? consolidated[consolidated.length - 1] : undefined;
-            if (prev instanceof Run_1.Run &&
-                (0, formatting_1.isEqualFormatting)(prev.getFormatting(), item.getFormatting())) {
+            if (prev instanceof Run_js_1.Run &&
+                (0, formatting_js_1.isEqualFormatting)(prev.getFormatting(), item.getFormatting())) {
                 const mergedContent = [...prev.getContent(), ...item.getContent()];
-                const mergedRun = Run_1.Run.createFromContent(mergedContent, (0, deepClone_1.deepClone)(prev.getFormatting()));
+                const mergedRun = Run_js_1.Run.createFromContent(mergedContent, (0, deepClone_js_1.deepClone)(prev.getFormatting()));
                 consolidated[consolidated.length - 1] = mergedRun;
                 eliminated++;
             }
@@ -2149,7 +2204,7 @@ class Paragraph {
     }
     mergeWith(otherPara) {
         for (const item of otherPara.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 this.content.push(item.clone());
             }
             else {
@@ -2174,7 +2229,7 @@ class Paragraph {
                     }
                 }
                 const text = run.getText();
-                const newRun = new Run_1.Run(text, newFormatting);
+                const newRun = new Run_js_1.Run(text, newFormatting);
                 const index = this.content.indexOf(run);
                 if (index !== -1) {
                     this.content[index] = newRun;
@@ -2182,7 +2237,7 @@ class Paragraph {
             }
             else {
                 const text = run.getText();
-                const newRun = new Run_1.Run(text, {});
+                const newRun = new Run_js_1.Run(text, {});
                 const index = this.content.indexOf(run);
                 if (index !== -1) {
                     this.content[index] = newRun;
@@ -2226,7 +2281,7 @@ class Paragraph {
                 propKey === 'numbering') {
                 const paraValue = this.formatting[propKey];
                 const styleValue = styleParagraphFormatting[propKey];
-                if (JSON.stringify(paraValue) !== JSON.stringify(styleValue)) {
+                if (!(0, deepEqual_js_1.deepEqual)(paraValue, styleValue)) {
                     conflictingParaProps.push(propKey);
                 }
             }
@@ -2240,7 +2295,7 @@ class Paragraph {
             delete this.formatting[prop];
         }
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 item.clearFormattingConflicts(styleRunFormatting);
             }
         }
@@ -2255,7 +2310,7 @@ class Paragraph {
         if (numbering)
             this.formatting.numbering = numbering;
         for (const item of this.content) {
-            if (item instanceof Run_1.Run) {
+            if (item instanceof Run_js_1.Run) {
                 item.clearFormatting();
             }
         }