@stll/folio-core 0.28.1 → 0.30.0

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

@@ -1,6 +1,6 @@
 import { measureParagraph } from "../../layout-engine/measure/measureParagraph.js";
 import { layoutTextBoxContent } from "../../layout-engine/measure/textBoxParagraphLayout.js";
-import { DEFAULT_TEXTBOX_MARGINS, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT } from "../../layout-engine/types.js";
+import { DEFAULT_TEXTBOX_MARGINS, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, isFloatingImageRun } from "../../layout-engine/types.js";
 import { footnoteToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.ts
@@ -196,6 +196,7 @@ function convertFootnoteToContent(footnote, displayNumber, contentWidth, options
 	const pmDoc = footnoteToProseDoc(footnote.content, proseOptions);
 	const flowOptions = {};
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
+	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
@@ -363,18 +364,48 @@ function applyFootnotePresentation(blocks, displayNumber) {
 	return output;
 }
 function createFootnoteNumberRun(displayNumber, paragraph) {
-	const firstTextRun = paragraph.runs.find((run) => run.kind === "text");
 	const firstFormattedRun = paragraph.runs.find((run) => run.kind === "text" || run.kind === "tab" || run.kind === "field");
 	const numberRun = {
 		kind: "text",
-		text: firstTextRun?.text.match(/^\s/u) ? `${displayNumber}` : `${displayNumber} `,
+		text: `${displayNumber}${resolveFootnoteNumberSuffix(paragraph.runs) === FOOTNOTE_NUMBER_SUFFIX.SEPARATED ? " " : ""}`,
 		fontSize: firstFormattedRun?.fontSize ?? paragraph.attrs?.defaultFontSize ?? FOOTNOTE_FONT_SIZE,
 		superscript: true
 	};
 	const fontFamily = firstFormattedRun?.fontFamily ?? paragraph.attrs?.defaultFontFamily;
 	if (fontFamily) numberRun.fontFamily = fontFamily;
+	const alternateFontFamily = firstFormattedRun?.fontFamily !== void 0 ? firstFormattedRun.alternateFontFamily : paragraph.attrs?.defaultAlternateFontFamily;
+	if (alternateFontFamily) numberRun.alternateFontFamily = alternateFontFamily;
 	return numberRun;
 }
+const FOOTNOTE_NUMBER_SUFFIX = {
+	ATTACHED: "none",
+	SEPARATED: "space"
+};
+const ATTACHED_FOOTNOTE_SUFFIX_PATTERN = /^(?:[\p{Pe}\p{Pf}\p{Sentence_Terminal}]|[,;:\u060c\u061b\u3001\uff0c\uff1a\uff1b])/u;
+const LEADING_WHITESPACE_PATTERN = /^\s/u;
+function resolveTextFootnoteNumberSuffix(text) {
+	if (LEADING_WHITESPACE_PATTERN.test(text) || ATTACHED_FOOTNOTE_SUFFIX_PATTERN.test(text)) return FOOTNOTE_NUMBER_SUFFIX.ATTACHED;
+	return FOOTNOTE_NUMBER_SUFFIX.SEPARATED;
+}
+function resolveRunFootnoteNumberSuffix(run) {
+	switch (run.kind) {
+		case "text": return run.text.length === 0 ? void 0 : resolveTextFootnoteNumberSuffix(run.text);
+		case "tab":
+		case "lineBreak": return FOOTNOTE_NUMBER_SUFFIX.ATTACHED;
+		case "field": return resolveTextFootnoteNumberSuffix(run.fallback || "1");
+		case "image": return isFloatingImageRun(run) ? void 0 : FOOTNOTE_NUMBER_SUFFIX.SEPARATED;
+		case "math": return FOOTNOTE_NUMBER_SUFFIX.SEPARATED;
+		case "renderedPageBreak": return;
+		default: return run;
+	}
+}
+function resolveFootnoteNumberSuffix(runs) {
+	for (const run of runs) {
+		const suffix = resolveRunFootnoteNumberSuffix(run);
+		if (suffix !== void 0) return suffix;
+	}
+	return FOOTNOTE_NUMBER_SUFFIX.SEPARATED;
+}
 function applyFootnoteBlockPresentation(block) {
 	if (block.kind === "paragraph") return applyFootnoteParagraphPresentation(block);
 	if (block.kind === "table") return applyFootnoteTablePresentation(block);

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

@@ -41,6 +41,7 @@ declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flow
 type ConvertHeaderFooterOptions = {
   styles?: document_d_exports.StyleDefinitions | null;
   theme?: document_d_exports.Theme | null;
+  fontAlternates?: ToFlowBlocksOptions["fontAlternates"];
   measureBlocks: MeasureBlocksFn;
   /** Document-wide `w:defaultTabStop` in twips — forwarded to toFlowBlocks. */
   defaultTabStopTwips?: number;

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

@@ -333,6 +333,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 	const pmDoc = headerFooterToProseDoc(headerFooter.content, proseDocOptions);
 	const flowOptions = {};
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
+	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
@@ -354,6 +355,7 @@ function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options
 	if (!pmDoc || pmDoc.content.size === 0) return;
 	const flowOptions = {};
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
+	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
@@ -495,8 +497,11 @@ function serializeRunFmt(run) {
 		"highlightColor",
 		"fontSize",
 		"fontFamily",
+		"alternateFontFamily",
 		"eastAsiaFontFamily",
+		"eastAsiaAlternateFontFamily",
 		"complexScriptFontFamily",
+		"complexScriptAlternateFontFamily",
 		"complexScriptFontSize",
 		"complexScriptBold",
 		"complexScriptItalic",

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

@@ -1,5 +1,7 @@
 import { document_d_exports } from "../../types/document.js";
 import { BorderStyle, FlowBlock, ParagraphAttrs } from "../../layout-engine/types.js";
+import { FontAlternates } from "../../fonts/fontAlternates.js";
+import { formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/toFlowBlocks.d.ts
 /**
@@ -12,6 +14,8 @@ type ToFlowBlocksOptions = {
   defaultSize?: number;
   /** Theme for resolving theme colors. */
   theme?: document_d_exports.Theme | null;
+  /** Document-scoped OOXML primary-font to `w:altName` lookup. */
+  fontAlternates?: FontAlternates;
   /** Page content height in pixels (pageHeight - marginTop - marginBottom). Images taller than this are scaled down to fit. */
   pageContentHeight?: number;
   /** Shared list counters for nested containers. */
@@ -59,8 +63,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,6 +1,6 @@
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
-import { formatOoxmlCounter } from "../../docx/ooxmlCounterFormatter.js";
+import { getFontAlternate } from "../../fonts/fontAlternates.js";
 import { setHyperlinkInstanceIndex } from "../../layout-engine/measure/hyperlinkInstance.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
@@ -9,12 +9,16 @@ import { getPageNumbering } from "../../paged-layout/sectionGeometry.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 { normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
+import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { AUTO_PARAGRAPH_SPACING_PX, halfPointsToPixels, halfPointsToPoints, pointsToPixels } from "../../utils/units.js";
@@ -68,79 +72,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).
@@ -151,7 +88,7 @@ function resetBlockIdCounter() {
 /**
 * Extract run formatting from ProseMirror marks.
 */
-function extractRunFormatting(marks, theme) {
+function extractRunFormatting(marks, theme, fontAlternates) {
 	const formatting = {};
 	let hasNoteRef = false;
 	for (const mark of marks) switch (mark.type.name) {
@@ -203,11 +140,23 @@ function extractRunFormatting(marks, theme) {
 		case "fontFamily": {
 			const attrs = expectFontFamilyMarkAttrs(mark);
 			const font = resolveWesternThemeFont(attrs, theme);
-			if (font) formatting.fontFamily = font;
+			if (font) {
+				formatting.fontFamily = font;
+				const alternate = getFontAlternate(font, fontAlternates);
+				if (alternate) formatting.alternateFontFamily = alternate;
+			}
 			const eastAsiaFont = resolveEastAsiaThemeFont(attrs, theme);
-			if (eastAsiaFont) formatting.eastAsiaFontFamily = eastAsiaFont;
+			if (eastAsiaFont) {
+				formatting.eastAsiaFontFamily = eastAsiaFont;
+				const alternate = getFontAlternate(eastAsiaFont, fontAlternates);
+				if (alternate) formatting.eastAsiaAlternateFontFamily = alternate;
+			}
 			const complexScriptFont = resolveComplexScriptThemeFont(attrs, theme);
-			if (complexScriptFont) formatting.complexScriptFontFamily = complexScriptFont;
+			if (complexScriptFont) {
+				formatting.complexScriptFontFamily = complexScriptFont;
+				const alternate = getFontAlternate(complexScriptFont, fontAlternates);
+				if (alternate) formatting.complexScriptAlternateFontFamily = alternate;
+			}
 			break;
 		}
 		case "language": {
@@ -223,7 +172,8 @@ function extractRunFormatting(marks, theme) {
 			const attrs = expectCharacterSpacingMarkAttrs(mark);
 			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;
+			const horizontalScale = normalizeHorizontalScalePercent(attrs.scale);
+			if (horizontalScale !== void 0) formatting.horizontalScale = horizontalScale;
 			if (attrs.kerning !== void 0 && attrs.kerning > 0) formatting.kerningMinPt = halfPointsToPoints(attrs.kerning);
 			break;
 		}
@@ -346,7 +296,11 @@ function mergeRunFormatting(paraDefaults, formatting) {
 		...paraDefaults,
 		...markDefaultBlackTextColorSource(formatting, paraDefaults)
 	};
+	if (formatting.fontFamily !== void 0 && formatting.alternateFontFamily === void 0) delete merged.alternateFontFamily;
+	if (formatting.eastAsiaFontFamily !== void 0 && formatting.eastAsiaAlternateFontFamily === void 0) delete merged.eastAsiaAlternateFontFamily;
+	if (formatting.complexScriptFontFamily !== void 0 && formatting.complexScriptAlternateFontFamily === void 0) delete merged.complexScriptAlternateFontFamily;
 	if (merged.letterSpacing === 0) delete merged.letterSpacing;
+	if (formatting.horizontalScale === 100 && paraDefaults.horizontalScale === void 0) delete merged.horizontalScale;
 	return merged;
 }
 /** Restore character-style toggle values that plain visual marks cannot represent. */
@@ -398,15 +352,27 @@ function applyRunFormattingOverrides(formatting, attrs) {
 	if (attrs.fontSizeCs !== void 0) formatting.complexScriptFontSize = attrs.fontSizeCs / 2;
 	if (attrs.cs !== void 0) formatting.forceComplexScript = attrs.cs;
 }
-function textFormattingToRunFormatting(defaultTextFormatting, theme) {
+function textFormattingToRunFormatting(defaultTextFormatting, theme, fontAlternates) {
 	if (!defaultTextFormatting) return {};
 	const result = {};
 	const fontFamily = defaultTextFormatting.fontFamily ? resolveWesternThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
-	if (fontFamily) result.fontFamily = fontFamily;
+	if (fontFamily) {
+		result.fontFamily = fontFamily;
+		const alternate = getFontAlternate(fontFamily, fontAlternates);
+		if (alternate) result.alternateFontFamily = alternate;
+	}
 	const eastAsiaFontFamily = defaultTextFormatting.fontFamily ? resolveEastAsiaThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
-	if (eastAsiaFontFamily) result.eastAsiaFontFamily = eastAsiaFontFamily;
+	if (eastAsiaFontFamily) {
+		result.eastAsiaFontFamily = eastAsiaFontFamily;
+		const alternate = getFontAlternate(eastAsiaFontFamily, fontAlternates);
+		if (alternate) result.eastAsiaAlternateFontFamily = alternate;
+	}
 	const complexScriptFontFamily = defaultTextFormatting.fontFamily ? resolveComplexScriptThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
-	if (complexScriptFontFamily) result.complexScriptFontFamily = complexScriptFontFamily;
+	if (complexScriptFontFamily) {
+		result.complexScriptFontFamily = complexScriptFontFamily;
+		const alternate = getFontAlternate(complexScriptFontFamily, fontAlternates);
+		if (alternate) result.complexScriptAlternateFontFamily = alternate;
+	}
 	if (defaultTextFormatting.language) result.language = { ...defaultTextFormatting.language };
 	if (defaultTextFormatting.fontSize !== void 0) result.fontSize = defaultTextFormatting.fontSize / 2;
 	if (defaultTextFormatting.fontSizeCs !== void 0) result.complexScriptFontSize = defaultTextFormatting.fontSizeCs / 2;
@@ -435,7 +401,8 @@ function textFormattingToRunFormatting(defaultTextFormatting, theme) {
 	if (defaultTextFormatting.smallCaps !== void 0) result.smallCaps = defaultTextFormatting.smallCaps;
 	if (defaultTextFormatting.spacing !== void 0 && defaultTextFormatting.spacing !== 0) result.letterSpacing = twipsToPixels(defaultTextFormatting.spacing);
 	if (defaultTextFormatting.position !== void 0 && defaultTextFormatting.position !== 0) result.positionPx = halfPointsToPixels(defaultTextFormatting.position);
-	if (defaultTextFormatting.scale !== void 0 && defaultTextFormatting.scale !== 100) result.horizontalScale = defaultTextFormatting.scale;
+	const horizontalScale = normalizeHorizontalScalePercent(defaultTextFormatting.scale);
+	if (horizontalScale !== void 0 && horizontalScale !== 100) result.horizontalScale = horizontalScale;
 	if (defaultTextFormatting.kerning !== void 0 && defaultTextFormatting.kerning > 0) result.kerningMinPt = halfPointsToPoints(defaultTextFormatting.kerning);
 	if (defaultTextFormatting.emboss !== void 0) result.emboss = defaultTextFormatting.emboss;
 	if (defaultTextFormatting.imprint !== void 0) result.imprint = defaultTextFormatting.imprint;
@@ -444,8 +411,8 @@ function textFormattingToRunFormatting(defaultTextFormatting, theme) {
 	if (defaultTextFormatting.emphasisMark && defaultTextFormatting.emphasisMark !== "none") result.emphasisMark = defaultTextFormatting.emphasisMark;
 	return result;
 }
-function paragraphRunDefaults(pmAttrs, theme) {
-	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme);
+function paragraphRunDefaults(pmAttrs, theme, fontAlternates) {
+	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme, fontAlternates);
 }
 /**
 * Build an ImageRun from ProseMirror node attrs, applying conditional property assignment
@@ -509,12 +476,14 @@ function paragraphToRuns(node, startPos, _options) {
 	const runs = [];
 	const offset = startPos + 1;
 	const theme = _options.theme;
+	const fontAlternates = _options.fontAlternates;
 	const pmAttrs = expectParagraphAttrs(node);
-	const paraDefaults = paragraphRunDefaults(pmAttrs, theme);
+	const paraDefaults = paragraphRunDefaults(pmAttrs, theme, fontAlternates);
 	const paragraphStyleId = pmAttrs.styleId;
 	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;
@@ -529,7 +498,7 @@ function paragraphToRuns(node, startPos, _options) {
 		}
 		if (child.type.name !== "sdt") leadingRenderedPageBreakPending = false;
 		if (child.isText && child.text) {
-			const formatting = extractRunFormatting(child.marks, theme);
+			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
 				marks: child.marks,
@@ -550,18 +519,20 @@ function paragraphToRuns(node, startPos, _options) {
 			const attrs = expectSymbolAttrs(child);
 			const text = decodeOoxmlSymbolCharacter(attrs.char);
 			if (text === null) return;
-			const formatting = extractRunFormatting(child.marks, theme);
+			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
 				marks: child.marks,
 				paraDefaults
 			});
 			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
+			const alternateFontFamily = getFontAlternate(attrs.font, fontAlternates);
+			formatting.fontFamily = attrs.font;
+			if (alternateFontFamily) formatting.alternateFontFamily = alternateFontFamily;
 			runs.push({
 				kind: "text",
 				text,
 				...mergeRunFormatting(paraDefaults, formatting),
-				fontFamily: attrs.font,
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			});
@@ -576,7 +547,7 @@ function paragraphToRuns(node, startPos, _options) {
 			return;
 		}
 		if (child.type.name === "tab") {
-			const formatting = extractRunFormatting(child.marks, theme);
+			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
 				marks: child.marks,
@@ -595,12 +566,12 @@ function paragraphToRuns(node, startPos, _options) {
 			const attrs = expectImageAttrs(child);
 			if (!attrs.src) return;
 			const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, _options.pageContentHeight);
-			const trackedFmt = extractRunFormatting(child.marks, theme);
+			const trackedFmt = extractRunFormatting(child.marks, theme, fontAlternates);
 			const run = buildImageRun(attrs, constrained, childPos, childPos + child.nodeSize, trackedFmt);
 			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";
@@ -608,7 +579,7 @@ function paragraphToRuns(node, startPos, _options) {
 			else if (ft === "NUMPAGES") mappedType = "NUMPAGES";
 			else if (ft === "DATE") mappedType = "DATE";
 			else if (ft === "TIME") mappedType = "TIME";
-			const extractedFieldFormatting = extractRunFormatting(child.marks, theme);
+			const extractedFieldFormatting = extractRunFormatting(child.marks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting: extractedFieldFormatting,
 				marks: child.marks,
@@ -620,7 +591,7 @@ function paragraphToRuns(node, startPos, _options) {
 				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,
@@ -711,28 +682,28 @@ 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, fontAlternates) {
 	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);
 	if (previousListAttrs.listIsBullet !== void 0) attrs.listIsBullet = previousListAttrs.listIsBullet;
 	if (previousListAttrs.listMarkerHidden !== void 0) attrs.listMarkerHidden = previousListAttrs.listMarkerHidden;
-	if (previousListAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(previousListAttrs.listMarkerFormatting, theme);
+	if (previousListAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(previousListAttrs.listMarkerFormatting, theme, fontAlternates);
 	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, fontAlternates, listCounterStreams, defaultTabStopTwips }) {
 	const attrs = {};
 	if (pmAttrs.alignment) {
 		const align = pmAttrs.alignment;
@@ -851,26 +822,24 @@ 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;
 	if (pmAttrs.listMarkerHidden) attrs.listMarkerHidden = true;
-	if (pmAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(pmAttrs.listMarkerFormatting, theme);
+	if (pmAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(pmAttrs.listMarkerFormatting, theme, fontAlternates);
 	if (pmAttrs.listMarkerAlignment) attrs.listMarkerAlignment = pmAttrs.listMarkerAlignment;
 	if (pmAttrs.listMarkerSuffix) attrs.listMarkerSuffix = pmAttrs.listMarkerSuffix;
 	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, fontAlternates);
+			if (resolvedMarker !== null) {
+				attrs.listMarker = resolvedMarker;
+				attrs.listMarkerRevision = toListMarkerRevision("del", numberingRemovedChange.info);
+			}
+		}
 	}
 	if (defaultTabStopTwips !== void 0) attrs.defaultTabStopTwips = defaultTabStopTwips;
 	const dtf = pmAttrs.defaultTextFormatting;
@@ -879,7 +848,11 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 		if (attrs.listMarker !== void 0 && !attrs.listMarkerHidden && dtf.fontSizeCs !== void 0 && (dtf.fontSize === void 0 || dtf.fontSizeCs > dtf.fontSize)) attrs.listParagraphMarkFontSize = dtf.fontSizeCs / 2;
 		if (dtf.fontFamily) {
 			const resolvedFamily = resolveWesternThemeFont(dtf.fontFamily, theme);
-			if (resolvedFamily) attrs.defaultFontFamily = resolvedFamily;
+			if (resolvedFamily) {
+				attrs.defaultFontFamily = resolvedFamily;
+				const alternate = getFontAlternate(resolvedFamily, fontAlternates);
+				if (alternate) attrs.defaultAlternateFontFamily = alternate;
+			}
 		}
 	}
 	return attrs;
@@ -908,7 +881,12 @@ 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,
+		fontAlternates: options.fontAlternates,
+		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;
@@ -919,7 +897,11 @@ function convertParagraph(node, startPos, options) {
 		if (paragraphMarkFormatting && Object.values(paragraphMarkFormatting).some((value) => value !== void 0 && value !== null)) attrs.hasDirectParagraphMarkFormatting = true;
 		if (paragraphMarkFormatting?.fontSize !== void 0) attrs.defaultFontSize = paragraphMarkFormatting.fontSize / 2;
 		const paragraphMarkFontFamily = paragraphMarkFormatting?.fontFamily ? resolveWesternThemeFont(paragraphMarkFormatting.fontFamily, options.theme) : void 0;
-		if (paragraphMarkFontFamily) attrs.defaultFontFamily = paragraphMarkFontFamily;
+		if (paragraphMarkFontFamily) {
+			attrs.defaultFontFamily = paragraphMarkFontFamily;
+			const alternate = getFontAlternate(paragraphMarkFontFamily, options.fontAlternates);
+			if (alternate) attrs.defaultAlternateFontFamily = alternate;
+		}
 	}
 	if (runs.length === 0 && defaultTextFormatting?.hidden === true) {
 		attrs.suppressEmptyParagraphHeight = true;
@@ -1139,6 +1121,8 @@ function convertTableRow(node, startPos, options, tableCellMargins) {
 	if (attrs.isHeader) row.isHeader = attrs.isHeader;
 	if (attrs._originalFormatting?.cantSplit) row.cantSplit = true;
 	if (attrs.hidden) row.hidden = attrs.hidden;
+	const effectiveJustification = attrs._originalFormatting?.justification ?? attrs._resolvedJustification;
+	if (effectiveJustification) row.justification = effectiveJustification;
 	return row;
 }
 /**
@@ -1160,7 +1144,7 @@ function convertTable(node, startPos, options) {
 		const cellWidths = rows[0].cells.map((cell) => cell.width);
 		if (cellWidths.every((w) => w !== void 0 && w > 0)) columnWidths = cellWidths;
 	}
-	const justification = attrs.justification;
+	const justification = attrs.justification ?? attrs._resolvedJustification;
 	const originalFormatting = attrs._originalFormatting;
 	const effectiveIndent = attrs._resolvedIndent ?? originalFormatting?.indent;
 	const indentPx = effectiveIndent?.value !== void 0 && effectiveIndent?.type === "dxa" ? twipsToPixels(effectiveIndent.value) : void 0;
@@ -1264,6 +1248,8 @@ function convertTextBoxNode(node, startPos, opts) {
 		pmStart: startPos,
 		pmEnd: startPos + node.nodeSize
 	};
+	const verticalAlign = normalizeShapeTextAnchor(attrs.verticalAlign);
+	if (verticalAlign !== void 0) textBox.verticalAlign = verticalAlign;
 	if (attrs.height !== void 0) textBox.height = attrs.height;
 	if (attrs.autoFit !== void 0) textBox.autoFit = attrs.autoFit;
 	if (attrs.textWrap !== void 0) textBox.textWrap = attrs.textWrap;
@@ -1283,6 +1269,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.
 *
@@ -1292,16 +1283,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;
@@ -1450,7 +1465,8 @@ function toFlowBlocks(doc, options = {}) {
 								...sourceAttrs?.snapToGrid !== void 0 ? { snapToGrid: sourceAttrs.snapToGrid } : {},
 								...sourceAttrs?.documentGridLinePitch !== void 0 ? { documentGridLinePitch: sourceAttrs.documentGridLinePitch } : {},
 								...sourceAttrs?.defaultFontSize !== void 0 ? { defaultFontSize: sourceAttrs.defaultFontSize } : {},
-								...sourceAttrs?.defaultFontFamily !== void 0 ? { defaultFontFamily: sourceAttrs.defaultFontFamily } : {}
+								...sourceAttrs?.defaultFontFamily !== void 0 ? { defaultFontFamily: sourceAttrs.defaultFontFamily } : {},
+								...sourceAttrs?.defaultAlternateFontFamily !== void 0 ? { defaultAlternateFontFamily: sourceAttrs.defaultAlternateFontFamily } : {}
 							};
 							const carrier = {
 								kind: "paragraph",

package/dist/layout-bridge/dom/noteStoryDom.d.ts

@@ -1,4 +1,4 @@
-import { NoteStoryKey } from "../../controller/noteEditorManager.js";
+import { NoteStoryKey } from "../../types/editor-story.js";
 //#region src/layout-bridge/dom/noteStoryDom.d.ts
 declare const findNoteStoryForTarget: (target: unknown) => NoteStoryKey | null;
 //#endregion