@stll/folio-core 0.23.1 → 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/docx/numberingParser.d.ts

@@ -24,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
@@ -80,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, formatOoxmlCounter as 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,5 +1,6 @@
 import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
-import { FontHintSchema, LevelSuffixSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.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 = {
@@ -315,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;
 }
 /**
@@ -428,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
@@ -603,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;
@@ -666,4 +610,4 @@ function isBulletLevel(level) {
 	return level.numFmt === "bullet" || level.numFmt === "none";
 }
 //#endregion
-export { computeListRendering, createNumberingMap, formatOoxmlCounter as 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/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/layout-bridge/convert/headerFooterLayout.js

@@ -442,7 +442,7 @@ function serializeParagraphAttrs(attrs) {
 		"listMarker",
 		"listIsBullet",
 		"listMarkerHidden",
-		"listMarkerBold",
+		"listMarkerFormatting",
 		"listMarkerAlignment",
 		"listMarkerSuffix",
 		"tabs"

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

@@ -362,8 +362,7 @@ function applyRunFormattingOverrides(formatting, attrs) {
 	if (attrs.fontSizeCs !== void 0) formatting.complexScriptFontSize = attrs.fontSizeCs / 2;
 	if (attrs.cs !== void 0) formatting.forceComplexScript = attrs.cs;
 }
-function paragraphRunDefaults(pmAttrs, theme) {
-	const defaultTextFormatting = pmAttrs.defaultTextFormatting;
+function textFormattingToRunFormatting(defaultTextFormatting, theme) {
 	if (!defaultTextFormatting) return {};
 	const result = {};
 	const fontFamily = defaultTextFormatting.fontFamily ? resolveWesternThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
@@ -379,6 +378,7 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (defaultTextFormatting.boldCs !== void 0) result.complexScriptBold = defaultTextFormatting.boldCs;
 	if (defaultTextFormatting.italic !== void 0) result.italic = defaultTextFormatting.italic;
 	if (defaultTextFormatting.italicCs !== void 0) result.complexScriptItalic = defaultTextFormatting.italicCs;
+	if (defaultTextFormatting.rtl !== void 0) result.rtl = defaultTextFormatting.rtl;
 	if (defaultTextFormatting.cs !== void 0) result.forceComplexScript = defaultTextFormatting.cs;
 	if (defaultTextFormatting.underline && defaultTextFormatting.underline.style !== "none") {
 		result.underline = { style: defaultTextFormatting.underline.style };
@@ -408,6 +408,9 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (defaultTextFormatting.emphasisMark && defaultTextFormatting.emphasisMark !== "none") result.emphasisMark = defaultTextFormatting.emphasisMark;
 	return result;
 }
+function paragraphRunDefaults(pmAttrs, theme) {
+	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme);
+}
 /**
 * Build an ImageRun from ProseMirror node attrs, applying conditional property assignment
 * to satisfy exactOptionalPropertyTypes.
@@ -653,12 +656,8 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listStartOverride !== void 0) attrs.listStartOverride = listStartOverride;
 	const listMarkerHidden = previousFormatting.listMarkerHidden;
 	if (listMarkerHidden !== void 0) attrs.listMarkerHidden = listMarkerHidden;
-	const listMarkerFontFamily = previousFormatting.listMarkerFontFamily;
-	if (listMarkerFontFamily !== void 0) attrs.listMarkerFontFamily = listMarkerFontFamily;
-	const listMarkerFontSize = previousFormatting.listMarkerFontSize;
-	if (listMarkerFontSize !== void 0) attrs.listMarkerFontSize = listMarkerFontSize;
-	const listMarkerBold = previousFormatting.listMarkerBold;
-	if (listMarkerBold !== void 0) attrs.listMarkerBold = listMarkerBold;
+	const listMarkerFormatting = previousFormatting.listMarkerFormatting;
+	if (listMarkerFormatting !== void 0) attrs.listMarkerFormatting = listMarkerFormatting;
 	const listMarkerAlignment = previousFormatting.listMarkerAlignment;
 	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
 	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
@@ -674,7 +673,7 @@ function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractC
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds) {
+function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds, theme) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
 	const marker = resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds);
 	if (!marker) return;
@@ -682,9 +681,7 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCo
 	attrs.listMarkerRevision = toListMarkerRevision("del", change.info);
 	if (previousListAttrs.listIsBullet !== void 0) attrs.listIsBullet = previousListAttrs.listIsBullet;
 	if (previousListAttrs.listMarkerHidden !== void 0) attrs.listMarkerHidden = previousListAttrs.listMarkerHidden;
-	if (previousListAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = previousListAttrs.listMarkerFontFamily;
-	if (previousListAttrs.listMarkerFontSize) attrs.listMarkerFontSize = previousListAttrs.listMarkerFontSize;
-	if (previousListAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = previousListAttrs.listMarkerBold;
+	if (previousListAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(previousListAttrs.listMarkerFormatting, theme);
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
@@ -820,15 +817,13 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;
 	if (pmAttrs.listMarkerHidden) attrs.listMarkerHidden = true;
-	if (pmAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = pmAttrs.listMarkerFontFamily;
-	if (pmAttrs.listMarkerFontSize) attrs.listMarkerFontSize = pmAttrs.listMarkerFontSize;
-	if (pmAttrs.listMarkerBold !== null && pmAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = pmAttrs.listMarkerBold;
+	if (pmAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(pmAttrs.listMarkerFormatting, theme);
 	if (pmAttrs.listMarkerAlignment) attrs.listMarkerAlignment = pmAttrs.listMarkerAlignment;
 	if (pmAttrs.listMarkerSuffix) attrs.listMarkerSuffix = pmAttrs.listMarkerSuffix;
 	if (pmAttrs.listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = pmAttrs.listMarkerSecondSlotOffsetTwips;
 	if (!pmAttrs.numPr) {
 		const numberingRemovedChange = propertyChanges.find(isRemovedNumberingChange);
-		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds);
+		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds, theme);
 	}
 	if (defaultTabStopTwips !== void 0) attrs.defaultTabStopTwips = defaultTabStopTwips;
 	const dtf = pmAttrs.defaultTextFormatting;

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

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

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

@@ -186,6 +186,10 @@ function hashParagraphBlock(block) {
 		if (attrs.reserveEmptyOutlineHeight) parts.push("outline-empty-reserve");
 		if (attrs.documentGridLinePitch !== void 0) parts.push(`documentGrid:${attrs.documentGridLinePitch}|${attrs.snapToGrid !== false}`);
 		if (attrs.justificationCompatibility) parts.push(`justify-compat:${attrs.justificationCompatibility.type}`);
+		if (attrs.listMarker !== void 0) {
+			const marker = attrs.listMarkerFormatting;
+			parts.push(`marker:${attrs.listMarker}|${attrs.listMarkerHidden}|${attrs.listMarkerAlignment}|${attrs.listMarkerSuffix}|${marker?.fontFamily}|${marker?.eastAsiaFontFamily}|${marker?.complexScriptFontFamily}|${marker?.fontSize}|${marker?.complexScriptFontSize}|${marker?.bold}|${marker?.complexScriptBold}|${marker?.italic}|${marker?.complexScriptItalic}|${marker?.rtl}|${marker?.forceComplexScript}`);
+		}
 		parts.push(...lineBreakPolicyCacheParts(attrs));
 		const borders = attrs.borders;
 		if (borders) {

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

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

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

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

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, SectionPageNumbering, 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.
@@ -127,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.
  */
@@ -461,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";
   /**
@@ -1380,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, 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 };
+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/renderParagraph.js

@@ -2,7 +2,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 { getListMarkerInlineWidth, getListMarkerVisualOffset, resolveListMarkerFont } 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";
 import { isFloatingImageRun } from "../layout-engine/types.js";
@@ -1463,18 +1463,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			const markerStart = hanging > 0 ? indentLeft - hanging : indentLeft + firstLine;
 			lineEl.style.paddingLeft = `${Math.max(0, markerStart)}px`;
 			lineEl.style.textIndent = "0";
-			let firstTextRun;
-			if (!block.attrs.listMarkerFontFamily || !block.attrs.listMarkerFontSize || block.attrs.listMarkerBold === void 0) for (let ri = line.fromRun; ri <= line.toRun; ri++) {
-				const r = block.runs[ri];
-				if (r && r.kind === "text") {
-					firstTextRun = r;
-					break;
-				}
-			}
-			const markerFontFamily = block.attrs.listMarkerFontFamily ?? firstTextRun?.fontFamily ?? block.attrs.defaultFontFamily;
-			const markerFontSize = block.attrs.listMarkerFontSize ?? firstTextRun?.fontSize ?? block.attrs.defaultFontSize;
-			const markerBold = block.attrs.listMarkerBold ?? firstTextRun?.bold;
-			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), getListMarkerVisualOffset(block), doc, markerFontFamily, markerFontSize, markerBold, block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
+			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), getListMarkerVisualOffset(block), doc, resolveListMarkerFont(block), block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
 			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
 			if (markerMarginLeft < 0) marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
@@ -1491,13 +1480,15 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 * tab grid. Long markers like "1.1.1." therefore grow to the next stop
 * instead of butting against the body text.
 */
-function renderListMarker(marker, inlineWidth, visualOffset, doc, fontFamily, fontSize, bold, revision, secondSlotOffsetTwips) {
+function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, revision, secondSlotOffsetTwips) {
 	const span = doc.createElement("span");
 	span.className = "layout-list-marker";
 	span.style.display = "inline-block";
-	if (fontFamily) span.style.fontFamily = resolveFontFamily(fontFamily).cssFallback;
-	if (fontSize) span.style.fontSize = `${fontSize * 96 / 72}px`;
-	if (bold !== void 0) span.style.fontWeight = bold ? "700" : "normal";
+	span.style.fontFamily = resolveFontFamily(formatting.fontFamily).cssFallback;
+	if (formatting.fontSize) span.style.fontSize = `${formatting.fontSize * 96 / 72}px`;
+	if (formatting.bold !== void 0) span.style.fontWeight = formatting.bold ? "700" : "normal";
+	if (formatting.italic !== void 0) span.style.fontStyle = formatting.italic ? "italic" : "normal";
+	if (formatting.rtl !== void 0) span.dir = formatting.rtl ? "rtl" : "ltr";
 	span.style.textAlign = "left";
 	span.style.textAlignLast = "left";
 	span.style.boxSizing = "border-box";

package/dist/prosemirror/attrs/index.js

@@ -162,9 +162,7 @@ const readParagraphAttrs = (node) => {
 	optionalBoolean(attrs, "listIsLegal", "paragraph.attrs.listIsLegal", issues);
 	optionalString(attrs, "listMarker", "paragraph.attrs.listMarker", issues);
 	optionalBoolean(attrs, "listMarkerHidden", "paragraph.attrs.listMarkerHidden", issues);
-	optionalString(attrs, "listMarkerFontFamily", "paragraph.attrs.listMarkerFontFamily", issues);
-	optionalNumber(attrs, "listMarkerFontSize", "paragraph.attrs.listMarkerFontSize", issues);
-	optionalBoolean(attrs, "listMarkerBold", "paragraph.attrs.listMarkerBold", issues);
+	optionalTextFormatting(attrs, "listMarkerFormatting", "paragraph.attrs.listMarkerFormatting", issues);
 	optionalOneOf(attrs, "listMarkerAlignment", "paragraph.attrs.listMarkerAlignment", issues, [
 		"left",
 		"center",
@@ -1397,12 +1395,10 @@ const validateParagraphFormatting = (value, path, issues) => {
 		"listIsBullet",
 		"listIsLegal",
 		"listMarkerHidden",
-		"listMarkerBold",
 		"listMarkerAllCaps"
 	]) optionalBoolean(value, key, `${path}.${key}`, issues);
 	for (const key of PARAGRAPH_FORMATTING_NUMBER_KEYS) optionalNumber(value, key, `${path}.${key}`, issues);
 	for (const key of [
-		"listMarkerFontSize",
 		"listImplicitChildLevelAdvances",
 		"listMarkerSecondSlotOffsetTwips",
 		"listAbstractNumId",
@@ -1412,7 +1408,7 @@ const validateParagraphFormatting = (value, path, issues) => {
 	optionalString(value, "styleId", `${path}.styleId`, issues);
 	optionalOneOf(value, "listNumFmt", `${path}.listNumFmt`, issues, NUMBER_FORMAT_VALUES);
 	optionalString(value, "listMarker", `${path}.listMarker`, issues);
-	optionalString(value, "listMarkerFontFamily", `${path}.listMarkerFontFamily`, issues);
+	optionalTextFormatting(value, "listMarkerFormatting", `${path}.listMarkerFormatting`, issues);
 	optionalOneOf(value, "listMarkerAlignment", `${path}.listMarkerAlignment`, issues, [
 		"left",
 		"center",

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -421,9 +421,7 @@ function listRenderingFromAttrs(attrs) {
 		...attrs.listIsLegal != null && { isLegal: attrs.listIsLegal },
 		...attrs.listNumFmt != null && { numFmt: attrs.listNumFmt },
 		...attrs.listMarkerHidden != null && { markerHidden: attrs.listMarkerHidden },
-		...attrs.listMarkerFontFamily != null && { markerFontFamily: attrs.listMarkerFontFamily },
-		...attrs.listMarkerFontSize != null && { markerFontSize: attrs.listMarkerFontSize },
-		...attrs.listMarkerBold != null && { markerBold: attrs.listMarkerBold },
+		...attrs.listMarkerFormatting != null && { markerFormatting: attrs.listMarkerFormatting },
 		...attrs.listMarkerAlignment != null && { markerAlignment: attrs.listMarkerAlignment },
 		...attrs.listMarkerSuffix != null && { markerSuffix: attrs.listMarkerSuffix },
 		...attrs.listMarkerAllCaps != null && { markerAllCaps: attrs.listMarkerAllCaps },

package/dist/prosemirror/conversion/toProseDoc.js

@@ -290,9 +290,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (paragraph.listRendering?.isLegal) attrs.listIsLegal = paragraph.listRendering.isLegal;
 	if (paragraph.listRendering?.marker) attrs.listMarker = paragraph.listRendering.marker;
 	if (paragraph.listRendering?.markerHidden) attrs.listMarkerHidden = paragraph.listRendering.markerHidden;
-	if (paragraph.listRendering?.markerFontFamily) attrs.listMarkerFontFamily = paragraph.listRendering.markerFontFamily;
-	if (paragraph.listRendering?.markerFontSize) attrs.listMarkerFontSize = paragraph.listRendering.markerFontSize;
-	if (paragraph.listRendering?.markerBold !== void 0) attrs.listMarkerBold = paragraph.listRendering.markerBold;
+	if (paragraph.listRendering?.markerFormatting) attrs.listMarkerFormatting = paragraph.listRendering.markerFormatting;
 	if (paragraph.listRendering?.markerAlignment) attrs.listMarkerAlignment = paragraph.listRendering.markerAlignment;
 	if (paragraph.listRendering?.markerSuffix) attrs.listMarkerSuffix = paragraph.listRendering.markerSuffix;
 	if (paragraph.listRendering?.markerAllCaps) attrs.listMarkerAllCaps = paragraph.listRendering.markerAllCaps;

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -204,9 +204,7 @@ const paragraphNodeSpec = {
 		listIsLegal: { default: null },
 		listMarker: { default: null },
 		listMarkerHidden: { default: null },
-		listMarkerFontFamily: { default: null },
-		listMarkerFontSize: { default: null },
-		listMarkerBold: { default: null },
+		listMarkerFormatting: { default: null },
 		listMarkerAlignment: { default: null },
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },

package/dist/prosemirror/extensions/features/ListExtension.js

@@ -32,9 +32,7 @@ const LIST_FORMATTING_ATTRS = [
 	"listNumFmt",
 	"listMarker",
 	"listMarkerHidden",
-	"listMarkerFontFamily",
-	"listMarkerFontSize",
-	"listMarkerBold",
+	"listMarkerFormatting",
 	"listMarkerAlignment",
 	"listMarkerSuffix",
 	"listLevelNumFmts",

package/dist/prosemirror/schema/nodes.d.ts

@@ -69,12 +69,8 @@ type ParagraphAttrs = {
   listMarker?: string;
   /** Whether the list marker is hidden (w:vanish on numbering level rPr) */
   listMarkerHidden?: boolean;
-  /** Marker font family from numbering level rPr */
-  listMarkerFontFamily?: string;
-  /** Marker font size from numbering level rPr, in points */
-  listMarkerFontSize?: number;
-  /** Marker bold state from numbering level rPr */
-  listMarkerBold?: boolean;
+  /** Canonical numbering-level marker typography, in OOXML units. */
+  listMarkerFormatting?: document_d_exports.ListMarkerFormatting;
   /** Horizontal alignment of the marker around the paragraph's list anchor. */
   listMarkerAlignment?: "left" | "center" | "right";
   /**
@@ -200,7 +196,7 @@ type ParagraphAttrs = {
 type ParagraphPropertyChangeAttrs = Omit<document_d_exports.ParagraphPropertyChange, "previousFormatting" | "currentFormatting"> & {
   previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr"> & {
     numPr?: document_d_exports.ParagraphFormatting["numPr"] | null;
-  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerHidden" | "listMarkerFontFamily" | "listMarkerFontSize" | "listMarkerBold" | "listMarkerAlignment" | "listMarkerSuffix" | "listLevelNumFmts" | "listLevelStarts" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
+  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerHidden" | "listMarkerFormatting" | "listMarkerAlignment" | "listMarkerSuffix" | "listLevelNumFmts" | "listLevelStarts" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
   currentFormatting?: document_d_exports.ParagraphFormatting;
 };
 /**

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -86,9 +86,7 @@ function listAttrsFromResolvedStyle(resolved, numbering) {
 		listIsLegal: rendering?.isLegal ?? null,
 		listMarker: rendering?.marker ?? null,
 		listMarkerHidden: rendering?.markerHidden ?? null,
-		listMarkerFontFamily: rendering?.markerFontFamily ?? null,
-		listMarkerFontSize: rendering?.markerFontSize ?? null,
-		listMarkerBold: rendering?.markerBold ?? null,
+		listMarkerFormatting: rendering?.markerFormatting ?? null,
 		listMarkerAlignment: rendering?.markerAlignment ?? null,
 		listMarkerSuffix: rendering?.markerSuffix ?? null,
 		listMarkerAllCaps: rendering?.markerAllCaps ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -113,7 +113,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.15.2",
+    "@stll/docx-core": "^0.16.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",