@stll/folio-core 0.47.7 → 0.48.0

package/dist/docx/fieldParser.js

@@ -141,6 +141,15 @@ function getFormatSwitch(instruction) {
 	return instruction.switches.find((s) => s.switch === "*" || s.switch === "@")?.value;
 }
 /**
+* Get the numeric picture switch value (\#), e.g. `0#` in `PAGE \# 0#`.
+*
+* @param instruction - Parsed instruction
+* @returns Picture string or undefined
+*/
+function getNumericPictureSwitch(instruction) {
+	return instruction.switches.find((s) => s.switch === "#")?.value;
+}
+/**
 * Check if field has MERGEFORMAT switch (preserve formatting)
 *
 * @param instruction - Parsed instruction
@@ -345,16 +354,51 @@ function isTocField(field) {
 * @returns Formatted page number string
 */
 function computePageNumber(pageNumber, instruction, sectionFormat) {
+	const picture = instruction ? getNumericPictureSwitch(instruction) : void 0;
+	if (picture !== void 0) return applyNumericPicture(pageNumber, picture);
 	const format = instruction ? getFormatSwitch(instruction) : void 0;
 	if (!format || format.toUpperCase() === "MERGEFORMAT") return formatSectionPageNumber(pageNumber, sectionFormat);
+	const isLowercaseSwitch = format === format.toLowerCase();
 	switch (format.toUpperCase()) {
-		case "ROMAN": return toRoman(pageNumber);
-		case "ALPHABETIC": return toLetter(pageNumber);
+		case "ROMAN": {
+			const roman = toRoman(pageNumber);
+			return isLowercaseSwitch ? roman.toLowerCase() : roman;
+		}
+		case "ALPHABETIC": {
+			const letters = toLetter(pageNumber);
+			return isLowercaseSwitch ? letters.toLowerCase() : letters;
+		}
 		default: return String(pageNumber);
 	}
 }
 const formatSectionPageNumber = (pageNumber, format) => formatOoxmlCounter(pageNumber, format);
 /**
+* Apply a `\#` numeric picture (ECMA-376 §17.16.4.2) to an integer field
+* value. `0` is a mandatory digit placeholder that zero-pads once the value
+* runs out of digits; `#` is an optional placeholder that is left blank
+* instead; every other picture character (including a thousands separator)
+* is copied through literally. Placeholders line up with the value's digits
+* from the right; digits that reach past the leftmost placeholder are kept,
+* not truncated.
+*/
+function applyNumericPicture(value, picture) {
+	const negative = value < 0;
+	const digits = [...String(Math.trunc(Math.abs(value)))];
+	const pictureChars = [...picture];
+	const output = Array.from({ length: pictureChars.length });
+	let digitIndex = digits.length - 1;
+	for (let i = pictureChars.length - 1; i >= 0; i--) {
+		const char = pictureChars[i];
+		if (char === "0" || char === "#") if (digitIndex >= 0) {
+			output[i] = digits[digitIndex];
+			digitIndex--;
+		} else output[i] = char === "0" ? "0" : "";
+		else output[i] = char;
+	}
+	const overflow = digitIndex >= 0 ? digits.slice(0, digitIndex + 1).join("") : "";
+	return (negative ? "-" : "") + overflow + output.join("");
+}
+/**
 * Convert number to uppercase Roman numerals
 */
 function toRoman(num) {
@@ -555,4 +599,4 @@ function getMergeFieldNames(fields) {
 	}).filter((name) => !!name);
 }
 //#endregion
-export { KNOWN_FIELD_TYPES, collectFields, computePageNumber, createComplexFieldContext, finalizeComplexField, formatDate, getFieldDisplayValue, getFieldsByType, getFormatSwitch, getMergeFieldNames, getMergeFields, getPageNumberFields, hasMergeFormat, isDateTimeField, isDocPropertyField, isHyperlinkField, isKnownFieldType, isMergeField, isPageNumberField, isReferenceField, isTocField, isTotalPagesField, parseFieldInstruction, parseFieldType, parseSimpleField, resetComplexFieldContext };
+export { KNOWN_FIELD_TYPES, collectFields, computePageNumber, createComplexFieldContext, finalizeComplexField, formatDate, getFieldDisplayValue, getFieldsByType, getFormatSwitch, getMergeFieldNames, getMergeFields, getNumericPictureSwitch, getPageNumberFields, hasMergeFormat, isDateTimeField, isDocPropertyField, isHyperlinkField, isKnownFieldType, isMergeField, isPageNumberField, isReferenceField, isTocField, isTotalPagesField, parseFieldInstruction, parseFieldType, parseSimpleField, resetComplexFieldContext };

