reamkit 1.16.0 → 1.18.0

package/dist/esm/pdf/shading.js

@@ -1,4 +1,4 @@
-import { dict, name, ref } from "./objects.js";
+import { dict, name, ref, stream } from "./objects.js";
 //#region src/pdf/shading.ts
 /**
 * The local-space bounding box of a shape's paths (y-up).
@@ -41,8 +41,7 @@ function shapeBbox(shape) {
 * @returns A reference to the `/Pattern` object, for a `/Pattern cs /Pn scn` fill.
 */
 function buildGradientPattern(doc, gradient, bbox, ctm) {
-	const fnRef = doc.add(buildRamp(gradient.stops));
-	const shading = gradient.kind === "radial" ? radialShading(bbox, fnRef) : axialShading(gradient.angle ?? 0, bbox, fnRef);
+	const shading = gradient.kind === "radial" && gradient.sweep === "rect" ? rectShading(doc, bbox, gradient.stops, gradient.center) : gradient.kind === "radial" ? radialShading(bbox, doc.add(buildRamp(gradient.stops)), gradient.center) : axialShading(gradient.angle ?? 0, bbox, doc.add(buildRamp(gradient.stops)));
 	return doc.add(dict({
 		Type: name("Pattern"),
 		PatternType: 2,
@@ -82,9 +81,9 @@ function axialShading(angleDeg, b, fnRef) {
 		Extend: [true, true]
 	});
 }
-function radialShading(b, fnRef) {
-	const cx = (b.minX + b.maxX) / 2;
-	const cy = (b.minY + b.maxY) / 2;
+function radialShading(b, fnRef, center) {
+	const cx = center ? b.minX + center.x * (b.maxX - b.minX) : (b.minX + b.maxX) / 2;
+	const cy = center ? b.maxY - center.y * (b.maxY - b.minY) : (b.minY + b.maxY) / 2;
 	const r = Math.hypot(b.maxX - b.minX, b.maxY - b.minY) / 2;
 	return dict({
 		ShadingType: 3,
@@ -101,6 +100,77 @@ function radialShading(b, fnRef) {
 		Extend: [true, true]
 	});
 }
+function rectShading(doc, b, stopsIn, center) {
+	const cx = center ? b.minX + center.x * (b.maxX - b.minX) : (b.minX + b.maxX) / 2;
+	const cy = center ? b.maxY - center.y * (b.maxY - b.minY) : (b.minY + b.maxY) / 2;
+	const halfW = Math.max((b.maxX - b.minX) / 2, 1e-6);
+	const halfH = Math.max((b.maxY - b.minY) / 2, 1e-6);
+	const domain = [
+		b.minX,
+		b.maxX,
+		b.minY,
+		b.maxY
+	];
+	const fn = doc.add(stream({
+		FunctionType: 4,
+		Domain: domain,
+		Range: [
+			0,
+			1,
+			0,
+			1,
+			0,
+			1
+		]
+	}, new TextEncoder().encode(rectSweepProgram(cx, cy, 1 / halfW, 1 / halfH, stopsIn))));
+	return dict({
+		ShadingType: 1,
+		ColorSpace: name("DeviceRGB"),
+		Domain: domain,
+		Function: ref(fn.id)
+	});
+}
+function rectSweepProgram(cx, cy, sx, sy, stopsIn) {
+	const stops = normalizeStops(stopsIn);
+	return [
+		"{",
+		`${ps(cy)} sub abs ${ps(sy)} mul`,
+		`exch ${ps(cx)} sub abs ${ps(sx)} mul`,
+		"2 copy lt { exch } if pop",
+		"dup 1 gt { pop 1 } if",
+		rampProgram(stops, 0),
+		"}"
+	].join("\n");
+}
+function rampProgram(stops, i) {
+	const last = i >= stops.length - 2;
+	const a = stops[i];
+	const b = stops[i + 1];
+	const seg = segmentProgram(a, b);
+	if (last) return seg;
+	return `dup ${ps(b.offset)} le { ${seg} } { ${rampProgram(stops, i + 1)} } ifelse`;
+}
+function segmentProgram(a, b) {
+	const c0 = rgb01(a.colorHex);
+	const c1 = rgb01(b.colorHex);
+	const span = b.offset - a.offset;
+	if (span <= 1e-9) return `pop ${c1.map(ps).join(" ")}`;
+	return [
+		`${ps(a.offset)} sub ${ps(1 / span)} mul`,
+		"dup 0 lt { pop 0 } if dup 1 gt { pop 1 } if",
+		"dup dup",
+		`${ps(c1[0] - c0[0])} mul ${ps(c0[0])} add`,
+		"3 1 roll",
+		`${ps(c1[1] - c0[1])} mul ${ps(c0[1])} add`,
+		"exch",
+		`${ps(c1[2] - c0[2])} mul ${ps(c0[2])} add`
+	].join(" ");
+}
+function ps(n) {
+	if (!Number.isFinite(n)) return "0";
+	const s = n.toFixed(6).replace(/0+$/u, "").replace(/\.$/u, "");
+	return s === "" || s === "-0" ? "0" : s;
+}
 function buildRamp(stopsIn) {
 	const stops = normalizeStops(stopsIn);
 	if (stops.length <= 2) return dict({

package/dist/esm/pdf/styled-page-emitter.js

@@ -3,9 +3,9 @@ import { embedTtfFont } from "./cid-font.js";
 import { preparePdfEncryption } from "./encryption.js";
 import { reorderVisual } from "../core/bidi/algorithm.js";
 import { reverseByCodePoint } from "../core/bidi/index.js";
-import "../layout/styled-layout.js";
+import { GLUE_SHRINK_RATIO } from "../layout/styled-layout.js";
 import { paintPlan } from "../layout/page-doc.js";
-import { emitVectorShape } from "./vector-graphics.js";
+import { emitClipPath, emitVectorShape, shadowBlurLayers } from "./vector-graphics.js";
 import { buildGradientPattern, shapeBbox } from "./shading.js";
 import { sanitizeHref } from "../core/links.js";
 import { embedAssociatedFile } from "./embedded-file.js";
@@ -15,6 +15,33 @@ import { addSignaturePlaceholder } from "./signature.js";
 import { buildXmpPacket } from "./xmp.js";
 //#region src/pdf/styled-page-emitter.ts
 var encoder = new TextEncoder();
+function washVeil(wash) {
+	if (!wash) return void 0;
+	const alpha = 1 - wash.gain;
+	if (!(alpha > .004)) return void 0;
+	const offset = .5 * (1 - wash.gain) + wash.black;
+	return {
+		alpha: Math.min(1, alpha),
+		grey: Math.max(0, Math.min(1, offset / alpha))
+	};
+}
+/**
+* The veil operators for a washed picture, to follow its own `/Im Do`: the
+* placement matrix maps the unit square onto the picture as drawn, so the wash
+* covers exactly it — cropped, rotated and flipped along with it.
+*/
+function washItems(wash, alphaStateNames) {
+	const veil = washVeil(wash);
+	if (!veil) return [];
+	const g = formatNumber(veil.grey);
+	const state = veil.alpha < 1 ? alphaStateNames?.get(Math.round(veil.alpha * 1e3) / 1e3) : void 0;
+	return [
+		...state === void 0 ? [] : [`/${state} gs`],
+		`${g} ${g} ${g} rg`,
+		"0 0 1 1 re",
+		"f"
+	];
+}
 /**
 * The emit phase: turn a laid-out document into PDF objects (ISO 32000) and
 * serialize it. The counterpart of `layoutStyledDocument` (the seam of
@@ -97,17 +124,29 @@ function assembleStyledPdf(laid, options, doc) {
 	}
 	const alphaStateNames = /* @__PURE__ */ new Map();
 	const extGStateEntries = {};
-	for (const page of renderedPages) for (const item of paintPlan(page.commands).shapes) {
-		const alpha = item.shape.shadow?.alpha;
-		if (alpha === void 0 || alpha >= 1) continue;
+	const wantAlpha = (alpha) => {
+		if (alpha === void 0 || alpha >= 1) return;
 		const key = Math.round(alpha * 1e3) / 1e3;
-		if (alphaStateNames.has(key)) continue;
+		if (alphaStateNames.has(key)) return;
 		const nm = `GSa${alphaStateNames.size}`;
 		alphaStateNames.set(key, nm);
 		extGStateEntries[nm] = dict({
 			ca: key,
 			CA: key
 		});
+	};
+	for (const page of renderedPages) {
+		const plan = paintPlan(page.commands);
+		for (const item of plan.shapes) {
+			const s = item.shape.shadow;
+			if (s) wantAlpha(shadowBlurLayers(s).alpha);
+			wantAlpha(item.shape.fillAlpha);
+		}
+		for (const img of plan.images) wantAlpha(washVeil(img.wash)?.alpha);
+		for (const line of plan.lines) for (const tok of line.line.tokens) {
+			if (tok.kind === "image" && tok.shadow) wantAlpha(shadowBlurLayers(tok.shadow).alpha);
+			if (tok.kind === "image") wantAlpha(washVeil(tok.wash)?.alpha);
+		}
 	}
 	const resourcesDict = dict({
 		Font: fontResourceDict,
@@ -378,12 +417,16 @@ function defaultPageCtx() {
 			even: { commands: [] }
 		},
 		titlePg: false,
-		evenAndOddHeaders: false
+		evenAndOddHeaders: false,
+		continuous: false
 	};
 }
 function embedImageResources(doc, laid) {
 	const out = /* @__PURE__ */ new Map();
-	for (const [resourceId, res] of laid.imageResources) out.set(resourceId, addImage(doc, res.prepared).ref);
+	for (const [resourceId, res] of laid.imageResources) {
+		if (!res.prepared) continue;
+		out.set(resourceId, addImage(doc, res.prepared).ref);
+	}
 	return out;
 }
 function embedFontResources(doc, laid, pdfaProfile) {
@@ -445,21 +488,37 @@ function emitTaggedRuns(out, cmds, tagging, body) {
 	close();
 }
 /**
-* The PDF dash array for a §18.18.3 border style, in points.
+* The dash array for a §18.18.3 / §17.18.2 border style, in points.
 *
-* Excel's dashes are proportional to the rule's weight; LibreOffice draws a
-* `thin` dashed edge as 3pt on / 1pt off, which is 4× / 1.33× its 0.75pt width.
-* An empty string means a solid rule.
+* A pattern is a pattern, not a weight: Word and Excel both draw the same
+* dashes on a hairline and on a 3pt rule, and both references agree on the
+* lengths — a `dashed` page border strokes `8 2.5` whether its `w:sz` is 4 or
+* 24. Scaling them by the width instead drew page-borders-export-case-2.docx's
+* half-point frame as a row of specks a quarter the length it should be.
 */
-function dashPatternFor(style, widthPt) {
-	const u = Math.max(.25, widthPt);
-	switch (style) {
-		case "dashed": return `[${formatNumber(u * 4)} ${formatNumber(u * 1.33)}]`;
-		case "dashDot": return `[${formatNumber(u * 4)} ${formatNumber(u * 1.33)} ${formatNumber(u)} ${formatNumber(u * 1.33)}]`;
-		case "dashDotDot": return `[${formatNumber(u * 4)} ${formatNumber(u * 1.33)} ${formatNumber(u)} ${formatNumber(u * 1.33)} ${formatNumber(u)} ${formatNumber(u * 1.33)}]`;
-		case "dotted": return `[${formatNumber(u)} ${formatNumber(u * 1.33)}]`;
-		default: return "";
-	}
+var BORDER_DASHES = new Map([
+	["dashed", [8, 2.5]],
+	["dashSmallGap", [3, 1]],
+	["dotted", [.5, 1]],
+	["dashDot", [
+		8,
+		2.5,
+		2.5,
+		2.5
+	]],
+	["dashDotDot", [
+		8,
+		2.5,
+		2.5,
+		2.5,
+		2.5,
+		2.5
+	]]
+]);
+/** The PDF dash array for a border style; an empty string means a solid rule. */
+function dashPatternFor(style) {
+	const pattern = style !== void 0 ? BORDER_DASHES.get(style) : void 0;
+	return pattern ? `[${pattern.map(formatNumber).join(" ")}]` : "";
 }
 function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 	const commands = page.commands;
@@ -491,8 +550,20 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 	}
 	emitTaggedRuns(out, plan.images.filter((c) => c.imageResourceName !== ""), tagging, (img) => {
 		out.push("q");
-		out.push(`${formatNumber(img.width)} 0 0 ${formatNumber(img.height)} ${formatNumber(img.x)} ${formatNumber(H - img.y - img.height)} cm`);
+		if (img.clip) {
+			const t = img.clip.transform;
+			out.push(...emitClipPath(img.clip.paths, [
+				t[0],
+				-t[1],
+				t[2],
+				-t[3],
+				t[4],
+				H - t[5]
+			]));
+		}
+		out.push(...placeImage(img.x, H - img.y - img.height, img.width, img.height, img.crop, img.rotationDeg, img.flipH, img.flipV));
 		out.push(`/${img.imageResourceName} Do`);
+		out.push(...washItems(img.wash, alphaStateNames));
 		out.push("Q");
 	});
 	const borders = plan.borders;
@@ -506,7 +577,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 		for (const b of borders) {
 			const width = b.borderSizePt;
 			const color = b.borderColorHex;
-			const dash = dashPatternFor(b.borderStyle, width);
+			const dash = dashPatternFor(b.borderStyle);
 			if (dash !== lastDash) {
 				out.push(dash === "" ? "[] 0 d 2 J" : `${dash} 0 d 0 J`);
 				lastDash = dash;
@@ -578,14 +649,17 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 				H - t[5]
 			]
 		};
-		const alpha = sh.shape.shadow?.alpha;
-		const alphaState = alpha !== void 0 && alpha < 1 ? alphaStateNames?.get(Math.round(alpha * 1e3) / 1e3) : void 0;
-		for (const op of emitVectorShape(shape, gradientNames?.get(sh.shape), alphaState)) out.push(op);
+		const shadowLayer = sh.shape.shadow ? shadowBlurLayers(sh.shape.shadow) : void 0;
+		const alphaState = shadowLayer && shadowLayer.alpha < 1 ? alphaStateNames?.get(Math.round(shadowLayer.alpha * 1e3) / 1e3) : void 0;
+		const fillAlpha = sh.shape.fillAlpha;
+		const fillAlphaState = fillAlpha !== void 0 && fillAlpha < 1 ? alphaStateNames?.get(Math.round(fillAlpha * 1e3) / 1e3) : void 0;
+		for (const op of emitVectorShape(shape, gradientNames?.get(sh.shape), alphaState, fillAlphaState)) out.push(op);
 	});
 	const lines = plan.lines;
 	if (lines.length > 0) {
 		let inBT = false;
 		let lastFont = "";
+		let lastTc = 0;
 		let lastSize = -1;
 		let lastColor = "";
 		const switchFontIfNeeded = (tok) => {
@@ -595,6 +669,11 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 				lastFont = fontKey;
 				lastSize = tok.fontSizePt;
 			}
+			const tc = tok.resolvedRun.letterSpacingPt ?? 0;
+			if (tc !== lastTc) {
+				out.push(`${formatNumber(tc)} Tc`);
+				lastTc = tc;
+			}
 			if (tok.resolvedRun.colorHex !== lastColor) {
 				const [r, g, b] = hexToRgb01(tok.resolvedRun.colorHex);
 				out.push(`${formatNumber(r)} ${formatNumber(g)} ${formatNumber(b)} rg`);
@@ -602,18 +681,87 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 			}
 		};
 		const emitImageToken = (tok, x, baselineY) => {
+			const meta = tok.metafile;
+			if (meta) {
+				if (inBT) {
+					out.push("ET");
+					inBT = false;
+				}
+				const b = tok.drawBox;
+				const ox = x + (b?.dxPt ?? 0);
+				const oy = baselineY + (b?.dyPt ?? 0);
+				for (const sh of meta.shapes) for (const op of emitVectorShape({
+					...sh,
+					transform: [
+						1,
+						0,
+						0,
+						1,
+						ox,
+						oy
+					]
+				})) out.push(op);
+				for (const t of meta.texts) {
+					const first = t.line.tokens.find((k) => k.kind === "text");
+					if (!first) continue;
+					const [r, g, bl] = hexToRgb01(first.resolvedRun.colorHex);
+					out.push("BT");
+					out.push(`/${first.font.resourceName} ${formatNumber(first.fontSizePt)} Tf`);
+					out.push(`${formatNumber(r)} ${formatNumber(g)} ${formatNumber(bl)} rg`);
+					out.push(`1 0 0 1 ${formatNumber(ox + t.x)} ${formatNumber(oy + t.y)} Tm`);
+					out.push(first.font.measure.showText(first.text));
+					out.push("ET");
+				}
+				lastFont = "";
+				lastSize = -1;
+				lastColor = "";
+				return;
+			}
 			if (!tok.imageResourceName) return;
 			if (inBT) {
 				out.push("ET");
 				inBT = false;
 			}
+			const shdw = tok.shadow;
+			if (shdw) {
+				const bx = tok.drawBox;
+				const [shr, shg, shb] = hexToRgb01(shdw.colorHex);
+				const layers = shadowBlurLayers(shdw);
+				const state = layers.alpha < 1 ? alphaStateNames?.get(Math.round(layers.alpha * 1e3) / 1e3) : void 0;
+				const sx = x + (bx?.dxPt ?? 0) + shdw.dxPt;
+				const sy = baselineY + (bx?.dyPt ?? 0) - shdw.dyPt;
+				const sw = bx?.widthPt ?? tok.widthPt;
+				const sh = bx?.heightPt ?? tok.heightPt;
+				out.push("q");
+				if (state) out.push(`/${state} gs`);
+				out.push(`${formatNumber(shr)} ${formatNumber(shg)} ${formatNumber(shb)} rg`);
+				for (let i = 0; i < layers.count; i++) {
+					const grow = layers.count > 1 ? -shdw.blurPt / 2 + (i + .5) * shdw.blurPt / layers.count : 0;
+					out.push(`${formatNumber(sx - grow)} ${formatNumber(sy - grow)} ${formatNumber(Math.max(sw + 2 * grow, 0))} ${formatNumber(Math.max(sh + 2 * grow, 0))} re`);
+					out.push("f");
+				}
+				out.push("Q");
+			}
 			out.push("q");
-			out.push(`${formatNumber(tok.widthPt)} 0 0 ${formatNumber(tok.heightPt)} ${formatNumber(x)} ${formatNumber(baselineY)} cm`);
+			const b = tok.drawBox;
+			out.push(...b ? placeImage(x + b.dxPt, baselineY + b.dyPt, b.widthPt, b.heightPt, tok.crop, tok.rotationDeg, tok.flipH, tok.flipV) : placeImage(x, baselineY, tok.widthPt, tok.heightPt, tok.crop, tok.rotationDeg, tok.flipH, tok.flipV));
 			out.push(`/${tok.imageResourceName} Do`);
+			out.push(...washItems(tok.wash, alphaStateNames));
 			out.push("Q");
+			const frame = tok.outline;
+			if (frame) {
+				const [fr, fg, fb] = hexToRgb01(frame.colorHex);
+				out.push("q");
+				out.push(`${formatNumber(frame.widthPt)} w`);
+				out.push(`${formatNumber(fr)} ${formatNumber(fg)} ${formatNumber(fb)} RG`);
+				out.push(`${formatNumber(x + (b?.dxPt ?? 0))} ${formatNumber(baselineY + (b?.dyPt ?? 0))} ${formatNumber(b?.widthPt ?? tok.widthPt)} ${formatNumber(b?.heightPt ?? tok.heightPt)} re`);
+				out.push("S");
+				out.push("Q");
+			}
 			lastFont = "";
 			lastSize = -1;
 			lastColor = "";
+			lastTc = 0;
 		};
 		const emitMathToken = (tok, originX, baselineY) => {
 			for (const it of tok.items) if (it.kind === "glyph") {
@@ -631,7 +779,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 					lastColor = "000000";
 				}
 				out.push(`1 0 0 1 ${formatNumber(originX + it.x)} ${formatNumber(baselineY + it.y)} Tm`);
-				out.push(`<${it.font.measure.encodeTextAsCidHex(it.text)}> Tj`);
+				out.push(it.font.measure.showText(it.text));
 			} else if (it.kind === "rule") {
 				if (inBT) {
 					out.push("ET");
@@ -687,6 +835,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 			lastFont = "";
 			lastSize = -1;
 			lastColor = "";
+			lastTc = 0;
 			out.push("BT");
 			inBT = true;
 			body(cmd);
@@ -698,6 +847,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 			lastFont = "";
 			lastSize = -1;
 			lastColor = "";
+			lastTc = 0;
 		};
 		const emitOneLine = (cmd) => {
 			const line = cmd.line;
@@ -749,12 +899,40 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 			const hasImageToken = line.tokens.some((t) => t.kind === "image");
 			const hasMathToken = line.tokens.some((t) => t.kind === "math");
 			const hasRtl = line.tokens.some((t) => t.bidiLevel % 2 === 1);
+			const hasTab = line.tokens.some((t) => t.kind === "text" && t.tab === true);
 			/** A text token carrying underline or strikethrough. */
 			const isDecorated = (tok) => tok.kind === "text" && (tok.resolvedRun.underline !== "none" || tok.resolvedRun.strike);
-			const encodeToken = (tok) => {
+			const showToken = (tok) => {
 				const text = tok.bidiLevel % 2 === 1 ? reverseByCodePoint(tok.text) : tok.text;
-				return tok.font.measure.encodeTextAsCidHex(text);
+				return tok.font.measure.showText(text);
 			};
+			if (line.tokens.some((t) => t.kind === "text" && t.resolvedRun.shadingColorHex)) {
+				if (inBT) {
+					out.push("ET");
+					inBT = false;
+				}
+				const shAscent = Math.max(lineFs, line.mathAscentPt ?? 0);
+				const shDescent = Math.max(lineFs * .2, line.mathDescentPt ?? 0);
+				out.push("q");
+				let sx = originX;
+				let painted = "";
+				for (const tok of line.tokens) {
+					const w = tok.widthPt + (tok.kind === "text" && tok.isSpace ? extraPerSpace : 0);
+					const hex = tok.kind === "text" ? tok.resolvedRun.shadingColorHex : void 0;
+					if (hex !== void 0) {
+						if (hex !== painted) {
+							if (painted !== "") out.push("f");
+							const [sr, sg, sb] = hexToRgb01(hex);
+							out.push(`${formatNumber(sr)} ${formatNumber(sg)} ${formatNumber(sb)} rg`);
+							painted = hex;
+						}
+						out.push(`${formatNumber(sx)} ${formatNumber(baselineY - shDescent)} ${formatNumber(w)} ${formatNumber(shAscent + shDescent)} re`);
+					}
+					sx += w;
+				}
+				if (painted !== "") out.push("f");
+				out.push("Q");
+			}
 			if (line.tokens.some((t) => t.kind === "text" && t.highlight === true)) {
 				if (inBT) {
 					out.push("ET");
@@ -784,12 +962,30 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 				for (const tok of line.tokens) {
 					const w = tok.widthPt + (tok.kind === "text" && tok.isSpace ? extraPerSpace : 0);
 					if (isDecorated(tok)) {
-						const [r, g, b] = hexToRgb01(tok.resolvedRun.colorHex);
 						const thickness = Math.max(.4, tok.fontSizePt * .06);
-						out.push(`${formatNumber(r)} ${formatNumber(g)} ${formatNumber(b)} rg`);
+						const paint = (hex) => {
+							const [r, g, b] = hexToRgb01(hex);
+							out.push(`${formatNumber(r)} ${formatNumber(g)} ${formatNumber(b)} rg`);
+						};
+						paint(tok.resolvedRun.colorHex);
 						if (tok.resolvedRun.underline !== "none") {
-							const y = baselineY - tok.fontSizePt * .12 - thickness;
-							out.push(`${formatNumber(dx)} ${formatNumber(y)} ${formatNumber(w)} ${formatNumber(thickness)} re f`);
+							if (tok.resolvedRun.underlineColorHex) paint(tok.resolvedRun.underlineColorHex);
+							const style = tok.resolvedRun.underline;
+							const t = style === "thick" || style === "dottedHeavy" || style === "dashHeavy" ? thickness * 2 : thickness;
+							const y = baselineY - tok.fontSizePt * .12 - t;
+							const dashed = style === "dotted" || style === "dottedHeavy" ? [t, t * 2] : style === "dash" || style === "dashHeavy" ? [t * 4, t * 3] : void 0;
+							if (dashed) {
+								out.push(`${formatNumber(t)} w`);
+								out.push(`[${dashed.map((n) => formatNumber(n)).join(" ")}] 0 d`);
+								const [r, g, b] = hexToRgb01(tok.resolvedRun.underlineColorHex ?? tok.resolvedRun.colorHex);
+								out.push(`${formatNumber(r)} ${formatNumber(g)} ${formatNumber(b)} RG`);
+								out.push(`${formatNumber(dx)} ${formatNumber(y + t / 2)} m ${formatNumber(dx + w)} ${formatNumber(y + t / 2)} l S`);
+								out.push("[] 0 d");
+							} else {
+								out.push(`${formatNumber(dx)} ${formatNumber(y)} ${formatNumber(w)} ${formatNumber(t)} re f`);
+								if (style === "double") out.push(`${formatNumber(dx)} ${formatNumber(y - t * 2)} ${formatNumber(w)} ${formatNumber(t)} re f`);
+							}
+							if (tok.resolvedRun.underlineColorHex) paint(tok.resolvedRun.colorHex);
 						}
 						if (tok.resolvedRun.strike) {
 							const y = baselineY + tok.fontSizePt * .26;
@@ -813,9 +1009,9 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 				for (const tok of line.tokens) {
 					if (tok.kind !== "text") continue;
 					switchFontIfNeeded(tok);
-					out.push(`<${tok.font.measure.encodeTextAsCidHex(tok.text)}> Tj`);
+					out.push(tok.font.measure.showText(tok.text));
 				}
-			} else if (extraPerSpace > 0 || hasImageToken || hasMathToken || hasRtl || hasRise) {
+			} else if (extraPerSpace !== 0 || hasImageToken || hasMathToken || hasRtl || hasRise || hasTab) {
 				const order = hasRtl ? lineVisualOrder(line) : line.tokens.map((_, i) => i);
 				let x = originX;
 				for (const ti of order) {
@@ -838,7 +1034,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 					}
 					switchFontIfNeeded(tok);
 					out.push(`1 0 0 1 ${formatNumber(x)} ${formatNumber(baselineY + (tok.risePt ?? 0))} Tm`);
-					out.push(`<${encodeToken(tok)}> Tj`);
+					out.push(showToken(tok));
 					const tokenX0 = x;
 					x += tok.widthPt;
 					if (tok.isSpace) x += extraPerSpace;
@@ -855,8 +1051,7 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 				for (const tok of line.tokens) {
 					if (tok.kind !== "text") continue;
 					switchFontIfNeeded(tok);
-					const hex = tok.font.measure.encodeTextAsCidHex(tok.text);
-					out.push(`<${hex}> Tj`);
+					out.push(tok.font.measure.showText(tok.text));
 					trackLink(tok.href, tok.anchor, tok.text, x, x + tok.widthPt);
 					x += tok.widthPt;
 				}
@@ -898,15 +1093,69 @@ function emitPageContent(page, tagging, gradientNames, alphaStateNames) {
 function lineVisualOrder(line) {
 	return reorderVisual(line.tokens.map((t) => t.bidiLevel));
 }
+/**
+* The operators that put an image XObject in a box — ISO 32000-1 §8.9.5.1: the
+* unit square scaled to the box and moved to `(x, y)`, its bottom-left corner.
+*
+* A `a:srcRect` crop (§20.1.8.55) cuts edges off the SOURCE and fits what is
+* left to the same box, so the picture is drawn larger than the box and the box
+* is made a clipping path. Ignored, ImageCrop.docx drew the whole mountain
+* where LibreOffice shows the peak.
+*
+* @returns The content-stream lines, to be pushed between `q` and the `Do`.
+*/
+function placeImage(x, y, width, height, crop, rotationDeg, flipH, flipV) {
+	const cm = (w, h, ox, oy) => `${formatNumber(w)} 0 0 ${formatNumber(h)} ${formatNumber(ox)} ${formatNumber(oy)} cm`;
+	const spin = rotationDeg ? [rotateAboutCm(x + width / 2, y + height / 2, -rotationDeg)] : [];
+	if (flipH === true || flipV === true) {
+		const sx = flipH === true ? -1 : 1;
+		const sy = flipV === true ? -1 : 1;
+		spin.push(`${formatNumber(sx)} 0 0 ${formatNumber(sy)} ${formatNumber(sx === -1 ? 2 * x + width : 0)} ${formatNumber(sy === -1 ? 2 * y + height : 0)} cm`);
+	}
+	if (!crop) return [...spin, cm(width, height, x, y)];
+	const kept = {
+		w: 1 - crop.left - crop.right,
+		h: 1 - crop.top - crop.bottom
+	};
+	const full = {
+		w: width / kept.w,
+		h: height / kept.h
+	};
+	return [
+		...spin,
+		`${formatNumber(x)} ${formatNumber(y)} ${formatNumber(width)} ${formatNumber(height)} re`,
+		"W",
+		"n",
+		cm(full.w, full.h, x - crop.left * full.w, y - crop.bottom * full.h)
+	];
+}
+/** A `cm` that turns the frame `deg` counter-clockwise about `(cx, cy)`. */
+function rotateAboutCm(cx, cy, deg) {
+	const rad = deg * Math.PI / 180;
+	const c = Math.cos(rad);
+	const s = Math.sin(rad);
+	return `${formatNumber(c)} ${formatNumber(s)} ${formatNumber(-s)} ${formatNumber(c)} ${formatNumber(cx - cx * c + cy * s)} ${formatNumber(cy - cx * s - cy * c)} cm`;
+}
 function computeJustifyExtra(line) {
-	if (line.resolved.alignment !== "both") return 0;
-	if (line.isLastInParagraph) return 0;
+	const alignment = line.resolved.alignment;
+	if (alignment !== "both" && alignment !== "distribute") return 0;
+	if (line.noJustify === true) return 0;
+	if (line.isLastInParagraph && alignment !== "distribute") return 0;
+	let last = line.tokens.length - 1;
+	while (last >= 0 && line.tokens[last].kind === "text" && line.tokens[last].isSpace) last--;
 	let spaces = 0;
-	for (const tok of line.tokens) if (tok.isSpace) spaces++;
+	let narrowest = Infinity;
+	let contentWidthPt = 0;
+	for (let i = 0; i <= last; i++) {
+		const tok = line.tokens[i];
+		contentWidthPt += tok.widthPt;
+		if (!tok.isSpace) continue;
+		spaces++;
+		if (tok.widthPt < narrowest) narrowest = tok.widthPt;
+	}
 	if (spaces === 0) return 0;
-	const extra = line.availableWidthPt - line.contentWidthPt;
-	if (extra <= 0) return 0;
-	return extra / spaces;
+	const extra = (line.availableWidthPt - contentWidthPt) / spaces;
+	return extra < 0 ? Math.max(extra, -narrowest * GLUE_SHRINK_RATIO) : extra;
 }
 function hexToRgb01(hex) {
 	return [

package/dist/esm/pdf/vector-graphics.d.ts

@@ -1,4 +1,4 @@
-import { VectorShape } from '../core/vector.js';
+import { VectorPath, VectorShape } from '../core/vector.js';
 export type { PathSegment, StrokeStyle, VectorPath, VectorShape } from '../core/vector.js';
 export { PathBuilder } from '../core/vector.js';
 /**
@@ -15,4 +15,31 @@ export { PathBuilder } from '../core/vector.js';
  *   named `/ExtGState` (its constant alpha) from the page's resources.
  * @returns The content-stream operator lines.
  */
-export declare function emitVectorShape(shape: VectorShape, patternName?: string, alphaStateName?: string): Array<string>;
+/**
+ * §20.1.8.40 `blurRad` — how a blurred shadow is drawn: as `count` copies of
+ * the silhouette, each at `alpha` transparency, growing through the blur's
+ * width. Shared with the emitter that registers the /ExtGState for it, so the
+ * alpha it registers is the one the layers are drawn at.
+ *
+ * @param shadow The shadow (its `blurPt` and `alpha` are read).
+ * @returns The number of layers and the transparency of each.
+ */
+export declare function shadowBlurLayers(shadow: {
+    readonly blurPt: number;
+    readonly alpha: number;
+}): {
+    count: number;
+    alpha: number;
+};
+export declare function emitVectorShape(shape: VectorShape, patternName?: string, alphaStateName?: string, fillAlphaStateName?: string): Array<string>;
+/**
+ * The operators that make `paths` the current CLIP, under `transform` — the
+ * same local→y-up-page matrix {@link emitVectorShape} takes. Emitted inside the
+ * caller's own `q`…`Q`, and followed by the inverse matrix so what comes after
+ * is back in page coordinates.
+ *
+ * @param paths     The clip outline, in the shape's local frame.
+ * @param transform The local→page matrix.
+ * @returns The operators: `cm`, the path, `W n`, and the inverse `cm`.
+ */
+export declare function emitClipPath(paths: ReadonlyArray<VectorPath>, transform: readonly [number, number, number, number, number, number]): Array<string>;