reamkit 1.22.0 → 1.24.0

package/dist/esm/pptx/pptx-reader.d.ts

@@ -17,6 +17,14 @@ export declare function readPptx(bytes: Uint8Array): ReadResult<FlowDoc>;
  * Parse an OOXML part's bytes into preserve-order {@link PoNode} roots with the
  * module's shared, presentation-tuned {@link XMLParser} (attributes kept, values
  * not coerced, whitespace preserved). Shared with the slide-style resolvers.
+ *
+ * ISO/IEC 29500-3 §10.2 — `mc:AlternateContent` is resolved first, to the
+ * `mc:Fallback` a reader takes when it implements none of the namespaces the
+ * choices require. A deck writes the same shape twice this way, and reading the
+ * CHOICE means reading markup written for someone else: tdf143222's whole slide
+ * is an embedded worksheet whose preview picture lives in the fallback alone,
+ * and the choice — written for VML — carries no picture at all, so the slide
+ * came out blank. 82 of the corpus's decks carry such a block.
  */
 export declare function parseXml(data: Uint8Array): Array<PoNode>;
 /**

package/dist/esm/pptx/pptx-reader.js

@@ -4,12 +4,16 @@ import { FEATURES } from "../core/ir/features.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs } from "../core/po-helpers.js";
+import { cachedDiagramTree, laidOutDiagramTree } from "../core/drawingml/diagram/run.js";
 import { packageHasPart } from "../core/bytes.js";
 import { DEFAULT_SCHEME_ALIAS, DEFAULT_THEME_PALETTE, defaultColorResolver, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
-import { parseTheme, parseThemeBgFillStyles, parseThemeFillStyles, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
+import { parseTheme, parseThemeBgFillStyles, parseThemeFillStyles, parseThemeFonts, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { OpcPackage } from "../core/opc/package.js";
 import "../core/opc/index.js";
+import { loadPptxEmbeddedFonts } from "./embedded-fonts.js";
+import { presetTableStyle } from "./preset-table-styles.js";
+import { resolveAlternateContent } from "../core/opc/alternate-content.js";
 import { buildPlaceholderCascade, parseLevelStyles } from "./placeholder-cascade.js";
 import { normalizeSpid, parseVmlImageRels } from "./ole-preview.js";
 import { asBackdrop, backdropElement, parseBackgroundFill, parseSlideShapes } from "./slide-parser.js";
@@ -19,6 +23,7 @@ var EMU_PER_PT = 12700;
 var DEFAULT_CX = 9144e3;
 var DEFAULT_CY = 6858e3;
 var decoder = new TextDecoder();
+var encoder = new TextEncoder();
 var parser = new XMLParser({
 	htmlEntities: true,
 	ignoreAttributes: false,
@@ -55,9 +60,11 @@ function readPptx(bytes) {
 	let cx = DEFAULT_CX;
 	let cy = DEFAULT_CY;
 	let defaultTextStyle;
+	let embeddedFonts = /* @__PURE__ */ new Map();
 	const slideParts = [];
 	if (presData) {
 		const pres = parser.parse(decoder.decode(presData)).find((n) => poIs(n, "p:presentation"));
+		embeddedFonts = loadPptxEmbeddedFonts(pkg, presPath, pres, (loss) => losses.push(loss));
 		const kids = pres ? poChildren(pres) : [];
 		defaultTextStyle = kids.find((c) => poIs(c, "p:defaultTextStyle"));
 		const sldSz = kids.find((c) => poIs(c, "p:sldSz"));
@@ -123,6 +130,7 @@ function readPptx(bytes) {
 					widthPt: pageW,
 					heightPt: pageH
 				},
+				...styles.themeFonts ? { themeFonts: styles.themeFonts } : {},
 				...styles.themeFills ? { themeFills: styles.themeFills } : {},
 				...styles.themeLineWidths ? { themeLineWidths: styles.themeLineWidths } : {},
 				resolveImage: makeSlideImageResolver(pkg, part.path, resources),
@@ -162,7 +170,8 @@ function readPptx(bytes) {
 			section,
 			styles: EMPTY_STYLE_SHEET,
 			resources,
-			...charts.size > 0 ? { charts } : {}
+			...charts.size > 0 ? { charts } : {},
+			...embeddedFonts.size > 0 ? { embeddedFonts } : {}
 		},
 		losses
 	};
