@stll/folio-core 0.4.0 → 0.5.0

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

@@ -16,20 +16,149 @@ const FOOTNOTE_FONT_SIZE = 8;
 * area.
 */
 function collectFootnoteRefs(blocks) {
+	return collectNoteRefs(blocks, "footnoteRefId").map(({ noteId, pmPos }) => ({
+		footnoteId: noteId,
+		pmPos
+	}));
+}
+/**
+* Scan FlowBlocks for runs with endnoteRefId set, in document order.
+* Same recursive walk as `collectFootnoteRefs`.
+*/
+function collectEndnoteRefs(blocks) {
+	return collectNoteRefs(blocks, "endnoteRefId").map(({ noteId, pmPos }) => ({
+		endnoteId: noteId,
+		pmPos
+	}));
+}
+function collectNoteRefs(blocks, idKey) {
 	const refs = [];
 	const walk = (containerBlocks) => {
-		for (const block of containerBlocks) if (block.kind === "paragraph") {
-			for (const run of block.runs) if (run.kind === "text" && run.footnoteRefId !== void 0) refs.push({
-				footnoteId: run.footnoteRefId,
+		for (const block of containerBlocks) if (block.kind === "paragraph") for (const run of block.runs) {
+			if (run.kind !== "text") continue;
+			const noteId = run[idKey];
+			if (noteId !== void 0) refs.push({
+				noteId,
 				pmPos: run.pmStart ?? 0
 			});
-		} else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) walk(cell.blocks);
+		}
+		else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) walk(cell.blocks);
 		else if (block.kind === "textBox") walk(block.content);
 	};
 	walk(blocks);
 	return refs;
 }
 /**
+* Assign sequential display numbers (1, 2, 3, …) to notes in order of first
+* reference. Word numbers footnotes/endnotes by reference order, not by their
+* `w:id` values, which may be non-contiguous or out of document order. Only
+* `normal` notes are numbered; separator/continuation notes and refs to
+* missing notes consume no number.
+*/
+function computeNoteDisplayNumbers(notes, refNoteIds) {
+	const numberable = /* @__PURE__ */ new Set();
+	for (const note of notes) if (note.noteType === "normal") numberable.add(note.id);
+	const displayNumbers = /* @__PURE__ */ new Map();
+	let nextNumber = 1;
+	for (const noteId of refNoteIds) {
+		if (displayNumbers.has(noteId) || !numberable.has(noteId)) continue;
+		displayNumbers.set(noteId, nextNumber);
+		nextNumber++;
+	}
+	return displayNumbers;
+}
+/**
+* Rewrite body reference-marker run text from the raw `w:id` (which the PM
+* doc stores as the marker text; the save path serializes from the mark
+* attrs, never from this text) to the sequential display number, so the
+* inline marker matches the number rendered in the note area. Must run
+* before measurement so marker widths match the painted digits. Untouched
+* blocks/runs are returned by reference so the painter's fingerprinting and
+* the incremental measure path see them unchanged. Runs keep their PM range,
+* so click-to-position still resolves into the marker (same contract as the
+* template preview substitution).
+*/
+function remapNoteMarkerText(blocks, maps) {
+	if ((maps.footnoteNumbers?.size ?? 0) === 0 && (maps.endnoteNumbers?.size ?? 0) === 0) return blocks;
+	let changed = false;
+	const next = blocks.map((block) => {
+		const remapped = remapNoteMarkerBlock(block, maps);
+		changed ||= remapped !== block;
+		return remapped;
+	});
+	return changed ? next : blocks;
+}
+function remapNoteMarkerBlock(block, maps) {
+	if (block.kind === "paragraph") return remapNoteMarkerParagraph(block, maps);
+	if (block.kind === "table") {
+		let tableChanged = false;
+		const rows = block.rows.map((row) => {
+			let rowChanged = false;
+			const cells = row.cells.map((cell) => {
+				let cellChanged = false;
+				const cellBlocks = cell.blocks.map((cellBlock) => {
+					const remapped = remapNoteMarkerBlock(cellBlock, maps);
+					cellChanged ||= remapped !== cellBlock;
+					return remapped;
+				});
+				return cellChanged ? {
+					...cell,
+					blocks: cellBlocks
+				} : cell;
+			});
+			rowChanged = cells.some((cell, index) => cell !== row.cells[index]);
+			tableChanged ||= rowChanged;
+			return rowChanged ? {
+				...row,
+				cells
+			} : row;
+		});
+		return tableChanged ? {
+			...block,
+			rows
+		} : block;
+	}
+	if (block.kind === "textBox") {
+		let boxChanged = false;
+		const content = block.content.map((paragraph) => {
+			const remapped = remapNoteMarkerParagraph(paragraph, maps);
+			boxChanged ||= remapped !== paragraph;
+			return remapped;
+		});
+		return boxChanged ? {
+			...block,
+			content
+		} : block;
+	}
+	return block;
+}
+function remapNoteMarkerParagraph(block, maps) {
+	let changed = false;
+	const runs = block.runs.map((run) => {
+		const remapped = remapNoteMarkerRun(run, maps);
+		changed ||= remapped !== run;
+		return remapped;
+	});
+	return changed ? {
+		...block,
+		runs
+	} : block;
+}
+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 : {
+		...run,
+		text
+	};
+}
+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);
+}
+/**
 * After layout, determine which footnotes appear on which pages.
 * Checks each page's fragments to see if any footnoteRef PM positions fall within.
 *
@@ -279,16 +408,11 @@ function buildFootnoteContentMap(footnotes, footnoteRefs, contentWidth, options
 	const contentMap = /* @__PURE__ */ new Map();
 	const footnoteById = /* @__PURE__ */ new Map();
 	for (const fn of footnotes) if (fn.noteType === "normal") footnoteById.set(fn.id, fn);
