@stll/folio-core 0.22.3 → 0.23.1

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, 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;
@@ -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, 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/imageLayout.d.ts

@@ -1,7 +1,7 @@
 import { FlowBlock, Measure } from "../layout-engine/types.js";
+import { ImageAttrs } from "../prosemirror/schema/nodes.js";
 import { BlockLookup } from "./index.js";
 import { WrapType } from "../docx/wrapTypes.js";
-import { ImageAttrs } from "../prosemirror/schema/nodes.js";
 //#region src/layout-painter/imageLayout.d.ts
 /**
  * Anchored wrap-type targets — the OOXML wrap types except `inline`.

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}`);

package/dist/layout-painter/renderParagraph.js

@@ -1,6 +1,7 @@
 import { ommlToMathml } from "../docx/mathToMathml.js";
 import { parseXmlDocument } from "../docx/xmlParser.js";
 import { evaluateFieldInstruction } from "../fields/evaluateField.js";
+import { hasComplexScriptFormatting, resolveComplexScriptFormatting } from "../layout-engine/measure/complexScriptFormatting.js";
 import { getListMarkerInlineWidth, getListMarkerVisualOffset } from "../layout-engine/measure/listMarkerWidth.js";
 import { DOCX_SCRIPT_FONT_SCALE } from "../layout-engine/measure/measureHelpers.js";
 import { FONT_KERNING_MODE, countCompressibleSpaces, getFontKerningMode, getRunFontKerningMode, toPaintedText } from "../layout-engine/measure/textMeasurementPolicy.js";
@@ -571,6 +572,7 @@ function resolveFieldText(run, context) {
 	if (!context) return fallback;
 	const fieldContext = {
 		pageNumber: context.pageNumber,
+		...context.pageNumberFormat === void 0 ? {} : { pageNumberFormat: context.pageNumberFormat },
 		totalPages: context.totalPages,
 		bookmarkPages: context.bookmarkPages ?? EMPTY_BOOKMARK_PAGES,
 		bookmarkText: context.bookmarkText ?? EMPTY_BOOKMARK_TEXT,
@@ -591,6 +593,10 @@ function renderFieldRun(run, doc, context) {
 		kind: "text",
 		text
 	};
+	if (resolvedRun.forceComplexScript && hasComplexScriptFormatting(resolvedRun)) return renderTextRun({
+		...resolvedRun,
+		...resolveComplexScriptFormatting(resolvedRun)
+	}, doc);
 	if (needsPerScriptSpans({
 		...resolvedRun,
 		text
@@ -607,7 +613,7 @@ function renderFieldRun(run, doc, context) {
 			const segmentRun = {
 				...segmentBase,
 				text: segment.text,
-				...scriptFontOverride(resolvedRun, segment.script)
+				...scriptFormattingOverride(resolvedRun, segment.script)
 			};
 			wrapper.append(renderTextRun(segmentRun, doc));
 		}
@@ -725,9 +731,9 @@ function sliceRunsForLine(block, line) {
 * The font a script segment paints with, mirroring the measurer's
 * `scriptFontFamily`. Returning undefined leaves the run's own `fontFamily`.
 */
