reamkit 1.23.0 → 1.24.0

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

@@ -1,3 +1,5 @@
+import { decodeBmp, isBmp } from "../../core/bmp.js";
+import { encodePng } from "../../core/png-encode.js";
 import { fromSymbolFont } from "../../core/metafile/symbol-fonts.js";
 import { isCfb, openCfb } from "../../core/ole/cfb.js";
 import { readEscherBlip } from "../../core/ole/escher-blip.js";
@@ -18,6 +20,7 @@ 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_ENVIRONMENT = 1010;
 var RT_FONT_COLLECTION = 2005;
 var RT_FONT_ENTITY_ATOM = 4023;
 var RT_COLOR_SCHEME_ATOM = 2032;
@@ -33,11 +36,31 @@ var FBT_SPGR_CONTAINER = 61443;
 var FBT_SPGR = 61449;
 var FBT_CHILD_ANCHOR = 61455;
 var RT_PLACEHOLDER_ATOM = 3011;
+var RT_HEADERS_FOOTERS = 4057;
+var RT_HEADERS_FOOTERS_ATOM = 4058;
+var RT_CSTRING = 4026;
+var HF_INSTANCE_PER_SLIDE = 0;
+var HF_INSTANCE_SLIDES = 3;
+var HF_HAS_DATE = 1;
+var HF_HAS_USER_DATE = 4;
+var HF_HAS_SLIDE_NUMBER = 8;
+var HF_HAS_FOOTER = 32;
+var PLACEHOLDER_DATE = 7;
+var PLACEHOLDER_SLIDE_NUMBER = 8;
+var PLACEHOLDER_FOOTER = 9;
+var SCHEME_TEXT_AND_LINES = 1;
 var PROP_PIB = 260;
+var PROP_CROP_TOP = 256;
+var PROP_CROP_BOTTOM = 257;
+var PROP_CROP_LEFT = 258;
+var PROP_CROP_RIGHT = 259;
+var PROP_PICTURE_TRANSPARENT = 263;
+var PICTURE_TRANSPARENT_NONE = 4294967295;
 var PROP_FILL_TYPE = 384;
 var PROP_FILL_COLOR = 385;
 var PROP_FILL_BACK_COLOR = 387;
 var PROP_FILL_ANGLE = 395;
+var PROP_FILL_FOCUS = 396;
 var PROP_FILL_BLIP = 390;
 var PROP_GTEXT_UNICODE = 192;
 var PROP_GTEXT_SIZE = 195;
@@ -215,8 +238,10 @@ function readSlideList(stream, docData, persist, img) {
 		persist,
 		stream,
 		byMasterId: buildMasterIdMap(docData),
-		cache: /* @__PURE__ */ new Map()
+		cache: /* @__PURE__ */ new Map(),
+		documentStyles: parseDocumentTextStyles(docData, fonts)
 	};
