@stll/folio-core 0.23.1 → 0.25.0

package/dist/layout-painter/renderParagraph.js

@@ -2,15 +2,15 @@ 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";
 import { calculateTabWidth } from "../prosemirror/utils/tabCalculator.js";
 import { AUTHOR_COLORS, getAuthorColorIdx } from "../utils/authorColors.js";
-import { detectBaseDirection } from "../utils/baseDirection.js";
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import "../utils/fontWeights.js";
+import { isRtlParagraph } from "../utils/paragraphBaseDirection.js";
 import { inlineImageBoundingBox, parseRotationDegrees, rotatedBoundingBox } from "../utils/rotationBoundingBox.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 import { SCRIPT_CLASS, hasCjk, hasComplexScript, segmentByScript } from "../utils/scriptSegments.js";
@@ -39,12 +39,42 @@ const PARAGRAPH_CLASS_NAMES = {
 	image: "layout-run-image",
 	lineBreak: "layout-run-linebreak"
 };
+const LEFT_TO_RIGHT_DIRECTION = "ltr";
+const RIGHT_TO_LEFT_DIRECTION = "rtl";
+const DISPLAYED_URL_PATTERN = /^(?:https?:\/\/|www\.)\S+$/iu;
 /**
 * Check if run is a text run
 */
 function isTextRun(run) {
 	return run.kind === "text";
 }
+function hyperlinksMatch(left, right) {
+	return left.href === right.href && left.tooltip === right.tooltip && left.noDefaultStyle === right.noDefaultStyle;
+}
+function collectLeftToRightDisplayedUrlHyperlinks(runs) {
+	const result = /* @__PURE__ */ new Set();
+	let index = 0;
+	while (index < runs.length) {
+		const first = runs[index];
+		if (!first || !isTextRun(first) || !first.hyperlink) {
+			index += 1;
+			continue;
+		}
+		const hyperlinks = [];
+		let displayedText = "";
+		let groupEnd = index;
+		while (groupEnd < runs.length) {
+			const run = runs[groupEnd];
+			if (!run || !isTextRun(run) || !run.hyperlink || !hyperlinksMatch(first.hyperlink, run.hyperlink)) break;
+			displayedText += toPaintedText(run.text);
+			hyperlinks.push(run.hyperlink);
+			groupEnd += 1;
+		}
+		if (DISPLAYED_URL_PATTERN.test(displayedText.trim())) for (const hyperlink of hyperlinks) result.add(hyperlink);
+		index = groupEnd;
+	}
+	return result;
+}
 /**
 * Check if run is a tab run
 */
@@ -144,8 +174,8 @@ function applyRunStyles(element, run) {
 		element.style.webkitTextStroke = "1px currentColor";
 		element.style.webkitTextFillColor = "transparent";
 	}
