reamkit 1.29.0 → 1.31.0

package/dist/esm/word/docx-writer.js

@@ -6,6 +6,7 @@ import { buildOpcPackage } from "../core/opc/opc-writer.js";
 import "../core/opc/index.js";
 import { omathXml } from "./omml-serializer.js";
 import { chartSpaceXml } from "../core/drawingml/chart-serializer.js";
+import { OBFUSCATED_FONT_CONTENT_TYPE, embedFaces } from "./font-embed.js";
 //#region src/word/docx-writer.ts
 var encoder = new TextEncoder();
 var DEFAULT_RUN = resolveRunProperties({}, {}, EMPTY_STYLE_SHEET);
@@ -17,6 +18,15 @@ var REL_NUMBERING = "http://schemas.openxmlformats.org/officeDocument/2006/relat
 var REL_HYPERLINK = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
 var REL_IMAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
 var NUMBERING_PART = "word/numbering.xml";
+var REL_FONT_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";
+var FONT_TABLE_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml";
+var FONT_TABLE_PART = "word/fontTable.xml";
+var REL_SETTINGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings";
+var SETTINGS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml";
+var SETTINGS_PART = "word/settings.xml";
+var REL_STYLES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
+var STYLES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml";
+var STYLES_PART = "word/styles.xml";
 var REL_FOOTNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";
 var REL_ENDNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";
 var FOOTNOTES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml";
@@ -30,6 +40,20 @@ var REL_COMMENTS_EXTENDED = "http://schemas.microsoft.com/office/2011/relationsh
 var COMMENTS_EXTENDED_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml";
 var COMMENTS_EXTENDED_PART = "word/commentsExtended.xml";
 var W14_NS = "http://schemas.microsoft.com/office/word/2010/wordml";
+var MC_NS = "http://schemas.openxmlformats.org/markup-compatibility/2006";
+/**
+* The namespaces a part's root declares: WordprocessingML's and the
+* relationships', and — where the part uses one — Word 2010's `w14`, which a
+* reader that does not know it is told to pass over (ECMA-376 Part 3
+* `mc:Ignorable`) rather than to refuse the file.
+*
+* @param inner The part's content, to see whether it uses `w14`.
+* @returns The attributes, each with its leading space.
+*/
+function rootNamespaces(inner) {
+	const base = " xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"";
+	return inner.includes("<w14:") ? `${base} xmlns:w14="${W14_NS}" xmlns:mc="${MC_NS}" mc:Ignorable="w14"` : base;
+}
 var W15_NS = "http://schemas.microsoft.com/office/word/2012/wordml";
 var REL_CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
 var CHART_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
@@ -127,7 +151,12 @@ function writeDocx(flow) {
 		drawingSeq: 0,
 		chartParts: [],
 		chartSeq: 0,
-		...flow.charts ? { charts: flow.charts } : {}
+		...flow.charts ? { charts: flow.charts } : {},
+		...flow.faceFamilies ? { faceFamilies: flow.faceFamilies } : {},
+		familiesUsed: /* @__PURE__ */ new Map(),
+		...flow.faceOutlines ? { faceOutlines: flow.faceOutlines } : {},
+		facesUsed: /* @__PURE__ */ new Set(),
+		zRanks: zRanksOf(flow)
 	};
 	const docScope = newScope();
 	const extraParts = [];
@@ -147,7 +176,8 @@ function writeDocx(flow) {
 	});
 	emitBody(body, flow.body, losses, state, docScope, sectPrByClosingIndex);
 	if (finalSectPr) body.push(finalSectPr);
-	const documentXml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><w:body>${body.join("")}</w:body></w:document>`;
+	const bodyXml = body.join("");
+	const documentXml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document${rootNamespaces(bodyXml)}><w:body>${bodyXml}</w:body></w:document>`;
 	const numberingPart = flow.body.some((el) => el.kind === "paragraph" && el.paragraph.properties.numbering !== void 0) && flow.numbering ? {
 		path: NUMBERING_PART,
 		data: encoder.encode(numberingXml(flow.numbering)),
@@ -179,6 +209,45 @@ function writeDocx(flow) {
 	}, state, losses, docScope, extraParts, extraPartRels);
 	const commentParaIds = emitComments(flow.comments, state, losses, docScope, extraParts, extraPartRels);
 	emitCommentsExtended(flow.comments, commentParaIds, docScope, extraParts);
