@office-open/docx 0.9.5 → 0.9.6

package/dist/{document-DYH7tGnw.mjs → document-D2OTVcbX.mjs}

@@ -796,7 +796,7 @@ function parseRunProperties(el) {
 	const bdr = findChild(el, "w:bdr");
 	if (bdr) opts.border = parseBorder(bdr);
 	const shd = findChild(el, "w:shd");
-	if (shd) opts.shading = parseShading(shd);
+	if (shd) opts.shading = parseShading$1(shd);
 	const eastAsianLayout = findChild(el, "w:eastAsianLayout");
 	if (eastAsianLayout) opts.eastAsianLayout = parseEastAsianLayout(eastAsianLayout);
 	const contentPart = findChild(el, "w:contentPart");
@@ -841,7 +841,7 @@ function parseBorder(el) {
 /**
 * Parse a w:shd element into ShadingAttributesProperties.
 */
-function parseShading(el) {
+function parseShading$1(el) {
 	const opts = {};
 	const fill = colorAttr(el, "w:fill");
 	if (fill) opts.fill = fill;
@@ -1171,7 +1171,7 @@ function tabStopsStr(defs) {
 		})}/>`;
 	}).join("")}</w:tabs>`;
 }
-function cnfStyleStr(opts) {
+function cnfStyleStr$1(opts) {
 	return `<w:cnfStyle ${attrParts({
 		"w:firstRow": opts.firstRow ? "1" : "0",
 		"w:lastRow": opts.lastRow ? "1" : "0",
@@ -1347,7 +1347,7 @@ function stringifyParagraphProperties(options) {
 	if (options.alignment) parts.push(`<w:jc w:val="${options.alignment}"/>`);
 	if (options.outlineLevel !== void 0) parts.push(`<w:outlineLvl w:val="${options.outlineLevel}"/>`);
 	if (options.divId !== void 0) parts.push(`<w:divId w:val="${options.divId}"/>`);
-	if (options.cnfStyle) parts.push(cnfStyleStr(options.cnfStyle));
+	if (options.cnfStyle) parts.push(cnfStyleStr$1(options.cnfStyle));
 	if (options.suppressLineNumbers !== void 0) parts.push(onOff("w:suppressLineNumbers", options.suppressLineNumbers));
 	if (options.autoSpaceEastAsianText !== void 0) parts.push(onOff("w:autoSpaceDN", options.autoSpaceEastAsianText));
 	if (options.suppressAutoHyphens !== void 0) parts.push(onOff("w:suppressAutoHyphens", options.suppressAutoHyphens));
@@ -4249,24 +4249,20 @@ function tableWidthStr(name, opts) {
 	})}/>`;
 }
 function cellMarginChildrenStr(opts) {
-	const unitType = opts.marginUnitType ?? WidthType.DXA;
 	const parts = [];
-	if (opts.top !== void 0) parts.push(tableWidthStr("w:top", {
-		size: opts.top,
-		type: unitType
-	}));
-	if (opts.left !== void 0) parts.push(tableWidthStr("w:left", {
-		size: opts.left,
-		type: unitType
-	}));
-	if (opts.bottom !== void 0) parts.push(tableWidthStr("w:bottom", {
-		size: opts.bottom,
-		type: unitType
-	}));
-	if (opts.right !== void 0) parts.push(tableWidthStr("w:right", {
-		size: opts.right,
-		type: unitType
-	}));
+	const side = (name, w) => {
+		if (w === void 0) return;
+		parts.push(tableWidthStr(name, {
+			size: w.size,
+			type: w.type ?? WidthType.DXA
+		}));
+	};
+	side("w:top", opts.top);
+	side("w:start", opts.start);
+	side("w:left", opts.left);
+	side("w:bottom", opts.bottom);
+	side("w:end", opts.end);
+	side("w:right", opts.right);
 	return parts.join("");
 }
 function cellMarginStr(tag, opts) {
@@ -4291,6 +4287,8 @@ function cellBordersStr(opts) {
 	if (opts.bottom) parts.push(borderStr("w:bottom", opts.bottom));
 	if (opts.end) parts.push(borderStr("w:end", opts.end));
 	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));
 	if (opts.topLeftToBottomRight) parts.push(borderStr("w:tl2br", opts.topLeftToBottomRight));
 	if (opts.topRightToBottomLeft) parts.push(borderStr("w:tr2bl", opts.topRightToBottomLeft));
 	return parts.length > 0 ? `<w:tcBorders>${parts.join("")}</w:tcBorders>` : void 0;
@@ -4319,6 +4317,23 @@ function tableLookStr(opts) {
 		"w:noVBand": opts.noVBand
 	})}/>`;
 }
+function cnfStyleStr(opts) {
+	return `<w:cnfStyle ${attrParts({
+		"w:val": opts.val,
+		"w:firstRow": opts.firstRow,
+		"w:lastRow": opts.lastRow,
+		"w:firstColumn": opts.firstColumn,
+		"w:lastColumn": opts.lastColumn,
+		"w:oddVBand": opts.oddVBand,
+		"w:evenVBand": opts.evenVBand,
+		"w:oddHBand": opts.oddHBand,
+		"w:evenHBand": opts.evenHBand,
+		"w:firstRowFirstColumn": opts.firstRowFirstColumn,
+		"w:firstRowLastColumn": opts.firstRowLastColumn,
+		"w:lastRowFirstColumn": opts.lastRowFirstColumn,
+		"w:lastRowLastColumn": opts.lastRowLastColumn
+	})}/>`;
+}
 function changeAttrStr(tag, opts) {
 	return `<${tag} ${attrParts({
 		"w:author": opts.author,
@@ -4339,7 +4354,7 @@ function cellMergeStr(opts) {
 function cellSpacingStr(opts) {
 	return `<w:tblCellSpacing ${attrParts({
 		"w:type": opts.type,
-		"w:w": measurementOrPercentValue(opts.value)
+		"w:w": measurementOrPercentValue(opts.size)
 	})}/>`;
 }
 function stringifyTablePropertiesChangeInner(options) {
@@ -4365,6 +4380,7 @@ function stringifyTablePropertiesInner(options) {
 	if (options.styleColBandSize !== void 0) parts.push(`<w:tblStyleColBandSize w:val="${options.styleColBandSize}"/>`);
 	if (options.width) parts.push(tableWidthStr("w:tblW", options.width));
 	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) {
 		const bs = tableBordersStr(options.borders);
@@ -4377,7 +4393,6 @@ function stringifyTablePropertiesInner(options) {
 		if (cm) parts.push(cm);
 	}
 	if (options.tableLook) parts.push(tableLookStr(options.tableLook));
-	if (options.cellSpacing) parts.push(cellSpacingStr(options.cellSpacing));
 	if (options.caption !== void 0) parts.push(`<w:tblCaption w:val="${options.caption}"/>`);
 	if (options.description !== void 0) parts.push(`<w:tblDescription w:val="${options.description}"/>`);
 	if (options.revision) parts.push(stringifyTablePropertiesChangeInner(options.revision));
@@ -4400,13 +4415,7 @@ function stringifyTableRowPropertiesChangeInner(options) {
 }
 function stringifyTableRowPropertiesInner(options) {
 	const parts = [];
-	if (options.cnfStyle !== void 0) {
-		const a = attrParts({
-			"w:val": options.cnfStyle.val,
-			"w:changed": options.cnfStyle.changed
-		});
-		parts.push(`<w:cnfStyle ${a}/>`);
-	}
+	if (options.cnfStyle !== void 0) parts.push(cnfStyleStr(options.cnfStyle));
 	if (options.divId !== void 0) parts.push(`<w:divId w:val="${options.divId}"/>`);
 	if (options.gridBefore !== void 0) parts.push(`<w:gridBefore w:val="${options.gridBefore}"/>`);
 	if (options.gridAfter !== void 0) parts.push(`<w:gridAfter w:val="${options.gridAfter}"/>`);
@@ -4446,15 +4455,11 @@ function stringifyTableCellPropertiesChangeInner(options) {
 }
 function stringifyTableCellPropertiesInner(options) {
 	const parts = [];
-	if (options.cnfStyle !== void 0) {
-		const a = attrParts({
-			"w:val": options.cnfStyle.val,
-			"w:changed": options.cnfStyle.changed
-		});
-		parts.push(`<w:cnfStyle ${a}/>`);
-	}
+	if (options.cnfStyle !== void 0) parts.push(cnfStyleStr(options.cnfStyle));
 	if (options.width) parts.push(tableWidthStr("w:tcW", options.width));
 	if (options.columnSpan) parts.push(`<w:gridSpan w:val="${options.columnSpan}"/>`);
+	if (options.horizontalMerge !== void 0) if (options.horizontalMerge === "restart") parts.push(`<w:hMerge w:val="restart"/>`);
+	else parts.push(`<w:hMerge/>`);
 	if (options.verticalMerge) parts.push(`<w:vMerge w:val="${options.verticalMerge}"/>`);
 	else if (options.rowSpan && options.rowSpan > 1) parts.push(`<w:vMerge w:val="${VerticalMergeType.RESTART}"/>`);
 	if (options.borders) {
@@ -4462,16 +4467,14 @@ function stringifyTableCellPropertiesInner(options) {
 		if (bs) parts.push(bs);
 	}
 	if (options.shading) parts.push(shadingStr(options.shading));
+	if (options.noWrap !== void 0) parts.push(onOff("w:noWrap", options.noWrap));
 	if (options.margins) {
 		const cm = cellMarginStr("w:tcMar", options.margins);
 		if (cm) parts.push(cm);
 	}
 	if (options.textDirection) parts.push(`<w:textDirection w:val="${options.textDirection}"/>`);
-	if (options.verticalAlign) parts.push(`<w:vAlign w:val="${options.verticalAlign}"/>`);
-	if (options.horizontalMerge !== void 0) if (options.horizontalMerge === "restart") parts.push(`<w:hMerge w:val="restart"/>`);
-	else parts.push(`<w:hMerge/>`);
-	if (options.noWrap !== void 0) parts.push(onOff("w:noWrap", options.noWrap));
 	if (options.fitText !== void 0) parts.push(onOff("w:tcFitText", options.fitText));
+	if (options.verticalAlign) parts.push(`<w:vAlign w:val="${options.verticalAlign}"/>`);
 	if (options.hideMark !== void 0) parts.push(onOff("w:hideMark", options.hideMark));
 	if (options.headers !== void 0) {
 		const headerParts = options.headers.map((h) => `<w:header w:val="${h}"/>`).join("");
@@ -4479,15 +4482,15 @@ function stringifyTableCellPropertiesInner(options) {
 	}
 	if (options.insertion) parts.push(changeAttrStr("w:cellIns", options.insertion));
 	if (options.deletion) parts.push(changeAttrStr("w:cellDel", options.deletion));
-	if (options.revision) parts.push(stringifyTableCellPropertiesChangeInner(options.revision));
 	if (options.cellMerge) parts.push(cellMergeStr(options.cellMerge));
+	if (options.revision) parts.push(stringifyTableCellPropertiesChangeInner(options.revision));
 	return parts.join("");
 }
 function stringifyTableCellProperties(options) {
 	const inner = stringifyTableCellPropertiesInner(options);
 	if (options.includeIfEmpty || inner) return `<w:tcPr>${inner}</w:tcPr>`;
 }
-function stringifyTablePropertyExceptions(options) {
+function stringifyTablePropertyExceptionsInner(options) {
 	const parts = [];
 	if (options.width) parts.push(tableWidthStr("w:tblW", options.width));
 	if (options.alignment) parts.push(`<w:jc w:val="${options.alignment}"/>`);
@@ -4506,15 +4509,18 @@ function stringifyTablePropertyExceptions(options) {
 	if (options.tableLook) parts.push(tableLookStr(options.tableLook));
 	if (options.tblPrExChange) {
 		const change = options.tblPrExChange;
-		const attrs = {
+		const a = attrParts({
 			"w:author": change.author,
+			"w:date": change.date,
 			"w:id": change.id
-		};
-		if (change.date !== void 0) attrs["w:date"] = change.date;
-		const a = attrParts(attrs);
-		parts.push(`<w:tblPrExChange ${a}/>`);
+		});
+		const revInner = stringifyTablePropertyExceptionsInner(change);
+		parts.push(`<w:tblPrExChange ${a}><w:tblPrEx>${revInner}</w:tblPrEx></w:tblPrExChange>`);
 	}
-	return `<w:tblPrEx>${parts.join("")}</w:tblPrEx>`;
+	return parts.join("");
+}
+function stringifyTablePropertyExceptions(options) {
+	return `<w:tblPrEx>${stringifyTablePropertyExceptionsInner(options)}</w:tblPrEx>`;
 }
 //#endregion
 //#region src/parts/table/descriptor.ts
@@ -4654,6 +4660,137 @@ function computeVerticalMergeCells(rows) {
 	}
 	return extraMap;
 }
+/** Parse a w:tblCellMar / w:tcMar container into TableCellMarginOptions. */
+function parseCellMargins(marginEl) {
+	const margins = {};
+	for (const side of [
+		"top",
+		"start",
+		"left",
+		"bottom",
+		"end",
+		"right"
+	]) {
+		const sideEl = findChild(marginEl, `w:${side}`);
+		if (sideEl) {
+			const size = attrNum(sideEl, "w:w");
+			if (size !== void 0) {
+				const type = attr(sideEl, "w:type");
+				margins[side] = type ? {
+					size,
+					type
+				} : { size };
+			}
+		}
+	}
+	if (Object.keys(margins).length === 0) return void 0;
+	return margins;
+}
+/** Parse a w:shd (CT_Shd) element into ShadingAttributesProperties. */
+function parseShading(shd) {
+	const shading = {};
+	const fill = attr(shd, "w:fill");
+	if (fill) shading.fill = fill;
+	const color = attr(shd, "w:color");
+	if (color) shading.color = color;
+	const val = attr(shd, "w:val");
+	if (val) shading.type = val;
+	const themeColor = attr(shd, "w:themeColor");
+	if (themeColor && THEME_COLORS.includes(themeColor)) shading.themeColor = themeColor;
+	const themeTint = attr(shd, "w:themeTint");
+	if (themeTint) shading.themeTint = themeTint;
+	const themeShade = attr(shd, "w:themeShade");
+	if (themeShade) shading.themeShade = themeShade;
+	const themeFill = attr(shd, "w:themeFill");
+	if (themeFill && THEME_COLORS.includes(themeFill)) shading.themeFill = themeFill;
+	const themeFillTint = attr(shd, "w:themeFillTint");
+	if (themeFillTint) shading.themeFillTint = themeFillTint;
+	const themeFillShade = attr(shd, "w:themeFillShade");
+	if (themeFillShade) shading.themeFillShade = themeFillShade;
+	if (Object.keys(shading).length === 0) return void 0;
+	return shading;
+}
+/** Parse a w:cnfStyle (CT_Cnf) element into CnfStyleOptions. */
+function parseCnfStyle(cnfEl) {
+	const cnf = {};
+	const val = attr(cnfEl, "w:val");
+	if (val) cnf.val = val;
+	const firstRow = attrBool(cnfEl, "w:firstRow");
+	if (firstRow !== void 0) cnf.firstRow = firstRow;
+	const lastRow = attrBool(cnfEl, "w:lastRow");
+	if (lastRow !== void 0) cnf.lastRow = lastRow;
+	const firstColumn = attrBool(cnfEl, "w:firstColumn");
+	if (firstColumn !== void 0) cnf.firstColumn = firstColumn;
+	const lastColumn = attrBool(cnfEl, "w:lastColumn");
+	if (lastColumn !== void 0) cnf.lastColumn = lastColumn;
+	const oddVBand = attrBool(cnfEl, "w:oddVBand");
+	if (oddVBand !== void 0) cnf.oddVBand = oddVBand;
+	const evenVBand = attrBool(cnfEl, "w:evenVBand");
+	if (evenVBand !== void 0) cnf.evenVBand = evenVBand;
+	const oddHBand = attrBool(cnfEl, "w:oddHBand");
+	if (oddHBand !== void 0) cnf.oddHBand = oddHBand;
+	const evenHBand = attrBool(cnfEl, "w:evenHBand");
+	if (evenHBand !== void 0) cnf.evenHBand = evenHBand;
+	const firstRowFirstColumn = attrBool(cnfEl, "w:firstRowFirstColumn");
+	if (firstRowFirstColumn !== void 0) cnf.firstRowFirstColumn = firstRowFirstColumn;
+	const firstRowLastColumn = attrBool(cnfEl, "w:firstRowLastColumn");
+	if (firstRowLastColumn !== void 0) cnf.firstRowLastColumn = firstRowLastColumn;
+	const lastRowFirstColumn = attrBool(cnfEl, "w:lastRowFirstColumn");
+	if (lastRowFirstColumn !== void 0) cnf.lastRowFirstColumn = lastRowFirstColumn;
+	const lastRowLastColumn = attrBool(cnfEl, "w:lastRowLastColumn");
+	if (lastRowLastColumn !== void 0) cnf.lastRowLastColumn = lastRowLastColumn;
+	if (Object.keys(cnf).length === 0) return void 0;
+	return cnf;
+}
+/**
+* Parse a w:tblPrEx (CT_TblPrEx) element into TablePropertyExOptions.
+* CT_TblPrExBase shares its child elements with CT_TblPrBase, so this reuses
+* parseTablePropertiesEl and maps the table-level margins field to cellMargin.
+*/
+function parseTablePropertyExceptions(el) {
+	const base = parseTablePropertiesEl(el);
+	const opts = {};
+	if (base.width !== void 0) opts.width = base.width;
+	if (base.indent !== void 0) opts.indent = base.indent;
+	if (base.layout !== void 0) opts.layout = base.layout;
+	if (base.borders !== void 0) opts.borders = base.borders;
+	if (base.shading !== void 0) opts.shading = base.shading;
+	if (base.alignment !== void 0) opts.alignment = base.alignment;
+	if (base.margins !== void 0) opts.cellMargin = base.margins;
+	if (base.tableLook !== void 0) opts.tableLook = base.tableLook;
+	if (base.cellSpacing !== void 0) opts.cellSpacing = base.cellSpacing;
+	const tblPrExChange = findChild(el, "w:tblPrExChange");
+	if (tblPrExChange) {
+		const change = parseTablePropertyExChange(tblPrExChange);
+		if (change) opts.tblPrExChange = change;
+	}
+	return opts;
+}
+/** Parse a w:tblPrExChange (CT_TblPrExChange) — track-change wrapper around the previous tblPrEx. */
+function parseTablePropertyExChange(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;
+	const innerTblPrEx = findChild(el, "w:tblPrEx");
+	if (innerTblPrEx) {
+		const inner = parseTablePropertyExceptions(innerTblPrEx);
+		if (inner.width !== void 0) change.width = inner.width;
+		if (inner.indent !== void 0) change.indent = inner.indent;
+		if (inner.layout !== void 0) change.layout = inner.layout;
+		if (inner.borders !== void 0) change.borders = inner.borders;
+		if (inner.shading !== void 0) change.shading = inner.shading;
+		if (inner.alignment !== void 0) change.alignment = inner.alignment;
+		if (inner.cellMargin !== void 0) change.cellMargin = inner.cellMargin;
+		if (inner.tableLook !== void 0) change.tableLook = inner.tableLook;
+		if (inner.cellSpacing !== void 0) change.cellSpacing = inner.cellSpacing;
+	}
+	if (change.id === void 0 || change.author === void 0) return void 0;
+	return change;
+}
 const tableDesc = {
 	kind: "custom",
 	stringify(opts, ctx) {
@@ -4669,6 +4806,7 @@ const tableDesc = {
 			indent: opts.indent,
 			layout: opts.layout,
 			revision: opts.revision,
+			shading: opts.shading,
 			style: opts.style,
 			styleColBandSize: opts.styleColBandSize,
 			styleRowBandSize: opts.styleRowBandSize,
@@ -4774,35 +4912,13 @@ function parseTablePropertiesEl(el) {
 	}
 	const tblCellMar = findChild(el, "w:tblCellMar");
 	if (tblCellMar) {
-		const margins = {};
-		for (const side of [
-			"top",
-			"bottom",
-			"left",
-			"right"
-		]) {
-			const sideEl = findChild(tblCellMar, `w:${side}`);
-			if (sideEl) {
-				const size = attrNum(sideEl, "w:w");
-				const type = attr(sideEl, "w:type");
-				if (size !== void 0) margins[side] = {
-					size,
-					type: type ?? "dxa"
-				};
-			}
-		}
-		if (Object.keys(margins).length > 0) opts.margins = margins;
+		const margins = parseCellMargins(tblCellMar);
+		if (margins) opts.margins = margins;
 	}
 	const shd = findChild(el, "w:shd");
 	if (shd) {
-		const shading = {};
-		const fill = attr(shd, "w:fill");
-		if (fill) shading.fill = fill;
-		const color = attr(shd, "w:color");
-		if (color) shading.color = color;
-		const val = attr(shd, "w:val");
-		if (val) shading.type = val;
-		if (Object.keys(shading).length > 0) opts.shading = shading;
+		const shading = parseShading(shd);
+		if (shading) opts.shading = shading;
 	}
 	const tblDesc = findChild(el, "w:tblDescription");
 	if (tblDesc) {
@@ -4810,28 +4926,35 @@ function parseTablePropertiesEl(el) {
 		if (val) opts.description = val;
 	}
 	const tblpPr = findChild(el, "w:tblpPr");
-	if (tblpPr) {
+	const tblOverlap = findChild(el, "w:tblOverlap");
+	if (tblpPr || tblOverlap) {
 		const floatOpts = {};
-		const horzAnchor = attr(tblpPr, "w:horzAnchor");
-		if (horzAnchor) floatOpts.horizontalAnchor = horzAnchor;
-		const vertAnchor = attr(tblpPr, "w:vertAnchor");
-		if (vertAnchor) floatOpts.verticalAnchor = vertAnchor;
-		const tblpX = attrNum(tblpPr, "w:tblpX");
-		if (tblpX !== void 0) floatOpts.absoluteHorizontalPosition = tblpX;
-		const tblpXSpec = attr(tblpPr, "w:tblpXSpec");
-		if (tblpXSpec) floatOpts.relativeHorizontalPosition = tblpXSpec;
-		const tblpY = attrNum(tblpPr, "w:tblpY");
-		if (tblpY !== void 0) floatOpts.absoluteVerticalPosition = tblpY;
-		const tblpYSpec = attr(tblpPr, "w:tblpYSpec");
-		if (tblpYSpec) floatOpts.relativeVerticalPosition = tblpYSpec;
-		const bottomFromText = attrNum(tblpPr, "w:bottomFromText");
-		if (bottomFromText !== void 0) floatOpts.bottomFromText = bottomFromText;
-		const topFromText = attrNum(tblpPr, "w:topFromText");
-		if (topFromText !== void 0) floatOpts.topFromText = topFromText;
-		const leftFromText = attrNum(tblpPr, "w:leftFromText");
-		if (leftFromText !== void 0) floatOpts.leftFromText = leftFromText;
-		const rightFromText = attrNum(tblpPr, "w:rightFromText");
-		if (rightFromText !== void 0) floatOpts.rightFromText = rightFromText;
+		if (tblpPr) {
+			const horzAnchor = attr(tblpPr, "w:horzAnchor");
+			if (horzAnchor) floatOpts.horizontalAnchor = horzAnchor;
+			const vertAnchor = attr(tblpPr, "w:vertAnchor");
+			if (vertAnchor) floatOpts.verticalAnchor = vertAnchor;
+			const tblpX = attrNum(tblpPr, "w:tblpX");
+			if (tblpX !== void 0) floatOpts.absoluteHorizontalPosition = tblpX;
+			const tblpXSpec = attr(tblpPr, "w:tblpXSpec");
+			if (tblpXSpec) floatOpts.relativeHorizontalPosition = tblpXSpec;
+			const tblpY = attrNum(tblpPr, "w:tblpY");
+			if (tblpY !== void 0) floatOpts.absoluteVerticalPosition = tblpY;
+			const tblpYSpec = attr(tblpPr, "w:tblpYSpec");
+			if (tblpYSpec) floatOpts.relativeVerticalPosition = tblpYSpec;
+			const bottomFromText = attrNum(tblpPr, "w:bottomFromText");
+			if (bottomFromText !== void 0) floatOpts.bottomFromText = bottomFromText;
+			const topFromText = attrNum(tblpPr, "w:topFromText");
+			if (topFromText !== void 0) floatOpts.topFromText = topFromText;
+			const leftFromText = attrNum(tblpPr, "w:leftFromText");
+			if (leftFromText !== void 0) floatOpts.leftFromText = leftFromText;
+			const rightFromText = attrNum(tblpPr, "w:rightFromText");
+			if (rightFromText !== void 0) floatOpts.rightFromText = rightFromText;
+		}
+		if (tblOverlap) {
+			const overlap = attr(tblOverlap, "w:val");
+			if (overlap) floatOpts.overlap = overlap;
+		}
 		if (Object.keys(floatOpts).length > 0) opts.float = floatOpts;
 	}
 	const tblInd = findChild(el, "w:tblInd");
@@ -4865,7 +4988,7 @@ function parseTablePropertiesEl(el) {
 		const type = attr(tblCellSpacing, "w:type");
 		const w = attrNum(tblCellSpacing, "w:w");
 		if (w !== void 0) opts.cellSpacing = {
-			value: w,
+			size: w,
 			...type ? { type } : {}
 		};
 	}
@@ -4882,17 +5005,51 @@ function parseTablePropertiesEl(el) {
 		if (innerTblPr) Object.assign(rev, parseTablePropertiesEl(innerTblPr));
 		if (Object.keys(rev).length > 0) opts.revision = rev;
 	}
+	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 parseColumnWidthsEl(el) {
-	const cols = [];
+	const widths = [];
 	const tblGrid = findChild(el, "w:tblGrid");
-	if (!tblGrid) return cols;
+	if (!tblGrid) return { widths };
 	for (const col of children(tblGrid, "w:gridCol")) {
 		const w = attrNum(col, "w:w");
-		cols.push(w ?? 100);
+		widths.push(w ?? 100);
+	}
+	const tblGridChange = findChild(tblGrid, "w:tblGridChange");
+	if (tblGridChange) {
+		const id = attrNum(tblGridChange, "w:id");
+		const innerGrid = findChild(tblGridChange, "w:tblGrid");
+		const revWidths = [];
+		if (innerGrid) for (const col of children(innerGrid, "w:gridCol")) {
+			const w = attrNum(col, "w:w");
+			revWidths.push(w ?? 100);
+		}
+		if (id !== void 0) return {
+			widths,
+			revision: {
+				id,
+				columnWidths: revWidths
+			}
+		};
 	}
-	return cols;
+	return { widths };
 }
 function parseTableRowPropertiesEl(el) {
 	const opts = {};
@@ -4902,18 +5059,13 @@ function parseTableRowPropertiesEl(el) {
 		const rule = attr(trHeight, "w:hRule");
 		if (val !== void 0) opts.height = {
 			value: val,
-			rule: rule ?? "atLeast"
+			...rule ? { rule } : {}
 		};
 	}
 	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 cnf = parseCnfStyle(cnfStyle);
+		if (cnf) opts.cnfStyle = cnf;
 	}
 	const divId = findChild(el, "w:divId");
 	if (divId) {
@@ -4962,7 +5114,7 @@ function parseTableRowPropertiesEl(el) {
 		const type = attr(tblCellSpacing, "w:type");
 		const w = attrNum(tblCellSpacing, "w:w");
 		if (w !== void 0) opts.cellSpacing = {
-			value: w,
+			size: w,
 			...type ? { type } : {}
 		};
 	}
@@ -4987,34 +5139,22 @@ function parseTableRowPropertiesEl(el) {
 	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) {
 	const opts = {};
+	const cnfStyle = findChild(el, "w:cnfStyle");
+	if (cnfStyle) {
+		const cnf = parseCnfStyle(cnfStyle);
+		if (cnf) opts.cnfStyle = cnf;
+	}
 	const tcW = findChild(el, "w:tcW");
 	if (tcW) {
 		const size = attrNum(tcW, "w:w");
 		const type = attr(tcW, "w:type");
 		if (size !== void 0) opts.width = {
 			size,
-			type: type ?? "dxa"
+			...type ? { type } : {}
 		};
 	}
 	const gridSpan = findChild(el, "w:gridSpan");
@@ -5031,39 +5171,47 @@ function parseTableCellPropertiesEl(el) {
 	}
 	const shd = findChild(el, "w:shd");
 	if (shd) {
-		const shading = {};
-		const fill = attr(shd, "w:fill");
-		if (fill) shading.fill = fill;
-		const color = attr(shd, "w:color");
-		if (color) shading.color = color;
-		const val = attr(shd, "w:val");
-		if (val) shading.type = val;
-		if (Object.keys(shading).length > 0) opts.shading = shading;
+		const shading = parseShading(shd);
+		if (shading) opts.shading = shading;
 	}
 	const tcBorders = findChild(el, "w:tcBorders");
 	if (tcBorders) {
-		const borders = {};
-		for (const [xmlSide, key] of [
+		const SIDE_KEYS = [
 			["top", "top"],
 			["start", "start"],
 			["left", "left"],
 			["bottom", "bottom"],
 			["end", "end"],
 			["right", "right"],
+			["insideH", "insideHorizontal"],
+			["insideV", "insideVertical"],
 			["tl2br", "topLeftToBottomRight"],
 			["tr2bl", "topRightToBottomLeft"]
-		]) {
+		];
+		const borders = {};
+		for (const [xmlSide, key] of SIDE_KEYS) {
 			const sideEl = findChild(tcBorders, `w:${xmlSide}`);
-			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;
-				borders[key] = b;
-			}
+			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;
 	}
@@ -5071,26 +5219,8 @@ function parseTableCellPropertiesEl(el) {
 	if (noWrap) opts.noWrap = attrBool(noWrap, "w:val") ?? true;
 	const tcMar = findChild(el, "w:tcMar");
 	if (tcMar) {
-		const margins = {};
-		let marginUnitType;
-		for (const side of [
-			"top",
-			"bottom",
-			"left",
-			"right"
-		]) {
-			const sideEl = findChild(tcMar, `w:${side}`);
-			if (sideEl) {
-				const size = attrNum(sideEl, "w:w");
-				const type = attr(sideEl, "w:type");
-				if (size !== void 0) {
-					margins[side] = size;
-					if (type && !marginUnitType) marginUnitType = type;
-				}
-			}
-		}
-		if (marginUnitType) margins.marginUnitType = marginUnitType;
-		if (Object.keys(margins).length > 0) opts.margins = margins;
+		const margins = parseCellMargins(tcMar);
+		if (margins) opts.margins = margins;
 	}
 	const textDirection = findChild(el, "w:textDirection");
 	if (textDirection) {
@@ -5161,6 +5291,11 @@ function parseTableRowEl(el, ctx) {
 	const opts = {};
 	const trPr = findChild(el, "w:trPr");
 	if (trPr) Object.assign(opts, parseTableRowPropertiesEl(trPr));
+	const tblPrEx = findChild(el, "w:tblPrEx");
+	if (tblPrEx) {
+		const exceptions = parseTablePropertyExceptions(tblPrEx);
+		if (Object.keys(exceptions).length > 0) opts.propertyExceptions = exceptions;
+	}
 	for (const [attrName, optKey] of [
 		["w:rsidRPr", "rsidRPr"],
 		["w:rsidR", "rsidR"],
@@ -5207,8 +5342,9 @@ function parseTableEl(el, ctx) {
 	const opts = {};
 	const tblPr = findChild(el, "w:tblPr");
 	if (tblPr) Object.assign(opts, parseTablePropertiesEl(tblPr));
-	const colWidths = parseColumnWidthsEl(el);
-	if (colWidths.length > 0) opts.columnWidths = colWidths;
+	const grid = parseColumnWidthsEl(el);
+	if (grid.widths.length > 0) opts.columnWidths = grid.widths;
+	if (grid.revision) opts.columnWidthsRevision = grid.revision;
 	const rows = [];
 	for (const child of el.elements ?? []) if (child.name === "w:tr") rows.push(parseTableRowEl(child, ctx));
 	else if (child.name === "w:sdt") {
@@ -6224,4 +6360,4 @@ function parseNotePropertiesEl(el) {
 //#endregion
 export { setBodyParseChild as $, stringifyParagraphInline as A, HorizontalPositionAlign as B, createPageSize as C, Media as Ct, parseSdtBlock as D, tableDesc as E, parseDrawingRun as F, createWrapTight as G, SpaceType as H, createVerticalPosition as I, altChunkDesc as J, TextWrappingSide as K, createHorizontalPosition as L, parseMathChildren as M, drawingDesc as N, parseSdtProperties as O, resetDrawingIdGen as P, sdtBlockDesc as Q, HorizontalPositionRelativeFrom as R, PageOrientation as S, WORKAROUND2 as St, setTableParseChild as T, VerticalPositionAlign as U, NumberFormat as V, createWrapThrough as W, customXmlBlockDesc as X, checkboxSymbolRunInner as Y, parseCustomXmlPr as Z, DocumentGridType as _, TextHorzOverflowType as _t, HeaderFooterType as a, stringifyRunProperties as at, sectionPageSizeDefaults as b, VerticalAnchor as bt, createSectionType as c, parsedRunToOptions as ct, createPageMargin as d, TextDirection as dt, stringifyCustomXmlShell as et, PageBorderDisplay as f, VerticalMergeType as ft, createPageNumberType as g, TextBodyWrappingType as gt, PageNumberSeparator as h, parseFormFieldData as ht, HeaderFooterReferenceType as i, stringifyParagraphProperties as it, stringifyRunInline as j, stringifyChildDispatch as k, LineNumberRestartFormat as l, WidthType as lt, PageBorderZOrder as m, createFormFieldData as mt, sectionPropertiesDesc as n, stringifySdtShell as nt, createHeaderFooterReference as o, parseRun as ot, PageBorderOffsetFrom as p, FormFieldTextType as pt, TextWrappingType as q, stringifySectionPropertiesXml as r, subDocDesc as rt, SectionType as s, parseRunProperties as st, parseSectionPropertiesEl as t, stringifySdtPr as tt, createLineNumberType as u, BorderStyle as ut, createDocumentGrid as v, TextVertOverflowType as vt, DocumentAttributeNamespaces as w, createTransformation as wt, PageTextDirectionType as x, createBodyProperties as xt, sectionMarginDefaults as y, TextVerticalType as yt, VerticalPositionRelativeFrom as z };
 
-//# sourceMappingURL=document-DYH7tGnw.mjs.map
+//# sourceMappingURL=document-D2OTVcbX.mjs.map