@office-open/docx 0.10.2 → 0.10.4

package/dist/{parts-DvRRYUug.mjs → parts-DgrmHznM.mjs}

@@ -1,6 +1,6 @@
-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, presetGeometryDesc, signedTwipsMeasureValue, toUint8Array, twipsMeasureValue, uCharHexNumber, uniqueId, uniqueNumericIdCreator, uniqueUuid, xsdVerticalMergeRev } from "@office-open/core";
-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, presetGeometryDesc as presetGeometryDesc$1, scene3DDesc, shape3DDesc, transform2DDesc } from "@office-open/core/drawingml";
+import { DOCX_PARTS, Media, Relationships, TargetModeType, ThemeColor, appPropertiesDesc, blipDesc, buildContentTypeOverrides, convertEmuToPixels, convertInchesToTwip, convertToEmu, convertToTwip, customGeometryDesc, customPropertiesDesc, decimalNumber, derivePasswordHash, effectListDesc, eighthPointMeasureValue, fillDesc, hexColorValue, hpsMeasureValue, measurementOrPercentValue, outlineDesc, parseColorChoice, pointMeasureValue, presetGeometryDesc, signedTwipsMeasureValue, toUint8Array, twipsMeasureValue, uCharHexNumber, uniqueId, uniqueNumericIdCreator, uniqueUuid, xsdVerticalMergeRev } from "@office-open/core";
+import { calculateEffectExtent, createColorElement, createEffectDag, createScene3D, createShape3D, customGeometryDesc as customGeometryDesc$1, effectListDesc as effectListDesc$1, fillDesc as fillDesc$1, outlineDesc as outlineDesc$1, presetGeometryDesc as presetGeometryDesc$1, scene3DDesc, shape3DDesc, transform2DDesc } from "@office-open/core/drawingml";
+import { attr, attrBool, attrMeasure, attrNum, children, colorAttr, element, escapeXml, findChild, findFirst, stringify, textOf } from "@office-open/xml";
 import { chartSpaceDesc } from "@office-open/core/chart";
 import { createDataModel } from "@office-open/core/smartart";
 //#region src/parts/paragraph/formatting/alignment.ts
