@office-open/docx 0.9.3 → 0.9.4

package/dist/{document-D8HDkCHs.mjs → document-B_uvEH8b.mjs}

@@ -1,4 +1,4 @@
-import { TargetModeType, convertEmuToPixels, convertPixelsToEmu, convertToEmu, convertToTwip, convertUniversalMeasureToEmu, decimalNumber, eighthPointMeasureValue, hexColorValue, hpsMeasureValue, measurementOrPercentValue, pointMeasureValue, signedTwipsMeasureValue, toUint8Array, twipsMeasureValue, uCharHexNumber, uniqueId, uniqueNumericIdCreator, xsdVerticalMergeRev } from "@office-open/core";
+import { TargetModeType, ThemeColor, convertEmuToPixels, convertPixelsToEmu, convertToEmu, convertToTwip, convertUniversalMeasureToEmu, decimalNumber, eighthPointMeasureValue, hexColorValue, hpsMeasureValue, measurementOrPercentValue, pointMeasureValue, signedTwipsMeasureValue, toUint8Array, twipsMeasureValue, uCharHexNumber, uniqueId, uniqueNumericIdCreator, xsdVerticalMergeRev } from "@office-open/core";
 import { attr, attrBool, attrNum, children, element, escapeXml, findChild, findDeep, textOf } from "@office-open/xml";
 import { calculateEffectExtent, createEffectDag, createScene3D, createShape3D, customGeometryDesc, effectListDesc, extractBlipFillMedia, fillDesc, outlineDesc, scene3DDesc, shape3DDesc, transform2DDesc } from "@office-open/core/drawingml";
 import { chartSpaceDesc } from "@office-open/core/chart";
@@ -1259,40 +1259,76 @@ function parseImageRun(el, ctx) {
 	}
 	if (anchor && !inline) {
 		const floating = {};
+		const margins = {};
+		const distT = attrNum(anchor, "distT");
+		if (distT !== void 0) margins.top = distT;
+		const distB = attrNum(anchor, "distB");
+		if (distB !== void 0) margins.bottom = distB;
+		const distL = attrNum(anchor, "distL");
+		if (distL !== void 0) margins.left = distL;
+		const distR = attrNum(anchor, "distR");
+		if (distR !== void 0) margins.right = distR;
+		if (Object.keys(margins).length > 0) floating.margins = margins;
 		const posH = findChild(anchor, "wp:positionH");
 		if (posH) {
-			const align = findChild(posH, "wp:align");
-			const posOffset = findChild(posH, "wp:posOffset");
-			if (align) floating.horizontalPosition = { align: textOf(align) };
-			else if (posOffset) {
-				const val = Number(textOf(posOffset));
-				if (!isNaN(val)) floating.horizontalPosition = { offset: val };
-			}
+			const hp = readPosition(posH);
+			if (hp) floating.horizontalPosition = hp;
 		}
 		const posV = findChild(anchor, "wp:positionV");
 		if (posV) {
-			const align = findChild(posV, "wp:align");
-			const posOffset = findChild(posV, "wp:posOffset");
-			if (align) floating.verticalPosition = { align: textOf(align) };
-			else if (posOffset) {
-				const val = Number(textOf(posOffset));
-				if (!isNaN(val)) floating.verticalPosition = { offset: val };
-			}
+			const vp = readPosition(posV);
+			if (vp) floating.verticalPosition = vp;
 		}
-		for (const wrapType of [
-			"wrapSquare",
-			"wrapTight",
-			"wrapTopAndBottom",
-			"wrapNone"
-		]) if (findChild(anchor, `wp:${wrapType}`)) {
-			floating.wrap = wrapType;
-			break;
-		}
-		if (attrBool(anchor, "behindDoc")) floating.behindDocument = true;
+		const wrap = readWrap(anchor);
+		if (wrap) floating.wrap = wrap;
+		const allowOverlap = attrBool(anchor, "allowOverlap");
+		if (allowOverlap !== void 0) floating.allowOverlap = allowOverlap;
+		const behindDoc = attrBool(anchor, "behindDoc");
+		if (behindDoc !== void 0) floating.behindDocument = behindDoc;
+		const locked = attrBool(anchor, "locked");
+		if (locked !== void 0) floating.lockAnchor = locked;
+		const layoutInCell = attrBool(anchor, "layoutInCell");
+		if (layoutInCell !== void 0) floating.layoutInCell = layoutInCell;
+		const relativeHeight = attrNum(anchor, "relativeHeight");
+		if (relativeHeight !== void 0) floating.zIndex = relativeHeight;
 		if (Object.keys(floating).length > 0) imageOpts.floating = floating;
 	}
 	return { image: imageOpts };
 }
