@stll/folio-core 0.61.0 → 0.63.0

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

@@ -1,6 +1,9 @@
+import { sharedMathRunFontSize } from "../../docx/mathToMathml.js";
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
+import { hasAutomaticTextSpacingCandidates } from "../../layout-engine/measure/automaticTextSpacing.js";
 import { expectFieldAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectPreservedXmlAttrs, expectSymbolAttrs } from "../../prosemirror/attrs/index.js";
-import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
+import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
+import { displayOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { buildImageRun, constrainImageToPage, hasPaintableImageSource, hasRelationshipBackedImageBox } from "./imageConversion.js";
 import { applyCharacterStyleToggleFormatting, markDefaultBlackTextColorSource, mergeRunFormatting } from "./runFormattingMerge.js";
@@ -40,11 +43,12 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 	const theme = _options.theme;
 	const fontAlternates = _options.fontAlternates;
 	const pmAttrs = expectParagraphAttrs(node);
+	const hasAutomaticSpacingCandidates = hasAutomaticTextSpacingCandidates(node.textContent);
 	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, inheritedMarks = []) {
+	function pushRunsForChild({ child, childPos, inheritedMarks = [], source }) {
 		if (child.type.name === "bookmarkBoundary") return;
 		if (child.type.name === "renderedPageBreak") {
 			if (leadingRenderedPageBreakPending) {
@@ -105,6 +109,10 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 				kind: "text",
 				text: child.text,
 				...mergeRunFormatting(paraDefaults, formatting),
+				...source === "literal" && !directionIsRtl(pmAttrs.direction) && hasAutomaticSpacingCandidates ? { automaticTextSpacing: {
+					latin: pmAttrs.autoSpaceDE !== false,
+					numbers: pmAttrs.autoSpaceDN !== false
+				} } : {},
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			};
@@ -113,7 +121,7 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		}
 		if (child.type.name === "symbol") {
 			const attrs = expectSymbolAttrs(child);
-			const text = decodeOoxmlSymbolCharacter(attrs.char);
+			const text = displayOoxmlSymbolCharacter(attrs.font, attrs.char);
 			if (text === null) return;
 			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
@@ -189,18 +197,23 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 			return;
 		}
 		if (child.type.name === "structuredField") {
-			let containsPageBreak = false;
+			let containsLayoutBreak = false;
 			child.descendants((descendant) => {
-				if (descendant.type.name === "pageBreakRun") {
-					containsPageBreak = true;
+				if (descendant.type.name === "pageBreakRun" || descendant.type.name === "hardBreak") {
+					containsLayoutBreak = true;
 					return false;
 				}
 				return true;
 			});
-			if (containsPageBreak) {
+			if (containsLayoutBreak) {
 				const fieldContentStart = childPos + 1;
 				child.forEach((fieldChild, fieldChildOffset) => {
-					pushRunsForChild(fieldChild, fieldContentStart + fieldChildOffset, effectiveMarks);
+					pushRunsForChild({
+						child: fieldChild,
+						childPos: fieldContentStart + fieldChildOffset,
+						inheritedMarks: effectiveMarks,
+						source: "field-result"
+					});
 				});
 				return;
 			}
@@ -238,6 +251,8 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		if (child.type.name === "math") {
 			const attrs = expectMathAttrs(child);
 			const plainText = attrs.plainText || "[equation]";
+			const mathFormatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
+			const fontSize = sharedMathRunFontSize(attrs.ommlXml) ?? mathFormatting.fontSize ?? paraDefaults.fontSize;
 			runs.push({
 				kind: "math",
 				display: attrs.display ?? "inline",
@@ -245,6 +260,7 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 				plainText,
 				italic: true,
 				fontFamily: "Cambria Math",
+				...fontSize === void 0 ? {} : { fontSize },
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			});
@@ -253,12 +269,21 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		if (child.type.name === "sdt") {
 			const sdtInnerOffset = childPos + 1;
 			child.forEach((sdtChild, sdtChildOffset) => {
-				pushRunsForChild(sdtChild, sdtInnerOffset + sdtChildOffset, effectiveMarks);
+				pushRunsForChild({
+					child: sdtChild,
+					childPos: sdtInnerOffset + sdtChildOffset,
+					inheritedMarks: effectiveMarks,
+					source
+				});
 			});
 		}
 	}
 	node.forEach((child, childOffset) => {
-		pushRunsForChild(child, offset + childOffset);
+		pushRunsForChild({
+			child,
+			childPos: offset + childOffset,
+			source: "literal"
+		});
 	});
 	const { defaultFont, defaultSize } = _options;
 	if (defaultFont !== void 0 || defaultSize !== void 0) for (const run of runs) switch (run.kind) {
@@ -269,10 +294,6 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		case "math":
 			if (defaultFont !== void 0) run.fontFamily ??= defaultFont;
 			if (defaultSize !== void 0) run.fontSize ??= defaultSize;
-			break;
-		case "image":
-		case "lineBreak": break;
-		default:
 	}
 	return runs;
 }

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

@@ -4,8 +4,8 @@ import { RunStyleResolver } from "../../prosemirror/runStyleFormatting.js";
 import { RunFormatting } from "../../layout-engine/types.js";
 import { Mark } from "prosemirror-model";
 //#region src/layout-bridge/convert/runFormattingMerge.d.ts
-declare function markDefaultBlackTextColorSource(formatting: RunFormatting, paraDefaults: RunFormatting): RunFormatting;
-declare function mergeRunFormatting(paraDefaults: RunFormatting, formatting: RunFormatting): RunFormatting;
+export declare function markDefaultBlackTextColorSource(formatting: RunFormatting, paraDefaults: RunFormatting): RunFormatting;
+export declare function mergeRunFormatting(paraDefaults: RunFormatting, formatting: RunFormatting): RunFormatting;
 type ApplyCharacterStyleToggleFormattingOptions = {
   formatting: RunFormatting;
   marks: readonly Mark[];
@@ -13,7 +13,7 @@ type ApplyCharacterStyleToggleFormattingOptions = {
   styleResolver: RunStyleResolver;
 };
 /** Restore character-style toggle values that plain visual marks cannot represent. */
-declare function applyCharacterStyleToggleFormatting({ formatting, marks, paragraphFormatting, styleResolver }: ApplyCharacterStyleToggleFormattingOptions): void;
-declare function applyRunFormattingOverrides(formatting: RunFormatting, attrs: RunFormattingOverrideAttrs): void;
+export declare function applyCharacterStyleToggleFormatting({ formatting, marks, paragraphFormatting, styleResolver }: ApplyCharacterStyleToggleFormattingOptions): void;
+export declare function applyRunFormattingOverrides(formatting: RunFormatting, attrs: RunFormattingOverrideAttrs): void;
 //#endregion
-export { applyCharacterStyleToggleFormatting, applyRunFormattingOverrides, markDefaultBlackTextColorSource, mergeRunFormatting };
+export {};

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

@@ -27,6 +27,7 @@ function mergeRunFormatting(paraDefaults, formatting) {
 	};
 	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.hAnsiFontFamily !== void 0 && formatting.hAnsiAlternateFontFamily === void 0) delete merged.hAnsiAlternateFontFamily;
 	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;

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

@@ -6,6 +6,5 @@ import { Mark } from "prosemirror-model";
 /**
  * Extract run formatting from ProseMirror marks.
  */
-declare function extractRunFormatting(marks: readonly Mark[], theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
-//#endregion
-export { extractRunFormatting };
+export declare function extractRunFormatting(marks: readonly Mark[], theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
+//#endregion

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

@@ -8,10 +8,14 @@ import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js"
 import { halfPointsToPixels, halfPointsToPoints } from "../../utils/units.js";
 import { twipsToPixels } from "./flowConversionShared.js";
 import { applyRunFormattingOverrides } from "./runFormattingMerge.js";
-import { isAutomaticTextColorValue, resolveComplexScriptThemeFont, resolveEastAsiaThemeFont, resolveWesternThemeFont } from "./textFormattingConversion.js";
+import { isAutomaticTextColorValue, resolveComplexScriptThemeFont, resolveEastAsiaThemeFont, resolveHAnsiThemeFont, resolveWesternThemeFont } from "./textFormattingConversion.js";
 import { panic } from "better-result";
 //#region src/layout-bridge/convert/runMarkFormatting.ts
 /**
+* Derives layout RunFormatting from the ProseMirror marks on a text node:
+* mark paint dispositions, bidi wrapper direction, and per-mark formatting.
+*/
+/**
 * What the painter does with each mark the schema declares.
 *
 * The switch below used to end in `default: break`, so a mark that reached it
@@ -152,6 +156,12 @@ function extractRunFormatting(marks, theme, fontAlternates) {
 				const alternate = getFontAlternate(font, fontAlternates);
 				if (alternate) formatting.alternateFontFamily = alternate;
 			}
+			const hAnsiFont = resolveHAnsiThemeFont(attrs, theme);
+			if (hAnsiFont) {
+				formatting.hAnsiFontFamily = hAnsiFont;
+				const alternate = getFontAlternate(hAnsiFont, fontAlternates);
+				if (alternate) formatting.hAnsiAlternateFontFamily = alternate;
+			}
 			const eastAsiaFont = resolveEastAsiaThemeFont(attrs, theme);
 			if (eastAsiaFont) {
 				formatting.eastAsiaFontFamily = eastAsiaFont;
@@ -279,9 +289,7 @@ function extractRunFormatting(marks, theme, fontAlternates) {
 			if (bidiWrapper) formatting.bidiWrapper = bidiWrapper;
 			break;
 		}
-		default:
-			if (markPaintDisposition(mark.type.name) === "runFormatting") panic(`Mark ${mark.type.name} is painted as run formatting but has no branch here`);
-			break;
+		default: if (markPaintDisposition(mark.type.name) === "runFormatting") panic(`Mark ${mark.type.name} is painted as run formatting but has no branch here`);
 	}
 	if (runFormattingOverride) applyRunFormattingOverrides(formatting, runFormattingOverride);
 	if (hasNoteRef && formatting.subscript) delete formatting.superscript;

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

@@ -1,13 +1,13 @@
 import { FlowBlock, SectionBreakBlock } from "../../layout-engine/types.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/sectionBoundaries.d.ts
-declare function getLastMapKey<K, V>(map: ReadonlyMap<K, V>): K | undefined;
+export declare function getLastMapKey<K, V>(map: ReadonlyMap<K, V>): K | undefined;
 /**
  * Translate section-owned start modes into the boundary-owned values consumed
  * by the paginator. Each flow section break carries the properties for the
  * section it ends, so its start mode belongs on the preceding boundary.
  */
-declare function applySectionStartsToBoundaries(blocks: readonly FlowBlock[], finalSectionStart: NonNullable<SectionBreakBlock["type"]> | undefined): FlowBlock[];
+export declare function applySectionStartsToBoundaries(blocks: readonly FlowBlock[], finalSectionStart: NonNullable<SectionBreakBlock["type"]> | undefined): FlowBlock[];
 /**
  * A trailing page break belongs to its section-ending paragraph. When the
  * paragraph mark stays on the current page, an immediately following
@@ -19,17 +19,17 @@ declare function applySectionStartsToBoundaries(blocks: readonly FlowBlock[], fi
  * that projected no block, so a page break just before it ends an earlier
  * paragraph and still starts the next page.
  */
-declare function coalesceTrailingPageBreakBeforeContinuousSection(blocks: readonly FlowBlock[], splitPageBreakAndParagraphMark: boolean, breaksWithoutMarker: ReadonlySet<SectionBreakBlock["id"]>): FlowBlock[];
+export declare function coalesceTrailingPageBreakBeforeContinuousSection(blocks: readonly FlowBlock[], splitPageBreakAndParagraphMark: boolean, breaksWithoutMarker: ReadonlySet<SectionBreakBlock["id"]>): FlowBlock[];
 /**
  * The last section's start mode, off a document attribute the schema types as
  * `any`. `parseSectionBreakType` owns the enumeration, so a member added to
  * `ST_SectionMark` reaches the paginator instead of being dropped here.
  */
-declare function readFinalSectionStart(doc: Node): NonNullable<SectionBreakBlock["type"]> | undefined;
+export declare function readFinalSectionStart(doc: Node): NonNullable<SectionBreakBlock["type"]> | undefined;
 type SectionDocumentGridOptions = {
   finalLinePitchTwips: number | undefined;
   tableCellLinePitch: "sectionGrid" | undefined;
 };
-declare function applySectionDocumentGrid(blocks: FlowBlock[], { finalLinePitchTwips, tableCellLinePitch }: SectionDocumentGridOptions): FlowBlock[];
+export declare function applySectionDocumentGrid(blocks: FlowBlock[], { finalLinePitchTwips, tableCellLinePitch }: SectionDocumentGridOptions): FlowBlock[];
 //#endregion
-export { applySectionDocumentGrid, applySectionStartsToBoundaries, coalesceTrailingPageBreakBeforeContinuousSection, getLastMapKey, readFinalSectionStart };
+export {};

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

@@ -5,8 +5,7 @@ import { Node } from "prosemirror-model";
 /**
  * Convert a table node to a TableBlock.
  */
-declare function convertTable(node: Node, startPos: number, options: FlowConversionOptions): TableBlock;
+export declare function convertTable(node: Node, startPos: number, options: FlowConversionOptions): TableBlock;
 /** Convert a textBox PM node to a TextBoxBlock. */
-declare function convertTextBoxNode(node: Node, startPos: number, opts: FlowConversionOptions): TextBoxBlock;
-//#endregion
-export { convertTable, convertTextBoxNode };
+export declare function convertTextBoxNode(node: Node, startPos: number, opts: FlowConversionOptions): TextBoxBlock;
+//#endregion

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

@@ -84,7 +84,7 @@ function convertTableCell(node, startPos, options, tableCellMargins) {
 		suppressEmptyParagraphHeight: true
 	};
 	const attrs = expectTableCellAttrs(node);
-	if (attrs.hideMark && trailingBlock?.kind === "paragraph" && trailingBlock.runs.every((run) => run.kind === "text" && run.text.length === 0)) trailingBlock.attrs = {
+	if (attrs.hideMark && blocks.length > 1 && trailingBlock?.kind === "paragraph" && trailingBlock.runs.every((run) => run.kind === "text" && run.text.length === 0)) trailingBlock.attrs = {
 		...trailingBlock.attrs,
 		suppressEmptyParagraphHeight: true
 	};

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

@@ -2,7 +2,7 @@ import { TemplatePreviewHiddenRange, TemplatePreviewValue } from "../../prosemir
 import { FlowBlock } from "../../layout-engine/types.js";
 //#region src/layout-bridge/convert/templatePreviewFlow.d.ts
 /** One marker→value substitution, in PM doc positions. */
-type TemplatePreviewFlowEntry = {
+export type TemplatePreviewFlowEntry = {
   /** Inclusive PM doc position of the marker start. */
   from: number;
   /** Exclusive PM doc position of the marker end. */
@@ -11,12 +11,12 @@ type TemplatePreviewFlowEntry = {
   value: TemplatePreviewValue;
 };
 /** What the preview substitutes and what it hides, as the flow stage sees it. */
-type TemplatePreviewFlowState = {
+export type TemplatePreviewFlowState = {
   entries: readonly TemplatePreviewFlowEntry[];
   /** Conditional spans a `false` condition hides, in PM doc positions. */
   hidden: readonly TemplatePreviewHiddenRange[];
 };
-type TemplatePreviewFlowOptions = TemplatePreviewFlowState & {
+export type TemplatePreviewFlowOptions = TemplatePreviewFlowState & {
   /** `highlighted` marks substituted runs for the accent-chip CSS. */
   mode: "highlighted" | "plain";
 };
@@ -26,7 +26,7 @@ type TemplatePreviewFlowOptions = TemplatePreviewFlowState & {
  * a hidden conditional span swallows whole. Returns the input array unchanged
  * when there is nothing to substitute and nothing to hide.
  */
-declare function applyTemplatePreviewToBlocks(blocks: FlowBlock[], { entries, hidden, mode }: TemplatePreviewFlowOptions): FlowBlock[];
+export declare function applyTemplatePreviewToBlocks(blocks: FlowBlock[], { entries, hidden, mode }: TemplatePreviewFlowOptions): FlowBlock[];
 /**
  * PM range covering every substitution and every hidden span that differs
  * between two preview states (changed, added, or removed), or `null` when the
@@ -36,9 +36,8 @@ declare function applyTemplatePreviewToBlocks(blocks: FlowBlock[], { entries, hi
  * changes the block count, which sends the measure path down its full-remeasure
  * branch regardless of how wide this range is.
  */
-declare function templatePreviewDirtyRange(previous: TemplatePreviewFlowState, next: TemplatePreviewFlowState): {
+export declare function templatePreviewDirtyRange(previous: TemplatePreviewFlowState, next: TemplatePreviewFlowState): {
   from: number;
   to: number;
 } | null;
-//#endregion
-export { TemplatePreviewFlowEntry, TemplatePreviewFlowOptions, TemplatePreviewFlowState, applyTemplatePreviewToBlocks, templatePreviewDirtyRange };
+//#endregion

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

@@ -10,11 +10,10 @@ import { ImagePadding } from "@stll/docx-core/model";
  * `wp:anchor` the position offsets already locate the shape's own extent, so
  * the reservation only affects wrapping and is not applied here.
  */
-declare function inlineEffectExtentPx(wrapType: TextBoxBlock["wrapType"], extent: ImagePadding | undefined): TextBoxBlock["effectExtent"];
+export declare function inlineEffectExtentPx(wrapType: TextBoxBlock["wrapType"], extent: ImagePadding | undefined): TextBoxBlock["effectExtent"];
 /**
  * A linear `a:gradFill` with its stop colors resolved through the theme. A path
  * gradient (`a:path`) is not painted: nothing here places its focus.
  */
-declare function resolveLinearGradientFill(fill: document_d_exports.ShapeFill | undefined, theme: document_d_exports.Theme | null | undefined): TextBoxGradientFill | undefined;
-//#endregion
-export { inlineEffectExtentPx, resolveLinearGradientFill };
+export declare function resolveLinearGradientFill(fill: document_d_exports.ShapeFill | undefined, theme: document_d_exports.Theme | null | undefined): TextBoxGradientFill | undefined;
+//#endregion

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

@@ -7,16 +7,17 @@ type ThemeFontAttributes = Omit<NonNullable<document_d_exports.TextFormatting["f
   /** The ProseMirror attr reader validates this against the canonical theme values. */
   asciiTheme?: string;
 };
-declare const resolveWesternThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
-declare const resolveComplexScriptThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
-declare const resolveEastAsiaThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
-declare function isAutomaticTextColorValue(color: document_d_exports.ColorValue): boolean;
+export declare const resolveWesternThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
+export declare const resolveHAnsiThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
+export declare const resolveComplexScriptThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
+export declare const resolveEastAsiaThemeFont: (fontFamily: ThemeFontAttributes, theme?: document_d_exports.Theme | null) => string | undefined;
+export declare function isAutomaticTextColorValue(color: document_d_exports.ColorValue): boolean;
 /**
  * The numbering symbol's typography: the numbering level's `w:rPr` applied
  * over the paragraph mark's run properties (ECMA-376 §17.9.24, §17.3.1.29).
  * Text runs of the paragraph play no part.
  */
-declare function listMarkerFormattingFor(levelFormatting: document_d_exports.TextFormatting | undefined, paragraphMarkFormatting: document_d_exports.TextFormatting | undefined, theme: document_d_exports.Theme | null | undefined, fontAlternates: FontAlternates | undefined): ListMarkerFormatting | undefined;
-declare function paragraphRunDefaults(pmAttrs: ParagraphAttrs, theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
+export declare function listMarkerFormattingFor(levelFormatting: document_d_exports.TextFormatting | undefined, paragraphMarkFormatting: document_d_exports.TextFormatting | undefined, theme: document_d_exports.Theme | null | undefined, fontAlternates: FontAlternates | undefined): ListMarkerFormatting | undefined;
+export declare function paragraphRunDefaults(pmAttrs: ParagraphAttrs, theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
 //#endregion
-export { isAutomaticTextColorValue, listMarkerFormattingFor, paragraphRunDefaults, resolveComplexScriptThemeFont, resolveEastAsiaThemeFont, resolveWesternThemeFont };
+export {};

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

@@ -15,6 +15,9 @@ const resolveWesternThemeFont = (fontFamily, theme) => {
 	const themeRef = fontFamily.asciiTheme ?? fontFamily.hAnsiTheme;
 	return (themeRef ? resolveThemeFont(themeRef, theme?.fontScheme) : null) ?? fontFamily.ascii ?? fontFamily.hAnsi ?? void 0;
 };
+const resolveHAnsiThemeFont = (fontFamily, theme) => {
+	return (fontFamily.hAnsiTheme ? resolveThemeFont(fontFamily.hAnsiTheme, theme?.fontScheme) : null) ?? fontFamily.hAnsi ?? void 0;
+};
 const resolveComplexScriptThemeFont = (fontFamily, theme) => {
 	return (fontFamily.csTheme ? resolveThemeFont(fontFamily.csTheme, theme?.fontScheme) : null) ?? fontFamily.cs ?? void 0;
 };
@@ -34,6 +37,12 @@ function textFormattingToRunFormatting(defaultTextFormatting, theme, fontAlterna
 		const alternate = getFontAlternate(fontFamily, fontAlternates);
 		if (alternate) result.alternateFontFamily = alternate;
 	}
+	const hAnsiFontFamily = defaultTextFormatting.fontFamily ? resolveHAnsiThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
+	if (hAnsiFontFamily) {
+		result.hAnsiFontFamily = hAnsiFontFamily;
+		const alternate = getFontAlternate(hAnsiFontFamily, fontAlternates);
+		if (alternate) result.hAnsiAlternateFontFamily = alternate;
+	}
 	const eastAsiaFontFamily = defaultTextFormatting.fontFamily ? resolveEastAsiaThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
 	if (eastAsiaFontFamily) {
 		result.eastAsiaFontFamily = eastAsiaFontFamily;
@@ -117,4 +126,4 @@ function paragraphRunDefaults(pmAttrs, theme, fontAlternates) {
 	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme, fontAlternates);
 }
 //#endregion
-export { isAutomaticTextColorValue, listMarkerFormattingFor, paragraphRunDefaults, resolveComplexScriptThemeFont, resolveEastAsiaThemeFont, resolveWesternThemeFont };
+export { isAutomaticTextColorValue, listMarkerFormattingFor, paragraphRunDefaults, resolveComplexScriptThemeFont, resolveEastAsiaThemeFont, resolveHAnsiThemeFont, resolveWesternThemeFont };

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

@@ -13,13 +13,13 @@ import { Node } from "prosemirror-model";
  * roots, while standalone ProseMirror documents keep the layout engine's 11pt
  * default.
  */
-declare const WORD_UNSPECIFIED_FONT_SIZE = 10;
+export declare const WORD_UNSPECIFIED_FONT_SIZE = 10;
 /**
  * Convert a ProseMirror document to FlowBlock array.
  *
  * Walks the document tree, converting each node to the appropriate block type.
  * Tracks pmStart/pmEnd positions for each block for click-to-position mapping.
  */
-declare function toFlowBlocks(doc: Node, options?: ToFlowBlocksOptions): FlowBlock[];
+export declare function toFlowBlocks(doc: Node, options?: ToFlowBlocksOptions): FlowBlock[];
 //#endregion
-export { type ToFlowBlocksOptions, WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };
+export { type ToFlowBlocksOptions, collectNoteRefs, convertBorderSpecToLayout, formatCounter, resetBlockIdCounter, resolveListTemplate };

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

@@ -261,7 +261,6 @@ function toFlowBlocks(doc, options = {}) {
 				}
 				return;
 			}
-			default: break;
 		}
 		switch (node.type.name) {
 			case "paragraph": {
@@ -397,7 +396,6 @@ function toFlowBlocks(doc, options = {}) {
 				trackedPush(pb);
 				break;
 			}
-			default: break;
 		}
 	};
 	doc.forEach((node, nodeOffset) => {
@@ -412,27 +410,37 @@ function toFlowBlocks(doc, options = {}) {
 	}
 	const mergedBlocks = mergeRunInParagraphs(blocks);
 	const tableCellLinePitch = doc.attrs["_adjustLineHeightInTable"] === true ? "sectionGrid" : void 0;
-	const result = groupParagraphFrames(coalesceTrailingPageBreakBeforeContinuousSection(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
+	const griddedBlocks = applySectionDocumentGrid(mergedBlocks, {
 		finalLinePitchTwips: opts.finalSectionDocumentGridLinePitchTwips,
 		tableCellLinePitch
-	}), readFinalSectionStart(doc)), options.splitPageBreakAndParagraphMark === true, sectionBreaksWithoutMarker), nextBlockId);
-	if (options.embeddedFontFamilyMap) attachEmbeddedFontFamilies(result, options.embeddedFontFamilyMap);
+	});
+	const boundaryBlocks = applySectionStartsToBoundaries(griddedBlocks, readFinalSectionStart(doc));
+	const reconciledBlocks = coalesceTrailingPageBreakBeforeContinuousSection(boundaryBlocks, options.splitPageBreakAndParagraphMark === true, sectionBreaksWithoutMarker);
+	const result = groupParagraphFrames(reconciledBlocks, nextBlockId);
+	if (options.embeddedFontFamilyMap !== void 0 || options.documentFontFacts !== void 0) attachFontResolutionContext(result, options);
 	return result;
 }
 /** Attach editor-owned resolution to freshly derived blocks without changing authored data. */
-const attachEmbeddedFontFamilies = (blocks, familyMap) => {
+const attachFontResolutionContext = (blocks, options) => {
 	for (const block of blocks) switch (block.kind) {
 		case "paragraph":
-			for (const run of block.runs) if (run.kind !== "image" && run.kind !== "lineBreak") run.embeddedFontFamilyMap = familyMap;
+			for (const run of block.runs) if (run.kind !== "image" && run.kind !== "lineBreak") {
+				if (options.embeddedFontFamilyMap !== void 0) run.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
+				if (options.documentFontFacts !== void 0) run.documentFontFacts = options.documentFontFacts;
+			}
 			block.attrs ??= {};
-			block.attrs.embeddedFontFamilyMap = familyMap;
-			if (block.attrs.listMarkerFormatting) block.attrs.listMarkerFormatting.embeddedFontFamilyMap = familyMap;
+			if (options.embeddedFontFamilyMap !== void 0) block.attrs.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
+			if (options.documentFontFacts !== void 0) block.attrs.documentFontFacts = options.documentFontFacts;
+			if (block.attrs.listMarkerFormatting) {
+				if (options.embeddedFontFamilyMap !== void 0) block.attrs.listMarkerFormatting.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
+				if (options.documentFontFacts !== void 0) block.attrs.listMarkerFormatting.documentFontFacts = options.documentFontFacts;
+			}
 			break;
 		case "table":
-			for (const row of block.rows) for (const cell of row.cells) attachEmbeddedFontFamilies(cell.blocks, familyMap);
+			for (const row of block.rows) for (const cell of row.cells) attachFontResolutionContext(cell.blocks, options);
 			break;
 		case "textBox":
-			attachEmbeddedFontFamilies(block.content, familyMap);
+			attachFontResolutionContext(block.content, options);
 			break;
 		case "image":
 		case "sectionBreak":

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

@@ -1,7 +1,7 @@
 import { EditorState, Transaction } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/layout-bridge/convert/wrapEditorViewAsSurface.d.ts
-type Surface = {
+export type Surface = {
   /** Identity tag — `"body"` for the body PM, `"hf"` for any HF PM. */
   kind: "body" | "hf";
   /** rId of the source HF part; `null` for the body surface. */
@@ -13,6 +13,5 @@ type Surface = {
   dispatch: (tr: Transaction) => void;
   setSelection: (anchor: number, head?: number) => void;
 };
-declare function wrapEditorViewAsSurface(view: EditorView | null, rId: string): Surface;
-//#endregion
-export { Surface, wrapEditorViewAsSurface };
+export declare function wrapEditorViewAsSurface(view: EditorView | null, rId: string): Surface;
+//#endregion

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

@@ -18,7 +18,7 @@
  * @param zoom - Current zoom level (default 1)
  * @returns ProseMirror position, or null if not found
  */
-declare function clickToPositionDom(container: HTMLElement, clientX: number, clientY: number, zoom?: number): number | null;
+export declare function clickToPositionDom(container: HTMLElement, clientX: number, clientY: number, zoom?: number): number | null;
 /**
  * Find exact position within a text span. Defers to the
  * browser's own hit-tester (`caretPositionFromPoint` /
@@ -29,7 +29,7 @@ declare function clickToPositionDom(container: HTMLElement, clientX: number, cli
  * unavailable or returns a point outside this span (e.g. the
  * caret API resolved to a sibling text node at the same y).
  */
-declare function findPositionInSpan(spanEl: HTMLElement, clientX: number, clientY: number): number | null;
+export declare function findPositionInSpan(spanEl: HTMLElement, clientX: number, clientY: number): number | null;
 /**
  * Get selection rectangles for a PM range using DOM-based detection.
  *
@@ -39,14 +39,14 @@ declare function findPositionInSpan(spanEl: HTMLElement, clientX: number, client
  * @param overlayRect - Bounding rect of the selection overlay
  * @returns Array of selection rectangles in overlay coordinates
  */
-type DomSelectionRect = {
+export type DomSelectionRect = {
   x: number;
   y: number;
   width: number;
   height: number;
   pageIndex: number;
 };
-declare function getSelectionRectsFromDom(container: HTMLElement, from: number, to: number, overlayRect: DOMRect): DomSelectionRect[];
+export declare function getSelectionRectsFromDom(container: HTMLElement, from: number, to: number, overlayRect: DOMRect): DomSelectionRect[];
 /**
  * Get caret position from DOM for a PM position.
  *
@@ -55,13 +55,13 @@ declare function getSelectionRectsFromDom(container: HTMLElement, from: number,
  * @param overlayRect - Bounding rect of the selection overlay
  * @returns Caret position in overlay coordinates, or null
  */
-type DomCaretPosition = {
+export type DomCaretPosition = {
   x: number;
   y: number;
   height: number;
   pageIndex: number;
 };
-type CollapsedLineEdgeCaretGeometry = {
+export type CollapsedLineEdgeCaretGeometry = {
   left: number;
   top: number;
   /** Viewport height of the visual anchor. Full-line caret painters retain
@@ -75,8 +75,8 @@ type CollapsedLineEdgeCaretGeometry = {
  * below the line until visible text is typed. Anchor the caret to the nearest
  * painted sibling instead; an all-whitespace line falls back to its line box.
  */
-declare function getCollapsedLineEdgeCaretGeometry(spanEl: HTMLElement, pmPos?: number): CollapsedLineEdgeCaretGeometry | null;
-type CollapsedLineEdgeCaretTarget = {
+export declare function getCollapsedLineEdgeCaretGeometry(spanEl: HTMLElement, pmPos?: number): CollapsedLineEdgeCaretGeometry | null;
+export type CollapsedLineEdgeCaretTarget = {
   span: HTMLElement;
   geometry: CollapsedLineEdgeCaretGeometry;
 };
@@ -85,14 +85,13 @@ type CollapsedLineEdgeCaretTarget = {
  * position. Generic text runs use inclusive endpoints, so DOM order alone
  * cannot decide which span owns a boundary.
  */
-declare function findCollapsedLineEdgeCaretTarget(spans: readonly HTMLElement[], pmPos: number): CollapsedLineEdgeCaretTarget | null;
+export declare function findCollapsedLineEdgeCaretTarget(spans: readonly HTMLElement[], pmPos: number): CollapsedLineEdgeCaretTarget | null;
 /**
  * Map an unpainted inline position inside a paragraph to the nearest painted
  * span boundary. Inline metadata and folded fields occupy ProseMirror
  * positions without emitting glyphs; their carets belong at the adjacent text
  * slot, not at the paragraph box's physical edge.
  */
-declare function findParagraphGapCaretTarget(container: ParentNode, pmPos: number): CollapsedLineEdgeCaretTarget | null;
-declare function getCaretPositionFromDom(container: HTMLElement, pmPos: number, overlayRect: DOMRect): DomCaretPosition | null;
-//#endregion
-export { CollapsedLineEdgeCaretGeometry, CollapsedLineEdgeCaretTarget, DomCaretPosition, DomSelectionRect, clickToPositionDom, findCollapsedLineEdgeCaretTarget, findParagraphGapCaretTarget, findPositionInSpan, getCaretPositionFromDom, getCollapsedLineEdgeCaretGeometry, getSelectionRectsFromDom };
+export declare function findParagraphGapCaretTarget(container: ParentNode, pmPos: number): CollapsedLineEdgeCaretTarget | null;
+export declare function getCaretPositionFromDom(container: HTMLElement, pmPos: number, overlayRect: DOMRect): DomCaretPosition | null;
+//#endregion

package/dist/layout-bridge/dom/clickToPositionDom.js

@@ -1,5 +1,5 @@
 import { closestHtmlElement, findHtmlElement, htmlQueryAll, queryHtmlElement } from "../../utils/domGuards.js";
-import { descendantTextNodes, logicalTextOffset, measurePaintedSpanRange, textBoundaryAt, totalTextLength } from "./textStreamDom.js";
+import { descendantTextNodes, logicalTextOffset, measurePaintedSpanRange, paintedTextOffset, textBoundaryAt, totalTextLength } from "./textStreamDom.js";
 //#region src/layout-bridge/dom/clickToPositionDom.ts
 /**
 * DOM-based Click-to-Position Mapping
@@ -60,7 +60,21 @@ function findPositionInSpan(spanEl, clientX, clientY) {
 	}
 	const textNodes = descendantTextNodes(spanEl);
 	if (textNodes.length === 0) return pmStart;
-	if (totalTextLength(textNodes) === 0) return pmStart;
+	const textLength = totalTextLength(textNodes);
+	if (textLength === 0) return pmStart;
+	if (pmEnd - pmStart === 1 && textLength > 1) {
+		const range = spanEl.ownerDocument.createRange();
+		const distanceToBoundary = (offset) => {
+			const boundary = textBoundaryAt(textNodes, offset, "start");
+			if (!boundary) return Number.POSITIVE_INFINITY;
+			range.setStart(boundary.node, boundary.offset);
+			range.setEnd(boundary.node, boundary.offset);
+			const rect = range.getBoundingClientRect();
+			const nearestY = Math.max(rect.top, Math.min(rect.bottom, clientY));
+			return Math.hypot(clientX - rect.left, clientY - nearestY);
+		};
+		return distanceToBoundary(0) < distanceToBoundary(textLength) ? pmStart : pmEnd;
+	}
 	const ownerDoc = spanEl.ownerDocument;
 	const native = caretOffsetFromPoint(ownerDoc, textNodes, clientX, clientY);
 	if (native !== null) return pmStart + Math.min(native, pmEnd - pmStart);
@@ -289,7 +303,13 @@ const getPaintedSpanCaretGeometry = (span, pmPos) => {
 		height: lineHeight
 	};
 	const pmStart = Number(span.dataset["pmStart"]);
-	const boundary = textBoundaryAt(textNodes, Math.min(Math.max(0, pmPos - pmStart), totalTextLength(textNodes)), "start");
+	const charIndex = paintedTextOffset({
+		pmStart,
+		pmEnd: Number(span.dataset["pmEnd"]),
+		pmPosition: pmPos,
+		textLength: totalTextLength(textNodes)
+	});
+	const boundary = textBoundaryAt(textNodes, charIndex, "start");
 	if (!boundary) return {
 		left: spanRect.left,
 		top: spanRect.top,
@@ -383,7 +403,13 @@ function getCaretPositionFromDom(container, pmPos, overlayRect) {
 					pageIndex
 				};
 			}
-			const boundary = textBoundaryAt(textNodes, Math.min(pmPos - pmStart, totalTextLength(textNodes)), "start");
+			const charIndex = paintedTextOffset({
+				pmStart,
+				pmEnd,
+				pmPosition: pmPos,
+				textLength: totalTextLength(textNodes)
+			});
+			const boundary = textBoundaryAt(textNodes, charIndex, "start");
 			if (!boundary) continue;
 			const range = spanEl.ownerDocument.createRange();
 			range.setStart(boundary.node, boundary.offset);