pdf-parser.js 5.2.26 → 5.2.28

package/dist/images-read.js

@@ -3,10 +3,14 @@ import { decodeStream } from "./filters.js";
 import { decodeJpeg2000 } from "./image/jpeg2000.js";
 import { PNG_MAX_DIMENSION, PNG_MAX_PIXELS, encodePng, readJpegInfo } from "byte-codec";
 //#region src/images-read.ts
+const CMYK_COMPONENT_COUNT = 4;
+const RGB_CHANNEL_COUNT = 3;
+const MAX_BYTE_VALUE = 255;
+const BITS_PER_BYTE = 8;
 function componentsOf(cs) {
 	if (cs.kind === "gray") return 1;
-	if (cs.kind === "cmyk") return 4;
-	return 3;
+	if (cs.kind === "cmyk") return CMYK_COMPONENT_COUNT;
+	return RGB_CHANNEL_COUNT;
 }
 function resolveColorSpace(csObj, resolver, sink) {
 	const resolved = resolver.resolve(csObj);
@@ -30,7 +34,7 @@ function resolveColorSpace(csObj, resolver, sink) {
 		const streamObj = resolver.resolve(arr[1]);
 		const n = streamObj?.kind === "stream" ? asNumber(dictGet(streamObj.dict, "N")) : void 0;
 		if (n === 1) return { kind: "gray" };
-		if (n === 4) return { kind: "cmyk" };
+		if (n === CMYK_COMPONENT_COUNT) return { kind: "cmyk" };
 		return { kind: "rgb" };
 	}
 	if (family === "Indexed") {
@@ -54,9 +58,9 @@ function resolveColorSpace(csObj, resolver, sink) {
 	};
 }
 function unpackSamples(data, width, height, componentsPerPixel, bitsPerComponent) {
-	if (bitsPerComponent === 8) return Array.from(data.subarray(0, width * height * componentsPerPixel));
+	if (bitsPerComponent === BITS_PER_BYTE) return Array.from(data.subarray(0, width * height * componentsPerPixel));
 	const samplesPerRow = width * componentsPerPixel;
-	const bytesPerRow = Math.ceil(samplesPerRow * bitsPerComponent / 8);
+	const bytesPerRow = Math.ceil(samplesPerRow * bitsPerComponent / BITS_PER_BYTE);
 	const out = [];
 	for (let row = 0; row < height; row++) {
 		const rowStart = row * bytesPerRow;
@@ -64,8 +68,8 @@ function unpackSamples(data, width, height, componentsPerPixel, bitsPerComponent
 		for (let s = 0; s < samplesPerRow; s++) {
 			let value = 0;
 			for (let b = 0; b < bitsPerComponent; b++) {
-				const byteIndex = rowStart + Math.floor(bitPos / 8);
-				const bitIndex = 7 - bitPos % 8;
+				const byteIndex = rowStart + Math.floor(bitPos / BITS_PER_BYTE);
+				const bitIndex = 7 - bitPos % BITS_PER_BYTE;
 				const bit = (data[byteIndex] ?? 0) >> bitIndex & 1;
 				value = value << 1 | bit;
 				bitPos++;
@@ -77,13 +81,13 @@ function unpackSamples(data, width, height, componentsPerPixel, bitsPerComponent
 }
 function scaleToByte(value, maxValue, inverted) {
 	const v = inverted ? maxValue - value : value;
-	return maxValue === 255 ? v : Math.round(v * 255 / maxValue);
+	return maxValue === MAX_BYTE_VALUE ? v : Math.round(v * MAX_BYTE_VALUE / maxValue);
 }
 function cmykToRgbByte(c, m, y, k) {
 	return {
-		r: Math.round(255 * (1 - c) * (1 - k)),
-		g: Math.round(255 * (1 - m) * (1 - k)),
-		b: Math.round(255 * (1 - y) * (1 - k))
+		r: Math.round(MAX_BYTE_VALUE * (1 - c) * (1 - k)),
+		g: Math.round(MAX_BYTE_VALUE * (1 - m) * (1 - k)),
+		b: Math.round(MAX_BYTE_VALUE * (1 - y) * (1 - k))
 	};
 }
 function sampleFromPalette(base, lookup, offset) {
@@ -95,7 +99,7 @@ function sampleFromPalette(base, lookup, offset) {
 			b: g
 		};
 	}
-	if (base.kind === "cmyk") return cmykToRgbByte((lookup[offset] ?? 0) / 255, (lookup[offset + 1] ?? 0) / 255, (lookup[offset + 2] ?? 0) / 255, (lookup[offset + 3] ?? 0) / 255);
+	if (base.kind === "cmyk") return cmykToRgbByte((lookup[offset] ?? 0) / MAX_BYTE_VALUE, (lookup[offset + 1] ?? 0) / MAX_BYTE_VALUE, (lookup[offset + 2] ?? 0) / MAX_BYTE_VALUE, (lookup[offset + 3] ?? 0) / MAX_BYTE_VALUE);
 	return {
 		r: lookup[offset] ?? 0,
 		g: lookup[offset + 1] ?? 0,
@@ -107,7 +111,7 @@ function buildRawImage(data, width, height, bitsPerComponent, colorSpace, invert
 	if (colorSpace.kind === "indexed") {
 		const indices = unpackSamples(data, width, height, 1, bitsPerComponent);
 		const baseComponents = componentsOf(colorSpace.base);
-		const out = new Uint8Array(width * height * (colorSpace.base.kind === "gray" ? 1 : 3));
+		const out = new Uint8Array(width * height * (colorSpace.base.kind === "gray" ? 1 : RGB_CHANNEL_COUNT));
 		let outIdx = 0;
 		for (const index of indices) {
 			const rgb = sampleFromPalette(colorSpace.base, colorSpace.lookup, index * baseComponents);
@@ -121,7 +125,7 @@ function buildRawImage(data, width, height, bitsPerComponent, colorSpace, invert
 		return {
 			width,
 			height,
-			channels: colorSpace.base.kind === "gray" ? 1 : 3,
+			channels: colorSpace.base.kind === "gray" ? 1 : RGB_CHANNEL_COUNT,
 			data: out
 		};
 	}
@@ -135,26 +139,27 @@ function buildRawImage(data, width, height, bitsPerComponent, colorSpace, invert
 		};
 	}
 	if (colorSpace.kind === "rgb") {
-		const samples = unpackSamples(data, width, height, 3, bitsPerComponent);
+		const samples = unpackSamples(data, width, height, RGB_CHANNEL_COUNT, bitsPerComponent);
+		const out = Uint8Array.from(samples, (v) => scaleToByte(v, maxValue, inverted));
 		return {
 			width,
 			height,
-			channels: 3,
-			data: Uint8Array.from(samples, (v) => scaleToByte(v, maxValue, inverted))
+			channels: RGB_CHANNEL_COUNT,
+			data: out
 		};
 	}
-	const samples = unpackSamples(data, width, height, 4, bitsPerComponent);
-	const out = new Uint8Array(width * height * 3);
+	const samples = unpackSamples(data, width, height, CMYK_COMPONENT_COUNT, bitsPerComponent);
+	const out = new Uint8Array(width * height * RGB_CHANNEL_COUNT);
 	for (let px = 0; px < width * height; px++) {
-		const rgb = cmykToRgbByte(scaleToByte(samples[px * 4] ?? 0, maxValue, inverted) / 255, scaleToByte(samples[px * 4 + 1] ?? 0, maxValue, inverted) / 255, scaleToByte(samples[px * 4 + 2] ?? 0, maxValue, inverted) / 255, scaleToByte(samples[px * 4 + 3] ?? 0, maxValue, inverted) / 255);
-		out[px * 3] = rgb.r;
-		out[px * 3 + 1] = rgb.g;
-		out[px * 3 + 2] = rgb.b;
+		const rgb = cmykToRgbByte(scaleToByte(samples[px * CMYK_COMPONENT_COUNT] ?? 0, maxValue, inverted) / MAX_BYTE_VALUE, scaleToByte(samples[px * CMYK_COMPONENT_COUNT + 1] ?? 0, maxValue, inverted) / MAX_BYTE_VALUE, scaleToByte(samples[px * CMYK_COMPONENT_COUNT + 2] ?? 0, maxValue, inverted) / MAX_BYTE_VALUE, scaleToByte(samples[px * CMYK_COMPONENT_COUNT + 3] ?? 0, maxValue, inverted) / MAX_BYTE_VALUE);
+		out[px * RGB_CHANNEL_COUNT] = rgb.r;
+		out[px * RGB_CHANNEL_COUNT + 1] = rgb.g;
+		out[px * RGB_CHANNEL_COUNT + 2] = rgb.b;
 	}
 	return {
 		width,
 		height,
-		channels: 3,
+		channels: RGB_CHANNEL_COUNT,
 		data: out
 	};
 }
@@ -165,8 +170,8 @@ function readSoftMaskAlpha(dict, width, height, resolver, sink) {
 	if (decoded.remainingFilter !== void 0) return;
 	const smaskWidth = asNumber(dictGet(smaskObj.dict, "Width")) ?? width;
 	const smaskHeight = asNumber(dictGet(smaskObj.dict, "Height")) ?? height;
-	const smaskBpc = asNumber(dictGet(smaskObj.dict, "BitsPerComponent")) ?? 8;
-	if (smaskWidth !== width || smaskHeight !== height || smaskBpc !== 8) return;
+	const smaskBpc = asNumber(dictGet(smaskObj.dict, "BitsPerComponent")) ?? BITS_PER_BYTE;
+	if (smaskWidth !== width || smaskHeight !== height || smaskBpc !== BITS_PER_BYTE) return;
 	return decoded.bytes.subarray(0, width * height);
 }
 function jpeg2000ChannelKind(image, dict, resolver, sink) {
@@ -178,7 +183,7 @@ function jpeg2000ChannelKind(image, dict, resolver, sink) {
 	if (image.colourSpace === "greyscale") return "gray";
 	if (image.colourSpace === "cmyk") return "cmyk";
 	if (image.colourSpace === "srgb" || image.colourSpace === "sycc" || image.colourSpace === "e-srgb" || image.colourSpace === "rommrgb") return "rgb";
-	return image.components.length >= 4 ? "cmyk" : image.components.length >= 3 ? "rgb" : "gray";
+	return image.components.length >= CMYK_COMPONENT_COUNT ? "cmyk" : image.components.length >= RGB_CHANNEL_COUNT ? "rgb" : "gray";
 }
 function readJpeg2000Image(dict, raw, resolver, sink) {
 	let image;
@@ -204,7 +209,7 @@ function readJpeg2000Image(dict, raw, resolver, sink) {
 		return;
 	}
 	const kind = jpeg2000ChannelKind(image, dict, resolver, sink);
-	const required = kind === "cmyk" ? 4 : kind === "rgb" ? 3 : 1;
+	const required = kind === "cmyk" ? CMYK_COMPONENT_COUNT : kind === "rgb" ? RGB_CHANNEL_COUNT : 1;
 	if (image.components.length < required) {
 		sink({
 			code: "image/jpx-undecodable",
@@ -219,15 +224,15 @@ function readJpeg2000Image(dict, raw, resolver, sink) {
 		message: `JPXDecode image carries ${String(image.components.length)} components where its colour space needs ${String(required)}; the extra channel(s) are ignored`
 	});
 	const maximum = (1 << image.bitDepth) - 1;
-	const scale = (value) => image.bitDepth === 8 ? value : Math.round(value * 255 / maximum);
+	const scale = (value) => image.bitDepth === BITS_PER_BYTE ? value : Math.round(value * MAX_BYTE_VALUE / maximum);
 	const pixels = image.width * image.height;
-	const channels = kind === "gray" ? 1 : 3;
+	const channels = kind === "gray" ? 1 : RGB_CHANNEL_COUNT;
 	const data = new Uint8Array(pixels * channels);
 	if (kind === "cmyk") for (let i = 0; i < pixels; i++) {
-		const rgb = cmykToRgbByte(scale(image.components[0]?.[i] ?? 0) / 255, scale(image.components[1]?.[i] ?? 0) / 255, scale(image.components[2]?.[i] ?? 0) / 255, scale(image.components[3]?.[i] ?? 0) / 255);
-		data[i * 3] = rgb.r;
-		data[i * 3 + 1] = rgb.g;
-		data[i * 3 + 2] = rgb.b;
+		const rgb = cmykToRgbByte(scale(image.components[0]?.[i] ?? 0) / MAX_BYTE_VALUE, scale(image.components[1]?.[i] ?? 0) / MAX_BYTE_VALUE, scale(image.components[2]?.[i] ?? 0) / MAX_BYTE_VALUE, scale(image.components[3]?.[i] ?? 0) / MAX_BYTE_VALUE);
+		data[i * RGB_CHANNEL_COUNT] = rgb.r;
+		data[i * RGB_CHANNEL_COUNT + 1] = rgb.g;
+		data[i * RGB_CHANNEL_COUNT + 2] = rgb.b;
 	}
 	else for (let channel = 0; channel < channels; channel++) {
 		const plane = image.components[channel];
@@ -301,8 +306,8 @@ function readImageXObject(dict, raw, resolver, sink) {
 		});
 		return;
 	}
-	const bitsPerComponent = asNumber(dictGet(dict, "BitsPerComponent") ?? dictGet(dict, "BPC")) ?? 8;
-	if (bitsPerComponent !== 1 && bitsPerComponent !== 2 && bitsPerComponent !== 4 && bitsPerComponent !== 8) {
+	const bitsPerComponent = asNumber(dictGet(dict, "BitsPerComponent") ?? dictGet(dict, "BPC")) ?? BITS_PER_BYTE;
+	if (bitsPerComponent !== 1 && bitsPerComponent !== 2 && bitsPerComponent !== 4 && bitsPerComponent !== BITS_PER_BYTE) {
 		sink({
 			code: "image/unsupported-bit-depth",
 			severity: "warning",

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
+const require_afm_widths = require("./afm-widths-BHD2HZIL.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-CEf-zBCA.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-Bnhh4juV.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-blUDDjlI.js";
+import { t as STANDARD_METRICS } from "./afm-widths-B_IGbGky.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

@@ -8,6 +8,8 @@ let document_schema_js = require("document-schema.js");
 //#region src/interpret.ts
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
+const GLYPH_SPACE_PER_TEXT_SPACE_UNIT = 1e3;
+const ASCII_SPACE = 32;
 const DEFAULT_LINE_WIDTH_PT = 1;
 function initialTextParameters() {
 	return {
@@ -72,31 +74,37 @@ function rgbColor(operands) {
 		b: numAt(operands, 2)
 	};
 }
+const CMYK_K_INDEX = 3;
 function cmykColor(operands) {
 	const c = numAt(operands, 0);
 	const m = numAt(operands, 1);
 	const y = numAt(operands, 2);
-	const k = numAt(operands, 3);
+	const k = numAt(operands, CMYK_K_INDEX);
 	return {
 		r: (1 - c) * (1 - k),
 		g: (1 - m) * (1 - k),
 		b: (1 - y) * (1 - k)
 	};
 }
+const RGB_COMPONENT_COUNT = 3;
+const CMYK_COMPONENT_COUNT = 4;
 function genericColor(operands) {
 	const numericOperands = operands.filter((o) => o.kind === "number");
 	if (numericOperands.length === 1) return grayColor(numAt(numericOperands, 0));
-	if (numericOperands.length === 3) return rgbColor(numericOperands);
-	if (numericOperands.length === 4) return cmykColor(numericOperands);
+	if (numericOperands.length === RGB_COMPONENT_COUNT) return rgbColor(numericOperands);
+	if (numericOperands.length === CMYK_COMPONENT_COUNT) return cmykColor(numericOperands);
 }
+const MATRIX_D_INDEX = 3;
+const MATRIX_E_INDEX = 4;
+const MATRIX_F_INDEX = 5;
 function matrixFromOperands(operands) {
 	return [
 		numAt(operands, 0),
 		numAt(operands, 1),
 		numAt(operands, 2),
-		numAt(operands, 3),
-		numAt(operands, 4),
-		numAt(operands, 5)
+		numAt(operands, MATRIX_D_INDEX),
+		numAt(operands, MATRIX_E_INDEX),
+		numAt(operands, MATRIX_F_INDEX)
 	];
 }
 const SHAPE_ABS_TOLERANCE_PT = .001;
@@ -140,9 +148,10 @@ function closedPolygonCorners(subpath) {
 	if (nearlyEqualPoints(first, last, shapeTolerance(Math.max(bounds.maxX - bounds.minX, bounds.maxY - bounds.minY)))) corners.pop();
 	return corners;
 }
+const RECTANGLE_CORNER_COUNT = 4;
 function detectRect(subpath, paint) {
 	const corners = closedPolygonCorners(subpath);
-	if (corners?.length !== 4) return;
+	if (corners?.length !== RECTANGLE_CORNER_COUNT) return;
 	const { minX, minY, maxX, maxY } = boundsOf(corners);
 	const widthPt = maxX - minX;
 	const heightPt = maxY - minY;
@@ -190,9 +199,10 @@ function expectedEllipseControl(atExtreme, atExtremeKind, otherEnd, center, kx,
 		y: atExtreme.y
 	};
 }
+const ELLIPSE_SEGMENT_COUNT = 4;
 function detectEllipse(subpath, paint) {
 	const segments = subpath.segments;
-	if (!subpath.closed || segments.length !== 4 || segments.some((segment) => segment.kind !== "cubic")) return;
+	if (!subpath.closed || segments.length !== ELLIPSE_SEGMENT_COUNT || segments.some((segment) => segment.kind !== "cubic")) return;
 	const start = {
 		x: subpath.startXPt,
 		y: subpath.startYPt
@@ -218,16 +228,16 @@ function detectEllipse(subpath, paint) {
 		y: finalSegment.yPt
 	}, start, Math.max(tolX, tolY))) return;
 	const extremes = onCurve.map((point) => cardinalExtremeOf(point, center, rx, ry, tolX, tolY));
-	if (extremes.some((extreme) => extreme === void 0) || new Set(extremes).size !== 4) return;
+	if (extremes.some((extreme) => extreme === void 0) || new Set(extremes).size !== ELLIPSE_SEGMENT_COUNT) return;
 	const kx = rx * require_matrix.BEZIER_KAPPA;
 	const ky = ry * require_matrix.BEZIER_KAPPA;
 	const controlTolerance = Math.max(tolX, tolY);
-	for (let i = 0; i < 4; i += 1) {
+	for (let i = 0; i < ELLIPSE_SEGMENT_COUNT; i += 1) {
 		const segment = segments[i];
 		const from = onCurve[i];
 		const fromKind = extremes[i];
-		const to = onCurve[(i + 1) % 4];
-		const toKind = extremes[(i + 1) % 4];
+		const to = onCurve[(i + 1) % ELLIPSE_SEGMENT_COUNT];
+		const toKind = extremes[(i + 1) % ELLIPSE_SEGMENT_COUNT];
 		if (segment?.kind !== "cubic" || from === void 0 || to === void 0 || fromKind === void 0 || toKind === void 0) return;
 		const expectedC1 = expectedEllipseControl(from, fromKind, to, center, kx, ky);
 		const expectedC2 = expectedEllipseControl(to, toKind, from, center, kx, ky);
@@ -274,17 +284,38 @@ 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];
+		}
+	}
+};
+const RE_HEIGHT_INDEX = 3;
+const OPERAND_INDEX_3 = 3;
+const OPERAND_INDEX_4 = 4;
+const OPERAND_INDEX_5 = 5;
+const TZ_PERCENT_DIVISOR = 100;
 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 +327,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");
@@ -350,7 +377,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		const x = numAt(operands, 0);
 		const y = numAt(operands, 1);
 		const w = numAt(operands, 2);
-		const h = numAt(operands, 3);
+		const h = numAt(operands, RE_HEIGHT_INDEX);
 		const p1 = require_matrix.applyMatrix(ctm, {
 			x,
 			y
@@ -432,10 +459,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			});
 			const widthPer1000 = glyph?.widthPer1000 ?? FALLBACK_GLYPH_WIDTH_PER_1000;
 			const byteLength = glyph?.byteLengthConsumed ?? 1;
-			const isSingleByteSpace = byteLength === 1 && codes[offset] === 32;
+			const isSingleByteSpace = byteLength === 1 && codes[offset] === ASCII_SPACE;
 			const spacing = gs.charSpace + (isSingleByteSpace ? gs.wordSpace : 0);
 			const vertical = glyph?.vertical;
-			text.tm = vertical === void 0 ? require_matrix.multiplyMatrices(require_matrix.translationMatrix((widthPer1000 / 1e3 * gs.fontSizePt + spacing) * gs.horizScale, 0), text.tm) : require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, vertical.displacementPer1000 / 1e3 * gs.fontSizePt + spacing), text.tm);
+			text.tm = vertical === void 0 ? require_matrix.multiplyMatrices(require_matrix.translationMatrix((widthPer1000 / GLYPH_SPACE_PER_TEXT_SPACE_UNIT * gs.fontSizePt + spacing) * gs.horizScale, 0), text.tm) : require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, vertical.displacementPer1000 / GLYPH_SPACE_PER_TEXT_SPACE_UNIT * gs.fontSizePt + spacing), text.tm);
 			offset += byteLength;
 		}
 	};
@@ -445,8 +472,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		const vertical = context.fontMetrics.glyphAdvance(fontResourceName, resources, codes, 0)?.vertical;
 		if (vertical === void 0) return;
 		return {
-			x: vertical.positionXPer1000 / 1e3,
-			y: vertical.positionYPer1000 / 1e3
+			x: vertical.positionXPer1000 / GLYPH_SPACE_PER_TEXT_SPACE_UNIT,
+			y: vertical.positionYPer1000 / GLYPH_SPACE_PER_TEXT_SPACE_UNIT
 		};
 	};
 	const showTextArray = (elements) => {
@@ -463,7 +490,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			totalLength += el.bytes.length;
 			advanceThroughString(el.bytes);
 		} else if (el.kind === "number") {
-			const adjustment = -(el.value / 1e3) * gs.fontSizePt;
+			const adjustment = -(el.value / GLYPH_SPACE_PER_TEXT_SPACE_UNIT) * gs.fontSizePt;
 			text.tm = require_matrix.multiplyMatrices(vertical ? require_matrix.translationMatrix(0, adjustment) : require_matrix.translationMatrix(adjustment * gs.horizScale, 0), text.tm);
 		}
 		if (totalLength === 0) return;
@@ -541,10 +568,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) {
@@ -661,11 +688,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				});
 				const c2 = require_matrix.applyMatrix(gs.ctm, {
 					x: numAt(operands, 2),
-					y: numAt(operands, 3)
+					y: numAt(operands, OPERAND_INDEX_3)
 				});
 				const p = require_matrix.applyMatrix(gs.ctm, {
-					x: numAt(operands, 4),
-					y: numAt(operands, 5)
+					x: numAt(operands, OPERAND_INDEX_4),
+					y: numAt(operands, OPERAND_INDEX_5)
 				});
 				currentSubpath?.segments.push({
 					kind: "cubic",
@@ -687,7 +714,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 					});
 					const p = require_matrix.applyMatrix(gs.ctm, {
 						x: numAt(operands, 2),
-						y: numAt(operands, 3)
+						y: numAt(operands, OPERAND_INDEX_3)
 					});
 					currentSubpath.segments.push({
 						kind: "cubic",
@@ -707,7 +734,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				});
 				const p = require_matrix.applyMatrix(gs.ctm, {
 					x: numAt(operands, 2),
-					y: numAt(operands, 3)
+					y: numAt(operands, OPERAND_INDEX_3)
 				});
 				currentSubpath?.segments.push({
 					kind: "cubic",
@@ -772,7 +799,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			case "Tz":
 				gs = {
 					...gs,
-					horizScale: numAt(operands, 0) / 100
+					horizScale: numAt(operands, 0) / TZ_PERCENT_DIVISOR
 				};
 				break;
 			case "TL":
@@ -843,18 +870,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 {

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 {