@office-open/docx 0.10.0 → 0.10.1

package/dist/{parts-BWmkYaBr.mjs → parts-DVpfsxSR.mjs}

@@ -1,5 +1,5 @@
 import { DOCX_PARTS, Relationships, TargetModeType, ThemeColor, appPropertiesDesc, blipDesc, buildContentTypeOverrides, convertEmuToPixels, convertInchesToTwip, convertPixelsToEmu, convertToEmu, convertToTwip, convertUniversalMeasureToEmu, customGeometryDesc, customPropertiesDesc, decimalNumber, derivePasswordHash, effectListDesc, eighthPointMeasureValue, fillDesc, hexColorValue, hpsMeasureValue, measurementOrPercentValue, outlineDesc, parseColorChoice, pointMeasureValue, signedTwipsMeasureValue, toUint8Array, twipsMeasureValue, uCharHexNumber, uniqueId, uniqueNumericIdCreator, uniqueUuid, xsdVerticalMergeRev } from "@office-open/core";
-import { attr, attrBool, attrNum, children, colorAttr, element, escapeXml, findChild, findDeep, stringify, textOf } from "@office-open/xml";
+import { attr, attrBool, attrMeasure, attrNum, children, colorAttr, element, escapeXml, findChild, findDeep, stringify, textOf } from "@office-open/xml";
 import { calculateEffectExtent, createColorElement, createEffectDag, createScene3D, createShape3D, customGeometryDesc as customGeometryDesc$1, effectListDesc as effectListDesc$1, extractBlipFillMedia, fillDesc as fillDesc$1, outlineDesc as outlineDesc$1, scene3DDesc, shape3DDesc, transform2DDesc } from "@office-open/core/drawingml";
 import { chartSpaceDesc } from "@office-open/core/chart";
 import { createDataModel } from "@office-open/core/smartart";
@@ -76,16 +76,6 @@ const AlignmentType = {
 //#endregion
 //#region src/parts/paragraph/formatting/spacing.ts
 /**
-* Paragraph spacing module for WordprocessingML documents.
-*
-* This module provides spacing options for paragraphs including space before,
-* space after, and line spacing.
-*
-* Reference: http://officeopenxml.com/WPspacing.php
-*
-* @module
-*/
-/**
 * Line spacing rule types.
 *
 * Specifies how the line height is calculated.
@@ -177,6 +167,18 @@ const TextboxTightWrapType = {
 //#endregion
 //#region src/parts/paragraph/run/run.ts
 /**
+* Serialize a break option (count shorthand or structured with clear) to one or
+* more `<w:br/>` tags.
+*/
+function breakXml(breakOpt) {
+	if (!breakOpt) return "";
+	const count = typeof breakOpt === "number" ? breakOpt : breakOpt.count ?? 1;
+	if (count <= 0) return "";
+	const clear = typeof breakOpt === "object" ? breakOpt.clear : void 0;
+	const one = clear ? `<w:br w:clear="${clear}"/>` : "<w:br/>";
+	return count === 1 ? one : one.repeat(count);
+}
+/**
 * Constants for page number field types.
 *
 * These values are used to insert dynamic page number fields into a document.
@@ -570,13 +572,13 @@ const parseBodyProperties = (el) => {
 	if (vert !== void 0) result.vert = vert;
 	const wrap = attr(el, "wrap");
 	if (wrap !== void 0) result.wrap = wrap;
-	const lIns = attrNum(el, "lIns");
+	const lIns = attrMeasure(el, "lIns");
 	if (lIns !== void 0) result.lIns = lIns;
-	const tIns = attrNum(el, "tIns");
+	const tIns = attrMeasure(el, "tIns");
 	if (tIns !== void 0) result.tIns = tIns;
-	const rIns = attrNum(el, "rIns");
+	const rIns = attrMeasure(el, "rIns");
 	if (rIns !== void 0) result.rIns = rIns;
-	const bIns = attrNum(el, "bIns");
+	const bIns = attrMeasure(el, "bIns");
 	if (bIns !== void 0) result.bIns = bIns;
 	const numCol = attrNum(el, "numCol");
 	if (numCol !== void 0) result.numCol = numCol;
@@ -1328,6 +1330,149 @@ const WidthType = {
 	PERCENTAGE: "pct"
 };
 //#endregion
+//#region src/parts/object/object-element.ts
+/**
+* Object element for WordprocessingML documents — w:object.
+*
+* Embeds an OLE object (e.g. an Excel sheet) in a run via a VML preview shape and
+* exactly one of objectEmbed / objectLink / control / movie. The OLE binary is
+* registered as word/embeddings/oleObjectN.bin (EmbeddingCollection); the optional
+* preview icon as word/media/imageN.<type> (Media). Relationship ids are emitted
+* as `{fileName}` placeholders and rewritten by the compiler's media bridge.
+*
+* Reference: OOXML transitional, wml.xsd, CT_Object / CT_ObjectEmbed / CT_ObjectLink
+*
+* @module
+*/
+let objectShapeCounter = 1025;
+const objectDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const inner = [];
+		const shapeId = opts.shapeId ?? `_x0000_i${objectShapeCounter++}`;
+		const widthVal = opts.width ?? 100;
+		const heightVal = opts.height ?? 100;
+		const styleWidth = typeof widthVal === "number" ? `${widthVal}px` : widthVal;
+		const styleHeight = typeof heightVal === "number" ? `${heightVal}px` : heightVal;
+		const shapeChildren = [];
+		if (opts.iconImage) {
+			const iconFileName = ctx.file.media.nextMediaName(opts.iconImage.type);
+			const iconMediaData = {
+				type: opts.iconImage.type,
+				...createImageData$1(toUint8Array(opts.iconImage.data), {
+					width: widthVal,
+					height: heightVal
+				}, iconFileName)
+			};
+			ctx.file.media.addImage(iconFileName, iconMediaData);
+			const titleAttr = opts.iconImage.title ? ` o:title="${opts.iconImage.title}"` : "";
+			shapeChildren.push(`<v:imagedata r:id="{${iconFileName}}"${titleAttr}/>`);
+		}
+		inner.push(`<v:shape id="${shapeId}" type="#_x0000_t75" style="width:${styleWidth};height:${styleHeight}">${shapeChildren.join("")}</v:shape>`);
+		if (opts.embed) {
+			const fileName = registerEmbedding(opts.embed, ctx);
+			inner.push(`<w:objectEmbed r:id="{${fileName}}"${embedAttrs(opts.embed)}/>`);
+		} else if (opts.link) {
+			const fileName = registerEmbedding(opts.link, ctx);
+			const locked = opts.link.lockedField ? ` w:lockedField="true"` : "";
+			inner.push(`<w:objectLink r:id="{${fileName}}"${embedAttrs(opts.link)} w:updateMode="${opts.link.updateMode}"${locked}/>`);
+		} else if (opts.control) {
+			const c = opts.control;
+			const cAttrs = [` r:id="${c.rId}"`];
+			if (c.name) cAttrs.push(` w:name="${c.name}"`);
+			if (c.shapeid) cAttrs.push(` w:shapeid="${c.shapeid}"`);
+			inner.push(`<w:control${cAttrs.join("")}/>`);
+		} else if (opts.movie) inner.push(`<w:movie r:id="${opts.movie}"/>`);
+		const objAttrs = [];
+		if (opts.dxaOrig !== void 0) objAttrs.push(` w:dxaOrig="${opts.dxaOrig}"`);
+		if (opts.dyaOrig !== void 0) objAttrs.push(` w:dyaOrig="${opts.dyaOrig}"`);
+		return `<w:object${objAttrs.join("")}>${inner.join("")}</w:object>`;
+	},
+	parse(el, _ctx) {
+		const result = {};
+		const dxaOrig = attrNum(el, "w:dxaOrig");
+		if (dxaOrig !== void 0) result.dxaOrig = dxaOrig;
+		const dyaOrig = attrNum(el, "w:dyaOrig");
+		if (dyaOrig !== void 0) result.dyaOrig = dyaOrig;
+		const shape = findChild(el, "v:shape");
+		if (shape) {
+			const id = attr(shape, "id");
+			if (id) result.shapeId = id;
+			const style = attr(shape, "style");
+			if (style) {
+				const w = style.match(/width:([^;]+)/);
+				const h = style.match(/height:([^;]+)/);
+				if (w) result.width = w[1].trim();
+				if (h) result.height = h[1].trim();
+			}
+		}
+		const embedEl = findChild(el, "w:objectEmbed");
+		if (embedEl) result.embed = parseEmbed(embedEl);
+		const linkEl = findChild(el, "w:objectLink");
+		if (linkEl) {
+			const base = parseEmbed(linkEl);
+			const updateMode = attr(linkEl, "w:updateMode");
+			const lockedField = attr(linkEl, "w:lockedField");
+			result.link = {
+				...base,
+				...updateMode ? { updateMode } : {},
+				...lockedField !== void 0 ? { lockedField: lockedField === "true" || lockedField === "1" } : {}
+			};
+		}
+		const controlEl = findChild(el, "w:control");
+		if (controlEl) {
+			const rId = attr(controlEl, "r:id") ?? "";
+			const name = attr(controlEl, "w:name");
+			const shapeid = attr(controlEl, "w:shapeid");
+			result.control = {
+				rId,
+				...name ? { name } : {},
+				...shapeid ? { shapeid } : {}
+			};
+		}
+		const movieEl = findChild(el, "w:movie");
+		if (movieEl) {
+			const rId = attr(movieEl, "r:id");
+			if (rId) result.movie = rId;
+		}
+		return result;
+	}
+};
+/** Register an OLE embedding and return its allocated file name. */
+function registerEmbedding(opts, ctx) {
+	const fileName = ctx.file.embeddings.nextEmbeddingName();
+	const data = {
+		fileName,
+		data: toUint8Array(opts.data),
+		...opts.progId ? { progId: opts.progId } : {}
+	};
+	ctx.file.embeddings.addEmbedding(fileName, data);
+	return fileName;
+}
+/** Build the common objectEmbed/objectLink attribute string (excludes r:id). */
+function embedAttrs(opts) {
+	const attrs = [];
+	if (opts.drawAspect) attrs.push(` w:drawAspect="${opts.drawAspect}"`);
+	if (opts.progId) attrs.push(` w:progId="${opts.progId}"`);
+	if (opts.shapeId) attrs.push(` w:shapeId="${opts.shapeId}"`);
+	if (opts.fieldCodes) attrs.push(` w:fieldCodes="${opts.fieldCodes}"`);
+	return attrs.join("");
+}
+/** Parse common objectEmbed/objectLink attributes (excludes r:id — external on parse). */
+function parseEmbed(el) {
+	const opts = {};
+	const drawAspect = attr(el, "w:drawAspect");
+	if (drawAspect === "content" || drawAspect === "icon") opts.drawAspect = drawAspect;
+	const progId = attr(el, "w:progId");
+	if (progId) opts.progId = progId;
+	const shapeId = attr(el, "w:shapeId");
+	if (shapeId) opts.shapeId = shapeId;
+	const fieldCodes = attr(el, "w:fieldCodes");
+	if (fieldCodes) opts.fieldCodes = fieldCodes;
+	opts.data = new Uint8Array();
+	return opts;
+}
+//#endregion
 //#region src/util/stringify-element.ts
 /**
 * Element-to-XML serialization helpers shared across the parse layer.
@@ -1489,7 +1634,7 @@ function parseRunProperties(el) {
 	}
 	const spacing = findChild(el, "w:spacing");
 	if (spacing) {
-		const val = attrNum(spacing, "w:val");
+		const val = attrMeasure(spacing, "w:val");
 		if (val !== void 0) opts.characterSpacing = val;
 	}
 	const scale = findChild(el, "w:w");
@@ -1646,8 +1791,10 @@ const PARSED_LAST_RENDERED_PAGE_BREAK = Symbol("LastRenderedPageBreak");
 function parseRun(el, _ctx) {
 	const rPr = findChild(el, "w:rPr");
 	const properties = rPr ? parseRunProperties(rPr) : void 0;
-	const rPrRawXml = rPr ? stringifyElement(rPr) : void 0;
 	const children = [];
+	const rsid = attr(el, "w:rsidR");
+	const runPropertiesRsid = attr(el, "w:rsidRPr");
+	const deletionRsid = attr(el, "w:rsidDel");
 	for (const child of el.elements ?? []) switch (child.name) {
 		case "w:rPr": break;
 		case "w:t": {
@@ -1664,8 +1811,13 @@ function parseRun(el, _ctx) {
 		}
 		case "w:br": {
 			const brType = attr(child, "w:type");
+			const brClear = attr(child, "w:clear");
 			if (brType === "page") children.push(PARSED_PAGE_BREAK);
 			else if (brType === "column") children.push(PARSED_COLUMN_BREAK);
+			else if (brClear) children.push({ break: {
+				count: 1,
+				clear: brClear
+			} });
 			else children.push(PARSED_LINE_BREAK);
 			break;
 		}
@@ -1688,6 +1840,9 @@ function parseRun(el, _ctx) {
 		}
 		case "w:drawing":
 		case "w:pict": break;
+		case "w:object":
+			children.push({ object: objectDesc.parse(child, _ctx) });
+			break;
 		case "w:sym": {
 			const charVal = attr(child, "w:char");
 			const fontVal = attr(child, "w:font");
@@ -1699,12 +1854,24 @@ function parseRun(el, _ctx) {
 		}
 		case "w:footnoteReference": {
 			const id = attrNum(child, "w:id");
-			if (id !== void 0) children.push({ footnoteReference: id });
+			if (id !== void 0) {
+				const customMarkFollows = attrBool(child, "w:customMarkFollows") === true;
+				children.push(customMarkFollows ? { footnoteReference: {
+					id,
+					customMarkFollows: true
+				} } : { footnoteReference: id });
+			}
 			break;
 		}
 		case "w:endnoteReference": {
 			const id = attrNum(child, "w:id");
-			if (id !== void 0) children.push({ endnoteReference: id });
+			if (id !== void 0) {
+				const customMarkFollows = attrBool(child, "w:customMarkFollows") === true;
+				children.push(customMarkFollows ? { endnoteReference: {
+					id,
+					customMarkFollows: true
+				} } : { endnoteReference: id });
+			}
 			break;
 		}
 		case "w:footnoteRef":
@@ -1748,8 +1915,10 @@ function parseRun(el, _ctx) {
 	}
 	return {
 		properties,
-		rPrRawXml,
-		children
+		children,
+		rsid,
+		runPropertiesRsid,
+		deletionRsid
 	};
 }
 /**
@@ -1783,15 +1952,26 @@ function parsedRunToOptions(parsed) {
 	const contentChildren = parsed.children.filter((c) => c !== PARSED_FOOTNOTE_REF);
 	if (contentChildren.length === 0 && parsed.children.some((c) => c === PARSED_FOOTNOTE_REF)) return null;
 	const opts = { ...parsed.properties };
-	if (parsed.rPrRawXml) opts.rPrRawXml = parsed.rPrRawXml;
+	if (parsed.rsid) opts.rsid = parsed.rsid;
+	if (parsed.runPropertiesRsid) opts.runPropertiesRsid = parsed.runPropertiesRsid;
+	if (parsed.deletionRsid) opts.deletionRsid = parsed.deletionRsid;
 	const isRefChild = (c) => typeof c === "object" && c !== null && ("commentReference" in c || "footnoteReference" in c || "endnoteReference" in c);
 	const refChildren = contentChildren.filter(isRefChild);
 	const nonRefChildren = contentChildren.filter((c) => !isRefChild(c));
 	if (refChildren.length > 0 && nonRefChildren.length === 0) return refChildren[0];
 	const symbolIdx = nonRefChildren.findIndex((c) => typeof c === "object" && c !== null && "symbolRun" in c);
 	if (symbolIdx >= 0 && nonRefChildren.length === 1 && !parsed.properties) return nonRefChildren[symbolIdx];
+	const objectIdx = nonRefChildren.findIndex((c) => typeof c === "object" && c !== null && "object" in c);
+	if (objectIdx >= 0) {
+		const objectChild = nonRefChildren[objectIdx];
+		return {
+			...parsed.properties,
+			...objectChild
+		};
+	}
 	const textParts = [];
 	let breakCount = 0;
+	const structuredBreaks = [];
 	let hasPageBreak = false;
 	let hasColumnBreak = false;
 	const extraChildren = [];
@@ -1799,16 +1979,19 @@ function parsedRunToOptions(parsed) {
 	else if (child === PARSED_LINE_BREAK) breakCount++;
 	else if (child === PARSED_PAGE_BREAK) hasPageBreak = true;
 	else if (child === PARSED_COLUMN_BREAK) hasColumnBreak = true;
+	else if (typeof child === "object" && child !== null && "break" in child) structuredBreaks.push(child.break);
 	else {
 		const mapped = SYMBOL_TO_CHILD.get(child);
 		if (mapped) extraChildren.push(mapped);
 	}
-	if (extraChildren.length > 0) {
+	const hasStructuredBreaks = structuredBreaks.length > 0;
+	if (extraChildren.length > 0 || hasStructuredBreaks && (breakCount > 0 || structuredBreaks.length > 1 || hasPageBreak || hasColumnBreak)) {
 		const children = [];
 		for (const child of nonRefChildren) if (typeof child === "string") children.push(child);
 		else if (child === PARSED_LINE_BREAK) children.push({ break: 1 });
 		else if (child === PARSED_PAGE_BREAK) children.push({ pageBreak: true });
 		else if (child === PARSED_COLUMN_BREAK) children.push({ columnBreak: true });
+		else if (typeof child === "object" && child !== null && "break" in child) children.push({ break: child.break });
 		else {
 			const mapped = SYMBOL_TO_CHILD.get(child);
 			if (mapped) children.push(mapped);
@@ -1817,6 +2000,7 @@ function parsedRunToOptions(parsed) {
 	} else {
 		if (textParts.length > 0) opts.text = textParts.join("");
 		if (breakCount > 0) opts.break = breakCount;
+		else if (hasStructuredBreaks) opts.break = structuredBreaks[0];
 		if (hasPageBreak) opts.pageBreak = true;
 		if (hasColumnBreak) opts.columnBreak = true;
 	}
@@ -1872,13 +2056,13 @@ function shadingStr(opts) {
 }
 function spacingStr(opts) {
 	return `<w:spacing ${attrParts({
-		"w:after": opts.after,
+		"w:after": opts.after !== void 0 ? twipsMeasureValue(opts.after) : void 0,
 		"w:afterAutospacing": opts.afterAutoSpacing !== void 0 ? opts.afterAutoSpacing ? 1 : 0 : void 0,
 		"w:afterLines": opts.afterLines !== void 0 ? decimalNumber(opts.afterLines) : void 0,
-		"w:before": opts.before,
+		"w:before": opts.before !== void 0 ? twipsMeasureValue(opts.before) : void 0,
 		"w:beforeAutospacing": opts.beforeAutoSpacing !== void 0 ? opts.beforeAutoSpacing ? 1 : 0 : void 0,
 		"w:beforeLines": opts.beforeLines !== void 0 ? decimalNumber(opts.beforeLines) : void 0,
-		"w:line": opts.line,
+		"w:line": opts.line !== void 0 ? twipsMeasureValue(opts.line) : void 0,
 		"w:lineRule": opts.lineRule
 	})}/>`;
 }
@@ -2141,9 +2325,9 @@ function stringifyRunPropertiesInner(opts) {
 	else if ("name" in opts.font) parts.push(runFontsStr(opts.font.name, opts.font.hint));
 	else parts.push(runFontsStr(opts.font));
 	if (opts.bold !== void 0) parts.push(onOff$1("w:b", opts.bold));
-	if ((opts.boldComplexScript === void 0 && opts.bold !== void 0 || opts.boldComplexScript) !== void 0) parts.push(onOff$1("w:bCs", opts.boldComplexScript ?? opts.bold));
+	if (opts.boldComplexScript !== void 0) parts.push(onOff$1("w:bCs", opts.boldComplexScript));
 	if (opts.italic !== void 0) parts.push(onOff$1("w:i", opts.italic));
-	if ((opts.italicComplexScript === void 0 && opts.italic !== void 0 || opts.italicComplexScript) !== void 0) parts.push(onOff$1("w:iCs", opts.italicComplexScript ?? opts.italic));
+	if (opts.italicComplexScript !== void 0) parts.push(onOff$1("w:iCs", opts.italicComplexScript));
 	if (opts.smallCaps !== void 0) parts.push(onOff$1("w:smallCaps", opts.smallCaps));
 	else if (opts.allCaps !== void 0) parts.push(onOff$1("w:caps", opts.allCaps));
 	if (opts.strike !== void 0) parts.push(onOff$1("w:strike", opts.strike));
@@ -2162,12 +2346,9 @@ function stringifyRunPropertiesInner(opts) {
 	if (opts.kern !== void 0) parts.push(`<w:kern w:val="${hpsMeasureValue(opts.kern)}"/>`);
 	if (opts.position) parts.push(`<w:position w:val="${opts.position}"/>`);
 	if (opts.size !== void 0) parts.push(`<w:sz w:val="${hpsMeasureValue(opts.size * 2)}"/>`);
-	const szCs = opts.sizeComplexScript === void 0 || opts.sizeComplexScript === true ? opts.size : opts.sizeComplexScript;
-	if (szCs) parts.push(`<w:szCs w:val="${hpsMeasureValue(szCs * 2)}"/>`);
+	if (opts.sizeComplexScript !== void 0) parts.push(`<w:szCs w:val="${hpsMeasureValue(opts.sizeComplexScript * 2)}"/>`);
 	if (opts.highlight) parts.push(`<w:highlight w:val="${opts.highlight}"/>`);
-	if (opts.highlightComplexScript === true) {
-		if (opts.highlight) parts.push(`<w:highlightCs w:val="${opts.highlight}"/>`);
-	} else if (opts.highlightComplexScript !== void 0 && opts.highlightComplexScript !== false) parts.push(`<w:highlightCs w:val="${opts.highlightComplexScript}"/>`);
+	if (opts.highlightComplexScript !== void 0) parts.push(`<w:highlightCs w:val="${opts.highlightComplexScript}"/>`);
 	if (opts.underline) parts.push(underlineStr(opts.underline.type, opts.underline.color));
 	if (opts.effect) parts.push(`<w:effect w:val="${opts.effect}"/>`);
 	if (opts.border) parts.push(borderStr("w:bdr", opts.border));
@@ -3292,32 +3473,6 @@ const PageOrientation = {
 	*/
 	LANDSCAPE: "landscape"
 };
