pdf-codec 4.3.0 → 4.5.0

package/README.md

@@ -234,7 +234,7 @@ The package is layered from generic primitives outward to the codec itself:
 - **`src/util/`** — two small independently-duplicated copies of family-shared logic: `base64.ts` (verbatim copy of `odf.js`'s own, replacing a former `ooxml.js` dependency for this one helper) and `abort.ts` (`throwIfAborted`, called at every page loop boundary — there is no `await` point in this synchronous pipeline for cancellation to hook into implicitly).
 - **`src/crypto/`** — MD5, SHA-256/384/512, RC4, and AES-CBC, hand-written with zero local imports, plus a thin `random.ts` wrapper around `globalThis.crypto.getRandomValues` for the writer's own salts/file keys/IVs. Not a preference: ISO 32000-1's key-derivation algorithms name MD5 and RC4 directly, neither offered by any portable platform crypto API, and `crypto.subtle` is asynchronous where this codec's read and write paths are both synchronous end to end — `getRandomValues` itself, unlike `crypto.subtle`, is synchronous and portable, so it is used directly rather than hand-written. Reaching for `node:crypto` would break the browser bundle. Each hash/cipher module cites its specification (RFC 1321, FIPS 180-4, FIPS 197) and is tested against published conformance vectors.
 - **The codec itself, importing only `layout`/`bytes`/`image`/`crypto`/`util` plus `document-schema.js`'s port types (no OOXML or ODF knowledge):**
-  - **Write**: `objects.ts` (the `PdfObject` discriminated union), `afm-widths.ts`/`encoding.ts`/`winansi.ts`/`fonts.ts` (standard-14 metrics, WinAnsi encoding, family resolution), `font-registry.ts` (resolution port plus `resolveFaceWithRegistry`, the one step both measurer and writer resolve through so they can never disagree about which face a `LayoutFont` means), `font-face.ts` (`readFontFace`, reading a standalone font file's family/bold/italic triple off its `name`/`OS/2`/`head` tables), `measure.ts`/`text-layout.ts` (greedy line-wrapping against either standard-14 AFM widths plus per-family correction or a resolved face's own real `hmtx` advances — never both), `content-write.ts` (`LayoutItem[]` → content-stream operators, with text branching on standard-14 vs embedded face encoding, pair-kerning split into `TJ` arrays, and stroke `style` becoming real dash/line-cap state), `write.ts` (the full object graph, cross-reference table, trailer, and embedded font groups).
+  - **Write**: `objects.ts` (the `PdfObject` discriminated union), `afm-widths.ts`/`encoding.ts`/`winansi.ts`/`fonts.ts` (standard-14 metrics, WinAnsi encoding, family resolution), `font-registry.ts` (resolution port plus `resolveFaceWithRegistry`, the one step both measurer and writer resolve through so they can never disagree about which face a `LayoutFont` means), `font-face.ts` (`readFontFace`, reading a standalone font file's family/bold/italic triple off its `name`/`OS/2`/`head` tables), `measure.ts`/`text-layout.ts` (greedy line-wrapping against either standard-14 AFM widths plus per-family correction or a resolved face's own real `hmtx` advances — never both), `content-write.ts` (`LayoutItem[]` → content-stream operators, with text branching on standard-14 vs embedded face encoding, pair-kerning split into `TJ` arrays, stroke `style` becoming real dash/line-cap state, and `/P <</MCID n /OC R>> BDC`…`EMC` spans around items carrying a structure owner or an optional-content layer — the one marked-content spelling both read-side channels resolve through), `write.ts` (the full object graph, cross-reference table, trailer, and embedded font groups, plus the document-level round-trip surfaces: the `/Names /EmbeddedFiles` attachments tree and `/Outlines` bookmark tree, `/OCProperties` optional-content groups with each layer stated explicitly into the default configuration's `/ON` or `/OFF` list, the `/AcroForm` field tree with the merged-field/widget spelling (a single widget merges into its field dict; further widgets are separate `/Subtype /Widget` kids, and fully-qualified names decompose back into the `/T` chain), the `/StructTreeRoot` element tree with its `/ParentTree` number tree associating each marked item's MCID to its owning element, and the package-level residue rows restored inline onto the Catalog or trailer — the XMP packet as an uncompressed `/Metadata` stream, and any row whose serialisation references source-file objects skipped rather than emitted as a dangling reference).
   - **sfnt font tables**: `sfnt.ts` (bounds-checked table-directory reader), `cmap-table.ts` (character code → glyph ID, formats 0/4/6/12, exposed both as the best Unicode lookup and as every subtable individually, since a (3, 0) or (1, 0) subtable is keyed by a font's own codes rather than by code points), `hmtx-table.ts` (per-glyph advance widths), `font-tables.ts` (`head`/`maxp`/`OS/2`/`post`/`name`, including `post`'s own glyph names where a font still carries them), `glyf.ts` (`loca` offset index, per-glyph headers, composite component records, `glyphInkBounds`), `math-table.ts` (OpenType `MATH` constants/glyph-info/variants subtables). `ot-layout-common.ts` (Coverage/ClassDef, stored as sorted glyph ranges searched by bisection). `gpos-table.ts` reads `GPOS` for exactly one thing: pair-advance kerning through the `kern` feature, both PairPos formats and LookupType 9 Extension indirection — mark attachment, cursive joining, and contextual positioning have no consumer here. Every parser degrades to `undefined` on a missing/truncated table rather than throwing.
   - **sfnt subsetting**: `sfnt-subset.ts` — a TrueType-outline glyph subsetter (Unicode code points → glyph IDs via `cmap`, transitive closure over `glyf` composite components, rebuilt sfnt carrying only used outlines). **Glyph IDs are preserved, never renumbered**, keeping composite component references valid and making CID == GID trivially true. Output rebuilds `head`/`hhea`/`maxp`/`loca`/`glyf`/`hmtx`, copies hinting programs verbatim, stubs `post`, omits `cmap`/`name`/`OS/2`/`GSUB`/`GPOS`/`kern` (none read through a `CIDFontType2` program per ISO 32000-1 9.9). Applies to `glyf`-flavoured fonts only; CFF returns `undefined`.
   - **Embedded math font**: `math-font.ts` (parses/caches the vendored STIX Two Math font, exposing size-specific `MathFontMetrics` and stretchy-glyph entry points), `math-stretch.ts` (OpenType MATH two-stage stretching: pick smallest pre-built variant reaching target, else assemble from repeated parts with seams overlapped), `math-font-write.ts` (builds the `/Type0`/`/CIDFontType0`/`/FontDescriptor`/`/FontFile3`/ToUnicode group), `math-content-write.ts` (`PositionedFormula[]` → content-stream bytes, Identity-H CIDs for text, `re`/`m`/`l` operators for rules, glyph-ID-addressed text objects for stretched constructions wrapped in `/ActualText`).
@@ -264,6 +264,7 @@ Dependency direction is strictly downward and checkable: `layout` imports only `
 - **Nothing in this codec's reader accepts, prompts for, or guesses a password.** Authenticating as owner is a permissions escalation, not a way to read a file you were already allowed to read.
 - **`writePdf` produces real, spec-conformant encryption for all four of the schemes above** (`src/encrypt-write.ts`, `WritePdfOptions.encryption`) — genuine `/O`/`/U`/`/OE`/`/UE`/`/Perms` computation per ISO 32000-2 7.6.4.4's Algorithms 3, 8, 9, and 10, a real user and (optional, defaulting to the user password) owner password, and per-`/P`-bit permission flags. Unlike the reader, the writer's own password is not scoped to empty: a genuinely non-empty user password is fully supported and round-trips against the published algorithm (see `encrypt-write.test.ts`), even though this package's own reader — scoped as above — can only ever open the result back up if the user password used to encrypt it was itself empty. Two boundaries are deliberately narrower than the full spec rather than approximated silently: a revision 2-4 (rc4-40/rc4-128/aes-128) password must be plain printable ASCII, not the full 8-bit PDFDocEncoding table, and a revision 6 (aes-256) password is Unicode-normalised with NFKC rather than the full SASLPrep/stringprep profile (prohibited-character tables and the bidirectional-text rule are not implemented). Both throw `PdfEncryptionError` for a password outside that scope rather than silently mis-encoding it into one that will not open the file it was meant to protect.
 - **`CCITTFaxDecode`, `JBIG2Decode` and `JPXDecode` images all decode for real** via hand-written decoders (`src/image/ccitt.ts` for ITU-T T.4/T.6 fax; `src/image/jbig2*.ts` for ITU-T T.88; `src/image/jpeg2000*.ts` for ISO/IEC 15444-1). JPEG images (`DCTDecode`) pass through losslessly in both directions. See [JBIG2 scope](#jbig2-scope) and [JPEG 2000 scope](#jpeg-2000-scope) for exactly what is and is not implemented.
+- **The write side re-encodes bilevel images as CCITT Group 4** (`src/image/ccitt-encode.ts`, a hand-written ITU-T T.6 encoder sharing the decoder's own code-table transcription): a grayscale image whose samples are all 0 or 255, with no soft mask, is written as `/CCITTFaxDecode` with `/K -1` whenever the G4 encoding comes out smaller than Flate over the same pixels — which for vertically coherent bilevel content (a scan's edges and text baselines) it does by an order of magnitude. Whichever encoding is smaller wins, deterministically, so decorrelated or repetitive bilevel content where Flate happens to win keeps Flate. **JBIG2 and JPEG 2000 re-encoding are permanent boundaries, not gaps**: a hand-written JBIG2 encoder is research-grade symbol-dictionary design and a JPEG 2000 encoder is the full EBCOT/wavelet stack, and re-encoding lossy JPX back is not fidelity-preserving anyway. Verbatim passthrough of a source's original JBIG2/JPX compressed bytes would need `LayoutImageAsset` and `document-schema.js`'s own `ContentImageBlock` to carry the original filter and bytes (the model normalises to decoded pixels at read time), a cross-package schema design change recorded in #975's scorecard rather than smuggled into this feature.
 - **`interpret.ts` tracks general vector paths, not just axis-aligned `re` rectangles.** `m`/`l`/`c`/`v`/`y`/`h` (and `re` itself) accumulate real subpaths — CTM-transformed line/cubic segments, open or closed — and any paint operator emits an item built from them. A recovered path matching one of three characteristic shape patterns comes back as that shape's own kind, not a generic `LayoutPath`: an axis-aligned closed four-corner subpath is a `LayoutRect`; a closed subpath of four cubic segments meeting its bounding box at cardinal points with kappa-ratio control points is a `LayoutEllipse`; an open single-straight-segment stroke-only subpath is a `LayoutLine` (tolerance: `max(1e-3pt, 1e-4 × extent)`). **These are deliberate, bounded heuristics** — a false positive changes an item's kind, never its geometry, since every detected shape reproduces its source path's own points exactly. Off-axis rotations, non-quadrant curves, polygons, and multi-subpath figures stay a `LayoutPath`.
 - **`writePdf`/`readPdf` round-trip a page's own `notes` field via a hidden `/Subtype /Text` annotation** with the `Hidden` flag set so it never renders or prints, distinguished from a genuine third-party sticky note by an internal author marker. This is a round-trip mechanism specific to this package's own writer/reader pair. `documents.js` uses this to carry pptx/odp speaker notes through PDF.
 - **STIX Two Math is a CFF-flavoured OpenType font, not TrueType/glyf** — the **entire** `CFF ` table is embedded verbatim as a single `/FontFile3` `/Subtype /CIDFontType0C` stream (a real, correct, working embedded font, just not glyph-subsetted). Everything else genuinely IS built from a targeted parse of only what's used: `cmap` resolves exactly the Unicode code points a document's formulas reference, and the emitted `/W` widths array covers only drawn glyph IDs. A CID-keyed composite font built this way needs no `/CIDToGIDMap` — per ISO 32000-1 9.7.4.2, a `/CIDFontType0` whose `/FontFile3` is a non-CID-keyed CFF program is read with CID directly indexing `CharStrings` by glyph order (CID == GID).

package/dist/content-write.cjs

@@ -313,16 +313,38 @@ function writeContentStream(items, context) {
 	const writer = new require_bytes_writer.ByteWriter();
 	const substitutions = [];
 	const missingGlyphs = [];
-	for (const item of items) if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-	else if (item.kind === "image") writeImage(writer, item, context);
-	else if (item.kind === "rect") writeRect(writer, item);
-	else if (item.kind === "line") writeLine(writer, item);
-	else if (item.kind === "ellipse") writeEllipse(writer, item);
-	else if (item.kind === "path") writePath(writer, item);
+	const markedStructure = [];
+	for (const item of items) {
+		const itemLayer = "layer" in item ? item.layer : void 0;
+		const itemStructure = "structure" in item ? item.structure : void 0;
+		const layerObjectNum = itemLayer !== void 0 ? context.layerObjectNumberOf?.(itemLayer) : void 0;
+		const marked = itemStructure !== void 0 || layerObjectNum !== void 0;
+		if (marked) {
+			writer.writeAscii("/P <<");
+			if (itemStructure !== void 0 && context.nextMcid !== void 0) {
+				const mcid = context.nextMcid();
+				markedStructure.push({
+					mcid,
+					structureId: itemStructure
+				});
+				writer.writeAscii(` /MCID ${mcid}`);
+			}
+			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
+			writer.writeAscii(" >> BDC\n");
+		}
+		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
+		else if (item.kind === "image") writeImage(writer, item, context);
+		else if (item.kind === "rect") writeRect(writer, item);
+		else if (item.kind === "line") writeLine(writer, item);
+		else if (item.kind === "ellipse") writeEllipse(writer, item);
+		else if (item.kind === "path") writePath(writer, item);
+		if (marked) writer.writeAscii("EMC\n");
+	}
 	return {
 		bytes: writer.toBytes(),
 		substitutions,
-		missingGlyphs
+		missingGlyphs,
+		markedStructure
 	};
 }
 //#endregion

package/dist/content-write.d.cts

@@ -20,12 +20,19 @@ interface ContentWriteContext {
   readonly measurer: TextMeasurer;
   resolveFont(font: LayoutFont): ResolvedFontResource;
   resolveImage(imageId: string): ResolvedImageResource;
+  readonly layerObjectNumberOf?: (name: string) => number | undefined;
+  readonly nextMcid?: () => number;
 }
 interface ContentStreamResult {
   readonly bytes: Uint8Array<ArrayBuffer>;
+  readonly markedStructure: readonly MarkedStructureItem[];
   readonly substitutions: readonly WinAnsiSubstitution[];
   readonly missingGlyphs: readonly EmbeddedFaceSubstitution[];
 }
 declare function writeContentStream(items: readonly LayoutItem[], context: ContentWriteContext): ContentStreamResult;
+interface MarkedStructureItem {
+  readonly mcid: number;
+  readonly structureId: string;
+}
 //#endregion
-export { ContentStreamResult, ContentWriteContext, ResolvedFontResource, ResolvedImageResource, writeContentStream };
+export { ContentStreamResult, ContentWriteContext, MarkedStructureItem, ResolvedFontResource, ResolvedImageResource, writeContentStream };

package/dist/content-write.d.ts

@@ -20,12 +20,19 @@ interface ContentWriteContext {
   readonly measurer: TextMeasurer;
   resolveFont(font: LayoutFont): ResolvedFontResource;
   resolveImage(imageId: string): ResolvedImageResource;
+  readonly layerObjectNumberOf?: (name: string) => number | undefined;
+  readonly nextMcid?: () => number;
 }
 interface ContentStreamResult {
   readonly bytes: Uint8Array<ArrayBuffer>;
+  readonly markedStructure: readonly MarkedStructureItem[];
   readonly substitutions: readonly WinAnsiSubstitution[];
   readonly missingGlyphs: readonly EmbeddedFaceSubstitution[];
 }
 declare function writeContentStream(items: readonly LayoutItem[], context: ContentWriteContext): ContentStreamResult;
+interface MarkedStructureItem {
+  readonly mcid: number;
+  readonly structureId: string;
+}
 //#endregion
-export { ContentStreamResult, ContentWriteContext, ResolvedFontResource, ResolvedImageResource, writeContentStream };
+export { ContentStreamResult, ContentWriteContext, MarkedStructureItem, ResolvedFontResource, ResolvedImageResource, writeContentStream };

package/dist/content-write.js

@@ -312,16 +312,38 @@ function writeContentStream(items, context) {
 	const writer = new ByteWriter();
 	const substitutions = [];
 	const missingGlyphs = [];
-	for (const item of items) if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-	else if (item.kind === "image") writeImage(writer, item, context);
-	else if (item.kind === "rect") writeRect(writer, item);
-	else if (item.kind === "line") writeLine(writer, item);
-	else if (item.kind === "ellipse") writeEllipse(writer, item);
-	else if (item.kind === "path") writePath(writer, item);
+	const markedStructure = [];
+	for (const item of items) {
+		const itemLayer = "layer" in item ? item.layer : void 0;
+		const itemStructure = "structure" in item ? item.structure : void 0;
+		const layerObjectNum = itemLayer !== void 0 ? context.layerObjectNumberOf?.(itemLayer) : void 0;
+		const marked = itemStructure !== void 0 || layerObjectNum !== void 0;
+		if (marked) {
+			writer.writeAscii("/P <<");
+			if (itemStructure !== void 0 && context.nextMcid !== void 0) {
+				const mcid = context.nextMcid();
+				markedStructure.push({
+					mcid,
+					structureId: itemStructure
+				});
+				writer.writeAscii(` /MCID ${mcid}`);
+			}
+			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
+			writer.writeAscii(" >> BDC\n");
+		}
+		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
+		else if (item.kind === "image") writeImage(writer, item, context);
+		else if (item.kind === "rect") writeRect(writer, item);
+		else if (item.kind === "line") writeLine(writer, item);
+		else if (item.kind === "ellipse") writeEllipse(writer, item);
+		else if (item.kind === "path") writePath(writer, item);
+		if (marked) writer.writeAscii("EMC\n");
+	}
 	return {
 		bytes: writer.toBytes(),
 		substitutions,
-		missingGlyphs
+		missingGlyphs,
+		markedStructure
 	};
 }
 //#endregion

package/dist/image/ccitt-encode.cjs

@@ -0,0 +1,119 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_image_ccitt = require("./ccitt.cjs");
+//#region src/image/ccitt-encode.ts
+function buildRunCodes(table) {
+	const map = /* @__PURE__ */ new Map();
+	for (const [bits, run] of table) map.set(run, bits);
+	for (const [bits, run] of require_image_ccitt.EXTENDED_MAKEUP) if (!map.has(run)) map.set(run, bits);
+	return map;
+}
+const WHITE_RUN_CODES = buildRunCodes(require_image_ccitt.WHITE_TERMINATING_AND_MAKEUP);
+const BLACK_RUN_CODES = buildRunCodes(require_image_ccitt.BLACK_TERMINATING_AND_MAKEUP);
+const PASS_MODE = "0001";
+const HORIZONTAL_MODE = "001";
+const VERTICAL_MODES = /* @__PURE__ */ new Map([
+	[0, "1"],
+	[1, "011"],
+	[-1, "010"],
+	[2, "000011"],
+	[-2, "000010"],
+	[3, "0000011"],
+	[-3, "0000010"]
+]);
+const LARGEST_MAKEUP_RUN = 2560;
+const MAKEUP_GRANULARITY = 64;
+var BitWriter = class {
+	bytes = [];
+	current = 0;
+	used = 0;
+	get byteLength() {
+		return this.bytes.length;
+	}
+	writeBits(bits) {
+		for (const char of bits) {
+			this.current = this.current << 1 | (char === "1" ? 1 : 0);
+			this.used++;
+			if (this.used === 8) {
+				this.bytes.push(this.current);
+				this.current = 0;
+				this.used = 0;
+			}
+		}
+	}
+	finish() {
+		if (this.used > 0) this.bytes.push(this.current << 8 - this.used);
+		return new Uint8Array(this.bytes);
+	}
+};
+function writeRun(writer, run, white) {
+	const codes = white ? WHITE_RUN_CODES : BLACK_RUN_CODES;
+	let remaining = run;
+	while (remaining >= MAKEUP_GRANULARITY) {
+		const makeup = Math.min(remaining - remaining % MAKEUP_GRANULARITY, LARGEST_MAKEUP_RUN);
+		writer.writeBits(codes.get(makeup));
+		remaining -= makeup;
+	}
+	writer.writeBits(codes.get(remaining));
+}
+function changingElements(bitmap, rowByteOffset, columns) {
+	const changes = [];
+	let previous = 1;
+	for (let x = 0; x < columns; x++) {
+		const pixel = (bitmap[rowByteOffset + (x >> 3)] ?? 0) >> 7 - (x & 7) & 1;
+		if (pixel !== previous) {
+			changes.push(x);
+			previous = pixel;
+		}
+	}
+	return changes;
+}
+function encodeCcittFax(bitmap, options) {
+	const { columns, rows, maxBytes } = options;
+	if (columns <= 0 || rows <= 0) return /* @__PURE__ */ new Uint8Array(0);
+	const rowBytes = columns + 7 >> 3;
+	const writer = new BitWriter();
+	let reference = [];
+	for (let y = 0; y < rows; y++) {
+		const offset = y * rowBytes;
+		const current = changingElements(bitmap, offset, columns);
+		let ci = 0;
+		let ri = 0;
+		const cur = (i) => current[i] ?? columns;
+		const ref = (i) => reference[i] ?? columns;
+		let a0 = -1;
+		let white = true;
+		while (a0 < columns) {
+			if (maxBytes !== void 0 && writer.byteLength > maxBytes) return;
+			const a1 = cur(ci);
+			const a2 = cur(ci + 1);
+			while (ri < reference.length && ref(ri) <= a0) ri++;
+			let b1Index = ri;
+			if (b1Index % 2 !== (white ? 0 : 1)) b1Index++;
+			const b1 = ref(b1Index);
+			const b2 = ref(b1Index + 1);
+			if (b2 < a1) {
+				writer.writeBits(PASS_MODE);
+				a0 = b2;
+			} else {
+				const delta = a1 - b1;
+				const vertical = VERTICAL_MODES.get(delta);
+				if (vertical !== void 0) {
+					writer.writeBits(vertical);
+					a0 = a1;
+					ci++;
+				} else {
+					writer.writeBits(HORIZONTAL_MODE);
+					writeRun(writer, a1 - Math.max(a0, 0), white);
+					writeRun(writer, a2 - a1, !white);
+					a0 = a2;
+					ci += 2;
+				}
+			}
+			if (a0 < columns) white = ((bitmap[offset + (a0 >> 3)] ?? 0) >> 7 - (a0 & 7) & 1) === 1;
+		}
+		reference = current;
+	}
+	return writer.finish();
+}
+//#endregion
+exports.encodeCcittFax = encodeCcittFax;

package/dist/image/ccitt-encode.d.cts

@@ -0,0 +1,9 @@
+//#region src/image/ccitt-encode.d.ts
+interface EncodeCcittFaxOptions {
+  readonly columns: number;
+  readonly rows: number;
+  readonly maxBytes?: number;
+}
+declare function encodeCcittFax(bitmap: Uint8Array, options: EncodeCcittFaxOptions): Uint8Array<ArrayBuffer> | undefined;
+//#endregion
+export { EncodeCcittFaxOptions, encodeCcittFax };

package/dist/image/ccitt-encode.d.ts

@@ -0,0 +1,9 @@
+//#region src/image/ccitt-encode.d.ts
+interface EncodeCcittFaxOptions {
+  readonly columns: number;
+  readonly rows: number;
+  readonly maxBytes?: number;
+}
+declare function encodeCcittFax(bitmap: Uint8Array, options: EncodeCcittFaxOptions): Uint8Array<ArrayBuffer> | undefined;
+//#endregion
+export { EncodeCcittFaxOptions, encodeCcittFax };

package/dist/image/ccitt-encode.js

@@ -0,0 +1,118 @@
+import { BLACK_TERMINATING_AND_MAKEUP, EXTENDED_MAKEUP, WHITE_TERMINATING_AND_MAKEUP } from "./ccitt.js";
+//#region src/image/ccitt-encode.ts
+function buildRunCodes(table) {
+	const map = /* @__PURE__ */ new Map();
+	for (const [bits, run] of table) map.set(run, bits);
+	for (const [bits, run] of EXTENDED_MAKEUP) if (!map.has(run)) map.set(run, bits);
+	return map;
+}
+const WHITE_RUN_CODES = buildRunCodes(WHITE_TERMINATING_AND_MAKEUP);
+const BLACK_RUN_CODES = buildRunCodes(BLACK_TERMINATING_AND_MAKEUP);
+const PASS_MODE = "0001";
+const HORIZONTAL_MODE = "001";
+const VERTICAL_MODES = /* @__PURE__ */ new Map([
+	[0, "1"],
+	[1, "011"],
+	[-1, "010"],
+	[2, "000011"],
+	[-2, "000010"],
+	[3, "0000011"],
+	[-3, "0000010"]
+]);
+const LARGEST_MAKEUP_RUN = 2560;
+const MAKEUP_GRANULARITY = 64;
+var BitWriter = class {
+	bytes = [];
+	current = 0;
+	used = 0;
+	get byteLength() {
+		return this.bytes.length;
+	}
+	writeBits(bits) {
+		for (const char of bits) {
+			this.current = this.current << 1 | (char === "1" ? 1 : 0);
+			this.used++;
+			if (this.used === 8) {
+				this.bytes.push(this.current);
+				this.current = 0;
+				this.used = 0;
+			}
+		}
+	}
+	finish() {
+		if (this.used > 0) this.bytes.push(this.current << 8 - this.used);
+		return new Uint8Array(this.bytes);
+	}
+};
+function writeRun(writer, run, white) {
+	const codes = white ? WHITE_RUN_CODES : BLACK_RUN_CODES;
+	let remaining = run;
+	while (remaining >= MAKEUP_GRANULARITY) {
+		const makeup = Math.min(remaining - remaining % MAKEUP_GRANULARITY, LARGEST_MAKEUP_RUN);
+		writer.writeBits(codes.get(makeup));
+		remaining -= makeup;
+	}
+	writer.writeBits(codes.get(remaining));
+}
+function changingElements(bitmap, rowByteOffset, columns) {
+	const changes = [];
+	let previous = 1;
+	for (let x = 0; x < columns; x++) {
+		const pixel = (bitmap[rowByteOffset + (x >> 3)] ?? 0) >> 7 - (x & 7) & 1;
+		if (pixel !== previous) {
+			changes.push(x);
+			previous = pixel;
+		}
+	}
+	return changes;
+}
+function encodeCcittFax(bitmap, options) {
+	const { columns, rows, maxBytes } = options;
+	if (columns <= 0 || rows <= 0) return /* @__PURE__ */ new Uint8Array(0);
+	const rowBytes = columns + 7 >> 3;
+	const writer = new BitWriter();
+	let reference = [];
+	for (let y = 0; y < rows; y++) {
+		const offset = y * rowBytes;
+		const current = changingElements(bitmap, offset, columns);
+		let ci = 0;
+		let ri = 0;
+		const cur = (i) => current[i] ?? columns;
+		const ref = (i) => reference[i] ?? columns;
+		let a0 = -1;
+		let white = true;
+		while (a0 < columns) {
+			if (maxBytes !== void 0 && writer.byteLength > maxBytes) return;
+			const a1 = cur(ci);
+			const a2 = cur(ci + 1);
+			while (ri < reference.length && ref(ri) <= a0) ri++;
+			let b1Index = ri;
+			if (b1Index % 2 !== (white ? 0 : 1)) b1Index++;
+			const b1 = ref(b1Index);
+			const b2 = ref(b1Index + 1);
+			if (b2 < a1) {
+				writer.writeBits(PASS_MODE);
+				a0 = b2;
+			} else {
+				const delta = a1 - b1;
+				const vertical = VERTICAL_MODES.get(delta);
+				if (vertical !== void 0) {
+					writer.writeBits(vertical);
+					a0 = a1;
+					ci++;
+				} else {
+					writer.writeBits(HORIZONTAL_MODE);
+					writeRun(writer, a1 - Math.max(a0, 0), white);
+					writeRun(writer, a2 - a1, !white);
+					a0 = a2;
+					ci += 2;
+				}
+			}
+			if (a0 < columns) white = ((bitmap[offset + (a0 >> 3)] ?? 0) >> 7 - (a0 & 7) & 1) === 1;
+		}
+		reference = current;
+	}
+	return writer.finish();
+}
+//#endregion
+export { encodeCcittFax };

package/dist/image/ccitt.cjs

@@ -485,4 +485,7 @@ function decodeCcittFax(data, options = {}) {
 	};
 }
 //#endregion
+exports.BLACK_TERMINATING_AND_MAKEUP = BLACK_TERMINATING_AND_MAKEUP;
+exports.EXTENDED_MAKEUP = EXTENDED_MAKEUP;
+exports.WHITE_TERMINATING_AND_MAKEUP = WHITE_TERMINATING_AND_MAKEUP;
 exports.decodeCcittFax = decodeCcittFax;

package/dist/image/ccitt.d.cts

@@ -1,4 +1,7 @@
 //#region src/image/ccitt.d.ts
+declare const WHITE_TERMINATING_AND_MAKEUP: readonly (readonly [string, number])[];
+declare const BLACK_TERMINATING_AND_MAKEUP: readonly (readonly [string, number])[];
+declare const EXTENDED_MAKEUP: readonly (readonly [string, number])[];
 interface CcittFaxOptions {
   readonly k?: number;
   readonly columns?: number;
@@ -14,4 +17,4 @@ interface CcittFaxImage {
 }
 declare function decodeCcittFax(data: Uint8Array<ArrayBuffer>, options?: CcittFaxOptions): CcittFaxImage;
 //#endregion
-export { CcittFaxImage, CcittFaxOptions, decodeCcittFax };
+export { BLACK_TERMINATING_AND_MAKEUP, CcittFaxImage, CcittFaxOptions, EXTENDED_MAKEUP, WHITE_TERMINATING_AND_MAKEUP, decodeCcittFax };

package/dist/image/ccitt.d.ts

@@ -1,4 +1,7 @@
 //#region src/image/ccitt.d.ts
+declare const WHITE_TERMINATING_AND_MAKEUP: readonly (readonly [string, number])[];
+declare const BLACK_TERMINATING_AND_MAKEUP: readonly (readonly [string, number])[];
+declare const EXTENDED_MAKEUP: readonly (readonly [string, number])[];
 interface CcittFaxOptions {
   readonly k?: number;
   readonly columns?: number;
@@ -14,4 +17,4 @@ interface CcittFaxImage {
 }
 declare function decodeCcittFax(data: Uint8Array<ArrayBuffer>, options?: CcittFaxOptions): CcittFaxImage;
 //#endregion
-export { CcittFaxImage, CcittFaxOptions, decodeCcittFax };
+export { BLACK_TERMINATING_AND_MAKEUP, CcittFaxImage, CcittFaxOptions, EXTENDED_MAKEUP, WHITE_TERMINATING_AND_MAKEUP, decodeCcittFax };

package/dist/image/ccitt.js

@@ -484,4 +484,4 @@ function decodeCcittFax(data, options = {}) {
 	};
 }
 //#endregion
-export { decodeCcittFax };
+export { BLACK_TERMINATING_AND_MAKEUP, EXTENDED_MAKEUP, WHITE_TERMINATING_AND_MAKEUP, decodeCcittFax };

package/dist/write.cjs

@@ -4,12 +4,15 @@ const require_notes_annotation_author = require("./notes-annotation-author.cjs")
 const require_objects = require("./objects.cjs");
 const require_bytes_writer = require("./bytes/writer.cjs");
 const require_serialize = require("./serialize.cjs");
+const require_bytes_reader = require("./bytes/reader.cjs");
 const require_bytes_flate = require("./bytes/flate.cjs");
 const require_util_base64 = require("./util/base64.cjs");
+const require_parse = require("./parse.cjs");
 const require_util_abort = require("./util/abort.cjs");
 const require_crypto_random = require("./crypto/random.cjs");
 const require_encrypt_write = require("./encrypt-write.cjs");
 const require_image_jpeg_info = require("./image/jpeg-info.cjs");
+const require_image_ccitt_encode = require("./image/ccitt-encode.cjs");
 const require_image_png_decode = require("./image/png-decode.cjs");
 const require_embedded_font = require("./embedded-font.cjs");
 const require_content_write = require("./content-write.cjs");
@@ -143,9 +146,57 @@ function pngImageDict(width, height, colorSpace, compress) {
 	if (compress) entries.set("Filter", require_objects.pdfName("FlateDecode"));
 	return require_objects.pdfDict(entries);
 }
+function packBilevel(raw) {
+	const rowBytes = raw.width + 7 >> 3;
+	const packed = new Uint8Array(rowBytes * raw.height);
+	for (let y = 0; y < raw.height; y++) for (let x = 0; x < raw.width; x++) {
+		const sample = raw.data[y * raw.width + x] ?? 0;
+		if (sample !== 0 && sample !== 255) return;
+		if (sample === 255) {
+			const index = y * rowBytes + (x >> 3);
+			packed[index] = (packed[index] ?? 0) | 128 >> (x & 7);
+		}
+	}
+	return packed;
+}
 function preparePngImage(bytes, compress) {
 	const raw = require_image_png_decode.decodePng(bytes);
 	const colorSpace = raw.channels === 1 ? "DeviceGray" : "DeviceRGB";
+	if (compress && raw.channels === 1 && raw.alpha === void 0) {
+		const bilevel = packBilevel(raw);
+		if (bilevel !== void 0) {
+			const flate = require_bytes_flate.deflate(raw.data);
+			const g4 = require_image_ccitt_encode.encodeCcittFax(bilevel, {
+				columns: raw.width,
+				rows: raw.height,
+				maxBytes: flate.length
+			});
+			if (g4 !== void 0) return {
+				dict: require_objects.pdfDict(/* @__PURE__ */ new Map([
+					["Type", require_objects.pdfName("XObject")],
+					["Subtype", require_objects.pdfName("Image")],
+					["Width", require_objects.pdfNum(raw.width)],
+					["Height", require_objects.pdfNum(raw.height)],
+					["ColorSpace", require_objects.pdfName("DeviceGray")],
+					["BitsPerComponent", require_objects.pdfNum(1)],
+					["Filter", require_objects.pdfName("CCITTFaxDecode")],
+					["DecodeParms", require_objects.pdfDict(/* @__PURE__ */ new Map([
+						["K", require_objects.pdfNum(-1)],
+						["Columns", require_objects.pdfNum(raw.width)],
+						["Rows", require_objects.pdfNum(raw.height)],
+						["BlackIs1", require_objects.pdfBool(false)]
+					]))]
+				])),
+				raw: g4,
+				alpha: void 0
+			};
+			return {
+				dict: pngImageDict(raw.width, raw.height, colorSpace, true),
+				raw: flate,
+				alpha: void 0
+			};
+		}
+	}
 	return {
 		dict: pngImageDict(raw.width, raw.height, colorSpace, compress),
 		raw: compress ? require_bytes_flate.deflate(raw.data) : raw.data,
@@ -252,6 +303,24 @@ function buildNotesAnnotDict(notes) {
 function xrefEntry(offset, generation, inUse) {
 	return `${offset.toString().padStart(10, "0")} ${generation.toString().padStart(5, "0")} ${inUse ? "n" : "f"} \n`;
 }
+function parseResidueRow(residue) {
+	const reader = new require_bytes_reader.ByteReader(new TextEncoder().encode(residue.xml));
+	return require_parse.parseValue(reader, () => {});
+}
+function objectContainsReference(obj) {
+	if (obj.kind === "ref") return true;
+	if (obj.kind === "array") return obj.items.some(objectContainsReference);
+	if (obj.kind === "dict") return [...obj.entries.values()].some(objectContainsReference);
+	if (obj.kind === "stream") return [...obj.dict.entries.values()].some(objectContainsReference);
+	return false;
+}
+function restoreResidueRow(source, key) {
+	const row = source?.[key];
+	if (row === void 0) return;
+	const parsed = parseResidueRow(row);
+	if (parsed === void 0 || objectContainsReference(parsed)) return;
+	return parsed;
+}
 function writePdf(doc, options = {}) {
 	const compress = options.compress ?? true;
 	const registry = options.fonts;
@@ -340,10 +409,80 @@ function writePdf(doc, options = {}) {
 		};
 		for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
 	}
+	const layerNumByName = /* @__PURE__ */ new Map();
+	for (const layer of doc.layers ?? []) layerNumByName.set(layer.name, nextObjNum++);
+	const formObjectNums = [];
+	const countFieldObjects = (fields) => {
+		let n = 0;
+		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length - 1 : 0) + countFieldObjects(field.children);
+		return n;
+	};
+	for (let i = 0; i < countFieldObjects(doc.form ?? []); i += 1) formObjectNums.push(nextObjNum++);
+	const formNumByField = /* @__PURE__ */ new Map();
+	const formExtraWidgetNums = /* @__PURE__ */ new Map();
+	let formNumCursor = 0;
+	const claimFormNums = (fields) => {
+		for (const field of fields) {
+			formNumByField.set(field, formObjectNums[formNumCursor++]);
+			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.slice(1).map(() => formObjectNums[formNumCursor++]));
+			claimFormNums(field.children);
+		}
+	};
+	claimFormNums(doc.form ?? []);
+	const formNumOf = (field) => {
+		const num = formNumByField.get(field);
+		if (num === void 0) throw new Error("AcroForm field object number was not claimed -- this is a writePdf internal invariant violation");
+		return num;
+	};
+	const structElementNumById = /* @__PURE__ */ new Map();
+	const countElements = (elements) => {
+		let n = 0;
+		for (const element of elements) {
+			structElementNumById.set(element.id, nextObjNum++);
+			n += 1 + countElements(element.children);
+		}
+		return n;
+	};
+	const structElementCount = countElements(doc.structure ?? []);
+	const structRootNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	const structParentTreeNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	const residueXmpNum = doc.source?.xmp !== void 0 ? nextObjNum++ : void 0;
 	const objects = [];
 	const catalogEntries = [["Type", require_objects.pdfName("Catalog")], ["Pages", require_objects.pdfRef(pagesNum, 0)]];
 	if (attachmentsNamesNum !== void 0) catalogEntries.push(["Names", require_objects.pdfRef(attachmentsNamesNum, 0)]);
 	if (outlineRootNum !== void 0) catalogEntries.push(["Outlines", require_objects.pdfRef(outlineRootNum, 0)]);
+	if (layerNumByName.size > 0) {
+		const ocgRefs = [...layerNumByName.values()].map((num) => require_objects.pdfRef(num, 0));
+		const visible = [];
+		const hidden = [];
+		for (const layer of doc.layers ?? []) {
+			const num = layerNumByName.get(layer.name);
+			(layer.visible ? visible : hidden).push(require_objects.pdfRef(num, 0));
+		}
+		const defaultConfigEntries = [];
+		if (visible.length > 0) defaultConfigEntries.push(["ON", require_objects.pdfArray(visible)]);
+		if (hidden.length > 0) defaultConfigEntries.push(["OFF", require_objects.pdfArray(hidden)]);
+		catalogEntries.push(["OCProperties", require_objects.pdfDict({
+			OCGs: require_objects.pdfArray(ocgRefs),
+			D: require_objects.pdfDict(Object.fromEntries(defaultConfigEntries))
+		})]);
+	}
+	if (doc.form !== void 0 && doc.form.length > 0) catalogEntries.push(["AcroForm", require_objects.pdfDict({ Fields: require_objects.pdfArray(doc.form.map((field) => require_objects.pdfRef(formNumOf(field), 0))) })]);
+	if (structRootNum !== void 0) catalogEntries.push(["StructTreeRoot", require_objects.pdfRef(structRootNum, 0)]);
+	if (residueXmpNum !== void 0) catalogEntries.push(["Metadata", require_objects.pdfRef(residueXmpNum, 0)]);
+	const trailerIdRestore = restoreResidueRow(doc.source, "trailer-id");
+	for (const [rowKey, catalogKey] of [
+		["viewer-preferences", "ViewerPreferences"],
+		["page-mode", "PageMode"],
+		["page-layout", "PageLayout"],
+		["output-intents", "OutputIntents"],
+		["piece-info", "PieceInfo"],
+		["legal", "Legal"],
+		["collection", "Collection"]
+	]) {
+		const restored = restoreResidueRow(doc.source, rowKey);
+		if (restored !== void 0) catalogEntries.push([catalogKey, restored]);
+	}
 	objects.push({
 		num: catalogNum,
 		value: require_objects.pdfDict(Object.fromEntries(catalogEntries))
@@ -427,6 +566,118 @@ function writePdf(doc, options = {}) {
 			})
 		});
 	}
+	for (const layer of doc.layers ?? []) {
+		const num = layerNumByName.get(layer.name);
+		objects.push({
+			num,
+			value: require_objects.pdfDict({
+				Type: require_objects.pdfName("OCG"),
+				Name: require_objects.pdfLiteralString(new TextEncoder().encode(layer.name))
+			})
+		});
+	}
+	const widgetRectArray = (widget) => require_objects.pdfArray([
+		widget.xPt,
+		widget.yPt,
+		widget.xPt + widget.widthPt,
+		widget.yPt + widget.heightPt
+	].map((n) => require_objects.pdfNum(n)));
+	const widgetDict = (widget) => require_objects.pdfDict({
+		Subtype: require_objects.pdfName("Widget"),
+		Rect: widgetRectArray(widget),
+		P: require_objects.pdfRef(pageAllocs[widget.pageIndex].pageNum, 0)
+	});
+	const FIELD_TYPE_PDF_NAME = {
+		text: "Tx",
+		checkbox: "Btn",
+		radio: "Btn",
+		button: "Btn",
+		listbox: "Ch",
+		combobox: "Ch",
+		signature: "Sig"
+	};
+	const emitFormFieldObjects = (fields, parentName) => {
+		for (const field of fields) {
+			const ownName = parentName.length > 0 && field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
+			const entries = [];
+			if (ownName.length > 0) entries.push(["T", require_objects.pdfLiteralString(new TextEncoder().encode(ownName))]);
+			if (field.alias !== void 0) entries.push(["TU", require_objects.pdfLiteralString(new TextEncoder().encode(field.alias))]);
+			if (field.fieldType === "group") entries.push(["Kids", require_objects.pdfArray(field.children.map((child) => require_objects.pdfRef(formNumOf(child), 0)))]);
+			else {
+				entries.push(["FT", require_objects.pdfName(FIELD_TYPE_PDF_NAME[field.fieldType])]);
+				const FLAG_READ_ONLY = 1;
+				const FLAG_PUSHBUTTON = 4;
+				const FLAG_RADIO = 32768;
+				const FLAG_COMBO = 131072;
+				let flags = 0;
+				if (field.readOnly === true) flags |= FLAG_READ_ONLY;
+				if (field.fieldType === "button") flags |= FLAG_PUSHBUTTON;
+				if (field.fieldType === "radio") flags |= FLAG_RADIO;
+				if (field.fieldType === "combobox") flags |= FLAG_COMBO;
+				if (flags !== 0) entries.push(["Ff", require_objects.pdfNum(flags)]);
+				if (field.fieldType === "text" || field.fieldType === "listbox" || field.fieldType === "combobox") {
+					if (field.value !== void 0) entries.push(["V", require_objects.pdfLiteralString(new TextEncoder().encode(field.value))]);
+				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", require_objects.pdfName(field.checked === false || field.value === void 0 ? field.value ?? (field.checked === true ? "Yes" : "Off") : field.value)]);
+				if (field.options !== void 0) entries.push(["Opt", require_objects.pdfArray(field.options.map((option) => require_objects.pdfLiteralString(new TextEncoder().encode(option))))]);
+				const firstWidget = field.widgets[0];
+				if (field.widgets.length === 1 && firstWidget !== void 0) {
+					entries.push(["Subtype", require_objects.pdfName("Widget")]);
+					entries.push(["Rect", widgetRectArray(firstWidget)]);
+					entries.push(["P", require_objects.pdfRef(pageAllocs[firstWidget.pageIndex].pageNum, 0)]);
+				} else if (field.widgets.length > 1 && firstWidget !== void 0) {
+					const extraNums = formExtraWidgetNums.get(field) ?? [];
+					entries.push(["Kids", require_objects.pdfArray([widgetDict(firstWidget), ...extraNums.map((num) => require_objects.pdfRef(num, 0))])]);
+				}
+			}
+			objects.push({
+				num: formNumOf(field),
+				value: require_objects.pdfDict(Object.fromEntries(entries))
+			});
+			const extraNums = formExtraWidgetNums.get(field) ?? [];
+			for (const [index, num] of extraNums.entries()) {
+				const widget = field.widgets[index + 1];
+				objects.push({
+					num,
+					value: widgetDict(widget)
+				});
+			}
+			emitFormFieldObjects(field.children, field.name);
+		}
+	};
+	emitFormFieldObjects(doc.form ?? [], "");
+	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+		const emitStructureElement = (element, parentNum) => {
+			const entries = [
+				["Type", require_objects.pdfName("StructElem")],
+				["S", require_objects.pdfName(element.type)],
+				["P", require_objects.pdfRef(parentNum, 0)]
+			];
+			if (element.title !== void 0) entries.push(["T", require_objects.pdfLiteralString(new TextEncoder().encode(element.title))]);
+			if (element.language !== void 0) entries.push(["Lang", require_objects.pdfLiteralString(new TextEncoder().encode(element.language))]);
+			if (element.alt !== void 0) entries.push(["Alt", require_objects.pdfLiteralString(new TextEncoder().encode(element.alt))]);
+			if (element.actualText !== void 0) entries.push(["ActualText", require_objects.pdfLiteralString(new TextEncoder().encode(element.actualText))]);
+			if (element.children.length > 0) entries.push(["K", require_objects.pdfArray(element.children.map((child) => {
+				const num = structElementNumById.get(child.id);
+				if (num === void 0) throw new Error(`structure element "${child.id}" was not allocated -- this is a writePdf internal invariant violation`);
+				return require_objects.pdfRef(num, 0);
+			}))]);
+			const ownNum = structElementNumById.get(element.id);
+			if (ownNum === void 0) throw new Error(`structure element "${element.id}" was not allocated -- this is a writePdf internal invariant violation`);
+			objects.push({
+				num: ownNum,
+				value: require_objects.pdfDict(Object.fromEntries(entries))
+			});
+			for (const child of element.children) emitStructureElement(child, ownNum);
+		};
+		for (const element of doc.structure ?? []) emitStructureElement(element, structRootNum);
+	}
+	if (residueXmpNum !== void 0 && doc.source?.xmp !== void 0) objects.push({
+		num: residueXmpNum,
+		value: require_objects.pdfStream(require_objects.pdfDict({
+			Type: require_objects.pdfName("Metadata"),
+			Subtype: require_objects.pdfName("XML")
+		}), new TextEncoder().encode(doc.source.xmp.xml))
+	});
 	for (const [standardName, alloc] of fontAllocs) {
 		const { font, descriptor } = buildFontObjects(standardName, require_objects.pdfRef(alloc.descNum, 0));
 		objects.push({
@@ -521,6 +772,7 @@ function writePdf(doc, options = {}) {
 	}
 	if (imageAllocs.size > 0) resourceEntries.set("XObject", require_objects.pdfDict(new Map([...imageAllocs.values()].map((alloc) => [alloc.resourceName, require_objects.pdfRef(alloc.imageNum, 0)]))));
 	const resourcesDict = require_objects.pdfDict(resourceEntries);
+	const markedStructureByPage = /* @__PURE__ */ new Map();
 	const formulasByPage = /* @__PURE__ */ new Map();
 	for (const formula of formulas) {
 		const forPage = formulasByPage.get(formula.pageIndex);
@@ -557,7 +809,14 @@ function writePdf(doc, options = {}) {
 	doc.pages.forEach((page, pageIndex) => {
 		require_util_abort.throwIfAborted(options.signal);
 		const { pageNum, contentsNum } = pageAllocs[pageIndex];
-		const { bytes: contentBytes, substitutions, missingGlyphs } = require_content_write.writeContentStream(page.items, context);
+		let pageMcid = 0;
+		const pageContext = {
+			...context,
+			nextMcid: () => pageMcid++,
+			layerObjectNumberOf: (name) => layerNumByName.get(name)
+		};
+		const { bytes: contentBytes, substitutions, missingGlyphs, markedStructure } = require_content_write.writeContentStream(page.items, pageContext);
+		if (markedStructure.length > 0) markedStructureByPage.set(pageIndex, [...markedStructure]);
 		for (const substitution of substitutions) options.onSubstitution?.(substitution, { pageIndex });
 		for (const missing of missingGlyphs) options.onMissingGlyph?.(missing, { pageIndex });
 		const pageFormulas = formulasByPage.get(pageIndex);
@@ -587,11 +846,41 @@ function writePdf(doc, options = {}) {
 			["Contents", require_objects.pdfRef(contentsNum, 0)]
 		]);
 		if (annots.length > 0) pageEntries.set("Annots", require_objects.pdfArray(annots));
+		if ((markedStructureByPage.get(pageIndex) ?? []).length > 0) pageEntries.set("StructParents", require_objects.pdfNum(pageIndex));
 		objects.push({
 			num: pageNum,
 			value: require_objects.pdfDict(pageEntries)
 		});
 	});
+	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+		const nums = [];
+		for (const [pageIndex, marks] of markedStructureByPage) {
+			const maxMcid = Math.max(...marks.map((mark) => mark.mcid));
+			const byMcid = Array.from({ length: maxMcid + 1 }, () => require_objects.pdfNull());
+			for (const mark of marks) {
+				const elementNum = structElementNumById.get(mark.structureId);
+				if (elementNum !== void 0) byMcid[mark.mcid] = require_objects.pdfRef(elementNum, 0);
+			}
+			nums.push(require_objects.pdfNum(pageIndex), require_objects.pdfArray(byMcid));
+		}
+		objects.push({
+			num: structParentTreeNum,
+			value: require_objects.pdfDict({ Nums: require_objects.pdfArray(nums) })
+		});
+		const rootEntries = [
+			["Type", require_objects.pdfName("StructTreeRoot")],
+			["K", require_objects.pdfArray((doc.structure ?? []).map((element) => {
+				const num = structElementNumById.get(element.id);
+				if (num === void 0) throw new Error(`structure element "${element.id}" was not allocated -- this is a writePdf internal invariant violation`);
+				return require_objects.pdfRef(num, 0);
+			}))],
+			["ParentTree", require_objects.pdfRef(structParentTreeNum, 0)]
+		];
+		objects.push({
+			num: structRootNum,
+			value: require_objects.pdfDict(Object.fromEntries(rootEntries))
+		});
+	}
 	let fileId;
 	let encryptedObjects = objects;
 	if (options.encryption !== void 0 && encryptDictNum !== void 0) {
@@ -633,7 +922,7 @@ function writePdf(doc, options = {}) {
 	if (fileId !== void 0 && encryptDictNum !== void 0) {
 		trailerEntries.set("ID", require_objects.pdfArray([require_objects.pdfHexString(fileId), require_objects.pdfHexString(fileId)]));
 		trailerEntries.set("Encrypt", require_objects.pdfRef(encryptDictNum, 0));
-	}
+	} else if (trailerIdRestore !== void 0) trailerEntries.set("ID", trailerIdRestore);
 	writer.writeAscii("trailer\n");
 	require_serialize.writeObject(writer, require_objects.pdfDict(trailerEntries));
 	writer.writeAscii("\nstartxref\n");

package/dist/write.js

@@ -1,14 +1,17 @@
 import { n as widthOfCode, p as winAnsiGlyphName, t as STANDARD_METRICS } from "./afm-widths-De_QMWgC.js";
 import { NOTES_ANNOTATION_AUTHOR } from "./notes-annotation-author.js";
-import { pdfArray, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream } from "./objects.js";
+import { pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream } from "./objects.js";
 import { ByteWriter, concatBytes } from "./bytes/writer.js";
 import { writeObject } from "./serialize.js";
+import { ByteReader } from "./bytes/reader.js";
 import { deflate } from "./bytes/flate.js";
 import { base64ToBytes } from "./util/base64.js";
+import { parseValue } from "./parse.js";
 import { throwIfAborted } from "./util/abort.js";
 import { randomBytes } from "./crypto/random.js";
 import { createStandardEncryptor, encryptIndirectObject } from "./encrypt-write.js";
 import { readJpegInfo } from "./image/jpeg-info.js";
+import { encodeCcittFax } from "./image/ccitt-encode.js";
 import { decodePng } from "./image/png-decode.js";
 import { collectEmbeddedGlyphs } from "./embedded-font.js";
 import { writeContentStream } from "./content-write.js";
@@ -142,9 +145,57 @@ function pngImageDict(width, height, colorSpace, compress) {
 	if (compress) entries.set("Filter", pdfName("FlateDecode"));
 	return pdfDict(entries);
 }
+function packBilevel(raw) {
+	const rowBytes = raw.width + 7 >> 3;
+	const packed = new Uint8Array(rowBytes * raw.height);
+	for (let y = 0; y < raw.height; y++) for (let x = 0; x < raw.width; x++) {
+		const sample = raw.data[y * raw.width + x] ?? 0;
+		if (sample !== 0 && sample !== 255) return;
+		if (sample === 255) {
+			const index = y * rowBytes + (x >> 3);
+			packed[index] = (packed[index] ?? 0) | 128 >> (x & 7);
+		}
+	}
+	return packed;
+}
 function preparePngImage(bytes, compress) {
 	const raw = decodePng(bytes);
 	const colorSpace = raw.channels === 1 ? "DeviceGray" : "DeviceRGB";
+	if (compress && raw.channels === 1 && raw.alpha === void 0) {
+		const bilevel = packBilevel(raw);
+		if (bilevel !== void 0) {
+			const flate = deflate(raw.data);
+			const g4 = encodeCcittFax(bilevel, {
+				columns: raw.width,
+				rows: raw.height,
+				maxBytes: flate.length
+			});
+			if (g4 !== void 0) return {
+				dict: pdfDict(/* @__PURE__ */ new Map([
+					["Type", pdfName("XObject")],
+					["Subtype", pdfName("Image")],
+					["Width", pdfNum(raw.width)],
+					["Height", pdfNum(raw.height)],
+					["ColorSpace", pdfName("DeviceGray")],
+					["BitsPerComponent", pdfNum(1)],
+					["Filter", pdfName("CCITTFaxDecode")],
+					["DecodeParms", pdfDict(/* @__PURE__ */ new Map([
+						["K", pdfNum(-1)],
+						["Columns", pdfNum(raw.width)],
+						["Rows", pdfNum(raw.height)],
+						["BlackIs1", pdfBool(false)]
+					]))]
+				])),
+				raw: g4,
+				alpha: void 0
+			};
+			return {
+				dict: pngImageDict(raw.width, raw.height, colorSpace, true),
+				raw: flate,
+				alpha: void 0
+			};
+		}
+	}
 	return {
 		dict: pngImageDict(raw.width, raw.height, colorSpace, compress),
 		raw: compress ? deflate(raw.data) : raw.data,
@@ -251,6 +302,24 @@ function buildNotesAnnotDict(notes) {
 function xrefEntry(offset, generation, inUse) {
 	return `${offset.toString().padStart(10, "0")} ${generation.toString().padStart(5, "0")} ${inUse ? "n" : "f"} \n`;
 }
+function parseResidueRow(residue) {
+	const reader = new ByteReader(new TextEncoder().encode(residue.xml));
+	return parseValue(reader, () => {});
+}
+function objectContainsReference(obj) {
+	if (obj.kind === "ref") return true;
+	if (obj.kind === "array") return obj.items.some(objectContainsReference);
+	if (obj.kind === "dict") return [...obj.entries.values()].some(objectContainsReference);
+	if (obj.kind === "stream") return [...obj.dict.entries.values()].some(objectContainsReference);
+	return false;
+}
+function restoreResidueRow(source, key) {
+	const row = source?.[key];
+	if (row === void 0) return;
+	const parsed = parseResidueRow(row);
+	if (parsed === void 0 || objectContainsReference(parsed)) return;
+	return parsed;
+}
 function writePdf(doc, options = {}) {
 	const compress = options.compress ?? true;
 	const registry = options.fonts;
@@ -339,10 +408,80 @@ function writePdf(doc, options = {}) {
 		};
 		for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
 	}
+	const layerNumByName = /* @__PURE__ */ new Map();
+	for (const layer of doc.layers ?? []) layerNumByName.set(layer.name, nextObjNum++);
+	const formObjectNums = [];
+	const countFieldObjects = (fields) => {
+		let n = 0;
+		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length - 1 : 0) + countFieldObjects(field.children);
+		return n;
+	};
+	for (let i = 0; i < countFieldObjects(doc.form ?? []); i += 1) formObjectNums.push(nextObjNum++);
+	const formNumByField = /* @__PURE__ */ new Map();
+	const formExtraWidgetNums = /* @__PURE__ */ new Map();
+	let formNumCursor = 0;
+	const claimFormNums = (fields) => {
+		for (const field of fields) {
+			formNumByField.set(field, formObjectNums[formNumCursor++]);
+			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.slice(1).map(() => formObjectNums[formNumCursor++]));
+			claimFormNums(field.children);
+		}
+	};
+	claimFormNums(doc.form ?? []);
+	const formNumOf = (field) => {
+		const num = formNumByField.get(field);
+		if (num === void 0) throw new Error("AcroForm field object number was not claimed -- this is a writePdf internal invariant violation");
+		return num;
+	};
+	const structElementNumById = /* @__PURE__ */ new Map();
+	const countElements = (elements) => {
+		let n = 0;
+		for (const element of elements) {
+			structElementNumById.set(element.id, nextObjNum++);
+			n += 1 + countElements(element.children);
+		}
+		return n;
+	};
+	const structElementCount = countElements(doc.structure ?? []);
+	const structRootNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	const structParentTreeNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	const residueXmpNum = doc.source?.xmp !== void 0 ? nextObjNum++ : void 0;
 	const objects = [];
 	const catalogEntries = [["Type", pdfName("Catalog")], ["Pages", pdfRef(pagesNum, 0)]];
 	if (attachmentsNamesNum !== void 0) catalogEntries.push(["Names", pdfRef(attachmentsNamesNum, 0)]);
 	if (outlineRootNum !== void 0) catalogEntries.push(["Outlines", pdfRef(outlineRootNum, 0)]);
+	if (layerNumByName.size > 0) {
+		const ocgRefs = [...layerNumByName.values()].map((num) => pdfRef(num, 0));
+		const visible = [];
+		const hidden = [];
+		for (const layer of doc.layers ?? []) {
+			const num = layerNumByName.get(layer.name);
+			(layer.visible ? visible : hidden).push(pdfRef(num, 0));
+		}
+		const defaultConfigEntries = [];
+		if (visible.length > 0) defaultConfigEntries.push(["ON", pdfArray(visible)]);
+		if (hidden.length > 0) defaultConfigEntries.push(["OFF", pdfArray(hidden)]);
+		catalogEntries.push(["OCProperties", pdfDict({
+			OCGs: pdfArray(ocgRefs),
+			D: pdfDict(Object.fromEntries(defaultConfigEntries))
+		})]);
+	}
+	if (doc.form !== void 0 && doc.form.length > 0) catalogEntries.push(["AcroForm", pdfDict({ Fields: pdfArray(doc.form.map((field) => pdfRef(formNumOf(field), 0))) })]);
+	if (structRootNum !== void 0) catalogEntries.push(["StructTreeRoot", pdfRef(structRootNum, 0)]);
+	if (residueXmpNum !== void 0) catalogEntries.push(["Metadata", pdfRef(residueXmpNum, 0)]);
+	const trailerIdRestore = restoreResidueRow(doc.source, "trailer-id");
+	for (const [rowKey, catalogKey] of [
+		["viewer-preferences", "ViewerPreferences"],
+		["page-mode", "PageMode"],
+		["page-layout", "PageLayout"],
+		["output-intents", "OutputIntents"],
+		["piece-info", "PieceInfo"],
+		["legal", "Legal"],
+		["collection", "Collection"]
+	]) {
+		const restored = restoreResidueRow(doc.source, rowKey);
+		if (restored !== void 0) catalogEntries.push([catalogKey, restored]);
+	}
 	objects.push({
 		num: catalogNum,
 		value: pdfDict(Object.fromEntries(catalogEntries))
@@ -426,6 +565,118 @@ function writePdf(doc, options = {}) {
 			})
 		});
 	}
+	for (const layer of doc.layers ?? []) {
+		const num = layerNumByName.get(layer.name);
+		objects.push({
+			num,
+			value: pdfDict({
+				Type: pdfName("OCG"),
+				Name: pdfLiteralString(new TextEncoder().encode(layer.name))
+			})
+		});
+	}
+	const widgetRectArray = (widget) => pdfArray([
+		widget.xPt,
+		widget.yPt,
+		widget.xPt + widget.widthPt,
+		widget.yPt + widget.heightPt
+	].map((n) => pdfNum(n)));
+	const widgetDict = (widget) => pdfDict({
+		Subtype: pdfName("Widget"),
+		Rect: widgetRectArray(widget),
+		P: pdfRef(pageAllocs[widget.pageIndex].pageNum, 0)
+	});
+	const FIELD_TYPE_PDF_NAME = {
+		text: "Tx",
+		checkbox: "Btn",
+		radio: "Btn",
+		button: "Btn",
+		listbox: "Ch",
+		combobox: "Ch",
+		signature: "Sig"
+	};
+	const emitFormFieldObjects = (fields, parentName) => {
+		for (const field of fields) {
+			const ownName = parentName.length > 0 && field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
+			const entries = [];
+			if (ownName.length > 0) entries.push(["T", pdfLiteralString(new TextEncoder().encode(ownName))]);
+			if (field.alias !== void 0) entries.push(["TU", pdfLiteralString(new TextEncoder().encode(field.alias))]);
+			if (field.fieldType === "group") entries.push(["Kids", pdfArray(field.children.map((child) => pdfRef(formNumOf(child), 0)))]);
+			else {
+				entries.push(["FT", pdfName(FIELD_TYPE_PDF_NAME[field.fieldType])]);
+				const FLAG_READ_ONLY = 1;
+				const FLAG_PUSHBUTTON = 4;
+				const FLAG_RADIO = 32768;
+				const FLAG_COMBO = 131072;
+				let flags = 0;
+				if (field.readOnly === true) flags |= FLAG_READ_ONLY;
+				if (field.fieldType === "button") flags |= FLAG_PUSHBUTTON;
+				if (field.fieldType === "radio") flags |= FLAG_RADIO;
+				if (field.fieldType === "combobox") flags |= FLAG_COMBO;
+				if (flags !== 0) entries.push(["Ff", pdfNum(flags)]);
+				if (field.fieldType === "text" || field.fieldType === "listbox" || field.fieldType === "combobox") {
+					if (field.value !== void 0) entries.push(["V", pdfLiteralString(new TextEncoder().encode(field.value))]);
+				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", pdfName(field.checked === false || field.value === void 0 ? field.value ?? (field.checked === true ? "Yes" : "Off") : field.value)]);
+				if (field.options !== void 0) entries.push(["Opt", pdfArray(field.options.map((option) => pdfLiteralString(new TextEncoder().encode(option))))]);
+				const firstWidget = field.widgets[0];
+				if (field.widgets.length === 1 && firstWidget !== void 0) {
+					entries.push(["Subtype", pdfName("Widget")]);
+					entries.push(["Rect", widgetRectArray(firstWidget)]);
+					entries.push(["P", pdfRef(pageAllocs[firstWidget.pageIndex].pageNum, 0)]);
+				} else if (field.widgets.length > 1 && firstWidget !== void 0) {
+					const extraNums = formExtraWidgetNums.get(field) ?? [];
+					entries.push(["Kids", pdfArray([widgetDict(firstWidget), ...extraNums.map((num) => pdfRef(num, 0))])]);
+				}
+			}
+			objects.push({
+				num: formNumOf(field),
+				value: pdfDict(Object.fromEntries(entries))
+			});
+			const extraNums = formExtraWidgetNums.get(field) ?? [];
+			for (const [index, num] of extraNums.entries()) {
+				const widget = field.widgets[index + 1];
+				objects.push({
+					num,
+					value: widgetDict(widget)
+				});
+			}
+			emitFormFieldObjects(field.children, field.name);
+		}
+	};
+	emitFormFieldObjects(doc.form ?? [], "");
+	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+		const emitStructureElement = (element, parentNum) => {
+			const entries = [
+				["Type", pdfName("StructElem")],
+				["S", pdfName(element.type)],
+				["P", pdfRef(parentNum, 0)]
+			];
+			if (element.title !== void 0) entries.push(["T", pdfLiteralString(new TextEncoder().encode(element.title))]);
+			if (element.language !== void 0) entries.push(["Lang", pdfLiteralString(new TextEncoder().encode(element.language))]);
+			if (element.alt !== void 0) entries.push(["Alt", pdfLiteralString(new TextEncoder().encode(element.alt))]);
+			if (element.actualText !== void 0) entries.push(["ActualText", pdfLiteralString(new TextEncoder().encode(element.actualText))]);
+			if (element.children.length > 0) entries.push(["K", pdfArray(element.children.map((child) => {
+				const num = structElementNumById.get(child.id);
+				if (num === void 0) throw new Error(`structure element "${child.id}" was not allocated -- this is a writePdf internal invariant violation`);
+				return pdfRef(num, 0);
+			}))]);
+			const ownNum = structElementNumById.get(element.id);
+			if (ownNum === void 0) throw new Error(`structure element "${element.id}" was not allocated -- this is a writePdf internal invariant violation`);
+			objects.push({
+				num: ownNum,
+				value: pdfDict(Object.fromEntries(entries))
+			});
+			for (const child of element.children) emitStructureElement(child, ownNum);
+		};
+		for (const element of doc.structure ?? []) emitStructureElement(element, structRootNum);
+	}
+	if (residueXmpNum !== void 0 && doc.source?.xmp !== void 0) objects.push({
+		num: residueXmpNum,
+		value: pdfStream(pdfDict({
+			Type: pdfName("Metadata"),
+			Subtype: pdfName("XML")
+		}), new TextEncoder().encode(doc.source.xmp.xml))
+	});
 	for (const [standardName, alloc] of fontAllocs) {
 		const { font, descriptor } = buildFontObjects(standardName, pdfRef(alloc.descNum, 0));
 		objects.push({
@@ -520,6 +771,7 @@ function writePdf(doc, options = {}) {
 	}
 	if (imageAllocs.size > 0) resourceEntries.set("XObject", pdfDict(new Map([...imageAllocs.values()].map((alloc) => [alloc.resourceName, pdfRef(alloc.imageNum, 0)]))));
 	const resourcesDict = pdfDict(resourceEntries);
+	const markedStructureByPage = /* @__PURE__ */ new Map();
 	const formulasByPage = /* @__PURE__ */ new Map();
 	for (const formula of formulas) {
 		const forPage = formulasByPage.get(formula.pageIndex);
@@ -556,7 +808,14 @@ function writePdf(doc, options = {}) {
 	doc.pages.forEach((page, pageIndex) => {
 		throwIfAborted(options.signal);
 		const { pageNum, contentsNum } = pageAllocs[pageIndex];
-		const { bytes: contentBytes, substitutions, missingGlyphs } = writeContentStream(page.items, context);
+		let pageMcid = 0;
+		const pageContext = {
+			...context,
+			nextMcid: () => pageMcid++,
+			layerObjectNumberOf: (name) => layerNumByName.get(name)
+		};
+		const { bytes: contentBytes, substitutions, missingGlyphs, markedStructure } = writeContentStream(page.items, pageContext);
+		if (markedStructure.length > 0) markedStructureByPage.set(pageIndex, [...markedStructure]);
 		for (const substitution of substitutions) options.onSubstitution?.(substitution, { pageIndex });
 		for (const missing of missingGlyphs) options.onMissingGlyph?.(missing, { pageIndex });
 		const pageFormulas = formulasByPage.get(pageIndex);
@@ -586,11 +845,41 @@ function writePdf(doc, options = {}) {
 			["Contents", pdfRef(contentsNum, 0)]
 		]);
 		if (annots.length > 0) pageEntries.set("Annots", pdfArray(annots));
+		if ((markedStructureByPage.get(pageIndex) ?? []).length > 0) pageEntries.set("StructParents", pdfNum(pageIndex));
 		objects.push({
 			num: pageNum,
 			value: pdfDict(pageEntries)
 		});
 	});
+	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+		const nums = [];
+		for (const [pageIndex, marks] of markedStructureByPage) {
+			const maxMcid = Math.max(...marks.map((mark) => mark.mcid));
+			const byMcid = Array.from({ length: maxMcid + 1 }, () => pdfNull());
+			for (const mark of marks) {
+				const elementNum = structElementNumById.get(mark.structureId);
+				if (elementNum !== void 0) byMcid[mark.mcid] = pdfRef(elementNum, 0);
+			}
+			nums.push(pdfNum(pageIndex), pdfArray(byMcid));
+		}
+		objects.push({
+			num: structParentTreeNum,
+			value: pdfDict({ Nums: pdfArray(nums) })
+		});
+		const rootEntries = [
+			["Type", pdfName("StructTreeRoot")],
+			["K", pdfArray((doc.structure ?? []).map((element) => {
+				const num = structElementNumById.get(element.id);
+				if (num === void 0) throw new Error(`structure element "${element.id}" was not allocated -- this is a writePdf internal invariant violation`);
+				return pdfRef(num, 0);
+			}))],
+			["ParentTree", pdfRef(structParentTreeNum, 0)]
+		];
+		objects.push({
+			num: structRootNum,
+			value: pdfDict(Object.fromEntries(rootEntries))
+		});
+	}
 	let fileId;
 	let encryptedObjects = objects;
 	if (options.encryption !== void 0 && encryptDictNum !== void 0) {
@@ -632,7 +921,7 @@ function writePdf(doc, options = {}) {
 	if (fileId !== void 0 && encryptDictNum !== void 0) {
 		trailerEntries.set("ID", pdfArray([pdfHexString(fileId), pdfHexString(fileId)]));
 		trailerEntries.set("Encrypt", pdfRef(encryptDictNum, 0));
-	}
+	} else if (trailerIdRestore !== void 0) trailerEntries.set("ID", trailerIdRestore);
 	writer.writeAscii("trailer\n");
 	writeObject(writer, pdfDict(trailerEntries));
 	writer.writeAscii("\nstartxref\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-codec",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Hand-written, dependency-minimal PDF codec: parses arbitrary real-world PDFs and generates new ones, built on its own codec-owned LayoutDocument item model and Zod 4 codecs.",
   "type": "module",
   "repository": {