pdf-parser.js 5.2.25 → 5.2.27

package/dist/{glyf-nXC-IDRW.d.cts → glyf-DFyknMrW.d.cts}

@@ -18,10 +18,10 @@ interface CompositeComponent {
 }
 interface GlyfTable {
   readonly numGlyphs: number;
-  glyphBytes(glyphId: number): Uint8Array<ArrayBuffer> | undefined;
-  glyphHeader(glyphId: number): GlyphHeader | undefined;
-  compositeComponents(glyphId: number): readonly CompositeComponent[] | undefined;
-  glyphInkBounds(glyphId: number): GlyphInkBounds | undefined;
+  glyphBytes: (glyphId: number) => Uint8Array<ArrayBuffer> | undefined;
+  glyphHeader: (glyphId: number) => GlyphHeader | undefined;
+  compositeComponents: (glyphId: number) => readonly CompositeComponent[] | undefined;
+  glyphInkBounds: (glyphId: number) => GlyphInkBounds | undefined;
 }
 interface GlyfOptions {
   readonly numGlyphs: number;

package/dist/{glyf-contours-OSdG6Edr.d.ts → glyf-contours-B1PsI9oA.d.ts}

@@ -1,4 +1,4 @@
-import { r as GlyfTable } from "./glyf-vMGtP1pb.js";
+import { r as GlyfTable } from "./glyf-Bv1katwK.js";
 //#region src/glyf-contours.d.ts
 interface GlyphContourPoint {
   readonly x: number;
@@ -8,6 +8,6 @@ interface GlyphContourPoint {
 interface GlyphOutline {
   readonly contours: readonly (readonly GlyphContourPoint[])[];
 }
-declare function decodeGlyphOutline(glyf: GlyfTable, glyphId: number): GlyphOutline | undefined;
+declare function decodeGlyphOutline(glyf: Readonly<GlyfTable>, glyphId: number): GlyphOutline | undefined;
 //#endregion
 export { GlyphOutline as n, decodeGlyphOutline as r, GlyphContourPoint as t };

package/dist/{glyf-contours-zRQbj-Yp.d.cts → glyf-contours-NHBpgks-.d.cts}

@@ -1,4 +1,4 @@
-import { r as GlyfTable } from "./glyf-nXC-IDRW.cjs";
+import { r as GlyfTable } from "./glyf-DFyknMrW.cjs";
 //#region src/glyf-contours.d.ts
 interface GlyphContourPoint {
   readonly x: number;
@@ -8,6 +8,6 @@ interface GlyphContourPoint {
 interface GlyphOutline {
   readonly contours: readonly (readonly GlyphContourPoint[])[];
 }
-declare function decodeGlyphOutline(glyf: GlyfTable, glyphId: number): GlyphOutline | undefined;
+declare function decodeGlyphOutline(glyf: Readonly<GlyfTable>, glyphId: number): GlyphOutline | undefined;
 //#endregion
 export { GlyphOutline as n, decodeGlyphOutline as r, GlyphContourPoint as t };

package/dist/glyf-contours.d.cts

@@ -1,2 +1,2 @@
-import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-zRQbj-Yp.cjs";
+import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-NHBpgks-.cjs";
 export { GlyphContourPoint, GlyphOutline, decodeGlyphOutline };

package/dist/glyf-contours.d.ts

@@ -1,2 +1,2 @@
-import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-OSdG6Edr.js";
+import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-B1PsI9oA.js";
 export { GlyphContourPoint, GlyphOutline, decodeGlyphOutline };

package/dist/glyf.d.cts

@@ -1,2 +1,2 @@
-import { a as parseGlyf, i as GlyphHeader, n as GlyfOptions, o as parseLoca, r as GlyfTable, t as CompositeComponent } from "./glyf-nXC-IDRW.cjs";
+import { a as parseGlyf, i as GlyphHeader, n as GlyfOptions, o as parseLoca, r as GlyfTable, t as CompositeComponent } from "./glyf-DFyknMrW.cjs";
 export { CompositeComponent, GlyfOptions, GlyfTable, GlyphHeader, parseGlyf, parseLoca };

package/dist/glyf.d.ts

@@ -1,2 +1,2 @@
-import { a as parseGlyf, i as GlyphHeader, n as GlyfOptions, o as parseLoca, r as GlyfTable, t as CompositeComponent } from "./glyf-vMGtP1pb.js";
+import { a as parseGlyf, i as GlyphHeader, n as GlyfOptions, o as parseLoca, r as GlyfTable, t as CompositeComponent } from "./glyf-Bv1katwK.js";
 export { CompositeComponent, GlyfOptions, GlyfTable, GlyphHeader, parseGlyf, parseLoca };

package/dist/gsub-table.cjs

@@ -3,6 +3,7 @@ const require_sfnt = require("./sfnt.cjs");
 const require_ot_layout_common = require("./ot-layout-common.cjs");
 const require_gdef_table = require("./gdef-table.cjs");
 //#region src/gsub-table.ts
+const constantZeroClassDef = () => 0;
 const DEFAULT_GSUB_FEATURE_TAGS = [
 	"liga",
 	"rlig",
@@ -192,7 +193,10 @@ function applyContextualRule(slots, inputSlots, records, lookupOf, skip, depth)
 		const lookup = lookupOf(record.lookupIndex);
 		if (lookup === void 0 || record.sequenceIndex >= inputSlots.length || depth >= MAX_LOOKUP_NESTING_DEPTH) return;
 		const target = visibleInputSlot(window, record.sequenceIndex, skip);
-		if (target !== void 0) applyLookupAtSlot(window, target, lookup, depth + 1);
+		if (target !== void 0) {
+			const application = applyLookupAtSlot(window, target, lookup, depth + 1);
+			if (application !== void 0) window.splice(target, application.consumed, ...application.replacement);
+		}
 	}
 	return {
 		consumed: last - first + 1,
@@ -210,12 +214,8 @@ function visibleInputSlot(window, position, skip) {
 function applyLookupAtSlot(slots, index, lookup, depth) {
 	for (const subtable of lookup.subtables) {
 		const application = subtable(slots, index, depth);
-		if (application !== void 0) {
-			slots.splice(index, application.consumed, ...application.replacement);
-			return application.replacement.length;
-		}
+		if (application !== void 0) return application;
 	}
-	return 0;
 }
 const SUBST_LOOKUP_RECORD_SIZE = 4;
 function readSubstLookupRecords(bytes, offset, count) {
@@ -422,7 +422,6 @@ function parseContextualSubtable(bytes, chained, subtableOffset, skip, lookupOf)
 		}, skip, lookupOf);
 	}
 }
-const constantZeroClassDef = () => 0;
 function findScriptOffset(bytes, scriptListOffset) {
 	if (!require_sfnt.hasBytes(bytes, scriptListOffset, 2)) return;
 	const scriptCount = require_sfnt.u16(bytes, scriptListOffset);
@@ -526,8 +525,13 @@ function buildGsubShaper(font, options = {}) {
 		for (const lookup of appliedLookups) {
 			let slotIndex = 0;
 			while (slotIndex < slots.length) {
-				const advanced = applyLookupAtSlot(slots, slotIndex, lookup, 0);
-				slotIndex += advanced !== 0 ? advanced : 1;
+				const application = applyLookupAtSlot(slots, slotIndex, lookup, 0);
+				if (application === void 0) {
+					slotIndex += 1;
+					continue;
+				}
+				slots.splice(slotIndex, application.consumed, ...application.replacement);
+				slotIndex += application.replacement.length !== 0 ? application.replacement.length : 1;
 			}
 		}
 		return {

package/dist/gsub-table.js

@@ -2,6 +2,7 @@ import { hasBytes, i16, sfntTableBytes, u16, u32 } from "./sfnt.js";
 import { parseClassDef, parseCoverage } from "./ot-layout-common.js";
 import { parseGdefTable } from "./gdef-table.js";
 //#region src/gsub-table.ts
+const constantZeroClassDef = () => 0;
 const DEFAULT_GSUB_FEATURE_TAGS = [
 	"liga",
 	"rlig",
@@ -191,7 +192,10 @@ function applyContextualRule(slots, inputSlots, records, lookupOf, skip, depth)
 		const lookup = lookupOf(record.lookupIndex);
 		if (lookup === void 0 || record.sequenceIndex >= inputSlots.length || depth >= MAX_LOOKUP_NESTING_DEPTH) return;
 		const target = visibleInputSlot(window, record.sequenceIndex, skip);
-		if (target !== void 0) applyLookupAtSlot(window, target, lookup, depth + 1);
+		if (target !== void 0) {
+			const application = applyLookupAtSlot(window, target, lookup, depth + 1);
+			if (application !== void 0) window.splice(target, application.consumed, ...application.replacement);
+		}
 	}
 	return {
 		consumed: last - first + 1,
@@ -209,12 +213,8 @@ function visibleInputSlot(window, position, skip) {
 function applyLookupAtSlot(slots, index, lookup, depth) {
 	for (const subtable of lookup.subtables) {
 		const application = subtable(slots, index, depth);
-		if (application !== void 0) {
-			slots.splice(index, application.consumed, ...application.replacement);
-			return application.replacement.length;
-		}
+		if (application !== void 0) return application;
 	}
-	return 0;
 }
 const SUBST_LOOKUP_RECORD_SIZE = 4;
 function readSubstLookupRecords(bytes, offset, count) {
@@ -421,7 +421,6 @@ function parseContextualSubtable(bytes, chained, subtableOffset, skip, lookupOf)
 		}, skip, lookupOf);
 	}
 }
-const constantZeroClassDef = () => 0;
 function findScriptOffset(bytes, scriptListOffset) {
 	if (!hasBytes(bytes, scriptListOffset, 2)) return;
 	const scriptCount = u16(bytes, scriptListOffset);
@@ -525,8 +524,13 @@ function buildGsubShaper(font, options = {}) {
 		for (const lookup of appliedLookups) {
 			let slotIndex = 0;
 			while (slotIndex < slots.length) {
-				const advanced = applyLookupAtSlot(slots, slotIndex, lookup, 0);
-				slotIndex += advanced !== 0 ? advanced : 1;
+				const application = applyLookupAtSlot(slots, slotIndex, lookup, 0);
+				if (application === void 0) {
+					slotIndex += 1;
+					continue;
+				}
+				slots.splice(slotIndex, application.consumed, ...application.replacement);
+				slotIndex += application.replacement.length !== 0 ? application.replacement.length : 1;
 			}
 		}
 		return {

package/dist/hmtx-table.d.cts

@@ -1,7 +1,7 @@
 import { t as SfntFont } from "./sfnt-V08bb5ut.cjs";
 //#region src/hmtx-table.d.ts
 interface HmtxTable {
-  advanceWidth(glyphId: number): number;
+  advanceWidth: (glyphId: number) => number;
 }
 declare function parseHmtx(font: SfntFont): HmtxTable;
 //#endregion

package/dist/hmtx-table.d.ts

@@ -1,7 +1,7 @@
 import { t as SfntFont } from "./sfnt-V08bb5ut.js";
 //#region src/hmtx-table.d.ts
 interface HmtxTable {
-  advanceWidth(glyphId: number): number;
+  advanceWidth: (glyphId: number) => number;
 }
 declare function parseHmtx(font: SfntFont): HmtxTable;
 //#endregion

package/dist/image/jbig2-generic.cjs

@@ -91,14 +91,14 @@ function resolveTemplate(template) {
 	if (positions === void 0) throw new require_image_jbig2_errors.Jbig2UnsupportedError(`generic region declares GBTEMPLATE ${String(template)}, which is outside the 0-3 range T.88 6.2.5.3 defines`);
 	return positions;
 }
-function flattenTemplate(positions, at) {
+function flattenTemplate(positions, atPixels) {
 	const dx = new Int32Array(positions.length);
 	const dy = new Int32Array(positions.length);
 	positions.forEach((position, i) => {
 		const offset = position.kind === "fixed" ? {
 			x: position.dx,
 			y: position.dy
-		} : at[position.index] ?? {
+		} : atPixels[position.index] ?? {
 			x: 0,
 			y: 0
 		};

package/dist/image/jbig2-generic.js

@@ -90,14 +90,14 @@ function resolveTemplate(template) {
 	if (positions === void 0) throw new Jbig2UnsupportedError(`generic region declares GBTEMPLATE ${String(template)}, which is outside the 0-3 range T.88 6.2.5.3 defines`);
 	return positions;
 }
-function flattenTemplate(positions, at) {
+function flattenTemplate(positions, atPixels) {
 	const dx = new Int32Array(positions.length);
 	const dy = new Int32Array(positions.length);
 	positions.forEach((position, i) => {
 		const offset = position.kind === "fixed" ? {
 			x: position.dx,
 			y: position.dy
-		} : at[position.index] ?? {
+		} : atPixels[position.index] ?? {
 			x: 0,
 			y: 0
 		};

package/dist/image/jpeg2000-codestream.cjs

@@ -201,6 +201,15 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
 	if (length < 2) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
@@ -220,7 +229,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -236,7 +245,7 @@ function parseJpeg2000Codestream(data) {
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -250,7 +259,7 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
 		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
@@ -264,13 +273,13 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
@@ -292,14 +301,14 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
 function trimTrailingEoc(data, end) {
 	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;

package/dist/image/jpeg2000-codestream.js

@@ -200,6 +200,15 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
 	if (length < 2) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
@@ -219,7 +228,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -235,7 +244,7 @@ function parseJpeg2000Codestream(data) {
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -249,7 +258,7 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
 		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
@@ -263,13 +272,13 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
@@ -291,14 +300,14 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
 function trimTrailingEoc(data, end) {
 	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;

package/dist/image/jpeg2000-tagtree.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_image_jpeg2000_errors = require("./jpeg2000-errors.cjs");
 //#region src/image/jpeg2000-tagtree.ts
+const SENTINEL_VALUE = 2147483647;
 var PacketBitReader = class {
 	data;
 	end;
@@ -99,7 +100,6 @@ var TagTree = class {
 		return this.value[y * (this.levelWidths[0] ?? 1) + x] ?? SENTINEL_VALUE;
 	}
 };
-const SENTINEL_VALUE = 2147483647;
 //#endregion
 exports.PacketBitReader = PacketBitReader;
 exports.TagTree = TagTree;

package/dist/image/jpeg2000-tagtree.js

@@ -1,5 +1,6 @@
 import { Jpeg2000ParseError } from "./jpeg2000-errors.js";
 //#region src/image/jpeg2000-tagtree.ts
+const SENTINEL_VALUE = 2147483647;
 var PacketBitReader = class {
 	data;
 	end;
@@ -98,6 +99,5 @@ var TagTree = class {
 		return this.value[y * (this.levelWidths[0] ?? 1) + x] ?? SENTINEL_VALUE;
 	}
 };
-const SENTINEL_VALUE = 2147483647;
 //#endregion
 export { PacketBitReader, TagTree };

package/dist/images-read.d.cts

@@ -1,5 +1,5 @@
 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";
 //#region src/images-read.d.ts
 interface ExtractedPdfImage {
@@ -13,6 +13,6 @@ interface ExtractedPdfImage {
     readonly globalsBytes?: Uint8Array<ArrayBuffer>;
   };
 }
-declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
+declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
 //#endregion
 export { ExtractedPdfImage, readImageXObject };

package/dist/images-read.d.ts

@@ -1,5 +1,5 @@
 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";
 //#region src/images-read.d.ts
 interface ExtractedPdfImage {
@@ -13,6 +13,6 @@ interface ExtractedPdfImage {
     readonly globalsBytes?: Uint8Array<ArrayBuffer>;
   };
 }
-declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
+declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
 //#endregion
 export { ExtractedPdfImage, readImageXObject };

package/dist/index.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_image_ccitt = require("./image/ccitt.cjs");
 const require_image_jbig2_errors = require("./image/jbig2-errors.cjs");
 const require_image_jbig2 = require("./image/jbig2.cjs");

package/dist/index.d.cts

@@ -3,7 +3,7 @@ import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnost
 import { LAYOUT_FORMAT_VERSION, LayoutAnnotation, LayoutAnnotationQuad, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachment, LayoutAttachmentSchema, LayoutDestination, LayoutDestinationSchema, LayoutDestinationTarget, LayoutDestinationTargetSchema, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutFormField, LayoutFormFieldSchema, LayoutFormWidget, LayoutFormWidgetSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLink, LayoutInternalLinkSchema, LayoutItem, LayoutItemSchema, LayoutLayer, LayoutLayerSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutOutlineItem, LayoutOutlineItemSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutStructureElement, LayoutStructureElementSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.cjs";
 import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.cjs";
 import { PdfBytesSchema, pdfCodec } from "./codec.cjs";
-import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DJUn9kMH.cjs";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DgVBedw6.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.cjs";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.cjs";

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnost
 import { LAYOUT_FORMAT_VERSION, LayoutAnnotation, LayoutAnnotationQuad, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachment, LayoutAttachmentSchema, LayoutDestination, LayoutDestinationSchema, LayoutDestinationTarget, LayoutDestinationTargetSchema, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutFormField, LayoutFormFieldSchema, LayoutFormWidget, LayoutFormWidgetSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLink, LayoutInternalLinkSchema, LayoutItem, LayoutItemSchema, LayoutLayer, LayoutLayerSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutOutlineItem, LayoutOutlineItemSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutStructureElement, LayoutStructureElementSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.js";
 import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.js";
 import { PdfBytesSchema, pdfCodec } from "./codec.js";
-import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-BRhZfEN2.js";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-ByD7ZiQS.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.js";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as STANDARD_METRICS } from "./afm-widths-De_QMWgC.js";
+import { t as STANDARD_METRICS } from "./afm-widths-blUDDjlI.js";
 import { decodeCcittFax } from "./image/ccitt.js";
 import { Jbig2ParseError, Jbig2UnsupportedError } from "./image/jbig2-errors.js";
 import { decodeJbig2Embedded } from "./image/jbig2.js";

package/dist/interpret.cjs

@@ -274,17 +274,33 @@ function classifyShape(subpaths, paint, style) {
 	if (subpaths.length !== 1 || subpath === void 0) return;
 	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint, style);
 }
+var MarkedContentStack = class {
+	#frames;
+	constructor(seed = []) {
+		this.#frames = [...seed];
+	}
+	open(frame) {
+		this.#frames.push(frame);
+	}
+	close() {
+		this.#frames.pop();
+	}
+	inScope(key) {
+		for (let i = this.#frames.length - 1; i >= 0; i--) {
+			const frame = this.#frames[i];
+			if (frame !== void 0 && key in frame) return frame[key];
+		}
+	}
+};
 function interpretContentStream(bytes, resources, context) {
-	const items = [];
-	runContentStream(bytes, resources, {
+	return runContentStream(bytes, resources, {
 		ctm: require_matrix.IDENTITY_MATRIX,
 		fillColor: document_schema_js.COLOR_BLACK,
 		strokeColor: document_schema_js.COLOR_BLACK,
 		lineWidth: DEFAULT_LINE_WIDTH_PT,
 		dashArray: [],
 		...initialTextParameters()
-	}, context, items, 0, []);
-	return items;
+	}, context, 0, new MarkedContentStack());
 }
 function lastPointOf(subpath) {
 	const last = subpath.segments[subpath.segments.length - 1];
@@ -296,19 +312,15 @@ function lastPointOf(subpath) {
 		y: last.yPt
 	};
 }
-function runContentStream(bytes, resources, initialState, context, items, depth, markedContent) {
+function runContentStream(bytes, resources, initialState, context, depth, markedContent) {
+	const items = [];
 	const operations = require_content_read.readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let text = defaultTextObjectState();
 	let pathSubpaths = [];
 	let currentSubpath;
-	const inScope = (key) => {
-		for (let i = markedContent.length - 1; i >= 0; i--) {
-			const frame = markedContent[i];
-			if (frame !== void 0 && key in frame) return frame[key];
-		}
-	};
+	const inScope = (key) => markedContent.inScope(key);
 	const pushItem = (item) => {
 		if (item.kind === "text") {
 			const layer = item.layerName ?? inScope("layerName");
@@ -487,10 +499,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			...vertical ? { vertical: true } : {}
 		});
 	};
-	const showText = (bytes) => {
+	const showText = (textBytes) => {
 		showTextArray([{
 			kind: "string",
-			bytes,
+			bytes: textBytes,
 			hex: false
 		}]);
 	};
@@ -541,10 +553,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			};
 			const formLayer = ownLayer ?? inScope("layerName");
 			const formMcid = require_objects.dictGet(xobj.dict, "StructParents") !== void 0 ? void 0 : inScope("mcid");
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [{
+			for (const formItem of runContentStream(decoded.bytes, formResources, formState, context, depth + 1, new MarkedContentStack([{
 				...formLayer !== void 0 ? { layerName: formLayer } : {},
 				...formMcid !== void 0 ? { mcid: formMcid } : {}
-			}]);
+			}]))) items.push(formItem);
 		}
 	};
 	for (const token of operations) {
@@ -843,18 +855,19 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 					...layerName !== void 0 ? { layerName } : {},
 					...markedContentScopeProps(props)
 				};
-				markedContent.push(depth === 0 ? scopeProps : {
+				markedContent.open(depth === 0 ? scopeProps : {
 					...scopeProps,
 					mcid: void 0
 				});
 				break;
 			}
 			case "BMC":
-				markedContent.push({});
+				markedContent.open({});
 				break;
-			case "EMC": markedContent.pop();
+			case "EMC": markedContent.close();
 		}
 	}
+	return items;
 }
 //#endregion
 exports.interpretContentStream = interpretContentStream;

package/dist/interpret.d.cts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { Color, ContentStrokeStyle } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {
@@ -106,12 +106,12 @@ interface GlyphAdvance {
   readonly vertical?: VerticalGlyphAdvance;
 }
 interface FontMetricsPort {
-  glyphAdvance(fontResourceName: string, resources: PdfDict, codes: Uint8Array<ArrayBuffer>, byteOffset: number): GlyphAdvance | undefined;
-  isVertical(fontResourceName: string, resources: PdfDict): boolean;
+  glyphAdvance: (fontResourceName: string, resources: PdfDict, codes: Uint8Array<ArrayBuffer>, byteOffset: number) => GlyphAdvance | undefined;
+  isVertical: (fontResourceName: string, resources: PdfDict) => boolean;
 }
 interface PdfObjectResolver {
-  resolve(obj: PdfObject | undefined): PdfObject | undefined;
-  resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
+  resolve: (obj: PdfObject | undefined) => PdfObject | undefined;
+  resolveDict: (obj: PdfObject | undefined) => PdfDict | undefined;
 }
 interface InterpretContext {
   readonly fontMetrics: FontMetricsPort;

package/dist/interpret.d.ts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 import { Color, ContentStrokeStyle } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {
@@ -106,12 +106,12 @@ interface GlyphAdvance {
   readonly vertical?: VerticalGlyphAdvance;
 }
 interface FontMetricsPort {
-  glyphAdvance(fontResourceName: string, resources: PdfDict, codes: Uint8Array<ArrayBuffer>, byteOffset: number): GlyphAdvance | undefined;
-  isVertical(fontResourceName: string, resources: PdfDict): boolean;
+  glyphAdvance: (fontResourceName: string, resources: PdfDict, codes: Uint8Array<ArrayBuffer>, byteOffset: number) => GlyphAdvance | undefined;
+  isVertical: (fontResourceName: string, resources: PdfDict) => boolean;
 }
 interface PdfObjectResolver {
-  resolve(obj: PdfObject | undefined): PdfObject | undefined;
-  resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
+  resolve: (obj: PdfObject | undefined) => PdfObject | undefined;
+  resolveDict: (obj: PdfObject | undefined) => PdfDict | undefined;
 }
 interface InterpretContext {
   readonly fontMetrics: FontMetricsPort;