@stll/folio-core 0.33.2 → 0.35.0

package/dist/display-list/build/watermarkPrimitives.js

@@ -1,4 +1,4 @@
-import { pxToPt } from "../../layout-engine/measure/measureHelpers.js";
+import { ptToPx, pxToPt } from "../../layout-engine/measure/measureHelpers.js";
 import { getFontMetrics } from "../../layout-engine/measure/measureProvider.js";
 import { parseDisplayColor } from "./colors.js";
 import { buildGlyphs, glyphRunText } from "./glyphs.js";
@@ -28,7 +28,7 @@ const TEXT_DEFAULT_COLOR = "#C0C0C0";
 const TEXT_DEFAULT_OPACITY = .5;
 const TEXT_DIAGONAL_DEGREES = -45;
 const PICTURE_NATIVE_SCALE = 1;
-const PICTURE_WASHOUT_OPACITY = .4;
+const PICTURE_WASHOUT_OPACITY = .18;
 const paintTextWatermark = (watermark, page, context) => {
 	if (watermark.text.length === 0) return [];
 	const style = {
@@ -98,6 +98,18 @@ const containedRect = (page, scale, pixelWidth, pixelHeight) => {
 		heightPx
 	};
 };
+/** The centred VML shape box, when both authored dimensions survived parsing. */
+const authoredPictureRect = (page, widthPt, heightPt) => {
+	if (widthPt === void 0 || heightPt === void 0) return;
+	const widthPx = ptToPx(widthPt);
+	const heightPx = ptToPx(heightPt);
+	return {
+		xPx: (page.size.w - widthPx) / 2,
+		yPx: (page.size.h - heightPx) / 2,
+		widthPx,
+		heightPx
+	};
+};
 const paintPictureWatermark = (watermark, page, imageSrc, context) => {
 	if (imageSrc === void 0) {
 		context.unsupported.report(UNSUPPORTED_CONSTRUCT.watermark, context.pageIndex, `picture watermark ${watermark.imageRId} has no resolved image source: the relationship id resolves in the package layer, not in the builder`);
@@ -113,7 +125,7 @@ const paintPictureWatermark = (watermark, page, imageSrc, context) => {
 	return [{
 		kind: "image",
 		image: ref,
-		rect: containedRect(page, watermark.scale ?? PICTURE_NATIVE_SCALE, source?.pixelWidth ?? 0, source?.pixelHeight ?? 0),
+		rect: authoredPictureRect(page, watermark.widthPt, watermark.heightPt) ?? containedRect(page, watermark.scale ?? PICTURE_NATIVE_SCALE, source?.pixelWidth ?? 0, source?.pixelHeight ?? 0),
 		opacity: watermark.washout === false ? 1 : PICTURE_WASHOUT_OPACITY
 	}];
 };

package/dist/document-operations.js

@@ -143,6 +143,24 @@ const readOptionalBoolean = (value, key, path) => {
 	if (typeof candidate === "boolean") return candidate;
 	return invalidBatch(`${path}.${key}`, "expected a boolean when provided");
 };
+const readClearableNonEmptyString = (value, key, path) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	if (typeof candidate === "string" && candidate.trim().length > 0) return candidate.trim();
+	return invalidBatch(`${path}.${key}`, "expected a non-empty string or null when provided");
+};
+const readClearableFontSize = (value, key, path) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	if (typeof candidate === "number" && candidate > 0 && Number.isInteger(candidate * 2)) return candidate;
+	return invalidBatch(`${path}.${key}`, "expected a positive half-point value or null");
+};
+const readClearableRgbColor = (value, key, path) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	if (typeof candidate === "string" && /^#?[0-9a-fA-F]{6}$/u.test(candidate)) return candidate.replace(/^#/u, "").toUpperCase();
+	return invalidBatch(`${path}.${key}`, "expected a six-digit RGB color or null");
+};
 const readOptionalStringArray = (value, key, path) => {
 	const candidate = value[key];
 	if (candidate === void 0) return;
@@ -238,18 +256,27 @@ const readInlineFormatting = (value, path) => {
 		"bold",
 		"italic",
 		"underline",
-		"strike"
+		"strike",
+		"fontFamily",
+		"fontSizePt",
+		"color"
 	]);
 	const bold = readOptionalBoolean(candidate, "bold", formattingPath);
 	const italic = readOptionalBoolean(candidate, "italic", formattingPath);
 	const underline = readOptionalBoolean(candidate, "underline", formattingPath);
 	const strike = readOptionalBoolean(candidate, "strike", formattingPath);
-	if (bold === void 0 && italic === void 0 && underline === void 0 && strike === void 0) return invalidBatch(formattingPath, "expected at least one formatting property");
+	const fontFamily = readClearableNonEmptyString(candidate, "fontFamily", formattingPath);
+	const fontSizePt = readClearableFontSize(candidate, "fontSizePt", formattingPath);
+	const color = readClearableRgbColor(candidate, "color", formattingPath);
+	if (bold === void 0 && italic === void 0 && underline === void 0 && strike === void 0 && fontFamily === void 0 && fontSizePt === void 0 && color === void 0) return invalidBatch(formattingPath, "expected at least one formatting property");
 	return {
 		...bold !== void 0 && { bold },
 		...italic !== void 0 && { italic },
 		...underline !== void 0 && { underline },
-		...strike !== void 0 && { strike }
+		...strike !== void 0 && { strike },
+		...fontFamily !== void 0 && { fontFamily },
+		...fontSizePt !== void 0 && { fontSizePt },
+		...color !== void 0 && { color }
 	};
 };
 const readOptionalComment = (value, path) => {

package/dist/docx/headerFooterParser.js

@@ -31,27 +31,21 @@ function parseHeader(headerXml, hdrFtrType = "default", styles = null, theme = n
 		result.rawWatermarkXml = watermarkResult.rawParagraphXml;
 		result.watermarkBlockIndex = watermarkResult.blockIndex;
 	}
-	result.content = parseBlockContent(watermarkResult ? withoutChild(rootElement, watermarkResult.hostingParagraph) : rootElement, styles, theme, numbering, rels, media, {
+	result.content = parseBlockContent(rootElement, styles, theme, numbering, rels, media, {
 		inHeaderFooter: true,
 		rootXmlns: collectXmlnsDeclarations(rootElement)
 	});
+	if (watermarkResult) {
+		const host = result.content.at(watermarkResult.blockIndex);
+		if (host?.type === "paragraph") result.content[watermarkResult.blockIndex] = {
+			...host,
+			content: []
+		};
+	}
 	assignHeaderFooterVerbatimXml(result, headerXml);
 	return result;
 }
 /**
-* Return a shallow copy of `parent` whose `elements` array omits the
-* single child reference `child`. Used to skip the watermark paragraph
-* when feeding the header into `parseBlockContent` — without this the
-* body parser would emit an empty placeholder paragraph where the
-* watermark sits in the source.
-*/
-function withoutChild(parent, child) {
-	return {
-		...parent,
-		elements: (parent.elements ?? []).filter((el) => el !== child)
-	};
-}
-/**
 * Parse a footer XML file (word/footer*.xml)
 *
 * @param footerXml - The raw XML content of the footer file

package/dist/docx/paragraphParser.js

@@ -763,6 +763,47 @@ function parseSimpleField(node, styles, theme, rels, media, rootXmlns = {}) {
 function hasRunPayloadElement(runElement) {
 	return getChildElements(runElement).some((child) => !matchesName(child, "w", "rPr"));
 }
+const LEGACY_FORM_CHECKBOX_GLYPHS = {
+	checked: "☒",
+	unchecked: "☐"
+};
+const LEGACY_FORM_CHECKBOX_INSTRUCTION = "FORMCHECKBOX";
+function getLegacyFormCheckboxDisplay(runElement) {
+	const fieldChar = findChild(runElement, "w", "fldChar");
+	const fieldData = fieldChar ? findChild(fieldChar, "w", "ffData") : null;
+	const checkBox = fieldData ? findChild(fieldData, "w", "checkBox") : null;
+	if (!checkBox) return;
+	const checked = findChild(checkBox, "w", "checked");
+	const defaultChecked = findChild(checkBox, "w", "default");
+	let isChecked = defaultChecked ? parseBooleanElement(defaultChecked) : false;
+	if (checked) isChecked = parseBooleanElement(checked);
+	const explicitSize = parseNumericAttribute(findChild(checkBox, "w", "size"), "w", "val");
+	const text = isChecked ? LEGACY_FORM_CHECKBOX_GLYPHS.checked : LEGACY_FORM_CHECKBOX_GLYPHS.unchecked;
+	if (explicitSize === void 0) return { text };
+	return {
+		text,
+		fontSize: explicitSize
+	};
+}
+function createLegacyFormCheckboxResultRun(display, inheritedFormatting) {
+	const run = {
+		type: "run",
+		content: [{
+			type: "text",
+			text: display.text
+		}]
+	};
+	const hasInheritedFormatting = inheritedFormatting !== void 0 && Object.keys(inheritedFormatting).length > 0;
+	if (display.fontSize !== void 0) run.formatting = hasInheritedFormatting ? {
+		...inheritedFormatting,
+		fontSize: display.fontSize
+	} : { fontSize: display.fontSize };
+	else if (hasInheritedFormatting) run.formatting = inheritedFormatting;
+	return run;
+}
+function isLegacyFormCheckboxInstruction(instruction) {
+	return instruction.trim().split(/\s+/u).at(0)?.toUpperCase() === LEGACY_FORM_CHECKBOX_INSTRUCTION;
+}
 /**
 * Parse all content within a paragraph
 *
@@ -779,6 +820,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 	let afterSeparator = false;
 	let complexFieldLock = false;
 	let complexFieldDirty = false;
+	let complexFieldFallbackDisplay;
 	let complexFieldFormatting;
 	for (const child of children) {
 		const localName = getLocalName(child.name);
@@ -790,6 +832,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 				let hasFieldBegin = false;
 				let beginFldLock = false;
 				let beginDirty = false;
+				const beginFallbackDisplay = getLegacyFormCheckboxDisplay(runElement);
 				let hasFieldSeparate = false;
 				let hasFieldEnd = false;
 				let endOriginalValue;
@@ -816,6 +859,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 					complexFieldResultRuns = [];
 					complexFieldLock = beginFldLock;
 					complexFieldDirty = beginDirty;
+					complexFieldFallbackDisplay = beginFallbackDisplay;
 					complexFieldFormatting = run.formatting;
 				}
 				if (inComplexField) {
@@ -840,6 +884,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 					}
 					if (hasFieldEnd) {
 						let resultRuns = complexFieldResultRuns;
+						if (resultRuns.length === 0 && complexFieldFallbackDisplay !== void 0 && isLegacyFormCheckboxInstruction(complexFieldInstr)) resultRuns = [createLegacyFormCheckboxResultRun(complexFieldFallbackDisplay, complexFieldFormatting)];
 						if (resultRuns.length === 0 && !afterSeparator && endOriginalValue !== void 0) resultRuns = [{
 							type: "run",
 							content: [{

package/dist/docx/serializer/headerFooterSerializer.js

@@ -1,4 +1,7 @@
 import { canReplayHeaderFooterVerbatim, getHeaderFooterVerbatimXml } from "../headerFooterVerbatim.js";
+import { isEmptyParagraph } from "../paragraphParser.js";
+import { captureVerbatimXml } from "../verbatimCapture.js";
+import { getLocalName, parseXmlDocument } from "../xmlParser.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializePartElement } from "./partNamespaces.js";
@@ -53,8 +56,16 @@ function serializeHeaderFooter(hf, source) {
 	const watermarkInsertIndex = hf.watermarkBlockIndex !== void 0 ? Math.max(0, Math.min(hf.watermarkBlockIndex, hf.content.length)) : 0;
 	const blocksXml = hf.content.map((block) => serializeBlock(block));
 	let contentXml;
-	if (watermarkXml) contentXml = blocksXml.slice(0, watermarkInsertIndex).join("") + watermarkXml + blocksXml.slice(watermarkInsertIndex).join("");
-	else contentXml = blocksXml.join("");
+	if (watermarkXml) {
+		const watermarkHost = hf.content.at(watermarkInsertIndex);
+		const rawWatermarkXml = hf.rawWatermarkXml;
+		const mergesIntoRetainedHost = rawWatermarkXml !== void 0 && watermarkHost?.type === "paragraph" && isEmptyParagraph(watermarkHost);
+		if (mergesIntoRetainedHost) blocksXml[watermarkInsertIndex] = serializeRawWatermarkIntoHost({
+			hostXml: blocksXml[watermarkInsertIndex] ?? serializeParagraph(watermarkHost),
+			rawWatermarkXml
+		});
+		contentXml = blocksXml.slice(0, watermarkInsertIndex).join("") + (mergesIntoRetainedHost ? "" : watermarkXml) + blocksXml.slice(watermarkInsertIndex).join("");
+	} else contentXml = blocksXml.join("");
 	if (!contentXml) contentXml = "<w:p><w:pPr/></w:p>";
 	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
 		partPath: source?.path ?? `word/${hf.type}.xml`,
@@ -64,6 +75,14 @@ function serializeHeaderFooter(hf, source) {
 		body: contentXml
 	});
 }
+function serializeRawWatermarkIntoHost({ hostXml, rawWatermarkXml }) {
+	const rawHost = parseXmlDocument(rawWatermarkXml);
+	if (!rawHost || getLocalName(rawHost.name ?? "") !== "p") return rawWatermarkXml;
+	const watermarkContent = (rawHost.elements ?? []).filter((child) => child.type === "element" && getLocalName(child.name ?? "") !== "pPr").map((child) => captureVerbatimXml(child)).join("");
+	if (!watermarkContent) return rawWatermarkXml;
+	const namespaceAttributes = Object.entries(rawHost.attributes ?? {}).filter(([name, value]) => value !== void 0 && (name === "xmlns" || name.startsWith("xmlns:"))).map(([name, value]) => ` ${name}="${escapeXml(String(value))}"`).join("");
+	return hostXml.replace(/^<w:p(?=[\s>])/u, `<w:p${namespaceAttributes}`).replace("</w:p>", `${watermarkContent}</w:p>`);
+}
 function serializeWatermarkParagraph(hf) {
 	if (hf.rawWatermarkXml) return hf.rawWatermarkXml;
 	if (hf.watermark) return synthesizeWatermarkParagraph(hf.watermark);

package/dist/docx/serializer/paragraphSerializer.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../../types/document.js";
 //#region src/docx/serializer/paragraphSerializer.d.ts
-declare function serializeParagraphFormatting(formatting: document_d_exports.ParagraphFormatting | undefined, propertyChanges?: document_d_exports.ParagraphPropertyChange[], pPrMark?: document_d_exports.ParagraphMarkChange): string;
+declare function serializeParagraphFormatting(formatting: document_d_exports.ParagraphFormatting | undefined, propertyChanges?: document_d_exports.ParagraphPropertyChange[], paragraphMarkChange?: document_d_exports.ParagraphMarkChange): string;
 /**
  * Serialize a paragraph to OOXML XML (w:p)
  *

package/dist/docx/serializer/paragraphSerializer.js

@@ -140,7 +140,7 @@ function serializeParagraphMarkChange(mark) {
 	const attrs = serializeTrackedChangeAttrs(mark.info);
 	return `<w:${mark.kind} ${attrs}/>`;
 }
-function serializeParagraphFormatting(formatting, propertyChanges, pPrMark) {
+const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges, paragraphMarkChange, sectionProperties } = {}) => {
 	const parts = [];
 	const pushToggle = (name, value) => {
 		if (value === true) parts.push(`<w:${name}/>`);
@@ -175,14 +175,22 @@ function serializeParagraphFormatting(formatting, propertyChanges, pPrMark) {
 		pushToggle("contextualSpacing", formatting.contextualSpacing);
 		if (formatting.alignment) parts.push(`<w:jc w:val="${formatting.alignment}"/>`);
 		if (formatting.outlineLevel !== void 0) parts.push(`<w:outlineLvl w:val="${formatting.outlineLevel}"/>`);
-		if (pPrMark || formatting.runProperties || formatting.runInWithNext) {
-			const fullInner = `${pPrMark ? serializeParagraphMarkChange(pPrMark) : ""}${formatting.runProperties ? extractRPrInner(serializeTextFormatting(formatting.runProperties)) : ""}${formatting.runInWithNext ? "<w:specVanish/>" : ""}`;
+		if (paragraphMarkChange || formatting.runProperties || formatting.runInWithNext) {
+			const fullInner = `${paragraphMarkChange ? serializeParagraphMarkChange(paragraphMarkChange) : ""}${formatting.runProperties ? extractRPrInner(serializeTextFormatting(formatting.runProperties)) : ""}${formatting.runInWithNext ? "<w:specVanish/>" : ""}`;
 			if (fullInner.length > 0) parts.push(`<w:rPr>${fullInner}</w:rPr>`);
 		}
-	} else if (pPrMark) parts.push(`<w:rPr>${serializeParagraphMarkChange(pPrMark)}</w:rPr>`);
+	} else if (paragraphMarkChange) parts.push(`<w:rPr>${serializeParagraphMarkChange(paragraphMarkChange)}</w:rPr>`);
+	parts.push(serializeSectionProperties(sectionProperties));
 	if (propertyChanges && propertyChanges.length > 0) parts.push(...propertyChanges.map((change) => serializeParagraphPropertyChange(change)));
-	if (parts.length === 0) return "";
-	return `<w:pPr>${parts.join("")}</w:pPr>`;
+	const inner = parts.join("");
+	if (inner.length === 0) return "";
+	return `<w:pPr>${inner}</w:pPr>`;
+};
+function serializeParagraphFormatting(formatting, propertyChanges, paragraphMarkChange) {
+	return serializeParagraphFormattingWithOptions(formatting, {
+		propertyChanges,
+		paragraphMarkChange
+	});
 }
 function extractPPrInner(pPrXml) {
 	if (!pPrXml.startsWith("<w:pPr>") || !pPrXml.endsWith("</w:pPr>")) return "";
@@ -486,9 +494,11 @@ function serializeParagraph(paragraph) {
 	if (paragraph.paraId) attrs.push(`w14:paraId="${escapeXml(paragraph.paraId)}"`);
 	if (paragraph.textId) attrs.push(`w14:textId="${escapeXml(paragraph.textId)}"`);
 	const attrsStr = attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
-	const pPrXml = serializeParagraphFormatting(paragraph.formatting, paragraph.propertyChanges, paragraph.pPrMark);
-	const sectionPropertiesXml = serializeSectionProperties(paragraph.sectionProperties);
-	if (pPrXml || sectionPropertiesXml) parts.push(`<w:pPr>${extractPPrInner(pPrXml)}${sectionPropertiesXml}</w:pPr>`);
+	parts.push(serializeParagraphFormattingWithOptions(paragraph.formatting, {
+		propertyChanges: paragraph.propertyChanges,
+		paragraphMarkChange: paragraph.pPrMark,
+		sectionProperties: paragraph.sectionProperties
+	}));
 	const explicitCommentReferenceIds = /* @__PURE__ */ new Set();
 	for (const content of paragraph.content) if (content.type === "commentReference") explicitCommentReferenceIds.add(content.id);
 	let pendingRenderedPageBreak = paragraph.renderedPageBreakBefore === true;

package/dist/docx/settingsParser.js

@@ -55,6 +55,9 @@ function parseSettings(xml) {
 	if (compatibilityMode !== void 0) settings.compatibilityMode = compatibilityMode;
 	const splitPageBreakAndParagraphMark = compat ? findChild(compat, "w", "splitPgBreakAndParaMark") : null;
 	if (splitPageBreakAndParagraphMark && parseBooleanElement(splitPageBreakAndParagraphMark)) settings.splitPageBreakAndParagraphMark = true;
+	const wordprocessingCompat = root ? findChildByNamespaceUri(root, WORDPROCESSINGML_NAMESPACE_URIS, "compat") : null;
+	const adjustLineHeightInTable = wordprocessingCompat ? findChildByNamespaceUri(wordprocessingCompat, WORDPROCESSINGML_NAMESPACE_URIS, "adjustLineHeightInTable") : null;
+	if (adjustLineHeightInTable && parseBooleanElement(adjustLineHeightInTable)) settings.adjustLineHeightInTable = true;
 	const applyBreakingRules = compat ? findChild(compat, "w", "applyBreakingRules") : null;
 	const useLegacyEthiopicAmharicRules = applyBreakingRules !== null && parseBooleanElement(applyBreakingRules);
 	if (noLineBreaksBefore || noLineBreaksAfter || useLegacyEthiopicAmharicRules) settings.lineBreakRules = {

package/dist/docx/watermarkParser.d.ts

@@ -14,10 +14,8 @@ type ParsedWatermark = {
   hostingParagraph: XmlElement;
   /**
    * Index where the watermark paragraph sat among block-level siblings
-   * (`w:p` / `w:tbl`) in the source header. After the host paragraph is
-   * filtered out of `content`, the serializer inserts the watermark
-   * back at this index so a header that originally placed the
-   * watermark after visible text rounds-trips with the same flow.
+   * (`w:p` / `w:tbl` / `w:sdt`) in the source header. The serializer uses
+   * this index to replace the retained host paragraph with watermark XML.
    */
   blockIndex: number;
 };

package/dist/docx/watermarkParser.js

@@ -59,11 +59,9 @@ function parseWatermark(header) {
 	}
 }
 /**
-* Index of `target` among block-level children of `header` (only
-* `w:p` and `w:tbl` count as blocks). Since the hosting paragraph
-* is filtered out of `content` after parse, this is the index the
-* serializer needs to splice the watermark XML back into so the
-* header rounds-trips with the same flow as the source.
+* Index of `target` among block-level children of `header`. Keep this list
+* aligned with `parseBlockContent`, which emits paragraphs, tables, and
+* block-level content controls as one content item each.
 */
 function blockIndexOf(header, target) {
 	let blockIdx = 0;
@@ -71,7 +69,7 @@ function blockIndexOf(header, target) {
 		if (child === target) return blockIdx;
 		if (child.type !== "element") continue;
 		const local = getLocalName(child.name ?? "");
-		if (local === "p" || local === "tbl") blockIdx++;
+		if (local === "p" || local === "tbl" || local === "sdt") blockIdx++;
 	}
 	return 0;
 }

package/dist/headless-layout.js

@@ -1,3 +1,5 @@
+import { resolveDocumentGridLinePitch } from "./docx/documentGrid.js";
+import { formatOoxmlCounter } from "./docx/ooxmlCounterFormatter.js";
 import { parseDocx } from "./docx/parser.js";
 import { buildHeaderFooterFieldValues } from "./fields/resolveFieldValues.js";
 import { extractEmbeddedFonts } from "./fonts/embeddedFonts.js";
@@ -50,6 +52,11 @@ import { createHash } from "node:crypto";
 * backend in a browser); this module refuses to guess, because a silently
 * wrong provider produces a plausible layout that is wrong everywhere.
 */
+const formatEndnoteTexts = (numbers, formatNumber) => {
+	const texts = /* @__PURE__ */ new Map();
+	for (const [id, displayNumber] of numbers) texts.set(id, formatNumber(displayNumber));
+	return texts;
+};
 var HeadlessLayoutError = class extends TaggedError("HeadlessLayoutError") {};
 /**
 * Stories this entry still does not lay out, keyed by story so the map is total
@@ -93,6 +100,8 @@ const buildFlowOptions = (document, pageContentHeight) => {
 		...settings.consecutiveHyphenLimit === void 0 ? {} : { consecutiveLineLimit: settings.consecutiveHyphenLimit },
 		...settings.hyphenationZoneTwips === void 0 ? {} : { hyphenationZoneTwips: settings.hyphenationZoneTwips }
 	};
+	const finalSectionDocumentGridLinePitchTwips = resolveDocumentGridLinePitch(document.package.document.sections?.at(-1)?.properties.docGrid);
+	if (finalSectionDocumentGridLinePitchTwips !== void 0) options.finalSectionDocumentGridLinePitchTwips = finalSectionDocumentGridLinePitchTwips;
 	return options;
 };
 /**
@@ -237,9 +246,12 @@ const layoutDocxHeadless = async (input, options = {}) => {
 		const footnotes = document.package.footnotes ?? [];
 		const endnotes = document.package.endnotes ?? [];
 		const footnoteRefs = collectFootnoteRefs(authored);
+		const footnoteNumbers = computeNoteDisplayNumbers(footnotes, footnoteRefs.map((ref) => ref.footnoteId));
+		const endnoteNumbers = computeNoteDisplayNumbers(endnotes, collectEndnoteRefs(authored).map((ref) => ref.endnoteId));
+		const endnoteNumberFormat = finalSection?.endnotePr?.numFmt ?? "lowerRoman";
 		const blocks = remapNoteMarkerText(authored, {
-			footnoteNumbers: computeNoteDisplayNumbers(footnotes, footnoteRefs.map((ref) => ref.footnoteId)),
-			endnoteNumbers: computeNoteDisplayNumbers(endnotes, collectEndnoteRefs(authored).map((ref) => ref.endnoteId))
+			footnoteNumbers,
+			endnoteTexts: formatEndnoteTexts(endnoteNumbers, (displayNumber) => formatOoxmlCounter(displayNumber, endnoteNumberFormat))
 		});
 		const measures = measureBlocks(blocks, contentWidth);
 		const footnoteContentById = footnoteRefs.length === 0 ? void 0 : buildFootnoteContentMap(footnotes, footnoteRefs, contentWidth, {

package/dist/layout-bridge/convert/footnoteLayout.d.ts

@@ -52,8 +52,8 @@ declare function computeNoteDisplayNumbers(notes: readonly NumberableNote[], ref
 type NoteDisplayNumberMaps = {
   /** footnote `w:id` → sequential display number */
   footnoteNumbers?: ReadonlyMap<number, number>;
-  /** endnote `w:id` → sequential display number */
-  endnoteNumbers?: ReadonlyMap<number, number>;
+  /** endnote `w:id` → formatted display text */
+  endnoteTexts?: ReadonlyMap<number, string>;
 };
 /**
  * Rewrite body reference-marker run text from the raw `w:id` (which the PM

package/dist/layout-bridge/convert/footnoteLayout.js

@@ -80,7 +80,7 @@ function computeNoteDisplayNumbers(notes, refNoteIds) {
 * template preview substitution).
 */
 function remapNoteMarkerText(blocks, maps) {
-	if ((maps.footnoteNumbers?.size ?? 0) === 0 && (maps.endnoteNumbers?.size ?? 0) === 0) return blocks;
+	if ((maps.footnoteNumbers?.size ?? 0) === 0 && (maps.endnoteTexts?.size ?? 0) === 0) return blocks;
 	let changed = false;
 	const next = blocks.map((block) => {
 		const remapped = remapNoteMarkerBlock(block, maps);
@@ -147,17 +147,19 @@ function remapNoteMarkerParagraph(block, maps) {
 }
 function remapNoteMarkerRun(run, maps) {
 	if (run.kind !== "text") return run;
-	const displayNumber = getRunDisplayNumber(run, maps);
-	if (displayNumber === void 0) return run;
-	const text = String(displayNumber);
-	return run.text === text ? run : {
+	const displayText = getRunDisplayText(run, maps);
+	if (displayText === void 0) return run;
+	return run.text === displayText ? run : {
 		...run,
-		text
+		text: displayText
 	};
 }
-function getRunDisplayNumber(run, maps) {
-	if (run.footnoteRefId !== void 0) return maps.footnoteNumbers?.get(run.footnoteRefId);
-	if (run.endnoteRefId !== void 0) return maps.endnoteNumbers?.get(run.endnoteRefId);
+function getRunDisplayText(run, maps) {
+	if (run.footnoteRefId !== void 0) {
+		const displayNumber = maps.footnoteNumbers?.get(run.footnoteRefId);
+		return displayNumber === void 0 ? void 0 : String(displayNumber);
+	}
+	if (run.endnoteRefId !== void 0) return maps.endnoteTexts?.get(run.endnoteRefId);
 }
 /**
 * After layout, determine which footnotes appear on which pages.
@@ -202,7 +204,7 @@ function convertFootnoteToContent(footnote, displayNumber, contentWidth, options
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
 	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
 	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	const blocks = applyFootnotePresentation(toFlowBlocks(pmDoc, flowOptions), displayNumber);
+	const blocks = applyFootnotePresentation(preserveAuthoredFootnoteTerminalParagraph(toFlowBlocks(pmDoc, flowOptions)), displayNumber);
 	const measures = options.measureBlocks ? options.measureBlocks(blocks, contentWidth) : measureFootnoteBlocks(blocks, contentWidth);
 	let totalHeight = 0;
 	for (const measure of measures) if (measure.kind === "paragraph") totalHeight += measure.totalHeight;
@@ -216,6 +218,17 @@ function convertFootnoteToContent(footnote, displayNumber, contentWidth, options
 		height: totalHeight
 	};
 }
+/** Restore an authored footnote line that the body-only terminal-table policy collapsed. */
+function preserveAuthoredFootnoteTerminalParagraph(blocks) {
+	const finalBlock = blocks.at(-1);
+	if (blocks.at(-2)?.kind !== "table" || finalBlock?.kind !== "paragraph" || finalBlock.attrs?.suppressEmptyParagraphHeight !== true) return blocks;
+	const attrs = { ...finalBlock.attrs };
+	delete attrs.suppressEmptyParagraphHeight;
+	return [...blocks.slice(0, -1), {
+		...finalBlock,
+		attrs
+	}];
+}
 function measureFootnoteBlocks(blocks, contentWidth) {
 	return blocks.map((block) => measureFootnoteBlock(block, contentWidth));
 }

package/dist/layout-bridge/convert/headerFooterLayout.js

@@ -3,6 +3,16 @@ import { headerFooterToProseDoc } from "../../prosemirror/conversion/toProseDoc.
 import { emuToPixels } from "../../utils/units.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/headerFooterLayout.ts
+const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
+const headerFooterToProseDocWithDetachedWatermarkHost = (headerFooter, options) => {
+	return headerFooterToProseDoc(headerFooter.content.map((block, blockIndex) => {
+		if (blockIndex !== headerFooter.watermarkBlockIndex || block.type !== "paragraph") return block;
+		return {
+			...block,
+			[DETACHED_WATERMARK_HOST]: true
+		};
+	}), options);
+};
 function isAnchoredImageRun(run) {
 	if (run.kind !== "image") return false;
 	if (run.position) return true;
@@ -241,7 +251,7 @@ function calculateHeaderFooterVisualBounds(blocks, measures, flowHeight, metrics
 * these bounds separately describe the in-flow portion for API consumers.
 */
 function calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, metrics) {
-	if (blocks.length > 0 && blocks.every((block) => isPaintlessParagraph(block) && !hasAuthoredVisualContent(block))) return {
+	if (blocks.length > 0 && blocks.every((block) => block.kind === "paragraph" && isPaintlessParagraph(block) && !hasAuthoredVisualContent(block) && block.attrs?.suppressEmptyParagraphHeight !== false && !preservesInheritedSpacing(block))) return {
 		top: 0,
 		bottom: 0
 	};
@@ -330,7 +340,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 	const proseDocOptions = {};
 	if (options.styles) proseDocOptions.styles = options.styles;
 	if (options.theme !== void 0) proseDocOptions.theme = options.theme;
-	const pmDoc = headerFooterToProseDoc(headerFooter.content, proseDocOptions);
+	const pmDoc = headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions);
 	const flowOptions = {};
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
 	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
@@ -458,6 +468,7 @@ function serializeParagraphAttrs(attrs) {
 	const keys = [
 		"alignment",
 		"bidi",
+		"suppressEmptyParagraphHeight",
 		"indent",
 		"spacing",
 		"styleId",