@stll/folio-core 0.28.0 → 0.29.0

package/dist/docx/styleParser.js

@@ -1,23 +1,24 @@
 import { isValidHexColor } from "../utils/colorResolver.js";
 import { mergeParagraphFormatting } from "../utils/paragraphFormattingMerge.js";
-import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
+import { mergeStyleTextFormatting } from "../utils/textFormattingMerge.js";
 import { BorderStyleSchema, ConditionalStyleTypeSchema, EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, StyleTypeSchema, TabLeaderSchema, TabStopAlignmentSchema, TableCellTextDirectionSchema, TableRowHeightRuleSchema, TableWidthTypeSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { resolveThemeFontRef } from "./themeParser.js";
 import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/styleParser.ts
+const findLastRunToggle = (rPr, localName) => findChildren(rPr, "w", localName).at(-1) ?? null;
 /**
 * Parse text formatting properties (w:rPr)
 */
 function parseRunProperties(rPr, theme) {
 	if (!rPr) return;
 	const formatting = {};
-	const b = findChild(rPr, "w", "b");
+	const b = findLastRunToggle(rPr, "b");
 	if (b) formatting.bold = parseBooleanElement(b);
-	const bCs = findChild(rPr, "w", "bCs");
+	const bCs = findLastRunToggle(rPr, "bCs");
 	if (bCs) formatting.boldCs = parseBooleanElement(bCs);
-	const i = findChild(rPr, "w", "i");
+	const i = findLastRunToggle(rPr, "i");
 	if (i) formatting.italic = parseBooleanElement(i);
-	const iCs = findChild(rPr, "w", "iCs");
+	const iCs = findLastRunToggle(rPr, "iCs");
 	if (iCs) formatting.italicCs = parseBooleanElement(iCs);
 	const u = findChild(rPr, "w", "u");
 	if (u) {
@@ -29,7 +30,7 @@ function parseRunProperties(rPr, theme) {
 			if (colorVal || themeColor) formatting.underline.color = parseColorValue(colorVal, themeColor, getAttribute(u, "w", "themeTint"), getAttribute(u, "w", "themeShade"));
 		}
 	}
-	const strike = findChild(rPr, "w", "strike");
+	const strike = findLastRunToggle(rPr, "strike");
 	if (strike) formatting.strike = parseBooleanElement(strike);
 	const dstrike = findChild(rPr, "w", "dstrike");
 	if (dstrike) formatting.doubleStrike = parseBooleanElement(dstrike);
@@ -38,11 +39,11 @@ function parseRunProperties(rPr, theme) {
 		const val = getAttribute(vertAlign, "w", "val");
 		if (val === "superscript" || val === "subscript" || val === "baseline") formatting.vertAlign = val;
 	}
-	const smallCaps = findChild(rPr, "w", "smallCaps");
+	const smallCaps = findLastRunToggle(rPr, "smallCaps");
 	if (smallCaps) formatting.smallCaps = parseBooleanElement(smallCaps);
-	const caps = findChild(rPr, "w", "caps");
+	const caps = findLastRunToggle(rPr, "caps");
 	if (caps) formatting.allCaps = parseBooleanElement(caps);
-	const vanish = findChild(rPr, "w", "vanish");
+	const vanish = findLastRunToggle(rPr, "vanish");
 	if (vanish) formatting.hidden = parseBooleanElement(vanish);
 	const color = findChild(rPr, "w", "color");
 	if (color) formatting.color = parseColorValue(getAttribute(color, "w", "val"), getAttribute(color, "w", "themeColor"), getAttribute(color, "w", "themeTint"), getAttribute(color, "w", "themeShade"));
@@ -154,13 +155,13 @@ function parseRunProperties(rPr, theme) {
 		const val = narrowEnum(getAttribute(em, "w", "val"), EmphasisMarkSchema);
 		if (val) formatting.emphasisMark = val;
 	}
-	const emboss = findChild(rPr, "w", "emboss");
+	const emboss = findLastRunToggle(rPr, "emboss");
 	if (emboss) formatting.emboss = parseBooleanElement(emboss);
-	const imprint = findChild(rPr, "w", "imprint");
+	const imprint = findLastRunToggle(rPr, "imprint");
 	if (imprint) formatting.imprint = parseBooleanElement(imprint);
-	const outline = findChild(rPr, "w", "outline");
+	const outline = findLastRunToggle(rPr, "outline");
 	if (outline) formatting.outline = parseBooleanElement(outline);
-	const shadow = findChild(rPr, "w", "shadow");
+	const shadow = findLastRunToggle(rPr, "shadow");
 	if (shadow) formatting.shadow = parseBooleanElement(shadow);
 	const rtl = findChild(rPr, "w", "rtl");
 	if (rtl) formatting.rtl = parseBooleanElement(rtl);
@@ -807,7 +808,7 @@ function resolveStyleInheritance(style, styleMap, visited = /* @__PURE__ */ new
 	const resolved = { ...style };
 	const mergedPPr = mergeParagraphFormatting(resolvedParent.pPr, style.pPr);
 	if (mergedPPr) resolved.pPr = mergedPPr;
-	const mergedRPr = mergeTextFormatting(resolvedParent.rPr, style.rPr);
+	const mergedRPr = mergeStyleTextFormatting(resolvedParent.rPr, style.rPr);
 	if (mergedRPr) resolved.rPr = mergedRPr;
 	if (style.type === "table") {
 		if (resolvedParent.tblPr || style.tblPr) resolved.tblPr = {

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

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../../types/document.js";
 import { BorderStyle, FlowBlock, ParagraphAttrs } from "../../layout-engine/types.js";
+import { formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/toFlowBlocks.d.ts
 /**
@@ -59,8 +60,6 @@ type ToFlowBlocksOptions = {
   /** Line pitch for the final body section, whose properties live outside the PM body. */
   finalSectionDocumentGridLinePitchTwips?: number;
 };
-declare function formatCounter(value: number, format: document_d_exports.NumberFormat | undefined): string;
-declare function resolveListTemplate(template: string, counters: number[], levelFormats: document_d_exports.NumberFormat[] | undefined, forceDecimal?: boolean): string;
 /**
  * Reset the block ID counter (useful for testing).
  */

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

@@ -1,15 +1,17 @@
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
-import { formatOoxmlCounter } from "../../docx/ooxmlCounterFormatter.js";
 import { setHyperlinkInstanceIndex } from "../../layout-engine/measure/hyperlinkInstance.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
 import { DEFAULT_TEXTBOX_MARGINS } from "../../layout-engine/types.js";
 import { getPageNumbering } from "../../paged-layout/sectionGeometry.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSymbolAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSymbolAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
+import { advanceListMarker, advanceVisibleListMarker, cloneListCounterState, formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
+import { resolveNumberedRefFields } from "../../prosemirror/numberedRefFields.js";
 import { directionToBidi } from "../../prosemirror/paragraphDirection.js";
+import { cascadeStyleTextFormatting } from "../../prosemirror/styles/styleToggleCascade.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
@@ -67,79 +69,12 @@ let blockIdCounter = 0;
 function nextBlockId() {
 	return `block-${++blockIdCounter}`;
 }
-function formatNumberedMarker(counters, level) {
-	const parts = [];
-	for (let i = 0; i <= level; i += 1) {
-		const value = counters[i] ?? 0;
-		if (!Number.isFinite(value) || value <= 0) break;
-		parts.push(value);
-	}
-	if (parts.length === 0) return "1.";
-	return `${parts.join(".")}.`;
-}
-function formatCounter(value, format) {
-	return formatOoxmlCounter(value, format);
-}
-function resolveListTemplate(template, counters, levelFormats, forceDecimal = false) {
-	return template.replace(/%(?<digit>\d)(?<punct>[.):\]])?/gu, (...args) => {
-		const { digit, punct = "" } = args.at(-1);
-		const index = Number.parseInt(digit, 10) - 1;
-		if (index < 0) return "";
-		const counter = counters[index];
-		if (counter === void 0 || Number.isNaN(counter)) return "";
-		const formatted = formatCounter(counter, forceDecimal ? "decimal" : levelFormats?.[index]);
-		return formatted ? `${formatted}${punct}` : "";
-	});
-}
-function getLastListCounters(listCounters) {
-	let lastCounters;
-	for (const counters of listCounters.values()) lastCounters = counters;
-	return lastCounters;
-}
 function applyMarkerAllCaps(marker, allCaps) {
 	if (marker === null || !allCaps) return marker;
 	return marker.toLocaleUpperCase();
 }
-function computeListMarker(pmAttrs, listCounters, abstractCounters, seenNumIds) {
-	const numId = pmAttrs.numPr?.numId;
-	if (numId === void 0 || numId === 0) {
-		if (pmAttrs.listMarker?.includes("%") && !pmAttrs.listIsBullet) {
-			const counters = getLastListCounters(listCounters);
-			if (counters) return resolveListTemplate(pmAttrs.listMarker, counters, pmAttrs.listLevelNumFmts, pmAttrs.listIsLegal);
-		}
-		return null;
-	}
-	if (pmAttrs.listIsBullet) return convertBulletToUnicode(pmAttrs.listMarker || "");
-	const level = pmAttrs.numPr?.ilvl ?? 0;
-	const counters = listCounters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
-	const abstractNumId = pmAttrs.listAbstractNumId;
-	if (level > 0) {
-		const latestAbstractCounters = abstractNumId === void 0 ? void 0 : abstractCounters.get(abstractNumId);
-		if (counters.slice(0, level).every((counter) => !Number.isFinite(counter))) for (let i = 0; i < level; i += 1) {
-			const latestCounter = latestAbstractCounters?.[i];
-			counters[i] = latestCounter !== void 0 && Number.isFinite(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;
-	}
-	if (!Number.isFinite(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] = NaN;
-	const childAdvances = pmAttrs.listImplicitChildLevelAdvances ?? 0;
-	if (childAdvances > 0 && level + 1 < counters.length) {
-		const childCounter = counters[level + 1];
-		counters[level + 1] = (childCounter === void 0 || !Number.isFinite(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);
-	if (pmAttrs.listMarker && pmAttrs.listMarker.includes("%")) return resolveListTemplate(pmAttrs.listMarker, counters, levelFormats, pmAttrs.listIsLegal);
-	if (pmAttrs.listMarker) return pmAttrs.listMarker;
-	if ((levelFormats?.[level] ?? pmAttrs.listNumFmt) === "none" || pmAttrs.listMarker === "") return null;
-	return formatNumberedMarker(counters, level);
+function computeListMarker(pmAttrs, state) {
+	return advanceListMarker(pmAttrs, state);
 }
 /**
 * Reset the block ID counter (useful for testing).
@@ -348,17 +283,49 @@ function mergeRunFormatting(paraDefaults, formatting) {
 	if (merged.letterSpacing === 0) delete merged.letterSpacing;
 	return merged;
 }
+/** Restore character-style toggle values that plain visual marks cannot represent. */
+function applyCharacterStyleToggleFormatting({ formatting, marks, paraDefaults }) {
+	const characterStyleMark = marks.find((mark) => mark.type.name === "characterStyle");
+	if (!characterStyleMark) return;
+	const styleRPr = expectCharacterStyleMarkAttrs(characterStyleMark)._styleRPr;
+	if (!styleRPr) return;
+	const effectiveStyleFormatting = cascadeStyleTextFormatting([{
+		formatting: {
+			bold: paraDefaults.bold ?? false,
+			boldCs: paraDefaults.complexScriptBold ?? false,
+			italic: paraDefaults.italic ?? false,
+			italicCs: paraDefaults.complexScriptItalic ?? false
+		},
+		type: "direct"
+	}, {
+		formatting: styleRPr,
+		type: "style"
+	}]).formatting;
+	if (styleRPr.bold !== void 0 && formatting.bold === void 0) formatting.bold = effectiveStyleFormatting?.bold ?? false;
+	if (styleRPr.boldCs !== void 0 && formatting.complexScriptBold === void 0) formatting.complexScriptBold = effectiveStyleFormatting?.boldCs ?? false;
+	if (styleRPr.italic !== void 0 && formatting.italic === void 0) formatting.italic = effectiveStyleFormatting?.italic ?? false;
+	if (styleRPr.italicCs !== void 0 && formatting.complexScriptItalic === void 0) formatting.complexScriptItalic = effectiveStyleFormatting?.italicCs ?? false;
+	if (styleRPr.allCaps === true && formatting.allCaps === void 0) formatting.allCaps = false;
+	if (styleRPr.emboss === true && formatting.emboss === void 0) formatting.emboss = false;
+	if (styleRPr.imprint === true && formatting.imprint === void 0) formatting.imprint = false;
+	if (styleRPr.outline === true && formatting.textOutline === void 0) formatting.textOutline = false;
+	if (styleRPr.shadow === true && formatting.textShadow === void 0) formatting.textShadow = false;
+	if (styleRPr.smallCaps === true && formatting.smallCaps === void 0) formatting.smallCaps = false;
+	if (styleRPr.strike === true && formatting.strike === void 0) formatting.strike = false;
+	if (styleRPr.hidden === true && formatting.hidden === void 0) formatting.hidden = false;
+}
 function applyRunFormattingOverrides(formatting, attrs) {
-	if (attrs.bold === false) formatting.bold = false;
-	if (attrs.italic === false) formatting.italic = false;
+	if (attrs.bold !== void 0) formatting.bold = attrs.bold;
+	if (attrs.italic !== void 0) formatting.italic = attrs.italic;
 	if (attrs.underline === "none") formatting.underline = false;
-	if (attrs.strike === false) formatting.strike = false;
-	if (attrs.allCaps === false) formatting.allCaps = false;
-	if (attrs.smallCaps === false) formatting.smallCaps = false;
-	if (attrs.emboss === false) formatting.emboss = false;
-	if (attrs.imprint === false) formatting.imprint = false;
-	if (attrs.shadow === false) formatting.textShadow = false;
-	if (attrs.outline === false) formatting.textOutline = false;
+	if (attrs.strike !== void 0) formatting.strike = attrs.strike;
+	if (attrs.allCaps !== void 0) formatting.allCaps = attrs.allCaps;
+	if (attrs.smallCaps !== void 0) formatting.smallCaps = attrs.smallCaps;
+	if (attrs.hidden !== void 0) formatting.hidden = attrs.hidden;
+	if (attrs.emboss !== void 0) formatting.emboss = attrs.emboss;
+	if (attrs.imprint !== void 0) formatting.imprint = attrs.imprint;
+	if (attrs.shadow !== void 0) formatting.textShadow = attrs.shadow;
+	if (attrs.outline !== void 0) formatting.textOutline = attrs.outline;
 	if (attrs.rtl === false) formatting.rtl = false;
 	if (attrs.boldCs !== void 0) formatting.complexScriptBold = attrs.boldCs;
 	if (attrs.italicCs !== void 0) formatting.complexScriptItalic = attrs.italicCs;
@@ -482,6 +449,7 @@ function paragraphToRuns(node, startPos, _options) {
 	const inTocParagraph = pmAttrs._tableOfContentsLevel !== void 0 || tableOfContentsStyleLevel({ styleId: paragraphStyleId }) !== void 0;
 	let leadingRenderedPageBreakPending = pmAttrs.renderedPageBreakBefore === true;
 	function pushRunsForChild(child, childPos) {
+		if (child.type.name === "bookmarkBoundary") return;
 		if (child.type.name === "renderedPageBreak") {
 			if (leadingRenderedPageBreakPending) {
 				leadingRenderedPageBreakPending = false;
@@ -497,6 +465,11 @@ function paragraphToRuns(node, startPos, _options) {
 		if (child.type.name !== "sdt") leadingRenderedPageBreakPending = false;
 		if (child.isText && child.text) {
 			const formatting = extractRunFormatting(child.marks, theme);
+			applyCharacterStyleToggleFormatting({
+				formatting,
+				marks: child.marks,
+				paraDefaults
+			});
 			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
 			const run = {
 				kind: "text",
@@ -513,6 +486,11 @@ function paragraphToRuns(node, startPos, _options) {
 			const text = decodeOoxmlSymbolCharacter(attrs.char);
 			if (text === null) return;
 			const formatting = extractRunFormatting(child.marks, theme);
+			applyCharacterStyleToggleFormatting({
+				formatting,
+				marks: child.marks,
+				paraDefaults
+			});
 			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
 			runs.push({
 				kind: "text",
@@ -534,6 +512,11 @@ function paragraphToRuns(node, startPos, _options) {
 		}
 		if (child.type.name === "tab") {
 			const formatting = extractRunFormatting(child.marks, theme);
+			applyCharacterStyleToggleFormatting({
+				formatting,
+				marks: child.marks,
+				paraDefaults
+			});
 			const run = {
 				kind: "tab",
 				...mergeRunFormatting(paraDefaults, formatting),
@@ -552,7 +535,7 @@ function paragraphToRuns(node, startPos, _options) {
 			runs.push(run);
 			return;
 		}
-		if (child.type.name === "field") {
+		if (child.type.name === "field" || child.type.name === "structuredField") {
 			const attrs = expectFieldAttrs(child);
 			const ft = attrs.fieldType;
 			let mappedType = "OTHER";
@@ -561,13 +544,18 @@ function paragraphToRuns(node, startPos, _options) {
 			else if (ft === "DATE") mappedType = "DATE";
 			else if (ft === "TIME") mappedType = "TIME";
 			const extractedFieldFormatting = extractRunFormatting(child.marks, theme);
+			applyCharacterStyleToggleFormatting({
+				formatting: extractedFieldFormatting,
+				marks: child.marks,
+				paraDefaults
+			});
 			if (inTocParagraph) stripTocHyperlinkStyle(extractedFieldFormatting);
 			const fieldFormatting = markDefaultBlackTextColorSource(extractedFieldFormatting, paraDefaults);
 			const run = {
 				kind: "field",
 				fieldType: mappedType,
 				instruction: attrs.instruction,
-				fallback: attrs.displayText || "",
+				fallback: _options.numberedRefResults?.get(child) ?? attrs.displayText ?? "",
 				...attrs.fldLock ? { fldLock: true } : {},
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize,
@@ -658,18 +646,18 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listMarkerSuffix !== void 0) attrs.listMarkerSuffix = listMarkerSuffix;
 	return attrs;
 }
-function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds) {
-	if (listCounters && previousListAttrs.numPr) {
-		const marker = computeListMarker(previousListAttrs, listCounters, listAbstractCounters ?? /* @__PURE__ */ new Map(), listSeenNumIds ?? /* @__PURE__ */ new Set());
+function resolveDeletedListMarker(previousListAttrs, listCounterState) {
+	if (listCounterState && previousListAttrs.numPr) {
+		const marker = computeListMarker(previousListAttrs, listCounterState);
 		if (marker) return marker;
 	}
 	if (previousListAttrs.listMarker) return previousListAttrs.listIsBullet ? convertBulletToUnicode(previousListAttrs.listMarker) : previousListAttrs.listMarker;
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds, theme) {
+function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
-	const marker = resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds);
+	const marker = resolveDeletedListMarker(previousListAttrs, listCounterState);
 	if (!marker) return;
 	attrs.listMarker = marker;
 	attrs.listMarkerRevision = toListMarkerRevision("del", change.info);
@@ -679,7 +667,7 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCo
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
-function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounters, listSeenNumIds, defaultTabStopTwips, originalListCounters, originalListAbstractCounters, originalListSeenNumIds) {
+function convertParagraphAttrs(pmAttrs, { theme, listCounterStreams, defaultTabStopTwips }) {
 	const attrs = {};
 	if (pmAttrs.alignment) {
 		const align = pmAttrs.alignment;
@@ -798,15 +786,7 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 			if (numberingInsertionChange) attrs.listMarkerRevision = toListMarkerRevision("ins", numberingInsertionChange.info);
 		}
 	}
-	const useOriginalStream = attrs.listMarkerRevision?.kind === "del" && originalListCounters !== void 0;
-	const streamCounters = useOriginalStream ? originalListCounters : listCounters;
-	const resolvedMarker = applyMarkerAllCaps(streamCounters ? computeListMarker(pmAttrs, streamCounters, (useOriginalStream ? originalListAbstractCounters : listAbstractCounters) ?? /* @__PURE__ */ new Map(), (useOriginalStream ? originalListSeenNumIds : listSeenNumIds) ?? /* @__PURE__ */ new Set()) : null, pmAttrs.listMarkerAllCaps);
-	const numberedNumId = pmAttrs.numPr?.numId;
-	if (attrs.listMarkerRevision === void 0 && !pmAttrs.listIsBullet && originalListCounters !== void 0 && numberedNumId !== void 0 && numberedNumId !== 0) computeListMarker(pmAttrs, originalListCounters, originalListAbstractCounters ?? /* @__PURE__ */ new Map(), originalListSeenNumIds ?? /* @__PURE__ */ new Set());
-	else if (changedNumberingChange !== void 0 && originalListCounters !== void 0) {
-		const previousListAttrs = toPreviousListAttrs(changedNumberingChange.previousFormatting);
-		if (previousListAttrs.numPr && !previousListAttrs.listIsBullet) computeListMarker(previousListAttrs, originalListCounters, originalListAbstractCounters ?? /* @__PURE__ */ new Map(), originalListSeenNumIds ?? /* @__PURE__ */ new Set());
-	}
+	const resolvedMarker = applyMarkerAllCaps(advanceVisibleListMarker(pmAttrs, listCounterStreams).marker, pmAttrs.listMarkerAllCaps);
 	if (resolvedMarker !== null) attrs.listMarker = resolvedMarker;
 	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;
@@ -817,7 +797,13 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	if (pmAttrs.listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = pmAttrs.listMarkerSecondSlotOffsetTwips;
 	if (!pmAttrs.numPr) {
 		const numberingRemovedChange = propertyChanges.find(isRemovedNumberingChange);
-		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds, theme);
+		if (numberingRemovedChange) {
+			applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, void 0, theme);
+			if (resolvedMarker !== null) {
+				attrs.listMarker = resolvedMarker;
+				attrs.listMarkerRevision = toListMarkerRevision("del", numberingRemovedChange.info);
+			}
+		}
 	}
 	if (defaultTabStopTwips !== void 0) attrs.defaultTabStopTwips = defaultTabStopTwips;
 	const dtf = pmAttrs.defaultTextFormatting;
@@ -855,7 +841,11 @@ function hasOnlyVisuallyEmptyTextRuns(runs) {
 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 attrs = convertParagraphAttrs(pmAttrs, {
+		theme: options.theme,
+		listCounterStreams: options.listCounterStreams,
+		defaultTabStopTwips: options.defaultTabStopTwips
+	});
 	if (options.lineBreakRules) attrs.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) attrs.justificationCompatibility = options.justificationCompatibility;
 	if (options.automaticHyphenation) attrs.automaticHyphenation = options.automaticHyphenation;
@@ -902,27 +892,25 @@ function convertParagraph(node, startPos, options) {
 	return block;
 }
 /**
-* Word keeps terminal empty body paragraphs after a final table as editable
-* anchors, but they do not create a page of their own. Preserve every block
-* and PM range while collapsing only the contiguous, run-free suffix; empty
-* paragraphs elsewhere still retain their normal line height.
+* Word keeps a final empty body paragraph after a table as an editable anchor,
+* but that final anchor does not create a page of its own. Earlier authored
+* empty paragraphs retain their height and may carry the document onto a blank
+* page. Preserve every block and PM range while collapsing only the final one.
 */
 function isPaintlessTerminalParagraph(block) {
 	if (block?.kind !== "paragraph" || block.runs.length !== 0) return false;
 	const attrs = block.attrs;
 	return !(attrs?.listMarker !== void 0 && !attrs.listMarkerHidden || attrs?.borders?.top || attrs?.borders?.bottom || attrs?.borders?.left || attrs?.borders?.right || attrs?.borders?.between || attrs?.borders?.bar || attrs?.shading || attrs?.spacingExplicit?.before || attrs?.spacingExplicit?.after || attrs?.pageBreakBefore || attrs?.renderedPageBreakBefore);
 }
-function suppressTerminalEmptyParagraphsAfterTable(blocks) {
+function suppressFinalEmptyParagraphAfterTable(blocks) {
 	let suffixStart = blocks.length;
 	while (suffixStart > 0 && isPaintlessTerminalParagraph(blocks[suffixStart - 1])) suffixStart -= 1;
 	if (suffixStart === blocks.length || suffixStart === 0 || blocks[suffixStart - 1]?.kind !== "table") return;
-	for (let index = suffixStart; index < blocks.length; index += 1) {
-		const block = blocks[index];
-		if (isPaintlessTerminalParagraph(block)) block.attrs = {
-			...block.attrs,
-			suppressEmptyParagraphHeight: true
-		};
-	}
+	const finalBlock = blocks.at(-1);
+	if (isPaintlessTerminalParagraph(finalBlock)) finalBlock.attrs = {
+		...finalBlock.attrs,
+		suppressEmptyParagraphHeight: true
+	};
 }
 function suppressFinalParagraphInRepeatedEmptySuffix(blocks) {
 	let suffixStart = blocks.length;
@@ -1232,6 +1220,11 @@ function convertTextBoxNode(node, startPos, opts) {
 	if (attrs._docxGroupId !== void 0) setTextBoxGroupId(textBox, attrs._docxGroupId);
 	return textBox;
 }
+function getLastMapKey(map) {
+	let lastKey;
+	for (const key of map.keys()) lastKey = key;
+	return lastKey;
+}
 /**
 * Convert a ProseMirror document to FlowBlock array.
 *
@@ -1241,16 +1234,40 @@ function convertTextBoxNode(node, startPos, opts) {
 function toFlowBlocks(doc, options = {}) {
 	assertValidProseMirrorDocument(doc, "Cannot layout invalid ProseMirror document");
 	resetBlockIdCounter();
+	const listCounters = options.listCounters ?? /* @__PURE__ */ new Map();
+	const originalListCounters = options.originalListCounters ?? /* @__PURE__ */ new Map();
+	const lastAdvancedNumId = getLastMapKey(listCounters);
+	const lastAdvancedOriginalNumId = getLastMapKey(originalListCounters);
+	const listCounterState = {
+		counters: listCounters,
+		abstractCounters: options.listAbstractCounters ?? /* @__PURE__ */ new Map(),
+		seenLevels: options.listSeenNumIds ?? /* @__PURE__ */ new Set(),
+		...lastAdvancedNumId !== void 0 ? { lastAdvancedNumId } : {}
+	};
+	const originalListCounterState = {
+		counters: originalListCounters,
+		abstractCounters: options.originalListAbstractCounters ?? /* @__PURE__ */ new Map(),
+		seenLevels: options.originalListSeenNumIds ?? /* @__PURE__ */ new Set(),
+		...lastAdvancedOriginalNumId !== void 0 ? { lastAdvancedNumId: lastAdvancedOriginalNumId } : {}
+	};
 	const opts = {
 		...options,
 		defaultFont: options.defaultFont ?? DEFAULT_FONT,
 		defaultSize: options.defaultSize ?? DEFAULT_SIZE,
-		listCounters: options.listCounters ?? /* @__PURE__ */ new Map(),
-		listAbstractCounters: options.listAbstractCounters ?? /* @__PURE__ */ new Map(),
-		listSeenNumIds: options.listSeenNumIds ?? /* @__PURE__ */ new Set(),
-		originalListCounters: options.originalListCounters ?? /* @__PURE__ */ new Map(),
-		originalListAbstractCounters: options.originalListAbstractCounters ?? /* @__PURE__ */ new Map(),
-		originalListSeenNumIds: options.originalListSeenNumIds ?? /* @__PURE__ */ new Set()
+		listCounters: listCounterState.counters,
+		listAbstractCounters: listCounterState.abstractCounters,
+		listSeenNumIds: listCounterState.seenLevels,
+		originalListCounters: originalListCounterState.counters,
+		originalListAbstractCounters: originalListCounterState.abstractCounters,
+		originalListSeenNumIds: originalListCounterState.seenLevels,
+		listCounterStreams: {
+			final: listCounterState,
+			original: originalListCounterState
+		},
+		numberedRefResults: resolveNumberedRefFields(doc, {
+			listCounterState: cloneListCounterState(listCounterState),
+			originalListCounterState: cloneListCounterState(originalListCounterState)
+		})
 	};
 	const blocks = [];
 	const offset = 0;
@@ -1477,7 +1494,7 @@ function toFlowBlocks(doc, options = {}) {
 		visit(node, offset + nodeOffset);
 	});
 	reserveLeadingEmptyOutlineHeight(blocks);
-	suppressTerminalEmptyParagraphsAfterTable(blocks);
+	suppressFinalEmptyParagraphAfterTable(blocks);
 	suppressFinalParagraphInRepeatedEmptySuffix(blocks);
 	return groupParagraphFrames(applySectionDocumentGrid(mergeRunInParagraphs(blocks), opts.finalSectionDocumentGridLinePitchTwips), nextBlockId);
 }

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

@@ -0,0 +1,15 @@
+import { Layout } from "./types.js";
+//#region src/layout-engine/footnoteColumnReflow.d.ts
+type ReflowFootnoteColumnsOptions = {
+  initialLayout: Layout;
+  initialReserveFloors?: ReadonlyMap<number, number>;
+  runLayout: (reserveFloors: Map<number, number>) => Layout;
+};
+/**
+ * Re-run a multi-column layout until its body flow clears the shared footnote band.
+ * Reserve floors follow the current page-to-footnote assignment. Repeated floor states
+ * and persistent overlap use a stable fallback layout instead of throwing.
+ */
+declare function reflowFootnoteColumns({ initialLayout, initialReserveFloors, runLayout }: ReflowFootnoteColumnsOptions): Layout;
+//#endregion
+export { reflowFootnoteColumns };

package/dist/layout-engine/footnoteColumnReflow.js

@@ -0,0 +1,74 @@
+//#region src/layout-engine/footnoteColumnReflow.ts
+function isFlowFragment(fragment) {
+	switch (fragment.kind) {
+		case "paragraph": return true;
+		case "table": return !fragment.isFloating;
+		case "image": return !fragment.isAnchored;
+		case "textBox": return !fragment.isPositioned;
+		default: return fragment;
+	}
+}
+function hasFootnoteColumnOverlap(layout) {
+	for (const page of layout.pages) {
+		if ((page.columns?.count ?? 1) < 2 || !page.footnoteReservedHeight) continue;
+		const bodyBottom = page.size.h - page.margins.bottom - page.footnoteReservedHeight;
+		if (page.fragments.some((fragment) => isFlowFragment(fragment) && fragment.y + fragment.height > bodyBottom)) return true;
+	}
+	return false;
+}
+function growFootnoteReserveFloors(layout, initialReserveFloors) {
+	const next = /* @__PURE__ */ new Map();
+	for (const page of layout.pages) {
+		if ((page.footnoteIds?.length ?? 0) === 0) continue;
+		const observed = page.footnoteReservedHeight ?? 0;
+		const callerFloor = initialReserveFloors?.get(page.number) ?? 0;
+		const floor = Math.max(callerFloor, observed);
+		if (floor > 0) next.set(page.number, floor);
+	}
+	return next;
+}
+function reserveFloorFingerprint(floors) {
+	return JSON.stringify([...floors.entries()].sort(([leftPage], [rightPage]) => leftPage - rightPage));
+}
+function clearOrphanedFootnoteReservations(layout) {
+	let pagesChanged = false;
+	const pages = layout.pages.map((page) => {
+		if ((page.footnoteIds?.length ?? 0) > 0 || page.footnoteReservedHeight === void 0) return page;
+		pagesChanged = true;
+		const cleanedPage = { ...page };
+		delete cleanedPage.footnoteReservedHeight;
+		return cleanedPage;
+	});
+	if (!pagesChanged) return layout;
+	return {
+		...layout,
+		pages
+	};
+}
+function getPassBudget(layout) {
+	const fragmentCount = layout.pages.reduce((count, page) => count + page.fragments.length, 0);
+	const footnoteCount = new Set(layout.pages.flatMap((page) => page.footnoteIds ?? [])).size;
+	return layout.pages.length + fragmentCount + footnoteCount + 1;
+}
+/**
+* Re-run a multi-column layout until its body flow clears the shared footnote band.
+* Reserve floors follow the current page-to-footnote assignment. Repeated floor states
+* and persistent overlap use a stable fallback layout instead of throwing.
+*/
+function reflowFootnoteColumns({ initialLayout, initialReserveFloors, runLayout }) {
+	let layout = initialLayout;
+	if (!hasFootnoteColumnOverlap(layout)) return clearOrphanedFootnoteReservations(layout);
+	const seenReserveStates = /* @__PURE__ */ new Set();
+	const passBudget = getPassBudget(layout);
+	for (let pass = 0; pass < passBudget; pass += 1) {
+		const reserveFloors = growFootnoteReserveFloors(layout, initialReserveFloors);
+		const reserveState = reserveFloorFingerprint(reserveFloors);
+		if (seenReserveStates.has(reserveState)) return clearOrphanedFootnoteReservations(layout);
+		seenReserveStates.add(reserveState);
+		layout = runLayout(reserveFloors);
+		if (!hasFootnoteColumnOverlap(layout)) return clearOrphanedFootnoteReservations(layout);
+	}
+	return clearOrphanedFootnoteReservations(layout);
+}
+//#endregion
+export { reflowFootnoteColumns };

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

@@ -32,11 +32,9 @@ declare function applyContextualSpacing(blocks: FlowBlock[]): void;
 /**
  * Layout a document: convert blocks + measures into pages with positioned fragments.
  *
- * Algorithm:
- * 1. Walk blocks in order with their corresponding measures
- * 2. For each block, create appropriate fragment(s)
- * 3. Use paginator to manage page/column state
- * 4. Handle page breaks, section breaks, and keepNext chains
+ * A reference discovered after the first column has already been placed can shrink the
+ * shared body band below earlier-column fragments. Retry those documents with the observed
+ * reservations as page floors so every column participates in the same footnote geometry.
  */
 declare function layoutDocument(blocks: FlowBlock[], measures: Measure[], options: LayoutOptions): Layout;
 /**