pdf-codec 3.3.1 → 3.4.0

package/README.md

@@ -214,7 +214,7 @@ The package is layered from generic primitives outward to the codec itself:
   - **Embedded text faces**: `embedded-font.ts` (parses one TrueType-outline face's metrics and `GPOS` pair kerning, and `encodeForShowEmbedded` — the single code path both measurement and text-showing go through so encoding and measuring cannot disagree). Every geometry field is converted into PDF's 1000-units-per-em glyph space. `embedded-font-write.ts` builds the `/Type0`/`/CIDFontType2`/`/FontDescriptor`/`/FontFile2`/ToUnicode group, with `/CIDToGIDMap /Identity` written explicitly and `/Length1` set to the **uncompressed** subset length. Its subset tag is a CRC32 over the face's PostScript name and glyph-ID list, so identical input yields byte-identical output.
   - **ToUnicode CMaps**: `tounicode.ts`, shared by both embedded-font writers — a character code → Unicode code point mapping written as a bfchar CMap (9.10.3), with supplementary-plane code points encoded as UTF-16BE surrogate pairs and entries emitted in blocks of at most 100.
   - **CFF reading**: `cff.ts` (shared `INDEX`/`DICT` container structures), `cff-bounds.ts` (a Type 2 charstring interpreter computing each glyph's tight ink bounding box by tracking the current point through every path operator and solving each cubic's real extrema from the roots of its derivative — a path walker, not a rasteriser; verified against the vendored STIX Two Math font's whole 5,543-glyph repertoire, matching fontTools' `BoundsPen` to within 0.01 design units). `cff-probe.ts` reads a bare CFF program's header/Name INDEX/Top DICT to detect the `ROS` operator defining a CID-keyed font — the guard a future source-embedded-font phase needs before it can trust CID == GID against an arbitrary caller-supplied font.
-  - **Read**: `lexer.ts`/`parse.ts` (byte tokenizer and tokens → `PdfObject`), `filters.ts`/`predictors.ts` (Flate/LZW/ASCII85/ASCIIHex/RunLength/CCITTFax, TIFF/PNG predictors), `xref.ts`/`document.ts` (classic and cross-reference-stream resolution, object streams, `/Prev` chains, linear-scan recovery, the page tree with attribute inheritance), `encrypt.ts` (standard security handler: `/Encrypt` parsing, empty-user-password key derivation and `/U` verification, per-object keys, transparent string/stream decryption), `content-read.ts`/`interpret.ts` (content-stream tokenizer and graphics/text state machine, form-XObject recursion, general vector-path tracking), `cmap.ts`/`font-style.ts`/`font-read.ts` (`/ToUnicode` CMaps, font-dictionary resolution), `images-read.ts` (Image XObjects → PNG/JPEG bytes), `names.ts` (the document-level name-tree walker: one flattening pass for every `/Names` tenant), `navigation.ts` (named destinations from `/Dests` and `/Names` `/Dests`, reader-minted entries for direct destination arrays, and the `/Outlines` bookmark tree), `attachments.ts` (embedded files from the name tree, `/FileAttachment` filespecs, and `/AF`), `optional-content.ts` (`/OCProperties` groups and default-configuration visibility, plus the `/OC`-to-name resolution `interpret.ts` stamps onto span items), `annotations.ts` (sticky notes, FreeText, the `/QuadPoints` markup family, and residue for the opaque kinds), `form.ts` (the AcroForm field tree), `xmp.ts` (a bounded Dublin Core extractor for the `/Metadata` packet), `pdf-text.ts` (PDF string/date scalar decoding), `read.ts` (`readPdf`, assembling all of the above into a `LayoutDocument`).
+  - **Read**: `lexer.ts`/`parse.ts` (byte tokenizer and tokens → `PdfObject`), `filters.ts`/`predictors.ts` (Flate/LZW/ASCII85/ASCIIHex/RunLength/CCITTFax, TIFF/PNG predictors), `xref.ts`/`document.ts` (classic and cross-reference-stream resolution, object streams, `/Prev` chains, linear-scan recovery, the page tree with attribute inheritance), `encrypt.ts` (standard security handler: `/Encrypt` parsing, empty-user-password key derivation and `/U` verification, per-object keys, transparent string/stream decryption), `content-read.ts`/`interpret.ts` (content-stream tokenizer and graphics/text state machine, form-XObject recursion, general vector-path tracking), `cmap.ts`/`font-style.ts`/`font-read.ts` (`/ToUnicode` CMaps, font-dictionary resolution), `images-read.ts` (Image XObjects → PNG/JPEG bytes), `names.ts` (the document-level name-tree walker: one flattening pass for every `/Names` tenant), `navigation.ts` (named destinations from `/Dests` and `/Names` `/Dests`, reader-minted entries for direct destination arrays, and the `/Outlines` bookmark tree), `attachments.ts` (embedded files from the name tree, `/FileAttachment` filespecs, and `/AF`), `optional-content.ts` (`/OCProperties` groups and default-configuration visibility, plus the `/OC`-to-name resolution `interpret.ts` stamps onto span items), `annotations.ts` (sticky notes, FreeText, the `/QuadPoints` markup family, and residue for the opaque kinds), `form.ts` (the AcroForm field tree), `structure.ts` (the tagged-PDF `/StructTreeRoot` element tree with `/RoleMap` resolution and `/ClassMap` attribute merging, plus the `/ParentTree` walk that resolves each `(page, MCID)` pair to the owning element `read.ts` stamps onto an item), `xmp.ts` (a bounded Dublin Core extractor for the `/Metadata` packet), `pdf-text.ts` (PDF string/date scalar decoding), `read.ts` (`readPdf`, assembling all of the above into a `LayoutDocument`).
   - `codec.ts` — `pdfCodec`, a `z.codec()` pair over `readPdf`/`writePdf`, plus a standalone local copy of the `%PDF-` header check.
 - **`src/test-support/`** — hand-built PDF fixtures (`pdf.ts`) built by literal byte/string concatenation and deliberately importing NOTHING from this package's own writer (a fixture built by `writePdf` would let a writer bug hide from the corresponding reader test). `encrypted-pdfs.ts` applies the same principle: real PDFs encrypted by [qpdf](https://qpdf.sourceforge.io/), embedded as base64, so a bug in key derivation cannot cancel out between write and read halves. `fonts.ts` holds the real vendored Carlito and Caladea faces as raw sfnt bytes, and asserts values read out of the `.ttf` files by a standalone script with a bare `DataView`, not by this package's own parsers — external cross-checks rather than a parser's output compared against itself.
 

package/dist/codec.d.cts

@@ -1,4 +1,4 @@
-import { LayoutFormField, LayoutOutlineItem } from "./layout.cjs";
+import { LayoutFormField, LayoutOutlineItem, LayoutStructureElement } from "./layout.cjs";
 import { z } from "zod";
 //#region src/codec.d.ts
 declare const PdfBytesSchema: z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>>;
@@ -46,6 +46,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
       layer: z.ZodOptional<z.ZodString>;
       actualText: z.ZodOptional<z.ZodString>;
       alt: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"image">;
@@ -56,6 +57,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
       heightPt: z.ZodNumber;
       rotationDeg: z.ZodOptional<z.ZodNumber>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"rect">;
@@ -77,6 +79,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         widthPt: z.ZodNumber;
       }, z.core.$strip>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"line">;
