@stll/folio-core 0.23.0 → 0.24.0

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;

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

@@ -1,4 +1,4 @@
-import { ColumnLayout, FOOTNOTE_SEPARATOR_HEIGHT, Fragment, Page, PageHeaderFooterRefs, PageMargins } from "./types.js";
+import { ColumnLayout, FOOTNOTE_SEPARATOR_HEIGHT, Fragment, Page, PageHeaderFooterRefs, PageMargins, SectionPageNumbering } from "./types.js";
 //#region src/layout-engine/paginator.d.ts
 /**
  * Current state of a page being laid out.
@@ -45,8 +45,10 @@ type PaginatorOptions = {
    * first-page header) vs. its body pages. Pages 2+ use `margins`.
    */
   firstPageMargins?: PageMargins;
-  /** Per-section body margins used on even section pages. */
+  /** Per-section body margins used on even authored page numbers. */
   sectionEvenPageMargins?: (PageMargins | undefined)[];
+  /** Page-number policy for the initial section. */
+  pageNumbering?: SectionPageNumbering;
   /** Column configuration (optional). */
   columns?: ColumnLayout;
   /** Per-page footnote reserved heights (pageNumber → height in pixels). */
@@ -114,7 +116,7 @@ declare function createPaginator(options: PaginatorOptions): {
     h: number;
   }, newMargins?: PageMargins, applyImmediately?: boolean) => void;
   /** Mark the next created page as the first page of a new section. */
-  startSection: (sectionIndex: number) => void;
+  startSection: (sectionIndex: number, pageNumbering?: SectionPageNumbering) => void;
 };
 type Paginator = ReturnType<typeof createPaginator>;
 //#endregion

package/dist/layout-engine/paginator.js