-/**
-* This element specifies the properties (size and orientation) for all pages in the current section.
-*
-* Reference: https://c-rex.net/samples/ooxml/e1/Part4/OOXML_P4_DOCX_pgSz_topic_ID0ENEDT.html?hl=pgsz%2Cpage%2Csize
-*
-* ## XSD Schema
-*
-* ```xml
-* <xsd:complexType name="CT_PageSz">
-*   <xsd:attribute name="w" type="s:ST_TwipsMeasure"/>
-*   <xsd:attribute name="h" type="s:ST_TwipsMeasure"/>
-*   <xsd:attribute name="orient" type="ST_PageOrientation" use="optional"/>
-*   <xsd:attribute name="code" type="ST_DecimalNumber" use="optional"/>
-* </xsd:complexType>
-* ```
-*/
-const createPageSize = ({ width = 11906, height = 16838, orientation, code }) => {
-	const widthTwips = twipsMeasureValue(width);
-	const heightTwips = twipsMeasureValue(height);
-	return element("w:pgSz", {
-		"w:code": code,
-		"w:h": orientation === PageOrientation.LANDSCAPE ? widthTwips : heightTwips,
-		"w:orient": orientation,
-		"w:w": orientation === PageOrientation.LANDSCAPE ? heightTwips : widthTwips
-	});
-};
 //#endregion
 //#region src/parts/document/body/section-properties/properties/page-text-direction.ts
 /**
@@ -3492,8 +3647,10 @@ function stringifySectionPropertiesInner(opts) {
 	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;
+	const wTwips = convertToTwip(width);
+	const hTwips = convertToTwip(height);
+	const pgW = orientation === "landscape" ? hTwips : wTwips;
+	const pgH = orientation === "landscape" ? wTwips : hTwips;
 	parts.push(pageSizeXml(pgW, pgH, orientation, code));
 	parts.push(pageMarginXml(top, right, bottom, left, header, footer, gutter));
 	if (borders) parts.push(pageBordersXml(borders));
@@ -3543,20 +3700,20 @@ const sectionPropertiesDesc = {
 function stringifySectionPropertiesXml(opts) {
 	const inner = stringifySectionPropertiesInner(opts);
 	const attrs = [];
-	if (opts.rsidRPr !== void 0) attrs.push(`w:rsidRPr="${opts.rsidRPr}"`);
-	if (opts.rsidDel !== void 0) attrs.push(`w:rsidDel="${opts.rsidDel}"`);
-	if (opts.rsidR !== void 0) attrs.push(`w:rsidR="${opts.rsidR}"`);
-	if (opts.rsidSect !== void 0) attrs.push(`w:rsidSect="${opts.rsidSect}"`);
+	if (opts.runPropertiesRsid !== void 0) attrs.push(`w:rsidRPr="${opts.runPropertiesRsid}"`);
+	if (opts.deletionRsid !== void 0) attrs.push(`w:rsidDel="${opts.deletionRsid}"`);
+	if (opts.rsid !== void 0) attrs.push(`w:rsidR="${opts.rsid}"`);
+	if (opts.sectionRsid !== void 0) attrs.push(`w:rsidSect="${opts.sectionRsid}"`);
 	return `<w:sectPr${attrs.length ? " " + attrs.join(" ") : ""}>${inner}</w:sectPr>`;
 }
 /** Parse a w:sectPr element into SectionPropertiesOptions. */
 function parseSectionPropertiesEl(el) {
 	const opts = {};
 	for (const [attrName, optKey] of [
-		["w:rsidR", "rsidR"],
-		["w:rsidRPr", "rsidRPr"],
-		["w:rsidDel", "rsidDel"],
-		["w:rsidSect", "rsidSect"]
+		["w:rsidR", "rsid"],
+		["w:rsidRPr", "runPropertiesRsid"],
+		["w:rsidDel", "deletionRsid"],
+		["w:rsidSect", "sectionRsid"]
 	]) {
 		const val = attr(el, attrName);
 		if (val) opts[optKey] = val;
@@ -3616,7 +3773,7 @@ function parseSectionPropertiesEl(el) {
 		const column = {};
 		const count = attrNum(cols, "w:num");
 		if (count !== void 0) column.count = count;
-		const space = attrNum(cols, "w:space");
+		const space = attrMeasure(cols, "w:space");
 		if (space !== void 0) column.space = space;
 		const separate = attrBool(cols, "w:sep");
 		if (separate !== void 0) column.separate = separate;
@@ -3625,10 +3782,10 @@ function parseSectionPropertiesEl(el) {
 		const colChildren = [];
 		for (const colEl of cols.elements ?? []) {
 			if (colEl.name !== "w:col") continue;
-			const width = attrNum(colEl, "w:w");
+			const width = attrMeasure(colEl, "w:w");
 			if (width === void 0) continue;
 			const colAttr = { width };
-			const colSpace = attrNum(colEl, "w:space");
+			const colSpace = attrMeasure(colEl, "w:space");
 			if (colSpace !== void 0) colAttr.space = colSpace;
 			colChildren.push(colAttr);
 		}
@@ -4077,7 +4234,7 @@ function stringifyMathInput(value) {
 	if (typeof value !== "object" || value === null) return "";
 	if ("subSuperScript" in value) {
 		const opts = value.subSuperScript;
-		return `<m:sSubSup><m:sSubSupPr/><m:e>${stringifyChildren(opts.children)}</m:e><m:sub>${stringifyChildren(opts.subScript)}</m:sub><m:sup>${stringifyChildren(opts.superScript)}</m:sup></m:sSubSup>`;
+		return `<m:sSubSup>${opts.alignScript ? "<m:sSubSupPr><m:alnScr m:val=\"1\"/></m:sSubSupPr>" : "<m:sSubSupPr/>"}<m:e>${stringifyChildren(opts.children)}</m:e><m:sub>${stringifyChildren(opts.subScript)}</m:sub><m:sup>${stringifyChildren(opts.superScript)}</m:sup></m:sSubSup>`;
 	}
 	if ("preSubSuperScript" in value) {
 		const opts = value.preSubSuperScript;
@@ -4093,7 +4250,10 @@ function stringifyMathInput(value) {
 	}
 	if ("fraction" in value) {
 		const opts = value.fraction;
-		return `<m:f>${opts.fractionType ? `<m:fPr><m:type m:val="${opts.fractionType}"/></m:fPr>` : ""}<m:num>${stringifyChildren(opts.numerator)}</m:num><m:den>${stringifyChildren(opts.denominator)}</m:den></m:f>`;
+		const pr = opts.fractionType ? `<m:fPr><m:type m:val="${opts.fractionType}"/></m:fPr>` : "";
+		const numArgPr = argPrXml(opts.numeratorArgumentSize);
+		const denArgPr = argPrXml(opts.denominatorArgumentSize);
+		return `<m:f>${pr}<m:num>${numArgPr}${stringifyChildren(opts.numerator)}</m:num><m:den>${denArgPr}${stringifyChildren(opts.denominator)}</m:den></m:f>`;
 	}
 	if ("radical" in value) {
 		const opts = value.radical;
@@ -4136,10 +4296,22 @@ function stringifyMathInput(value) {
 		}
 		return `<m:m>${pr}${rows}</m:m>`;
 	}
-	if ("roundBrackets" in value) return stringifyDelimiters(bracketChildren(value.roundBrackets), "(", ")");
-	if ("curlyBrackets" in value) return stringifyDelimiters(bracketChildren(value.curlyBrackets), "{", "}");
-	if ("angledBrackets" in value) return stringifyDelimiters(bracketChildren(value.angledBrackets), "〈", "〉");
-	if ("squareBrackets" in value) return stringifyDelimiters(bracketChildren(value.squareBrackets), "[", "]");
+	if ("roundBrackets" in value) {
+		const spec = bracketSpec(value.roundBrackets);
+		return stringifyDelimiters(spec.children, "(", ")", spec.properties);
+	}
+	if ("curlyBrackets" in value) {
+		const spec = bracketSpec(value.curlyBrackets);
+		return stringifyDelimiters(spec.children, "{", "}", spec.properties);
+	}
+	if ("angledBrackets" in value) {
+		const spec = bracketSpec(value.angledBrackets);
+		return stringifyDelimiters(spec.children, "〈", "〉", spec.properties);
+	}
+	if ("squareBrackets" in value) {
+		const spec = bracketSpec(value.squareBrackets);
+		return stringifyDelimiters(spec.children, "[", "]", spec.properties);
+	}
 	if ("borderBox" in value) {
 		const opts = value.borderBox;
 		let pr = "";
@@ -4231,16 +4403,31 @@ function stringifyNAry(opts, chr) {
 	const hasSub = opts.subScript && opts.subScript.length > 0;
 	const hasSup = opts.superScript && opts.superScript.length > 0;
 	const prParts = [`<m:chr m:val="${chr}"/>`];
+	if (opts.properties?.limitLocation) prParts.push(`<m:limLoc m:val="${opts.properties.limitLocation}"/>`);
+	if (opts.properties?.grow !== void 0) prParts.push(`<m:grow m:val="${opts.properties.grow ? 1 : 0}"/>`);
 	if (!hasSub) prParts.push("<m:subHide m:val=\"1\"/>");
 	if (!hasSup) prParts.push("<m:supHide m:val=\"1\"/>");
 	return `<m:nary>${`<m:naryPr>${prParts.join("")}</m:naryPr>`}${hasSub ? `<m:sub>${stringifyChildren(opts.subScript)}</m:sub>` : "<m:sub/>"}${hasSup ? `<m:sup>${stringifyChildren(opts.superScript)}</m:sup>` : "<m:sup/>"}<m:e>${stringifyChildren(opts.children)}</m:e></m:nary>`;
 }
-function stringifyDelimiters(children, begChr, endChr) {
-	return `<m:d><m:dPr><m:begChr m:val="${begChr}"/><m:endChr m:val="${endChr}"/></m:dPr><m:e>${stringifyChildren(children)}</m:e></m:d>`;
-}
-function bracketChildren(v) {
-	if (Array.isArray(v)) return v;
-	return v.children;
+function stringifyDelimiters(children, begChr, endChr, properties) {
+	const prParts = [`<m:begChr m:val="${properties?.beginCharacter ?? begChr}"/>`];
+	if (properties?.separatorCharacter) prParts.push(`<m:sepChr m:val="${properties.separatorCharacter}"/>`);
+	prParts.push(`<m:endChr m:val="${properties?.endCharacter ?? endChr}"/>`);
+	if (properties?.grow !== void 0) prParts.push(`<m:grow m:val="${properties.grow ? 1 : 0}"/>`);
+	if (properties?.shape) prParts.push(`<m:shp m:val="${properties.shape}"/>`);
+	return `<m:d><m:dPr>${prParts.join("")}</m:dPr><m:e>${stringifyChildren(children)}</m:e></m:d>`;
+}
+/** Build an m:argPr/m:argSz block for an argument size scaling value. */
+function argPrXml(size) {
+	return size !== void 0 ? `<m:argPr><m:argSz m:val="${size}"/></m:argPr>` : "";
+}
+/** Split a bracket shorthand into children + optional delimiter properties. */
+function bracketSpec(v) {
+	if (Array.isArray(v)) return { children: v };
+	return {
+		children: v.children,
+		properties: v.properties
+	};
 }
 function stringifyMath(children) {
 	return `<m:oMath>${children.map((c) => stringifyMathInput(c)).join("")}</m:oMath>`;
@@ -4303,10 +4490,33 @@ function parseMathElement(el) {
 function parseMathRun(el) {
 	return textOf(findChild(el, "m:t")) ?? "";
 }
+/** Read an m:val on/off attribute (1/0/true/false; empty element = on). */
+function readOnOff$1(el) {
+	if (!el) return void 0;
+	const v = attr(el, "m:val");
+	return v === void 0 ? true : v === "1" || v === "true" || v === "on";
+}
+/** Read an m:val numeric attribute. */
+function readNum$1(el) {
+	if (!el) return void 0;
+	const v = attr(el, "m:val");
+	if (v === void 0 || v === "") return void 0;
+	const n = Number(v);
+	return Number.isFinite(n) ? n : void 0;
+}
+/** Read an m:argSz scaling value from an m:argPr-bearing argument element. */
+function readArgSize(argEl) {
+	if (!argEl) return void 0;
+	return readNum$1(findChild(argEl, "m:argSz"));
+}
 function parseMathFraction(el) {
+	const numeratorArgumentSize = readArgSize(findChild(el, "m:num"));
+	const denominatorArgumentSize = readArgSize(findChild(el, "m:den"));
 	return { fraction: {
 		numerator: parseMathArg(el, "m:num"),
-		denominator: parseMathArg(el, "m:den")
+		denominator: parseMathArg(el, "m:den"),
+		...numeratorArgumentSize !== void 0 ? { numeratorArgumentSize } : {},
+		...denominatorArgumentSize !== void 0 ? { denominatorArgumentSize } : {}
 	} };
 }
 function parseMathRadical(el) {
@@ -4329,10 +4539,13 @@ function parseMathSubScript(el) {
 	} };
 }
 function parseMathSubSuperScript(el) {
+	const pr = findChild(el, "m:sSubSupPr");
+	const alignScript = pr ? readOnOff$1(findChild(pr, "m:alnScr")) : void 0;
 	return { subSuperScript: {
 		children: parseMathArg(el, "m:e"),
 		subScript: parseMathArg(el, "m:sub"),
-		superScript: parseMathArg(el, "m:sup")
+		superScript: parseMathArg(el, "m:sup"),
+		...alignScript !== void 0 ? { alignScript } : {}
 	} };
 }
 function parseMathNAry(el) {
@@ -4342,10 +4555,21 @@ function parseMathNAry(el) {
 	const baseChildren = parseMathArg(el, "m:e");
 	const sub = parseMathArg(el, "m:sub");
 	const sup = parseMathArg(el, "m:sup");
+	const properties = {};
+	if (naryPr) {
+		const limLocEl = findChild(naryPr, "m:limLoc");
+		if (limLocEl) {
+			const limLoc = attr(limLocEl, "m:val");
+			if (limLoc === "subSup" || limLoc === "undOvr") properties.limitLocation = limLoc;
+		}
+		const grow = readOnOff$1(findChild(naryPr, "m:grow"));
+		if (grow !== void 0) properties.grow = grow;
+	}
 	const common = {
 		children: baseChildren,
 		...sub.length > 0 ? { subScript: sub } : {},
-		...sup.length > 0 ? { superScript: sup } : {}
+		...sup.length > 0 ? { superScript: sup } : {},
+		...Object.keys(properties).length > 0 ? { properties } : {}
 	};
 	if (chrVal === "∑") return { sum: common };
 	return { integral: common };
@@ -4361,12 +4585,31 @@ function parseMathDelimiter(el) {
 	const begChrEl = dPr ? findChild(dPr, "m:begChr") : void 0;
 	const begChr = begChrEl ? attr(begChrEl, "m:val") : "(";
 	const mathChildren = parseMathArg(el, "m:e");
+	const properties = {};
+	if (dPr) {
+		if (begChrEl) properties.beginCharacter = begChr;
+		const endChrEl = findChild(dPr, "m:endChr");
+		if (endChrEl) properties.endCharacter = attr(endChrEl, "m:val");
+		const sepChrEl = findChild(dPr, "m:sepChr");
+		if (sepChrEl) properties.separatorCharacter = attr(sepChrEl, "m:val");
+		const grow = readOnOff$1(findChild(dPr, "m:grow"));
+		if (grow !== void 0) properties.grow = grow;
+		const shpEl = findChild(dPr, "m:shp");
+		if (shpEl) {
+			const shp = attr(shpEl, "m:val");
+			if (shp === "centered" || shp === "match") properties.shape = shp;
+		}
+	}
+	const value = Object.keys(properties).length > 0 ? {
+		children: mathChildren,
+		properties
+	} : mathChildren;
 	switch (begChr) {
-		case "[": return { squareBrackets: mathChildren };
-		case "{": return { curlyBrackets: mathChildren };
+		case "[": return { squareBrackets: value };
+		case "{": return { curlyBrackets: value };
 		case "<":
-		case "⟨": return { angledBrackets: mathChildren };
-		default: return { roundBrackets: mathChildren };
+		case "⟨": return { angledBrackets: value };
+		default: return { roundBrackets: value };
 	}
 }
 function parseMathMatrix(el) {
@@ -4486,13 +4729,12 @@ function stringifyRun(opts, ctx) {
 			break;
 		}
 	}
-	const runOpts = commentRefStyle ? {
+	const rPr = stringifyRunProperties(commentRefStyle ? {
 		...opts,
 		style: "CommentReference"
-	} : opts;
-	const rPr = runOpts.rPrRawXml ?? stringifyRunProperties(runOpts);
+	} : opts);
 	if (rPr) parts.push(rPr);
-	if (opts.break) for (let i = 0; i < opts.break; i++) parts.push("<w:br/>");
+	if (opts.break) parts.push(breakXml(opts.break));
 	if (opts.children) {
 		for (const child of opts.children) if (typeof child === "string") parts.push(`<w:t xml:space="preserve">${escapeXml(child)}</w:t>`);
 		else if (typeof child === "object" && child !== null) {
@@ -4508,6 +4750,10 @@ function stringifyRun(opts, ctx) {
 				parts.push("<w:br w:type=\"column\"/>");
 				continue;
 			}
+			if ("break" in child) {
+				parts.push(breakXml(child.break));
+				continue;
+			}
 			if ("commentReference" in child) {
 				parts.push(`<w:commentReference w:id="${Number(child.commentReference)}"/>`);
 				continue;
@@ -4517,6 +4763,10 @@ function stringifyRun(opts, ctx) {
 				parts.push(emptyXml);
 				continue;
 			}
+			if ("object" in child) {
+				parts.push(objectDesc.stringify(child.object, ctx) ?? "");
+				continue;
+			}
 			const jsonResult = stringifyChildDispatch(child, ctx);
 			if (jsonResult !== void 0) if (Array.isArray(jsonResult)) parts.push(...jsonResult);
 			else parts.push(jsonResult);
@@ -4524,8 +4774,9 @@ function stringifyRun(opts, ctx) {
 		}
 	} else if (opts.text !== void 0) parts.push(`<w:t xml:space="preserve">${escapeXml(String(opts.text))}</w:t>`);
 	const rsidAttrs = [];
-	if (opts.rsidRPr) rsidAttrs.push(` w:rsidRPr="${opts.rsidRPr}"`);
-	if (opts.rsidDel) rsidAttrs.push(` w:rsidDel="${opts.rsidDel}"`);
+	if (opts.rsid) rsidAttrs.push(` w:rsidR="${opts.rsid}"`);
+	if (opts.runPropertiesRsid) rsidAttrs.push(` w:rsidRPr="${opts.runPropertiesRsid}"`);
+	if (opts.deletionRsid) rsidAttrs.push(` w:rsidDel="${opts.deletionRsid}"`);
 	const attr = rsidAttrs.join("");
 	const body = parts.join("");
 	return body.length === 0 ? attr ? `<w:r${attr}/>` : "<w:r/>" : `<w:r${attr}>${body}</w:r>`;
@@ -4554,7 +4805,16 @@ function stringifyParagraph(opts, ctx, sectionPropertiesXml) {
 		}
 	}
 	const body = parts.join("");
-	return body ? `<w:p>${body}</w:p>` : "<w:p/>";
+	const paraAttrs = [];
+	if (resolved.paraId) paraAttrs.push(` w14:paraId="${resolved.paraId}"`);
+	if (resolved.textId) paraAttrs.push(` w14:textId="${resolved.textId}"`);
+	if (resolved.rsid) paraAttrs.push(` w:rsidR="${resolved.rsid}"`);
+	if (resolved.defaultRunRsid) paraAttrs.push(` w:rsidRDefault="${resolved.defaultRunRsid}"`);
+	if (resolved.propertiesRsid) paraAttrs.push(` w:rsidP="${resolved.propertiesRsid}"`);
+	if (resolved.runPropertiesRsid) paraAttrs.push(` w:rsidRPr="${resolved.runPropertiesRsid}"`);
+	if (resolved.deletionRsid) paraAttrs.push(` w:rsidDel="${resolved.deletionRsid}"`);
+	const attr = paraAttrs.join("");
+	return body ? `<w:p${attr}>${body}</w:p>` : `<w:p${attr}/>`;
 }
 /**
 * Stringify a body-level child element.
@@ -4574,8 +4834,16 @@ function stringifyBodyChild(child, ctx) {
 	if ("altChunk" in child) return altChunkDesc.stringify(child.altChunk, ctx) ?? "";
 	if ("subDoc" in child) return subDocDesc.stringify(child.subDoc, ctx) ?? "";
 	if ("customXml" in child) return customXmlBlockDesc.stringify(child.customXml, ctx) ?? "";
-	if ("bookmarkStart" in child) return `<w:bookmarkStart w:id="${child.bookmarkStart.id}" w:name="${child.bookmarkStart.name}"/>`;
-	if ("bookmarkEnd" in child) return `<w:bookmarkEnd w:id="${child.bookmarkEnd}"/>`;
+	if ("bookmarkStart" in child) {
+		const bs = child.bookmarkStart;
+		const bsDisp = bs.displacedByCustomXml ? ` w:displacedByCustomXml="${bs.displacedByCustomXml}"` : "";
+		return `<w:bookmarkStart w:id="${bs.id}" w:name="${bs.name}"${bsDisp}/>`;
+	}
+	if ("bookmarkEnd" in child) {
+		const be = child.bookmarkEnd;
+		const beDisp = be.displacedByCustomXml ? ` w:displacedByCustomXml="${be.displacedByCustomXml}"` : "";
+		return `<w:bookmarkEnd w:id="${be.id}"${beDisp}/>`;
+	}
 	if ("rawXml" in child) return child.rawXml;
 	throw new Error("Unknown section child type");
 }
@@ -4656,7 +4924,8 @@ function stringifyDocumentXml(ctx, docCtx) {
 	const sections = ctx._options.sections;
 	const bodySections = ctx.sectionProperties;
 	const parts = [];
-	parts.push(`<w:document ${DOC_NS} mc:Ignorable="w14 w15 wp14">`);
+	const conformanceAttr = ctx._options.conformance ? ` w:conformance="${ctx._options.conformance}"` : "";
+	parts.push(`<w:document ${DOC_NS} mc:Ignorable="w14 w15 wp14"${conformanceAttr}>`);
 	if (ctx._options.background) parts.push(stringifyDocumentBackground(ctx._options.background, docCtx));
 	const bodyParts = [];
 	for (let si = 0; si < sections.length; si++) {
@@ -4717,11 +4986,11 @@ function parseParagraphProperties(el, ctx) {
 	const spacing = findChild(el, "w:spacing");
 	if (spacing) {
 		const sp = {};
-		const before = attrNum(spacing, "w:before");
+		const before = attrMeasure(spacing, "w:before");
 		if (before !== void 0) sp.before = before;
-		const after = attrNum(spacing, "w:after");
+		const after = attrMeasure(spacing, "w:after");
 		if (after !== void 0) sp.after = after;
-		const line = attrNum(spacing, "w:line");
+		const line = attrMeasure(spacing, "w:line");
 		if (line !== void 0) sp.line = line;
 		const lineRule = attr(spacing, "w:lineRule");
 		if (lineRule && LINE_RULES.includes(lineRule)) sp.lineRule = lineRule;
@@ -4738,27 +5007,27 @@ function parseParagraphProperties(el, ctx) {
 	const ind = findChild(el, "w:ind");
 	if (ind) {
 		const indentObj = {};
-		const left = attrNum(ind, "w:left");
+		const left = attrMeasure(ind, "w:left");
 		if (left !== void 0) indentObj.left = left;
 		const leftChars = attrNum(ind, "w:leftChars");
 		if (leftChars !== void 0) indentObj.leftChars = leftChars;
-		const right = attrNum(ind, "w:right");
+		const right = attrMeasure(ind, "w:right");
 		if (right !== void 0) indentObj.right = right;
 		const rightChars = attrNum(ind, "w:rightChars");
 		if (rightChars !== void 0) indentObj.rightChars = rightChars;
-		const start = attrNum(ind, "w:start");
+		const start = attrMeasure(ind, "w:start");
 		if (start !== void 0) indentObj.start = start;
 		const startChars = attrNum(ind, "w:startChars");
 		if (startChars !== void 0) indentObj.startChars = startChars;
-		const end = attrNum(ind, "w:end");
+		const end = attrMeasure(ind, "w:end");
 		if (end !== void 0) indentObj.end = end;
 		const endChars = attrNum(ind, "w:endChars");
 		if (endChars !== void 0) indentObj.endChars = endChars;
-		const hanging = attrNum(ind, "w:hanging");
+		const hanging = attrMeasure(ind, "w:hanging");
 		if (hanging !== void 0) indentObj.hanging = hanging;
 		const hangingChars = attrNum(ind, "w:hangingChars");
 		if (hangingChars !== void 0) indentObj.hangingChars = hangingChars;
-		const firstLine = attrNum(ind, "w:firstLine");
+		const firstLine = attrMeasure(ind, "w:firstLine");
 		if (firstLine !== void 0) indentObj.firstLine = firstLine;
 		const firstLineChars = attrNum(ind, "w:firstLineChars");
 		if (firstLineChars !== void 0) indentObj.firstLineChars = firstLineChars;
@@ -5176,7 +5445,7 @@ function parseRunLevelChildren(elements, ctx) {
 				const drawingChild = parseDrawingRun(drawingEl, ctx);
 				if (drawingChild) {
 					const rPrEl = findChild(child, "w:rPr");
-					const runPropertiesRawXml = rPrEl ? stringifyElement(rPrEl) : void 0;
+					const runProperties = rPrEl ? parseRunProperties(rPrEl) : void 0;
 					if (altFallback) {
 						if ("wpsShape" in drawingChild) {
 							drawingChild.wpsShape.vmlFallback = altFallback;
@@ -5188,10 +5457,10 @@ function parseRunLevelChildren(elements, ctx) {
 							if (altRequires) drawingChild.wpgGroup.mcChoiceRequires = altRequires;
 						}
 					}
-					if (runPropertiesRawXml) {
-						if ("image" in drawingChild) drawingChild.image.runPropertiesRawXml = runPropertiesRawXml;
-						else if ("wpsShape" in drawingChild) drawingChild.wpsShape.runPropertiesRawXml = runPropertiesRawXml;
-						else if ("wpgGroup" in drawingChild) drawingChild.wpgGroup.runPropertiesRawXml = runPropertiesRawXml;
+					if (runProperties) {
+						if ("image" in drawingChild) drawingChild.image.runProperties = runProperties;
+						else if ("wpsShape" in drawingChild) drawingChild.wpsShape.runProperties = runProperties;
+						else if ("wpgGroup" in drawingChild) drawingChild.wpgGroup.runProperties = runProperties;
 					}
 					childList.push(drawingChild);
 					break;
@@ -5212,6 +5481,12 @@ function parseRunLevelChildren(elements, ctx) {
 			if (anchor) hl.anchor = anchor;
 			const tooltip = attr(child, "w:tooltip");
 			if (tooltip) hl.tooltip = tooltip;
+			const tgtFrame = attr(child, "w:tgtFrame");
+			if (tgtFrame) hl.tgtFrame = tgtFrame;
+			const docLocation = attr(child, "w:docLocation");
+			if (docLocation) hl.docLocation = docLocation;
+			const history = attrBool(child, "w:history");
+			if (history !== void 0) hl.history = history;
 			const linkRuns = [];
 			for (const sub of child.elements ?? []) if (sub.name === "w:r") {
 				const runOpts = parsedRunToOptions(parseRun(sub, ctx));
@@ -5226,15 +5501,25 @@ function parseRunLevelChildren(elements, ctx) {
 		case "w:bookmarkStart": {
 			const id = attrNum(child, "w:id");
 			const name = attr(child, "w:name");
-			if (id !== void 0 && name) childList.push({ bookmarkStart: {
-				id,
-				name
-			} });
+			if (id !== void 0 && name) {
+				const bookmarkStart = {
+					id,
+					name
+				};
+				const disp = attr(child, "w:displacedByCustomXml");
+				if (disp === "before" || disp === "after") bookmarkStart.displacedByCustomXml = disp;
+				childList.push({ bookmarkStart });
+			}
 			break;
 		}
 		case "w:bookmarkEnd": {
 			const id = attrNum(child, "w:id");
-			if (id !== void 0) childList.push({ bookmarkEnd: id });
+			if (id !== void 0) {
+				const bookmarkEnd = { id };
+				const disp = attr(child, "w:displacedByCustomXml");
+				if (disp === "before" || disp === "after") bookmarkEnd.displacedByCustomXml = disp;
+				childList.push({ bookmarkEnd });
+			}
 			break;
 		}
 		case "w:commentRangeStart": {
@@ -5317,6 +5602,10 @@ function parseRunLevelChildren(elements, ctx) {
 				let cachedValue = "";
 				for (const sub of child.elements ?? []) if (sub.name === "w:r") cachedValue += collectRunText(sub);
 				if (cachedValue) sf.cachedValue = cachedValue;
+				const sfLock = attrBool(child, "w:fldLock");
+				if (sfLock !== void 0) sf.fldLock = sfLock;
+				const sfDirty = attrBool(child, "w:dirty");
+				if (sfDirty !== void 0) sf.dirty = sfDirty;
 				childList.push({ simpleField: sf });
 			}
 			break;
@@ -5502,13 +5791,31 @@ function parseRunLevelChildren(elements, ctx) {
 	}
 	return childList;
 }
+/** True when a child is a single-field `{ text: string }` run (simple text). */
+function isTextOnlyRun(c) {
+	return typeof c === "object" && c !== null && "text" in c && Object.keys(c).length === 1;
+}
 function parseParagraph(el, ctx) {
 	const opts = {};
+	const paraId = attr(el, "w14:paraId");
+	if (paraId) opts.paraId = paraId;
+	const textId = attr(el, "w14:textId");
+	if (textId) opts.textId = textId;
+	const rsid = attr(el, "w:rsidR");
+	if (rsid) opts.rsid = rsid;
+	const defaultRunRsid = attr(el, "w:rsidRDefault");
+	if (defaultRunRsid) opts.defaultRunRsid = defaultRunRsid;
+	const propertiesRsid = attr(el, "w:rsidP");
+	if (propertiesRsid) opts.propertiesRsid = propertiesRsid;
+	const runPropertiesRsid = attr(el, "w:rsidRPr");
+	if (runPropertiesRsid) opts.runPropertiesRsid = runPropertiesRsid;
+	const deletionRsid = attr(el, "w:rsidDel");
+	if (deletionRsid) opts.deletionRsid = deletionRsid;
 	const pPr = findChild(el, "w:pPr");
 	if (pPr) Object.assign(opts, parseParagraphProperties(pPr, ctx));
 	const childList = parseRunLevelChildren(el.elements, ctx);
 	if (childList.length > 0) {
-		if (childList.every((c) => typeof c === "object" && c !== null && "text" in c && Object.keys(c).length === 1)) {
+		if (childList.every(isTextOnlyRun)) {
 			const combined = childList.map((c) => c.text).join("");
 			if (combined && Object.keys(opts).length === 0) return combined;
 			if (combined) {
@@ -6910,7 +7217,7 @@ function stringifyDeletedRun(c) {
 	const parts = [];
 	const rPr = stringifyRunProperties(opts);
 	if (rPr) parts.push(rPr);
-	if (opts.break) for (let i = 0; i < opts.break; i++) parts.push("<w:br/>");
+	if (opts.break) parts.push(breakXml(opts.break));
 	const fieldMap = {
 		CURRENT: "PAGE",
 		TOTAL_PAGES: "NUMPAGES",
@@ -6929,7 +7236,7 @@ function stringifyRunInline(opts, ctx) {
 	const parts = [];
 	const rPr = stringifyRunProperties(opts);
 	if (rPr) parts.push(rPr);
-	if (opts.break) for (let i = 0; i < opts.break; i++) parts.push("<w:br/>");
+	if (opts.break) parts.push(breakXml(opts.break));
 	if (opts.children) for (const child of opts.children) if (typeof child === "string") parts.push(`<w:t xml:space="preserve">${escapeXml(child)}</w:t>`);
 	else {
 		const jsonResult = stringifyChildDispatch(child, ctx);
@@ -6939,8 +7246,9 @@ function stringifyRunInline(opts, ctx) {
 	}
 	else if (opts.text !== void 0) parts.push(`<w:t xml:space="preserve">${escapeXml(String(opts.text))}</w:t>`);
 	const rsidAttrs = [];
-	if (opts.rsidRPr) rsidAttrs.push(` w:rsidRPr="${opts.rsidRPr}"`);
-	if (opts.rsidDel) rsidAttrs.push(` w:rsidDel="${opts.rsidDel}"`);
+	if (opts.rsid) rsidAttrs.push(` w:rsidR="${opts.rsid}"`);
+	if (opts.runPropertiesRsid) rsidAttrs.push(` w:rsidRPr="${opts.runPropertiesRsid}"`);
+	if (opts.deletionRsid) rsidAttrs.push(` w:rsidDel="${opts.deletionRsid}"`);
 	const attr = rsidAttrs.join("");
 	const body = parts.join("");
 	return body.length === 0 ? attr ? `<w:r${attr}/>` : "<w:r/>" : `<w:r${attr}>${body}</w:r>`;
@@ -6970,7 +7278,7 @@ let nextChartId = 1;
 */
 function wrapDrawingRun(drawingXml, opts) {
 	const xml = drawingXml ?? "";
-	const rPr = opts.runPropertiesRawXml ?? "";
+	const rPr = stringifyRunProperties(opts.runProperties) ?? "";
 	if (opts.vmlFallback) return `<w:r>${rPr}<mc:AlternateContent><mc:Choice Requires="${opts.mcChoiceRequires ?? "wps"}">${xml}</mc:Choice>${opts.vmlFallback}</mc:AlternateContent></w:r>`;
 	return `<w:r>${rPr}${xml}</w:r>`;
 }
@@ -7010,25 +7318,36 @@ function registerVmlFallbackMedia(opts, ctx) {
 	}
 }
 /**
-* Resolve a break/tab run's rPr: prefer the raw rPr carried from parse (verbatim,
-* no b/bCs, sz/szCs pairing), else regenerate from the structured fields.
+* Build the rPr XML for a break/tab run from its structured run properties.
 */
-function runPrOrRaw(child) {
-	const raw = child.rPrRawXml;
-	if (raw) return raw;
+function runPropertiesXml(child) {
 	return stringifyRunProperties(child) ?? "";
 }
 function stringifyChildDispatch(child, ctx) {
-	if ("pageBreak" in child) return `<w:r>${runPrOrRaw(child)}<w:br w:type="page"/></w:r>`;
-	if ("columnBreak" in child) return `<w:r>${runPrOrRaw(child)}<w:br w:type="column"/></w:r>`;
-	if ("tab" in child) return `<w:r>${runPrOrRaw(child)}<w:tab/></w:r>`;
-	if ("footnoteReference" in child) return `<w:r><w:rPr><w:rStyle w:val="FootnoteReference"/></w:rPr><w:footnoteReference w:id="${child.footnoteReference}"/></w:r>`;
-	if ("endnoteReference" in child) return `<w:r><w:rPr><w:rStyle w:val="EndnoteReference"/></w:rPr><w:endnoteReference w:id="${child.endnoteReference}"/></w:r>`;
+	if ("pageBreak" in child) return `<w:r>${runPropertiesXml(child)}<w:br w:type="page"/></w:r>`;
+	if ("columnBreak" in child) return `<w:r>${runPropertiesXml(child)}<w:br w:type="column"/></w:r>`;
+	if ("tab" in child) return `<w:r>${runPropertiesXml(child)}<w:tab/></w:r>`;
+	if ("footnoteReference" in child) {
+		const ref = child.footnoteReference;
+		return `<w:r><w:rPr><w:rStyle w:val="FootnoteReference"/></w:rPr><w:footnoteReference w:id="${typeof ref === "number" ? ref : ref.id}"${typeof ref === "object" && ref.customMarkFollows ? " w:customMarkFollows=\"true\"" : ""}/></w:r>`;
+	}
+	if ("endnoteReference" in child) {
+		const ref = child.endnoteReference;
+		return `<w:r><w:rPr><w:rStyle w:val="EndnoteReference"/></w:rPr><w:endnoteReference w:id="${typeof ref === "number" ? ref : ref.id}"${typeof ref === "object" && ref.customMarkFollows ? " w:customMarkFollows=\"true\"" : ""}/></w:r>`;
+	}
 	if ("commentRangeStart" in child) return `<w:commentRangeStart w:id="${child.commentRangeStart}"/>`;
 	if ("commentRangeEnd" in child) return `<w:commentRangeEnd w:id="${child.commentRangeEnd}"/>`;
 	if ("commentReference" in child) return `<w:r><w:rPr><w:rStyle w:val="CommentReference"/></w:rPr><w:commentReference w:id="${child.commentReference}"/></w:r>`;
-	if ("bookmarkStart" in child) return `<w:bookmarkStart w:id="${child.bookmarkStart.id}" w:name="${child.bookmarkStart.name}"/>`;
-	if ("bookmarkEnd" in child) return `<w:bookmarkEnd w:id="${child.bookmarkEnd}"/>`;
+	if ("bookmarkStart" in child) {
+		const bs = child.bookmarkStart;
+		const bsDisp = bs.displacedByCustomXml ? ` w:displacedByCustomXml="${bs.displacedByCustomXml}"` : "";
+		return `<w:bookmarkStart w:id="${bs.id}" w:name="${bs.name}"${bsDisp}/>`;
+	}
+	if ("bookmarkEnd" in child) {
+		const be = child.bookmarkEnd;
+		const beDisp = be.displacedByCustomXml ? ` w:displacedByCustomXml="${be.displacedByCustomXml}"` : "";
+		return `<w:bookmarkEnd w:id="${be.id}"${beDisp}/>`;
+	}
 	if ("symbolRun" in child) {
 		const opts = child.symbolRun;
 		return `<w:r>${stringifyRunProperties(opts) ?? ""}<w:sym w:char="${opts.char}" w:font="${opts.symbolfont ?? "Wingdings"}"/></w:r>`;
@@ -7226,16 +7545,22 @@ function stringifyChildDispatch(child, ctx) {
 		if (hl.children) for (const rc of hl.children) if (typeof rc === "string") childParts.push(stringifyRunInline({ text: rc }, ctx));
 		else childParts.push(stringifyRunInline(rc, ctx));
 		const body = childParts.join("");
+		const pushHlAttrs = (attrs) => {
+			if (hl.history !== false) attrs.push("w:history=\"1\"");
+			if (hl.tooltip) attrs.push(`w:tooltip="${escapeXml(hl.tooltip)}"`);
+			if (hl.tgtFrame) attrs.push(`w:tgtFrame="${escapeXml(hl.tgtFrame)}"`);
+			if (hl.docLocation) attrs.push(`w:docLocation="${escapeXml(hl.docLocation)}"`);
+		};
 		if (hl.link) {
 			const linkId = uniqueId();
 			ctx.viewWrapper.relationships.addRelationship(linkId, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hl.link, TargetModeType.EXTERNAL);
-			const attrs = [`r:id="rId${linkId}"`, "w:history=\"1\""];
-			if (hl.tooltip) attrs.push(`w:tooltip="${escapeXml(hl.tooltip)}"`);
+			const attrs = [`r:id="rId${linkId}"`];
+			pushHlAttrs(attrs);
 			return `<w:hyperlink ${attrs.join(" ")}>${body}</w:hyperlink>`;
 		}
 		if (hl.anchor) {
-			const attrs = [`w:anchor="${escapeXml(hl.anchor)}"`, "w:history=\"1\""];
-			if (hl.tooltip) attrs.push(`w:tooltip="${escapeXml(hl.tooltip)}"`);
+			const attrs = [`w:anchor="${escapeXml(hl.anchor)}"`];
+			pushHlAttrs(attrs);
 			return `<w:hyperlink ${attrs.join(" ")}>${body}</w:hyperlink>`;
 		}
 		return "";
@@ -7305,8 +7630,11 @@ function stringifyChildDispatch(child, ctx) {
 	if ("customXmlMoveToRangeEnd" in child) return `<w:customXmlMoveToRangeEnd w:id="${child.customXmlMoveToRangeEnd}"/>`;
 	if ("simpleField" in child) {
 		const sf = child.simpleField;
-		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)}"/>`;
+		const sfAttrs = [`w:instr="${escapeXml(sf.instruction)}"`];
+		if (sf.fldLock !== void 0) sfAttrs.push(`w:fldLock="${sf.fldLock ? 1 : 0}"`);
+		if (sf.dirty !== void 0) sfAttrs.push(`w:dirty="${sf.dirty ? 1 : 0}"`);
+		if (sf.cachedValue !== void 0) return `<w:fldSimple ${sfAttrs.join(" ")}><w:r><w:t>${escapeXml(sf.cachedValue)}</w:t></w:r></w:fldSimple>`;
+		return `<w:fldSimple ${sfAttrs.join(" ")}/>`;
 	}
 	if ("complexField" in child) {
 		const cf = child.complexField;
@@ -7792,10 +8120,10 @@ function stringifyTableRow(row, ctx, extraCells) {
 		parts.splice(insertIdx, 0, stringifyTableCell(cell, ctx));
 	}
 	const rsidAttrs = [];
-	if (row.rsidRPr) rsidAttrs.push(` w:rsidRPr="${row.rsidRPr}"`);
-	if (row.rsidR) rsidAttrs.push(` w:rsidR="${row.rsidR}"`);
-	if (row.rsidDel) rsidAttrs.push(` w:rsidDel="${row.rsidDel}"`);
-	if (row.rsidTr) rsidAttrs.push(` w:rsidTr="${row.rsidTr}"`);
+	if (row.runPropertiesRsid) rsidAttrs.push(` w:rsidRPr="${row.runPropertiesRsid}"`);
+	if (row.rsid) rsidAttrs.push(` w:rsidR="${row.rsid}"`);
+	if (row.deletionRsid) rsidAttrs.push(` w:rsidDel="${row.deletionRsid}"`);
+	if (row.tableRowRsid) rsidAttrs.push(` w:rsidTr="${row.tableRowRsid}"`);
 	const attr = rsidAttrs.join("");
 	const body = parts.join("");
 	return body ? `<w:tr${attr}>${body}</w:tr>` : attr ? `<w:tr${attr}/>` : "<w:tr/>";
@@ -7865,14 +8193,12 @@ function parseCellMargins(marginEl) {
 	]) {
 		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 };
-			}
+			const type = attr(sideEl, "w:type");
+			const size = attrMeasure(sideEl, "w:w", type);
+			if (size !== void 0) margins[side] = type ? {
+				size,
+				type
+			} : { size };
 		}
 	}
 	if (Object.keys(margins).length === 0) return void 0;
@@ -7948,7 +8274,7 @@ function parseTablePropertyExceptions(el) {
 	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.cellMargin !== void 0) opts.cellMargin = base.cellMargin;
 	if (base.tableLook !== void 0) opts.tableLook = base.tableLook;
 	if (base.cellSpacing !== void 0) opts.cellSpacing = base.cellSpacing;
 	const tblPrExChange = findChild(el, "w:tblPrExChange");
@@ -8047,9 +8373,8 @@ function parseTablePropertiesEl(el) {
 	}
 	const tblW = findChild(el, "w:tblW");
 	if (tblW) {
-		const rawSize = attr(tblW, "w:w");
 		const type = attr(tblW, "w:type");
-		const size = type === "pct" ? rawSize : attrNum(tblW, "w:w");
+		const size = attrMeasure(tblW, "w:w", type);
 		if (size !== void 0 || type) opts.width = {
 			size: size ?? 0,
 			...type ? { type } : {}
@@ -8105,7 +8430,7 @@ function parseTablePropertiesEl(el) {
 	const tblCellMar = findChild(el, "w:tblCellMar");
 	if (tblCellMar) {
 		const margins = parseCellMargins(tblCellMar);
-		if (margins) opts.margins = margins;
+		if (margins) opts.cellMargin = margins;
 	}
 	const shd = findChild(el, "w:shd");
 	if (shd) {
@@ -8151,8 +8476,8 @@ function parseTablePropertiesEl(el) {
 	}
 	const tblInd = findChild(el, "w:tblInd");
 	if (tblInd) {
-		const size = attrNum(tblInd, "w:w");
 		const type = attr(tblInd, "w:type");
+		const size = attrMeasure(tblInd, "w:w", type);
 		if (size !== void 0) opts.indent = {
 			size,
 			...type ? { type } : {}
@@ -8178,7 +8503,7 @@ function parseTablePropertiesEl(el) {
 	const tblCellSpacing = findChild(el, "w:tblCellSpacing");
 	if (tblCellSpacing) {
 		const type = attr(tblCellSpacing, "w:type");
-		const w = attrNum(tblCellSpacing, "w:w");
+		const w = attrMeasure(tblCellSpacing, "w:w", type);
 		if (w !== void 0) opts.cellSpacing = {
 			size: w,
 			...type ? { type } : {}
@@ -8221,7 +8546,7 @@ function parseColumnWidthsEl(el) {
 	const tblGrid = findChild(el, "w:tblGrid");
 	if (!tblGrid) return { widths };
 	for (const col of children(tblGrid, "w:gridCol")) {
-		const w = attrNum(col, "w:w");
+		const w = attrMeasure(col, "w:w");
 		widths.push(w ?? 100);
 	}
 	const tblGridChange = findChild(tblGrid, "w:tblGridChange");
@@ -8230,7 +8555,7 @@ function parseColumnWidthsEl(el) {
 		const innerGrid = findChild(tblGridChange, "w:tblGrid");
 		const revWidths = [];
 		if (innerGrid) for (const col of children(innerGrid, "w:gridCol")) {
-			const w = attrNum(col, "w:w");
+			const w = attrMeasure(col, "w:w");
 			revWidths.push(w ?? 100);
 		}
 		if (id !== void 0) return {
@@ -8247,7 +8572,7 @@ function parseTableRowPropertiesEl(el) {
 	const opts = {};
 	const trHeight = findChild(el, "w:trHeight");
 	if (trHeight) {
-		const val = attrNum(trHeight, "w:val");
+		const val = attrMeasure(trHeight, "w:val");
 		const rule = attr(trHeight, "w:hRule");
 		if (val !== void 0) opts.height = {
 			value: val,
@@ -8276,9 +8601,8 @@ function parseTableRowPropertiesEl(el) {
 	}
 	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");
+		const size = attrMeasure(wBefore, "w:w", type);
 		if (size !== void 0) opts.widthBefore = {
 			size,
 			...type ? { type } : {}
@@ -8286,9 +8610,8 @@ function parseTableRowPropertiesEl(el) {
 	}
 	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");
+		const size = attrMeasure(wAfter, "w:w", type);
 		if (size !== void 0) opts.widthAfter = {
 			size,
 			...type ? { type } : {}
@@ -8304,7 +8627,7 @@ function parseTableRowPropertiesEl(el) {
 	const tblCellSpacing = findChild(el, "w:tblCellSpacing");
 	if (tblCellSpacing) {
 		const type = attr(tblCellSpacing, "w:type");
-		const w = attrNum(tblCellSpacing, "w:w");
+		const w = attrMeasure(tblCellSpacing, "w:w", type);
 		if (w !== void 0) opts.cellSpacing = {
 			size: w,
 			...type ? { type } : {}
@@ -8342,8 +8665,8 @@ function parseTableCellPropertiesEl(el) {
 	}
 	const tcW = findChild(el, "w:tcW");
 	if (tcW) {
-		const size = attrNum(tcW, "w:w");
 		const type = attr(tcW, "w:type");
+		const size = attrMeasure(tcW, "w:w", type);
 		if (size !== void 0) opts.width = {
 			size,
 			...type ? { type } : {}
@@ -8489,10 +8812,10 @@ function parseTableRowEl(el, ctx) {
 		if (Object.keys(exceptions).length > 0) opts.propertyExceptions = exceptions;
 	}
 	for (const [attrName, optKey] of [
-		["w:rsidRPr", "rsidRPr"],
-		["w:rsidR", "rsidR"],
-		["w:rsidDel", "rsidDel"],
-		["w:rsidTr", "rsidTr"]
+		["w:rsidRPr", "runPropertiesRsid"],
+		["w:rsidR", "rsid"],
+		["w:rsidDel", "deletionRsid"],
+		["w:rsidTr", "tableRowRsid"]
 	]) {
 		const val = attr(el, attrName);
 		if (val) opts[optKey] = val;
@@ -8533,7 +8856,11 @@ function parseTableRowEl(el, ctx) {
 function parseTableEl(el, ctx) {
 	const opts = {};
 	const tblPr = findChild(el, "w:tblPr");
-	if (tblPr) Object.assign(opts, parseTablePropertiesEl(tblPr));
+	if (tblPr) {
+		const tblPrParsed = parseTablePropertiesEl(tblPr);
+		Object.assign(opts, tblPrParsed);
+		if (tblPrParsed.cellMargin !== void 0) opts.margins = tblPrParsed.cellMargin;
+	}
 	const grid = parseColumnWidthsEl(el);
 	if (grid.widths.length > 0) opts.columnWidths = grid.widths;
 	if (grid.revision) opts.columnWidthsRevision = grid.revision;
@@ -8947,10 +9274,15 @@ function stringifyLevel(opts) {
 	if (opts.lvlRestart !== void 0) children.push(`<w:lvlRestart w:val="${decimalNumber(opts.lvlRestart)}"/>`);
 	if (opts.suffix) children.push(`<w:suff w:val="${opts.suffix}"/>`);
 	if (opts.isLegalNumberingStyle) children.push("<w:isLgl/>");
-	if (opts.text) children.push(`<w:lvlText w:val="${opts.text}"/>`);
+	if (opts.text !== void 0 || opts.textNull) {
+		const lvlTextAttrs = [];
+		if (opts.text !== void 0) lvlTextAttrs.push(`w:val="${opts.text}"`);
+		if (opts.textNull) lvlTextAttrs.push("w:null=\"1\"");
+		children.push(`<w:lvlText ${lvlTextAttrs.join(" ")}/>`);
+	}
 	if (opts.lvlPicBulletId !== void 0) children.push(`<w:lvlPicBulletId w:val="${decimalNumber(opts.lvlPicBulletId)}"/>`);
 	if (opts.legacy !== void 0) {
-		const legacyAttrs = [];
+		const legacyAttrs = [`w:legacy="${opts.legacy.enabled ?? true ? 1 : 0}"`];
 		if (opts.legacy.space !== void 0) legacyAttrs.push(`w:legacySpace="${opts.legacy.space}"`);
 		if (opts.legacy.indent !== void 0) legacyAttrs.push(`w:legacyIndent="${opts.legacy.indent}"`);
 		children.push(`<w:legacy ${legacyAttrs.join(" ")}/>`);
@@ -9052,6 +9384,8 @@ function parseLevelEl(el, parseParagraphProperties, ctx) {
 	if (lvlText) {
 		const val = attr(lvlText, "w:val");
 		if (val) opts.text = val;
+		const isNull = attrBool(lvlText, "w:null");
+		if (isNull) opts.textNull = isNull;
 	}
 	const lvlPicBulletId = findChild(el, "w:lvlPicBulletId");
 	if (lvlPicBulletId) {
@@ -9061,11 +9395,13 @@ function parseLevelEl(el, parseParagraphProperties, ctx) {
 	const legacyEl = findChild(el, "w:legacy");
 	if (legacyEl) {
 		const legacy = {};
+		const enabled = attrBool(legacyEl, "w:legacy");
+		if (enabled !== void 0) legacy.enabled = enabled;
 		const space = attrNum(legacyEl, "w:legacySpace");
 		if (space !== void 0) legacy.space = space;
 		const indent = attrNum(legacyEl, "w:legacyIndent");
 		if (indent !== void 0) legacy.indent = indent;
-		if (Object.keys(legacy).length > 0) opts.legacy = legacy;
+		opts.legacy = legacy;
 	}
 	const lvlJc = findChild(el, "w:lvlJc");
 	if (lvlJc) {
@@ -9487,23 +9823,34 @@ const createHeaderFooterReference = (type, options) => `<${type} r:id="rId${opti
 function esc(s) {
 	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
+/**
+* Build CT_Style style-level children (name…rsid), shared by paragraph/character/table styles.
+* Order follows CT_Style sequence: name, aliases, basedOn, next, link, autoRedefine, hidden,
+* uiPriority, semiHidden, unhideWhenUsed, qFormat, locked, personal, personalCompose,
+* personalReply, rsid.
+*/
+function stringifyStyleLevelChildren(opts) {
+	const parts = [`<w:name w:val="${esc(opts.name ?? opts.id ?? "")}"/>`];
+	if (opts.aliases) parts.push(`<w:aliases w:val="${esc(opts.aliases)}"/>`);
+	if (opts.basedOn) parts.push(`<w:basedOn w:val="${esc(opts.basedOn)}"/>`);
+	if (opts.next) parts.push(`<w:next w:val="${esc(opts.next)}"/>`);
+	if (opts.link) parts.push(`<w:link w:val="${esc(opts.link)}"/>`);
+	if (opts.autoRedefine) parts.push("<w:autoRedefine/>");
+	if (opts.hidden) parts.push("<w:hidden/>");
+	if (opts.uiPriority !== void 0) parts.push(`<w:uiPriority w:val="${opts.uiPriority}"/>`);
+	if (opts.semiHidden) parts.push("<w:semiHidden/>");
+	if (opts.unhideWhenUsed) parts.push("<w:unhideWhenUsed/>");
+	if (opts.quickFormat) parts.push("<w:qFormat/>");
+	if (opts.locked) parts.push("<w:locked/>");
+	if (opts.personal) parts.push("<w:personal/>");
+	if (opts.personalCompose) parts.push("<w:personalCompose/>");
+	if (opts.personalReply) parts.push("<w:personalReply/>");
+	if (opts.rsid) parts.push(`<w:rsid w:val="${opts.rsid}"/>`);
+	return parts.join("");
+}
 /** Build `<w:style>` XML for a paragraph style. */
 function stringifyParagraphStyle(opts) {
-	const children = [];
-	children.push(`<w:name w:val="${esc(opts.name ?? opts.id)}"/>`);
-	if (opts.aliases) children.push(`<w:aliases w:val="${esc(opts.aliases)}"/>`);
-	if (opts.basedOn) children.push(`<w:basedOn w:val="${esc(opts.basedOn)}"/>`);
-	if (opts.next) children.push(`<w:next w:val="${esc(opts.next)}"/>`);
-	if (opts.link) children.push(`<w:link w:val="${esc(opts.link)}"/>`);
-	if (opts.autoRedefine) children.push("<w:autoRedefine/>");
-	if (opts.uiPriority !== void 0) children.push(`<w:uiPriority w:val="${opts.uiPriority}"/>`);
-	if (opts.semiHidden) children.push("<w:semiHidden/>");
-	if (opts.unhideWhenUsed) children.push("<w:unhideWhenUsed/>");
-	if (opts.quickFormat) children.push("<w:qFormat/>");
-	if (opts.locked) children.push("<w:locked/>");
-	if (opts.personal) children.push("<w:personal/>");
-	if (opts.personalCompose) children.push("<w:personalCompose/>");
-	if (opts.personalReply) children.push("<w:personalReply/>");
+	const children = [stringifyStyleLevelChildren(opts)];
 	const pPr = stringifyParagraphProperties(opts.paragraph).xml;
 	if (pPr) children.push(pPr);
 	const rPr = stringifyRunProperties(opts.run);
@@ -9512,23 +9859,54 @@ function stringifyParagraphStyle(opts) {
 }
 /** Build `<w:style>` XML for a character style. */
 function stringifyCharacterStyle(opts) {
-	const children = [];
-	children.push(`<w:name w:val="${esc(opts.name ?? opts.id)}"/>`);
-	if (opts.aliases) children.push(`<w:aliases w:val="${esc(opts.aliases)}"/>`);
-	if (opts.basedOn) children.push(`<w:basedOn w:val="${esc(opts.basedOn)}"/>`);
-	if (opts.link) children.push(`<w:link w:val="${esc(opts.link)}"/>`);
-	if (opts.autoRedefine) children.push("<w:autoRedefine/>");
-	if (opts.uiPriority !== void 0) children.push(`<w:uiPriority w:val="${opts.uiPriority}"/>`);
-	if (opts.semiHidden) children.push("<w:semiHidden/>");
-	if (opts.unhideWhenUsed) children.push("<w:unhideWhenUsed/>");
-	if (opts.locked) children.push("<w:locked/>");
-	if (opts.personal) children.push("<w:personal/>");
-	if (opts.personalCompose) children.push("<w:personalCompose/>");
-	if (opts.personalReply) children.push("<w:personalReply/>");
+	const children = [stringifyStyleLevelChildren(opts)];
 	const rPr = stringifyRunProperties(opts.run);
 	if (rPr) children.push(rPr);
 	return `<w:style w:type="character" w:styleId="${esc(opts.id)}">${children.join("")}</w:style>`;
 }
+/** Build `<w:tblStylePr>` XML for a conditional table style format. */
+function stringifyConditionalTableStyle(opts) {
+	const children = [];
+	const pPr = stringifyParagraphProperties(opts.paragraph).xml;
+	if (pPr) children.push(pPr);
+	const rPr = stringifyRunProperties(opts.run);
+	if (rPr) children.push(rPr);
+	if (opts.table) {
+		const tblPr = stringifyTableProperties(opts.table);
+		if (tblPr) children.push(tblPr);
+	}
+	if (opts.row) {
+		const trPr = stringifyTableRowProperties(opts.row);
+		if (trPr) children.push(trPr);
+	}
+	if (opts.cell) {
+		const tcPr = stringifyTableCellProperties(opts.cell);
+		if (tcPr) children.push(tcPr);
+	}
+	return `<w:tblStylePr w:type="${opts.type}">${children.join("")}</w:tblStylePr>`;
+}
+/** Build `<w:style type="table">` XML for a table style. */
+function stringifyTableStyle(opts) {
+	const children = [stringifyStyleLevelChildren(opts)];
+	const pPr = stringifyParagraphProperties(opts.paragraph).xml;
+	if (pPr) children.push(pPr);
+	const rPr = stringifyRunProperties(opts.run);
+	if (rPr) children.push(rPr);
+	if (opts.table) {
+		const tblPr = stringifyTableProperties(opts.table);
+		if (tblPr) children.push(tblPr);
+	}
+	if (opts.row) {
+		const trPr = stringifyTableRowProperties(opts.row);
+		if (trPr) children.push(trPr);
+	}
+	if (opts.cell) {
+		const tcPr = stringifyTableCellProperties(opts.cell);
+		if (tcPr) children.push(tcPr);
+	}
+	for (const cf of opts.conditionalFormats ?? []) children.push(stringifyConditionalTableStyle(cf));
+	return `<w:style w:type="table" w:styleId="${esc(opts.id)}">${children.join("")}</w:style>`;
+}
 /** Resolve a user override for heading level N (1-9) from default styles options. */
 function headingOverride(options, level) {
 	switch (level) {
@@ -9980,6 +10358,7 @@ var Styles = class {
 		const customStyleIds = /* @__PURE__ */ new Set();
 		for (const s of options.paragraphStyles ?? []) customStyleIds.add(s.id);
 		for (const s of options.characterStyles ?? []) customStyleIds.add(s.id);
+		for (const s of options.tableStyles ?? []) customStyleIds.add(s.id);
 		if (options.importedStyles) for (const style of options.importedStyles) {
 			if (!style._raw) continue;
 			if (customStyleIds.size > 0) {
@@ -10023,6 +10402,7 @@ var Styles = class {
 			personalReply: style.personalReply,
 			run: style.run
 		}));
+		if (options.tableStyles) for (const style of options.tableStyles) this.parts.push(stringifyTableStyle(style));
 	}
 	/**
 	* Serialize to word/styles.xml content (with XML declaration).
@@ -10088,6 +10468,7 @@ function parseStyleDefinitions(el, parseParagraphProperties, ctx) {
 	const opts = {};
 	const paragraphStyles = [];
 	const characterStyles = [];
+	const tableStyles = [];
 	for (const child of el.elements ?? []) if (child.name === "w:docDefaults") {
 		const defOpts = parseDocDefaults(child, parseParagraphProperties, ctx);
 		if (defOpts) opts.default = defOpts;
@@ -10096,6 +10477,11 @@ function parseStyleDefinitions(el, parseParagraphProperties, ctx) {
 	else if (child.name === "w:style") {
 		const styleOpts = parseStyleElement(child, parseParagraphProperties, ctx);
 		if (!styleOpts?._type || !styleOpts.id) continue;
+		if (styleOpts._type === "table") {
+			delete styleOpts._type;
+			tableStyles.push(styleOpts);
+			continue;
+		}
 		(opts.importedStyles ??= []).push({ _raw: stringifyElement(child) });
 		const defaultField = STYLE_ID_TO_DEFAULT_FIELD[styleOpts.id];
 		if (defaultField) {
@@ -10112,6 +10498,7 @@ function parseStyleDefinitions(el, parseParagraphProperties, ctx) {
 	}
 	if (paragraphStyles.length > 0) opts.paragraphStyles = paragraphStyles;
 	if (characterStyles.length > 0) opts.characterStyles = characterStyles;
+	if (tableStyles.length > 0) opts.tableStyles = tableStyles;
 	return Object.keys(opts).length > 0 ? opts : void 0;
 }
 function parseDocDefaults(el, parseParagraphProperties, ctx) {
@@ -10175,6 +10562,12 @@ function parseStyleElement(el, parseParagraphProperties, ctx) {
 	if (findChild(el, "w:personal")) opts.personal = true;
 	if (findChild(el, "w:personalCompose")) opts.personalCompose = true;
 	if (findChild(el, "w:personalReply")) opts.personalReply = true;
+	if (findChild(el, "w:hidden")) opts.hidden = true;
+	const rsidEl = findChild(el, "w:rsid");
+	if (rsidEl) {
+		const val = attr(rsidEl, "w:val");
+		if (val) opts.rsid = val;
+	}
 	const aliases = findChild(el, "w:aliases");
 	if (aliases) {
 		const val = attr(aliases, "w:val");
@@ -10190,6 +10583,55 @@ function parseStyleElement(el, parseParagraphProperties, ctx) {
 		const runOpts = parseRunProperties(rPr);
 		if (Object.keys(runOpts).length > 0) opts.run = runOpts;
 	}
+	const tblPr = findChild(el, "w:tblPr");
+	if (tblPr) {
+		const tableOpts = parseTablePropertiesEl(tblPr);
+		if (Object.keys(tableOpts).length > 0) opts.table = tableOpts;
+	}
+	const trPr = findChild(el, "w:trPr");
+	if (trPr) {
+		const rowOpts = parseTableRowPropertiesEl(trPr);
+		if (Object.keys(rowOpts).length > 0) opts.row = rowOpts;
+	}
+	const tcPr = findChild(el, "w:tcPr");
+	if (tcPr) {
+		const cellOpts = parseTableCellPropertiesEl(tcPr);
+		if (Object.keys(cellOpts).length > 0) opts.cell = cellOpts;
+	}
+	const conditionalFormats = [];
+	for (const child of el.elements ?? []) {
+		if (child.name !== "w:tblStylePr") continue;
+		const type = attr(child, "w:type");
+		if (!type) continue;
+		const cf = { type };
+		const cfPPr = findChild(child, "w:pPr");
+		if (cfPPr) {
+			const paraOpts = parseParagraphProperties(cfPPr, ctx);
+			if (Object.keys(paraOpts).length > 0) cf.paragraph = paraOpts;
+		}
+		const cfRPr = findChild(child, "w:rPr");
+		if (cfRPr) {
+			const runOpts = parseRunProperties(cfRPr);
+			if (Object.keys(runOpts).length > 0) cf.run = runOpts;
+		}
+		const cfTblPr = findChild(child, "w:tblPr");
+		if (cfTblPr) {
+			const tableOpts = parseTablePropertiesEl(cfTblPr);
+			if (Object.keys(tableOpts).length > 0) cf.table = tableOpts;
+		}
+		const cfTrPr = findChild(child, "w:trPr");
+		if (cfTrPr) {
+			const rowOpts = parseTableRowPropertiesEl(cfTrPr);
+			if (Object.keys(rowOpts).length > 0) cf.row = rowOpts;
+		}
+		const cfTcPr = findChild(child, "w:tcPr");
+		if (cfTcPr) {
+			const cellOpts = parseTableCellPropertiesEl(cfTcPr);
+			if (Object.keys(cellOpts).length > 0) cf.cell = cellOpts;
+		}
+		conditionalFormats.push(cf);
+	}
+	if (conditionalFormats.length > 0) opts.conditionalFormats = conditionalFormats;
 	return opts;
 }
 //#endregion
@@ -10230,8 +10672,443 @@ function attrEl(tag, attrs) {
 	const a = attrStr(attrs);
 	return a ? `<${tag} ${a}/>` : `<${tag}/>`;
 }
-function compatSetting(name, val) {
-	return `<w:compatSetting w:name="${escapeAttr$1(name)}" w:uri="http://schemas.microsoft.com/office/word" w:val="${val}"/>`;
+function compatSetting(name, val, uri) {
+	const u = uri ?? "http://schemas.microsoft.com/office/word";
+	return `<w:compatSetting w:name="${escapeAttr$1(name)}" w:uri="${u}" w:val="${val}"/>`;
+}
+/** Read a CT_OnOff child as boolean (presence true unless val is explicitly false). */
+function readOnOff(el) {
+	if (!el || !el.name) return void 0;
+	const v = attr(el, valAttr(el.name));
+	return v !== "false" && v !== "0" && v !== "off";
+}
+/** Read an attribute as a number, or undefined if absent/unparseable. */
+function readNum(el, name) {
+	if (!el) return void 0;
+	const v = attr(el, name);
+	if (v === void 0 || v === "") return void 0;
+	const n = parseInt(v, 10);
+	return Number.isNaN(n) ? void 0 : n;
+}
+/** Read an attribute as a string, or undefined if absent. */
+function readStr(el, name) {
+	if (!el) return void 0;
+	const v = attr(el, name);
+	return v === void 0 || v === "" ? void 0 : v;
+}
+/** Read an attribute constrained to an enum; undefined if absent or not allowed. */
+function readEnum(el, name, allowed) {
+	const v = readStr(el, name);
+	return v !== void 0 && allowed.includes(v) ? v : void 0;
+}
+/** Shared password/crypto attributes (AG_TransitionalPassword) → options keys. */
+const PASSWORD_ATTR_MAP = [
+	[
+		"hashValue",
+		"w:hashValue",
+		false
+	],
+	[
+		"saltValue",
+		"w:saltValue",
+		false
+	],
+	[
+		"hash",
+		"w:hash",
+		false
+	],
+	[
+		"salt",
+		"w:salt",
+		false
+	],
+	[
+		"spinCount",
+		"w:spinCount",
+		true
+	],
+	[
+		"algorithmName",
+		"w:algorithmName",
+		false
+	],
+	[
+		"cryptoAlgorithmClass",
+		"w:cryptAlgorithmClass",
+		false
+	],
+	[
+		"cryptoAlgorithmSid",
+		"w:cryptAlgorithmSid",
+		true
+	],
+	[
+		"cryptoAlgorithmType",
+		"w:cryptAlgorithmType",
+		false
+	],
+	[
+		"cryptoProvider",
+		"w:cryptProvider",
+		false
+	],
+	[
+		"cryptoProviderType",
+		"w:cryptProviderType",
+		false
+	],
+	[
+		"cryptoProviderTypeExtension",
+		"w:cryptProviderTypeExt",
+		true
+	],
+	[
+		"cryptoProviderTypeExtensionSource",
+		"w:cryptProviderTypeExtSource",
+		false
+	],
+	[
+		"algorithmExtensionId",
+		"w:algIdExt",
+		true
+	],
+	[
+		"algorithmExtensionSource",
+		"w:algIdExtSource",
+		false
+	],
+	[
+		"cryptoSpinCount",
+		"w:cryptSpinCount",
+		true
+	]
+];
+/** Read shared password/crypto attributes into an options object. */
+function readPasswordAttrs(el) {
+	const out = {};
+	for (const [key, xmlAttr, isNum] of PASSWORD_ATTR_MAP) {
+		const v = attr(el, xmlAttr);
+		if (v === void 0 || v === "") continue;
+		out[key] = isNum ? parseInt(v, 10) : v;
+	}
+	return out;
+}
+/**
+* CT_OnOff compat flag elements → CompatibilityOptions keys. The XML tag often
+* differs from the option key (e.g. wordPerfectJustification → w:wpJustification).
+* Order mirrors stringifyCompatibility so round-trip preserves element order.
+*/
+const COMPAT_FLAG_MAP = [
+	["useSingleBorderforContiguousCells", "w:useSingleBorderforContiguousCells"],
+	["wordPerfectJustification", "w:wpJustification"],
+	["noTabStopForHangingIndent", "w:noTabHangInd"],
+	["noLeading", "w:noLeading"],
+	["spaceForUnderline", "w:spaceForUL"],
+	["noColumnBalance", "w:noColumnBalance"],
+	["balanceSingleByteDoubleByteWidth", "w:balanceSingleByteDoubleByteWidth"],
+	["noExtraLineSpacing", "w:noExtraLineSpacing"],
+	["doNotLeaveBackslashAlone", "w:doNotLeaveBackslashAlone"],
+	["underlineTrailingSpaces", "w:ulTrailSpace"],
+	["doNotExpandShiftReturn", "w:doNotExpandShiftReturn"],
+	["spacingInWholePoints", "w:spacingInWholePoints"],
+	["lineWrapLikeWord6", "w:lineWrapLikeWord6"],
+	["printBodyTextBeforeHeader", "w:printBodyTextBeforeHeader"],
+	["printColorsBlack", "w:printColBlack"],
+	["spaceWidth", "w:wpSpaceWidth"],
+	["showBreaksInFrames", "w:showBreaksInFrames"],
+	["subFontBySize", "w:subFontBySize"],
+	["suppressBottomSpacing", "w:suppressBottomSpacing"],
+	["suppressTopSpacing", "w:suppressTopSpacing"],
+	["suppressSpacingAtTopOfPage", "w:suppressSpacingAtTopOfPage"],
+	["suppressTopSpacingWP", "w:suppressTopSpacingWP"],
+	["suppressSpBfAfterPgBrk", "w:suppressSpBfAfterPgBrk"],
+	["swapBordersFacingPages", "w:swapBordersFacingPages"],
+	["convertMailMergeEsc", "w:convMailMergeEsc"],
+	["truncateFontHeightsLikeWP6", "w:truncateFontHeightsLikeWP6"],
+	["macWordSmallCaps", "w:mwSmallCaps"],
+	["usePrinterMetrics", "w:usePrinterMetrics"],
+	["doNotSuppressParagraphBorders", "w:doNotSuppressParagraphBorders"],
+	["wrapTrailSpaces", "w:wrapTrailSpaces"],
+	["footnoteLayoutLikeWW8", "w:footnoteLayoutLikeWW8"],
+	["shapeLayoutLikeWW8", "w:shapeLayoutLikeWW8"],
+	["alignTablesRowByRow", "w:alignTablesRowByRow"],
+	["forgetLastTabAlignment", "w:forgetLastTabAlignment"],
+	["adjustLineHeightInTable", "w:adjustLineHeightInTable"],
+	["autoSpaceLikeWord95", "w:autoSpaceLikeWord95"],
+	["noSpaceRaiseLower", "w:noSpaceRaiseLower"],
+	["doNotUseHTMLParagraphAutoSpacing", "w:doNotUseHTMLParagraphAutoSpacing"],
+	["layoutRawTableWidth", "w:layoutRawTableWidth"],
+	["layoutTableRowsApart", "w:layoutTableRowsApart"],
+	["useWord97LineBreakRules", "w:useWord97LineBreakRules"],
+	["doNotBreakWrappedTables", "w:doNotBreakWrappedTables"],
+	["doNotSnapToGridInCell", "w:doNotSnapToGridInCell"],
+	["selectFieldWithFirstOrLastCharacter", "w:selectFldWithFirstOrLastChar"],
+	["applyBreakingRules", "w:applyBreakingRules"],
+	["doNotWrapTextWithPunctuation", "w:doNotWrapTextWithPunct"],
+	["doNotUseEastAsianBreakRules", "w:doNotUseEastAsianBreakRules"],
+	["useWord2002TableStyleRules", "w:useWord2002TableStyleRules"],
+	["growAutofit", "w:growAutofit"],
+	["useFELayout", "w:useFELayout"],
+	["useNormalStyleForList", "w:useNormalStyleForList"],
+	["doNotUseIndentAsNumberingTabStop", "w:doNotUseIndentAsNumberingTabStop"],
+	["useAlternateEastAsianLineBreakRules", "w:useAltKinsokuLineBreakRules"],
+	["allowSpaceOfSameStyleInTable", "w:allowSpaceOfSameStyleInTable"],
+	["doNotSuppressIndentation", "w:doNotSuppressIndentation"],
+	["doNotAutofitConstrainedTables", "w:doNotAutofitConstrainedTables"],
+	["autofitToFirstFixedWidthCell", "w:autofitToFirstFixedWidthCell"],
+	["underlineTabInNumberingList", "w:underlineTabInNumList"],
+	["displayHangulFixedWidth", "w:displayHangulFixedWidth"],
+	["splitPgBreakAndParaMark", "w:splitPgBreakAndParaMark"],
+	["doNotVerticallyAlignCellWithSp", "w:doNotVertAlignCellWithSp"],
+	["doNotBreakConstrainedForcedTable", "w:doNotBreakConstrainedForcedTable"],
+	["ignoreVerticalAlignmentInTextboxes", "w:doNotVertAlignInTxbx"],
+	["useAnsiKerningPairs", "w:useAnsiKerningPairs"],
+	["cachedColumnBalance", "w:cachedColBalance"]
+];
+/** compatSetting names that map to dedicated sugar fields (not into compatSettings[]). */
+const COMPAT_SETTING_SUGAR = {
+	compatibilityMode: "version",
+	overrideTableStyleFontSizeAndJustification: "overrideTableStyleFontSizeAndJustification",
+	enableOpenTypeFeatures: "enableOpenTypeFeatures",
+	doNotFlipMirrorIndents: "doNotFlipMirrorIndents"
+};
+/** Parse w:footnotePr / w:endnotePr (CT_FtnDocProps / CT_EdnDocProps). */
+function parseFtnEdnPr(el) {
+	const o = {};
+	const pos = readStr(findChild(el, "w:pos"), "w:val");
+	if (pos) o.pos = pos;
+	const numFmtEl = findChild(el, "w:numFmt");
+	if (numFmtEl) {
+		const v = readStr(numFmtEl, "w:val");
+		if (v) o.numFmt = v;
+		const format = readStr(numFmtEl, "w:format");
+		if (format) o.format = format;
+	}
+	const numStart = readNum(findChild(el, "w:numStart"), "w:val");
+	if (numStart !== void 0) o.numStart = numStart;
+	const numRestart = readStr(findChild(el, "w:numRestart"), "w:val");
+	if (numRestart) o.numRestart = numRestart;
+	return Object.keys(o).length > 0 ? o : void 0;
+}
+/** Parse w:compat (CT_Compat): on/off flag elements + w:compatSetting entries. */
+function parseCompatibility(el) {
+	const o = {};
+	const flagMap = Object.fromEntries(COMPAT_FLAG_MAP.map(([key, tag]) => [tag, key]));
+	const extras = [];
+	for (const child of el.elements ?? []) {
+		if (child.type !== "element" || !child.name) continue;
+		const key = flagMap[child.name];
+		if (key !== void 0) {
+			o[key] = true;
+			continue;
+		}
+		if (child.name === "w:compatSetting") {
+			const name = attr(child, "w:name");
+			const val = attr(child, "w:val");
+			if (name === void 0 || val === void 0) continue;
+			const sugar = COMPAT_SETTING_SUGAR[name];
+			if (sugar === "version") {
+				const n = parseInt(val, 10);
+				if (!Number.isNaN(n)) o.version = n;
+			} else if (sugar !== void 0) o[sugar] = val !== "0" && val !== "false";
+			else extras.push({
+				name,
+				val,
+				uri: attr(child, "w:uri")
+			});
+		}
+	}
+	if (extras.length > 0) o.compatSettings = extras;
+	return Object.keys(o).length > 0 ? o : void 0;
+}
+/** Parse m:mathPr (CT_MathPr). */
+function parseMathPr(el) {
+	const o = {};
+	const mathFont = readStr(findChild(el, "m:mathFont"), "m:val");
+	if (mathFont) o.mathFont = mathFont;
+	const binaryOperatorBreak = readEnum(findChild(el, "m:brkBin"), "m:val", [
+		"before",
+		"after",
+		"repeat"
+	]);
+	if (binaryOperatorBreak) o.binaryOperatorBreak = binaryOperatorBreak;
+	const binaryOperatorBreakSubtraction = readEnum(findChild(el, "m:brkBinSub"), "m:val", [
+		"--",
+		"-+",
+		"+-"
+	]);
+	if (binaryOperatorBreakSubtraction) o.binaryOperatorBreakSubtraction = binaryOperatorBreakSubtraction;
+	const smallFractions = readOnOff(findChild(el, "m:smallFrac"));
+	if (smallFractions !== void 0) o.smallFractions = smallFractions;
+	const displayDefaults = readOnOff(findChild(el, "m:dispDef"));
+	if (displayDefaults !== void 0) o.displayDefaults = displayDefaults;
+	const leftMargin = readNum(findChild(el, "m:lMargin"), "m:val");
+	if (leftMargin !== void 0) o.leftMargin = leftMargin;
+	const rightMargin = readNum(findChild(el, "m:rMargin"), "m:val");
+	if (rightMargin !== void 0) o.rightMargin = rightMargin;
+	const defaultJustification = readEnum(findChild(el, "m:defJc"), "m:val", [
+		"left",
+		"right",
+		"center",
+		"centerGroup"
+	]);
+	if (defaultJustification) o.defaultJustification = defaultJustification;
+	const preSpacing = readNum(findChild(el, "m:preSp"), "m:val");
+	if (preSpacing !== void 0) o.preSpacing = preSpacing;
+	const postSpacing = readNum(findChild(el, "m:postSp"), "m:val");
+	if (postSpacing !== void 0) o.postSpacing = postSpacing;
+	const interSpacing = readNum(findChild(el, "m:interSp"), "m:val");
+	if (interSpacing !== void 0) o.interSpacing = interSpacing;
+	const intraSpacing = readNum(findChild(el, "m:intraSp"), "m:val");
+	if (intraSpacing !== void 0) o.intraSpacing = intraSpacing;
+	const wrapIndent = readNum(findChild(el, "m:wrapIndent"), "m:val");
+	if (wrapIndent !== void 0) o.wrapIndent = wrapIndent;
+	const wrapRight = readOnOff(findChild(el, "m:wrapRight"));
+	if (wrapRight !== void 0) o.wrapRight = wrapRight;
+	const integralLimitLocation = readEnum(findChild(el, "m:intLim"), "m:val", ["subSup", "undOvr"]);
+	if (integralLimitLocation) o.integralLimitLocation = integralLimitLocation;
+	const naryLimitLocation = readEnum(findChild(el, "m:naryLim"), "m:val", ["subSup", "undOvr"]);
+	if (naryLimitLocation) o.naryLimitLocation = naryLimitLocation;
+	return Object.keys(o).length > 0 ? o : void 0;
+}
+/** Parse w:captions (CT_Captions). */
+function parseCaptions(el) {
+	const captions = [];
+	const autoCaptions = [];
+	for (const child of el.elements ?? []) {
+		if (child.type !== "element") continue;
+		if (child.name === "w:caption") {
+			const c = { name: attr(child, "w:name") ?? "" };
+			const pos = attr(child, "w:pos");
+			if (pos) c.pos = pos;
+			const chapNum = attr(child, "w:chapNum");
+			if (chapNum !== void 0) c.chapNum = chapNum === "1";
+			const heading = attr(child, "w:heading");
+			if (heading !== void 0) c.heading = parseInt(heading, 10);
+			const noLabel = attr(child, "w:noLabel");
+			if (noLabel !== void 0) c.noLabel = noLabel === "1";
+			const numFmt = attr(child, "w:numFmt");
+			if (numFmt) c.numFmt = numFmt;
+			const sep = attr(child, "w:sep");
+			if (sep) c.sep = sep;
+			captions.push(c);
+		} else if (child.name === "w:autoCaptions") for (const ac of child.elements ?? []) {
+			if (ac.name !== "w:autoCaption") continue;
+			const name = attr(ac, "w:name");
+			const caption = attr(ac, "w:caption");
+			if (name && caption) autoCaptions.push({
+				name,
+				caption
+			});
+		}
+	}
+	if (captions.length === 0) return void 0;
+	const o = { captions };
+	if (autoCaptions.length > 0) o.autoCaptions = autoCaptions;
+	return o;
+}
+/** Parse w:odso (CT_Odso). */
+function parseOdso(el) {
+	const o = {};
+	const udl = readStr(findChild(el, "w:udl"), "w:val");
+	if (udl) o.udl = udl;
+	const table = readStr(findChild(el, "w:table"), "w:val");
+	if (table) o.table = table;
+	const srcEl = findChild(el, "w:src");
+	if (srcEl) {
+		const rid = attr(srcEl, "r:id");
+		if (rid) o.src = rid;
+	}
+	const colDelim = readNum(findChild(el, "w:colDelim"), "w:val");
+	if (colDelim !== void 0) o.colDelim = colDelim;
+	const type = readStr(findChild(el, "w:type"), "w:val");
+	if (type) o.type = type;
+	const fHdr = readOnOff(findChild(el, "w:fHdr"));
+	if (fHdr !== void 0) o.fHdr = fHdr;
+	const fieldMapData = [];
+	for (const child of el.elements ?? []) {
+		if (child.name !== "w:fieldMapData") continue;
+		const fm = {};
+		const t = readStr(findChild(child, "w:type"), "w:val");
+		if (t) fm.type = t;
+		const n = readStr(findChild(child, "w:name"), "w:val");
+		if (n) fm.name = n;
+		const mn = readStr(findChild(child, "w:mappedName"), "w:val");
+		if (mn) fm.mappedName = mn;
+		const col = readNum(findChild(child, "w:column"), "w:val");
+		if (col !== void 0) fm.column = col;
+		const lid = readStr(findChild(child, "w:lid"), "w:val");
+		if (lid) fm.lid = lid;
+		const dyn = readOnOff(findChild(child, "w:dynamicAddress"));
+		if (dyn !== void 0) fm.dynamicAddress = dyn;
+		if (Object.keys(fm).length > 0) fieldMapData.push(fm);
+	}
+	if (fieldMapData.length > 0) o.fieldMapData = fieldMapData;
+	const recipientData = [];
+	for (const child of el.elements ?? []) {
+		if (child.name !== "w:recipientData") continue;
+		const rid = attr(child, "r:id");
+		if (rid) recipientData.push(rid);
+	}
+	if (recipientData.length > 0) o.recipientData = recipientData;
+	const uniqueTag = readStr(findChild(el, "w:uniqueTag"), "w:val");
+	if (uniqueTag) o.uniqueTag = uniqueTag;
+	return Object.keys(o).length > 0 ? o : void 0;
+}
+/** Parse w:mailMerge (CT_MailMerge). */
+function parseMailMerge(el) {
+	const o = {};
+	const mdt = readStr(findChild(el, "w:mainDocumentType"), "w:val");
+	if (mdt) o.mainDocumentType = mdt;
+	const dataType = readStr(findChild(el, "w:dataType"), "w:val");
+	if (dataType) o.dataType = dataType;
+	const dest = readStr(findChild(el, "w:destination"), "w:val");
+	if (dest) o.destination = dest;
+	const connectString = readStr(findChild(el, "w:connectString"), "w:val");
+	if (connectString) o.connectString = connectString;
+	const query = readStr(findChild(el, "w:query"), "w:val");
+	if (query) o.query = query;
+	const dsEl = findChild(el, "w:dataSource");
+	if (dsEl) {
+		const rid = attr(dsEl, "r:id");
+		if (rid) o.dataSource = rid;
+	}
+	const hsEl = findChild(el, "w:headerSource");
+	if (hsEl) {
+		const rid = attr(hsEl, "r:id");
+		if (rid) o.headerSource = rid;
+	}
+	const linkToQuery = readOnOff(findChild(el, "w:linkToQuery"));
+	if (linkToQuery !== void 0) o.linkToQuery = linkToQuery;
+	const doNotSuppress = readOnOff(findChild(el, "w:doNotSuppressBlankLines"));
+	if (doNotSuppress !== void 0) o.doNotSuppressBlankLines = doNotSuppress;
+	const addressFieldName = readStr(findChild(el, "w:addressFieldName"), "w:val");
+	if (addressFieldName) o.addressFieldName = addressFieldName;
+	const mailSubject = readStr(findChild(el, "w:mailSubject"), "w:val");
+	if (mailSubject) o.mailSubject = mailSubject;
+	const mailAsAttachment = readOnOff(findChild(el, "w:mailAsAttachment"));
+	if (mailAsAttachment !== void 0) o.mailAsAttachment = mailAsAttachment;
+	const viewMergedData = readOnOff(findChild(el, "w:viewMergedData"));
+	if (viewMergedData !== void 0) o.viewMergedData = viewMergedData;
+	const activeRecord = readNum(findChild(el, "w:activeRecord"), "w:val");
+	if (activeRecord !== void 0) o.activeRecord = activeRecord;
+	const checkErrors = readNum(findChild(el, "w:checkErrors"), "w:val");
+	if (checkErrors !== void 0) o.checkErrors = checkErrors;
+	const active = readOnOff(findChild(el, "w:active"));
+	if (active !== void 0) o.active = active;
+	const recipientsEl = findChild(el, "w:recipients");
+	if (recipientsEl) {
+		const rid = attr(recipientsEl, "r:id");
+		if (rid) o.recipients = rid;
+	}
+	const odsoEl = findChild(el, "w:odso");
+	if (odsoEl) {
+		const odso = parseOdso(odsoEl);
+		if (odso) o.odso = odso;
+	}
+	if (Object.keys(o).length === 0) return void 0;
+	return o;
 }
 function maybeDerive(password, hashValue) {
 	return password !== void 0 && hashValue === void 0 ? derivePasswordHash(password) : void 0;
@@ -10407,16 +11284,21 @@ function stringifyCaptions(opts) {
 function stringifyMathPr(opts) {
 	const p = [];
 	if (opts.mathFont !== void 0) p.push(attrEl("m:mathFont", { "m:val": opts.mathFont }));
-	if (opts.brkBin !== void 0) p.push(attrEl("m:brkBin", { "m:val": opts.brkBin }));
-	if (opts.brkBinSub !== void 0) p.push(attrEl("m:brkBinSub", { "m:val": opts.brkBinSub }));
-	p.push(onOff("m:smallFrac", opts.smallFrac));
-	p.push(onOff("m:dispDef", opts.dispDef));
-	p.push(numVal("m:lMargin", opts.lMargin));
-	p.push(numVal("m:rMargin", opts.rMargin));
-	if (opts.defJc !== void 0) p.push(attrEl("m:defJc", { "m:val": opts.defJc }));
+	if (opts.binaryOperatorBreak !== void 0) p.push(attrEl("m:brkBin", { "m:val": opts.binaryOperatorBreak }));
+	if (opts.binaryOperatorBreakSubtraction !== void 0) p.push(attrEl("m:brkBinSub", { "m:val": opts.binaryOperatorBreakSubtraction }));
+	p.push(onOff("m:smallFrac", opts.smallFractions));
+	p.push(onOff("m:dispDef", opts.displayDefaults));
+	p.push(numVal("m:lMargin", opts.leftMargin));
+	p.push(numVal("m:rMargin", opts.rightMargin));
+	if (opts.defaultJustification !== void 0) p.push(attrEl("m:defJc", { "m:val": opts.defaultJustification }));
+	p.push(numVal("m:preSp", opts.preSpacing));
+	p.push(numVal("m:postSp", opts.postSpacing));
+	p.push(numVal("m:interSp", opts.interSpacing));
+	p.push(numVal("m:intraSp", opts.intraSpacing));
 	p.push(numVal("m:wrapIndent", opts.wrapIndent));
-	if (opts.intLim !== void 0) p.push(attrEl("m:intLim", { "m:val": opts.intLim }));
-	if (opts.naryLim !== void 0) p.push(attrEl("m:naryLim", { "m:val": opts.naryLim }));
+	p.push(onOff("m:wrapRight", opts.wrapRight));
+	if (opts.integralLimitLocation !== void 0) p.push(attrEl("m:intLim", { "m:val": opts.integralLimitLocation }));
+	if (opts.naryLimitLocation !== void 0) p.push(attrEl("m:naryLim", { "m:val": opts.naryLimitLocation }));
 	return `<m:mathPr>${p.join("")}</m:mathPr>`;
 }
 function stringifyColorSchemeMapping(opts) {
@@ -10506,6 +11388,18 @@ function stringifyCompatibility(opts) {
 	if (opts.overrideTableStyleFontSizeAndJustification) p.push(compatSetting("overrideTableStyleFontSizeAndJustification", 1));
 	if (opts.enableOpenTypeFeatures) p.push(compatSetting("enableOpenTypeFeatures", 1));
 	if (opts.doNotFlipMirrorIndents) p.push(compatSetting("doNotFlipMirrorIndents", 1));
+	if (opts.compatSettings) {
+		const emitted = /* @__PURE__ */ new Set();
+		if (opts.version) emitted.add("compatibilityMode");
+		if (opts.overrideTableStyleFontSizeAndJustification) emitted.add("overrideTableStyleFontSizeAndJustification");
+		if (opts.enableOpenTypeFeatures) emitted.add("enableOpenTypeFeatures");
+		if (opts.doNotFlipMirrorIndents) emitted.add("doNotFlipMirrorIndents");
+		for (const cs of opts.compatSettings) {
+			if (emitted.has(cs.name)) continue;
+			p.push(compatSetting(cs.name, cs.val, cs.uri));
+			emitted.add(cs.name);
+		}
+	}
 	return p.length ? `<w:compat>${p.join("")}</w:compat>` : "";
 }
 const SETTINGS_NS = "xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 w15 wp14\"";
@@ -10575,7 +11469,8 @@ const settingsDesc = {
 				["clearFormatting", "w:clearFormatting"],
 				["top3HeadingStyles", "w:top3HeadingStyles"],
 				["visibleStyles", "w:visibleStyles"],
-				["alternateStyleNames", "w:alternateStyleNames"]
+				["alternateStyleNames", "w:alternateStyleNames"],
+				["latentStyles", "w:latentStyles"]
 			]) if (f[prop] !== void 0) attrs[xmlKey] = f[prop] ? "1" : "0";
 			p.push(attrEl("w:stylePaneFormatFilter", attrs));
 		}
@@ -10645,7 +11540,7 @@ const settingsDesc = {
 		p.push(onOff("w:showXMLTags", opts.showXMLTags));
 		p.push(onOff("w:alwaysMergeEmptyNamespace", opts.alwaysMergeEmptyNamespace));
 		p.push(onOff("w:updateFields", opts.updateFields));
-		if (opts.hdrShapeDefaults !== void 0) p.push("<w:hdrShapeDefaults/>");
+		if (opts.hdrShapeDefaults !== void 0) p.push(`<w:hdrShapeDefaults>${opts.hdrShapeDefaults}</w:hdrShapeDefaults>`);
 		if (opts.footnotePr !== void 0) p.push(stringifyFootnotePr(opts.footnotePr));
 		if (opts.endnotePr !== void 0) p.push(stringifyEndnotePr(opts.endnotePr));
 		const compatXml = stringifyCompatibility({
@@ -10664,7 +11559,13 @@ const settingsDesc = {
 		if (opts.mathPr !== void 0) p.push(stringifyMathPr(opts.mathPr));
 		if (opts.attachedSchema !== void 0) for (const schema of opts.attachedSchema) p.push(strVal("w:attachedSchema", schema));
 		if (opts.colorSchemeMapping !== void 0) p.push(stringifyColorSchemeMapping(opts.colorSchemeMapping));
-		if (opts.themeFontLang !== void 0) p.push(attrEl("w:themeFontLang", { "w:val": opts.themeFontLang }));
+		if (opts.themeFontLang !== void 0) {
+			const a = {};
+			if (opts.themeFontLang.val !== void 0) a["w:val"] = opts.themeFontLang.val;
+			if (opts.themeFontLang.eastAsia !== void 0) a["w:eastAsia"] = opts.themeFontLang.eastAsia;
+			if (opts.themeFontLang.bidi !== void 0) a["w:bidi"] = opts.themeFontLang.bidi;
+			p.push(attrEl("w:themeFontLang", a));
+		}
 		p.push(onOff("w:doNotIncludeSubdocsInStats", opts.doNotIncludeSubdocsInStats));
 		p.push(onOff("w:doNotAutoCompressPictures", opts.doNotAutoCompressPictures));
 		if (opts.forceUpgrade !== void 0) p.push("<w:forceUpgrade/>");
@@ -10679,160 +11580,84 @@ const settingsDesc = {
 			p.push(attrEl("w:smartTagType", attrs));
 		}
 		p.push(onOff("w:doNotEmbedSmartTags", opts.doNotEmbedSmartTags));
-		if (opts.shapeDefaults !== void 0) p.push("<w:shapeDefaults/>");
+		if (opts.shapeDefaults !== void 0) p.push(`<w:shapeDefaults>${opts.shapeDefaults}</w:shapeDefaults>`);
 		p.push(strVal("w:decimalSymbol", opts.decimalSymbol));
 		p.push(strVal("w:listSeparator", opts.listSeparator));
 		return `<w:settings ${SETTINGS_NS}>${p.join("")}</w:settings>`;
 	},
 	parse(el, _ctx) {
 		const opts = {};
-		const eohEl = findChild(el, "w:evenAndOddHeaders");
-		if (eohEl) {
-			const val = attr(eohEl, "w:val");
-			opts.evenAndOddHeaderAndFooters = val !== "false" && val !== "0" && val !== "off";
-		}
-		const viewEl = findChild(el, "w:view");
-		if (viewEl) {
-			const val = attr(viewEl, "w:val");
-			if (val) opts.view = val;
-		}
+		const wpEl = findChild(el, "w:writeProtection");
+		if (wpEl) {
+			const wp = readPasswordAttrs(wpEl);
+			const recommended = attr(wpEl, "w:recommended");
+			if (recommended !== void 0) wp.recommended = recommended === "1" || recommended === "true";
+			if (Object.keys(wp).length > 0) opts.writeProtection = wp;
+		}
+		const viewVal = readStr(findChild(el, "w:view"), "w:val");
+		if (viewVal) opts.view = viewVal;
 		const zoomEl = findChild(el, "w:zoom");
 		if (zoomEl) {
 			const zoom = {};
 			const percent = attr(zoomEl, "w:percent");
 			if (percent) zoom.percent = parseInt(percent, 10);
-			const val = attr(zoomEl, "w:val");
-			if (val) zoom.val = val;
+			const zval = attr(zoomEl, "w:val");
+			if (zval) zoom.val = zval;
 			if (Object.keys(zoom).length > 0) opts.zoom = zoom;
 		}
-		const tabStopEl = findChild(el, "w:defaultTabStop");
-		if (tabStopEl) {
-			const val = attr(tabStopEl, "w:val");
-			if (val) opts.defaultTabStop = parseInt(val, 10);
-		}
-		const trackRevEl = findChild(el, "w:trackRevisions");
-		if (trackRevEl) opts.trackRevisions = attrBool(trackRevEl, "w:val") ?? true;
-		const updateFieldsEl = findChild(el, "w:updateFields");
-		if (updateFieldsEl) opts.updateFields = attrBool(updateFieldsEl, "w:val") ?? true;
-		const compatEl = findChild(el, "w:compat");
-		if (compatEl) {
-			for (const child of compatEl.elements ?? []) if (child.name === "w:compatSetting") {
-				if (attr(child, "w:name") === "compatibilityMode") {
-					const val = attr(child, "w:val");
-					if (val) opts.compatabilityModeVersion = parseInt(val, 10);
-				}
-			}
-		}
-		const docVarsEl = findChild(el, "w:docVars");
-		if (docVarsEl) {
-			const vars = [];
-			for (const child of docVarsEl.elements ?? []) if (child.name === "w:docVar") {
-				const name = attr(child, "w:name");
-				const val = attr(child, "w:val");
-				if (name && val) vars.push({
-					name,
-					val
-				});
-			}
-			if (vars.length > 0) opts.docVars = vars;
-		}
-		const cscEl = findChild(el, "w:characterSpacingControl");
-		if (cscEl) {
-			const val = attr(cscEl, "w:val");
-			if (val) opts.characterSpacingControl = val;
-		}
-		if (findChild(el, "w:displayBackgroundShape")) opts.displayBackgroundShape = true;
-		if (findChild(el, "w:embedTrueTypeFonts")) opts.embedTrueTypeFonts = true;
-		if (findChild(el, "w:embedSystemFonts")) opts.embedSystemFonts = true;
-		if (findChild(el, "w:saveSubsetFonts")) opts.saveSubsetFonts = true;
-		if (findChild(el, "w:removePersonalInformation")) opts.removePersonalInformation = true;
-		if (findChild(el, "w:removeDateAndTime")) opts.removeDateAndTime = true;
-		if (findChild(el, "w:hideSpellingErrors")) opts.hideSpellingErrors = true;
-		if (findChild(el, "w:hideGrammaticalErrors")) opts.hideGrammaticalErrors = true;
-		if (findChild(el, "w:mirrorMargins")) opts.mirrorMargins = true;
-		if (findChild(el, "w:saveFormsData")) opts.saveFormsData = true;
-		if (findChild(el, "w:alignBordersAndEdges")) opts.alignBordersAndEdges = true;
-		if (findChild(el, "w:bordersDoNotSurroundHeader")) opts.bordersDoNotSurroundHeader = true;
-		if (findChild(el, "w:bordersDoNotSurroundFooter")) opts.bordersDoNotSurroundFooter = true;
-		if (findChild(el, "w:gutterAtTop")) opts.gutterAtTop = true;
-		if (findChild(el, "w:formsDesign")) opts.formsDesign = true;
-		if (findChild(el, "w:linkStyles")) opts.linkStyles = true;
-		if (findChild(el, "w:autoHyphenation")) {
-			const hyphenation = opts.hyphenation ?? {};
-			hyphenation.autoHyphenation = true;
-			opts.hyphenation = hyphenation;
-		}
-		if (findChild(el, "w:doNotHyphenateCaps")) {
-			const hyphenation = opts.hyphenation ?? {};
-			hyphenation.doNotHyphenateCaps = true;
-			opts.hyphenation = hyphenation;
-		}
-		const consHyphEl = findChild(el, "w:consecutiveHyphenLimit");
-		if (consHyphEl) {
-			const val = attr(consHyphEl, "w:val");
-			if (val) {
-				const hyphenation = opts.hyphenation ?? {};
-				hyphenation.consecutiveHyphenLimit = parseInt(val, 10);
-				opts.hyphenation = hyphenation;
-			}
-		}
-		const hyphZoneEl = findChild(el, "w:hyphenationZone");
-		if (hyphZoneEl) {
-			const val = attr(hyphZoneEl, "w:val");
-			if (val) {
-				const hyphenation = opts.hyphenation ?? {};
-				hyphenation.hyphenationZone = parseInt(val, 10);
-				opts.hyphenation = hyphenation;
-			}
-		}
-		const attachedTplEl = findChild(el, "w:attachedTemplate");
-		if (attachedTplEl) {
-			const val = attr(attachedTplEl, "r:id");
-			if (val) opts.attachedTemplate = val;
-		}
-		const spsmEl = findChild(el, "w:stylePaneSortMethod");
-		if (spsmEl) {
-			const val = attr(spsmEl, "w:val");
-			if (val) opts.stylePaneSortMethod = val;
-		}
-		const docTypeEl = findChild(el, "w:documentType");
-		if (docTypeEl) {
-			const val = attr(docTypeEl, "w:val");
-			if (val) opts.documentType = val;
-		}
-		const defTblStyleEl = findChild(el, "w:defaultTableStyle");
-		if (defTblStyleEl) {
-			const val = attr(defTblStyleEl, "w:val");
-			if (val) opts.defaultTableStyle = val;
-		}
-		const spffEl = findChild(el, "w:stylePaneFormatFilter");
-		if (spffEl) {
-			const filter = {};
-			for (const [prop, xmlKey] of [
-				["allStyles", "w:allStyles"],
-				["customStyles", "w:customStyles"],
-				["stylesInUse", "w:stylesInUse"],
-				["headingStyles", "w:headingStyles"],
-				["numberingStyles", "w:numberingStyles"],
-				["tableStyles", "w:tableStyles"],
-				["directFormattingOnRuns", "w:directFormattingOnRuns"],
-				["directFormattingOnParagraphs", "w:directFormattingOnParagraphs"],
-				["directFormattingOnNumbering", "w:directFormattingOnNumbering"],
-				["directFormattingOnTables", "w:directFormattingOnTables"],
-				["clearFormatting", "w:clearFormatting"],
-				["top3HeadingStyles", "w:top3HeadingStyles"],
-				["visibleStyles", "w:visibleStyles"],
-				["alternateStyleNames", "w:alternateStyleNames"]
-			]) {
-				const v = attr(spffEl, xmlKey);
-				if (v !== void 0) filter[prop] = v !== "0" && v !== "false" && v !== "off";
-			}
-			if (Object.keys(filter).length > 0) opts.stylePaneFormatFilter = filter;
-		}
-		const catEl = findChild(el, "w:clickAndTypeStyle");
-		if (catEl) {
-			const val = attr(catEl, "w:val");
-			if (val) opts.clickAndTypeStyle = val;
+		for (const [key, tag] of [
+			["removePersonalInformation", "w:removePersonalInformation"],
+			["removeDateAndTime", "w:removeDateAndTime"],
+			["doNotDisplayPageBoundaries", "w:doNotDisplayPageBoundaries"],
+			["displayBackgroundShape", "w:displayBackgroundShape"],
+			["printPostScriptOverText", "w:printPostScriptOverText"],
+			["printFractionalCharacterWidth", "w:printFractionalCharacterWidth"],
+			["printFormsData", "w:printFormsData"],
+			["embedTrueTypeFonts", "w:embedTrueTypeFonts"],
+			["embedSystemFonts", "w:embedSystemFonts"],
+			["saveSubsetFonts", "w:saveSubsetFonts"],
+			["saveFormsData", "w:saveFormsData"],
+			["mirrorMargins", "w:mirrorMargins"],
+			["alignBordersAndEdges", "w:alignBordersAndEdges"],
+			["bordersDoNotSurroundHeader", "w:bordersDoNotSurroundHeader"],
+			["bordersDoNotSurroundFooter", "w:bordersDoNotSurroundFooter"],
+			["gutterAtTop", "w:gutterAtTop"],
+			["hideSpellingErrors", "w:hideSpellingErrors"],
+			["hideGrammaticalErrors", "w:hideGrammaticalErrors"],
+			["formsDesign", "w:formsDesign"],
+			["linkStyles", "w:linkStyles"],
+			["trackRevisions", "w:trackRevisions"],
+			["doNotTrackMoves", "w:doNotTrackMoves"],
+			["doNotTrackFormatting", "w:doNotTrackFormatting"],
+			["autoFormatOverride", "w:autoFormatOverride"],
+			["styleLockTheme", "w:styleLockTheme"],
+			["styleLockQFSet", "w:styleLockQFSet"],
+			["showEnvelope", "w:showEnvelope"],
+			["evenAndOddHeaders", "w:evenAndOddHeaders"],
+			["bookFoldRevPrinting", "w:bookFoldRevPrinting"],
+			["bookFoldPrinting", "w:bookFoldPrinting"],
+			["doNotUseMarginsForDrawingGridOrigin", "w:doNotUseMarginsForDrawingGridOrigin"],
+			["doNotShadeFormData", "w:doNotShadeFormData"],
+			["noPunctuationKerning", "w:noPunctuationKerning"],
+			["printTwoOnOne", "w:printTwoOnOne"],
+			["strictFirstAndLastChars", "w:strictFirstAndLastChars"],
+			["savePreviewPicture", "w:savePreviewPicture"],
+			["doNotValidateAgainstSchema", "w:doNotValidateAgainstSchema"],
+			["saveInvalidXml", "w:saveInvalidXml"],
+			["ignoreMixedContent", "w:ignoreMixedContent"],
+			["alwaysShowPlaceholderText", "w:alwaysShowPlaceholderText"],
+			["doNotDemarcateInvalidXml", "w:doNotDemarcateInvalidXml"],
+			["saveXmlDataOnly", "w:saveXmlDataOnly"],
+			["useXSLTWhenSaving", "w:useXSLTWhenSaving"],
+			["showXMLTags", "w:showXMLTags"],
+			["alwaysMergeEmptyNamespace", "w:alwaysMergeEmptyNamespace"],
+			["updateFields", "w:updateFields"],
+			["doNotIncludeSubdocsInStats", "w:doNotIncludeSubdocsInStats"],
+			["doNotAutoCompressPictures", "w:doNotAutoCompressPictures"],
+			["doNotEmbedSmartTags", "w:doNotEmbedSmartTags"]
+		]) {
+			const v = readOnOff(findChild(el, tag));
+			if (v !== void 0) opts[key] = v;
 		}
 		const awsList = [];
 		for (const child of el.elements ?? []) {
@@ -10864,45 +11689,252 @@ const settingsDesc = {
 			if (grammar) proof.grammar = grammar;
 			if (Object.keys(proof).length > 0) opts.proofState = proof;
 		}
+		const attachedTplEl = findChild(el, "w:attachedTemplate");
+		if (attachedTplEl) {
+			const rid = attr(attachedTplEl, "r:id");
+			if (rid) opts.attachedTemplate = rid;
+		}
+		const spffEl = findChild(el, "w:stylePaneFormatFilter");
+		if (spffEl) {
+			const filter = {};
+			for (const [prop, xmlKey] of [
+				["allStyles", "w:allStyles"],
+				["customStyles", "w:customStyles"],
+				["stylesInUse", "w:stylesInUse"],
+				["headingStyles", "w:headingStyles"],
+				["numberingStyles", "w:numberingStyles"],
+				["tableStyles", "w:tableStyles"],
+				["directFormattingOnRuns", "w:directFormattingOnRuns"],
+				["directFormattingOnParagraphs", "w:directFormattingOnParagraphs"],
+				["directFormattingOnNumbering", "w:directFormattingOnNumbering"],
+				["directFormattingOnTables", "w:directFormattingOnTables"],
+				["clearFormatting", "w:clearFormatting"],
+				["top3HeadingStyles", "w:top3HeadingStyles"],
+				["visibleStyles", "w:visibleStyles"],
+				["alternateStyleNames", "w:alternateStyleNames"],
+				["latentStyles", "w:latentStyles"]
+			]) {
+				const v = attr(spffEl, xmlKey);
+				if (v !== void 0) filter[prop] = v !== "0" && v !== "false" && v !== "off";
+			}
+			if (Object.keys(filter).length > 0) opts.stylePaneFormatFilter = filter;
+		}
+		const stylePaneSortMethod = readStr(findChild(el, "w:stylePaneSortMethod"), "w:val");
+		if (stylePaneSortMethod) opts.stylePaneSortMethod = stylePaneSortMethod;
+		const documentType = readStr(findChild(el, "w:documentType"), "w:val");
+		if (documentType) opts.documentType = documentType;
+		const clickAndTypeStyle = readStr(findChild(el, "w:clickAndTypeStyle"), "w:val");
+		if (clickAndTypeStyle) opts.clickAndTypeStyle = clickAndTypeStyle;
+		const defaultTableStyle = readStr(findChild(el, "w:defaultTableStyle"), "w:val");
+		if (defaultTableStyle) opts.defaultTableStyle = defaultTableStyle;
+		const mailMergeEl = findChild(el, "w:mailMerge");
+		if (mailMergeEl) {
+			const mm = parseMailMerge(mailMergeEl);
+			if (mm) opts.mailMerge = mm;
+		}
+		const revViewEl = findChild(el, "w:revisionView");
+		if (revViewEl) {
+			const rv = {};
+			for (const [k, a] of [
+				["markup", "w:markup"],
+				["comments", "w:comments"],
+				["insDel", "w:insDel"],
+				["formatting", "w:formatting"],
+				["inkAnnotations", "w:inkAnnotations"]
+			]) {
+				const v = attr(revViewEl, a);
+				if (v !== void 0) rv[k] = v !== "false" && v !== "0";
+			}
+			if (Object.keys(rv).length > 0) opts.revisionView = rv;
+		}
 		const docProtEl = findChild(el, "w:documentProtection");
 		if (docProtEl) {
 			const prot = {};
 			const edit = attr(docProtEl, "w:edit");
 			if (edit && DOC_PROTECT_EDITS.includes(edit)) prot.edit = edit;
 			if (attr(docProtEl, "w:enforcement") !== void 0) {
-				const hash = attr(docProtEl, "w:hash");
-				if (hash) prot.hash = hash;
-				const salt = attr(docProtEl, "w:salt");
-				if (salt) prot.salt = salt;
-				const cryptProviderType = attr(docProtEl, "w:cryptProviderType");
-				if (cryptProviderType) prot.cryptoProviderType = cryptProviderType;
-				const cryptAlgorithmClass = attr(docProtEl, "w:cryptAlgorithmClass");
-				if (cryptAlgorithmClass) prot.cryptoAlgorithmClass = cryptAlgorithmClass;
-				const cryptAlgorithmType = attr(docProtEl, "w:cryptAlgorithmType");
-				if (cryptAlgorithmType) prot.cryptoAlgorithmType = cryptAlgorithmType;
-				const cryptAlgorithmSid = attr(docProtEl, "w:cryptAlgorithmSid");
-				if (cryptAlgorithmSid) prot.cryptoAlgorithmSid = parseInt(cryptAlgorithmSid, 10);
-				const cryptSpinCount = attr(docProtEl, "w:cryptSpinCount");
-				if (cryptSpinCount) prot.cryptoSpinCount = parseInt(cryptSpinCount, 10);
-				const hashValue = attr(docProtEl, "w:hashValue");
-				if (hashValue) prot.hashValue = hashValue;
-				const saltValue = attr(docProtEl, "w:saltValue");
-				if (saltValue) prot.saltValue = saltValue;
-				const spinCount = attr(docProtEl, "w:spinCount");
-				if (spinCount) prot.spinCount = parseInt(spinCount, 10);
-				const algorithmName = attr(docProtEl, "w:algorithmName");
-				if (algorithmName) prot.algorithmName = algorithmName;
+				Object.assign(prot, readPasswordAttrs(docProtEl));
 				const formatting = attr(docProtEl, "w:formatting");
 				if (formatting !== void 0) prot.formatting = formatting === "1" || formatting === "true";
 			}
 			if (Object.keys(prot).length > 0) opts.documentProtection = prot;
 		}
-		const noMovesEl = findChild(el, "w:doNotTrackMoves");
-		if (noMovesEl) opts.doNotTrackMoves = attrBool(noMovesEl, "w:val") ?? true;
-		const noFmtEl = findChild(el, "w:doNotTrackFormatting");
-		if (noFmtEl) opts.doNotTrackFormatting = attrBool(noFmtEl, "w:val") ?? true;
-		opts.rawXml = stringify(el);
-		if (el.attributes) opts.rootAttributes = { ...el.attributes };
+		const defaultTabStop = readNum(findChild(el, "w:defaultTabStop"), "w:val");
+		if (defaultTabStop !== void 0) opts.defaultTabStop = defaultTabStop;
+		if (findChild(el, "w:autoHyphenation") || findChild(el, "w:doNotHyphenateCaps") || findChild(el, "w:consecutiveHyphenLimit") || findChild(el, "w:hyphenationZone")) {
+			const hyphenation = {};
+			const autoHyph = readOnOff(findChild(el, "w:autoHyphenation"));
+			if (autoHyph !== void 0) hyphenation.autoHyphenation = autoHyph;
+			const noHyphCaps = readOnOff(findChild(el, "w:doNotHyphenateCaps"));
+			if (noHyphCaps !== void 0) hyphenation.doNotHyphenateCaps = noHyphCaps;
+			const consLimit = readNum(findChild(el, "w:consecutiveHyphenLimit"), "w:val");
+			if (consLimit !== void 0) hyphenation.consecutiveHyphenLimit = consLimit;
+			const zone = readNum(findChild(el, "w:hyphenationZone"), "w:val");
+			if (zone !== void 0) hyphenation.hyphenationZone = zone;
+			if (Object.keys(hyphenation).length > 0) opts.hyphenation = hyphenation;
+		}
+		const summaryLength = readNum(findChild(el, "w:summaryLength"), "w:val");
+		if (summaryLength !== void 0) opts.summaryLength = summaryLength;
+		const bookFoldSheets = readNum(findChild(el, "w:bookFoldPrintingSheets"), "w:val");
+		if (bookFoldSheets !== void 0) opts.bookFoldPrintingSheets = bookFoldSheets;
+		for (const [key, tag] of [
+			["drawingGridHorizontalSpacing", "w:drawingGridHorizontalSpacing"],
+			["drawingGridVerticalSpacing", "w:drawingGridVerticalSpacing"],
+			["displayHorizontalDrawingGridEvery", "w:displayHorizontalDrawingGridEvery"],
+			["displayVerticalDrawingGridEvery", "w:displayVerticalDrawingGridEvery"],
+			["drawingGridHorizontalOrigin", "w:drawingGridHorizontalOrigin"],
+			["drawingGridVerticalOrigin", "w:drawingGridVerticalOrigin"]
+		]) {
+			const v = readNum(findChild(el, tag), "w:val");
+			if (v !== void 0) opts[key] = v;
+		}
+		const characterSpacingControl = readStr(findChild(el, "w:characterSpacingControl"), "w:val");
+		if (characterSpacingControl) opts.characterSpacingControl = characterSpacingControl;
+		for (const [key, tag] of [["noLineBreaksAfter", "w:noLineBreaksAfter"], ["noLineBreaksBefore", "w:noLineBreaksBefore"]]) {
+			const lbEl = findChild(el, tag);
+			if (!lbEl) continue;
+			const entry = {};
+			const lang = attr(lbEl, "w:lang");
+			if (lang) entry.lang = lang;
+			const val = attr(lbEl, "w:val");
+			if (val) entry.val = val;
+			if (Object.keys(entry).length > 0) opts[key] = entry;
+		}
+		const stxEl = findChild(el, "w:saveThroughXslt");
+		if (stxEl) {
+			const stx = {};
+			const id = attr(stxEl, "r:id");
+			if (id) stx.id = id;
+			const val = attr(stxEl, "w:val");
+			if (val) stx.val = val;
+			const solutionID = attr(stxEl, "w:solutionID");
+			if (solutionID) stx.solutionID = solutionID;
+			if (Object.keys(stx).length > 0) opts.saveThroughXslt = stx;
+		}
+		const hdrSdEl = findChild(el, "w:hdrShapeDefaults");
+		if (hdrSdEl) opts.hdrShapeDefaults = stringify(hdrSdEl);
+		const sdEl = findChild(el, "w:shapeDefaults");
+		if (sdEl) opts.shapeDefaults = stringify(sdEl);
+		const fnPrEl = findChild(el, "w:footnotePr");
+		if (fnPrEl) {
+			const fn = parseFtnEdnPr(fnPrEl);
+			if (fn) opts.footnotePr = fn;
+		}
+		const enPrEl = findChild(el, "w:endnotePr");
+		if (enPrEl) {
+			const en = parseFtnEdnPr(enPrEl);
+			if (en) opts.endnotePr = en;
+		}
+		const compatEl = findChild(el, "w:compat");
+		if (compatEl) {
+			const compat = parseCompatibility(compatEl);
+			if (compat) opts.compatibility = compat;
+		}
+		const docVarsEl = findChild(el, "w:docVars");
+		if (docVarsEl) {
+			const vars = [];
+			for (const child of docVarsEl.elements ?? []) {
+				if (child.name !== "w:docVar") continue;
+				const name = attr(child, "w:name");
+				const val = attr(child, "w:val");
+				if (name !== void 0 && val !== void 0) vars.push({
+					name,
+					val
+				});
+			}
+			if (vars.length > 0) opts.docVars = vars;
+		}
+		const rsidsEl = findChild(el, "w:rsids");
+		if (rsidsEl) {
+			const rsids = {};
+			const root = readStr(findChild(rsidsEl, "w:rsidRoot"), "w:val");
+			if (root) rsids.rsidRoot = root;
+			const list = [];
+			for (const child of rsidsEl.elements ?? []) {
+				if (child.name !== "w:rsid") continue;
+				const val = attr(child, "w:val");
+				if (val) list.push(val);
+			}
+			if (list.length > 0) rsids.rsids = list;
+			if (Object.keys(rsids).length > 0) opts.rsids = rsids;
+		}
+		const mathPrEl = findChild(el, "m:mathPr");
+		if (mathPrEl) {
+			const mp = parseMathPr(mathPrEl);
+			if (mp) opts.mathPr = mp;
+		}
+		const attachedSchemas = [];
+		for (const child of el.elements ?? []) {
+			if (child.name !== "w:attachedSchema") continue;
+			const val = attr(child, "w:val");
+			if (val) attachedSchemas.push(val);
+		}
+		if (attachedSchemas.length > 0) opts.attachedSchema = attachedSchemas;
+		const tflEl = findChild(el, "w:themeFontLang");
+		if (tflEl) {
+			const tfl = {};
+			const val = attr(tflEl, "w:val");
+			if (val) tfl.val = val;
+			const eastAsia = attr(tflEl, "w:eastAsia");
+			if (eastAsia) tfl.eastAsia = eastAsia;
+			const bidi = attr(tflEl, "w:bidi");
+			if (bidi) tfl.bidi = bidi;
+			if (Object.keys(tfl).length > 0) opts.themeFontLang = tfl;
+		}
+		const csmEl = findChild(el, "w:clrSchemeMapping");
+		if (csmEl) {
+			const csm = {};
+			for (const [key, xmlAttr] of [
+				["bg1", "w:bg1"],
+				["t1", "w:t1"],
+				["bg2", "w:bg2"],
+				["t2", "w:t2"],
+				["accent1", "w:accent1"],
+				["accent2", "w:accent2"],
+				["accent3", "w:accent3"],
+				["accent4", "w:accent4"],
+				["accent5", "w:accent5"],
+				["accent6", "w:accent6"],
+				["hyperlink", "w:hyperlink"],
+				["followedHyperlink", "w:followedHyperlink"]
+			]) {
+				const v = attr(csmEl, xmlAttr);
+				if (v) csm[key] = v;
+			}
+			if (Object.keys(csm).length > 0) opts.colorSchemeMapping = csm;
+		}
+		if (findChild(el, "w:forceUpgrade")) opts.forceUpgrade = true;
+		const captionsEl = findChild(el, "w:captions");
+		if (captionsEl) {
+			const captions = parseCaptions(captionsEl);
+			if (captions) opts.captions = captions;
+		}
+		const rmilEl = findChild(el, "w:readModeInkLockDown");
+		if (rmilEl) opts.readModeInkLockDown = {
+			actualPg: attr(rmilEl, "w:actualPg") !== "0",
+			w: parseInt(attr(rmilEl, "w:w") ?? "0", 10),
+			h: parseInt(attr(rmilEl, "w:h") ?? "0", 10),
+			fontSz: parseInt(attr(rmilEl, "w:fontSz") ?? "0", 10)
+		};
+		const smartTags = [];
+		for (const child of el.elements ?? []) {
+			if (child.name !== "w:smartTagType") continue;
+			const entry = {};
+			const ns = attr(child, "w:namespace");
+			if (ns) entry.namespace = ns;
+			const nsuri = attr(child, "w:namespaceuri");
+			if (nsuri) entry.namespaceuri = nsuri;
+			const name = attr(child, "w:name");
+			if (name) entry.name = name;
+			const url = attr(child, "w:url");
+			if (url) entry.url = url;
+			if (Object.keys(entry).length > 0) smartTags.push(entry);
+		}
+		if (smartTags.length > 0) opts.smartTagType = smartTags;
+		const decimalSymbol = readStr(findChild(el, "w:decimalSymbol"), "w:val");
+		if (decimalSymbol) opts.decimalSymbol = decimalSymbol;
+		const listSeparator = readStr(findChild(el, "w:listSeparator"), "w:val");
+		if (listSeparator) opts.listSeparator = listSeparator;
 		return opts;
 	}
 };
@@ -11059,6 +12091,25 @@ function parseTocFieldInstruction(instruction, opts) {
 	if ("z" in switches) opts.hideTabAndPageNumbersInWebView = true;
 }
 /**
+* Extract TOC options from the elements of a captured TOC field (SDT content or
+* a bare cross-paragraph field). Feeds every w:instrText to the instruction
+* parser; non-TOC fields (HYPERLINK/PAGEREF inside the rendered entries) are
+* ignored — parseTocFieldInstruction only acts on instructions starting "TOC".
+*/
+function parseTocFieldFromElements(els) {
+	const opts = {};
+	for (const el of els) collectTocInstructions(el, opts);
+	return opts;
+}
+/** Recursively feed every w:instrText to the TOC instruction parser. */
+function collectTocInstructions(el, opts) {
+	if (el.name === "w:instrText") {
+		const instruction = textOf(el)?.trim();
+		if (instruction) parseTocFieldInstruction(instruction, opts);
+	}
+	for (const c of el.elements ?? []) if (c.type === "element") collectTocInstructions(c, opts);
+}
+/**
 * Parse field switches like \o "1-3" \h \z into a map.
 */
 function parseFieldSwitches(text) {
@@ -11293,14 +12344,22 @@ function fontXml(font) {
 	const parts = [`<w:font w:name="${escapeXml(font.name)}">`];
 	if (font.altName) parts.push(`<w:altName w:val="${escapeXml(font.altName)}"/>`);
 	if (font.panose1) parts.push(`<w:panose1 w:val="${escapeXml(font.panose1)}"/>`);
-	if (font.characterSet) parts.push(`<w:charset w:val="${escapeXml(font.characterSet)}"/>`);
+	if (font.characterSet || font.characterSetName) {
+		const valAttr = font.characterSet ? ` w:val="${escapeXml(font.characterSet)}"` : "";
+		const csAttr = font.characterSetName ? ` w:characterSet="${escapeXml(font.characterSetName)}"` : "";
+		parts.push(`<w:charset${valAttr}${csAttr}/>`);
+	}
 	const family = font.family ?? (font.embedRid ? "auto" : void 0);
 	if (family) parts.push(`<w:family w:val="${escapeXml(family)}"/>`);
 	const pitch = font.pitch ?? (font.embedRid ? "variable" : void 0);
 	if (pitch) parts.push(`<w:pitch w:val="${escapeXml(pitch)}"/>`);
 	const sig = font.sig ?? (font.embedRid ? DEFAULT_SIG : void 0);
 	if (sig) parts.push(`<w:sig w:usb0="${sig.usb0}" w:usb1="${sig.usb1}" w:usb2="${sig.usb2}" w:usb3="${sig.usb3}" w:csb0="${sig.csb0}" w:csb1="${sig.csb1}"/>`);
-	if (font.embedRid) parts.push(`<w:embedRegular r:id="${font.embedRid}" w:fontKey="{${font.fontKey}}"/>`);
+	if (font.embedRid) {
+		const embedAttrs = [`r:id="${font.embedRid}"`, `w:fontKey="{${font.fontKey}}"`];
+		if (font.subsetted !== void 0) embedAttrs.push(`w:subsetted="${font.subsetted ? 1 : 0}"`);
+		parts.push(`<w:embedRegular ${embedAttrs.join(" ")}/>`);
+	}
 	parts.push("</w:font>");
 	return parts.join("");
 }
@@ -11333,6 +12392,8 @@ const fontTableDesc = {
 			if (charsetEl) {
 				const val = attr(charsetEl, "w:val");
 				if (val) font.characterSet = val;
+				const csName = attr(charsetEl, "w:characterSet");
+				if (csName) font.characterSetName = csName;
 			}
 			const familyEl = findChild(child, "w:family");
 			if (familyEl) {
@@ -11373,6 +12434,8 @@ const fontTableDesc = {
 				if (rawKey) font.fontKey = rawKey.replace(/^\{\{|\}\}$/g, "").replace(/^\{|\}$/g, "");
 				const rid = attr(embedEl, "r:id");
 				if (rid) font.embedRid = rid;
+				const subsetted = attrBool(embedEl, "w:subsetted");
+				if (subsetted !== void 0) font.subsetted = subsetted;
 			}
 			fonts.push(font);
 		}
@@ -11747,6 +12810,10 @@ const STANDARD_DEFAULTS = [
 	{
 		extension: "odttf",
 		contentType: "application/vnd.openxmlformats-officedocument.obfuscatedFont"
+	},
+	{
+		extension: "bin",
+		contentType: "application/vnd.openxmlformats-officedocument.oleObject"
 	}
 ];
 /**
@@ -12069,22 +13136,22 @@ function parseDivEl(el) {
 	const opts = { id: attrNum(el, "w:id") ?? 0 };
 	const marLeft = findChild(el, "w:marLeft");
 	if (marLeft) {
-		const val = attrNum(marLeft, "w:val");
+		const val = attrMeasure(marLeft, "w:val");
 		if (val !== void 0) opts.marginLeft = val;
 	}
 	const marRight = findChild(el, "w:marRight");
 	if (marRight) {
-		const val = attrNum(marRight, "w:val");
+		const val = attrMeasure(marRight, "w:val");
 		if (val !== void 0) opts.marginRight = val;
 	}
 	const marTop = findChild(el, "w:marTop");
 	if (marTop) {
-		const val = attrNum(marTop, "w:val");
+		const val = attrMeasure(marTop, "w:val");
 		if (val !== void 0) opts.marginTop = val;
 	}
 	const marBottom = findChild(el, "w:marBottom");
 	if (marBottom) {
-		const val = attrNum(marBottom, "w:val");
+		const val = attrMeasure(marBottom, "w:val");
 		if (val !== void 0) opts.marginBottom = val;
 	}
 	const blockQuote = findChild(el, "w:blockQuote");
@@ -12201,7 +13268,15 @@ const webSettingsDesc = {
 			p.push("</w:divs>");
 		}
 		if (opts.encoding !== void 0) p.push(wsStringVal("w:encoding", opts.encoding));
-		if (opts.optimizeForBrowser !== void 0) p.push(wsOnOff("w:optimizeForBrowser", opts.optimizeForBrowser));
+		if (opts.optimizeForBrowser !== void 0) {
+			const ob = opts.optimizeForBrowser;
+			if (typeof ob === "boolean") p.push(wsOnOff("w:optimizeForBrowser", ob));
+			else {
+				const valAttr = ob.value === false ? " w:val=\"false\"" : "";
+				const targetAttr = ob.target ? ` w:target="${wsEscapeAttr(ob.target)}"` : "";
+				p.push(`<w:optimizeForBrowser${valAttr}${targetAttr}/>`);
+			}
+		}
 		if (opts.relyOnVML !== void 0) p.push(wsOnOff("w:relyOnVML", opts.relyOnVML));
 		if (opts.allowPNG !== void 0) p.push(wsOnOff("w:allowPNG", opts.allowPNG));
 		if (opts.doNotRelyOnCSS !== void 0) p.push(wsOnOff("w:doNotRelyOnCSS", opts.doNotRelyOnCSS));
@@ -12229,7 +13304,6 @@ const webSettingsDesc = {
 			if (val) opts.encoding = val;
 		}
 		for (const [name, optKey] of [
-			["w:optimizeForBrowser", "optimizeForBrowser"],
 			["w:relyOnVML", "relyOnVML"],
 			["w:allowPNG", "allowPNG"],
 			["w:doNotRelyOnCSS", "doNotRelyOnCSS"],
@@ -12241,6 +13315,15 @@ const webSettingsDesc = {
 			const child = findChild(el, name);
 			if (child) opts[optKey] = attrBool(child, "w:val") ?? true;
 		}
+		const obEl = findChild(el, "w:optimizeForBrowser");
+		if (obEl) {
+			const target = attr(obEl, "w:target");
+			if (target) opts.optimizeForBrowser = {
+				value: attrBool(obEl, "w:val") ?? true,
+				target
+			};
+			else opts.optimizeForBrowser = attrBool(obEl, "w:val") ?? true;
+		}
 		const ppi = findChild(el, "w:pixelsPerInch");
 		if (ppi) {
 			const val = attrNum(ppi, "w:val");
@@ -12255,6 +13338,6 @@ const webSettingsDesc = {
 	}
 };
 //#endregion
-export { LevelSuffix as $, OverlapType as $t, buildNumberingCache as A, TextboxTightWrapType as An, HorizontalPositionAlign as At, createSectionType as B, customXmlBlockDesc as Bt, footnotesDesc as C, WORKAROUND2 as Cn, createPageSize as Ct, StyleLevel as D, TextEffect as Dn, createHorizontalPosition as Dt, SdtLock as E, HighlightColor as En, createVerticalPosition as Et, collectDefaultOverrideIds as F, createWrapTight as Ft, PageBorderOffsetFrom as G, stringifySdtPr as Gt, createLineNumberType as H, sdtBlockDesc as Ht, HeaderFooterReferenceType as I, TextWrappingSide as It, createDocumentGrid as J, stringifyElement as Jt, PageBorderZOrder as K, stringifySdtShell as Kt, HeaderFooterType as L, TextWrappingType as Lt, extractStyleId as M, LineRuleType as Mn, SpaceType as Mt, parseStyleDefinitions as N, AlignmentType as Nn, VerticalPositionAlign as Nt, settingsDesc as O, PageNumber as On, HorizontalPositionRelativeFrom as Ot, DefaultStylesFactory as P, createWrapThrough as Pt, LevelFormat as Q, TableLayoutType as Qt, createHeaderFooterReference as R, altChunkDesc as Rt, endnotesDesc as S, createImageData$1 as Sn, PageOrientation as St, SdtDateMappingType as T, createTransformation as Tn, createPageNumberType as Tt, createPageMargin as U, setBodyParseChild as Ut, LineNumberRestartFormat as V, parseCustomXmlProperties as Vt, PageBorderDisplay as W, stringifyCustomXmlShell as Wt, Numbering as X, TABLE_BORDERS_NONE as Xt, DocumentAttributeNamespaces as Y, WidthType as Yt, parseNumberingDefinitions as Z, BorderStyle as Zt, glossaryDesc as _, TextVertOverflowType as _n, sectionPropertiesDesc as _t, appPropertiesDesc as a, ProofErrorType as an, drawingDesc as at, CharacterSet as b, createBodyProperties as bn, sectionPageSizeDefaults as bt, relationshipsDesc as c, parseFormFieldData as cn, parseParagraphProperties as ct, withAltChunkOverrides as d, PositionalTabLeader as dn, replaceRelsWithPlaceholders as dt, RelativeHorizontalPosition as en, setTableParseChild as et, withMediaDefaults as f, PositionalTabRelativeTo as fn, stringifyTableOfContents as ft, DocPartType as g, TextHorzOverflowType as gn, parseSectionPropertiesEl as gt, DocPartGallery as h, TextBodyWrappingType as hn, FontWrapper as ht, webSettingsDesc as i, VerticalMergeType as in, stringifyRunInline as it, buildStyleCache as j, HeadingLevel as jn, NumberFormat as jt, Styles as k, TextAlignmentType as kn, VerticalPositionRelativeFrom as kt, buildContentTypesFromRegistry as l, RubyAlign as ln, stringifyBodyChild as lt, DocPartBehavior as m, UnderlineType as mn, parseSdtProperties as mt, frameXml as n, TableAnchorType as nn, stringifyChildDispatch as nt, customPropertiesDesc as o, FormFieldTextType as on, resetDrawingIdGen as ot, commentsDesc as p, EmphasisMarkType as pn, parseSdtBlock as pt, DocumentGridType as q, subDocDesc as qt, framesetXml as r, TextDirection as rn, stringifyParagraphInline as rt, corePropertiesDesc as s, createFormFieldData as sn, parseParagraph as st, TargetScreenSize as t, RelativeVerticalPosition as tn, tableDesc as tt, contentTypesDesc as u, PositionalTabAlignment as un, stringifyDocumentXml as ut, bibliographyDesc as v, TextVerticalType as vn, stringifySectionPropertiesXml as vt, parseToc as w, Media as wn, PageNumberSeparator as wt, EditGroupType as x, parseBodyProperties as xn, PageTextDirectionType as xt, fontTableDesc as y, VerticalAnchor as yn, sectionMarginDefaults as yt, SectionType as z, checkboxSymbolRunInner as zt };
+export { PageBorderZOrder as $, stringifyCustomXmlShell as $t, settingsDesc as A, createBodyProperties as An, sectionPageSizeDefaults as At, stringifyConditionalTableStyle as B, TextAlignmentType as Bn, NumberFormat as Bt, footnotesDesc as C, EmphasisMarkType as Cn, parseSdtBlock as Ct, SdtDateMappingType as D, TextVertOverflowType as Dn, sectionPropertiesDesc as Dt, parseTocFieldInstruction as E, TextHorzOverflowType as En, parseSectionPropertiesEl as Et, parseStyleDefinitions as F, createTransformation as Fn, createVerticalPosition as Ft, createHeaderFooterReference as G, TextWrappingSide as Gt, stringifyTableStyle as H, HeadingLevel as Hn, VerticalPositionAlign as Ht, DefaultStylesFactory as I, HighlightColor as In, createHorizontalPosition as It, LineNumberRestartFormat as J, checkboxSymbolRunInner as Jt, SectionType as K, TextWrappingType as Kt, STYLE_ID_TO_DEFAULT_FIELD as L, TextEffect as Ln, HorizontalPositionRelativeFrom as Lt, buildNumberingCache as M, createImageData$1 as Mn, PageOrientation as Mt, buildStyleCache as N, WORKAROUND2 as Nn, PageNumberSeparator as Nt, SdtLock as O, TextVerticalType as On, stringifySectionPropertiesXml as Ot, extractStyleId as P, Media as Pn, createPageNumberType as Pt, PageBorderOffsetFrom as Q, setBodyParseChild as Qt, collectDefaultOverrideIds as R, PageNumber as Rn, VerticalPositionRelativeFrom as Rt, endnotesDesc as S, PositionalTabRelativeTo as Sn, stringifyTableOfContents as St, parseTocFieldFromElements as T, TextBodyWrappingType as Tn, FontWrapper as Tt, HeaderFooterReferenceType as U, LineRuleType as Un, createWrapThrough as Ut, stringifyParagraphStyle as V, TextboxTightWrapType as Vn, SpaceType as Vt, HeaderFooterType as W, AlignmentType as Wn, createWrapTight as Wt, createPageMargin as X, parseCustomXmlProperties as Xt, createLineNumberType as Y, customXmlBlockDesc as Yt, PageBorderDisplay as Z, sdtBlockDesc as Zt, glossaryDesc as _, createFormFieldData as _n, parseParagraph as _t, appPropertiesDesc as a, WidthType as an, LevelFormat as at, CharacterSet as b, PositionalTabAlignment as bn, stringifyDocumentXml as bt, relationshipsDesc as c, TableLayoutType as cn, parseTablePropertiesEl as ct, withAltChunkOverrides as d, RelativeVerticalPosition as dn, tableDesc as dt, stringifySdtPr as en, DocumentGridType as et, withMediaDefaults as f, TableAnchorType as fn, stringifyChildDispatch as ft, DocPartType as g, FormFieldTextType as gn, resetDrawingIdGen as gt, DocPartGallery as h, ProofErrorType as hn, drawingDesc as ht, webSettingsDesc as i, objectDesc as in, parseNumberingDefinitions as it, Styles as j, parseBodyProperties as jn, PageTextDirectionType as jt, StyleLevel as k, VerticalAnchor as kn, sectionMarginDefaults as kt, buildContentTypesFromRegistry as l, OverlapType as ln, parseTableRowPropertiesEl as lt, DocPartBehavior as m, VerticalMergeType as mn, stringifyRunInline as mt, frameXml as n, subDocDesc as nn, DocumentAttributeNamespaces as nt, customPropertiesDesc as o, TABLE_BORDERS_NONE as on, LevelSuffix as ot, commentsDesc as p, TextDirection as pn, stringifyParagraphInline as pt, createSectionType as q, altChunkDesc as qt, framesetXml as r, stringifyElement as rn, Numbering as rt, corePropertiesDesc as s, BorderStyle as sn, parseTableCellPropertiesEl as st, TargetScreenSize as t, stringifySdtShell as tn, createDocumentGrid as tt, contentTypesDesc as u, RelativeHorizontalPosition as un, setTableParseChild as ut, bibliographyDesc as v, parseFormFieldData as vn, parseParagraphProperties as vt, parseToc as w, UnderlineType as wn, parseSdtProperties as wt, EditGroupType as x, PositionalTabLeader as xn, replaceRelsWithPlaceholders as xt, fontTableDesc as y, RubyAlign as yn, stringifyBodyChild as yt, stringifyCharacterStyle as z, breakXml as zn, HorizontalPositionAlign as zt };
 
-//# sourceMappingURL=parts-BWmkYaBr.mjs.map
+//# sourceMappingURL=parts-DVpfsxSR.mjs.map