package/dist/docx/fontTableParser.js

@@ -1,5 +1,5 @@
 import { DERIVED_PART_ROOT_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
-import { CAPTURE, dispatchChildren } from "./containerChildren.js";
+import { CAPTURE, dispatchChildrenWithContext } from "./containerChildren.js";
 import { getAttribute, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/fontTableParser.ts
 const FONT_FAMILIES = [
@@ -22,14 +22,12 @@ const parseFontTable = (xml) => {
 	const root = parseXmlDocument(xml);
 	if (!root) return;
 	const fonts = [];
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: root,
 		container: "w:fonts",
 		capturePosition: () => fonts.length,
-		handlers: { font: (element) => {
-			const font = parseFont(element);
-			if (font) fonts.push(font);
-		} }
+		handlers: FONT_TABLE_HANDLERS,
+		context: fonts
 	});
 	const preservedAttributes = attributeRemainder({
 		element: root,
@@ -45,31 +43,18 @@ const parseFontTable = (xml) => {
 const parseFont = (element) => {
 	const name = getAttribute(element, "w", "name");
 	if (!name) return;
-	const font = { name };
-	let modelled = 0;
-	const read = (key, value) => {
-		if (value === void 0) return;
-		font[key] = value;
-		modelled += 1;
+	const walk = {
+		font: { name },
+		modelled: 0
 	};
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element,
 		container: "w:font",
-		capturePosition: () => modelled,
-		handlers: {
-			altName: (child) => read("altName", value(child)),
-			panose1: (child) => read("panose1", value(child)),
-			charset: (child) => read("charset", charsetOf(child)),
-			family: (child) => read("family", narrow(value(child), FONT_FAMILIES)),
-			notTrueType: CAPTURE,
-			pitch: (child) => read("pitch", narrow(value(child), FONT_PITCHES)),
-			sig: (child) => read("sig", signatureOf(child)),
-			embedRegular: (child) => read("embedRegular", embedOf(child)),
-			embedBold: (child) => read("embedBold", embedOf(child)),
-			embedItalic: (child) => read("embedItalic", embedOf(child)),
-			embedBoldItalic: (child) => read("embedBoldItalic", embedOf(child))
-		}
+		capturePosition: () => walk.modelled,
+		handlers: FONT_HANDLERS,
+		context: walk
 	});
+	const { font } = walk;
 	if (preserved !== void 0) font.preserved = preserved;
 	const preservedAttributes = attributeRemainder({
 		element,
@@ -129,5 +114,27 @@ const signatureOf = (element) => {
 	return Object.keys(signature).length === 0 ? void 0 : signature;
 };
 const narrow = (carried, members) => members.find((member) => member === carried);
+const FONT_TABLE_HANDLERS = { font: (element, fonts) => {
+	const font = parseFont(element);
+	if (font) fonts.push(font);
+} };
+const read = (walk, key, carried) => {
+	if (carried === void 0) return;
+	walk.font[key] = carried;
+	walk.modelled += 1;
+};
+const FONT_HANDLERS = {
+	altName: (child, walk) => read(walk, "altName", value(child)),
+	panose1: (child, walk) => read(walk, "panose1", value(child)),
+	charset: (child, walk) => read(walk, "charset", charsetOf(child)),
+	family: (child, walk) => read(walk, "family", narrow(value(child), FONT_FAMILIES)),
+	notTrueType: CAPTURE,
+	pitch: (child, walk) => read(walk, "pitch", narrow(value(child), FONT_PITCHES)),
+	sig: (child, walk) => read(walk, "sig", signatureOf(child)),
+	embedRegular: (child, walk) => read(walk, "embedRegular", embedOf(child)),
+	embedBold: (child, walk) => read(walk, "embedBold", embedOf(child)),
+	embedItalic: (child, walk) => read(walk, "embedItalic", embedOf(child)),
+	embedBoldItalic: (child, walk) => read(walk, "embedBoldItalic", embedOf(child))
+};
 //#endregion
 export { parseFontTable };

package/dist/docx/footnoteParser.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 import { ParseContext } from "./parseContext.js";
+import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
 //#region src/docx/footnoteParser.d.ts
@@ -53,7 +54,7 @@ type EndnoteMap = {
  * @param media - Media files for images
  * @returns FootnoteMap with all footnotes
  */
-declare function parseFootnotes(footnotesXml: string | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, context?: ParseContext): FootnoteMap;
+declare function parseFootnotes(footnotesXml: string | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, context?: ParseContext, previews?: PreviewLedger): FootnoteMap;
 /**
  * Parse endnotes.xml
  *
@@ -65,7 +66,7 @@ declare function parseFootnotes(footnotesXml: string | null, styles?: StyleMap |
  * @param media - Media files for images
  * @returns EndnoteMap with all endnotes
  */
-declare function parseEndnotes(endnotesXml: string | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, context?: ParseContext): EndnoteMap;
+declare function parseEndnotes(endnotesXml: string | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, context?: ParseContext, previews?: PreviewLedger): EndnoteMap;
 /**
  * Get plain text content of a footnote.
  *

package/dist/docx/footnoteParser.js

@@ -1,6 +1,7 @@
 import { blockPlainText } from "./blockPlainText.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
 import { parseParagraph } from "./paragraphParser.js";
+import { standalonePreviewLedger } from "./previewBudget.js";
 import { captureSdtSiblingMarkers, parseSdtProperties } from "./sdtProperties.js";
 import { parseTable } from "./tableParser.js";
 import { findChildren, findWordprocessingChild, getAttributes, getChildElements, getLocalName, parseXml } from "./xmlParser.js";
@@ -27,13 +28,13 @@ function parseNoteId(element) {
 	const parsed = Number.parseInt(id, 10);
 	return Number.isNaN(parsed) ? 0 : parsed;
 }
-function parseNoteBlockContent(element, styles, theme, numbering, rels, media) {
+function parseNoteBlockContent(element, styles, theme, numbering, rels, media, previews) {
 	const blocks = [];
 	for (const child of getChildElements(element)) {
 		const localName = getLocalName(child.name ?? "");
-		if (localName === "p") blocks.push(parseParagraph(child, styles, theme, numbering, rels));
+		if (localName === "p") blocks.push(parseParagraph(child, styles, theme, numbering, rels, media, { previews }));
 		else if (localName === "tbl") {
-			const table = parseTable(child, styles, theme, numbering, rels, media);
+			const table = parseTable(child, styles, theme, numbering, rels, media, { previews });
 			if (table) blocks.push(table);
 		} else if (localName === "sdt") {
 			const sdtPr = findWordprocessingChild(child, "sdtPr");
@@ -46,7 +47,7 @@ function parseNoteBlockContent(element, styles, theme, numbering, rels, media) {
 			blocks.push({
 				type: "blockSdt",
 				properties,
-				content: sdtContent ? parseNoteBlockContent(sdtContent, styles, theme, numbering, rels, media) : []
+				content: sdtContent ? parseNoteBlockContent(sdtContent, styles, theme, numbering, rels, media, previews) : []
 			});
 		}
 	}
@@ -55,12 +56,12 @@ function parseNoteBlockContent(element, styles, theme, numbering, rels, media) {
 /**
 * Parse a single footnote element (w:footnote)
 */
-function parseFootnote(element, styles, theme, numbering, rels, media) {
+function parseFootnote(element, styles, theme, numbering, rels, media, previews) {
 	return {
 		type: "footnote",
 		id: parseNoteId(element),
 		noteType: parseNoteType(getNoteAttribute(element, "type")),
-		content: parseNoteBlockContent(element, styles, theme, numbering, rels, media)
+		content: parseNoteBlockContent(element, styles, theme, numbering, rels, media, previews)
 	};
 }
 /**
@@ -74,7 +75,7 @@ function parseFootnote(element, styles, theme, numbering, rels, media) {
 * @param media - Media files for images
 * @returns FootnoteMap with all footnotes
 */
-function parseFootnotes(footnotesXml, styles = null, theme = null, numbering = null, rels = null, media = null, context) {
+function parseFootnotes(footnotesXml, styles = null, theme = null, numbering = null, rels = null, media = null, context, previews = standalonePreviewLedger()) {
 	const byId = /* @__PURE__ */ new Map();
 	const footnotes = [];
 	if (!footnotesXml) return createFootnoteMap(byId, footnotes);
@@ -82,13 +83,14 @@ function parseFootnotes(footnotesXml, styles = null, theme = null, numbering = n
 	if (!rootElement) return createFootnoteMap(byId, footnotes);
 	const footnoteElements = findChildren(rootElement, "w", "footnote");
 	for (const fnEl of footnoteElements) {
-		const footnote = parseFootnote(fnEl, styles, theme, numbering, rels, media);
+		const footnote = parseFootnote(fnEl, styles, theme, numbering, rels, media, previews);
 		if (byId.has(footnote.id)) {
 			context?.warn({
 				code: PARSE_WARNING_CODES.duplicateNoteId,
 				element: "w:footnote",
 				at: `w:id ${String(footnote.id)}`
 			});
+			previews.release(footnote);
 			continue;
 		}
 		byId.set(footnote.id, footnote);
@@ -123,12 +125,12 @@ function createFootnoteMap(byId, footnotes) {
 /**
 * Parse a single endnote element (w:endnote)
 */
-function parseEndnote(element, styles, theme, numbering, rels, media) {
+function parseEndnote(element, styles, theme, numbering, rels, media, previews) {
 	return {
 		type: "endnote",
 		id: parseNoteId(element),
 		noteType: parseNoteType(getNoteAttribute(element, "type")),
-		content: parseNoteBlockContent(element, styles, theme, numbering, rels, media)
+		content: parseNoteBlockContent(element, styles, theme, numbering, rels, media, previews)
 	};
 }
 /**
@@ -142,7 +144,7 @@ function parseEndnote(element, styles, theme, numbering, rels, media) {
 * @param media - Media files for images
 * @returns EndnoteMap with all endnotes
 */
-function parseEndnotes(endnotesXml, styles = null, theme = null, numbering = null, rels = null, media = null, context) {
+function parseEndnotes(endnotesXml, styles = null, theme = null, numbering = null, rels = null, media = null, context, previews = standalonePreviewLedger()) {
 	const byId = /* @__PURE__ */ new Map();
 	const endnotes = [];
 	if (!endnotesXml) return createEndnoteMap(byId, endnotes);
@@ -150,13 +152,14 @@ function parseEndnotes(endnotesXml, styles = null, theme = null, numbering = nul
 	if (!rootElement) return createEndnoteMap(byId, endnotes);
 	const endnoteElements = findChildren(rootElement, "w", "endnote");
 	for (const enEl of endnoteElements) {
-		const endnote = parseEndnote(enEl, styles, theme, numbering, rels, media);
+		const endnote = parseEndnote(enEl, styles, theme, numbering, rels, media, previews);
 		if (byId.has(endnote.id)) {
 			context?.warn({
 				code: PARSE_WARNING_CODES.duplicateNoteId,
 				element: "w:endnote",
 				at: `w:id ${String(endnote.id)}`
 			});
+			previews.release(endnote);
 			continue;
 		}
 		byId.set(endnote.id, endnote);

package/dist/docx/groupDrawingParser.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
 import { XmlElement } from "./xmlParser.js";
+import { PreviewLedger } from "./previewBudget.js";
 //#region src/docx/groupDrawingParser.d.ts
 /**
  * Whether a `w:drawing` carries a WordprocessingGroup payload. A group this
@@ -8,6 +9,6 @@ import { XmlElement } from "./xmlParser.js";
  */
 declare const isGroupDrawing: (drawing: XmlElement) => boolean;
 /** Parse a WordprocessingGroup drawing into a safe SVG-backed image preview. */
-declare const parseGroupDrawing: (drawing: XmlElement, rels?: document_d_exports.RelationshipMap, media?: Map<string, document_d_exports.MediaFile>) => document_d_exports.Image | null;
+declare const parseGroupDrawing: (drawing: XmlElement, previews: PreviewLedger, rels?: document_d_exports.RelationshipMap, media?: Map<string, document_d_exports.MediaFile>) => document_d_exports.Image | null;
 //#endregion
 export { isGroupDrawing, parseGroupDrawing };

package/dist/docx/groupDrawingParser.js

@@ -1,6 +1,5 @@
 import { emuToPixels } from "../utils/units.js";
 import { parseImage, resolveImageData } from "./imageParser.js";
-import { PREVIEW_KINDS } from "./previewBudget.js";
 import { findAllDeep, findChildByLocalName, findChildrenByLocalName, getAttribute, getChildElements, getLocalName, getTextContent, parseNumericAttribute } from "./xmlParser.js";
 import { escapeXmlAttribute, escapeXmlText } from "@stll/docx-core";
 //#region src/docx/groupDrawingParser.ts
@@ -176,17 +175,15 @@ const groupElement = (drawing) => {
 */
 const isGroupDrawing = (drawing) => groupElement(drawing) !== null;
 /** Parse a WordprocessingGroup drawing into a safe SVG-backed image preview. */
-const parseGroupDrawing = (drawing, rels, media) => {
+const parseGroupDrawing = (drawing, previews, rels, media) => {
 	const group = groupElement(drawing);
 	if (!group) return null;
 	const image = parseImage(drawing, void 0, void 0);
 	if (!image || image.size.width <= 0 || image.size.height <= 0) return null;
 	const svg = createSvg(group, image.size.width, image.size.height, rels, media);
 	if (!svg || svg.length > MAX_SVG_CHARACTERS) return null;
-	image.src = `${PREVIEW_KINDS.wpGroup.srcPrefix}${encodeURIComponent(svg)}`;
-	image.mimeType = PREVIEW_KINDS.wpGroup.mimeType;
-	image.filename = PREVIEW_KINDS.wpGroup.filename;
-	return image;
+	const { rId: _rId, src: _src, mimeType: _mimeType, filename: _filename, ...frame } = image;
+	return previews.svgImage("wpGroup", svg, frame);
 };
 //#endregion
 export { isGroupDrawing, parseGroupDrawing };

package/dist/docx/headerFooterParser.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
+import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 import { parseFooterReference, parseFooterReferences, parseHeaderReference, parseHeaderReferences } from "./headerFooterRefParser.js";
 //#region src/docx/headerFooterParser.d.ts
@@ -28,9 +29,11 @@ type HeaderFooterMap = {
  * @param numbering - Parsed numbering definitions for lists
  * @param rels - Relationships for resolving hyperlinks/images
  * @param media - Media files for images
+ * @param previews - The ledger of the package this part belongs to; a part
+ *   read on its own charges its previews to no package
  * @returns HeaderFooter object
  */
-declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): document_d_exports.HeaderFooter;
+declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
 /**
  * Parse a footer XML file (word/footer*.xml)
  *
@@ -41,9 +44,11 @@ declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.
  * @param numbering - Parsed numbering definitions for lists
  * @param rels - Relationships for resolving hyperlinks/images
  * @param media - Media files for images
+ * @param previews - The ledger of the package this part belongs to; a part
+ *   read on its own charges its previews to no package
  * @returns HeaderFooter object
  */
-declare function parseFooter(footerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): document_d_exports.HeaderFooter;
+declare function parseFooter(footerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
 /**
  * Generic function to parse either header or footer
  *

package/dist/docx/headerFooterParser.js

@@ -3,6 +3,7 @@ import { blockPlainText } from "./blockPlainText.js";
 import { parseFooterReference, parseFooterReferences, parseHeaderReference, parseHeaderReferences } from "./headerFooterRefParser.js";
 import { assignHeaderFooterVerbatimXml } from "./headerFooterVerbatim.js";
 import { cloneParagraphWithPropertySource } from "./paragraphPropertySource.js";
+import { standalonePreviewLedger } from "./previewBudget.js";
 import { parseWatermark } from "./watermarkParser.js";
 import { collectXmlnsDeclarations, parseXml } from "./xmlParser.js";
 //#region src/docx/headerFooterParser.ts
@@ -16,9 +17,11 @@ import { collectXmlnsDeclarations, parseXml } from "./xmlParser.js";
 * @param numbering - Parsed numbering definitions for lists
 * @param rels - Relationships for resolving hyperlinks/images
 * @param media - Media files for images
+* @param previews - The ledger of the package this part belongs to; a part
+*   read on its own charges its previews to no package
 * @returns HeaderFooter object
 */
-function parseHeader(headerXml, hdrFtrType = "default", styles = null, theme = null, numbering = null, rels = null, media = null) {
+function parseHeader(headerXml, hdrFtrType = "default", styles = null, theme = null, numbering = null, rels = null, media = null, previews = standalonePreviewLedger()) {
 	const result = {
 		type: "header",
 		hdrFtrType,
@@ -35,11 +38,15 @@ function parseHeader(headerXml, hdrFtrType = "default", styles = null, theme = n
 	}
 	result.content = parseBlockContent(rootElement, styles, theme, numbering, rels, media, {
 		inHeaderFooter: true,
-		rootXmlns: collectXmlnsDeclarations(rootElement)
+		rootXmlns: collectXmlnsDeclarations(rootElement),
+		previews
 	});
 	if (watermarkResult) {
 		const host = result.content.at(watermarkResult.blockIndex);
-		if (host?.type === "paragraph") result.content[watermarkResult.blockIndex] = cloneParagraphWithPropertySource(host, { content: [] });
+		if (host?.type === "paragraph") {
+			previews.release(host.content);
+			result.content[watermarkResult.blockIndex] = cloneParagraphWithPropertySource(host, { content: [] });
+		}
 	}
 	assignHeaderFooterVerbatimXml(result, headerXml);
 	return result;
@@ -54,9 +61,11 @@ function parseHeader(headerXml, hdrFtrType = "default", styles = null, theme = n
 * @param numbering - Parsed numbering definitions for lists
 * @param rels - Relationships for resolving hyperlinks/images
 * @param media - Media files for images
+* @param previews - The ledger of the package this part belongs to; a part
+*   read on its own charges its previews to no package
 * @returns HeaderFooter object
 */
-function parseFooter(footerXml, hdrFtrType = "default", styles = null, theme = null, numbering = null, rels = null, media = null) {
+function parseFooter(footerXml, hdrFtrType = "default", styles = null, theme = null, numbering = null, rels = null, media = null, previews = standalonePreviewLedger()) {
 	const result = {
 		type: "footer",
 		hdrFtrType,
@@ -67,7 +76,8 @@ function parseFooter(footerXml, hdrFtrType = "default", styles = null, theme = n
 	if (!rootElement) return result;
 	result.content = parseBlockContent(rootElement, styles, theme, numbering, rels, media, {
 		inHeaderFooter: true,
-		rootXmlns: collectXmlnsDeclarations(rootElement)
+		rootXmlns: collectXmlnsDeclarations(rootElement),
+		previews
 	});
 	assignHeaderFooterVerbatimXml(result, footerXml);
 	return result;

package/dist/docx/hyperlinkParser.d.ts

@@ -1,6 +1,8 @@
 import { document_d_exports } from "../types/document.js";
 import { XmlElement } from "./xmlParser.js";
+import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
+import { ChildReader } from "./containerChildren.js";
 //#region src/docx/hyperlinkParser.d.ts
 /**
  * Parse a hyperlink element (w:hyperlink)
@@ -13,10 +15,19 @@ import { StyleMap } from "./styleParser.js";
  * @param styles - Style map for resolving run styles
  * @param theme - Theme for resolving colors/fonts
  * @param media - Media files map for image data
+ * @param previews - The ledger of the package this link belongs to; a link
+ *   read on its own charges its previews to no package
  * @returns Parsed Hyperlink object
  */
-declare function parseHyperlink(node: XmlElement, rels: document_d_exports.RelationshipMap | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, media?: Map<string, document_d_exports.MediaFile> | null, rootXmlns?: Record<string, string>): document_d_exports.Hyperlink;
-/** What {@link hyperlinkChildHandlers} needs to read one child of a link. */
+declare function parseHyperlink(node: XmlElement, rels: document_d_exports.RelationshipMap | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, media?: Map<string, document_d_exports.MediaFile> | null, rootXmlns?: Record<string, string>, previews?: PreviewLedger): document_d_exports.Hyperlink;
+/**
+ * A `w:hyperlink`'s own attributes as a link with no children yet.
+ *
+ * The paragraph parser's revision-segmenting walk reads the children itself,
+ * so it takes the shell rather than a link whose children it would discard.
+ */
+declare function parseHyperlinkShell(node: XmlElement, rels: document_d_exports.RelationshipMap | null): document_d_exports.Hyperlink;
+/** What {@link HYPERLINK_CHILD_HANDLERS} needs to read one child of a link. */
 type HyperlinkChildContext = {
   /** Where a parsed or captured child lands, in source order. */
   push: (child: document_d_exports.Hyperlink["children"][number]) => void;
@@ -24,6 +35,7 @@ type HyperlinkChildContext = {
   theme: document_d_exports.Theme | null;
   rels: document_d_exports.RelationshipMap | null;
   media: Map<string, document_d_exports.MediaFile> | null;
+  previews: PreviewLedger;
   inScopeXmlns: Record<string, string>;
 };
 /**
@@ -43,39 +55,39 @@ type HyperlinkChildContext = {
  * recognising is recognised by all of them rather than by whichever list
  * somebody remembered to update.
  */
-declare const hyperlinkChildHandlers: (context: HyperlinkChildContext) => {
-  r: (child: XmlElement) => void;
-  bookmarkStart: (child: XmlElement) => void;
-  bookmarkEnd: (child: XmlElement) => void;
-  bdo: (child: XmlElement) => void;
-  dir: (child: XmlElement) => void;
-  customXml: (child: XmlElement) => void;
-  smartTag: (child: XmlElement) => void;
-  del: "capture";
-  ins: "capture";
-  moveFrom: "capture";
-  moveTo: "capture";
-  commentRangeEnd: "capture";
-  commentRangeStart: "capture";
-  customXmlDelRangeEnd: "capture";
-  customXmlDelRangeStart: "capture";
-  customXmlInsRangeEnd: "capture";
-  customXmlInsRangeStart: "capture";
-  customXmlMoveFromRangeEnd: "capture";
-  customXmlMoveFromRangeStart: "capture";
-  customXmlMoveToRangeEnd: "capture";
-  customXmlMoveToRangeStart: "capture";
-  fldSimple: (child: XmlElement) => void;
-  hyperlink: (child: XmlElement) => void;
-  moveFromRangeEnd: "capture";
-  moveFromRangeStart: "capture";
-  moveToRangeEnd: "capture";
-  moveToRangeStart: "capture";
-  permEnd: "capture";
-  permStart: "capture";
-  proofErr: "capture";
-  sdt: "capture";
-  subDoc: "capture";
+declare const HYPERLINK_CHILD_HANDLERS: {
+  readonly r: (child: XmlElement, { push, styles, theme, rels, media, previews, inScopeXmlns }: HyperlinkChildContext) => void;
+  readonly bookmarkStart: (child: XmlElement, { push }: HyperlinkChildContext) => void;
+  readonly bookmarkEnd: (child: XmlElement, { push }: HyperlinkChildContext) => void;
+  readonly bdo: ChildReader<HyperlinkChildContext>;
+  readonly dir: ChildReader<HyperlinkChildContext>;
+  readonly customXml: ChildReader<HyperlinkChildContext>;
+  readonly smartTag: ChildReader<HyperlinkChildContext>;
+  readonly del: "capture";
+  readonly ins: "capture";
+  readonly moveFrom: "capture";
+  readonly moveTo: "capture";
+  readonly commentRangeEnd: "capture";
+  readonly commentRangeStart: "capture";
+  readonly customXmlDelRangeEnd: "capture";
+  readonly customXmlDelRangeStart: "capture";
+  readonly customXmlInsRangeEnd: "capture";
+  readonly customXmlInsRangeStart: "capture";
+  readonly customXmlMoveFromRangeEnd: "capture";
+  readonly customXmlMoveFromRangeStart: "capture";
+  readonly customXmlMoveToRangeEnd: "capture";
+  readonly customXmlMoveToRangeStart: "capture";
+  readonly fldSimple: (child: XmlElement, { push }: HyperlinkChildContext) => void;
+  readonly hyperlink: (child: XmlElement, { push }: HyperlinkChildContext) => void;
+  readonly moveFromRangeEnd: "capture";
+  readonly moveFromRangeStart: "capture";
+  readonly moveToRangeEnd: "capture";
+  readonly moveToRangeStart: "capture";
+  readonly permEnd: "capture";
+  readonly permStart: "capture";
+  readonly proofErr: "capture";
+  readonly sdt: "capture";
+  readonly subDoc: "capture";
 };
 /**
  * Get the display text of a hyperlink
@@ -169,4 +181,4 @@ declare function createExternalHyperlink(url: string, children: document_d_expor
   target?: string;
 }): document_d_exports.Hyperlink;
 //#endregion
-export { HyperlinkChildContext, createExternalHyperlink, createInternalHyperlink, getHyperlinkRuns, getHyperlinkText, getHyperlinkUrl, hasContent, hyperlinkChildHandlers, isExternalLink, isInternalLink, parseHyperlink, resolveHyperlinkUrl };
+export { HYPERLINK_CHILD_HANDLERS, HyperlinkChildContext, createExternalHyperlink, createInternalHyperlink, getHyperlinkRuns, getHyperlinkText, getHyperlinkUrl, hasContent, isExternalLink, isInternalLink, parseHyperlink, parseHyperlinkShell, resolveHyperlinkUrl };