@@ -171,9 +180,17 @@ function readPptx(bytes) {
 * Parse an OOXML part's bytes into preserve-order {@link PoNode} roots with the
 * module's shared, presentation-tuned {@link XMLParser} (attributes kept, values
 * not coerced, whitespace preserved). Shared with the slide-style resolvers.
+*
+* ISO/IEC 29500-3 §10.2 — `mc:AlternateContent` is resolved first, to the
+* `mc:Fallback` a reader takes when it implements none of the namespaces the
+* choices require. A deck writes the same shape twice this way, and reading the
+* CHOICE means reading markup written for someone else: tdf143222's whole slide
+* is an embedded worksheet whose preview picture lives in the fallback alone,
+* and the choice — written for VML — carries no picture at all, so the slide
+* came out blank. 82 of the corpus's decks carry such a block.
 */
 function parseXml(data) {
-	return parser.parse(decoder.decode(data));
+	return parser.parse(resolveAlternateContent(decoder.decode(data)));
 }
 function parseSlide(tree, ctx, inheritedBg, pageW, pageH, inheritedShapes = []) {
 	const sld = tree.find((n) => poIs(n, "p:sld"));
@@ -191,7 +208,81 @@ function parseSlide(tree, ctx, inheritedBg, pageW, pageH, inheritedShapes = [])
 	if (bg) out.push(backdropElement(bg, pageW, pageH));
 	out.push(...inheritedShapes.map(asBackdrop));
 	if (spTree) out.push(...parseSlideShapes(spTree, shapeCtx));
-	return out;
+	out.push(...parseSlideControls(cSld, shapeCtx));
+	return inPaintOrder(out);
+}
+/**
+* §19.3.1 — a slide's shape tree IS its z-order: what stands later in it is
+* drawn over what stands earlier, whatever KIND either of them is.
+*
+* The page otherwise paints kind by kind — every image, then every shape — and
+* on a slide that is simply wrong. 54542_cropped_bitmap.pptx is six logos each
+* standing on its own coloured panel, written panel-then-logo six times over,
+* and painted by kind all six logos went down first and all six panels covered
+* them.
+*
+* @param elements The slide's elements, in the order the tree gives them.
+* @returns The same elements, each float carrying its place in that order.
+*/
+function inPaintOrder(elements) {
+	return elements.map((el, z) => {
+		if (el.kind === "shape") return {
+			...el,
+			shape: withZ(el.shape, z)
+		};
+		if (el.kind === "image") return {
+			...el,
+			image: withZ(el.image, z)
+		};
+		if (el.kind === "table") {
+			const anchor = el.table.properties.float;
+			return anchor ? {
+				...el,
+				table: {
+					...el.table,
+					properties: {
+						...el.table.properties,
+						float: {
+							...anchor,
+							zOrder: z
+						}
+					}
+				}
+			} : el;
+		}
+		return el;
+	});
+}
+/** The same block with its float carrying `z`, when it floats at all. */
+function withZ(block, z) {
+	return block.float ? {
+		...block,
+		float: {
+			...block.float,
+			zOrder: z
+		}
+	} : block;
+}
+/**
+* §19.3.1.15 `p:controls` — the ActiveX controls a slide carries.
+*
+* They sit BESIDE the shape tree rather than in it, so a reader that walks
+* `p:spTree` alone never sees them. Each one's `mc:Fallback` is a `p:pic` of
+* what the control looks like — the picture PowerPoint cached precisely so that
+* a reader which cannot run the control still draws it — and by the time the
+* slide is parsed the alternate content is already resolved to that fallback.
+* activex_picture.pptx is seventeen of them over an EMPTY `p:spTree`, and it
+* rendered as a blank page.
+*
+* @param cSld The slide's `p:cSld`.
+* @param ctx  The slide's parsing context.
+* @returns The controls' cached pictures as ordinary floating pictures.
+*/
+function parseSlideControls(cSld, ctx) {
+	const controls = cSld ? poChildren(cSld).find((c) => poIs(c, "p:controls")) : void 0;
+	if (!controls) return [];
+	const pics = poChildren(controls).flatMap((c) => poIs(c, "p:control") ? poChildren(c).filter((k) => poIs(k, "p:pic")) : []);
+	return pics.length === 0 ? [] : parseSlideShapes({ "p:spTree": pics }, ctx);
 }
 function partBackground(tree, root, colors, resolveImage, themeFills) {
 	const sld = tree.find((n) => poIs(n, root));
@@ -247,6 +338,9 @@ function makeOlePreviewResolver(pkg, slidePath, resources) {
 * table that names none wears none — table-with-no-theme's two rows are bare
 * text in a plain frame, not the blue banding `@def` points at.
 *
+* A GUID the part does not hold may still be one of the GALLERY's own, which
+* every deck names and none ships (see `preset-table-styles`).
+*
 * The part is read once, on the first table in the deck.
 */
 function makeTableStyleResolver(pkg, presPath) {
@@ -265,7 +359,8 @@ function makeTableStyleResolver(pkg, presPath) {
 				}
 			}
 		}
-		return styleId === void 0 ? void 0 : byId.get(styleId);
+		if (styleId === void 0) return void 0;
+		return byId.get(styleId) ?? presetTableStyle(styleId, (xml) => parseXml(encoder.encode(xml)));
 	};
 }
 function makeHyperlinkResolver(pkg, slidePath) {
@@ -292,23 +387,28 @@ function makeSlideChartResolver(pkg, slidePath, charts, colors, resources) {
 }
 function makeSlideDiagramResolver(pkg, slidePath) {
 	const cache = /* @__PURE__ */ new Map();
-	return (relId) => {
+	return (relId, frame) => {
 		if (cache.has(relId)) return cache.get(relId);
-		let spTree;
 		const dataRel = pkg.getPartRelationships(slidePath).find((r) => r.id === relId);
 		const data = dataRel ? pkg.resolveRelatedPart(slidePath, dataRel) : void 0;
 		const draw = data ? drawingPart(pkg, slidePath, data) : void 0;
-		if (draw) for (const root of parseXml(draw.data)) {
-			const found = poFindDescendant(root, "dsp:spTree");
-			if (found) {
-				spTree = found;
-				break;
-			}
-		}
+		let spTree = draw ? cachedDiagramTree(draw.data, parseXml) : void 0;
+		if (!spTree && data) spTree = laidOutDiagram(pkg, slidePath, data, frame);
 		cache.set(relId, spTree);
 		return spTree;
 	};
 }
+function laidOutDiagram(pkg, slidePath, data, frame) {
+	const related = (type) => {
+		const rel = pkg.getPartRelationships(slidePath).find((r) => r.type.endsWith(type));
+		return rel ? pkg.resolveRelatedPart(slidePath, rel)?.data : void 0;
+	};
+	return laidOutDiagramTree({
+		data: data.data,
+		layout: related("/diagramLayout"),
+		colors: related("/diagramColors")
+	}, frame, parseXml);
+}
 /**
 * The pre-rendered drawing a diagram's data part points at.
 *
@@ -358,7 +458,8 @@ function slideStylesFor(pkg, slidePath, cache, resources, charts, onLoss, deckDe
 		resolveImage: makeSlideImageResolver(pkg, theme.path, resources)
 	} : void 0;
 	const themeLineWidths = theme ? parseThemeLineWidths(theme.data) : void 0;
-	const cascade = buildPlaceholderCascade(layoutTree, masterTree, colors, parseLevelStyles(deckDefaultTextStyle, colors));
+	const themeFonts = theme ? parseThemeFonts(theme.data) : void 0;
+	const cascade = buildPlaceholderCascade(layoutTree, masterTree, colors, parseLevelStyles(deckDefaultTextStyle, colors, themeFonts), themeFonts);
 	const background = partBackground(layoutTree, "p:sldLayout", inheritedColors, makeSlideImageResolver(pkg, layout.path, resources), themeFills) ?? (masterTree && master ? partBackground(masterTree, "p:sldMaster", inheritedColors, makeSlideImageResolver(pkg, master.path, resources), themeFills) : void 0);
 	const deps = {
 		colors: inheritedColors,
@@ -376,6 +477,7 @@ function slideStylesFor(pkg, slidePath, cache, resources, charts, onLoss, deckDe
 	const styles = {
 		cascade,
 		colors,
+		...themeFonts ? { themeFonts } : {},
 		...themeFills ? { themeFills } : {},
 		...themeLineWidths && themeLineWidths.length > 0 ? { themeLineWidths } : {},
 		...background ? { background } : {},

package/dist/esm/pptx/preset-table-styles.d.ts

@@ -0,0 +1,9 @@
+import { PoNode } from '../core/po-helpers.js';
+/**
+ * The built-in table style a GUID names, or `undefined` when it is not one this
+ * reader holds.
+ *
+ * @param styleId The `a:tableStyleId` a table states.
+ * @param parse   The module's XML reader, injected so this file needs none.
+ */
+export declare function presetTableStyle(styleId: string, parse: (xml: string) => ReadonlyArray<PoNode>): PoNode | undefined;

package/dist/esm/pptx/preset-table-styles.js

@@ -0,0 +1,27 @@
+import { poAttr, poIs } from "../core/po-helpers.js";
+//#region src/pptx/preset-table-styles.ts
+/** The gallery styles this reader knows, by the GUID a table names. */
+var PRESETS = new Map([
+	["{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}", "<a:tblStyle styleId=\"{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}\" styleName=\"Medium Style 2 - Accent 1\"><a:wholeTbl><a:tcTxStyle><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"dk1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:left><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:left><a:right><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:right><a:top><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:top><a:bottom><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:bottom><a:insideH><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:insideH><a:insideV><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:insideV></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"accent1\"><a:tint val=\"20000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:wholeTbl><a:band1H><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"accent1\"><a:tint val=\"40000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:band1H><a:band2H><a:tcStyle><a:tcBdr/></a:tcStyle></a:band2H><a:band1V><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"accent1\"><a:tint val=\"40000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:band1V><a:band2V><a:tcStyle><a:tcBdr/></a:tcStyle></a:band2V><a:lastCol><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"accent1\"/></a:solidFill></a:fill></a:tcStyle></a:lastCol><a:firstCol><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"accent1\"/></a:solidFill></a:fill></a:tcStyle></a:firstCol><a:lastRow><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:top><a:ln w=\"38100\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:top></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"accent1\"/></a:solidFill></a:fill></a:tcStyle></a:lastRow><a:firstRow><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:bottom><a:ln w=\"38100\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:bottom></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"accent1\"/></a:solidFill></a:fill></a:tcStyle></a:firstRow></a:tblStyle>"],
+	["{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}", "<a:tblStyle styleId=\"{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}\" styleName=\"Medium Style 2\"><a:wholeTbl><a:tcTxStyle><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"dk1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:left><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:left><a:right><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:right><a:top><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:top><a:bottom><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:bottom><a:insideH><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:insideH><a:insideV><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:insideV></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"dk1\"><a:tint val=\"20000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:wholeTbl><a:band1H><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"dk1\"><a:tint val=\"40000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:band1H><a:band2H><a:tcStyle><a:tcBdr/></a:tcStyle></a:band2H><a:band1V><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"dk1\"><a:tint val=\"40000\"/></a:schemeClr></a:solidFill></a:fill></a:tcStyle></a:band1V><a:band2V><a:tcStyle><a:tcBdr/></a:tcStyle></a:band2V><a:lastCol><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"dk1\"/></a:solidFill></a:fill></a:tcStyle></a:lastCol><a:firstCol><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr/><a:fill><a:solidFill><a:schemeClr val=\"dk1\"/></a:solidFill></a:fill></a:tcStyle></a:firstCol><a:lastRow><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:top><a:ln w=\"38100\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:top></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"dk1\"/></a:solidFill></a:fill></a:tcStyle></a:lastRow><a:firstRow><a:tcTxStyle b=\"on\"><a:fontRef idx=\"minor\"><a:prstClr val=\"black\"/></a:fontRef><a:schemeClr val=\"lt1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:bottom><a:ln w=\"38100\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></a:bottom></a:tcBdr><a:fill><a:solidFill><a:schemeClr val=\"dk1\"/></a:solidFill></a:fill></a:tcStyle></a:firstRow></a:tblStyle>"],
+	["{5940675A-B579-460E-94D1-54222C63F5DA}", "<a:tblStyle styleId=\"{5940675A-B579-460E-94D1-54222C63F5DA}\" styleName=\"No Style, Table Grid\"><a:wholeTbl><a:tcTxStyle><a:fontRef idx=\"minor\"><a:scrgbClr r=\"0\" g=\"0\" b=\"0\"/></a:fontRef><a:schemeClr val=\"tx1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:left><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:left><a:right><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:right><a:top><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:top><a:bottom><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:bottom><a:insideH><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:insideH><a:insideV><a:ln w=\"12700\" cmpd=\"sng\"><a:solidFill><a:schemeClr val=\"tx1\"/></a:solidFill></a:ln></a:insideV></a:tcBdr><a:fill><a:noFill/></a:fill></a:tcStyle></a:wholeTbl></a:tblStyle>"],
+	["{2D5ABB26-0587-4C30-8999-92F81FD0307C}", "<a:tblStyle styleId=\"{2D5ABB26-0587-4C30-8999-92F81FD0307C}\" styleName=\"No Style, No Grid\"><a:wholeTbl><a:tcTxStyle><a:fontRef idx=\"minor\"><a:scrgbClr r=\"0\" g=\"0\" b=\"0\"/></a:fontRef><a:schemeClr val=\"tx1\"/></a:tcTxStyle><a:tcStyle><a:tcBdr><a:left><a:ln><a:noFill/></a:ln></a:left><a:right><a:ln><a:noFill/></a:ln></a:right><a:top><a:ln><a:noFill/></a:ln></a:top><a:bottom><a:ln><a:noFill/></a:ln></a:bottom><a:insideH><a:ln><a:noFill/></a:ln></a:insideH><a:insideV><a:ln><a:noFill/></a:ln></a:insideV></a:tcBdr><a:fill><a:noFill/></a:fill></a:tcStyle></a:wholeTbl></a:tblStyle>"]
+]);
+var parsed = /* @__PURE__ */ new Map();
+/**
+* The built-in table style a GUID names, or `undefined` when it is not one this
+* reader holds.
+*
+* @param styleId The `a:tableStyleId` a table states.
+* @param parse   The module's XML reader, injected so this file needs none.
+*/
+function presetTableStyle(styleId, parse) {
+	const seen = parsed.get(styleId);
+	if (seen !== void 0 || parsed.has(styleId)) return seen;
+	const xml = PRESETS.get(styleId);
+	const style = xml ? parse(xml).find((n) => poIs(n, "a:tblStyle") && poAttr(n, "styleId") === styleId) : void 0;
+	parsed.set(styleId, style);
+	return style;
+}
+//#endregion
+export { presetTableStyle };

package/dist/esm/pptx/slide-parser.d.ts

@@ -1,5 +1,6 @@
 import { BodyElement, FloatAnchor, ShapeBlock, ShapeFill, ShapeGeometry, ShapeTextBody } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
+import { ThemeFonts } from '../core/drawingml/theme-parser.js';
 import { Loss, Pt, ResourceId } from '../core/ir/index.js';
 import { PoNode } from '../core/po-helpers.js';
 import { PlaceholderCascade } from './placeholder-cascade.js';
@@ -17,6 +18,11 @@ export interface SlideContext {
     readonly resolveImage?: (relId: string) => ResourceId | undefined;
     /** The deck theme's fill style lists, for a `p:bgRef` on this slide. */
     readonly themeFills?: ThemeFillStyles;
+    /**
+     * §20.1.4.1.16 — the two typefaces the deck's theme names. A run states its
+     * own by TOKEN (`+mn-lt`) more often than by name.
+     */
+    readonly themeFonts?: ThemeFonts;
     /** §20.1.4.1.21 `a:lnStyleLst` — the widths an `a:lnRef` indexes, in points. */
     readonly themeLineWidths?: ReadonlyArray<number>;
     /**
@@ -53,7 +59,10 @@ export interface SlideContext {
      * drawing override (its `dsp:spTree`), or `undefined` when the file ships no
      * override (E-SMARTART SA0).
      */
-    readonly resolveDiagram?: (relId: string) => PoNode | undefined;
+    readonly resolveDiagram?: (relId: string, frame: {
+        readonly cx: number;
+        readonly cy: number;
+    }) => PoNode | undefined;
     /**
      * Sink for graceful-degradation notices (E-SMARTART SA3): a SmartArt that
      * declares a diagram but ships no drawing override records a dropped-feature
@@ -203,5 +212,5 @@ export declare function parseGeometry(spPr: PoNode | undefined): ShapeGeometry;
  * @param resolveLink A run hyperlink resolver, or `undefined`.
  * @returns The text body, or `undefined` when it holds no paragraphs.
  */
-export declare function parseTxBody(txBody: PoNode, ph: PlaceholderRef | undefined, cascade: PlaceholderCascade | undefined, colors: ColorResolver, resolveLink: LinkResolver, styleColor?: string): ShapeTextBody | undefined;
+export declare function parseTxBody(txBody: PoNode, ph: PlaceholderRef | undefined, cascade: PlaceholderCascade | undefined, colors: ColorResolver, resolveLink: LinkResolver, styleColor?: string, themeFonts?: ThemeFonts): ShapeTextBody | undefined;
 export {};