reamkit 1.15.4 → 1.17.0

package/dist/esm/pdf/cid-font.js

@@ -1,6 +1,6 @@
 import { glyphClosure, subsetTtf } from "../core/font/ttf-subset.js";
 import { createFontMeasure } from "../core/font/measure.js";
-import { dict, name, ref, stream } from "./objects.js";
+import { deflatedStream, dict, name, ref } from "./objects.js";
 //#region src/pdf/cid-font.ts
 var encoder = new TextEncoder();
 /**
@@ -17,9 +17,10 @@ function embedTtfFont(doc, parsed, options = {}) {
 	const scale = 1e3 / parsed.unitsPerEm;
 	const toPdfUnits = (v) => Math.round(v * scale);
 	const usedGidsArr = options.usedGids ? [...options.usedGids] : void 0;
+	const subsetGids = usedGidsArr ? [...glyphClosure(parsed, usedGidsArr)].sort((a, b) => a - b) : void 0;
 	const fontFileBytes = usedGidsArr ? subsetTtf(parsed, usedGidsArr) : parsed.raw;
-	const fontFileRef = doc.add(stream({ Length1: fontFileBytes.byteLength }, fontFileBytes));
-	const cidSetRef = usedGidsArr !== void 0 && options.cidSet ? doc.add(stream({}, buildCidSet(glyphClosure(parsed, usedGidsArr)))) : void 0;
+	const fontFileRef = doc.add(deflatedStream({ Length1: fontFileBytes.byteLength }, fontFileBytes));
+	const cidSetRef = usedGidsArr !== void 0 && options.cidSet ? doc.add(deflatedStream({}, buildCidSet(glyphClosure(parsed, usedGidsArr)))) : void 0;
 	const baseFontName = usedGidsArr ? `${subsetTag(parsed.postScriptName, usedGidsArr)}+${parsed.postScriptName}` : parsed.postScriptName;
 	const descriptorRef = doc.add(dict({
 		Type: name("FontDescriptor"),
@@ -40,8 +41,7 @@ function embedTtfFont(doc, parsed, options = {}) {
 		FontFile2: ref(fontFileRef.id),
 		...cidSetRef ? { CIDSet: ref(cidSetRef.id) } : {}
 	}));
-	const widths = new Array(parsed.numGlyphs);
-	for (let i = 0; i < parsed.numGlyphs; i++) widths[i] = toPdfUnits(parsed.advanceWidths[i] ?? 0);
+	const widthRuns = consecutiveRuns(subsetGids ?? Array.from({ length: parsed.numGlyphs }, (_, i) => i)).map((run) => [run[0], run.map((g) => toPdfUnits(parsed.advanceWidths[g] ?? 0))]);
 	const cidFontRef = doc.add(dict({
 		Type: name("Font"),
 		Subtype: name("CIDFontType2"),
@@ -53,10 +53,10 @@ function embedTtfFont(doc, parsed, options = {}) {
 		}),
 		FontDescriptor: ref(descriptorRef.id),
 		DW: 1e3,
-		W: [0, widths],
+		W: widthRuns.flatMap(([first, ws]) => [first, ws]),
 		CIDToGIDMap: name("Identity")
 	}));
-	const toUnicodeRef = doc.add(stream({}, buildToUnicodeCMap(parsed)));
+	const toUnicodeRef = doc.add(deflatedStream({}, buildToUnicodeCMap(parsed, subsetGids)));
 	const type0Ref = doc.add(dict({
 		Type: name("Font"),
 		Subtype: name("Type0"),
@@ -99,7 +99,18 @@ function subsetTag(postScriptName, gids) {
 	}
 	return tag;
 }
-function buildToUnicodeCMap(parsed) {
+/** Split a sorted id list into runs of consecutive ids. */
+function consecutiveRuns(ids) {
+	const runs = [];
+	for (const id of ids) {
+		const last = runs[runs.length - 1];
+		if (last && id === last[last.length - 1] + 1) last.push(id);
+		else runs.push([id]);
+	}
+	return runs;
+}
+function buildToUnicodeCMap(parsed, subsetGids) {
+	const inSubset = subsetGids ? new Set(subsetGids) : void 0;
 	const gidToCps = /* @__PURE__ */ new Map();
 	const order = [];
 	for (let cp = 9; cp <= 65535; cp++) {
@@ -131,7 +142,7 @@ function buildToUnicodeCMap(parsed) {
 			}
 		}
 	}
