pdf-codec 3.1.4 → 3.2.0

package/dist/form.js

@@ -0,0 +1,137 @@
+import { asArray, asName, asNumber, dictGet } from "./objects.js";
+import { decodePdfString } from "./pdf-text.js";
+//#region src/form.ts
+const FLAG_READ_ONLY = 1;
+const FLAG_PUSHBUTTON = 4;
+const FLAG_RADIO = 32768;
+const FLAG_COMBO = 131072;
+function readAcroForm(catalog, resolver, pageIndex, sink) {
+	const acroForm = resolver.resolveDict(dictGet(catalog, "AcroForm"));
+	if (acroForm === void 0) return [];
+	const fields = [];
+	const visited = /* @__PURE__ */ new Set();
+	for (const fieldRef of asArray(resolver.resolve(dictGet(acroForm, "Fields"))) ?? []) {
+		const fieldDict = resolver.resolveDict(fieldRef);
+		if (fieldDict !== void 0) readField(fieldDict, "", resolver, pageIndex, sink, fields, visited);
+	}
+	return fields;
+}
+function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
+	if (visited.has(node)) {
+		sink({
+			code: "pdf/form-field-cycle",
+			severity: "warning",
+			message: "the AcroForm field tree contains a cycle; stopping descent at the repeated field"
+		});
+		return;
+	}
+	visited.add(node);
+	const ownName = annotText(node, "T");
+	const name = ownName === void 0 ? parentName : parentName.length > 0 ? `${parentName}.${ownName}` : ownName;
+	const fieldObj = dictGet(node, "FT");
+	const fieldType = asName(fieldObj);
+	if (fieldType === void 0) {
+		const children = [];
+		for (const kidRef of asArray(resolver.resolve(dictGet(node, "Kids"))) ?? []) {
+			const kid = resolver.resolveDict(kidRef);
+			if (kid !== void 0) readField(kid, name, resolver, pageIndex, sink, children, visited);
+		}
+		out.push({
+			name,
+			fieldType: "group",
+			widgets: [],
+			children
+		});
+		return;
+	}
+	const flags = asNumber(resolver.resolve(dictGet(node, "Ff"))) ?? 0;
+	const value = fieldValue(node, resolver);
+	const options = fieldOptions(node, resolver);
+	const alias = annotText(node, "TU");
+	const widgets = [];
+	for (const kidRef of asArray(resolver.resolve(dictGet(node, "Kids"))) ?? []) {
+		const kid = resolver.resolveDict(kidRef);
+		if (kid === void 0 || dictGet(kid, "FT") !== void 0) continue;
+		const widget = widgetPlacement(kid, pageIndex);
+		if (widget !== void 0) widgets.push(widget);
+	}
+	if (widgets.length === 0 && dictGet(node, "Rect") !== void 0) {
+		const widget = widgetPlacement(node, pageIndex);
+		if (widget !== void 0) widgets.push(widget);
+	}
+	out.push({
+		name,
+		fieldType: mapFieldType(fieldType, flags),
+		...valueFields(fieldType, value),
+		...options !== void 0 ? { options } : {},
+		...alias !== void 0 ? { alias } : {},
+		...(flags & FLAG_READ_ONLY) !== 0 ? { readOnly: true } : {},
+		widgets,
+		children: []
+	});
+}
+function mapFieldType(fieldType, flags) {
+	if (fieldType === "Tx") return "text";
+	if (fieldType === "Btn") {
+		if ((flags & FLAG_PUSHBUTTON) !== 0) return "button";
+		if ((flags & FLAG_RADIO) !== 0) return "radio";
+		return "checkbox";
+	}
+	if (fieldType === "Ch") return (flags & FLAG_COMBO) !== 0 ? "combobox" : "listbox";
+	return "signature";
+}
+function valueFields(fieldType, value) {
+	if (value === void 0) return {};
+	if (fieldType === "Btn") return {
+		checked: value !== "Off",
+		...value !== "Off" ? { value } : {}
+	};
+	if (fieldType === "Sig") return {};
+	return { value };
+}
+function fieldValue(node, resolver) {
+	const value = resolver.resolve(dictGet(node, "V"));
+	if (value?.kind === "string") return decodePdfString(value.bytes);
+	if (value?.kind === "name") return value.name;
+	if (value?.kind === "number") return String(value.value);
+}
+function fieldOptions(node, resolver) {
+	const opts = asArray(resolver.resolve(dictGet(node, "Opt")));
+	if (opts === void 0) return;
+	const values = [];
+	for (const opt of opts) {
+		const resolved = resolver.resolve(opt);
+		if (resolved?.kind === "string") values.push(decodePdfString(resolved.bytes));
+		else if (resolved?.kind === "array") {
+			const first = resolved.items[0];
+			const exportValue = first?.kind === "string" ? decodePdfString(first.bytes) : first?.kind === "name" ? first.name : void 0;
+			if (exportValue !== void 0) values.push(exportValue);
+		}
+	}
+	return values.length > 0 ? values : void 0;
+}
+function widgetPlacement(widget, pageIndex) {
+	const pageNo = pageIndex(dictGet(widget, "P"));
+	if (pageNo === void 0) return;
+	return rectWidget(asArray(dictGet(widget, "Rect")), pageNo);
+}
+function rectWidget(rect, pageNo) {
+	if (rect === void 0) return;
+	const x1 = asNumber(rect[0]) ?? 0;
+	const y1 = asNumber(rect[1]) ?? 0;
+	const x2 = asNumber(rect[2]) ?? 0;
+	const y2 = asNumber(rect[3]) ?? 0;
+	return {
+		pageIndex: pageNo,
+		xPt: Math.min(x1, x2),
+		yPt: Math.min(y1, y2),
+		widthPt: Math.abs(x2 - x1),
+		heightPt: Math.abs(y2 - y1)
+	};
+}
+function annotText(dict, key) {
+	const obj = dictGet(dict, key);
+	return obj?.kind === "string" ? decodePdfString(obj.bytes) : void 0;
+}
+//#endregion
+export { readAcroForm };

