pdf-parser.js 3.0.7 → 4.5.1

package/dist/index.cjs

@@ -1,21 +1,22 @@
 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_afm_widths = require("./afm-widths-BTu0IDp2.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");
 const require_image_jpeg2000 = require("./image/jpeg2000.cjs");
+const require_read = require("./read.cjs");
+const require_encrypt_write = require("./encrypt-write.cjs");
 const require_font_registry = require("./font-registry.cjs");
 const require_math_stretch = require("./math-stretch.cjs");
 const require_math_font = require("./math-font.cjs");
 const require_measure = require("./measure.cjs");
 const require_write = require("./write.cjs");
-const require_read = require("./read.cjs");
 const require_codec = require("./codec.cjs");
 const require_font_face = require("./font-face.cjs");
 exports.DEFAULT_VERTICAL_METRIC_POLICY = require_measure.DEFAULT_VERTICAL_METRIC_POLICY;
@@ -25,22 +26,34 @@ 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;
 exports.LayoutRectSchema = require_layout.LayoutRectSchema;
+exports.LayoutStructureElementSchema = require_layout.LayoutStructureElementSchema;
 exports.LayoutSubpathSchema = require_layout.LayoutSubpathSchema;
 exports.LayoutTextSchema = require_layout.LayoutTextSchema;
 exports.NOOP_DIAGNOSTIC_SINK = require_diagnostics.NOOP_DIAGNOSTIC_SINK;
 exports.PdfBytesSchema = require_codec.PdfBytesSchema;
 exports.PdfEncryptedError = require_diagnostics.PdfEncryptedError;
+exports.PdfEncryptionError = require_encrypt_write.PdfEncryptionError;
 exports.PdfParseError = require_diagnostics.PdfParseError;
 exports.PdfPasswordRequiredError = require_diagnostics.PdfPasswordRequiredError;
 exports.STANDARD_METRICS = require_afm_widths.STANDARD_METRICS;

package/dist/index.d.cts

