reamkit 1.22.0 → 1.24.0

package/dist/esm/pptx/slide-parser.js

@@ -1,10 +1,11 @@
 import { emuToPt, pt } from "../core/ir/units.js";
 import { FEATURES } from "../core/ir/features.js";
+import { isTextWarp } from "../core/drawingml/text-warp.js";
 import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs, poTag, poText } from "../core/po-helpers.js";
 import { defaultColorResolver, placeholderColors, resolveColorNode } from "../core/drawingml/colors.js";
 import { boxFromXfrm, parsePh, parseXfrmBox, rPrToRunProps } from "./sp-helpers.js";
-import { parseBullet } from "./placeholder-cascade.js";
-import { colorChangeOf, parseCustGeom, parseFill, parseLine, parsePrstGeom, parseShadow, parseXfrm, statesFill, styleRefFill, styleRefFontColor, styleRefLine } from "../word/drawing-parser.js";
+import { lineSpacing, parseBullet, spacingFractions, spacingFromLineFraction } from "./placeholder-cascade.js";
+import { colorChangeOf, parseCustGeom, parseFill, parseLine, parsePrstGeom, parseShadow, parseSrcRect, parseXfrm, statesFill, styleRefFill, styleRefFontColor, styleRefLine, withStatedDirection } from "../word/drawing-parser.js";
 import { cellStyle, lineBorder, tableStyleFlags, tableStyleId, withCellStyle, withoutFill } from "./table-style.js";
 //#region src/pptx/slide-parser.ts
 var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
@@ -46,17 +47,49 @@ function parseSlideShapes(container, ctx = {}, transform = IDENTITY_TRANSFORM, s
 				shape
 			});
 		} else if (poIs(child, "p:pic")) {
-			const image = parsePic(child, ctx, transform);
-			if (image) out.push({
-				kind: "image",
-				image
+			const clipped = pictureAsShape(child);
+			const shape = clipped ? parseSp(clipped, ctx, transform) : void 0;
+			if (shape) out.push({
+				kind: "shape",
+				shape
 			});
+			else {
+				const image = parsePic(child, ctx, transform);
+				if (image) out.push({
+					kind: "image",
+					image
+				});
+			}
 		} else if (poIs(child, "p:graphicFrame")) out.push(...parseGraphicFrame(child, ctx, transform));
 		else if (poIs(child, "p:grpSp")) out.push(...parseSlideShapes(child, ctx, composeGroupTransform(child, transform), skipPlaceholders));
 	}
 	return out;
 }
 /**
+* A `p:pic` that names a geometry of its own, rewritten as the `p:sp` it is.
+*
+* A picture holds its `p:blipFill` BESIDE `p:spPr`; a shape holds its fill
+* INSIDE it, under the drawing namespace. Moving the one into the other is the
+* whole difference, and it buys the shape path entire — the geometry, the
+* outline, the crop, the recolour — instead of a second clipper that would
+* drift from it.
+*
+* @param pic The `p:pic` node.
+* @returns The equivalent `p:sp`, or undefined when the picture is a plain
+*          rectangle and wants no clipping at all.
+*/
+function pictureAsShape(pic) {
+	const spPr = poChildren(pic).find((c) => poIs(c, "p:spPr"));
+	const prst = spPr ? poChildren(spPr).find((c) => poIs(c, "a:prstGeom")) : void 0;
+	const custom = spPr ? poChildren(spPr).find((c) => poIs(c, "a:custGeom")) : void 0;
+	const shape = poAttr(prst, "prst");
+	if (custom === void 0 && (shape === void 0 || shape === "rect")) return void 0;
+	const blipFill = poChildren(pic).find((c) => poIs(c, "p:blipFill"));
+	if (!blipFill || !spPr) return void 0;
+	const nv = poChildren(pic).find((c) => poIs(c, "p:nvPicPr"));
+	return { "p:sp": [...nv ? [{ "p:nvSpPr": poChildren(nv) }] : [], { "p:spPr": [{ "a:blipFill": poChildren(blipFill) }, ...poChildren(spPr)] }] };
+}
+/**
 * Whether a shape is a placeholder — `p:ph` in its OWN non-visual properties.
 * Read as "anywhere below", a group holding one would take the whole group
 * with it.
@@ -116,19 +149,25 @@ function parseSp(sp, ctx, transform) {
 	const style = poChildren(sp).find((c) => poIs(c, "p:style"));
 	const txBody = poChildren(sp).find((c) => poIs(c, "p:txBody"));
 	const styleColor = style ? styleRefFontColor(style, colors) : void 0;
-	const text = txBody ? parseTxBody(txBody, ph, ctx.cascade, colors, ctx.resolveHyperlink, styleColor) : void 0;
-	const proto = ph && ctx.cascade ? ctx.cascade.shapePropsFor(ph) : void 0;
-	const geometry = parseGeometry(spPr && statesGeometry(spPr) ? spPr : proto ?? spPr);
+	const text = txBody ? parseTxBody(txBody, ph, ctx.cascade, colors, ctx.resolveHyperlink, styleColor, ctx.themeFonts) : void 0;
+	const protos = ph && ctx.cascade ? ctx.cascade.shapePropsFor(ph) : [];
+	const from = (states) => spPr && states(spPr) ? spPr : protos.find(states) ?? spPr;
+	/** What the shape states ITSELF, before anything is inherited. */
+	const stated = (states) => spPr && states(spPr) ? spPr : void 0;
+	/** …and what a prototype lends it, nearest first. */
+	const lent = (states) => protos.find(states);
+	const geometry = parseGeometry(from(statesGeometry));
 	const useBgFill = poAttr(sp, "useBgFill") === "1";