-const scriptFontOverride = (run, script) => {
+const scriptFormattingOverride = (run, script) => {
+	if (run.forceComplexScript || script === SCRIPT_CLASS.complex) return resolveComplexScriptFormatting(run);
 	if (script === SCRIPT_CLASS.eastAsia && run.eastAsiaFontFamily !== void 0) return { fontFamily: run.eastAsiaFontFamily };
-	if (script === SCRIPT_CLASS.complex && run.complexScriptFontFamily !== void 0) return { fontFamily: run.complexScriptFontFamily };
 	return {};
 };
 /**
@@ -739,7 +745,7 @@ const scriptFontOverride = (run, script) => {
 const needsPerScriptSpans = (run) => {
 	if (run.letterSpacing) return false;
 	if (run.eastAsiaFontFamily !== void 0 && hasCjk(run.text)) return true;
-	return run.complexScriptFontFamily !== void 0 && hasComplexScript(run.text);
+	return hasComplexScriptFormatting(run) && hasComplexScript(run.text);
 };
 /**
 * Split each text run carrying an East-Asian font into per-script sub-runs, so
@@ -753,6 +759,13 @@ const needsPerScriptSpans = (run) => {
 function splitTextRunsByEastAsia(runs) {
 	const result = [];
 	for (const run of runs) {
+		if (isTextRun(run) && run.forceComplexScript && hasComplexScriptFormatting(run)) {
+			result.push({
+				...run,
+				...resolveComplexScriptFormatting(run)
+			});
+			continue;
+		}
 		if (!isTextRun(run) || !needsPerScriptSpans(run)) {
 			result.push(run);
 			continue;
@@ -762,7 +775,7 @@ function splitTextRunsByEastAsia(runs) {
 			result.push({
 				...run,
 				text: segment.text,
-				...scriptFontOverride(run, segment.script),
+				...scriptFormattingOverride(run, segment.script),
 				...run.pmStart !== void 0 ? {
 					pmStart: run.pmStart + offset,
 					pmEnd: run.pmStart + offset + segment.text.length
@@ -866,6 +879,10 @@ function runMeasureStyle(run) {
 		...run.smallCaps !== void 0 ? { smallCaps: run.smallCaps } : {},
 		...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 } : {},
 		kerning: getRunFontKerningMode(run, 11) === FONT_KERNING_MODE.enabled
 	};
 }
@@ -972,27 +989,32 @@ function createTextMeasurer(doc) {
 	return (text, fontSize = 11, fontFamily = "Calibri", style = {}) => {
 		if (!ctx) return applyLetterSpacingToMeasuredWidth(text.length * 7, text, style.letterSpacing);
 		ctx.fontKerning = getFontKerningMode(style);
-		const cssFallback = resolveFontFamily(fontFamily).cssFallback;
-		const fontSizePx = fontSize * 96 / 72;
-		const fontPrefixParts = [];
-		if (style.italic) fontPrefixParts.push("italic");
-		if (style.smallCaps) fontPrefixParts.push("small-caps");
-		if (style.bold) fontPrefixParts.push("700");
-		fontPrefixParts.push(`${fontSizePx}px`);
-		const fontPrefix = fontPrefixParts.join(" ");
-		const perScriptFallback = {
-			...style.eastAsiaFontFamily ? { [SCRIPT_CLASS.eastAsia]: resolveFontFamily(style.eastAsiaFontFamily).cssFallback } : {},
-			...style.complexScriptFontFamily ? { [SCRIPT_CLASS.complex]: resolveFontFamily(style.complexScriptFontFamily).cssFallback } : {}
+		const fontString = (family, size, bold, italic) => {
+			const fontPrefixParts = [];
+			if (italic) fontPrefixParts.push("italic");
+			if (style.smallCaps) fontPrefixParts.push("small-caps");
+			if (bold) fontPrefixParts.push("700");
+			fontPrefixParts.push(`${size * 96 / 72}px`);
+			return `${fontPrefixParts.join(" ")} ${resolveFontFamily(family).cssFallback}`;
 		};
-		if (!style.letterSpacing && (style.eastAsiaFontFamily && hasCjk(text) || style.complexScriptFontFamily && hasComplexScript(text))) {
+		const baseFont = fontString(fontFamily, fontSize, style.bold, style.italic);
+		const complex = resolveComplexScriptFormatting(style);
+		const complexFont = fontString(complex.fontFamily ?? fontFamily, complex.fontSize ?? fontSize, complex.bold ?? style.bold, complex.italic ?? style.italic);
+		if (style.forceComplexScript) {
+			ctx.font = complexFont;
+			return applyLetterSpacingToMeasuredWidth(ctx.measureText(text).width, text, style.letterSpacing);
+		}
+		if (!style.letterSpacing && (style.eastAsiaFontFamily && hasCjk(text) || hasComplexScriptFormatting(style) && hasComplexScript(text))) {
 			let segmentedWidth = 0;
 			for (const segment of segmentByScript(text)) {
-				ctx.font = `${fontPrefix} ${perScriptFallback[segment.script] ?? cssFallback}`;
+				if (segment.script === SCRIPT_CLASS.eastAsia && style.eastAsiaFontFamily) ctx.font = fontString(style.eastAsiaFontFamily, fontSize, style.bold, style.italic);
+				else if (segment.script === SCRIPT_CLASS.complex) ctx.font = complexFont;
+				else ctx.font = baseFont;
 				segmentedWidth += ctx.measureText(segment.text).width;
 			}
 			return segmentedWidth;
 		}
-		ctx.font = `${fontPrefix} ${cssFallback}`;
+		ctx.font = baseFont;
 		return applyLetterSpacingToMeasuredWidth(ctx.measureText(text).width, text, style.letterSpacing);
 	};
 }
@@ -1180,12 +1202,7 @@ function renderLine(block, line, alignment, doc, options) {
 			if (!measureText) continue;
 			const fontSize = run.fontSize || 11;
 			const fontFamily = run.fontFamily || "Calibri";
-			const measuredWidth = measureText(run.allCaps ? run.text.toLocaleUpperCase() : run.text, fontSize, fontFamily, {
-				...run.bold !== void 0 ? { bold: run.bold } : {},
-				...run.italic !== void 0 ? { italic: run.italic } : {},
-				...run.letterSpacing !== void 0 ? { letterSpacing: run.letterSpacing } : {},
-				...run.smallCaps !== void 0 ? { smallCaps: run.smallCaps } : {}
-			});
+			const measuredWidth = measureText(run.allCaps ? run.text.toLocaleUpperCase() : run.text, fontSize, fontFamily, runMeasureStyle(run));
 			reserveScaledAdvance(runEl, measuredWidth, run.horizontalScale);
 			currentX += measuredWidth * ((run.horizontalScale ?? 100) / 100);
 		} else if (isImageRun(run)) {

package/dist/layout-painter/renderUtils.d.ts

@@ -16,6 +16,8 @@ declare function resolveImageLineAlign(imageRun: ImageRun, paragraphAlignment: "
 type RenderContext = {
   /** Current page number (1-indexed) */
   pageNumber: number;
+  /** OOXML section-level format for the current logical page number. */
+  pageNumberFormat?: string;
   /** Total number of pages */
   totalPages: number;
   /** Which section is being rendered */

package/dist/managers/AutoSaveManager.js

@@ -1,10 +1,10 @@
 import { Subscribable } from "./Subscribable.js";
+import { decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelopeFromDocument } from "./autoSaveCodec.js";
 //#region src/managers/AutoSaveManager.ts
 const DEFAULT_STORAGE_KEY = "docx-editor-autosave";
 const DEFAULT_INTERVAL = 3e4;
 const DEFAULT_MAX_AGE = 1440 * 60 * 1e3;
 const DEFAULT_DEBOUNCE_DELAY = 2e3;
-const SAVE_VERSION = 1;
 function isLocalStorageAvailable() {
 	try {
 		const testKey = "__docx_editor_test__";
@@ -16,31 +16,7 @@ function isLocalStorageAvailable() {
 	}
 }
 function serializeForStorage(document) {
-	return JSON.stringify({
-		...document,
-		originalBuffer: null
-	});
-}
-function isDocumentLike(value) {
-	return typeof value === "object" && value !== null && "package" in value;
-}
-function parseSavedData(json) {
-	let parsed;
-	try {
-		parsed = JSON.parse(json);
-	} catch {
-		return null;
-	}
-	if (typeof parsed !== "object" || parsed === null) return null;
-	if (!("document" in parsed) || !("savedAt" in parsed) || !("version" in parsed)) return null;
-	const { document, savedAt, version } = parsed;
-	if (typeof savedAt !== "string" || typeof version !== "number") return null;
-	if (!isDocumentLike(document)) return null;
-	return {
-		document,
-		savedAt,
-		version
-	};
+	return encodeAutoSaveDocument(document);
 }
 function isStale(savedAt, maxAge) {
 	const savedTime = new Date(savedAt).getTime();
@@ -99,12 +75,12 @@ var AutoSaveManager = class extends Subscribable {
 		this.updateStatus("saving");
 		try {
 			const serialized = serializeForStorage(doc);
-			if (serialized === this.lastSavedJson) {
+			if (serialized.json === this.lastSavedJson) {
 				this.updateStatus("saved");
 				return true;
 			}
-			this.persistToStorage(doc);
-			this.lastSavedJson = serialized;
+			this.persistToStorage(serialized);
+			this.lastSavedJson = serialized.json;
 			const saveTime = /* @__PURE__ */ new Date();
 			this.lastSaveTime = saveTime;
 			this.updateStatus("saved");
@@ -133,7 +109,7 @@ var AutoSaveManager = class extends Subscribable {
 		if (!this.storageAvailable) return null;
 		const savedJson = localStorage.getItem(this.storageKey);
 		if (!savedJson) return null;
-		const savedData = parseSavedData(savedJson);
+		const savedData = decodeAutoSaveEnvelope(savedJson);
 		if (!savedData) return null;
 		if (isStale(savedData.savedAt, this.maxAge)) {
 			this.clear();
@@ -179,7 +155,7 @@ var AutoSaveManager = class extends Subscribable {
 	destroy() {
 		this.stopTimers();
 		if (this.isEnabled && this.currentDocument && this.storageAvailable) try {
-			this.persistToStorage(this.currentDocument);
+			this.persistToStorage(serializeForStorage(this.currentDocument));
 		} catch (error) {
 			this.onErrorCallback?.(error instanceof Error ? error : new Error(String(error)));
 		}
@@ -194,15 +170,7 @@ var AutoSaveManager = class extends Subscribable {
 		}
 	}
 	persistToStorage(document) {
-		const dataToSave = {
-			document: {
-				...document,
-				originalBuffer: null
-			},
-			savedAt: (/* @__PURE__ */ new Date()).toISOString(),
-			version: SAVE_VERSION
-		};
-		localStorage.setItem(this.storageKey, JSON.stringify(dataToSave));
+		localStorage.setItem(this.storageKey, encodeAutoSaveEnvelopeFromDocument(document, (/* @__PURE__ */ new Date()).toISOString()));
 	}
 	debounceSave() {
 		if (this.debounceTimer) clearTimeout(this.debounceTimer);

package/dist/managers/TableSelectionManager.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
+import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { Subscribable } from "./Subscribable.js";
 import { CellCoordinates } from "./types.js";
-import { TableAction, TableContext } from "../utils/tableOperations.js";
 //#region src/managers/TableSelectionManager.d.ts
 /** Data attributes for table elements in the rendered DOM */
 declare const TABLE_DATA_ATTRIBUTES: {

package/dist/managers/autoSaveCodec.d.ts

@@ -0,0 +1,17 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/managers/autoSaveCodec.d.ts
+declare const AUTOSAVE_FORMAT_VERSION = 2;
+type DecodedAutoSave = {
+  document: document_d_exports.Document;
+  savedAt: string;
+  version: typeof AUTOSAVE_FORMAT_VERSION;
+};
+type EncodedAutoSaveDocument = {
+  json: string;
+};
+declare const encodeAutoSaveDocument: (document: document_d_exports.Document) => EncodedAutoSaveDocument;
+declare const encodeAutoSaveEnvelopeFromDocument: (document: EncodedAutoSaveDocument, savedAt: string) => string;
+declare const encodeAutoSaveEnvelope: (document: document_d_exports.Document, savedAt: string) => string;
+declare const decodeAutoSaveEnvelope: (json: string) => DecodedAutoSave | null;
+//#endregion
+export { AUTOSAVE_FORMAT_VERSION, DecodedAutoSave, EncodedAutoSaveDocument, decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelope, encodeAutoSaveEnvelopeFromDocument };