@stll/folio-core 0.29.0 → 0.31.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,6 @@
 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
@@ -13,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. */

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

@@ -1,5 +1,6 @@
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.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";
@@ -13,9 +14,11 @@ 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";
@@ -85,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) {
@@ -137,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": {
@@ -157,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;
 		}
@@ -280,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. */
@@ -332,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;
@@ -369,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;
@@ -378,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
@@ -443,8 +476,9 @@ 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;
@@ -464,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,
@@ -485,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
 			});
@@ -511,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,
@@ -530,7 +566,7 @@ 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;
@@ -543,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,
@@ -655,7 +691,7 @@ function resolveDeletedListMarker(previousListAttrs, listCounterState) {
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme) {
+function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme, fontAlternates) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
 	const marker = resolveDeletedListMarker(previousListAttrs, listCounterState);
 	if (!marker) return;
@@ -663,11 +699,11 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme) {
 	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, listCounterStreams, defaultTabStopTwips }) {
+function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStreams, defaultTabStopTwips }) {
 	const attrs = {};
 	if (pmAttrs.alignment) {
 		const align = pmAttrs.alignment;
@@ -791,14 +827,14 @@ function convertParagraphAttrs(pmAttrs, { theme, listCounterStreams, defaultTabS
 	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, void 0, theme);
+			applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, void 0, theme, fontAlternates);
 			if (resolvedMarker !== null) {
 				attrs.listMarker = resolvedMarker;
 				attrs.listMarkerRevision = toListMarkerRevision("del", numberingRemovedChange.info);
@@ -812,7 +848,11 @@ function convertParagraphAttrs(pmAttrs, { theme, listCounterStreams, defaultTabS
 		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;
@@ -843,6 +883,7 @@ function convertParagraph(node, startPos, options) {
 	const runs = paragraphToRuns(node, startPos, options);
 	const attrs = convertParagraphAttrs(pmAttrs, {
 		theme: options.theme,
+		fontAlternates: options.fontAlternates,
 		listCounterStreams: options.listCounterStreams,
 		defaultTabStopTwips: options.defaultTabStopTwips
 	});
@@ -856,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;
@@ -1076,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;
 }
 /**
@@ -1097,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;
@@ -1201,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;
@@ -1416,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

package/dist/layout-bridge/engine/selectionRects.js

@@ -6,6 +6,7 @@ import { measureRun } from "../../layout-engine/measure/measureProvider.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../../layout-engine/measure/tableCellFloating.js";
 import { buildTableCellGrid, buildTableCellPlacements } from "../../layout-engine/measure/tableCellGrid.js";
 import { resolveTableCellPadding } from "../../layout-engine/types.js";
+import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { resolvePhysicalParagraphInlineLayout } from "../../utils/paragraphInlineLayout.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
 import { getPageTop } from "./hitTest.js";
@@ -33,13 +34,14 @@ function runToFontStyle(run) {
 	return buildRunFontStyle(run, "Arial", 12);
 }
 function mathRunToFontStyle(run) {
+	const horizontalScale = normalizeHorizontalScalePercent(run.horizontalScale);
 	return {
 		fontFamily: run.fontFamily ?? "Cambria Math",
 		fontSize: run.fontSize ?? 11,
 		...run.bold !== void 0 ? { bold: run.bold } : {},
 		...run.italic !== void 0 ? { italic: run.italic } : {},
 		...run.letterSpacing !== void 0 ? { letterSpacing: run.letterSpacing } : {},
-		...run.horizontalScale !== void 0 ? { horizontalScale: run.horizontalScale } : {}
+		...horizontalScale !== void 0 ? { horizontalScale } : {}
 	};
 }
 /**