-	const fillFrom = statesFill(spPr) ? spPr : proto ?? spPr;
-	const fill = useBgFill ? backgroundThrough(ctx.backgroundFill, box, ctx.slideSize) : fillFrom ? parseFill(fillFrom, colors, ctx.resolveImage) : { kind: "none" };
-	const lineFrom = spPr && poChildren(spPr).some((c) => poIs(c, "a:ln")) ? spPr : proto ?? spPr;
-	let line = lineFrom ? parseLine(lineFrom, colors) : void 0;
 	const themeStyles = ctx.themeFills ? {
 		fills: ctx.themeFills.fills,
 		bgFills: ctx.themeFills.backgrounds
 	} : void 0;
-	const styled = style && fill.kind === "none" && !statesFill(fillFrom) ? styleRefFill(style, colors, themeStyles) : fill;
+	const ownFill = stated(statesFill);
+	const styleFill = style ? styleRefFill(style, colors, themeStyles) : void 0;
+	const lentFill = lent(statesFill);
+	const styled = withStatedDirection(useBgFill ? backgroundThrough(ctx.backgroundFill, box, ctx.slideSize) : ownFill ? parseFill(ownFill, colors, ctx.resolveImage) : styleFill && styleFill.kind !== "none" ? styleFill : lentFill ? parseFill(lentFill, colors, ctx.resolveImage) : spPr ? parseFill(spPr, colors, ctx.resolveImage) : { kind: "none" }, spPr);
+	const lineFrom = from((n) => poChildren(n).some((c) => poIs(c, "a:ln")));
+	let line = lineFrom ? parseLine(lineFrom, colors) : void 0;
 	if (style) {
 		const fromStyle = styleRefLine(style, colors, ctx.themeLineWidths);
 		if (fromStyle) line = line ? {
@@ -136,6 +175,8 @@ function parseSp(sp, ctx, transform) {
 			...Object.fromEntries(Object.entries(line).filter(([, v]) => v !== void 0))
 		} : fromStyle;
 	}
+	const shadowFrom = from((n) => poChildren(n).some((c) => poIs(c, "a:effectLst")));
+	const shadow = shadowFrom ? parseShadow(shadowFrom, colors) : void 0;
 	const visibleLine = line !== void 0 && line.fill !== "none";
 	if (!text && styled.kind === "none" && !visibleLine) return void 0;
 	const xfrm = spPr ? poChildren(spPr).find((c) => poIs(c, "a:xfrm")) : void 0;
@@ -147,6 +188,7 @@ function parseSp(sp, ctx, transform) {
 		geometry,
 		fill: styled,
 		...line ? { line } : {},
+		...shadow ? { shadow } : {},
 		...spin && Object.keys(spin).length > 0 ? { transform: spin } : {},
 		...text ? { text } : {},
 		paragraphProperties: {}
@@ -177,7 +219,10 @@ function parseGraphicFrame(gf, ctx, transform) {
 	if (uri === TABLE_URI) {
 		const tbl = poFindDescendant(gf, "a:tbl");
 		if (!tbl) return [];
-		const table = parseTable(tbl, ctx.colors ?? defaultColorResolver, ctx.resolveTableStyle);
+		const table = parseTable(tbl, ctx.colors ?? defaultColorResolver, ctx.resolveTableStyle, {
+			...ctx.themeFills ? { fills: ctx.themeFills.fills } : {},
+			...ctx.themeLineWidths ? { lineWidths: ctx.themeLineWidths } : {}
+		});
 		return [{
 			kind: "table",
 			table: {
@@ -224,7 +269,10 @@ function parseGraphicFrame(gf, ctx, transform) {
 	if (uri === DIAGRAM_URI) {
 		const relIds = poFindDescendant(gf, "dgm:relIds");
 		const dmRelId = relIds ? poAttr(relIds, "dm") : void 0;
-		const spTree = dmRelId !== void 0 ? ctx.resolveDiagram?.(dmRelId) : void 0;
+		const spTree = dmRelId !== void 0 ? ctx.resolveDiagram?.(dmRelId, {
+			cx: box.cx,
+			cy: box.cy
+		}) : void 0;
 		if (!spTree) {
 			if (dmRelId !== void 0) ctx.onLoss?.(noDiagramOverrideLoss());
 			return [];
@@ -539,7 +587,10 @@ function parseGeometry(spPr) {
 	return RECT_GEOMETRY;
 }
 function parsePic(pic, ctx, transform) {
-	const own = parseXfrmBox(poChildren(pic).find((c) => poIs(c, "p:spPr")));
+	const spPr = poChildren(pic).find((c) => poIs(c, "p:spPr"));
+	const ph = parsePh(pic);
+	let own = parseXfrmBox(spPr);
+	if (!own && ph && ctx.cascade) own = ctx.cascade.geometryFor(ph);
 	if (!own) return void 0;
 	const box = transform(own);
 	const blipFill = poChildren(pic).find((c) => poIs(c, "p:blipFill"));
@@ -550,12 +601,19 @@ function parsePic(pic, ctx, transform) {
 	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));
+	const crop = parseSrcRect(blipFill ? poFindDescendant(blipFill, "a:srcRect") : void 0);
+	const xfrm = spPr ? poChildren(spPr).find((c) => poIs(c, "a:xfrm")) : void 0;
+	const rot = xfrm ? poIntAttr(xfrm, "rot") : void 0;
 	const altText = picAltText(pic);
 	return {
 		float: floatAt(box),
 		...resource !== void 0 ? { resource } : {},
 		...colorChange ? { colorChange } : {},
 		...alpha !== void 0 && alpha < 1 ? { alpha } : {},
+		...crop ? { crop } : {},
+		...rot !== void 0 && rot !== 0 ? { rotation60k: rot } : {},
+		...poAttr(xfrm, "flipH") === "1" ? { flipH: true } : {},
+		...poAttr(xfrm, "flipV") === "1" ? { flipV: true } : {},
 		width: emuToPt(box.cx),
 		height: emuToPt(box.cy),
 		paragraphProperties: {},
@@ -569,14 +627,14 @@ function picAltText(pic) {
 	const title = cNvPr ? poAttr(cNvPr, "title") : void 0;
 	return (descr ?? title)?.trim() || void 0;
 }
-function txBodyParagraphs(txBody, ph, cascade, colors, resolveLink, styleColor) {
+function txBodyParagraphs(txBody, ph, cascade, colors, resolveLink, styleColor, themeFonts) {
 	const content = [];
 	const counters = [];
 	for (const child of poChildren(txBody)) {
 		if (!poIs(child, "a:p")) continue;
 		content.push({
 			kind: "paragraph",
-			paragraph: parseSlideParagraph(child, ph, cascade, colors, resolveLink, counters, styleColor)
+			paragraph: parseSlideParagraph(child, ph, cascade, colors, resolveLink, counters, styleColor, themeFonts)
 		});
 	}
 	return content;
@@ -594,26 +652,100 @@ function txBodyParagraphs(txBody, ph, cascade, colors, resolveLink, styleColor)
 * @param resolveLink A run hyperlink resolver, or `undefined`.
 * @returns The text body, or `undefined` when it holds no paragraphs.
 */
-function parseTxBody(txBody, ph, cascade, colors, resolveLink, styleColor) {
-	const content = txBodyParagraphs(txBody, ph, cascade, colors, resolveLink, styleColor);
+function parseTxBody(txBody, ph, cascade, colors, resolveLink, styleColor, themeFonts) {
+	const content = txBodyParagraphs(txBody, ph, cascade, colors, resolveLink, styleColor, themeFonts);
 	if (content.length === 0) return void 0;
 	const bodyPr = poChildren(txBody).find((c) => poIs(c, "a:bodyPr"));
+	const fitted = fitToBody(content, bodyPr);
 	const lIns = bodyPr ? poIntAttr(bodyPr, "lIns") : void 0;
 	const tIns = bodyPr ? poIntAttr(bodyPr, "tIns") : void 0;
 	const rIns = bodyPr ? poIntAttr(bodyPr, "rIns") : void 0;
 	const bIns = bodyPr ? poIntAttr(bodyPr, "bIns") : void 0;
 	const a = bodyPr ? poAttr(bodyPr, "anchor") : void 0;
+	const autofit = bodyPr ? poChildren(bodyPr).find((c) => poIs(c, "a:normAutofit")) : void 0;
+	const shrink = autofit !== void 0 && poIntAttr(autofit, "fontScale") === void 0;
+	const warp = bodyPr ? textWarp(bodyPr) : void 0;
 	const anchor = a === "ctr" || a === "b" || a === "t" ? a : ph && cascade ? cascade.anchorFor(ph) : void 0;
 	return {
-		content,
+		content: fitted,
 		...lIns !== void 0 ? { insetLeft: emuToPt(lIns) } : {},
 		...tIns !== void 0 ? { insetTop: emuToPt(tIns) } : {},
 		...rIns !== void 0 ? { insetRight: emuToPt(rIns) } : {},
 		...bIns !== void 0 ? { insetBottom: emuToPt(bIns) } : {},
-		...anchor ? { anchor } : {}
+		...anchor ? { anchor } : {},
+		...shrink ? { shrinkToFit: true } : {},
+		...warp ? { warp } : {}
+	};
+}
+/**
+* §20.1.9.10 `a:prstTxWarp` — the WordArt curve a body's text is bent through,
+* with the `a:avLst` `adj` guide when it states one. Unread, tdf114848's eight
+* pieces of WordArt were set as eight ordinary paragraphs, each wrapped onto
+* three lines of upright type where both references draw one bent line.
+*
+* @param bodyPr The body's `a:bodyPr`.
+* @returns The preset and its adjustment, or `undefined` when the body states
+*          no warp or states the enumeration's `textNoShape`.
+*/
+function textWarp(bodyPr) {
+	const node = poChildren(bodyPr).find((c) => poIs(c, "a:prstTxWarp"));
+	const preset = node ? poAttr(node, "prst") : void 0;
+	if (node === void 0 || preset === void 0 || !isTextWarp(preset)) return void 0;
+	const avLst = poChildren(node).find((c) => poIs(c, "a:avLst"));
+	const adj = avLst ? poChildren(avLst).find((c) => poIs(c, "a:gd") && poAttr(c, "name") === "adj") : void 0;
+	const value = adj ? /^val\s+(-?\d+)$/u.exec(poAttr(adj, "fmla") ?? "")?.[1] : void 0;
+	return {
+		preset,
+		...value !== void 0 ? { adjust: Number(value) } : {}
 	};
 }
-function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters, styleColor) {
+/**
+* §21.1.2.1.2 — the body's text at the size the autofit settled on.
+*
+* The scale is a property of the BODY that reaches every run in it, so it is
+* applied here rather than carried down: a run in the model already holds the
+* size it inherited, and the shrink multiplies exactly that. Unread, the text
+* PowerPoint squeezed to 62% of its style overflowed the placeholder it was
+* squeezed to fit.
+*
+* @param content The body's paragraphs.
+* @param bodyPr  The body's `a:bodyPr`, which carries the autofit.
+* @returns The paragraphs, scaled; the same array when nothing is stated.
+*/
+function fitToBody(content, bodyPr) {
+	const fit = bodyPr ? poChildren(bodyPr).find((c) => poIs(c, "a:normAutofit")) : void 0;
+	const scale = fit ? poIntAttr(fit, "fontScale") : void 0;
+	const reduction = fit ? poIntAttr(fit, "lnSpcReduction") : void 0;
+	const fontScale = scale !== void 0 && scale > 0 ? scale / 1e5 : void 0;
+	const lineScale = reduction !== void 0 && reduction > 0 ? 1 - Math.min(reduction, 1e5) / 1e5 : void 0;
+	if (fontScale === void 0 && lineScale === void 0) return content;
+	return content.map((el) => {
+		if (el.kind !== "paragraph") return el;
+		const p = el.paragraph;
+		const line = lineScale === void 0 ? void 0 : pt((p.properties.spacingLine ?? 12) * lineScale);
+		return {
+			...el,
+			paragraph: {
+				...p,
+				properties: {
+					...p.properties,
+					...line !== void 0 ? {
+						spacingLine: line,
+						spacingLineRule: "auto"
+					} : {}
+				},
+				runs: fontScale === void 0 ? p.runs : p.runs.map((run) => run.properties.fontSizePt === void 0 ? run : {
+					...run,
+					properties: {
+						...run.properties,
+						fontSizePt: pt(run.properties.fontSizePt * fontScale)
+					}
+				})
+			}
+		};
+	});
+}
+function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters, styleColor, themeFonts) {
 	const pPr = poChildren(aP).find((c) => poIs(c, "a:pPr"));
 	const level = (pPr ? poIntAttr(pPr, "lvl") : void 0) ?? 0;
 	const defaults = {
@@ -624,9 +756,19 @@ function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters, sty
 	const algn = pPr ? poAttr(pPr, "algn") : void 0;
 	const alignment = algn !== void 0 ? ALGN_TO_ALIGNMENT[algn] : void 0;
 	const runs = [];
-	for (const child of poChildren(aP)) if (poIs(child, "a:r") || poIs(child, "a:fld")) {
-		const run = parseSlideRun(child, defaults, colors, resolveLink);
-		if (run) runs.push(run);
+	for (const child of poChildren(aP)) {
+		if (poIs(child, "a:br")) {
+			const last = runs[runs.length - 1];
+			if (last) runs[runs.length - 1] = {
+				...last,
+				text: `${last.text}\n`
+			};
+			continue;
+		}
+		if (poIs(child, "a:r") || poIs(child, "a:fld")) {
+			const run = parseSlideRun(child, defaults, colors, resolveLink, themeFonts);
+			if (run) runs.push(run);
+		}
 	}
 	const marL = pPr ? poIntAttr(pPr, "marL") : void 0;
 	const indent = pPr ? poIntAttr(pPr, "indent") : void 0;
@@ -645,27 +787,41 @@ function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters, sty
 			listMarker: true
 		});
 	}
-	if (runs.length === 0) {
-		const endRPr = poChildren(aP).find((c) => poIs(c, "a:endParaRPr"));
-		const sz = endRPr ? poIntAttr(endRPr, "sz") : void 0;
-		if (sz !== void 0 && sz > 0) runs.push({
-			text: "",
-			properties: {
-				...defaults,
-				fontSizePt: pt(sz / 100)
-			}
-		});
-	}
+	const endRPr = poChildren(aP).find((c) => poIs(c, "a:endParaRPr"));
+	const endSz = endRPr ? poIntAttr(endRPr, "sz") : void 0;
+	const markProps = runs.length > 0 ? void 0 : {
+		...defaults,
+		...endSz !== void 0 && endSz > 0 ? { fontSizePt: pt(endSz / 100) } : {}
+	};
 	return {
 		properties: {
 			...inherited,
 			...alignment ? { alignment } : {},
 			...indentLeft !== void 0 ? { indentLeft } : {},
-			...indent !== void 0 ? { indentFirstLine: emuToPt(indent) } : {}
+			...indent !== void 0 ? { indentFirstLine: emuToPt(indent) } : {},
+			...lineSpacing(pPr),
+			...ownSpacing(pPr, runs[0]?.properties.fontSizePt ?? defaults.fontSizePt),
+			...markProps && markProps.fontSizePt !== void 0 ? { runProperties: markProps } : {}
 		},
 		runs
 	};
 }
+function ownSpacing(pPr, sizePt) {
+	const fractions = spacingFractions(pPr);
+	const before = spacingFromLineFraction(fractions?.before, sizePt);
+	const after = spacingFromLineFraction(fractions?.after, sizePt);
+	const points = (tag) => {
+		const holder = pPr ? poChildren(pPr).find((c) => poIs(c, tag)) : void 0;
+		const node = holder ? poChildren(holder).find((c) => poIs(c, "a:spcPts")) : void 0;
+		const val = node ? poIntAttr(node, "val") : void 0;
+		return val === void 0 ? void 0 : pt(val / 100);
+	};
+	const [beforePt, afterPt] = [points("a:spcBef") ?? before, points("a:spcAft") ?? after];
+	return {
+		...beforePt !== void 0 ? { spacingBefore: beforePt } : {},
+		...afterPt !== void 0 ? { spacingAfter: afterPt } : {}
+	};
+}
 function bulletProps(base, bullet) {
 	const sizePt = bullet.sizePts ?? (bullet.sizePct !== void 0 && base.fontSizePt !== void 0 ? base.fontSizePt * bullet.sizePct : void 0);
 	return {
@@ -688,7 +844,7 @@ function autoNumSuffix(type) {
 	if (type.endsWith("Period")) return ".";
 	return "";
 }
-function parseSlideRun(node, defaults, colors, resolveLink) {
+function parseSlideRun(node, defaults, colors, resolveLink, themeFonts) {
 	const t = poChildren(node).find((c) => poIs(c, "a:t"));
 	const text = t ? poText(t) : "";
 	if (text.length === 0) return void 0;
@@ -700,12 +856,12 @@ function parseSlideRun(node, defaults, colors, resolveLink) {
 		text,
 		properties: {
 			...defaults,
-			...rPrToRunProps(rPr, colors)
+			...rPrToRunProps(rPr, colors, themeFonts)
 		},
 		...href ? { href } : {}
 	};
 }
-function parseTable(tbl, colors, resolveTableStyle) {
+function parseTable(tbl, colors, resolveTableStyle, theme) {
 	const grid = [];
 	const tblGrid = poChildren(tbl).find((c) => poIs(c, "a:tblGrid"));
 	if (tblGrid) {
@@ -738,7 +894,7 @@ function parseTable(tbl, colors, resolveTableStyle) {
 					rowCount: rows.length,
 					col: c,
 					colCount: grid.length
-				}, colors);
+				}, colors, theme);
 				const tc = sources[r]?.[c];
 				return withCellStyle(cell, tc && cellSaysNoFill(tc) ? withoutFill(part) : part);
 			})
@@ -767,12 +923,15 @@ function parseTableCell(tc, colors) {
 	const tcPr = poChildren(tc).find((c) => poIs(c, "a:tcPr"));
 	const shadingHex = tcPr ? cellFillHex(tcPr, colors) : void 0;
 	const borders = tcPr ? cellOwnBorders(tcPr, colors) : void 0;
+	const vert = tcPr ? poAttr(tcPr, "vert") : void 0;
+	const textDirection = vert === "vert" || vert === "eaVert" || vert === "mongolianVert" ? "vert" : vert === "vert270" ? "vert270" : void 0;
 	return {
 		properties: {
 			...gridSpan !== void 0 && gridSpan > 1 ? { colSpan: gridSpan } : {},
 			...merge ? { merge } : {},
 			...shadingHex ? { shading: { colorHex: shadingHex } } : {},
-			...borders ? { borders } : {}
+			...borders ? { borders } : {},
+			...textDirection ? { textDirection } : {}
 		},
 		content
 	};

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
@@ -18,9 +19,13 @@ export interface ShapeBoxEmu {
     readonly cy: number;
 }
 /**
- * `p:nvSpPr/p:nvPr/p:ph` → the placeholder reference, or `undefined` for an
- * ordinary (non-placeholder) shape. A bare `<p:ph/>` returns an empty ref (still
- * a placeholder: `type` defaults to `'obj'`).
+ * `p:nvPr/p:ph` → the placeholder reference, or `undefined` for an ordinary
+ * (non-placeholder) shape. A bare `<p:ph/>` returns an empty ref (still a
+ * placeholder: `type` defaults to `'obj'`).
+ *
+ * A PICTURE is a placeholder as readily as a shape is — a content placeholder
+ * filled with a photograph writes `p:nvPicPr/p:nvPr/p:ph` and an EMPTY `p:spPr`,
+ * leaving its whole geometry to the layout (customshape-bitmapfill-srcrect).
  */
 export declare function parsePh(sp: PoNode): PlaceholderRef | undefined;
 /**
@@ -42,4 +47,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,16 +1,27 @@
 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";
+var NON_VISUAL = [
+	"p:nvSpPr",
+	"p:nvPicPr",
+	"p:nvGraphicFramePr",
+	"p:nvCxnSpPr"
+];
 /**
-* `p:nvSpPr/p:nvPr/p:ph` → the placeholder reference, or `undefined` for an
-* ordinary (non-placeholder) shape. A bare `<p:ph/>` returns an empty ref (still
-* a placeholder: `type` defaults to `'obj'`).
+* `p:nvPr/p:ph` → the placeholder reference, or `undefined` for an ordinary
+* (non-placeholder) shape. A bare `<p:ph/>` returns an empty ref (still a
+* placeholder: `type` defaults to `'obj'`).
+*
+* A PICTURE is a placeholder as readily as a shape is — a content placeholder
+* filled with a photograph writes `p:nvPicPr/p:nvPr/p:ph` and an EMPTY `p:spPr`,
+* leaving its whole geometry to the layout (customshape-bitmapfill-srcrect).
 */
 function parsePh(sp) {
-	const nvSpPr = poChildren(sp).find((c) => poIs(c, "p:nvSpPr"));
-	const nvPr = nvSpPr ? poChildren(nvSpPr).find((c) => poIs(c, "p:nvPr")) : void 0;
+	const nonVisual = poChildren(sp).find((c) => NON_VISUAL.some((n) => poIs(c, n)));
+	const nvPr = nonVisual ? poChildren(nonVisual).find((c) => poIs(c, "p:nvPr")) : void 0;
 	const ph = nvPr ? poChildren(nvPr).find((c) => poIs(c, "p:ph")) : void 0;
 	if (!ph) return void 0;
 	const type = poAttr(ph, "type");
@@ -54,13 +65,13 @@ 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);
@@ -87,8 +98,36 @@ function capsOf(cap) {
 }
 function solidFillColor(rPr, colors) {
 	const solidFill = poChildren(rPr).find((c) => poIs(c, "a:solidFill"));
-	if (!solidFill) return void 0;
-	for (const c of poChildren(solidFill)) {
+	if (solidFill) {
+		for (const c of poChildren(solidFill)) {
+			const hex = resolveColorNode(c, colors);
+			if (hex) return hex;
+		}
+		return;
+	}
+	return gradientFillColor(rPr, colors);
+}
+/**
+* §20.1.8.33 — a run may be filled with a GRADIENT, and WordArt always is: the
+* text of tdf114848's second page runs through five stops of accent1. A run
+* here wears one colour, so the gradient gives up the stop nearest its middle —
+* the one most of the glyph is painted in. Unread, the run had no colour at all
+* and every word came out in the default black.
+*/
+function gradientFillColor(rPr, colors) {
+	const grad = poChildren(rPr).find((c) => poIs(c, "a:gradFill"));
+	const list = grad ? poChildren(grad).find((c) => poIs(c, "a:gsLst")) : void 0;
+	const stops = list ? poChildren(list).filter((c) => poIs(c, "a:gs")) : [];
+	let best;
+	for (const gs of stops) {
+		const at = Math.abs((poIntAttr(gs, "pos") ?? 0) - 5e4);
+		if (!best || at < best.at) best = {
+			at,
+			node: gs
+		};
+	}
+	if (!best) return void 0;
+	for (const c of poChildren(best.node)) {
 		const hex = resolveColorNode(c, colors);
 		if (hex) return hex;
 	}

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

@@ -13,6 +13,13 @@ export interface TableStyleFlags {
 /** What one part of a table style says about a cell. */
 export interface TableStylePart {
     readonly shadingHex?: string;
+    /**
+     * §20.1.2.3.1 — how opaque that shading is, when the part asks for less than
+     * all of it. A cell's fill is a layer over the table's background, not over
+     * the page, so the two have to be composed rather than each flattened to
+     * white on its own.
+     */
+    readonly shadingAlpha?: number;
     readonly borders?: CellBorders;
     readonly bold?: boolean;
     readonly italic?: boolean;
@@ -29,6 +36,13 @@ export interface CellPosition {
 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.
  *
@@ -36,9 +50,10 @@ export declare function tableStyleId(tblPr: PoNode | undefined): string | undefi
  * @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): TableStylePart;
+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.
  *