wpd-codec 3.3.0 → 3.4.1

package/README.md

@@ -174,7 +174,12 @@ This is a bet against libwpd's _code_, not against citing its _data_: the charac
 
 Everything below is recognised by the tokeniser and skipped by the fold, so a document containing it still reads — losing that construct's own structure, never the surrounding text. Each is reported through the diagnostic sink rather than passed over in silence.
 
-- **Headers, footers, footnotes, and endnotes** (the 0xD6 and 0xD7 groups). Reported through `wpd/header-footer-dropped` and `wpd/note-dropped`. The text is genuinely recoverable — each function names a General WP Text packet (type 0x08) holding its own function-code stream, which this package's tokeniser and fold would read (the same packet type boxes now resolve their own text content through) — but the flat `ContentDocument` has no page-furniture position for a header or footer and no note position for a footnote body. That body's real home is `document-schema.js`'s tree-only `definitions` table, which a codec producing the flat form cannot reach; it is the same gap `rtf-codec` documents for its own equivalent constructs, and it closes at the schema boundary rather than here — the one gap in this list that stays blocked pending a DocumentTree-producing wpd-codec, distinct from every other entry, which is a parsing-effort gap rather than a schema-shape one.
+- **A box whose content is a presentation, video, macro, sound, or external payload**, and a box relying on its own template's inherited geometry rather than an explicit function-level position/size override. Reported through `wpd/box-content-unresolved` and `wpd/box-frame-unresolved` respectively. An image box IS lifted when its content packet carries a whole PNG or JPEG payload: the packet's raw bytes are scanned by signature and structural walk (`src/stream/image.ts` — the chunk chain to IEND for PNG, the marker segments to EOI for JPEG), never by guessing at a container header, and the span lifts as a `ContentImageBlock` sized by the box's own frame, with an absolute-from-page-edge position carried as the image's `floatPosition`. What stays unresolved: a WPG vector graphic (a distinct binary graphics format `ContentImageBlock`'s `png`/`jpeg`/`svg`/`gif` set cannot hold as recovered, and which this package does not decode — a project on the scale of this package's own WordPerfect reader, not a wiring job) and a native OLE object (see the next bullet). A box with no function-level content override at all — relying entirely on its template's own rendering defaults — is reported through `wpd/box-dropped`, unchanged from before.
+- **Watermarks** (the 0xD6 group's two watermark subfunctions). Reported through `wpd/header-footer-dropped`: a watermark is neither a header nor a footer and owns no parity, so the shared page-furniture vocabulary has no slot for one.
+- **A second header or footer claiming a slot a first already filled.** WordPerfect's own A/B two-slot-per-kind mechanism is a shape the shared one-flow-per-slot vocabulary does not carry; the first function to claim a slot is the one lifted, and the collision is reported through `wpd/header-footer-dropped`.
+
+Headers and footers themselves are LIFTED (ExaDev/documents.js#1128): a D6 function's occurrence bits narrow onto the shared furniture vocabulary's slots (`ContentSection.headers`/`footers`, `default`/`even` — odd-only and both-parities are the default slot, even-only the even slot), its body folded from the General WP Text packet its first prefix ID names. Footnotes and endnotes are anchored in the flat form (a footnote/endnote anchor construct around the reference site, `definition` naming `note-1`, `note-2`, ... in document order) and their bodies are carried by `readWpd` as definitions-table entries in the tree form — the flat `readWpdContent` reports each still-borne body through `wpd/note-dropped`, since the flat `ContentDocument` genuinely has no home for one (`rtf-codec` documents the same split for its own equivalent constructs).
+
 - **A box whose content is an image, presentation, video, macro, sound, or external payload**, and a box relying on its own template's inherited geometry rather than an explicit function-level position/size override. Reported through `wpd/box-content-unresolved` and `wpd/box-frame-unresolved` respectively. An image box's own content resolves to a Graphics Filename prefix packet (type 0x40) whose children carry either WPG vector graphics (a distinct binary graphics format `ContentImageBlock`'s `png`/`jpeg`/`svg`/`gif` set cannot hold as recovered, and which this package does not decode — a project on the scale of this package's own WordPerfect reader, not a wiring job) or a native OLE object (see the next bullet). A box with no function-level content override at all — relying entirely on its template's own rendering defaults — is reported through `wpd/box-dropped`, unchanged from before.
 - **Embedded OLE objects**, stored under the compound file's `PerfectOffice_OBJECTS` storage and named by an image box's Graphics Filename packet's own `0x70`/`0x71` (OLE Object Descriptor / OLE Object Data) children. `archive-codec`'s compound-file reader already reaches that storage, which is how `ooxml.js` recovers a ZIP-payload embedded object — but a WordPerfect OLE object's payload is a native OLE server's own stream rather than a nested document package (`ooxml.js`'s own equivalent case, a classic OLE1 `.bin` payload with no `Package` stream, stays opaque by the identical scope boundary), so recovering one generically is a project in its own right, not a wiring job.
 - **The counter groups** (0xD8, 0xD9, 0xDB, 0xDC): setting, numbering-method, increment and decrement carry no text and change no structure this reader models, so only the Display Number group's own paragraph-number pair is read.

package/dist/bytes/base64.cjs

@@ -0,0 +1,21 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_bytes_view = require("./view.cjs");
+//#region src/bytes/base64.ts
+const ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function bytesToBase64(bytes) {
+	let out = "";
+	for (let i = 0; i < bytes.length; i += 3) {
+		const b0 = require_bytes_view.byteAt(bytes, i);
+		const b1 = bytes[i + 1];
+		const b2 = bytes[i + 2];
+		out += ALPHABET.charAt(b0 >>> 2);
+		out += ALPHABET.charAt((b0 & 3) << 4 | (b1 ?? 0) >>> 4);
+		if (b1 === void 0) return out + "==";
+		out += ALPHABET.charAt((b1 & 15) << 2 | (b2 ?? 0) >>> 6);
+		if (b2 === void 0) return out + "=";
+		out += ALPHABET.charAt(b2 & 63);
+	}
+	return out;
+}
+//#endregion
+exports.bytesToBase64 = bytesToBase64;

package/dist/bytes/base64.d.cts

@@ -0,0 +1,4 @@
+//#region src/bytes/base64.d.ts
+declare function bytesToBase64(bytes: Uint8Array): string;
+//#endregion
+export { bytesToBase64 };

package/dist/bytes/base64.d.ts

@@ -0,0 +1,4 @@
+//#region src/bytes/base64.d.ts
+declare function bytesToBase64(bytes: Uint8Array): string;
+//#endregion
+export { bytesToBase64 };

package/dist/bytes/base64.js

@@ -0,0 +1,20 @@
+import { byteAt } from "./view.js";
+//#region src/bytes/base64.ts
+const ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function bytesToBase64(bytes) {
+	let out = "";
+	for (let i = 0; i < bytes.length; i += 3) {
+		const b0 = byteAt(bytes, i);
+		const b1 = bytes[i + 1];
+		const b2 = bytes[i + 2];
+		out += ALPHABET.charAt(b0 >>> 2);
+		out += ALPHABET.charAt((b0 & 3) << 4 | (b1 ?? 0) >>> 4);
+		if (b1 === void 0) return out + "==";
+		out += ALPHABET.charAt((b1 & 15) << 2 | (b2 ?? 0) >>> 6);
+		if (b2 === void 0) return out + "=";
+		out += ALPHABET.charAt(b2 & 63);
+	}
+	return out;
+}
+//#endregion
+export { bytesToBase64 };

package/dist/{diagnostics-Dtb2uPw4.d.cts → diagnostics-DhO7mgqJ.d.cts}

@@ -16,6 +16,7 @@ declare const WpdDiagnosticCodes: {
   readonly OutlineNumberRegenerated: "wpd/outline-number-regenerated";
   readonly BoxDropped: "wpd/box-dropped";
   readonly NoteDropped: "wpd/note-dropped";
+  readonly NoteSpansParagraphs: "wpd/note-spans-paragraphs";
   readonly HeaderFooterDropped: "wpd/header-footer-dropped";
   readonly CrossReferenceFlattened: "wpd/cross-reference-flattened";
   readonly MergeCodeDropped: "wpd/merge-code-dropped";

package/dist/{diagnostics-Dtb2uPw4.d.ts → diagnostics-DhO7mgqJ.d.ts}

@@ -16,6 +16,7 @@ declare const WpdDiagnosticCodes: {
   readonly OutlineNumberRegenerated: "wpd/outline-number-regenerated";
   readonly BoxDropped: "wpd/box-dropped";
   readonly NoteDropped: "wpd/note-dropped";
+  readonly NoteSpansParagraphs: "wpd/note-spans-paragraphs";
   readonly HeaderFooterDropped: "wpd/header-footer-dropped";
   readonly CrossReferenceFlattened: "wpd/cross-reference-flattened";
   readonly MergeCodeDropped: "wpd/merge-code-dropped";

package/dist/diagnostics.cjs

@@ -12,6 +12,7 @@ const WpdDiagnosticCodes = {
 	OutlineNumberRegenerated: "wpd/outline-number-regenerated",
 	BoxDropped: "wpd/box-dropped",
 	NoteDropped: "wpd/note-dropped",
+	NoteSpansParagraphs: "wpd/note-spans-paragraphs",
 	HeaderFooterDropped: "wpd/header-footer-dropped",
 	CrossReferenceFlattened: "wpd/cross-reference-flattened",
 	MergeCodeDropped: "wpd/merge-code-dropped",

package/dist/diagnostics.d.cts

@@ -1,2 +1,2 @@
-import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-Dtb2uPw4.cjs";
+import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-DhO7mgqJ.cjs";
 export { NOOP_WPD_DIAGNOSTIC_SINK, WpdDiagnostic, WpdDiagnosticCodes, WpdDiagnosticSink };

package/dist/diagnostics.d.ts

@@ -1,2 +1,2 @@
-import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-Dtb2uPw4.js";
+import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-DhO7mgqJ.js";
 export { NOOP_WPD_DIAGNOSTIC_SINK, WpdDiagnostic, WpdDiagnosticCodes, WpdDiagnosticSink };

package/dist/diagnostics.js

@@ -11,6 +11,7 @@ const WpdDiagnosticCodes = {
 	OutlineNumberRegenerated: "wpd/outline-number-regenerated",
 	BoxDropped: "wpd/box-dropped",
 	NoteDropped: "wpd/note-dropped",
+	NoteSpansParagraphs: "wpd/note-spans-paragraphs",
 	HeaderFooterDropped: "wpd/header-footer-dropped",
 	CrossReferenceFlattened: "wpd/cross-reference-flattened",
 	MergeCodeDropped: "wpd/merge-code-dropped",

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-Dtb2uPw4.cjs";
+import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-DhO7mgqJ.cjs";
 import { ReadWpdOptions, readWpd, readWpdContent } from "./read.cjs";
 import { WpdBytesSchema, wpdContentCodec } from "./codec.cjs";
 import { WPD_FILE_ID, WPD_PREFIX_HEADER_SIZE, WpdFileHeader, hasWordPerfectFileId, readFileHeader } from "./container/header.cjs";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-Dtb2uPw4.js";
+import { i as WpdDiagnosticSink, n as WpdDiagnostic, r as WpdDiagnosticCodes, t as NOOP_WPD_DIAGNOSTIC_SINK } from "./diagnostics-DhO7mgqJ.js";
 import { ReadWpdOptions, readWpd, readWpdContent } from "./read.js";
 import { WpdBytesSchema, wpdContentCodec } from "./codec.js";
 import { WPD_FILE_ID, WPD_PREFIX_HEADER_SIZE, WpdFileHeader, hasWordPerfectFileId, readFileHeader } from "./container/header.js";

package/dist/read.cjs

@@ -1,5 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_bytes_view = require("./bytes/view.cjs");
+const require_bytes_base64 = require("./bytes/base64.cjs");
+const require_stream_furniture = require("./stream/furniture.cjs");
 const require_stream_characters = require("./stream/characters.cjs");
 const require_container_prefix = require("./container/prefix.cjs");
 const require_container_container = require("./container/container.cjs");
@@ -12,6 +14,7 @@ const require_stream_style = require("./stream/style.cjs");
 const require_stream_table = require("./stream/table.cjs");
 const require_stream_box = require("./stream/box.cjs");
 const require_stream_formula = require("./stream/formula.cjs");
+const require_stream_image = require("./stream/image.cjs");
 const require_stream_tab = require("./stream/tab.cjs");
 const require_stream_tokenise = require("./stream/tokenise.cjs");
 let document_schema_js = require("document-schema.js");
@@ -87,6 +90,10 @@ function targetBlocks(state) {
 }
 function flushParagraph(state, sink) {
 	flushRun(state);
+	if (state.openNote !== void 0) {
+		state.openNote = void 0;
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.NoteSpansParagraphs, "A footnote or endnote's own On/Off pair straddled a paragraph boundary, which the run-scoped note anchor cannot express; its reference text became ordinary paragraph text with no note anchor.");
+	}
 	if (state.openMergeFieldStartRun !== void 0) {
 		state.openMergeFieldStartRun = void 0;
 		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.MergeFieldSpansParagraphs, "A merge field's own On/Off pair straddled a paragraph boundary, which the run-scoped field construct cannot express; its text became ordinary paragraph text with no field tag.");
@@ -427,6 +434,90 @@ function applyCharacterGroup(state, token, container, sink) {
 		default: return;
 	}
 }
+function applyHeaderFooterGroup(state, token, container, sink) {
+	const claim = require_stream_furniture.readFurnitureClaim(token.subgroup, token.nonDeletable);
+	if (claim === "none") return;
+	if (claim === "watermark") {
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a watermark, which is neither a header nor a footer and owns no parity -- the shared page-furniture vocabulary has no slot for one.");
+		return;
+	}
+	const slotKey = `${claim.kind}:${claim.slot}`;
+	if (state.furnitureFilled.has(slotKey)) {
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, `This document declares a second ${claim.kind} for the ${claim.slot} slot -- WordPerfect's own A/B two-slot-per-kind mechanism, which the shared one-flow-per-slot page-furniture vocabulary does not carry; the first ${claim.kind} to claim the slot is the one lifted.`);
+		return;
+	}
+	const blocks = furnitureBodyBlocks(state, token, container, sink);
+	if (blocks === void 0) return;
+	state.furnitureFilled.add(slotKey);
+	const furniture = claim.kind === "header" ? state.headers : state.footers;
+	furniture[claim.slot] = blocks;
+}
+function furnitureBodyBlocks(state, token, container, sink) {
+	const prefixId = token.prefixIds[0];
+	const packet = prefixId === void 0 ? void 0 : require_container_prefix.packetByPrefixId(container.packets, prefixId);
+	if (packet?.packetType !== 8) {
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not resolve; it was not lifted.");
+		return;
+	}
+	const textBlocks = require_container_prefix.readGeneralWpTextBlocks(packet.bytes);
+	if (textBlocks === void 0) {
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not read; it was not lifted.");
+		return;
+	}
+	return foldTokens(require_stream_tokenise.tokeniseDocumentArea(textBlocks, 0, textBlocks.length), container, sink).blocks;
+}
+const FOOTNOTE_ON = 0;
+const FOOTNOTE_OFF = 1;
+const ENDNOTE_ON = 2;
+const ENDNOTE_OFF = 3;
+function applyNoteGroup(state, token, container, sink) {
+	if (token.subgroup === FOOTNOTE_ON || token.subgroup === ENDNOTE_ON) {
+		flushRun(state);
+		const prefixId = token.prefixIds[0];
+		if (prefixId === void 0) {
+			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote whose body packet this reader could not resolve; only its reference text survived.");
+			return;
+		}
+		state.openNote = {
+			anchorType: token.subgroup === FOOTNOTE_ON ? "footnote" : "endnote",
+			startRun: state.runs.length,
+			prefixId
+		};
+		return;
+	}
+	const closing = token.subgroup === FOOTNOTE_OFF ? "footnote" : token.subgroup === ENDNOTE_OFF ? "endnote" : void 0;
+	if (closing === void 0) return;
+	const open = state.openNote;
+	state.openNote = void 0;
+	if (open?.anchorType !== closing) return;
+	flushRun(state);
+	const endRun = state.runs.length;
+	const marker = state.runs.slice(open.startRun, endRun).map((run) => run.text).join("") || String(state.notes.length + 1);
+	const definition = `note-${state.notes.length + 1}`;
+	state.pendingConstructs.push({
+		descriptor: {
+			kind: "anchor",
+			anchorType: open.anchorType,
+			name: marker,
+			definition
+		},
+		startRun: open.startRun,
+		endRun
+	});
+	const packet = require_container_prefix.packetByPrefixId(container.packets, open.prefixId);
+	const textBlocks = packet?.packetType === 8 ? require_container_prefix.readGeneralWpTextBlocks(packet.bytes) : void 0;
+	const nested = textBlocks === void 0 ? void 0 : require_stream_tokenise.tokeniseDocumentArea(textBlocks, 0, textBlocks.length);
+	const blocks = nested === void 0 ? void 0 : foldTokens(nested, container, sink).blocks;
+	if (blocks === void 0) {
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote whose body packet this reader could not read; its reference anchor survives and its body does not.");
+		return;
+	}
+	state.notes.push({
+		anchorType: open.anchorType,
+		marker,
+		blocks
+	});
+}
 function applyMergeGroup(state, token, sink) {
 	if (token.subgroup === MERGE_FIELD_ON) {
 		flushRun(state);
@@ -461,6 +552,37 @@ function applyBoxGroup(state, token, container, sink) {
 		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.BoxDropped, "This document contains a box -- a figure, text box, equation, or graphic -- whose function-level override names no content this reader can resolve.");
 		return;
 	}
+	if (boxContent.contentType === 3) {
+		const imagePacket = require_container_prefix.packetByPrefixId(container.packets, boxContent.contentPrefixId);
+		const payload = imagePacket === void 0 ? void 0 : require_stream_image.scanImagePayload(imagePacket.bytes);
+		if (payload === void 0) {
+			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.BoxContentUnresolved, "This document contains an image box whose content packet carries no decodable PNG or JPEG payload -- a WPG graphic or other image spelling this reader does not decode.");
+			return;
+		}
+		if (boxContent.frame === void 0) {
+			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.BoxFrameUnresolved, "This document contains a box whose content this reader could read, but whose function-level override states no width and height this reader can trust, so its content was not lifted.");
+			return;
+		}
+		flushParagraphIfContent(state, sink);
+		targetBlocks(state).push({
+			kind: "image",
+			format: payload.format,
+			base64: require_bytes_base64.bytesToBase64(payload.bytes),
+			widthPt: boxContent.frame.widthPt,
+			heightPt: boxContent.frame.heightPt,
+			...boxContent.frame.positionResolved ? { floatPosition: {
+				horizontal: {
+					relativeTo: "page",
+					offsetPt: boxContent.frame.xPt
+				},
+				vertical: {
+					relativeTo: "page",
+					offsetPt: boxContent.frame.yPt
+				}
+			} } : {}
+		});
+		return;
+	}
 	const packet = boxContent.contentType === 1 || boxContent.contentType === 2 || boxContent.contentType === 4 ? require_container_prefix.packetByPrefixId(container.packets, boxContent.contentPrefixId) : void 0;
 	const textBlocks = packet?.packetType !== 8 ? void 0 : require_container_prefix.readGeneralWpTextBlocks(packet.bytes);
 	if (textBlocks === void 0) {
@@ -564,10 +686,10 @@ function applyVariableFunction(state, token, container, sink) {
 			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.CrossReferenceFlattened, "This document contains a cross-reference; its displayed text survives as ordinary text, and the reference's own target binding does not.");
 			return;
 		case HEADER_FOOTER_GROUP:
-			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark, which the flat content model has no page-furniture position for.");
+			applyHeaderFooterGroup(state, token, container, sink);
 			return;
 		case FOOTNOTE_ENDNOTE_GROUP:
-			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote; its text lives in a prefix packet the flat content model has nowhere to put.");
+			applyNoteGroup(state, token, container, sink);
 			return;
 		case MERGE_GROUP:
 			applyMergeGroup(state, token, sink);
@@ -663,7 +785,12 @@ function foldTokens(tokens, container, sink) {
 		table: void 0,
 		reported: /* @__PURE__ */ new Set(),
 		pendingConstructs: [],
-		openMergeFieldStartRun: void 0
+		openMergeFieldStartRun: void 0,
+		headers: {},
+		footers: {},
+		furnitureFilled: /* @__PURE__ */ new Set(),
+		openNote: void 0,
+		notes: []
 	};
 	for (const token of tokens) applyToken(state, token, container, sink);
 	flushRun(state);
@@ -674,7 +801,10 @@ function foldTokens(tokens, container, sink) {
 	}
 	return {
 		blocks: state.blocks,
-		page: state.page
+		page: state.page,
+		headers: state.headers,
+		footers: state.footers,
+		notes: state.notes
 	};
 }
 function readMetadata(container) {
@@ -684,7 +814,11 @@ function readMetadata(container) {
 function readWpdContent(bytes, options = {}) {
 	const sink = options.sink ?? require_diagnostics.NOOP_WPD_DIAGNOSTIC_SINK;
 	const container = require_container_container.openWpdDocument(bytes, { password: options.password });
-	const { blocks, page } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	const { blocks, page, headers, footers, notes } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	for (const note of notes) sink({
+		code: require_diagnostics.WpdDiagnosticCodes.NoteDropped,
+		message: `This document contains a ${note.anchorType} whose body the flat ContentDocument has no home for; its reference anchor survives and readWpd lifts the body into the tree form's definitions table.`
+	});
 	return {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -699,12 +833,48 @@ function readWpdContent(bytes, options = {}) {
 				bottomPt: page.bottomPt ?? 72,
 				leftPt: page.leftPt ?? 72
 			},
+			...Object.keys(headers).length > 0 ? { headers } : {},
+			...Object.keys(footers).length > 0 ? { footers } : {},
 			blocks
 		}]
 	};
 }
 function readWpd(bytes, options = {}) {
-	return (0, document_schema_js.assembleTree)(readWpdContent(bytes, options));
+	const container = require_container_container.openWpdDocument(bytes, { password: options.password });
+	const { notes, ...flatRest } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? require_diagnostics.NOOP_WPD_DIAGNOSTIC_SINK);
+	const document = {
+		kind: "wordprocessing",
+		metadata: readMetadata(container),
+		sections: [{
+			pageSize: {
+				widthPt: flatRest.page.widthPt ?? 612,
+				heightPt: flatRest.page.heightPt ?? 792
+			},
+			margins: {
+				topPt: flatRest.page.topPt ?? 72,
+				rightPt: flatRest.page.rightPt ?? 72,
+				bottomPt: flatRest.page.bottomPt ?? 72,
+				leftPt: flatRest.page.leftPt ?? 72
+			},
+			...Object.keys(flatRest.headers).length > 0 ? { headers: flatRest.headers } : {},
+			...Object.keys(flatRest.footers).length > 0 ? { footers: flatRest.footers } : {},
+			blocks: flatRest.blocks
+		}]
+	};
+	const assembled = (0, document_schema_js.assembleTree)(document);
+	if (notes.length === 0) return assembled;
+	const definitions = Object.fromEntries(notes.map((note, index) => [`note-${index + 1}`, {
+		kind: note.anchorType,
+		marker: note.marker,
+		blocks: note.blocks
+	}]));
+	return {
+		...assembled,
+		definitions: {
+			...assembled.definitions,
+			...definitions
+		}
+	};
 }
 //#endregion
 exports.readWpd = readWpd;

package/dist/read.d.cts

@@ -1,11 +1,16 @@
-import { i as WpdDiagnosticSink } from "./diagnostics-Dtb2uPw4.cjs";
-import { ContentDocument, DocumentTree } from "document-schema.js";
+import { i as WpdDiagnosticSink } from "./diagnostics-DhO7mgqJ.cjs";
+import { ContentBlock, ContentDocument, DocumentTree } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadWpdOptions {
   readonly sink?: WpdDiagnosticSink;
   readonly password?: string;
 }
+interface WpdNoteDefinition {
+  readonly anchorType: "footnote" | "endnote";
+  readonly marker: string;
+  readonly blocks: readonly ContentBlock[];
+}
 declare function readWpdContent(bytes: Uint8Array, options?: ReadWpdOptions): ContentDocument;
 declare function readWpd(bytes: Uint8Array, options?: ReadWpdOptions): DocumentTree;
 //#endregion
-export { ReadWpdOptions, readWpd, readWpdContent };
+export { ReadWpdOptions, WpdNoteDefinition, readWpd, readWpdContent };

package/dist/read.d.ts

@@ -1,11 +1,16 @@
-import { i as WpdDiagnosticSink } from "./diagnostics-Dtb2uPw4.js";
-import { ContentDocument, DocumentTree } from "document-schema.js";
+import { i as WpdDiagnosticSink } from "./diagnostics-DhO7mgqJ.js";
+import { ContentBlock, ContentDocument, DocumentTree } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadWpdOptions {
   readonly sink?: WpdDiagnosticSink;
   readonly password?: string;
 }
+interface WpdNoteDefinition {
+  readonly anchorType: "footnote" | "endnote";
+  readonly marker: string;
+  readonly blocks: readonly ContentBlock[];
+}
 declare function readWpdContent(bytes: Uint8Array, options?: ReadWpdOptions): ContentDocument;
 declare function readWpd(bytes: Uint8Array, options?: ReadWpdOptions): DocumentTree;
 //#endregion
-export { ReadWpdOptions, readWpd, readWpdContent };
+export { ReadWpdOptions, WpdNoteDefinition, readWpd, readWpdContent };

package/dist/read.js

@@ -1,4 +1,6 @@
 import { uint16At } from "./bytes/view.js";
+import { bytesToBase64 } from "./bytes/base64.js";
+import { readFurnitureClaim } from "./stream/furniture.js";
 import { decodeSingleByteCharacter, decodeWpCharacter } from "./stream/characters.js";
 import { packetByPrefixId, readGeneralWpTextBlocks, readTypefaceName } from "./container/prefix.js";
 import { openWpdDocument } from "./container/container.js";
@@ -11,6 +13,7 @@ import { isParagraphNumberDisplayOff, isParagraphNumberDisplayOn, isStyleScopeCl
 import { findEmbeddedSubfunction, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt } from "./stream/table.js";
 import { readBoxContent } from "./stream/box.js";
 import { readTableFormula } from "./stream/formula.js";
+import { scanImagePayload } from "./stream/image.js";
 import { tabEffectFor } from "./stream/tab.js";
 import { tokeniseDocumentArea } from "./stream/tokenise.js";
 import { assembleTree } from "document-schema.js";
@@ -86,6 +89,10 @@ function targetBlocks(state) {
 }
 function flushParagraph(state, sink) {
 	flushRun(state);
+	if (state.openNote !== void 0) {
+		state.openNote = void 0;
+		reportOnce(state, sink, WpdDiagnosticCodes.NoteSpansParagraphs, "A footnote or endnote's own On/Off pair straddled a paragraph boundary, which the run-scoped note anchor cannot express; its reference text became ordinary paragraph text with no note anchor.");
+	}
 	if (state.openMergeFieldStartRun !== void 0) {
 		state.openMergeFieldStartRun = void 0;
 		reportOnce(state, sink, WpdDiagnosticCodes.MergeFieldSpansParagraphs, "A merge field's own On/Off pair straddled a paragraph boundary, which the run-scoped field construct cannot express; its text became ordinary paragraph text with no field tag.");
@@ -426,6 +433,90 @@ function applyCharacterGroup(state, token, container, sink) {
 		default: return;
 	}
 }
+function applyHeaderFooterGroup(state, token, container, sink) {
+	const claim = readFurnitureClaim(token.subgroup, token.nonDeletable);
+	if (claim === "none") return;
+	if (claim === "watermark") {
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a watermark, which is neither a header nor a footer and owns no parity -- the shared page-furniture vocabulary has no slot for one.");
+		return;
+	}
+	const slotKey = `${claim.kind}:${claim.slot}`;
+	if (state.furnitureFilled.has(slotKey)) {
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, `This document declares a second ${claim.kind} for the ${claim.slot} slot -- WordPerfect's own A/B two-slot-per-kind mechanism, which the shared one-flow-per-slot page-furniture vocabulary does not carry; the first ${claim.kind} to claim the slot is the one lifted.`);
+		return;
+	}
+	const blocks = furnitureBodyBlocks(state, token, container, sink);
+	if (blocks === void 0) return;
+	state.furnitureFilled.add(slotKey);
+	const furniture = claim.kind === "header" ? state.headers : state.footers;
+	furniture[claim.slot] = blocks;
+}
+function furnitureBodyBlocks(state, token, container, sink) {
+	const prefixId = token.prefixIds[0];
+	const packet = prefixId === void 0 ? void 0 : packetByPrefixId(container.packets, prefixId);
+	if (packet?.packetType !== 8) {
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not resolve; it was not lifted.");
+		return;
+	}
+	const textBlocks = readGeneralWpTextBlocks(packet.bytes);
+	if (textBlocks === void 0) {
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not read; it was not lifted.");
+		return;
+	}
+	return foldTokens(tokeniseDocumentArea(textBlocks, 0, textBlocks.length), container, sink).blocks;
+}
+const FOOTNOTE_ON = 0;
+const FOOTNOTE_OFF = 1;
+const ENDNOTE_ON = 2;
+const ENDNOTE_OFF = 3;
+function applyNoteGroup(state, token, container, sink) {
+	if (token.subgroup === FOOTNOTE_ON || token.subgroup === ENDNOTE_ON) {
+		flushRun(state);
+		const prefixId = token.prefixIds[0];
+		if (prefixId === void 0) {
+			reportOnce(state, sink, WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote whose body packet this reader could not resolve; only its reference text survived.");
+			return;
+		}
+		state.openNote = {
+			anchorType: token.subgroup === FOOTNOTE_ON ? "footnote" : "endnote",
+			startRun: state.runs.length,
+			prefixId
+		};
+		return;
+	}
+	const closing = token.subgroup === FOOTNOTE_OFF ? "footnote" : token.subgroup === ENDNOTE_OFF ? "endnote" : void 0;
+	if (closing === void 0) return;
+	const open = state.openNote;
+	state.openNote = void 0;
+	if (open?.anchorType !== closing) return;
+	flushRun(state);
+	const endRun = state.runs.length;
+	const marker = state.runs.slice(open.startRun, endRun).map((run) => run.text).join("") || String(state.notes.length + 1);
+	const definition = `note-${state.notes.length + 1}`;
+	state.pendingConstructs.push({
+		descriptor: {
+			kind: "anchor",
+			anchorType: open.anchorType,
+			name: marker,
+			definition
+		},
+		startRun: open.startRun,
+		endRun
+	});
+	const packet = packetByPrefixId(container.packets, open.prefixId);
+	const textBlocks = packet?.packetType === 8 ? readGeneralWpTextBlocks(packet.bytes) : void 0;
+	const nested = textBlocks === void 0 ? void 0 : tokeniseDocumentArea(textBlocks, 0, textBlocks.length);
+	const blocks = nested === void 0 ? void 0 : foldTokens(nested, container, sink).blocks;
+	if (blocks === void 0) {
+		reportOnce(state, sink, WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote whose body packet this reader could not read; its reference anchor survives and its body does not.");
+		return;
+	}
+	state.notes.push({
+		anchorType: open.anchorType,
+		marker,
+		blocks
+	});
+}
 function applyMergeGroup(state, token, sink) {
 	if (token.subgroup === MERGE_FIELD_ON) {
 		flushRun(state);
@@ -460,6 +551,37 @@ function applyBoxGroup(state, token, container, sink) {
 		reportOnce(state, sink, WpdDiagnosticCodes.BoxDropped, "This document contains a box -- a figure, text box, equation, or graphic -- whose function-level override names no content this reader can resolve.");
 		return;
 	}
+	if (boxContent.contentType === 3) {
+		const imagePacket = packetByPrefixId(container.packets, boxContent.contentPrefixId);
+		const payload = imagePacket === void 0 ? void 0 : scanImagePayload(imagePacket.bytes);
+		if (payload === void 0) {
+			reportOnce(state, sink, WpdDiagnosticCodes.BoxContentUnresolved, "This document contains an image box whose content packet carries no decodable PNG or JPEG payload -- a WPG graphic or other image spelling this reader does not decode.");
+			return;
+		}
+		if (boxContent.frame === void 0) {
+			reportOnce(state, sink, WpdDiagnosticCodes.BoxFrameUnresolved, "This document contains a box whose content this reader could read, but whose function-level override states no width and height this reader can trust, so its content was not lifted.");
+			return;
+		}
+		flushParagraphIfContent(state, sink);
+		targetBlocks(state).push({
+			kind: "image",
+			format: payload.format,
+			base64: bytesToBase64(payload.bytes),
+			widthPt: boxContent.frame.widthPt,
+			heightPt: boxContent.frame.heightPt,
+			...boxContent.frame.positionResolved ? { floatPosition: {
+				horizontal: {
+					relativeTo: "page",
+					offsetPt: boxContent.frame.xPt
+				},
+				vertical: {
+					relativeTo: "page",
+					offsetPt: boxContent.frame.yPt
+				}
+			} } : {}
+		});
+		return;
+	}
 	const packet = boxContent.contentType === 1 || boxContent.contentType === 2 || boxContent.contentType === 4 ? packetByPrefixId(container.packets, boxContent.contentPrefixId) : void 0;
 	const textBlocks = packet?.packetType !== 8 ? void 0 : readGeneralWpTextBlocks(packet.bytes);
 	if (textBlocks === void 0) {
@@ -563,10 +685,10 @@ function applyVariableFunction(state, token, container, sink) {
 			reportOnce(state, sink, WpdDiagnosticCodes.CrossReferenceFlattened, "This document contains a cross-reference; its displayed text survives as ordinary text, and the reference's own target binding does not.");
 			return;
 		case HEADER_FOOTER_GROUP:
-			reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark, which the flat content model has no page-furniture position for.");
+			applyHeaderFooterGroup(state, token, container, sink);
 			return;
 		case FOOTNOTE_ENDNOTE_GROUP:
-			reportOnce(state, sink, WpdDiagnosticCodes.NoteDropped, "This document contains a footnote or endnote; its text lives in a prefix packet the flat content model has nowhere to put.");
+			applyNoteGroup(state, token, container, sink);
 			return;
 		case MERGE_GROUP:
 			applyMergeGroup(state, token, sink);
@@ -662,7 +784,12 @@ function foldTokens(tokens, container, sink) {
 		table: void 0,
 		reported: /* @__PURE__ */ new Set(),
 		pendingConstructs: [],
-		openMergeFieldStartRun: void 0
+		openMergeFieldStartRun: void 0,
+		headers: {},
+		footers: {},
+		furnitureFilled: /* @__PURE__ */ new Set(),
+		openNote: void 0,
+		notes: []
 	};
 	for (const token of tokens) applyToken(state, token, container, sink);
 	flushRun(state);
@@ -673,7 +800,10 @@ function foldTokens(tokens, container, sink) {
 	}
 	return {
 		blocks: state.blocks,
-		page: state.page
+		page: state.page,
+		headers: state.headers,
+		footers: state.footers,
+		notes: state.notes
 	};
 }
 function readMetadata(container) {
@@ -683,7 +813,11 @@ function readMetadata(container) {
 function readWpdContent(bytes, options = {}) {
 	const sink = options.sink ?? NOOP_WPD_DIAGNOSTIC_SINK;
 	const container = openWpdDocument(bytes, { password: options.password });
-	const { blocks, page } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	const { blocks, page, headers, footers, notes } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	for (const note of notes) sink({
+		code: WpdDiagnosticCodes.NoteDropped,
+		message: `This document contains a ${note.anchorType} whose body the flat ContentDocument has no home for; its reference anchor survives and readWpd lifts the body into the tree form's definitions table.`
+	});
 	return {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -698,12 +832,48 @@ function readWpdContent(bytes, options = {}) {
 				bottomPt: page.bottomPt ?? 72,
 				leftPt: page.leftPt ?? 72
 			},
+			...Object.keys(headers).length > 0 ? { headers } : {},
+			...Object.keys(footers).length > 0 ? { footers } : {},
 			blocks
 		}]
 	};
 }
 function readWpd(bytes, options = {}) {
-	return assembleTree(readWpdContent(bytes, options));
+	const container = openWpdDocument(bytes, { password: options.password });
+	const { notes, ...flatRest } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? NOOP_WPD_DIAGNOSTIC_SINK);
+	const document = {
+		kind: "wordprocessing",
+		metadata: readMetadata(container),
+		sections: [{
+			pageSize: {
+				widthPt: flatRest.page.widthPt ?? 612,
+				heightPt: flatRest.page.heightPt ?? 792
+			},
+			margins: {
+				topPt: flatRest.page.topPt ?? 72,
+				rightPt: flatRest.page.rightPt ?? 72,
+				bottomPt: flatRest.page.bottomPt ?? 72,
+				leftPt: flatRest.page.leftPt ?? 72
+			},
+			...Object.keys(flatRest.headers).length > 0 ? { headers: flatRest.headers } : {},
+			...Object.keys(flatRest.footers).length > 0 ? { footers: flatRest.footers } : {},
+			blocks: flatRest.blocks
+		}]
+	};
+	const assembled = assembleTree(document);
+	if (notes.length === 0) return assembled;
+	const definitions = Object.fromEntries(notes.map((note, index) => [`note-${index + 1}`, {
+		kind: note.anchorType,
+		marker: note.marker,
+		blocks: note.blocks
+	}]));
+	return {
+		...assembled,
+		definitions: {
+			...assembled.definitions,
+			...definitions
+		}
+	};
 }
 //#endregion
 export { readWpd, readWpdContent };

package/dist/stream/furniture.cjs

@@ -0,0 +1,33 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/stream/furniture.ts
+const HEADER_FOOTER_GROUP = 214;
+const HEADER_A = 0;
+const HEADER_B = 1;
+const FOOTER_A = 2;
+const FOOTER_B = 3;
+const WATERMARK_A = 4;
+const WATERMARK_B = 5;
+const OCCURS_ON_ODD = 1;
+const OCCURS_ON_EVEN = 2;
+function readFurnitureClaim(subgroup, nonDeletable) {
+	if (subgroup === 4 || subgroup === 5) return "watermark";
+	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : void 0;
+	if (kind === void 0) return "none";
+	const occurrence = nonDeletable[0] ?? 0;
+	const odd = (occurrence & OCCURS_ON_ODD) !== 0;
+	const even = (occurrence & OCCURS_ON_EVEN) !== 0;
+	if (!odd && !even) return "none";
+	return {
+		kind,
+		slot: even && !odd ? "even" : "default"
+	};
+}
+//#endregion
+exports.FOOTER_A = FOOTER_A;
+exports.FOOTER_B = FOOTER_B;
+exports.HEADER_A = HEADER_A;
+exports.HEADER_B = HEADER_B;
+exports.HEADER_FOOTER_GROUP = HEADER_FOOTER_GROUP;
+exports.WATERMARK_A = WATERMARK_A;
+exports.WATERMARK_B = WATERMARK_B;
+exports.readFurnitureClaim = readFurnitureClaim;

package/dist/stream/furniture.d.cts

@@ -0,0 +1,15 @@
+//#region src/stream/furniture.d.ts
+declare const HEADER_FOOTER_GROUP = 214;
+declare const HEADER_A = 0;
+declare const HEADER_B = 1;
+declare const FOOTER_A = 2;
+declare const FOOTER_B = 3;
+declare const WATERMARK_A = 4;
+declare const WATERMARK_B = 5;
+interface WpdFurnitureClaim {
+  readonly kind: "header" | "footer";
+  readonly slot: "default" | "even";
+}
+declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "watermark" | "none";
+//#endregion
+export { FOOTER_A, FOOTER_B, HEADER_A, HEADER_B, HEADER_FOOTER_GROUP, WATERMARK_A, WATERMARK_B, WpdFurnitureClaim, readFurnitureClaim };

package/dist/stream/furniture.d.ts

@@ -0,0 +1,15 @@
+//#region src/stream/furniture.d.ts
+declare const HEADER_FOOTER_GROUP = 214;
+declare const HEADER_A = 0;
+declare const HEADER_B = 1;
+declare const FOOTER_A = 2;
+declare const FOOTER_B = 3;
+declare const WATERMARK_A = 4;
+declare const WATERMARK_B = 5;
+interface WpdFurnitureClaim {
+  readonly kind: "header" | "footer";
+  readonly slot: "default" | "even";
+}
+declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "watermark" | "none";
+//#endregion
+export { FOOTER_A, FOOTER_B, HEADER_A, HEADER_B, HEADER_FOOTER_GROUP, WATERMARK_A, WATERMARK_B, WpdFurnitureClaim, readFurnitureClaim };

package/dist/stream/furniture.js

@@ -0,0 +1,25 @@
+//#region src/stream/furniture.ts
+const HEADER_FOOTER_GROUP = 214;
+const HEADER_A = 0;
+const HEADER_B = 1;
+const FOOTER_A = 2;
+const FOOTER_B = 3;
+const WATERMARK_A = 4;
+const WATERMARK_B = 5;
+const OCCURS_ON_ODD = 1;
+const OCCURS_ON_EVEN = 2;
+function readFurnitureClaim(subgroup, nonDeletable) {
+	if (subgroup === 4 || subgroup === 5) return "watermark";
+	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : void 0;
+	if (kind === void 0) return "none";
+	const occurrence = nonDeletable[0] ?? 0;
+	const odd = (occurrence & OCCURS_ON_ODD) !== 0;
+	const even = (occurrence & OCCURS_ON_EVEN) !== 0;
+	if (!odd && !even) return "none";
+	return {
+		kind,
+		slot: even && !odd ? "even" : "default"
+	};
+}
+//#endregion
+export { FOOTER_A, FOOTER_B, HEADER_A, HEADER_B, HEADER_FOOTER_GROUP, WATERMARK_A, WATERMARK_B, readFurnitureClaim };

package/dist/stream/image.cjs

@@ -0,0 +1,72 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_bytes_view = require("../bytes/view.cjs");
+//#region src/stream/image.ts
+const PNG_SIGNATURE = [
+	137,
+	80,
+	78,
+	71,
+	13,
+	10,
+	26,
+	10
+];
+const JPEG_SOI = [255, 216];
+function indexOf(bytes, needle, from) {
+	outer: for (let i = from; i + needle.length <= bytes.length; i += 1) {
+		for (let j = 0; j < needle.length; j += 1) if (bytes[i + j] !== needle[j]) continue outer;
+		return i;
+	}
+}
+function scanPng(bytes, signatureAt) {
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	let cursor = signatureAt + PNG_SIGNATURE.length;
+	for (;;) {
+		if (cursor + 8 > bytes.length) return;
+		const length = view.getUint32(cursor);
+		const type = String.fromCharCode(require_bytes_view.byteAt(bytes, cursor + 4), require_bytes_view.byteAt(bytes, cursor + 5), require_bytes_view.byteAt(bytes, cursor + 6), require_bytes_view.byteAt(bytes, cursor + 7));
+		cursor += 8 + length + 4;
+		if (cursor > bytes.length) return;
+		if (type === "IEND") return {
+			format: "png",
+			bytes: bytes.subarray(signatureAt, cursor)
+		};
+	}
+}
+function scanJpeg(bytes, soiAt) {
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	let cursor = soiAt + JPEG_SOI.length;
+	for (;;) {
+		if (cursor >= bytes.length) return;
+		if (require_bytes_view.byteAt(bytes, cursor) !== 255) return;
+		while (cursor < bytes.length && require_bytes_view.byteAt(bytes, cursor) === 255) cursor += 1;
+		if (cursor >= bytes.length) return;
+		const marker = require_bytes_view.byteAt(bytes, cursor);
+		cursor += 1;
+		if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
+		if (marker === 217) return {
+			format: "jpeg",
+			bytes: bytes.subarray(soiAt, cursor)
+		};
+		if (cursor + 2 > bytes.length) return;
+		const length = view.getUint16(cursor);
+		if (length < 2 || cursor + length > bytes.length) return;
+		cursor += length;
+		if (marker === 218) {
+			const eoi = indexOf(bytes, [255, 217], cursor);
+			if (eoi === void 0) return;
+			return {
+				format: "jpeg",
+				bytes: bytes.subarray(soiAt, eoi + 2)
+			};
+		}
+	}
+}
+function scanImagePayload(bytes) {
+	const pngAt = indexOf(bytes, PNG_SIGNATURE, 0);
+	const jpegAt = indexOf(bytes, JPEG_SOI, 0);
+	if (pngAt !== void 0 && (jpegAt === void 0 || pngAt < jpegAt)) return scanPng(bytes, pngAt);
+	if (jpegAt !== void 0) return scanJpeg(bytes, jpegAt);
+}
+//#endregion
+exports.scanImagePayload = scanImagePayload;

package/dist/stream/image.d.cts

@@ -0,0 +1,8 @@
+//#region src/stream/image.d.ts
+interface WpdImagePayload {
+  readonly format: "png" | "jpeg";
+  readonly bytes: Uint8Array;
+}
+declare function scanImagePayload(bytes: Uint8Array): WpdImagePayload | undefined;
+//#endregion
+export { WpdImagePayload, scanImagePayload };

package/dist/stream/image.d.ts

@@ -0,0 +1,8 @@
+//#region src/stream/image.d.ts
+interface WpdImagePayload {
+  readonly format: "png" | "jpeg";
+  readonly bytes: Uint8Array;
+}
+declare function scanImagePayload(bytes: Uint8Array): WpdImagePayload | undefined;
+//#endregion
+export { WpdImagePayload, scanImagePayload };

package/dist/stream/image.js

@@ -0,0 +1,71 @@
+import { byteAt } from "../bytes/view.js";
+//#region src/stream/image.ts
+const PNG_SIGNATURE = [
+	137,
+	80,
+	78,
+	71,
+	13,
+	10,
+	26,
+	10
+];
+const JPEG_SOI = [255, 216];
+function indexOf(bytes, needle, from) {
+	outer: for (let i = from; i + needle.length <= bytes.length; i += 1) {
+		for (let j = 0; j < needle.length; j += 1) if (bytes[i + j] !== needle[j]) continue outer;
+		return i;
+	}
+}
+function scanPng(bytes, signatureAt) {
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	let cursor = signatureAt + PNG_SIGNATURE.length;
+	for (;;) {
+		if (cursor + 8 > bytes.length) return;
+		const length = view.getUint32(cursor);
+		const type = String.fromCharCode(byteAt(bytes, cursor + 4), byteAt(bytes, cursor + 5), byteAt(bytes, cursor + 6), byteAt(bytes, cursor + 7));
+		cursor += 8 + length + 4;
+		if (cursor > bytes.length) return;
+		if (type === "IEND") return {
+			format: "png",
+			bytes: bytes.subarray(signatureAt, cursor)
+		};
+	}
+}
+function scanJpeg(bytes, soiAt) {
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	let cursor = soiAt + JPEG_SOI.length;
+	for (;;) {
+		if (cursor >= bytes.length) return;
+		if (byteAt(bytes, cursor) !== 255) return;
+		while (cursor < bytes.length && byteAt(bytes, cursor) === 255) cursor += 1;
+		if (cursor >= bytes.length) return;
+		const marker = byteAt(bytes, cursor);
+		cursor += 1;
+		if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) continue;
+		if (marker === 217) return {
+			format: "jpeg",
+			bytes: bytes.subarray(soiAt, cursor)
+		};
+		if (cursor + 2 > bytes.length) return;
+		const length = view.getUint16(cursor);
+		if (length < 2 || cursor + length > bytes.length) return;
+		cursor += length;
+		if (marker === 218) {
+			const eoi = indexOf(bytes, [255, 217], cursor);
+			if (eoi === void 0) return;
+			return {
+				format: "jpeg",
+				bytes: bytes.subarray(soiAt, eoi + 2)
+			};
+		}
+	}
+}
+function scanImagePayload(bytes) {
+	const pngAt = indexOf(bytes, PNG_SIGNATURE, 0);
+	const jpegAt = indexOf(bytes, JPEG_SOI, 0);
+	if (pngAt !== void 0 && (jpegAt === void 0 || pngAt < jpegAt)) return scanPng(bytes, pngAt);
+	if (jpegAt !== void 0) return scanJpeg(bytes, jpegAt);
+}
+//#endregion
+export { scanImagePayload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wpd-codec",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "Hand-written read-only WordPerfect 6.x-X6 (.wpd) reader over document-schema.js's ContentDocument",
   "type": "module",
   "repository": {
@@ -80,8 +80,8 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "1.10.1",
-    "document-schema.js": "7.5.1",
+    "archive-codec": "1.10.3",
+    "document-schema.js": "7.6.1",
     "zod": "4.4.3"
   },
   "devDependencies": {