+	const deckFurniture = headersFooters(docData, HF_INSTANCE_SLIDES);
 	const flush = () => {
 		if (pendingRef === void 0) return;
 		const slideOff = persist.get(pendingRef);
@@ -232,7 +257,12 @@ function readSlideList(stream, docData, persist, img) {
 		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) : [];
+		const own = isSlide ? headersFooters(slideRec.data, HF_INSTANCE_PER_SLIDE) : void 0;
+		const furniture = own ?? deckFurniture ? {
+			...own ?? deckFurniture,
+			number: slides.length + 1
+		} : void 0;
+		const decoration = isSlide ? masterShapes(slideRec.data, masters, img, furniture, defaults) : [];
 		slides.push({
 			shapes: [...decoration, ...content.shapes],
 			...background ? { background } : {}
@@ -270,7 +300,7 @@ function collectParagraphs(d, depth, defaults, env) {
 	}
 	return out;
 }
-var TEXT_TYPE_OTHER = 3;
+var TEXT_TYPE_OTHER = 4;
 var levelStyles = (defaults, textType) => defaults ? (level) => defaults(textType, level) : void 0;
 function findFollowingStyle(recs, i) {
 	for (let j = i + 1; j < recs.length; j++) {
@@ -362,7 +392,7 @@ function collectShapeContainers(d, img, out, depth, env, outline, defaults, grou
 	if (depth > MAX_DEPTH) return;
 	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);
+			collectShapeContainers(r.data, img, out, depth + 1, env, outline, defaults, groupFrame(r.data, group) ?? group);
 			continue;
 		}
 		if (r.type === FBT_SP_CONTAINER) {
@@ -372,6 +402,7 @@ function collectShapeContainers(d, img, out, depth, env, outline, defaults, grou
 			let shapeType = 0;
 			let fspFlags = 0;
 			let fillColorHex;
+			let backColorHex;
 			let lineColorHex;
 			let gradient;
 			let geometry;
@@ -382,13 +413,19 @@ function collectShapeContainers(d, img, out, depth, env, outline, defaults, grou
 			let tileSizePt;
 			let gtext;
 			let placeholder = false;
+			let placeholderId;
+			let pictureCrop;
+			let pictureTransparentHex;
 			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_CLIENT_DATA) {
+				const ph = findChild(child.data, (c) => c.type === RT_PLACEHOLDER_ATOM);
+				placeholder = ph !== void 0;
+				placeholderId = ph !== void 0 && ph.length > 4 ? ph[4] : 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;
@@ -397,24 +434,35 @@ function collectShapeContainers(d, img, out, depth, env, outline, defaults, grou
 				geometry = parseFreeformGeometry(child.data, child.instance);
 				fillType = optProperty(child.data, child.instance, PROP_FILL_TYPE);
 				fillBlip = optProperty(child.data, child.instance, PROP_FILL_BLIP);
+				backColorHex = optColor(child.data, child.instance, PROP_FILL_BACK_COLOR, scheme);
 				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);
+				pictureCrop = parsePictureCrop(child.data, child.instance);
+				const transparent = optProperty(child.data, child.instance, PROP_PICTURE_TRANSPARENT);
+				pictureTransparentHex = transparent !== void 0 && transparent !== PICTURE_TRANSPARENT_NONE ? optColor(child.data, child.instance, PROP_PICTURE_TRANSPARENT, scheme) : void 0;
 			}
 			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;
+			const pattern = fillType === 1 ? patternFill(blip(fillBlip) ?? inlineBlip(inlineFill), fillColorHex, backColorHex) : void 0;
+			const tiled = fillType === 2 || pattern !== void 0;
+			const fillImage = pattern ?? (fillType === 2 || fillType === 3 ? blip(fillBlip) ?? inlineBlip(inlineFill) : void 0);
+			if (pattern) tileSizePt = PATTERN_TILE_PT;
 			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 picture = blip(pib) ?? inlineBlip(inlinePic);
+			const image = picture ? {
+				...picture,
+				...pictureCrop ? { crop: pictureCrop } : {},
+				...pictureTransparentHex !== void 0 ? { transparentHex: pictureTransparentHex } : {}
+			} : void 0;
 			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) ? {
@@ -427,10 +475,11 @@ function collectShapeContainers(d, img, out, depth, env, outline, defaults, grou
 				...fillImage && tiled && tileSizePt ? { tileSizePt } : {},
 				...geometry ? { geometry } : {}
 			} : void 0;
-			if (textParas || image || autoShape) out.shapes.push({
+			if (textParas || image || autoShape || placeholderId === PLACEHOLDER_DATE || placeholderId === PLACEHOLDER_SLIDE_NUMBER || placeholderId === PLACEHOLDER_FOOTER) out.shapes.push({
 				...rectPt ? { rectPt } : {},
 				...gtext ? { wordArt: true } : {},
 				...placeholder ? { placeholder: true } : {},
+				...placeholderId !== void 0 ? { placeholderId } : {},
 				...textParas ? { paragraphs: textParas } : {},
 				...image ? { image } : {},
 				...autoShape ? { autoShape } : {}
@@ -457,6 +506,23 @@ function parseFontCollection(docData) {
 	}
 	return out;
 }
+/**
+* §2.9.3 — the DECK's own text styles, from the document's text info.
+*
+* A master states the styles its placeholders take; the style a TEXT BOX drawn
+* on a slide takes — `Tx_TYPE_OTHER` — is stated once for the whole document
+* and lives here instead. 38256.ppt's four captions are all of that kind, and
+* without it they were set in the outline's 32pt Arial rather than the sizes
+* and faces they were typed in.
+*
+* @param docData The DocumentContainer's body.
+* @param fonts   The deck's typefaces, by the index a run names.
+* @returns The level styles, by text type — in practice the one for `other`.
+*/
+function parseDocumentTextStyles(docData, fonts) {
+	const env = findDescendantContainer(docData, RT_ENVIRONMENT, 0);
+	return env ? parseMasterTextStyles(env, fonts) : /* @__PURE__ */ new Map();
+}
 function parseMasterTextStyles(masterData, fonts) {
 	const out = /* @__PURE__ */ new Map();
 	for (const rec of records(masterData)) {
@@ -488,7 +554,12 @@ function readMasterLevels(d, levels, prefix, fonts) {
 			...cf.props,
 			...pf.align !== void 0 ? { align: pf.align } : {},
 			...pf.bullet !== void 0 ? { bullet: pf.bullet } : {},
-			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {}
+			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {},
+			...pf.leftMarginPt !== void 0 ? { leftMarginPt: pf.leftMarginPt } : {},
+			...pf.indentPt !== void 0 ? { indentPt: pf.indentPt } : {},
+			...pf.lineSpacing !== void 0 ? { lineSpacing: pf.lineSpacing } : {},
+			...pf.spaceBeforePt !== void 0 ? { spaceBeforePt: pf.spaceBeforePt } : {},
+			...pf.spaceAfterPt !== void 0 ? { spaceAfterPt: pf.spaceAfterPt } : {}
 		});
 	}
 	return {
@@ -497,10 +568,10 @@ function readMasterLevels(d, levels, prefix, fonts) {
 	};
 }
 var TEXT_TYPE_FALLBACK = new Map([
-	[4, 1],
-	[5, 0],
-	[6, 1],
-	[7, 1]
+	[5, 1],
+	[6, 0],
+	[7, 1],
+	[8, 1]
 ]);
 function masterDefaults(chain, scheme) {
 	return (textType, level) => {
@@ -510,7 +581,7 @@ function masterDefaults(chain, scheme) {
 			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;
+			const { colorHex: _c, colorIndex: _i, bullet: _b, bulletOn: _o, spaceBeforePt: _sb, spaceAfterPt: _sa, lineSpacing: _ls, leftMarginPt: _lm, indentPt: _ip, ...metrics } = at;
 			merged = {
 				...t === textType ? at : metrics,
 				...merged
@@ -545,12 +616,83 @@ 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) {
+function masterShapes(slideData, ctx, img, furniture, defaults) {
 	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);
+	return collectShapes(master.data, img, scheme ? { scheme } : {}, [], defaults).shapes.filter((s) => s.rectPt !== void 0).flatMap((s) => {
+		if (s.placeholder !== true) return [s];
+		const text = furniture ? furnitureText(s.placeholderId, furniture) : void 0;
+		return text === void 0 ? [] : [{
+			...s,
+			paragraphs: [furnitureParagraph(s, text, scheme?.[SCHEME_TEXT_AND_LINES])]
+		}];
+	});
+}
+/**
+* §2.4.15/§2.4.16 — the string one furniture placeholder shows, or `undefined`
+* when this deck does not show that one at all.
+*
+* A date box is only drawn when the deck states the date ITSELF: `fHasTodayDate`
+* asks for the day the file is opened, and a converter that answered it would
+* put a different date in the file every time it ran.
+*/
+function furnitureText(id, hf) {
+	if (id === PLACEHOLDER_FOOTER) return (hf.mask & HF_HAS_FOOTER) !== 0 ? (hf.footer ?? "") || void 0 : void 0;
+	if (id === PLACEHOLDER_SLIDE_NUMBER) return (hf.mask & HF_HAS_SLIDE_NUMBER) !== 0 ? String(hf.number) : void 0;
+	if (id === PLACEHOLDER_DATE) return (hf.mask & HF_HAS_DATE) !== 0 && (hf.mask & HF_HAS_USER_DATE) !== 0 ? (hf.userDate ?? "") || void 0 : void 0;
+}
+/**
+* The furniture's words, in the formatting the master's own box carries.
+*
+* A `.ppt` master keeps no prompt text in these boxes, so there is usually no
+* run to copy from and the paragraph takes the master's defaults; where one IS
+* there, its size, colour and alignment are what PowerPoint draws the footer in.
+*/
+function furnitureParagraph(shape, text, textColorHex) {
+	const model = shape.paragraphs?.find((p) => p.runs.length > 0);
+	const first = model?.runs[0];
+	return {
+		...model ? { ...model } : {},
+		runs: [{
+			...textColorHex !== void 0 ? { colorHex: textColorHex } : {},
+			...first ?? {},
+			text
+		}]
+	};
+}
+/**
+* §2.4.15 `HeadersFootersContainer` — the strings a deck shows on every slide,
+* and which of them it shows.
+*
+* They live nowhere near the boxes that draw them: the geometry is a
+* placeholder on the MASTER and the words are here, so a reader that has one
+* without the other draws an empty band. 37625.ppt's every slide is signed
+* "Transport CDM Workshop" and dated "26 August 2004" this way.
+*
+* @param data     A DocumentContainer's or SlideContainer's records.
+* @param instance Which container to read — the deck's or the slide's own.
+* @returns The mask and the strings, or `undefined` when there is no container.
+*/
+function headersFooters(data, instance) {
+	for (const rec of records(data)) {
+		if (rec.type !== RT_HEADERS_FOOTERS || rec.instance !== instance) continue;
+		let mask = 0;
+		let userDate;
+		let footer;
+		for (const child of records(rec.data)) if (child.type === RT_HEADERS_FOOTERS_ATOM && child.data.length >= 4) mask = child.data[2] | child.data[3] << 8;
+		else if (child.type === RT_CSTRING) {
+			const s = utf16Property(child.data);
+			if (child.instance === 0) userDate = s;
+			else if (child.instance === 2) footer = s;
+		}
+		return {
+			mask,
+			...userDate !== void 0 ? { userDate } : {},
+			...footer !== void 0 ? { footer } : {}
+		};
+	}
 }
 function masterBackground(slideData, ctx, img) {
 	if (!slideFlag(slideData, SLIDE_FLAG_MASTER_BACKGROUND)) return void 0;
@@ -562,6 +704,7 @@ function masterBackground(slideData, ctx, img) {
 function masterChain(slideData, ctx, scheme, fonts) {
 	const chain = [];
 	if (!ctx) return masterDefaults(chain, scheme);
+	const behind = ctx.documentStyles;
 	let data = slideData;
 	const seen = /* @__PURE__ */ new Set();
 	for (let hop = 0; hop < 4 && data; hop++) {
@@ -582,9 +725,10 @@ function masterChain(slideData, ctx, scheme, fonts) {
 		}
 		data = rec.type === RT_SLIDE ? rec.data : void 0;
 	}
+	if (behind.size > 0) chain.push(behind);
 	return masterDefaults(chain, scheme);
 }
-function groupFrame(spgrData) {
+function groupFrame(spgrData, parent) {
 	const sp = [...records(spgrData)].find((r) => r.type === FBT_SP_CONTAINER);
 	if (!sp) return void 0;
 	let box;
@@ -599,6 +743,7 @@ function groupFrame(spgrData) {
 			h: i32(child.data, 12) - y
 		};
 	} else if (child.type === FBT_CLIENT_ANCHOR) rect = parseAnchor(child.data);
+	else if (child.type === FBT_CHILD_ANCHOR && parent !== void 0 && rect === void 0) rect = childRect(child.data, parent);
 	if (!box || !rect || box.w <= 0 || box.h <= 0) return void 0;
 	return {
 		rect,
@@ -613,7 +758,7 @@ function childRect(d, g) {
 	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 ? {
+	return (w > 0 || h > 0) && w >= 0 && h >= 0 && Math.abs(x1) < 5e3 && Math.abs(y1) < 5e3 ? {
 		x: x1,
 		y: y1,
 		w,
@@ -667,6 +812,63 @@ function inlineBlip(blob) {
 	const bytes = readEscherBlip(u16(blob, 2), u16(blob, 0) >> 4, blob.subarray(8));
 	return bytes ? { bytes } : void 0;
 }
+var PATTERN_TILE_PT = {
+	widthPt: 576 / 96,
+	heightPt: 576 / 96
+};
+/**
+* §2.3.7.1 MSOFILLTYPE 1 — the picture a PATTERN fill repeats.
+*
+* The pattern itself is a one-bit bitmap in the picture store, and it carries
+* no colour of its own: its set bits are the shape's `fillColor` and its clear
+* bits its `fillBackColor`. So it is not a picture to be drawn but a stencil to
+* be painted through, and the two colours are recorded nowhere else. 37625.ppt
+* rules its every slide with a pale blue grid this way, and unread the whole
+* deck came out on white.
+*
+* The result is handed back as an ordinary tiled picture: the tile path is
+* already there and already tested, and a pattern IS a tiled picture once its
+* two colours are in it.
+*
+* @param mono   The pattern bitmap from the store, when it resolves.
+* @param fgHex  The shape's `fillColor` — what the set bits are painted in.
+* @param bgHex  Its `fillBackColor`; white when the shape states none.
+* @returns The recoloured tile as a PNG, or `undefined` when the blip is not a
+*          bitmap this can read.
+*/
+function patternFill(mono, fgHex, bgHex) {
+	if (!mono || !isBmp(mono.bytes)) return void 0;
+	let decoded;
+	try {
+		decoded = decodeBmp(mono.bytes);
+	} catch {
+		return;
+	}
+	const fg = rgb(fgHex ?? "000000");
+	const bg = rgb(bgHex ?? "FFFFFF");
+	const { width, height, data } = decoded;
+	const out = new Uint8Array(width * height * 3);
+	for (let i = 0; i < width * height; i++) {
+		const c = data[i * 3] + data[i * 3 + 1] + data[i * 3 + 2] < 384 ? fg : bg;
+		out[i * 3] = c[0];
+		out[i * 3 + 1] = c[1];
+		out[i * 3 + 2] = c[2];
+	}
+	return { bytes: encodePng(width, height, "rgb", out) };
+}
+/** `RRGGBB` → its three bytes. */
+function rgb(hex) {
+	const n = Number.parseInt(hex, 16);
+	return Number.isFinite(n) ? [
+		n >> 16 & 255,
+		n >> 8 & 255,
+		n & 255
+	] : [
+		0,
+		0,
+		0
+	];
+}
 function slideBackground(fillColorHex, gradient, fillType, image, tiled) {
 	if (image) return {
 		image,
@@ -708,6 +910,32 @@ function stated(d, count, propId, flag) {
 	if (bools === void 0) return true;
 	return (bools & flag << 16) !== 0 ? (bools & flag) !== 0 : true;
 }
+/**
+* §2.3.23 `cropFrom*` — the four edge crops, as fractions of the source.
+*
+* Each is a SIGNED 16.16 fixed-point fraction, so a negative one extends the
+* picture past its box rather than cutting into it. A crop that leaves nothing
+* of an axis is not one — 23884's globe keeps a ninth of its width and a
+* seventh of its height, but zero would divide the fitting by nothing.
+*
+* @param d     The OPT record's body.
+* @param count The number of fixed entries it declares.
+* @returns The four fractions, or `undefined` when the shape states no crop.
+*/
+function parsePictureCrop(d, count) {
+	const frac = (id) => {
+		const raw = optProperty(d, count, id);
+		return raw === void 0 ? 0 : (raw | 0) / 65536;
+	};
+	const crop = {
+		left: frac(PROP_CROP_LEFT),
+		top: frac(PROP_CROP_TOP),
+		right: frac(PROP_CROP_RIGHT),
+		bottom: frac(PROP_CROP_BOTTOM)
+	};
+	if (crop.left === 0 && crop.top === 0 && crop.right === 0 && crop.bottom === 0) return void 0;
+	return 1 - crop.left - crop.right > 0 && 1 - crop.top - crop.bottom > 0 ? crop : void 0;
+}
 function optProperty(d, count, wantId) {
 	for (let i = 0; i < count && i * 6 + 6 <= d.length; i++) {
 		const id = u16(d, i * 6);
@@ -879,11 +1107,15 @@ function parseFillGradient(d, count, fromHex, scheme) {
 	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);
+	const angleDeg = raw === void 0 ? 90 : 90 - (raw | 0) / 65536;
+	const focus = optProperty(d, count, PROP_FILL_FOCUS);
+	const focusPct = focus === void 0 ? 0 : (focus | 0) << 16 >> 16;
 	return {
 		fromHex,
 		toHex,
-		angleDeg: raw === void 0 ? 90 : 90 - (raw | 0) / 65536,
-		radial: type === 5 || type === 6
+		angleDeg,
+		radial: type === 5 || type === 6,
+		...focusPct !== 0 ? { focusPct } : {}
 	};
 }
 function optColor(d, count, wantId, scheme) {
@@ -941,37 +1173,47 @@ function paragraphText(p) {
 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 paraProps = style ? expandParaProps(style.paraRuns, text.length) : void 0;
 	const paras = [];
 	let runs = [];
 	let cur = "";
 	let curProps;
-	let paraIndex = 0;
+	let paraStart = 0;
 	const pushRun = () => {
 		if (cur.length > 0) runs.push(toRun(cur, curProps));
 		cur = "";
 	};
-	const endParagraph = () => {
+	const endParagraph = (end) => {
 		pushRun();
-		const meta = paraRuns[paraIndex];
+		const meta = paraProps?.[paraStart];
 		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;
+		const leftMarginPt = meta?.leftMarginPt ?? lvl?.leftMarginPt;
+		const indentPt = meta?.indentPt ?? lvl?.indentPt;
+		const lineSpacing = meta?.lineSpacing ?? lvl?.lineSpacing;
+		const spaceBeforePt = meta?.spaceBeforePt ?? lvl?.spaceBeforePt;
+		const spaceAfterPt = meta?.spaceAfterPt ?? lvl?.spaceAfterPt;
 		paras.push({
 			runs: lvl ? runs.map((r) => inherit(r, lvl)) : runs,
 			...align !== void 0 ? { align } : {},
 			...meta?.level !== void 0 ? { level: meta.level } : {},
-			...bullet !== void 0 ? { bullet } : {}
+			...bullet !== void 0 ? { bullet } : {},
+			...leftMarginPt !== void 0 ? { leftMarginPt } : {},
+			...indentPt !== void 0 ? { indentPt } : {},
+			...lineSpacing !== void 0 ? { lineSpacing } : {},
+			...spaceBeforePt !== void 0 ? { spaceBeforePt } : {},
+			...spaceAfterPt !== void 0 ? { spaceAfterPt } : {}
 		});
 		runs = [];
-		paraIndex++;
+		paraStart = end + 1;
 	};
 	for (let i = 0; i < text.length; i++) {
 		const c = text.charCodeAt(i);
 		if (c === 13) {
-			endParagraph();
+			endParagraph(i);
 			continue;
 		}
 		const props = charProps?.[i];
@@ -980,7 +1222,7 @@ function buildStyledParagraphs(text, styleData, defaults, env) {
 		if (c === 11 || c === 10 || c === 9) cur += " ";
 		else if (c !== 65279 && c >= 32) cur += text[i];
 	}
-	endParagraph();
+	endParagraph(text.length);
 	if (paras.length > 1 && paragraphText(paras[paras.length - 1]).length === 0) paras.pop();
 	return paras;
 }
@@ -1018,6 +1260,13 @@ function expandCharProps(charRuns, textLen) {
 	while (out.length < textLen) out.push(charRuns[charRuns.length - 1] ?? { count: 0 });
 	return out;
 }
+/** The same, for the paragraph runs: the run that covers each character. */
+function expandParaProps(paraRuns, textLen) {
+	const out = [];
+	for (const run of paraRuns) for (let i = 0; i < run.count && out.length < textLen; i++) out.push(run);
+	while (out.length < textLen) out.push(paraRuns[paraRuns.length - 1]);
+	return out;
+}
 function parseStyleTextProp(data, textLen, env) {
 	const target = textLen + 1;
 	let off = 0;
@@ -1033,7 +1282,12 @@ function parseStyleTextProp(data, textLen, env) {
 			level,
 			...pf.align !== void 0 ? { align: pf.align } : {},
 			...pf.bullet !== void 0 ? { bullet: pf.bullet } : {},
-			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {}
+			...pf.bulletOn !== void 0 ? { bulletOn: pf.bulletOn } : {},
+			...pf.leftMarginPt !== void 0 ? { leftMarginPt: pf.leftMarginPt } : {},
+			...pf.indentPt !== void 0 ? { indentPt: pf.indentPt } : {},
+			...pf.lineSpacing !== void 0 ? { lineSpacing: pf.lineSpacing } : {},
+			...pf.spaceBeforePt !== void 0 ? { spaceBeforePt: pf.spaceBeforePt } : {},
+			...pf.spaceAfterPt !== void 0 ? { spaceAfterPt: pf.spaceAfterPt } : {}
 		});
 		consumed += count;
 		if (count <= 0) break;
@@ -1056,12 +1310,28 @@ function parseStyleTextProp(data, textLen, env) {
 		charRuns
 	} : void 0;
 }
+/**
+* §2.9.32 ParaSpacing → points, or `undefined` when the value is a percentage.
+*
+* Negative states a DISTANCE in master units, 576 to the inch. Positive states
+* a percentage of the line's height, which is not a distance this reader can
+* work out — the line has not been set yet — so it is left for the paragraph to
+* inherit nothing rather than guessed at.
+*/
+function spacingPt(value) {
+	return value < 0 ? -value / 8 : void 0;
+}
 function readPfException(data, start) {
 	const mask = u32(data, start);
 	let off = start + 4;
 	let align;
 	let bulletOn;
 	let bullet;
+	let leftMarginPt;
+	let indentPt;
+	let lineSpacing;
+	let spaceBeforePt;
+	let spaceAfterPt;
 	if ((mask & 15) !== 0) {
 		bulletOn = (u16(data, off) & 1) !== 0;
 		off += 2;
@@ -1077,11 +1347,26 @@ function readPfException(data, start) {
 		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 & 4096) !== 0) {
+		lineSpacing = i16(data, off);
+		off += 2;
+	}
+	if ((mask & 8192) !== 0) {
+		spaceBeforePt = spacingPt(i16(data, off));
+		off += 2;
+	}
+	if ((mask & 16384) !== 0) {
+		spaceAfterPt = spacingPt(i16(data, off));
+		off += 2;
+	}
+	if ((mask & 256) !== 0) {
+		leftMarginPt = u16(data, off) / 8;
+		off += 2;
+	}
+	if ((mask & 1024) !== 0) {
+		indentPt = u16(data, off) / 8;
+		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;
@@ -1091,7 +1376,12 @@ function readPfException(data, start) {
 		off,
 		...align !== void 0 ? { align } : {},
 		...bullet !== void 0 ? { bullet } : {},
-		...bulletOn !== void 0 ? { bulletOn } : {}
+		...bulletOn !== void 0 ? { bulletOn } : {},
+		...leftMarginPt !== void 0 ? { leftMarginPt } : {},
+		...indentPt !== void 0 ? { indentPt } : {},
+		...lineSpacing !== void 0 ? { lineSpacing } : {},
+		...spaceBeforePt !== void 0 ? { spaceBeforePt } : {},
+		...spaceAfterPt !== void 0 ? { spaceAfterPt } : {}
 	};
 }
 function bulletCharacter(code) {