@stll/folio-core 0.22.3 → 0.23.1

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

@@ -470,6 +470,12 @@ function serializeRunFmt(run) {
 		"highlightColor",
 		"fontSize",
 		"fontFamily",
+		"eastAsiaFontFamily",
+		"complexScriptFontFamily",
+		"complexScriptFontSize",
+		"complexScriptBold",
+		"complexScriptItalic",
+		"forceComplexScript",
 		"verticalAlign",
 		"letterSpacing",
 		"smallCaps",

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

@@ -1,15 +1,15 @@
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
-import { padDecimal } from "../../docx/numberingParser.js";
+import { formatOoxmlCounter } from "../../docx/ooxmlCounterFormatter.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
 import { DEFAULT_TEXTBOX_MARGINS } from "../../layout-engine/types.js";
+import { getPageNumbering } from "../../paged-layout/sectionGeometry.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSymbolAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
-import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
+import { directionToBidi } from "../../prosemirror/paragraphDirection.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
-import { NUMBER_FORMAT_VALUES } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
@@ -75,51 +75,8 @@ function formatNumberedMarker(counters, level) {
 	if (parts.length === 0) return "1.";
 	return `${parts.join(".")}.`;
 }
-const ROMAN_PAIRS = [
-	[1e3, "M"],
-	[900, "CM"],
-	[500, "D"],
-	[400, "CD"],
-	[100, "C"],
-	[90, "XC"],
-	[50, "L"],
-	[40, "XL"],
-	[10, "X"],
-	[9, "IX"],
-	[5, "V"],
-	[4, "IV"],
-	[1, "I"]
-];
-function toRoman(value, upper) {
-	if (value <= 0) return "";
-	let remaining = value;
-	let output = "";
-	for (const [number, symbol] of ROMAN_PAIRS) while (remaining >= number) {
-		output += symbol;
-		remaining -= number;
-	}
-	return upper ? output : output.toLowerCase();
-}
-function toLetter(value, upper) {
-	if (value <= 0) return "";
-	const zeroBased = value - 1;
-	const baseCodePoint = upper ? 65 : 97;
-	return String.fromCodePoint(baseCodePoint + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
-}
 function formatCounter(value, format) {
-	if (!Number.isFinite(value)) return "";
-	switch (format) {
-		case "upperRoman": return toRoman(value, true);
-		case "lowerRoman": return toRoman(value, false);
-		case "upperLetter": return toLetter(value, true);
-		case "lowerLetter": return toLetter(value, false);
-		case "decimalZero": return padDecimal(value, 2);
-		case "decimalZero3": return padDecimal(value, 3);
-		case "decimalZero4": return padDecimal(value, 4);
-		case "decimalZero5": return padDecimal(value, 5);
-		case "none": return "";
-		default: return String(value);
-	}
+	return formatOoxmlCounter(value, format);
 }
 function resolveListTemplate(template, counters, levelFormats, forceDecimal = false) {
 	return template.replace(/%(?<digit>\d)(?<punct>[.):\]])?/gu, (...args) => {
@@ -364,7 +321,7 @@ const resolveWesternThemeFont = (fontFamily, theme) => {
 	return (themeRef ? resolveThemeFont(themeRef, theme?.fontScheme) : null) ?? fontFamily.ascii ?? fontFamily.hAnsi ?? void 0;
 };
 const resolveComplexScriptThemeFont = (fontFamily, theme) => {
-	return (fontFamily.cstheme ? resolveThemeFont(fontFamily.cstheme, theme?.fontScheme) : null) ?? fontFamily.cs ?? void 0;
+	return (fontFamily.csTheme ? resolveThemeFont(fontFamily.csTheme, theme?.fontScheme) : null) ?? fontFamily.cs ?? void 0;
 };
 const resolveEastAsiaThemeFont = (fontFamily, theme) => {
 	return (fontFamily.eastAsiaTheme ? resolveThemeFont(fontFamily.eastAsiaTheme, theme?.fontScheme) : null) ?? fontFamily.eastAsia ?? void 0;
@@ -400,6 +357,10 @@ function applyRunFormattingOverrides(formatting, attrs) {
 	if (attrs.shadow === false) formatting.textShadow = false;
 	if (attrs.outline === false) formatting.textOutline = false;
 	if (attrs.rtl === false) formatting.rtl = false;
+	if (attrs.boldCs !== void 0) formatting.complexScriptBold = attrs.boldCs;
+	if (attrs.italicCs !== void 0) formatting.complexScriptItalic = attrs.italicCs;
+	if (attrs.fontSizeCs !== void 0) formatting.complexScriptFontSize = attrs.fontSizeCs / 2;
+	if (attrs.cs !== void 0) formatting.forceComplexScript = attrs.cs;
 }
 function paragraphRunDefaults(pmAttrs, theme) {
 	const defaultTextFormatting = pmAttrs.defaultTextFormatting;
@@ -413,8 +374,12 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (complexScriptFontFamily) result.complexScriptFontFamily = complexScriptFontFamily;
 	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;
 	if (defaultTextFormatting.bold !== void 0) result.bold = defaultTextFormatting.bold;
+	if (defaultTextFormatting.boldCs !== void 0) result.complexScriptBold = defaultTextFormatting.boldCs;
 	if (defaultTextFormatting.italic !== void 0) result.italic = defaultTextFormatting.italic;
+	if (defaultTextFormatting.italicCs !== void 0) result.complexScriptItalic = defaultTextFormatting.italicCs;
+	if (defaultTextFormatting.cs !== void 0) result.forceComplexScript = defaultTextFormatting.cs;
 	if (defaultTextFormatting.underline && defaultTextFormatting.underline.style !== "none") {
 		result.underline = { style: defaultTextFormatting.underline.style };
 		if (defaultTextFormatting.underline.color) result.underline.color = resolveColor(defaultTextFormatting.underline.color, theme);
@@ -650,78 +615,54 @@ function toListMarkerRevision(kind, info) {
 }
 function isAddedNumberingChange(change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && previousFormatting["numPr"] == null;
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && previousFormatting.numPr == null;
 }
 function isRemovedNumberingChange(change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting["numPr"]);
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting.numPr);
 }
 function isChangedNumberingChange(currentNumPr, change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting["numPr"]) && !areListNumPrEqual(previousFormatting["numPr"], currentNumPr);
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting.numPr) && !areListNumPrEqual(previousFormatting.numPr, currentNumPr);
 }
 function areListNumPrEqual(left, right) {
 	return left.numId === right.numId && left.ilvl === right.ilvl;
 }
-function isRecord(value) {
-	return typeof value === "object" && value !== null;
-}
 function isListNumPr(value) {
-	if (!isRecord(value)) return false;
-	const numId = value["numId"];
-	const ilvl = value["ilvl"];
-	return (numId === void 0 || typeof numId === "number") && (ilvl === void 0 || typeof ilvl === "number");
-}
-function isNumberFormat(value) {
-	return NUMBER_FORMAT_VALUES.some((format) => format === value);
-}
-function readNumberFormats(value) {
-	if (!Array.isArray(value)) return;
-	const formats = [];
-	for (const item of value) {
-		if (!isNumberFormat(item)) return;
-		formats.push(item);
-	}
-	return formats;
-}
-function readListMarkerSuffix(value) {
-	if (value === "tab" || value === "space" || value === "nothing") return value;
-}
-function readListMarkerAlignment(value) {
-	if (value === "left" || value === "center" || value === "right") return value;
+	return value !== void 0 && value !== null;
 }
 function toPreviousListAttrs(previousFormatting) {
 	const attrs = {};
-	const numPr = previousFormatting["numPr"];
+	const numPr = previousFormatting.numPr;
 	if (isListNumPr(numPr)) attrs.numPr = numPr;
-	const listIsBullet = previousFormatting["listIsBullet"];
-	if (typeof listIsBullet === "boolean") attrs.listIsBullet = listIsBullet;
-	const listIsLegal = previousFormatting["listIsLegal"];
-	if (typeof listIsLegal === "boolean") attrs.listIsLegal = listIsLegal;
-	const listMarker = previousFormatting["listMarker"];
-	if (typeof listMarker === "string") attrs.listMarker = listMarker;
-	const listNumFmt = previousFormatting["listNumFmt"];
-	if (isNumberFormat(listNumFmt)) attrs.listNumFmt = listNumFmt;
-	const listLevelNumFmts = readNumberFormats(previousFormatting["listLevelNumFmts"]);
-	if (listLevelNumFmts) attrs.listLevelNumFmts = listLevelNumFmts;
-	const listLevelStarts = previousFormatting["listLevelStarts"];
-	if (Array.isArray(listLevelStarts) && listLevelStarts.every((value) => typeof value === "number")) attrs.listLevelStarts = listLevelStarts;
-	const listAbstractNumId = previousFormatting["listAbstractNumId"];
-	if (typeof listAbstractNumId === "number") attrs.listAbstractNumId = listAbstractNumId;
-	const listStartOverride = previousFormatting["listStartOverride"];
-	if (typeof listStartOverride === "number") attrs.listStartOverride = listStartOverride;
-	const listMarkerHidden = previousFormatting["listMarkerHidden"];
-	if (typeof listMarkerHidden === "boolean") attrs.listMarkerHidden = listMarkerHidden;
-	const listMarkerFontFamily = previousFormatting["listMarkerFontFamily"];
-	if (typeof listMarkerFontFamily === "string") attrs.listMarkerFontFamily = listMarkerFontFamily;
-	const listMarkerFontSize = previousFormatting["listMarkerFontSize"];
-	if (typeof listMarkerFontSize === "number") attrs.listMarkerFontSize = listMarkerFontSize;
-	const listMarkerBold = previousFormatting["listMarkerBold"];
-	if (typeof listMarkerBold === "boolean") attrs.listMarkerBold = listMarkerBold;
-	const listMarkerAlignment = readListMarkerAlignment(previousFormatting["listMarkerAlignment"]);
-	if (listMarkerAlignment) attrs.listMarkerAlignment = listMarkerAlignment;
-	const listMarkerSuffix = readListMarkerSuffix(previousFormatting["listMarkerSuffix"]);
-	if (listMarkerSuffix) attrs.listMarkerSuffix = listMarkerSuffix;
+	const listIsBullet = previousFormatting.listIsBullet;
+	if (listIsBullet !== void 0) attrs.listIsBullet = listIsBullet;
+	const listIsLegal = previousFormatting.listIsLegal;
+	if (listIsLegal !== void 0) attrs.listIsLegal = listIsLegal;
+	const listMarker = previousFormatting.listMarker;
+	if (listMarker !== void 0) attrs.listMarker = listMarker;
+	const listNumFmt = previousFormatting.listNumFmt;
+	if (listNumFmt !== void 0) attrs.listNumFmt = listNumFmt;
+	const listLevelNumFmts = previousFormatting.listLevelNumFmts;
+	if (listLevelNumFmts !== void 0) attrs.listLevelNumFmts = listLevelNumFmts;
+	const listLevelStarts = previousFormatting.listLevelStarts;
+	if (listLevelStarts !== void 0) attrs.listLevelStarts = listLevelStarts;
+	const listAbstractNumId = previousFormatting.listAbstractNumId;
+	if (listAbstractNumId !== void 0) attrs.listAbstractNumId = listAbstractNumId;
+	const listStartOverride = previousFormatting.listStartOverride;
+	if (listStartOverride !== void 0) attrs.listStartOverride = listStartOverride;
+	const listMarkerHidden = previousFormatting.listMarkerHidden;
+	if (listMarkerHidden !== void 0) attrs.listMarkerHidden = listMarkerHidden;
+	const listMarkerFontFamily = previousFormatting.listMarkerFontFamily;
+	if (listMarkerFontFamily !== void 0) attrs.listMarkerFontFamily = listMarkerFontFamily;
+	const listMarkerFontSize = previousFormatting.listMarkerFontSize;
+	if (listMarkerFontSize !== void 0) attrs.listMarkerFontSize = listMarkerFontSize;
+	const listMarkerBold = previousFormatting.listMarkerBold;
+	if (listMarkerBold !== void 0) attrs.listMarkerBold = listMarkerBold;
+	const listMarkerAlignment = previousFormatting.listMarkerAlignment;
+	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
+	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
+	if (listMarkerSuffix !== void 0) attrs.listMarkerSuffix = listMarkerSuffix;
 	return attrs;
 }
 function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds) {
@@ -846,10 +787,10 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	if (pmAttrs.widowControl === false) attrs.widowControl = false;
 	if (pmAttrs.contextualSpacing) attrs.contextualSpacing = true;
 	if (pmAttrs.runInWithNext) attrs.runInWithNext = true;
-	if (directionIsRtl(pmAttrs.direction)) attrs.bidi = true;
+	const bidi = directionToBidi(pmAttrs.direction);
+	if (bidi !== void 0) attrs.bidi = bidi;
 	if (pmAttrs.styleId) attrs.styleId = pmAttrs.styleId;
-	const pPrChange = pmAttrs._propertyChanges;
-	const propertyChanges = Array.isArray(pPrChange) ? pPrChange : [];
+	const propertyChanges = pmAttrs._propertyChanges ?? [];
 	let changedNumberingChange;
 	if (pmAttrs.numPr) {
 		const numPr = {};
@@ -1213,7 +1154,7 @@ function convertTable(node, startPos, options) {
 	if (justification) tableBlock.justification = justification;
 	if (indentPx !== void 0) tableBlock.indent = indentPx;
 	if (floatingPx) tableBlock.floating = floatingPx;
-	if (originalFormatting?.bidi) tableBlock.bidi = true;
+	if (attrs._resolvedBidi ?? originalFormatting?.bidi) tableBlock.bidi = true;
 	return tableBlock;
 }
 /**
@@ -1488,6 +1429,7 @@ function toFlowBlocks(doc, options = {}) {
 					const breakType = secProps?.sectionStart ?? pmAttrs.sectionBreakType;
 					if (breakType) sectionBreak.type = breakType;
 					if (secProps) {
+						sectionBreak.pageNumbering = getPageNumbering(secProps);
 						const documentGridLinePitchTwips = resolveDocumentGridLinePitch(secProps.docGrid);
 						if (documentGridLinePitchTwips !== void 0) sectionBreak.documentGridLinePitchTwips = documentGridLinePitchTwips;
 						if (secProps.pageWidth || secProps.pageHeight) sectionBreak.pageSize = {

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

@@ -1,4 +1,4 @@
-import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, tableColumnsArePinned } from "./types.js";
+import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, tableColumnsArePinned } from "./types.js";
 import { PageState, Paginator, PaginatorOptions, createPaginator } from "./paginator.js";
 import { KeepNextChain, calculateChainHeight, computeKeepNextChains, getMidChainIndices, hasKeepLines, hasPageBreakBefore } from "./keep-together.js";
 import { resolveSectionHeaderFooterRefs } from "./headerFooterRefs.js";
@@ -11,6 +11,7 @@ type SectionLayoutConfig = {
     h: number;
   };
   margins: PageMargins;
+  pageNumbering: SectionPageNumbering;
   columns?: ColumnLayout;
 };
 declare function collectSectionConfigs(blocks: FlowBlock[], initialConfig: SectionLayoutConfig, finalConfig: SectionLayoutConfig): {
@@ -43,4 +44,4 @@ declare function layoutDocument(blocks: FlowBlock[], measures: Measure[], option
  */
 declare function getHeaderRowsHeight(measure: TableMeasure, headerRowCount: number): number;
 //#endregion
-export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, scheduleSectionBreak, tableColumnsArePinned };
+export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, SectionPageNumbering, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, scheduleSectionBreak, tableColumnsArePinned };

package/dist/layout-engine/index.js

@@ -5,7 +5,7 @@ import { measuredLineAdvance } from "./lineFlow.js";
 import { resolveFloatingTableX } from "./measure/floatingTablePosition.js";
 import { createPaginator } from "./paginator.js";
 import { getParagraphFragmentPmRange } from "./paragraphFragmentRange.js";
-import { collapseParagraphSpacing, getParagraphSpacingAfter, getParagraphSpacingBefore, paragraphsShareStyle, resolveEffectiveParagraphSpacingTree } from "./paragraphSpacing.js";
+import { collapseParagraphSpacing, getParagraphSpacingAfter, getParagraphSpacingBefore, isEmptyParagraph, paragraphsShareStyle, resolveEffectiveParagraphSpacingTree } from "./paragraphSpacing.js";
 import { assertExhaustiveFlowBlock, findPageIndexContainingPmPos } from "./pmPageIndex.js";
 import { INITIAL_RENDERED_BREAK_STATE, reconcileAfterBlock, reconcileBreakBeforeBlock, recordReflowBoundary } from "./renderedBreakReconciliation.js";
 import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, scheduleSectionBreak } from "./section-breaks.js";