+	const embedded = state.faceOutlines && state.faceFamilies ? embedFaces(state.facesUsed, state.faceOutlines, state.faceFamilies, losses) : void 0;
+	if (embedded && embedded.relationships.length > 0) extraPartRels.push({
+		sourcePart: FONT_TABLE_PART,
+		relationships: [...embedded.relationships]
+	});
+	const fontTablePart = state.familiesUsed.size > 0 ? {
+		path: FONT_TABLE_PART,
+		data: encoder.encode(fontTableXml(state.familiesUsed, embedded?.elements)),
+		contentType: FONT_TABLE_CONTENT_TYPE
+	} : void 0;
+	if (fontTablePart) docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_FONT_TABLE,
+		target: "fontTable.xml",
+		targetMode: "Internal"
+	});
+	const settings = settingsXml(flow, sections, (embedded?.parts.length ?? 0) > 0);
+	const settingsPart = settings !== void 0 ? {
+		path: SETTINGS_PART,
+		data: encoder.encode(settings),
+		contentType: SETTINGS_CONTENT_TYPE
+	} : void 0;
+	if (settingsPart) docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_SETTINGS,
+		target: "settings.xml",
+		targetMode: "Internal"
+	});
+	const stylesPart = {
+		path: STYLES_PART,
+		data: encoder.encode(stylesXml()),
+		contentType: STYLES_CONTENT_TYPE
+	};
+	docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_STYLES,
+		target: "styles.xml",
+		targetMode: "Internal"
+	});
 	const partRelationships = [...docScope.rels.length > 0 ? [{
 		sourcePart: "word/document.xml",
 		relationships: docScope.rels
@@ -191,11 +260,16 @@ function writeDocx(flow) {
 					data: encoder.encode(documentXml),
 					contentType: DOC_CONTENT_TYPE
 				},
+				stylesPart,
 				...numberingPart ? [numberingPart] : [],
+				...fontTablePart ? [fontTablePart] : [],
+				...settingsPart ? [settingsPart] : [],
 				...extraParts,
 				...state.chartParts,
-				...state.mediaParts
+				...state.mediaParts,
+				...embedded?.parts ?? []
 			],
+			...(embedded?.parts.length ?? 0) > 0 ? { defaultsByExtension: { odttf: OBFUSCATED_FONT_CONTENT_TYPE } } : {},
 			rootRelationships: [{
 				id: "rId1",
 				type: REL_OFFICE_DOCUMENT,
@@ -207,6 +281,89 @@ function writeDocx(flow) {
 		losses
 	};
 }
+/**
+* §17.15.1.78 `w:settings` — the document-wide settings the model carries, in
+* the order CT_Settings declares them: `w:embedTrueTypeFonts` and
+* `w:saveSubsetFonts` (§17.15.1.42, .74) where the package embeds its faces,
+* `w:gutterAtTop` (§17.15.1.49), `w:evenAndOddHeaders` (§17.15.1.36, which a
+* section carries in the model), and inside `w:compat` §17.15.3.4's
+* `w:doNotExpandShiftReturn` before the version of Word the document is laid
+* out for ([MS-DOCX] `w:compatSetting` `compatibilityMode`), which CT_Compat
+* keeps last.
+*
+* @param flow        The document.
+* @param sections    The sections being written.
+* @param embedsFonts Whether the package embeds fonts — which then stay
+*                    embedded, as subsets, when the document is saved again.
+* @returns The part's XML, or undefined where the document states none.
+*/
+function settingsXml(flow, sections, embedsFonts) {
+	const parts = [];
+	if (embedsFonts) parts.push("<w:embedTrueTypeFonts/><w:saveSubsetFonts/>");
+	if (flow.gutterAtTop === true) parts.push("<w:gutterAtTop/>");
+	if (sections.some((sec) => sec.properties.evenAndOddHeaders === true)) parts.push("<w:evenAndOddHeaders/>");
+	const compat = [...flow.doNotExpandShiftReturn === true ? ["<w:doNotExpandShiftReturn/>"] : [], ...flow.compatibilityMode !== void 0 ? [`<w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="${String(flow.compatibilityMode)}"/>`] : []];
+	if (compat.length > 0) parts.push(`<w:compat>${compat.join("")}</w:compat>`);
+	if (parts.length === 0) return void 0;
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:settings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">${parts.join("")}</w:settings>`;
+}
+/**
+* §17.7.2 `w:styles` — what a property the document states nowhere IS: the
+* values the model resolves an empty sheet to (`DEFAULT_RUN`, `DEFAULT_PARA`
+* — the very values a run or paragraph is written without), as §17.7.5
+* `w:docDefaults`, under an empty default paragraph style (§17.7.4.17).
+*
+* A package with no styles part leaves them to its reader, and Word fills
+* them from its own template's Normal: 8pt after every paragraph, lines 1.08
+* apart, runs in 12pt — so every paragraph of a reconstruction stood 8pt
+* further down than its page set it, and a run of the model's own 11pt, which
+* states no size, was set in 12.
+*/
+function stylesXml() {
+	const size = Math.round(DEFAULT_RUN.fontSizePt * 2);
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:styles xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:docDefaults><w:rPrDefault><w:rPr><w:sz w:val="${size}"/><w:szCs w:val="${size}"/></w:rPr></w:rPrDefault><w:pPrDefault><w:pPr>${DEFAULT_PARA.widowControl ? "<w:widowControl/>" : "<w:widowControl w:val=\"0\"/>"}${`<w:spacing w:before="${twips(DEFAULT_PARA.spacingBefore)}" w:after="${twips(DEFAULT_PARA.spacingAfter)}" w:line="${twips(DEFAULT_PARA.spacingLine)}" w:lineRule="${DEFAULT_PARA.spacingLineRule}"/>`}</w:pPr></w:pPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/></w:style></w:styles>`;
+}
+function fontTableXml(families, embeds) {
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${[...families.values()].map((f) => `<w:font w:name="${escapeAttr(f.family)}"><w:family w:val="${f.generic}"/><w:pitch w:val="${f.generic === "modern" ? "fixed" : "variable"}"/>${embeds?.get(f.family) ?? ""}</w:font>`).join("")}</w:fonts>`;
+}
+/**
+* §20.4.2.3 `relativeHeight` — a float's z-order, written the way Word writes
+* it: a rank over every z-order the document states, counted up from Word's
+* own floor.
+*
+* The model's z-order is an ORDER, and may be any number. Written as it stood,
+* a PDF's first two marks got 0 and 1 — which Word, and LibreOffice after it,
+* read as "above everything": an "APPROVED" stamp's blue box came back over
+* its own lettering. A tagged reading counts up from minus a million, and a
+* negative number is not a value the attribute admits at all.
+*/
+function relativeHeight(zOrder, state) {
+	const at = (zOrder !== void 0 ? state.zRanks.get(zOrder) : void 0) ?? state.zRanks.size + ++state.drawingSeq;
+	const step = Math.max(1, Math.min(Z_STEP, Math.floor((Z_CEILING - Z_FLOOR) / Z_ROOM)));
+	return Math.min(Z_FLOOR + at * step, Z_CEILING);
+}
+/** Word's first float, and the highest value §20.4.2.3 lets a float take. */
+var Z_FLOOR = 251658240;
+var Z_CEILING = 503316479;
+/** …and the step Word counts up in, while there is room for it. */
+var Z_STEP = 1024;
+var Z_ROOM = 1 << 17;
+/** Every z-order the document's floats state, and each one's rank among them. */
+function zRanksOf(flow) {
+	const seen = /* @__PURE__ */ new Set();
+	const visit = (blocks) => {
+		for (const el of blocks) {
+			const z = el.kind === "image" ? el.image.float?.zOrder : el.kind === "shape" ? el.shape.float?.zOrder : el.kind === "chart" ? el.chart.float?.zOrder : void 0;
+			if (z !== void 0 && Number.isFinite(z)) seen.add(z);
+			if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+		}
+	};
+	visit(flow.body);
+	for (const band of flow.headersFooters?.values() ?? []) visit(band);
+	for (const note of flow.footnotes?.values() ?? []) visit(note);
+	for (const note of flow.endnotes?.values() ?? []) visit(note);
+	return new Map([...seen].sort((a, b) => a - b).map((z, i) => [z, i]));
+}
 function emitNotes(notes, cfg, state, losses, docScope, extraParts, extraPartRels) {
 	if (!notes || notes.size === 0) return;
 	const scope = newScope();
@@ -218,7 +375,8 @@ function emitNotes(notes, cfg, state, losses, docScope, extraParts, extraPartRel
 		for (const el of content) emitBlock(inner, el, losses, state, scope);
 		noteXmls.push(`<${cfg.noteTag} w:id="${escapeAttr(id)}">${inner.join("") || "<w:p/>"}</${cfg.noteTag}>`);
 	}
-	const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><${cfg.rootTag} xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">` + stub("separator", -1, "<w:separator/>") + stub("continuationSeparator", 0, "<w:continuationSeparator/>") + noteXmls.join("") + `</${cfg.rootTag}>`;
+	const notesXml = noteXmls.join("");
+	const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><${cfg.rootTag}${rootNamespaces(notesXml)}>` + stub("separator", -1, "<w:separator/>") + stub("continuationSeparator", 0, "<w:continuationSeparator/>") + notesXml + `</${cfg.rootTag}>`;
 	extraParts.push({
 		path: cfg.partPath,
 		data: encoder.encode(xml),
@@ -324,7 +482,8 @@ function emitHeadersFooters(flow, section, state, docScope, extraParts, extraPar
 		const scope = newScope();
 		const inner = [];
 		for (const el of content) emitBlock(inner, el, losses, state, scope);
-		const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><${root} xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${inner.join("")}</${root}>`;
+		const bandXml = inner.join("");
+		const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><${root}${rootNamespaces(bandXml)}>${bandXml}</${root}>`;
 		extraParts.push({
 			path,
 			data: encoder.encode(xml),
@@ -368,7 +527,7 @@ function emitHeadersFooters(flow, section, state, docScope, extraParts, extraPar
 var docxWriter = {
 	id: "docx",
 	consumes: "flow",
-	supports: new Set([FEATURES.text]),
+	supports: new Set([FEATURES.text, FEATURES.fontsEmbedding]),
 	write: (doc) => writeDocx(doc)
 };
 /**
@@ -388,14 +547,17 @@ var docxWriter = {
 */
 function emitBody(out, blocks, losses, state, scope, sectPrByClosingIndex) {
 	let carried = [];
+	let carrier;
 	const flush = () => {
-		if (carried.length > 0) out.push(`<w:p>${carried.join("")}</w:p>`);
+		if (carried.length > 0) out.push(`<w:p>${pPrWithSect(carrier ?? {})}${carried.join("")}</w:p>`);
 		carried = [];
+		carrier = void 0;
 	};
 	blocks.forEach((el, idx) => {
 		const closing = sectPrByClosingIndex.get(idx);
 		const anchored = closing === void 0 ? floatingDrawingRun(el, losses, state, scope) : void 0;
 		if (anchored !== void 0) {
+			carrier ??= el.kind === "image" ? el.image.paragraphProperties : el.kind === "shape" ? el.shape.paragraphProperties : void 0;
 			carried.push(anchored);
 			return;
 		}
@@ -411,7 +573,7 @@ function emitBody(out, blocks, losses, state, scope, sectPrByClosingIndex) {
 */
 function floatingDrawingRun(el, losses, state, scope) {
 	if (el.kind === "image" && el.image.float) {
-		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float);
+		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float, el.image);
 		if (drawing === "") {
 			losses.push({
 				severity: "dropped",
@@ -435,7 +597,7 @@ function emitBlock(out, el, losses, state, scope, closingSectPr) {
 		return;
 	}
 	if (el.kind === "image") {
-		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float);
+		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float, el.image);
 		if (drawing) out.push(`<w:p>${pPrWithSect(el.image.paragraphProperties, closingSectPr)}<w:r>${drawing}</w:r></w:p>`);
 		else {
 			losses.push({
@@ -514,7 +676,7 @@ function drawingFrame(float, cx, cy, head, graphic, state, rotation60k) {
 	const emu = (pt) => Number.isFinite(pt) ? Math.round((pt ?? 0) * EMU_PER_PT) : 0;
 	const d = float.wrapDist;
 	const dist = ` distT="${String(emu(d?.topPt))}" distB="${String(emu(d?.bottomPt))}" distL="${String(emu(d?.leftPt))}" distR="${String(emu(d?.rightPt))}"`;
-	const z = float.zOrder ?? ++state.drawingSeq;
+	const z = relativeHeight(float.zOrder, state);
 	const attrs = `${dist} simplePos="0" relativeHeight="${String(z)}" behindDoc="${float.behind ? "1" : "0"}" locked="0" layoutInCell="${float.inCell === false ? "0" : "1"}" allowOverlap="1"`;
 	const pos = (tag, p, fallback) => {
 		const from = p?.relativeFrom ?? fallback;
@@ -550,7 +712,7 @@ function effectExtentXml(cx, cy, rotation60k) {
 	const v = overhang(cy, cx * s + cy * c);
 	return h === 0 && v === 0 ? none : `<wp:effectExtent l="${String(h)}" t="${String(v)}" r="${String(h)}" b="${String(v)}"/>`;
 }
-function drawingXml(resource, widthPt, heightPt, altText, state, scope, float) {
+function drawingXml(resource, widthPt, heightPt, altText, state, scope, float, look) {
 	if (resource === void 0) return "";
 	const relId = mediaRelId(resource, state, scope);
 	if (relId === void 0) return "";
@@ -558,8 +720,15 @@ function drawingXml(resource, widthPt, heightPt, altText, state, scope, float) {
 	const cy = Math.round(heightPt * EMU_PER_PT);
 	const id = ++state.drawingSeq;
 	const descr = altText ? ` descr="${escapeAttr(altText)}"` : "";
-	const graphic = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="${id}" name="Image ${id}"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${relId}"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic>`;
-	return drawingFrame(float, cx, cy, `<wp:docPr id="${id}" name="Image ${id}"${descr}/>`, graphic, state);
+	const graphic = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="${id}" name="Image ${id}"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${relId}">${look?.alpha !== void 0 && look.alpha < 1 ? `<a:alphaModFix amt="${String(Math.round(Math.max(0, look.alpha) * 1e5))}"/>` : ""}</a:blip>${srcRectXml(look?.crop)}<a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr>${xfrmXml(look, cx, cy)}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic>`;
+	return drawingFrame(float, cx, cy, `<wp:docPr id="${id}" name="Image ${id}"${descr}/>`, graphic, state, look?.rotation60k);
+}
+/** §20.1.8.55 `a:srcRect` — each edge cut away, in thousandths of a percent. */
+function srcRectXml(crop) {
+	if (!crop) return "";
+	const edge = (name, v) => v > 0 ? ` ${name}="${String(Math.round(v * 1e5))}"` : "";
+	const attrs = edge("l", crop.left) + edge("t", crop.top) + edge("r", crop.right) + edge("b", crop.bottom);
+	return attrs === "" ? "" : `<a:srcRect${attrs}/>`;
 }
 var WPS_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 function shapeDrawingXml(shape, losses, state, scope) {
@@ -567,13 +736,76 @@ function shapeDrawingXml(shape, losses, state, scope) {
 	const cy = Math.round(shape.height * EMU_PER_PT);
 	const id = ++state.drawingSeq;
 	const descr = shape.altText ? ` descr="${escapeAttr(shape.altText)}"` : "";
-	const spPr = `<wps:spPr>${xfrmXml(shape.transform, cx, cy)}${geomXml(shape.geometry)}${fillXml(shape.fill)}${shape.line ? lineXml(shape.line) : ""}</wps:spPr>`;
-	const txbx = shape.text ? txbxXml(shape.text, losses, state, scope) : "";
-	const graphic = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="${WPS_URI}"><wps:wsp xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"><wps:cNvSpPr/>` + spPr + txbx + bodyPrXml(shape.text) + "</wps:wsp></a:graphicData></a:graphic>";
+	const members = shape.children ?? [];
+	const graphic = "<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\">" + (members.length > 0 ? `<a:graphicData uri="${WPG_URI}">` + groupXml("wpg:wgp", members, {
+		x: 0,
+		y: 0,
+		cx,
+		cy
+	}, losses, state, scope) : `<a:graphicData uri="${WPS_URI}">` + wspXml(shape, cx, cy, void 0, losses, state, scope)) + "</a:graphicData></a:graphic>";
 	return drawingFrame(shape.float, cx, cy, `<wp:docPr id="${id}" name="Shape ${id}"${descr}/>`, graphic, state, shape.transform?.rotation60k);
 }
-function xfrmXml(t, cx, cy) {
-	return `<a:xfrm${t?.rotation60k !== void 0 ? ` rot="${t.rotation60k}"` : ""}${t?.flipH ? " flipH=\"1\"" : ""}${t?.flipV ? " flipV=\"1\"" : ""}><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm>`;
+/**
+* `wps:wsp` — one shape: its box, geometry, fill and outline, and the text it
+* holds. `id` is its own `wps:cNvPr` inside a group, where the members name
+* themselves; a shape alone is named by the frame's `wp:docPr`.
+*/
+function wspXml(shape, cx, cy, member, losses, state, scope) {
+	const spPr = `<wps:spPr>${xfrmXml(shape.transform, cx, cy, member)}${geomXml(shape.geometry)}${fillXml(shape.fill)}${shape.line ? lineXml(shape.line) : ""}</wps:spPr>`;
+	const txbx = shape.text ? txbxXml(shape.text, losses, state, scope) : "";
+	return `<wps:wsp xmlns:wps="${WPS_URI}">` + (member ? `<wps:cNvPr id="${member.id}" name="Shape ${member.id}"/>` : "") + "<wps:cNvSpPr/>" + spPr + txbx + bodyPrXml(shape.text) + "</wps:wsp>";
+}
+var WPG_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
+/**
+* §20.5.2.17 `wpg:wgp` / `wpg:grpSp` — a group: its box, and its members in
+* the order they are painted. The members are placed in a child space the
+* same as the box, so a member's offset from the group's corner is its offset
+* in the file. The inverse of drawing-parser's `groupChildren`.
+*
+* Written as one shape, the group came back an empty box: a figure's paths
+* and labels were thrown away with it.
+*/
+function groupXml(tag, members, box, losses, state, scope) {
+	return `<${tag}${tag === "wpg:wgp" ? ` xmlns:wpg="${WPG_URI}"` : ""}><wpg:cNvGrpSpPr/><wpg:grpSpPr>${`<a:xfrm><a:off x="${box.x}" y="${box.y}"/><a:ext cx="${box.cx}" cy="${box.cy}"/><a:chOff x="0" y="0"/><a:chExt cx="${box.cx}" cy="${box.cy}"/></a:xfrm>`}</wpg:grpSpPr>${members.map((m) => memberXml(m, losses, state, scope)).join("")}</${tag}>`;
+}
+/**
+* One member of a group: a group of its own, a picture (`pic:pic`, a shape
+* whose fill is the picture — how the reader brings one in), or a shape.
+*/
+function memberXml(member, losses, state, scope) {
+	const s = member.shape;
+	const x = Math.round(member.xPt * EMU_PER_PT);
+	const y = Math.round(member.yPt * EMU_PER_PT);
+	const cx = Math.round(s.width * EMU_PER_PT);
+	const cy = Math.round(s.height * EMU_PER_PT);
+	if (s.children !== void 0 && s.children.length > 0) return groupXml("wpg:grpSp", s.children, {
+		x,
+		y,
+		cx,
+		cy
+	}, losses, state, scope);
+	const id = ++state.drawingSeq;
+	if (s.fill.kind !== "picture") return wspXml(s, cx, cy, {
+		id,
+		x,
+		y
+	}, losses, state, scope);
+	const relId = s.fill.imageResource !== void 0 ? mediaRelId(s.fill.imageResource, state, scope) : void 0;
+	if (relId === void 0) {
+		losses.push({
+			severity: "dropped",
+			feature: FEATURES.images,
+			detail: imageRefusal(s.fill.imageResource, state)
+		});
+		return "";
+	}
+	return `<pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="${id}" name="Image ${id}"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${relId}">${s.fill.alpha !== void 0 && s.fill.alpha < 1 ? `<a:alphaModFix amt="${String(Math.round(Math.max(0, s.fill.alpha) * 1e5))}"/>` : ""}</a:blip>${srcRectXml(s.fill.imageCrop)}<a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr>${xfrmXml(s.transform, cx, cy, {
+		x,
+		y
+	})}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic>`;
+}
+function xfrmXml(t, cx, cy, at) {
+	return `<a:xfrm${t?.rotation60k !== void 0 ? ` rot="${t.rotation60k}"` : ""}${t?.flipH ? " flipH=\"1\"" : ""}${t?.flipV ? " flipV=\"1\"" : ""}><a:off x="${at?.x ?? 0}" y="${at?.y ?? 0}"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm>`;
 }
 /**
 * The factor that carries a path into whole units, and the space it lands in.
@@ -599,7 +831,7 @@ function pathScale(g) {
 	else if (c.cmd === "quad") values.push(c.x1, c.y1, c.x, c.y);
 	else if (c.cmd === "arc") values.push(c.wR, c.hR);
 	if (values.every((v) => Number.isInteger(v))) return 1;
-	const span = Math.max(...values.map((v) => Number.isFinite(v) ? Math.abs(v) : 0), 1);
+	const span = values.reduce((most, v) => Number.isFinite(v) ? Math.max(most, Math.abs(v)) : most, 1);
 	return Math.max(1, Math.floor(PATH_SPACE / span));
 }
 function geomXml(g) {
@@ -624,13 +856,24 @@ function geomXml(g) {
 	return `<a:prstGeom prst="${escapeAttr(g.preset ?? "rect")}"><a:avLst>${gds}</a:avLst></a:prstGeom>`;
 }
 function fillXml(f) {
-	if (f.kind === "solid" && f.colorHex) return `<a:solidFill><a:srgbClr val="${f.colorHex}"/></a:solidFill>`;
-	if (f.kind === "gradient" && f.gradient) return gradFillXml(f.gradient);
+	if (f.kind === "solid" && f.colorHex) return `<a:solidFill>${srgbXml(f.colorHex, f.alpha)}</a:solidFill>`;
+	if (f.kind === "gradient" && f.gradient) return gradFillXml(f.gradient, f.alpha);
 	return "<a:noFill/>";
 }
-function gradFillXml(g) {
+/**
+* §20.1.2.3.19 `a:srgbClr`, with the §20.1.2.3.1 `a:alpha` of a fill that is
+* seen through. The model carried the opacity and the writer dropped it:
+* bug1755507.pdf lays a card on a shadow painted at a fifth of full strength,
+* and the shadow came back as a solid black slab around the card.
+*/
+function srgbXml(colorHex, alpha) {
+	if (alpha === void 0 || !(alpha < 1)) return `<a:srgbClr val="${colorHex}"/>`;
+	const val = Math.round(Math.max(0, alpha) * 1e5);
+	return `<a:srgbClr val="${colorHex}"><a:alpha val="${String(val)}"/></a:srgbClr>`;
+}
+function gradFillXml(g, alpha) {
 	return `<a:gradFill><a:gsLst>${g.stops.map((s) => {
-		return `<a:gs pos="${Math.round(Math.max(0, Math.min(1, s.offset)) * 1e5)}"><a:srgbClr val="${s.colorHex}"/></a:gs>`;
+		return `<a:gs pos="${Math.round(Math.max(0, Math.min(1, s.offset)) * 1e5)}">${srgbXml(s.colorHex, alpha)}</a:gs>`;
 	}).join("")}</a:gsLst>${g.kind === "radial" ? "<a:path path=\"circle\"/>" : `<a:lin ang="${Math.round(((g.angle ?? 0) % 360 + 360) % 360 * 6e4)}" scaled="1"/>`}</a:gradFill>`;
 }
 function lineXml(l) {
@@ -638,8 +881,13 @@ function lineXml(l) {
 	const cap = l.cap === "round" ? " cap=\"rnd\"" : l.cap === "square" ? " cap=\"sq\"" : l.cap === "flat" ? " cap=\"flat\"" : "";
 	const inner = [];
 	if (l.fill === "none") inner.push("<a:noFill/>");
-	else if (l.colorHex) inner.push(`<a:solidFill><a:srgbClr val="${l.colorHex}"/></a:solidFill>`);
-	if (l.dash) inner.push(`<a:prstDash val="${l.dash}"/>`);
+	else if (l.colorHex) inner.push(`<a:solidFill>${srgbXml(l.colorHex, l.alpha)}</a:solidFill>`);
+	const custom = l.customDash ?? [];
+	if (custom.length >= 2) {
+		const pairs = [];
+		for (let i = 0; i + 1 < custom.length; i += 2) pairs.push(`<a:ds d="${Math.round(custom[i] * 1e5)}" sp="${Math.round(custom[i + 1] * 1e5)}"/>`);
+		inner.push(`<a:custDash>${pairs.join("")}</a:custDash>`);
+	} else if (l.dash) inner.push(`<a:prstDash val="${l.dash}"/>`);
 	return `<a:ln${w}${cap}>${inner.join("")}</a:ln>`;
 }
 function txbxXml(text, losses, state, scope) {
@@ -651,7 +899,7 @@ function bodyPrXml(text) {
 	if (!text) return "<wps:bodyPr/>";
 	const ins = (v, name) => v !== void 0 ? ` ${name}="${Math.round(v * EMU_PER_PT)}"` : "";
 	const anchor = text.anchor ? ` anchor="${text.anchor}"` : "";
-	return "<wps:bodyPr" + ins(text.insetLeft, "lIns") + ins(text.insetTop, "tIns") + ins(text.insetRight, "rIns") + ins(text.insetBottom, "bIns") + anchor + "/>";
+	return "<wps:bodyPr" + (text.noWrap === true ? " wrap=\"none\"" : "") + ins(text.insetLeft, "lIns") + ins(text.insetTop, "tIns") + ins(text.insetRight, "rIns") + ins(text.insetBottom, "bIns") + anchor + "/>";
 }
 function mediaRelId(resource, state, scope) {
 	const existingRel = scope.relIdByResource.get(resource);
@@ -702,8 +950,10 @@ function tblPrXml(p) {
 		out.push(`<w:tblW w:w="${w}" w:type="${p.widthType}"/>`);
 	}
 	if (p.alignment && p.alignment !== "left") out.push(`<w:jc w:val="${p.alignment}"/>`);
+	if (p.indentPt !== void 0 && p.indentPt !== 0) out.push(`<w:tblInd w:w="${twips(p.indentPt)}" w:type="dxa"/>`);
 	const borders = bordersXml("w:tblBorders", p.borders);
 	if (borders) out.push(borders);
+	if (p.layout === "fixed") out.push("<w:tblLayout w:type=\"fixed\"/>");
 	const margins = cellMarginsXml("w:tblCellMar", p.defaultCellMargins);
 	if (margins) out.push(margins);
 	return `<w:tblPr>${out.join("")}</w:tblPr>`;
@@ -747,15 +997,20 @@ var BORDER_SIDES = [
 ];
 function bordersXml(tag, borders) {
 	if (!borders) return "";
-	const sides = BORDER_SIDES.map(([key, el]) => {
+	const sides = BORDER_SIDES.map(([key, name]) => {
 		const b = borders[key];
 		if (!b) return "";
+		if (tag === "w:pBdr" && key === "insideV") return "";
+		const el = tag === "w:pBdr" && key === "insideH" ? "w:between" : name;
 		const sz = b.width !== void 0 ? ` w:sz="${Math.round(b.width * 8)}"` : "";
+		const space = b.spacePt !== void 0 && Math.round(b.spacePt) > 0 ? ` w:space="${Math.min(Math.round(b.spacePt), MOST_BORDER_SPACE_PT)}"` : "";
 		const color = b.colorHex !== void 0 ? ` w:color="${b.colorHex}"` : "";
-		return `<${el} w:val="${b.style}"${sz}${color}/>`;
+		return `<${el} w:val="${b.style}"${sz}${space}${color}/>`;
 	}).join("");
 	return sides ? `<${tag}>${sides}</${tag}>` : "";
 }
+/** §17.3.4 — the farthest a border may stand off its text, in points. */
+var MOST_BORDER_SPACE_PT = 31;
 function cellMarginsXml(tag, margins) {
 	if (!margins) return "";
 	const inner = [
@@ -809,10 +1064,10 @@ function hyperlinkXml(run, inner, _state, scope) {
 }
 function runXml(run, state, scope) {
 	if (run.math !== void 0) return `<m:oMath xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">${omathXml(run.math)}</m:oMath>`;
-	const rPr = rPrXml(run.properties);
+	const rPr = rPrXml(run.properties, state);
 	if (run.inlineImage !== void 0) {
 		const img = run.inlineImage;
-		const drawing = drawingXml(img.resource, img.width, img.height, void 0, state, scope);
+		const drawing = drawingXml(img.resource, img.width, img.height, void 0, state, scope, void 0, img);
 		if (drawing) return `<w:r>${rPr}${drawing}</w:r>`;
 		if (run.text === "" && !run.pageBreak) return "";
 	}
@@ -822,27 +1077,41 @@ function runXml(run, state, scope) {
 	if (run.commentRef !== void 0) return `<w:r>${rPr}<w:commentReference w:id="${escapeAttr(run.commentRef)}"/></w:r>`;
 	const brk = run.pageBreak ? "<w:br w:type=\"page\"/>" : "";
 	if (run.field !== void 0 && run.text !== "") {
-		const inner = `<w:r>${rPr}<w:t xml:space="preserve">${escapeXml(run.text)}</w:t></w:r>`;
-		return `<w:fldSimple w:instr=" ${run.field} ">${inner}</w:fldSimple>${brk}`;
+		const piece = (inner) => `<w:r>${rPr}${inner}</w:r>`;
+		return piece("<w:fldChar w:fldCharType=\"begin\"/>") + piece(`<w:instrText xml:space="preserve"> ${run.field} </w:instrText>`) + piece("<w:fldChar w:fldCharType=\"separate\"/>") + piece(`<w:t xml:space="preserve">${escapeXml(run.text)}</w:t>`) + piece("<w:fldChar w:fldCharType=\"end\"/>") + brk;
 	}
 	if (run.text === "") return brk ? `<w:r>${rPr}${brk}</w:r>` : "";
-	return `<w:r>${rPr}${run.text.split("	").map((piece) => piece === "" ? "" : `<w:t xml:space="preserve">${escapeXml(piece)}</w:t>`).join("<w:tab/>")}${brk}</w:r>`;
+	const lineBreak = run.columnBreak ? "<w:br w:type=\"column\"/>" : "<w:br/>";
+	return `<w:r>${rPr}${run.text.split("	").map((piece) => piece.split("\n").map((line) => line === "" ? "" : `<w:t xml:space="preserve">${escapeXml(line)}</w:t>`).join(lineBreak)).join("<w:tab/>")}${brk}</w:r>`;
 }
-function rPrXml(r) {
+function rPrXml(r, state) {
 	const out = [];
 	const states = (key) => r[key] !== void 0 && r[key] !== DEFAULT_RUN[key];
-	const fonts = rFontsXml(r.fontFamily);
+	const fonts = rFontsXml(r.fontFamily, state);
 	if (fonts) out.push(fonts);
-	if (states("bold")) out.push(toggle("w:b", r.bold));
-	if (states("italic")) out.push(toggle("w:i", r.italic));
+	if (states("bold")) out.push(toggle("w:b", r.bold), toggle("w:bCs", r.bold));
+	if (states("italic")) out.push(toggle("w:i", r.italic), toggle("w:iCs", r.italic));
 	if (states("strike")) out.push(toggle("w:strike", r.strike));
 	if (states("colorHex")) out.push(`<w:color w:val="${r.colorHex}"/>`);
-	if (states("fontSizePt")) out.push(`<w:sz w:val="${Math.round(r.fontSizePt * 2)}"/>`);
+	if (r.letterSpacingPt !== void 0 && r.letterSpacingPt !== 0) {
+		const twips = Math.round(r.letterSpacingPt * 20);
+		if (twips !== 0) out.push(`<w:spacing w:val="${String(twips)}"/>`);
+	}
+	if (r.widthScale !== void 0) {
+		const percent = Math.min(600, Math.max(1, Math.round(r.widthScale * 100)));
+		if (percent !== 100) out.push(`<w:w w:val="${String(percent)}"/>`);
+	}
+	if (r.kerningMinPt !== void 0 && states("kerningMinPt")) out.push(`<w:kern w:val="${Math.round(r.kerningMinPt * 2)}"/>`);
+	if (states("fontSizePt")) {
+		const half = Math.round(r.fontSizePt * 2);
+		out.push(`<w:sz w:val="${half}"/>`, `<w:szCs w:val="${half}"/>`);
+	}
 	if (states("underline")) out.push(underlineXml(r));
 	if (r.shadingColorHex !== void 0) out.push(runShdXml(r.shadingColorHex));
 	if (states("verticalAlign")) out.push(`<w:vertAlign w:val="${r.verticalAlign}"/>`);
 	if (states("rtl")) out.push(toggle("w:rtl", r.rtl));
 	if (r.lang !== void 0) out.push(`<w:lang w:val="${escapeAttr(r.lang)}"/>`);
+	if (r.ligatures !== void 0 && states("ligatures")) out.push(`<w14:ligatures w14:val="${r.ligatures}"/>`);
 	return out.length > 0 ? `<w:rPr>${out.join("")}</w:rPr>` : "";
 }
 function underlineXml(r) {
@@ -854,17 +1123,14 @@ function runShdXml(fill) {
 }
 function pPrBody(p) {
 	const out = [];
-	if (p.numbering) out.push(`<w:numPr><w:ilvl w:val="${p.numbering.ilvl}"/><w:numId w:val="${escapeAttr(p.numbering.numId)}"/></w:numPr>`);
-	if (p.outlineLevel !== void 0) out.push(`<w:outlineLvl w:val="${p.outlineLevel}"/>`);
+	if (p.keepNext) out.push("<w:keepNext/>");
+	if (p.keepLines) out.push("<w:keepLines/>");
 	if (p.pageBreakBefore) out.push("<w:pageBreakBefore/>");
-	if (p.bidi !== DEFAULT_PARA.bidi) out.push(toggle("w:bidi", p.bidi));
-	const ind = indXml(p);
-	if (ind) out.push(ind);
-	const spacing = spacingXml(p);
-	if (spacing) out.push(spacing);
-	if (JC.has(p.alignment) && p.alignment !== DEFAULT_PARA.alignment) out.push(`<w:jc w:val="${p.alignment}"/>`);
+	if (p.widowControl === false) out.push("<w:widowControl w:val=\"0\"/>");
+	if (p.numbering) out.push(`<w:numPr><w:ilvl w:val="${p.numbering.ilvl}"/><w:numId w:val="${escapeAttr(p.numbering.numId)}"/></w:numPr>`);
 	const pBdr = bordersXml("w:pBdr", p.borders);
 	if (pBdr) out.push(pBdr);
+	if (p.shading) out.push(`<w:shd w:val="clear" w:color="auto" w:fill="${p.shading.colorHex}"/>`);
 	const tabs = p.tabs ?? [];
 	if (tabs.length > 0) {
 		const stops = tabs.map((t) => {
@@ -874,6 +1140,13 @@ function pPrBody(p) {
 		}).join("");
 		out.push(`<w:tabs>${stops}</w:tabs>`);
 	}
+	if (p.bidi !== void 0 && p.bidi !== DEFAULT_PARA.bidi) out.push(toggle("w:bidi", p.bidi));
+	const spacing = spacingXml(p);
+	if (spacing) out.push(spacing);
+	const ind = indXml(p);
+	if (ind) out.push(ind);
+	if (JC.has(p.alignment) && p.alignment !== DEFAULT_PARA.alignment) out.push(`<w:jc w:val="${p.alignment}"/>`);
+	if (p.outlineLevel !== void 0) out.push(`<w:outlineLvl w:val="${p.outlineLevel}"/>`);
 	return out.join("");
 }
 function pPrWithSect(p, closingSectPr) {
@@ -914,18 +1187,26 @@ function spacingXml(p) {
 	const attrs = [];
 	if (stated(p.spacingBefore) && p.spacingBefore !== DEFAULT_PARA.spacingBefore) attrs.push(`w:before="${twips(p.spacingBefore)}"`);
 	if (stated(p.spacingAfter) && p.spacingAfter !== DEFAULT_PARA.spacingAfter) attrs.push(`w:after="${twips(p.spacingAfter)}"`);
-	if ((p.spacingLineRule !== DEFAULT_PARA.spacingLineRule || p.spacingLine !== DEFAULT_PARA.spacingLine) && p.spacingLine > 0) {
-		const lineVal = p.spacingLineRule === "auto" ? Math.round(p.spacingLine * 12) : twips(p.spacingLine);
-		attrs.push(`w:line="${lineVal}"`, `w:lineRule="${p.spacingLineRule}"`);
-	}
+	if ((p.spacingLineRule !== DEFAULT_PARA.spacingLineRule || p.spacingLine !== DEFAULT_PARA.spacingLine) && p.spacingLine > 0) attrs.push(`w:line="${twips(p.spacingLine)}"`, `w:lineRule="${p.spacingLineRule}"`);
 	return attrs.length > 0 ? `<w:spacing ${attrs.join(" ")}/>` : "";
 }
-function rFontsXml(fonts) {
+function rFontsXml(fonts, state) {
+	if (fonts === void 0) return "";
 	const d = DEFAULT_RUN.fontFamily;
+	const family = (name) => {
+		const known = state?.faceFamilies?.get(name);
+		if (known === void 0) return name;
+		state?.familiesUsed.set(known.family, known);
+		if (state?.faceOutlines?.has(name) === true) state.facesUsed.add(name);
+		return known.family;
+	};
 	const attrs = [];
-	if (fonts.ascii && fonts.ascii !== d.ascii) attrs.push(`w:ascii="${escapeAttr(fonts.ascii)}"`);
-	if (fonts.hAnsi && fonts.hAnsi !== d.hAnsi) attrs.push(`w:hAnsi="${escapeAttr(fonts.hAnsi)}"`);
-	if (fonts.cs && fonts.cs !== d.cs) attrs.push(`w:cs="${escapeAttr(fonts.cs)}"`);
+	if (fonts.ascii && fonts.ascii !== d.ascii) attrs.push(`w:ascii="${escapeAttr(family(fonts.ascii))}"`);
+	if (fonts.hAnsi && fonts.hAnsi !== d.hAnsi) attrs.push(`w:hAnsi="${escapeAttr(family(fonts.hAnsi))}"`);
+	const face = fonts.ascii !== void 0 && state?.faceFamilies?.has(fonts.ascii) === true ? family(fonts.ascii) : void 0;
+	if (face !== void 0 && fonts.eastAsia === void 0) attrs.push(`w:eastAsia="${escapeAttr(face)}"`);
+	if (fonts.cs && fonts.cs !== d.cs) attrs.push(`w:cs="${escapeAttr(family(fonts.cs))}"`);
+	else if (face !== void 0) attrs.push(`w:cs="${escapeAttr(face)}"`);
 	return attrs.length > 0 ? `<w:rFonts ${attrs.join(" ")}/>` : "";
 }
 function toggle(tag, on) {
@@ -1003,8 +1284,14 @@ function sectPrXml(s, hf) {
 		const footer = m.footer !== void 0 ? ` w:footer="${twips(m.footer)}"` : "";
 		parts.push(`<w:pgMar w:top="${twips(m.top)}" w:right="${twips(m.right)}" w:bottom="${twips(m.bottom)}" w:left="${twips(m.left)}"${header}${footer}/>`);
 	}
+	if (s.pageNumberFormat !== void 0 || s.pageNumberStart !== void 0) {
+		const fmt = s.pageNumberFormat !== void 0 ? ` w:fmt="${s.pageNumberFormat}"` : "";
+		const start = s.pageNumberStart !== void 0 ? ` w:start="${String(s.pageNumberStart)}"` : "";
+		parts.push(`<w:pgNumType${fmt}${start}/>`);
+	}
 	if (s.columns) parts.push(colsXml(s.columns));
 	if (s.titlePg) parts.push("<w:titlePg/>");
+	if (s.textDirection) parts.push(`<w:textDirection w:val="${s.textDirection}"/>`);
 	if (parts.length === 0) return "";
 	return `<w:sectPr>${parts.join("")}</w:sectPr>`;
 }