-	let displayNumber = 1;
-	const seen = /* @__PURE__ */ new Set();
-	for (const ref of footnoteRefs) {
-		if (seen.has(ref.footnoteId)) continue;
-		seen.add(ref.footnoteId);
-		const footnote = footnoteById.get(ref.footnoteId);
+	const displayNumbers = computeNoteDisplayNumbers(footnotes, footnoteRefs.map((ref) => ref.footnoteId));
+	for (const [footnoteId, displayNumber] of displayNumbers) {
+		const footnote = footnoteById.get(footnoteId);
 		if (!footnote) continue;
-		const content = convertFootnoteToContent(footnote, displayNumber, contentWidth, options);
-		contentMap.set(ref.footnoteId, content);
-		displayNumber++;
+		contentMap.set(footnoteId, convertFootnoteToContent(footnote, displayNumber, contentWidth, options));
 	}
 	return contentMap;
 }
@@ -313,4 +437,4 @@ function calculateFootnoteReservedHeights(pageFootnoteMap, footnoteContentMap) {
 	return reserved;
 }
 //#endregion
-export { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectFootnoteRefs, convertFootnoteToContent, mapFootnotesToPages };
+export { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, convertFootnoteToContent, mapFootnotesToPages, remapNoteMarkerText };

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

@@ -20,13 +20,11 @@ declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures
   visualBottom: number;
 };
 /**
- * Compute the header/footer bounds used by `computeHeaderFooterMarginExtender`
- * to push body margins clear of HF overflow. Excludes anchored/floating objects
- * (full-page letterheads, watermarks): Word positions them on the page instead
- * of in the header/footer flow, so they must not reserve body push-down. Keeping
- * them in `visualBottom` is still correct for the renderer (and for the
- * page-hash invalidation signal), but the margin extender needs the flow-only
- * extent.
+ * Compute flow-only header/footer bounds, excluding anchored/floating objects
+ * such as full-page letterheads and watermarks. Word positions those objects on
+ * the page independently from header/footer flow. Keeping them in
+ * `visualBottom` is still correct for rendering and page-hash invalidation;
+ * these bounds separately describe the in-flow portion for API consumers.
  */
 declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
   top: number;

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

