reamkit 1.21.0 → 1.23.0

package/dist/esm/pptx/sp-helpers.d.ts

@@ -1,5 +1,6 @@
 import { RunProperties } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 import { PoNode } from '../core/po-helpers.js';
 /**
  * §19.3.1.36 `p:ph` — a shape's placeholder reference. `type`/`idx` tie a slide
@@ -42,4 +43,4 @@ export declare function parseXfrmBox(spPr: PoNode | undefined): ShapeBoxEmu | un
  * (`sz`, hundredths of a point), bold/italic/underline, solid colour and the
  * latin typeface. Scheme colours and the theme font cascade come in PX5.
  */
-export declare function rPrToRunProps(rPr: PoNode | undefined, colors: ColorResolver): RunProperties;
+export declare function rPrToRunProps(rPr: PoNode | undefined, colors: ColorResolver, themeFonts?: ThemeFonts): RunProperties;

package/dist/esm/pptx/sp-helpers.js

@@ -1,6 +1,7 @@
 import { pt } from "../core/ir/units.js";
 import { poAttr, poChildren, poIntAttr, poIs } from "../core/po-helpers.js";
 import { resolveColorNode } from "../core/drawingml/colors.js";
+import { resolveThemeFont } from "../core/drawingml/theme-parser.js";
 //#region src/pptx/sp-helpers.ts
 var isTrue = (v) => v === "1" || v === "true" || v === "on";
 /**
@@ -54,21 +55,36 @@ function parseXfrmBox(spPr) {
 * (`sz`, hundredths of a point), bold/italic/underline, solid colour and the
 * latin typeface. Scheme colours and the theme font cascade come in PX5.
 */
