reamkit 1.30.0 → 1.32.0

package/dist/esm/word/doc/doc-text.js

@@ -40,6 +40,9 @@ var SPRM_P_DYA_BEFORE = 42003;
 var SPRM_P_DYA_AFTER = 42004;
 var SPRM_P_F_IN_TABLE = 9238;
 var SPRM_P_F_TTP = 9239;
+var SPRM_P_F_WIDOW_CONTROL = 9265;
+var SPRM_P_F_KEEP = 9221;
+var SPRM_P_F_KEEP_FOLLOW = 9222;
 var SPRM_T_DEF_TABLE = 54792;
 var SPRM_T_DEF_TABLE_SHD = 54802;
 var MAX_ROW_CELLS = 256;
@@ -433,6 +436,9 @@ function decodePapxGrpprl(d) {
 	let cellShadings;
 	let listIlfo;
 	let listIlvl;
+	let widowControl;
+	let keepNext;
+	let keepLines;
 	for (const s of sprms(d)) switch (s.sprm) {
 		case SPRM_P_JC:
 			jc = d[s.op];
@@ -458,6 +464,15 @@ function decodePapxGrpprl(d) {
 		case SPRM_P_F_TTP:
 			rowEnd = d[s.op] !== 0;
 			break;
+		case SPRM_P_F_WIDOW_CONTROL:
+			widowControl = d[s.op] !== 0;
+			break;
+		case SPRM_P_F_KEEP_FOLLOW:
+			keepNext = d[s.op] !== 0;
+			break;
+		case SPRM_P_F_KEEP:
+			keepLines = d[s.op] !== 0;
+			break;
 		case SPRM_T_DEF_TABLE: {
 			const cols = d[s.op] ?? 0;
 			const edges = [];
@@ -498,7 +513,10 @@ function decodePapxGrpprl(d) {
 		...cellDescriptors ? { cellDescriptors } : {},
 		...cellShadings ? { cellShadings } : {},
 		...listIlfo !== void 0 ? { listIlfo } : {},
-		...listIlvl !== void 0 ? { listIlvl } : {}
+		...listIlvl !== void 0 ? { listIlvl } : {},
+		...widowControl !== void 0 ? { widowControl } : {},
+		...keepNext !== void 0 ? { keepNext } : {},
+		...keepLines !== void 0 ? { keepLines } : {}
 	};
 }
 function* sprms(d) {

package/dist/esm/word/document-parser.d.ts

@@ -80,8 +80,8 @@ export interface ParseContext {
     readonly openCommentRanges?: Set<string>;
     /**
      * §17.3.1.1/§17.3.1.3 — what `w:beforeAutospacing`/`w:afterAutospacing`
-     * resolve to for THIS document: 14pt when it states no compatibility mode,
-     * and nothing (the default) for every Word 2007-or-later one.
+     * resolve to: HTML's 14pt for a Word document, nothing (the default) where
+     * the caller gives none.
      */
     readonly autoSpacingPt?: number;
 }

package/dist/esm/word/document-parser.js

@@ -9,6 +9,7 @@ import { parseRunProperties } from "./run-properties.js";
 import { parseParagraphProperties } from "./paragraph-properties.js";
 import { poElementToFlat } from "./po-to-flat.js";
 import { parseBorders, parseTable } from "./table-parser.js";
+import { FORMATS } from "./numbering-parser.js";
 import { XMLParser } from "fast-xml-parser";
 //#region src/word/document-parser.ts
 var decoder = new TextDecoder("utf-8");
@@ -199,11 +200,13 @@ function parseSectPrNode(sectPr) {
 	let margins;
 	let titlePg = false;
 	let pageNumberStart;
+	let pageNumberFormat;
 	let lineNumbering;
 	let columns;
 	let sectionStart;
 	let pageBorders;
 	let gridLinePitchPt;
+	let textDirection;
 	const headers = [];
 	const footers = [];
 	for (const child of poChildren(sectPr)) if (poIs(child, "w:pgSz")) {
@@ -251,6 +254,8 @@ function parseSectPrNode(sectPr) {
 	} else if (poIs(child, "w:pgNumType")) {
 		const start = poIntAttr(child, "start");
 		if (start !== void 0) pageNumberStart = start;
+		const fmt = poAttr(child, "fmt");
+		if (fmt !== void 0 && FORMATS.has(fmt) && fmt !== "decimal") pageNumberFormat = fmt;
 	} else if (poIs(child, "w:cols")) columns = parseColumns(child);
 	else if (poIs(child, "w:pgBorders")) {
 		const borders = parseBorders(child);
@@ -265,6 +270,9 @@ function parseSectPrNode(sectPr) {
 	} else if (poIs(child, "w:type")) {
 		const val = poAttr(child, "val");
 		sectionStart = val === "continuous" || val === "oddPage" || val === "evenPage" ? val : "nextPage";
+	} else if (poIs(child, "w:textDirection")) {
+		const val = poAttr(child, "val");
+		if (val === "tbRl" || val === "btLr") textDirection = val;
 	}
 	return {
 		pageSize,
@@ -273,11 +281,13 @@ function parseSectPrNode(sectPr) {
 		footers,
 		...titlePg ? { titlePg: true } : {},
 		...pageNumberStart !== void 0 ? { pageNumberStart } : {},
+		...pageNumberFormat !== void 0 ? { pageNumberFormat } : {},
 		...lineNumbering ? { lineNumbering } : {},
 		...columns ? { columns } : {},
 		...sectionStart ? { sectionStart } : {},
 		...pageBorders ? { pageBorders } : {},
-		...gridLinePitchPt !== void 0 ? { gridLinePitchPt } : {}
+		...gridLinePitchPt !== void 0 ? { gridLinePitchPt } : {},
+		...textDirection ? { textDirection } : {}
 	};
 }
 function parseColumns(cols) {

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

@@ -15,10 +15,10 @@ import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
 import { parseXml } from "../pptx/pptx-reader.js";
+import { EMPTY_NUMBERING, parseNumbering } from "./numbering-parser.js";
 import { EMPTY_SECTION, applyAuthorIds, bodyIndexForBlock, newBlockCounter, parseBackgroundColor, parseBackgroundFill, parseCommentThreads, parseDocument, parseHeaderFooter, parseNotes, parsePeople, parseSections } from "./document-parser.js";
 import { parseStyles } from "./styles-parser.js";
 import { loadEmbeddedFonts } from "./font-table.js";
-import { EMPTY_NUMBERING, parseNumbering } from "./numbering-parser.js";
 import { EMPTY_SETTINGS, parseSettings } from "./settings-parser.js";
 import "./index.js";
 //#region src/word/docx-reader.ts
@@ -66,7 +66,7 @@ function readDocx(docx) {
 	const settings = settingsData ? parseSettings(settingsData) : EMPTY_SETTINGS;
 	const ctx = {
 		resolveColor,
-		...settings.compatibilityMode === void 0 ? { autoSpacingPt: 14 } : {},
+		autoSpacingPt: 14,
 		...themeLineWidths && themeLineWidths.length > 0 ? { themeLineWidths } : {},
 		...themeStyles ? { themeStyles } : {},
 		...themeFonts ? { themeFonts } : {},
@@ -142,7 +142,9 @@ function readDocx(docx) {
 			...settings.doNotExpandShiftReturn ? { doNotExpandShiftReturn: true } : {},
 			...settings.displayBackgroundShape && backgroundFill ? { pageBackgroundFill: backgroundFill } : {},
 			...settings.displayBackgroundShape && backgroundColorHex ? { pageBackgroundColorHex: backgroundColorHex } : {},
-			...settings.gutterAtTop ? { gutterAtTop: true } : {}
+			...settings.gutterAtTop ? { gutterAtTop: true } : {},
+			...settings.compatibilityMode !== void 0 ? { compatibilityMode: settings.compatibilityMode } : {},
+			typesetBy: "word"
 		},
 		losses
 	};

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);
@@ -20,6 +21,12 @@ 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";
@@ -33,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";
@@ -133,7 +154,10 @@ function writeDocx(flow) {
 		...flow.charts ? { charts: flow.charts } : {},
 		...flow.faceFamilies ? { faceFamilies: flow.faceFamilies } : {},
 		familiesUsed: /* @__PURE__ */ new Map(),
-		zRanks: zRanksOf(flow)
+		...flow.faceOutlines ? { faceOutlines: flow.faceOutlines } : {},
+		facesUsed: /* @__PURE__ */ new Set(),
+		zRanks: zRanksOf(flow),
+		overlaid: /* @__PURE__ */ new Set()
 	};
 	const docScope = newScope();
 	const extraParts = [];
@@ -153,7 +177,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)),
@@ -185,9 +210,14 @@ 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)),
+		data: encoder.encode(fontTableXml(state.familiesUsed, embedded?.elements)),
 		contentType: FONT_TABLE_CONTENT_TYPE
 	} : void 0;
 	if (fontTablePart) docScope.rels.push({
@@ -196,6 +226,29 @@ function writeDocx(flow) {
 		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
@@ -208,12 +261,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,
@@ -225,8 +282,50 @@ function writeDocx(flow) {
 		losses
 	};
 }
-function fontTableXml(families) {
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">${[...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"}"/></w:font>`).join("")}</w:fonts>`;
+/**
+* §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
@@ -257,7 +356,10 @@ function zRanksOf(flow) {
 		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);
+			if (el.kind === "table") {
+				for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+				visit(el.table.overlay?.drawings ?? []);
+			}
 		}
 	};
 	visit(flow.body);
@@ -277,7 +379,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),
@@ -383,7 +486,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),
@@ -427,7 +531,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)
 };
 /**
@@ -493,6 +597,11 @@ function emitBlock(out, el, losses, state, scope, closingSectPr) {
 	}
 	if (el.kind === "table") {
 		out.push(tableXml(el.table, losses, state, scope));
+		for (const drawing of el.table.overlay?.drawings ?? []) {
+			if (state.overlaid.has(drawing)) continue;
+			state.overlaid.add(drawing);
+			emitBlock(out, drawing, losses, state, scope);
+		}
 		if (closingSectPr) out.push(`<w:p><w:pPr>${closingSectPr}</w:pPr></w:p>`);
 		return;
 	}
@@ -636,13 +745,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.
@@ -668,7 +840,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) {
@@ -736,7 +908,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);
@@ -787,6 +959,7 @@ 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\"/>");
@@ -839,11 +1012,14 @@ function bordersXml(tag, borders) {
 		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 = [
@@ -914,7 +1090,8 @@ function runXml(run, state, scope) {
 		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, state) {
 	const out = [];
@@ -925,6 +1102,15 @@ function rPrXml(r, state) {
 	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 (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}"/>`);
@@ -934,6 +1120,7 @@ function rPrXml(r, state) {
 	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) {
@@ -945,10 +1132,14 @@ function runShdXml(fill) {
 }
 function pPrBody(p) {
 	const out = [];
+	if (p.keepNext) out.push("<w:keepNext/>");
+	if (p.keepLines) out.push("<w:keepLines/>");
 	if (p.pageBreakBefore) out.push("<w:pageBreakBefore/>");
+	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) => {
@@ -1005,10 +1196,7 @@ 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, state) {
@@ -1018,6 +1206,7 @@ function rFontsXml(fonts, state) {
 		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 = [];
@@ -1104,8 +1293,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>`;
 }

package/dist/esm/word/drawing-parser.d.ts

@@ -104,7 +104,9 @@ export type DrawingContent = {
  * ECMA-376 Part 3 (Markup Compatibility) — resolve an `<mc:AlternateContent>` to
  * the children of the first `<mc:Choice>` whose `Requires` lists only namespaces
  * we understand, else the `<mc:Fallback>` children, else nothing. (`Requires`
- * holds space-separated namespace prefixes as declared in the document.)
+ * holds space-separated namespace prefixes as declared in the document.) The
+ * elements are known by their local names, whatever prefix the producer bound
+ * the namespace to: Word 2008 for Mac wrote `ve:`.
  *
  * @param altContent The `mc:AlternateContent` node.
  * @returns The chosen branch's children.
@@ -126,12 +128,12 @@ export declare function expandMcChildren(children: ReadonlyArray<PoNode>): Array
  * SmartArt diagram, or — falling through — an embedded picture from
  * `a:blip @r:embed`.
  *
- * @param drawing      The `w:drawing` node.
+ * @param drawingNode  The `w:drawing` node.
  * @param resolveColor Resolver for theme/scheme colours used by shape fills/lines.
  * @param parseBody    Optional body parser for a shape's text box (omitted ⇒ no text).
  * @returns The parsed content, or `null` when no anchor / recognizable graphic is found.
  */
-export declare function parseDrawing(drawing: PoNode, resolveColor: ColorResolver, parseBody?: ParseBody, resolveImage?: (relId: string) => ResourceId | undefined, resolveChartPart?: (relId: string) => string | undefined, themeLineWidths?: ReadonlyArray<number>, themeStyles?: ThemeStyles, parseDrawingText?: ParseDrawingText): DrawingContent | null;
+export declare function parseDrawing(drawingNode: PoNode, resolveColor: ColorResolver, parseBody?: ParseBody, resolveImage?: (relId: string) => ResourceId | undefined, resolveChartPart?: (relId: string) => string | undefined, themeLineWidths?: ReadonlyArray<number>, themeStyles?: ThemeStyles, parseDrawingText?: ParseDrawingText): DrawingContent | null;
 /**
  * Parse a legacy `<w:pict>`/`<w:object>` VML picture (ISO/IEC 29500-1 §14, VML
  * transitional) into an `image` {@link DrawingContent}. Modern files use