@@ -25,6 +25,7 @@ const DEFAULT_COLUMNS = {
 	gap: 0
 };
 const DEFAULT_SECTION_BREAK_TYPE = "nextPage";
+const CONTINUE_PAGE_NUMBERING = { type: "continue" };
 function collectSectionConfigs(blocks, initialConfig, finalConfig) {
 	const configs = [];
 	const breakIndices = [];
@@ -35,7 +36,8 @@ function collectSectionConfigs(blocks, initialConfig, finalConfig) {
 		const sectionBreak = block;
 		const config = {
 			pageSize: sectionBreak.pageSize ?? previousConfig.pageSize,
-			margins: sectionBreak.margins ?? previousConfig.margins
+			margins: sectionBreak.margins ?? previousConfig.margins,
+			pageNumbering: sectionBreak.pageNumbering ?? CONTINUE_PAGE_NUMBERING
 		};
 		if (sectionBreak.columns !== void 0) config.columns = sectionBreak.columns;
 		configs.push(config);
@@ -160,12 +162,14 @@ function layoutDocument(blocks, measures, options) {
 	if (pageSize.w - margins.left - margins.right <= 0) panic("layoutDocument: page size and margins yield no content area");
 	const bodyConfig = {
 		pageSize,
-		margins
+		margins,
+		pageNumbering: options.pageNumbering ?? CONTINUE_PAGE_NUMBERING
 	};
 	if (options.columns !== void 0) bodyConfig.columns = options.columns;
 	const finalConfig = {
 		pageSize: finalPageSize,
-		margins: finalMargins
+		margins: finalMargins,
+		pageNumbering: options.finalPageNumbering ?? bodyConfig.pageNumbering
 	};
 	const finalColumns = options.finalColumns ?? options.columns;
 	if (finalColumns !== void 0) finalConfig.columns = finalColumns;
@@ -179,6 +183,7 @@ function layoutDocument(blocks, measures, options) {
 		...options.firstPageMargins !== void 0 ? { firstPageMargins: options.firstPageMargins } : {},
 		...options.sectionEvenPageMargins !== void 0 ? { sectionEvenPageMargins: options.sectionEvenPageMargins } : {},
 		columns: initialConfig.columns ?? DEFAULT_COLUMNS,
+		pageNumbering: initialConfig.pageNumbering,
 		...options.footnoteReservedHeights !== void 0 ? { footnoteReservedHeights: options.footnoteReservedHeights } : {},
 		...options.sectionHeaderFooterRefs !== void 0 ? { sectionHeaderFooterRefs: options.sectionHeaderFooterRefs } : {}
 	});
@@ -474,10 +479,27 @@ function getHeaderRowsHeight(measure, headerRowCount) {
 	for (let i = 0; i < headerRowCount && i < measure.rows.length; i++) height += measure.rows[i].height;
 	return height;
 }
-const tableRowStartsWithRenderedPageBreak = (block, rowIndex) => block.rows[rowIndex]?.cells.some((cell) => {
-	const firstBlock = cell.blocks.at(0);
-	return firstBlock?.kind === "paragraph" && firstBlock.attrs?.renderedPageBreakBefore === true;
-}) ?? false;
+const tableRowStartsWithRenderedPageBreak = (block, rowIndex) => {
+	const visibleCells = block.rows[rowIndex]?.cells.filter((cell) => cell.blocks.some((cellBlock) => cellBlock.kind !== "paragraph" || !isEmptyParagraph(cellBlock)));
+	if (!visibleCells || visibleCells.length === 0) return false;
+	return visibleCells.every((cell) => {
+		const firstVisibleBlock = cell.blocks.find((cellBlock) => cellBlock.kind !== "paragraph" || !isEmptyParagraph(cellBlock));
+		return firstVisibleBlock?.kind === "paragraph" && firstVisibleBlock.attrs?.renderedPageBreakBefore === true;
+	});
+};
+const getVerticallyMergedRows = (block) => {
+	const mergedRows = /* @__PURE__ */ new Set();
+	for (let rowIndex = 0; rowIndex < block.rows.length; rowIndex += 1) {
+		const row = block.rows[rowIndex];
+		if (!row) continue;
+		for (const cell of row.cells) {
+			const rowSpan = cell.rowSpan ?? 1;
+			if (rowSpan <= 1) continue;
+			for (let mergedRowIndex = rowIndex; mergedRowIndex < Math.min(block.rows.length, rowIndex + rowSpan); mergedRowIndex += 1) mergedRows.add(mergedRowIndex);
+		}
+	}
+	return mergedRows;
+};
 const flowBlockHasTrackedChanges = (block) => {
 	if (block.kind === "paragraph") return block.runs.some((run) => {
 		if (run.kind === "lineBreak") return false;
@@ -499,7 +521,7 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 	const headerRowsHeight = getHeaderRowsHeight(measure, headerRowCount);
 	let currentRowIndex = 0;
 	const breakInfo = buildTableRowBreakInfo(block, measure);
-	const hasVerticalMerges = block.rows.some((row) => row.cells.some((cell) => (cell.rowSpan ?? 1) > 1));
+	const verticallyMergedRows = getVerticallyMergedRows(block);
 	const computeTableX = (columnIndex) => {
 		let x = paginator.getColumnX(columnIndex);
 		if (block.justification === "center") x += (paginator.columnWidth - measure.totalWidth) / 2;
@@ -520,7 +542,7 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 	const canSplitRow = (rowIndex, state = paginator.getCurrentState()) => {
 		const row = rows[rowIndex];
 		const sourceRow = block.rows[rowIndex];
-		if (!row || !sourceRow || sourceRow.cantSplit || sourceRow.isHeader || hasVerticalMerges) return false;
+		if (!row || !sourceRow || sourceRow.cantSplit || sourceRow.isHeader || verticallyMergedRows.has(rowIndex)) return false;
 		if ((breakInfo.breakOffsets[rowIndex]?.length ?? 0) <= 1) return false;
 		const freshHeaderOverhead = headerRowCount > 0 && rowIndex >= headerRowCount ? headerRowsHeight : 0;
 		const oversized = row.height + freshHeaderOverhead > getCurrentRowCapacity(state);
@@ -881,24 +903,26 @@ function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionTyp
 	switch (nextSectionType) {
 		case "nextPage":
 			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
-			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex);
+			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex, nextSectionConfig.pageNumbering);
 			paginator.forcePageBreak({ coalesceBlankPage: true });
 			break;
 		case "evenPage":
-			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
-			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex);
 			if (paginator.forcePageBreak({ coalesceBlankPage: true }).page.number % 2 !== 0) paginator.forcePageBreak();
+			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
+			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex, nextSectionConfig.pageNumbering);
+			if (!paginator.retargetCurrentBlankPage()) panic("Even-page section target must be blank");
 			break;
 		case "oddPage":
-			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
-			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex);
 			if (paginator.forcePageBreak({ coalesceBlankPage: true }).page.number % 2 === 0) paginator.forcePageBreak();
+			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
+			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex, nextSectionConfig.pageNumbering);
+			if (!paginator.retargetCurrentBlankPage()) panic("Odd-page section target must be blank");
 			break;
 		case "continuous": {
 			const currentPage = paginator.pages.at(-1);
 			const nextSize = nextSectionConfig.pageSize;
 			const pageSizeChanges = currentPage != null && (Math.round(nextSize.w) !== Math.round(currentPage.size.w) || Math.round(nextSize.h) !== Math.round(currentPage.size.h));
-			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex);
+			if (nextSectionIndex !== void 0) paginator.startSection(nextSectionIndex, nextSectionConfig.pageNumbering);
 			if (pageSizeChanges) {
 				paginator.updatePageLayout(nextSize, nextSectionConfig.margins);
 				if (!paginator.retargetCurrentBlankPage()) paginator.forcePageBreak({ coalesceBlankPage: true });

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

@@ -170,7 +170,7 @@ const paragraphMeasureCache = /* @__PURE__ */ new Map();
 */
 function hashParagraphBlock(block) {
 	const parts = [`lbp:${getLineBreakProviderGeneration()}`];
-	for (const run of block.runs) if (run.kind === "text") parts.push(`t:${run.text}|${run.fontFamily}|${run.eastAsiaFontFamily}|${run.complexScriptFontFamily}|${run.fontSize}|${run.bold}|${run.italic}|${run.allCaps}|${run.smallCaps}|${run.horizontalScale}|${run.letterSpacing}|${run.language?.val}|${run.language?.eastAsia}|${run.language?.bidi}`);
+	for (const run of block.runs) if (run.kind === "text") parts.push(`t:${run.text}|${run.fontFamily}|${run.eastAsiaFontFamily}|${run.complexScriptFontFamily}|${run.fontSize}|${run.complexScriptFontSize}|${run.bold}|${run.complexScriptBold}|${run.italic}|${run.complexScriptItalic}|${run.forceComplexScript}|${run.allCaps}|${run.smallCaps}|${run.horizontalScale}|${run.letterSpacing}|${run.language?.val}|${run.language?.eastAsia}|${run.language?.bidi}`);
 	else if (run.kind === "tab") parts.push(`tab:${run.width}`);
 	else if (run.kind === "image") parts.push(`img:${run.width}x${run.height}:${run.exactLineHeight === true ? "exact" : "text"}`);
 	else if (run.kind === "lineBreak") parts.push("br");

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

@@ -0,0 +1,18 @@
+//#region src/layout-engine/measure/complexScriptFormatting.d.ts
+type ComplexScriptFormattingSource = {
+  complexScriptFontFamily?: string;
+  complexScriptFontSize?: number;
+  complexScriptBold?: boolean;
+  complexScriptItalic?: boolean;
+};
+type ResolvedComplexScriptFormatting = {
+  fontFamily?: string;
+  fontSize?: number;
+  bold?: boolean;
+  italic?: boolean;
+};
+/** Resolve Word's independent complex-script slot into ordinary paint fields. */
+declare const resolveComplexScriptFormatting: (source: ComplexScriptFormattingSource) => ResolvedComplexScriptFormatting;
+declare const hasComplexScriptFormatting: (source: ComplexScriptFormattingSource) => boolean;
+//#endregion
+export { ResolvedComplexScriptFormatting, hasComplexScriptFormatting, resolveComplexScriptFormatting };

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

@@ -0,0 +1,11 @@
+//#region src/layout-engine/measure/complexScriptFormatting.ts
+/** Resolve Word's independent complex-script slot into ordinary paint fields. */
+const resolveComplexScriptFormatting = (source) => ({
+	...source.complexScriptFontFamily !== void 0 ? { fontFamily: source.complexScriptFontFamily } : {},
+	...source.complexScriptFontSize !== void 0 ? { fontSize: source.complexScriptFontSize } : {},
+	...source.complexScriptBold !== void 0 ? { bold: source.complexScriptBold } : {},
+	...source.complexScriptItalic !== void 0 ? { italic: source.complexScriptItalic } : {}
+});
+const hasComplexScriptFormatting = (source) => source.complexScriptFontFamily !== void 0 || source.complexScriptFontSize !== void 0 || source.complexScriptBold !== void 0 || source.complexScriptItalic !== void 0;
+//#endregion
+export { hasComplexScriptFormatting, resolveComplexScriptFormatting };

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

@@ -1,5 +1,6 @@
 import { SCRIPT_CLASS, hasCjk, hasComplexScript, scriptClassOf, segmentByScript } from "../../utils/scriptSegments.js";
 import { getCachedFontMetrics, getCachedTextWidth, getTextWidthCacheGeneration, setCachedFontMetrics, setCachedTextWidth } from "./cache.js";
+import { hasComplexScriptFormatting, resolveComplexScriptFormatting } from "./complexScriptFormatting.js";
 import { buildFontString, getResolvedData, ptToPx } from "./measureHelpers.js";
 import { setMeasureProvider } from "./measureProvider.js";
 import { canPrefetchMeasurement, prefetchMeasurement } from "./measureWorker.js";
@@ -115,10 +116,14 @@ function canvasGetFontMetrics(style) {
 * @param style - Font styling properties
 * @returns Width in pixels
 */
-function canvasMeasureTextWidth(text, style) {
+function canvasMeasureTextWidth(text, sourceStyle) {
 	if (!text) return 0;
+	const style = sourceStyle.forceComplexScript ? {
+		...sourceStyle,
+		...resolveComplexScriptFormatting(sourceStyle)
+	} : sourceStyle;
 	const measuredText = applyTextTransform(text, style);
-	if (!style.letterSpacing && needsPerScriptFonts(style, measuredText)) return measureMixedScriptWidth(measuredText, style);
+	if (!sourceStyle.forceComplexScript && !style.letterSpacing && needsPerScriptFonts(style, measuredText)) return measureMixedScriptWidth(measuredText, style);
 	const ctx = getCanvasContext();
 	const font = buildFontString(style);
 	const letterSpacing = style.letterSpacing ?? 0;
@@ -156,9 +161,9 @@ function canvasMeasureTextWidth(text, style) {
 * letter spacing, horizontal scale, transform, and the EA font so the segment
 * takes the single-font path (no double-counting, no recursion).
 */
-function glyphAdvanceStyle(style, fontFamily) {
+function glyphAdvanceStyle(style) {
 	const result = {};
-	if (fontFamily !== void 0) result.fontFamily = fontFamily;
+	if (style.fontFamily !== void 0) result.fontFamily = style.fontFamily;
 	if (style.fontSize !== void 0) result.fontSize = style.fontSize;
 	if (style.bold !== void 0) result.bold = style.bold;
 	if (style.italic !== void 0) result.italic = style.italic;
@@ -179,19 +184,28 @@ function glyphAdvanceStyle(style, fontFamily) {
 */
 function needsPerScriptFonts(style, measuredText) {
 	if (style.eastAsiaFontFamily && hasCjk(measuredText)) return true;
-	return Boolean(style.complexScriptFontFamily) && hasComplexScript(measuredText);
+	return hasComplexScriptFormatting(style) && hasComplexScript(measuredText);
 }
-/** The font slot a script class selects, falling back to the western one. */
-function scriptFontFamily(style, script) {
-	if (script === SCRIPT_CLASS.eastAsia) return style.eastAsiaFontFamily ?? style.fontFamily;
-	if (script === SCRIPT_CLASS.complex) return style.complexScriptFontFamily ?? style.fontFamily;
-	return style.fontFamily;
+/** Resolve the independent font/style slot selected by a script segment. */
+function scriptStyle(style, script) {
+	if (script === SCRIPT_CLASS.eastAsia) {
+		if (style.eastAsiaFontFamily === void 0) return style;
+		return {
+			...style,
+			fontFamily: style.eastAsiaFontFamily
+		};
+	}
+	if (script === SCRIPT_CLASS.complex) return {
+		...style,
+		...resolveComplexScriptFormatting(style)
+	};
+	return style;
 }
 function measureMixedScriptWidth(measuredText, style) {
 	const letterSpacing = style.letterSpacing ?? 0;
 	const horizontalScale = getHorizontalScaleFactor(style);
 	let glyphWidth = 0;
-	for (const segment of segmentByScript(measuredText)) glyphWidth += canvasMeasureTextWidth(segment.text, glyphAdvanceStyle(style, scriptFontFamily(style, segment.script)));
+	for (const segment of segmentByScript(measuredText)) glyphWidth += canvasMeasureTextWidth(segment.text, glyphAdvanceStyle(scriptStyle(style, segment.script)));
 	let width = glyphWidth;
 	if (letterSpacing) {
 		const codePoints = countCodePoints(measuredText);
@@ -247,7 +261,11 @@ function canvasMeasureText(text, style) {
 * @param style - Font styling properties
 * @returns Run measurement with width and per-character widths
 */
-function canvasMeasureRun(text, style) {
+function canvasMeasureRun(text, sourceStyle) {
+	const style = sourceStyle.forceComplexScript ? {
+		...sourceStyle,
+		...resolveComplexScriptFormatting(sourceStyle)
+	} : sourceStyle;
 	const metrics = canvasGetFontMetrics(style);
 	if (!text) return {
 		width: 0,
@@ -262,10 +280,7 @@ function canvasMeasureRun(text, style) {
 		...style,
 		fontFamily: style.eastAsiaFontFamily
 	}) : void 0;
-	const complexScriptFont = style.complexScriptFontFamily !== void 0 && !style.letterSpacing ? buildFontString({
-		...style,
-		fontFamily: style.complexScriptFontFamily
-	}) : void 0;
+	const complexScriptFont = hasComplexScriptFormatting(style) && !style.letterSpacing ? buildFontString(scriptStyle(style, SCRIPT_CLASS.complex)) : void 0;
 	const letterSpacing = style.letterSpacing ?? 0;
 	const scale = getHorizontalScaleFactor(style);
 	const charWidths = [];

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

@@ -32,6 +32,10 @@ function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
 		...run.complexScriptFontFamily !== void 0 ? { complexScriptFontFamily: run.complexScriptFontFamily } : {},
+		...run.complexScriptFontSize !== void 0 ? { complexScriptFontSize: run.complexScriptFontSize } : {},
+		...run.complexScriptBold !== void 0 ? { complexScriptBold: run.complexScriptBold } : {},
+		...run.complexScriptItalic !== void 0 ? { complexScriptItalic: run.complexScriptItalic } : {},
+		...run.forceComplexScript !== void 0 ? { forceComplexScript: run.forceComplexScript } : {},
 		fontSize,
 		...run.bold !== void 0 ? { bold: run.bold } : {},
 		...run.italic !== void 0 ? { italic: run.italic } : {},

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

@@ -1,10 +1,11 @@
 import { calculateTabWidth, pixelsToTwips } from "../../prosemirror/utils/tabCalculator.js";
 import { CJK_FALLBACK_FONT_FAMILY, isCjkFont } from "../../utils/fontResolver.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
-import { hasCjk } from "../../utils/scriptSegments.js";
+import { hasCjk, hasComplexScript } from "../../utils/scriptSegments.js";
 import { measuredLineAdvance } from "../lineFlow.js";
 import { isFloatingImageRun } from "../types.js";
 import { clampFloatingWrapMargins } from "./clampFloatingWrapMargins.js";
+import { hasComplexScriptFormatting, resolveComplexScriptFormatting } from "./complexScriptFormatting.js";
 import { resolveEffectiveLineBreakPolicy } from "./effectiveLineBreakPolicy.js";
 import { getFloatingAvailableWidth, getFloatingMargins } from "./floatingZones.js";
 import { defaultLineBreakProvider, getLineBreakProvider } from "./lineBreakProvider.js";
@@ -97,6 +98,15 @@ function cjkLineHeightStyle(run, baseStyle) {
 		fontFamily: CJK_FALLBACK_FONT_FAMILY
 	};
 }
+/** Pick the dominant typography metrics for a run containing complex script. */
+function complexScriptLineHeightStyle(run, baseStyle) {
+	if (!hasComplexScriptFormatting(run) || !run.forceComplexScript && !hasComplexScript(run.text)) return baseStyle;
+	const complexStyle = {
+		...baseStyle,
+		...resolveComplexScriptFormatting(run)
+	};
+	return (complexStyle.fontSize ?? DEFAULT_FONT_SIZE) >= (baseStyle.fontSize ?? DEFAULT_FONT_SIZE) ? complexStyle : baseStyle;
+}
 /**
 * Calculate typography metrics from font size and spacing settings
 *
@@ -1018,7 +1028,7 @@ function measureParagraph(block, maxWidth, options) {
 				run: textRun
 			});
 			const breakPolicy = effectiveLineBreakPolicy.provider;
-			const lineHeightStyle = cjkLineHeightStyle(textRun, style);
+			const lineHeightStyle = cjkLineHeightStyle(textRun, complexScriptLineHeightStyle(textRun, style));
 			updateMaxFont(lineHeightStyle);
 			if (!text || text.length === 0) {
 				currentLine.toRun = runIndex;
@@ -1095,7 +1105,7 @@ function measureParagraph(block, maxWidth, options) {
 						}
 					}
 					if (fittingPrefix) {
-						for (const segment of fittingPrefix.segments) updateMaxFont(cjkLineHeightStyle(segment.run, segment.style));
+						for (const segment of fittingPrefix.segments) updateMaxFont(cjkLineHeightStyle(segment.run, complexScriptLineHeightStyle(segment.run, segment.style)));
 						currentLine.width += fittingPrefix.width + measureTextWidth("-", fittingPrefix.hyphenStyle);
 						currentLine.trailingWhitespaceWidth = 0;
 						currentLine.toRun = fittingPrefix.endRunIndex;

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

@@ -26,6 +26,10 @@ type FontStyle = {
    * points. Same contract as `eastAsiaFontFamily`, over a different slot.
    */
   complexScriptFontFamily?: string;
+  complexScriptFontSize?: number;
+  complexScriptBold?: boolean;
+  complexScriptItalic?: boolean;
+  forceComplexScript?: boolean;
   fontSize?: number;
   bold?: boolean;
   italic?: boolean;