pdf-parser.js 5.2.25 → 5.2.27

package/dist/afm-widths.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
+const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
 exports.STANDARD_METRICS = require_afm_widths.STANDARD_METRICS;
 exports.widthOfCode = require_afm_widths.widthOfCode;

package/dist/afm-widths.js

@@ -1,2 +1,2 @@
-import { n as widthOfCode, t as STANDARD_METRICS } from "./afm-widths-De_QMWgC.js";
+import { n as widthOfCode, t as STANDARD_METRICS } from "./afm-widths-blUDDjlI.js";
 export { STANDARD_METRICS, widthOfCode };

package/dist/annotations.d.cts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutAnnotation } from "./layout.cjs";
 //#region src/annotations.d.ts
-declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAnnotation[];
+declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAnnotation[];
 //#endregion
 export { readPageAnnotations };

package/dist/annotations.d.ts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutAnnotation } from "./layout.js";
 //#region src/annotations.d.ts
-declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAnnotation[];
+declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAnnotation[];
 //#endregion
 export { readPageAnnotations };

package/dist/attachments.d.cts

@@ -1,8 +1,8 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutAttachment } from "./layout.cjs";
 //#region src/attachments.d.ts
-declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAttachment[];
+declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAttachment[];
 //#endregion
 export { readAttachments };

package/dist/attachments.d.ts

@@ -1,8 +1,8 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutAttachment } from "./layout.js";
 //#region src/attachments.d.ts
-declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAttachment[];
+declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAttachment[];
 //#endregion
 export { readAttachments };

package/dist/builtin-encoding.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
+const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
 const require_sfnt = require("./sfnt.cjs");
 const require_cff = require("./cff.cjs");
 const require_cmap_table = require("./cmap-table.cjs");

package/dist/builtin-encoding.d.cts

@@ -1,7 +1,7 @@
 //#region src/builtin-encoding.d.ts
 interface BuiltinEncoding {
-  codeToUnicode(code: number): number | undefined;
-  glyphIdToUnicode(glyphId: number): number | undefined;
+  codeToUnicode: (code: number) => number | undefined;
+  glyphIdToUnicode: (glyphId: number) => number | undefined;
 }
 declare function readFontProgramEncoding(program: Uint8Array<ArrayBuffer>): BuiltinEncoding | undefined;
 //#endregion

package/dist/builtin-encoding.d.ts

@@ -1,7 +1,7 @@
 //#region src/builtin-encoding.d.ts
 interface BuiltinEncoding {
-  codeToUnicode(code: number): number | undefined;
-  glyphIdToUnicode(glyphId: number): number | undefined;
+  codeToUnicode: (code: number) => number | undefined;
+  glyphIdToUnicode: (glyphId: number) => number | undefined;
 }
 declare function readFontProgramEncoding(program: Uint8Array<ArrayBuffer>): BuiltinEncoding | undefined;
 //#endregion

package/dist/builtin-encoding.js

@@ -1,4 +1,4 @@
-import { c as glyphNameToUnicode, d as standardGlyphName } from "./afm-widths-De_QMWgC.js";
+import { c as glyphNameToUnicode, d as standardGlyphName } from "./afm-widths-blUDDjlI.js";
 import { hasBytes, parseSfnt, sfntTableBytes, u16, u8 } from "./sfnt.js";
 import { cffStringForSid, parseCffDict, readCffIndex } from "./cff.js";
 import { readCmapSubtables } from "./cmap-table.js";

package/dist/cff-bounds.cjs

@@ -62,13 +62,31 @@ function subrBias(count) {
 	if (count < SUBR_BIAS_MEDIUM_LIMIT) return SUBR_BIAS_MEDIUM;
 	return SUBR_BIAS_LARGE;
 }