@@ -97,6 +100,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         double: "double";
       }>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"ellipse">;
@@ -118,6 +122,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         widthPt: z.ZodNumber;
       }, z.core.$strip>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"path">;
@@ -163,6 +168,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         double: "double";
       }>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"link">;
@@ -265,6 +271,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
     name: z.ZodString;
     visible: z.ZodBoolean;
   }, z.core.$strip>>>;
+  structure: z.ZodOptional<z.ZodArray<z.ZodType<LayoutStructureElement, LayoutStructureElement, z.core.$ZodTypeInternals<LayoutStructureElement, LayoutStructureElement>>>>;
   form: z.ZodOptional<z.ZodArray<z.ZodType<LayoutFormField, LayoutFormField, z.core.$ZodTypeInternals<LayoutFormField, LayoutFormField>>>>;
   source: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
     format: z.ZodEnum<{

package/dist/codec.d.ts

@@ -1,4 +1,4 @@
-import { LayoutFormField, LayoutOutlineItem } from "./layout.js";
+import { LayoutFormField, LayoutOutlineItem, LayoutStructureElement } from "./layout.js";
 import { z } from "zod";
 //#region src/codec.d.ts
 declare const PdfBytesSchema: z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>>;
@@ -46,6 +46,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
       layer: z.ZodOptional<z.ZodString>;
       actualText: z.ZodOptional<z.ZodString>;
       alt: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"image">;
@@ -56,6 +57,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
       heightPt: z.ZodNumber;
       rotationDeg: z.ZodOptional<z.ZodNumber>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"rect">;
@@ -77,6 +79,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         widthPt: z.ZodNumber;
       }, z.core.$strip>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"line">;