-	const pairs = order.map((g) => [g, gidToCps.get(g)]).sort((a, b) => a[0] - b[0]);
+	const pairs = order.filter((g) => inSubset === void 0 || inSubset.has(g)).map((g) => [g, gidToCps.get(g)]).sort((a, b) => a[0] - b[0]);
 	const utf16beHex = (cps) => {
 		let hex = "";
 		for (const cp of cps) if (cp <= 65535) hex += cp.toString(16).padStart(4, "0").toUpperCase();

package/dist/esm/pdf/objects.d.ts

@@ -62,6 +62,19 @@ export declare const ref: (id: number, gen?: number) => PdfRef;
 export declare const dict: (entries: Record<string, PdfValue>) => PdfDict;
 /** Construct a {@link PdfStream} from a dictionary literal plus its byte payload. */
 export declare const stream: (entries: Record<string, PdfValue>, data: Uint8Array) => PdfStream;
+/**
+ * A {@link PdfStream} whose payload is deflated (ISO 32000-1 §7.4.4).
+ *
+ * Nothing we wrote was compressed at all — `grep /Filter` over one of our own
+ * files returned the empty set — so a three-page workbook came out at 192 KB
+ * against LibreOffice's 21 KB, most of it an uncompressed font program. Any
+ * stream that is not already in a compressed image format belongs here.
+ *
+ * @param entries The stream's dictionary, minus `/Filter` and `/Length`.
+ * @param data    The raw payload.
+ * @returns The stream, deflated, with `/Filter /FlateDecode`.
+ */
+export declare const deflatedStream: (entries: Record<string, PdfValue>, data: Uint8Array) => PdfStream;
 /**
  * Build a PDF Unicode string (UTF-16BE with BOM) suitable for `/Info` or
  * document-level text metadata. Accepts arbitrary Unicode input.

package/dist/esm/pdf/objects.js

@@ -1,3 +1,4 @@
+import { zlibSync } from "fflate";
 //#region src/pdf/objects.ts
 /** The PDF `null` object (§7.3.9), modelled as a unique symbol. */
 var PDF_NULL = Symbol("PDF_NULL");
@@ -61,6 +62,22 @@ var dict = (entries) => new Map(Object.entries(entries));
 /** Construct a {@link PdfStream} from a dictionary literal plus its byte payload. */
 var stream = (entries, data) => new PdfStream(dict(entries), data);
 /**
+* A {@link PdfStream} whose payload is deflated (ISO 32000-1 §7.4.4).
+*
+* Nothing we wrote was compressed at all — `grep /Filter` over one of our own
+* files returned the empty set — so a three-page workbook came out at 192 KB
+* against LibreOffice's 21 KB, most of it an uncompressed font program. Any
+* stream that is not already in a compressed image format belongs here.
+*
+* @param entries The stream's dictionary, minus `/Filter` and `/Length`.
+* @param data    The raw payload.
+* @returns The stream, deflated, with `/Filter /FlateDecode`.
+*/
+var deflatedStream = (entries, data) => new PdfStream(dict({
+	...entries,
+	Filter: name("FlateDecode")
+}), zlibSync(data));
+/**
 * Build a PDF Unicode string (UTF-16BE with BOM) suitable for `/Info` or
 * document-level text metadata. Accepts arbitrary Unicode input.
 *
@@ -87,4 +104,4 @@ var unicodeString = (s) => {
 	return new PdfHexString(out);
 };
 //#endregion
-export { PDF_NULL, PdfHexString, PdfName, PdfRawToken, PdfRef, PdfStream, dict, name, ref, stream, unicodeString };
+export { PDF_NULL, PdfHexString, PdfName, PdfRawToken, PdfRef, PdfStream, deflatedStream, dict, name, ref, stream, unicodeString };

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({