reamkit 1.22.0 → 1.23.0

package/dist/esm/pptx/ppt/ppt-text.js

@@ -1,4 +1,6 @@
+import { fromSymbolFont } from "../../core/metafile/symbol-fonts.js";
 import { isCfb, openCfb } from "../../core/ole/cfb.js";
+import { readEscherBlip } from "../../core/ole/escher-blip.js";
 //#region src/pptx/ppt/ppt-text.ts
 var RT_DOCUMENT = 1e3;
 var RT_DOCUMENT_ATOM = 1001;
@@ -12,8 +14,12 @@ var RT_TEXT_HEADER_ATOM = 3999;
 var RT_TEXT_CHARS_ATOM = 4e3;
 var RT_STYLE_TEXT_PROP_ATOM = 4001;
 var RT_TEXT_BYTES_ATOM = 4008;
+var RT_OUTLINE_TEXT_REF_ATOM = 3998;
+var RT_TEXT_MASTER_STYLE_ATOM = 4003;
 var RT_SLIDE_ATOM = 1007;
 var RT_MAIN_MASTER = 1016;
+var RT_FONT_COLLECTION = 2005;
+var RT_FONT_ENTITY_ATOM = 4023;
 var RT_COLOR_SCHEME_ATOM = 2032;
 var FBT_BSTORE_CONTAINER = 61441;
 var FBT_BSE = 61447;
@@ -22,9 +28,28 @@ var FBT_FSP = 61450;
 var FBT_OPT = 61451;
 var FBT_CLIENT_TEXTBOX = 61453;
 var FBT_CLIENT_ANCHOR = 61456;
+var FBT_CLIENT_DATA = 61457;
+var FBT_SPGR_CONTAINER = 61443;
+var FBT_SPGR = 61449;
+var FBT_CHILD_ANCHOR = 61455;
+var RT_PLACEHOLDER_ATOM = 3011;
 var PROP_PIB = 260;
+var PROP_FILL_TYPE = 384;
 var PROP_FILL_COLOR = 385;
+var PROP_FILL_BACK_COLOR = 387;
+var PROP_FILL_ANGLE = 395;
+var PROP_FILL_BLIP = 390;
+var PROP_GTEXT_UNICODE = 192;
+var PROP_GTEXT_SIZE = 195;
+var PROP_GTEXT_FONT = 197;
+var PROP_FILL_WIDTH = 393;
+var PROP_FILL_HEIGHT = 394;
+var EMU_PER_POINT = 12700;
 var PROP_LINE_COLOR = 448;
+var PROP_FILL_BOOLS = 447;
+var PROP_LINE_BOOLS = 511;
+var FILL_F_FILLED = 16;
+var LINE_F_LINE = 8;
 var PROP_GEO_LEFT = 320;
 var PROP_GEO_TOP = 321;
 var PROP_GEO_RIGHT = 322;
@@ -37,8 +62,10 @@ var COLORREF_SCHEME_INDEX = 8;
 var COLORREF_SYS_INDEX = 16;
 var FBSE_FODELAY_OFFSET = 28;
 var FSP_FLAG_PATRIARCH = 4;
+var FSP_FLAG_BACKGROUND = 1024;
 var TOKEN_ENCRYPTED = 4090610911;
 var SLWT_INSTANCE_SLIDES = 0;
+var SLWT_INSTANCE_MASTERS = 1;
 var MAX_EDITS = 4096;
 var MAX_DEPTH = 24;
 function recordAt(stream, off) {
@@ -127,19 +154,19 @@ function extractPptContent(bytes) {
 	};
 }
 function slideHasContent(s) {
-	return s.shapes.some((sh) => shapeHasText(sh) || sh.image !== void 0 || sh.autoShape !== void 0);
+	return s.background !== void 0 || s.shapes.some((sh) => shapeHasText(sh) || sh.image !== void 0 || sh.autoShape !== void 0);
 }
 function shapeHasText(sh) {
 	return sh.paragraphs?.some((p) => paragraphText(p).length > 0) ?? false;
 }
