reamkit 1.20.0 → 1.22.0

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

@@ -0,0 +1,56 @@
+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;
+/**
+ * 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.
+ * @returns The composed part, empty when the style says nothing.
+ */
+export declare function cellStyle(style: PoNode, flags: TableStyleFlags, at: CellPosition, colors: ColorResolver): 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,161 @@
+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.
+* @returns The composed part, empty when the style says nothing.
+*/
+function cellStyle(style, flags, at, colors) {
+	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 = {};
+	for (const name of names) {
+		const part = poChildren(style).find((c) => poIs(c, name));
+		if (part) out = {
+			...out,
+			...partStyle(part, colors)
+		};
+	}
+	return out;
+}
+function bandName(index, edge, axis) {
+	return (edge ? index - 1 : index) % 2 === 0 ? `a:band1${axis}` : `a:band2${axis}`;
+}
+function partStyle(part, colors) {
+	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) : 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) {
+	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);
+	}
+	return Object.keys(out).length > 0 ? out : void 0;
+}
+/**
+* §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/docx-reader.js

@@ -6,7 +6,7 @@ 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";
@@ -166,7 +166,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/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,20 @@ 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 tiled = poChildren(child).some((c) => poIs(c, "a:tile"));
+		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 } : {},
+			...crop ? { imageCrop: crop } : {},
+			...rect ? { imageFillRect: rect } : {},
+			...duotone ? { duotone } : {},
+			...alpha !== void 0 && alpha < 1 ? { alpha } : {}
 		};
 	}
 	if (poIs(child, "a:solidFill")) {
@@ -1830,10 +1854,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 +1934,90 @@ 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 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`).
 *
@@ -2089,6 +2200,38 @@ function colorFromContainer(parent, resolveColor) {
 		if (hex) return hex;
 	}
 }
+/**
+* §20.1.2.3.1 — a gradient's stop transparencies, settled.
+*
+* A page paints a gradient at ONE transparency, so only a gradient whose every
+* stop is translucent can carry it: the strongest stop decides whether the
+* shape is there at all, which is the question a 7%-and-fading glow asks
+* (tdf123684's master draws one over a dark slide, and composited over the
+* paper instead it was an opaque white disc).
+*
+* A gradient that mixes a translucent stop with an opaque one has no such
+* answer, so it keeps the colours the resolver already washed toward the paper
+* — an approximation, but the one that has always been drawn: smartart-simple's
+* cyan-to-purple sweep sets 75% on its purple end alone.
+*/
+function normalizeStopAlpha(stops) {
+	if (gradientAlpha(stops) === void 0) {
+		for (const [i, s] of stops.entries()) if (s.alpha !== void 0) stops[i] = {
+			offset: s.offset,
+			colorHex: s.colorHex
+		};
+		return;
+	}
+	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 +2246,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 +2290,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.20.0",
+  "version": "1.22.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>",