@office-open/docx 0.10.10 → 0.10.11

package/dist/{parts-7TLJ0TNR.mjs → parts-D0KoDfg7.mjs}

@@ -179,6 +179,32 @@ function breakXml(breakOpt) {
 	return count === 1 ? one : one.repeat(count);
 }
 /**
+* Empty EG_RunInnerContent elements — self-closing XML with no attributes.
+* Shared by the body run stringifier and the inline (footnote/endnote) run
+* stringifier so both emit them identically. Keyed by the RunOptions child
+* property name (e.g. `{ separator: true }` → `separator`).
+*
+* XSD reference: EG_RunInnerContent group in wml.xsd.
+*/
+const EMPTY_RUN_ELEMENTS = {
+	noBreakHyphen: "<w:noBreakHyphen/>",
+	softHyphen: "<w:softHyphen/>",
+	dayShort: "<w:dayShort/>",
+	monthShort: "<w:monthShort/>",
+	yearShort: "<w:yearShort/>",
+	dayLong: "<w:dayLong/>",
+	monthLong: "<w:monthLong/>",
+	yearLong: "<w:yearLong/>",
+	annotationRef: "<w:annotationRef/>",
+	footnoteRef: "<w:footnoteRef/>",
+	endnoteRef: "<w:endnoteRef/>",
+	separator: "<w:separator/>",
+	continuationSeparator: "<w:continuationSeparator/>",
+	pgNum: "<w:pgNum/>",
+	carriageReturn: "<w:cr/>",
+	lastRenderedPageBreak: "<w:lastRenderedPageBreak/>"
+};
+/**
 * Constants for page number field types.
 *
 * These values are used to insert dynamic page number fields into a document.
@@ -1431,6 +1457,133 @@ function parseEmbed(el) {
 	return opts;
 }
 //#endregion
+//#region src/shared/shading.ts
+/**
+* Shading module for WordprocessingML documents.
+*
+* Shading is used to apply background colors and patterns to paragraphs,
+* table cells, and text runs. The shading type is identical in all places.
+*
+* Reference: http://officeopenxml.com/WPshading.php
+*
+* @see http://officeopenxml.com/WPtableShading.php
+* @see http://officeopenxml.com/WPtableCellProperties-Shading.php
+*
+* ## XSD Schema
+* ```xml
+* <xsd:complexType name="CT_Shd">
+*   <xsd:attribute name="val" type="ST_Shd" use="required"/>
+*   <xsd:attribute name="color" type="ST_HexColor" use="optional"/>
+*   <xsd:attribute name="themeColor" type="ST_ThemeColor" use="optional"/>
+*   <xsd:attribute name="themeTint" type="ST_UcharHexNumber" use="optional"/>
+*   <xsd:attribute name="themeShade" type="ST_UcharHexNumber" use="optional"/>
+*   <xsd:attribute name="fill" type="ST_HexColor" use="optional"/>
+*   <xsd:attribute name="themeFill" type="ST_ThemeColor" use="optional"/>
+*   <xsd:attribute name="themeFillTint" type="ST_UcharHexNumber" use="optional"/>
+*   <xsd:attribute name="themeFillShade" type="ST_UcharHexNumber" use="optional"/>
+* </xsd:complexType>
+* ```
+*
+* @module
+*/
+/**
+* Shading pattern types.
+*
+* Specifies the pattern used for shading. The pattern combines the fill
+* color and the pattern color.
+*
+* ## XSD Schema
+* ```xml
+* <xsd:simpleType name="ST_Shd">
+*   <xsd:restriction base="xsd:string">
+*     <xsd:enumeration value="nil"/>
+*     <xsd:enumeration value="clear"/>
+*     <xsd:enumeration value="solid"/>
+*     <xsd:enumeration value="horzStripe"/>
+*     <xsd:enumeration value="vertStripe"/>
+*     <xsd:enumeration value="reverseDiagStripe"/>
+*     <xsd:enumeration value="diagStripe"/>
+*     <xsd:enumeration value="horzCross"/>
+*     <xsd:enumeration value="diagCross"/>
+*     <!-- ... percent values ... -->
+*   </xsd:restriction>
+* </xsd:simpleType>
+* ```
+*
+* @publicApi
+*/
+const ShadingType = {
+	/** Clear shading - no pattern, fill color only */
+	CLEAR: "clear",
+	DIAGONAL_CROSS: "diagCross",
+	DIAGONAL_STRIPE: "diagStripe",
+	HORIZONTAL_CROSS: "horzCross",
+	HORIZONTAL_STRIPE: "horzStripe",
+	NIL: "nil",
+	PERCENT_10: "pct10",
+	PERCENT_12: "pct12",
+	PERCENT_15: "pct15",
+	PERCENT_20: "pct20",
+	PERCENT_25: "pct25",
+	PERCENT_30: "pct30",
+	PERCENT_35: "pct35",
+	PERCENT_37: "pct37",
+	PERCENT_40: "pct40",
+	PERCENT_45: "pct45",
+	PERCENT_5: "pct5",
+	PERCENT_50: "pct50",
+	PERCENT_55: "pct55",
+	PERCENT_60: "pct60",
+	PERCENT_62: "pct62",
+	PERCENT_65: "pct65",
+	PERCENT_70: "pct70",
+	PERCENT_75: "pct75",
+	PERCENT_80: "pct80",
+	PERCENT_85: "pct85",
+	PERCENT_87: "pct87",
+	PERCENT_90: "pct90",
+	PERCENT_95: "pct95",
+	REVERSE_DIAGONAL_STRIPE: "reverseDiagStripe",
+	SOLID: "solid",
+	THIN_DIAGONAL_CROSS: "thinDiagCross",
+	THIN_DIAGONAL_STRIPE: "thinDiagStripe",
+	THIN_HORIZONTAL_CROSS: "thinHorzCross",
+	THIN_REVERSE_DIAGONAL_STRIPE: "thinReverseDiagStripe",
+	THIN_VERTICAL_STRIPE: "thinVertStripe",
+	VERTICAL_STRIPE: "vertStripe"
+};
+const THEME_COLORS$2 = Object.values(ThemeColor);
+/**
+* Parse a w:shd (CT_Shd) element into ShadingAttributesProperties.
+*
+* Reads every CT_Shd attribute (fill/color/val plus the theme* family), so the
+* result round-trips losslessly — paragraph, table-cell, and run shading all
+* share this single reader. Returns undefined when the element carries no data.
+*/
+function parseShading(shd) {
+	const shading = {};
+	const fill = attr(shd, "w:fill");
+	if (fill) shading.fill = fill;
+	const color = attr(shd, "w:color");
+	if (color) shading.color = color;
+	const val = attr(shd, "w:val");
+	if (val) shading.type = val;
+	const themeColor = attr(shd, "w:themeColor");
+	if (themeColor && THEME_COLORS$2.includes(themeColor)) shading.themeColor = themeColor;
+	const themeTint = attr(shd, "w:themeTint");
+	if (themeTint) shading.themeTint = themeTint;
+	const themeShade = attr(shd, "w:themeShade");
+	if (themeShade) shading.themeShade = themeShade;
+	const themeFill = attr(shd, "w:themeFill");
+	if (themeFill && THEME_COLORS$2.includes(themeFill)) shading.themeFill = themeFill;
+	const themeFillTint = attr(shd, "w:themeFillTint");
+	if (themeFillTint) shading.themeFillTint = themeFillTint;
+	const themeFillShade = attr(shd, "w:themeFillShade");
+	if (themeFillShade) shading.themeFillShade = themeFillShade;
+	if (Object.keys(shading).length === 0) return void 0;
+	return shading;
+}
+//#endregion
 //#region src/util/stringify-element.ts
 /**
 * Element-to-XML serialization helpers shared across the parse layer.
@@ -1629,7 +1782,7 @@ function parseRunProperties(el) {
 	const bdr = findChild(el, "w:bdr");
 	if (bdr) opts.border = parseBorder(bdr);
 	const shd = findChild(el, "w:shd");
-	if (shd) opts.shading = parseShading$1(shd);
+	if (shd) opts.shading = parseShading(shd);
 	const eastAsianLayout = findChild(el, "w:eastAsianLayout");
 	if (eastAsianLayout) opts.eastAsianLayout = parseEastAsianLayout(eastAsianLayout);
 	const contentPart = findChild(el, "w:contentPart");
@@ -1675,19 +1828,6 @@ function parseBorder(el) {
 	return opts;
 }
 /**
-* Parse a w:shd element into ShadingAttributesProperties.
-*/
-function parseShading$1(el) {
-	const opts = {};
-	const fill = colorAttr(el, "w:fill");
-	if (fill) opts.fill = fill;
-	const color = colorAttr(el, "w:color");
-	if (color) opts.color = color;
-	const type = attr(el, "w:val");
-	if (type) opts.type = type;
-	return opts;
-}
-/**
 * Parse a w:eastAsianLayout element into EastAsianLayoutOptions.
 */
 function parseEastAsianLayout(el) {
@@ -2220,7 +2360,7 @@ function stringifyParagraphProperties(options) {
 	if (options.suppressAutoHyphens !== void 0) parts.push(onOff$1("w:suppressAutoHyphens", options.suppressAutoHyphens));
 	if (options.kinsoku !== void 0) parts.push(onOff$1("w:kinsoku", options.kinsoku));
 	if (options.wordWrap !== void 0) parts.push(onOff$1("w:wordWrap", options.wordWrap));
-	if (options.overflowPunctuation) parts.push(onOff$1("w:overflowPunct", options.overflowPunctuation));
+	if (options.overflowPunctuation !== void 0) parts.push(onOff$1("w:overflowPunct", options.overflowPunctuation));
 	if (options.topLinePunct !== void 0) parts.push(onOff$1("w:topLinePunct", options.topLinePunct));
 	if (options.autoSpaceDE !== void 0) parts.push(onOff$1("w:autoSpaceDE", options.autoSpaceDE));
 	if (options.autoSpaceEastAsianText !== void 0) parts.push(onOff$1("w:autoSpaceDN", options.autoSpaceEastAsianText));
@@ -4128,8 +4268,39 @@ function tocInstructionStr(opts) {
 function stringifyTableOfContents(alias = "Table of Contents", options = {}, entriesXml = "") {
 	const instr = tocInstructionStr(options);
 	const aliasAttr = alias ? ` w:val="${escapeXml(alias)}"` : "";
-	const dirtyAttr = entriesXml.length > 0 ? "" : " w:dirty=\"1\"";
-	return `<w:sdt>${`<w:sdtPr><w:alias${aliasAttr}/><w:docPartObj><w:docPartGallery w:val="Table of Contents"/></w:docPartObj></w:sdtPr>`}${`<w:sdtContent><w:p><w:r><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:cstheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cs="Times New Roman"/></w:rPr><w:fldChar w:fldCharType="begin"${dirtyAttr}/></w:r><w:r><w:instrText xml:space="preserve"> ${instr} </w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r></w:p>` + entriesXml + "<w:p><w:r><w:fldChar w:fldCharType=\"end\"/></w:r></w:p></w:sdtContent>"}</w:sdt>`;
+	const headRuns = `<w:r><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:cstheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cs="Times New Roman"/></w:rPr><w:fldChar w:fldCharType="begin"${entriesXml.length > 0 ? "" : " w:dirty=\"1\""}/></w:r><w:r><w:instrText xml:space="preserve"> ${instr} </w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r>`;
+	const endRun = `<w:r><w:fldChar w:fldCharType="end"/></w:r>`;
+	const endParagraph = `<w:p>${endRun}</w:p>`;
+	const body = entriesXml ? injectFieldEnd(injectFieldHead(entriesXml, headRuns), endRun) : `<w:p>${headRuns}</w:p>` + endParagraph;
+	return `<w:sdt>${`<w:sdtPr><w:alias${aliasAttr}/><w:docPartObj><w:docPartGallery w:val="Table of Contents"/></w:docPartObj></w:sdtPr>`}${`<w:sdtContent>${body}</w:sdtContent>`}</w:sdt>`;
+}
+/**
+* Inject the field-head runs into the first `<w:p>` of `entriesXml`, placing
+* them after the opening tag (and after `<w:pPr>` when present) so the head
+* shares the first entry's paragraph. Returns `entriesXml` unchanged when no
+* `<w:p>` is found.
+*/
+function injectFieldHead(entriesXml, headRuns) {
+	const pTagStart = entriesXml.search(/<w:p[ >]/);
+	if (pTagStart < 0) return entriesXml;
+	const pTagEnd = entriesXml.indexOf(">", pTagStart) + 1;
+	let injectAt = pTagEnd;
+	if (entriesXml.slice(pTagEnd, pTagEnd + 7) === "<w:pPr>") {
+		const pPrEnd = entriesXml.indexOf("</w:pPr>", pTagEnd);
+		if (pPrEnd >= 0) injectAt = pPrEnd + 8;
+	}
+	return entriesXml.slice(0, injectAt) + headRuns + entriesXml.slice(injectAt);
+}
+/**
+* Inject the field-end run into the last `<w:p>` of `entriesXml` (before its
+* closing `</w:p>`) so the end shares the last entry's paragraph instead of
+* occupying a standalone control-only paragraph that renders as a blank line.
+* Returns `entriesXml` unchanged when no `</w:p>` is found.
+*/
+function injectFieldEnd(entriesXml, endRun) {
+	const lastClose = entriesXml.lastIndexOf("</w:p>");
+	if (lastClose < 0) return entriesXml;
+	return entriesXml.slice(0, lastClose) + endRun + entriesXml.slice(lastClose);
 }
 //#endregion
 //#region src/parts/textbox/shape/shape.ts
@@ -4648,32 +4819,6 @@ function replaceRelsWithPlaceholders(xml, ctx, prefix) {
 * @module
 */
 /**
-* Mapping from empty child property name to self-closing XML element.
-*
-* These are single-key objects like `{ noBreakHyphen: true }` that map to
-* self-closing XML elements with no attributes.
-*
-* XSD reference: EG_RunInnerContent group in wml.xsd.
-*/
-const EMPTY_RUN_ELEMENTS = {
-	noBreakHyphen: "<w:noBreakHyphen/>",
-	softHyphen: "<w:softHyphen/>",
-	dayShort: "<w:dayShort/>",
-	monthShort: "<w:monthShort/>",
-	yearShort: "<w:yearShort/>",
-	dayLong: "<w:dayLong/>",
-	monthLong: "<w:monthLong/>",
-	yearLong: "<w:yearLong/>",
-	annotationRef: "<w:annotationRef/>",
-	footnoteRef: "<w:footnoteRef/>",
-	endnoteRef: "<w:endnoteRef/>",
-	separator: "<w:separator/>",
-	continuationSeparator: "<w:continuationSeparator/>",
-	pgNum: "<w:pgNum/>",
-	carriageReturn: "<w:cr/>",
-	lastRenderedPageBreak: "<w:lastRenderedPageBreak/>"
-};
-/**
 * Stringify a run (w:r) from pure JSON options.
 *
 * Handles text, children, breaks, and run properties.
@@ -5005,7 +5150,8 @@ function parseParagraphProperties(el, ctx) {
 		const level = ilvl ? attrNum(ilvl, "w:val") ?? 0 : 0;
 		const numIdEl = findChild(numPr, "w:numId");
 		const numId = numIdEl ? attr(numIdEl, "w:val") : void 0;
-		if (numId !== void 0 && ctx.numberingCache.size > 0) {
+		if (numId === "0") opts.numbering = false;
+		else if (numId !== void 0 && ctx.numberingCache.size > 0) {
 			const numEl = ctx.docx.numbering;
 			if (numEl) {
 				let abstractNumId;
@@ -5116,14 +5262,8 @@ function parseParagraphProperties(el, ctx) {
 	}
 	const shd = findChild(el, "w:shd");
 	if (shd) {
-		const shdObj = {};
-		const fill = attr(shd, "w:fill");
-		if (fill) shdObj.fill = fill;
-		const color = attr(shd, "w:color");
-		if (color) shdObj.color = color;
-		const val = attr(shd, "w:val");
-		if (val) shdObj.type = val;
-		if (Object.keys(shdObj).length > 0) opts.shading = shdObj;
+		const shading = parseShading(shd);
+		if (shading) opts.shading = shading;
 	}
 	const textAlignment = findChild(el, "w:textAlignment");
 	if (textAlignment) {
@@ -5985,8 +6125,9 @@ function parseImageRun(el, ctx) {
 	if (!mediaPath) return void 0;
 	const imageData = ctx.docx.doc.getRaw(mediaPath);
 	if (!imageData) return void 0;
+	const type = imageTypeFromPath(mediaPath);
 	const imageOpts = {
-		type: imageTypeFromPath(mediaPath),
+		type,
 		data: imageData,
 		transformation: {
 			...info.width !== void 0 ? { width: info.width } : {},
@@ -6017,6 +6158,15 @@ function parseImageRun(el, ctx) {
 	if (blipResult.blipEffects) imageOpts.blipEffects = blipResult.blipEffects;
 	const useLocalDpi = readBlipUseLocalDpi(blip);
 	if (useLocalDpi !== void 0) imageOpts.useLocalDpi = useLocalDpi;
+	const svg = readBlipSvg(blip, ctx);
+	if (svg) {
+		imageOpts.fallback = {
+			type,
+			data: imageData
+		};
+		imageOpts.type = "svg";
+		imageOpts.data = svg.data;
+	}
 	return { image: imageOpts };
 }
 /**
@@ -6033,6 +6183,33 @@ function readBlipUseLocalDpi(blip) {
 	}
 }
 /**
+* Read the `asvg:svgBlip` blip extension. When present, the surrounding
+* `a:blip` r:embed carries the raster fallback and this extension targets the
+* vector SVG part. Returns the SVG bytes so the picture round-trips as an
+* SvgMediaOptions (vector primary + raster fallback); undefined when no SVG
+* extension exists.
+*/
+function readBlipSvg(blip, ctx) {
+	const extLst = findChild(blip, "a:extLst");
+	if (!extLst) return void 0;
+	for (const ext of extLst.elements ?? []) {
+		if (ext.type !== "element" || ext.name !== "a:ext") continue;
+		const svgBlip = findChild(ext, "asvg:svgBlip");
+		if (svgBlip) {
+			const rEmbed = attr(svgBlip, "r:embed");
+			if (!rEmbed) return void 0;
+			const svgPath = ctx.resolveRelationship(rEmbed);
+			if (!svgPath) return void 0;
+			const data = ctx.docx.doc.getRaw(svgPath);
+			if (!data) return void 0;
+			return {
+				data,
+				fileName: svgPath.split("/").pop() ?? svgPath
+			};
+		}
+	}
+}
+/**
 * Read the blip-fill crop rectangle (`a:srcRect`, l/t/r/b percentage insets)
 * from a `pic:blipFill` parent. Returns undefined when there is no crop.
 */
@@ -6273,6 +6450,19 @@ function parsePicChildMediaData(picEl, ctx) {
 		const ln = findChild(spPr, "a:ln");
 		if (ln) result.outline = outlineDesc.parse(ln, ctx);
 	}
+	const svg = readBlipSvg(blip, ctx);
+	if (svg) return {
+		...result,
+		type: "svg",
+		data: svg.data,
+		fileName: svg.fileName,
+		fallback: {
+			type: result.type,
+			fileName: result.fileName,
+			data,
+			transformation: result.transformation
+		}
+	};
 	return result;
 }
 /**
@@ -6409,6 +6599,26 @@ function readPosition(posEl) {
 	}
 	return Object.keys(result).length > 0 ? result : void 0;
 }
+/** Read wp:wrapPolygon (start + lineTo points) into a WrapPolygon, if present. */
+function readWrapPolygon(el) {
+	const poly = findChild(el, "wp:wrapPolygon");
+	if (!poly) return void 0;
+	const points = [];
+	const start = findChild(poly, "wp:start");
+	if (start) points.push({
+		x: attrNum(start, "x") ?? 0,
+		y: attrNum(start, "y") ?? 0
+	});
+	for (const child of poly.elements ?? []) if (child.name === "wp:lineTo") points.push({
+		x: attrNum(child, "x") ?? 0,
+		y: attrNum(child, "y") ?? 0
+	});
+	if (points.length === 0) return void 0;
+	return {
+		edited: attrBool(poly, "edited"),
+		points
+	};
+}
 /** Map the wp:anchor wrap child element into a TextWrapping ({ type, side? }). */
 function readWrap(anchor) {
 	const WRAP_TYPE = [
@@ -6424,6 +6634,10 @@ function readWrap(anchor) {
 		const wrap = { type };
 		const side = attr(el, "wrapText");
 		if (side) wrap.side = side;
+		if (name === "wrapTight" || name === "wrapThrough") {
+			const polygon = readWrapPolygon(el);
+			if (polygon) wrap.polygon = polygon;
+		}
 		return wrap;
 	}
 }
@@ -6895,11 +7109,17 @@ function stringifyGroupChild(child, ctx) {
 	}
 	if (child.type === "wpg") return stringifyNestedGroup(child, ctx);
 	const picData = child;
+	const isSvg = picData.type === "svg";
+	const blipTarget = isSvg && "fallback" in picData ? picData.fallback.fileName : picData.fileName;
 	const picParts = [];
 	picParts.push(stringifyNvPicPr({}, picData.nonVisualProperties));
 	const groupBlipParts = [];
+	const extParts = [];
 	const useLocalDpiExt = buildUseLocalDpiExt(picData.useLocalDpi);
-	groupBlipParts.push(useLocalDpiExt ? `<a:blip r:embed="{${escapeXml(picData.fileName)}}"><a:extLst>${useLocalDpiExt}</a:extLst></a:blip>` : `<a:blip r:embed="{${escapeXml(picData.fileName)}}"/>`);
+	if (useLocalDpiExt) extParts.push(useLocalDpiExt);
+	if (isSvg) extParts.push(`<a:ext uri="${SVG_BLIP_EXT_URI}"><asvg:svgBlip xmlns:asvg="http://schemas.microsoft.com/office/drawing/2016/SVG/main" r:embed="{${escapeXml(picData.fileName)}}"/></a:ext>`);
+	const extLst = extParts.length > 0 ? `<a:extLst>${extParts.join("")}</a:extLst>` : "";
+	groupBlipParts.push(extLst ? `<a:blip r:embed="{${escapeXml(blipTarget)}}">${extLst}</a:blip>` : `<a:blip r:embed="{${escapeXml(blipTarget)}}"/>`);
 	const groupSrcRectXml = buildSrcRectXml(picData.sourceRectangle);
 	if (groupSrcRectXml) groupBlipParts.push(groupSrcRectXml);
 	groupBlipParts.push("<a:stretch><a:fillRect/></a:stretch>");
@@ -6953,7 +7173,12 @@ function stringifyPositionH(opts) {
 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>${convertToEmu(opts.offset)}</wp:posOffset>` : "<wp:align>top</wp:align>"}</wp:positionV>`;
 }
-function wrapPolygonStr(cx, cy) {
+function wrapPolygonStr(cx, cy, polygon) {
+	if (polygon?.points.length) {
+		const editedAttr = polygon.edited !== void 0 ? ` edited="${polygon.edited ? 1 : 0}"` : "";
+		const [start, ...rest] = polygon.points;
+		return `<wp:wrapPolygon${editedAttr}>${`<wp:start x="${start.x}" y="${start.y}"/>`}${rest.map((p) => `<wp:lineTo x="${p.x}" y="${p.y}"/>`).join("")}</wp:wrapPolygon>`;
+	}
 	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>`;
 }
 function wrapSquareStr(textWrapping, margins) {
@@ -6971,13 +7196,13 @@ function wrapTightStr(textWrapping, margins, cx, cy) {
 	const a = [`wrapText="${textWrapping.side ?? TextWrappingSide.BOTH_SIDES}"`];
 	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>`;
+	return `<wp:wrapTight ${a.join(" ")}>${wrapPolygonStr(cx, cy, textWrapping.polygon)}</wp:wrapTight>`;
 }
 function wrapThroughStr(textWrapping, margins, cx, cy) {
 	const a = [`wrapText="${textWrapping.side ?? TextWrappingSide.BOTH_SIDES}"`];
 	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>`;
+	return `<wp:wrapThrough ${a.join(" ")}>${wrapPolygonStr(cx, cy, textWrapping.polygon)}</wp:wrapThrough>`;
 }
 function wrapTopAndBottomStr(margins) {
 	const m = margins ?? {};
@@ -7216,14 +7441,36 @@ function stringifyRunInline(opts, ctx) {
 	const rPr = stringifyRunProperties(opts);
 	if (rPr) parts.push(rPr);
 	if (opts.break) parts.push(breakXml(opts.break));
-	if (opts.children) for (const child of opts.children) if (typeof child === "string") parts.push(`<w:t xml:space="preserve">${escapeXml(child)}</w:t>`);
-	else {
-		const jsonResult = stringifyChildDispatch(child, ctx);
-		if (jsonResult !== void 0) if (Array.isArray(jsonResult)) parts.push(...jsonResult);
-		else parts.push(jsonResult);
-		else if ("text" in child || "children" in child || "break" in child) parts.push(stringifyRunInline(child, ctx));
-	}
-	else if (opts.text !== void 0) parts.push(`<w:t xml:space="preserve">${escapeXml(String(opts.text))}</w:t>`);
+	if (opts.children) {
+		for (const child of opts.children) if (typeof child === "string") parts.push(`<w:t xml:space="preserve">${escapeXml(child)}</w:t>`);
+		else if (typeof child === "object" && child !== null) {
+			if ("tab" in child) {
+				parts.push("<w:tab/>");
+				continue;
+			}
+			if ("pageBreak" in child) {
+				parts.push("<w:br w:type=\"page\"/>");
+				continue;
+			}
+			if ("columnBreak" in child) {
+				parts.push("<w:br w:type=\"column\"/>");
+				continue;
+			}
+			if ("break" in child) {
+				parts.push(breakXml(child.break));
+				continue;
+			}
+			const emptyXml = EMPTY_RUN_ELEMENTS[Object.keys(child)[0]];
+			if (emptyXml) {
+				parts.push(emptyXml);
+				continue;
+			}
+			const jsonResult = stringifyChildDispatch(child, ctx);
+			if (jsonResult !== void 0) if (Array.isArray(jsonResult)) parts.push(...jsonResult);
+			else parts.push(jsonResult);
+			else if ("text" in child || "children" in child || "break" in child) parts.push(stringifyRunInline(child, ctx));
+		}
+	} else if (opts.text !== void 0) parts.push(`<w:t xml:space="preserve">${escapeXml(String(opts.text))}</w:t>`);
 	const rsidAttrs = [];
 	if (opts.rsid) rsidAttrs.push(` w:rsidR="${opts.rsid}"`);
 	if (opts.runPropertiesRsid) rsidAttrs.push(` w:rsidRPr="${opts.runPropertiesRsid}"`);
@@ -7563,7 +7810,13 @@ function stringifyChildDispatch(child, ctx) {
 					registerMedia(c.children);
 					continue;
 				}
-				ctx.file.media.addMedia(c.data, c.type, () => c, c.fileName);
+				if (c.type === "svg") {
+					const fb = c.fallback;
+					fb.fileName = ctx.file.media.addMedia(fb.data, fb.type, () => fb, fb.fileName).fileName;
+					c.fileName = ctx.file.media.addMedia(c.data, "svg", () => c, c.fileName).fileName;
+					continue;
+				}
+				c.fileName = ctx.file.media.addMedia(c.data, c.type, () => c, c.fileName).fileName;
 			}
 		};
 		registerMedia(opts.children);
@@ -8267,30 +8520,6 @@ function parseCellMargins(marginEl) {
 	if (Object.keys(margins).length === 0) return void 0;
 	return margins;
 }
-/** Parse a w:shd (CT_Shd) element into ShadingAttributesProperties. */
-function parseShading(shd) {
-	const shading = {};
-	const fill = attr(shd, "w:fill");
-	if (fill) shading.fill = fill;
-	const color = attr(shd, "w:color");
-	if (color) shading.color = color;
-	const val = attr(shd, "w:val");
-	if (val) shading.type = val;
-	const themeColor = attr(shd, "w:themeColor");
-	if (themeColor && THEME_COLORS.includes(themeColor)) shading.themeColor = themeColor;
-	const themeTint = attr(shd, "w:themeTint");
-	if (themeTint) shading.themeTint = themeTint;
-	const themeShade = attr(shd, "w:themeShade");
-	if (themeShade) shading.themeShade = themeShade;
-	const themeFill = attr(shd, "w:themeFill");
-	if (themeFill && THEME_COLORS.includes(themeFill)) shading.themeFill = themeFill;
-	const themeFillTint = attr(shd, "w:themeFillTint");
-	if (themeFillTint) shading.themeFillTint = themeFillTint;
-	const themeFillShade = attr(shd, "w:themeFillShade");
-	if (themeFillShade) shading.themeFillShade = themeFillShade;
-	if (Object.keys(shading).length === 0) return void 0;
-	return shading;
-}
 /** Parse a w:cnfStyle (CT_Cnf) element into CnfStyleOptions. */
 function parseCnfStyle(cnfEl) {
 	const cnf = {};
@@ -11664,8 +11893,8 @@ const settingsDesc = {
 		}));
 		p.push(onOff("w:removePersonalInformation", opts.removePersonalInformation));
 		p.push(onOff("w:removeDateAndTime", opts.removeDateAndTime));
-		p.push(onOff("w:displayBackgroundShape", opts.displayBackgroundShape));
 		p.push(onOff("w:doNotDisplayPageBoundaries", opts.doNotDisplayPageBoundaries));
+		p.push(onOff("w:displayBackgroundShape", opts.displayBackgroundShape));
 		p.push(onOff("w:printPostScriptOverText", opts.printPostScriptOverText));
 		p.push(onOff("w:printFractionalCharacterWidth", opts.printFractionalCharacterWidth));
 		p.push(onOff("w:printFormsData", opts.printFormsData));
@@ -11750,12 +11979,12 @@ const settingsDesc = {
 		p.push(numVal("w:drawingGridVerticalSpacing", opts.drawingGridVerticalSpacing));
 		p.push(numVal("w:displayHorizontalDrawingGridEvery", opts.displayHorizontalDrawingGridEvery));
 		p.push(numVal("w:displayVerticalDrawingGridEvery", opts.displayVerticalDrawingGridEvery));
+		p.push(onOff("w:doNotUseMarginsForDrawingGridOrigin", opts.doNotUseMarginsForDrawingGridOrigin));
 		p.push(numVal("w:drawingGridHorizontalOrigin", opts.drawingGridHorizontalOrigin));
 		p.push(numVal("w:drawingGridVerticalOrigin", opts.drawingGridVerticalOrigin));
-		p.push(onOff("w:doNotUseMarginsForDrawingGridOrigin", opts.doNotUseMarginsForDrawingGridOrigin));
 		p.push(onOff("w:doNotShadeFormData", opts.doNotShadeFormData));
-		if (opts.characterSpacingControl !== void 0) p.push(strVal("w:characterSpacingControl", opts.characterSpacingControl));
 		p.push(onOff("w:noPunctuationKerning", opts.noPunctuationKerning));
+		if (opts.characterSpacingControl !== void 0) p.push(strVal("w:characterSpacingControl", opts.characterSpacingControl));
 		p.push(onOff("w:printTwoOnOne", opts.printTwoOnOne));
 		p.push(onOff("w:strictFirstAndLastChars", opts.strictFirstAndLastChars));
 		if (opts.noLineBreaksAfter !== void 0) {
@@ -11806,7 +12035,6 @@ const settingsDesc = {
 		if (opts.rsids !== void 0) p.push(stringifyRsids(opts.rsids));
 		if (opts.mathPr !== void 0) p.push(stringifyMathPr(opts.mathPr));
 		if (opts.attachedSchema !== void 0) for (const schema of opts.attachedSchema) p.push(strVal("w:attachedSchema", schema));
-		if (opts.colorSchemeMapping !== void 0) p.push(stringifyColorSchemeMapping(opts.colorSchemeMapping));
 		if (opts.themeFontLang !== void 0) {
 			const a = {};
 			if (opts.themeFontLang.val !== void 0) a["w:val"] = opts.themeFontLang.val;
@@ -11814,6 +12042,7 @@ const settingsDesc = {
 			if (opts.themeFontLang.bidi !== void 0) a["w:bidi"] = opts.themeFontLang.bidi;
 			p.push(attrEl("w:themeFontLang", a));
 		}
+		if (opts.colorSchemeMapping !== void 0) p.push(stringifyColorSchemeMapping(opts.colorSchemeMapping));
 		p.push(onOff("w:doNotIncludeSubdocsInStats", opts.doNotIncludeSubdocsInStats));
 		p.push(onOff("w:doNotAutoCompressPictures", opts.doNotAutoCompressPictures));
 		if (opts.forceUpgrade !== void 0) p.push("<w:forceUpgrade/>");
@@ -11827,8 +12056,8 @@ const settingsDesc = {
 			if (st.url !== void 0) attrs["w:url"] = st.url;
 			p.push(attrEl("w:smartTagType", attrs));
 		}
-		p.push(onOff("w:doNotEmbedSmartTags", opts.doNotEmbedSmartTags));
 		if (opts.shapeDefaults !== void 0) p.push(`<w:shapeDefaults>${opts.shapeDefaults}</w:shapeDefaults>`);
+		p.push(onOff("w:doNotEmbedSmartTags", opts.doNotEmbedSmartTags));
 		p.push(strVal("w:decimalSymbol", opts.decimalSymbol));
 		p.push(strVal("w:listSeparator", opts.listSeparator));
 		return `<w:settings ${SETTINGS_NS}>${p.join("")}</w:settings>`;
@@ -13619,6 +13848,6 @@ const webSettingsDesc = {
 	}
 };
 //#endregion
-export { PageBorderZOrder as $, stringifyCustomXmlShell as $t, StyleLevel as A, TextVerticalType as An, sectionPageSizeDefaults as At, stringifyNumberingStyle as B, breakXml as Bn, NumberFormat as Bt, footnotesDesc as C, PositionalTabLeader as Cn, parseSdtBlock as Ct, selectTocEntryElements as D, TextBodyWrappingType as Dn, sectionPropertiesDesc as Dt, parseTocFieldInstruction as E, UnderlineType as En, parseSectionPropertiesEl as Et, extractStyleId as F, Media as Fn, createVerticalPosition as Ft, createHeaderFooterReference as G, AlignmentType as Gn, TextWrappingSide as Gt, stringifyTableStyle as H, TextboxTightWrapType as Hn, VerticalPositionAlign as Ht, parseStyleDefinitions as I, createTransformation as In, createHorizontalPosition as It, LineNumberRestartFormat as J, checkboxSymbolRunInner as Jt, SectionType as K, TextWrappingType as Kt, DefaultStylesFactory as L, HighlightColor as Ln, HorizontalPositionRelativeFrom as Lt, Styles as M, createBodyProperties as Mn, PageOrientation as Mt, buildNumberingCache as N, parseBodyProperties as Nn, PageNumberSeparator as Nt, SdtDateMappingType as O, TextHorzOverflowType as On, stringifySectionPropertiesXml as Ot, buildStyleCache as P, createImageData$1 as Pn, createPageNumberType as Pt, PageBorderOffsetFrom as Q, setBodyParseChild as Qt, stringifyCharacterStyle as R, TextEffect as Rn, VerticalPositionRelativeFrom as Rt, endnotesDesc as S, PositionalTabAlignment as Sn, stringifyTableOfContents as St, parseTocFieldFromElements as T, EmphasisMarkType as Tn, FontWrapper as Tt, HeaderFooterReferenceType as U, HeadingLevel as Un, createWrapThrough as Ut, stringifyParagraphStyle as V, TextAlignmentType as Vn, SpaceType as Vt, HeaderFooterType as W, LineRuleType 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 _, ProofErrorType as _n, parseParagraph as _t, appPropertiesDesc as a, WidthType as an, LevelFormat as at, CharacterSet as b, parseFormFieldData as bn, stringifyDocumentXml as bt, relationshipsDesc as c, TABLE_BORDERS_NONE as cn, parseTablePropertiesEl as ct, withAltChunkOverrides as d, OverlapType as dn, tableDesc as dt, stringifySdtPr as en, DocumentGridType as et, withMediaDefaults as f, RelativeHorizontalPosition as fn, stringifyChildDispatch as ft, DocPartType as g, VerticalMergeType as gn, resetDrawingIdGen as gt, DocPartGallery as h, TextDirection as hn, drawingDesc as ht, webSettingsDesc as i, objectDesc as in, parseNumberingDefinitions as it, settingsDesc as j, VerticalAnchor as jn, PageTextDirectionType as jt, SdtLock as k, TextVertOverflowType as kn, sectionMarginDefaults as kt, buildContentTypesFromRegistry as l, BorderStyle as ln, parseTableRowPropertiesEl as lt, DocPartBehavior as m, TableAnchorType as mn, stringifyRunInline as mt, frameXml as n, subDocDesc as nn, DocumentAttributeNamespaces as nt, customPropertiesDesc as o, widthFiftiethsToPct as on, LevelSuffix as ot, commentsDesc as p, RelativeVerticalPosition as pn, stringifyParagraphInline as pt, createSectionType as q, altChunkDesc as qt, framesetXml as r, stringifyElement as rn, Numbering as rt, corePropertiesDesc as s, widthPctToFiftieths as sn, parseTableCellPropertiesEl as st, TargetScreenSize as t, stringifySdtShell as tn, createDocumentGrid as tt, contentTypesDesc as u, TableLayoutType as un, setTableParseChild as ut, bibliographyDesc as v, FormFieldTextType as vn, parseParagraphProperties as vt, parseToc as w, PositionalTabRelativeTo as wn, parseSdtProperties as wt, EditGroupType as x, RubyAlign as xn, replaceRelsWithPlaceholders as xt, fontTableDesc as y, createFormFieldData as yn, stringifyBodyChild as yt, stringifyConditionalTableStyle as z, PageNumber as zn, HorizontalPositionAlign as zt };
+export { PageBorderZOrder as $, stringifyCustomXmlShell as $t, StyleLevel as A, TextHorzOverflowType as An, sectionPageSizeDefaults as At, stringifyNumberingStyle as B, TextEffect as Bn, NumberFormat as Bt, footnotesDesc as C, RubyAlign as Cn, parseSdtBlock as Ct, selectTocEntryElements as D, EmphasisMarkType as Dn, sectionPropertiesDesc as Dt, parseTocFieldInstruction as E, PositionalTabRelativeTo as En, parseSectionPropertiesEl as Et, extractStyleId as F, parseBodyProperties as Fn, createVerticalPosition as Ft, createHeaderFooterReference as G, TextboxTightWrapType as Gn, TextWrappingSide as Gt, stringifyTableStyle as H, PageNumber as Hn, VerticalPositionAlign as Ht, parseStyleDefinitions as I, createImageData$1 as In, createHorizontalPosition as It, LineNumberRestartFormat as J, AlignmentType as Jn, checkboxSymbolRunInner as Jt, SectionType as K, HeadingLevel as Kn, TextWrappingType as Kt, DefaultStylesFactory as L, Media as Ln, HorizontalPositionRelativeFrom as Lt, Styles as M, TextVerticalType as Mn, PageOrientation as Mt, buildNumberingCache as N, VerticalAnchor as Nn, PageNumberSeparator as Nt, SdtDateMappingType as O, UnderlineType as On, stringifySectionPropertiesXml as Ot, buildStyleCache as P, createBodyProperties as Pn, createPageNumberType as Pt, PageBorderOffsetFrom as Q, setBodyParseChild as Qt, stringifyCharacterStyle as R, createTransformation as Rn, VerticalPositionRelativeFrom as Rt, endnotesDesc as S, parseFormFieldData as Sn, stringifyTableOfContents as St, parseTocFieldFromElements as T, PositionalTabLeader as Tn, FontWrapper as Tt, HeaderFooterReferenceType as U, breakXml as Un, createWrapThrough as Ut, stringifyParagraphStyle as V, EMPTY_RUN_ELEMENTS as Vn, SpaceType as Vt, HeaderFooterType as W, TextAlignmentType 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 _, TextDirection as _n, parseParagraph as _t, appPropertiesDesc as a, parseShading as an, LevelFormat as at, CharacterSet as b, FormFieldTextType as bn, stringifyDocumentXml as bt, relationshipsDesc as c, widthFiftiethsToPct as cn, parseTablePropertiesEl as ct, withAltChunkOverrides as d, BorderStyle as dn, tableDesc as dt, stringifySdtPr as en, DocumentGridType as et, withMediaDefaults as f, TableLayoutType as fn, stringifyChildDispatch as ft, DocPartType as g, TableAnchorType as gn, resetDrawingIdGen as gt, DocPartGallery as h, RelativeVerticalPosition as hn, drawingDesc as ht, webSettingsDesc as i, ShadingType as in, parseNumberingDefinitions as it, settingsDesc as j, TextVertOverflowType as jn, PageTextDirectionType as jt, SdtLock as k, TextBodyWrappingType as kn, sectionMarginDefaults as kt, buildContentTypesFromRegistry as l, widthPctToFiftieths as ln, parseTableRowPropertiesEl as lt, DocPartBehavior as m, RelativeHorizontalPosition as mn, stringifyRunInline as mt, frameXml as n, subDocDesc as nn, DocumentAttributeNamespaces as nt, customPropertiesDesc as o, objectDesc as on, LevelSuffix as ot, commentsDesc as p, OverlapType as pn, stringifyParagraphInline as pt, createSectionType as q, LineRuleType as qn, altChunkDesc as qt, framesetXml as r, stringifyElement as rn, Numbering as rt, corePropertiesDesc as s, WidthType as sn, parseTableCellPropertiesEl as st, TargetScreenSize as t, stringifySdtShell as tn, createDocumentGrid as tt, contentTypesDesc as u, TABLE_BORDERS_NONE as un, setTableParseChild as ut, bibliographyDesc as v, VerticalMergeType as vn, parseParagraphProperties as vt, parseToc as w, PositionalTabAlignment as wn, parseSdtProperties as wt, EditGroupType as x, createFormFieldData as xn, replaceRelsWithPlaceholders as xt, fontTableDesc as y, ProofErrorType as yn, stringifyBodyChild as yt, stringifyConditionalTableStyle as z, HighlightColor as zn, HorizontalPositionAlign as zt };
 
-//# sourceMappingURL=parts-7TLJ0TNR.mjs.map
+//# sourceMappingURL=parts-D0KoDfg7.mjs.map