@@ -225,13 +225,11 @@ function calculateHeaderFooterVisualBounds(blocks, measures, flowHeight, metrics
 	};
 }
 /**
-* Compute the header/footer bounds used by `computeHeaderFooterMarginExtender`
-* to push body margins clear of HF overflow. Excludes anchored/floating objects
-* (full-page letterheads, watermarks): Word positions them on the page instead
-* of in the header/footer flow, so they must not reserve body push-down. Keeping
-* them in `visualBottom` is still correct for the renderer (and for the
-* page-hash invalidation signal), but the margin extender needs the flow-only
-* extent.
+* Compute flow-only header/footer bounds, excluding anchored/floating objects
+* such as full-page letterheads and watermarks. Word positions those objects on
+* the page independently from header/footer flow. Keeping them in
+* `visualBottom` is still correct for rendering and page-hash invalidation;
+* these bounds separately describe the in-flow portion for API consumers.
 */
 function calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, metrics) {
 	let top = 0;

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

@@ -5,6 +5,7 @@ import { DEFAULT_TEXTBOX_MARGINS } from "../../layout-engine/types.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
+import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
 import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
@@ -100,7 +101,7 @@ function toLetter(value, upper) {
 	return String.fromCodePoint(baseCodePoint + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
 }
 function formatCounter(value, format) {
-	if (value <= 0) return "";
+	if (!Number.isFinite(value)) return "";
 	switch (format) {
 		case "upperRoman": return toRoman(value, true);
 		case "lowerRoman": return toRoman(value, false);
@@ -119,7 +120,9 @@ function resolveListTemplate(template, counters, levelFormats, forceDecimal = fa
 		const { digit, punct = "" } = args.at(-1);
 		const index = Number.parseInt(digit, 10) - 1;
 		if (index < 0) return "";
-		const formatted = formatCounter(counters[index] ?? 0, forceDecimal ? "decimal" : levelFormats?.[index]);
+		const counter = counters[index];
+		if (counter === void 0 || Number.isNaN(counter)) return "";
+		const formatted = formatCounter(counter, forceDecimal ? "decimal" : levelFormats?.[index]);
 		return formatted ? `${formatted}${punct}` : "";
 	});
 }
@@ -143,22 +146,28 @@ function computeListMarker(pmAttrs, listCounters, abstractCounters, seenNumIds)
 	}
 	if (pmAttrs.listIsBullet) return convertBulletToUnicode(pmAttrs.listMarker || "");
 	const level = pmAttrs.numPr?.ilvl ?? 0;
-	const counters = listCounters.get(numId) ?? Array.from({ length: 9 }, () => 0);
+	const counters = listCounters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
 	const abstractNumId = pmAttrs.listAbstractNumId;
-	if (abstractNumId !== void 0 && level > 0) {
-		const latestAbstractCounters = abstractCounters.get(abstractNumId);
-		const missingParentCounters = counters.slice(0, level).every((value) => value === 0);
-		if (latestAbstractCounters && missingParentCounters) for (let i = 0; i < level; i += 1) counters[i] = latestAbstractCounters[i] ?? 0;
+	if (level > 0) {
+		const latestAbstractCounters = abstractNumId === void 0 ? void 0 : abstractCounters.get(abstractNumId);
+		if (counters.slice(0, level).every(Number.isNaN)) for (let i = 0; i < level; i += 1) {
+			const latestCounter = latestAbstractCounters?.[i];
+			counters[i] = latestCounter !== void 0 && !Number.isNaN(latestCounter) ? latestCounter : pmAttrs.listLevelStarts?.[i] ?? 1;
+		}
 	}
 	const seenKey = `${numId}:${level}`;
 	if (!seenNumIds.has(seenKey)) {
 		seenNumIds.add(seenKey);
 		if (pmAttrs.listStartOverride != null) counters[level] = pmAttrs.listStartOverride - 1;
+		else if (Number.isNaN(counters[level])) counters[level] = (pmAttrs.listLevelStarts?.[level] ?? 1) - 1;
 	}
 	counters[level] = (counters[level] ?? 0) + 1;
-	for (let i = level + 1; i < counters.length; i += 1) counters[i] = 0;
+	for (let i = level + 1; i < counters.length; i += 1) counters[i] = NaN;
 	const childAdvances = pmAttrs.listImplicitChildLevelAdvances ?? 0;
-	if (childAdvances > 0 && level + 1 < counters.length) counters[level + 1] = (counters[level + 1] ?? 0) + childAdvances;
+	if (childAdvances > 0 && level + 1 < counters.length) {
+		const childCounter = counters[level + 1];
+		counters[level + 1] = (childCounter === void 0 || Number.isNaN(childCounter) ? 0 : childCounter) + childAdvances;
+	}
 	listCounters.set(numId, counters);
 	if (abstractNumId !== void 0) abstractCounters.set(abstractNumId, [...counters]);
 	const levelFormats = pmAttrs.listLevelNumFmts ?? (pmAttrs.listNumFmt ? [pmAttrs.listNumFmt] : void 0);
@@ -234,7 +243,7 @@ function extractRunFormatting(marks, theme) {
 		}
 		case "characterSpacing": {
 			const attrs = expectCharacterSpacingMarkAttrs(mark);
-			if (attrs.spacing !== void 0 && attrs.spacing !== 0) formatting.letterSpacing = twipsToPixels(attrs.spacing);
+			if (attrs.spacing !== void 0) formatting.letterSpacing = twipsToPixels(attrs.spacing);
 			if (attrs.position !== void 0 && attrs.position !== 0) formatting.positionPx = halfPointsToPixels(attrs.position);
 			if (attrs.scale !== void 0 && attrs.scale !== 100) formatting.horizontalScale = attrs.scale;
 			if (attrs.kerning !== void 0 && attrs.kerning > 0) formatting.kerningMinPt = halfPointsToPoints(attrs.kerning);
@@ -336,10 +345,12 @@ function markDefaultBlackTextColorSource(formatting, paraDefaults) {
 	};
 }
 function mergeRunFormatting(paraDefaults, formatting) {
-	return {
+	const merged = {
 		...paraDefaults,
 		...markDefaultBlackTextColorSource(formatting, paraDefaults)
 	};
+	if (merged.letterSpacing === 0) delete merged.letterSpacing;
+	return merged;
 }
 function applyRunFormattingOverrides(formatting, attrs) {
 	if (attrs.bold === false) formatting.bold = false;
@@ -485,9 +496,10 @@ function paragraphToRuns(node, startPos, _options) {
 			return;
 		}
 		if (child.type.name === "tab") {
+			const formatting = extractRunFormatting(child.marks, theme);
 			const run = {
 				kind: "tab",
-				...mergeRunFormatting(paraDefaults, extractRunFormatting(child.marks, theme)),
+				...mergeRunFormatting(paraDefaults, formatting),
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			};
@@ -496,7 +508,8 @@ function paragraphToRuns(node, startPos, _options) {
 		}
 		if (child.type.name === "image") {
 			const attrs = expectImageAttrs(child);
-			const constrained = constrainImageToPage(attrs.width || 100, attrs.height || 100, _options.pageContentHeight);
+			if (!attrs.src) return;
+			const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, _options.pageContentHeight);
 			const trackedFmt = extractRunFormatting(child.marks, theme);
 			const run = buildImageRun(attrs, constrained, childPos, childPos + child.nodeSize, trackedFmt);
 			runs.push(run);
@@ -613,6 +626,8 @@ function toPreviousListAttrs(previousFormatting) {
 	if (isNumberFormat(listNumFmt)) attrs.listNumFmt = listNumFmt;
 	const listLevelNumFmts = readNumberFormats(previousFormatting["listLevelNumFmts"]);
 	if (listLevelNumFmts) attrs.listLevelNumFmts = listLevelNumFmts;
+	const listLevelStarts = previousFormatting["listLevelStarts"];
+	if (Array.isArray(listLevelStarts) && listLevelStarts.every((value) => typeof value === "number")) attrs.listLevelStarts = listLevelStarts;
 	const listAbstractNumId = previousFormatting["listAbstractNumId"];
 	if (typeof listAbstractNumId === "number") attrs.listAbstractNumId = listAbstractNumId;
 	const listStartOverride = previousFormatting["listStartOverride"];
@@ -669,9 +684,10 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 		if (autoAfter) attrs.spacing.after = 14;
 		else if (typeof spaceAfter === "number") attrs.spacing.after = twipsToPixels(spaceAfter);
 		const pmSpacingExplicit = pmAttrs.spacingExplicit;
+		const spacingFromDocDefaults = pmAttrs.spacingFromDocDefaults;
 		const explicit = {};
-		if (autoBefore || pmSpacingExplicit?.before) explicit.before = true;
-		if (autoAfter || pmSpacingExplicit?.after) explicit.after = true;
+		if (autoBefore || pmSpacingExplicit?.before || spacingFromDocDefaults?.before) explicit.before = true;
+		if (autoAfter || pmSpacingExplicit?.after || spacingFromDocDefaults?.after) explicit.after = true;
 		if (explicit.before !== void 0 || explicit.after !== void 0) attrs.spacingExplicit = explicit;
 		if (typeof lineSpacing === "number") if (pmAttrs.lineSpacingRule === "exact" || pmAttrs.lineSpacingRule === "atLeast") {
 			attrs.spacing.line = twipsToPixels(lineSpacing);
@@ -730,6 +746,7 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 		return tabStop;
 	});
 	if (pmAttrs.pageBreakBefore) attrs.pageBreakBefore = true;
+	if (pmAttrs.renderedPageBreakBefore) attrs.renderedPageBreakBefore = true;
 	if (pmAttrs.keepNext) attrs.keepNext = true;
 	if (pmAttrs.keepLines) attrs.keepLines = true;
 	if (pmAttrs.widowControl === false) attrs.widowControl = false;
@@ -809,6 +826,17 @@ function convertParagraph(node, startPos, options) {
 	const pmAttrs = expectParagraphAttrs(node);
 	const runs = paragraphToRuns(node, startPos, options);
 	const attrs = convertParagraphAttrs(pmAttrs, options.theme, options.listCounters, options.listAbstractCounters, options.listSeenNumIds, options.defaultTabStopTwips, options.originalListCounters, options.originalListAbstractCounters, options.originalListSeenNumIds);
+	const defaultTextFormatting = pmAttrs.defaultTextFormatting;
+	if (runs.length === 0) {
+		const paragraphMarkFormatting = pmAttrs._originalFormatting?.runProperties;
+		if (paragraphMarkFormatting?.fontSize !== void 0) attrs.defaultFontSize = paragraphMarkFormatting.fontSize / 2;
+		const paragraphMarkFontFamily = paragraphMarkFormatting?.fontFamily?.ascii ?? paragraphMarkFormatting?.fontFamily?.hAnsi;
+		if (paragraphMarkFontFamily) attrs.defaultFontFamily = paragraphMarkFontFamily;
+	}
+	if (runs.length === 0 && defaultTextFormatting?.hidden === true) {
+		attrs.suppressEmptyParagraphHeight = true;
+		if (attrs.listMarker !== void 0) attrs.listMarkerHidden = true;
+	}
 	const bookmarkNames = pmAttrs.bookmarks?.map((b) => b.name);
 	return {
 		kind: "paragraph",
@@ -893,6 +921,11 @@ function convertTableCell(node, startPos, options, tableCellMargins) {
 		} else if (child.type.name === "table") blocks.push(convertTable(child, offset, options));
 		offset += child.nodeSize;
 	});
+	const trailingBlock = blocks.at(-1);
+	if (blocks.length > 1 && trailingBlock?.kind === "paragraph" && trailingBlock.runs.every((run) => run.kind === "text" && run.text.length === 0)) trailingBlock.attrs = {
+		...trailingBlock.attrs,
+		suppressEmptyParagraphHeight: true
+	};
 	const attrs = expectTableCellAttrs(node);
 	const margins = attrs.margins;
 	const resolvePaddingSide = (side, cellTwips, tableTwips) => {
@@ -993,6 +1026,7 @@ function convertTable(node, startPos, options) {
 	if (columnWidths) tableBlock.columnWidths = columnWidths;
 	if (width !== void 0) tableBlock.width = width;
 	if (widthType !== void 0) tableBlock.widthType = widthType;
+	if (originalFormatting?.layout !== void 0) tableBlock.layout = originalFormatting.layout;
 	if (justification) tableBlock.justification = justification;
 	if (indentPx !== void 0) tableBlock.indent = indentPx;
 	if (floatingPx) tableBlock.floating = floatingPx;
@@ -1006,7 +1040,7 @@ function convertImage(node, startPos, pageContentHeight) {
 	const attrs = expectImageAttrs(node);
 	const wrapType = attrs.wrapType;
 	const shouldAnchor = wrapType === "behind" || wrapType === "inFront";
-	const constrained = constrainImageToPage(attrs.width || 100, attrs.height || 100, pageContentHeight);
+	const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, pageContentHeight);
 	const imgBlock = {
 		kind: "image",
 		id: nextBlockId(),
@@ -1075,6 +1109,7 @@ function convertTextBoxNode(node, startPos, opts) {
 	if (attrs.distLeft !== void 0) textBox.distLeft = attrs.distLeft;
 	if (attrs.distRight !== void 0) textBox.distRight = attrs.distRight;
 	if (attrs.position !== void 0) textBox.position = attrs.position;
+	if (attrs._docxGroupId !== void 0) setTextBoxGroupId(textBox, attrs._docxGroupId);
 	return textBox;
 }
 /**
@@ -1235,14 +1270,16 @@ function toFlowBlocks(doc, options = {}) {
 				trackedPush(convertTextBoxNode(node, pos, opts));
 				break;
 			case "horizontalRule":
-			case "pageBreak":
-				trackedPush({
+			case "pageBreak": {
+				const pb = {
 					kind: "pageBreak",
 					id: nextBlockId(),
 					pmStart: pos,
 					pmEnd: pos + node.nodeSize
-				});
+				};
+				trackedPush(pb);
 				break;
+			}
 			default: break;
 		}
 	};

package/dist/layout-engine/index.d.ts

@@ -1,4 +1,4 @@
-import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "./types.js";
+import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, tableColumnsArePinned } from "./types.js";
 import { PageState, Paginator, PaginatorOptions, createPaginator } from "./paginator.js";
 import { KeepNextChain, calculateChainHeight, computeKeepNextChains, getMidChainIndices, hasKeepLines, hasPageBreakBefore } from "./keep-together.js";
 import { BreakDecision, SectionState, applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, scheduleSectionBreak } from "./section-breaks.js";
@@ -20,9 +20,10 @@ declare function collectSectionConfigs(blocks: FlowBlock[], initialConfig: Secti
 /**
  * Apply contextual spacing suppression (OOXML §17.3.1.9).
  *
- * When two consecutive paragraph blocks both have `contextualSpacing: true`
- * and share the same `styleId`, the spaceAfter of the first paragraph and
- * the spaceBefore of the second paragraph are suppressed (set to 0).
+ * Contextual spacing applies independently to each paragraph: suppress the
+ * current paragraph's spaceAfter when it opts in, and the next paragraph's
+ * spaceBefore when it opts in, provided both paragraphs share a style. Two
+ * absent style ids both refer to the document's default paragraph style.
  *
  * This mutates the block attrs in-place before layout runs.
  */
@@ -42,4 +43,4 @@ declare function layoutDocument(blocks: FlowBlock[], measures: Measure[], option
  */
 declare function getHeaderRowsHeight(measure: TableMeasure, headerRowCount: number): number;
 //#endregion
-export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, scheduleSectionBreak };
+export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, scheduleSectionBreak, tableColumnsArePinned };