@stll/folio-core 0.62.0 → 0.63.0

package/dist/layout-engine/measure/lineFitting.js

@@ -1,4 +1,5 @@
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
+import { automaticRunGap, automaticTextBoundaryGap } from "./automaticTextSpacing.js";
 import { defaultLineBreakProvider, getLineBreakProvider } from "./lineBreakProvider.js";
 import { findGraphemeBreaks, isHangingPunctuation } from "./lineBreaks.js";
 import { twipsToPx } from "./measureHelpers.js";
@@ -76,17 +77,17 @@ function admitFinalCandidate(candidateWidth, availableWidth, tolerancePx) {
 		}
 	};
 }
-function trimTrailingSpacesAndTabs(text) {
+function trimLineEndWhitespace(text) {
 	let end = text.length;
 	while (end > 0) {
 		const char = text[end - 1];
-		if (char !== " " && char !== "	") break;
+		if (char !== " " && char !== "	" && char !== "​") break;
 		end--;
 	}
 	return text.slice(0, end);
 }
 function measureWordWithTrailingWhitespace(word, style) {
-	const measuredWord = trimTrailingSpacesAndTabs(word);
+	const measuredWord = trimLineEndWhitespace(word);
 	const wordWidth = measureTextWidth(measuredWord, style);
 	const trailingWhitespace = word.slice(measuredWord.length);
 	if (trailingWhitespace.length === 0) return {
@@ -116,11 +117,21 @@ const scaledLetterSpacing = (style) => (style.letterSpacing ?? 0) * getHorizonta
 */
 function precedingLetterSpacing({ block, line, runIndex, charIndex, runStyle }) {
 	if (line.fromRun === line.toRun && line.fromChar === line.toChar) return 0;
-	if (line.toRun === runIndex && line.toChar === charIndex) return scaledLetterSpacing(runStyle);
+	if (line.toRun === runIndex && line.toChar === charIndex) {
+		const run = block.runs[runIndex];
+		return scaledLetterSpacing(runStyle) + (run?.kind === "text" ? automaticTextBoundaryGap({
+			beforeText: run.text,
+			beforeEnd: charIndex,
+			beforeStyle: runStyle,
+			afterText: run.text,
+			afterStart: charIndex,
+			afterStyle: runStyle
+		}) : 0);
+	}
 	if (charIndex !== 0 || line.toRun !== runIndex - 1) return 0;
 	const previousRun = block.runs[runIndex - 1];
 	if (!previousRun || !isTextRun(previousRun) || previousRun.text.length === 0 || line.toChar !== previousRun.text.length) return 0;
-	return scaledLetterSpacing(runToFontStyle(previousRun));
+	return scaledLetterSpacing(runToFontStyle(previousRun)) + automaticRunGap(previousRun, block.runs[runIndex]);
 }
 function trailingCodePoint(text) {
 	if (text.length === 0) return;
@@ -142,4 +153,4 @@ function trailingHangingPunctuationWidth(text, style, policy, enabled) {
 	return measureTextWidth(lastGrapheme, style);
 }
 //#endregion
-export { exceedsHyphenationZone, findMaxFittingLength, isFinalTextCandidate, isIgnorableFinalTailRun, measureWordWithTrailingWhitespace, precedingLetterSpacing, resolveTextCandidateFit, trailingHangingPunctuationWidth, trimTrailingSpacesAndTabs };
+export { exceedsHyphenationZone, findMaxFittingLength, isFinalTextCandidate, isIgnorableFinalTailRun, measureWordWithTrailingWhitespace, precedingLetterSpacing, resolveTextCandidateFit, trailingHangingPunctuationWidth, trimLineEndWhitespace };

package/dist/layout-engine/measure/lineTypography.d.ts

@@ -1,5 +1,5 @@
-import { ParagraphAttrs, ParagraphSpacing, TextRun } from "../types.js";
 import { FontMetrics, FontStyle } from "./measureTypes.js";
+import { ParagraphAttrs, ParagraphSpacing, TextRun } from "../types.js";
 import { LineTypography } from "./paragraphMeasureShared.js";
 //#region src/layout-engine/measure/lineTypography.d.ts
 /**
@@ -18,9 +18,9 @@ import { LineTypography } from "./paragraphMeasureShared.js";
  * The result feeds `updateMaxFont` (line height) ONLY — width measurement
  * keeps the base style so wrapping is untouched.
  */
-declare function cjkLineHeightStyle(run: TextRun, baseStyle: FontStyle): FontStyle;
+export declare function cjkLineHeightStyle(run: TextRun, baseStyle: FontStyle): FontStyle;
 /** Pick the dominant typography metrics for a run containing complex script. */
-declare function complexScriptLineHeightStyle(run: TextRun, baseStyle: FontStyle): FontStyle;
+export declare function complexScriptLineHeightStyle(run: TextRun, baseStyle: FontStyle): FontStyle;
 /**
  * Calculate typography metrics from font size and spacing settings
  *
@@ -28,7 +28,7 @@ declare function complexScriptLineHeightStyle(run: TextRun, baseStyle: FontStyle
  * @param spacing - Paragraph spacing settings
  * @param metrics - Pre-calculated font metrics (in pixels)
  */
-declare function calculateTypographyMetrics(fontSize: number, spacing?: ParagraphSpacing, metrics?: FontMetrics | null): LineTypography;
+export declare function calculateTypographyMetrics(fontSize: number, spacing?: ParagraphSpacing, metrics?: FontMetrics | null): LineTypography;
 /**
  * Calculate metrics for an empty paragraph.
  *
@@ -38,7 +38,6 @@ declare function calculateTypographyMetrics(fontSize: number, spacing?: Paragrap
  * `auto`/`atLeast` line rules; `exact` means exact (per OOXML §17.3.1.33)
  * and stays untouched.
  */
-declare function calculateEmptyParagraphMetrics(fontSize: number, spacing?: ParagraphSpacing, fontFamily?: string, attrs?: ParagraphAttrs): LineTypography;
-declare function applyDocumentGrid(typography: LineTypography, attrs: ParagraphAttrs | undefined, spacing: ParagraphSpacing | undefined): LineTypography;
-//#endregion
-export { applyDocumentGrid, calculateEmptyParagraphMetrics, calculateTypographyMetrics, cjkLineHeightStyle, complexScriptLineHeightStyle };
+export declare function calculateEmptyParagraphMetrics(fontSize: number, spacing?: ParagraphSpacing, fontFamily?: string, attrs?: ParagraphAttrs): LineTypography;
+export declare function applyDocumentGrid(typography: LineTypography, attrs: ParagraphAttrs | undefined, spacing: ParagraphSpacing | undefined): LineTypography;
+//#endregion

package/dist/layout-engine/measure/lineTypography.js

@@ -97,6 +97,7 @@ const WORD_SINGLE_LINE_FLOOR = 1.15;
 function calculateEmptyParagraphMetrics(fontSize, spacing, fontFamily, attrs) {
 	const result = calculateTypographyMetrics(fontSize, spacing, getFontMetrics({
 		...attrs?.embeddedFontFamilyMap ? { embeddedFontFamilyMap: attrs.embeddedFontFamilyMap } : {},
+		...attrs?.documentFontFacts ? { documentFontFacts: attrs.documentFontFacts } : {},
 		fontSize,
 		fontFamily: fontFamily ?? "Times New Roman",
 		...attrs?.defaultAlternateFontFamily !== void 0 ? { alternateFontFamily: attrs.defaultAlternateFontFamily } : {}

package/dist/layout-engine/measure/listMarkerWidth.d.ts

@@ -1,3 +1,4 @@
+import { FontStyle } from "./measureTypes.js";
 import { ParagraphBlock } from "../types.js";
 //#region src/layout-engine/measure/listMarkerWidth.d.ts
 /**
@@ -5,17 +6,20 @@ import { ParagraphBlock } from "../types.js";
  * 720 twips = 0.5 inch = 48 CSS px at 96 DPI. Folio doesn't currently parse
  * settings.xml; documents that override this fall back to the OOXML default.
  */
-declare const DEFAULT_TAB_STOP_TWIPS = 720;
+export declare const DEFAULT_TAB_STOP_TWIPS = 720;
 /**
  * Marker font resolution per ECMA-376 §17.9: the numbering level's `w:rPr`
  * over the paragraph mark's run properties (`attrs.listMarkerFormatting`,
  * resolved by the bridge), then paragraph and document defaults. The text runs
  * of the paragraph do not format its number.
  */
-declare function resolveListMarkerFont(block: ParagraphBlock): {
+export declare function resolveListMarkerFont(block: ParagraphBlock): {
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
+  documentFontFacts?: NonNullable<FontStyle["documentFontFacts"]>;
   fontFamily: string;
   alternateFontFamily?: string;
+  hAnsiFontFamily?: string;
+  hAnsiAlternateFontFamily?: string;
   fontSize: number;
   bold?: boolean;
   italic?: boolean;
@@ -44,8 +48,7 @@ declare function resolveListMarkerFont(block: ParagraphBlock): {
  * candidates; the closest stop past the marker wins (§17.6.13: the default
  * grid is not erased by custom tabs, just augmented).
  */
-declare function getListMarkerInlineWidth(block: ParagraphBlock): number;
+export declare function getListMarkerInlineWidth(block: ParagraphBlock): number;
 /** Paint-only offset that places the marker around its authored list anchor. */
-declare function getListMarkerVisualOffset(block: ParagraphBlock): number;
-//#endregion
-export { DEFAULT_TAB_STOP_TWIPS, getListMarkerInlineWidth, getListMarkerVisualOffset, resolveListMarkerFont };
+export declare function getListMarkerVisualOffset(block: ParagraphBlock): number;
+//#endregion

package/dist/layout-engine/measure/listMarkerWidth.js

@@ -28,8 +28,11 @@ function resolveListMarkerFont(block) {
 	}
 	const base = {
 		...attrs?.embeddedFontFamilyMap ? { embeddedFontFamilyMap: attrs.embeddedFontFamilyMap } : {},
+		...attrs?.documentFontFacts ? { documentFontFacts: attrs.documentFontFacts } : {},
 		fontFamily,
 		...alternateFontFamily !== void 0 ? { alternateFontFamily } : {},
+		...markerFormatting?.hAnsiFontFamily === void 0 ? {} : { hAnsiFontFamily: markerFormatting.hAnsiFontFamily },
+		...markerFormatting?.hAnsiAlternateFontFamily === void 0 ? {} : { hAnsiAlternateFontFamily: markerFormatting.hAnsiAlternateFontFamily },
 		fontSize: markerFormatting?.fontSize ?? attrs?.defaultFontSize ?? DEFAULT_FONT_SIZE,
 		...markerFormatting?.bold !== void 0 ? { bold: markerFormatting.bold } : {},
 		...markerFormatting?.italic !== void 0 ? { italic: markerFormatting.italic } : {},
@@ -73,7 +76,7 @@ function resolveListMarkerFont(block) {
 */
 function getListMarkerInlineWidth(block) {
 	const attrs = block.attrs;
-	if (!attrs?.listMarker || attrs.listMarkerHidden) return 0;
+	if (attrs?.listMarker == null || attrs.listMarkerHidden) return 0;
 	const style = resolveListMarkerFont(block);
 	const naturalWidth = measureTextWidth(attrs.listMarker, style);
 	const markerEndOffset = getMarkerEndOffset(naturalWidth, attrs.listMarkerAlignment);
@@ -92,9 +95,10 @@ function getListMarkerInlineWidth(block) {
 		return (firstCustomStop !== void 0 && (firstCustomStop < indentLeft || attrs.listNumberingTabIgnoresIndent === true) ? firstCustomStop : indentLeft) - markerStartPx;
 	}
 	const searchStart = hanging > 0 ? Math.max(minBodyStart, indentLeft) : minBodyStart;
-	const firstCustomPast = customTabs.find((px) => px >= searchStart);
+	const emptyMarkerTab = naturalWidth === 0 && markerEndOffset === 0;
+	const firstCustomPast = customTabs.find((px) => emptyMarkerTab ? px > searchStart : px >= searchStart);
 	const defaultTabStopPx = (attrs.defaultTabStopTwips ?? 720) * TWIPS_TO_PX;
-	const firstGridPast = defaultTabStopPx > 0 ? Math.ceil(searchStart / defaultTabStopPx) * defaultTabStopPx : void 0;
+	const firstGridPast = defaultTabStopPx > 0 ? (emptyMarkerTab ? Math.floor(searchStart / defaultTabStopPx) + 1 : Math.ceil(searchStart / defaultTabStopPx)) * defaultTabStopPx : void 0;
 	let bodyStart;
 	if (firstCustomPast !== void 0 && firstGridPast !== void 0) bodyStart = Math.min(firstCustomPast, firstGridPast);
 	else bodyStart = firstCustomPast ?? firstGridPast;

package/dist/layout-engine/measure/measureBlocks.d.ts

@@ -3,11 +3,11 @@ import { SectionStartAdvance } from "../section-breaks.js";
 import { FloatingImageZone } from "./floatingZones.js";
 import "./measureParagraph.js";
 //#region src/layout-engine/measure/measureBlocks.d.ts
-type MeasureBlocksOptions = {
+export type MeasureBlocksOptions = {
   /** Header/footer tabs may be authored in the page margin, beyond body width. */
   allowEndTabOverflow?: boolean;
 };
-declare function measureTableBlock(tableBlock: TableBlock, contentWidth: number, fieldValues?: ReadonlyMap<number, string>): TableMeasure;
+export declare function measureTableBlock(tableBlock: TableBlock, contentWidth: number, fieldValues?: ReadonlyMap<number, string>): TableMeasure;
 type PhysicalBandPageGeometry = {
   pageWidth: number | number[];
   pageHeight: number | number[];
@@ -35,8 +35,8 @@ type BandPageGeometry = {
 /**
  * Measure a block based on its type.
  */
-declare function measureBlock(block: FlowBlock, contentWidth: number, floatingZones?: FloatingImageZone[], cumulativeY?: number, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure;
-declare function measureTextBoxBlock(tb: TextBoxBlock, fieldValues?: ReadonlyMap<number, string>): TextBoxMeasure;
+export declare function measureBlock(block: FlowBlock, contentWidth: number, floatingZones?: FloatingImageZone[], cumulativeY?: number, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure;
+export declare function measureTextBoxBlock(tb: TextBoxBlock, fieldValues?: ReadonlyMap<number, string>): TextBoxMeasure;
 /**
  * Measure all blocks with floating image support.
  *
@@ -44,7 +44,7 @@ declare function measureTextBoxBlock(tb: TextBoxBlock, fieldValues?: ReadonlyMap
  * Then measures each block, passing the zones so paragraphs can calculate
  * per-line widths based on vertical overlap with floating images.
  */
-declare function measureBlocks(blocks: FlowBlock[], contentWidth: number | number[], marginTop?: number | number[], pageGeometry?: BandPageGeometry, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure[];
-declare function measureSingleBlockWithoutFloatingZones(block: FlowBlock, blockWidth: number, blockIndex: number): Measure;
+export declare function measureBlocks(blocks: FlowBlock[], contentWidth: number | number[], marginTop?: number | number[], pageGeometry?: BandPageGeometry, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure[];
+export declare function measureSingleBlockWithoutFloatingZones(block: FlowBlock, blockWidth: number, blockIndex: number): Measure;
 //#endregion
-export { MeasureBlocksOptions, measureBlock, measureBlocks, measureSingleBlockWithoutFloatingZones, measureTableBlock, measureTextBoxBlock };
+export {};

package/dist/layout-engine/measure/measureBlocks.js

@@ -1,6 +1,6 @@
+import { getParagraphFrame, isParagraphFrameTextBox } from "../../utils/paragraphFrame.js";
 import { hasPageBreakBefore } from "../keep-together.js";
 import { recordMeasureBlock, recordMeasureBlockError } from "../layoutInstrumentation.js";
-import { isParagraphFrameTextBox } from "../paragraphFrame.js";
 import { resolveTableSpacing } from "../paragraphSpacing.js";
 import { sectionStartAdvanceOf } from "../section-breaks.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "../textBoxFlow.js";
@@ -511,24 +511,32 @@ function projectFloatingTablePageRect({ rect, contentLeft, contentTop, contentWi
 	const topY = rect.pageTop - contentTop;
 	const bottomY = rect.pageBottom - contentTop;
 	if (rectRight <= 0 || rectLeft >= contentWidth) return {
+		source: "floatingTable",
 		leftMargin: 0,
 		rightMargin: 0,
 		topY,
 		bottomY
 	};
 	if (rectLeft < contentWidth / 2) return {
+		source: "floatingTable",
 		leftMargin: Math.max(0, Math.min(rectRight, contentWidth)),
 		rightMargin: 0,
 		topY,
 		bottomY
 	};
 	return {
+		source: "floatingTable",
 		leftMargin: 0,
 		rightMargin: Math.max(0, Math.min(contentWidth - rectLeft, contentWidth)),
 		topY,
 		bottomY
 	};
 }
+function isUndecoratedParagraphMark(block) {
+	if (block.kind !== "paragraph") return false;
+	const attrs = block.attrs;
+	return block.runs.every((run) => run.kind === "text" && run.text.length === 0) && attrs?.listMarker === void 0 && attrs?.listIsBullet !== true && attrs?.listMarkerHidden !== true && attrs?.numPr === void 0 && attrs?.listMarkerFormatting === void 0 && attrs?.borders === void 0 && attrs?.shading === void 0 && attrs?.pageBreakBefore !== true && attrs?.renderedPageBreakBefore !== true && getParagraphFrame(block) === void 0;
+}
 function activateFloatingTablePageRect(template, anchorPageY) {
 	switch (template.vertical.type) {
 		case "anchorRelative": return {
@@ -595,7 +603,8 @@ function measureTextBoxBlock(tb, fieldValues) {
 	const innerWidth = tb.width - margins.left - margins.right;
 	const innerMeasures = tb.content.map((block) => {
 		if (block.kind === "table") return measureTableBlock(block, innerWidth, fieldValues);
-		return measureParagraph(block, tb.textWrap === "none" ? NO_WRAP_MEASURE_WIDTH : innerWidth, fieldValues ? { fieldValues } : void 0);
+		const measureWidth = tb.textWrap === "none" ? NO_WRAP_MEASURE_WIDTH : innerWidth;
+		return measureParagraph(block, measureWidth, fieldValues ? { fieldValues } : void 0);
 	});
 	let naturalContentWidth = 0;
 	for (let index = 0; index < innerMeasures.length; index++) {
@@ -642,10 +651,7 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 		case "contentZone":
 			floatingZonesWithAnchors.push(extracted.zone);
 			break;
-		case "tablePageRect":
-			tablePageRects.push(extracted.rect);
-			break;
-		default:
+		case "tablePageRect": tablePageRects.push(extracted.rect);
 	}
 	const marginRelative = floatingZonesWithAnchors.filter((z) => z.isMarginRelative && !z.fullWidthBlock);
 	const ownAnchorZones = floatingZonesWithAnchors.filter((z) => !z.isMarginRelative || z.fullWidthBlock);
@@ -725,7 +731,7 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 		}));
 		const zones = activeZones.length > 0 || projectedTableZones.length > 0 ? [...activeZones, ...projectedTableZones] : void 0;
 		try {
-			const measure = measureBlock(block, blockWidth, zones, cumulativeY, fieldValues, options);
+			const measure = measureBlock(block, blockWidth, isUndecoratedParagraphMark(block) ? zones?.filter((zone) => zone.source !== "floatingTable") : zones, cumulativeY, fieldValues, options);
 			const clearingZones = measure.kind === "table" ? zones : zones?.filter((zone) => zone.fullWidthBlock);
 			if (clearingZones?.length && (measure.kind === "image" || measure.kind === "table" && !block.floating)) {
 				const blockHeight = measure.kind === "image" ? measure.height : measure.totalHeight;

package/dist/layout-engine/measure/measureContainer.d.ts

@@ -3,21 +3,20 @@ import { MeasureProvider } from "./measureProvider.js";
 /**
  * Get or create a canvas 2D context for text measurement
  */
-declare function getCanvasContext(): CanvasRenderingContext2D;
+export declare function getCanvasContext(): CanvasRenderingContext2D;
 /**
  * Reset the canvas context (useful for testing)
  */
-declare function resetCanvasContext(): void;
+export declare function resetCanvasContext(): void;
 /**
  * Default provider backed by the canvas measurement functions above.
  */
-declare const canvasMeasureProvider: MeasureProvider;
+export declare const canvasMeasureProvider: MeasureProvider;
 /**
  * Install the canvas backend as the active MeasureProvider. Called once at each
  * composition root (the React editor's layout pipeline and the bun test
  * preload) before any layout runs. Explicit call, not a module side effect, so
  * importing this module never silently swaps the active provider.
  */
-declare const installCanvasMeasureProvider: () => void;
-//#endregion
-export { canvasMeasureProvider, getCanvasContext, installCanvasMeasureProvider, resetCanvasContext };
+export declare const installCanvasMeasureProvider: () => void;
+//#endregion

package/dist/layout-engine/measure/measureContainer.js

@@ -1,5 +1,5 @@
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
-import { SCRIPT_CLASS, hasComplexScript, hasEastAsiaSlotText, scriptClassOf, segmentByScript } from "../../utils/scriptSegments.js";
+import { SCRIPT_CLASS, hasComplexScript, hasDistinctHAnsiFont, hasEastAsiaSlotText, hasHAnsiSlotText, scriptClassOf, segmentByScript } from "../../utils/scriptSegments.js";
 import { getCachedFontMetrics, getCachedTextWidth, setCachedFontMetrics, setCachedTextWidth } from "./cache.js";
 import { applyComplexScriptFormatting, hasComplexScriptFormatting } from "./complexScriptFormatting.js";
 import { buildFontString, getResolvedData, ptToPx } from "./measureHelpers.js";
@@ -164,7 +164,10 @@ function canvasMeasureTextWidth(text, sourceStyle) {
 * takes the single-font path (no double-counting, no recursion).
 */
 function glyphAdvanceStyle(style) {
-	const result = { ...style.embeddedFontFamilyMap ? { embeddedFontFamilyMap: style.embeddedFontFamilyMap } : {} };
+	const result = {
+		...style.embeddedFontFamilyMap ? { embeddedFontFamilyMap: style.embeddedFontFamilyMap } : {},
+		...style.documentFontFacts ? { documentFontFacts: style.documentFontFacts } : {}
+	};
 	if (style.fontFamily !== void 0) result.fontFamily = style.fontFamily;
 	if (style.alternateFontFamily !== void 0) result.alternateFontFamily = style.alternateFontFamily;
 	if (style.fontSize !== void 0) result.fontSize = style.fontSize;
@@ -187,6 +190,7 @@ function glyphAdvanceStyle(style) {
 */
 function needsPerScriptFonts(style, measuredText) {
 	if (style.eastAsiaFontFamily && hasEastAsiaSlotText(measuredText, style.eastAsiaHint)) return true;
+	if (hasDistinctHAnsiFont(style) && hasHAnsiSlotText(measuredText, { eastAsiaHint: style.eastAsiaHint })) return true;
 	return hasComplexScriptFormatting(style) && hasComplexScript(measuredText);
 }
 /** Resolve the independent font/style slot selected by a script segment. */
@@ -201,6 +205,16 @@ function scriptStyle(style, script) {
 		if (style.eastAsiaAlternateFontFamily !== void 0) result.alternateFontFamily = style.eastAsiaAlternateFontFamily;
 		return result;
 	}
+	if (script === SCRIPT_CLASS.hAnsi) {
+		if (style.hAnsiFontFamily === void 0) return style;
+		const result = {
+			...style,
+			fontFamily: style.hAnsiFontFamily
+		};
+		delete result.alternateFontFamily;
+		if (style.hAnsiAlternateFontFamily !== void 0) result.alternateFontFamily = style.hAnsiAlternateFontFamily;
+		return result;
+	}
 	if (script === SCRIPT_CLASS.complex) return applyComplexScriptFormatting(style, style);
 	return style;
 }
@@ -208,7 +222,10 @@ function measureMixedScriptWidth(measuredText, style) {
 	const letterSpacing = style.letterSpacing ?? 0;
 	const horizontalScale = getHorizontalScaleFactor(style.horizontalScale);
 	let glyphWidth = 0;
-	for (const segment of segmentByScript(measuredText, style.eastAsiaHint)) glyphWidth += canvasMeasureTextWidth(segment.text, glyphAdvanceStyle(scriptStyle(style, segment.script)));
+	for (const segment of segmentByScript(measuredText, {
+		eastAsiaHint: style.eastAsiaHint,
+		hasHAnsiFont: hasDistinctHAnsiFont(style)
+	})) glyphWidth += canvasMeasureTextWidth(segment.text, glyphAdvanceStyle(scriptStyle(style, segment.script)));
 	let width = glyphWidth;
 	if (letterSpacing) {
 		const codePoints = countCodePoints(measuredText);
@@ -286,6 +303,7 @@ function canvasMeasureRun(text, sourceStyle) {
 		...style.eastAsiaAlternateFontFamily !== void 0 ? { alternateFontFamily: style.eastAsiaAlternateFontFamily } : {}
 	}) : void 0;
 	const complexScriptFont = hasComplexScriptFormatting(style) && !style.letterSpacing ? buildFontString(scriptStyle(style, SCRIPT_CLASS.complex)) : void 0;
+	const hAnsiFont = hasDistinctHAnsiFont(style) && !style.forceComplexScript && !style.letterSpacing ? buildFontString(scriptStyle(style, SCRIPT_CLASS.hAnsi)) : void 0;
 	const smallCapsFont = style.fontVariant === "small-caps" ? buildFontString({
 		...style,
 		fontSize: (style.fontSize ?? 11) * SMALL_CAPS_SCALE
@@ -302,9 +320,12 @@ function canvasMeasureRun(text, sourceStyle) {
 		const isSmallCap = smallCapsAt?.[codePointIndex] ?? false;
 		const measured = isSmallCap ? char.toLocaleUpperCase() : applyTextTransform(char, style);
 		if (isSmallCap && smallCapsFont !== void 0) ctx.font = smallCapsFont;
-		else if (eastAsiaFont !== void 0 || complexScriptFont !== void 0) {
-			const script = scriptClassOf(cp, style.eastAsiaHint);
-			ctx.font = (script === SCRIPT_CLASS.eastAsia ? eastAsiaFont : void 0) ?? (script === SCRIPT_CLASS.complex ? complexScriptFont : void 0) ?? baseFont;
+		else if (eastAsiaFont !== void 0 || complexScriptFont !== void 0 || hAnsiFont !== void 0) {
+			const script = scriptClassOf(cp, {
+				eastAsiaHint: style.eastAsiaHint,
+				hasHAnsiFont: hasDistinctHAnsiFont(style) && !style.forceComplexScript
+			});
+			ctx.font = (script === SCRIPT_CLASS.eastAsia ? eastAsiaFont : void 0) ?? (script === SCRIPT_CLASS.hAnsi ? hAnsiFont : void 0) ?? (script === SCRIPT_CLASS.complex ? complexScriptFont : void 0) ?? baseFont;
 		} else if (smallCapsFont !== void 0) ctx.font = baseFont;
 		let charWidth = ctx.measureText(measured).width;
 		if (letterSpacing && offset + char.length < text.length) charWidth += letterSpacing;

package/dist/layout-engine/measure/measureHelpers.d.ts

@@ -1,7 +1,7 @@
-import { RunFormatting } from "../types.js";
 import { FontStyle } from "./measureTypes.js";
+import { RunFormatting } from "../types.js";
 //#region src/layout-engine/measure/measureHelpers.d.ts
-declare const DEFAULT_FONT_SIZE = 11;
+export declare const DEFAULT_FONT_SIZE = 11;
 /**
  * The face for text whose run properties name no font anywhere in the cascade:
  * no `w:rFonts` family or theme reference in the run, its styles or
@@ -9,13 +9,13 @@ declare const DEFAULT_FONT_SIZE = 11;
  * default is Times New Roman. A document that names a font at any level never
  * reaches it.
  */
-declare const DEFAULT_FONT_FAMILY = "Times New Roman";
+export declare const DEFAULT_FONT_FAMILY = "Times New Roman";
 /**
  * Point size of `w:vertAlign="superscript"`/`"subscript"` text: two thirds
  * of the run's size, truncated to whole half-points (the `w:sz` unit) and
  * never below one half-point.
  */
-declare function docxScriptFontSize(fontSize: number): number;
+export declare function docxScriptFontSize(fontSize: number): number;
 /**
  * Build a measurement `FontStyle` from a run's formatting. Single source of
  * truth for run → FontStyle so every measurement path (layout line-breaking,
@@ -24,7 +24,9 @@ declare function docxScriptFontSize(fontSize: number): number;
  * offsets to match what was wrapped and painted. Callers pass their own family
  * and size fallbacks for runs that declare neither.
  */
-declare function buildRunFontStyle(run: RunFormatting, fallbackFontFamily: string, fallbackFontSize: number): FontStyle;
+export declare function buildRunFontStyle(run: RunFormatting & {
+  templatePreview?: "highlighted" | "plain";
+}, fallbackFontFamily: string, fallbackFontSize: number): FontStyle;
 /** Cached resolved font data (CSS fallback + single-line ratio) */
 type ResolvedFontCache = {
   cssFallback: string;
@@ -36,15 +38,16 @@ type ResolvedFontCache = {
 type ResolvedDataOptions = {
   alternateFontFamily?: string | undefined;
   embeddedFontFamilyMap?: ReadonlyMap<string, string> | undefined;
+  documentFontFacts?: FontStyle["documentFontFacts"];
 };
-declare function getResolvedData(fontFamily: string, options?: ResolvedDataOptions): ResolvedFontCache;
+export declare function getResolvedData(fontFamily: string, options?: ResolvedDataOptions): ResolvedFontCache;
 /**
  * Whether a face of `family` (a `FontFace.family`, possibly quoted) can change
  * a width this page has measured.
  */
-declare function isLayoutFontFamily(family: string): boolean;
+export declare function isLayoutFontFamily(family: string): boolean;
 /** Clear cached resolution after a browser font-set or font-policy change. */
-declare function clearFontResolvedCache(): void;
+export declare function clearFontResolvedCache(): void;
 /**
  * Build a CSS font string from styling properties
  *
@@ -59,7 +62,7 @@ declare function clearFontResolvedCache(): void;
  * buildFontString({ fontFamily: "Arial", fontSize: 12, bold: true })
  * // Returns: "700 16px Arial, Arimo, Helvetica, sans-serif" (12pt = 16px)
  */
-declare function buildFontString(style: FontStyle): string;
+export declare function buildFontString(style: FontStyle): string;
 /**
  * Find the character offset at a given X position within a text run
  *
@@ -67,7 +70,7 @@ declare function buildFontString(style: FontStyle): string;
  * @param charWidths - Per-character widths from measureRun
  * @returns Character offset (0-based index)
  */
-declare function findCharacterAtX(x: number, charWidths: number[]): number;
+export declare function findCharacterAtX(x: number, charWidths: number[]): number;
 /**
  * Get the X position of a character offset within a text run
  *
@@ -75,31 +78,31 @@ declare function findCharacterAtX(x: number, charWidths: number[]): number;
  * @param charWidths - Per-character widths from measureRun
  * @returns X position in pixels
  */
-declare function getXForCharacter(offset: number, charWidths: number[]): number;
+export declare function getXForCharacter(offset: number, charWidths: number[]): number;
 /**
  * Convert twips to pixels
  */
-declare function twipsToPx(twips: number): number;
+export declare function twipsToPx(twips: number): number;
 /**
  * Convert pixels to twips
  */
-declare function pxToTwips(px: number): number;
+export declare function pxToTwips(px: number): number;
 /**
  * Convert points to pixels
  */
-declare function ptToPx(pt: number): number;
+export declare function ptToPx(pt: number): number;
 /**
  * Convert pixels to points
  */
-declare function pxToPt(px: number): number;
+export declare function pxToPt(px: number): number;
 /**
  * Convert OOXML half-points to pixels
  * OOXML font sizes are in half-points (24 = 12pt)
  */
-declare function halfPtToPx(halfPt: number): number;
+export declare function halfPtToPx(halfPt: number): number;
 /**
  * Convert pixels to OOXML half-points
  */
-declare function pxToHalfPt(px: number): number;
+export declare function pxToHalfPt(px: number): number;
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, docxScriptFontSize, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, isLayoutFontFamily, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export {};

package/dist/layout-engine/measure/measureHelpers.js

@@ -1,3 +1,4 @@
+import { documentFontFactsCacheIdentity } from "../../fonts/documentFontFacts.js";
 import { parseFontFamilyList, resolveFontFamily } from "../../utils/fontResolver.js";
 import "../../utils/fontWeights.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
@@ -59,8 +60,15 @@ function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
 	const horizontalScale = normalizeHorizontalScalePercent(run.horizontalScale);
 	return {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
+		...run.automaticTextSpacing === void 0 || run.rtl || run.bidiWrapper !== void 0 || run.hidden || run.superscript || run.subscript || (run.positionPx ?? 0) !== 0 || run.footnoteRefId !== void 0 || run.endnoteRefId !== void 0 || run.templatePreview !== void 0 ? {} : { automaticTextSpacing: {
+			...run.automaticTextSpacing,
+			reverseFontFamily: run.fontFamily ?? null
+		} },
 		...run.embeddedFontFamilyMap ? { embeddedFontFamilyMap: run.embeddedFontFamilyMap } : {},
+		...run.documentFontFacts ? { documentFontFacts: run.documentFontFacts } : {},
 		...run.alternateFontFamily !== void 0 ? { alternateFontFamily: run.alternateFontFamily } : {},
+		...run.hAnsiFontFamily !== void 0 ? { hAnsiFontFamily: run.hAnsiFontFamily } : {},
+		...run.hAnsiAlternateFontFamily !== void 0 ? { hAnsiAlternateFontFamily: run.hAnsiAlternateFontFamily } : {},
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
 		...run.eastAsiaAlternateFontFamily !== void 0 ? { eastAsiaAlternateFontFamily: run.eastAsiaAlternateFontFamily } : {},
 		...eastAsiaHintApplies(run) ? { eastAsiaHint: true } : {},
@@ -83,19 +91,20 @@ function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
 const fontResolvedCache = /* @__PURE__ */ new Map();
 let embeddedFontResolvedCaches = /* @__PURE__ */ new WeakMap();
 function getResolvedData(fontFamily, options = {}) {
-	const { alternateFontFamily, embeddedFontFamilyMap } = options;
+	const { alternateFontFamily, embeddedFontFamilyMap, documentFontFacts } = options;
 	let cache = fontResolvedCache;
 	if (embeddedFontFamilyMap) {
 		const owned = embeddedFontResolvedCaches.get(embeddedFontFamilyMap);
 		cache = owned ?? /* @__PURE__ */ new Map();
 		if (!owned) embeddedFontResolvedCaches.set(embeddedFontFamilyMap, cache);
 	}
-	const cacheKey = `${fontFamily}\u0000${alternateFontFamily ?? ""}`;
+	const cacheKey = `${fontFamily}\u0000${alternateFontFamily ?? ""}\u0000${documentFontFactsCacheIdentity(documentFontFacts) ?? ""}`;
 	let cached = cache.get(cacheKey);
 	if (cached === void 0) {
 		const resolved = resolveFontFamily(fontFamily, {
 			alternateFontName: alternateFontFamily,
-			embeddedFontFamilyMap
+			embeddedFontFamilyMap,
+			documentFontFacts
 		});
 		cached = {
 			cssFallback: resolved.cssFallback,

package/dist/layout-engine/measure/measureParagraph.d.ts

@@ -6,7 +6,7 @@ import { MIN_WRAP_SEGMENT_WIDTH, findClearLineY } from "./floatingLineClearance.
 /**
  * Options for paragraph measurement
  */
-type MeasureParagraphOptions = {
+export type MeasureParagraphOptions = {
   /** Floating image exclusion zones that affect line widths */
   floatingZones?: FloatingImageZone[];
   /** Y offset of this paragraph relative to the exclusion zones (default: 0) */
@@ -25,7 +25,7 @@ type MeasureParagraphOptions = {
  * @param options - Optional measurement options (floating zones, Y offset)
  * @returns ParagraphMeasure with lines and total height
  */
-declare function measureParagraph(block: ParagraphBlock, maxWidth: number, options?: MeasureParagraphOptions): ParagraphMeasure;
+export declare function measureParagraph(block: ParagraphBlock, maxWidth: number, options?: MeasureParagraphOptions): ParagraphMeasure;
 /**
  * Measure multiple paragraph blocks
  *
@@ -33,13 +33,13 @@ declare function measureParagraph(block: ParagraphBlock, maxWidth: number, optio
  * @param maxWidth - Maximum available width
  * @returns Array of ParagraphMeasure results
  */
-declare function measureParagraphs(blocks: ParagraphBlock[], maxWidth: number): ParagraphMeasure[];
+export declare function measureParagraphs(blocks: ParagraphBlock[], maxWidth: number): ParagraphMeasure[];
 /**
  * Get per-character widths for a text run (for click positioning)
  *
  * @param run - The text run to measure
  * @returns Array of character widths
  */
-declare function getRunCharWidths(run: TextRun): number[];
+export declare function getRunCharWidths(run: TextRun): number[];
 //#endregion
-export { type FloatingImageZone, MIN_WRAP_SEGMENT_WIDTH, MeasureParagraphOptions, clampFloatingWrapMargins, findClearLineY, getRunCharWidths, measureParagraph, measureParagraphs };
+export { type FloatingImageZone, MIN_WRAP_SEGMENT_WIDTH, clampFloatingWrapMargins, findClearLineY };