reamkit 1.21.0 → 1.23.0

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;
+/**
+ * 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
+ * nothing inherits its prototype's.
+ *
+ * @param spPr The shape properties, or undefined.
+ * @returns Whether a fill element is present.
+ */
+export declare function statesFill(spPr: PoNode | undefined): boolean;
+export declare function styleRefFill(style: PoNode, resolveColor: ColorResolver, themeStyles?: ThemeStyles): ShapeFill;
+export declare function styleRefLine(style: PoNode, resolveColor: ColorResolver, themeLineWidths?: ReadonlyArray<number>): ShapeLine | undefined;
+/**
+ * §20.1.4.2.14 `a:fontRef` — the colour a gallery style writes its text in.
+ *
+ * @param style        The shape's `p:style`/`wps:style` node.
+ * @param resolveColor The document's colour resolver.
+ * @returns The 6-hex colour, or `undefined` when the style names none.
+ */
+export declare function styleRefFontColor(style: PoNode, resolveColor: ColorResolver): string | undefined;
+export declare function withStyleFontColor(text: ShapeTextBody, style: PoNode, resolveColor: ColorResolver): ShapeTextBody;
 /**
  * §20.1.7.6 `a:xfrm` — how a shape sits in its box: rotated about its centre by
  * `@rot` (sixtieth-thousandths of a degree) and mirrored by `@flipH`/`@flipV`.
@@ -190,6 +210,20 @@ export declare function parseCustGeom(cust: PoNode): ShapeGeometry;
  * @param resolveColor Resolver for theme/scheme colours.
  */
 export declare function parseFill(spPr: PoNode, resolveColor: ColorResolver, resolveImage?: (relId: string) => ResourceId | undefined): ShapeFill;
+/**
+ * §20.1.8.16 `a:clrChange` — the colour a picture declares away, and what it
+ * becomes. `useA` (default true) says the destination's alpha counts, so a
+ * destination at zero alpha knocks the colour OUT rather than replacing it.
+ *
+ * @param blip         The `a:blip` node.
+ * @param resolveColor The colour resolver.
+ * @returns The change, or `undefined` when the blip declares none.
+ */
+export declare function colorChangeOf(blip: PoNode, resolveColor: ColorResolver): {
+    readonly fromHex: string;
+    readonly toHex: string;
+    readonly transparent: boolean;
+} | undefined;
 /**
  * Parse a shape's drop shadow from its `a:spPr` (§20.1.8.40 `a:effectLst` →
  * `a:outerShdw`).

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

@@ -1,7 +1,7 @@
 import { emuToPt, pt } from "../core/ir/units.js";
 import { buildStroke } from "../core/drawingml/shape-render.js";
 import { poAttr, poAttrLocal, poChildren, poFindDescendant, poIntAttr, poIs, poIsLocal, poTag, poText } from "../core/po-helpers.js";
-import { applyColorMods, readColorMods, resolveColorNode } from "../core/drawingml/colors.js";
+import { placeholderColors, readColorMods, resolveColorNode } from "../core/drawingml/colors.js";
 //#region src/word/drawing-parser.ts
 var WPS_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 var DRAWINGML_URI_BASES = ["http://schemas.openxmlformats.org/drawingml/2006/", "http://purl.oclc.org/ooxml/drawingml/"];
@@ -1524,9 +1524,6 @@ function styleRefShadow(style, resolveColor, themeEffectStyles) {
 	const phHex = child ? resolveColorNode(child, resolveColor) : void 0;
 	return shadowFromOuterShdw(shdw, phHex ? placeholderColors(resolveColor, phHex) : resolveColor);
 }
-function placeholderColors(base, phHex) {
-	return (raw) => "scheme" in raw && raw.scheme === "phClr" ? applyColorMods(phHex, raw.mods ?? []) : base(raw);
-}
 var FILL_TAGS = new Set([
 	"a:noFill",
 	"a:solidFill",
@@ -1535,6 +1532,14 @@ var FILL_TAGS = new Set([
 	"a:pattFill",
 	"a:grpFill"
 ]);
+/**
+* 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
+* nothing inherits its prototype's.
+*
+* @param spPr The shape properties, or undefined.
+* @returns Whether a fill element is present.
+*/
 function statesFill(spPr) {
 	return spPr !== void 0 && poChildren(spPr).some((c) => FILL_TAGS.has(poTag(c) ?? ""));
 }