+/** Map wp:positionH/V children + relativeFrom into a position-options object. */
+function readPosition(posEl) {
+	const relative = attr(posEl, "relativeFrom");
+	const alignEl = findChild(posEl, "wp:align");
+	const posOffset = findChild(posEl, "wp:posOffset");
+	const result = {};
+	if (relative) result.relative = relative;
+	if (alignEl) {
+		const a = textOf(alignEl);
+		if (a) result.align = a;
+	} else if (posOffset) {
+		const val = Number(textOf(posOffset));
+		if (!isNaN(val)) result.offset = val;
+	}
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+/** Map the wp:anchor wrap child element into a TextWrapping ({ type, side? }). */
+function readWrap(anchor) {
+	const WRAP_TYPE = [
+		["wrapNone", TextWrappingType.NONE],
+		["wrapSquare", TextWrappingType.SQUARE],
+		["wrapTight", TextWrappingType.TIGHT],
+		["wrapTopAndBottom", TextWrappingType.TOP_AND_BOTTOM],
+		["wrapThrough", TextWrappingType.THROUGH]
+	];
+	for (const [name, type] of WRAP_TYPE) {
+		const el = findChild(anchor, `wp:${name}`);
+		if (!el) continue;
+		const wrap = { type };
+		const side = attr(el, "wrapText");
+		if (side) wrap.side = side;
+		return wrap;
+	}
+}
 function getDrawingExtent(el) {
 	const inline = findDeep(el, "wp:inline")[0];
 	const anchor = inline ? void 0 : findDeep(el, "wp:anchor")[0];
@@ -3032,6 +3068,11 @@ function stringifyChildDispatch(child, ctx) {
 		if (sf.cachedValue !== void 0) return `<w:fldSimple w:instr="${escapeXml(sf.instruction)}"><w:r><w:t>${escapeXml(sf.cachedValue)}</w:t></w:r></w:fldSimple>`;
 		return `<w:fldSimple w:instr="${escapeXml(sf.instruction)}"/>`;
 	}
+	if ("complexField" in child) {
+		const cf = child.complexField;
+		const resultXml = cf.result !== void 0 ? `<w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t xml:space="preserve">${escapeXml(cf.result)}</w:t></w:r>` : "";
+		return `<w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText xml:space="preserve">${escapeXml(cf.instruction)}</w:instrText></w:r>` + resultXml + "<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
+	}
 	if ("seqIdentifier" in child) {
 		const id = child.seqIdentifier;
 		return `<w:r><w:fldChar w:fldCharType="begin"/><w:instrText xml:space="preserve"> SEQ ${escapeXml(id)} </w:instrText><w:fldChar w:fldCharType="separate"/><w:fldChar w:fldCharType="end"/></w:r>`;
@@ -3178,20 +3219,15 @@ function cellMarginStr(tag, opts) {
 	const inner = cellMarginChildrenStr(opts);
 	return inner ? `<${tag}>${inner}</${tag}>` : void 0;
 }
-const DEFAULT_BORDER = {
-	color: "auto",
-	size: 4,
-	style: BorderStyle.SINGLE
-};
 function tableBordersStr(opts) {
 	const parts = [];
-	parts.push(borderStr("w:top", opts.top ?? DEFAULT_BORDER));
-	parts.push(borderStr("w:left", opts.left ?? DEFAULT_BORDER));
-	parts.push(borderStr("w:bottom", opts.bottom ?? DEFAULT_BORDER));
-	parts.push(borderStr("w:right", opts.right ?? DEFAULT_BORDER));
-	parts.push(borderStr("w:insideH", opts.insideHorizontal ?? DEFAULT_BORDER));
-	parts.push(borderStr("w:insideV", opts.insideVertical ?? DEFAULT_BORDER));
-	return `<w:tblBorders>${parts.join("")}</w:tblBorders>`;
+	if (opts.top) parts.push(borderStr("w:top", opts.top));
+	if (opts.left) parts.push(borderStr("w:left", opts.left));
+	if (opts.bottom) parts.push(borderStr("w:bottom", opts.bottom));
+	if (opts.right) parts.push(borderStr("w:right", opts.right));
+	if (opts.insideHorizontal) parts.push(borderStr("w:insideH", opts.insideHorizontal));
+	if (opts.insideVertical) parts.push(borderStr("w:insideV", opts.insideVertical));
+	return parts.length > 0 ? `<w:tblBorders>${parts.join("")}</w:tblBorders>` : void 0;
 }
 function cellBordersStr(opts) {
 	const parts = [];
@@ -3276,7 +3312,10 @@ function stringifyTablePropertiesInner(options) {
 	if (options.width) parts.push(tableWidthStr("w:tblW", options.width));
 	if (options.alignment) parts.push(`<w:jc w:val="${options.alignment}"/>`);
 	if (options.indent) parts.push(tableWidthStr("w:tblInd", options.indent));
-	if (options.borders) parts.push(tableBordersStr(options.borders));
+	if (options.borders) {
+		const bs = tableBordersStr(options.borders);
+		if (bs) parts.push(bs);
+	}
 	if (options.shading) parts.push(shadingStr(options.shading));
 	if (options.layout) parts.push(`<w:tblLayout w:type="${options.layout}"/>`);
 	if (options.cellMargin) {
@@ -3400,7 +3439,10 @@ function stringifyTablePropertyExceptions(options) {
 	if (options.alignment) parts.push(`<w:jc w:val="${options.alignment}"/>`);
 	if (options.cellSpacing) parts.push(cellSpacingStr(options.cellSpacing));
 	if (options.indent) parts.push(tableWidthStr("w:tblInd", options.indent));
-	if (options.borders) parts.push(tableBordersStr(options.borders));
+	if (options.borders) {
+		const bs = tableBordersStr(options.borders);
+		if (bs) parts.push(bs);
+	}
 	if (options.shading) parts.push(shadingStr(options.shading));
 	if (options.layout) parts.push(`<w:tblLayout w:type="${options.layout}"/>`);
 	if (options.cellMargin) {
@@ -3422,6 +3464,27 @@ function stringifyTablePropertyExceptions(options) {
 }
 //#endregion
 //#region src/parts/table/descriptor.ts
+/**
+* Table (w:tbl) descriptor for DOCX.
+*
+* Stringifies pure JSON TableOptions into XML using direct string
+* concatenation — zero IXmlableObject, zero xml(), zero BaseXmlComponent.
+*
+* @module
+*/
+const BORDER_STYLES = Object.values(BorderStyle);
+const THEME_COLORS = Object.values(ThemeColor);
+/** Parse track-change attributes (id/author/date) from w:ins/w:del/w:cellIns/w:cellDel. */
+function parseChangeAttrs(el) {
+	const change = {};
+	const id = attrNum(el, "w:id");
+	if (id !== void 0) change.id = id;
+	const author = attr(el, "w:author");
+	if (author) change.author = author;
+	const date = attr(el, "w:date");
+	if (date) change.date = date;
+	return change;
+}
 function buildTableGridXml(widths, revision) {
 	const cols = widths.map((w) => `<w:gridCol w:w="${w}"/>`).join("");
 	if (revision) {
@@ -3520,9 +3583,9 @@ const tableDesc = {
 	kind: "custom",
 	stringify(opts, ctx) {
 		const parts = [];
-		const tblPr = stringifyTableProperties({
+		const tblPrOpts = {
 			alignment: opts.alignment,
-			borders: opts.borders ?? {},
+			borders: opts.borders,
 			caption: opts.caption,
 			cellMargin: opts.margins,
 			cellSpacing: opts.cellSpacing,
@@ -3536,9 +3599,10 @@ const tableDesc = {
 			styleRowBandSize: opts.styleRowBandSize,
 			tableLook: opts.tableLook,
 			visuallyRightToLeft: opts.visuallyRightToLeft,
-			width: opts.width ?? { size: 100 }
-		});
-		if (tblPr) parts.push(tblPr);
+			width: opts.width,
+			includeIfEmpty: true
+		};
+		parts.push(stringifyTableProperties(tblPrOpts));
 		const columnWidths = opts.columnWidths ?? Array(Math.max(...opts.rows.map((r) => r.cells.length))).fill(100);
 		parts.push(buildTableGridXml(columnWidths, opts.columnWidthsRevision));
 		const extraCells = computeVerticalMergeCells(opts.rows);
@@ -3588,28 +3652,38 @@ function parseTablePropertiesEl(el) {
 	}
 	const tblBorders = findChild(el, "w:tblBorders");
 	if (tblBorders) {
+		const SIDE_KEYS = [
+			["top", "top"],
+			["left", "left"],
+			["bottom", "bottom"],
+			["right", "right"],
+			["insideH", "insideHorizontal"],
+			["insideV", "insideVertical"]
+		];
 		const borders = {};
-		for (const side of [
-			"top",
-			"bottom",
-			"left",
-			"right",
-			"insideH",
-			"insideV"
-		]) {
-			const sideEl = findChild(tblBorders, `w:${side}`);
-			if (sideEl) {
-				const b = {};
-				const val = attr(sideEl, "w:val");
-				if (val) b.style = val;
-				const color = attr(sideEl, "w:color");
-				if (color) b.color = color;
-				const sz = attrNum(sideEl, "w:sz");
-				if (sz !== void 0) b.size = sz;
-				const space = attrNum(sideEl, "w:space");
-				if (space !== void 0) b.space = space;
-				borders[side] = b;
-			}
+		for (const [xmlSide, key] of SIDE_KEYS) {
+			const sideEl = findChild(tblBorders, `w:${xmlSide}`);
+			if (!sideEl) continue;
+			const style = attr(sideEl, "w:val");
+			if (!style || !BORDER_STYLES.includes(style)) continue;
+			const sideOpts = { style };
+			const color = attr(sideEl, "w:color");
+			if (color) sideOpts.color = color;
+			const size = attrNum(sideEl, "w:sz");
+			if (size !== void 0) sideOpts.size = size;
+			const space = attrNum(sideEl, "w:space");
+			if (space !== void 0) sideOpts.space = space;
+			const themeColor = attr(sideEl, "w:themeColor");
+			if (themeColor && THEME_COLORS.includes(themeColor)) sideOpts.themeColor = themeColor;
+			const themeTint = attr(sideEl, "w:themeTint");
+			if (themeTint) sideOpts.themeTint = themeTint;
+			const themeShade = attr(sideEl, "w:themeShade");
+			if (themeShade) sideOpts.themeShade = themeShade;
+			const shadow = attrBool(sideEl, "w:shadow");
+			if (shadow !== void 0) sideOpts.shadow = shadow;
+			const frame = attrBool(sideEl, "w:frame");
+			if (frame !== void 0) sideOpts.frame = frame;
+			borders[key] = sideOpts;
 		}
 		if (Object.keys(borders).length > 0) opts.borders = borders;
 	}
@@ -3684,6 +3758,45 @@ function parseTablePropertiesEl(el) {
 			...type ? { type } : {}
 		};
 	}
+	const bidiVisual = findChild(el, "w:bidiVisual");
+	if (bidiVisual) opts.visuallyRightToLeft = attrBool(bidiVisual, "w:val") ?? true;
+	const tblStyleRowBandSize = findChild(el, "w:tblStyleRowBandSize");
+	if (tblStyleRowBandSize) {
+		const val = attrNum(tblStyleRowBandSize, "w:val");
+		if (val !== void 0) opts.styleRowBandSize = val;
+	}
+	const tblStyleColBandSize = findChild(el, "w:tblStyleColBandSize");
+	if (tblStyleColBandSize) {
+		const val = attrNum(tblStyleColBandSize, "w:val");
+		if (val !== void 0) opts.styleColBandSize = val;
+	}
+	const tblCaption = findChild(el, "w:tblCaption");
+	if (tblCaption) {
+		const val = attr(tblCaption, "w:val");
+		if (val) opts.caption = val;
+	}
+	const tblCellSpacing = findChild(el, "w:tblCellSpacing");
+	if (tblCellSpacing) {
+		const type = attr(tblCellSpacing, "w:type");
+		const w = attrNum(tblCellSpacing, "w:w");
+		if (w !== void 0) opts.cellSpacing = {
+			value: w,
+			...type ? { type } : {}
+		};
+	}
+	const tblPrChange = findChild(el, "w:tblPrChange");
+	if (tblPrChange) {
+		const rev = {};
+		const author = attr(tblPrChange, "w:author");
+		if (author) rev.author = author;
+		const date = attr(tblPrChange, "w:date");
+		if (date) rev.date = date;
+		const id = attrNum(tblPrChange, "w:id");
+		if (id !== void 0) rev.id = id;
+		const innerTblPr = findChild(tblPrChange, "w:tblPr");
+		if (innerTblPr) Object.assign(rev, parseTablePropertiesEl(innerTblPr));
+		if (Object.keys(rev).length > 0) opts.revision = rev;
+	}
 	return opts;
 }
 function parseColumnWidthsEl(el) {
@@ -3707,10 +3820,105 @@ function parseTableRowPropertiesEl(el) {
 			rule: rule ?? "atLeast"
 		};
 	}
+	const cnfStyle = findChild(el, "w:cnfStyle");
+	if (cnfStyle) {
+		const val = attr(cnfStyle, "w:val");
+		if (val) {
+			const cnf = { val };
+			const changed = attrBool(cnfStyle, "w:changed");
+			if (changed !== void 0) cnf.changed = changed;
+			opts.cnfStyle = cnf;
+		}
+	}
+	const divId = findChild(el, "w:divId");
+	if (divId) {
+		const val = attrNum(divId, "w:val");
+		if (val !== void 0) opts.divId = val;
+	}
+	const gridBefore = findChild(el, "w:gridBefore");
+	if (gridBefore) {
+		const val = attrNum(gridBefore, "w:val");
+		if (val !== void 0) opts.gridBefore = val;
+	}
+	const gridAfter = findChild(el, "w:gridAfter");
+	if (gridAfter) {
+		const val = attrNum(gridAfter, "w:val");
+		if (val !== void 0) opts.gridAfter = val;
+	}
+	const wBefore = findChild(el, "w:wBefore");
+	if (wBefore) {
+		const rawSize = attr(wBefore, "w:w");
+		const type = attr(wBefore, "w:type");
+		const size = type === "pct" ? rawSize : attrNum(wBefore, "w:w");
+		if (size !== void 0) opts.widthBefore = {
+			size,
+			...type ? { type } : {}
+		};
+	}
+	const wAfter = findChild(el, "w:wAfter");
+	if (wAfter) {
+		const rawSize = attr(wAfter, "w:w");
+		const type = attr(wAfter, "w:type");
+		const size = type === "pct" ? rawSize : attrNum(wAfter, "w:w");
+		if (size !== void 0) opts.widthAfter = {
+			size,
+			...type ? { type } : {}
+		};
+	}
+	const jc = findChild(el, "w:jc");
+	if (jc) {
+		const val = attr(jc, "w:val");
+		if (val) opts.rowAlignment = val;
+	}
+	const hidden = findChild(el, "w:hidden");
+	if (hidden) opts.hidden = attrBool(hidden, "w:val") ?? true;
+	const tblCellSpacing = findChild(el, "w:tblCellSpacing");
+	if (tblCellSpacing) {
+		const type = attr(tblCellSpacing, "w:type");
+		const w = attrNum(tblCellSpacing, "w:w");
+		if (w !== void 0) opts.cellSpacing = {
+			value: w,
+			...type ? { type } : {}
+		};
+	}
+	const ins = findChild(el, "w:ins");
+	if (ins) opts.insertion = parseChangeAttrs(ins);
+	const del = findChild(el, "w:del");
+	if (del) opts.deletion = parseChangeAttrs(del);
+	const trPrChange = findChild(el, "w:trPrChange");
+	if (trPrChange) {
+		const rev = {};
+		const author = attr(trPrChange, "w:author");
+		if (author) rev.author = author;
+		const date = attr(trPrChange, "w:date");
+		if (date) rev.date = date;
+		const id = attrNum(trPrChange, "w:id");
+		if (id !== void 0) rev.id = id;
+		const innerTrPr = findChild(trPrChange, "w:trPr");
+		if (innerTrPr) Object.assign(rev, parseTableRowPropertiesEl(innerTrPr));
+		if (Object.keys(rev).length > 0) opts.revision = rev;
+	}
 	const tblHeader = findChild(el, "w:tblHeader");
 	if (tblHeader) opts.tableHeader = attrBool(tblHeader, "w:val") ?? true;
 	const cantSplit = findChild(el, "w:cantSplit");
 	if (cantSplit) opts.cantSplit = attrBool(cantSplit, "w:val") ?? true;
+	const tblLook = findChild(el, "w:tblLook");
+	if (tblLook) {
+		const look = {};
+		const firstRow = attrBool(tblLook, "w:firstRow");
+		if (firstRow !== void 0) look.firstRow = firstRow;
+		const lastRow = attrBool(tblLook, "w:lastRow");
+		if (lastRow !== void 0) look.lastRow = lastRow;
+		const firstColumn = attrBool(tblLook, "w:firstColumn");
+		if (firstColumn !== void 0) look.firstColumn = firstColumn;
+		const lastColumn = attrBool(tblLook, "w:lastColumn");
+		if (lastColumn !== void 0) look.lastColumn = lastColumn;
+		const noHBand = attrBool(tblLook, "w:noHBand");
+		if (noHBand !== void 0) look.noHBand = noHBand;
+		const noVBand = attrBool(tblLook, "w:noVBand");
+		if (noVBand !== void 0) look.noVBand = noVBand;
+		if (Object.keys(look).length > 0) opts.tableLook = look;
+	}
 	return opts;
 }
 function parseTableCellPropertiesEl(el) {
@@ -3750,13 +3958,17 @@ function parseTableCellPropertiesEl(el) {
 	const tcBorders = findChild(el, "w:tcBorders");
 	if (tcBorders) {
 		const borders = {};
-		for (const side of [
-			"top",
-			"bottom",
-			"left",
-			"right"
+		for (const [xmlSide, key] of [
+			["top", "top"],
+			["start", "start"],
+			["left", "left"],
+			["bottom", "bottom"],
+			["end", "end"],
+			["right", "right"],
+			["tl2br", "topLeftToBottomRight"],
+			["tr2bl", "topRightToBottomLeft"]
 		]) {
-			const sideEl = findChild(tcBorders, `w:${side}`);
+			const sideEl = findChild(tcBorders, `w:${xmlSide}`);
 			if (sideEl) {
 				const b = {};
 				const val = attr(sideEl, "w:val");
@@ -3765,12 +3977,13 @@ function parseTableCellPropertiesEl(el) {
 				if (color) b.color = color;
 				const sz = attrNum(sideEl, "w:sz");
 				if (sz !== void 0) b.size = sz;
-				borders[side] = b;
+				borders[key] = b;
 			}
 		}
 		if (Object.keys(borders).length > 0) opts.borders = borders;
 	}
-	if (findChild(el, "w:noWrap")) opts.noWrap = true;
+	const noWrap = findChild(el, "w:noWrap");
+	if (noWrap) opts.noWrap = attrBool(noWrap, "w:val") ?? true;
 	const tcMar = findChild(el, "w:tcMar");
 	if (tcMar) {
 		const margins = {};
@@ -3799,6 +4012,48 @@ function parseTableCellPropertiesEl(el) {
 		const val = attr(textDirection, "w:val");
 		if (val) opts.textDirection = val;
 	}
+	const hMerge = findChild(el, "w:hMerge");
+	if (hMerge) opts.horizontalMerge = attr(hMerge, "w:val") === "restart" ? "restart" : "continue";
+	const tcFitText = findChild(el, "w:tcFitText");
+	if (tcFitText) opts.fitText = attrBool(tcFitText, "w:val") ?? true;
+	const hideMark = findChild(el, "w:hideMark");
+	if (hideMark) opts.hideMark = attrBool(hideMark, "w:val") ?? true;
+	const headersEl = findChild(el, "w:headers");
+	if (headersEl) {
+		const headerVals = [];
+		for (const h of headersEl.elements ?? []) {
+			if (h.name !== "w:header") continue;
+			const val = attr(h, "w:val");
+			if (val) headerVals.push(val);
+		}
+		if (headerVals.length > 0) opts.headers = headerVals;
+	}
+	const cellIns = findChild(el, "w:cellIns");
+	if (cellIns) opts.insertion = parseChangeAttrs(cellIns);
+	const cellDel = findChild(el, "w:cellDel");
+	if (cellDel) opts.deletion = parseChangeAttrs(cellDel);
+	const tcPrChange = findChild(el, "w:tcPrChange");
+	if (tcPrChange) {
+		const rev = {};
+		const author = attr(tcPrChange, "w:author");
+		if (author) rev.author = author;
+		const date = attr(tcPrChange, "w:date");
+		if (date) rev.date = date;
+		const id = attrNum(tcPrChange, "w:id");
+		if (id !== void 0) rev.id = id;
+		const innerTcPr = findChild(tcPrChange, "w:tcPr");
+		if (innerTcPr) Object.assign(rev, parseTableCellPropertiesEl(innerTcPr));
+		if (Object.keys(rev).length > 0) opts.revision = rev;
+	}
+	const cellMerge = findChild(el, "w:cellMerge");
+	if (cellMerge) {
+		const cm = parseChangeAttrs(cellMerge);
+		const vMerge = attr(cellMerge, "w:vMerge");
+		if (vMerge) cm.verticalMerge = xsdVerticalMergeRev.from(vMerge);
+		const vMergeOrig = attr(cellMerge, "w:vMergeOrig");
+		if (vMergeOrig) cm.verticalMergeOriginal = xsdVerticalMergeRev.from(vMergeOrig);
+		if (Object.keys(cm).length > 0) opts.cellMerge = cm;
+	}
 	return opts;
 }
 function parseTableCellEl(el, ctx) {
@@ -3821,6 +4076,15 @@ function parseTableRowEl(el, ctx) {
 	const opts = {};
 	const trPr = findChild(el, "w:trPr");
 	if (trPr) Object.assign(opts, parseTableRowPropertiesEl(trPr));
+	for (const [attrName, optKey] of [
+		["w:rsidRPr", "rsidRPr"],
+		["w:rsidR", "rsidR"],
+		["w:rsidDel", "rsidDel"],
+		["w:rsidTr", "rsidTr"]
+	]) {
+		const val = attr(el, attrName);
+		if (val) opts[optKey] = val;
+	}
 	const childCells = [];
 	for (const child of el.elements ?? []) if (child.name === "w:tc") childCells.push(parseTableCellEl(child, ctx));
 	opts.cells = childCells;
@@ -4402,6 +4666,10 @@ const createHeaderFooterReference = (type, options) => `<${type} r:id="rId${opti
 *
 * @module
 */
+/** Valid page-number @w:fmt values (ST_NumberFormat). */
+const PAGE_NUMBER_FORMATS = Object.values(NumberFormat);
+/** Valid page-number @w:chapSep values (ST_ChapterSep). */
+const PAGE_NUMBER_SEPARATORS = Object.values(PageNumberSeparator);
 function stringifyBorderXml(tag, opts) {
 	const attrs = [];
 	if (opts.style !== void 0) attrs.push(`w:val="${opts.style}"`);
@@ -4516,14 +4784,14 @@ function stringifySectionPropertiesInner(opts) {
 	const parts = [];
 	appendHeaderFooterRefs(parts, "w:headerReference", opts.headerWrapperGroup);
 	appendHeaderFooterRefs(parts, "w:footerReference", opts.footerWrapperGroup);
-	const { size: { width = sectionPageSizeDefaults.WIDTH, height = sectionPageSizeDefaults.HEIGHT, orientation = sectionPageSizeDefaults.ORIENTATION } = {}, margin: { top = sectionMarginDefaults.TOP, right = sectionMarginDefaults.RIGHT, bottom = sectionMarginDefaults.BOTTOM, left = sectionMarginDefaults.LEFT, header = sectionMarginDefaults.HEADER, footer = sectionMarginDefaults.FOOTER, gutter = sectionMarginDefaults.GUTTER } = {}, pageNumbers = {}, borders, textDirection } = opts.page ?? {};
+	const { size: { width = sectionPageSizeDefaults.WIDTH, height = sectionPageSizeDefaults.HEIGHT, orientation = sectionPageSizeDefaults.ORIENTATION, code } = {}, margin: { top = sectionMarginDefaults.TOP, right = sectionMarginDefaults.RIGHT, bottom = sectionMarginDefaults.BOTTOM, left = sectionMarginDefaults.LEFT, header = sectionMarginDefaults.HEADER, footer = sectionMarginDefaults.FOOTER, gutter = sectionMarginDefaults.GUTTER } = {}, pageNumbers = {}, borders, textDirection } = opts.page ?? {};
 	const { linePitch = 312, charSpace = 0, type: gridType = "lines" } = opts.grid ?? {};
 	if (opts.footnotePr) parts.push(footnotePrXml("w:footnotePr", opts.footnotePr));
 	if (opts.endnotePr) parts.push(footnotePrXml("w:endnotePr", opts.endnotePr));
 	if (opts.type) parts.push(sectionTypeXml(opts.type));
 	const pgW = orientation === "landscape" ? convertToTwip(height) : width;
 	const pgH = orientation === "landscape" ? convertToTwip(width) : height;
-	parts.push(pageSizeXml(pgW, pgH, orientation));
+	parts.push(pageSizeXml(pgW, pgH, orientation, code));
 	parts.push(pageMarginXml(top, right, bottom, left, header, footer, gutter));
 	if (borders) parts.push(pageBordersXml(borders));
 	if (opts.lineNumbers) parts.push(lineNumberXml(opts.lineNumbers));
@@ -4605,6 +4873,8 @@ function parseSectionPropertiesEl(el) {
 			if (h !== void 0) size.height = h;
 		}
 		if (orient) size.orientation = orient;
+		const code = attrNum(pgSz, "w:code");
+		if (code !== void 0) size.code = code;
 		if (Object.keys(size).length > 0) page.size = size;
 		const pgMar = findChild(el, "w:pgMar");
 		if (pgMar) {
@@ -4629,7 +4899,11 @@ function parseSectionPropertiesEl(el) {
 			const start = attrNum(pgNumType, "w:start");
 			if (start !== void 0) pageNumbers.start = start;
 			const fmt = attr(pgNumType, "w:fmt");
-			if (fmt) pageNumbers.formatType = fmt;
+			if (fmt && PAGE_NUMBER_FORMATS.includes(fmt)) pageNumbers.formatType = fmt;
+			const chapSep = attr(pgNumType, "w:chapSep");
+			if (chapSep && PAGE_NUMBER_SEPARATORS.includes(chapSep)) pageNumbers.separator = chapSep;
+			const chapStyle = attrNum(pgNumType, "w:chapStyle");
+			if (chapStyle !== void 0) pageNumbers.chapStyle = chapStyle;
 			if (Object.keys(pageNumbers).length > 0) page.pageNumbers = pageNumbers;
 		}
 		if (Object.keys(page).length > 0) opts.page = page;
@@ -4641,7 +4915,21 @@ function parseSectionPropertiesEl(el) {
 		if (count !== void 0) column.count = count;
 		const space = attrNum(cols, "w:space");
 		if (space !== void 0) column.space = space;
-		if (attrBool(cols, "w:sep")) column.separator = true;
+		const separate = attrBool(cols, "w:sep");
+		if (separate !== void 0) column.separate = separate;
+		const equalWidth = attrBool(cols, "w:equalWidth");
+		if (equalWidth !== void 0) column.equalWidth = equalWidth;
+		const colChildren = [];
+		for (const colEl of cols.elements ?? []) {
+			if (colEl.name !== "w:col") continue;
+			const width = attrNum(colEl, "w:w");
+			if (width === void 0) continue;
+			const colAttr = { width };
+			const colSpace = attrNum(colEl, "w:space");
+			if (colSpace !== void 0) colAttr.space = colSpace;
+			colChildren.push(colAttr);
+		}
+		if (colChildren.length > 0) column.children = colChildren;
 		if (Object.keys(column).length > 0) opts.column = column;
 	}
 	const type = findChild(el, "w:type");
@@ -4793,6 +5081,6 @@ function parseNotePropertiesEl(el) {
 	return opts;
 }
 //#endregion
-export { createFormFieldData as $, stringifyParagraphProperties as A, HorizontalPositionAlign as B, createPageSize as C, stringifyChildDispatch as D, tableDesc as E, parseDrawingRun as F, createWrapTight as G, SpaceType as H, createVerticalPosition as I, WidthType as J, TextWrappingSide as K, createHorizontalPosition as L, parseMathChildren as M, drawingDesc as N, stringifyParagraphInline as O, resetDrawingIdGen as P, FormFieldTextType as Q, HorizontalPositionRelativeFrom as R, PageOrientation as S, setTableParseChild as T, VerticalPositionAlign as U, NumberFormat as V, createWrapThrough as W, TextDirection as X, BorderStyle as Y, VerticalMergeType as Z, DocumentGridType as _, HeaderFooterType as a, VerticalAnchor as at, sectionPageSizeDefaults as b, createSectionType as c, Media as ct, createPageMargin as d, parseFormFieldData as et, PageBorderDisplay as f, createPageNumberType as g, PageNumberSeparator as h, HeaderFooterReferenceType as i, TextVerticalType as it, stringifyRunProperties as j, stringifyRunInline as k, LineNumberRestartFormat as l, createTransformation as lt, PageBorderZOrder as m, sectionPropertiesDesc as n, TextHorzOverflowType as nt, createHeaderFooterReference as o, createBodyProperties as ot, PageBorderOffsetFrom as p, TextWrappingType as q, stringifySectionPropertiesXml as r, TextVertOverflowType as rt, SectionType as s, WORKAROUND2 as st, parseSectionPropertiesEl as t, TextBodyWrappingType as tt, createLineNumberType as u, createDocumentGrid as v, DocumentAttributeNamespaces as w, PageTextDirectionType as x, sectionMarginDefaults as y, VerticalPositionRelativeFrom as z };
+export { FormFieldTextType as $, stringifyParagraphProperties as A, VerticalPositionRelativeFrom as B, createPageSize as C, stringifyChildDispatch as D, tableDesc as E, resetDrawingIdGen as F, createWrapThrough as G, NumberFormat as H, parseDrawingRun as I, TextWrappingType as J, createWrapTight as K, createVerticalPosition as L, stringifyRunPropertiesInner as M, parseMathChildren as N, stringifyParagraphInline as O, drawingDesc as P, VerticalMergeType as Q, createHorizontalPosition as R, PageOrientation as S, setTableParseChild as T, SpaceType as U, HorizontalPositionAlign as V, VerticalPositionAlign as W, BorderStyle as X, WidthType as Y, TextDirection as Z, DocumentGridType as _, HeaderFooterType as a, TextVerticalType as at, sectionPageSizeDefaults as b, createSectionType as c, WORKAROUND2 as ct, createPageMargin as d, createFormFieldData as et, PageBorderDisplay as f, createPageNumberType as g, PageNumberSeparator as h, HeaderFooterReferenceType as i, TextVertOverflowType as it, stringifyRunProperties as j, stringifyRunInline as k, LineNumberRestartFormat as l, Media as lt, PageBorderZOrder as m, sectionPropertiesDesc as n, TextBodyWrappingType as nt, createHeaderFooterReference as o, VerticalAnchor as ot, PageBorderOffsetFrom as p, TextWrappingSide as q, stringifySectionPropertiesXml as r, TextHorzOverflowType as rt, SectionType as s, createBodyProperties as st, parseSectionPropertiesEl as t, parseFormFieldData as tt, createLineNumberType as u, createTransformation as ut, createDocumentGrid as v, DocumentAttributeNamespaces as w, PageTextDirectionType as x, sectionMarginDefaults as y, HorizontalPositionRelativeFrom as z };
 
-//# sourceMappingURL=document-D8HDkCHs.mjs.map
+//# sourceMappingURL=document-B_uvEH8b.mjs.map