@@ -97,6 +100,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         double: "double";
       }>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"ellipse">;
@@ -118,6 +122,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         widthPt: z.ZodNumber;
       }, z.core.$strip>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"path">;
@@ -163,6 +168,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
         double: "double";
       }>>;
       layer: z.ZodOptional<z.ZodString>;
+      structure: z.ZodOptional<z.ZodString>;
       sourcePath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
       kind: z.ZodLiteral<"link">;
@@ -265,6 +271,7 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
     name: z.ZodString;
     visible: z.ZodBoolean;
   }, z.core.$strip>>>;
+  structure: z.ZodOptional<z.ZodArray<z.ZodType<LayoutStructureElement, LayoutStructureElement, z.core.$ZodTypeInternals<LayoutStructureElement, LayoutStructureElement>>>>;
   form: z.ZodOptional<z.ZodArray<z.ZodType<LayoutFormField, LayoutFormField, z.core.$ZodTypeInternals<LayoutFormField, LayoutFormField>>>>;
   source: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
     format: z.ZodEnum<{

package/dist/index.cjs

@@ -46,6 +46,7 @@ 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;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-DyDq56Ph.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 { 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-BU6Jgcof.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, 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 };
+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, 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,6 +1,6 @@
 import { n as STANDARD_METRICS, r as StandardFontName, t as FontMetrics } from "./afm-widths-DyDq56Ph.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 { 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-fREdbxnr.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, 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 };
+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, 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

@@ -3,7 +3,7 @@ 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 { 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";
@@ -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, 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 };
+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, 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

@@ -43,13 +43,15 @@ function markedContentProperties(operand, resources, resolver) {
 		return properties === void 0 ? void 0 : resolver.resolveDict(require_objects.dictGet(properties, operand.name));
 	}
 }
-function markedContentStrings(props) {
+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) } : {}
+		...altObj?.kind === "string" ? { alt: require_pdf_text.decodePdfString(altObj.bytes) } : {},
+		...mcid !== void 0 && mcid >= 0 ? { mcid } : {}
 	};
 }
 function grayColor(value) {
@@ -292,8 +294,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 	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 frame = markedContent[i];
+			if (frame !== void 0 && key in frame) return frame[key];
 		}
 	};
 	const pushItem = (item) => {
@@ -301,18 +303,25 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			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 } : {}
+				...alt !== void 0 ? { alt } : {},
+				...mcid !== void 0 ? { mcid } : {}
 			});
 			return;
 		}
 		const layer = item.layerName ?? inScope("layerName");
