docxmlater 10.3.6 → 10.4.1

package/dist/core/DocumentParser.js

@@ -57,6 +57,7 @@ const Table_1 = require("../elements/Table");
 const TableCell_1 = require("../elements/TableCell");
 const TableOfContents_1 = require("../elements/TableOfContents");
 const TableOfContentsElement_1 = require("../elements/TableOfContentsElement");
+const TableGridChange_1 = require("../elements/TableGridChange");
 const TableRow_1 = require("../elements/TableRow");
 const AbstractNumbering_1 = require("../formatting/AbstractNumbering");
 const NumberingInstance_1 = require("../formatting/NumberingInstance");
@@ -587,6 +588,10 @@ class DocumentParser {
             if (paraId) {
                 paragraph.formatting.paraId = paraId;
             }
+            const textId = pElement['w14:textId'];
+            if (textId) {
+                paragraph.formatting.textId = textId;
+            }
             await this.parseOrderedParagraphChildren(paraXml, pElement, paragraph, relationshipManager, zipHandler, imageManager);
             const runs = paragraph.getRuns();
             const runData = runs.map((run) => ({
@@ -918,9 +923,50 @@ class DocumentParser {
                         hyperlinkObj['w:moveFrom'] ||
                         hyperlinkObj['w:moveTo'];
                     if (hasRevisionChildren) {
-                        const rawXml = extractElementXmlAtPosition(child.pos, 'w:hyperlink');
-                        if (rawXml) {
-                            paragraph.addContent(new PreservedElement_1.PreservedElement(rawXml, 'w:hyperlink', 'inline'));
+                        const flattenedObj = { ...hyperlinkObj };
+                        const allRuns = [];
+                        if (flattenedObj['w:r']) {
+                            const directRuns = Array.isArray(flattenedObj['w:r'])
+                                ? flattenedObj['w:r']
+                                : [flattenedObj['w:r']];
+                            allRuns.push(...directRuns);
+                        }
+                        if (flattenedObj['w:ins']) {
+                            const insArr = Array.isArray(flattenedObj['w:ins'])
+                                ? flattenedObj['w:ins']
+                                : [flattenedObj['w:ins']];
+                            for (const ins of insArr) {
+                                if (ins['w:r']) {
+                                    const insRuns = Array.isArray(ins['w:r']) ? ins['w:r'] : [ins['w:r']];
+                                    allRuns.push(...insRuns);
+                                }
+                            }
+                        }
+                        if (flattenedObj['w:moveTo']) {
+                            const moveToArr = Array.isArray(flattenedObj['w:moveTo'])
+                                ? flattenedObj['w:moveTo']
+                                : [flattenedObj['w:moveTo']];
+                            for (const mt of moveToArr) {
+                                if (mt['w:r']) {
+                                    const mtRuns = Array.isArray(mt['w:r']) ? mt['w:r'] : [mt['w:r']];
+                                    allRuns.push(...mtRuns);
+                                }
+                            }
+                        }
+                        flattenedObj['w:r'] = allRuns.length > 0 ? allRuns : undefined;
+                        delete flattenedObj['w:del'];
+                        delete flattenedObj['w:ins'];
+                        delete flattenedObj['w:moveFrom'];
+                        delete flattenedObj['w:moveTo'];
+                        const result = this.parseHyperlinkFromObject(flattenedObj, relationshipManager);
+                        if (result.hyperlink) {
+                            paragraph.addHyperlink(result.hyperlink);
+                        }
+                        for (const bookmark of result.bookmarkStarts) {
+                            paragraph.addBookmarkStart(bookmark);
+                        }
+                        for (const bookmark of result.bookmarkEnds) {
+                            paragraph.addBookmarkEnd(bookmark);
                         }
                     }
                     else {
@@ -1286,10 +1332,14 @@ class DocumentParser {
                 return null;
             }
             const id = parseInt(idAttr, 10);
+            const colFirstAttr = XMLParser_1.XMLParser.extractAttribute(bookmarkXml, 'w:colFirst');
+            const colLastAttr = XMLParser_1.XMLParser.extractAttribute(bookmarkXml, 'w:colLast');
             const bookmark = new Bookmark_1.Bookmark({
                 name: nameAttr,
                 id: id,
                 skipNormalization: true,
+                colFirst: colFirstAttr ? parseInt(colFirstAttr, 10) : undefined,
+                colLast: colLastAttr ? parseInt(colLastAttr, 10) : undefined,
             });
             if (this.bookmarkManager) {
                 try {
@@ -1335,6 +1385,10 @@ class DocumentParser {
             if (paraId) {
                 paragraph.formatting.paraId = paraId;
             }
+            const textId = paraObj['w14:textId'];
+            if (textId) {
+                paragraph.formatting.textId = textId;
+            }
             this.parseParagraphPropertiesFromObject(paraObj['w:pPr'], paragraph);
             const orderedChildren = paraObj._orderedChildren;
             if (orderedChildren && orderedChildren.length > 0) {
@@ -1493,10 +1547,12 @@ class DocumentParser {
         }
         if (pPrObj['w:ind']) {
             const ind = pPrObj['w:ind'];
-            if ((0, parsingHelpers_1.isExplicitlySet)(ind['@_w:left']))
-                paragraph.setLeftIndent((0, parsingHelpers_1.safeParseInt)(ind['@_w:left']));
-            if ((0, parsingHelpers_1.isExplicitlySet)(ind['@_w:right']))
-                paragraph.setRightIndent((0, parsingHelpers_1.safeParseInt)(ind['@_w:right']));
+            const leftVal = ind['@_w:start'] ?? ind['@_w:left'];
+            const rightVal = ind['@_w:end'] ?? ind['@_w:right'];
+            if ((0, parsingHelpers_1.isExplicitlySet)(leftVal))
+                paragraph.setLeftIndent((0, parsingHelpers_1.safeParseInt)(leftVal));
+            if ((0, parsingHelpers_1.isExplicitlySet)(rightVal))
+                paragraph.setRightIndent((0, parsingHelpers_1.safeParseInt)(rightVal));
             if ((0, parsingHelpers_1.isExplicitlySet)(ind['@_w:firstLine']))
                 paragraph.setFirstLineIndent((0, parsingHelpers_1.safeParseInt)(ind['@_w:firstLine']));
             if ((0, parsingHelpers_1.isExplicitlySet)(ind['@_w:hanging']))
@@ -1511,15 +1567,33 @@ class DocumentParser {
             if ((0, parsingHelpers_1.isExplicitlySet)(spacing['@_w:line'])) {
                 paragraph.setLineSpacing((0, parsingHelpers_1.safeParseInt)(spacing['@_w:line']), spacing['@_w:lineRule']);
             }
+            if (!paragraph.formatting.spacing)
+                paragraph.formatting.spacing = {};
+            if ((0, parsingHelpers_1.isExplicitlySet)(spacing['@_w:beforeLines']))
+                paragraph.formatting.spacing.beforeLines = (0, parsingHelpers_1.safeParseInt)(spacing['@_w:beforeLines']);
+            if ((0, parsingHelpers_1.isExplicitlySet)(spacing['@_w:afterLines']))
+                paragraph.formatting.spacing.afterLines = (0, parsingHelpers_1.safeParseInt)(spacing['@_w:afterLines']);
+            const beforeAuto = spacing['@_w:beforeAutospacing'];
+            if (beforeAuto !== undefined)
+                paragraph.formatting.spacing.beforeAutospacing =
+                    String(beforeAuto) === '1' || String(beforeAuto) === 'true';
+            const afterAuto = spacing['@_w:afterAutospacing'];
+            if (afterAuto !== undefined)
+                paragraph.formatting.spacing.afterAutospacing =
+                    String(afterAuto) === '1' || String(afterAuto) === 'true';
+        }
+        if (pPrObj['w:pageBreakBefore'] !== undefined) {
+            paragraph.formatting.pageBreakBefore = (0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:pageBreakBefore']);
+        }
+        if (pPrObj['w:keepNext'] !== undefined) {
+            paragraph.setKeepNext((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:keepNext']));
+        }
+        if (pPrObj['w:keepLines'] !== undefined) {
+            paragraph.setKeepLines((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:keepLines']));
+        }
+        if (pPrObj['w:contextualSpacing'] !== undefined) {
+            paragraph.setContextualSpacing((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:contextualSpacing']));
         }
-        if (pPrObj['w:pageBreakBefore'])
-            paragraph.formatting.pageBreakBefore = true;
-        if (pPrObj['w:keepNext'])
-            paragraph.setKeepNext(true);
-        if (pPrObj['w:keepLines'])
-            paragraph.setKeepLines(true);
-        if (pPrObj['w:contextualSpacing'])
-            paragraph.setContextualSpacing(true);
         if (pPrObj['w:numPr']) {
             const numPrRaw = pPrObj['w:numPr'];
             const numPr = Array.isArray(numPrRaw) ? numPrRaw[0] : numPrRaw;
@@ -1619,8 +1693,8 @@ class DocumentParser {
                 paragraph.setOutlineLevel(level);
             }
         }
-        if (pPrObj['w:suppressLineNumbers']) {
-            paragraph.setSuppressLineNumbers(true);
+        if (pPrObj['w:suppressLineNumbers'] !== undefined) {
+            paragraph.setSuppressLineNumbers((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:suppressLineNumbers']));
         }
         if (pPrObj['w:bidi'] !== undefined) {
             const bidiVal = pPrObj['w:bidi']?.['@_w:val'];
@@ -1637,8 +1711,8 @@ class DocumentParser {
         if (pPrObj['w:textAlignment']?.['@_w:val']) {
             paragraph.setTextAlignment(pPrObj['w:textAlignment']['@_w:val']);
         }
-        if (pPrObj['w:mirrorIndents']) {
-            paragraph.setMirrorIndents(true);
+        if (pPrObj['w:mirrorIndents'] !== undefined) {
+            paragraph.setMirrorIndents((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:mirrorIndents']));
         }
         if (pPrObj['w:adjustRightInd'] !== undefined) {
             const adjustRightIndVal = pPrObj['w:adjustRightInd']?.['@_w:val'];
@@ -1692,8 +1766,8 @@ class DocumentParser {
                 paragraph.setFrameProperties(frameProps);
             }
         }
-        if (pPrObj['w:suppressAutoHyphens']) {
-            paragraph.setSuppressAutoHyphens(true);
+        if (pPrObj['w:suppressAutoHyphens'] !== undefined) {
+            paragraph.setSuppressAutoHyphens((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:suppressAutoHyphens']));
         }
         if (pPrObj['w:kinsoku']) {
             paragraph.setKinsoku((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:kinsoku']));
@@ -1713,8 +1787,8 @@ class DocumentParser {
         if (pPrObj['w:autoSpaceDN']) {
             paragraph.setAutoSpaceDN((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:autoSpaceDN']));
         }
-        if (pPrObj['w:suppressOverlap']) {
-            paragraph.setSuppressOverlap(true);
+        if (pPrObj['w:suppressOverlap'] !== undefined) {
+            paragraph.setSuppressOverlap((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj['w:suppressOverlap']));
         }
         if (pPrObj['w:textboxTightWrap']) {
             const wrapVal = pPrObj['w:textboxTightWrap']?.['@_w:val'];
@@ -1769,10 +1843,12 @@ class DocumentParser {
                 if (prevPPr['w:ind']) {
                     const ind = prevPPr['w:ind'];
                     previousProperties.indentation = {};
-                    if (ind['@_w:left'] !== undefined)
-                        previousProperties.indentation.left = parseInt(ind['@_w:left'], 10);
-                    if (ind['@_w:right'] !== undefined)
-                        previousProperties.indentation.right = parseInt(ind['@_w:right'], 10);
+                    const leftVal = ind['@_w:start'] ?? ind['@_w:left'];
+                    const rightVal = ind['@_w:end'] ?? ind['@_w:right'];
+                    if (leftVal !== undefined)
+                        previousProperties.indentation.left = parseInt(leftVal, 10);
+                    if (rightVal !== undefined)
+                        previousProperties.indentation.right = parseInt(rightVal, 10);
                     if (ind['@_w:firstLine'] !== undefined)
                         previousProperties.indentation.firstLine = parseInt(ind['@_w:firstLine'], 10);
                     if (ind['@_w:hanging'] !== undefined)
@@ -1792,6 +1868,18 @@ class DocumentParser {
                         previousProperties.spacing.line = parseInt(spacing['@_w:line'], 10);
                     if (spacing['@_w:lineRule'])
                         previousProperties.spacing.lineRule = String(spacing['@_w:lineRule']);
+                    if (spacing['@_w:beforeLines'] !== undefined)
+                        previousProperties.spacing.beforeLines = parseInt(spacing['@_w:beforeLines'], 10);
+                    if (spacing['@_w:afterLines'] !== undefined)
+                        previousProperties.spacing.afterLines = parseInt(spacing['@_w:afterLines'], 10);
+                    const beforeAuto = spacing['@_w:beforeAutospacing'];
+                    if (beforeAuto !== undefined)
+                        previousProperties.spacing.beforeAutospacing =
+                            String(beforeAuto) === '1' || String(beforeAuto) === 'true';
+                    const afterAuto = spacing['@_w:afterAutospacing'];
+                    if (afterAuto !== undefined)
+                        previousProperties.spacing.afterAutospacing =
+                            String(afterAuto) === '1' || String(afterAuto) === 'true';
                 }
                 if (prevPPr['w:keepNext']) {
                     previousProperties.keepNext = prevPPr['w:keepNext']['@_w:val'] !== '0';
@@ -2876,7 +2964,8 @@ class DocumentParser {
                             const brElements = toArray(runObj['w:br']);
                             const brElement = brElements[elementIndex] || brElements[0];
                             const breakType = brElement?.['@_w:type'];
-                            content.push({ type: 'break', breakType });
+                            const breakClear = brElement?.['@_w:clear'];
+                            content.push({ type: 'break', breakType, breakClear });
                             break;
                         }
                         case 'w:cr':
@@ -3044,7 +3133,8 @@ class DocumentParser {
                 if (runObj['w:br'] !== undefined) {
                     const brElement = runObj['w:br'];
                     const breakType = brElement?.['@_w:type'];
-                    content.push({ type: 'break', breakType });
+                    const breakClear = brElement?.['@_w:clear'];
+                    content.push({ type: 'break', breakType, breakClear });
                 }
                 if (runObj['w:cr'] !== undefined) {
                     content.push({ type: 'carriageReturn' });
@@ -3239,14 +3329,8 @@ class DocumentParser {
                     }
                 }
             }
-            let finalAnchor = anchor;
-            let finalRelationshipId = relationshipId;
-            if (url && anchor) {
-                url = url + '#' + anchor;
-                finalAnchor = undefined;
-                finalRelationshipId = undefined;
-                logger_1.defaultLogger.debug(`[DocumentParser] Combined external URL with anchor fragment: ${url}`);
-            }
+            const finalAnchor = anchor;
+            const finalRelationshipId = relationshipId;
             if (!url && !finalAnchor && !finalRelationshipId) {
                 logger_1.defaultLogger.debug(`[DocumentParser] Skipping hyperlink with no URL, anchor, or relationship ID. Text: "${text}"`);
                 return result;
@@ -3464,41 +3548,42 @@ class DocumentParser {
             if (val)
                 run.setEmphasis(val);
         }
-        if (rPrObj['w:outline'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:outline']))
             run.setOutline(true);
-        if (rPrObj['w:shadow'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:shadow']))
             run.setShadow(true);
-        if (rPrObj['w:emboss'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:emboss']))
             run.setEmboss(true);
-        if (rPrObj['w:imprint'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:imprint']))
             run.setImprint(true);
-        if (rPrObj['w:noProof'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:noProof']))
             run.setNoProof(true);
-        if (rPrObj['w:snapToGrid'])
-            run.setSnapToGrid(true);
-        if (rPrObj['w:vanish'])
+        if (rPrObj['w:snapToGrid'] !== undefined) {
+            run.setSnapToGrid((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:snapToGrid']));
+        }
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:vanish']))
             run.setVanish(true);
-        if (rPrObj['w:specVanish'])
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:specVanish']))
             run.setSpecVanish(true);
         if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:rtl']))
             run.setRTL(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:b']))
-            run.setBold(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:bCs']))
-            run.setComplexScriptBold(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:i']))
-            run.setItalic(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:iCs']))
-            run.setComplexScriptItalic(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:strike']))
-            run.setStrike(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:dstrike'])) {
-            run.formatting.dstrike = true;
-        }
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:smallCaps']))
-            run.setSmallCaps(true);
-        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:caps']))
-            run.setAllCaps(true);
+        if (rPrObj['w:b'] !== undefined)
+            run.setBold((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:b']));
+        if (rPrObj['w:bCs'] !== undefined)
+            run.setComplexScriptBold((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:bCs']));
+        if (rPrObj['w:i'] !== undefined)
+            run.setItalic((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:i']));
+        if (rPrObj['w:iCs'] !== undefined)
+            run.setComplexScriptItalic((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:iCs']));
+        if (rPrObj['w:strike'] !== undefined)
+            run.setStrike((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:strike']));
+        if (rPrObj['w:dstrike'] !== undefined) {
+            run.formatting.dstrike = (0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:dstrike']);
+        }
+        if (rPrObj['w:smallCaps'] !== undefined)
+            run.setSmallCaps((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:smallCaps']));
+        if (rPrObj['w:caps'] !== undefined)
+            run.setAllCaps((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:caps']));
         if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:cs']))
             run.setComplexScript(true);
         if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj['w:webHidden']))
@@ -3536,9 +3621,20 @@ class DocumentParser {
                 run.setKerning(parseInt(val, 10));
         }
         if (rPrObj['w:lang']) {
-            const val = rPrObj['w:lang']['@_w:val'];
-            if (val)
-                run.setLanguage(val);
+            const langObj = rPrObj['w:lang'];
+            const val = langObj['@_w:val'];
+            const eastAsia = langObj['@_w:eastAsia'];
+            const bidi = langObj['@_w:bidi'];
+            if (eastAsia || bidi) {
+                run.setLanguage({
+                    val: val ? String(val) : undefined,
+                    eastAsia: eastAsia ? String(eastAsia) : undefined,
+                    bidi: bidi ? String(bidi) : undefined,
+                });
+            }
+            else if (val) {
+                run.setLanguage(String(val));
+            }
         }
         if (rPrObj['w:eastAsianLayout']) {
             const layoutObj = rPrObj['w:eastAsianLayout'];
@@ -3571,8 +3667,10 @@ class DocumentParser {
             const val = rPrObj['w:vertAlign']['@_w:val'];
             if (val === 'subscript')
                 run.setSubscript(true);
-            if (val === 'superscript')
+            else if (val === 'superscript')
                 run.setSuperscript(true);
+            else if (val === 'baseline')
+                run.formatting.vertAlignBaseline = true;
         }
         if (rPrObj['w:rFonts']) {
             const rFonts = rPrObj['w:rFonts'];
@@ -3610,8 +3708,13 @@ class DocumentParser {
         if (rPrObj['w:color']) {
             const colorObj = rPrObj['w:color'];
             const colorVal = colorObj['@_w:val'];
-            if (colorVal && colorVal !== 'auto') {
-                run.setColor(colorVal);
+            if (colorVal) {
+                if (colorVal === 'auto') {
+                    run.formatting.color = 'auto';
+                }
+                else {
+                    run.setColor(colorVal);
+                }
             }
             if (colorObj['@_w:themeColor']) {
                 run.setThemeColor(colorObj['@_w:themeColor']);
@@ -3683,7 +3786,7 @@ class DocumentParser {
                 if (prevRPr['w:color']) {
                     const colorObj = prevRPr['w:color'];
                     const colorVal = colorObj['@_w:val'];
-                    if (colorVal && colorVal !== 'auto') {
+                    if (colorVal) {
                         prevProps.color = colorVal;
                     }
                     if (colorObj['@_w:themeColor']) {
@@ -3703,8 +3806,10 @@ class DocumentParser {
                     const val = prevRPr['w:vertAlign']['@_w:val'];
                     if (val === 'subscript')
                         prevProps.subscript = true;
-                    if (val === 'superscript')
+                    else if (val === 'superscript')
                         prevProps.superscript = true;
+                    else if (val === 'baseline')
+                        prevProps.vertAlignBaseline = true;
                 }
                 if (prevRPr['w:smallCaps']) {
                     prevProps.smallCaps = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr['w:smallCaps']);
@@ -3779,8 +3884,18 @@ class DocumentParser {
                     }
                 }
                 if (prevRPr['w:lang']) {
-                    const langVal = prevRPr['w:lang']['@_w:val'];
-                    if (langVal) {
+                    const langObj = prevRPr['w:lang'];
+                    const langVal = langObj['@_w:val'];
+                    const langEastAsia = langObj['@_w:eastAsia'];
+                    const langBidi = langObj['@_w:bidi'];
+                    if (langEastAsia || langBidi) {
+                        prevProps.language = {
+                            val: langVal ? String(langVal) : undefined,
+                            eastAsia: langEastAsia ? String(langEastAsia) : undefined,
+                            bidi: langBidi ? String(langBidi) : undefined,
+                        };
+                    }
+                    else if (langVal) {
                         prevProps.language = String(langVal);
                     }
                 }
@@ -4481,6 +4596,18 @@ class DocumentParser {
                     table.setTableGrid(widths);
                 }
             }
+            if (tableObj['w:tblGrid']?.['w:tblGridChange']) {
+                const changeObj = tableObj['w:tblGrid']['w:tblGridChange'];
+                const prevGridCols = changeObj['w:tblGrid']?.['w:gridCol'];
+                if (prevGridCols) {
+                    const prevArray = Array.isArray(prevGridCols) ? prevGridCols : [prevGridCols];
+                    const prevWidths = prevArray.map((col) => ({
+                        width: (0, parsingHelpers_1.isExplicitlySet)(col['@_w:w']) ? (0, parsingHelpers_1.safeParseInt)(col['@_w:w'], 2880) : 2880,
+                    }));
+                    const gridChange = TableGridChange_1.TableGridChange.create((0, parsingHelpers_1.safeParseInt)(changeObj['@_w:id'], 0), prevWidths, changeObj['@_w:author'] || undefined, changeObj['@_w:date'] ? new Date(changeObj['@_w:date']) : undefined);
+                    table.setTblGridChange(gridChange);
+                }
+            }
             const rows = tableObj['w:tr'];
             const rowChildren = Array.isArray(rows) ? rows : rows ? [rows] : [];
             let rowXmls = [];
@@ -4637,6 +4764,10 @@ class DocumentParser {
         if (tblPrObj['w:tblInd']) {
             const indentVal = (0, parsingHelpers_1.safeParseInt)(tblPrObj['w:tblInd']['@_w:w'], 0);
             table.setIndent(indentVal);
+            const indentType = tblPrObj['w:tblInd']['@_w:type'];
+            if (indentType) {
+                table.setIndentType(indentType);
+            }
         }
         if (tblPrObj['w:tblCellMar']) {
             const cellMar = tblPrObj['w:tblCellMar'];
@@ -4651,13 +4782,15 @@ class DocumentParser {
                 if (w !== undefined)
                     margins.bottom = parseInt(w, 10);
             }
-            if (cellMar['w:left']) {
-                const w = cellMar['w:left']['@_w:w'];
+            const leftSource = cellMar['w:start'] || cellMar['w:left'];
+            if (leftSource) {
+                const w = leftSource['@_w:w'];
                 if (w !== undefined)
                     margins.left = parseInt(w, 10);
             }
-            if (cellMar['w:right']) {
-                const w = cellMar['w:right']['@_w:w'];
+            const rightSource = cellMar['w:end'] || cellMar['w:right'];
+            if (rightSource) {
+                const w = rightSource['@_w:w'];
                 if (w !== undefined)
                     margins.right = parseInt(w, 10);
             }
@@ -4760,9 +4893,15 @@ class DocumentParser {
             return;
         if (trPrObj['w:trHeight']) {
             const heightVal = parseInt(trPrObj['w:trHeight']['@_w:val'] || '0', 10);
-            const heightRule = trPrObj['w:trHeight']['@_w:hRule'] || 'atLeast';
+            const heightRule = trPrObj['w:trHeight']['@_w:hRule'];
             if (heightVal > 0) {
-                row.setHeight(heightVal, heightRule);
+                row.setHeight(heightVal);
+                if (heightRule) {
+                    row.setHeightRule(heightRule);
+                }
+                else {
+                    row.setHeightRule(undefined);
+                }
             }
         }
         if (trPrObj['w:tblHeader']) {
@@ -4948,11 +5087,13 @@ class DocumentParser {
                     if (tcMar['w:bottom']) {
                         margins.bottom = parseInt(tcMar['w:bottom']['@_w:w'] || '0', 10);
                     }
-                    if (tcMar['w:left']) {
-                        margins.left = parseInt(tcMar['w:left']['@_w:w'] || '0', 10);
+                    const leftSrc = tcMar['w:start'] || tcMar['w:left'];
+                    if (leftSrc) {
+                        margins.left = parseInt(leftSrc['@_w:w'] || '0', 10);
                     }
-                    if (tcMar['w:right']) {
-                        margins.right = parseInt(tcMar['w:right']['@_w:w'] || '0', 10);
+                    const rightSrc = tcMar['w:end'] || tcMar['w:right'];
+                    if (rightSrc) {
+                        margins.right = parseInt(rightSrc['@_w:w'] || '0', 10);
                     }
                     if (Object.keys(margins).length > 0) {
                         cell.setMargins(margins);
@@ -5584,7 +5725,7 @@ class DocumentParser {
         logger_1.defaultLogger.debug(`[TOC Parser] Normalized field instruction from "${instruction}" to "${normalized}"`);
         return normalized;
     }
-    parseTOCFromSDTContent(content, properties, sdtContent) {
+    parseTOCFromSDTContent(content, _properties, sdtContent) {
         try {
             let title;
             let fieldInstruction;
@@ -5966,11 +6107,13 @@ class DocumentParser {
                     const width = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:w');
                     const height = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:h');
                     const orient = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:orient');
+                    const code = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:code');
                     if (width && height) {
                         sectionProps.pageSize = {
                             width: parseInt(width, 10),
                             height: parseInt(height, 10),
                             orientation: orient === 'landscape' ? 'landscape' : 'portrait',
+                            code: code ? parseInt(code, 10) : undefined,
                         };
                     }
                 }
@@ -6067,11 +6210,21 @@ class DocumentParser {
                     const sep = XMLParser_1.XMLParser.extractAttribute(cols, 'w:sep');
                     const colElements = XMLParser_1.XMLParser.extractElements(cols, 'w:col');
                     const columnWidths = [];
+                    const columnSpaces = [];
+                    let hasColumnSpaces = false;
                     for (const col of colElements) {
                         const width = XMLParser_1.XMLParser.extractAttribute(col, 'w:w');
                         if (width) {
                             columnWidths.push(parseInt(width.toString(), 10));
                         }
+                        const colSpace = XMLParser_1.XMLParser.extractAttribute(col, 'w:space');
+                        if (colSpace) {
+                            columnSpaces.push(parseInt(colSpace.toString(), 10));
+                            hasColumnSpaces = true;
+                        }
+                        else {
+                            columnSpaces.push(0);
+                        }
                     }
                     const toBool = (val) => val === '1' || val === 1 || val === 'true' || val === true;
                     if (num) {
@@ -6081,6 +6234,7 @@ class DocumentParser {
                             equalWidth: equalWidth ? toBool(equalWidth) : undefined,
                             separator: sep ? toBool(sep) : undefined,
                             columnWidths: columnWidths.length > 0 ? columnWidths : undefined,
+                            columnSpaces: hasColumnSpaces ? columnSpaces : undefined,
                         };
                     }
                 }
@@ -6445,10 +6599,15 @@ class DocumentParser {
         }
         const spacingElement = XMLParser_1.XMLParser.extractSelfClosingTag(pPrXml, 'w:spacing');
         if (spacingElement) {
-            const before = XMLParser_1.XMLParser.extractAttribute(`<w:spacing${spacingElement}`, 'w:before');
-            const after = XMLParser_1.XMLParser.extractAttribute(`<w:spacing${spacingElement}`, 'w:after');
-            const line = XMLParser_1.XMLParser.extractAttribute(`<w:spacing${spacingElement}`, 'w:line');
-            const lineRule = XMLParser_1.XMLParser.extractAttribute(`<w:spacing${spacingElement}`, 'w:lineRule');
+            const spacingTag = `<w:spacing${spacingElement}`;
+            const before = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:before');
+            const after = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:after');
+            const line = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:line');
+            const lineRule = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:lineRule');
+            const beforeLines = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:beforeLines');
+            const afterLines = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:afterLines');
+            const beforeAutosp = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:beforeAutospacing');
+            const afterAutosp = XMLParser_1.XMLParser.extractAttribute(spacingTag, 'w:afterAutospacing');
             let validatedLineRule;
             if (lineRule) {
                 const validLineRules = ['auto', 'exact', 'atLeast'];
@@ -6461,17 +6620,28 @@ class DocumentParser {
                 after: after ? parseInt(after, 10) : undefined,
                 line: line ? parseInt(line, 10) : validatedLineRule ? 240 : undefined,
                 lineRule: validatedLineRule,
+                beforeLines: beforeLines ? parseInt(beforeLines, 10) : undefined,
+                afterLines: afterLines ? parseInt(afterLines, 10) : undefined,
+                beforeAutospacing: beforeAutosp
+                    ? beforeAutosp === '1' || beforeAutosp === 'true'
+                    : undefined,
+                afterAutospacing: afterAutosp ? afterAutosp === '1' || afterAutosp === 'true' : undefined,
             };
         }
         const indElement = XMLParser_1.XMLParser.extractSelfClosingTag(pPrXml, 'w:ind');
         if (indElement) {
-            const left = XMLParser_1.XMLParser.extractAttribute(`<w:ind${indElement}`, 'w:left');
-            const right = XMLParser_1.XMLParser.extractAttribute(`<w:ind${indElement}`, 'w:right');
-            const firstLine = XMLParser_1.XMLParser.extractAttribute(`<w:ind${indElement}`, 'w:firstLine');
-            const hanging = XMLParser_1.XMLParser.extractAttribute(`<w:ind${indElement}`, 'w:hanging');
+            const indTag = `<w:ind${indElement}`;
+            const start = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:start');
+            const left = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:left');
+            const end = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:end');
+            const right = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:right');
+            const firstLine = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:firstLine');
+            const hanging = XMLParser_1.XMLParser.extractAttribute(indTag, 'w:hanging');
+            const leftVal = start || left;
+            const rightVal = end || right;
             formatting.indentation = {
-                left: left ? parseInt(left, 10) : undefined,
-                right: right ? parseInt(right, 10) : undefined,
+                left: leftVal ? parseInt(leftVal, 10) : undefined,
+                right: rightVal ? parseInt(rightVal, 10) : undefined,
                 firstLine: firstLine ? parseInt(firstLine, 10) : undefined,
                 hanging: hanging ? parseInt(hanging, 10) : undefined,
             };
@@ -6498,6 +6668,58 @@ class DocumentParser {
                 }
             }
         }
+        const pBdrXml = XMLParser_1.XMLParser.extractBetweenTags(pPrXml, '<w:pBdr>', '</w:pBdr>');
+        if (pBdrXml) {
+            const borders = {};
+            const borderTypes = ['top', 'left', 'bottom', 'right', 'between', 'bar'];
+            for (const type of borderTypes) {
+                if (pBdrXml.includes(`<w:${type}`)) {
+                    const tag = XMLParser_1.XMLParser.extractSelfClosingTag(pBdrXml, `w:${type}`);
+                    if (tag) {
+                        const bTag = `<w:${type}${tag}`;
+                        const style = XMLParser_1.XMLParser.extractAttribute(bTag, 'w:val');
+                        const size = XMLParser_1.XMLParser.extractAttribute(bTag, 'w:sz');
+                        const space = XMLParser_1.XMLParser.extractAttribute(bTag, 'w:space');
+                        const color = XMLParser_1.XMLParser.extractAttribute(bTag, 'w:color');
+                        const border = {};
+                        if (style)
+                            border.style = style;
+                        if (size)
+                            border.size = parseInt(size, 10);
+                        if (space)
+                            border.space = parseInt(space, 10);
+                        if (color)
+                            border.color = color;
+                        if (Object.keys(border).length > 0)
+                            borders[type] = border;
+                    }
+                }
+            }
+            if (Object.keys(borders).length > 0)
+                formatting.borders = borders;
+        }
+        const tabsXml = XMLParser_1.XMLParser.extractBetweenTags(pPrXml, '<w:tabs>', '</w:tabs>');
+        if (tabsXml) {
+            const tabs = [];
+            const tabRegex = /<w:tab\s[^>]*\/>/g;
+            let tabMatch;
+            while ((tabMatch = tabRegex.exec(tabsXml)) !== null) {
+                const tabTag = tabMatch[0];
+                const pos = XMLParser_1.XMLParser.extractAttribute(tabTag, 'w:pos');
+                const val = XMLParser_1.XMLParser.extractAttribute(tabTag, 'w:val');
+                const leader = XMLParser_1.XMLParser.extractAttribute(tabTag, 'w:leader');
+                if (pos) {
+                    const tab = { position: parseInt(pos, 10) };
+                    if (val)
+                        tab.val = val;
+                    if (leader)
+                        tab.leader = leader;
+                    tabs.push(tab);
+                }
+            }
+            if (tabs.length > 0)
+                formatting.tabs = tabs;
+        }
         const shading = this.parseShadingFromXml(pPrXml);
         if (shading) {
             formatting.shading = shading;
@@ -6523,7 +6745,8 @@ class DocumentParser {
         }
         const uElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:u');
         if (uElement) {
-            const uVal = XMLParser_1.XMLParser.extractAttribute(`<w:u${uElement}`, 'w:val');
+            const uTag = `<w:u${uElement}`;
+            const uVal = XMLParser_1.XMLParser.extractAttribute(uTag, 'w:val');
             if (uVal === 'single' ||
                 uVal === 'double' ||
                 uVal === 'thick' ||
@@ -6535,6 +6758,19 @@ class DocumentParser {
             else {
                 formatting.underline = true;
             }
+            const uColor = XMLParser_1.XMLParser.extractAttribute(uTag, 'w:color');
+            if (uColor)
+                formatting.underlineColor = uColor;
+            const uThemeColor = XMLParser_1.XMLParser.extractAttribute(uTag, 'w:themeColor');
+            if (uThemeColor) {
+                formatting.underlineThemeColor = uThemeColor;
+            }
+            const uThemeTint = XMLParser_1.XMLParser.extractAttribute(uTag, 'w:themeTint');
+            if (uThemeTint)
+                formatting.underlineThemeTint = parseInt(uThemeTint, 16);
+            const uThemeShade = XMLParser_1.XMLParser.extractAttribute(uTag, 'w:themeShade');
+            if (uThemeShade)
+                formatting.underlineThemeShade = parseInt(uThemeShade, 16);
         }
         const vertAlignElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:vertAlign');
         if (vertAlignElement) {
@@ -6545,13 +6781,40 @@ class DocumentParser {
             else if (val === 'superscript') {
                 formatting.superscript = true;
             }
+            else if (val === 'baseline') {
+                formatting.vertAlignBaseline = true;
+            }
         }
         const rFontsElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:rFonts');
         if (rFontsElement) {
-            const ascii = XMLParser_1.XMLParser.extractAttribute(`<w:rFonts${rFontsElement}`, 'w:ascii');
-            if (ascii) {
+            const rFontsTag = `<w:rFonts${rFontsElement}`;
+            const ascii = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:ascii');
+            if (ascii)
                 formatting.font = ascii;
-            }
+            const hAnsi = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:hAnsi');
+            if (hAnsi)
+                formatting.fontHAnsi = hAnsi;
+            const eastAsia = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:eastAsia');
+            if (eastAsia)
+                formatting.fontEastAsia = eastAsia;
+            const cs = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:cs');
+            if (cs)
+                formatting.fontCs = cs;
+            const hint = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:hint');
+            if (hint)
+                formatting.fontHint = hint;
+            const asciiTheme = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:asciiTheme');
+            if (asciiTheme)
+                formatting.fontAsciiTheme = asciiTheme;
+            const hAnsiTheme = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:hAnsiTheme');
+            if (hAnsiTheme)
+                formatting.fontHAnsiTheme = hAnsiTheme;
+            const eastAsiaTheme = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:eastAsiaTheme');
+            if (eastAsiaTheme)
+                formatting.fontEastAsiaTheme = eastAsiaTheme;
+            const cstheme = XMLParser_1.XMLParser.extractAttribute(rFontsTag, 'w:cstheme');
+            if (cstheme)
+                formatting.fontCsTheme = cstheme;
         }
         const szElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:sz');
         if (szElement) {
@@ -6560,12 +6823,35 @@ class DocumentParser {
                 formatting.size = (0, units_1.halfPointsToPoints)(parseInt(val, 10));
             }
         }
+        const szCsElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:szCs');
+        if (szCsElement) {
+            const val = XMLParser_1.XMLParser.extractAttribute(`<w:szCs${szCsElement}`, 'w:val');
+            if (val) {
+                const szCsVal = (0, units_1.halfPointsToPoints)(parseInt(val, 10));
+                if (formatting.size === undefined || szCsVal !== formatting.size) {
+                    formatting.sizeCs = szCsVal;
+                }
+            }
+        }
         const colorElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:color');
         if (colorElement) {
-            const val = XMLParser_1.XMLParser.extractAttribute(`<w:color${colorElement}`, 'w:val');
+            const colorTag = `<w:color${colorElement}`;
+            const val = XMLParser_1.XMLParser.extractAttribute(colorTag, 'w:val');
             if (val && val !== 'auto') {
                 formatting.color = val;
             }
+            const themeColor = XMLParser_1.XMLParser.extractAttribute(colorTag, 'w:themeColor');
+            if (themeColor) {
+                formatting.themeColor = themeColor;
+            }
+            const themeTint = XMLParser_1.XMLParser.extractAttribute(colorTag, 'w:themeTint');
+            if (themeTint) {
+                formatting.themeTint = parseInt(themeTint, 16);
+            }
+            const themeShade = XMLParser_1.XMLParser.extractAttribute(colorTag, 'w:themeShade');
+            if (themeShade) {
+                formatting.themeShade = parseInt(themeShade, 16);
+            }
         }
         const highlightElement = XMLParser_1.XMLParser.extractSelfClosingTag(rPrXml, 'w:highlight');
         if (highlightElement) {
@@ -6588,6 +6874,7 @@ class DocumentParser {
                     'lightGray',
                     'black',
                     'white',
+                    'none',
                 ];
                 if (validHighlights.includes(val)) {
                     formatting.highlight = val;
@@ -6640,10 +6927,15 @@ class DocumentParser {
         if (tblPrXml.includes('<w:tblInd')) {
             const tag = XMLParser_1.XMLParser.extractSelfClosingTag(tblPrXml, 'w:tblInd');
             if (tag) {
-                const w = XMLParser_1.XMLParser.extractAttribute(`<w:tblInd${tag}`, 'w:w');
+                const tblIndTag = `<w:tblInd${tag}`;
+                const w = XMLParser_1.XMLParser.extractAttribute(tblIndTag, 'w:w');
                 if (w) {
                     formatting.indent = parseInt(w, 10);
                 }
+                const type = XMLParser_1.XMLParser.extractAttribute(tblIndTag, 'w:type');
+                if (type) {
+                    formatting.indentType = type;
+                }
             }
         }
         if (tblPrXml.includes('<w:jc')) {
@@ -6879,8 +7171,7 @@ class DocumentParser {
     }
     parseCellMarginsFromXml(marginXml) {
         const margins = {};
-        const marginTypes = ['top', 'bottom', 'left', 'right'];
-        for (const type of marginTypes) {
+        for (const type of ['top', 'bottom']) {
             if (marginXml.includes(`<w:${type}`)) {
                 const tag = XMLParser_1.XMLParser.extractSelfClosingTag(marginXml, `w:${type}`);
                 if (tag) {
@@ -6891,6 +7182,26 @@ class DocumentParser {
                 }
             }
         }
+        const leftTag = marginXml.includes('<w:start')
+            ? XMLParser_1.XMLParser.extractSelfClosingTag(marginXml, 'w:start')
+            : XMLParser_1.XMLParser.extractSelfClosingTag(marginXml, 'w:left');
+        if (leftTag) {
+            const tagName = marginXml.includes('<w:start') ? 'w:start' : 'w:left';
+            const w = XMLParser_1.XMLParser.extractAttribute(`<${tagName}${leftTag}`, 'w:w');
+            if (w) {
+                margins.left = parseInt(w, 10);
+            }
+        }
+        const rightTag = marginXml.includes('<w:end')
+            ? XMLParser_1.XMLParser.extractSelfClosingTag(marginXml, 'w:end')
+            : XMLParser_1.XMLParser.extractSelfClosingTag(marginXml, 'w:right');
+        if (rightTag) {
+            const tagName = marginXml.includes('<w:end') ? 'w:end' : 'w:right';
+            const w = XMLParser_1.XMLParser.extractAttribute(`<${tagName}${rightTag}`, 'w:w');
+            if (w) {
+                margins.right = parseInt(w, 10);
+            }
+        }
         return Object.keys(margins).length > 0 ? margins : undefined;
     }
     static getRawXml(zipHandler, partName) {
@@ -7162,6 +7473,40 @@ class DocumentParser {
         if (propsObj['w:tblStyle']) {
             result.style = propsObj['w:tblStyle']['@_w:val'] || '';
         }
+        if (propsObj['w:tblpPr']) {
+            const tblpPr = propsObj['w:tblpPr'];
+            const pos = {};
+            if (tblpPr['@_w:tblpX'])
+                pos.x = parseInt(tblpPr['@_w:tblpX'], 10);
+            if (tblpPr['@_w:tblpY'])
+                pos.y = parseInt(tblpPr['@_w:tblpY'], 10);
+            if (tblpPr['@_w:horzAnchor'])
+                pos.horizontalAnchor = tblpPr['@_w:horzAnchor'];
+            if (tblpPr['@_w:vertAnchor'])
+                pos.verticalAnchor = tblpPr['@_w:vertAnchor'];
+            if (tblpPr['@_w:leftFromText'])
+                pos.leftFromText = parseInt(tblpPr['@_w:leftFromText'], 10);
+            if (tblpPr['@_w:rightFromText'])
+                pos.rightFromText = parseInt(tblpPr['@_w:rightFromText'], 10);
+            if (tblpPr['@_w:topFromText'])
+                pos.topFromText = parseInt(tblpPr['@_w:topFromText'], 10);
+            if (tblpPr['@_w:bottomFromText'])
+                pos.bottomFromText = parseInt(tblpPr['@_w:bottomFromText'], 10);
+            if (Object.keys(pos).length > 0)
+                result.position = pos;
+        }
+        if (propsObj['w:tblOverlap']) {
+            result.overlap = propsObj['w:tblOverlap']['@_w:val'];
+        }
+        if (propsObj['w:bidiVisual']) {
+            result.bidiVisual = true;
+        }
+        if (propsObj['w:tblStyleRowBandSize']) {
+            result.tblStyleRowBandSize = parseInt(propsObj['w:tblStyleRowBandSize']['@_w:val'] || '1', 10);
+        }
+        if (propsObj['w:tblStyleColBandSize']) {
+            result.tblStyleColBandSize = parseInt(propsObj['w:tblStyleColBandSize']['@_w:val'] || '1', 10);
+        }
         if (propsObj['w:tblW']) {
             result.width = parseInt(propsObj['w:tblW']['@_w:w'] || '0', 10);
             result.widthType = propsObj['w:tblW']['@_w:type'] || 'dxa';
@@ -7171,9 +7516,31 @@ class DocumentParser {
         }
         if (propsObj['w:tblInd']) {
             result.indent = parseInt(propsObj['w:tblInd']['@_w:w'] || '0', 10);
+            const indType = propsObj['w:tblInd']['@_w:type'];
+            if (indType)
+                result.indentType = indType;
         }
         if (propsObj['w:tblCellSpacing']) {
             result.cellSpacing = parseInt(propsObj['w:tblCellSpacing']['@_w:w'] || '0', 10);
+            const csType = propsObj['w:tblCellSpacing']['@_w:type'];
+            if (csType)
+                result.cellSpacingType = csType;
+        }
+        if (propsObj['w:tblCellMar']) {
+            const cellMar = propsObj['w:tblCellMar'];
+            const margins = {};
+            if (cellMar['w:top'])
+                margins.top = parseInt(cellMar['w:top']['@_w:w'] || '0', 10);
+            if (cellMar['w:bottom'])
+                margins.bottom = parseInt(cellMar['w:bottom']['@_w:w'] || '0', 10);
+            const leftSrc = cellMar['w:start'] || cellMar['w:left'];
+            if (leftSrc)
+                margins.left = parseInt(leftSrc['@_w:w'] || '0', 10);
+            const rightSrc = cellMar['w:end'] || cellMar['w:right'];
+            if (rightSrc)
+                margins.right = parseInt(rightSrc['@_w:w'] || '0', 10);
+            if (Object.keys(margins).length > 0)
+                result.cellMargins = margins;
         }
         if (propsObj['w:tblBorders']) {
             const borders = {};
@@ -7186,6 +7553,40 @@ class DocumentParser {
             if (Object.keys(borders).length > 0)
                 result.borders = borders;
         }
+        if (propsObj['w:tblLook']) {
+            const look = propsObj['w:tblLook'];
+            result.tblLook = look['@_w:val'] || '0000';
+        }
+        if (propsObj['w:tblCaption']) {
+            result.caption = propsObj['w:tblCaption']['@_w:val'];
+        }
+        if (propsObj['w:tblDescription']) {
+            result.description = propsObj['w:tblDescription']['@_w:val'];
+        }
+        if (propsObj['w:cnfStyle']) {
+            result.cnfStyle = propsObj['w:cnfStyle']['@_w:val'];
+        }
+        if (propsObj['w:divId']) {
+            result.divId = propsObj['w:divId']['@_w:val'];
+        }
+        if (propsObj['w:gridBefore']) {
+            result.gridBefore = parseInt(propsObj['w:gridBefore']['@_w:val'] || '0', 10);
+        }
+        if (propsObj['w:gridAfter']) {
+            result.gridAfter = parseInt(propsObj['w:gridAfter']['@_w:val'] || '0', 10);
+        }
+        if (propsObj['w:wBefore']) {
+            result.wBefore = parseInt(propsObj['w:wBefore']['@_w:w'] || '0', 10);
+            const wbType = propsObj['w:wBefore']['@_w:type'];
+            if (wbType)
+                result.wBeforeType = wbType;
+        }
+        if (propsObj['w:wAfter']) {
+            result.wAfter = parseInt(propsObj['w:wAfter']['@_w:w'] || '0', 10);
+            const waType = propsObj['w:wAfter']['@_w:type'];
+            if (waType)
+                result.wAfterType = waType;
+        }
         if (propsObj['w:trHeight']) {
             result.height = parseInt(propsObj['w:trHeight']['@_w:val'] || '0', 10);
             const rule = propsObj['w:trHeight']['@_w:hRule'];
@@ -7205,8 +7606,14 @@ class DocumentParser {
             result.width = parseInt(propsObj['w:tcW']['@_w:w'] || '0', 10);
             result.widthType = propsObj['w:tcW']['@_w:type'] || 'dxa';
         }
-        if (propsObj['w:vAlign']) {
-            result.verticalAlignment = propsObj['w:vAlign']['@_w:val'];
+        if (propsObj['w:gridSpan']) {
+            result.columnSpan = parseInt(propsObj['w:gridSpan']['@_w:val'] || '1', 10);
+        }
+        if (propsObj['w:hMerge']) {
+            result.hMerge = propsObj['w:hMerge']['@_w:val'] || 'continue';
+        }
+        if (propsObj['w:vMerge']) {
+            result.vMerge = propsObj['w:vMerge']['@_w:val'] || 'continue';
         }
         if (propsObj['w:tcBorders']) {
             const borders = {};
@@ -7219,6 +7626,40 @@ class DocumentParser {
             if (Object.keys(borders).length > 0)
                 result.borders = borders;
         }
+        if (propsObj['w:noWrap']) {
+            result.noWrap = true;
+        }
+        if (propsObj['w:tcMar']) {
+            const tcMar = propsObj['w:tcMar'];
+            const margins = {};
+            if (tcMar['w:top'])
+                margins.top = parseInt(tcMar['w:top']['@_w:w'] || '0', 10);
+            if (tcMar['w:bottom'])
+                margins.bottom = parseInt(tcMar['w:bottom']['@_w:w'] || '0', 10);
+            const leftSrc = tcMar['w:start'] || tcMar['w:left'];
+            if (leftSrc)
+                margins.left = parseInt(leftSrc['@_w:w'] || '0', 10);
+            const rightSrc = tcMar['w:end'] || tcMar['w:right'];
+            if (rightSrc)
+                margins.right = parseInt(rightSrc['@_w:w'] || '0', 10);
+            if (Object.keys(margins).length > 0)
+                result.margins = margins;
+        }
+        if (propsObj['w:textDirection']) {
+            result.textDirection = propsObj['w:textDirection']['@_w:val'];
+        }
+        if (propsObj['w:tcFitText']) {
+            result.fitText = true;
+        }
+        if (propsObj['w:vAlign']) {
+            result.verticalAlignment = propsObj['w:vAlign']['@_w:val'];
+        }
+        if (propsObj['w:hideMark']) {
+            result.hideMark = true;
+        }
+        if (propsObj['w:cnfStyle']) {
+            result.cnfStyle = propsObj['w:cnfStyle']['@_w:val'];
+        }
         if (propsObj['w:jc']) {
             const val = propsObj['w:jc']['@_w:val'];
             if (val) {
@@ -7243,11 +7684,13 @@ class DocumentParser {
             const width = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:w');
             const height = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:h');
             const orient = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:orient');
+            const code = XMLParser_1.XMLParser.extractAttribute(pgSz, 'w:code');
             if (width || height) {
                 result.pageSize = {
                     width: width ? parseInt(width, 10) : undefined,
                     height: height ? parseInt(height, 10) : undefined,
                     orientation: orient === 'landscape' ? 'landscape' : 'portrait',
+                    code: code ? parseInt(code, 10) : undefined,
                 };
             }
         }
@@ -7282,6 +7725,38 @@ class DocumentParser {
             if (val)
                 result.type = val;
         }
+        const lnNumElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:lnNumType');
+        if (lnNumElements.length > 0 && lnNumElements[0]) {
+            const ln = lnNumElements[0];
+            const lnObj = {};
+            const countBy = XMLParser_1.XMLParser.extractAttribute(ln, 'w:countBy');
+            if (countBy)
+                lnObj.countBy = parseInt(countBy, 10);
+            const start = XMLParser_1.XMLParser.extractAttribute(ln, 'w:start');
+            if (start)
+                lnObj.start = parseInt(start, 10);
+            const restart = XMLParser_1.XMLParser.extractAttribute(ln, 'w:restart');
+            if (restart)
+                lnObj.restart = restart;
+            const distance = XMLParser_1.XMLParser.extractAttribute(ln, 'w:distance');
+            if (distance)
+                lnObj.distance = parseInt(distance, 10);
+            if (Object.keys(lnObj).length > 0)
+                result.lineNumbering = lnObj;
+        }
+        const pgNumElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:pgNumType');
+        if (pgNumElements.length > 0 && pgNumElements[0]) {
+            const pn = pgNumElements[0];
+            const pnObj = {};
+            const pnStart = XMLParser_1.XMLParser.extractAttribute(pn, 'w:start');
+            if (pnStart)
+                pnObj.start = parseInt(pnStart, 10);
+            const fmt = XMLParser_1.XMLParser.extractAttribute(pn, 'w:fmt');
+            if (fmt)
+                pnObj.format = fmt;
+            if (Object.keys(pnObj).length > 0)
+                result.pageNumbering = pnObj;
+        }
         const colsElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:cols');
         if (colsElements.length > 0 && colsElements[0]) {
             const cols = colsElements[0];
@@ -7294,6 +7769,44 @@ class DocumentParser {
                 };
             }
         }
+        if (sectPrXml.includes('<w:formProt'))
+            result.formProt = true;
+        const vAlignElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:vAlign');
+        if (vAlignElements.length > 0 && vAlignElements[0]) {
+            const val = XMLParser_1.XMLParser.extractAttribute(vAlignElements[0], 'w:val');
+            if (val)
+                result.verticalAlignment = val;
+        }
+        if (sectPrXml.includes('<w:noEndnote'))
+            result.noEndnote = true;
+        if (sectPrXml.includes('<w:titlePg'))
+            result.titlePage = true;
+        const textDirElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:textDirection');
+        if (textDirElements.length > 0 && textDirElements[0]) {
+            const val = XMLParser_1.XMLParser.extractAttribute(textDirElements[0], 'w:val');
+            if (val)
+                result.textDirection = val;
+        }
+        if (sectPrXml.includes('<w:bidi'))
+            result.bidi = true;
+        if (sectPrXml.includes('<w:rtlGutter'))
+            result.rtlGutter = true;
+        const docGridElements = XMLParser_1.XMLParser.extractElements(sectPrXml, 'w:docGrid');
+        if (docGridElements.length > 0 && docGridElements[0]) {
+            const dg = docGridElements[0];
+            const dgObj = {};
+            const dgType = XMLParser_1.XMLParser.extractAttribute(dg, 'w:type');
+            if (dgType)
+                dgObj.type = dgType;
+            const linePitch = XMLParser_1.XMLParser.extractAttribute(dg, 'w:linePitch');
+            if (linePitch)
+                dgObj.linePitch = parseInt(linePitch, 10);
+            const charSpace = XMLParser_1.XMLParser.extractAttribute(dg, 'w:charSpace');
+            if (charSpace)
+                dgObj.charSpace = parseInt(charSpace, 10);
+            if (Object.keys(dgObj).length > 0)
+                result.docGrid = dgObj;
+        }
         return result;
     }
 }