@stll/folio-core 0.23.0 → 0.24.0

package/dist/fields/bookmarkPages.js

@@ -13,7 +13,7 @@ function buildBookmarkPageMap(pages, blocks) {
 	if (anchors.length === 0) return pageByBookmark;
 	for (const page of pages) for (const fragment of page.fragments) for (const anchor of anchors) {
 		if (!fragmentContainsAnchor(fragment, anchor)) continue;
-		assignBookmarkPage(pageByBookmark, anchor.names, page.number);
+		assignBookmarkPage(pageByBookmark, anchor.names, page.logicalNumber);
 	}
 	return pageByBookmark;
 }

package/dist/fields/evaluateField.js

@@ -38,7 +38,7 @@ function evaluateField(parsed, ctx, options = {}) {
 	const fallback = options.fallback ?? "";
 	if (options.locked) return fallback;
 	switch (parsed.type) {
-		case "PAGE": return computePageNumber(ctx.pageNumber, parsed);
+		case "PAGE": return computePageNumber(ctx.pageNumber, parsed, ctx.pageNumberFormat);
 		case "NUMPAGES": return computePageNumber(ctx.totalPages, parsed);
 		case "SECTIONPAGES": return ctx.sectionPages === void 0 ? fallback : computePageNumber(ctx.sectionPages, parsed);
 		case "TIME": {

package/dist/fields/fieldContext.d.ts

@@ -9,6 +9,8 @@
 type FieldContext = {
   /** 1-indexed page the field is on (PAGE). */
   pageNumber: number;
+  /** OOXML section-level format used when PAGE has no explicit format switch. */
+  pageNumberFormat?: string;
   /** Total pages in the document (NUMPAGES). */
   totalPages: number;
   /** Pages in the field's current section (SECTIONPAGES); omit until the

package/dist/fields/resolveFieldValues.js

@@ -22,6 +22,7 @@ function resolveFieldValues(blocks, pages, shared) {
 		const sectionPages = location ? shared.sectionPageCounts.get(location.sectionIndex) : void 0;
 		const context = {
 			pageNumber: location?.page ?? 1,
+			...location?.pageFormat === void 0 ? {} : { pageNumberFormat: location.pageFormat },
 			totalPages: shared.totalPages,
 			bookmarkPages: shared.bookmarkPages,
 			bookmarkText: shared.bookmarkText,
@@ -131,7 +132,8 @@ function fieldValuesEqual(a, b) {
 function buildBlockPageMap(pages) {
 	const map = /* @__PURE__ */ new Map();
 	for (const page of pages) for (const fragment of page.fragments) if (!map.has(fragment.blockId)) map.set(fragment.blockId, {
-		page: page.number,
+		page: page.logicalNumber,
+		...page.logicalNumberFormat === void 0 ? {} : { pageFormat: page.logicalNumberFormat },
 		sectionIndex: page.sectionIndex ?? 0
 	});
 	return map;
@@ -143,7 +145,8 @@ function buildTableRowPageMap(pages) {
 		for (let rowIndex = fragment.fromRow; rowIndex < fragment.toRow; rowIndex++) {
 			const key = tableRowKey(fragment.blockId, rowIndex);
 			if (!map.has(key)) map.set(key, {
-				page: page.number,
+				page: page.logicalNumber,
+				...page.logicalNumberFormat === void 0 ? {} : { pageFormat: page.logicalNumberFormat },
 				sectionIndex: page.sectionIndex ?? 0
 			});
 		}

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

@@ -442,7 +442,7 @@ function serializeParagraphAttrs(attrs) {
 		"listMarker",
 		"listIsBullet",
 		"listMarkerHidden",
-		"listMarkerBold",
+		"listMarkerFormatting",
 		"listMarkerAlignment",
 		"listMarkerSuffix",
 		"tabs"
@@ -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,13 +1,14 @@
 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 { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
@@ -74,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) => {
@@ -399,9 +357,12 @@ 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;
+function textFormattingToRunFormatting(defaultTextFormatting, theme) {
 	if (!defaultTextFormatting) return {};
 	const result = {};
 	const fontFamily = defaultTextFormatting.fontFamily ? resolveWesternThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
@@ -412,8 +373,13 @@ 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.rtl !== void 0) result.rtl = defaultTextFormatting.rtl;
+	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);
@@ -442,6 +408,9 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (defaultTextFormatting.emphasisMark && defaultTextFormatting.emphasisMark !== "none") result.emphasisMark = defaultTextFormatting.emphasisMark;
 	return result;
 }
+function paragraphRunDefaults(pmAttrs, theme) {
+	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme);
+}
 /**
 * Build an ImageRun from ProseMirror node attrs, applying conditional property assignment
 * to satisfy exactOptionalPropertyTypes.
@@ -687,12 +656,8 @@ function toPreviousListAttrs(previousFormatting) {
 	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 listMarkerFormatting = previousFormatting.listMarkerFormatting;
+	if (listMarkerFormatting !== void 0) attrs.listMarkerFormatting = listMarkerFormatting;
 	const listMarkerAlignment = previousFormatting.listMarkerAlignment;
 	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
 	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
@@ -708,7 +673,7 @@ function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractC
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds) {
+function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds, theme) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
 	const marker = resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds);
 	if (!marker) return;
@@ -716,9 +681,7 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCo
 	attrs.listMarkerRevision = toListMarkerRevision("del", change.info);
 	if (previousListAttrs.listIsBullet !== void 0) attrs.listIsBullet = previousListAttrs.listIsBullet;
 	if (previousListAttrs.listMarkerHidden !== void 0) attrs.listMarkerHidden = previousListAttrs.listMarkerHidden;
-	if (previousListAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = previousListAttrs.listMarkerFontFamily;
-	if (previousListAttrs.listMarkerFontSize) attrs.listMarkerFontSize = previousListAttrs.listMarkerFontSize;
-	if (previousListAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = previousListAttrs.listMarkerBold;
+	if (previousListAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(previousListAttrs.listMarkerFormatting, theme);
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
@@ -821,7 +784,8 @@ 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 propertyChanges = pmAttrs._propertyChanges ?? [];
 	let changedNumberingChange;
@@ -853,15 +817,13 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;
 	if (pmAttrs.listMarkerHidden) attrs.listMarkerHidden = true;
-	if (pmAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = pmAttrs.listMarkerFontFamily;
-	if (pmAttrs.listMarkerFontSize) attrs.listMarkerFontSize = pmAttrs.listMarkerFontSize;
-	if (pmAttrs.listMarkerBold !== null && pmAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = pmAttrs.listMarkerBold;
+	if (pmAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(pmAttrs.listMarkerFormatting, theme);
 	if (pmAttrs.listMarkerAlignment) attrs.listMarkerAlignment = pmAttrs.listMarkerAlignment;
 	if (pmAttrs.listMarkerSuffix) attrs.listMarkerSuffix = pmAttrs.listMarkerSuffix;
 	if (pmAttrs.listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = pmAttrs.listMarkerSecondSlotOffsetTwips;
 	if (!pmAttrs.numPr) {
 		const numberingRemovedChange = propertyChanges.find(isRemovedNumberingChange);
-		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds);
+		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds, theme);
 	}
 	if (defaultTabStopTwips !== void 0) attrs.defaultTabStopTwips = defaultTabStopTwips;
 	const dtf = pmAttrs.defaultTextFormatting;
@@ -1187,7 +1149,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;
 }
 /**
@@ -1462,6 +1424,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, ListMarkerFormatting, 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, ListMarkerFormatting, 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");
@@ -186,6 +186,10 @@ function hashParagraphBlock(block) {
 		if (attrs.reserveEmptyOutlineHeight) parts.push("outline-empty-reserve");
 		if (attrs.documentGridLinePitch !== void 0) parts.push(`documentGrid:${attrs.documentGridLinePitch}|${attrs.snapToGrid !== false}`);
 		if (attrs.justificationCompatibility) parts.push(`justify-compat:${attrs.justificationCompatibility.type}`);
+		if (attrs.listMarker !== void 0) {
+			const marker = attrs.listMarkerFormatting;
+			parts.push(`marker:${attrs.listMarker}|${attrs.listMarkerHidden}|${attrs.listMarkerAlignment}|${attrs.listMarkerSuffix}|${marker?.fontFamily}|${marker?.eastAsiaFontFamily}|${marker?.complexScriptFontFamily}|${marker?.fontSize}|${marker?.complexScriptFontSize}|${marker?.bold}|${marker?.complexScriptBold}|${marker?.italic}|${marker?.complexScriptItalic}|${marker?.rtl}|${marker?.forceComplexScript}`);
+		}
 		parts.push(...lineBreakPolicyCacheParts(attrs));
 		const borders = attrs.borders;
 		if (borders) {

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/listMarkerWidth.d.ts

@@ -8,7 +8,7 @@ import { ParagraphBlock } from "../types.js";
 declare const DEFAULT_TAB_STOP_TWIPS = 720;
 /**
  * Marker font resolution per ECMA-376 §17.9.6:
- *  1. explicit numbering-level rPr (`attrs.listMarkerFont*`),
+ *  1. explicit numbering-level rPr (`attrs.listMarkerFormatting`),
  *  2. first body text run's font,
  *  3. paragraph defaults, then document defaults.
  */
@@ -16,6 +16,8 @@ declare function resolveListMarkerFont(block: ParagraphBlock): {
   fontFamily: string;
   fontSize: number;
   bold?: boolean;
+  italic?: boolean;
+  rtl?: boolean;
 };
 /**
  * Compute the marker's inline-block width in pixels, or 0 if the paragraph

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

@@ -1,3 +1,5 @@
+import { hasCjk, hasComplexScript } from "../../utils/scriptSegments.js";
+import { hasComplexScriptFormatting, resolveComplexScriptFormatting } from "./complexScriptFormatting.js";
 import { ptToPx } from "./measureHelpers.js";
 import { measureTextWidth } from "./measureProvider.js";
 //#region src/layout-engine/measure/listMarkerWidth.ts
@@ -12,21 +14,33 @@ const DEFAULT_TAB_STOP_TWIPS = 720;
 const TWIPS_TO_PX = 96 / 1440;
 /**
 * Marker font resolution per ECMA-376 §17.9.6:
-*  1. explicit numbering-level rPr (`attrs.listMarkerFont*`),
+*  1. explicit numbering-level rPr (`attrs.listMarkerFormatting`),
 *  2. first body text run's font,
 *  3. paragraph defaults, then document defaults.
 */
 function resolveListMarkerFont(block) {
 	const attrs = block.attrs;
 	const firstTextRun = block.runs.find((r) => r.kind === "text");
-	const fontFamily = attrs?.listMarkerFontFamily ?? firstTextRun?.fontFamily ?? attrs?.defaultFontFamily ?? DEFAULT_FONT_FAMILY;
-	const fontSize = attrs?.listMarkerFontSize ?? firstTextRun?.fontSize ?? attrs?.defaultFontSize ?? DEFAULT_FONT_SIZE;
-	const bold = attrs?.listMarkerBold ?? firstTextRun?.bold;
-	return {
-		fontFamily,
-		fontSize,
-		...bold !== void 0 ? { bold } : {}
+	const markerFormatting = attrs?.listMarkerFormatting;
+	const bold = markerFormatting?.bold ?? firstTextRun?.bold;
+	const italic = markerFormatting?.italic ?? firstTextRun?.italic;
+	const base = {
+		fontFamily: markerFormatting?.fontFamily ?? firstTextRun?.fontFamily ?? attrs?.defaultFontFamily ?? DEFAULT_FONT_FAMILY,
+		fontSize: markerFormatting?.fontSize ?? firstTextRun?.fontSize ?? attrs?.defaultFontSize ?? DEFAULT_FONT_SIZE,
+		...bold !== void 0 ? { bold } : {},
+		...italic !== void 0 ? { italic } : {},
+		...markerFormatting?.rtl !== void 0 ? { rtl: markerFormatting.rtl } : {}
 	};
+	const marker = attrs?.listMarker ?? "";
+	if (markerFormatting && hasComplexScriptFormatting(markerFormatting) && (markerFormatting.forceComplexScript || hasComplexScript(marker))) return {
+		...base,
+		...resolveComplexScriptFormatting(markerFormatting)
+	};
+	if (markerFormatting?.eastAsiaFontFamily && hasCjk(marker)) return {
+		...base,
+		fontFamily: markerFormatting.eastAsiaFontFamily
+	};
+	return base;
 }
 /**
 * Compute the marker's inline-block width in pixels, or 0 if the paragraph
@@ -49,12 +63,7 @@ function resolveListMarkerFont(block) {
 function getListMarkerInlineWidth(block) {
 	const attrs = block.attrs;
 	if (!attrs?.listMarker || attrs.listMarkerHidden) return 0;
-	const { fontFamily, fontSize, bold } = resolveListMarkerFont(block);
-	const style = {
-		fontFamily,
-		fontSize,
-		...bold !== void 0 ? { bold } : {}
-	};
+	const style = resolveListMarkerFont(block);
 	const naturalWidth = measureTextWidth(attrs.listMarker, style);
 	const markerEndOffset = getMarkerEndOffset(naturalWidth, attrs.listMarkerAlignment);
 	const suffix = attrs.listMarkerSuffix ?? "tab";
@@ -75,19 +84,14 @@ function getListMarkerInlineWidth(block) {
 	let bodyStart;
 	if (firstCustomPast !== void 0 && firstGridPast !== void 0) bodyStart = Math.min(firstCustomPast, firstGridPast);
 	else bodyStart = firstCustomPast ?? firstGridPast;
-	if (bodyStart === void 0) return naturalWidth + ptToPx(fontSize) * .5;
+	if (bodyStart === void 0) return naturalWidth + ptToPx(style.fontSize ?? DEFAULT_FONT_SIZE) * .5;
 	return bodyStart - markerStartPx;
 }
 /** Paint-only offset that places the marker around its authored list anchor. */
 function getListMarkerVisualOffset(block) {
 	const attrs = block.attrs;
 	if (!attrs?.listMarker || attrs.listMarkerHidden) return 0;
-	const { fontFamily, fontSize, bold } = resolveListMarkerFont(block);
-	const naturalWidth = measureTextWidth(attrs.listMarker, {
-		fontFamily,
-		fontSize,
-		...bold !== void 0 ? { bold } : {}
-	});
+	const naturalWidth = measureTextWidth(attrs.listMarker, resolveListMarkerFont(block));
 	if (attrs.listMarkerAlignment === "right") return -naturalWidth;
 	if (attrs.listMarkerAlignment === "center") return -naturalWidth / 2;
 	return 0;