@@ -266,125 +266,42 @@ const HighlightColor = {
 //#endregion
 //#region src/shared/media/media.ts
 /**
-* Converts user-facing transformation options (pixels or universal measure) to internal
+* Converts user-facing transformation options (EMU or universal measure) to internal
 * transformation data (pixels + EMUs).
 *
-* @param options - User-facing transformation in pixels or universal measure
+* @param options - User-facing transformation in EMU or universal measure
 * @returns Internal transformation data with both pixel and EMU values
 */
-const createTransformation = (options) => ({
-	emus: {
-		x: typeof options.width === "string" ? convertUniversalMeasureToEmu(options.width) : convertPixelsToEmu(options.width),
-		y: typeof options.height === "string" ? convertUniversalMeasureToEmu(options.height) : convertPixelsToEmu(options.height)
-	},
-	flip: options.flip,
-	offset: {
+const createTransformation = (options) => {
+	const widthEmu = convertToEmu(options.width);
+	const heightEmu = convertToEmu(options.height);
+	const offsetLeftEmu = convertToEmu(options.offset?.left ?? 0);
+	const offsetTopEmu = convertToEmu(options.offset?.top ?? 0);
+	return {
 		emus: {
-			x: typeof options.offset?.left === "string" ? convertUniversalMeasureToEmu(options.offset.left) : convertPixelsToEmu(options.offset?.left ?? 0),
-			y: typeof options.offset?.top === "string" ? convertUniversalMeasureToEmu(options.offset.top) : convertPixelsToEmu(options.offset?.top ?? 0)
+			x: widthEmu,
+			y: heightEmu
 		},
-		pixels: {
-			x: typeof options.offset?.left === "number" ? Math.round(options.offset.left) : 0,
-			y: typeof options.offset?.top === "number" ? Math.round(options.offset.top) : 0
-		}
-	},
-	pixels: {
-		x: typeof options.width === "number" ? Math.round(options.width) : 0,
-		y: typeof options.height === "number" ? Math.round(options.height) : 0
-	},
-	rotation: options.rotation ? options.rotation * 6e4 : void 0,
-	...options.effectExtent ? { effectExtent: options.effectExtent } : {}
-});
-/**
-* Manages embedded media (images) in a document.
-*
-* Media stores all images referenced in the document and provides
-* access to their data for packaging into the DOCX file. Each image
-* is stored with a unique key for retrieval.
-*
-* @example
-* ```typescript
-* const media = new Media();
-* media.addImage("image1", {
-*   type: "png",
-*   fileName: "image1.png",
-*   transformation: {
-*     pixels: { x: 200, y: 100 },
-*     emus: { x: 1828800, y: 914400 }
-*   },
-*   data: imageBuffer
-* });
-* const allImages = media.Array;
-* ```
-*/
-var Media = class {
-	map;
-	nextMediaCounter = 0;
-	constructor() {
-		this.map = /* @__PURE__ */ new Map();
-	}
-	/**
-	* Allocates the next sequential media file name (Office-style `image1.png`,
-	* `image2.png`, …). The counter is package-global because media is shared
-	* across the document, headers, and footers, matching MS Office's numbering.
-	*
-	* Deterministic across runs (unlike random ids) so round-trip output is stable
-	* and diffable. Callers pair this with {@link findByContent} to reuse an
-	* existing entry for byte-identical content before allocating a new name.
-	*
-	* @param type - File extension / image type token (e.g. "png", "jpg")
-	* @returns A sequential file name like `image3.png`
-	*/
-	nextMediaName(type) {
-		return `image${++this.nextMediaCounter}.${type}`;
-	}
-	/**
-	* Adds an image to the media collection.
-	*
-	* @param key - Unique identifier for this image
-	* @param mediaData - Complete image data including file name, transformation, and raw data
-	*/
-	addImage(key, mediaData) {
-		this.map.set(key, mediaData);
-	}
-	/**
-	* Finds an existing image with byte-identical content (content-based dedup).
-	*
-	* Returns the matching entry's key (fileName) so callers reuse it instead of
-	* registering a duplicate — e.g. a VML fallback image that mirrors the Choice
-	* blip should share one relationship/file, matching Office's output.
-	*
-	* @param data - Raw image bytes to search for
-	* @returns The matching entry's key, or `undefined` if no match
-	*/
-	findByContent(data) {
-		for (const [key, md] of this.map) {
-			const existing = toUint8Array(md.data);
-			if (existing.length !== data.length) continue;
-			let match = true;
-			for (let i = 0; i < existing.length; i++) if (existing[i] !== data[i]) {
-				match = false;
-				break;
+		flip: options.flip,
+		offset: {
+			emus: {
+				x: offsetLeftEmu,
+				y: offsetTopEmu
+			},
+			pixels: {
+				x: Math.round(convertEmuToPixels(offsetLeftEmu)),
+				y: Math.round(convertEmuToPixels(offsetTopEmu))
 			}
-			if (match) return key;
-		}
-	}
-	/**
-	* Gets all images as an array.
-	*
-	* @returns Read-only array of all media data in the collection
-	*/
-	get array() {
-		return [...this.map.values()];
-	}
+		},
+		pixels: {
+			x: Math.round(convertEmuToPixels(widthEmu)),
+			y: Math.round(convertEmuToPixels(heightEmu))
+		},
+		rotation: options.rotation ? options.rotation * 6e4 : void 0,
+		...options.effectExtent ? { effectExtent: options.effectExtent } : {}
+	};
 };
 //#endregion
-//#region src/shared/media/data.ts
-/**
-* @ignore
-*/
-const WORKAROUND2 = "";
-//#endregion
 //#region src/parts/paragraph/run/image-run.ts
 const createImageData$1 = (data, transformation, key, sourceRectangle, nonVisualProperties) => ({
 	data,
@@ -558,7 +475,7 @@ const createBodyProperties = (options = {}) => {
 * (noAutofit/normAutofit/spAutoFit). prstTxWarp/scene3d/text-3D are not yet
 * parsed (later phase).
 */
-const parseBodyProperties = (el) => {
+const parseBodyProperties = (el, ctx) => {
 	const result = {};
 	const rotation = attrNum(el, "rot");
 	if (rotation !== void 0) result.rotation = rotation;
@@ -610,6 +527,31 @@ const parseBodyProperties = (el) => {
 			result.normAutofit = normOpts;
 		} else if (findChild(el, "a:spAutoFit")) result.spAutoFit = true;
 	}
+	const prstTxWarp = findChild(el, "a:prstTxWarp");
+	if (prstTxWarp) {
+		const preset = attr(prstTxWarp, "prst") ?? "";
+		const avLst = findChild(prstTxWarp, "a:avLst");
+		const adjustments = [];
+		for (const gd of avLst?.elements ?? []) if (gd.type === "element" && gd.name === "a:gd") adjustments.push({
+			name: attr(gd, "name") ?? "",
+			formula: attr(gd, "fmla") ?? ""
+		});
+		result.prstTxWarp = {
+			preset,
+			...adjustments.length > 0 ? { adjustments } : {}
+		};
+	}
+	const scene3d = findChild(el, "a:scene3d");
+	if (scene3d) result.scene3d = scene3DDesc.parse(scene3d, ctx);
+	const sp3d = findChild(el, "a:sp3d");
+	if (sp3d) result.sp3d = shape3DDesc.parse(sp3d, ctx);
+	else {
+		const flatTx = findChild(el, "a:flatTx");
+		if (flatTx) {
+			const z = attrNum(flatTx, "z");
+			result.flatTx = z !== void 0 ? { z } : {};
+		}
+	}
 	return result;
 };
 //#endregion
@@ -1356,15 +1298,15 @@ const objectDesc = {
 		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), {
+			const rawData = toUint8Array(opts.iconImage.data);
+			const iconType = opts.iconImage.type;
+			const { fileName: iconFileName } = ctx.file.media.addMedia(rawData, iconType, (fileName) => ({
+				type: iconType,
+				...createImageData$1(rawData, {
 					width: widthVal,
 					height: heightVal
-				}, iconFileName)
-			};
-			ctx.file.media.addImage(iconFileName, iconMediaData);
+				}, fileName)
+			}));
 			const titleAttr = opts.iconImage.title ? ` o:title="${opts.iconImage.title}"` : "";
 			shapeChildren.push(`<v:imagedata r:id="{${iconFileName}}"${titleAttr}/>`);
 		}
@@ -2392,9 +2334,6 @@ function stringifyRunProperties(opts) {
 *
 * @module
 */
-function escapeAttr$2(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 const ALTCHUNK_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk";
 function wrapHtmlDocument(fragment) {
 	if (/<(!DOCTYPE|html|HTML)/i.test(fragment)) return fragment;
@@ -2406,8 +2345,8 @@ const altChunkDesc = {
 		const relId = uniqueId();
 		const extension = opts.extension;
 		const partPath = `afchunks/afchunk${relId}.${extension}`;
-		const rawData = typeof opts.data === "string" ? new TextEncoder().encode(opts.data) : opts.data;
-		const data = opts.contentType === "text/html" && typeof opts.data === "string" ? new TextEncoder().encode(wrapHtmlDocument(opts.data)) : rawData;
+		const rawData = typeof opts.data === "string" ? toUint8Array(opts.data) : opts.data;
+		const data = opts.contentType === "text/html" && typeof opts.data === "string" ? toUint8Array(wrapHtmlDocument(opts.data)) : rawData;
 		ctx.fileData.document.relationships.addRelationship(relId, ALTCHUNK_REL_TYPE, partPath);
 		ctx.fileData.altChunks.addAltChunk(relId, {
 			key: relId,
@@ -2479,28 +2418,25 @@ const subDocDesc = {
 		return { data: new Uint8Array(0) };
 	}
 };
-function escapeXml$2(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 function sdtListItemXml(item, forceValue) {
 	const attrs = [];
-	if (item.displayText !== void 0) attrs.push(`w:displayText="${escapeXml$2(item.displayText)}"`);
+	if (item.displayText !== void 0) attrs.push(`w:displayText="${escapeXml(item.displayText)}"`);
 	const value = item.value ?? (forceValue ? item.displayText : void 0);
-	if (value !== void 0) attrs.push(`w:value="${escapeXml$2(value)}"`);
+	if (value !== void 0) attrs.push(`w:value="${escapeXml(value)}"`);
 	return `<w:listItem ${attrs.join(" ")}/>`;
 }
 function sdtListTypeXml(name, options) {
 	const parts = [];
 	if (options.items) for (const item of options.items) parts.push(sdtListItemXml(item, name === "w:dropDownList"));
 	const attrs = [];
-	if (options.lastValue !== void 0) attrs.push(`w:lastValue="${escapeXml$2(options.lastValue)}"`);
+	if (options.lastValue !== void 0) attrs.push(`w:lastValue="${escapeXml(options.lastValue)}"`);
 	const attrStr = attrs.length ? " " + attrs.join(" ") : "";
 	return parts.length ? `<${name}${attrStr}>${parts.join("")}</${name}>` : `<${name}${attrStr}/>`;
 }
 function sdtDateXml(options) {
 	const parts = [];
-	if (options.dateFormat !== void 0) parts.push(`<w:dateFormat w:val="${escapeXml$2(options.dateFormat)}"/>`);
-	if (options.languageId !== void 0) parts.push(`<w:lid w:val="${escapeXml$2(options.languageId)}"/>`);
+	if (options.dateFormat !== void 0) parts.push(`<w:dateFormat w:val="${escapeXml(options.dateFormat)}"/>`);
+	if (options.languageId !== void 0) parts.push(`<w:lid w:val="${escapeXml(options.languageId)}"/>`);
 	if (options.storeMappedDataAs !== void 0) parts.push(`<w:storeMappedDataAs w:val="${options.storeMappedDataAs}"/>`);
 	if (options.calendar !== void 0) parts.push(`<w:calendar w:val="${options.calendar}"/>`);
 	const attrs = [];
@@ -2509,14 +2445,14 @@ function sdtDateXml(options) {
 	return parts.length ? `<w:date${attrStr}>${parts.join("")}</w:date>` : `<w:date${attrStr}/>`;
 }
 function sdtDataBindingXml(options) {
-	const attrs = [`w:xpath="${escapeXml$2(options.xpath)}"`, `w:storeItemID="${escapeXml$2(options.storeItemID)}"`];
-	if (options.prefixMappings !== void 0) attrs.push(`w:prefixMappings="${escapeXml$2(options.prefixMappings)}"`);
+	const attrs = [`w:xpath="${escapeXml(options.xpath)}"`, `w:storeItemID="${escapeXml(options.storeItemID)}"`];
+	if (options.prefixMappings !== void 0) attrs.push(`w:prefixMappings="${escapeXml(options.prefixMappings)}"`);
 	return `<w:dataBinding ${attrs.join(" ")}/>`;
 }
 function sdtDocPartXml(name, options) {
 	const parts = [];
-	if (options.gallery !== void 0) parts.push(`<w:docPartGallery w:val="${escapeXml$2(options.gallery)}"/>`);
-	if (options.category !== void 0) parts.push(`<w:docPartCategory w:val="${escapeXml$2(options.category)}"/>`);
+	if (options.gallery !== void 0) parts.push(`<w:docPartGallery w:val="${escapeXml(options.gallery)}"/>`);
+	if (options.category !== void 0) parts.push(`<w:docPartCategory w:val="${escapeXml(options.category)}"/>`);
 	if (options.unique !== void 0) parts.push(options.unique ? "<w:docPartUnique/>" : "<w:docPartUnique w:val=\"0\"/>");
 	return parts.length ? `<${name}>${parts.join("")}</${name}>` : `<${name}/>`;
 }
@@ -2543,18 +2479,18 @@ const DEFAULT_UNCHECKED = {
 function sdtCheckboxXml(opts) {
 	const checked = opts.checkedState ?? DEFAULT_CHECKED;
 	const unchecked = opts.uncheckedState ?? DEFAULT_UNCHECKED;
-	return `<w14:checkbox ${W14_NS}>${(opts.checked ? "<w14:checked/>" : "<w14:checked w14:val=\"0\"/>") + `<w14:checkedState w14:val="${escapeXml$2(checked.val)}" w14:font="${escapeXml$2(checked.font ?? CHECKBOX_FONT)}"/><w14:uncheckedState w14:val="${escapeXml$2(unchecked.val)}" w14:font="${escapeXml$2(unchecked.font ?? CHECKBOX_FONT)}"/>`}</w14:checkbox>`;
+	return `<w14:checkbox ${W14_NS}>${(opts.checked ? "<w14:checked/>" : "<w14:checked w14:val=\"0\"/>") + `<w14:checkedState w14:val="${escapeXml(checked.val)}" w14:font="${escapeXml(checked.font ?? CHECKBOX_FONT)}"/><w14:uncheckedState w14:val="${escapeXml(unchecked.val)}" w14:font="${escapeXml(unchecked.font ?? CHECKBOX_FONT)}"/>`}</w14:checkbox>`;
 }
 /** Build the run that renders a checkbox content control's current state symbol. */
 function checkboxSymbolRunInner(cb) {
 	const symbol = cb.checked ?? false ? cb.checkedState ?? DEFAULT_CHECKED : cb.uncheckedState ?? DEFAULT_UNCHECKED;
-	const font = escapeXml$2(symbol.font ?? CHECKBOX_FONT);
-	return `<w:r><w:rPr><w:rFonts w:ascii="${font}" w:hAnsi="${font}"/></w:rPr><w:t>${escapeXml$2(String.fromCodePoint(parseInt(symbol.val, 16)))}</w:t></w:r>`;
+	const font = escapeXml(symbol.font ?? CHECKBOX_FONT);
+	return `<w:r><w:rPr><w:rFonts w:ascii="${font}" w:hAnsi="${font}"/></w:rPr><w:t>${escapeXml(String.fromCodePoint(parseInt(symbol.val, 16)))}</w:t></w:r>`;
 }
 function stringifySdtPr(opts) {
 	const parts = [];
-	if (opts.alias !== void 0) parts.push(`<w:alias w:val="${escapeXml$2(opts.alias)}"/>`);
-	if (opts.tag !== void 0) parts.push(`<w:tag w:val="${escapeXml$2(opts.tag)}"/>`);
+	if (opts.alias !== void 0) parts.push(`<w:alias w:val="${escapeXml(opts.alias)}"/>`);
+	if (opts.tag !== void 0) parts.push(`<w:tag w:val="${escapeXml(opts.tag)}"/>`);
 	if (opts.id !== void 0) parts.push(`<w:id w:val="${opts.id}"/>`);
 	if (opts.lock !== void 0) parts.push(`<w:lock w:val="${opts.lock}"/>`);
 	if (opts.temporary !== void 0) parts.push(onOffAttr("w:temporary", opts.temporary));
@@ -2787,10 +2723,10 @@ const sdtBlockDesc = {
 };
 function buildCustomXmlPropertiesXml(pr) {
 	const parts = ["<w:customXmlPr>"];
-	if (pr.placeholder !== void 0) parts.push(`<w:placeholder w:val="${escapeAttr$2(pr.placeholder)}"/>`);
+	if (pr.placeholder !== void 0) parts.push(`<w:placeholder w:val="${escapeXml(pr.placeholder)}"/>`);
 	if (pr.attributes) for (const attr of pr.attributes) {
-		const attrParts = [`w:name="${escapeAttr$2(attr.name)}"`, `w:val="${escapeAttr$2(attr.val)}"`];
-		if (attr.uri !== void 0) attrParts.push(`w:uri="${escapeAttr$2(attr.uri)}"`);
+		const attrParts = [`w:name="${escapeXml(attr.name)}"`, `w:val="${escapeXml(attr.val)}"`];
+		if (attr.uri !== void 0) attrParts.push(`w:uri="${escapeXml(attr.uri)}"`);
 		parts.push(`<w:attr ${attrParts.join(" ")}/>`);
 	}
 	parts.push("</w:customXmlPr>");
@@ -2799,10 +2735,14 @@ function buildCustomXmlPropertiesXml(pr) {
 /**
 * Serialize the common customXml shell (element/uri/customXmlPr) wrapping
 * arbitrary content. Shared by all four customXml levels (block/run/row/cell).
+*
+* @deprecated Microsoft Word removed support for `w:customXml` inline markup on
+* 2010-01-10 (i4i Inc. v. Microsoft ruling); Word deletes these elements on
+* open. Prefer content controls (`w:sdt`) or a `customXml` part.
 */
 function stringifyCustomXmlShell(opts, contentXml) {
-	const attrs = [`w:element="${escapeAttr$2(opts.element)}"`];
-	if (opts.uri !== void 0) attrs.push(`w:uri="${escapeAttr$2(opts.uri)}"`);
+	const attrs = [`w:element="${escapeXml(opts.element)}"`];
+	if (opts.uri !== void 0) attrs.push(`w:uri="${escapeXml(opts.uri)}"`);
 	const prXml = opts.customXmlPr ? buildCustomXmlPropertiesXml(opts.customXmlPr) : "";
 	return `<w:customXml ${attrs.join(" ")}>${prXml}${contentXml}</w:customXml>`;
 }
@@ -3318,7 +3258,7 @@ const VerticalPositionRelativeFrom = {
 * ```
 */
 const createHorizontalPosition = ({ relative, align, offset }) => {
-	const child = align ? `<wp:align>${align}</wp:align>` : offset !== void 0 ? `<wp:posOffset>${offset}</wp:posOffset>` : `<wp:align>${HorizontalPositionAlign.LEFT}</wp:align>`;
+	const child = align ? `<wp:align>${align}</wp:align>` : offset !== void 0 ? `<wp:posOffset>${convertToEmu(offset)}</wp:posOffset>` : `<wp:align>${HorizontalPositionAlign.LEFT}</wp:align>`;
 	return element("wp:positionH", { relativeFrom: relative ?? HorizontalPositionRelativeFrom.PAGE }, [child]);
 };
 //#endregion
@@ -3371,7 +3311,7 @@ const createHorizontalPosition = ({ relative, align, offset }) => {
 * ```
 */
 const createVerticalPosition = ({ relative, align, offset }) => {
-	const child = align ? `<wp:align>${align}</wp:align>` : offset !== void 0 ? `<wp:posOffset>${offset}</wp:posOffset>` : `<wp:align>${VerticalPositionAlign.TOP}</wp:align>`;
+	const child = align ? `<wp:align>${align}</wp:align>` : offset !== void 0 ? `<wp:posOffset>${convertToEmu(offset)}</wp:posOffset>` : `<wp:align>${VerticalPositionAlign.TOP}</wp:align>`;
 	return element("wp:positionV", { relativeFrom: relative ?? VerticalPositionRelativeFrom.PAGE }, [child]);
 };
 //#endregion
@@ -4264,15 +4204,15 @@ function stringifyMathInput(value) {
 	if ("integral" in value) return stringifyNAry(value.integral, "∫");
 	if ("limitLower" in value) {
 		const opts = value.limitLower;
-		return `<m:limLow>${opts.properties ? "" : ""}<m:e>${stringifyChildren(opts.children)}</m:e><m:lim>${stringifyChildren(opts.limit)}</m:lim></m:limLow>`;
+		return `<m:limLow><m:e>${stringifyChildren(opts.children)}</m:e><m:lim>${stringifyChildren(opts.limit)}</m:lim></m:limLow>`;
 	}
 	if ("limitUpper" in value) {
 		const opts = value.limitUpper;
-		return `<m:limUpp>${opts.properties ? "" : ""}<m:e>${stringifyChildren(opts.children)}</m:e><m:lim>${stringifyChildren(opts.limit)}</m:lim></m:limUpp>`;
+		return `<m:limUpp><m:e>${stringifyChildren(opts.children)}</m:e><m:lim>${stringifyChildren(opts.limit)}</m:lim></m:limUpp>`;
 	}
 	if ("function" in value) {
 		const opts = value.function;
-		return `<m:func>${opts.properties ? "" : ""}<m:fName>${stringifyChildren(opts.name)}</m:fName><m:e>${stringifyChildren(opts.children)}</m:e></m:func>`;
+		return `<m:func><m:fName>${stringifyChildren(opts.name)}</m:fName><m:e>${stringifyChildren(opts.children)}</m:e></m:func>`;
 	}
 	if ("matrix" in value) {
 		const opts = value.matrix;
@@ -4836,13 +4776,17 @@ function stringifyBodyChild(child, ctx) {
 	if ("customXml" in child) return customXmlBlockDesc.stringify(child.customXml, ctx) ?? "";
 	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}/>`;
+		const a = [`w:id="${bs.id}"`, `w:name="${escapeXml(bs.name)}"`];
+		if (bs.displacedByCustomXml) a.push(`w:displacedByCustomXml="${bs.displacedByCustomXml}"`);
+		if (bs.colFirst !== void 0) a.push(`w:colFirst="${bs.colFirst}"`);
+		if (bs.colLast !== void 0) a.push(`w:colLast="${bs.colLast}"`);
+		return `<w:bookmarkStart ${a.join(" ")}/>`;
 	}
 	if ("bookmarkEnd" in child) {
 		const be = child.bookmarkEnd;
-		const beDisp = be.displacedByCustomXml ? ` w:displacedByCustomXml="${be.displacedByCustomXml}"` : "";
-		return `<w:bookmarkEnd w:id="${be.id}"${beDisp}/>`;
+		const a = [`w:id="${be.id}"`];
+		if (be.displacedByCustomXml) a.push(`w:displacedByCustomXml="${be.displacedByCustomXml}"`);
+		return `<w:bookmarkEnd ${a.join(" ")}/>`;
 	}
 	if ("rawXml" in child) return child.rawXml;
 	throw new Error("Unknown section child type");
@@ -4851,21 +4795,25 @@ function stringifyBodyChild(child, ctx) {
 const vmlStyleMap = styleToKeyMap;
 function stringifyDocumentBackground(opts, ctx) {
 	if (opts.rawXml) {
-		if (opts.rawMedia) for (const m of opts.rawMedia) ctx.file.media.addImage(m.fileName, {
-			type: m.type,
-			data: toUint8Array(m.data),
-			fileName: m.fileName,
-			transformation: {
-				emus: {
-					x: 0,
-					y: 0
-				},
-				pixels: {
-					x: 0,
-					y: 0
+		if (opts.rawMedia) for (const m of opts.rawMedia) {
+			const data = toUint8Array(m.data);
+			const entry = ctx.file.media.addMedia(data, m.type, (fileName) => ({
+				type: m.type,
+				data,
+				fileName,
+				transformation: {
+					emus: {
+						x: 0,
+						y: 0
+					},
+					pixels: {
+						x: 0,
+						y: 0
+					}
 				}
-			}
-		});
+			}), m.fileName);
+			if (entry.fileName !== m.fileName) opts.rawXml = opts.rawXml.split(`{${m.fileName}}`).join(`{${entry.fileName}}`);
+		}
 		return opts.rawXml;
 	}
 	const attrs = [];
@@ -4875,12 +4823,12 @@ function stringifyDocumentBackground(opts, ctx) {
 	if (opts.themeTint !== void 0) attrs.push(`w:themeTint="${uCharHexNumber(opts.themeTint)}"`);
 	const attrStr = attrs.join(" ");
 	if (opts.image) {
-		const fileName = ctx.file.media.nextMediaName(opts.image.type);
-		const rawData = toUint8Array(opts.image.data);
-		ctx.file.media.addImage(fileName, {
-			type: opts.image.type,
+		const image = opts.image;
+		const rawData = toUint8Array(image.data);
+		const { fileName } = ctx.file.media.addMedia(rawData, image.type, (name) => ({
+			type: image.type,
 			data: rawData,
-			fileName,
+			fileName: name,
 			transformation: {
 				emus: {
 					x: 0,
@@ -4891,7 +4839,7 @@ function stringifyDocumentBackground(opts, ctx) {
 					y: 0
 				}
 			}
-		});
+		}));
 		return `<w:background ${attrStr}>${`<v:background id="_x0000_s1025"><v:fill r:id="{${fileName}}" o:title="${fileName}" recolor="t" type="frame"/></v:background>`}</w:background>`;
 	}
 	return `<w:background ${attrStr}/>`;
@@ -5334,6 +5282,12 @@ function parseMoveRangeStart(el) {
 	if (author !== void 0) m.author = author;
 	const date = attr(el, "w:date");
 	if (date !== void 0) m.date = date;
+	const disp = attr(el, "w:displacedByCustomXml");
+	if (disp === "before" || disp === "after") m.displacedByCustomXml = disp;
+	const colFirst = attrNum(el, "w:colFirst");
+	if (colFirst !== void 0) m.colFirst = colFirst;
+	const colLast = attrNum(el, "w:colLast");
+	if (colLast !== void 0) m.colLast = colLast;
 	return m;
 }
 /** Parse a customXml range start (Ins/Del/MoveFrom/MoveTo). */
@@ -5347,6 +5301,15 @@ function parseCustomXmlRangeStart(el) {
 	if (date !== void 0) m.date = date;
 	return m;
 }
+/** Parse a CT_MarkupRange end marker (id + displacedByCustomXml). */
+function parseMarkupRangeOptions(el) {
+	const id = attrNum(el, "w:id");
+	if (id === void 0) return void 0;
+	const m = { id };
+	const disp = attr(el, "w:displacedByCustomXml");
+	if (disp === "before" || disp === "after") m.displacedByCustomXml = disp;
+	return m;
+}
 /**
 * Parse a w:p element into ParagraphOptions.
 */
@@ -5508,6 +5471,10 @@ function parseRunLevelChildren(elements, ctx) {
 				};
 				const disp = attr(child, "w:displacedByCustomXml");
 				if (disp === "before" || disp === "after") bookmarkStart.displacedByCustomXml = disp;
+				const colFirst = attrNum(child, "w:colFirst");
+				if (colFirst !== void 0) bookmarkStart.colFirst = colFirst;
+				const colLast = attrNum(child, "w:colLast");
+				if (colLast !== void 0) bookmarkStart.colLast = colLast;
 				childList.push({ bookmarkStart });
 			}
 			break;
@@ -5523,13 +5490,13 @@ function parseRunLevelChildren(elements, ctx) {
 			break;
 		}
 		case "w:commentRangeStart": {
-			const id = attrNum(child, "w:id");
-			if (id !== void 0) childList.push({ commentRangeStart: id });
+			const m = parseMarkupRangeOptions(child);
+			if (m) childList.push({ commentRangeStart: m });
 			break;
 		}
 		case "w:commentRangeEnd": {
-			const id = attrNum(child, "w:id");
-			if (id !== void 0) childList.push({ commentRangeEnd: id });
+			const m = parseMarkupRangeOptions(child);
+			if (m) childList.push({ commentRangeEnd: m });
 			break;
 		}
 		case "w:commentReference": {
@@ -5721,8 +5688,8 @@ function parseRunLevelChildren(elements, ctx) {
 			break;
 		}
 		case "w:moveFromRangeEnd": {
-			const id = attrNum(child, "w:id");
-			if (id !== void 0) childList.push({ moveFromRangeEnd: id });
+			const m = parseMarkupRangeOptions(child);
+			if (m) childList.push({ moveFromRangeEnd: m });
 			break;
 		}
 		case "w:moveToRangeStart": {
@@ -5731,8 +5698,8 @@ function parseRunLevelChildren(elements, ctx) {
 			break;
 		}
 		case "w:moveToRangeEnd": {
-			const id = attrNum(child, "w:id");
-			if (id !== void 0) childList.push({ moveToRangeEnd: id });
+			const m = parseMarkupRangeOptions(child);
+			if (m) childList.push({ moveToRangeEnd: m });
 			break;
 		}
 		case "w:customXmlInsRangeStart": {
@@ -5841,7 +5808,7 @@ function parseParagraph(el, ctx) {
 * based on the graphicData URI.
 */
 function parseDrawingRun(el, ctx) {
-	const graphicData = findDeep(el, "a:graphicData")[0];
+	const graphicData = findFirst(el, "a:graphicData");
 	if (!graphicData) return void 0;
 	const uri = attr(graphicData, "uri") ?? "";
 	if (uri.includes("/chart")) return parseChartDrawing(el, ctx);
@@ -5907,8 +5874,8 @@ function readGrpSpLocks(cNvGrpSpPr) {
 * Returns `null` when the drawing has neither wrapper.
 */
 function parseAnchorOrInline(el) {
-	const inline = findDeep(el, "wp:inline")[0];
-	const anchor = inline ? void 0 : findDeep(el, "wp:anchor")[0];
+	const inline = findFirst(el, "wp:inline");
+	const anchor = inline ? void 0 : findFirst(el, "wp:anchor");
 	const parent = inline ?? anchor;
 	if (!parent) return null;
 	const info = {};
@@ -5916,8 +5883,8 @@ function parseAnchorOrInline(el) {
 	if (extent) {
 		const cxEmu = attrNum(extent, "cx");
 		const cyEmu = attrNum(extent, "cy");
-		if (cxEmu !== void 0) info.width = convertEmuToPixels(cxEmu);
-		if (cyEmu !== void 0) info.height = convertEmuToPixels(cyEmu);
+		if (cxEmu !== void 0) info.width = cxEmu;
+		if (cyEmu !== void 0) info.height = cyEmu;
 	}
 	const ee = findChild(parent, "wp:effectExtent");
 	if (ee) info.effectExtent = {
@@ -5987,7 +5954,7 @@ function parseAnchorOrInline(el) {
 function parseImageRun(el, ctx) {
 	const info = parseAnchorOrInline(el);
 	if (!info) return void 0;
-	const blip = findDeep(el, "a:blip")[0];
+	const blip = findFirst(el, "a:blip");
 	if (!blip) return void 0;
 	const rEmbed = attr(blip, "r:embed");
 	if (!rEmbed) return void 0;
@@ -6007,14 +5974,14 @@ function parseImageRun(el, ctx) {
 	if (info.altText) imageOpts.altText = info.altText;
 	if (info.floating) imageOpts.floating = info.floating;
 	if (info.graphicFrameLocks !== void 0) imageOpts.graphicFrameLocks = info.graphicFrameLocks;
-	const blipFill = findDeep(el, "pic:blipFill")[0];
+	const blipFill = findFirst(el, "pic:blipFill");
 	if (blipFill) {
 		const srcRect = readSourceRectangle(blipFill);
 		if (srcRect) imageOpts.sourceRectangle = srcRect;
 	}
 	const cNvPr = readPicCnvPr(el);
 	if (cNvPr) imageOpts.nonVisualProperties = cNvPr;
-	const picSpPr = findDeep(el, "pic:spPr")[0];
+	const picSpPr = findFirst(el, "pic:spPr");
 	if (picSpPr) {
 		const fill = readShapeFill(picSpPr, ctx);
 		if (fill) imageOpts.fill = fill;
@@ -6065,7 +6032,7 @@ function readSourceRectangle(parent) {
 * undefined when there is no non-visual properties block.
 */
 function readPicCnvPr(el) {
-	const nvPicPr = findDeep(el, "pic:nvPicPr")[0];
+	const nvPicPr = findFirst(el, "pic:nvPicPr");
 	if (!nvPicPr) return void 0;
 	const result = {};
 	const cNvPr = findChild(nvPicPr, "pic:cNvPr");
@@ -6090,7 +6057,7 @@ function readPicCnvPr(el) {
 * through the shared descriptor.
 */
 function readShapeFill(parent, ctx) {
-	if (!(findChild(parent, "a:noFill") ?? findChild(parent, "a:solidFill") ?? findChild(parent, "a:gradFill") ?? findChild(parent, "a:pattFill") ?? findChild(parent, "a:grpFill"))) return void 0;
+	if (!(findChild(parent, "a:noFill") ?? findChild(parent, "a:solidFill") ?? findChild(parent, "a:gradFill") ?? findChild(parent, "a:pattFill") ?? findChild(parent, "a:grpFill") ?? findChild(parent, "a:blipFill"))) return void 0;
 	return fillDesc.parse(parent, ctx);
 }
 /**
@@ -6129,7 +6096,7 @@ function parseShapeStyle(styleEl, ctx) {
 */
 function parseWpsShapeCore(wspEl, ctx) {
 	const result = {};
-	const txbxContent = findDeep(wspEl, "w:txbxContent")[0];
+	const txbxContent = findFirst(wspEl, "w:txbxContent");
 	const children = [];
 	if (txbxContent) {
 		for (const child of txbxContent.elements ?? []) if (child.name === "w:p") children.push(parseParagraph(child, ctx));
@@ -6167,9 +6134,13 @@ function parseWpsShapeCore(wspEl, ctx) {
 		if (custGeom) result.customGeometry = customGeometryDesc.parse(custGeom, ctx);
 		const prstGeom = findChild(spPr, "a:prstGeom");
 		if (prstGeom) result.presetGeometry = presetGeometryDesc.parse(prstGeom, ctx);
+		const scene3d = findChild(spPr, "a:scene3d");
+		if (scene3d) result.scene3d = scene3DDesc.parse(scene3d, ctx);
+		const sp3d = findChild(spPr, "a:sp3d");
+		if (sp3d) result.shape3d = shape3DDesc.parse(sp3d, ctx);
 	}
 	const bodyPr = findChild(wspEl, "wps:bodyPr");
-	if (bodyPr) result.bodyProperties = parseBodyProperties(bodyPr);
+	if (bodyPr) result.bodyProperties = parseBodyProperties(bodyPr, ctx);
 	const styleEl = findChild(wspEl, "wps:style");
 	if (styleEl) result.style = parseShapeStyle(styleEl, ctx);
 	return result;
@@ -6251,7 +6222,7 @@ function parseWpsChildMediaData(wspEl, ctx) {
 * to the same image collapse to one media entry.
 */
 function parsePicChildMediaData(picEl, ctx) {
-	const blip = findDeep(picEl, "a:blip")[0];
+	const blip = findFirst(picEl, "a:blip");
 	if (!blip) return void 0;
 	const rEmbed = attr(blip, "r:embed");
 	if (!rEmbed) return void 0;
@@ -6285,7 +6256,7 @@ function parsePicChildMediaData(picEl, ctx) {
 * Parse a standalone wps shape drawing (graphicData URI wordprocessingShape).
 */
 function parseWpsShapeDrawing(el, ctx) {
-	const wsp = findDeep(el, "wps:wsp")[0];
+	const wsp = findFirst(el, "wps:wsp");
 	if (!wsp) return void 0;
 	const info = parseAnchorOrInline(el) ?? {};
 	const shape = {
@@ -6305,7 +6276,7 @@ function parseWpsShapeDrawing(el, ctx) {
 * Parse a wpg group drawing (graphicData URI wordprocessingGroup).
 */
 function parseWpgGroupDrawing(el, ctx) {
-	const wgp = findDeep(el, "wpg:wgp")[0];
+	const wgp = findFirst(el, "wpg:wgp");
 	if (!wgp) return void 0;
 	const info = parseAnchorOrInline(el) ?? {};
 	const grpSpPr = findChild(wgp, "wpg:grpSpPr");
@@ -6434,8 +6405,8 @@ function readWrap(anchor) {
 	}
 }
 function getDrawingExtent(el) {
-	const inline = findDeep(el, "wp:inline")[0];
-	const anchor = inline ? void 0 : findDeep(el, "wp:anchor")[0];
+	const inline = findFirst(el, "wp:inline");
+	const anchor = inline ? void 0 : findFirst(el, "wp:anchor");
 	const parent = inline ?? anchor;
 	if (!parent) return {};
 	const extent = findChild(parent, "wp:extent");
@@ -6443,8 +6414,8 @@ function getDrawingExtent(el) {
 	const cxEmu = attrNum(extent, "cx");
 	const cyEmu = attrNum(extent, "cy");
 	return {
-		...cxEmu !== void 0 ? { width: convertEmuToPixels(cxEmu) } : {},
-		...cyEmu !== void 0 ? { height: convertEmuToPixels(cyEmu) } : {}
+		...cxEmu !== void 0 ? { width: cxEmu } : {},
+		...cyEmu !== void 0 ? { height: cyEmu } : {}
 	};
 }
 /**
@@ -6458,7 +6429,7 @@ function lookupRId(map, rId) {
 	if (rId.startsWith("rIdrId")) return map.get(rId.slice(3));
 }
 function parseChartDrawing(el, ctx) {
-	const chartRef = findDeep(el, "c:chart")[0];
+	const chartRef = findFirst(el, "c:chart");
 	if (!chartRef) return void 0;
 	const rId = attr(chartRef, "r:id");
 	const chartPath = lookupRId(ctx.docx.partRefs.charts, rId);
@@ -6480,9 +6451,9 @@ function parseChartXml(el) {
 	const opts = {};
 	const titleEl = findChild(chart, "c:title");
 	if (titleEl) {
-		const rich = findDeep(titleEl, "c:rich")[0];
+		const rich = findFirst(titleEl, "c:rich");
 		if (rich) {
-			const t = findDeep(rich, "a:t")[0];
+			const t = findFirst(rich, "a:t");
 			if (t) {
 				const title = textOf(t);
 				if (title) opts.title = title;
@@ -6551,7 +6522,7 @@ function parseChartXml(el) {
 function extractStrCache(parent, containerName) {
 	const container = findChild(parent, containerName);
 	if (!container) return [];
-	const cache = findDeep(container, "c:strCache")[0];
+	const cache = findFirst(container, "c:strCache");
 	if (!cache) return [];
 	const values = [];
 	for (const pt of cache.elements ?? []) {
@@ -6567,7 +6538,7 @@ function extractStrCache(parent, containerName) {
 function extractNumCache(parent) {
 	const valEl = findChild(parent, "c:val");
 	if (!valEl) return [];
-	const cache = findDeep(valEl, "c:numCache")[0];
+	const cache = findFirst(valEl, "c:numCache");
 	if (!cache) return [];
 	const values = [];
 	for (const pt of cache.elements ?? []) {
@@ -6581,7 +6552,7 @@ function extractNumCache(parent) {
 	return values;
 }
 function parseSmartArtDrawing(el, ctx) {
-	const relIds = findDeep(el, "dgm:relIds")[0];
+	const relIds = findFirst(el, "dgm:relIds");
 	if (!relIds) return void 0;
 	const rId = attr(relIds, "r:dm");
 	const dataPath = lookupRId(ctx.docx.partRefs.diagramData, rId);
@@ -6620,7 +6591,7 @@ function parseSmartArtDataXml(el) {
 				if (color) opts.color = color;
 			}
 		} else if (type === "node" && modelId) {
-			const t = findDeep(pt, "a:t")[0];
+			const t = findFirst(pt, "a:t");
 			nodeMap.set(modelId, t ? textOf(t) ?? "" : "");
 		}
 	}
@@ -6833,7 +6804,7 @@ function stringifyWpsShape(opts, ctx) {
 	if (opts.customGeometry) spPrParts.push(customGeometryDesc$1.stringify(opts.customGeometry, NOOP_CTX) ?? "");
 	else if (opts.presetGeometry) spPrParts.push(presetGeometryDesc$1.stringify(opts.presetGeometry, NOOP_CTX) ?? "");
 	else spPrParts.push("<a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom>");
-	if (opts.fill) spPrParts.push(fillDesc$1.stringify(opts.fill, NOOP_CTX) ?? "");
+	if (opts.fill) spPrParts.push(fillDesc$1.stringify(opts.fill, ctx) ?? "");
 	if (opts.outline) spPrParts.push(outlineDesc$1.stringify(opts.outline, NOOP_CTX) ?? "");
 	if (opts.effectDag) spPrParts.push(createEffectDag(opts.effectDag));
 	else if (opts.effects) spPrParts.push(effectListDesc$1.stringify(opts.effects, NOOP_CTX) ?? "");
@@ -6880,7 +6851,7 @@ function stringifyWpgGroup(opts, ctx) {
 	const transform = opts.transformation;
 	const grpSpPrParts = [];
 	grpSpPrParts.push(stringifyGroupTransform2D(transform, opts.childOffset, opts.childExtent));
-	if (opts.fill) grpSpPrParts.push(fillDesc$1.stringify(opts.fill, NOOP_CTX) ?? "");
+	if (opts.fill) grpSpPrParts.push(fillDesc$1.stringify(opts.fill, ctx) ?? "");
 	if (opts.effects) grpSpPrParts.push(effectListDesc$1.stringify(opts.effects, NOOP_CTX) ?? "");
 	const childXml = opts.children.map((child) => stringifyGroupChild(child, ctx)).join("");
 	return "<wpg:wgp>" + stringifyCnvGrpSpPr(opts.groupShapeLocks) + `<wpg:grpSpPr>${grpSpPrParts.join("")}</wpg:grpSpPr>` + childXml + "</wpg:wgp>";
@@ -6920,7 +6891,7 @@ function stringifyGroupChild(child, ctx) {
 function stringifyNestedGroup(grp, ctx) {
 	const grpSpPrParts = [];
 	grpSpPrParts.push(stringifyGroupTransform2D(grp.transformation, grp.childOffset, grp.childExtent));
-	if (grp.fill) grpSpPrParts.push(fillDesc$1.stringify(grp.fill, NOOP_CTX) ?? "");
+	if (grp.fill) grpSpPrParts.push(fillDesc$1.stringify(grp.fill, ctx) ?? "");
 	if (grp.effects) grpSpPrParts.push(effectListDesc$1.stringify(grp.effects, NOOP_CTX) ?? "");
 	return "<wpg:grpSp><wpg:cNvPr id=\"0\" name=\"\"/>" + stringifyCnvGrpSpPr(grp.groupShapeLocks) + `<wpg:grpSpPr>${grpSpPrParts.join("")}</wpg:grpSpPr>` + grp.children.map((c) => stringifyGroupChild(c, ctx)).join("") + "</wpg:grpSp>";
 }
@@ -6954,10 +6925,10 @@ function stringifyGraphicDataContent(mediaData, opts, hlIds, ctx) {
 	return `<a:graphicData uri="${PIC_URI}"><pic:pic xmlns:pic="${PIC_URI}">` + stringifyNvPicPr(hlIds, md.nonVisualProperties) + stringifyBlipFill(md, blipEffects, tile) + stringifyShapeProps(transform, outline, fill, effects) + `</pic:pic></a:graphicData>`;
 }
 function stringifyPositionH(opts) {
-	return `<wp:positionH relativeFrom="${opts.relative ?? HorizontalPositionRelativeFrom.PAGE}">${opts.align ? `<wp:align>${opts.align}</wp:align>` : opts.offset !== void 0 ? `<wp:posOffset>${opts.offset}</wp:posOffset>` : "<wp:align>left</wp:align>"}</wp:positionH>`;
+	return `<wp:positionH relativeFrom="${opts.relative ?? HorizontalPositionRelativeFrom.PAGE}">${opts.align ? `<wp:align>${opts.align}</wp:align>` : opts.offset !== void 0 ? `<wp:posOffset>${convertToEmu(opts.offset)}</wp:posOffset>` : "<wp:align>left</wp:align>"}</wp:positionH>`;
 }
 function stringifyPositionV(opts) {
-	return `<wp:positionV relativeFrom="${opts.relative ?? VerticalPositionRelativeFrom.PAGE}">${opts.align ? `<wp:align>${opts.align}</wp:align>` : opts.offset !== void 0 ? `<wp:posOffset>${opts.offset}</wp:posOffset>` : "<wp:align>top</wp:align>"}</wp:positionV>`;
+	return `<wp:positionV relativeFrom="${opts.relative ?? VerticalPositionRelativeFrom.PAGE}">${opts.align ? `<wp:align>${opts.align}</wp:align>` : opts.offset !== void 0 ? `<wp:posOffset>${convertToEmu(opts.offset)}</wp:posOffset>` : "<wp:align>top</wp:align>"}</wp:positionV>`;
 }
 function wrapPolygonStr(cx, cy) {
 	return `<wp:wrapPolygon edited="0"><wp:start x="0" y="0"/><wp:lineTo x="0" y="${-cy}"/><wp:lineTo x="${cx}" y="${-cy}"/><wp:lineTo x="${cx}" y="0"/><wp:lineTo x="0" y="0"/></wp:wrapPolygon>`;
@@ -6967,27 +6938,27 @@ function wrapSquareStr(textWrapping, margins) {
 	const m = margins ?? {};
 	return `<wp:wrapSquare ${[
 		`wrapText="${side}"`,
-		...m.top != null ? [`distT="${m.top}"`] : [],
-		...m.bottom != null ? [`distB="${m.bottom}"`] : [],
-		...m.left != null ? [`distL="${m.left}"`] : [],
-		...m.right != null ? [`distR="${m.right}"`] : []
+		...m.top != null ? [`distT="${convertToEmu(m.top)}"`] : [],
+		...m.bottom != null ? [`distB="${convertToEmu(m.bottom)}"`] : [],
+		...m.left != null ? [`distL="${convertToEmu(m.left)}"`] : [],
+		...m.right != null ? [`distR="${convertToEmu(m.right)}"`] : []
 	].join(" ")}/>`;
 }
 function wrapTightStr(textWrapping, margins, cx, cy) {
 	const a = [`wrapText="${textWrapping.side ?? TextWrappingSide.BOTH_SIDES}"`];
-	if (margins.left != null) a.push(`distL="${margins.left}"`);
-	if (margins.right != null) a.push(`distR="${margins.right}"`);
+	if (margins.left != null) a.push(`distL="${convertToEmu(margins.left)}"`);
+	if (margins.right != null) a.push(`distR="${convertToEmu(margins.right)}"`);
 	return `<wp:wrapTight ${a.join(" ")}>${wrapPolygonStr(cx, cy)}</wp:wrapTight>`;
 }
 function wrapThroughStr(textWrapping, margins, cx, cy) {
 	const a = [`wrapText="${textWrapping.side ?? TextWrappingSide.BOTH_SIDES}"`];
-	if (margins.left != null) a.push(`distL="${margins.left}"`);
-	if (margins.right != null) a.push(`distR="${margins.right}"`);
+	if (margins.left != null) a.push(`distL="${convertToEmu(margins.left)}"`);
+	if (margins.right != null) a.push(`distR="${convertToEmu(margins.right)}"`);
 	return `<wp:wrapThrough ${a.join(" ")}>${wrapPolygonStr(cx, cy)}</wp:wrapThrough>`;
 }
 function wrapTopAndBottomStr(margins) {
 	const m = margins ?? {};
-	const a = [...m.top != null ? [`distT="${m.top}"`] : [], ...m.bottom != null ? [`distB="${m.bottom}"`] : []].join(" ");
+	const a = [...m.top != null ? [`distT="${convertToEmu(m.top)}"`] : [], ...m.bottom != null ? [`distB="${convertToEmu(m.bottom)}"`] : []].join(" ");
 	return a ? `<wp:wrapTopAndBottom ${a}/>` : "<wp:wrapTopAndBottom/>";
 }
 /** Render wp:cNvGraphicFramePr. Undefined → authoring default (noChangeAspect=1);
@@ -7048,10 +7019,10 @@ function stringifyAnchor(opts, hlIds, ctx) {
 		...rawFloating
 	};
 	const attrParts = [
-		`distT="${floating.margins?.top ?? 0}"`,
-		`distB="${floating.margins?.bottom ?? 0}"`,
-		`distL="${floating.margins?.left ?? 0}"`,
-		`distR="${floating.margins?.right ?? 0}"`,
+		`distT="${convertToEmu(floating.margins?.top ?? 0)}"`,
+		`distB="${convertToEmu(floating.margins?.bottom ?? 0)}"`,
+		`distL="${convertToEmu(floating.margins?.left ?? 0)}"`,
+		`distR="${convertToEmu(floating.margins?.right ?? 0)}"`,
 		"simplePos=\"0\"",
 		`allowOverlap="${floating.allowOverlap ? 1 : 0}"`,
 		`behindDoc="${floating.behindDocument ? 1 : 0}"`,
@@ -7086,24 +7057,6 @@ function stringifyAnchor(opts, hlIds, ctx) {
 const drawingDesc = {
 	kind: "custom",
 	stringify(opts, ctx) {
-		if (opts.fill) {
-			const media = extractBlipFillMedia(opts.fill, (type) => ctx.file.media.nextMediaName(type));
-			if (media) ctx.file.media.addImage(media.fileName, {
-				data: media.data,
-				fileName: media.fileName,
-				type: media.type,
-				transformation: {
-					pixels: {
-						x: 0,
-						y: 0
-					},
-					emus: {
-						x: 0,
-						y: 0
-					}
-				}
-			});
-		}
 		const hlIds = registerHyperlinks(opts.docProperties?.hyperlink, ctx);
 		if (opts.floating) return stringifyAnchor(opts, hlIds, ctx);
 		return stringifyInline(opts, hlIds, ctx);
@@ -7298,15 +7251,10 @@ function registerVmlFallbackMedia(opts, ctx) {
 	if (!opts.vmlFallbackMedia) return;
 	for (const m of opts.vmlFallbackMedia) {
 		const data = toUint8Array(m.data);
-		const existing = ctx.file.media.findByContent(data);
-		if (existing) {
-			if (opts.vmlFallback) opts.vmlFallback = opts.vmlFallback.split(`{${m.fileName}}`).join(`{${existing}}`);
-			continue;
-		}
-		ctx.file.media.addImage(m.fileName, {
+		const entry = ctx.file.media.addMedia(data, m.type, (fileName) => ({
 			type: m.type,
 			data,
-			fileName: m.fileName,
+			fileName,
 			transformation: {
 				emus: {
 					x: 0,
@@ -7317,12 +7265,109 @@ function registerVmlFallbackMedia(opts, ctx) {
 					y: 0
 				}
 			}
-		});
+		}), m.fileName);
+		if (entry.fileName !== m.fileName && opts.vmlFallback) opts.vmlFallback = opts.vmlFallback.split(`{${m.fileName}}`).join(`{${entry.fileName}}`);
 	}
 }
 /**
 * Build the rPr XML for a break/tab run from its structured run properties.
 */
+/** Shared attribute string for CT_MarkupRange end markers (commentRange, move range end). */
+function buildMarkupRangeAttrs(m) {
+	const a = [`w:id="${m.id}"`];
+	if (m.displacedByCustomXml) a.push(`w:displacedByCustomXml="${m.displacedByCustomXml}"`);
+	return a.join(" ");
+}
+/** Shared attribute string for w:bookmarkStart (CT_Bookmark). */
+function buildBookmarkStartAttrs(bs) {
+	const a = [`w:id="${bs.id}"`, `w:name="${escapeXml(bs.name)}"`];
+	if (bs.displacedByCustomXml) a.push(`w:displacedByCustomXml="${bs.displacedByCustomXml}"`);
+	if (bs.colFirst !== void 0) a.push(`w:colFirst="${bs.colFirst}"`);
+	if (bs.colLast !== void 0) a.push(`w:colLast="${bs.colLast}"`);
+	return a.join(" ");
+}
+/** Shared attribute string for w:moveFromRangeStart / w:moveToRangeStart (CT_MoveBookmark). */
+function buildMoveRangeStartAttrs(m) {
+	const a = [`w:id="${m.id}"`];
+	if (m.name) a.push(`w:name="${escapeXml(m.name)}"`);
+	if (m.author) a.push(`w:author="${escapeXml(m.author)}"`);
+	if (m.date) a.push(`w:date="${m.date}"`);
+	if (m.displacedByCustomXml) a.push(`w:displacedByCustomXml="${m.displacedByCustomXml}"`);
+	if (m.colFirst !== void 0) a.push(`w:colFirst="${m.colFirst}"`);
+	if (m.colLast !== void 0) a.push(`w:colLast="${m.colLast}"`);
+	return a.join(" ");
+}
+/** Stringify inline run/text content — the `wrap` shared by every sugar child. */
+function stringifyInlineWrap(wrap, ctx) {
+	const parts = [];
+	for (const item of wrap ?? []) parts.push(typeof item === "string" ? stringifyRunInline({ text: item }, ctx) : stringifyRunInline(item, ctx));
+	return parts.join("");
+}
+/**
+* Expand a `{ comment }` sugar child: allocate the comment id, register the
+* comment entry (side effect, consumed when word/comments.xml is stringified),
+* and emit the range markers + anchored content + reference with one shared id.
+*
+* The caller never supplies an id — the library owns id allocation and pairing.
+*/
+function stringifyCommentChild(c, ctx) {
+	const id = ctx.file.comments.nextId++;
+	ctx.file.comments.entries.push({
+		id,
+		author: c.author,
+		initials: c.initials,
+		date: c.date,
+		children: c.children
+	});
+	return `<w:commentRangeStart w:id="${id}"/>` + stringifyInlineWrap(c.wrap, ctx) + `<w:commentRangeEnd w:id="${id}"/><w:r><w:rPr><w:rStyle w:val="CommentReference"/></w:rPr><w:commentReference w:id="${id}"/></w:r>`;
+}
+/**
+* Expand a `{ bookmark }` sugar child: allocate the bookmark id and emit the
+* paired bookmarkStart/bookmarkEnd with the anchored content between them.
+* Bookmarks are pure markup — the only effect is the two markers.
+*/
+function stringifyBookmarkChild(b, ctx) {
+	const id = ctx.file.markupIds.rangeNext++;
+	const startAttrs = buildBookmarkStartAttrs({
+		id,
+		name: b.name,
+		displacedByCustomXml: b.displacedByCustomXml,
+		colFirst: b.colFirst,
+		colLast: b.colLast
+	});
+	const endAttrs = buildMarkupRangeAttrs({
+		id,
+		displacedByCustomXml: b.displacedByCustomXml
+	});
+	return `<w:bookmarkStart ${startAttrs}/>${stringifyInlineWrap(b.wrap, ctx)}<w:bookmarkEnd ${endAttrs}/>`;
+}
+/**
+* Expand a `{ moveFrom }` / `{ moveTo }` sugar child: allocate the range id and
+* the move-run id, then emit the paired range markers with the moved run between
+* them. The move run (CT_TrackChange) carries the moved content.
+*/
+function stringifyMoveRangeChild(kind, opts, ctx) {
+	const rangeId = ctx.file.markupIds.rangeNext++;
+	const runId = ctx.file.markupIds.moveRunNext++;
+	const isMoveFrom = kind === "moveFrom";
+	const startTag = isMoveFrom ? "w:moveFromRangeStart" : "w:moveToRangeStart";
+	const endTag = isMoveFrom ? "w:moveFromRangeEnd" : "w:moveToRangeEnd";
+	const runTag = isMoveFrom ? "w:moveFrom" : "w:moveTo";
+	const rangeStartAttrs = buildMoveRangeStartAttrs({
+		id: rangeId,
+		name: opts.name,
+		author: opts.author,
+		date: opts.date,
+		displacedByCustomXml: opts.displacedByCustomXml,
+		colFirst: opts.colFirst,
+		colLast: opts.colLast
+	});
+	const endAttrs = buildMarkupRangeAttrs({
+		id: rangeId,
+		displacedByCustomXml: opts.displacedByCustomXml
+	});
+	return `<${startTag} ${rangeStartAttrs}/><${runTag} w:id="${runId}" w:author="${escapeXml(opts.author)}" w:date="${opts.date}">${stringifyInlineWrap(opts.wrap, ctx)}</${runTag}><${endTag} ${endAttrs}/>`;
+}
 function runPropertiesXml(child) {
 	return stringifyRunProperties(child) ?? "";
 }
@@ -7338,19 +7383,13 @@ function stringifyChildDispatch(child, ctx) {
 		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 ("comment" in child) return stringifyCommentChild(child.comment, ctx);
+	if ("commentRangeStart" in child) return `<w:commentRangeStart ${buildMarkupRangeAttrs(child.commentRangeStart)}/>`;
+	if ("commentRangeEnd" in child) return `<w:commentRangeEnd ${buildMarkupRangeAttrs(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) {
-		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 ("bookmarkStart" in child) return `<w:bookmarkStart ${buildBookmarkStartAttrs(child.bookmarkStart)}/>`;
+	if ("bookmarkEnd" in child) return `<w:bookmarkEnd ${buildMarkupRangeAttrs(child.bookmarkEnd)}/>`;
+	if ("bookmark" in child) return stringifyBookmarkChild(child.bookmark, ctx);
 	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>`;
@@ -7377,27 +7416,29 @@ function stringifyChildDispatch(child, ctx) {
 	}
 	if ("image" in child) {
 		const opts = child.image;
-		const key = ctx.file.media.nextMediaName(opts.type);
-		const rawData = toUint8Array(opts.data);
+		const rawData = toUint8Array(opts.data, { encoding: "base64" });
 		let mediaData;
 		if (opts.type === "svg") {
-			const fallbackData = toUint8Array(opts.fallback.data);
-			mediaData = {
+			const fallbackData = toUint8Array(opts.fallback.data, { encoding: "base64" });
+			const fallbackType = opts.fallback.type;
+			const fallback = ctx.file.media.addMedia(fallbackData, fallbackType, (fileName) => ({
+				type: fallbackType,
+				...createImageData(fallbackData, opts.transformation, fileName)
+			}));
+			mediaData = ctx.file.media.addMedia(rawData, "svg", (fileName) => ({
 				type: "svg",
-				...createImageData(rawData, opts.transformation, key, opts.sourceRectangle, opts.nonVisualProperties),
+				...createImageData(rawData, opts.transformation, fileName, opts.sourceRectangle, opts.nonVisualProperties),
 				useLocalDpi: opts.useLocalDpi,
-				fallback: {
-					type: opts.fallback.type,
-					...createImageData(fallbackData, opts.transformation, ctx.file.media.nextMediaName(opts.fallback.type))
-				}
-			};
-		} else mediaData = {
-			type: opts.type,
-			...createImageData(rawData, opts.transformation, key, opts.sourceRectangle, opts.nonVisualProperties),
-			useLocalDpi: opts.useLocalDpi
-		};
-		ctx.file.media.addImage(mediaData.fileName, mediaData);
-		if (mediaData.type === "svg") ctx.file.media.addImage(mediaData.fallback.fileName, mediaData.fallback);
+				fallback
+			}));
+		} else {
+			const type = opts.type;
+			mediaData = ctx.file.media.addMedia(rawData, type, (fileName) => ({
+				type,
+				...createImageData(rawData, opts.transformation, fileName, opts.sourceRectangle, opts.nonVisualProperties),
+				useLocalDpi: opts.useLocalDpi
+			}));
+		}
 		return wrapDrawingRun(drawingDesc.stringify({
 			mediaData,
 			docProperties: opts.altText,
@@ -7499,7 +7540,7 @@ function stringifyChildDispatch(child, ctx) {
 					registerMedia(c.children);
 					continue;
 				}
-				ctx.file.media.addImage(c.fileName, c);
+				ctx.file.media.addMedia(c.data, c.type, () => c, c.fileName);
 			}
 		};
 		registerMedia(opts.children);
@@ -7545,6 +7586,7 @@ function stringifyChildDispatch(child, ctx) {
 	if ("hyperlink" in child) {
 		const hl = child.hyperlink;
 		const childParts = [];
+		if (child.text !== void 0) childParts.push(stringifyRunInline({ text: child.text }, 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("");
@@ -7583,24 +7625,12 @@ function stringifyChildDispatch(child, ctx) {
 		return `<w:permStart ${a.join(" ")}/>`;
 	}
 	if ("permEnd" in child) return `<w:permEnd w:id="${child.permEnd}"/>`;
-	if ("moveFromRangeStart" in child) {
-		const m = child.moveFromRangeStart;
-		const a = [`w:id="${m.id}"`];
-		if (m.name) a.push(`w:name="${escapeXml(m.name)}"`);
-		if (m.author) a.push(`w:author="${escapeXml(m.author)}"`);
-		if (m.date) a.push(`w:date="${m.date}"`);
-		return `<w:moveFromRangeStart ${a.join(" ")}/>`;
-	}
-	if ("moveFromRangeEnd" in child) return `<w:moveFromRangeEnd w:id="${child.moveFromRangeEnd}"/>`;
-	if ("moveToRangeStart" in child) {
-		const m = child.moveToRangeStart;
-		const a = [`w:id="${m.id}"`];
-		if (m.name) a.push(`w:name="${escapeXml(m.name)}"`);
-		if (m.author) a.push(`w:author="${escapeXml(m.author)}"`);
-		if (m.date) a.push(`w:date="${m.date}"`);
-		return `<w:moveToRangeStart ${a.join(" ")}/>`;
-	}
-	if ("moveToRangeEnd" in child) return `<w:moveToRangeEnd w:id="${child.moveToRangeEnd}"/>`;
+	if ("moveFromRangeStart" in child) return `<w:moveFromRangeStart ${buildMoveRangeStartAttrs(child.moveFromRangeStart)}/>`;
+	if ("moveFromRangeEnd" in child) return `<w:moveFromRangeEnd ${buildMarkupRangeAttrs(child.moveFromRangeEnd)}/>`;
+	if ("moveToRangeStart" in child) return `<w:moveToRangeStart ${buildMoveRangeStartAttrs(child.moveToRangeStart)}/>`;
+	if ("moveToRangeEnd" in child) return `<w:moveToRangeEnd ${buildMarkupRangeAttrs(child.moveToRangeEnd)}/>`;
+	if ("moveFrom" in child) return stringifyMoveRangeChild("moveFrom", child.moveFrom, ctx);
+	if ("moveTo" in child) return stringifyMoveRangeChild("moveTo", child.moveTo, ctx);
 	if ("movedFrom" in child) {
 		const { id, author, date, children } = child.movedFrom;
 		const body = children.map((c) => stringifyRunInline(typeof c === "string" ? { text: c } : c, ctx)).join("");
@@ -9822,10 +9852,6 @@ const HeaderFooterType = {
 const createHeaderFooterReference = (type, options) => `<${type} r:id="rId${options.id}" w:type="${options.type || HeaderFooterReferenceType.DEFAULT}"/>`;
 //#endregion
 //#region src/parts/styles/factory.ts
-/** Escape special XML characters. */
-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,
@@ -9833,11 +9859,11 @@ function esc(s) {
 * 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)}"/>`);
+	const parts = [`<w:name w:val="${escapeXml(opts.name ?? opts.id ?? "")}"/>`];
+	if (opts.aliases) parts.push(`<w:aliases w:val="${escapeXml(opts.aliases)}"/>`);
+	if (opts.basedOn) parts.push(`<w:basedOn w:val="${escapeXml(opts.basedOn)}"/>`);
+	if (opts.next) parts.push(`<w:next w:val="${escapeXml(opts.next)}"/>`);
+	if (opts.link) parts.push(`<w:link w:val="${escapeXml(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}"/>`);
@@ -9851,6 +9877,17 @@ function stringifyStyleLevelChildren(opts) {
 	if (opts.rsid) parts.push(`<w:rsid w:val="${opts.rsid}"/>`);
 	return parts.join("");
 }
+/**
+* Build the `<w:style>` opening tag: type/styleId plus the optional w:default
+* and w:customStyle element attributes (CT_Style). Shared by paragraph/
+* character/table styles.
+*/
+function styleOpenTag(type, opts) {
+	let attrs = ` w:type="${type}" w:styleId="${escapeXml(opts.id ?? "")}"`;
+	if (opts.default) attrs += " w:default=\"1\"";
+	if (opts.customStyle) attrs += " w:customStyle=\"1\"";
+	return `<w:style${attrs}>`;
+}
 /** Build `<w:style>` XML for a paragraph style. */
 function stringifyParagraphStyle(opts) {
 	const children = [stringifyStyleLevelChildren(opts)];
@@ -9858,14 +9895,14 @@ function stringifyParagraphStyle(opts) {
 	if (pPr) children.push(pPr);
 	const rPr = stringifyRunProperties(opts.run);
 	if (rPr) children.push(rPr);
-	return `<w:style w:type="paragraph" w:styleId="${esc(opts.id)}">${children.join("")}</w:style>`;
+	return `${styleOpenTag("paragraph", opts)}${children.join("")}</w:style>`;
 }
 /** Build `<w:style>` XML for a character style. */
 function stringifyCharacterStyle(opts) {
 	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>`;
+	return `${styleOpenTag("character", opts)}${children.join("")}</w:style>`;
 }
 /** Build `<w:tblStylePr>` XML for a conditional table style format. */
 function stringifyConditionalTableStyle(opts) {
@@ -9908,7 +9945,16 @@ function stringifyTableStyle(opts) {
 		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>`;
+	return `${styleOpenTag("table", opts)}${children.join("")}</w:style>`;
+}
+/** Build `<w:style type="numbering">` XML for a numbering style. */
+function stringifyNumberingStyle(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);
+	return `${styleOpenTag("numbering", opts)}${children.join("")}</w:style>`;
 }
 /** Resolve a user override for heading level N (1-9) from default styles options. */
 function headingOverride(options, level) {
@@ -9925,45 +9971,6 @@ function headingOverride(options, level) {
 		default: return;
 	}
 }
-/**
-* Maps DefaultStylesOptions override fields to every built-in styleId the
-* factory (re)emits when that field is provided — the main style plus its
-* linked character style (e.g. heading1 -> Heading1 + Heading1Char).
-*/
-const DEFAULT_STYLE_FIELDS = [
-	["title", ["Title", "TitleChar"]],
-	["subtitle", ["Subtitle", "SubtitleChar"]],
-	["heading1", ["Heading1", "Heading1Char"]],
-	["heading2", ["Heading2", "Heading2Char"]],
-	["heading3", ["Heading3", "Heading3Char"]],
-	["heading4", ["Heading4", "Heading4Char"]],
-	["heading5", ["Heading5", "Heading5Char"]],
-	["heading6", ["Heading6", "Heading6Char"]],
-	["heading7", ["Heading7", "Heading7Char"]],
-	["heading8", ["Heading8", "Heading8Char"]],
-	["heading9", ["Heading9", "Heading9Char"]],
-	["listParagraph", ["ListParagraph"]],
-	["quote", ["Quote", "QuoteChar"]],
-	["strong", ["Strong"]],
-	["emphasis", ["Emphasis"]]
-];
-/**
-* Reverse map: main built-in styleId -> the DefaultStylesOptions field that
-* overrides it. Linked char ids (Heading1Char, TitleChar, ...) are excluded —
-* they ride along with their main style.
-*/
-const STYLE_ID_TO_DEFAULT_FIELD = Object.fromEntries(DEFAULT_STYLE_FIELDS.map(([field, [mainId]]) => [mainId, field]));
-/**
-* Collect every styleId the factory (re)emits for the default-styles fields the
-* user explicitly provided — including linked character styles, so the
-* round-trip path drops the matching verbatim entries (no duplicate styleId).
-*/
-function collectDefaultOverrideIds(defaultOpts) {
-	const ids = /* @__PURE__ */ new Set();
-	if (!defaultOpts) return ids;
-	for (const [field, styleIds] of DEFAULT_STYLE_FIELDS) if (defaultOpts[field] !== void 0) for (const id of styleIds) ids.add(id);
-	return ids;
-}
 /** Build `<w:docDefaults>` XML matching Word's default settings. */
 function stringifyDocDefaults(opts) {
 	const children = [];
@@ -9992,6 +9999,10 @@ var DefaultStylesFactory = class {
 	}
 	build(options) {
 		const importedStyles = [];
+		const paragraphStyles = [];
+		const characterStyles = [];
+		const tableStyles = [];
+		const numberingStyles = [];
 		const initialAttributes = {
 			"xmlns:mc": "http://schemas.openxmlformats.org/markup-compatibility/2006",
 			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
@@ -10002,70 +10013,76 @@ var DefaultStylesFactory = class {
 		};
 		importedStyles.push({ _raw: stringifyDocDefaults(options.document ?? {}) });
 		importedStyles.push({ _raw: "<w:latentStyles w:defLockedState=\"0\" w:defUIPriority=\"99\" w:defSemiHidden=\"0\" w:defUnhideWhenUsed=\"0\" w:defQFormat=\"0\" w:count=\"376\"><w:lsdException w:name=\"Normal\" w:uiPriority=\"0\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 1\" w:uiPriority=\"9\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 2\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 3\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 4\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 5\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 6\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 7\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 8\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"heading 9\" w:semiHidden=\"1\" w:uiPriority=\"9\" w:unhideWhenUsed=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"Default Paragraph Font\" w:semiHidden=\"1\" w:uiPriority=\"1\" w:unhideWhenUsed=\"1\"/><w:lsdException w:name=\"Normal Table\" w:semiHidden=\"1\" w:uiPriority=\"99\" w:unhideWhenUsed=\"1\"/><w:lsdException w:name=\"No List\" w:semiHidden=\"1\" w:uiPriority=\"99\" w:unhideWhenUsed=\"1\"/><w:lsdException w:name=\"Subtitle\" w:uiPriority=\"11\" w:qFormat=\"1\"/><w:lsdException w:name=\"Strong\" w:uiPriority=\"22\" w:qFormat=\"1\"/><w:lsdException w:name=\"Emphasis\" w:uiPriority=\"20\" w:qFormat=\"1\"/><w:lsdException w:name=\"Hyperlink\" w:semiHidden=\"1\" w:unhideWhenUsed=\"1\"/><w:lsdException w:name=\"FollowedHyperlink\" w:semiHidden=\"1\" w:unhideWhenUsed=\"1\"/><w:lsdException w:name=\"No Spacing\" w:uiPriority=\"1\" w:qFormat=\"1\"/><w:lsdException w:name=\"Revision\" w:semiHidden=\"1\"/></w:latentStyles>" });
-		importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:default=\"1\" w:styleId=\"Normal\"><w:name w:val=\"Normal\"/><w:qFormat/><w:pPr><w:widowControl w:val=\"0\"/></w:pPr></w:style>" });
+		paragraphStyles.push({
+			id: "Normal",
+			name: "Normal",
+			default: true,
+			quickFormat: true,
+			paragraph: { widowControl: false }
+		});
 		const headings = [
 			{
 				id: "Heading1",
 				name: "heading 1",
 				link: "Heading1Char",
-				sz: "48",
-				before: "480",
-				after: "80",
-				outlineLvl: "0"
+				sz: 48,
+				before: 480,
+				after: 80,
+				outlineLvl: 0
 			},
 			{
 				id: "Heading2",
 				name: "heading 2",
 				link: "Heading2Char",
-				sz: "40",
-				before: "160",
-				after: "80",
-				outlineLvl: "1"
+				sz: 40,
+				before: 160,
+				after: 80,
+				outlineLvl: 1
 			},
 			{
 				id: "Heading3",
 				name: "heading 3",
 				link: "Heading3Char",
-				sz: "32",
-				before: "160",
-				after: "80",
-				outlineLvl: "2"
+				sz: 32,
+				before: 160,
+				after: 80,
+				outlineLvl: 2
 			},
 			{
 				id: "Heading4",
 				name: "heading 4",
 				link: "Heading4Char",
-				sz: "28",
-				before: "80",
-				after: "40",
-				outlineLvl: "3"
+				sz: 28,
+				before: 80,
+				after: 40,
+				outlineLvl: 3
 			},
 			{
 				id: "Heading5",
 				name: "heading 5",
 				link: "Heading5Char",
-				sz: "24",
-				before: "80",
-				after: "40",
-				outlineLvl: "4"
+				sz: 24,
+				before: 80,
+				after: 40,
+				outlineLvl: 4
 			},
 			{
 				id: "Heading6",
 				name: "heading 6",
 				link: "Heading6Char",
 				sz: void 0,
-				before: "40",
-				after: "0",
-				outlineLvl: "5"
+				before: 40,
+				after: 0,
+				outlineLvl: 5
 			},
 			{
 				id: "Heading7",
 				name: "heading 7",
 				link: "Heading7Char",
 				sz: void 0,
-				before: "40",
-				after: "0",
-				outlineLvl: "6"
+				before: 40,
+				after: 0,
+				outlineLvl: 6
 			},
 			{
 				id: "Heading8",
@@ -10073,8 +10090,8 @@ var DefaultStylesFactory = class {
 				link: "Heading8Char",
 				sz: void 0,
 				before: void 0,
-				after: "0",
-				outlineLvl: "7"
+				after: 0,
+				outlineLvl: 7
 			},
 			{
 				id: "Heading9",
@@ -10082,15 +10099,16 @@ var DefaultStylesFactory = class {
 				link: "Heading9Char",
 				sz: void 0,
 				before: void 0,
-				after: "0",
-				outlineLvl: "8"
+				after: 0,
+				outlineLvl: 8
 			}
 		];
 		for (let headingIdx = 0; headingIdx < headings.length; headingIdx++) {
 			const h = headings[headingIdx];
+			const outlineLvl = h.outlineLvl;
 			const headingOverrideOpts = headingOverride(options, headingIdx + 1);
 			if (headingOverrideOpts) {
-				importedStyles.push({ _raw: stringifyParagraphStyle({
+				paragraphStyles.push({
 					id: h.id,
 					name: headingOverrideOpts.name ?? h.name,
 					basedOn: headingOverrideOpts.basedOn ?? "Normal",
@@ -10105,42 +10123,124 @@ var DefaultStylesFactory = class {
 						...headingOverrideOpts.paragraph
 					},
 					run: headingOverrideOpts.run
-				}) });
-				importedStyles.push({ _raw: stringifyCharacterStyle({
+				});
+				characterStyles.push({
 					id: h.link,
 					name: `${h.name} Char`,
 					basedOn: "DefaultParagraphFont",
 					link: h.id,
 					run: headingOverrideOpts.run
-				}) });
+				});
 				continue;
 			}
-			const pPrParts = [`<w:keepNext/>`, `<w:keepLines/>`];
-			if (h.before || h.after) {
-				const sp = [];
-				if (h.before) sp.push(`w:before="${h.before}"`);
-				if (h.after) sp.push(`w:after="${h.after}"`);
-				pPrParts.push(`<w:spacing ${sp.join(" ")}/>`);
+			const accentRange = outlineLvl < 6;
+			const runProps = {
+				font: accentRange ? {
+					asciiTheme: "majorHAnsi",
+					eastAsiaTheme: "majorEastAsia",
+					hAnsiTheme: "majorHAnsi",
+					cstheme: "majorBidi"
+				} : { cstheme: "majorBidi" },
+				color: accentRange ? {
+					val: "0F4761",
+					themeColor: "accent1",
+					themeShade: "BF"
+				} : {
+					val: "595959",
+					themeColor: "text1",
+					themeTint: "A6"
+				}
+			};
+			if (h.sz) {
+				const sizePt = h.sz / 2;
+				runProps.size = sizePt;
+				runProps.sizeComplexScript = sizePt;
 			}
-			pPrParts.push(`<w:outlineLvl w:val="${h.outlineLvl}"/>`);
-			const rPrParts = [];
-			if (parseInt(h.outlineLvl) < 6) {
-				rPrParts.push(`<w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>`);
-				rPrParts.push(`<w:color w:val="0F4761" w:themeColor="accent1" w:themeShade="BF"/>`);
-			} else {
-				rPrParts.push(`<w:rFonts w:cstheme="majorBidi"/>`);
-				rPrParts.push(`<w:color w:val="595959" w:themeColor="text1" w:themeTint="A6"/>`);
+			if (outlineLvl >= 5) {
+				runProps.bold = true;
+				runProps.boldComplexScript = true;
 			}
-			if (h.sz) rPrParts.push(`<w:sz w:val="${h.sz}"/><w:szCs w:val="${h.sz}"/>`);
-			if (parseInt(h.outlineLvl) >= 5) rPrParts.push(`<w:b/><w:bCs/>`);
-			importedStyles.push({ _raw: `<w:style w:type="paragraph" w:styleId="${h.id}"><w:name w:val="${h.name}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:link w:val="${h.link}"/><w:uiPriority w:val="9"/>` + (parseInt(h.outlineLvl) > 0 ? `<w:semiHidden/><w:unhideWhenUsed/>` : "") + `<w:qFormat/><w:pPr>${pPrParts.join("")}</w:pPr><w:rPr>${rPrParts.join("")}</w:rPr></w:style>` });
-			importedStyles.push({ _raw: `<w:style w:type="character" w:styleId="${h.link}"><w:name w:val="${h.name} Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="${h.id}"/><w:uiPriority w:val="9"/>` + (parseInt(h.outlineLvl) > 0 ? `<w:semiHidden/>` : "") + `<w:rPr>${rPrParts.join("")}</w:rPr></w:style>` });
-		}
-		importedStyles.push({ _raw: "<w:style w:type=\"character\" w:default=\"1\" w:styleId=\"DefaultParagraphFont\"><w:name w:val=\"Default Paragraph Font\"/><w:uiPriority w:val=\"1\"/><w:semiHidden/><w:unhideWhenUsed/></w:style>" });
-		importedStyles.push({ _raw: "<w:style w:type=\"table\" w:default=\"1\" w:styleId=\"NormalTable\"><w:name w:val=\"Normal Table\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/><w:tblPr><w:tblInd w:w=\"0\" w:type=\"dxa\"/><w:tblCellMar><w:top w:w=\"0\" w:type=\"dxa\"/><w:left w:w=\"108\" w:type=\"dxa\"/><w:bottom w:w=\"0\" w:type=\"dxa\"/><w:right w:w=\"108\" w:type=\"dxa\"/></w:tblCellMar></w:tblPr></w:style>" });
-		importedStyles.push({ _raw: "<w:style w:type=\"numbering\" w:default=\"1\" w:styleId=\"NoList\"><w:name w:val=\"No List\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/></w:style>" });
+			paragraphStyles.push({
+				id: h.id,
+				name: h.name,
+				basedOn: "Normal",
+				next: "Normal",
+				link: h.link,
+				uiPriority: 9,
+				semiHidden: outlineLvl > 0,
+				unhideWhenUsed: outlineLvl > 0,
+				quickFormat: true,
+				paragraph: {
+					keepNext: true,
+					keepLines: true,
+					spacing: {
+						before: h.before,
+						after: h.after
+					},
+					outlineLevel: outlineLvl
+				},
+				run: runProps
+			});
+			characterStyles.push({
+				id: h.link,
+				name: `${h.name} Char`,
+				basedOn: "DefaultParagraphFont",
+				link: h.id,
+				uiPriority: 9,
+				semiHidden: outlineLvl > 0,
+				run: runProps
+			});
+		}
+		characterStyles.push({
+			id: "DefaultParagraphFont",
+			name: "Default Paragraph Font",
+			default: true,
+			uiPriority: 1,
+			semiHidden: true,
+			unhideWhenUsed: true
+		});
+		tableStyles.push({
+			id: "NormalTable",
+			name: "Normal Table",
+			default: true,
+			uiPriority: 99,
+			semiHidden: true,
+			unhideWhenUsed: true,
+			table: {
+				indent: {
+					size: 0,
+					type: WidthType.DXA
+				},
+				cellMargin: {
+					top: {
+						size: 0,
+						type: WidthType.DXA
+					},
+					left: {
+						size: 108,
+						type: WidthType.DXA
+					},
+					bottom: {
+						size: 0,
+						type: WidthType.DXA
+					},
+					right: {
+						size: 108,
+						type: WidthType.DXA
+					}
+				}
+			}
+		});
+		numberingStyles.push({
+			id: "NoList",
+			name: "No List",
+			default: true,
+			uiPriority: 99,
+			semiHidden: true,
+			unhideWhenUsed: true
+		});
 		if (options.title) {
-			importedStyles.push({ _raw: stringifyParagraphStyle({
+			paragraphStyles.push({
 				id: "Title",
 				name: options.title.name ?? "Title",
 				basedOn: options.title.basedOn ?? "Normal",
@@ -10150,20 +10250,57 @@ var DefaultStylesFactory = class {
 				quickFormat: options.title.quickFormat ?? true,
 				paragraph: options.title.paragraph,
 				run: options.title.run
-			}) });
-			importedStyles.push({ _raw: stringifyCharacterStyle({
+			});
+			characterStyles.push({
 				id: "TitleChar",
 				name: "Title Char",
 				basedOn: "DefaultParagraphFont",
 				link: "Title",
 				run: options.title.run
-			}) });
+			});
 		} else {
-			importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:styleId=\"Title\"><w:name w:val=\"Title\"/><w:basedOn w:val=\"Normal\"/><w:next w:val=\"Normal\"/><w:link w:val=\"TitleChar\"/><w:uiPriority w:val=\"10\"/><w:qFormat/><w:pPr><w:spacing w:after=\"80\" w:line=\"240\" w:lineRule=\"auto\"/><w:contextualSpacing/><w:jc w:val=\"center\"/></w:pPr><w:rPr><w:rFonts w:asciiTheme=\"majorHAnsi\" w:eastAsiaTheme=\"majorEastAsia\" w:hAnsiTheme=\"majorHAnsi\" w:cstheme=\"majorBidi\"/><w:spacing w:val=\"-10\"/><w:kern w:val=\"28\"/><w:sz w:val=\"56\"/><w:szCs w:val=\"56\"/></w:rPr></w:style>" });
-			importedStyles.push({ _raw: "<w:style w:type=\"character\" w:styleId=\"TitleChar\"><w:name w:val=\"Title Char\"/><w:basedOn w:val=\"DefaultParagraphFont\"/><w:link w:val=\"Title\"/><w:uiPriority w:val=\"10\"/><w:rPr><w:rFonts w:asciiTheme=\"majorHAnsi\" w:eastAsiaTheme=\"majorEastAsia\" w:hAnsiTheme=\"majorHAnsi\" w:cstheme=\"majorBidi\"/><w:spacing w:val=\"-10\"/><w:kern w:val=\"28\"/><w:sz w:val=\"56\"/><w:szCs w:val=\"56\"/></w:rPr></w:style>" });
+			const titleRun = {
+				font: {
+					asciiTheme: "majorHAnsi",
+					eastAsiaTheme: "majorEastAsia",
+					hAnsiTheme: "majorHAnsi",
+					cstheme: "majorBidi"
+				},
+				characterSpacing: -10,
+				kern: 28,
+				size: 28,
+				sizeComplexScript: 28
+			};
+			paragraphStyles.push({
+				id: "Title",
+				name: "Title",
+				basedOn: "Normal",
+				next: "Normal",
+				link: "TitleChar",
+				uiPriority: 10,
+				quickFormat: true,
+				paragraph: {
+					spacing: {
+						after: 80,
+						line: 240,
+						lineRule: "auto"
+					},
+					contextualSpacing: true,
+					alignment: AlignmentType.CENTER
+				},
+				run: titleRun
+			});
+			characterStyles.push({
+				id: "TitleChar",
+				name: "Title Char",
+				basedOn: "DefaultParagraphFont",
+				link: "Title",
+				uiPriority: 10,
+				run: titleRun
+			});
 		}
 		if (options.subtitle) {
-			importedStyles.push({ _raw: stringifyParagraphStyle({
+			paragraphStyles.push({
 				id: "Subtitle",
 				name: options.subtitle.name ?? "Subtitle",
 				basedOn: options.subtitle.basedOn ?? "Normal",
@@ -10173,19 +10310,52 @@ var DefaultStylesFactory = class {
 				quickFormat: options.subtitle.quickFormat ?? true,
 				paragraph: options.subtitle.paragraph,
 				run: options.subtitle.run
-			}) });
-			importedStyles.push({ _raw: stringifyCharacterStyle({
+			});
+			characterStyles.push({
 				id: "SubtitleChar",
 				name: "Subtitle Char",
 				basedOn: "DefaultParagraphFont",
 				link: "Subtitle",
 				run: options.subtitle.run
-			}) });
+			});
 		} else {
-			importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:styleId=\"Subtitle\"><w:name w:val=\"Subtitle\"/><w:basedOn w:val=\"Normal\"/><w:next w:val=\"Normal\"/><w:link w:val=\"SubtitleChar\"/><w:uiPriority w:val=\"11\"/><w:qFormat/><w:pPr><w:jc w:val=\"center\"/></w:pPr><w:rPr><w:rFonts w:asciiTheme=\"majorHAnsi\" w:eastAsiaTheme=\"majorEastAsia\" w:hAnsiTheme=\"majorHAnsi\" w:cstheme=\"majorBidi\"/><w:color w:val=\"595959\" w:themeColor=\"text1\" w:themeTint=\"A6\"/><w:spacing w:val=\"15\"/><w:sz w:val=\"28\"/><w:szCs w:val=\"28\"/></w:rPr></w:style>" });
-			importedStyles.push({ _raw: "<w:style w:type=\"character\" w:styleId=\"SubtitleChar\"><w:name w:val=\"Subtitle Char\"/><w:basedOn w:val=\"DefaultParagraphFont\"/><w:link w:val=\"Subtitle\"/><w:uiPriority w:val=\"11\"/><w:rPr><w:rFonts w:asciiTheme=\"majorHAnsi\" w:eastAsiaTheme=\"majorEastAsia\" w:hAnsiTheme=\"majorHAnsi\" w:cstheme=\"majorBidi\"/><w:color w:val=\"595959\" w:themeColor=\"text1\" w:themeTint=\"A6\"/><w:spacing w:val=\"15\"/><w:sz w:val=\"28\"/><w:szCs w:val=\"28\"/></w:rPr></w:style>" });
+			const subtitleRun = {
+				font: {
+					asciiTheme: "majorHAnsi",
+					eastAsiaTheme: "majorEastAsia",
+					hAnsiTheme: "majorHAnsi",
+					cstheme: "majorBidi"
+				},
+				color: {
+					val: "595959",
+					themeColor: "text1",
+					themeTint: "A6"
+				},
+				characterSpacing: 15,
+				size: 14,
+				sizeComplexScript: 14
+			};
+			paragraphStyles.push({
+				id: "Subtitle",
+				name: "Subtitle",
+				basedOn: "Normal",
+				next: "Normal",
+				link: "SubtitleChar",
+				uiPriority: 11,
+				quickFormat: true,
+				paragraph: { alignment: AlignmentType.CENTER },
+				run: subtitleRun
+			});
+			characterStyles.push({
+				id: "SubtitleChar",
+				name: "Subtitle Char",
+				basedOn: "DefaultParagraphFont",
+				link: "Subtitle",
+				uiPriority: 11,
+				run: subtitleRun
+			});
 		}
-		if (options.listParagraph) importedStyles.push({ _raw: stringifyParagraphStyle({
+		if (options.listParagraph) paragraphStyles.push({
 			id: "ListParagraph",
 			name: options.listParagraph.name ?? "List Paragraph",
 			basedOn: options.listParagraph.basedOn ?? "Normal",
@@ -10193,9 +10363,19 @@ var DefaultStylesFactory = class {
 			quickFormat: options.listParagraph.quickFormat ?? true,
 			paragraph: options.listParagraph.paragraph,
 			run: options.listParagraph.run
-		}) });
-		else importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:styleId=\"ListParagraph\"><w:name w:val=\"List Paragraph\"/><w:basedOn w:val=\"Normal\"/><w:uiPriority w:val=\"34\"/><w:qFormat/><w:pPr><w:ind w:left=\"720\"/><w:contextualSpacing/></w:pPr></w:style>" });
-		if (options.strong) importedStyles.push({ _raw: stringifyParagraphStyle({
+		});
+		else paragraphStyles.push({
+			id: "ListParagraph",
+			name: "List Paragraph",
+			basedOn: "Normal",
+			uiPriority: 34,
+			quickFormat: true,
+			paragraph: {
+				indent: { left: 720 },
+				contextualSpacing: true
+			}
+		});
+		if (options.strong) paragraphStyles.push({
 			id: "Strong",
 			name: options.strong.name ?? "Strong",
 			basedOn: options.strong.basedOn ?? "Normal",
@@ -10203,8 +10383,8 @@ var DefaultStylesFactory = class {
 			quickFormat: options.strong.quickFormat ?? true,
 			paragraph: options.strong.paragraph,
 			run: options.strong.run
-		}) });
-		if (options.emphasis) importedStyles.push({ _raw: stringifyParagraphStyle({
+		});
+		if (options.emphasis) paragraphStyles.push({
 			id: "Emphasis",
 			name: options.emphasis.name ?? "Emphasis",
 			basedOn: options.emphasis.basedOn ?? "Normal",
@@ -10212,9 +10392,18 @@ var DefaultStylesFactory = class {
 			quickFormat: options.emphasis.quickFormat ?? true,
 			paragraph: options.emphasis.paragraph,
 			run: options.emphasis.run
-		}) });
+		});
+		const quoteRun = {
+			italic: true,
+			italicComplexScript: true,
+			color: {
+				val: "404040",
+				themeColor: "text1",
+				themeTint: "BF"
+			}
+		};
 		if (options.quote) {
-			importedStyles.push({ _raw: stringifyParagraphStyle({
+			paragraphStyles.push({
 				id: "Quote",
 				name: options.quote.name ?? "Quote",
 				basedOn: options.quote.basedOn ?? "Normal",
@@ -10224,21 +10413,89 @@ var DefaultStylesFactory = class {
 				quickFormat: options.quote.quickFormat ?? true,
 				paragraph: options.quote.paragraph,
 				run: options.quote.run
-			}) });
-			importedStyles.push({ _raw: stringifyCharacterStyle({
+			});
+			characterStyles.push({
 				id: "QuoteChar",
 				name: "Quote Char",
 				basedOn: "DefaultParagraphFont",
 				link: "Quote",
 				run: options.quote.run
-			}) });
+			});
 		} else {
-			importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:styleId=\"Quote\"><w:name w:val=\"Quote\"/><w:basedOn w:val=\"Normal\"/><w:next w:val=\"Normal\"/><w:link w:val=\"QuoteChar\"/><w:uiPriority w:val=\"29\"/><w:qFormat/><w:pPr><w:spacing w:before=\"160\"/><w:jc w:val=\"center\"/></w:pPr><w:rPr><w:i/><w:iCs/><w:color w:val=\"404040\" w:themeColor=\"text1\" w:themeTint=\"BF\"/></w:rPr></w:style>" });
-			importedStyles.push({ _raw: "<w:style w:type=\"character\" w:styleId=\"QuoteChar\"><w:name w:val=\"Quote Char\"/><w:basedOn w:val=\"DefaultParagraphFont\"/><w:link w:val=\"Quote\"/><w:uiPriority w:val=\"29\"/><w:rPr><w:i/><w:iCs/><w:color w:val=\"404040\" w:themeColor=\"text1\" w:themeTint=\"BF\"/></w:rPr></w:style>" });
+			paragraphStyles.push({
+				id: "Quote",
+				name: "Quote",
+				basedOn: "Normal",
+				next: "Normal",
+				link: "QuoteChar",
+				uiPriority: 29,
+				quickFormat: true,
+				paragraph: {
+					spacing: { before: 160 },
+					alignment: AlignmentType.CENTER
+				},
+				run: quoteRun
+			});
+			characterStyles.push({
+				id: "QuoteChar",
+				name: "Quote Char",
+				basedOn: "DefaultParagraphFont",
+				link: "Quote",
+				uiPriority: 29,
+				run: quoteRun
+			});
 		}
-		importedStyles.push({ _raw: "<w:style w:type=\"paragraph\" w:styleId=\"IntenseQuote\"><w:name w:val=\"Intense Quote\"/><w:basedOn w:val=\"Normal\"/><w:next w:val=\"Normal\"/><w:link w:val=\"IntenseQuoteChar\"/><w:uiPriority w:val=\"30\"/><w:qFormat/><w:pPr><w:pBdr><w:top w:val=\"single\" w:sz=\"4\" w:space=\"10\" w:color=\"0F4761\" w:themeColor=\"accent1\" w:themeShade=\"BF\"/><w:bottom w:val=\"single\" w:sz=\"4\" w:space=\"10\" w:color=\"0F4761\" w:themeColor=\"accent1\" w:themeShade=\"BF\"/></w:pBdr><w:spacing w:before=\"360\" w:after=\"360\"/><w:ind w:left=\"864\" w:right=\"864\"/><w:jc w:val=\"center\"/></w:pPr><w:rPr><w:i/><w:iCs/><w:color w:val=\"0F4761\" w:themeColor=\"accent1\" w:themeShade=\"BF\"/></w:rPr></w:style>" });
-		importedStyles.push({ _raw: "<w:style w:type=\"character\" w:styleId=\"IntenseQuoteChar\"><w:name w:val=\"Intense Quote Char\"/><w:basedOn w:val=\"DefaultParagraphFont\"/><w:link w:val=\"IntenseQuote\"/><w:uiPriority w:val=\"30\"/><w:rPr><w:i/><w:iCs/><w:color w:val=\"0F4761\" w:themeColor=\"accent1\" w:themeShade=\"BF\"/></w:rPr></w:style>" });
-		importedStyles.push({ _raw: stringifyCharacterStyle({
+		const intenseQuoteRun = {
+			italic: true,
+			italicComplexScript: true,
+			color: {
+				val: "0F4761",
+				themeColor: "accent1",
+				themeShade: "BF"
+			}
+		};
+		const intenseQuoteBorder = {
+			style: BorderStyle.SINGLE,
+			size: 4,
+			space: 10,
+			color: "0F4761",
+			themeColor: "accent1",
+			themeShade: "BF"
+		};
+		paragraphStyles.push({
+			id: "IntenseQuote",
+			name: "Intense Quote",
+			basedOn: "Normal",
+			next: "Normal",
+			link: "IntenseQuoteChar",
+			uiPriority: 30,
+			quickFormat: true,
+			paragraph: {
+				border: {
+					top: intenseQuoteBorder,
+					bottom: intenseQuoteBorder
+				},
+				spacing: {
+					before: 360,
+					after: 360
+				},
+				indent: {
+					left: 864,
+					right: 864
+				},
+				alignment: AlignmentType.CENTER
+			},
+			run: intenseQuoteRun
+		});
+		characterStyles.push({
+			id: "IntenseQuoteChar",
+			name: "Intense Quote Char",
+			basedOn: "DefaultParagraphFont",
+			link: "IntenseQuote",
+			uiPriority: 30,
+			run: intenseQuoteRun
+		});
+		characterStyles.push({
 			id: "Hyperlink",
 			name: "Hyperlink",
 			basedOn: "DefaultParagraphFont",
@@ -10249,8 +10506,8 @@ var DefaultStylesFactory = class {
 				underline: { type: "single" }
 			},
 			...options.hyperlink
-		}) });
-		importedStyles.push({ _raw: stringifyCharacterStyle({
+		});
+		characterStyles.push({
 			id: "FootnoteReference",
 			name: "footnote reference",
 			basedOn: "DefaultParagraphFont",
@@ -10258,8 +10515,8 @@ var DefaultStylesFactory = class {
 			unhideWhenUsed: true,
 			run: { superScript: true },
 			...options.footnoteReference
-		}) });
-		importedStyles.push({ _raw: stringifyParagraphStyle({
+		});
+		paragraphStyles.push({
 			id: "FootnoteText",
 			name: "footnote text",
 			basedOn: "Normal",
@@ -10274,8 +10531,8 @@ var DefaultStylesFactory = class {
 			} },
 			run: { size: 20 },
 			...options.footnoteText
-		}) });
-		importedStyles.push({ _raw: stringifyCharacterStyle({
+		});
+		characterStyles.push({
 			id: "FootnoteTextChar",
 			name: "Footnote Text Char",
 			basedOn: "DefaultParagraphFont",
@@ -10283,8 +10540,8 @@ var DefaultStylesFactory = class {
 			semiHidden: true,
 			run: { size: 20 },
 			...options.footnoteTextChar
-		}) });
-		importedStyles.push({ _raw: stringifyCharacterStyle({
+		});
+		characterStyles.push({
 			id: "EndnoteReference",
 			name: "endnote reference",
 			basedOn: "DefaultParagraphFont",
@@ -10292,8 +10549,8 @@ var DefaultStylesFactory = class {
 			unhideWhenUsed: true,
 			run: { superScript: true },
 			...options.endnoteReference
-		}) });
-		importedStyles.push({ _raw: stringifyParagraphStyle({
+		});
+		paragraphStyles.push({
 			id: "EndnoteText",
 			name: "endnote text",
 			basedOn: "Normal",
@@ -10308,8 +10565,8 @@ var DefaultStylesFactory = class {
 			} },
 			run: { size: 20 },
 			...options.endnoteText
-		}) });
-		importedStyles.push({ _raw: stringifyCharacterStyle({
+		});
+		characterStyles.push({
 			id: "EndnoteTextChar",
 			name: "Endnote Text Char",
 			basedOn: "DefaultParagraphFont",
@@ -10317,10 +10574,31 @@ var DefaultStylesFactory = class {
 			semiHidden: true,
 			run: { size: 20 },
 			...options.endnoteTextChar
-		}) });
-		importedStyles.push({ _raw: "<w:style w:type=\"character\" w:styleId=\"IntenseReference\"><w:name w:val=\"Intense Reference\"/><w:basedOn w:val=\"DefaultParagraphFont\"/><w:uiPriority w:val=\"32\"/><w:qFormat/><w:rPr><w:b/><w:bCs/><w:smallCaps/><w:color w:val=\"0F4761\" w:themeColor=\"accent1\" w:themeShade=\"BF\"/><w:spacing w:val=\"5\"/></w:rPr></w:style>" });
+		});
+		characterStyles.push({
+			id: "IntenseReference",
+			name: "Intense Reference",
+			basedOn: "DefaultParagraphFont",
+			uiPriority: 32,
+			quickFormat: true,
+			run: {
+				bold: true,
+				boldComplexScript: true,
+				smallCaps: true,
+				color: {
+					val: "0F4761",
+					themeColor: "accent1",
+					themeShade: "BF"
+				},
+				characterSpacing: 5
+			}
+		});
 		return {
 			importedStyles,
+			paragraphStyles,
+			characterStyles,
+			tableStyles,
+			numberingStyles,
 			initialAttributes
 		};
 	}
@@ -10370,42 +10648,10 @@ var Styles = class {
 			}
 			this.parts.push(style._raw);
 		}
-		if (options.paragraphStyles) for (const style of options.paragraphStyles) this.parts.push(stringifyParagraphStyle({
-			id: style.id,
-			name: style.name ?? style.id,
-			aliases: style.aliases,
-			basedOn: style.basedOn,
-			next: style.next,
-			link: style.link,
-			autoRedefine: style.autoRedefine,
-			quickFormat: style.quickFormat,
-			semiHidden: style.semiHidden,
-			uiPriority: style.uiPriority,
-			unhideWhenUsed: style.unhideWhenUsed,
-			locked: style.locked,
-			personal: style.personal,
-			personalCompose: style.personalCompose,
-			personalReply: style.personalReply,
-			paragraph: style.paragraph,
-			run: style.run
-		}));
-		if (options.characterStyles) for (const style of options.characterStyles) this.parts.push(stringifyCharacterStyle({
-			id: style.id,
-			name: style.name ?? style.id,
-			aliases: style.aliases,
-			basedOn: style.basedOn,
-			link: style.link,
-			autoRedefine: style.autoRedefine,
-			semiHidden: style.semiHidden,
-			uiPriority: style.uiPriority,
-			unhideWhenUsed: style.unhideWhenUsed,
-			locked: style.locked,
-			personal: style.personal,
-			personalCompose: style.personalCompose,
-			personalReply: style.personalReply,
-			run: style.run
-		}));
+		if (options.paragraphStyles) for (const style of options.paragraphStyles) this.parts.push(stringifyParagraphStyle(style));
+		if (options.characterStyles) for (const style of options.characterStyles) this.parts.push(stringifyCharacterStyle(style));
 		if (options.tableStyles) for (const style of options.tableStyles) this.parts.push(stringifyTableStyle(style));
+		if (options.numberingStyles) for (const style of options.numberingStyles) this.parts.push(stringifyNumberingStyle(style));
 	}
 	/**
 	* Serialize to word/styles.xml content (with XML declaration).
@@ -10416,25 +10662,6 @@ var Styles = class {
 		return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:styles${attrParts.join("")}>${this.parts.join("")}</w:styles>`;
 	}
 };
-/** Style IDs generated by DefaultStylesFactory — skip these during parsing. */
-const BUILTIN_STYLE_IDS = new Set([
-	"Title",
-	"Heading1",
-	"Heading2",
-	"Heading3",
-	"Heading4",
-	"Heading5",
-	"Heading6",
-	"Strong",
-	"ListParagraph",
-	"Hyperlink",
-	"FootnoteText",
-	"FootnoteTextChar",
-	"EndnoteText",
-	"EndnoteTextChar",
-	"FootnoteReference",
-	"EndnoteReference"
-]);
 /**
 * Build a cache of style elements keyed by styleId.
 */
@@ -10472,6 +10699,7 @@ function parseStyleDefinitions(el, parseParagraphProperties, ctx) {
 	const paragraphStyles = [];
 	const characterStyles = [];
 	const tableStyles = [];
+	const numberingStyles = [];
 	for (const child of el.elements ?? []) if (child.name === "w:docDefaults") {
 		const defOpts = parseDocDefaults(child, parseParagraphProperties, ctx);
 		if (defOpts) opts.default = defOpts;
@@ -10480,28 +10708,18 @@ 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) {
-			const { _type: _omitType, id: _omitId, ...rest } = styleOpts;
-			opts.default ??= {};
-			opts.default[defaultField] = rest;
-			continue;
-		}
-		if (BUILTIN_STYLE_IDS.has(styleOpts.id)) continue;
 		const type = styleOpts._type;
 		delete styleOpts._type;
-		if (type === "paragraph") paragraphStyles.push(styleOpts);
+		if (type === "table") tableStyles.push(styleOpts);
+		else if (type === "numbering") numberingStyles.push(styleOpts);
+		else if (type === "paragraph") paragraphStyles.push(styleOpts);
 		else if (type === "character") characterStyles.push(styleOpts);
 	}
 	if (paragraphStyles.length > 0) opts.paragraphStyles = paragraphStyles;
 	if (characterStyles.length > 0) opts.characterStyles = characterStyles;
 	if (tableStyles.length > 0) opts.tableStyles = tableStyles;
+	if (numberingStyles.length > 0) opts.numberingStyles = numberingStyles;
+	opts.roundTripped = true;
 	return Object.keys(opts).length > 0 ? opts : void 0;
 }
 function parseDocDefaults(el, parseParagraphProperties, ctx) {
@@ -10531,7 +10749,7 @@ function parseStyleElement(el, parseParagraphProperties, ctx) {
 	const id = attr(el, "w:styleId");
 	if (id) opts.id = id;
 	if (attrBool(el, "w:default")) opts.default = true;
-	if (attrBool(el, "w:customStyle")) opts.customStyle = "1";
+	if (attrBool(el, "w:customStyle")) opts.customStyle = true;
 	const nameEl = findChild(el, "w:name");
 	if (nameEl) {
 		const name = attr(nameEl, "w:val");
@@ -10648,9 +10866,6 @@ function parseStyleElement(el, parseParagraphProperties, ctx) {
 *
 * @module
 */
-function escapeAttr$1(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 /** Derive the namespace-prefixed val attribute from the element tag. */
 function valAttr(tag) {
 	return `${tag.split(":")[0]}:val`;
@@ -10662,12 +10877,12 @@ function numVal(tag, val) {
 	return val !== void 0 ? `<${tag} ${valAttr(tag)}="${val}"/>` : "";
 }
 function strVal(tag, val) {
-	return val !== void 0 ? `<${tag} ${valAttr(tag)}="${escapeAttr$1(val)}"/>` : "";
+	return val !== void 0 ? `<${tag} ${valAttr(tag)}="${escapeXml(val)}"/>` : "";
 }
 /** Build attribute string from key-value pairs, skipping undefined. */
 function attrStr(attrs) {
 	const parts = [];
-	for (const [k, v] of Object.entries(attrs)) if (v !== void 0) parts.push(`${k}="${escapeAttr$1(String(v))}"`);
+	for (const [k, v] of Object.entries(attrs)) if (v !== void 0) parts.push(`${k}="${escapeXml(String(v))}"`);
 	return parts.join(" ");
 }
 /** Self-closing element with attributes only. */
@@ -10677,7 +10892,7 @@ function attrEl(tag, attrs) {
 }
 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}"/>`;
+	return `<w:compatSetting w:name="${escapeXml(name)}" w:uri="${u}" w:val="${val}"/>`;
 }
 /** Read a CT_OnOff child as boolean (presence true unless val is explicitly false). */
 function readOnOff(el) {
@@ -12447,9 +12662,6 @@ const fontTableDesc = {
 };
 //#endregion
 //#region src/parts/bibliography.ts
-function escapeXml$1(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 const SOURCE_FIELDS = [
 	["SourceType", "type"],
 	["Title", "title"],
@@ -12472,13 +12684,13 @@ const bibliographyDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
 		const attrParts = ["xmlns:b=\"http://schemas.openxmlformats.org/officeDocument/2006/bibliography\""];
-		if (opts.styleName !== void 0) attrParts.push(`StyleName="${escapeXml$1(opts.styleName)}"`);
+		if (opts.styleName !== void 0) attrParts.push(`StyleName="${escapeXml(opts.styleName)}"`);
 		const parts = [`<b:Sources ${attrParts.join(" ")}>`];
 		for (const source of opts.sources) {
 			const sourceParts = [];
 			for (const [tagName, key] of SOURCE_FIELDS) {
 				const value = source[key];
-				if (value !== void 0) sourceParts.push(`<b:${tagName}>${escapeXml$1(value)}</b:${tagName}>`);
+				if (value !== void 0) sourceParts.push(`<b:${tagName}>${escapeXml(value)}</b:${tagName}>`);
 			}
 			parts.push(`<b:Source>${sourceParts.join("")}</b:Source>`);
 		}
@@ -12565,15 +12777,12 @@ const DocPartBehavior = {
 	PAGE: "pg"
 };
 const GLOSSARY_NS = "xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" 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:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"";
-function glossaryEscapeAttr(text) {
-	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 function docPartPrXml(part) {
 	const prParts = [];
-	prParts.push(`<w:name w:val="${glossaryEscapeAttr(part.name)}"${part.decorated ? " w:decorated=\"1\"" : ""}/>`);
+	prParts.push(`<w:name w:val="${escapeXml(part.name)}"${part.decorated ? " w:decorated=\"1\"" : ""}/>`);
 	if (part.category || part.gallery) {
 		const catParts = [];
-		if (part.category) catParts.push(`<w:name w:val="${glossaryEscapeAttr(part.category)}"/>`);
+		if (part.category) catParts.push(`<w:name w:val="${escapeXml(part.category)}"/>`);
 		catParts.push(`<w:gallery w:val="${part.gallery}"/>`);
 		prParts.push(`<w:category>${catParts.join("")}</w:category>`);
 	}
@@ -12586,8 +12795,8 @@ function docPartPrXml(part) {
 		const behaviorXml = part.behaviors.map((b) => `<w:behavior w:val="${b}"/>`).join("");
 		prParts.push(`<w:behaviors>${behaviorXml}</w:behaviors>`);
 	}
-	if (part.description) prParts.push(`<w:description w:val="${glossaryEscapeAttr(part.description)}"/>`);
-	if (part.guid) prParts.push(`<w:guid w:val="${glossaryEscapeAttr(part.guid)}"/>`);
+	if (part.description) prParts.push(`<w:description w:val="${escapeXml(part.description)}"/>`);
+	if (part.guid) prParts.push(`<w:guid w:val="${escapeXml(part.guid)}"/>`);
 	return `<w:docPartPr>${prParts.join("")}</w:docPartPr>`;
 }
 const glossaryDesc = {
@@ -12663,18 +12872,15 @@ const glossaryDesc = {
 };
 //#endregion
 //#region src/parts/comments.ts
-function escapeAttr(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 const COMMENTS_NS = "xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" 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:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" xmlns:wne=\"http://schemas.openxmlformats.org/office/word/2006/wordml\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" 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\"";
 function stringifyComment(opts, ctx) {
 	const dateStr = typeof opts.date === "string" ? opts.date : (opts.date ?? /* @__PURE__ */ new Date()).toISOString();
 	const attrs = [
 		`w:id="${opts.id}"`,
-		`w:author="${escapeAttr(opts.author ?? "")}"`,
-		`w:date="${escapeAttr(dateStr)}"`
+		`w:author="${escapeXml(opts.author ?? "")}"`,
+		`w:date="${escapeXml(dateStr)}"`
 	];
-	if (opts.initials !== void 0) attrs.push(`w:initials="${escapeAttr(opts.initials)}"`);
+	if (opts.initials !== void 0) attrs.push(`w:initials="${escapeXml(opts.initials)}"`);
 	const parts = [];
 	for (const child of opts.children) parts.push(stringifyParagraphInline(child, ctx));
 	return `<w:comment ${attrs.join(" ")}>${parts.join("")}</w:comment>`;
@@ -12911,8 +13117,26 @@ function buildContentTypesFromRegistry(facts, dynamic = {}) {
 		partName: sd.path.startsWith("/") ? sd.path : `/${sd.path}`,
 		contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"
 	});
+	const defaults = [{
+		extension: "rels",
+		contentType: "application/vnd.openxmlformats-package.relationships+xml"
+	}, {
+		extension: "xml",
+		contentType: "application/xml"
+	}];
+	const haveExt = new Set(["rels", "xml"]);
+	for (const ac of dynamic.altChunks ?? []) {
+		const ext = (ac.path.split(".").pop() ?? "").toLowerCase();
+		if (ext && !haveExt.has(ext) && ALTCHUNK_DEFAULTS[ext]) {
+			defaults.push({
+				extension: ext,
+				contentType: ALTCHUNK_DEFAULTS[ext]
+			});
+			haveExt.add(ext);
+		}
+	}
 	return {
-		defaults: [...STANDARD_DEFAULTS],
+		defaults,
 		overrides
 	};
 }
@@ -13035,14 +13259,11 @@ function wsOnOff(tag, val) {
 	return `<${tag} w:val="${val ? "true" : "false"}"/>`;
 }
 function wsStringVal(tag, val) {
-	return `<${tag} w:val="${wsEscapeAttr(val)}"/>`;
+	return `<${tag} w:val="${escapeXml(val)}"/>`;
 }
 function wsNumVal(tag, val) {
 	return `<${tag} w:val="${val}"/>`;
 }
-function wsEscapeAttr(s) {
-	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 function parseFramesetEl(el) {
 	const opts = {};
 	const sz = findChild(el, "w:sz");
@@ -13202,8 +13423,8 @@ function wsDivBorderXml(b) {
 	];
 	for (const [tag, side] of sides) {
 		if (!side) continue;
-		const attrParts = [`w:val="${wsEscapeAttr(side.style)}"`];
-		if (side.color) attrParts.push(`w:color="${wsEscapeAttr(side.color)}"`);
+		const attrParts = [`w:val="${escapeXml(side.style)}"`];
+		if (side.color) attrParts.push(`w:color="${escapeXml(side.color)}"`);
 		if (side.size !== void 0) attrParts.push(`w:sz="${side.size}"`);
 		parts.push(`<${tag} ${attrParts.join(" ")}/>`);
 	}
@@ -13250,13 +13471,13 @@ function frameXml(f) {
 	if (f.size !== void 0) parts.push(wsStringVal("w:sz", f.size));
 	if (f.name !== void 0) parts.push(wsStringVal("w:name", f.name));
 	if (f.title !== void 0) parts.push(wsStringVal("w:title", f.title));
-	if (f.sourceRId !== void 0) parts.push(`<w:sourceFileName r:id="${wsEscapeAttr(f.sourceRId)}"/>`);
+	if (f.sourceRId !== void 0) parts.push(`<w:sourceFileName r:id="${escapeXml(f.sourceRId)}"/>`);
 	if (f.marginWidth !== void 0) parts.push(wsNumVal("w:marW", f.marginWidth));
 	if (f.marginHeight !== void 0) parts.push(wsNumVal("w:marH", f.marginHeight));
 	if (f.scrollbar !== void 0) parts.push(`<w:scrollbar w:val="${f.scrollbar}"/>`);
 	if (f.noResizeAllowed) parts.push("<w:noResizeAllowed/>");
 	if (f.linkedToFile) parts.push("<w:linkedToFile/>");
-	if (f.longDescRId !== void 0) parts.push(`<w:longDesc r:id="${wsEscapeAttr(f.longDescRId)}"/>`);
+	if (f.longDescRId !== void 0) parts.push(`<w:longDesc r:id="${escapeXml(f.longDescRId)}"/>`);
 	parts.push("</w:frame>");
 	return parts.join("");
 }
@@ -13276,7 +13497,7 @@ const webSettingsDesc = {
 			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)}"` : "";
+				const targetAttr = ob.target ? ` w:target="${escapeXml(ob.target)}"` : "";
 				p.push(`<w:optimizeForBrowser${valAttr}${targetAttr}/>`);
 			}
 		}
@@ -13341,6 +13562,6 @@ const webSettingsDesc = {
 	}
 };
 //#endregion
-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 };
+export { DocumentGridType as $, stringifySdtPr as $t, settingsDesc as A, parseBodyProperties as An, PageTextDirectionType as At, stringifyParagraphStyle as B, HeadingLevel as Bn, SpaceType as Bt, footnotesDesc as C, UnderlineType as Cn, parseSdtProperties as Ct, SdtDateMappingType as D, TextVerticalType as Dn, stringifySectionPropertiesXml as Dt, parseTocFieldInstruction as E, TextVertOverflowType as En, sectionPropertiesDesc as Et, parseStyleDefinitions as F, TextEffect as Fn, createHorizontalPosition as Ft, SectionType as G, TextWrappingType as Gt, HeaderFooterReferenceType as H, AlignmentType as Hn, createWrapThrough as Ht, DefaultStylesFactory as I, PageNumber as In, HorizontalPositionRelativeFrom as It, createLineNumberType as J, customXmlBlockDesc as Jt, createSectionType as K, altChunkDesc as Kt, stringifyCharacterStyle as L, breakXml as Ln, VerticalPositionRelativeFrom as Lt, buildNumberingCache as M, Media as Mn, PageNumberSeparator as Mt, buildStyleCache as N, createTransformation as Nn, createPageNumberType as Nt, SdtLock as O, VerticalAnchor as On, sectionMarginDefaults as Ot, extractStyleId as P, HighlightColor as Pn, createVerticalPosition as Pt, PageBorderZOrder as Q, stringifyCustomXmlShell as Qt, stringifyConditionalTableStyle as R, TextAlignmentType as Rn, HorizontalPositionAlign as Rt, endnotesDesc as S, EmphasisMarkType as Sn, parseSdtBlock as St, parseTocFieldFromElements as T, TextHorzOverflowType as Tn, parseSectionPropertiesEl as Tt, HeaderFooterType as U, createWrapTight as Ut, stringifyTableStyle as V, LineRuleType as Vn, VerticalPositionAlign as Vt, createHeaderFooterReference as W, TextWrappingSide as Wt, PageBorderDisplay as X, sdtBlockDesc as Xt, createPageMargin as Y, parseCustomXmlProperties as Yt, PageBorderOffsetFrom as Z, setBodyParseChild as Zt, glossaryDesc as _, parseFormFieldData as _n, parseParagraphProperties as _t, appPropertiesDesc as a, TABLE_BORDERS_NONE as an, LevelSuffix as at, CharacterSet as b, PositionalTabLeader as bn, replaceRelsWithPlaceholders as bt, relationshipsDesc as c, OverlapType as cn, parseTableRowPropertiesEl as ct, withAltChunkOverrides as d, TableAnchorType as dn, stringifyChildDispatch as dt, stringifySdtShell as en, createDocumentGrid as et, withMediaDefaults as f, TextDirection as fn, stringifyParagraphInline as ft, DocPartType as g, createFormFieldData as gn, parseParagraph as gt, DocPartGallery as h, FormFieldTextType as hn, resetDrawingIdGen as ht, webSettingsDesc as i, WidthType as in, LevelFormat as it, Styles as j, createImageData$1 as jn, PageOrientation as jt, StyleLevel as k, createBodyProperties as kn, sectionPageSizeDefaults as kt, buildContentTypesFromRegistry as l, RelativeHorizontalPosition as ln, setTableParseChild as lt, DocPartBehavior as m, ProofErrorType as mn, drawingDesc as mt, frameXml as n, stringifyElement as nn, Numbering as nt, customPropertiesDesc as o, BorderStyle as on, parseTableCellPropertiesEl as ot, commentsDesc as p, VerticalMergeType as pn, stringifyRunInline as pt, LineNumberRestartFormat as q, checkboxSymbolRunInner as qt, framesetXml as r, objectDesc as rn, parseNumberingDefinitions as rt, corePropertiesDesc as s, TableLayoutType as sn, parseTablePropertiesEl as st, TargetScreenSize as t, subDocDesc as tn, DocumentAttributeNamespaces as tt, contentTypesDesc as u, RelativeVerticalPosition as un, tableDesc as ut, bibliographyDesc as v, RubyAlign as vn, stringifyBodyChild as vt, parseToc as w, TextBodyWrappingType as wn, FontWrapper as wt, EditGroupType as x, PositionalTabRelativeTo as xn, stringifyTableOfContents as xt, fontTableDesc as y, PositionalTabAlignment as yn, stringifyDocumentXml as yt, stringifyNumberingStyle as z, TextboxTightWrapType as zn, NumberFormat as zt };
 
-//# sourceMappingURL=parts-DvRRYUug.mjs.map
+//# sourceMappingURL=parts-DgrmHznM.mjs.map