@stll/folio-core 0.23.0 → 0.24.0

package/dist/controller/fontReadiness.js

@@ -1,4 +1,4 @@
-import { expectFontFamilyMarkAttrs } from "../prosemirror/attrs/index.js";
+import { expectFontFamilyMarkAttrs, expectParagraphAttrs } from "../prosemirror/attrs/index.js";
 import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
 //#region src/controller/fontReadiness.ts
 function getDocumentFontSet() {
@@ -62,13 +62,15 @@ function collectInitialLayoutFontFaces(documentModel, pmDoc) {
 	return Array.from(faces.values());
 }
 function addTextFormattingFontFaces(faces, formatting) {
-	addLayoutFontFamilyFace(faces, formatting?.fontFamily, layoutDescriptorFromFormatting(formatting));
+	const standardDescriptor = layoutDescriptorFromFormatting(formatting);
+	const complexScriptDescriptor = layoutDescriptorFromEmphasis(formatting?.boldCs ?? formatting?.bold, formatting?.italicCs ?? formatting?.italic);
+	addLayoutFontFamilyFace(faces, formatting?.fontFamily, standardDescriptor, complexScriptDescriptor);
 }
 function collectProseMirrorFontFaces(faces, node, inheritedTextFormatting) {
 	const paragraphDefaults = readParagraphDefaultTextFormatting(node);
 	const textFormatting = paragraphDefaults ?? inheritedTextFormatting;
 	if (paragraphDefaults) addTextFormattingFontFaces(faces, paragraphDefaults);
-	if (node.attrs["listMarkerFontFamily"]) addLayoutFontFamilyFace(faces, node.attrs["listMarkerFontFamily"], REGULAR_LAYOUT_FONT_DESCRIPTOR);
+	if (node.type.name === "paragraph") addTextFormattingFontFaces(faces, expectParagraphAttrs(node).listMarkerFormatting);
 	if (node.isText) {
 		const descriptor = layoutDescriptorFromFormattingAndMarks(textFormatting, node.marks);
 		addLayoutFontFamilyFace(faces, readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? DEFAULT_LAYOUT_FONT_FAMILY, descriptor);
@@ -86,9 +88,12 @@ function readFontFamilyMarkAttrs(marks) {
 	for (const mark of marks) if (mark.type.name === "fontFamily") return expectFontFamilyMarkAttrs(mark);
 }
 function layoutDescriptorFromFormatting(formatting) {
+	return layoutDescriptorFromEmphasis(formatting?.bold, formatting?.italic);
+}
+function layoutDescriptorFromEmphasis(bold, italic) {
 	return {
-		style: formatting?.italic ? "italic" : "normal",
-		weight: formatting?.bold ? 700 : 400
+		style: italic ? "italic" : "normal",
+		weight: bold ? 700 : 400
 	};
 }
 function layoutDescriptorFromFormattingAndMarks(formatting, marks) {
@@ -103,7 +108,7 @@ function layoutDescriptorFromFormattingAndMarks(formatting, marks) {
 		weight: bold ? 700 : 400
 	};
 }
-function addLayoutFontFamilyFace(faces, value, descriptor) {
+function addLayoutFontFamilyFace(faces, value, descriptor, complexScriptDescriptor = descriptor) {
 	if (typeof value === "string") {
 		addLayoutFontFamilyNameFace(faces, value, descriptor);
 		return;
@@ -112,7 +117,7 @@ function addLayoutFontFamilyFace(faces, value, descriptor) {
 	const fontFamily = value;
 	addLayoutFontFamilyFace(faces, fontFamily.ascii, descriptor);
 	addLayoutFontFamilyFace(faces, fontFamily.hAnsi, descriptor);
-	addLayoutFontFamilyFace(faces, fontFamily.cs, descriptor);
+	addLayoutFontFamilyFace(faces, fontFamily.cs, complexScriptDescriptor);
 	addLayoutFontFamilyFace(faces, fontFamily.eastAsia, descriptor);
 }
 function addLayoutFontFamilyNameFace(faces, family, descriptor) {

package/dist/controller/layoutPipeline.js

@@ -18,7 +18,7 @@ import "../layout-engine/types.js";
 import { renderPages } from "../layout-painter/renderPage.js";
 import { tryBuildIncrementalMeasures } from "../paged-layout/incrementalMeasure.js";
 import { computePerBlockMeasureInputs } from "../paged-layout/sectionBlockWidths.js";
-import { getMargins, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
+import { getMargins, getPageNumbering, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
 import { templatePreviewValuesKey } from "../prosemirror/plugins/templatePreviewValues.js";
 import { getDocumentWatermark } from "../watermark/index.js";
 //#region src/controller/layoutPipeline.ts
@@ -195,7 +195,8 @@ function runLayoutPipeline(deps, state, options = {}) {
 		phaseStartedAt = performance.now();
 		const bodyLayoutConfig = {
 			pageSize,
-			margins: initialBodyMargins
+			margins: initialBodyMargins,
+			pageNumbering: getPageNumbering(sectionProperties)
 		};
 		if (columns !== void 0) bodyLayoutConfig.columns = columns;
 		const finalSectionProperties = document?.package.document.sections?.at(-1)?.properties;
@@ -213,7 +214,8 @@ function runLayoutPipeline(deps, state, options = {}) {
 				authoredMargins: getMargins(finalSectionProperties),
 				preparedHeader: finalHeaderForLayout,
 				preparedFooter: finalFooterForLayout
-			})
+			}),
+			pageNumbering: getPageNumbering(finalSectionProperties)
 		} : bodyLayoutConfig;
 		const finalColumns = getColumns(finalSectionProperties);
 		if (finalColumns !== void 0) finalLayoutConfig.columns = finalColumns;
@@ -258,6 +260,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 			const nextLayoutOpts = {
 				pageSize,
 				margins: initialBodyMargins,
+				pageNumbering: bodyLayoutConfig.pageNumbering,
 				pageGap,
 				mirrorMargins
 			};
@@ -273,6 +276,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 					count: 1,
 					gap: 0
 				};
+				nextLayoutOpts.finalPageNumbering = finalLayoutConfig.pageNumbering;
 			}
 			if (columns !== void 0) nextLayoutOpts.columns = columns;
 			if (bodyBreakType !== void 0) nextLayoutOpts.bodyBreakType = bodyBreakType;

package/dist/docx/blockContentParser.js

@@ -1,58 +1,13 @@
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInBlocks } from "./bookmarkPlacement.js";
 import { convertBulletToUnicode } from "./bulletMarkers.js";
-import { padDecimal } from "./numberingParser.js";
+import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { parseSdtProperties } from "./sdtProperties.js";
 import { parseTable } from "./tableParser.js";
 import { elementToXml, findChild, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
 //#region src/docx/blockContentParser.ts
-const toRoman = (numParam) => {
-	let num = numParam;
-	const romanNumerals = [
-		[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"]
-	];
-	let result = "";
-	for (const [value, symbol] of romanNumerals) while (num >= value) {
-		result += symbol;
-		num -= value;
-	}
-	return result;
-};
-const toRepeatedLetter = (value, baseCodePoint) => {
-	if (value <= 0) return "0";
-	const zeroBased = value - 1;
-	return String.fromCodePoint(baseCodePoint + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
-};
-const formatNumber = (value, numFmt) => {
-	switch (numFmt) {
-		case "decimal": return String(value);
-		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 "lowerLetter": return toRepeatedLetter(value, 97);
-		case "upperLetter": return toRepeatedLetter(value, 65);
-		case "lowerRoman": return toRoman(value).toLowerCase();
-		case "upperRoman": return toRoman(value);
-		case "bullet": return "•";
-		case "none": return "";
-		default: return String(value);
-	}
-};
 const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList, siblingNumIdsByAbstractNumId }) => {
 	const listRendering = paragraph.listRendering;
 	if (!listRendering || !numbering) {
@@ -137,7 +92,7 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 		if (computedMarker.includes(placeholder)) {
 			const value = counters[lvl] ?? 0;
 			const levelInfo = numbering.getLevel(numId, lvl);
-			const formatted = formatNumber(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
+			const formatted = formatOoxmlCounter(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
 			computedMarker = computedMarker.replaceAll(placeholder, formatted);
 		}
 	}

package/dist/docx/fieldParser.d.ts

@@ -188,7 +188,7 @@ declare function isTocField(field: document_d_exports.Field): boolean;
  * @param instruction - Parsed instruction for format switches
  * @returns Formatted page number string
  */
-declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction): string;
+declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction, sectionFormat?: string): string;
 /**
  * Format a date according to a format string
  *

package/dist/docx/fieldParser.js

@@ -345,16 +345,24 @@ function isTocField(field) {
 * @param instruction - Parsed instruction for format switches
 * @returns Formatted page number string
 */
-function computePageNumber(pageNumber, instruction) {
-	if (!instruction) return String(pageNumber);
-	const format = getFormatSwitch(instruction);
-	if (!format) return String(pageNumber);
+function computePageNumber(pageNumber, instruction, sectionFormat) {
+	const format = instruction ? getFormatSwitch(instruction) : void 0;
+	if (!format || format.toUpperCase() === "MERGEFORMAT") return formatSectionPageNumber(pageNumber, sectionFormat);
 	switch (format.toUpperCase()) {
 		case "ROMAN": return toRoman(pageNumber);
 		case "ALPHABETIC": return toLetter(pageNumber);
 		default: return String(pageNumber);
 	}
 }
+function formatSectionPageNumber(pageNumber, format) {
+	switch (format) {
+		case "upperRoman": return toRoman(pageNumber);
+		case "lowerRoman": return toRoman(pageNumber).toLowerCase();
+		case "upperLetter": return toLetter(pageNumber);
+		case "lowerLetter": return toLetter(pageNumber).toLowerCase();
+		default: return String(pageNumber);
+	}
+}
 /**
 * Convert number to uppercase Roman numerals
 */

package/dist/docx/numberingParser.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 //#region src/docx/numberingParser.d.ts
 /**
  * Map of rId to numbering definitions
@@ -23,6 +24,7 @@ type NumberingMap = {
  * @returns NumberingMap with definitions and helper functions
  */
 declare function parseNumbering(numberingXml: string | null): NumberingMap;
+declare const markerFormattingFromLevel: (formatting: document_d_exports.TextFormatting | undefined) => document_d_exports.ListMarkerFormatting | undefined;
 declare function getCachedNumberingMap(definitions: document_d_exports.NumberingDefinitions): NumberingMap;
 /**
  * Create a NumberingMap with helper functions
@@ -46,16 +48,6 @@ declare function computeListRendering(numPr: {
 }, numbering: NumberingMap): (document_d_exports.ListRendering & {
   levelStarts: number[];
 }) | null;
-/**
- * Format a number according to the specified format
- *
- * @param num - The number to format
- * @param format - The number format
- * @returns Formatted string
- */
-declare function formatNumber(num: number, format: document_d_exports.NumberFormat): string;
-/** Zero-pad a counter to `width` digits ("decimalZero" family, §17.18.59). */
-declare function padDecimal(num: number, width: number): string;
 /**
  * Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
  * `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
@@ -89,4 +81,4 @@ declare function getBulletCharacter(level: document_d_exports.ListLevel): string
  */
 declare function isBulletLevel(level: document_d_exports.ListLevel): boolean;
 //#endregion
-export { NumberingMap, computeListRendering, createNumberingMap, formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -1,4 +1,6 @@
-import { FontHintSchema, LevelSuffixSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
+import { LevelSuffixSchema, narrowEnum } from "./parserEnums.js";
+import { parseRunProperties } from "./runParser.js";
 import { findChild, findChildren, getAttribute, parseBooleanElement, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/numberingParser.ts
 const NUMBER_FORMAT_MAP = {
@@ -314,7 +316,10 @@ function parseListLevel(element) {
 		};
 	}
 	if (pPrEl) level.pPr = parseLevelParagraphProps(pPrEl);
-	if (rPrEl) level.rPr = parseLevelRunProps(rPrEl);
+	if (rPrEl) {
+		const runProperties = parseRunProperties(rPrEl, null);
+		if (runProperties) level.rPr = runProperties;
+	}
 	return level;
 }
 /**
@@ -427,79 +432,21 @@ function parseTabLeader(val) {
 		default: return;
 	}
 }
-/**
-* Parse run properties for a list level (subset of full rPr)
-* Main concern: fonts for bullet characters
-*/
-function parseLevelRunProps(rPr) {
-	const formatting = {};
-	let rFontsEl;
-	let szEl;
-	let colorEl;
-	let bEl;
-	let iEl;
-	let vanishEl;
-	for (const child of rPr.elements ?? []) {
-		if (child.type !== "element") continue;
-		switch (child.name) {
-			case "w:rFonts":
-				rFontsEl ??= child;
-				break;
-			case "w:sz":
-				szEl ??= child;
-				break;
-			case "w:color":
-				colorEl ??= child;
-				break;
-			case "w:b":
-				bEl ??= child;
-				break;
-			case "w:i":
-				iEl ??= child;
-				break;
-			case "w:vanish":
-				vanishEl ??= child;
-				break;
-			default: break;
-		}
-	}
-	if (rFontsEl) {
-		const ascii = getAttribute(rFontsEl, "w", "ascii");
-		const hAnsi = getAttribute(rFontsEl, "w", "hAnsi");
-		const eastAsia = getAttribute(rFontsEl, "w", "eastAsia");
-		const cs = getAttribute(rFontsEl, "w", "cs");
-		const hint = narrowEnum(getAttribute(rFontsEl, "w", "hint"), FontHintSchema);
-		formatting.fontFamily = {
-			...ascii != null ? { ascii } : {},
-			...hAnsi != null ? { hAnsi } : {},
-			...eastAsia != null ? { eastAsia } : {},
-			...cs != null ? { cs } : {},
-			...hint !== void 0 ? { hint } : {}
-		};
-	}
-	if (szEl) {
-		const size = parseNumericAttribute(szEl, "w", "val");
-		if (size !== void 0) formatting.fontSize = size;
-	}
-	if (colorEl) {
-		const val = getAttribute(colorEl, "w", "val");
-		const validatedThemeColor = narrowEnum(getAttribute(colorEl, "w", "themeColor"), ThemeColorSlotSchema);
-		if (val === "auto") formatting.color = { auto: true };
-		else if (validatedThemeColor) {
-			const themeTint = getAttribute(colorEl, "w", "themeTint");
-			const themeShade = getAttribute(colorEl, "w", "themeShade");
-			formatting.color = {
-				themeColor: validatedThemeColor,
-				...themeTint != null ? { themeTint } : {},
-				...themeShade != null ? { themeShade } : {}
-			};
-		} else if (val) formatting.color = { rgb: val };
-	}
-	if (bEl) formatting.bold = parseBooleanElement(bEl);
-	if (iEl) formatting.italic = parseBooleanElement(iEl);
-	if (vanishEl) formatting.hidden = parseBooleanElement(vanishEl);
-	return formatting;
-}
+const markerFormattingFromLevel = (formatting) => {
+	if (!formatting) return;
+	const markerFormatting = {
+		...formatting.fontFamily !== void 0 ? { fontFamily: formatting.fontFamily } : {},
+		...formatting.fontSize !== void 0 ? { fontSize: formatting.fontSize } : {},
+		...formatting.fontSizeCs !== void 0 ? { fontSizeCs: formatting.fontSizeCs } : {},
+		...formatting.bold !== void 0 ? { bold: formatting.bold } : {},
+		...formatting.boldCs !== void 0 ? { boldCs: formatting.boldCs } : {},
+		...formatting.italic !== void 0 ? { italic: formatting.italic } : {},
+		...formatting.italicCs !== void 0 ? { italicCs: formatting.italicCs } : {},
+		...formatting.rtl !== void 0 ? { rtl: formatting.rtl } : {},
+		...formatting.cs !== void 0 ? { cs: formatting.cs } : {}
+	};
+	return Object.keys(markerFormatting).length > 0 ? markerFormatting : void 0;
+};
 /**
 * Per-definitions cache for `createNumberingMap`. Style application rebuilds
 * the lookup map on every picker click otherwise; the definitions object is
@@ -602,10 +549,8 @@ function computeListRendering(numPr, numbering) {
 	};
 	if (level.isLgl) rendering.isLegal = true;
 	if (level.rPr?.hidden) rendering.markerHidden = true;
-	const markerFont = level.rPr?.fontFamily?.ascii || level.rPr?.fontFamily?.hAnsi;
-	if (markerFont) rendering.markerFontFamily = markerFont;
-	if (level.rPr?.fontSize) rendering.markerFontSize = level.rPr.fontSize / 2;
-	if (level.rPr?.bold !== void 0) rendering.markerBold = level.rPr.bold;
+	const markerFormatting = markerFormattingFromLevel(level.rPr);
+	if (markerFormatting) rendering.markerFormatting = markerFormatting;
 	if (level.rPr?.allCaps) rendering.markerAllCaps = true;
 	if (level.lvlJc) rendering.markerAlignment = level.lvlJc;
 	if (level.suffix) rendering.markerSuffix = level.suffix;
@@ -614,37 +559,6 @@ function computeListRendering(numPr, numbering) {
 	return rendering;
 }
 /**
-* Format a number according to the specified format
-*
-* @param num - The number to format
-* @param format - The number format
-* @returns Formatted string
-*/
-function formatNumber(num, format) {
-	switch (format) {
-		case "decimal": return num.toString();
-		case "decimalZero": return padDecimal(num, 2);
-		case "decimalZero3": return padDecimal(num, 3);
-		case "decimalZero4": return padDecimal(num, 4);
-		case "decimalZero5": return padDecimal(num, 5);
-		case "upperRoman": return toRoman(num).toUpperCase();
-		case "lowerRoman": return toRoman(num).toLowerCase();
-		case "upperLetter": return toLetter(num).toUpperCase();
-		case "lowerLetter": return toLetter(num).toLowerCase();
-		case "ordinal": return toOrdinal(num);
-		case "bullet": return "•";
-		case "none": return "";
-		case "decimalEnclosedParen": return `(${num})`;
-		case "numberInDash": return `-${num}-`;
-		default: return num.toString();
-	}
-}
-/** Zero-pad a counter to `width` digits ("decimalZero" family, §17.18.59). */
-function padDecimal(num, width) {
-	if (num < 0) return num.toString();
-	return num.toString().padStart(width, "0");
-}
-/**
 * Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
 * `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
 * avoids JSON.stringify equality, which is sensitive to key order.
@@ -654,52 +568,6 @@ function numPrEqual(a, b) {
 	return a.numId === b.numId && (a.ilvl ?? 0) === (b.ilvl ?? 0);
 }
 /**
-* Convert number to Roman numerals
-*/
-function toRoman(num) {
-	if (num <= 0 || num > 3999) return num.toString();
-	const romanNumerals = [
-		[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"]
-	];
-	let result = "";
-	let remaining = num;
-	for (const [value, numeral] of romanNumerals) while (remaining >= value) {
-		result += numeral;
-		remaining -= value;
-	}
-	return result;
-}
-function toLetter(num) {
-	if (num <= 0) return "";
-	const zeroBased = num - 1;
-	return String.fromCodePoint(97 + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
-}
-/**
-* Convert number to ordinal (1st, 2nd, 3rd, ...)
-*/
-function toOrdinal(num) {
-	const suffix = [
-		"th",
-		"st",
-		"nd",
-		"rd"
-	];
-	const v = num % 100;
-	return num + (suffix[(v - 20) % 10] ?? suffix[v] ?? suffix[0] ?? "th");
-}
-/**
 * Render list marker text by replacing placeholders with formatted numbers
 *
 * @param lvlText - The level text pattern (e.g., "%1.", "%1.%2")
@@ -713,7 +581,7 @@ function renderListMarker(lvlText, counters, formats) {
 		const placeholder = `%${i}`;
 		if (result.includes(placeholder)) {
 			const counterIndex = i - 1;
-			const formatted = formatNumber(counters[counterIndex] ?? 1, formats[counterIndex] ?? "decimal");
+			const formatted = formatOoxmlCounter(counters[counterIndex] ?? 1, formats[counterIndex] ?? "decimal");
 			result = result.replaceAll(placeholder, formatted);
 		}
 	}
@@ -742,4 +610,4 @@ function isBulletLevel(level) {
 	return level.numFmt === "bullet" || level.numFmt === "none";
 }
 //#endregion
-export { computeListRendering, createNumberingMap, formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/ooxmlCounterFormatter.d.ts

@@ -0,0 +1,8 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/docx/ooxmlCounterFormatter.d.ts
+/** Zero-pad a counter to `width` digits (the `decimalZero` family). */
+declare const padDecimal: (value: number, width: number) => string;
+/** Format one OOXML numbering counter using Microsoft Word display semantics. */
+declare const formatOoxmlCounter: (value: number, format: document_d_exports.NumberFormat | undefined) => string;
+//#endregion
+export { formatOoxmlCounter, padDecimal };

package/dist/docx/ooxmlCounterFormatter.js

@@ -0,0 +1,134 @@
+//#region src/docx/ooxmlCounterFormatter.ts
+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"]
+];
+const LATIN_LOWER_SEQUENCE = [..."abcdefghijklmnopqrstuvwxyz"];
+const ARABIC_ALPHA_SEQUENCE = [..."أبتثجحخدذرزسشصضطظعغفقكلمنهوي"];
+const ARABIC_ABJAD_SEQUENCE = [..."أبجدهوزحطيكلمنسعفصقرشتثخذضظغ"];
+const ZERO_WIDTH_NON_JOINER = "‌";
+const MAX_REPEATED_COUNTER_LENGTH = 1024;
+const toRoman = (value) => {
+	if (value <= 0 || value > 3999) return String(value);
+	let remaining = value;
+	let result = "";
+	for (const [number, numeral] of ROMAN_PAIRS) while (remaining >= number) {
+		result += numeral;
+		remaining -= number;
+	}
+	return result;
+};
+const toRepeatedSequence = (value, sequence) => {
+	if (!Number.isSafeInteger(value) || value <= 0) return "";
+	const zeroBased = value - 1;
+	const character = sequence.at(zeroBased % sequence.length);
+	const repetitions = Math.floor(zeroBased / sequence.length) + 1;
+	if (repetitions > MAX_REPEATED_COUNTER_LENGTH) return;
+	return character?.repeat(repetitions) ?? "";
+};
+const toOrdinal = (value) => {
+	const suffixes = [
+		"th",
+		"st",
+		"nd",
+		"rd"
+	];
+	const remainder = value % 100;
+	return `${value}${suffixes[(remainder - 20) % 10] ?? suffixes[remainder] ?? "th"}`;
+};
+/** Zero-pad a counter to `width` digits (the `decimalZero` family). */
+const padDecimal = (value, width) => {
+	if (value < 0) return String(value);
+	return String(value).padStart(width, "0");
+};
+/** Format one OOXML numbering counter using Microsoft Word display semantics. */
+const formatOoxmlCounter = (value, format) => {
+	if (!Number.isFinite(value)) return "";
+	switch (format ?? "decimal") {
+		case "decimal":
+		case "cardinalText":
+		case "ordinalText":
+		case "hex":
+		case "chicago":
+		case "ideographDigital":
+		case "japaneseCounting":
+		case "aiueo":
+		case "iroha":
+		case "decimalFullWidth":
+		case "decimalHalfWidth":
+		case "japaneseLegal":
+		case "japaneseDigitalTenThousand":
+		case "decimalEnclosedCircle":
+		case "decimalFullWidth2":
+		case "aiueoFullWidth":
+		case "irohaFullWidth":
+		case "ganada":
+		case "chosung":
+		case "decimalEnclosedFullstop":
+		case "decimalEnclosedCircleChinese":
+		case "ideographEnclosedCircle":
+		case "ideographTraditional":
+		case "ideographZodiac":
+		case "ideographZodiacTraditional":
+		case "taiwaneseCounting":
+		case "ideographLegalTraditional":
+		case "taiwaneseCountingThousand":
+		case "taiwaneseDigital":
+		case "chineseCounting":
+		case "chineseLegalSimplified":
+		case "chineseCountingThousand":
+		case "koreanDigital":
+		case "koreanCounting":
+		case "koreanLegal":
+		case "koreanDigital2":
+		case "vietnameseCounting":
+		case "russianLower":
+		case "russianUpper":
+		case "hebrew1":
+		case "hebrew2":
+		case "hindiVowels":
+		case "hindiConsonants":
+		case "hindiNumbers":
+		case "hindiCounting":
+		case "thaiLetters":
+		case "thaiNumbers":
+		case "thaiCounting": return String(value);
+		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 "upperRoman": return toRoman(value);
+		case "lowerRoman": return toRoman(value).toLowerCase();
+		case "upperLetter": return (toRepeatedSequence(value, LATIN_LOWER_SEQUENCE) ?? String(value)).toUpperCase();
+		case "lowerLetter": return toRepeatedSequence(value, LATIN_LOWER_SEQUENCE) ?? String(value);
+		case "ordinal": return toOrdinal(value);
+		case "bullet": return "•";
+		case "none": return "";
+		case "decimalEnclosedParen": return `(${value})`;
+		case "numberInDash": return `-${value}-`;
+		case "arabicAlpha": {
+			const counter = toRepeatedSequence(value, ARABIC_ALPHA_SEQUENCE);
+			if (counter === void 0) return String(value);
+			return counter ? `${counter}${ZERO_WIDTH_NON_JOINER}` : "";
+		}
+		case "arabicAbjad": {
+			const counter = toRepeatedSequence(value, ARABIC_ABJAD_SEQUENCE);
+			if (counter === void 0) return String(value);
+			return counter ? `${ZERO_WIDTH_NON_JOINER}${counter}` : "";
+		}
+		default: return String(value);
+	}
+};
+//#endregion
+export { formatOoxmlCounter, padDecimal };

package/dist/docx/paragraphParser.js

@@ -2,6 +2,7 @@ import { isValidHexId } from "../utils/hexId.js";
 import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
 import { parseFieldType } from "./fieldParser.js";
 import { parseHyperlink as parseHyperlink$1 } from "./hyperlinkParser.js";
+import { markerFormattingFromLevel } from "./numberingParser.js";
 import { BorderStyleSchema, FrameWrapSchema, FrameXAlignSchema, FrameYAlignSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, TabLeaderSchema, TabStopAlignmentSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { consolidateParagraphContent } from "./runConsolidator.js";
 import { parseRun, parseRunProperties } from "./runParser.js";
@@ -1016,10 +1017,8 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 				if (level.isLgl) listRendering.isLegal = true;
 				listRendering.numFmt = level.isLgl ? "decimal" : level.numFmt;
 				if (level.rPr?.hidden) listRendering.markerHidden = true;
-				const markerFont = level.rPr?.fontFamily?.ascii || level.rPr?.fontFamily?.hAnsi;
-				if (markerFont) listRendering.markerFontFamily = markerFont;
-				if (level.rPr?.fontSize) listRendering.markerFontSize = level.rPr.fontSize / 2;
-				if (level.rPr?.bold !== void 0) listRendering.markerBold = level.rPr.bold;
+				const markerFormatting = markerFormattingFromLevel(level.rPr);
+				if (markerFormatting) listRendering.markerFormatting = markerFormatting;
 				if (level.rPr?.allCaps) listRendering.markerAllCaps = true;
 				if (level.lvlJc) listRendering.markerAlignment = level.lvlJc;
 				if (level.suffix) listRendering.markerSuffix = level.suffix;

package/dist/docx/serializer/tableSerializer.js

@@ -134,7 +134,7 @@ function serializeTableFormatting(formatting, propertyChanges) {
 		if (formatting.styleId) parts.push(`<w:tblStyle w:val="${escapeXml(formatting.styleId)}"/>`);
 		const floatingXml = serializeFloatingTableProperties(formatting.floating);
 		if (floatingXml) parts.push(floatingXml);
-		if (formatting.bidi) parts.push("<w:bidiVisual/>");
+		if (formatting.bidi !== void 0) parts.push(formatting.bidi ? "<w:bidiVisual/>" : "<w:bidiVisual w:val=\"0\"/>");
 		const widthXml = serializeMeasurement(formatting.width, "tblW");
 		if (widthXml) parts.push(widthXml);
 		if (formatting.justification) parts.push(`<w:jc w:val="${formatting.justification}"/>`);

package/dist/docx/tableParser.js

@@ -284,7 +284,8 @@ function parseTableProperties(tblPrElement) {
 	}
 	const floating = parseFloatingTableProperties(findChild(tblPrElement, "w", "tblpPr"));
 	if (floating) formatting.floating = floating;
-	if (parseBooleanElement(findChild(tblPrElement, "w", "bidiVisual"))) formatting.bidi = true;
+	const bidiVisual = findChild(tblPrElement, "w", "bidiVisual");
+	if (bidiVisual) formatting.bidi = parseBooleanElement(bidiVisual);
 	if (Object.keys(formatting).length === 0) return;
 	return formatting;
 }