-function slideShapes(slideData, img, outline, scheme) {
-	const shapes = collectShapes(slideData, img, scheme);
-	if (!shapes.some(shapeHasText)) {
-		const inline = collectParagraphs(slideData, 0);
-		const text = inline.some((p) => paragraphText(p).length > 0) ? inline : outline;
-		if (text.some((p) => paragraphText(p).length > 0)) shapes.push({ paragraphs: text });
+function slideShapes(slideData, img, outline, env, defaults) {
+	const content = collectShapes(slideData, img, env, outline, defaults);
+	if (!content.shapes.some(shapeHasText)) {
+		const inline = collectParagraphs(slideData, 0, defaults, env);
+		const text = inline.some((p) => paragraphText(p).length > 0) ? inline : outline.flat();
+		if (text.some((p) => paragraphText(p).length > 0)) content.shapes.push({ paragraphs: text });
 	}
-	return shapes;
+	return content;
 }
 function buildPersistDirectory(stream, currentEditOffset) {
 	const persist = /* @__PURE__ */ new Map();
@@ -178,42 +205,73 @@ function mergePersistDirectory(stream, offset, persist) {
 	}
 }
 function readSlideList(stream, docData, persist, img) {
+	const fonts = parseFontCollection(docData);
 	const slwt = findChild(docData, (r) => r.type === RT_SLIDE_LIST_WITH_TEXT && r.instance === SLWT_INSTANCE_SLIDES);
 	if (!slwt) return [];
 	const slides = [];
 	let outline = [];
 	let pendingRef;
+	const masters = {
+		persist,
+		stream,
+		byMasterId: buildMasterIdMap(docData),
+		cache: /* @__PURE__ */ new Map()
+	};
 	const flush = () => {
 		if (pendingRef === void 0) return;
 		const slideOff = persist.get(pendingRef);
 		const slideRec = slideOff !== void 0 ? recordAt(stream, slideOff) : void 0;
-		const shapes = slideRec !== void 0 && slideRec.type === RT_SLIDE ? slideShapes(slideRec.data, img, outline, resolveScheme(slideRec.data, persist, stream)) : outline.some((p) => paragraphText(p).length > 0) ? [{ paragraphs: outline }] : [];
-		slides.push({ shapes });
+		const isSlide = slideRec !== void 0 && slideRec.type === RT_SLIDE;
+		const scheme = isSlide ? resolveScheme(slideRec.data, masters) : void 0;
+		const env = {
+			...scheme ? { scheme } : {},
+			...fonts.length > 0 ? { fonts } : {}
+		};
+		const defaults = isSlide ? masterChain(slideRec.data, masters, scheme, fonts) : void 0;
+		const texts = outline.map((e) => styledParagraphs(e.rec, e.style, levelStyles(defaults, e.textType), env));
+		const flat = texts.flat();
+		const content = isSlide ? slideShapes(slideRec.data, img, texts, env, defaults) : { shapes: flat.some((p) => paragraphText(p).length > 0) ? [{ paragraphs: flat }] : [] };
+		const background = isSlide ? masterBackground(slideRec.data, masters, img) ?? content.background : void 0;
+		const decoration = isSlide ? masterShapes(slideRec.data, masters, img) : [];
+		slides.push({
+			shapes: [...decoration, ...content.shapes],
+			...background ? { background } : {}
+		});
 		outline = [];
 		pendingRef = void 0;
 	};
 	const recs = [...records(slwt)];
+	let textType = TEXT_TYPE_OTHER;
 	for (let i = 0; i < recs.length; i++) {
 		const rec = recs[i];
 		if (rec.type === RT_SLIDE_PERSIST_ATOM) {
 			flush();
 			pendingRef = rec.data.length >= 4 ? u32(rec.data, 0) : void 0;
-		} else if (rec.type === RT_TEXT_CHARS_ATOM || rec.type === RT_TEXT_BYTES_ATOM) outline.push(...styledParagraphs(rec, findFollowingStyle(recs, i)));
+		} else if (rec.type === RT_TEXT_HEADER_ATOM) textType = rec.data.length >= 4 ? u32(rec.data, 0) : TEXT_TYPE_OTHER;
+		else if (rec.type === RT_TEXT_CHARS_ATOM || rec.type === RT_TEXT_BYTES_ATOM) outline.push({
+			textType,
+			rec,
+			style: findFollowingStyle(recs, i)
+		});
 	}
 	flush();
 	return slides;
 }
-function collectParagraphs(d, depth) {
+function collectParagraphs(d, depth, defaults, env) {
 	if (depth > MAX_DEPTH) return [];
 	const out = [];
 	const recs = [...records(d)];
+	let textType = TEXT_TYPE_OTHER;
 	for (let i = 0; i < recs.length; i++) {
 		const rec = recs[i];
-		if (rec.type === RT_TEXT_CHARS_ATOM || rec.type === RT_TEXT_BYTES_ATOM) out.push(...styledParagraphs(rec, findFollowingStyle(recs, i)));
-		else if (rec.isContainer) out.push(...collectParagraphs(rec.data, depth + 1));
+		if (rec.type === RT_TEXT_HEADER_ATOM) textType = rec.data.length >= 4 ? u32(rec.data, 0) : TEXT_TYPE_OTHER;
+		else if (rec.type === RT_TEXT_CHARS_ATOM || rec.type === RT_TEXT_BYTES_ATOM) out.push(...styledParagraphs(rec, findFollowingStyle(recs, i), levelStyles(defaults, textType), env));
+		else if (rec.isContainer) out.push(...collectParagraphs(rec.data, depth + 1, defaults, env));
 	}
 	return out;
 }
+var TEXT_TYPE_OTHER = 3;
+var levelStyles = (defaults, textType) => defaults ? (level) => defaults(textType, level) : void 0;
 function findFollowingStyle(recs, i) {
 	for (let j = i + 1; j < recs.length; j++) {
 		const t = recs[j].type;
@@ -221,8 +279,8 @@ function findFollowingStyle(recs, i) {
 		if (t === RT_TEXT_CHARS_ATOM || t === RT_TEXT_BYTES_ATOM || t === RT_TEXT_HEADER_ATOM) break;
 	}
 }
-function styledParagraphs(textRec, styleData) {
-	return buildStyledParagraphs(textRec.type === RT_TEXT_CHARS_ATOM ? decodeUtf16(textRec.data) : decodeCp1252(textRec.data), styleData);
+function styledParagraphs(textRec, styleData, defaults, env) {
+	return buildStyledParagraphs(textRec.type === RT_TEXT_CHARS_ATOM ? decodeUtf16(textRec.data) : decodeCp1252(textRec.data), styleData, defaults, env);
 }
 function slidesByScan(stream, img) {
 	const slides = [];
@@ -231,8 +289,14 @@ function slidesByScan(stream, img) {
 }
 function collectSlides(d, out, img, depth) {
 	if (depth > MAX_DEPTH) return;
-	for (const rec of records(d)) if (rec.type === RT_SLIDE) out.push({ shapes: slideShapes(rec.data, img, [], resolveScheme(rec.data)) });
-	else if (rec.isContainer) collectSlides(rec.data, out, img, depth + 1);
+	for (const rec of records(d)) if (rec.type === RT_SLIDE) {
+		const scheme = resolveScheme(rec.data);
+		const content = slideShapes(rec.data, img, [], scheme ? { scheme } : {});
+		out.push({
+			shapes: content.shapes,
+			...content.background ? { background: content.background } : {}
+		});
+	} else if (rec.isContainer) collectSlides(rec.data, out, img, depth + 1);
 }
 function findChild(d, pred) {
 	for (const rec of records(d)) if (pred(rec)) return rec.data;
@@ -288,53 +352,328 @@ function findDescendantContainer(d, type, depth) {
 		}
 	}
 }
-function collectShapes(slideData, img, scheme) {
-	const out = [];
-	collectShapeContainers(slideData, img, out, 0, scheme);
+function collectShapes(slideData, img, env, outline = [], defaults) {
+	const out = { shapes: [] };
+	collectShapeContainers(slideData, img, out, 0, env, outline, defaults);
 	return out;
 }
-function collectShapeContainers(d, img, out, depth, scheme) {
+function collectShapeContainers(d, img, out, depth, env, outline, defaults, group) {
+	const scheme = env.scheme;
 	if (depth > MAX_DEPTH) return;
-	for (const r of records(d)) if (r.type === FBT_SP_CONTAINER) {
-		let rectPt;
-		let paragraphs;
-		let pib;
-		let shapeType = 0;
-		let fspFlags = 0;
-		let fillColorHex;
-		let lineColorHex;
-		let geometry;
-		for (const child of records(r.data)) if (child.type === FBT_FSP) {
-			shapeType = child.instance;
-			fspFlags = child.data.length >= 8 ? u32(child.data, 4) : 0;
-		} else if (child.type === FBT_CLIENT_ANCHOR) rectPt = parseAnchor(child.data);
-		else if (child.type === FBT_CLIENT_TEXTBOX) paragraphs = collectParagraphs(child.data, 0);
-		else if (child.type === FBT_OPT) {
-			pib = optProperty(child.data, child.instance, PROP_PIB);
-			fillColorHex = optColor(child.data, child.instance, PROP_FILL_COLOR, scheme);
-			lineColorHex = optColor(child.data, child.instance, PROP_LINE_COLOR, scheme);
-			geometry = parseFreeformGeometry(child.data, child.instance);
+	for (const r of records(d)) {
+		if (r.type === FBT_SPGR_CONTAINER) {
+			collectShapeContainers(r.data, img, out, depth + 1, env, outline, defaults, groupFrame(r.data) ?? group);
+			continue;
 		}
-		let image;
-		if (pib !== void 0 && pib >= 1 && pib <= img.foDelays.length) {
-			const bytes = readBlipBytes(img.pictures, img.foDelays[pib - 1]);
-			if (bytes) image = { bytes };
+		if (r.type === FBT_SP_CONTAINER) {
+			let rectPt;
+			let paragraphs;
+			let pib;
+			let shapeType = 0;
+			let fspFlags = 0;
+			let fillColorHex;
+			let lineColorHex;
+			let gradient;
+			let geometry;
+			let fillType;
+			let fillBlip;
+			let inlineFill;
+			let inlinePic;
+			let tileSizePt;
+			let gtext;
+			let placeholder = false;
+			for (const child of records(r.data)) if (child.type === FBT_FSP) {
+				shapeType = child.instance;
+				fspFlags = child.data.length >= 8 ? u32(child.data, 4) : 0;
+			} else if (child.type === FBT_CLIENT_ANCHOR) rectPt = parseAnchor(child.data);
+			else if (child.type === FBT_CHILD_ANCHOR && group) rectPt = childRect(child.data, group);
+			else if (child.type === FBT_CLIENT_DATA) placeholder = findChild(child.data, (c) => c.type === RT_PLACEHOLDER_ATOM) !== void 0;
+			else if (child.type === FBT_CLIENT_TEXTBOX) paragraphs = clientTextboxParagraphs(child.data, outline, defaults, env);
+			else if (child.type === FBT_OPT) {
+				pib = optProperty(child.data, child.instance, PROP_PIB);
+				fillColorHex = stated(child.data, child.instance, PROP_FILL_BOOLS, FILL_F_FILLED) ? optColor(child.data, child.instance, PROP_FILL_COLOR, scheme) : void 0;
+				lineColorHex = stated(child.data, child.instance, PROP_LINE_BOOLS, LINE_F_LINE) ? optColor(child.data, child.instance, PROP_LINE_COLOR, scheme) : void 0;
+				gradient = parseFillGradient(child.data, child.instance, fillColorHex, scheme);
+				geometry = parseFreeformGeometry(child.data, child.instance);
+				fillType = optProperty(child.data, child.instance, PROP_FILL_TYPE);
+				fillBlip = optProperty(child.data, child.instance, PROP_FILL_BLIP);
+				tileSizePt = parseTileSize(child.data, child.instance);
+				gtext = parseWordArt(child.data, child.instance, fillColorHex);
+				inlineFill = optComplex(child.data, child.instance, PROP_FILL_BLIP);
+				inlinePic = optComplex(child.data, child.instance, PROP_PIB);
+			}
+			const blip = (index) => {
+				if (index === void 0 || index < 1 || index > img.foDelays.length) return void 0;
+				const bytes = readBlipBytes(img.pictures, img.foDelays[index - 1]);
+				return bytes ? { bytes } : void 0;
+			};
+			const tiled = fillType === 2;
+			const fillImage = fillType === 2 || fillType === 3 ? blip(fillBlip) ?? inlineBlip(inlineFill) : void 0;
+			if ((fspFlags & FSP_FLAG_BACKGROUND) !== 0) {
+				const bg = slideBackground(fillColorHex, gradient, fillType, fillImage, tiled);
+				if (bg && !out.background) out.background = bg;
+				continue;
+			}
+			const image = blip(pib) ?? inlineBlip(inlinePic);
+			const textParas = gtext ?? (paragraphs?.some((p) => paragraphText(p).length > 0) === true ? paragraphs : void 0) ? gtext ? [gtext] : paragraphs : void 0;
+			const decorative = (fspFlags & (FSP_FLAG_PATRIARCH | 1025)) === 0;
+			const autoShape = !gtext && !image && rectPt && (shapeType > 0 || geometry) && decorative && (fillColorHex || lineColorHex || fillImage) ? {
+				shapeType,
+				...fillColorHex ? { fillColorHex } : {},
+				...lineColorHex ? { lineColorHex } : {},
+				...gradient ? { gradient } : {},
+				...fillImage ? { image: fillImage } : {},
+				...fillImage && tiled ? { imageTiled: true } : {},
+				...fillImage && tiled && tileSizePt ? { tileSizePt } : {},
+				...geometry ? { geometry } : {}
+			} : void 0;
+			if (textParas || image || autoShape) out.shapes.push({
+				...rectPt ? { rectPt } : {},
+				...gtext ? { wordArt: true } : {},
+				...placeholder ? { placeholder: true } : {},
+				...textParas ? { paragraphs: textParas } : {},
+				...image ? { image } : {},
+				...autoShape ? { autoShape } : {}
+			});
+		} else if (r.isContainer) collectShapeContainers(r.data, img, out, depth + 1, env, outline, defaults, group);
+	}
+}
+function parseFontCollection(docData) {
+	const out = [];
+	const coll = findDescendantContainer(docData, RT_FONT_COLLECTION, 0);
+	if (!coll) return out;
+	let ordinal = 0;
+	for (const rec of records(coll)) {
+		if (rec.type !== RT_FONT_ENTITY_ATOM || rec.data.length < 2) continue;
+		const index = rec.instance > 0 || ordinal === 0 ? rec.instance : ordinal;
+		let name = "";
+		for (let i = 0; i < 32 && i * 2 + 1 < rec.data.length; i++) {
+			const cu = u16(rec.data, i * 2);
+			if (cu === 0) break;
+			name += String.fromCharCode(cu);
+		}
+		out[index] = name;
+		ordinal++;
+	}
+	return out;
+}
+function parseMasterTextStyles(masterData, fonts) {
+	const out = /* @__PURE__ */ new Map();
+	for (const rec of records(masterData)) {
+		if (rec.type !== RT_TEXT_MASTER_STYLE_ATOM || rec.data.length < 2) continue;
+		const levels = Math.min(u16(rec.data, 0), 5);
+		const first = readMasterLevels(rec.data, levels, rec.instance >= 4 ? 2 : 0, fonts);
+		const exact = (r) => r.styles.length === levels && r.off === rec.data.length;
+		let best = first;
+		if (!exact(first)) {
+			const other = readMasterLevels(rec.data, levels, rec.instance >= 4 ? 0 : 2, fonts);
+			if (exact(other)) best = other;
 		}
-		const textParas = paragraphs && paragraphs.some((p) => paragraphText(p).length > 0) ? paragraphs : void 0;
-		const decorative = (fspFlags & (FSP_FLAG_PATRIARCH | 1025)) === 0;
-		const autoShape = !textParas && !image && rectPt && (shapeType > 0 || geometry) && decorative && (fillColorHex || lineColorHex) ? {
-			shapeType,
-			...fillColorHex ? { fillColorHex } : {},
-			...lineColorHex ? { lineColorHex } : {},
-			...geometry ? { geometry } : {}
-		} : void 0;
-		if (textParas || image || autoShape) out.push({
-			...rectPt ? { rectPt } : {},
-			...textParas ? { paragraphs: textParas } : {},
-			...image ? { image } : {},
-			...autoShape ? { autoShape } : {}
+		if (best.styles.length > 0) out.set(rec.instance, best.styles);
+	}
+	return out;
+}
+function readMasterLevels(d, levels, prefix, fonts) {
+	const styles = [];
+	let off = 2;
+	for (let i = 0; i < levels; i++) {
+		off += prefix;
+		if (off + 4 > d.length) break;
+		const pf = readPfException(d, off);
+		if (pf.off + 4 > d.length) break;
+		const cf = readCfException(d, pf.off, void 0, fonts);
+		if (cf.off > d.length) break;
+		off = cf.off;
+		styles.push({
+			...cf.props,
+			...pf.align !== void 0 ? { align: pf.align } : {},
+			...pf.bullet !== void 0 ? { bullet: pf.bullet } : {},
+			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {}
 		});
-	} else if (r.isContainer) collectShapeContainers(r.data, img, out, depth + 1, scheme);
+	}
+	return {
+		styles,
+		off
+	};
+}
+var TEXT_TYPE_FALLBACK = new Map([
+	[4, 1],
+	[5, 0],
+	[6, 1],
+	[7, 1]
+]);
+function masterDefaults(chain, scheme) {
+	return (textType, level) => {
+		const types = [textType, TEXT_TYPE_FALLBACK.get(textType)];
+		let merged;
+		for (const styles of chain) for (const t of types) {
+			const levels = t === void 0 ? void 0 : styles.get(t);
+			const at = levels?.[Math.min(level, levels.length - 1)];
+			if (!at) continue;
+			const { colorHex: _c, colorIndex: _i, bullet: _b, bulletOn: _o, ...metrics } = at;
+			merged = {
+				...t === textType ? at : metrics,
+				...merged
+			};
+		}
+		if (!merged || merged.colorHex !== void 0 || merged.colorIndex === void 0) return merged;
+		const slot = scheme?.[merged.colorIndex];
+		return slot === void 0 ? merged : {
+			...merged,
+			colorHex: slot
+		};
+	};
+}
+function buildMasterIdMap(docData) {
+	const out = /* @__PURE__ */ new Map();
+	const slwt = findChild(docData, (r) => r.type === RT_SLIDE_LIST_WITH_TEXT && r.instance === SLWT_INSTANCE_MASTERS);
+	if (!slwt) return out;
+	for (const rec of records(slwt)) if (rec.type === RT_SLIDE_PERSIST_ATOM && rec.data.length >= 16) out.set(u32(rec.data, 12), u32(rec.data, 0));
+	return out;
+}
+var SLIDE_FLAG_MASTER_OBJECTS = 1;
+var SLIDE_FLAG_MASTER_BACKGROUND = 4;
+function masterOf(slideData, ctx) {
+	const slideAtom = findChild(slideData, (r) => r.type === RT_SLIDE_ATOM);
+	if (!slideAtom || slideAtom.length < 22) return void 0;
+	const id = u32(slideAtom, 12);
+	const off = ctx.persist.get(ctx.byMasterId.get(id) ?? id);
+	const rec = off !== void 0 ? recordAt(ctx.stream, off) : void 0;
+	return rec && (rec.type === RT_MAIN_MASTER || rec.type === RT_SLIDE) ? rec : void 0;
+}
+function slideFlag(slideData, flag) {
+	const slideAtom = findChild(slideData, (r) => r.type === RT_SLIDE_ATOM);
+	return slideAtom !== void 0 && slideAtom.length >= 22 && (u16(slideAtom, 20) & flag) !== 0;
+}
+function masterShapes(slideData, ctx, img) {
+	if (!slideFlag(slideData, SLIDE_FLAG_MASTER_OBJECTS)) return [];
+	const master = masterOf(slideData, ctx);
+	if (!master) return [];
+	const scheme = resolveScheme(master.data, ctx);
+	return collectShapes(master.data, img, scheme ? { scheme } : {}).shapes.filter((s) => s.placeholder !== true && s.rectPt !== void 0);
+}
+function masterBackground(slideData, ctx, img) {
+	if (!slideFlag(slideData, SLIDE_FLAG_MASTER_BACKGROUND)) return void 0;
+	const master = masterOf(slideData, ctx);
+	if (!master) return void 0;
+	const scheme = resolveScheme(master.data, ctx);
+	return collectShapes(master.data, img, scheme ? { scheme } : {}).background;
+}
+function masterChain(slideData, ctx, scheme, fonts) {
+	const chain = [];
+	if (!ctx) return masterDefaults(chain, scheme);
+	let data = slideData;
+	const seen = /* @__PURE__ */ new Set();
+	for (let hop = 0; hop < 4 && data; hop++) {
+		const slideAtom = findChild(data, (r) => r.type === RT_SLIDE_ATOM);
+		if (!slideAtom || slideAtom.length < 16) break;
+		const masterId = u32(slideAtom, 12);
+		if (seen.has(masterId)) break;
+		seen.add(masterId);
+		const cached = ctx.cache.get(masterId);
+		const off = ctx.persist.get(ctx.byMasterId.get(masterId) ?? masterId);
+		const rec = off !== void 0 ? recordAt(ctx.stream, off) : void 0;
+		if (!rec || rec.type !== RT_MAIN_MASTER && rec.type !== RT_SLIDE) break;
+		if (cached) chain.push(cached);
+		else {
+			const styles = parseMasterTextStyles(rec.data, fonts);
+			ctx.cache.set(masterId, styles);
+			chain.push(styles);
+		}
+		data = rec.type === RT_SLIDE ? rec.data : void 0;
+	}
+	return masterDefaults(chain, scheme);
+}
+function groupFrame(spgrData) {
+	const sp = [...records(spgrData)].find((r) => r.type === FBT_SP_CONTAINER);
+	if (!sp) return void 0;
+	let box;
+	let rect;
+	for (const child of records(sp.data)) if (child.type === FBT_SPGR && child.data.length >= 16) {
+		const x = i32(child.data, 0);
+		const y = i32(child.data, 4);
+		box = {
+			x,
+			y,
+			w: i32(child.data, 8) - x,
+			h: i32(child.data, 12) - y
+		};
+	} else if (child.type === FBT_CLIENT_ANCHOR) rect = parseAnchor(child.data);
+	if (!box || !rect || box.w <= 0 || box.h <= 0) return void 0;
+	return {
+		rect,
+		...box
+	};
+}
+function childRect(d, g) {
+	if (d.length < 16) return void 0;
+	const x1 = g.rect.x + (i32(d, 0) - g.x) / g.w * g.rect.w;
+	const y1 = g.rect.y + (i32(d, 4) - g.y) / g.h * g.rect.h;
+	const x2 = g.rect.x + (i32(d, 8) - g.x) / g.w * g.rect.w;
+	const y2 = g.rect.y + (i32(d, 12) - g.y) / g.h * g.rect.h;
+	const w = x2 - x1;
+	const h = y2 - y1;
+	return w > 0 && h > 0 && Math.abs(x1) < 5e3 && Math.abs(y1) < 5e3 ? {
+		x: x1,
+		y: y1,
+		w,
+		h
+	} : void 0;
+}
+function clientTextboxParagraphs(d, outline, defaults, env) {
+	const own = collectParagraphs(d, 0, defaults, env);
+	if (own.some((p) => paragraphText(p).length > 0)) return own;
+	const ref = findChild(d, (r) => r.type === RT_OUTLINE_TEXT_REF_ATOM);
+	if (!ref || ref.length < 4) return own;
+	return [...outline[u32(ref, 0)] ?? []];
+}
+function parseWordArt(d, count, colorHex) {
+	const text = utf16Property(optComplex(d, count, PROP_GTEXT_UNICODE));
+	if (text === void 0 || text.trim() === "") return void 0;
+	const raw = optProperty(d, count, PROP_GTEXT_SIZE);
+	const sizePt = raw === void 0 ? void 0 : Math.round(raw / 65536 * 10) / 10;
+	const font = utf16Property(optComplex(d, count, PROP_GTEXT_FONT));
+	return {
+		runs: [{
+			text,
+			...sizePt !== void 0 && sizePt > 0 ? { sizePt } : {},
+			...colorHex ? { colorHex } : {},
+			...font ? { fontFamily: font } : {}
+		}],
+		align: 1
+	};
+}
+function utf16Property(blob) {
+	if (!blob || blob.length < 2) return void 0;
+	let out = "";
+	for (let i = 0; i * 2 + 1 < blob.length; i++) {
+		const cu = u16(blob, i * 2);
+		if (cu === 0) break;
+		out += String.fromCharCode(cu);
+	}
+	return out.length > 0 ? out : void 0;
+}
+function parseTileSize(d, count) {
+	const w = signedLong(optProperty(d, count, PROP_FILL_WIDTH));
+	const h = signedLong(optProperty(d, count, PROP_FILL_HEIGHT));
+	if (w === void 0 || h === void 0 || w <= 0 || h <= 0) return void 0;
+	return {
+		widthPt: w / EMU_PER_POINT,
+		heightPt: h / EMU_PER_POINT
+	};
+}
+function inlineBlip(blob) {
+	if (!blob || blob.length < 8) return void 0;
+	const bytes = readEscherBlip(u16(blob, 2), u16(blob, 0) >> 4, blob.subarray(8));
+	return bytes ? { bytes } : void 0;
+}
+function slideBackground(fillColorHex, gradient, fillType, image, tiled) {
+	if (image) return {
+		image,
+		...tiled ? { imageTiled: true } : {}
+	};
+	if (gradient) return { gradient };
+	if (fillColorHex) return { fillColorHex };
 }
 function parseAnchor(data) {
 	let top;
@@ -364,6 +703,11 @@ function parseAnchor(data) {
 		h
 	};
 }
+function stated(d, count, propId, flag) {
+	const bools = optProperty(d, count, propId);
+	if (bools === void 0) return true;
+	return (bools & flag << 16) !== 0 ? (bools & flag) !== 0 : true;
+}
 function optProperty(d, count, wantId) {
 	for (let i = 0; i < count && i * 6 + 6 <= d.length; i++) {
 		const id = u16(d, i * 6);
@@ -375,11 +719,29 @@ function optComplex(d, count, wantId) {
 	for (let i = 0; i < count && i * 6 + 6 <= d.length; i++) {
 		const id = u16(d, i * 6);
 		if ((id & 32768) === 0) continue;
-		const len = u32(d, i * 6 + 2);
+		const len = arrayBlobLength(d, offset, id & 16383, u32(d, i * 6 + 2));
 		if ((id & 16383) === wantId) return offset + len <= d.length && len > 0 ? d.subarray(offset, offset + len) : void 0;
 		offset += len;
 	}
 }
+var ARRAY_PROPS = new Set([
+	325,
+	326,
+	327,
+	329,
+	330,
+	337,
+	338,
+	339
+]);
+function arrayBlobLength(d, offset, id, len) {
+	if (!ARRAY_PROPS.has(id) || offset + 6 > d.length) return len;
+	const nElems = u16(d, offset);
+	const raw = u16(d, offset + 4);
+	const signed = raw >= 32768 ? raw - 65536 : raw;
+	const size = signed < 0 ? -signed >> 2 : signed;
+	return size > 0 && nElems > 0 && nElems * size === len ? len + 6 : len;
+}
 function arrayHeader(blob) {
 	if (blob.length < 6) return void 0;
 	const raw = u16(blob, 4);
@@ -501,6 +863,29 @@ var SYS_COLORS = new Map([
 	[23, "000000"],
 	[24, "FFFFE1"]
 ]);
+/**
+* MS-ODRAW §2.3.7.1 `fillType` — the sweep a shaded fill asks for, or
+* `undefined` when the shape is filled with one flat colour (type 0) or with
+* something this reader does not draw (a picture, a texture, a pattern).
+*
+* @param d      The OPT record's data.
+* @param count  Its entry count (the record's instance).
+* @param fromHex The resolved `fillColor` — one end of the sweep.
+* @param scheme The slide's colour scheme, for a scheme-relative far end.
+*/
+function parseFillGradient(d, count, fromHex, scheme) {
+	const type = optProperty(d, count, PROP_FILL_TYPE);
+	if (type === void 0 || type < 4 || type > 8) return void 0;
+	const toHex = optColor(d, count, PROP_FILL_BACK_COLOR, scheme) ?? "FFFFFF";
+	if (fromHex === void 0) return void 0;
+	const raw = optProperty(d, count, PROP_FILL_ANGLE);
+	return {
+		fromHex,
+		toHex,
+		angleDeg: raw === void 0 ? 90 : 90 - (raw | 0) / 65536,
+		radial: type === 5 || type === 6
+	};
+}
 function optColor(d, count, wantId, scheme) {
 	const v = optProperty(d, count, wantId);
 	if (v === void 0) return void 0;
@@ -512,13 +897,14 @@ function optColor(d, count, wantId, scheme) {
 	}
 	if (flags === COLORREF_SYS_INDEX) return SYS_COLORS.get(v & 65535);
 }
-function resolveScheme(slideData, persist, stream) {
+function resolveScheme(slideData, ctx) {
 	let schemeData = findColorScheme(slideData);
 	const slideAtom = findChild(slideData, (r) => r.type === RT_SLIDE_ATOM);
-	if (slideAtom && slideAtom.length >= 22 && persist && stream) {
+	if (slideAtom && slideAtom.length >= 22 && ctx) {
 		if ((u16(slideAtom, 20) & SLIDE_FLAG_MASTER_SCHEME) !== 0) {
-			const masterOff = persist.get(u32(slideAtom, 12));
-			const masterRec = masterOff !== void 0 ? recordAt(stream, masterOff) : void 0;
+			const id = u32(slideAtom, 12);
+			const masterOff = ctx.persist.get(ctx.byMasterId.get(id) ?? id);
+			const masterRec = masterOff !== void 0 ? recordAt(ctx.stream, masterOff) : void 0;
 			if (masterRec && masterRec.type === RT_MAIN_MASTER) {
 				const masterScheme = findColorScheme(masterRec.data);
 				if (masterScheme) schemeData = masterScheme;
@@ -541,33 +927,19 @@ function parseColorScheme(d) {
 }
 function readBlipBytes(pictures, foDelay) {
 	if (foDelay < 0 || foDelay + 8 > pictures.length) return void 0;
+	const verInstance = u16(pictures, foDelay);
+	const type = u16(pictures, foDelay + 2);
 	const recLen = u32(pictures, foDelay + 4);
 	const start = foDelay + 8;
 	const blip = pictures.subarray(start, Math.min(pictures.length, start + recLen));
-	const limit = Math.min(blip.length, 80);
-	for (let off = 0; off < limit; off++) for (const magic of IMAGE_MAGICS) if (matchesMagic(blip, off, magic)) return blip.subarray(off);
-}
-var IMAGE_MAGICS = [[
-	137,
-	80,
-	78,
-	71
-], [
-	255,
-	216,
-	255
-]];
-function matchesMagic(d, off, magic) {
-	if (off + magic.length > d.length) return false;
-	for (let i = 0; i < magic.length; i++) if (d[off + i] !== magic[i]) return false;
-	return true;
+	return readEscherBlip(type, verInstance >> 4, blip);
 }
 /** The concatenated plain text of a paragraph's runs. */
 function paragraphText(p) {
 	return p.runs.map((r) => r.text).join("");
 }
-function buildStyledParagraphs(text, styleData) {
-	const style = styleData ? parseStyleTextProp(styleData, text.length) : void 0;
+function buildStyledParagraphs(text, styleData, defaults, env) {
+	const style = styleData ? parseStyleTextProp(styleData, text.length, env) : void 0;
 	const charProps = style ? expandCharProps(style.charRuns, text.length) : void 0;
 	const paraRuns = style?.paraRuns ?? [];
 	const paras = [];
@@ -582,10 +954,16 @@ function buildStyledParagraphs(text, styleData) {
 	const endParagraph = () => {
 		pushRun();
 		const meta = paraRuns[paraIndex];
+		const lvl = defaults?.(meta?.level ?? 0);
+		const align = meta?.align ?? lvl?.align;
+		const on = meta?.bulletOn ?? lvl?.bulletOn;
+		const char = meta?.bullet ?? lvl?.bullet;
+		const bullet = on === false ? void 0 : on === true ? char ?? "•" : char;
 		paras.push({
-			runs,
-			...meta?.align !== void 0 ? { align: meta.align } : {},
-			...meta?.level !== void 0 ? { level: meta.level } : {}
+			runs: lvl ? runs.map((r) => inherit(r, lvl)) : runs,
+			...align !== void 0 ? { align } : {},
+			...meta?.level !== void 0 ? { level: meta.level } : {},
+			...bullet !== void 0 ? { bullet } : {}
 		});
 		runs = [];
 		paraIndex++;
@@ -606,6 +984,17 @@ function buildStyledParagraphs(text, styleData) {
 	if (paras.length > 1 && paragraphText(paras[paras.length - 1]).length === 0) paras.pop();
 	return paras;
 }
+function inherit(run, lvl) {
+	const sizePt = run.sizePt ?? lvl.sizePt;
+	const colorHex = run.colorHex ?? lvl.colorHex;
+	const fontFamily = run.fontFamily ?? lvl.fontFamily;
+	return {
+		...run,
+		...sizePt !== void 0 ? { sizePt } : {},
+		...colorHex !== void 0 ? { colorHex } : {},
+		...fontFamily !== void 0 ? { fontFamily } : {}
+	};
+}
 function toRun(text, props) {
 	if (!props) return { text };
 	return {
@@ -614,13 +1003,14 @@ function toRun(text, props) {
 		...props.italic ? { italic: true } : {},
 		...props.underline ? { underline: true } : {},
 		...props.sizePt ? { sizePt: props.sizePt } : {},
-		...props.colorHex ? { colorHex: props.colorHex } : {}
+		...props.colorHex ? { colorHex: props.colorHex } : {},
+		...props.fontFamily ? { fontFamily: props.fontFamily } : {}
 	};
 }
 function sameProps(a, b) {
 	if (a === b) return true;
 	if (!a || !b) return false;
-	return !!a.bold === !!b.bold && !!a.italic === !!b.italic && !!a.underline === !!b.underline && a.sizePt === b.sizePt && a.colorHex === b.colorHex;
+	return !!a.bold === !!b.bold && !!a.italic === !!b.italic && !!a.underline === !!b.underline && a.sizePt === b.sizePt && a.colorHex === b.colorHex && a.fontFamily === b.fontFamily;
 }
 function expandCharProps(charRuns, textLen) {
 	const out = [];
@@ -628,7 +1018,7 @@ function expandCharProps(charRuns, textLen) {
 	while (out.length < textLen) out.push(charRuns[charRuns.length - 1] ?? { count: 0 });
 	return out;
 }
-function parseStyleTextProp(data, textLen) {
+function parseStyleTextProp(data, textLen, env) {
 	const target = textLen + 1;
 	let off = 0;
 	const paraRuns = [];
@@ -636,32 +1026,14 @@ function parseStyleTextProp(data, textLen) {
 	while (consumed < target && off + 10 <= data.length) {
 		const count = u32(data, off);
 		const level = u16(data, off + 4);
-		const mask = u32(data, off + 6);
-		off += 10;
-		let align;
-		if ((mask & 15) !== 0) off += 2;
-		if ((mask & 128) !== 0) off += 2;
-		if ((mask & 16) !== 0) off += 2;
-		if ((mask & 64) !== 0) off += 2;
-		if ((mask & 32) !== 0) off += 4;
-		if ((mask & 2048) !== 0) {
-			align = u16(data, off);
-			off += 2;
-		}
-		if ((mask & 4096) !== 0) off += 2;
-		if ((mask & 8192) !== 0) off += 2;
-		if ((mask & 16384) !== 0) off += 2;
-		if ((mask & 256) !== 0) off += 2;
-		if ((mask & 1024) !== 0) off += 2;
-		if ((mask & 32768) !== 0) off += 2;
-		if ((mask & 1048576) !== 0) off += 2 + (off + 2 <= data.length ? u16(data, off) : 0) * 4;
-		if ((mask & 65536) !== 0) off += 2;
-		if ((mask & 917504) !== 0) off += 2;
-		if ((mask & 2097152) !== 0) off += 2;
+		const pf = readPfException(data, off + 6);
+		off = pf.off;
 		paraRuns.push({
 			count,
 			level,
-			...align !== void 0 ? { align } : {}
+			...pf.align !== void 0 ? { align: pf.align } : {},
+			...pf.bullet !== void 0 ? { bullet: pf.bullet } : {},
+			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {}
 		});
 		consumed += count;
 		if (count <= 0) break;
@@ -670,31 +1042,12 @@ function parseStyleTextProp(data, textLen) {
 	consumed = 0;
 	while (consumed < target && off + 8 <= data.length) {
 		const count = u32(data, off);
-		const mask = u32(data, off + 4);
-		off += 8;
-		const run = { count };
-		if ((mask & 16055) !== 0) {
-			const style = u16(data, off);
-			off += 2;
-			if ((mask & 1) !== 0 && (style & 1) !== 0) run.bold = true;
-			if ((mask & 2) !== 0 && (style & 2) !== 0) run.italic = true;
-			if ((mask & 4) !== 0 && (style & 4) !== 0) run.underline = true;
-		}
-		if ((mask & 65536) !== 0) off += 2;
-		if ((mask & 2097152) !== 0) off += 2;
-		if ((mask & 4194304) !== 0) off += 2;
-		if ((mask & 8388608) !== 0) off += 2;
-		if ((mask & 131072) !== 0) {
-			const sz = u16(data, off);
-			off += 2;
-			if (sz > 0) run.sizePt = sz;
-		}
-		if ((mask & 262144) !== 0) {
-			if (off + 4 <= data.length && data[off + 3] === 254) run.colorHex = hex2(data[off]) + hex2(data[off + 1]) + hex2(data[off + 2]);
-			off += 4;
-		}
-		if ((mask & 524288) !== 0) off += 2;
-		charRuns.push(run);
+		const cf = readCfException(data, off + 4, env?.scheme, env?.fonts);
+		off = cf.off;
+		charRuns.push({
+			count,
+			...cf.props
+		});
 		consumed += count;
 		if (count <= 0) break;
 	}
@@ -703,6 +1056,92 @@ function parseStyleTextProp(data, textLen) {
 		charRuns
 	} : void 0;
 }
+function readPfException(data, start) {
+	const mask = u32(data, start);
+	let off = start + 4;
+	let align;
+	let bulletOn;
+	let bullet;
+	if ((mask & 15) !== 0) {
+		bulletOn = (u16(data, off) & 1) !== 0;
+		off += 2;
+	}
+	if ((mask & 128) !== 0) {
+		bullet = bulletCharacter(u16(data, off));
+		off += 2;
+	}
+	if ((mask & 16) !== 0) off += 2;
+	if ((mask & 64) !== 0) off += 2;
+	if ((mask & 32) !== 0) off += 4;
+	if ((mask & 2048) !== 0) {
+		align = u16(data, off);
+		off += 2;
+	}
+	if ((mask & 4096) !== 0) off += 2;
+	if ((mask & 8192) !== 0) off += 2;
+	if ((mask & 16384) !== 0) off += 2;
+	if ((mask & 256) !== 0) off += 2;
+	if ((mask & 1024) !== 0) off += 2;
+	if ((mask & 32768) !== 0) off += 2;
+	if ((mask & 1048576) !== 0) off += 2 + (off + 2 <= data.length ? u16(data, off) : 0) * 4;
+	if ((mask & 65536) !== 0) off += 2;
+	if ((mask & 917504) !== 0) off += 2;
+	if ((mask & 2097152) !== 0) off += 2;
+	return {
+		off,
+		...align !== void 0 ? { align } : {},
+		...bullet !== void 0 ? { bullet } : {},
+		...bulletOn !== void 0 ? { bulletOn } : {}
+	};
+}
+function bulletCharacter(code) {
+	if (code === 0) return void 0;
+	const ch = String.fromCharCode(code);
+	return code < 8192 || code >= 61440 && code <= 61695 ? fromSymbolFont(ch, "Wingdings") : ch;
+}
+function readCfException(data, start, scheme, fonts) {
+	const mask = u32(data, start);
+	let off = start + 4;
+	const props = {};
+	if ((mask & 16055) !== 0) {
+		const style = u16(data, off);
+		off += 2;
+		if ((mask & 1) !== 0 && (style & 1) !== 0) props.bold = true;
+		if ((mask & 2) !== 0 && (style & 2) !== 0) props.italic = true;
+		if ((mask & 4) !== 0 && (style & 4) !== 0) props.underline = true;
+	}
+	if ((mask & 65536) !== 0) {
+		props.fontRef = u16(data, off);
+		off += 2;
+	}
+	if ((mask & 2097152) !== 0) off += 2;
+	if ((mask & 4194304) !== 0) off += 2;
+	if ((mask & 8388608) !== 0) off += 2;
+	if ((mask & 131072) !== 0) {
+		const sz = u16(data, off);
+		off += 2;
+		if (sz > 0) props.sizePt = sz;
+	}
+	if ((mask & 262144) !== 0) {
+		const index = off + 4 <= data.length ? data[off + 3] : void 0;
+		if (index === 254) props.colorHex = hex2(data[off]) + hex2(data[off + 1]) + hex2(data[off + 2]);
+		else if (index !== void 0 && index < 8) {
+			props.colorIndex = index;
+			const slot = scheme?.[index];
+			if (slot !== void 0) props.colorHex = slot;
+		}
+		off += 4;
+	}
+	if ((mask & 524288) !== 0) off += 2;
+	if (props.fontRef !== void 0) {
+		const name = fonts?.[props.fontRef];
+		if (name !== void 0 && name.length > 0) props.fontFamily = name;
+	}
+	return {
+		off,
+		props
+	};
+}
 function hex2(n) {
 	return n.toString(16).padStart(2, "0").toUpperCase();
 }