-function rPrToRunProps(rPr, colors) {
+function rPrToRunProps(rPr, colors, themeFonts) {
 	if (!rPr) return {};
 	const sz = poIntAttr(rPr, "sz");
 	const u = poAttr(rPr, "u");
 	const colorHex = solidFillColor(rPr, colors);
 	const latin = poChildren(rPr).find((c) => poIs(c, "a:latin"));
-	const typeface = latin ? poAttr(latin, "typeface")?.trim() : void 0;
+	const typeface = resolveThemeFont(latin ? poAttr(latin, "typeface")?.trim() : void 0, themeFonts);
+	const flag = (name) => {
+		const v = poAttr(rPr, name);
+		return v === void 0 ? void 0 : isTrue(v);
+	};
+	const [b, i] = [flag("b"), flag("i")];
 	return {
-		...isTrue(poAttr(rPr, "b")) ? { bold: true } : {},
-		...isTrue(poAttr(rPr, "i")) ? { italic: true } : {},
-		...u !== void 0 && u !== "none" ? { underline: "single" } : {},
+		...b !== void 0 ? { bold: b } : {},
+		...i !== void 0 ? { italic: i } : {},
+		...u !== void 0 ? { underline: u === "none" ? "none" : "single" } : {},
 		...sz !== void 0 ? { fontSizePt: pt(sz / 100) } : {},
 		...colorHex ? { colorHex } : {},
-		...typeface ? { fontFamily: { ascii: typeface } } : {}
+		...typeface ? { fontFamily: { ascii: typeface } } : {},
+		...capsOf(poAttr(rPr, "cap"))
+	};
+}
+function capsOf(cap) {
+	if (cap === "all") return { caps: true };
+	if (cap === "small") return { smallCaps: true };
+	if (cap === "none") return {
+		caps: false,
+		smallCaps: false
 	};
+	return {};
 }
 function solidFillColor(rPr, colors) {
 	const solidFill = poChildren(rPr).find((c) => poIs(c, "a:solidFill"));

package/dist/esm/pptx/table-style.d.ts

@@ -0,0 +1,64 @@
+import { Border, CellBorders, TableCell } from '../core/document-model/index.js';
+import { ColorResolver } from '../core/drawingml/colors.js';
+import { PoNode } from '../core/po-helpers.js';
+/** Which conditional parts of a style a table asks for (`a:tblPr` flags). */
+export interface TableStyleFlags {
+    readonly firstRow: boolean;
+    readonly lastRow: boolean;
+    readonly firstCol: boolean;
+    readonly lastCol: boolean;
+    readonly bandRow: boolean;
+    readonly bandCol: boolean;
+}
+/** What one part of a table style says about a cell. */
+export interface TableStylePart {
+    readonly shadingHex?: string;
+    readonly borders?: CellBorders;
+    readonly bold?: boolean;
+    readonly italic?: boolean;
+    readonly colorHex?: string;
+}
+/** Where a cell sits, which decides the parts that reach it. */
+export interface CellPosition {
+    readonly row: number;
+    readonly rowCount: number;
+    readonly col: number;
+    readonly colCount: number;
+}
+/** The `a:tblPr` flags, all off unless the table says otherwise. */
+export declare function tableStyleFlags(tblPr: PoNode | undefined): TableStyleFlags;
+/** The GUID a table names, if it names one (`a:tblPr/a:tableStyleId`). */
+export declare function tableStyleId(tblPr: PoNode | undefined): string | undefined;
+/** What the deck's theme lends a style that points at it instead of spelling it out. */
+export interface TableStyleTheme {
+    /** §20.1.4.1.14 `a:fillStyleLst` — the fills an `a:fillRef` indexes. */
+    readonly fills?: ReadonlyArray<PoNode>;
+    /** §20.1.4.2.19 `a:lnStyleLst` — the widths an `a:lnRef` indexes, in points. */
+    readonly lineWidths?: ReadonlyArray<number>;
+}
+/**
+ * The style a cell wears, composed from every part that reaches it.
+ *
+ * @param style  The `a:tblStyle` node.
+ * @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.
+ */
+export declare function cellStyle(style: PoNode, flags: TableStyleFlags, at: CellPosition, colors: ColorResolver, theme?: TableStyleTheme): TableStylePart;
+/**
+ * §20.1.2.1 `a:ln` → the rule it draws on one side of a cell.
+ *
+ * Shared with the cell's OWN `a:lnL`/`a:lnR`/`a:lnT`/`a:lnB`, which are the
+ * same element under a different name.
+ *
+ * @param ln     The line node.
+ * @param colors The deck's colour resolver.
+ * @returns The border, `none` when the line is one that draws nothing.
+ */
+export declare function lineBorder(ln: PoNode, colors: ColorResolver): Border;
+/** The same part with the style's fill dropped, for a cell that says `a:noFill`. */
+export declare function withoutFill(part: TableStylePart): TableStylePart;
+/** A cell with the style's fill, borders and run properties filled in under its own. */
+export declare function withCellStyle(cell: TableCell, part: TableStylePart): TableCell;

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

@@ -0,0 +1,203 @@
+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";
+//#region src/pptx/table-style.ts
+/** The `a:tblPr` flags, all off unless the table says otherwise. */
+function tableStyleFlags(tblPr) {
+	const on = (name) => tblPr !== void 0 && (poAttr(tblPr, name) === "1" || poAttr(tblPr, name) === "true");
+	return {
+		firstRow: on("firstRow"),
+		lastRow: on("lastRow"),
+		firstCol: on("firstCol"),
+		lastCol: on("lastCol"),
+		bandRow: on("bandRow"),
+		bandCol: on("bandCol")
+	};
+}
+/** The GUID a table names, if it names one (`a:tblPr/a:tableStyleId`). */
+function tableStyleId(tblPr) {
+	const id = tblPr ? poChildren(tblPr).find((c) => poIs(c, "a:tableStyleId")) : void 0;
+	return id ? poText(id).trim() || void 0 : void 0;
+}
+/**
+* The style a cell wears, composed from every part that reaches it.
+*
+* @param style  The `a:tblStyle` node.
+* @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, 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"));
+	if (flags.firstCol && at.col === 0) names.push("a:firstCol");
+	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 = tableBackground(style, colors, theme);
+	for (const name of names) {
+		const part = poChildren(style).find((c) => poIs(c, name));
+		if (part) out = {
+			...out,
+			...partStyle(part, colors, theme)
+		};
+	}
+	return out;
+}
+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 solid = poChildren(slot).find((c) => poIs(c, "a:solidFill"));
+	const slotHex = solid ? colorOf(solid, colors) : void 0;
+	return slotHex && slotHex !== "PHCLR" ? own ?? slotHex : own;
+}
+function bandName(index, edge, axis) {
+	return (edge ? index - 1 : index) % 2 === 0 ? `a:band1${axis}` : `a:band2${axis}`;
+}
+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 bdr = tcStyle ? poChildren(tcStyle).find((c) => poIs(c, "a:tcBdr")) : 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 } : {},
+		...borders ? { borders } : {},
+		...txStyle && on("b") ? { bold: true } : {},
+		...txStyle && on("i") ? { italic: true } : {},
+		...colorHex ? { colorHex } : {}
+	};
+}
+var SIDES = [
+	["a:left", "left"],
+	["a:right", "right"],
+	["a:top", "top"],
+	["a:bottom", "bottom"],
+	["a:insideH", "insideH"],
+	["a:insideV", "insideV"]
+];
+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);
+			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.
+*
+* Shared with the cell's OWN `a:lnL`/`a:lnR`/`a:lnT`/`a:lnB`, which are the
+* same element under a different name.
+*
+* @param ln     The line node.
+* @param colors The deck's colour resolver.
+* @returns The border, `none` when the line is one that draws nothing.
+*/
+function lineBorder(ln, colors) {
+	if (poChildren(ln).some((c) => poIs(c, "a:noFill")) || isTransparent(ln)) return { style: "none" };
+	const colorHex = colorOf(ln, colors);
+	const w = poIntAttr(ln, "w");
+	return {
+		style: "single",
+		...colorHex ? { colorHex } : {},
+		...w !== void 0 ? { width: pt(Math.max(.25, w / 12700)) } : {}
+	};
+}
+function isTransparent(ln) {
+	const fill = poChildren(ln).find((c) => poIs(c, "a:solidFill"));
+	const color = fill ? poChildren(fill).find((c) => poTag(c) !== void 0) : void 0;
+	const alpha = color ? readColorMods(color).find((m) => m.kind === "alpha") : void 0;
+	return alpha !== void 0 && alpha.val <= .001;
+}
+/** The same part with the style's fill dropped, for a cell that says `a:noFill`. */
+function withoutFill(part) {
+	const { shadingHex: _fill, ...rest } = part;
+	return rest;
+}
+function colorOf(node, colors) {
+	for (const child of poChildren(node)) {
+		const hex = resolveColorNode(child, colors);
+		if (hex !== void 0) return hex;
+		const deeper = poTag(child) !== void 0 ? colorOf(child, colors) : void 0;
+		if (deeper !== void 0) return deeper;
+	}
+}
+/** A cell with the style's fill, borders and run properties filled in under its own. */
+function withCellStyle(cell, part) {
+	const runProps = {
+		...part.bold === true ? { bold: true } : {},
+		...part.italic === true ? { italic: true } : {},
+		...part.colorHex !== void 0 ? { colorHex: part.colorHex } : {}
+	};
+	const content = Object.keys(runProps).length === 0 ? cell.content : cell.content.map((block) => block.kind === "paragraph" ? {
+		...block,
+		paragraph: {
+			...block.paragraph,
+			runs: block.paragraph.runs.map((run) => ({
+				...run,
+				properties: {
+					...runProps,
+					...run.properties
+				}
+			}))
+		}
+	} : block);
+	const borders = part.borders || cell.properties.borders ? {
+		...part.borders,
+		...cell.properties.borders
+	} : void 0;
+	return {
+		...cell,
+		properties: {
+			...part.shadingHex !== void 0 ? { shading: { colorHex: part.shadingHex } } : {},
+			...cell.properties,
+			...borders ? { borders } : {}
+		},
+		content
+	};
+}
+//#endregion
+export { cellStyle, lineBorder, tableStyleFlags, tableStyleId, withCellStyle, withoutFill };

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

@@ -56,12 +56,9 @@ var svgWriter = {
 };
 function emitPage(out, page, laid, losses, idc) {
 	const plan = paintPlan(page.commands);
+	for (const item of plan.behind) emitPageItem(out, item, laid, losses, idc);
 	for (const f of plan.fills) out.push(`<rect x="${fmt(f.x)}" y="${fmt(f.y)}" width="${fmt(f.width)}" height="${fmt(f.height)}" fill="#${f.fillColorHex}"/>`);
-	for (const img of plan.images) {
-		const href = imageHref(img.imageResourceName, laid);
-		if (!href) continue;
-		out.push(`<image x="${fmt(img.x)}" y="${fmt(img.y)}" width="${fmt(img.width)}" height="${fmt(img.height)}" href="${href}" preserveAspectRatio="none"/>`);
-	}
+	for (const img of plan.images) emitImage(out, img, laid, idc);
 	for (const b of plan.borders) {
 		const x2 = b.x + b.width;
 		const yTop = b.y;
@@ -90,8 +87,59 @@ function emitPage(out, page, laid, losses, idc) {
 		out.push(`<line x1="${fmt(ax)}" y1="${fmt(ay)}" x2="${fmt(bx)}" y2="${fmt(by)}" stroke="#${b.borderColorHex}" stroke-width="${fmt(b.borderSizePt)}"${b.borderStyle === "dashed" ? " stroke-dasharray=\"8 2.5\"" : b.borderStyle === "dashSmallGap" ? " stroke-dasharray=\"3 1\"" : b.borderStyle === "dotted" ? " stroke-dasharray=\"0.5 1\"" : ""}/>`);
 	}
 	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 t of plan.lines) emitTextLine(out, t, losses, idc);
 }
+/**
+* One picture. §20.1.8.23 `a:duotone` recolours it between two colours — its
+* dark end and its light end — which is a luminance-to-two-tone map, and SVG
+* states exactly that: luminance into every channel, then a two-entry transfer
+* table per channel.
+*
+* @param out  The SVG fragment sink.
+* @param img  The image item.
+* @param laid The laid-out document, for the image's data URI.
+* @param idc  The shared id counter, for the filter's id.
+*/
+function emitImage(out, img, laid, idc) {
+	const href = imageHref(img.imageResourceName, laid);
+	if (!href) return;
+	let filter = "";
+	if (img.duotone) {
+		const id = `duo${String(idc.n++)}`;
+		const chan = (hex, at) => parseInt(hex.slice(at, at + 2), 16) / 255;
+		const table = (at) => `${fmt(chan(img.duotone.shadowHex, at))} ${fmt(chan(img.duotone.highlightHex, at))}`;
+		out.push(`<filter id="${id}" color-interpolation-filters="sRGB"><feColorMatrix type="matrix" values="0.2126 0.7152 0.0722 0 0 0.2126 0.7152 0.0722 0 0 0.2126 0.7152 0.0722 0 0 0 0 0 1 0"/><feComponentTransfer><feFuncR type="table" tableValues="${table(0)}"/><feFuncG type="table" tableValues="${table(2)}"/><feFuncB type="table" tableValues="${table(4)}"/></feComponentTransfer></filter>`);
+		filter = ` filter="url(#${id})"`;
+	}
+	out.push(`<image x="${fmt(img.x)}" y="${fmt(img.y)}" width="${fmt(img.width)}" height="${fmt(img.height)}" href="${href}" preserveAspectRatio="none"${filter}/>`);
+}
+/**
+* One page item, whatever its kind — for the runs that paint in their own order
+* (what stands behind the content, and a picture's own primitives) rather than
+* in the by-kind passes.
+*
+* @param out    The SVG fragment sink.
+* @param item   The item to draw.
+* @param laid   The laid-out document, for image resources.
+* @param losses Where an unrenderable item records itself.
+* @param idc    The shared id counter for generated defs.
+*/
+function emitPageItem(out, item, laid, losses, idc) {
+	if (item.type === "shape") {
+		emitShape(out, item.shape, idc);
+		return;
+	}
+	if (item.type === "line") {
+		emitTextLine(out, item, losses, idc);
+		return;
+	}
+	if (item.type === "image") {
+		emitImage(out, item, laid, idc);
+		return;
+	}
+	if (item.type === "fill") out.push(`<rect x="${fmt(item.x)}" y="${fmt(item.y)}" width="${fmt(item.width)}" height="${fmt(item.height)}" fill="#${item.fillColorHex}"/>`);
+}
 function emitTextLine(out, item, losses, idc) {
 	const clip = item.clip;
 	if (clip) {

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` —
@@ -57,6 +58,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 +191,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;
@@ -536,7 +536,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 +773,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 +785,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 +870,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

@@ -6,10 +6,10 @@ 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 { bytesIncludePartName } from "../core/bytes.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)
 	});
@@ -166,7 +169,7 @@ var docxReader = {
 		FEATURES.trackedChanges,
 		FEATURES.fontsEmbedding
 	]),
-	sniff: (bytes) => bytes[0] === 80 && bytes[1] === 75 && (bytesIncludePartName(bytes, "word/document.xml") || bytesIncludePartName(bytes, "word/styles.xml") || bytesIncludePartName(bytes, "word/_rels/")),
+	sniff: (bytes) => bytes[0] === 80 && bytes[1] === 75 && (packageHasPart(bytes, "word/document.xml") || packageHasPart(bytes, "word/styles.xml") || packageHasPart(bytes, "word/_rels/")),
 	read: (bytes) => readDocx(bytes)
 };
 function infoFromCore(core) {

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 };