@@ -1567,9 +1572,19 @@ function styleRefLine(style, resolveColor, themeLineWidths) {
 		width: pt((idx !== void 0 && idx > 0 ? themeLineWidths?.[idx - 1] : void 0) ?? .75)
 	};
 }
-function withStyleFontColor(text, style, resolveColor) {
+/**
+* §20.1.4.2.14 `a:fontRef` — the colour a gallery style writes its text in.
+*
+* @param style        The shape's `p:style`/`wps:style` node.
+* @param resolveColor The document's colour resolver.
+* @returns The 6-hex colour, or `undefined` when the style names none.
+*/
+function styleRefFontColor(style, resolveColor) {
 	const child = firstElementChild(poChildren(style).find((c) => poIs(c, "a:fontRef")));
-	const colorHex = child ? resolveColorNode(child, resolveColor) : void 0;
+	return child ? resolveColorNode(child, resolveColor) : void 0;
+}
+function withStyleFontColor(text, style, resolveColor) {
+	const colorHex = styleRefFontColor(style, resolveColor);
 	if (colorHex === void 0) return text;
 	return {
 		...text,
@@ -1801,11 +1816,23 @@ function fillFromNode(child, resolveColor, resolveImage) {
 		const resource = relId !== void 0 ? resolveImage?.(relId) : void 0;
 		if (resource === void 0) return { kind: "none" };
 		const crop = parseSrcRect(poFindDescendant(child, "a:srcRect")) ?? fillRectCrop(child);
+		const rect = fillRectBox(child);
+		const duotone = blip ? duotoneOf(blip, resolveColor) : void 0;
+		const tile = poChildren(child).find((c) => poIs(c, "a:tile"));
+		const tiled = tile !== void 0;
+		const tileScale = tile ? tileScaleOf(tile) : void 0;
+		const fixed = blip ? poChildren(blip).find((c) => poIs(c, "a:alphaModFix")) : void 0;
+		const amt = fixed ? poIntAttr(fixed, "amt") : void 0;
+		const alpha = amt === void 0 ? void 0 : Math.min(1, Math.max(0, amt / 1e5));
 		return {
 			kind: "picture",
 			imageResource: resource,
-			...poChildren(child).some((c) => poIs(c, "a:tile")) ? { tiled: true } : {},
-			...crop ? { imageCrop: crop } : {}
+			...tiled ? { tiled: true } : {},
+			...tileScale ? { tileScale } : {},
+			...crop ? { imageCrop: crop } : {},
+			...rect ? { imageFillRect: rect } : {},
+			...duotone ? { duotone } : {},
+			...alpha !== void 0 && alpha < 1 ? { alpha } : {}
 		};
 	}
 	if (poIs(child, "a:solidFill")) {
@@ -1830,10 +1857,13 @@ function fillFromNode(child, resolveColor, resolveImage) {
 	}
 	if (poIs(child, "a:gradFill")) {
 		const gradient = parseGradient(child, resolveColor);
-		return gradient ? {
+		if (!gradient) return { kind: "none" };
+		const alpha = gradientAlpha(gradient.stops);
+		return {
 			kind: "gradient",
-			gradient
-		} : { kind: "none" };
+			gradient,
+			...alpha !== void 0 ? { alpha } : {}
+		};
 	}
 }
 /**
@@ -1907,6 +1937,102 @@ function fillRectCrop(blipFill) {
 	};
 }
 /**
+* §20.1.8.16 `a:clrChange` — the colour a picture declares away, and what it
+* becomes. `useA` (default true) says the destination's alpha counts, so a
+* destination at zero alpha knocks the colour OUT rather than replacing it.
+*
+* @param blip         The `a:blip` node.
+* @param resolveColor The colour resolver.
+* @returns The change, or `undefined` when the blip declares none.
+*/
+function colorChangeOf(blip, resolveColor) {
+	const change = poChildren(blip).find((c) => poIs(c, "a:clrChange"));
+	if (!change) return void 0;
+	const side = (tag) => poChildren(change).find((c) => poIs(c, tag));
+	const from = side("a:clrFrom");
+	const to = side("a:clrTo");
+	const inner = (holder) => holder ? poChildren(holder).find((c) => poTag(c) !== void 0) : void 0;
+	const fromNode = inner(from);
+	const toNode = inner(to);
+	const fromHex = fromNode ? resolveColorNode(fromNode, resolveColor) : void 0;
+	if (fromHex === void 0) return void 0;
+	const toHex = (toNode ? resolveColorNode(toNode, resolveColor) : void 0) ?? fromHex;
+	const useA = poAttr(change, "useA") !== "0";
+	const alpha = toNode ? nodeAlpha(toNode) : void 0;
+	return {
+		fromHex,
+		toHex,
+		transparent: useA && alpha !== void 0 && alpha <= .001
+	};
+}
+/** §20.1.2.3.1 — a colour node's own `a:alpha`, as a fraction. */
+function nodeAlpha(color) {
+	const alpha = poChildren(color).find((c) => poIs(c, "a:alpha"));
+	const val = alpha ? poIntAttr(alpha, "val") : void 0;
+	return val === void 0 ? void 0 : val / 1e5;
+}
+/**
+* §20.1.8.23 `a:duotone` — the two colours a picture is recoloured between,
+* dark end first. Both are ordinary colour containers, so a theme's `phClr`
+* resolves through whatever resolver the caller bound.
+*
+* @param blip         The `a:blip` node.
+* @param resolveColor The colour resolver.
+* @returns The pair, or `undefined` when the blip states no duotone.
+*/
+function duotoneOf(blip, resolveColor) {
+	const duotone = poChildren(blip).find((c) => poIs(c, "a:duotone"));
+	if (!duotone) return void 0;
+	const [shadowHex, highlightHex] = poChildren(duotone).map((c) => resolveColorNode(c, resolveColor)).filter((hex) => hex !== void 0);
+	return shadowHex !== void 0 && highlightHex !== void 0 ? {
+		shadowHex,
+		highlightHex
+	} : void 0;
+}
+/**
+* §20.1.8.30 `a:stretch/a:fillRect` with POSITIVE insets — the part of the box
+* the picture is stretched INTO. The negative case is the zoom {@link
+* fillRectCrop} reads; this is the other one, and unread it drew a background
+* picture inset into the corner of a slide across the whole of it
+* (tdf153466.pptx: a triangle five times its size).
+*
+* @param blipFill The `a:blipFill` node.
+* @returns The rect as fractions of the box, or `undefined` when every inset
+*          is zero or negative.
+*/
+function tileScaleOf(tile) {
+	const pct = (name) => {
+		const v = poIntAttr(tile, name);
+		return v === void 0 || v <= 0 ? 1 : v / 1e5;
+	};
+	const sx = pct("sx");
+	const sy = pct("sy");
+	return sx === 1 && sy === 1 ? void 0 : {
+		sx,
+		sy
+	};
+}
+function fillRectBox(blipFill) {
+	const stretch = poChildren(blipFill).find((c) => poIs(c, "a:stretch"));
+	const rect = stretch ? poChildren(stretch).find((c) => poIs(c, "a:fillRect")) : void 0;
+	if (!rect) return void 0;
+	const side = (name) => Math.max(0, (poIntAttr(rect, name) ?? 0) / 1e5);
+	const [left, top, right, bottom] = [
+		side("l"),
+		side("t"),
+		side("r"),
+		side("b")
+	];
+	if (left + top + right + bottom === 0) return void 0;
+	if (left + right >= 1 || top + bottom >= 1) return void 0;
+	return {
+		left,
+		top,
+		right,
+		bottom
+	};
+}
+/**
 * Parse a shape's drop shadow from its `a:spPr` (§20.1.8.40 `a:effectLst` →
 * `a:outerShdw`).
 *
@@ -1936,14 +2062,15 @@ function shadowFromOuterShdw(shdw, resolveColor) {
 	const colorHex = colorNode ? resolveColorNode(colorNode, resolveColor) : void 0;
 	if (!colorHex) return void 0;
 	const alphaMod = colorNode ? readColorMods(colorNode).find((m) => m.kind === "alpha") : void 0;
+	const alpha = alphaMod ? alphaMod.val : 1;
 	const dist = emuToPt(poIntAttr(shdw, "dist") ?? 0);
 	const rad = (poIntAttr(shdw, "dir") ?? 0) / 6e4 * Math.PI / 180;
 	return {
 		dxPt: dist * Math.cos(rad),
 		dyPt: dist * Math.sin(rad),
 		blurPt: emuToPt(poIntAttr(shdw, "blurRad") ?? 0),
-		colorHex,
-		alpha: alphaMod ? alphaMod.val : 1
+		colorHex: alpha < 1 ? unblendWhite(colorHex, alpha) : colorHex,
+		alpha
 	};
 }
 /**
@@ -2089,6 +2216,34 @@ function colorFromContainer(parent, resolveColor) {
 		if (hex) return hex;
 	}
 }
+/**
+* §20.1.2.3.1 — a gradient's stop transparencies, settled.
+*
+* The resolver composites a translucent colour over the PAPER, because a solid
+* fill has nowhere else to put the transparency. A gradient does: its stops
+* become a luminosity soft mask of the same sweep (§11.6.5.2,
+* `buildGradientAlphaMask`), so each stop keeps its own alpha and its own
+* colour, and the mask decides what shows through.
+*
+* That means the washing has to be undone here, on every stop — including the
+* opaque ones, where undoing it is a no-op. It used to be undone only when
+* EVERY stop was translucent, on the reasoning that a page paints a gradient at
+* one transparency; the mask makes that false, and the cost of the old reading
+* was a band that should have been half-transparent over a blue slide drawn as
+* an opaque pale stripe (45541's layout fades the middle of its left rule to
+* 50 %).
+*/
+function normalizeStopAlpha(stops) {
+	for (const [i, s] of stops.entries()) stops[i] = {
+		...s,
+		colorHex: unblendWhite(s.colorHex, s.alpha ?? 1)
+	};
+}
+/** The one transparency a gradient can be drawn at; see {@link normalizeStopAlpha}. */
+function gradientAlpha(stops) {
+	const strongest = Math.max(...stops.map((s) => s.alpha ?? 1));
+	return strongest < 1 ? strongest : void 0;
+}
 function parseGradient(grad, resolveColor) {
 	const gsLst = poChildren(grad).find((c) => poIs(c, "a:gsLst"));
 	if (!gsLst) return void 0;
@@ -2103,13 +2258,16 @@ function parseGradient(grad, resolveColor) {
 		if (!hex) continue;
 		const pos = poIntAttr(gs, "pos");
 		const offset = pos !== void 0 ? clampUnit(pos / 1e5) : stops.length === 0 ? 0 : 1;
+		const alpha = containerAlpha(gs);
 		stops.push({
 			offset,
-			colorHex: hex
+			colorHex: hex,
+			...alpha !== void 0 ? { alpha } : {}
 		});
 	}
 	if (stops.length === 0) return void 0;
 	stops.sort((a, b) => a.offset - b.offset);
+	normalizeStopAlpha(stops);
 	const path = poChildren(grad).find((c) => poIs(c, "a:path"));
 	if (path) {
 		const rect = poChildren(path).find((c) => poIs(c, "a:fillToRect"));
@@ -2144,4 +2302,4 @@ function clampUnit(x) {
 	return x < 0 ? 0 : x > 1 ? 1 : x;
 }
 //#endregion
-export { expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseVmlPicture, parseXfrm, shadowFromOuterShdw, vmlFill };
+export { colorChangeOf, expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseVmlPicture, parseXfrm, shadowFromOuterShdw, statesFill, styleRefFill, styleRefFontColor, styleRefLine, vmlFill };

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

@@ -1,5 +1,6 @@
 import { Numbering } from '../core/document-model/index.js';
 import { ResourceId } from '../core/ir/index.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 /** The empty {@link Numbering} returned when a document has no `numbering.xml`. */
 export declare const EMPTY_NUMBERING: Numbering;
 /**
@@ -12,4 +13,4 @@ export declare const EMPTY_NUMBERING: Numbering;
  * @param data The raw `numbering.xml` bytes.
  * @returns The parsed numbering, or {@link EMPTY_NUMBERING} when the root is absent.
  */
-export declare function parseNumbering(data: Uint8Array, resolveImage?: (relId: string) => ResourceId | undefined): Numbering;
+export declare function parseNumbering(data: Uint8Array, resolveImage?: (relId: string) => ResourceId | undefined, themeFonts?: ThemeFonts): Numbering;

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

@@ -56,7 +56,7 @@ var EMPTY_NUMBERING = {
 * @param data The raw `numbering.xml` bytes.
 * @returns The parsed numbering, or {@link EMPTY_NUMBERING} when the root is absent.
 */
-function parseNumbering(data, resolveImage) {
+function parseNumbering(data, resolveImage, themeFonts) {
 	const xml = decoder.decode(data);
 	const root = asElement(parser.parse(xml)["w:numbering"]);
 	if (!root) return EMPTY_NUMBERING;
@@ -69,7 +69,7 @@ function parseNumbering(data, resolveImage) {
 		if (!id) continue;
 		const levels = /* @__PURE__ */ new Map();
 		for (const lvlNode of asArray(el["w:lvl"])) {
-			const lvl = parseLevel(lvlNode, picBullets);
+			const lvl = parseLevel(lvlNode, picBullets, themeFonts);
 			if (lvl) levels.set(lvl.ilvl, lvl);
 		}
 		abstractNums.set(id, {
@@ -94,7 +94,7 @@ function parseNumbering(data, resolveImage) {
 			if (!Number.isFinite(ilvl)) continue;
 			const start = Number(getValVal(ovr["w:startOverride"]));
 			if (Number.isFinite(start)) startOverrides.set(ilvl, start);
-			const lvl = parseLevel(ovr["w:lvl"], picBullets);
+			const lvl = parseLevel(ovr["w:lvl"], picBullets, themeFonts);
 			if (lvl) levelOverrides.set(ilvl, lvl);
 		}
 		numInstances.set(numId, {
@@ -109,7 +109,7 @@ function parseNumbering(data, resolveImage) {
 		numInstances
 	};
 }
-function parseLevel(node, picBullets) {
+function parseLevel(node, picBullets, themeFonts) {
 	const lvlEl = asElement(node);
 	if (!lvlEl) return void 0;
 	const ilvlStr = getAttr(lvlEl, "ilvl");
@@ -131,8 +131,8 @@ function parseLevel(node, picBullets) {
 		lvlText,
 		...isLegal ? { isLegal: true } : {},
 		...picBullet ? { picBullet } : {},
-		paragraphProperties: parseParagraphProperties(lvlEl["w:pPr"]),
-		runProperties: parseRunProperties(lvlEl["w:rPr"])
+		paragraphProperties: parseParagraphProperties(lvlEl["w:pPr"], 0, themeFonts),
+		runProperties: parseRunProperties(lvlEl["w:rPr"], themeFonts)
 	};
 }
 function parsePicBullets(root, resolveImage) {

package/dist/esm/word/paragraph-properties.d.ts

@@ -1,4 +1,5 @@
 import { ParagraphProperties } from '../core/document-model/index.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 /**
  * §17.3.1.1/§17.3.1.3 — the gap `w:*Autospacing` asks the consumer for. Word's
  * own automatic value is HTML's 14pt, and only a document old enough to state
@@ -19,4 +20,4 @@ export declare const HTML_AUTO_SPACING_PT = 14;
  *   compatibility mode, and 0 (the default) for every Word 2007-or-later one.
  * @returns The extracted properties; an empty object when `pPr` is absent.
  */
-export declare function parseParagraphProperties(pPr: unknown, autoSpacingPt?: number): ParagraphProperties;
+export declare function parseParagraphProperties(pPr: unknown, autoSpacingPt?: number, themeFonts?: ThemeFonts): ParagraphProperties;

package/dist/esm/word/paragraph-properties.js

@@ -104,7 +104,7 @@ function parseFramePr(node) {
 *   compatibility mode, and 0 (the default) for every Word 2007-or-later one.
 * @returns The extracted properties; an empty object when `pPr` is absent.
 */
-function parseParagraphProperties(pPr, autoSpacingPt = 0) {
+function parseParagraphProperties(pPr, autoSpacingPt = 0, themeFonts) {
 	const el = asElement(pPr);
 	if (!el) return {};
 	const out = {};
@@ -197,7 +197,7 @@ function parseParagraphProperties(pPr, autoSpacingPt = 0) {
 		}
 	}
 	if ("w:rPr" in el) {
-		const rPr = parseRunProperties(el["w:rPr"]);
+		const rPr = parseRunProperties(el["w:rPr"], themeFonts);
 		if (Object.keys(rPr).length > 0) out.runProperties = rPr;
 	}
 	return out;

package/dist/esm/word/run-properties.d.ts

@@ -1,4 +1,5 @@
 import { RunProperties } from '../core/document-model/index.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 /**
  * Parse a run-properties element (`w:rPr`, ECMA-376 Part 1 §17.3.2) into the
  * typed {@link RunProperties}. Reads the character formatting the renderer needs:
@@ -6,7 +7,9 @@ import { RunProperties } from '../core/document-model/index.js';
  * font family map, vertical alignment, RTL, and language; sizes convert from
  * half-points to points and colours normalize to uppercase hex.
  *
- * @param rPr The flat-tree `w:rPr` element (or `undefined`/non-element).
+ * @param rPr        The flat-tree `w:rPr` element (or `undefined`/non-element).
+ * @param themeFonts The document theme's font scheme, for the fonts a run names
+ *                   by slot rather than by name (§17.3.2.26 `w:asciiTheme`).
  * @returns The parsed properties; an empty object when `rPr` is absent.
  */
-export declare function parseRunProperties(rPr: unknown): RunProperties;
+export declare function parseRunProperties(rPr: unknown, themeFonts?: ThemeFonts): RunProperties;

package/dist/esm/word/run-properties.js

@@ -1,5 +1,7 @@
 import { halfPtToPt, twipsToPt } from "../core/ir/units.js";
+import { resolveThemeFont } from "../core/drawingml/theme-parser.js";
 import { asElement, getAttr, getVal, parseHalfPointAttr, parseToggle } from "./xml-helpers.js";
+import { resolveWordThemeFont } from "./theme-fonts.js";
 import { shadingFillHex } from "./shading.js";
 //#region src/word/run-properties.ts
 var UNDERLINE_STYLES = new Set([
@@ -43,10 +45,12 @@ var HIGHLIGHT_COLORS = new Map([
 * font family map, vertical alignment, RTL, and language; sizes convert from
 * half-points to points and colours normalize to uppercase hex.
 *
-* @param rPr The flat-tree `w:rPr` element (or `undefined`/non-element).
+* @param rPr        The flat-tree `w:rPr` element (or `undefined`/non-element).
+* @param themeFonts The document theme's font scheme, for the fonts a run names
+*                   by slot rather than by name (§17.3.2.26 `w:asciiTheme`).
 * @returns The parsed properties; an empty object when `rPr` is absent.
 */
-function parseRunProperties(rPr) {
+function parseRunProperties(rPr, themeFonts) {
 	const el = asElement(rPr);
 	if (!el) return {};
 	const out = {};
@@ -90,7 +94,7 @@ function parseRunProperties(rPr) {
 		else if (v === "auto") out.colorHex = "000000";
 	}
 	if ("w:rFonts" in el) {
-		const ff = parseFontFamily(el["w:rFonts"]);
+		const ff = parseFontFamily(el["w:rFonts"], themeFonts);
 		if (ff) out.fontFamily = ff;
 	}
 	if ("w:vertAlign" in el) {
@@ -121,12 +125,13 @@ function parseRunProperties(rPr) {
 	}
 	return out;
 }
-function parseFontFamily(node) {
+function parseFontFamily(node, themeFonts) {
 	const ff = {};
-	const ascii = getAttr(node, "ascii");
-	const hAnsi = getAttr(node, "hAnsi");
-	const cs = getAttr(node, "cs");
-	const eastAsia = getAttr(node, "eastAsia");
+	const slot = (literal, theme) => resolveThemeFont(getAttr(node, literal), themeFonts) ?? resolveWordThemeFont(getAttr(node, theme), themeFonts);
+	const ascii = slot("ascii", "asciiTheme");
+	const hAnsi = slot("hAnsi", "hAnsiTheme");
+	const cs = slot("cs", "cstheme");
+	const eastAsia = slot("eastAsia", "eastAsiaTheme");
 	if (ascii) ff.ascii = ascii;
 	if (hAnsi) ff.hAnsi = hAnsi;
 	if (cs) ff.cs = cs;

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

@@ -1,4 +1,5 @@
 import { StyleSheet } from '../core/document-model/index.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 /**
  * Parse `word/styles.xml` (ECMA-376 Part 1 §17.7) into a {@link StyleSheet}: the
  * document defaults (`w:docDefaults` run/paragraph properties) plus the named
@@ -9,4 +10,4 @@ import { StyleSheet } from '../core/document-model/index.js';
  * @param stylesXml The raw `styles.xml` bytes.
  * @returns The parsed stylesheet, or `EMPTY_STYLE_SHEET` when the root is absent.
  */
-export declare function parseStyles(stylesXml: Uint8Array): StyleSheet;
+export declare function parseStyles(stylesXml: Uint8Array, themeFonts?: ThemeFonts): StyleSheet;

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

@@ -32,7 +32,7 @@ var STYLE_TYPES = new Set([
 * @param stylesXml The raw `styles.xml` bytes.
 * @returns The parsed stylesheet, or `EMPTY_STYLE_SHEET` when the root is absent.
 */
-function parseStyles(stylesXml) {
+function parseStyles(stylesXml, themeFonts) {
 	const xml = decoder.decode(stylesXml);
 	const root = asElement(parser.parse(xml)["w:styles"]);
 	if (!root) return EMPTY_STYLE_SHEET;
@@ -41,9 +41,9 @@ function parseStyles(stylesXml) {
 	let defaultParagraphProperties = {};
 	if (docDefaults) {
 		const rPrDef = asElement(docDefaults["w:rPrDefault"]);
-		if (rPrDef) defaultRunProperties = parseRunProperties(rPrDef["w:rPr"]);
+		if (rPrDef) defaultRunProperties = parseRunProperties(rPrDef["w:rPr"], themeFonts);
 		const pPrDef = asElement(docDefaults["w:pPrDefault"]);
-		if (pPrDef) defaultParagraphProperties = parseParagraphProperties(pPrDef["w:pPr"]);
+		if (pPrDef) defaultParagraphProperties = parseParagraphProperties(pPrDef["w:pPr"], 0, themeFonts);
 	}
 	const styles = /* @__PURE__ */ new Map();
 	for (const s of asArray(root["w:style"])) {
@@ -61,9 +61,9 @@ function parseStyles(stylesXml) {
 			type,
 			...basedOnVal ? { basedOn: basedOnVal } : {},
 			isDefault,
-			runProperties: parseRunProperties(el["w:rPr"]),
-			paragraphProperties: parseParagraphProperties(el["w:pPr"]),
-			...type === "table" ? parseTableStyleParts(el) : {}
+			runProperties: parseRunProperties(el["w:rPr"], themeFonts),
+			paragraphProperties: parseParagraphProperties(el["w:pPr"], 0, themeFonts),
+			...type === "table" ? parseTableStyleParts(el, themeFonts) : {}
 		};
 		styles.set(id, style);
 	}
@@ -88,9 +88,9 @@ var CONDITION_TYPES = new Set([
 	"swCell",
 	"seCell"
 ]);
-function parseTableStyleParts(el) {
+function parseTableStyleParts(el, themeFonts) {
 	const out = {};
-	const base = parseTableStyleLayer(el);
+	const base = parseTableStyleLayer(el, themeFonts);
 	if (base) out.tableLayer = base;
 	const tblPr = asElement(el["w:tblPr"]);
 	if (tblPr) {
@@ -105,7 +105,7 @@ function parseTableStyleParts(el) {
 		if (!cond) continue;
 		const typeAttr = getAttr(cond, "type");
 		if (!typeAttr || !CONDITION_TYPES.has(typeAttr)) continue;
-		const layer = parseTableStyleLayer(cond);
+		const layer = parseTableStyleLayer(cond, themeFonts);
 		if (layer) conditions.push({
 			type: typeAttr,
 			layer
@@ -114,7 +114,7 @@ function parseTableStyleParts(el) {
 	if (conditions.length > 0) out.tableConditions = conditions;
 	return out;
 }
-function parseTableStyleLayer(el) {
+function parseTableStyleLayer(el, themeFonts) {
 	const tblPr = asElement(el["w:tblPr"]);
 	const tcPr = asElement(el["w:tcPr"]);
 	const borders = parseFlatBorders(tblPr ? asElement(tblPr["w:tblBorders"]) : void 0) ?? parseFlatBorders(tcPr ? asElement(tcPr["w:tcBorders"]) : void 0);
@@ -124,8 +124,8 @@ function parseTableStyleLayer(el) {
 	const indType = tblInd ? getAttr(tblInd, "type") : void 0;
 	const indentPt = indW !== void 0 && (indType === void 0 || indType === "dxa") ? twipsToPt(indW) : void 0;
 	const shading = parseFlatShading(tcPr ? tcPr["w:shd"] : void 0);
-	const runProperties = parseRunProperties(el["w:rPr"]);
-	const paragraphProperties = parseParagraphProperties(el["w:pPr"]);
+	const runProperties = parseRunProperties(el["w:rPr"], themeFonts);
+	const paragraphProperties = parseParagraphProperties(el["w:pPr"], 0, themeFonts);
 	const layer = {
 		...borders ? { borders } : {},
 		...cellMargins ? { cellMargins } : {},

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

@@ -115,11 +115,11 @@ function parseTable(tbl, ctx = DEFAULT_PARSE_CONTEXT) {
 function poChildrenThroughSdt(node, tag) {
 	return childrenThroughSdt(node, tag).map((c) => c.node);
 }
-function childrenThroughSdt(node, tag) {
+function childrenThroughSdt(node, tag, themeFonts) {
 	const out = [];
 	for (const child of poChildren(node)) if (poIs(child, tag)) out.push({ node: child });
 	else if (poIs(child, "w:sdt")) {
-		const props = sdtRunProperties(child);
+		const props = sdtRunProperties(child, themeFonts);
 		for (const inner of poChildrenWith(poFirstChild(child, "w:sdtContent"), tag)) out.push({
 			node: inner,
 			...props ? { sdtRunProps: props } : {}
@@ -270,7 +270,7 @@ function isDeletedRow(tr) {
 function parseTableRow(tr, ctx) {
 	const properties = parseRowProperties(poFirstChild(tr, "w:trPr"));
 	const cells = [];
-	for (const { node, sdtRunProps } of childrenThroughSdt(tr, "w:tc")) cells.push(parseTableCell(node, ctx, sdtRunProps));
+	for (const { node, sdtRunProps } of childrenThroughSdt(tr, "w:tc", ctx.themeFonts)) cells.push(parseTableCell(node, ctx, sdtRunProps));
 	return {
 		properties,
 		cells

package/dist/esm/word/theme-fonts.d.ts

@@ -0,0 +1,10 @@
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
+/**
+ * Resolve a `w:rFonts` theme attribute to the typeface it stands for.
+ *
+ * @param value The attribute as written (`minorHAnsi`, `majorBidi`, …).
+ * @param fonts The theme's font scheme, when the part was read.
+ * @returns The typeface, or `undefined` for an unknown slot, a missing theme,
+ *          or a slot the theme leaves empty.
+ */
+export declare function resolveWordThemeFont(value: string | undefined, fonts: ThemeFonts | undefined): string | undefined;

package/dist/esm/word/theme-fonts.js

@@ -0,0 +1,28 @@
+//#region src/word/theme-fonts.ts
+var THEME_SLOTS = new Map([
+	["majorascii", ["major", "latin"]],
+	["majorhansi", ["major", "latin"]],
+	["majoreastasia", ["major", "ea"]],
+	["majorbidi", ["major", "cs"]],
+	["minorascii", ["minor", "latin"]],
+	["minorhansi", ["minor", "latin"]],
+	["minoreastasia", ["minor", "ea"]],
+	["minorbidi", ["minor", "cs"]]
+]);
+/**
+* Resolve a `w:rFonts` theme attribute to the typeface it stands for.
+*
+* @param value The attribute as written (`minorHAnsi`, `majorBidi`, …).
+* @param fonts The theme's font scheme, when the part was read.
+* @returns The typeface, or `undefined` for an unknown slot, a missing theme,
+*          or a slot the theme leaves empty.
+*/
+function resolveWordThemeFont(value, fonts) {
+	if (value === void 0 || !fonts) return void 0;
+	const slot = THEME_SLOTS.get(value.trim().toLowerCase());
+	if (!slot) return void 0;
+	const [which, script] = slot;
+	return fonts[which][script];
+}
+//#endregion
+export { resolveWordThemeFont };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "description": "Ream — convert DOCX, XLSX, PPTX and PDF to PDF, SVG, HTML, DOCX and XLSX, built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
   "author": "Alex Krassavin <info@reamkit.dev>",