@@ -1,10 +1,11 @@
-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 { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-CneRyu5l.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, 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 { 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 { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-oc65VGlr.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
+import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.cjs";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.cjs";
 import { FontRegistry, ResolvedFace, createFontRegistry, resolveFaceWithRegistry } from "./font-registry.cjs";
 import { ResolvedFont, resolveStandardFont } from "./fonts.cjs";
@@ -19,9 +20,9 @@ import { filterScanlines, unfilterScanlines } from "./image/png-filter.cjs";
 import { ReadPdfOptions, readPdf } from "./read.cjs";
 import { WritePdfOptions, writePdf } from "./write.cjs";
 import { a as MathGlyphPart, c as MathVariants, n as MathGlyphAssembly, o as MathGlyphVariant, r as MathGlyphConstruction } from "./math-table-gFNB8DmQ.cjs";
-import { a as scaleMathStretchConstruction, i as assembleStretchyGlyph, n as MathStretchOptions, r as MathStretchPlacement, t as MathStretchConstruction } from "./math-stretch-E26z6byT.cjs";
+import { a as scaleMathStretchConstruction, i as assembleStretchyGlyph, n as MathStretchOptions, r as MathStretchPlacement, t as MathStretchConstruction } from "./math-stretch-C2JanDAz.cjs";
 import { LoadedMathFont, MathFont, MathFontDescriptorMetrics, loadMathFont } from "./math-font.cjs";
 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, LayoutStructureElement, LayoutStructureElementSchema, 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, PdfEncryptionError, type PdfEncryptionOptions, type PdfEncryptionPermissions, type PdfEncryptionScheme, 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,10 +1,11 @@
-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 { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-CneRyu5l.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, 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 { 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 { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-B4p9a3O3.js";
 import { WinAnsiSubstitution } from "./winansi.js";
+import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.js";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.js";
 import { FontRegistry, ResolvedFace, createFontRegistry, resolveFaceWithRegistry } from "./font-registry.js";
 import { ResolvedFont, resolveStandardFont } from "./fonts.js";
@@ -19,9 +20,9 @@ import { filterScanlines, unfilterScanlines } from "./image/png-filter.js";
 import { ReadPdfOptions, readPdf } from "./read.js";
 import { WritePdfOptions, writePdf } from "./write.js";
 import { a as MathGlyphPart, c as MathVariants, n as MathGlyphAssembly, o as MathGlyphVariant, r as MathGlyphConstruction } from "./math-table-DhPrNoPa.js";
-import { a as scaleMathStretchConstruction, i as assembleStretchyGlyph, n as MathStretchOptions, r as MathStretchPlacement, t as MathStretchConstruction } from "./math-stretch-a_rHNRvc.js";
+import { a as scaleMathStretchConstruction, i as assembleStretchyGlyph, n as MathStretchOptions, r as MathStretchPlacement, t as MathStretchConstruction } from "./math-stretch-BbC2o4Br.js";
 import { LoadedMathFont, MathFont, MathFontDescriptorMetrics, loadMathFont } from "./math-font.js";
 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, LayoutStructureElement, LayoutStructureElementSchema, 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, PdfEncryptionError, type PdfEncryptionOptions, type PdfEncryptionPermissions, type PdfEncryptionScheme, 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,21 +1,22 @@
-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 { t as STANDARD_METRICS } from "./afm-widths-De_QMWgC.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, LayoutStructureElementSchema, 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";
 import { decodeJpeg2000, readJpeg2000Metadata } from "./image/jpeg2000.js";
+import { readPdf } from "./read.js";
+import { PdfEncryptionError } from "./encrypt-write.js";
 import { createFontRegistry, resolveFaceWithRegistry } from "./font-registry.js";
 import { assembleStretchyGlyph, scaleMathStretchConstruction } from "./math-stretch.js";
 import { loadMathFont } from "./math-font.js";
 import { DEFAULT_VERTICAL_METRIC_POLICY, createFontMeasurer, createStandardFontMeasurer } from "./measure.js";
 import { writePdf } from "./write.js";
-import { readPdf } from "./read.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, LayoutStructureElementSchema, LayoutSubpathSchema, LayoutTextSchema, NOOP_DIAGNOSTIC_SINK, PdfBytesSchema, PdfEncryptedError, PdfEncryptionError, 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,17 +1,16 @@
 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
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
 const DEFAULT_LINE_WIDTH_PT = 1;
-function defaultTextState() {
+function initialTextParameters() {
 	return {
-		tm: require_matrix.IDENTITY_MATRIX,
-		tlm: require_matrix.IDENTITY_MATRIX,
 		fontResourceName: void 0,
 		fontSizePt: 0,
 		charSpace: 0,
@@ -21,20 +20,44 @@ function defaultTextState() {
 		rise: 0
 	};
 }
-function computeTrm(ctm, ts) {
+function defaultTextObjectState() {
+	return {
+		tm: require_matrix.IDENTITY_MATRIX,
+		tlm: require_matrix.IDENTITY_MATRIX
+	};
+}
+function computeTrm(gs, text) {
 	const fontMatrix = [
-		ts.fontSizePt * ts.horizScale,
+		gs.fontSizePt * gs.horizScale,
 		0,
 		0,
-		ts.fontSizePt,
+		gs.fontSizePt,
 		0,
-		ts.rise
+		gs.rise
 	];
-	return require_matrix.multiplyMatrices(require_matrix.multiplyMatrices(fontMatrix, ts.tm), ctm);
+	return require_matrix.multiplyMatrices(require_matrix.multiplyMatrices(fontMatrix, text.tm), gs.ctm);
 }
 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 markedContentScopeProps(props) {
+	if (props === void 0) return {};
+	const actualTextObj = require_objects.dictGet(props, "ActualText");
+	const altObj = require_objects.dictGet(props, "Alt");
+	const mcid = require_objects.asNumber(require_objects.dictGet(props, "MCID"));
+	return {
+		...actualTextObj?.kind === "string" ? { actualText: require_pdf_text.decodePdfString(actualTextObj.bytes) } : {},
+		...altObj?.kind === "string" ? { alt: require_pdf_text.decodePdfString(altObj.bytes) } : {},
+		...mcid !== void 0 && mcid >= 0 ? { mcid } : {}
+	};
+}
 function grayColor(value) {
 	return {
 		r: value,
@@ -227,7 +250,11 @@ function detectEllipse(subpath, paint) {
 		stroke: paint.stroke
 	};
 }
-function detectLine(subpath, paint) {
+function strokeStyleFromDashArray(dashArray) {
+	if (dashArray.length === 0) return;
+	return dashArray.length === 2 && dashArray[0] === 0 ? "dotted" : "dashed";
+}
+function detectLine(subpath, paint, style) {
 	const segment = subpath.segments[0];
 	if (subpath.closed || subpath.segments.length !== 1 || segment?.kind !== "line") return;
 	if (paint.fill !== void 0 || paint.stroke === void 0) return;
@@ -238,13 +265,14 @@ function detectLine(subpath, paint) {
 		x2Pt: segment.xPt,
 		y2Pt: segment.yPt,
 		color: paint.stroke.color,
-		widthPt: paint.stroke.widthPt
+		widthPt: paint.stroke.widthPt,
+		...style !== void 0 ? { style } : {}
 	};
 }
-function classifyShape(subpaths, paint) {
+function classifyShape(subpaths, paint, style) {
 	const subpath = subpaths[0];
 	if (subpaths.length !== 1 || subpath === void 0) return;
-	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint);
+	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint, style);
 }
 function interpretContentStream(bytes, resources, context) {
 	const items = [];
@@ -252,8 +280,10 @@ function interpretContentStream(bytes, resources, context) {
 		ctm: require_matrix.IDENTITY_MATRIX,
 		fillColor: document_schema_js.COLOR_BLACK,
 		strokeColor: document_schema_js.COLOR_BLACK,
-		lineWidth: DEFAULT_LINE_WIDTH_PT
-	}, context, items, 0);
+		lineWidth: DEFAULT_LINE_WIDTH_PT,
+		dashArray: [],
+		...initialTextParameters()
+	}, context, items, 0, []);
 	return items;
 }
 function lastPointOf(subpath) {
@@ -266,13 +296,45 @@ 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 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 pushItem = (item) => {
+		if (item.kind === "text") {
+			const layer = item.layerName ?? inScope("layerName");
+			const actualText = inScope("actualText");
+			const alt = inScope("alt");
+			const mcid = inScope("mcid");
+			items.push({
+				...item,
+				...layer !== void 0 ? { layerName: layer } : {},
+				...actualText !== void 0 ? { actualText } : {},
+				...alt !== void 0 ? { alt } : {},
+				...mcid !== void 0 ? { mcid } : {}
+			});
+			return;
+		}
+		const layer = item.layerName ?? inScope("layerName");
+		const layerStamped = layer === void 0 ? item : {
+			...item,
+			layerName: layer
+		};
+		const mcid = inScope("mcid");
+		items.push(mcid === void 0 ? layerStamped : {
+			...layerStamped,
+			mcid
+		});
+	};
 	const finalizeCurrentSubpath = () => {
 		if (currentSubpath !== void 0) {
 			pathSubpaths.push(currentSubpath);
@@ -346,36 +408,40 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					widthPt: gs.lineWidth
 				} : void 0
 			};
-			items.push(classifyShape(pathSubpaths, paint) ?? {
+			const strokeStyle = isStrokeOp ? strokeStyleFromDashArray(gs.dashArray) : void 0;
+			pushItem(classifyShape(pathSubpaths, paint, strokeStyle) ?? {
 				kind: "path",
 				subpaths: pathSubpaths,
 				fillRule: paintFillRuleFor(operator),
-				...paint
+				...paint,
+				...strokeStyle !== void 0 ? { style: strokeStyle } : {}
 			});
 		}
 		resetPath();
 	};
 	const advanceThroughString = (codes) => {
-		if (ts.fontResourceName === void 0) return;
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
 		let offset = 0;
 		while (offset < codes.length) {
-			const glyph = context.fontMetrics.glyphAdvance(ts.fontResourceName, resources, codes, offset);
+			const glyph = context.fontMetrics.glyphAdvance(fontResourceName, resources, codes, offset);
 			if (glyph === void 0) context.sink({
 				code: "pdf/font-not-resolved",
 				severity: "warning",
-				message: `could not resolve font resource /${ts.fontResourceName} to compute a glyph advance; assuming a fallback width`
+				message: `could not resolve font resource /${fontResourceName} to compute a glyph advance; assuming a fallback width`
 			});
 			const widthPer1000 = glyph?.widthPer1000 ?? FALLBACK_GLYPH_WIDTH_PER_1000;
 			const byteLength = glyph?.byteLengthConsumed ?? 1;
 			const isSingleByteSpace = byteLength === 1 && codes[offset] === 32;
-			const tx = (widthPer1000 / 1e3 * ts.fontSizePt + ts.charSpace + (isSingleByteSpace ? ts.wordSpace : 0)) * ts.horizScale;
-			ts.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(tx, 0), ts.tm);
+			const tx = (widthPer1000 / 1e3 * gs.fontSizePt + gs.charSpace + (isSingleByteSpace ? gs.wordSpace : 0)) * gs.horizScale;
+			text.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(tx, 0), text.tm);
 			offset += byteLength;
 		}
 	};
 	const showTextArray = (elements) => {
-		if (ts.fontResourceName === void 0) return;
-		const startMatrix = computeTrm(gs.ctm, ts);
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
+		const startMatrix = computeTrm(gs, text);
 		const chunks = [];
 		let totalLength = 0;
 		for (const el of elements) if (el.kind === "string") {
@@ -383,8 +449,8 @@ 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) * ts.fontSizePt * ts.horizScale;
-			ts.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(adjustment, 0), ts.tm);
+			const adjustment = -(el.value / 1e3) * gs.fontSizePt * gs.horizScale;
+			text.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(adjustment, 0), text.tm);
 		}
 		if (totalLength === 0) return;
 		const combined = new Uint8Array(totalLength);
@@ -393,15 +459,15 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			combined.set(chunk, at);
 			at += chunk.length;
 		}
-		const endMatrix = computeTrm(gs.ctm, ts);
-		items.push({
+		const endMatrix = computeTrm(gs, text);
+		pushItem({
 			kind: "text",
 			codes: combined,
-			fontResourceName: ts.fontResourceName,
+			fontResourceName,
 			resources,
 			startMatrix,
 			endMatrix,
-			sizePt: ts.fontSizePt,
+			sizePt: gs.fontSizePt,
 			color: gs.fillColor
 		});
 	};
@@ -413,8 +479,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 		}]);
 	};
 	const nextLine = () => {
-		ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, -ts.leading), ts.tlm);
-		ts.tm = ts.tlm;
+		text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, -gs.leading), text.tlm);
+		text.tm = text.tlm;
 	};
 	const handleDo = (name) => {
 		if (name === void 0) return;
@@ -429,12 +495,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 +523,17 @@ 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");
+			const formMcid = require_objects.dictGet(xobj.dict, "StructParents") !== void 0 ? void 0 : inScope("mcid");
+			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [{
+				...formLayer !== void 0 ? { layerName: formLayer } : {},
+				...formMcid !== void 0 ? { mcid: formMcid } : {}
+			}]);
 		}
 	};
 	for (const token of operations) {
 		if (token.kind === "inlineImage") {
-			items.push({
+			pushItem({
 				kind: "inlineImage",
 				dict: token.image.dict,
 				data: token.image.data,
@@ -640,6 +713,12 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					lineWidth: numAt(operands, 0)
 				};
 				break;
+			case "d":
+				gs = {
+					...gs,
+					dashArray: (require_objects.asArray(operands[0]) ?? []).map((entry) => require_objects.asNumber(entry) ?? 0)
+				};
+				break;
 			case "f":
 			case "F":
 			case "f*":
@@ -653,39 +732,60 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 				emitPaint(operator);
 				break;
 			case "BT":
-				ts = defaultTextState();
+				text = defaultTextObjectState();
 				break;
 			case "Tf":
-				ts.fontResourceName = require_objects.asName(operands[0]);
-				ts.fontSizePt = numAt(operands, 1);
+				gs = {
+					...gs,
+					fontResourceName: require_objects.asName(operands[0]),
+					fontSizePt: numAt(operands, 1)
+				};
 				break;
 			case "Tc":
-				ts.charSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					charSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tw":
-				ts.wordSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tz":
-				ts.horizScale = numAt(operands, 0) / 100;
+				gs = {
+					...gs,
+					horizScale: numAt(operands, 0) / 100
+				};
 				break;
 			case "TL":
-				ts.leading = numAt(operands, 0);
+				gs = {
+					...gs,
+					leading: numAt(operands, 0)
+				};
 				break;
 			case "Ts":
-				ts.rise = numAt(operands, 0);
+				gs = {
+					...gs,
+					rise: numAt(operands, 0)
+				};
 				break;
 			case "Td":
-				ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "TD":
-				ts.leading = -numAt(operands, 1);
-				ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				gs = {
+					...gs,
+					leading: -numAt(operands, 1)
+				};
+				text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "Tm":
-				ts.tlm = matrixFromOperands(operands);
-				ts.tm = ts.tlm;
+				text.tlm = matrixFromOperands(operands);
+				text.tm = text.tlm;
 				break;
 			case "T*":
 				nextLine();
@@ -702,8 +802,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 				break;
 			}
 			case "\"": {
-				ts.wordSpace = numAt(operands, 0);
-				ts.charSpace = numAt(operands, 1);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0),
+					charSpace: numAt(operands, 1)
+				};
 				nextLine();
 				const str = operands[2];
 				if (str?.kind === "string") showText(str.bytes);
@@ -714,7 +817,26 @@ 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"));
+				const scopeProps = {
+					...layerName !== void 0 ? { layerName } : {},
+					...markedContentScopeProps(props)
+				};
+				markedContent.push(depth === 0 ? scopeProps : {
+					...scopeProps,
+					mcid: void 0
+				});
+				break;
+			}
+			case "BMC":
+				markedContent.push({});
+				break;
+			case "EMC": markedContent.pop();
 		}
 	}
 }