@stll/folio-core 0.23.0 → 0.24.0

package/dist/layout-painter/renderParagraph.js

@@ -1,7 +1,8 @@
 import { ommlToMathml } from "../docx/mathToMathml.js";
 import { parseXmlDocument } from "../docx/xmlParser.js";
 import { evaluateFieldInstruction } from "../fields/evaluateField.js";
-import { getListMarkerInlineWidth, getListMarkerVisualOffset } from "../layout-engine/measure/listMarkerWidth.js";
+import { hasComplexScriptFormatting, resolveComplexScriptFormatting } from "../layout-engine/measure/complexScriptFormatting.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";
@@ -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)) {
@@ -1446,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);
@@ -1474,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/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/paged-layout/sectionGeometry.d.ts

@@ -1,5 +1,5 @@
 import { document_d_exports } from "../types/document.js";
-import { PageMargins } from "../layout-engine/types.js";
+import { PageMargins, SectionPageNumbering } from "../layout-engine/types.js";
 //#region src/paged-layout/sectionGeometry.d.ts
 declare const DEFAULT_PAGE_WIDTH_PX = 816;
 declare const DEFAULT_PAGE_HEIGHT_PX = 1056;
@@ -16,5 +16,6 @@ declare const getPageSize: (sectionProps: document_d_exports.SectionProperties |
   h: number;
 };
 declare const getMargins: (sectionProps: document_d_exports.SectionProperties | null | undefined) => PageMargins;
+declare const getPageNumbering: (sectionProps: document_d_exports.SectionProperties | null | undefined) => SectionPageNumbering;
 //#endregion
-export { DEFAULT_BODY_MARGIN_PX, DEFAULT_HEADER_FOOTER_DISTANCE_PX, DEFAULT_PAGE_HEIGHT_PX, DEFAULT_PAGE_WIDTH_PX, getMargins, getPageSize, twipsToPixels, twipsToPxOr };
+export { DEFAULT_BODY_MARGIN_PX, DEFAULT_HEADER_FOOTER_DISTANCE_PX, DEFAULT_PAGE_HEIGHT_PX, DEFAULT_PAGE_WIDTH_PX, getMargins, getPageNumbering, getPageSize, twipsToPixels, twipsToPxOr };

package/dist/paged-layout/sectionGeometry.js

@@ -32,5 +32,21 @@ const getMargins = (sectionProps) => ({
 	header: twipsToPxOr(sectionProps?.headerDistance, 48),
 	footer: twipsToPxOr(sectionProps?.footerDistance, 48)
 });
+const getPageNumbering = (sectionProps) => {
+	const pageNumbering = sectionProps?.pageNumbering;
+	const format = pageNumbering?.format;
+	if (pageNumbering?.start === void 0) return format === void 0 ? { type: "continue" } : {
+		type: "continue",
+		format
+	};
+	return format === void 0 ? {
+		type: "restart",
+		start: pageNumbering.start
+	} : {
+		type: "restart",
+		start: pageNumbering.start,
+		format
+	};
+};
 //#endregion
-export { DEFAULT_BODY_MARGIN_PX, DEFAULT_HEADER_FOOTER_DISTANCE_PX, DEFAULT_PAGE_HEIGHT_PX, DEFAULT_PAGE_WIDTH_PX, getMargins, getPageSize, twipsToPixels, twipsToPxOr };
+export { DEFAULT_BODY_MARGIN_PX, DEFAULT_HEADER_FOOTER_DISTANCE_PX, DEFAULT_PAGE_HEIGHT_PX, DEFAULT_PAGE_WIDTH_PX, getMargins, getPageNumbering, getPageSize, twipsToPixels, twipsToPxOr };

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",
@@ -276,6 +274,7 @@ const readTableAttrs = (node) => {
 		"insideH",
 		"insideV"
 	]);
+	optionalBoolean(attrs, "_resolvedBidi", "table.attrs._resolvedBidi", issues);
 	optionalRecord(attrs, "_originalFormatting", "table.attrs._originalFormatting", issues);
 	return attrsResult(attrs, issues);
 };