package/dist/image/png-decode.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bytes_crc32 = require("../bytes/crc32.cjs");
 const require_bytes_writer = require("../bytes/writer.cjs");
 const require_bytes_flate = require("../bytes/flate.cjs");
 const require_image_png_filter = require("./png-filter.cjs");
+const require_bytes_crc32 = require("../bytes/crc32.cjs");
 //#region src/image/png-decode.ts
 const PNG_SIGNATURE = [
 	137,

package/dist/image/png-decode.js

@@ -1,7 +1,7 @@
-import { crc32 } from "../bytes/crc32.js";
 import { concatBytes } from "../bytes/writer.js";
 import { inflateTolerant } from "../bytes/flate.js";
 import { unfilterScanlines } from "./png-filter.js";
+import { crc32 } from "../bytes/crc32.js";
 //#region src/image/png-decode.ts
 const PNG_SIGNATURE = [
 	137,

package/dist/image/png-encode.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bytes_crc32 = require("../bytes/crc32.cjs");
 const require_bytes_writer = require("../bytes/writer.cjs");
 const require_bytes_flate = require("../bytes/flate.cjs");
 const require_image_png_filter = require("./png-filter.cjs");
+const require_bytes_crc32 = require("../bytes/crc32.cjs");
 //#region src/image/png-encode.ts
 const PNG_SIGNATURE = new Uint8Array([
 	137,

package/dist/image/png-encode.js

@@ -1,7 +1,7 @@
-import { crc32 } from "../bytes/crc32.js";
 import { ByteWriter, concatBytes } from "../bytes/writer.js";
 import { deflate } from "../bytes/flate.js";
 import { filterScanlines } from "./png-filter.js";
+import { crc32 } from "../bytes/crc32.js";
 //#region src/image/png-encode.ts
 const PNG_SIGNATURE = new Uint8Array([
 	137,

package/dist/index.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_afm_widths = require("./afm-widths-BoeTOK2r.cjs");
-const require_layout = require("./layout.cjs");
-const require_diagnostics = require("./diagnostics.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");
 const require_image_png_filter = require("./image/png-filter.cjs");
+const require_layout = require("./layout.cjs");
+const require_diagnostics = require("./diagnostics.cjs");
 const require_fonts = require("./fonts.cjs");
 const require_image_jpeg2000_errors = require("./image/jpeg2000-errors.cjs");
 const require_image_jp2_boxes = require("./image/jp2-boxes.cjs");
@@ -25,13 +25,23 @@ exports.Jbig2UnsupportedError = require_image_jbig2_errors.Jbig2UnsupportedError
 exports.Jpeg2000ParseError = require_image_jpeg2000_errors.Jpeg2000ParseError;
 exports.Jpeg2000UnsupportedError = require_image_jpeg2000_errors.Jpeg2000UnsupportedError;
 exports.LAYOUT_FORMAT_VERSION = require_layout.LAYOUT_FORMAT_VERSION;
+exports.LayoutAnnotationQuadSchema = require_layout.LayoutAnnotationQuadSchema;
+exports.LayoutAnnotationSchema = require_layout.LayoutAnnotationSchema;
+exports.LayoutAttachmentSchema = require_layout.LayoutAttachmentSchema;
+exports.LayoutDestinationSchema = require_layout.LayoutDestinationSchema;
+exports.LayoutDestinationTargetSchema = require_layout.LayoutDestinationTargetSchema;
 exports.LayoutDocumentSchema = require_layout.LayoutDocumentSchema;
 exports.LayoutEllipseSchema = require_layout.LayoutEllipseSchema;
+exports.LayoutFormFieldSchema = require_layout.LayoutFormFieldSchema;
+exports.LayoutFormWidgetSchema = require_layout.LayoutFormWidgetSchema;
 exports.LayoutImageAssetSchema = require_layout.LayoutImageAssetSchema;
 exports.LayoutImageSchema = require_layout.LayoutImageSchema;
+exports.LayoutInternalLinkSchema = require_layout.LayoutInternalLinkSchema;
 exports.LayoutItemSchema = require_layout.LayoutItemSchema;
+exports.LayoutLayerSchema = require_layout.LayoutLayerSchema;
 exports.LayoutLineSchema = require_layout.LayoutLineSchema;
 exports.LayoutLinkSchema = require_layout.LayoutLinkSchema;
+exports.LayoutOutlineItemSchema = require_layout.LayoutOutlineItemSchema;
 exports.LayoutPageSchema = require_layout.LayoutPageSchema;
 exports.LayoutPathSchema = require_layout.LayoutPathSchema;
 exports.LayoutPathSegmentSchema = require_layout.LayoutPathSegmentSchema;

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-DyDq56Ph.cjs";
-import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.cjs";
 import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError } from "./diagnostics.cjs";
+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, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.cjs";
+import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.cjs";
 import { PdfBytesSchema, pdfCodec } from "./codec.cjs";
-import { LAYOUT_FORMAT_VERSION, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutItem, LayoutItemSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.cjs";
 import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-BU6Jgcof.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.cjs";
@@ -24,4 +24,4 @@ import { LoadedMathFont, MathFont, MathFontDescriptorMetrics, loadMathFont } fro
 import { DEFAULT_VERTICAL_METRIC_POLICY, FontMeasurerOptions, StandardFontMeasurerOptions, VerticalMetricPolicy, createFontMeasurer, createStandardFontMeasurer } from "./measure.cjs";
 import { FontRegistryOptions, FontSubstitution, MathAssembledGlyphs, MathBox, MathColor, MathFontMetrics, MathGlyphMetrics, MathGlyphPlacement, MathGlyphRun, MathLayoutItem, MathRule, MathStretchAxis, MathStretchGlyph, MathStretchResult, MathStroke, Point, PositionedFormula, ProvidedFont, StyledFragment, StyledRun, TextMeasurer, UnderlineMetrics, WrapOptions, WrappedLine } from "document-schema.js";
 export * from "byte-codec";
-export { type CcittFaxImage, type CcittFaxOptions, DEFAULT_VERTICAL_METRIC_POLICY, type EmbeddedFace, type EmbeddedFaceMetrics, type EmbeddedFaceSubstitution, type FontFace, FontFaceParseError, type FontMeasurerOptions, type FontMetrics, type FontRegistry, type FontRegistryOptions, type FontSubstitution, type GlyphInkBounds, type Jbig2DecodeOptions, type Jbig2Image, Jbig2ParseError, Jbig2UnsupportedError, type Jp2ChannelDefinition, type Jp2ColourSpace, type Jp2Container, type Jp2ImageHeader, type Jpeg2000ComponentMetadata, type Jpeg2000DecodeOptions, type Jpeg2000Image, type Jpeg2000Metadata, Jpeg2000ParseError, type Jpeg2000ProgressionOrder, type Jpeg2000QuantizationStyle, type Jpeg2000Transform, Jpeg2000UnsupportedError, LAYOUT_FORMAT_VERSION, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutItem, LayoutItemSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema, type LoadedMathFont, type MathAssembledGlyphs, type MathBox, type MathColor, type MathFont, type MathFontDescriptorMetrics, type MathFontMetrics, type MathGlyphAssembly, type MathGlyphConstruction, type MathGlyphMetrics, type MathGlyphPart, type MathGlyphPlacement, type MathGlyphRun, type MathGlyphVariant, type MathLayoutItem, type MathRule, type MathStretchAxis, type MathStretchConstruction, type MathStretchGlyph, type MathStretchOptions, type MathStretchPlacement, type MathStretchResult, type MathStroke, type MathVariants, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, type PdfDiagnostic, type PdfDiagnosticSeverity, type PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, type Point, type PositionedFormula, type ProvidedFont, type ReadPdfOptions, type ResolvedFace, type ResolvedFont, STANDARD_METRICS, type StandardFontMeasurerOptions, type StandardFontName, type StyledFragment, type StyledRun, type TextMeasurer, type UnderlineMetrics, type VerticalMetricPolicy, type WinAnsiSubstitution, type WrapOptions, type WrappedLine, type WritePdfOptions, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };
+export { type CcittFaxImage, type CcittFaxOptions, DEFAULT_VERTICAL_METRIC_POLICY, type EmbeddedFace, type EmbeddedFaceMetrics, type EmbeddedFaceSubstitution, type FontFace, FontFaceParseError, type FontMeasurerOptions, type FontMetrics, type FontRegistry, type FontRegistryOptions, type FontSubstitution, type GlyphInkBounds, type Jbig2DecodeOptions, type Jbig2Image, Jbig2ParseError, Jbig2UnsupportedError, type Jp2ChannelDefinition, type Jp2ColourSpace, type Jp2Container, type Jp2ImageHeader, type Jpeg2000ComponentMetadata, type Jpeg2000DecodeOptions, type Jpeg2000Image, type Jpeg2000Metadata, Jpeg2000ParseError, type Jpeg2000ProgressionOrder, type Jpeg2000QuantizationStyle, type Jpeg2000Transform, Jpeg2000UnsupportedError, 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, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema, type LoadedMathFont, type MathAssembledGlyphs, type MathBox, type MathColor, type MathFont, type MathFontDescriptorMetrics, type MathFontMetrics, type MathGlyphAssembly, type MathGlyphConstruction, type MathGlyphMetrics, type MathGlyphPart, type MathGlyphPlacement, type MathGlyphRun, type MathGlyphVariant, type MathLayoutItem, type MathRule, type MathStretchAxis, type MathStretchConstruction, type MathStretchGlyph, type MathStretchOptions, type MathStretchPlacement, type MathStretchResult, type MathStroke, type MathVariants, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, type PdfDiagnostic, type PdfDiagnosticSeverity, type PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, type Point, type PositionedFormula, type ProvidedFont, type ReadPdfOptions, type ResolvedFace, type ResolvedFont, STANDARD_METRICS, type StandardFontMeasurerOptions, type StandardFontName, type StyledFragment, type StyledRun, type TextMeasurer, type UnderlineMetrics, type VerticalMetricPolicy, type WinAnsiSubstitution, type WrapOptions, type WrappedLine, type WritePdfOptions, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-DyDq56Ph.js";
-import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.js";
 import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError } from "./diagnostics.js";
+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, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.js";
+import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.js";
 import { PdfBytesSchema, pdfCodec } from "./codec.js";
-import { LAYOUT_FORMAT_VERSION, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutItem, LayoutItemSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.js";
 import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-fREdbxnr.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.js";
@@ -24,4 +24,4 @@ import { LoadedMathFont, MathFont, MathFontDescriptorMetrics, loadMathFont } fro
 import { DEFAULT_VERTICAL_METRIC_POLICY, FontMeasurerOptions, StandardFontMeasurerOptions, VerticalMetricPolicy, createFontMeasurer, createStandardFontMeasurer } from "./measure.js";
 import { FontRegistryOptions, FontSubstitution, MathAssembledGlyphs, MathBox, MathColor, MathFontMetrics, MathGlyphMetrics, MathGlyphPlacement, MathGlyphRun, MathLayoutItem, MathRule, MathStretchAxis, MathStretchGlyph, MathStretchResult, MathStroke, Point, PositionedFormula, ProvidedFont, StyledFragment, StyledRun, TextMeasurer, UnderlineMetrics, WrapOptions, WrappedLine } from "document-schema.js";
 export * from "byte-codec";
-export { type CcittFaxImage, type CcittFaxOptions, DEFAULT_VERTICAL_METRIC_POLICY, type EmbeddedFace, type EmbeddedFaceMetrics, type EmbeddedFaceSubstitution, type FontFace, FontFaceParseError, type FontMeasurerOptions, type FontMetrics, type FontRegistry, type FontRegistryOptions, type FontSubstitution, type GlyphInkBounds, type Jbig2DecodeOptions, type Jbig2Image, Jbig2ParseError, Jbig2UnsupportedError, type Jp2ChannelDefinition, type Jp2ColourSpace, type Jp2Container, type Jp2ImageHeader, type Jpeg2000ComponentMetadata, type Jpeg2000DecodeOptions, type Jpeg2000Image, type Jpeg2000Metadata, Jpeg2000ParseError, type Jpeg2000ProgressionOrder, type Jpeg2000QuantizationStyle, type Jpeg2000Transform, Jpeg2000UnsupportedError, LAYOUT_FORMAT_VERSION, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutItem, LayoutItemSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema, type LoadedMathFont, type MathAssembledGlyphs, type MathBox, type MathColor, type MathFont, type MathFontDescriptorMetrics, type MathFontMetrics, type MathGlyphAssembly, type MathGlyphConstruction, type MathGlyphMetrics, type MathGlyphPart, type MathGlyphPlacement, type MathGlyphRun, type MathGlyphVariant, type MathLayoutItem, type MathRule, type MathStretchAxis, type MathStretchConstruction, type MathStretchGlyph, type MathStretchOptions, type MathStretchPlacement, type MathStretchResult, type MathStroke, type MathVariants, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, type PdfDiagnostic, type PdfDiagnosticSeverity, type PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, type Point, type PositionedFormula, type ProvidedFont, type ReadPdfOptions, type ResolvedFace, type ResolvedFont, STANDARD_METRICS, type StandardFontMeasurerOptions, type StandardFontName, type StyledFragment, type StyledRun, type TextMeasurer, type UnderlineMetrics, type VerticalMetricPolicy, type WinAnsiSubstitution, type WrapOptions, type WrappedLine, type WritePdfOptions, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };
+export { type CcittFaxImage, type CcittFaxOptions, DEFAULT_VERTICAL_METRIC_POLICY, type EmbeddedFace, type EmbeddedFaceMetrics, type EmbeddedFaceSubstitution, type FontFace, FontFaceParseError, type FontMeasurerOptions, type FontMetrics, type FontRegistry, type FontRegistryOptions, type FontSubstitution, type GlyphInkBounds, type Jbig2DecodeOptions, type Jbig2Image, Jbig2ParseError, Jbig2UnsupportedError, type Jp2ChannelDefinition, type Jp2ColourSpace, type Jp2Container, type Jp2ImageHeader, type Jpeg2000ComponentMetadata, type Jpeg2000DecodeOptions, type Jpeg2000Image, type Jpeg2000Metadata, Jpeg2000ParseError, type Jpeg2000ProgressionOrder, type Jpeg2000QuantizationStyle, type Jpeg2000Transform, Jpeg2000UnsupportedError, 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, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema, type LoadedMathFont, type MathAssembledGlyphs, type MathBox, type MathColor, type MathFont, type MathFontDescriptorMetrics, type MathFontMetrics, type MathGlyphAssembly, type MathGlyphConstruction, type MathGlyphMetrics, type MathGlyphPart, type MathGlyphPlacement, type MathGlyphRun, type MathGlyphVariant, type MathLayoutItem, type MathRule, type MathStretchAxis, type MathStretchConstruction, type MathStretchGlyph, type MathStretchOptions, type MathStretchPlacement, type MathStretchResult, type MathStroke, type MathVariants, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, type PdfDiagnostic, type PdfDiagnosticSeverity, type PdfDiagnosticSink, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, type Point, type PositionedFormula, type ProvidedFont, type ReadPdfOptions, type ResolvedFace, type ResolvedFont, STANDARD_METRICS, type StandardFontMeasurerOptions, type StandardFontName, type StyledFragment, type StyledRun, type TextMeasurer, type UnderlineMetrics, type VerticalMetricPolicy, type WinAnsiSubstitution, type WrapOptions, type WrappedLine, type WritePdfOptions, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };

package/dist/index.js

@@ -1,10 +1,10 @@
 import { t as STANDARD_METRICS } from "./afm-widths-Dxucrg7D.js";
-import { LAYOUT_FORMAT_VERSION, LayoutDocumentSchema, LayoutEllipseSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutItemSchema, LayoutLineSchema, LayoutLinkSchema, LayoutPageSchema, LayoutPathSchema, LayoutPathSegmentSchema, LayoutRectSchema, LayoutSubpathSchema, LayoutTextSchema } from "./layout.js";
-import { NOOP_DIAGNOSTIC_SINK, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError } from "./diagnostics.js";
 import { decodeCcittFax } from "./image/ccitt.js";
 import { Jbig2ParseError, Jbig2UnsupportedError } from "./image/jbig2-errors.js";
 import { decodeJbig2Embedded } from "./image/jbig2.js";
 import { filterScanlines, unfilterScanlines } from "./image/png-filter.js";
+import { LAYOUT_FORMAT_VERSION, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachmentSchema, LayoutDestinationSchema, LayoutDestinationTargetSchema, LayoutDocumentSchema, LayoutEllipseSchema, LayoutFormFieldSchema, LayoutFormWidgetSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLinkSchema, LayoutItemSchema, LayoutLayerSchema, LayoutLineSchema, LayoutLinkSchema, LayoutOutlineItemSchema, LayoutPageSchema, LayoutPathSchema, LayoutPathSegmentSchema, LayoutRectSchema, LayoutSubpathSchema, LayoutTextSchema } from "./layout.js";
+import { NOOP_DIAGNOSTIC_SINK, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError } from "./diagnostics.js";
 import { resolveStandardFont } from "./fonts.js";
 import { Jpeg2000ParseError, Jpeg2000UnsupportedError } from "./image/jpeg2000-errors.js";
 import { looksLikeBareCodestream, parseJp2Container } from "./image/jp2-boxes.js";
@@ -18,4 +18,4 @@ import { writePdf } from "./write.js";
 import { PdfBytesSchema, pdfCodec } from "./codec.js";
 import { FontFaceParseError, readFontFace } from "./font-face.js";
 export * from "byte-codec";
-export { DEFAULT_VERTICAL_METRIC_POLICY, FontFaceParseError, Jbig2ParseError, Jbig2UnsupportedError, Jpeg2000ParseError, Jpeg2000UnsupportedError, LAYOUT_FORMAT_VERSION, LayoutDocumentSchema, LayoutEllipseSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutItemSchema, LayoutLineSchema, LayoutLinkSchema, LayoutPageSchema, LayoutPathSchema, LayoutPathSegmentSchema, LayoutRectSchema, LayoutSubpathSchema, LayoutTextSchema, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, STANDARD_METRICS, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };
+export { DEFAULT_VERTICAL_METRIC_POLICY, FontFaceParseError, Jbig2ParseError, Jbig2UnsupportedError, Jpeg2000ParseError, Jpeg2000UnsupportedError, LAYOUT_FORMAT_VERSION, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachmentSchema, LayoutDestinationSchema, LayoutDestinationTargetSchema, LayoutDocumentSchema, LayoutEllipseSchema, LayoutFormFieldSchema, LayoutFormWidgetSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLinkSchema, LayoutItemSchema, LayoutLayerSchema, LayoutLineSchema, LayoutLinkSchema, LayoutOutlineItemSchema, LayoutPageSchema, LayoutPathSchema, LayoutPathSegmentSchema, LayoutRectSchema, LayoutSubpathSchema, LayoutTextSchema, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, PdfEncryptedError, PdfParseError, PdfPasswordRequiredError, STANDARD_METRICS, assembleStretchyGlyph, createFontMeasurer, createFontRegistry, createStandardFontMeasurer, decodeCcittFax, decodeJbig2Embedded, decodeJpeg2000, filterScanlines, loadMathFont, looksLikeBareCodestream, parseJp2Container, pdfCodec, readFontFace, readJpeg2000Metadata, readPdf, resolveFaceWithRegistry, resolveStandardFont, scaleMathStretchConstruction, unfilterScanlines, writePdf };

package/dist/interpret.cjs

@@ -1,7 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_objects = require("./objects.cjs");
-const require_filters = require("./filters.cjs");
+const require_pdf_text = require("./pdf-text.cjs");
 const require_matrix = require("./matrix.cjs");
+const require_filters = require("./filters.cjs");
 const require_content_read = require("./content-read.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/interpret.ts
@@ -35,6 +36,22 @@ function computeTrm(ctm, ts) {
 function numAt(operands, index) {
 	return require_objects.asNumber(operands[index]) ?? 0;
 }
+function markedContentProperties(operand, resources, resolver) {
+	if (operand?.kind === "dict") return operand;
+	if (operand?.kind === "name") {
+		const properties = resolver.resolveDict(require_objects.dictGet(resources, "Properties"));
+		return properties === void 0 ? void 0 : resolver.resolveDict(require_objects.dictGet(properties, operand.name));
+	}
+}
+function markedContentStrings(props) {
+	if (props === void 0) return {};
+	const actualTextObj = require_objects.dictGet(props, "ActualText");
+	const altObj = require_objects.dictGet(props, "Alt");
+	return {
+		...actualTextObj?.kind === "string" ? { actualText: require_pdf_text.decodePdfString(actualTextObj.bytes) } : {},
+		...altObj?.kind === "string" ? { alt: require_pdf_text.decodePdfString(altObj.bytes) } : {}
+	};
+}
 function grayColor(value) {
 	return {
 		r: value,
@@ -253,7 +270,7 @@ function interpretContentStream(bytes, resources, context) {
 		fillColor: document_schema_js.COLOR_BLACK,
 		strokeColor: document_schema_js.COLOR_BLACK,
 		lineWidth: DEFAULT_LINE_WIDTH_PT
-	}, context, items, 0);
+	}, context, items, 0, []);
 	return items;
 }
 function lastPointOf(subpath) {
@@ -266,13 +283,38 @@ function lastPointOf(subpath) {
 		y: last.yPt
 	};
 }
-function runContentStream(bytes, resources, initialState, context, items, depth) {
+function runContentStream(bytes, resources, initialState, context, items, depth, markedContent) {
 	const operations = require_content_read.readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let ts = defaultTextState();
 	let pathSubpaths = [];
 	let currentSubpath;
+	const inScope = (key) => {
+		for (let i = markedContent.length - 1; i >= 0; i--) {
+			const value = markedContent[i]?.[key];
+			if (value !== void 0) return value;
+		}
+	};
+	const pushItem = (item) => {
+		if (item.kind === "text") {
+			const layer = item.layerName ?? inScope("layerName");
+			const actualText = inScope("actualText");
+			const alt = inScope("alt");
+			items.push({
+				...item,
+				...layer !== void 0 ? { layerName: layer } : {},
+				...actualText !== void 0 ? { actualText } : {},
+				...alt !== void 0 ? { alt } : {}
+			});
+			return;
+		}
+		const layer = item.layerName ?? inScope("layerName");
+		items.push(layer === void 0 ? item : {
+			...item,
+			layerName: layer
+		});
+	};
 	const finalizeCurrentSubpath = () => {
 		if (currentSubpath !== void 0) {
 			pathSubpaths.push(currentSubpath);
@@ -346,7 +388,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					widthPt: gs.lineWidth
 				} : void 0
 			};
-			items.push(classifyShape(pathSubpaths, paint) ?? {
+			pushItem(classifyShape(pathSubpaths, paint) ?? {
 				kind: "path",
 				subpaths: pathSubpaths,
 				fillRule: paintFillRuleFor(operator),
@@ -394,7 +436,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			at += chunk.length;
 		}
 		const endMatrix = computeTrm(gs.ctm, ts);
-		items.push({
+		pushItem({
 			kind: "text",
 			codes: combined,
 			fontResourceName: ts.fontResourceName,
@@ -429,12 +471,14 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			return;
 		}
 		const subtype = require_objects.asName(require_objects.dictGet(xobj.dict, "Subtype"));
+		const ownLayer = context.layerNameOf?.(require_objects.dictGet(xobj.dict, "OC"));
 		if (subtype === "Image") {
-			items.push({
+			pushItem({
 				kind: "image",
 				resourceName: name,
 				resources,
-				matrix: gs.ctm
+				matrix: gs.ctm,
+				...ownLayer !== void 0 ? { layerName: ownLayer } : {}
 			});
 			return;
 		}
@@ -455,12 +499,13 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 				...gs,
 				ctm: require_matrix.multiplyMatrices(formMatrix, gs.ctm)
 			};
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1);
+			const formLayer = ownLayer ?? inScope("layerName");
+			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [formLayer !== void 0 ? { layerName: formLayer } : {}]);
 		}
 	};
 	for (const token of operations) {
 		if (token.kind === "inlineImage") {
-			items.push({
+			pushItem({
 				kind: "inlineImage",
 				dict: token.image.dict,
 				data: token.image.data,
@@ -714,7 +759,22 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 				if (array !== void 0) showTextArray(array);
 				break;
 			}
-			case "Do": handleDo(require_objects.asName(operands[0]));
+			case "Do":
+				handleDo(require_objects.asName(operands[0]));
+				break;
+			case "BDC": {
+				const props = markedContentProperties(operands[1], resources, context.resolver);
+				const layerName = context.layerNameOf?.(props === void 0 ? void 0 : require_objects.dictGet(props, "OC"));
+				markedContent.push({
+					...layerName !== void 0 ? { layerName } : {},
+					...markedContentStrings(props)
+				});
+				break;
+			}
+			case "BMC":
+				markedContent.push({});
+				break;
+			case "EMC": markedContent.pop();
 		}
 	}
 }

package/dist/interpret.d.cts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { PdfDict, PdfObject } from "./objects.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.cjs";
+import { PdfDict, PdfObject } from "./objects.cjs";
 import { Color } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {
@@ -12,6 +12,9 @@ interface ExtractedTextRun {
   readonly endMatrix: Matrix;
   readonly sizePt: number;
   readonly color: Color;
+  readonly layerName?: string;
+  readonly actualText?: string;
+  readonly alt?: string;
 }
 interface ExtractedPaint {
   readonly fill: Color | undefined;
@@ -19,6 +22,7 @@ interface ExtractedPaint {
     readonly color: Color;
     readonly widthPt: number;
   } | undefined;
+  readonly layerName?: string;
 }
 interface ExtractedRect extends ExtractedPaint {
   readonly kind: 'rect';
@@ -42,6 +46,7 @@ interface ExtractedLine {
   readonly y2Pt: number;
   readonly color: Color;
   readonly widthPt: number;
+  readonly layerName?: string;
 }
 type ExtractedPathSegment = {
   readonly kind: 'line';
@@ -72,12 +77,14 @@ interface ExtractedImage {
   readonly resourceName: string;
   readonly resources: PdfDict;
   readonly matrix: Matrix;
+  readonly layerName?: string;
 }
 interface ExtractedInlineImage {
   readonly kind: 'inlineImage';
   readonly dict: PdfDict;
   readonly data: Uint8Array<ArrayBuffer>;
   readonly matrix: Matrix;
+  readonly layerName?: string;
 }
 type ExtractedItem = ExtractedTextRun | ExtractedRect | ExtractedEllipse | ExtractedLine | ExtractedPath | ExtractedImage | ExtractedInlineImage;
 interface GlyphAdvance {
@@ -95,6 +102,7 @@ interface InterpretContext {
   readonly fontMetrics: FontMetricsPort;
   readonly resolver: PdfObjectResolver;
   readonly sink: PdfDiagnosticSink;
+  readonly layerNameOf?: (obj: PdfObject | undefined) => string | undefined;
 }
 declare function interpretContentStream(bytes: Uint8Array<ArrayBuffer>, resources: PdfDict, context: InterpretContext): ExtractedItem[];
 //#endregion

package/dist/interpret.d.ts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { PdfDict, PdfObject } from "./objects.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.js";
+import { PdfDict, PdfObject } from "./objects.js";
 import { Color } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {
@@ -12,6 +12,9 @@ interface ExtractedTextRun {
   readonly endMatrix: Matrix;
   readonly sizePt: number;
   readonly color: Color;
+  readonly layerName?: string;
+  readonly actualText?: string;
+  readonly alt?: string;
 }
 interface ExtractedPaint {
   readonly fill: Color | undefined;
@@ -19,6 +22,7 @@ interface ExtractedPaint {
     readonly color: Color;
     readonly widthPt: number;
   } | undefined;
+  readonly layerName?: string;
 }
 interface ExtractedRect extends ExtractedPaint {
   readonly kind: 'rect';
@@ -42,6 +46,7 @@ interface ExtractedLine {
   readonly y2Pt: number;
   readonly color: Color;
   readonly widthPt: number;
+  readonly layerName?: string;
 }
 type ExtractedPathSegment = {
   readonly kind: 'line';
@@ -72,12 +77,14 @@ interface ExtractedImage {
   readonly resourceName: string;
   readonly resources: PdfDict;
   readonly matrix: Matrix;
+  readonly layerName?: string;
 }
 interface ExtractedInlineImage {
   readonly kind: 'inlineImage';
   readonly dict: PdfDict;
   readonly data: Uint8Array<ArrayBuffer>;
   readonly matrix: Matrix;
+  readonly layerName?: string;
 }
 type ExtractedItem = ExtractedTextRun | ExtractedRect | ExtractedEllipse | ExtractedLine | ExtractedPath | ExtractedImage | ExtractedInlineImage;
 interface GlyphAdvance {
@@ -95,6 +102,7 @@ interface InterpretContext {
   readonly fontMetrics: FontMetricsPort;
   readonly resolver: PdfObjectResolver;
   readonly sink: PdfDiagnosticSink;
+  readonly layerNameOf?: (obj: PdfObject | undefined) => string | undefined;
 }
 declare function interpretContentStream(bytes: Uint8Array<ArrayBuffer>, resources: PdfDict, context: InterpretContext): ExtractedItem[];
 //#endregion