-	if (run.rtl === true) element.dir = "rtl";
-	else if (run.rtl === false) element.dir = "ltr";
+	if (run.rtl === true) element.dir = RIGHT_TO_LEFT_DIRECTION;
+	else if (run.rtl === false) element.dir = LEFT_TO_RIGHT_DIRECTION;
 	if (run.textEffect) {
 		element.classList.add("docx-text-effect", `docx-text-effect-${run.textEffect}`);
 		element.dataset["effect"] = run.textEffect;
@@ -264,7 +294,7 @@ function applyPmPositions(element, pmStart, pmEnd) {
 /**
 * Render a text run
 */
-function renderTextRun(run, doc) {
+function renderTextRun(run, doc, hyperlinkDirection) {
 	const span = doc.createElement("span");
 	span.className = `${PARAGRAPH_CLASS_NAMES.run} ${PARAGRAPH_CLASS_NAMES.text}`;
 	if (run.footnoteRefId !== void 0) {
@@ -284,6 +314,7 @@ function renderTextRun(run, doc) {
 	if (run.hyperlink) {
 		const anchor = doc.createElement("a");
 		anchor.href = run.hyperlink.href;
+		if (hyperlinkDirection || DISPLAYED_URL_PATTERN.test(paintedText.trim())) anchor.dir = LEFT_TO_RIGHT_DIRECTION;
 		if (!run.hyperlink.href.startsWith("#")) {
 			anchor.target = "_blank";
 			anchor.rel = "noopener noreferrer";
@@ -1053,7 +1084,7 @@ function renderLine(block, line, alignment, doc, options) {
 		return withCursiveJoiners(runEl, run, cursiveJoinerPlan, applyJoinerRunStyles, doc);
 	};
 	const renderLineTextRun = (run) => {
-		const runEl = renderTextRun(run, doc);
+		const runEl = renderTextRun(run, doc, run.hyperlink && options?.leftToRightDisplayedUrlHyperlinks?.has(run.hyperlink) ? LEFT_TO_RIGHT_DIRECTION : void 0);
 		if (collapsedLeadingSpaceRuns.has(run)) runEl.dataset["collapsedLeadingSpaces"] = "true";
 		if (collapsedTrailingSpaceRuns.has(run)) runEl.dataset["collapsedTrailingSpaces"] = "true";
 		if (isCollapsedLineEdgeSpaceRun(run)) {
@@ -1125,7 +1156,8 @@ function renderLine(block, line, alignment, doc, options) {
 	const measureText = collapsedSpaceMeasureText ?? (hasTabRuns || hasScaledTextRun ? createTextMeasurer(doc) : void 0);
 	if (hasTabRuns) {
 		const explicitStops = options?.tabStops?.map(convertTabStopToCalc);
-		const leftIndentTwips = options?.leftIndentPx ? Math.round(options.leftIndentPx * 15) : 0;
+		const tabLeftIndentPx = options?.tabLeftIndentPx ?? options?.leftIndentPx ?? 0;
+		const leftIndentTwips = Math.round(tabLeftIndentPx * 15);
 		tabContext = {
 			...explicitStops !== void 0 ? { explicitStops } : {},
 			...block.attrs?.defaultTabStopTwips !== void 0 ? { defaultTabInterval: block.attrs.defaultTabStopTwips } : {},
@@ -1134,11 +1166,13 @@ function renderLine(block, line, alignment, doc, options) {
 	}
 	let currentX;
 	const leftIndentPx = options?.leftIndentPx ?? 0;
+	const tabLeftIndentPx = options?.tabLeftIndentPx ?? leftIndentPx;
+	const floatingLeftOffsetPx = options?.floatingMargins?.leftMargin ?? 0;
 	if (options?.isFirstLine) {
 		const firstLineIndentPx = options.firstLineIndentPx ?? 0;
 		const markerInlineWidth = getListMarkerInlineWidth(block);
-		currentX = leftIndentPx + firstLineIndentPx + markerInlineWidth;
-	} else currentX = leftIndentPx;
+		currentX = tabLeftIndentPx + firstLineIndentPx + markerInlineWidth + floatingLeftOffsetPx;
+	} else currentX = tabLeftIndentPx + floatingLeftOffsetPx;
 	for (let i = 0; i < runsForLine.length; i++) {
 		const run = runsForLine[i];
 		if (isTabRun(run) && tabContext && measureText) {
@@ -1160,7 +1194,7 @@ function renderLine(block, line, alignment, doc, options) {
 					break;
 				}
 			}
-			if (lineRightEdgeX !== void 0 && tabResult.alignment === "end" && !hasFollowingTab && currentX + tabResult.width + followingWidthForCheck >= lineRightEdgeX - RIGHT_EDGE_EPSILON_PX) {
+			if (lineRightEdgeX !== void 0 && options?.isRtl !== true && tabResult.alignment === "end" && !hasFollowingTab && currentX + tabResult.width + followingWidthForCheck >= lineRightEdgeX - RIGHT_EDGE_EPSILON_PX) {
 				lineEl.style.display = "flex";
 				lineEl.style.alignItems = "baseline";
 				lineEl.style.whiteSpace = "pre";
@@ -1173,7 +1207,8 @@ function renderLine(block, line, alignment, doc, options) {
 				tabEl.style.minWidth = "0";
 				tabEl.style.width = "auto";
 				lineEl.append(tabEl);
-				if (options?.isFirstLine && options.firstLineIndentPx !== void 0 && options.firstLineIndentPx !== 0 && lineEl.firstElementChild instanceof HTMLElement) lineEl.firstElementChild.style.marginLeft = `${options.firstLineIndentPx}px`;
+				const firstFlexChild = lineEl.firstElementChild ?? void 0;
+				if (options?.isFirstLine && options.firstLineIndentPx !== void 0 && options.firstLineIndentPx !== 0 && isStyleableHTMLElement(firstFlexChild)) firstFlexChild.style.marginLeft = `${options.firstLineIndentPx}px`;
 				for (let j = i + 1; j < runsForLine.length; j++) {
 					const next = runsForLine[j];
 					if (isTabRun(next) || isLineBreakRun(next)) break;
@@ -1191,7 +1226,10 @@ function renderLine(block, line, alignment, doc, options) {
 				break;
 			}
 			let tabWidth = tabResult.width;
-			if (!(tabResult.alignment === "start" && leftIndentPx > 0 && Math.abs(currentX + tabWidth - leftIndentPx) <= RIGHT_EDGE_EPSILON_PX) && lineRightEdgeX !== void 0 && canClampTabToRightEdge(tabResult.alignment, i > 0, runsForLine.slice(0, i).some(isTabRun), options?.isLastLine === true) && currentX + tabWidth + followingWidthForCheck > lineRightEdgeX) tabWidth = Math.max(1, lineRightEdgeX - currentX - followingWidthForCheck);
+			const activeContentRightEdge = options?.contentWidthPx === void 0 ? void 0 : options.contentWidthPx - (options.floatingMargins?.rightMargin ?? 0);
+			const preservesLogicalRtlEndStop = options?.isRtl === true && tabResult.alignment === "end" && activeContentRightEdge !== void 0 && currentX + tabWidth + followingWidthForCheck <= activeContentRightEdge + RIGHT_EDGE_EPSILON_PX;
+			const landsOnLeftIndent = tabResult.alignment === "start" && tabLeftIndentPx > 0 && Math.abs(currentX + tabWidth - tabLeftIndentPx) <= RIGHT_EDGE_EPSILON_PX;
+			if (!preservesLogicalRtlEndStop && !landsOnLeftIndent && lineRightEdgeX !== void 0 && canClampTabToRightEdge(tabResult.alignment, i > 0, runsForLine.slice(0, i).some(isTabRun), options?.isLastLine === true) && currentX + tabWidth + followingWidthForCheck > lineRightEdgeX) tabWidth = Math.max(1, lineRightEdgeX - currentX - followingWidthForCheck);
 			const tabEl = renderTabRun(run, doc, tabWidth, tabResult.leader);
 			lineEl.append(tabEl);
 			currentX += tabWidth;
@@ -1281,22 +1319,6 @@ function bordersFormGroup(a, b) {
 	return bordersEqual(a.top, b.top) && bordersEqual(a.bottom, b.bottom) && bordersEqual(a.left, b.left) && bordersEqual(a.right, b.right) && bordersEqual(a.between, b.between);
 }
 /**
-* Decide whether a paragraph without an explicit `w:bidi` flag should still be
-* laid out right-to-left. Only paragraphs that carry at least one `w:rtl` run
-* are candidates; among those the base direction follows the first strong
-* directional character (the `dir="auto"` rule), so Hebrew/Arabic-led lines
-* order RTL while an English- (or CJK-/Devanagari-/…) led line stays LTR.
-* eigenpal #723 (#719).
-*/
-function paragraphBaseIsRtl(block) {
-	const runs = block.runs.filter((r) => isTextRun(r) || isFieldRun(r));
-	if (!runs.some((r) => r.rtl)) return false;
-	return detectBaseDirection(runs.map((r) => {
-		if (isTextRun(r)) return r.text;
-		return isFieldRun(r) ? r.fallback ?? "" : "";
-	}).join("")) !== "ltr";
-}
-/**
 * Render a paragraph fragment
 *
 * @param fragment - The fragment to render
@@ -1322,7 +1344,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 	const lines = measure.lines.slice(fragment.fromLine, fragment.toLine);
 	const alignment = block.attrs?.alignment;
 	if (block.attrs?.styleId) fragmentEl.dataset["styleId"] = block.attrs.styleId;
-	const isRtl = block.attrs?.bidi ?? paragraphBaseIsRtl(block);
+	const isRtl = isRtlParagraph(block);
 	if (isRtl) fragmentEl.dir = "rtl";
 	if (alignment) if (alignment === "center") fragmentEl.style.textAlign = "center";
 	else if (alignment === "right") fragmentEl.style.textAlign = "right";
@@ -1407,6 +1429,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 	else if (indent?.firstLine && indent.firstLine > 0) firstLineIndentPx = indent.firstLine;
 	let _cumulativeLineY = 0;
 	const renderedInlineImageKeys = options.renderedInlineImageKeys ?? /* @__PURE__ */ new Set();
+	const leftToRightDisplayedUrlHyperlinks = isRtl ? collectLeftToRightDisplayedUrlHyperlinks(block.runs) : void 0;
 	for (let i = 0; i < lines.length; i++) {
 		const line = lines[i];
 		const lineIndex = fragment.fromLine + i;
@@ -1422,13 +1445,17 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			paragraphEndsWithLineBreak,
 			...block.attrs?.tabs !== void 0 ? { tabStops: block.attrs.tabs } : {},
 			leftIndentPx: indentLeft,
+			tabLeftIndentPx: indent?.left ?? 0,
 			firstLineIndentPx: isFirstLine ? firstLineIndentPx : 0,
+			isRtl,
+			contentWidthPx: fragment.width,
 			context,
 			floatingMargins: {
 				leftMargin: lineLeftOffset,
 				rightMargin: lineRightOffset
 			},
 			renderedInlineImageKeys,
+			...leftToRightDisplayedUrlHyperlinks === void 0 ? {} : { leftToRightDisplayedUrlHyperlinks },
 			lineRightEdgePx: fragment.width - indentRight - lineRightOffset
 		});
 		const isFlexLine = lineEl.dataset["flexLine"] === "true";
@@ -1447,13 +1474,8 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 		const hasHanging = indent?.hanging && indent.hanging > 0;
 		const hasFirstLine = indent?.firstLine && indent.firstLine > 0;
 		if (isFirstLine) {
-			if (indentLeft !== 0 && hasHanging) {
-				lineEl.style.paddingLeft = `${Math.max(indentLeft, 0)}px`;
-				if (!isFlexLine) lineEl.style.textIndent = `-${indent.hanging ?? 0}px`;
-			} else if (indentLeft !== 0 && hasFirstLine) {
-				lineEl.style.paddingLeft = `${Math.max(indentLeft, 0)}px`;
-				if (!isFlexLine) lineEl.style.textIndent = `${indent.firstLine ?? 0}px`;
-			} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
+			if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
+			if (hasHanging && !isFlexLine) lineEl.style.textIndent = `-${indent.hanging ?? 0}px`;
 			else if (hasFirstLine && !isFlexLine) lineEl.style.textIndent = `${indent.firstLine ?? 0}px`;
 		} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
 		if (indentRight > 0) lineEl.style.paddingRight = `${indentRight}px`;
@@ -1463,18 +1485,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 +1502,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/renderTable.js

@@ -1,7 +1,7 @@
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../layout-engine/measure/tableCellFloating.js";
 import { createTableCellFlowState, finishTableCellFlow, placeTableCellBlock } from "../layout-engine/measure/tableCellFlow.js";
-import { getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
+import { getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, resolveTableCellPadding, tableColumnsArePinned } from "../layout-engine/types.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 import { emuToPixels } from "../utils/units.js";
 import { resolveAnchoredImagePosition } from "./anchoredImagePosition.js";
@@ -330,10 +330,7 @@ function renderTableCell({ cell, cellMeasure, x, rowHeight, borderFlags, columns
 	cellEl.style.height = `${rowHeight}px`;
 	cellEl.style.overflow = "hidden";
 	cellEl.style.boxSizing = "border-box";
-	const padTop = cell.padding?.top ?? 1;
-	const padRight = cell.padding?.right ?? 7;
-	const padBottom = cell.padding?.bottom ?? 1;
-	const padLeft = cell.padding?.left ?? 7;
+	const { top: padTop, right: padRight, bottom: padBottom, left: padLeft } = resolveTableCellPadding(cell);
 	cellEl.style.padding = `${padTop}px ${padRight}px ${padBottom}px ${padLeft}px`;
 	if (cell.borders) {
 		if (borderFlags.drawTop) applyBorder(cellEl, "top", cell.borders.top);

package/dist/layout-painter/renderTextBox.js

@@ -26,7 +26,7 @@ function renderTextBoxFragment(fragment, block, measure, context, options = {})
 	containerEl.style.position = "absolute";
 	containerEl.style.width = `${fragment.width}px`;
 	containerEl.style.height = `${fragment.height}px`;
-	containerEl.style.overflow = "hidden";
+	containerEl.style.overflow = block.textWrap === "none" ? "visible" : "hidden";
 	containerEl.style.boxSizing = "border-box";
 	if (block.fillColor) containerEl.style.backgroundColor = block.fillColor;
 	if (block.outlineWidth && block.outlineWidth > 0) {

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

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../types/document.js";
 import { ImageRun, isFloatingImageRun, isTextWrappingFloatingImageRun } from "../layout-engine/types.js";
 //#region src/layout-painter/renderUtils.d.ts
 /**
@@ -17,7 +18,7 @@ type RenderContext = {
   /** Current page number (1-indexed) */
   pageNumber: number;
   /** OOXML section-level format for the current logical page number. */
-  pageNumberFormat?: string;
+  pageNumberFormat?: document_d_exports.NumberFormat;
   /** Total number of pages */
   totalPages: number;
   /** Which section is being rendered */

package/dist/prosemirror/attrs/index.js

@@ -25,6 +25,7 @@ const TEXT_BOX_AUTO_FIT_VALUES = [
 	"normal",
 	"shape"
 ];
+const TEXT_BOX_TEXT_WRAP_VALUES = ["square", "none"];
 const FIELD_KINDS = ["simple", "complex"];
 const MATH_DISPLAYS = ["inline", "block"];
 const SHAPE_FILL_TYPES = [
@@ -162,9 +163,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",
@@ -465,6 +464,7 @@ const readTextBoxAttrs = (node) => {
 	optionalNumber(attrs, "width", "textBox.attrs.width", issues);
 	optionalNumber(attrs, "height", "textBox.attrs.height", issues);
 	optionalOneOf(attrs, "autoFit", "textBox.attrs.autoFit", issues, TEXT_BOX_AUTO_FIT_VALUES);
+	optionalOneOf(attrs, "textWrap", "textBox.attrs.textWrap", issues, TEXT_BOX_TEXT_WRAP_VALUES);
 	optionalString(attrs, "textBoxId", "textBox.attrs.textBoxId", issues);
 	optionalString(attrs, "fillColor", "textBox.attrs.fillColor", issues);
 	optionalNumber(attrs, "outlineWidth", "textBox.attrs.outlineWidth", issues);
@@ -1397,12 +1397,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 +1410,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 },
@@ -1880,6 +1878,7 @@ function convertPMTextBox(node) {
 				content: []
 			}],
 			...attrs.autoFit !== void 0 ? { autoFit: attrs.autoFit } : {},
+			...attrs.textWrap !== void 0 ? { textWrap: attrs.textWrap } : {},
 			margins: (() => {
 				const m = {};
 				if (typeof attrs.marginTop === "number") m.top = pixelsToEmu(attrs.marginTop);

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;
@@ -1525,6 +1523,7 @@ function textBoxFromShape(shape, textBody) {
 	if (shape.outline) textBox.outline = shape.outline;
 	if (textBody.margins) textBox.margins = textBody.margins;
 	if (textBody.autoFit) textBox.autoFit = textBody.autoFit;
+	if (textBody.textWrap) textBox.textWrap = textBody.textWrap;
 	return textBox;
 }
 /**
@@ -1599,6 +1598,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		width: widthPx,
 		height: heightPx,
 		autoFit: textBox.autoFit,
+		textWrap: textBox.textWrap,
 		textBoxId: textBox.id,
 		fillColor,
 		outlineWidth,

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/nodes/TextBoxExtension.d.ts

@@ -10,6 +10,8 @@ type TextBoxAttrs = {
   height?: number;
   /** Text fitting behavior */
   autoFit?: document_d_exports.ShapeTextBody["autoFit"];
+  /** Horizontal text wrapping inside the box */
+  textWrap?: document_d_exports.ShapeTextBody["textWrap"];
   /** Unique identifier */
   textBoxId?: string;
   /** Fill color as CSS color */

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

@@ -18,6 +18,9 @@ function parseTextBoxWrapType(raw) {
 function parseTextBoxAutoFit(raw) {
 	if (raw === "none" || raw === "normal" || raw === "shape") return raw;
 }
+function parseTextBoxTextWrap(raw) {
+	if (raw === "none" || raw === "square") return raw;
+}
 const TextBoxExtension = createNodeExtension({
 	name: "textBox",
 	schemaNodeName: "textBox",
@@ -30,6 +33,7 @@ const TextBoxExtension = createNodeExtension({
 			width: { default: 200 },
 			height: { default: null },
 			autoFit: { default: null },
+			textWrap: { default: null },
 			textBoxId: { default: null },
 			fillColor: { default: null },
 			outlineWidth: { default: null },
@@ -63,10 +67,12 @@ const TextBoxExtension = createNodeExtension({
 				const position = parseTextBoxPosition(d["position"]);
 				const wrapType = parseTextBoxWrapType(d["wrapType"]);
 				const autoFit = parseTextBoxAutoFit(d["autoFit"]);
+				const textWrap = parseTextBoxTextWrap(d["textWrap"]);
 				return {
 					...d["width"] ? { width: Number(d["width"]) } : {},
 					...d["height"] ? { height: Number(d["height"]) } : {},
 					...autoFit ? { autoFit } : {},
+					...textWrap ? { textWrap } : {},
 					...d["textboxId"] ? { textBoxId: d["textboxId"] } : {},
 					...d["fillColor"] ? { fillColor: d["fillColor"] } : {},
 					...d["outlineWidth"] ? { outlineWidth: Number(d["outlineWidth"]) } : {},
@@ -95,6 +101,7 @@ const TextBoxExtension = createNodeExtension({
 			if (attrs.width) domAttrs["data-width"] = String(attrs.width);
 			if (attrs.height) domAttrs["data-height"] = String(attrs.height);
 			if (attrs.autoFit) domAttrs["data-auto-fit"] = attrs.autoFit;
+			if (attrs.textWrap) domAttrs["data-text-wrap"] = attrs.textWrap;
 			if (attrs.textBoxId) domAttrs["data-textbox-id"] = attrs.textBoxId;
 			if (attrs.fillColor) domAttrs["data-fill-color"] = attrs.fillColor;
 			if (attrs.outlineWidth) domAttrs["data-outline-width"] = String(attrs.outlineWidth);

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;
 };
 /**
@@ -461,6 +457,8 @@ type TextBoxAttrs = {
   height?: number;
   /** Text fitting behavior */
   autoFit?: document_d_exports.ShapeTextBody["autoFit"];
+  /** Horizontal text wrapping inside the box */
+  textWrap?: document_d_exports.ShapeTextBody["textWrap"];
   /** Unique identifier */
   textBoxId?: string;
   /** Fill color as CSS color */

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/dist/utils/paragraphBaseDirection.d.ts

@@ -0,0 +1,6 @@
+import { ParagraphBlock } from "../layout-engine/types.js";
+//#region src/utils/paragraphBaseDirection.d.ts
+/** Resolve the paragraph direction used by both measurement and painting. */
+declare const isRtlParagraph: (block: ParagraphBlock) => boolean;
+//#endregion
+export { isRtlParagraph };

package/dist/utils/paragraphBaseDirection.js

@@ -0,0 +1,12 @@
+import { detectBaseDirection } from "./baseDirection.js";
+//#region src/utils/paragraphBaseDirection.ts
+const isDirectionalTextRun = (run) => run.kind === "text" || run.kind === "field";
+/** Resolve the paragraph direction used by both measurement and painting. */
+const isRtlParagraph = (block) => {
+	if (block.attrs?.bidi !== void 0) return block.attrs.bidi;
+	const runs = block.runs.filter(isDirectionalTextRun);
+	if (!runs.some(({ rtl }) => rtl === true)) return false;
+	return detectBaseDirection(runs.map((run) => run.kind === "text" ? run.text : run.fallback ?? "").join("")) !== "ltr";
+};
+//#endregion
+export { isRtlParagraph };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.23.1",
+  "version": "0.25.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.17.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",