@@ -651,6 +650,10 @@ const readRunFormattingOverrideMarkAttrs = (mark) => {
 	const issues = [];
 	expectMarkType(mark, "runFormattingOverride", issues);
 	for (const key of RUN_FORMATTING_OVERRIDE_FALSE_KEYS) optionalFalse(attrs, key, `runFormattingOverride.attrs.${key}`, issues);
+	optionalBoolean(attrs, "boldCs", "runFormattingOverride.attrs.boldCs", issues);
+	optionalBoolean(attrs, "italicCs", "runFormattingOverride.attrs.italicCs", issues);
+	optionalNumber(attrs, "fontSizeCs", "runFormattingOverride.attrs.fontSizeCs", issues);
+	optionalBoolean(attrs, "cs", "runFormattingOverride.attrs.cs", issues);
 	optionalOneOf(attrs, "underline", "runFormattingOverride.attrs.underline", issues, ["none"]);
 	return attrsResult(attrs, issues);
 };
@@ -1392,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",
@@ -1407,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

@@ -4,6 +4,7 @@ import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
+import { applyRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
@@ -420,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 },
@@ -1341,6 +1340,7 @@ function createShapeRun(node) {
 function marksToTextFormatting(marks) {
 	const formatting = {};
 	let characterStyleRPr;
+	let runFormattingOverrideMark;
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
 			formatting.bold = true;
@@ -1453,7 +1453,7 @@ function marksToTextFormatting(marks) {
 			formatting.effect = expectTextEffectMarkAttrs(mark).effect;
 			break;
 		case "runFormattingOverride":
-			applyRunFormattingOverrideAttrs(formatting, expectRunFormattingOverrideMarkAttrs(mark));
+			runFormattingOverrideMark = mark;
 			break;
 		case "characterStyle": {
 			const attrs = expectCharacterStyleMarkAttrs(mark);
@@ -1463,6 +1463,7 @@ function marksToTextFormatting(marks) {
 		}
 		default: break;
 	}
+	if (runFormattingOverrideMark) applyRunFormattingOverrideAttrs(formatting, expectRunFormattingOverrideMarkAttrs(runFormattingOverrideMark));
 	if (characterStyleRPr) return subtractCharacterStyleFormatting(formatting, characterStyleRPr);
 	return formatting;
 }
@@ -1522,21 +1523,6 @@ function subtractCharacterStyleFormatting(formatting, styleRPr) {
 	}
 	return result;
 }
-function applyRunFormattingOverrideAttrs(formatting, attrs) {
-	if (attrs.bold === false) formatting.bold = false;
-	if (attrs.italic === false) formatting.italic = false;
-	if (attrs.underline === "none") formatting.underline = { style: "none" };
-	if (attrs.strike === false) formatting.strike = false;
-	if (attrs.doubleStrike === false) formatting.doubleStrike = false;
-	if (attrs.allCaps === false) formatting.allCaps = false;
-	if (attrs.smallCaps === false) formatting.smallCaps = false;
-	if (attrs.hidden === false) formatting.hidden = false;
-	if (attrs.emboss === false) formatting.emboss = false;
-	if (attrs.imprint === false) formatting.imprint = false;
-	if (attrs.shadow === false) formatting.shadow = false;
-	if (attrs.outline === false) formatting.outline = false;
-	if (attrs.rtl === false) formatting.rtl = false;
-}
 /**
 * Convert a ProseMirror table node to our Table type
 */

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;
@@ -645,7 +643,9 @@ function convertTable(table, styleResolver, context) {
 	const fallbackTableStyle = tableStyleId ? void 0 : defaultTableStyle;
 	const conditionalTableStyleId = tableStyle?.styleId ?? fallbackTableStyle?.styleId;
 	const resolvedTableBorders = table.formatting?.borders ?? tableStyle?.tblPr?.borders ?? fallbackTableStyle?.tblPr?.borders;
-	const resolvedTableIndent = table.formatting?.indent ?? tableStyle?.tblPr?.indent ?? fallbackTableStyle?.tblPr?.indent;
+	const fallbackTableIndent = fallbackTableStyle?.tblPr?.indent;
+	const resolvedTableIndent = table.formatting?.indent ?? tableStyle?.tblPr?.indent ?? (fallbackTableIndent?.value === 0 ? void 0 : fallbackTableIndent);
+	const resolvedTableBidi = table.formatting?.bidi ?? tableStyle?.tblPr?.bidi ?? fallbackTableStyle?.tblPr?.bidi;
 	const tableCellMargins = table.formatting?.cellMargins ?? tableStyle?.tblPr?.cellMargins ?? fallbackTableStyle?.tblPr?.cellMargins;
 	let cellMarginsAttr;
 	if (tableCellMargins) {
@@ -667,6 +667,7 @@ function convertTable(table, styleResolver, context) {
 	if (table.formatting?.look) attrs.look = table.formatting.look;
 	if (table.formatting?.borders) attrs.borders = table.formatting.borders;
 	if (resolvedTableIndent) attrs._resolvedIndent = resolvedTableIndent;
+	if (resolvedTableBidi !== void 0) attrs._resolvedBidi = resolvedTableBidi;
 	if (table.formatting) attrs._originalFormatting = table.formatting;
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
 	const conditionalStyles = {};

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/extensions/marks/RunFormattingOverrideExtension.d.ts

@@ -1,10 +1,11 @@
 import { document_d_exports } from "../../../types/document.js";
+import { RunFormattingOverrideAttrs } from "../../schema/marks.js";
 import { MarkExtension } from "../types.js";
 import { Mark } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/RunFormattingOverrideExtension.d.ts
-type RunFormattingOverrideAttrs = Record<string, false | "none">;
 declare function buildRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting | undefined): RunFormattingOverrideAttrs | undefined;
+declare function applyRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting, attrs: RunFormattingOverrideAttrs): void;
 declare function applyRunFormattingOverrideMark(formatting: document_d_exports.TextFormatting, mark: Mark): void;
 declare const RunFormattingOverrideExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 //#endregion
-export { RunFormattingOverrideExtension, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };
+export { RunFormattingOverrideExtension, applyRunFormattingOverrideAttrs, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };

package/dist/prosemirror/extensions/marks/RunFormattingOverrideExtension.js

@@ -4,23 +4,26 @@ import { createMarkExtension } from "../create.js";
 function buildRunFormattingOverrideAttrs(formatting) {
 	if (!formatting) return;
 	const attrs = {};
-	if (formatting.bold === false) attrs["bold"] = false;
-	if (formatting.italic === false) attrs["italic"] = false;
-	if (formatting.underline?.style === "none") attrs["underline"] = "none";
-	if (formatting.strike === false) attrs["strike"] = false;
-	if (formatting.doubleStrike === false) attrs["doubleStrike"] = false;
-	if (formatting.allCaps === false) attrs["allCaps"] = false;
-	if (formatting.smallCaps === false) attrs["smallCaps"] = false;
-	if (formatting.hidden === false) attrs["hidden"] = false;
-	if (formatting.emboss === false) attrs["emboss"] = false;
-	if (formatting.imprint === false) attrs["imprint"] = false;
-	if (formatting.shadow === false) attrs["shadow"] = false;
-	if (formatting.outline === false) attrs["outline"] = false;
-	if (formatting.rtl === false) attrs["rtl"] = false;
+	if (formatting.bold === false) attrs.bold = false;
+	if (formatting.italic === false) attrs.italic = false;
+	if (formatting.underline?.style === "none") attrs.underline = "none";
+	if (formatting.strike === false) attrs.strike = false;
+	if (formatting.doubleStrike === false) attrs.doubleStrike = false;
+	if (formatting.allCaps === false) attrs.allCaps = false;
+	if (formatting.smallCaps === false) attrs.smallCaps = false;
+	if (formatting.hidden === false) attrs.hidden = false;
+	if (formatting.emboss === false) attrs.emboss = false;
+	if (formatting.imprint === false) attrs.imprint = false;
+	if (formatting.shadow === false) attrs.shadow = false;
+	if (formatting.outline === false) attrs.outline = false;
+	if (formatting.rtl === false) attrs.rtl = false;
+	if (formatting.boldCs !== void 0 && formatting.boldCs !== formatting.bold) attrs.boldCs = formatting.boldCs;
+	if (formatting.italicCs !== void 0 && formatting.italicCs !== formatting.italic) attrs.italicCs = formatting.italicCs;
+	if (formatting.fontSizeCs !== void 0 && formatting.fontSizeCs !== formatting.fontSize) attrs.fontSizeCs = formatting.fontSizeCs;
+	if (formatting.cs !== void 0) attrs.cs = formatting.cs;
 	return Object.keys(attrs).length > 0 ? attrs : void 0;
 }
-function applyRunFormattingOverrideMark(formatting, mark) {
-	const attrs = expectRunFormattingOverrideMarkAttrs(mark);
+function applyRunFormattingOverrideAttrs(formatting, attrs) {
 	if (attrs.bold === false) formatting.bold = false;
 	if (attrs.italic === false) formatting.italic = false;
 	if (attrs.underline === "none") formatting.underline = { style: "none" };
@@ -34,6 +37,13 @@ function applyRunFormattingOverrideMark(formatting, mark) {
 	if (attrs.shadow === false) formatting.shadow = false;
 	if (attrs.outline === false) formatting.outline = false;
 	if (attrs.rtl === false) formatting.rtl = false;
+	if (attrs.boldCs !== void 0) formatting.boldCs = attrs.boldCs;
+	if (attrs.italicCs !== void 0) formatting.italicCs = attrs.italicCs;
+	if (attrs.fontSizeCs !== void 0) formatting.fontSizeCs = attrs.fontSizeCs;
+	if (attrs.cs !== void 0) formatting.cs = attrs.cs;
+}
+function applyRunFormattingOverrideMark(formatting, mark) {
+	applyRunFormattingOverrideAttrs(formatting, expectRunFormattingOverrideMarkAttrs(mark));
 }
 const RunFormattingOverrideExtension = createMarkExtension({
 	name: "runFormattingOverride",
@@ -52,7 +62,11 @@ const RunFormattingOverrideExtension = createMarkExtension({
 			imprint: { default: null },
 			shadow: { default: null },
 			outline: { default: null },
-			rtl: { default: null }
+			rtl: { default: null },
+			boldCs: { default: null },
+			italicCs: { default: null },
+			fontSizeCs: { default: null },
+			cs: { default: null }
 		},
 		toDOM(mark) {
 			const attrs = expectRunFormattingOverrideMarkAttrs(mark);
@@ -72,4 +86,4 @@ const RunFormattingOverrideExtension = createMarkExtension({
 	}
 });
 //#endregion
-export { RunFormattingOverrideExtension, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };
+export { RunFormattingOverrideExtension, applyRunFormattingOverrideAttrs, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -154,6 +154,7 @@ const tableSpec = {
 		look: { default: null },
 		borders: { default: null },
 		_resolvedIndent: { default: null },
+		_resolvedBidi: { default: null },
 		_originalFormatting: { default: null },
 		tblPrChange: { default: null },
 		_suggestedInsert: { default: null }

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

@@ -122,6 +122,14 @@ type RunPropertyChangeMarkAttrs = {
   suggestionId?: string;
 };
 type RunFormattingOverrideAttrs = { [K in keyof Pick<document_d_exports.TextFormatting, "bold" | "italic" | "strike" | "doubleStrike" | "allCaps" | "smallCaps" | "hidden" | "emboss" | "imprint" | "shadow" | "outline" | "rtl">]?: false; } & {
+  /** Independent complex-script weight (`w:bCs`). */
+  boldCs?: boolean;
+  /** Force complex-script formatting for the full run (`w:cs`). */
+  cs?: boolean;
+  /** Independent complex-script size in half-points (`w:szCs`). */
+  fontSizeCs?: number;
+  /** Independent complex-script slant (`w:iCs`). */
+  italicCs?: boolean;
   underline?: "none";
 };
 /**

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;
 };
 /**
@@ -555,6 +551,8 @@ type TableAttrs = {
   borders?: document_d_exports.TableBorders;
   /** Effective table indent after style resolution. PM-only; never serialized. */
   _resolvedIndent?: NonNullable<document_d_exports.TableFormatting["indent"]>;
+  /** Effective table direction after style resolution. PM-only; never serialized. */
+  _resolvedBidi?: boolean;
   /** Original table formatting from DOCX for lossless round-trip serialization */
   _originalFormatting?: document_d_exports.TableFormatting;
   /** Tracked table property changes (w:tblPrChange) for round-trip + accept/reject */

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.0",
+  "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",