-		items.push(layer === void 0 ? item : {
+		const layerStamped = layer === void 0 ? item : {
 			...item,
 			layerName: layer
+		};
+		const mcid = inScope("mcid");
+		items.push(mcid === void 0 ? layerStamped : {
+			...layerStamped,
+			mcid
 		});
 	};
 	const finalizeCurrentSubpath = () => {
@@ -500,7 +509,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				ctm: require_matrix.multiplyMatrices(formMatrix, gs.ctm)
 			};
 			const formLayer = ownLayer ?? inScope("layerName");
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [formLayer !== void 0 ? { layerName: formLayer } : {}]);
+			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) {
@@ -765,9 +778,13 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			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({
+				const scopeProps = {
 					...layerName !== void 0 ? { layerName } : {},
-					...markedContentStrings(props)
+					...markedContentScopeProps(props)
+				};
+				markedContent.push(depth === 0 ? scopeProps : {
+					...scopeProps,
+					mcid: void 0
 				});
 				break;
 			}

package/dist/interpret.d.cts

@@ -15,6 +15,7 @@ interface ExtractedTextRun {
   readonly layerName?: string;
   readonly actualText?: string;
   readonly alt?: string;
+  readonly mcid?: number;
 }
 interface ExtractedPaint {
   readonly fill: Color | undefined;
@@ -23,6 +24,7 @@ interface ExtractedPaint {
     readonly widthPt: number;
   } | undefined;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 interface ExtractedRect extends ExtractedPaint {
   readonly kind: 'rect';
@@ -47,6 +49,7 @@ interface ExtractedLine {
   readonly color: Color;
   readonly widthPt: number;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 type ExtractedPathSegment = {
   readonly kind: 'line';
@@ -78,6 +81,7 @@ interface ExtractedImage {
   readonly resources: PdfDict;
   readonly matrix: Matrix;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 interface ExtractedInlineImage {
   readonly kind: 'inlineImage';
@@ -85,6 +89,7 @@ interface ExtractedInlineImage {
   readonly data: Uint8Array<ArrayBuffer>;
   readonly matrix: Matrix;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 type ExtractedItem = ExtractedTextRun | ExtractedRect | ExtractedEllipse | ExtractedLine | ExtractedPath | ExtractedImage | ExtractedInlineImage;
 interface GlyphAdvance {

package/dist/interpret.d.ts

@@ -15,6 +15,7 @@ interface ExtractedTextRun {
   readonly layerName?: string;
   readonly actualText?: string;
   readonly alt?: string;
+  readonly mcid?: number;
 }
 interface ExtractedPaint {
   readonly fill: Color | undefined;
@@ -23,6 +24,7 @@ interface ExtractedPaint {
     readonly widthPt: number;
   } | undefined;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 interface ExtractedRect extends ExtractedPaint {
   readonly kind: 'rect';
@@ -47,6 +49,7 @@ interface ExtractedLine {
   readonly color: Color;
   readonly widthPt: number;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 type ExtractedPathSegment = {
   readonly kind: 'line';
@@ -78,6 +81,7 @@ interface ExtractedImage {
   readonly resources: PdfDict;
   readonly matrix: Matrix;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 interface ExtractedInlineImage {
   readonly kind: 'inlineImage';
@@ -85,6 +89,7 @@ interface ExtractedInlineImage {
   readonly data: Uint8Array<ArrayBuffer>;
   readonly matrix: Matrix;
   readonly layerName?: string;
+  readonly mcid?: number;
 }
 type ExtractedItem = ExtractedTextRun | ExtractedRect | ExtractedEllipse | ExtractedLine | ExtractedPath | ExtractedImage | ExtractedInlineImage;
 interface GlyphAdvance {

package/dist/interpret.js

@@ -42,13 +42,15 @@ function markedContentProperties(operand, resources, resolver) {
 		return properties === void 0 ? void 0 : resolver.resolveDict(dictGet(properties, operand.name));
 	}
 }
-function markedContentStrings(props) {
+function markedContentScopeProps(props) {
 	if (props === void 0) return {};
 	const actualTextObj = dictGet(props, "ActualText");
 	const altObj = dictGet(props, "Alt");
+	const mcid = asNumber(dictGet(props, "MCID"));
 	return {
 		...actualTextObj?.kind === "string" ? { actualText: decodePdfString(actualTextObj.bytes) } : {},
-		...altObj?.kind === "string" ? { alt: decodePdfString(altObj.bytes) } : {}
+		...altObj?.kind === "string" ? { alt: decodePdfString(altObj.bytes) } : {},
+		...mcid !== void 0 && mcid >= 0 ? { mcid } : {}
 	};
 }
 function grayColor(value) {
@@ -291,8 +293,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 	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 frame = markedContent[i];
+			if (frame !== void 0 && key in frame) return frame[key];
 		}
 	};
 	const pushItem = (item) => {
@@ -300,18 +302,25 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			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 } : {}
+				...alt !== void 0 ? { alt } : {},
+				...mcid !== void 0 ? { mcid } : {}
 			});
 			return;
 		}
 		const layer = item.layerName ?? inScope("layerName");
-		items.push(layer === void 0 ? item : {
+		const layerStamped = layer === void 0 ? item : {
 			...item,
 			layerName: layer
+		};
+		const mcid = inScope("mcid");
+		items.push(mcid === void 0 ? layerStamped : {
+			...layerStamped,
+			mcid
 		});
 	};
 	const finalizeCurrentSubpath = () => {
@@ -499,7 +508,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				ctm: multiplyMatrices(formMatrix, gs.ctm)
 			};
 			const formLayer = ownLayer ?? inScope("layerName");
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [formLayer !== void 0 ? { layerName: formLayer } : {}]);
+			const formMcid = 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) {
@@ -764,9 +777,13 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			case "BDC": {
 				const props = markedContentProperties(operands[1], resources, context.resolver);
 				const layerName = context.layerNameOf?.(props === void 0 ? void 0 : dictGet(props, "OC"));
-				markedContent.push({
+				const scopeProps = {
 					...layerName !== void 0 ? { layerName } : {},
-					...markedContentStrings(props)
+					...markedContentScopeProps(props)
+				};
+				markedContent.push(depth === 0 ? scopeProps : {
+					...scopeProps,
+					mcid: void 0
 				});
 				break;
 			}

package/dist/layout.cjs

@@ -17,6 +17,7 @@ const LayoutTextSchema = zod.z.object({
 	layer: zod.z.string().optional(),
 	actualText: zod.z.string().optional(),
 	alt: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutImageSchema = zod.z.object({
@@ -28,6 +29,7 @@ const LayoutImageSchema = zod.z.object({
 	heightPt: zod.z.number().positive(),
 	rotationDeg: zod.z.number().optional(),
 	layer: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutRectSchema = zod.z.object({
@@ -42,6 +44,7 @@ const LayoutRectSchema = zod.z.object({
 		widthPt: zod.z.number().positive()
 	}).optional(),
 	layer: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutLineSchema = zod.z.object({
@@ -54,6 +57,7 @@ const LayoutLineSchema = zod.z.object({
 	widthPt: zod.z.number().positive(),
 	style: document_schema_js.ContentStrokeStyleSchema.optional(),
 	layer: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutEllipseSchema = zod.z.object({
@@ -68,6 +72,7 @@ const LayoutEllipseSchema = zod.z.object({
 		widthPt: zod.z.number().positive()
 	}).optional(),
 	layer: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutPathSegmentSchema = zod.z.discriminatedUnion("kind", [zod.z.object({
@@ -100,6 +105,7 @@ const LayoutPathSchema = zod.z.object({
 	}).optional(),
 	style: document_schema_js.ContentStrokeStyleSchema.optional(),
 	layer: zod.z.string().optional(),
+	structure: zod.z.string().optional(),
 	sourcePath: zod.z.string().optional()
 });
 const LayoutLinkSchema = zod.z.object({
@@ -238,6 +244,15 @@ const LayoutLayerSchema = zod.z.object({
 	name: zod.z.string(),
 	visible: zod.z.boolean()
 });
+const LayoutStructureElementSchema = zod.z.lazy(() => zod.z.object({
+	id: zod.z.string(),
+	type: zod.z.string(),
+	title: zod.z.string().optional(),
+	language: zod.z.string().optional(),
+	alt: zod.z.string().optional(),
+	actualText: zod.z.string().optional(),
+	children: zod.z.array(LayoutStructureElementSchema)
+}));
 const LayoutDocumentSchema = zod.z.object({
 	formatVersion: zod.z.literal(1),
 	metadata: document_schema_js.LayoutMetadataSchema,
@@ -247,6 +262,7 @@ const LayoutDocumentSchema = zod.z.object({
 	outline: zod.z.array(LayoutOutlineItemSchema).optional(),
 	attachments: zod.z.array(LayoutAttachmentSchema).optional(),
 	layers: zod.z.array(LayoutLayerSchema).optional(),
+	structure: zod.z.array(LayoutStructureElementSchema).optional(),
 	form: zod.z.array(LayoutFormFieldSchema).optional(),
 	source: zod.z.record(zod.z.string(), document_schema_js.SourceResidueSchema).optional()
 });
@@ -273,5 +289,6 @@ exports.LayoutPageSchema = LayoutPageSchema;
 exports.LayoutPathSchema = LayoutPathSchema;
 exports.LayoutPathSegmentSchema = LayoutPathSegmentSchema;
 exports.LayoutRectSchema = LayoutRectSchema;
+exports.LayoutStructureElementSchema = LayoutStructureElementSchema;
 exports.LayoutSubpathSchema = LayoutSubpathSchema;
 exports.LayoutTextSchema = LayoutTextSchema;