@@ -35,6 +35,9 @@ function createPaginator(options) {
 	let pendingMargins;
 	let currentSectionIndex = 0;
 	let currentSectionPageNumber = 0;
+	let currentPageNumbering = options.pageNumbering ?? { type: "continue" };
+	let nextLogicalPageNumber = currentPageNumbering.type === "restart" ? currentPageNumbering.start : 1;
+	let sectionStartPending = true;
 	const pages = [];
 	const states = [];
 	function getContentBottom() {
@@ -48,7 +51,7 @@ function createPaginator(options) {
 	}
 	function currentPageUsesActiveLayout(state) {
 		if (pendingPageSize || pendingMargins) return false;
-		return arePageSizesEqual(state.page.size, pageSize) && areMarginsEqual(state.page.margins, getPageMargins(state.page.number, state.page.sectionPageNumber ?? currentSectionPageNumber));
+		return arePageSizesEqual(state.page.size, pageSize) && areMarginsEqual(state.page.margins, getPageMargins(state.page.number, state.page.logicalNumber));
 	}
 	if (getContentHeight() <= 0) panic("Paginator: page size and margins yield no content area");
 	let columnWidths = calculateColumnWidths(pageSize.w, margins.left, margins.right, columns);
@@ -63,8 +66,8 @@ function createPaginator(options) {
 		if (getContentHeight() <= 0) panic("Paginator: section page size and margins yield no content area");
 		recalculateColumnWidths();
 	}
-	function getPageMargins(pageNumber, sectionPageNumber) {
-		const evenMargins = sectionPageNumber % 2 === 0 ? options.sectionEvenPageMargins?.[currentSectionIndex] : void 0;
+	function getPageMargins(pageNumber, logicalPageNumber) {
+		const evenMargins = logicalPageNumber % 2 === 0 ? options.sectionEvenPageMargins?.[currentSectionIndex] : void 0;
 		const pageMargins = pageNumber === 1 && options.firstPageMargins ? { ...options.firstPageMargins } : { ...evenMargins ?? margins };
 		if (options.mirrorMargins === true && pageNumber % 2 === 0) return {
 			...pageMargins,
@@ -79,7 +82,7 @@ function createPaginator(options) {
 	* Get X position for a given column index.
 	*/
 	function getColumnX(columnIndex) {
-		let x = states.at(-1)?.page.margins.left ?? getPageMargins(1, 1).left;
+		let x = states.at(-1)?.page.margins.left ?? getPageMargins(1, nextLogicalPageNumber).left;
 		for (let index = 0; index < columnIndex; index++) x += (columnWidths[index] ?? columnWidths[0] ?? 0) + gapAfterColumn(columns, index);
 		return x;
 	}
@@ -89,14 +92,19 @@ function createPaginator(options) {
 	function createNewPage() {
 		if (pendingPageSize || pendingMargins) applyPendingLayout();
 		const pageNumber = pages.length + 1;
+		const logicalNumber = nextLogicalPageNumber;
+		nextLogicalPageNumber += 1;
+		sectionStartPending = false;
 		currentSectionPageNumber += 1;
-		const pageMargins = getPageMargins(pageNumber, currentSectionPageNumber);
+		const pageMargins = getPageMargins(pageNumber, logicalNumber);
 		const topMargin = pageMargins.top;
 		const contentBottom = pageSize.h - pageMargins.bottom;
 		const footnoteHeight = options.footnoteReservedHeights?.get(pageNumber) ?? 0;
 		const pageContentBottom = contentBottom - footnoteHeight;
 		const page = {
 			number: pageNumber,
+			logicalNumber,
+			...currentPageNumbering.format === void 0 ? {} : { logicalNumberFormat: currentPageNumbering.format },
 			fragments: [],
 			margins: pageMargins,
 			size: { ...pageSize },
@@ -236,12 +244,12 @@ function createPaginator(options) {
 	*/
 	function forcePageBreak(breakOptions = {}) {
 		const current = states.at(-1);
-		if (breakOptions.coalesceBlankPage && current && current.page.fragments.length === 0 && current.cursorY === current.topMargin && currentPageUsesActiveLayout(current)) {
+		if (breakOptions.coalesceBlankPage && current && current.page.fragments.length === 0 && current.cursorY === current.topMargin) {
 			if (current.page.sectionIndex !== currentSectionIndex) {
-				currentSectionPageNumber = 1;
-				applySectionMetadata(current.page);
+				retargetCurrentBlankPage();
+				return current;
 			}
-			return current;
+			if (currentPageUsesActiveLayout(current)) return current;
 		}
 		return createNewPage();
 	}
@@ -249,7 +257,8 @@ function createPaginator(options) {
 		const current = states.at(-1);
 		if (!current || current.page.fragments.length > 0 || current.cursorY !== current.topMargin) return false;
 		if (pendingPageSize || pendingMargins) applyPendingLayout();
-		const pageMargins = getPageMargins(current.page.number, 1);
+		retargetSectionMetadata(current.page);
+		const pageMargins = getPageMargins(current.page.number, current.page.logicalNumber);
 		const topMargin = pageMargins.top;
 		const rawContentBottom = pageSize.h - pageMargins.bottom;
 		const footnoteHeight = options.footnoteReservedHeights?.get(current.page.number) ?? 0;
@@ -267,8 +276,6 @@ function createPaginator(options) {
 		current.contentBottom = rawContentBottom - footnoteHeight;
 		current.trailingSpacing = 0;
 		columnRegionTop = topMargin;
-		currentSectionPageNumber = 1;
-		applySectionMetadata(current.page);
 		return true;
 	}
 	/**
@@ -310,9 +317,23 @@ function createPaginator(options) {
 		pendingPageSize = void 0;
 		pendingMargins = void 0;
 	}
-	function startSection(sectionIndex) {
+	function startSection(sectionIndex, pageNumbering = { type: "continue" }) {
 		currentSectionIndex = sectionIndex;
 		currentSectionPageNumber = 0;
+		currentPageNumbering = pageNumbering;
+		sectionStartPending = true;
+		if (pageNumbering.type === "restart") nextLogicalPageNumber = pageNumbering.start;
+	}
+	function retargetSectionMetadata(page) {
+		currentSectionPageNumber = 1;
+		if (sectionStartPending && currentPageNumbering.type === "restart") {
+			page.logicalNumber = currentPageNumbering.start;
+			nextLogicalPageNumber = currentPageNumbering.start + 1;
+		}
+		sectionStartPending = false;
+		if (currentPageNumbering.format === void 0) delete page.logicalNumberFormat;
+		else page.logicalNumberFormat = currentPageNumbering.format;
+		applySectionMetadata(page);
 	}
 	function applySectionMetadata(page) {
 		page.sectionIndex = currentSectionIndex;

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

@@ -1,7 +1,7 @@
 import { OutlineStyleAttr } from "../types/documentEnumValues.js";
 import { ImagePosition, ImageWrap, SdtProperties, SdtType, ShapeTextBody, TableCellFormatting, TableWidthType } from "@stll/docx-core/model";
 declare namespace types_d_exports {
-  export { 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 };
+  export { 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 };
 }
 /**
  * Unique identifier for a block in the document.
@@ -46,6 +46,14 @@ type RunFormatting = {
    * does NOT do and is why this slot has to reach layout at all.
    */
   complexScriptFontFamily?: string;
+  /** Independent complex-script size (`w:szCs`), in points. */
+  complexScriptFontSize?: number;
+  /** Independent complex-script weight (`w:bCs`). */
+  complexScriptBold?: boolean;
+  /** Independent complex-script slant (`w:iCs`). */
+  complexScriptItalic?: boolean;
+  /** Force the complex-script formatting slot for every character (`w:cs`). */
+  forceComplexScript?: boolean;
   /** Run language metadata resolved from `w:lang`. */
   language?: {
     val?: string;
@@ -119,6 +127,7 @@ type RunFormatting = {
   /** Groups a suggestion's runs for accept/reject and scroll-to. */
   suggestionId?: string;
 };
+type ListMarkerFormatting = Pick<RunFormatting, "fontFamily" | "eastAsiaFontFamily" | "complexScriptFontFamily" | "fontSize" | "complexScriptFontSize" | "bold" | "complexScriptBold" | "italic" | "complexScriptItalic" | "rtl" | "forceComplexScript">;
 /**
  * Hyperlink information for a run.
  */
@@ -453,15 +462,14 @@ type ParagraphAttrs = {
   listMarker?: string;
   listIsBullet?: boolean;
   listMarkerHidden?: boolean;
-  listMarkerFontFamily?: string;
-  listMarkerFontSize?: number;
+  /** Canonical numbering-level marker typography, resolved for layout. */
+  listMarkerFormatting?: ListMarkerFormatting;
   /**
    * Effective paragraph-mark size used only to measure a visible list
    * paragraph's final line. Word lets the inherited complex-script size raise
    * that line box without enlarging the marker or Western text glyphs.
    */
   listParagraphMarkFontSize?: number;
-  listMarkerBold?: boolean;
   /** Horizontal alignment of the marker around the paragraph's list anchor. */
   listMarkerAlignment?: "left" | "center" | "right";
   /**
@@ -689,9 +697,20 @@ type SectionBreakBlock = {
   orientation?: "portrait" | "landscape";
   margins?: PageMargins;
   columns?: ColumnLayout;
+  /** Authored page-number continuation or restart policy for the section ending here. */
+  pageNumbering?: SectionPageNumbering;
   /** Line pitch authored by the section properties that end at this boundary, in twips. */
   documentGridLinePitchTwips?: number;
 };
+/** Normalized section page-number policy. An omitted OOXML start continues numbering. */
+type SectionPageNumbering = {
+  type: "continue";
+  format?: string;
+} | {
+  type: "restart";
+  start: number;
+  format?: string;
+};
 type PageHeaderFooterRefs = {
   titlePg?: boolean;
   evenAndOddHeaders?: boolean;
@@ -1057,8 +1076,12 @@ type PageMargins = {
  * A rendered page containing positioned fragments.
  */
 type Page = {
-  /** Page number (1-indexed). */
+  /** Physical page number (1-indexed), used for navigation and page counts. */
   number: number;
+  /** Authored page number shown by PAGE fields. */
+  logicalNumber: number;
+  /** OOXML number format for this page's section. */
+  logicalNumberFormat?: string;
   /** Fragments positioned on this page. */
   fragments: Fragment[];
   /** Page margins. */
@@ -1167,8 +1190,10 @@ type LayoutOptions = {
    * same extension.
    */
   firstPageMargins?: PageMargins;
-  /** Per-section body margins used on even section pages. */
+  /** Per-section body margins used on even authored page numbers. */
   sectionEvenPageMargins?: (PageMargins | undefined)[];
+  /** Page-number policy for the initial section. */
+  pageNumbering?: SectionPageNumbering;
   /** Body-level final section page size. */
   finalPageSize?: {
     w: number;
@@ -1178,6 +1203,8 @@ type LayoutOptions = {
   finalMargins?: PageMargins;
   /** Body-level final section column configuration. */
   finalColumns?: ColumnLayout;
+  /** Body-level final section page-number policy. */
+  finalPageNumbering?: SectionPageNumbering;
   /** Column configuration. */
   columns?: ColumnLayout;
   /** Gap between rendered pages (for UI). */
@@ -1353,4 +1380,4 @@ declare function tableColumnsArePinned(table: TableBlock): boolean;
 /** Return the leading visual offset for a row with omitted grid columns. */
 declare const getTableRowLeadingWidth: (row: TableRow, columnWidths: readonly number[]) => number;
 //#endregion
-export { 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, types_d_exports };
+export { 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, types_d_exports };

package/dist/layout-painter/index.js

@@ -81,7 +81,8 @@ var LayoutPainter = class {
 		for (const i_item of pages) {
 			const page = i_item;
 			const context = {
-				pageNumber: page.number,
+				pageNumber: page.logicalNumber,
+				...page.logicalNumberFormat === void 0 ? {} : { pageNumberFormat: page.logicalNumberFormat },
 				totalPages: this.totalPages,
 				section: "body"
 			};

package/dist/layout-painter/renderPage.js

@@ -601,6 +601,7 @@ function renderFootnoteContent(footnote, contentWidth, doc, context) {
 	wrapper.style.height = `${content.height}px`;
 	const renderContext = {
 		pageNumber: context?.pageNumber ?? 0,
+		...context?.pageNumberFormat === void 0 ? {} : { pageNumberFormat: context.pageNumberFormat },
 		totalPages: context?.totalPages ?? 0,
 		section: context?.section ?? "body",
 		contentWidth
@@ -1133,8 +1134,7 @@ function applySectionHeaderFooterOptions(page, pageOptions, options) {
 	if (!refs) return false;
 	const isFirstSectionPage = page.sectionPageNumber === 1;
 	const useFirst = refs.titlePg === true && isFirstSectionPage;
-	const sectionPageNumber = page.sectionPageNumber ?? page.number;
-	const useEven = refs.evenAndOddHeaders === true && sectionPageNumber % 2 === 0;
+	const useEven = refs.evenAndOddHeaders === true && page.logicalNumber % 2 === 0;
 	const headerRId = (() => {
 		if (useFirst) return refs.headerFirst;
 		if (useEven) return refs.headerEven;
@@ -1176,7 +1176,8 @@ function sectionPagesContext(page, counts) {
 */
 function buildPageRenderArgs(page, totalPages, options) {
 	const context = {
-		pageNumber: page.number,
+		pageNumber: page.logicalNumber,
+		...page.logicalNumberFormat === void 0 ? {} : { pageNumberFormat: page.logicalNumberFormat },
 		totalPages,
 		section: "body",
 		...options.bookmarkPages ? { bookmarkPages: options.bookmarkPages } : {},
@@ -1224,6 +1225,7 @@ function computePageFingerprintInternal(page, blockLookup, options) {
 	parts.push(`m:${pageMarginsFingerprint(page.margins)}`);
 	if (page.authoredMargins) parts.push(`am:${pageMarginsFingerprint(page.authoredMargins)}`);
 	parts.push(`n:${page.number}`);
+	parts.push(`ln:${page.logicalNumber},${page.logicalNumberFormat ?? ""}`);
 	if (page.sectionIndex !== void 0) parts.push(`si:${page.sectionIndex}`);
 	if (page.sectionPageNumber !== void 0) parts.push(`sp:${page.sectionPageNumber}`);
 	if (page.headerFooterRefs) parts.push(`hf:${JSON.stringify(page.headerFooterRefs)}`);
@@ -1334,6 +1336,10 @@ function runContentKey(run) {
 	if (run.highlight) parts.push(`hi:${run.highlight}`);
 	if (run.fontFamily) parts.push(`ff:${run.fontFamily}`);
 	if (run.complexScriptFontFamily) parts.push(`cs:${run.complexScriptFontFamily}`);
+	if (run.complexScriptFontSize !== void 0) parts.push(`cs-size:${run.complexScriptFontSize}`);
+	if (run.complexScriptBold !== void 0) parts.push(`cs-bold:${run.complexScriptBold}`);
+	if (run.complexScriptItalic !== void 0) parts.push(`cs-italic:${run.complexScriptItalic}`);
+	if (run.forceComplexScript !== void 0) parts.push(`cs-force:${run.forceComplexScript}`);
 	if (run.eastAsiaFontFamily) parts.push(`ea:${run.eastAsiaFontFamily}`);
 	if (run.fontSize !== void 0) parts.push(`fs:${run.fontSize}`);
 	if (run.letterSpacing !== void 0) parts.push(`ls:${run.letterSpacing}`);