reamkit 1.32.0 → 1.33.0

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

@@ -24,7 +24,7 @@ var parser = new XMLParser({
 	trimValues: false,
 	maxNestedTags: 1e3
 });
-var RUN_CONTAINER_TAGS = new Set([
+var RUN_CONTAINER_TAGS = /* @__PURE__ */ new Set([
 	"w:hyperlink",
 	"w:sdt",
 	"w:sdtContent",
@@ -102,7 +102,8 @@ function parseBackgroundFill(documentXml, resolveImage) {
 	return fill.kind === "gradient" || fill.kind === "picture" ? fill : void 0;
 }
 function backgroundNode(documentXml) {
-	const doc = poFindByPath(parser.parse(resolveInternalEntities(decoder.decode(documentXml))), ["w:document"]);
+	const tree = parser.parse(resolveInternalEntities(decoder.decode(documentXml)));
+	const doc = poFindByPath(tree, ["w:document"]);
 	return doc ? poChildren(doc).find((c) => poIs(c, "w:background")) : void 0;
 }
 /** A fresh {@link BlockCounter}. */
@@ -125,7 +126,7 @@ function bodyIndexForBlock(blocks, blockEnd) {
 	while (n < blocks.index.length && blocks.index[n] < blockEnd) n++;
 	return n;
 }
-var HF_TYPES = new Set([
+var HF_TYPES = /* @__PURE__ */ new Set([
 	"default",
 	"first",
 	"even"
@@ -400,7 +401,7 @@ function parseBodyElements(children, ctx = DEFAULT_PARSE_CONTEXT, blocks, sdtRun
 	}
 	return out;
 }
-var COLLAPSE_TRANSPARENT_TAGS = new Set([
+var COLLAPSE_TRANSPARENT_TAGS = /* @__PURE__ */ new Set([
 	"w:ins",
 	"w:moveTo",
 	"w:sdt",
@@ -560,7 +561,8 @@ function parseParagraph(p, ctx, extraBookmarks, anchored, sdtRunProps) {
 	const mathPara = poChildren(p).find((c) => poIs(c, "m:oMathPara"));
 	if (mathPara && properties.alignment === void 0) {
 		const paraPr = poChildren(mathPara).find((c) => poIs(c, "m:oMathParaPr"));
-		const jcVal = poAttr(paraPr ? poChildren(paraPr).find((c) => poIs(c, "m:jc")) : void 0, "val");
+		const jcNode = paraPr ? poChildren(paraPr).find((c) => poIs(c, "m:jc")) : void 0;
+		const jcVal = poAttr(jcNode, "val");
 		const alignment = jcVal === "left" ? "left" : jcVal === "right" ? "right" : "center";
 		properties = {
 			...properties,
@@ -619,7 +621,7 @@ function collectPositionTabs(p) {
 * @returns The display text, or `undefined` when this is not a MACROBUTTON.
 */
 function macroButtonText(instr) {
-	const shown = /^\s*MACROBUTTON\s+\S+\s(.*)$/su.exec(instr)?.[1]?.replace(/\s+$/u, "");
+	const shown = /^\s*MACROBUTTON\s+\S+\s(.*)$/su.exec(instr)?.[1]?.trimEnd();
 	return shown !== void 0 && shown !== "" ? shown : void 0;
 }
 function parseFieldInstr(instr) {
@@ -632,7 +634,7 @@ function fieldKeyword(instr) {
 }
 var CHECKBOX_CLEAR = "☐";
 var CHECKBOX_CHECKED = "☒";
-var SILENT_FIELDS = new Set([
+var SILENT_FIELDS = /* @__PURE__ */ new Set([
 	"SET",
 	"ASK",
 	"XE",
@@ -655,17 +657,18 @@ function applyFieldFsm(collected) {
 	let st = null;
 	for (const c of collected) {
 		if (c.fldChar === "begin") {
-			if (st) if (st.phase === "instr") st.depth++;
-			else {
-				out.push(...st.result);
-				st = {
-					phase: "instr",
-					instr: "",
-					result: [],
-					depth: 0
-				};
-			}
-			else st = {
+			if (st) {
+				if (st.phase === "instr") st.depth++;
+				else {
+					out.push(...st.result);
+					st = {
+						phase: "instr",
+						instr: "",
+						result: [],
+						depth: 0
+					};
+				}
+			} else st = {
 				phase: "instr",
 				instr: "",
 				result: [],
@@ -808,7 +811,7 @@ function sdtRunProperties(sdt, themeFonts) {
 	const props = parseRunProperties(poElementToFlat(rPr), themeFonts);
 	return Object.keys(props).length > 0 ? props : void 0;
 }
-var WINGDINGS_TO_UNICODE = new Map([
+var WINGDINGS_TO_UNICODE = /* @__PURE__ */ new Map([
 	[108, "●"],
 	[109, "❍"],
 	[110, "■"],
@@ -835,7 +838,7 @@ var WINGDINGS_TO_UNICODE = new Map([
 	[237, "↙"],
 	[238, "↘"]
 ]);
-var SYMBOL_TO_UNICODE = new Map([
+var SYMBOL_TO_UNICODE = /* @__PURE__ */ new Map([
 	[34, "∀"],
 	[36, "∃"],
 	[64, "≅"],
@@ -1031,7 +1034,8 @@ function elementTag(node) {
 */
 function parseNotes(notesXml, rootTag, noteTag, ctx = DEFAULT_PARSE_CONTEXT) {
 	const xml = resolveInternalEntities(decoder.decode(notesXml));
-	const root = poFindByPath(parser.parse(xml), [rootTag]);
+	const tree = parser.parse(xml);
+	const root = poFindByPath(tree, [rootTag]);
 	const out = /* @__PURE__ */ new Map();
 	if (!root) return out;
 	for (const note of poChildren(root)) {
@@ -1046,7 +1050,8 @@ function parseNotes(notesXml, rootTag, noteTag, ctx = DEFAULT_PARSE_CONTEXT) {
 }
 function parseCommentsRaw(commentsXml, ctx) {
 	const xml = resolveInternalEntities(decoder.decode(commentsXml));
-	const root = poFindByPath(parser.parse(xml), ["w:comments"]);
+	const tree = parser.parse(xml);
+	const root = poFindByPath(tree, ["w:comments"]);
 	const comments = /* @__PURE__ */ new Map();
 	const paraIds = /* @__PURE__ */ new Map();
 	if (!root) return {

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

@@ -7,14 +7,15 @@ import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numberin
 import "../core/numbering/index.js";
 import { cachedDiagramTree, laidOutDiagramTree } from "../core/drawingml/diagram/run.js";
 import { packageHasPart } from "../core/bytes.js";
+import { parseTheme, parseThemeBgFillStyles, parseThemeEffectStyles, parseThemeFillStyles, parseThemeFonts, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
-import { parseTheme, parseThemeBgFillStyles, parseThemeEffectStyles, parseThemeFillStyles, parseThemeFonts, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { isOoxmlRel } from "../core/opc/relationship-types.js";
 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 { firstTagMatch } from "../core/opc/tag-scan.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";
@@ -156,7 +157,7 @@ function readDocx(docx) {
 var docxReader = {
 	id: "docx",
 	produces: "flow",
-	supports: new Set([
+	supports: /* @__PURE__ */ new Set([
 		FEATURES.text,
 		FEATURES.tables,
 		FEATURES.tablesNested,
@@ -214,21 +215,26 @@ function makeDiagramResolver(pkg, partName, store) {
 		return resolved;
 	};
 }
+function partIndex(path) {
+	const dot = path.lastIndexOf(".");
+	if (dot < 0 || dot === path.length - 1) return "";
+	let from = dot;
+	while (from > 0 && path.charCodeAt(from - 1) >= 48 && path.charCodeAt(from - 1) <= 57) from--;
+	return path.slice(from, dot);
+}
 function siblingPart(pkg, ownerPart, dataPart, type) {
 	const own = pkg.getPartRelationships(dataPart).find((r) => r.type.endsWith(type));
 	if (own) return pkg.resolveRelatedPart(dataPart, own)?.data;
-	const index = (path) => /(\d*)\.[^.]+$/u.exec(path)?.[1] ?? "";
-	const want = index(dataPart);
+	const want = partIndex(dataPart);
 	const rels = pkg.getPartRelationships(ownerPart).filter((r) => r.type.endsWith(type));
-	const rel = rels.find((r) => index(r.target) === want) ?? (rels.length === 1 ? rels[0] : void 0);
+	const rel = rels.find((r) => partIndex(r.target) === want) ?? (rels.length === 1 ? rels[0] : void 0);
 	return rel ? pkg.resolveRelatedPart(ownerPart, rel)?.data : void 0;
 }
 function drawingFromOwner(pkg, ownerPart, dataPart) {
 	const drawings = pkg.getPartRelationships(ownerPart).filter((r) => r.type.endsWith("/diagramDrawing"));
 	if (drawings.length === 0) return void 0;
-	const index = (path) => /(\d*)\.[^.]+$/u.exec(path)?.[1] ?? "";
-	const want = index(dataPart);
-	const rel = drawings.find((r) => index(r.target) === want) ?? (drawings.length === 1 ? drawings[0] : void 0);
+	const want = partIndex(dataPart);
+	const rel = drawings.find((r) => partIndex(r.target) === want) ?? (drawings.length === 1 ? drawings[0] : void 0);
 	return rel ? pkg.resolveRelatedPart(ownerPart, rel) : void 0;
 }
 function makeImageResolver(pkg, store, partName = MAIN_DOCUMENT_PART) {
@@ -377,11 +383,10 @@ function chartOwningParts(pkg, sections, mainPart) {
 	return parts;
 }
 function detectDocxLanguage(stylesData, documentData) {
-	const re = /<w:lang\b[^>]*\bw:val="([^"]+)"/;
 	const decoder = new TextDecoder();
 	for (const data of [stylesData, documentData]) {
 		if (!data) continue;
-		const m = re.exec(decoder.decode(data));
+		const m = firstTagMatch(decoder.decode(data), "<w:lang", true, /<w:lang\b[^>]*\bw:val="([^"]+)"/y);
 		if (m?.[1]) return m[1];
 	}
 }

package/dist/esm/word/docx-to-pdf.js

@@ -6,6 +6,7 @@ import "../pdf/index.js";
 import { parseThemeFonts } from "../core/drawingml/theme-parser.js";
 import { OpcPackage } from "../core/opc/package.js";
 import "../core/opc/index.js";
+import { tagMatches } from "../core/opc/tag-scan.js";
 import { resolveWordThemeFont } from "./theme-fonts.js";
 import { readDocx } from "./docx-reader.js";
 import { flowRenderOptions } from "../core/converter/project.js";
@@ -13,6 +14,7 @@ import { flowRenderOptions } from "../core/converter/project.js";
 var STYLES_PART = "word/styles.xml";
 var THEME_PART = "word/theme/theme1.xml";
 var MAIN_DOCUMENT_PART = "word/document.xml";
+var ASCII_FONT = /<w:rFonts[^>]*?\bw:(ascii|asciiTheme)="([^"]+)"/y;
 /**
 * Synchronous one-shot conversion (requires `fonts`/`fontBytes`, no network).
 *
@@ -63,7 +65,7 @@ function prepareDocxStyledRender(docx, options) {
 *   cannot be opened.
 */
 function detectDocxFamilyKeys(docx) {
-	const keys = new Set(["arimo"]);
+	const keys = /* @__PURE__ */ new Set(["arimo"]);
 	let pkg;
 	try {
 		pkg = OpcPackage.open(docx);
@@ -72,13 +74,11 @@ function detectDocxFamilyKeys(docx) {
 	}
 	const decoder = new TextDecoder("utf-8");
 	const themeFonts = docxThemeFonts(pkg);
-	const re = /<w:rFonts[^>]*?\bw:(ascii|asciiTheme)="([^"]+)"/g;
 	for (const part of [STYLES_PART, MAIN_DOCUMENT_PART]) {
 		const data = pkg.getPart(part);
 		if (!data) continue;
 		const xml = decoder.decode(data);
-		let m;
-		while ((m = re.exec(xml)) !== null) {
+		for (const m of tagMatches(xml, "<w:rFonts", false, ASCII_FONT)) {
 			const name = m[1] === "ascii" ? m[2] : resolveWordThemeFont(m[2], themeFonts);
 			if (name !== void 0) keys.add(resolveFamilyKey(name));
 		}
@@ -134,7 +134,7 @@ async function buildUnsignedDocxPdf(docx, options) {
 */
 async function resolveDocxAutoFonts(docx, options = {}) {
 	const fetchOpt = options.fontFetch ? { fetch: options.fontFetch } : {};
-	const keys = options.fontFamily ? new Set([resolveFamilyKey(options.fontFamily)]) : detectDocxFamilyKeys(docx);
+	const keys = options.fontFamily ? /* @__PURE__ */ new Set([resolveFamilyKey(options.fontFamily)]) : detectDocxFamilyKeys(docx);
 	if (keys.size <= 1) {
 		const family = keys.values().next().value;
 		return { fonts: await fetchFontSet({
@@ -158,4 +158,4 @@ async function resolveDocxAutoFonts(docx, options = {}) {
 	};
 }
 //#endregion
-export { convertDocxToPdf };
+export { convertDocxToPdf, convertDocxToPdfSync, detectDocxFamilyKeys, resolveDocxAutoFonts };

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

@@ -531,7 +531,7 @@ function emitHeadersFooters(flow, section, state, docScope, extraParts, extraPar
 var docxWriter = {
 	id: "docx",
 	consumes: "flow",
-	supports: new Set([FEATURES.text, FEATURES.fontsEmbedding]),
+	supports: /* @__PURE__ */ new Set([FEATURES.text, FEATURES.fontsEmbedding]),
 	write: (doc) => writeDocx(doc)
 };
 /**
@@ -1177,7 +1177,7 @@ function pPrWithSect(p, closingSectPr) {
 */
 var stated = (pt) => Number.isFinite(pt);
 /** §17.18.44 ST_Jc — the tokens the attribute admits, so nothing else is written. */
-var JC = new Set([
+var JC = /* @__PURE__ */ new Set([
 	"left",
 	"right",
 	"center",
@@ -1188,8 +1188,10 @@ function indXml(p) {
 	const attrs = [];
 	if (stated(p.indentLeft) && p.indentLeft !== DEFAULT_PARA.indentLeft) attrs.push(`w:left="${twips(p.indentLeft)}"`);
 	if (stated(p.indentRight) && p.indentRight !== DEFAULT_PARA.indentRight) attrs.push(`w:right="${twips(p.indentRight)}"`);
-	if (stated(p.indentFirstLine) && p.indentFirstLine !== DEFAULT_PARA.indentFirstLine) if (p.indentFirstLine < 0) attrs.push(`w:hanging="${twips(-p.indentFirstLine)}"`);
-	else attrs.push(`w:firstLine="${twips(p.indentFirstLine)}"`);
+	if (stated(p.indentFirstLine) && p.indentFirstLine !== DEFAULT_PARA.indentFirstLine) {
+		if (p.indentFirstLine < 0) attrs.push(`w:hanging="${twips(-p.indentFirstLine)}"`);
+		else attrs.push(`w:firstLine="${twips(p.indentFirstLine)}"`);
+	}
 	return attrs.length > 0 ? `<w:ind ${attrs.join(" ")}/>` : "";
 }
 function spacingXml(p) {
@@ -1248,8 +1250,10 @@ function rawParaPrXml(p) {
 	const attrs = [];
 	if (p.indentLeft !== void 0 && stated(p.indentLeft)) attrs.push(`w:left="${twips(p.indentLeft)}"`);
 	if (p.indentRight !== void 0 && stated(p.indentRight)) attrs.push(`w:right="${twips(p.indentRight)}"`);
-	if (p.indentFirstLine !== void 0 && stated(p.indentFirstLine)) if (p.indentFirstLine < 0) attrs.push(`w:hanging="${twips(-p.indentFirstLine)}"`);
-	else attrs.push(`w:firstLine="${twips(p.indentFirstLine)}"`);
+	if (p.indentFirstLine !== void 0 && stated(p.indentFirstLine)) {
+		if (p.indentFirstLine < 0) attrs.push(`w:hanging="${twips(-p.indentFirstLine)}"`);
+		else attrs.push(`w:firstLine="${twips(p.indentFirstLine)}"`);
+	}
 	const ind = attrs.length > 0 ? `<w:ind ${attrs.join(" ")}/>` : "";
 	const jc = p.alignment !== void 0 && JC.has(p.alignment) ? `<w:jc w:val="${p.alignment}"/>` : "";
 	return ind || jc ? `<w:pPr>${jc}${ind}</w:pPr>` : "";

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

@@ -15,7 +15,7 @@ var EMPTY_GEOMETRY = {
 	pathHeight: 0,
 	commands: []
 };
-var UNDERSTOOD_NS = new Set([
+var UNDERSTOOD_NS = /* @__PURE__ */ new Set([
 	"wps",
 	"wpg",
 	"wpc"
@@ -72,12 +72,12 @@ function parseFloatAnchor(anchor) {
 		...posV ? { posV } : {}
 	};
 }
-var ANCHOR_ALIGNS = new Set([
+var ANCHOR_ALIGNS = /* @__PURE__ */ new Set([
 	"left",
 	"center",
 	"right"
 ]);
-var ANCHOR_V_ALIGNS = new Set([
+var ANCHOR_V_ALIGNS = /* @__PURE__ */ new Set([
 	"top",
 	"center",
 	"bottom"
@@ -583,7 +583,7 @@ function pairOf(v) {
 	const m = v !== void 0 ? /^\s*(-?\d+)[ ,]+(-?\d+)\s*$/u.exec(v) : null;
 	return m ? [Number(m[1]), Number(m[2])] : void 0;
 }
-var VML_PATH_PAIRS = new Set([
+var VML_PATH_PAIRS = /* @__PURE__ */ new Set([
 	"nf",
 	"ns",
 	"qx",
@@ -745,7 +745,7 @@ function parseVmlGroup(group, parseBody, shapeTypes, sizePt) {
 		fill: { kind: "none" }
 	};
 }
-var VML_SHAPE_TAGS = new Set([
+var VML_SHAPE_TAGS = /* @__PURE__ */ new Set([
 	"v:rect",
 	"v:roundrect",
 	"v:oval",
@@ -1021,14 +1021,14 @@ function vmlLine(shape, shapeType) {
 		...tailEnd ? { tailEnd } : {}
 	};
 }
-var VML_ARROWS = new Map([
+var VML_ARROWS = /* @__PURE__ */ new Map([
 	["block", "triangle"],
 	["classic", "stealth"],
 	["diamond", "diamond"],
 	["oval", "oval"],
 	["open", "arrow"]
 ]);
-var VML_ARROW_SIZES = new Map([
+var VML_ARROW_SIZES = /* @__PURE__ */ new Map([
 	["narrow", "sm"],
 	["short", "sm"],
 	["medium", "med"],
@@ -1439,7 +1439,8 @@ function memberOrigin(wgp, fallback) {
 	let minY = Infinity;
 	for (const child of expandMcChildren(poChildren(wgp))) {
 		if (!isGroupMember(child)) continue;
-		const xfrm = poChildren(poChildren(child).find((c) => poIsLocal(c, "spPr") || poIsLocal(c, "grpSpPr"))).find((c) => poIs(c, "a:xfrm"));
+		const spPr = poChildren(child).find((c) => poIsLocal(c, "spPr") || poIsLocal(c, "grpSpPr"));
+		const xfrm = poChildren(spPr).find((c) => poIs(c, "a:xfrm"));
 		const off = xfrm ? poChildren(xfrm).find((c) => poIs(c, "a:off")) : void 0;
 		const x = poIntAttr(off, "x");
 		const y = poIntAttr(off, "y");
@@ -1569,7 +1570,7 @@ function styleRefShadow(style, resolveColor, themeEffectStyles) {
 	const phHex = child ? resolveColorNode(child, resolveColor) : void 0;
 	return shadowFromOuterShdw(shdw, phHex ? placeholderColors(resolveColor, phHex) : resolveColor);
 }
-var FILL_TAGS = new Set([
+var FILL_TAGS = /* @__PURE__ */ new Set([
 	"a:noFill",
 	"a:solidFill",
 	"a:gradFill",
@@ -1639,10 +1640,11 @@ function styleRefLine(style, resolveColor, themeLineWidths) {
 	const colorHex = child ? resolveColorNode(child, resolveColor) : void 0;
 	if (colorHex === void 0) return void 0;
 	const idx = poIntAttr(ref, "idx");
+	const width = idx !== void 0 && idx > 0 ? themeLineWidths?.[idx - 1] : void 0;
 	return {
 		fill: "solid",
 		colorHex,
-		width: pt((idx !== void 0 && idx > 0 ? themeLineWidths?.[idx - 1] : void 0) ?? .75)
+		width: pt(width ?? .75)
 	};
 }
 /**
@@ -1827,9 +1829,7 @@ function parseCustGeom(cust) {
 				swAng: poIntAttr(node, "swAng") ?? 0
 			});
 			break;
-		case "a:close":
-			commands.push({ cmd: "close" });
-			break;
+		case "a:close": commands.push({ cmd: "close" });
 	}
 	if (pathWidth <= 0 || pathHeight <= 0 || commands.length === 0) return {
 		kind: "preset",
@@ -1963,7 +1963,7 @@ function patternCoverage(prst) {
 	if (DENSE_PATTERNS.has(prst)) return .5;
 	return .25;
 }
-var DENSE_PATTERNS = new Set([
+var DENSE_PATTERNS = /* @__PURE__ */ new Set([
 	"trellis",
 	"weave",
 	"plaid",
@@ -2211,14 +2211,14 @@ function pictureOutline(line) {
 		widthPt: pt(stroke.widthPt)
 	};
 }
-var LINE_END_TYPES = new Set([
+var LINE_END_TYPES = /* @__PURE__ */ new Set([
 	"triangle",
 	"stealth",
 	"diamond",
 	"oval",
 	"arrow"
 ]);
-var LINE_END_SIZES = new Set([
+var LINE_END_SIZES = /* @__PURE__ */ new Set([
 	"sm",
 	"med",
 	"lg"
@@ -2263,7 +2263,7 @@ function parseCustDash(custDash) {
 	}
 	return out.length > 0 ? out : void 0;
 }
-var DASH_VALUES = new Set([
+var DASH_VALUES = /* @__PURE__ */ new Set([
 	"solid",
 	"dot",
 	"dash",
@@ -2387,4 +2387,4 @@ function clampUnit(x) {
 	return x < 0 ? 0 : x > 1 ? 1 : x;
 }
 //#endregion
-export { colorChangeOf, expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseSrcRect, parseVmlPicture, parseXfrm, shadowFromOuterShdw, statesFill, styleRefFill, styleRefFontColor, styleRefLine, vmlFill, withStatedDirection };
+export { colorChangeOf, expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseSrcRect, parseVmlPicture, parseXfrm, resolveMc, shadowFromOuterShdw, statesFill, styleRefFill, styleRefFontColor, styleRefLine, vmlFill, withStatedDirection, withStyleFontColor };

package/dist/esm/word/font-table.js

@@ -1,4 +1,5 @@
 import { FontRegistry } from "../core/font/font-registry.js";
+import { isWordChar, tagMatches } from "../core/opc/tag-scan.js";
 //#region src/word/font-table.ts
 var FONT_TABLE_PART = "word/fontTable.xml";
 var REL_FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font";
@@ -19,7 +20,7 @@ var VARIANT_BY_TAG = {
 function deobfuscateEmbeddedFont(data, fontKey) {
 	const hex = fontKey.replace(/[{}-]/g, "");
 	if (hex.length !== 32) return data;
-	const key = new Uint8Array(16);
+	const key = /* @__PURE__ */ new Uint8Array(16);
 	for (let i = 0; i < 16; i++) key[i] = parseInt(hex.substring(i * 2, i * 2 + 2), 16);
 	key.reverse();
 	const out = new Uint8Array(data);
@@ -48,19 +49,15 @@ function obfuscateEmbeddedFont(data, fontKey) {
 function parseFontTable(data) {
 	const xml = new TextDecoder("utf-8").decode(data);
 	const out = [];
-	const fontRe = /<w:font\b[^>]*\bw:name="([^"]+)"[^>]*>([\s\S]*?)<\/w:font>/g;
-	let fm;
-	while ((fm = fontRe.exec(xml)) !== null) {
+	const closed = xml.slice(0, xml.lastIndexOf("</w:font>") + 9);
+	for (const fm of tagMatches(closed, "<w:font", true, FONT)) {
 		const name = fm[1];
-		const inner = fm[2];
 		const embeds = {};
-		const embedRe = /<w:embed(Regular|Bold|Italic|BoldItalic)\b[^>]*\br:id="([^"]+)"[^>]*\bw:fontKey="([^"]+)"/g;
-		let em;
-		while ((em = embedRe.exec(inner)) !== null) {
-			const variant = VARIANT_BY_TAG[em[1]];
+		for (const em of embedRefs(fm[2])) {
+			const variant = VARIANT_BY_TAG[em.tag];
 			if (variant) embeds[variant] = {
-				rId: em[2],
-				fontKey: em[3]
+				rId: em.rId,
+				fontKey: em.fontKey
 			};
 		}
 		if (Object.keys(embeds).length > 0) out.push({
@@ -70,6 +67,88 @@ function parseFontTable(data) {
 	}
 	return out;
 }
+/** A named `w:font` and everything up to its close. Sticky, for tagMatches. */
+var FONT = /<w:font\b[^>]*\bw:name="([^"]+)"[^>]*>([\s\S]*?)<\/w:font>/y;
+var EMBED_HEAD = /<w:embed(Regular|Bold|Italic|BoldItalic)\b/y;
+/**
+* The faces a font's element embeds — what
+* `/<w:embed(Regular|Bold|Italic|BoldItalic)\b[^>]*\br:id="([^"]+)"[^>]*\bw:fontKey="([^"]+)"/g`
+* finds in it, in one pass. The expression gave the tag back one `r:id` at a
+* time and read the rest of it again for a `w:fontKey` after each, quadratic
+* in a tag with many; and searching, it read each tag again from every
+* `<w:embed` inside it. Where a start fails, every later one before the tag's
+* `>` does too, so the search moves past it.
+*/
+function embedRefs(inner) {
+	const out = [];
+	let at = inner.indexOf("<w:embed");
+	while (at >= 0) {
+		EMBED_HEAD.lastIndex = at;
+		const head = EMBED_HEAD.exec(inner);
+		if (head === null) {
+			at = inner.indexOf("<w:embed", at + 1);
+			continue;
+		}
+		const from = EMBED_HEAD.lastIndex;
+		const tagEnd = endOfStretch(inner, from);
+		const found = embedRef(inner, from, tagEnd);
+		if (found) {
+			out.push({
+				tag: head[1],
+				rId: found.rId,
+				fontKey: found.fontKey
+			});
+			at = inner.indexOf("<w:embed", found.end);
+		} else if (tagEnd < inner.length) at = inner.indexOf("<w:embed", tagEnd + 1);
+		else break;
+	}
+	return out;
+}
+/** The first `>` at or after `from`, or the end of the text. */
+function endOfStretch(s, from) {
+	const gt = s.indexOf(">", from);
+	return gt < 0 ? s.length : gt;
+}
+/**
+* The reference one `<w:embed…` makes, its attributes read from `from` up to
+* the tag's `>` at `tagEnd`. The first `[^>]*` gives back the last `r:id`
+* first; the second takes the last `w:fontKey` before the `>` that follows the
+* `r:id`'s value — and that one is the same for every `r:id` whose value ends
+* in one stretch, so it is looked for once per stretch.
+*/
+function embedRef(s, from, tagEnd) {
+	const keys = /* @__PURE__ */ new Map();
+	const lastKey = (stretchEnd) => {
+		if (keys.has(stretchEnd)) return keys.get(stretchEnd);
+		const start = s.lastIndexOf(">", stretchEnd - 1) + 1;
+		let key;
+		for (let f = s.lastIndexOf("w:fontKey=\"", stretchEnd - 11); f >= start; f = s.lastIndexOf("w:fontKey=\"", f - 1)) {
+			const close = s.indexOf("\"", f + 11);
+			if (!isWordChar(s.charCodeAt(f - 1)) && close > f + 11) {
+				key = {
+					at: f,
+					value: s.slice(f + 11, close),
+					end: close + 1
+				};
+				break;
+			}
+			if (f === 0) break;
+		}
+		keys.set(stretchEnd, key);
+		return key;
+	};
+	for (let p = s.lastIndexOf("r:id=\"", tagEnd - 6); p >= from; p = s.lastIndexOf("r:id=\"", p - 1)) {
+		if (isWordChar(s.charCodeAt(p - 1))) continue;
+		const close = s.indexOf("\"", p + 6);
+		if (close <= p + 6) continue;
+		const key = lastKey(close < tagEnd ? tagEnd : endOfStretch(s, close + 1));
+		if (key !== void 0 && key.at > close) return {
+			rId: s.slice(p + 6, close),
+			fontKey: key.value,
+			end: key.end
+		};
+	}
+}
 /**
 * De-obfuscate and load every embedded font in the package, building one
 * {@link FontRegistry} per font keyed by its normalized (trimmed, lower-cased)

package/dist/esm/word/index.js

@@ -1,9 +1,10 @@
 import "./run-properties.js";
 import "./paragraph-properties.js";
 import "./table-parser.js";
-import "./numbering-parser.js";
-import "./document-parser.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 "./text-extractor.js";
-import "./styles-parser.js";
-import "./font-table.js";
-import "./settings-parser.js";
+import { parseStyles } from "./styles-parser.js";
+import { loadEmbeddedFonts } from "./font-table.js";
+import { EMPTY_SETTINGS, parseSettings } from "./settings-parser.js";
+export { EMPTY_NUMBERING, EMPTY_SECTION, EMPTY_SETTINGS, applyAuthorIds, bodyIndexForBlock, loadEmbeddedFonts, newBlockCounter, parseBackgroundColor, parseBackgroundFill, parseCommentThreads, parseDocument, parseHeaderFooter, parseNotes, parseNumbering, parsePeople, parseSections, parseSettings, parseStyles };

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

@@ -15,7 +15,7 @@ var parser = new XMLParser({
 	trimValues: false
 });
 /** §17.18.59 ST_NumberFormat — the formats this reader knows by name. */
-var FORMATS = new Set([
+var FORMATS = /* @__PURE__ */ new Set([
 	"decimal",
 	"decimalZero",
 	"decimalFullWidth",
@@ -59,7 +59,8 @@ var EMPTY_NUMBERING = {
 */
 function parseNumbering(data, resolveImage, themeFonts) {
 	const xml = decoder.decode(data);
-	const root = asElement(parser.parse(xml)["w:numbering"]);
+	const tree = parser.parse(xml);
+	const root = asElement(tree["w:numbering"]);
 	if (!root) return EMPTY_NUMBERING;
 	const picBullets = parsePicBullets(root, resolveImage);
 	const abstractNums = /* @__PURE__ */ new Map();
@@ -162,7 +163,7 @@ function parsePicBullets(root, resolveImage) {
 	}
 	return out;
 }
-var CSS_UNITS = new Map([
+var CSS_UNITS = /* @__PURE__ */ new Map([
 	["pt", 1],
 	["in", 72],
 	["cm", 72 / 2.54],
@@ -171,7 +172,7 @@ var CSS_UNITS = new Map([
 	["px", .75]
 ]);
 function cssLengthPt(raw) {
-	const m = raw !== void 0 ? /^\s*(-?[\d.]+)\s*([a-z%]*)\s*$/u.exec(raw) : null;
+	const m = raw !== void 0 ? /^(-?[\d.]+)\s*([a-z%]*)$/u.exec(raw.trim()) : null;
 	if (!m) return void 0;
 	const n = Number(m[1]);
 	if (!Number.isFinite(n)) return void 0;

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

@@ -229,4 +229,4 @@ function parseRadical(node) {
 	};
 }
 //#endregion
-export { parseOMath };
+export { childRow, parseOMath };