reamkit 1.22.0 → 1.23.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

@@ -7,9 +7,12 @@ import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs } from "../core/p
 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 +22,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 +59,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 +129,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 +169,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 +179,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"));
@@ -247,6 +263,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 +284,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) {
@@ -358,7 +378,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 +397,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>;
     /**
@@ -203,5 +209,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 {};

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

@@ -3,7 +3,7 @@ import { FEATURES } from "../core/ir/features.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 { lineSpacing, parseBullet, spacingFractions, spacingFromLineFraction } from "./placeholder-cascade.js";
 import { colorChangeOf, parseCustGeom, parseFill, parseLine, parsePrstGeom, parseShadow, parseXfrm, statesFill, styleRefFill, styleRefFontColor, styleRefLine } from "../word/drawing-parser.js";
 import { cellStyle, lineBorder, tableStyleFlags, tableStyleId, withCellStyle, withoutFill } from "./table-style.js";
 //#region src/pptx/slide-parser.ts
@@ -116,19 +116,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 = 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" };
+	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 +142,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 +155,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 +186,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: {
@@ -569,14 +581,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,10 +606,11 @@ 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;
@@ -605,7 +618,7 @@ function parseTxBody(txBody, ph, cascade, colors, resolveLink, styleColor) {
 	const a = bodyPr ? poAttr(bodyPr, "anchor") : 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) } : {},
@@ -613,7 +626,53 @@ function parseTxBody(txBody, ph, cascade, colors, resolveLink, styleColor) {
 		...anchor ? { anchor } : {}
 	};
 }
-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 = {
@@ -625,7 +684,7 @@ function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters, sty
 	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);
+		const run = parseSlideRun(child, defaults, colors, resolveLink, themeFonts);
 		if (run) runs.push(run);
 	}
 	const marL = pPr ? poIntAttr(pPr, "marL") : void 0;
@@ -645,27 +704,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 +761,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 +773,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 +811,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);
 			})

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

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

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

@@ -1,6 +1,7 @@
 import { pt } from "../core/ir/units.js";
 import { poAttr, poChildren, poIntAttr, poIs } from "../core/po-helpers.js";
 import { resolveColorNode } from "../core/drawingml/colors.js";
+import { resolveThemeFont } from "../core/drawingml/theme-parser.js";
 //#region src/pptx/sp-helpers.ts
 var isTrue = (v) => v === "1" || v === "true" || v === "on";
 /**
@@ -54,13 +55,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);

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

@@ -29,6 +29,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 +43,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.
  *

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

@@ -26,9 +26,10 @@ function tableStyleId(tblPr) {
 * @param flags  Which conditional parts the table asks for.
 * @param at     Where the cell sits.
 * @param colors The deck's colour resolver.
+* @param theme  The theme's style lists, for the parts that point at them.
 * @returns The composed part, empty when the style says nothing.
 */
-function cellStyle(style, flags, at, colors) {
+function cellStyle(style, flags, at, colors, theme) {
 	const names = ["a:wholeTbl"];
 	if (flags.bandCol) names.push(bandName(at.col, flags.firstCol, "V"));
 	if (flags.bandRow) names.push(bandName(at.row, flags.firstRow, "H"));
@@ -36,27 +37,52 @@ function cellStyle(style, flags, at, colors) {
 	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 = {};
+	let out = tableBackground(style, colors, theme);
 	for (const name of names) {
 		const part = poChildren(style).find((c) => poIs(c, name));
 		if (part) out = {
 			...out,
-			...partStyle(part, colors)
+			...partStyle(part, colors, theme)
 		};
 	}
 	return out;
 }
+function tableBackground(style, colors, theme) {
+	const bg = poChildren(style).find((c) => poIs(c, "a:tblBg"));
+	if (!bg) return {};
+	const solid = poChildren(bg).find((c) => poIs(c, "a:solidFill"));
+	const hex = (solid ? colorOf(solid, colors) : void 0) ?? refFillColor(poChildren(bg).find((c) => poIs(c, "a:fillRef")), colors, theme);
+	return hex ? { shadingHex: hex } : {};
+}
+/**
+* §20.1.4.1.16 `a:fillRef` — a fill named by its place in the theme's list,
+* with the colour to put wherever that fill says `phClr`.
+*
+* Only its COLOUR is taken: a slot may be a gradient or a picture, and a cell's
+* shading is one colour. The first solid colour the slot names, or the
+* reference's own, is the nearest true answer.
+*/
+function refFillColor(ref, colors, theme) {
+	if (!ref) return void 0;
+	const own = colorOf(ref, colors);
+	const idx = poIntAttr(ref, "idx");
+	const slot = idx !== void 0 && idx > 0 ? theme?.fills?.[idx - 1] : void 0;
+	if (!slot) return own;
+	const solid = poChildren(slot).find((c) => poIs(c, "a:solidFill"));
+	const slotHex = solid ? colorOf(solid, colors) : void 0;
+	return slotHex && slotHex !== "PHCLR" ? own ?? slotHex : own;
+}
 function bandName(index, edge, axis) {
 	return (edge ? index - 1 : index) % 2 === 0 ? `a:band1${axis}` : `a:band2${axis}`;
 }
-function partStyle(part, colors) {
+function partStyle(part, colors, theme) {
 	const tcStyle = poChildren(part).find((c) => poIs(c, "a:tcStyle"));
 	const txStyle = poChildren(part).find((c) => poIs(c, "a:tcTxStyle"));
 	const fill = tcStyle ? poChildren(tcStyle).find((c) => poIs(c, "a:fill")) : void 0;
 	const solid = fill ? poChildren(fill).find((c) => poIs(c, "a:solidFill")) : void 0;
 	const shadingHex = solid ? colorOf(solid, colors) : void 0;
 	const bdr = tcStyle ? poChildren(tcStyle).find((c) => poIs(c, "a:tcBdr")) : void 0;
-	const borders = bdr ? partBorders(bdr, colors) : void 0;
+	const borders = bdr ? partBorders(bdr, colors, theme) : void 0;
 	const on = (name) => poAttr(txStyle, name) === "on";
 	const colorHex = txStyle ? colorOf(txStyle, colors) : void 0;
 	return {
@@ -75,15 +101,31 @@ var SIDES = [
 	["a:insideH", "insideH"],
 	["a:insideV", "insideV"]
 ];
-function partBorders(bdr, colors) {
+function partBorders(bdr, colors, theme) {
 	const out = {};
 	for (const [tag, side] of SIDES) {
 		const holder = poChildren(bdr).find((c) => poIs(c, tag));
 		const ln = holder ? poChildren(holder).find((c) => poIs(c, "a:ln")) : void 0;
-		if (ln) out[side] = lineBorder(ln, colors);
+		if (ln) {
+			out[side] = lineBorder(ln, colors);
+			continue;
+		}
+		const border = refBorder(holder ? poChildren(holder).find((c) => poIs(c, "a:lnRef")) : void 0, colors, theme);
+		if (border) out[side] = border;
 	}
 	return Object.keys(out).length > 0 ? out : void 0;
 }
+function refBorder(ref, colors, theme) {
+	if (!ref || poAttr(ref, "idx") === "0") return void 0;
+	const colorHex = colorOf(ref, colors);
+	if (colorHex === void 0) return void 0;
+	const idx = poIntAttr(ref, "idx");
+	return {
+		style: "single",
+		colorHex,
+		width: pt((idx !== void 0 && idx > 0 ? theme?.lineWidths?.[idx - 1] : void 0) ?? .75)
+	};
+}
 /**
 * §20.1.2.1 `a:ln` → the rule it draws on one side of a cell.
 *