reamkit 1.21.0 → 1.23.0

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

@@ -1,11 +1,14 @@
 import { emuToPt, pt } from "../core/ir/units.js";
 import { FEATURES } from "../core/ir/features.js";
 import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs, poTag, poText } from "../core/po-helpers.js";
-import { defaultColorResolver, resolveColorNode } from "../core/drawingml/colors.js";
+import { defaultColorResolver, placeholderColors, resolveColorNode } from "../core/drawingml/colors.js";
 import { boxFromXfrm, parsePh, parseXfrmBox, rPrToRunProps } from "./sp-helpers.js";
-import { parseCustGeom, parseFill, parseLine, parsePrstGeom, parseShadow, parseXfrm } from "../word/drawing-parser.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
 var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+var OLE_URI = "http://schemas.openxmlformats.org/presentationml/2006/ole";
 var TABLE_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
 var DIAGRAM_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
 var ALGN_TO_ALIGNMENT = {
@@ -32,24 +35,37 @@ var IDENTITY_TRANSFORM = (box) => box;
 * @param transform Maps child-space boxes to the slide (identity at the top level).
 * @returns The container's shapes as positioned {@link BodyElement}s.
 */
-function parseSlideShapes(container, ctx = {}, transform = IDENTITY_TRANSFORM) {
+function parseSlideShapes(container, ctx = {}, transform = IDENTITY_TRANSFORM, skipPlaceholders = false) {
 	const out = [];
-	for (const child of poChildren(container)) if (poIs(child, "p:sp")) {
-		const shape = parseSp(child, ctx, transform);
-		if (shape) out.push({
-			kind: "shape",
-			shape
-		});
-	} else if (poIs(child, "p:pic")) {
-		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)));
+	for (const child of poChildren(container)) {
+		if (skipPlaceholders && isPlaceholder(child)) continue;
+		if (poIs(child, "p:sp")) {
+			const shape = parseSp(child, ctx, transform);
+			if (shape) out.push({
+				kind: "shape",
+				shape
+			});
+		} else if (poIs(child, "p:pic")) {
+			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;
 }
+/**
+* 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.
+*/
+function isPlaceholder(shape) {
+	const nv = poChildren(shape).find((c) => poTag(c)?.startsWith("p:nv") === true);
+	const nvPr = nv ? poChildren(nv).find((c) => poIs(c, "p:nvPr")) : void 0;
+	return nvPr !== void 0 && poChildren(nvPr).some((c) => poIs(c, "p:ph"));
+}
 function composeGroupTransform(grpSp, parent) {
 	const grpSpPr = poChildren(grpSp).find((c) => poIs(c, "p:grpSpPr"));
 	const xfrm = grpSpPr ? poChildren(grpSpPr).find((c) => poIs(c, "a:xfrm")) : void 0;
@@ -97,20 +113,50 @@ function parseSp(sp, ctx, transform) {
 	if (!own && ph && ctx.cascade) own = ctx.cascade.geometryFor(ph);
 	if (!own) return void 0;
 	const box = transform(own);
+	const style = poChildren(sp).find((c) => poIs(c, "p:style"));
 	const txBody = poChildren(sp).find((c) => poIs(c, "p:txBody"));
-	const text = txBody ? parseTxBody(txBody, ph, ctx.cascade, colors, ctx.resolveHyperlink) : void 0;
-	const geometry = parseGeometry(spPr);
-	const fill = spPr ? parseFill(spPr, colors) : { kind: "none" };
-	const line = spPr ? parseLine(spPr, colors) : void 0;
+	const styleColor = style ? styleRefFontColor(style, colors) : void 0;
+	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 themeStyles = ctx.themeFills ? {
+		fills: ctx.themeFills.fills,
+		bgFills: ctx.themeFills.backgrounds
+	} : void 0;
+	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 ? {
+			...fromStyle,
+			...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 && fill.kind === "none" && !visibleLine) return void 0;
+	if (!text && styled.kind === "none" && !visibleLine) return void 0;
+	const xfrm = spPr ? poChildren(spPr).find((c) => poIs(c, "a:xfrm")) : void 0;
+	const spin = xfrm ? parseXfrm(xfrm) : void 0;
 	return {
 		float: floatAt(box),
 		width: emuToPt(box.cx),
 		height: emuToPt(box.cy),
 		geometry,
-		fill,
+		fill: styled,
 		...line ? { line } : {},
+		...shadow ? { shadow } : {},
+		...spin && Object.keys(spin).length > 0 ? { transform: spin } : {},
 		...text ? { text } : {},
 		paragraphProperties: {}
 	};
@@ -139,10 +185,53 @@ function parseGraphicFrame(gf, ctx, transform) {
 	}
 	if (uri === TABLE_URI) {
 		const tbl = poFindDescendant(gf, "a:tbl");
-		return tbl ? [{
+		if (!tbl) return [];
+		const table = parseTable(tbl, ctx.colors ?? defaultColorResolver, ctx.resolveTableStyle, {
+			...ctx.themeFills ? { fills: ctx.themeFills.fills } : {},
+			...ctx.themeLineWidths ? { lineWidths: ctx.themeLineWidths } : {}
+		});
+		return [{
 			kind: "table",
-			table: parseTable(tbl, ctx.colors ?? defaultColorResolver)
-		}] : [];
+			table: {
+				...table,
+				properties: {
+					...table.properties,
+					float: floatAt(box)
+				}
+			}
+		}];
+	}
+	if (uri === OLE_URI) {
+		const oleObj = poFindDescendant(gf, "p:oleObj");
+		if (!oleObj) return [];
+		const pic = poChildren(oleObj).find((c) => poIs(c, "p:pic"));
+		if (pic) {
+			const image = parsePic(pic, ctx, transform);
+			return image ? [{
+				kind: "image",
+				image
+			}] : [];
+		}
+		const spid = poAttr(oleObj, "spid");
+		const resource = spid !== void 0 ? ctx.resolveOlePreview?.(spid) : void 0;
+		if (resource === void 0) {
+			ctx.onLoss?.({
+				severity: "dropped",
+				feature: FEATURES.images,
+				detail: "embedded object with no preview picture — the object is not drawn"
+			});
+			return [];
+		}
+		return [{
+			kind: "image",
+			image: {
+				float: floatAt(box),
+				resource,
+				width: emuToPt(box.cx),
+				height: emuToPt(box.cy),
+				paragraphProperties: {}
+			}
+		}];
 	}
 	if (uri === DIAGRAM_URI) {
 		const relIds = poFindDescendant(gf, "dgm:relIds");
@@ -152,7 +241,9 @@ function parseGraphicFrame(gf, ctx, transform) {
 			if (dmRelId !== void 0) ctx.onLoss?.(noDiagramOverrideLoss());
 			return [];
 		}
-		return parseDiagramDrawing(spTree, diagramTransform(spTree, box), floatAt, ctx.colors ?? defaultColorResolver, ctx.resolveHyperlink).map((shape) => ({
+		const drawn = parseDiagramDrawing(spTree, diagramTransform(spTree, box), floatAt, ctx.colors ?? defaultColorResolver, ctx.resolveHyperlink);
+		if (drawn.length === 0) ctx.onLoss?.(noDiagramOverrideLoss());
+		return drawn.map((shape) => ({
 			kind: "shape",
 			shape
 		}));
@@ -229,9 +320,9 @@ function parseDiagramNodes(spTree, transform, colors, resolveLink, resolveImage)
 		const box = transform(own);
 		const txBody = poChildren(sp).find((c) => poIs(c, "dsp:txBody"));
 		const parsed = txBody ? parseTxBody(txBody, void 0, void 0, colors, resolveLink) : void 0;
-		const text = parsed ? withDiagramFontColor(parsed, sp, colors) : void 0;
 		const geometry = parseGeometry(spPr);
 		const fill = spPr ? parseFill(spPr, colors, resolveImage) : { kind: "none" };
+		const text = parsed ? withDiagramFontColor(parsed, sp, colors, fill) : void 0;
 		const line = spPr ? parseLine(spPr, colors) : void 0;
 		const shadow = spPr ? parseShadow(spPr, colors) : void 0;
 		const visibleLine = line !== void 0 && line.fill !== "none";
@@ -287,12 +378,13 @@ function parseDiagramDrawing(spTree, transform, makeFloat, colors, resolveLink)
 		float: makeFloat(box)
 	}));
 }
-function withDiagramFontColor(text, sp, colors) {
+function withDiagramFontColor(text, sp, colors, fill) {
 	const style = poChildren(sp).find((c) => poIs(c, "dsp:style"));
 	const ref = style ? poChildren(style).find((c) => poIs(c, "a:fontRef")) : void 0;
 	const child = ref ? poChildren(ref).find((c) => poTag(c) !== void 0) : void 0;
 	const colorHex = child ? resolveColorNode(child, colors) : void 0;
 	if (colorHex === void 0) return text;
+	if (fill.kind === "solid" && fill.colorHex === colorHex) return text;
 	return {
 		...text,
 		content: text.content.map((block) => block.kind === "paragraph" ? {
@@ -311,26 +403,45 @@ function withDiagramFontColor(text, sp, colors) {
 	};
 }
 /**
-* `p:bg` → the background fill, or `undefined` when none/unsupported. `p:bgPr`
-* carries the fill directly (`a:solidFill`/`a:gradFill` — the same children
-* `parseFill` reads; a picture background is not yet supported); `p:bgRef` (a
-* theme fill-style index) is approximated by its colour child as a solid fill.
+* `p:bg` → the background fill, or `undefined` when it declares none.
+*
+* Two spellings. `p:bgPr` carries the fill itself — solid, gradient, or a
+* PICTURE, which needs the owning part's image resolver since the blip's
+* relationship is scoped to the part the background is written in. `p:bgRef`
+* (§19.3.1.2) carries no fill at all: an index into the theme's style lists and
+* the colour to put wherever that style says `phClr`. Read as its colour alone
+* — which is all this did — a deck whose theme opens with a black-to-grey
+* gradient came out flat, and one whose first background slot is a picture came
+* out a single colour.
+*
 * Used for the slide's own background and the inherited layout/master one (PX5b).
+*
+* @param bg           The `p:bg` node.
+* @param colors       The deck's colour resolver.
+* @param resolveImage Resolver for a picture background's relationship, scoped
+*                     to the part this `p:bg` is written in.
+* @param theme        The theme's fill style lists, for a `p:bgRef`.
 */
-function parseBackgroundFill(bg, colors) {
+function parseBackgroundFill(bg, colors, resolveImage, theme) {
 	const bgPr = poChildren(bg).find((c) => poIs(c, "p:bgPr"));
 	if (bgPr) {
-		const fill = parseFill(bgPr, colors);
+		const fill = parseFill(bgPr, colors, resolveImage);
 		return fill.kind !== "none" ? fill : void 0;
 	}
 	const bgRef = poChildren(bg).find((c) => poIs(c, "p:bgRef"));
-	if (bgRef) for (const c of poChildren(bgRef)) {
-		const hex = resolveColorNode(c, colors);
-		if (hex) return {
-			kind: "solid",
-			colorHex: hex
-		};
+	if (!bgRef) return void 0;
+	const child = poChildren(bgRef).find((c) => poTag(c) !== void 0);
+	const hex = child ? resolveColorNode(child, colors) : void 0;
+	const idx = poIntAttr(bgRef, "idx");
+	const slot = idx === void 0 ? void 0 : idx > 1e3 ? theme?.backgrounds[idx - 1001] : theme?.fills[idx - 1];
+	if (slot) {
+		const themed = parseFill({ "a:spPr": [slot] }, hex === void 0 ? colors : placeholderColors(colors, hex), theme?.resolveImage ?? resolveImage);
+		if (themed.kind !== "none") return themed;
 	}
+	return hex === void 0 ? void 0 : {
+		kind: "solid",
+		colorHex: hex
+	};
 }
 /**
 * A full-slide backdrop element for a background fill: a rectangle covering the
@@ -364,11 +475,73 @@ function backdropElement(fill, widthPt, heightPt) {
 		}
 	};
 }
+function backgroundThrough(bg, box, slide) {
+	if (!bg) return { kind: "none" };
+	if (bg.kind !== "picture" || !slide || box.cx <= 0 || box.cy <= 0) return bg;
+	const [x, y] = [emuToPt(box.x), emuToPt(box.y)];
+	const [w, h] = [emuToPt(box.cx), emuToPt(box.cy)];
+	return {
+		...bg,
+		imageFillRect: {
+			left: -x / w,
+			top: -y / h,
+			right: -(slide.widthPt - x - w) / w,
+			bottom: -(slide.heightPt - y - h) / h
+		}
+	};
+}
+/**
+* The same element, painted BEHIND the slide's own content.
+*
+* §19.3.1 — a slide's shape tree is drawn over its layout's, and that over the
+* master's; nothing a deck states once can bury what a slide puts on it. Our
+* page paints by KIND (every image, then every shape), so without this a
+* layout's white card landed on top of the photograph the slide is made of —
+* themes.pptx's fifth slide is one picture and it vanished under the card.
+*
+* @param el The inherited element.
+* @returns The element with its float sunk to the backdrop layer.
+*/
+function asBackdrop(el) {
+	const sink = (item) => item.float ? {
+		...item,
+		float: {
+			...item.float,
+			behind: true
+		}
+	} : item;
+	switch (el.kind) {
+		case "shape": return {
+			...el,
+			shape: sink(el.shape)
+		};
+		case "image": return {
+			...el,
+			image: sink(el.image)
+		};
+		case "table": return {
+			...el,
+			table: {
+				...el.table,
+				properties: sink(el.table.properties)
+			}
+		};
+		case "chart": return {
+			...el,
+			chart: sink(el.chart)
+		};
+		default: return el;
+	}
+}
 /**
 * `p:spPr` geometry: `a:prstGeom` (preset) or `a:custGeom` (custom path), default
 * rect. Exported for sheet shapes (E-SHEET W2), whose `xdr:spPr` carries the same
 * `a:` children.
 */
+/** Whether an `spPr` states a geometry of its own, rather than inheriting one. */
+function statesGeometry(spPr) {
+	return poChildren(spPr).some((c) => poIs(c, "a:prstGeom") || poIs(c, "a:custGeom"));
+}
 function parseGeometry(spPr) {
 	if (!spPr) return RECT_GEOMETRY;
 	const prst = poChildren(spPr).find((c) => poIs(c, "a:prstGeom"));
@@ -385,10 +558,16 @@ function parsePic(pic, ctx, transform) {
 	const blip = blipFill ? poChildren(blipFill).find((c) => poIs(c, "a:blip")) : void 0;
 	const relId = blip ? poAttr(blip, "embed") : void 0;
 	const resource = relId !== void 0 ? ctx.resolveImage?.(relId) : void 0;
+	const colorChange = blip ? colorChangeOf(blip, ctx.colors ?? defaultColorResolver) : void 0;
+	const fixed = blip ? poChildren(blip).find((c) => poIs(c, "a:alphaModFix")) : void 0;
+	const amt = fixed ? poIntAttr(fixed, "amt") : void 0;
+	const alpha = amt === void 0 ? void 0 : Math.min(1, Math.max(0, amt / 1e5));
 	const altText = picAltText(pic);
 	return {
 		float: floatAt(box),
 		...resource !== void 0 ? { resource } : {},
+		...colorChange ? { colorChange } : {},
+		...alpha !== void 0 && alpha < 1 ? { alpha } : {},
 		width: emuToPt(box.cx),
 		height: emuToPt(box.cy),
 		paragraphProperties: {},
@@ -402,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) {
+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)
+			paragraph: parseSlideParagraph(child, ph, cascade, colors, resolveLink, counters, styleColor, themeFonts)
 		});
 	}
 	return content;
@@ -427,18 +606,19 @@ function txBodyParagraphs(txBody, ph, cascade, colors, resolveLink) {
 * @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) {
-	const content = txBodyParagraphs(txBody, ph, cascade, colors, resolveLink);
+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 anchor = a === "ctr" ? "ctr" : a === "b" ? "b" : a === "t" ? "t" : 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) } : {},
@@ -446,67 +626,142 @@ function parseTxBody(txBody, ph, cascade, colors, resolveLink) {
 		...anchor ? { anchor } : {}
 	};
 }
-function parseSlideParagraph(aP, ph, cascade, colors, resolveLink, counters) {
+/**
+* §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 = ph && cascade ? cascade.defaultsFor(ph, level) : {};
+	const defaults = {
+		...cascade ? cascade.defaultsFor(ph, level) : {},
+		...styleColor !== void 0 ? { colorHex: styleColor } : {}
+	};
+	const inherited = cascade ? cascade.paragraphDefaultsFor(ph, level) : {};
 	const algn = pPr ? poAttr(pPr, "algn") : void 0;
 	const alignment = algn !== void 0 ? ALGN_TO_ALIGNMENT[algn] : void 0;
 	const runs = [];
-	const marker = bulletMarker(pPr, level, counters);
-	if (marker !== void 0) runs.push({
-		text: marker,
-		properties: defaults,
-		listMarker: true
-	});
 	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);
 	}
-	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 marL = pPr ? poIntAttr(pPr, "marL") : void 0;
 	const indent = pPr ? poIntAttr(pPr, "indent") : void 0;
 	const indentLeft = marL !== void 0 ? emuToPt(marL) : level > 0 ? emuToPt(level * 457200) : void 0;
+	const hanging = (indent !== void 0 ? emuToPt(indent) : inherited.indentFirstLine ?? 0) < 0;
+	const bullet = {
+		...cascade?.bulletFor(ph, level),
+		...parseBullet(pPr, colors)
+	};
+	const marker = bulletMarker(bullet, level, counters);
+	if (marker !== void 0) {
+		const base = runs[0]?.properties ?? defaults;
+		runs.unshift({
+			text: marker + (hanging ? "	" : "  "),
+			properties: bulletProps(base, bullet),
+			listMarker: true
+		});
+	}
+	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 bulletMarker(pPr, level, counters) {
-	if (!pPr) return void 0;
-	if (poChildren(pPr).some((c) => poIs(c, "a:buNone"))) return void 0;
-	const buChar = poChildren(pPr).find((c) => poIs(c, "a:buChar"));
-	if (buChar) return `${poAttr(buChar, "char") ?? "•"}  `;
-	const buAuto = poChildren(pPr).find((c) => poIs(c, "a:buAutoNum"));
-	if (!buAuto) return void 0;
-	const type = poAttr(buAuto, "type") ?? "arabicPeriod";
-	const startAt = poIntAttr(buAuto, "startAt") ?? 1;
+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 {
+		...base,
+		...sizePt !== void 0 ? { fontSizePt: pt(sizePt) } : {},
+		...bullet.colorHex !== void 0 ? { colorHex: bullet.colorHex } : {}
+	};
+}
+function bulletMarker(bullet, level, counters) {
+	if (!bullet || bullet.kind === "none" || bullet.kind === void 0) return void 0;
+	if (bullet.kind === "char") return bullet.char ?? "•";
 	const prev = counters[level];
-	const n = (prev === void 0 ? startAt - 1 : prev) + 1;
+	const n = (prev === void 0 ? (bullet.startAt ?? 1) - 1 : prev) + 1;
 	counters[level] = n;
 	counters.length = level + 1;
-	return `${n}${autoNumSuffix(type)}  `;
+	return `${n}${autoNumSuffix(bullet.type ?? "arabicPeriod")}`;
 }
 function autoNumSuffix(type) {
 	if (type.endsWith("ParenR") || type.endsWith("ParenBoth")) return ")";
 	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;
@@ -518,36 +773,62 @@ function parseSlideRun(node, defaults, colors, resolveLink) {
 		text,
 		properties: {
 			...defaults,
-			...rPrToRunProps(rPr, colors)
+			...rPrToRunProps(rPr, colors, themeFonts)
 		},
 		...href ? { href } : {}
 	};
 }
-function parseTable(tbl, colors) {
+function parseTable(tbl, colors, resolveTableStyle, theme) {
 	const grid = [];
 	const tblGrid = poChildren(tbl).find((c) => poIs(c, "a:tblGrid"));
 	if (tblGrid) {
 		for (const col of poChildren(tblGrid)) if (poIs(col, "a:gridCol")) grid.push(emuToPt(poIntAttr(col, "w") ?? 0));
 	}
 	const rows = [];
-	for (const tr of poChildren(tbl)) if (poIs(tr, "a:tr")) rows.push(parseTableRow(tr, colors));
-	return {
+	const sources = [];
+	for (const tr of poChildren(tbl)) {
+		if (!poIs(tr, "a:tr")) continue;
+		const cells = rowCells(tr);
+		sources.push(cells);
+		rows.push(parseTableRow(tr, cells, colors));
+	}
+	const tblPr = poChildren(tbl).find((c) => poIs(c, "a:tblPr"));
+	const style = resolveTableStyle?.(tableStyleId(tblPr));
+	if (!style) return {
 		properties: {},
 		grid,
 		rows
 	};
+	const flags = tableStyleFlags(tblPr);
+	return {
+		properties: {},
+		grid,
+		rows: rows.map((row, r) => ({
+			...row,
+			cells: row.cells.map((cell, c) => {
+				const part = cellStyle(style, flags, {
+					row: r,
+					rowCount: rows.length,
+					col: c,
+					colCount: grid.length
+				}, colors, theme);
+				const tc = sources[r]?.[c];
+				return withCellStyle(cell, tc && cellSaysNoFill(tc) ? withoutFill(part) : part);
+			})
+		}))
+	};
+}
+function rowCells(tr) {
+	return poChildren(tr).filter((tc) => poIs(tc, "a:tc") && poAttr(tc, "hMerge") !== "1");
 }
-function parseTableRow(tr, colors) {
+function parseTableRow(tr, cells, colors) {
 	const h = poIntAttr(tr, "h");
-	const cells = [];
-	for (const tc of poChildren(tr)) {
-		if (!poIs(tc, "a:tc")) continue;
-		if (poAttr(tc, "hMerge") === "1") continue;
-		cells.push(parseTableCell(tc, colors));
-	}
 	return {
-		properties: { ...h !== void 0 ? { height: emuToPt(h) } : {} },
-		cells
+		properties: { ...h !== void 0 ? {
+			height: emuToPt(h),
+			heightRule: "atLeast"
+		} : {} },
+		cells: cells.map((tc) => parseTableCell(tc, colors))
 	};
 }
 function parseTableCell(tc, colors) {
@@ -558,15 +839,35 @@ function parseTableCell(tc, colors) {
 	const merge = rowSpan !== void 0 && rowSpan > 1 ? "start" : poAttr(tc, "vMerge") === "1" ? "middle" : void 0;
 	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;
 	return {
 		properties: {
 			...gridSpan !== void 0 && gridSpan > 1 ? { colSpan: gridSpan } : {},
 			...merge ? { merge } : {},
-			...shadingHex ? { shading: { colorHex: shadingHex } } : {}
+			...shadingHex ? { shading: { colorHex: shadingHex } } : {},
+			...borders ? { borders } : {}
 		},
 		content
 	};
 }
+var CELL_LINES = [
+	["a:lnL", "left"],
+	["a:lnR", "right"],
+	["a:lnT", "top"],
+	["a:lnB", "bottom"]
+];
+function cellOwnBorders(tcPr, colors) {
+	const out = {};
+	for (const [tag, side] of CELL_LINES) {
+		const ln = poChildren(tcPr).find((c) => poIs(c, tag));
+		if (ln) out[side] = lineBorder(ln, colors);
+	}
+	return Object.keys(out).length > 0 ? out : void 0;
+}
+function cellSaysNoFill(tc) {
+	const tcPr = poChildren(tc).find((c) => poIs(c, "a:tcPr"));
+	return tcPr !== void 0 && poChildren(tcPr).some((c) => poIs(c, "a:noFill"));
+}
 function cellFillHex(tcPr, colors) {
 	const solidFill = poChildren(tcPr).find((c) => poIs(c, "a:solidFill"));
 	if (!solidFill) return void 0;
@@ -576,4 +877,4 @@ function cellFillHex(tcPr, colors) {
 	}
 }
 //#endregion
-export { backdropElement, diagramTransform, noDiagramOverrideLoss, parseBackgroundFill, parseDiagramNodes, parseGeometry, parseSlideShapes, parseTxBody };
+export { asBackdrop, backdropElement, diagramTransform, noDiagramOverrideLoss, parseBackgroundFill, parseDiagramNodes, parseGeometry, parseSlideShapes, parseTxBody };