-function includePoint(box, x, y) {
-	box.minX = Math.min(box.minX, x);
-	box.minY = Math.min(box.minY, y);
-	box.maxX = Math.max(box.maxX, x);
-	box.maxY = Math.max(box.maxY, y);
-	box.drawn = true;
-}
+var BoundsBox = class {
+	minX = Infinity;
+	minY = Infinity;
+	maxX = -Infinity;
+	maxY = -Infinity;
+	drawn = false;
+	includePoint(x, y) {
+		this.minX = Math.min(this.minX, x);
+		this.minY = Math.min(this.minY, y);
+		this.maxX = Math.max(this.maxX, x);
+		this.maxY = Math.max(this.maxY, y);
+		this.drawn = true;
+	}
+	includeXExtent(value) {
+		this.minX = Math.min(this.minX, value);
+		this.maxX = Math.max(this.maxX, value);
+	}
+	includeYExtent(value) {
+		this.minY = Math.min(this.minY, value);
+		this.maxY = Math.max(this.maxY, value);
+	}
+	markDrawn() {
+		this.drawn = true;
+	}
+};
 function cubicAt(p0, p1, p2, p3, t) {
 	const s = 1 - t;
 	return s * s * s * p0 + 3 * s * s * t * p1 + 3 * s * t * t * p2 + t * t * t * p3;
@@ -93,14 +111,12 @@ function includeCubicAxis(p0, p1, p2, p3, apply) {
 }
 function includeCubic(box, x0, y0, x1, y1, x2, y2, x3, y3) {
 	includeCubicAxis(x0, x1, x2, x3, (value) => {
-		box.minX = Math.min(box.minX, value);
-		box.maxX = Math.max(box.maxX, value);
+		box.includeXExtent(value);
 	});
 	includeCubicAxis(y0, y1, y2, y3, (value) => {
-		box.minY = Math.min(box.minY, value);
-		box.maxY = Math.max(box.maxY, value);
+		box.includeYExtent(value);
 	});
-	box.drawn = true;
+	box.markDrawn();
 }
 function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	const x0 = state.x;
@@ -116,10 +132,10 @@ function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	state.y = y3;
 }
 function lineTo(state, dx, dy) {
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 	state.x += dx;
 	state.y += dy;
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 }
 function moveTo(state, dx, dy) {
 	state.x += dx;
@@ -408,13 +424,7 @@ function computeBounds(glyphId, context) {
 		stems: 0,
 		widthParsed: false,
 		operations: 0,
-		box: {
-			minX: Infinity,
-			minY: Infinity,
-			maxX: -Infinity,
-			maxY: -Infinity,
-			drawn: false
-		}
+		box: new BoundsBox()
 	};
 	if (!execute(code, state, context, 0) || !state.box.drawn) return;
 	return {

package/dist/cff-bounds.d.cts

@@ -2,7 +2,7 @@ import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.cjs";
 //#region src/cff-bounds.d.ts
 interface CffGlyphBounds {
   readonly numGlyphs: number;
-  bounds(glyphId: number): GlyphInkBounds | undefined;
+  bounds: (glyphId: number) => GlyphInkBounds | undefined;
 }
 declare function parseCffGlyphBounds(bytes: Uint8Array<ArrayBuffer>): CffGlyphBounds | undefined;
 //#endregion

package/dist/cff-bounds.d.ts

@@ -2,7 +2,7 @@ import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.js";
 //#region src/cff-bounds.d.ts
 interface CffGlyphBounds {
   readonly numGlyphs: number;
-  bounds(glyphId: number): GlyphInkBounds | undefined;
+  bounds: (glyphId: number) => GlyphInkBounds | undefined;
 }
 declare function parseCffGlyphBounds(bytes: Uint8Array<ArrayBuffer>): CffGlyphBounds | undefined;
 //#endregion

package/dist/cff-bounds.js

@@ -61,13 +61,31 @@ function subrBias(count) {
 	if (count < SUBR_BIAS_MEDIUM_LIMIT) return SUBR_BIAS_MEDIUM;
 	return SUBR_BIAS_LARGE;
 }
-function includePoint(box, x, y) {
-	box.minX = Math.min(box.minX, x);
-	box.minY = Math.min(box.minY, y);
-	box.maxX = Math.max(box.maxX, x);
-	box.maxY = Math.max(box.maxY, y);
-	box.drawn = true;
-}
+var BoundsBox = class {
+	minX = Infinity;
+	minY = Infinity;
+	maxX = -Infinity;
+	maxY = -Infinity;
+	drawn = false;
+	includePoint(x, y) {
+		this.minX = Math.min(this.minX, x);
+		this.minY = Math.min(this.minY, y);
+		this.maxX = Math.max(this.maxX, x);
+		this.maxY = Math.max(this.maxY, y);
+		this.drawn = true;
+	}
+	includeXExtent(value) {
+		this.minX = Math.min(this.minX, value);
+		this.maxX = Math.max(this.maxX, value);
+	}
+	includeYExtent(value) {
+		this.minY = Math.min(this.minY, value);
+		this.maxY = Math.max(this.maxY, value);
+	}
+	markDrawn() {
+		this.drawn = true;
+	}
+};
 function cubicAt(p0, p1, p2, p3, t) {
 	const s = 1 - t;
 	return s * s * s * p0 + 3 * s * s * t * p1 + 3 * s * t * t * p2 + t * t * t * p3;
@@ -92,14 +110,12 @@ function includeCubicAxis(p0, p1, p2, p3, apply) {
 }
 function includeCubic(box, x0, y0, x1, y1, x2, y2, x3, y3) {
 	includeCubicAxis(x0, x1, x2, x3, (value) => {
-		box.minX = Math.min(box.minX, value);
-		box.maxX = Math.max(box.maxX, value);
+		box.includeXExtent(value);
 	});
 	includeCubicAxis(y0, y1, y2, y3, (value) => {
-		box.minY = Math.min(box.minY, value);
-		box.maxY = Math.max(box.maxY, value);
+		box.includeYExtent(value);
 	});
-	box.drawn = true;
+	box.markDrawn();
 }
 function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	const x0 = state.x;
@@ -115,10 +131,10 @@ function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	state.y = y3;
 }
 function lineTo(state, dx, dy) {
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 	state.x += dx;
 	state.y += dy;
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 }
 function moveTo(state, dx, dy) {
 	state.x += dx;
@@ -407,13 +423,7 @@ function computeBounds(glyphId, context) {
 		stems: 0,
 		widthParsed: false,
 		operations: 0,
-		box: {
-			minX: Infinity,
-			minY: Infinity,
-			maxX: -Infinity,
-			maxY: -Infinity,
-			drawn: false
-		}
+		box: new BoundsBox()
 	};
 	if (!execute(code, state, context, 0) || !state.box.drawn) return;
 	return {

package/dist/cff.d.cts

@@ -2,7 +2,7 @@
 interface CffIndex {
   readonly count: number;
   readonly endOffset: number;
-  entry(index: number): Uint8Array<ArrayBuffer> | undefined;
+  entry: (index: number) => Uint8Array<ArrayBuffer> | undefined;
 }
 type CffDict = ReadonlyMap<number, readonly number[]>;
 declare const CFF_ESCAPED_OPERATOR_BASE = 1200;

package/dist/cff.d.ts

@@ -2,7 +2,7 @@
 interface CffIndex {
   readonly count: number;
   readonly endOffset: number;
-  entry(index: number): Uint8Array<ArrayBuffer> | undefined;
+  entry: (index: number) => Uint8Array<ArrayBuffer> | undefined;
 }
 type CffDict = ReadonlyMap<number, readonly number[]>;
 declare const CFF_ESCAPED_OPERATOR_BASE = 1200;

package/dist/cmap-table.d.cts

@@ -6,7 +6,7 @@ interface CmapSubtable {
   readonly encodingId: number;
   readonly format: number;
   readonly lookup: CmapLookup;
-  forEachMapping(visit: (code: number, glyphId: number) => void): void;
+  forEachMapping: (visit: (code: number, glyphId: number) => void) => void;
 }
 declare function readCmapSubtables(font: SfntFont): readonly CmapSubtable[];
 declare function buildCmapLookup(font: SfntFont): CmapLookup | undefined;

package/dist/cmap-table.d.ts

@@ -6,7 +6,7 @@ interface CmapSubtable {
   readonly encodingId: number;
   readonly format: number;
   readonly lookup: CmapLookup;
-  forEachMapping(visit: (code: number, glyphId: number) => void): void;
+  forEachMapping: (visit: (code: number, glyphId: number) => void) => void;
 }
 declare function readCmapSubtables(font: SfntFont): readonly CmapSubtable[];
 declare function buildCmapLookup(font: SfntFont): CmapLookup | undefined;

package/dist/cmap.d.cts

@@ -1,7 +1,7 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 //#region src/cmap.d.ts
 interface ToUnicodeCMap {
-  lookup(code: number): string | undefined;
+  lookup: (code: number) => string | undefined;
 }
 declare function parseToUnicodeCMap(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): ToUnicodeCMap;
 //#endregion

package/dist/cmap.d.ts

@@ -1,7 +1,7 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 //#region src/cmap.d.ts
 interface ToUnicodeCMap {
-  lookup(code: number): string | undefined;
+  lookup: (code: number) => string | undefined;
 }
 declare function parseToUnicodeCMap(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): ToUnicodeCMap;
 //#endregion

package/dist/content-read.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 //#region src/content-read.d.ts
 interface ContentOperation {
   readonly operands: readonly PdfObject[];

package/dist/content-read.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 //#region src/content-read.d.ts
 interface ContentOperation {
   readonly operands: readonly PdfObject[];

package/dist/content-write.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
+const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
 const require_objects = require("./objects.cjs");
 const require_bytes_writer = require("./bytes/writer.cjs");
 const require_serialize = require("./serialize.cjs");
@@ -43,15 +43,15 @@ function writeShowTextBlock(writer, item, resourceName, scalePercent, show) {
 	writer.writeAscii(` ${show.operator}\n`);
 	writer.writeAscii("ET\n");
 }
-function writeStandardText(writer, item, standardName, resourceName, measurer, substitutions) {
+function writeStandardText(writer, item, standardName, resourceName, measurer) {
 	const encoded = require_afm_widths.encodeForShow(item.text, standardName);
-	substitutions.push(...encoded.substitutions);
 	const scale = measurer.horizontalScaleFor(item.font);
 	writeShowTextBlock(writer, item, resourceName, scale * 100, {
 		operand: require_objects.pdfHexString(encoded.codes),
 		operator: "Tj"
 	});
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt * scale, measurer.underlineAtSize(item.font, item.sizePt));
+	return encoded.substitutions;
 }
 function embeddedShowOperand(encoded) {
 	if (encoded.kerns.length === 0) return {
@@ -71,22 +71,25 @@ function embeddedShowOperand(encoded) {
 		operator: "TJ"
 	};
 }
-function writeEmbeddedText(writer, item, face, resourceName, missingGlyphs) {
+function writeEmbeddedText(writer, item, face, resourceName) {
 	const encoded = require_embedded_font.encodeForShowEmbedded(item.text, face);
-	missingGlyphs.push(...encoded.substitutions);
 	writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, embeddedShowOperand(encoded));
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt, {
 		offsetPt: face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt,
 		thicknessPt: face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt
 	});
+	return encoded.substitutions;
 }
-function writeText(writer, item, context, substitutions, missingGlyphs) {
+function writeText(writer, item, context) {
 	const font = context.resolveFont(item.font);
-	if (font.kind === "embedded") {
-		writeEmbeddedText(writer, item, font.face, font.resourceName, missingGlyphs);
-		return;
-	}
-	writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer, substitutions);
+	if (font.kind === "embedded") return {
+		substitutions: [],
+		missingGlyphs: writeEmbeddedText(writer, item, font.face, font.resourceName)
+	};
+	return {
+		substitutions: writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer),
+		missingGlyphs: []
+	};
 }
 function paintOperatorFor(fill, stroke, fillRule) {
 	const evenOdd = fillRule === "evenodd";
@@ -332,8 +335,11 @@ function writeContentStream(items, context) {
 			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
 			writer.writeAscii(" >> BDC\n");
 		}
-		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-		else if (item.kind === "image") writeImage(writer, item, context);
+		if (item.kind === "text") {
+			const written = writeText(writer, item, context);
+			substitutions.push(...written.substitutions);
+			missingGlyphs.push(...written.missingGlyphs);
+		} else if (item.kind === "image") writeImage(writer, item, context);
 		else if (item.kind === "rect") writeRect(writer, item);
 		else if (item.kind === "line") writeLine(writer, item);
 		else if (item.kind === "ellipse") writeEllipse(writer, item);

package/dist/content-write.d.cts

@@ -1,6 +1,6 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.cjs";
 import { LayoutItem } from "./layout.cjs";
-import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DJUn9kMH.cjs";
+import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DgVBedw6.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { LayoutFont, TextMeasurer } from "document-schema.js";
 //#region src/content-write.d.ts
@@ -18,8 +18,8 @@ interface ResolvedImageResource {
 }
 interface ContentWriteContext {
   readonly measurer: TextMeasurer;
-  resolveFont(font: LayoutFont): ResolvedFontResource;
-  resolveImage(imageId: string): ResolvedImageResource;
+  resolveFont: (font: Readonly<LayoutFont>) => ResolvedFontResource;
+  resolveImage: (imageId: string) => ResolvedImageResource;
   readonly layerObjectNumberOf?: (name: string) => number | undefined;
   readonly nextMcid?: () => number;
 }

package/dist/content-write.d.ts

@@ -1,6 +1,6 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.js";
 import { LayoutItem } from "./layout.js";
-import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-BRhZfEN2.js";
+import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-ByD7ZiQS.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { LayoutFont, TextMeasurer } from "document-schema.js";
 //#region src/content-write.d.ts
@@ -18,8 +18,8 @@ interface ResolvedImageResource {
 }
 interface ContentWriteContext {
   readonly measurer: TextMeasurer;
-  resolveFont(font: LayoutFont): ResolvedFontResource;
-  resolveImage(imageId: string): ResolvedImageResource;
+  resolveFont: (font: Readonly<LayoutFont>) => ResolvedFontResource;
+  resolveImage: (imageId: string) => ResolvedImageResource;
   readonly layerObjectNumberOf?: (name: string) => number | undefined;
   readonly nextMcid?: () => number;
 }

package/dist/content-write.js

@@ -1,4 +1,4 @@
-import { h as encodeForShow } from "./afm-widths-De_QMWgC.js";
+import { h as encodeForShow } from "./afm-widths-blUDDjlI.js";
 import { pdfArray, pdfHexString, pdfNum } from "./objects.js";
 import { ByteWriter } from "./bytes/writer.js";
 import { formatNumber, writeObject } from "./serialize.js";
@@ -42,15 +42,15 @@ function writeShowTextBlock(writer, item, resourceName, scalePercent, show) {
 	writer.writeAscii(` ${show.operator}\n`);
 	writer.writeAscii("ET\n");
 }
-function writeStandardText(writer, item, standardName, resourceName, measurer, substitutions) {
+function writeStandardText(writer, item, standardName, resourceName, measurer) {
 	const encoded = encodeForShow(item.text, standardName);
-	substitutions.push(...encoded.substitutions);
 	const scale = measurer.horizontalScaleFor(item.font);
 	writeShowTextBlock(writer, item, resourceName, scale * 100, {
 		operand: pdfHexString(encoded.codes),
 		operator: "Tj"
 	});
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt * scale, measurer.underlineAtSize(item.font, item.sizePt));
+	return encoded.substitutions;
 }
 function embeddedShowOperand(encoded) {
 	if (encoded.kerns.length === 0) return {
@@ -70,22 +70,25 @@ function embeddedShowOperand(encoded) {
 		operator: "TJ"
 	};
 }
-function writeEmbeddedText(writer, item, face, resourceName, missingGlyphs) {
+function writeEmbeddedText(writer, item, face, resourceName) {
 	const encoded = encodeForShowEmbedded(item.text, face);
-	missingGlyphs.push(...encoded.substitutions);
 	writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, embeddedShowOperand(encoded));
 	if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt, {
 		offsetPt: face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt,
 		thicknessPt: face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt
 	});
+	return encoded.substitutions;
 }
-function writeText(writer, item, context, substitutions, missingGlyphs) {
+function writeText(writer, item, context) {
 	const font = context.resolveFont(item.font);
-	if (font.kind === "embedded") {
-		writeEmbeddedText(writer, item, font.face, font.resourceName, missingGlyphs);
-		return;
-	}
-	writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer, substitutions);
+	if (font.kind === "embedded") return {
+		substitutions: [],
+		missingGlyphs: writeEmbeddedText(writer, item, font.face, font.resourceName)
+	};
+	return {
+		substitutions: writeStandardText(writer, item, font.standardName, font.resourceName, context.measurer),
+		missingGlyphs: []
+	};
 }
 function paintOperatorFor(fill, stroke, fillRule) {
 	const evenOdd = fillRule === "evenodd";
@@ -331,8 +334,11 @@ function writeContentStream(items, context) {
 			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
 			writer.writeAscii(" >> BDC\n");
 		}
-		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-		else if (item.kind === "image") writeImage(writer, item, context);
+		if (item.kind === "text") {
+			const written = writeText(writer, item, context);
+			substitutions.push(...written.substitutions);
+			missingGlyphs.push(...written.missingGlyphs);
+		} else if (item.kind === "image") writeImage(writer, item, context);
 		else if (item.kind === "rect") writeRect(writer, item);
 		else if (item.kind === "line") writeLine(writer, item);
 		else if (item.kind === "ellipse") writeEllipse(writer, item);

package/dist/document.cjs

@@ -154,19 +154,22 @@ function openPdfDocument(bytes, sink) {
 	function pages() {
 		const pagesRoot = resolveDict(require_objects.dictGet(catalog, "Pages"));
 		if (pagesRoot === void 0) return [];
-		const result = [];
 		originalLeaves.clear();
-		walkPageTree(pagesRoot, {}, /* @__PURE__ */ new Set(), result);
+		const result = [];
+		for (const leaf of walkPageTree(pagesRoot, {}, /* @__PURE__ */ new Set())) {
+			originalLeaves.set(leaf.node, result.length);
+			result.push(leaf.page);
+		}
 		return result;
 	}
-	function walkPageTree(node, inherited, visited, result) {
+	function walkPageTree(node, inherited, visited) {
 		if (visited.has(node)) {
 			sink({
 				code: "pdf/page-tree-cycle",
 				severity: "warning",
 				message: "the page tree contains a cycle; stopping descent at the repeated node"
 			});
-			return;
+			return [];
 		}
 		visited.add(node);
 		const merged = { ...inherited };
@@ -178,17 +181,20 @@ function openPdfDocument(bytes, sink) {
 		if (kids === void 0) {
 			const entries = new Map(node.entries);
 			for (const key of INHERITABLE_PAGE_KEYS) if (!entries.has(key) && merged[key] !== void 0) entries.set(key, merged[key]);
-			originalLeaves.set(node, result.length);
-			result.push({
-				kind: "dict",
-				entries
-			});
-			return;
+			return [{
+				node,
+				page: {
+					kind: "dict",
+					entries
+				}
+			}];
 		}
+		const leaves = [];
 		for (const kid of kids) {
 			const kidDict = resolveDict(kid);
-			if (kidDict !== void 0) walkPageTree(kidDict, merged, visited, result);
+			if (kidDict !== void 0) for (const leaf of walkPageTree(kidDict, merged, visited)) leaves.push(leaf);
 		}
+		return leaves;
 	}
 	function pageIndex(obj) {
 		const dict = require_objects.asDict(resolve(obj));

package/dist/document.d.cts

@@ -1,13 +1,13 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 //#region src/document.d.ts
 interface PdfDocument {
   readonly trailer: PdfDict;
   readonly catalog: PdfDict;
-  resolve(obj: PdfObject | undefined): PdfObject | undefined;
-  resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
-  pages(): PdfDict[];
-  pageIndex(obj: PdfObject | undefined): number | undefined;
+  resolve: (obj: PdfObject | undefined) => PdfObject | undefined;
+  resolveDict: (obj: PdfObject | undefined) => PdfDict | undefined;
+  pages: () => PdfDict[];
+  pageIndex: (obj: PdfObject | undefined) => number | undefined;
 }
 declare function openPdfDocument(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): PdfDocument;
 //#endregion

package/dist/document.d.ts

@@ -1,13 +1,13 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 //#region src/document.d.ts
 interface PdfDocument {
   readonly trailer: PdfDict;
   readonly catalog: PdfDict;
-  resolve(obj: PdfObject | undefined): PdfObject | undefined;
-  resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
-  pages(): PdfDict[];
-  pageIndex(obj: PdfObject | undefined): number | undefined;
+  resolve: (obj: PdfObject | undefined) => PdfObject | undefined;
+  resolveDict: (obj: PdfObject | undefined) => PdfDict | undefined;
+  pages: () => PdfDict[];
+  pageIndex: (obj: PdfObject | undefined) => number | undefined;
 }
 declare function openPdfDocument(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): PdfDocument;
 //#endregion