reamkit 1.22.0 → 1.24.0

package/dist/esm/pptx/table-style.js

@@ -1,6 +1,6 @@
 import { pt } from "../core/ir/units.js";
 import { poAttr, poChildren, poIntAttr, poIs, poTag, poText } from "../core/po-helpers.js";
-import { readColorMods, resolveColorNode } from "../core/drawingml/colors.js";
+import { placeholderColors, readColorMods, resolveColorNode } from "../core/drawingml/colors.js";
 //#region src/pptx/table-style.ts
 /** The `a:tblPr` flags, all off unless the table says otherwise. */
 function tableStyleFlags(tblPr) {
@@ -26,9 +26,10 @@ function tableStyleId(tblPr) {
 * @param flags  Which conditional parts the table asks for.
 * @param at     Where the cell sits.
 * @param colors The deck's colour resolver.
+* @param theme  The theme's style lists, for the parts that point at them.
 * @returns The composed part, empty when the style says nothing.
 */
-function cellStyle(style, flags, at, colors) {
+function cellStyle(style, flags, at, colors, theme) {
 	const names = ["a:wholeTbl"];
 	if (flags.bandCol) names.push(bandName(at.col, flags.firstCol, "V"));
 	if (flags.bandRow) names.push(bandName(at.row, flags.firstRow, "H"));
@@ -36,31 +37,108 @@ function cellStyle(style, flags, at, colors) {
 	if (flags.lastCol && at.col === at.colCount - 1) names.push("a:lastCol");
 	if (flags.firstRow && at.row === 0) names.push("a:firstRow");
 	if (flags.lastRow && at.row === at.rowCount - 1) names.push("a:lastRow");
-	let out = {};
+	let out = tableBackground(style, colors, theme);
 	for (const name of names) {
 		const part = poChildren(style).find((c) => poIs(c, name));
-		if (part) out = {
+		if (!part) continue;
+		const next = partStyle(part, colors, theme);
+		out = {
 			...out,
-			...partStyle(part, colors)
+			...next,
+			...overFill(out.shadingHex, next)
 		};
 	}
-	return out;
+	const { shadingAlpha: _drop, ...flat } = out;
+	return flat;
+}
+/**
+* A part's fill laid OVER what is already under it.
+*
+* A colour resolves flattened against the page, because that is what a shape's
+* fill sits on; a table cell's sits on the table's background. Undoing the one
+* and redoing the other needs only the alpha: bnc480256's banding is `accent1`
+* at 40% over a background the theme's gradient makes pale, and taken against
+* white instead it came out as the flat accent with every second row white.
+*/
+function overFill(under, part) {
+	const a = part.shadingAlpha;
+	if (a === void 0 || a >= 1 || part.shadingHex === void 0 || under === void 0) return {};
+	const flat = rgb(part.shadingHex);
+	const back = rgb(under);
+	if (!flat || !back) return {};
+	return { shadingHex: toHex(flat.map((v, i) => v - (1 - a) * (1 - (back[i] ?? 1)))) };
+}
+function alphaOf(fill) {
+	const walk = (node) => {
+		for (const child of poChildren(node)) {
+			if (poIs(child, "a:alpha")) {
+				const v = poIntAttr(child, "val");
+				if (v !== void 0) return Math.max(0, Math.min(1, v / 1e5));
+			}
+			const deeper = walk(child);
+			if (deeper !== void 0) return deeper;
+		}
+	};
+	return walk(fill) ?? 1;
+}
+function rgb(h) {
+	const m = /^([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/u.exec(h);
+	return m ? [
+		1,
+		2,
+		3
+	].map((i) => parseInt(m[i] ?? "0", 16) / 255) : void 0;
+}
+function toHex(v) {
+	return v.map((c) => Math.round(Math.max(0, Math.min(1, c)) * 255).toString(16).padStart(2, "0").toUpperCase()).join("");
+}
+function tableBackground(style, colors, theme) {
+	const bg = poChildren(style).find((c) => poIs(c, "a:tblBg"));
+	if (!bg) return {};
+	const solid = poChildren(bg).find((c) => poIs(c, "a:solidFill"));
+	const hex = (solid ? colorOf(solid, colors) : void 0) ?? refFillColor(poChildren(bg).find((c) => poIs(c, "a:fillRef")), colors, theme);
+	return hex ? { shadingHex: hex } : {};
+}
+/**
+* §20.1.4.1.16 `a:fillRef` — a fill named by its place in the theme's list,
+* with the colour to put wherever that fill says `phClr`.
+*
+* Only its COLOUR is taken: a slot may be a gradient or a picture, and a cell's
+* shading is one colour. The first solid colour the slot names, or the
+* reference's own, is the nearest true answer.
+*/
+function refFillColor(ref, colors, theme) {
+	if (!ref) return void 0;
+	const own = colorOf(ref, colors);
+	const idx = poIntAttr(ref, "idx");
+	const slot = idx !== void 0 && idx > 0 ? theme?.fills?.[idx - 1] : void 0;
+	if (!slot) return own;
+	const named = own === void 0 ? colors : placeholderColors(colors, own);
+	const solid = poIs(slot, "a:solidFill") ? slot : void 0;
+	if (solid) return colorOf(solid, named) ?? own;
+	const grad = poIs(slot, "a:gradFill") ? slot : void 0;
+	const list = grad ? poChildren(grad).find((c) => poIs(c, "a:gsLst")) : void 0;
+	const stops = list ? poChildren(list).filter((c) => poIs(c, "a:gs")) : [];
+	const last = stops[stops.length - 1];
+	return (last ? colorOf(last, named) : void 0) ?? own;
 }
 function bandName(index, edge, axis) {
 	return (edge ? index - 1 : index) % 2 === 0 ? `a:band1${axis}` : `a:band2${axis}`;
 }
-function partStyle(part, colors) {
+function partStyle(part, colors, theme) {
 	const tcStyle = poChildren(part).find((c) => poIs(c, "a:tcStyle"));
 	const txStyle = poChildren(part).find((c) => poIs(c, "a:tcTxStyle"));
 	const fill = tcStyle ? poChildren(tcStyle).find((c) => poIs(c, "a:fill")) : void 0;
 	const solid = fill ? poChildren(fill).find((c) => poIs(c, "a:solidFill")) : void 0;
 	const shadingHex = solid ? colorOf(solid, colors) : void 0;
+	const shadingAlpha = solid ? alphaOf(solid) : void 0;
 	const bdr = tcStyle ? poChildren(tcStyle).find((c) => poIs(c, "a:tcBdr")) : void 0;
-	const borders = bdr ? partBorders(bdr, colors) : void 0;
+	const borders = bdr ? partBorders(bdr, colors, theme) : void 0;
 	const on = (name) => poAttr(txStyle, name) === "on";
 	const colorHex = txStyle ? colorOf(txStyle, colors) : void 0;
 	return {
 		...shadingHex ? { shadingHex } : {},
+		...shadingAlpha !== void 0 && shadingAlpha < 1 ? { shadingAlpha } : {},
 		...borders ? { borders } : {},
 		...txStyle && on("b") ? { bold: true } : {},
 		...txStyle && on("i") ? { italic: true } : {},
@@ -75,15 +153,31 @@ var SIDES = [
 	["a:insideH", "insideH"],
 	["a:insideV", "insideV"]
 ];
-function partBorders(bdr, colors) {
+function partBorders(bdr, colors, theme) {
 	const out = {};
 	for (const [tag, side] of SIDES) {
 		const holder = poChildren(bdr).find((c) => poIs(c, tag));
 		const ln = holder ? poChildren(holder).find((c) => poIs(c, "a:ln")) : void 0;
-		if (ln) out[side] = lineBorder(ln, colors);
+		if (ln) {
+			out[side] = lineBorder(ln, colors);
+			continue;
+		}
+		const border = refBorder(holder ? poChildren(holder).find((c) => poIs(c, "a:lnRef")) : void 0, colors, theme);
+		if (border) out[side] = border;
 	}
 	return Object.keys(out).length > 0 ? out : void 0;
 }
+function refBorder(ref, colors, theme) {
+	if (!ref || poAttr(ref, "idx") === "0") return void 0;
+	const colorHex = colorOf(ref, colors);
+	if (colorHex === void 0) return void 0;
+	const idx = poIntAttr(ref, "idx");
+	return {
+		style: "single",
+		colorHex,
+		width: pt((idx !== void 0 && idx > 0 ? theme?.lineWidths?.[idx - 1] : void 0) ?? .75)
+	};
+}
 /**
 * §20.1.2.1 `a:ln` → the rule it draws on one side of a cell.
 *

package/dist/esm/svg/svg-writer.js

@@ -88,6 +88,7 @@ function emitPage(out, page, laid, losses, idc) {
 	}
 	for (const sh of plan.shapes) emitShape(out, sh.shape, idc);
 	for (const picture of plan.pictures) for (const item of picture) emitPageItem(out, item, laid, losses, idc);
+	for (const run of plan.ordered) for (const item of run) emitPageItem(out, item, laid, losses, idc);
 	for (const t of plan.lines) emitTextLine(out, t, losses, idc);
 }
 /**

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

@@ -2,6 +2,7 @@ import { BodyElement, Comment, RunProperties, Section, SectionProperties, ShapeF
 import { ColorResolver } from '../core/drawingml/colors.js';
 import { Loss, ResourceId } from '../core/ir/index.js';
 import { PoNode } from '../core/po-helpers.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 import { ThemeStyles } from './drawing-parser.js';
 /**
  * Resolves a drawing relationship id to a content-addressed `ResourceId` —
@@ -38,7 +39,10 @@ export interface ParseContext {
      * pre-rendered drawing override, or `undefined` when the file ships none
      * (E-SMARTART SA2).
      */
-    readonly resolveDiagram?: (relId: string) => ResolvedDiagram | undefined;
+    readonly resolveDiagram?: (relId: string, frame: {
+        readonly cx: number;
+        readonly cy: number;
+    }) => ResolvedDiagram | undefined;
     /**
      * §21.2 a `c:chart` `@r:id` → the chart part's path, the key the reader files
      * parsed charts under. Relationship ids are scoped to their owning part, so a
@@ -57,6 +61,11 @@ export interface ParseContext {
      * the shadow a gallery-drawn shape wears.
      */
     readonly themeStyles?: ThemeStyles;
+    /**
+     * §20.1.4.1.16 — the theme's font scheme, for the typefaces a run names by
+     * slot (`w:asciiTheme="minorHAnsi"`) rather than by name.
+     */
+    readonly themeFonts?: ThemeFonts;
     /**
      * Sink for graceful-degradation notices (E-SMARTART SA3): a SmartArt with no
      * drawing override records a dropped-feature {@link Loss} rather than vanishing.
@@ -185,7 +194,7 @@ export declare function parseBodyElements(children: ReadonlyArray<PoNode>, ctx?:
  * @param sdt The `w:sdt` element.
  * @returns The properties, or `undefined` when the control states none.
  */
-export declare function sdtRunProperties(sdt: PoNode): RunProperties | undefined;
+export declare function sdtRunProperties(sdt: PoNode, themeFonts?: ThemeFonts): RunProperties | undefined;
 /**
  * Parse `footnotes.xml` / `endnotes.xml` (§17.11) into note content by id. The
  * separator / continuationSeparator / continuationNotice stubs (negative ids or

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

@@ -425,7 +425,7 @@ function tryExtractDrawingFromParagraph(p, ctx) {
 	if (!vml && drawings.every((d) => poChildren(d).some((c) => poIs(c, "wp:anchor")))) return null;
 	const parseBody = (children) => parseBodyElements(children, ctx);
 	const pPrNode = poChildren(p).find((c) => poIs(c, "w:pPr"));
-	const paragraphProperties = pPrNode ? parseParagraphProperties(poElementToFlat(pPrNode), ctx.autoSpacingPt) : {};
+	const paragraphProperties = pPrNode ? parseParagraphProperties(poElementToFlat(pPrNode), ctx.autoSpacingPt, ctx.themeFonts) : {};
 	if (drawings.length === 0) {
 		const content = parseVmlPicture(vml, parseBody);
 		if (!content) return null;
@@ -484,7 +484,10 @@ function blocksForDrawing(content, paragraphProperties, ctx) {
 		}
 	}];
 	if (content.kind === "diagram") {
-		const diagram = ctx.resolveDiagram?.(content.dmRelId);
+		const diagram = ctx.resolveDiagram?.(content.dmRelId, {
+			cx: content.widthEmu,
+			cy: content.heightEmu
+		});
 		if (!diagram) {
 			ctx.onLoss?.(noDiagramOverrideLoss());
 			return null;
@@ -536,7 +539,7 @@ function parseParagraph(p, ctx, extraBookmarks, anchored, sdtRunProps) {
 		if (bookmarkName !== void 0 && bookmarkName !== "" && bookmarkName !== "_GoBack") bookmarks.push(bookmarkName);
 	}
 	const pPr = poChildren(p).find((c) => poIs(c, "w:pPr"));
-	let properties = parseParagraphProperties(pPr ? poElementToFlat(pPr) : void 0, ctx.autoSpacingPt);
+	let properties = parseParagraphProperties(pPr ? poElementToFlat(pPr) : void 0, ctx.autoSpacingPt, ctx.themeFonts);
 	if (pPr && poChildren(pPr).some((c) => poIs(c, "w:sectPr"))) properties = {
 		...properties,
 		sectionBreak: true
@@ -773,7 +776,7 @@ function collectRuns(container, out, ctx, href, anchor, anchored, sdtRunProps) {
 					if (bookmark !== void 0 && bookmark !== "") childAnchor = bookmark;
 				}
 			}
-			const childProps = tag === "w:sdt" ? sdtRunProperties(child) ?? sdtRunProps : sdtRunProps;
+			const childProps = tag === "w:sdt" ? sdtRunProperties(child, ctx.themeFonts) ?? sdtRunProps : sdtRunProps;
 			collectRuns(child, out, ctx, childHref, childAnchor, anchored, childProps);
 		}
 	}
@@ -785,11 +788,11 @@ function collectRuns(container, out, ctx, href, anchor, anchored, sdtRunProps) {
 * @param sdt The `w:sdt` element.
 * @returns The properties, or `undefined` when the control states none.
 */
-function sdtRunProperties(sdt) {
+function sdtRunProperties(sdt, themeFonts) {
 	const sdtPr = poChildren(sdt).find((c) => poIs(c, "w:sdtPr"));
 	const rPr = sdtPr ? poChildren(sdtPr).find((c) => poIs(c, "w:rPr")) : void 0;
 	if (!rPr) return void 0;
-	const props = parseRunProperties(poElementToFlat(rPr));
+	const props = parseRunProperties(poElementToFlat(rPr), themeFonts);
 	return Object.keys(props).length > 0 ? props : void 0;
 }
 var WINGDINGS_TO_UNICODE = new Map([
@@ -870,7 +873,7 @@ function symbolChar(font, char) {
 }
 function parseRun(r, ctx, anchored) {
 	const rPr = poChildren(r).find((c) => poIs(c, "w:rPr"));
-	const properties = parseRunProperties(rPr ? poElementToFlat(rPr) : void 0);
+	const properties = parseRunProperties(rPr ? poElementToFlat(rPr) : void 0, ctx.themeFonts);
 	let text = "";
 	let pageBreak = false;
 	let columnBreak = false;

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

@@ -5,11 +5,11 @@ import { resolveTableStyles } from "../core/style-cascade/table.js";
 import "../core/style-cascade/index.js";
 import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numbering/apply.js";
 import "../core/numbering/index.js";
-import { poFindDescendant } from "../core/po-helpers.js";
+import { cachedDiagramTree, laidOutDiagramTree } from "../core/drawingml/diagram/run.js";
 import { packageHasPart } from "../core/bytes.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, parseThemeLineWidths } from "../core/drawingml/theme-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";
@@ -52,6 +52,7 @@ function readDocx(docx) {
 	const resolveColor = buildColorResolver(pkg, main.path);
 	const themeData = loadTheme(pkg, main.path);
 	const themeLineWidths = themeData ? parseThemeLineWidths(themeData) : void 0;
+	const themeFonts = themeData ? parseThemeFonts(themeData) : void 0;
 	const themeStyles = themeData ? {
 		fills: parseThemeFillStyles(themeData),
 		bgFills: parseThemeBgFillStyles(themeData),
@@ -68,6 +69,7 @@ function readDocx(docx) {
 		...settings.compatibilityMode === void 0 ? { autoSpacingPt: 14 } : {},
 		...themeLineWidths && themeLineWidths.length > 0 ? { themeLineWidths } : {},
 		...themeStyles ? { themeStyles } : {},
+		...themeFonts ? { themeFonts } : {},
 		resolveImage,
 		resolveHyperlink,
 		resolveDiagram: makeDiagramResolver(pkg, main.path, resources),
@@ -84,11 +86,12 @@ function readDocx(docx) {
 		endIndex: bodyIndexForBlock(blocks, s.endIndex)
 	}));
 	const stylesData = pkg.getPart(STYLES_PART);
-	const styles = stylesData ? parseStyles(stylesData) : EMPTY_STYLE_SHEET;
+	const styles = stylesData ? parseStyles(stylesData, themeFonts) : EMPTY_STYLE_SHEET;
 	const numberingData = pkg.getPart(NUMBERING_PART);
-	const numbering = numberingData ? parseNumbering(numberingData, makeImageResolver(pkg, resources, NUMBERING_PART)) : EMPTY_NUMBERING;
+	const numbering = numberingData ? parseNumbering(numberingData, makeImageResolver(pkg, resources, NUMBERING_PART), themeFonts) : EMPTY_NUMBERING;
 	const noteCtx = (part) => ({
 		resolveColor,
+		...themeFonts ? { themeFonts } : {},
 		resolveImage: makeImageResolver(pkg, resources, part),
 		resolveHyperlink: makeHyperlinkResolver(pkg, part)
 	});
@@ -182,29 +185,42 @@ function infoFromCore(core) {
 }
 function makeDiagramResolver(pkg, partName, store) {
 	const cache = /* @__PURE__ */ new Map();
-	return (relId) => {
-		if (cache.has(relId)) return cache.get(relId);
+	return (relId, frame) => {
+		const key = `${relId}|${frame.cx}x${frame.cy}`;
+		if (cache.has(key)) return cache.get(key);
 		let resolved;
 		const dataRel = pkg.getPartRelationships(partName).find((r) => r.id === relId);
 		const data = dataRel ? pkg.resolveRelatedPart(partName, dataRel) : void 0;
 		if (data) {
 			const own = pkg.getPartRelationships(data.path).find((r) => r.type.endsWith("/diagramDrawing"));
 			const draw = own ? pkg.resolveRelatedPart(data.path, own) : drawingFromOwner(pkg, partName, data.path);
-			if (draw) for (const root of parseXml(draw.data)) {
-				const spTree = poFindDescendant(root, "dsp:spTree");
-				if (spTree) {
-					resolved = {
-						spTree,
-						resolveImage: makeImageResolver(pkg, store, draw.path)
-					};
-					break;
-				}
+			const cached = draw ? cachedDiagramTree(draw.data, parseXml) : void 0;
+			if (cached && draw) resolved = {
+				spTree: cached,
+				resolveImage: makeImageResolver(pkg, store, draw.path)
+			};
+			else {
+				const spTree = laidOutDiagramTree({
+					data: data.data,
+					layout: siblingPart(pkg, partName, data.path, "/diagramLayout"),
+					colors: siblingPart(pkg, partName, data.path, "/diagramColors")
+				}, frame, parseXml);
+				if (spTree) resolved = { spTree };
 			}
 		}
-		cache.set(relId, resolved);
+		cache.set(key, resolved);
 		return resolved;
 	};
 }
+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 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);
+	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;

package/dist/esm/word/docx-to-pdf.d.ts

@@ -38,10 +38,11 @@ export interface ConvertDocxOptions extends Omit<StyledRenderOptions, 'registry'
  */
 export declare function convertDocxToPdfSync(docx: Uint8Array, options: ConvertDocxOptions): Uint8Array;
 /**
- * The distinct curated font families the document references (scanning the
- * `w:ascii` of `styles.xml` + `document.xml`), always including the sans default
- * `'arimo'` as a fallback for unstyled runs / math / charts. The async path
- * fetches one substitute set per family so each run renders in the right one.
+ * The distinct curated font families the document references — the `w:ascii` of
+ * `styles.xml` + `document.xml`, and the theme slots they point at instead
+ * (§17.3.2.26) — always including the sans default `'arimo'` as a fallback for
+ * unstyled runs / math / charts. The async path fetches one substitute set per
+ * family so each run renders in the right one.
  *
  * @param docx The `.docx` bytes.
  * @returns The resolved {@link FamilyKey} set; just the default when the package
@@ -76,9 +77,9 @@ export declare function resolveDocxAutoFonts(docx: Uint8Array, options?: {
 }>;
 /**
  * Best-effort detection of the document's primary font family, used to choose a
- * substitute for auto-download. Prefers the document defaults' `w:ascii` font,
- * then falls back to the most frequent run font. A cheap regex over the XML — no
- * need to fully parse for this hint.
+ * substitute for auto-download. Prefers the document defaults' font — spelled
+ * out or pointed at in the theme — then falls back to the most frequent run
+ * font. A cheap regex over the XML: no need to fully parse for this hint.
  *
  * @param docx The `.docx` bytes.
  * @returns The detected family name, or `undefined` when none is found.

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

@@ -3,12 +3,15 @@ import { FontRegistry } from "../core/font/font-registry.js";
 import { signPdf } from "../pdf/signature.js";
 import { renderStyledPdf, renderStyledPdfEncrypted } from "../pdf/styled-page-renderer.js";
 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 { resolveWordThemeFont } from "./theme-fonts.js";
 import { readDocx } from "./docx-reader.js";
 import { flowRenderOptions } from "../core/converter/project.js";
 //#region src/word/docx-to-pdf.ts
 var STYLES_PART = "word/styles.xml";
+var THEME_PART = "word/theme/theme1.xml";
 var MAIN_DOCUMENT_PART = "word/document.xml";
 /**
 * Synchronous one-shot conversion (requires `fonts`/`fontBytes`, no network).
@@ -49,10 +52,11 @@ function prepareDocxStyledRender(docx, options) {
 	};
 }
 /**
-* The distinct curated font families the document references (scanning the
-* `w:ascii` of `styles.xml` + `document.xml`), always including the sans default
-* `'arimo'` as a fallback for unstyled runs / math / charts. The async path
-* fetches one substitute set per family so each run renders in the right one.
+* The distinct curated font families the document references — the `w:ascii` of
+* `styles.xml` + `document.xml`, and the theme slots they point at instead
+* (§17.3.2.26) — always including the sans default `'arimo'` as a fallback for
+* unstyled runs / math / charts. The async path fetches one substitute set per
+* family so each run renders in the right one.
 *
 * @param docx The `.docx` bytes.
 * @returns The resolved {@link FamilyKey} set; just the default when the package
@@ -67,16 +71,30 @@ function detectDocxFamilyKeys(docx) {
 		return keys;
 	}
 	const decoder = new TextDecoder("utf-8");
-	const re = /<w:rFonts[^>]*\bw:ascii="([^"]+)"/g;
+	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) keys.add(resolveFamilyKey(m[1]));
+		while ((m = re.exec(xml)) !== null) {
+			const name = m[1] === "ascii" ? m[2] : resolveWordThemeFont(m[2], themeFonts);
+			if (name !== void 0) keys.add(resolveFamilyKey(name));
+		}
 	}
 	return keys;
 }
+/** §20.1.4.1.16 — the theme's font scheme, for the slots `w:rFonts` points at. */
+function docxThemeFonts(pkg) {
+	const data = pkg.getPart(THEME_PART);
+	if (!data) return void 0;
+	try {
+		return parseThemeFonts(data);
+	} catch {
+		return;
+	}
+}
 /**
 * One-shot .docx → PDF (auto-downloads a substitute font set when the caller
 * supplies none; zero network with `fonts`/`fontBytes`).
@@ -140,4 +158,4 @@ async function resolveDocxAutoFonts(docx, options = {}) {
 	};
 }
 //#endregion
-export { convertDocxToPdf, resolveDocxAutoFonts };
+export { convertDocxToPdf };

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

@@ -50,6 +50,10 @@ var RASTER_MEDIA = {
 	gif: {
 		ext: "gif",
 		contentType: "image/gif"
+	},
+	bmp: {
+		ext: "bmp",
+		contentType: "image/bmp"
 	}
 };
 function mediaInfo(bytes) {

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

@@ -157,6 +157,26 @@ export declare function parseVmlPicture(node: PoNode, parseBody?: ParseBody): Dr
  * @returns The fill.
  */
 export declare function vmlFill(shape: PoNode, shapeType?: PoNode, resolveImage?: (id: string) => ResourceId | undefined): ShapeFill;
+/**
+ * §20.1.8.55 `a:srcRect` — the picture's own edges, cut away before it is
+ * fitted to its frame. Each is a percentage in thousandths (ST_Percentage), so
+ * `l="14711"` drops the left 14.711%.
+ *
+ * @param node The `a:srcRect` element, or `undefined` when the fill declares none.
+ * @returns The crop, or `undefined` when nothing is cut away.
+ */
+export declare function parseSrcRect(node: PoNode | undefined): ImageCrop | undefined;
+/**
+ * The fill with the direction the SHAPE states, where it states one and no
+ * colours: §20.1.8.33's `a:gradFill` holding only an `a:lin` says "sweep the
+ * gallery style's run of colours this way". 63200.pptx's ellipse asks for the
+ * diagonal where the theme's slot sweeps straight down.
+ *
+ * @param fill The fill resolved from the style (or anywhere else).
+ * @param spPr The shape's own properties.
+ * @returns The fill, turned; unchanged when the shape states no bare direction.
+ */
+export declare function withStatedDirection(fill: ShapeFill, spPr: PoNode | undefined): ShapeFill;
 /**
  * Whether an `spPr` states a fill AT ALL — including `a:noFill`, which is a
  * shape saying it has none rather than saying nothing. A placeholder that says