@stll/folio-core 0.33.2 → 0.35.0

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

@@ -13,6 +13,7 @@ import { advanceListMarker, advanceVisibleListMarker, cloneListCounterState, for
 import { resolveNumberedRefFields } from "../../prosemirror/numberedRefFields.js";
 import { directionToBidi } from "../../prosemirror/paragraphDirection.js";
 import { cascadeStyleTextFormatting } from "../../prosemirror/styles/styleToggleCascade.js";
+import { expectTextBoxAnchorAttrs } from "../../prosemirror/textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
 import { normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
@@ -20,12 +21,22 @@ import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
+import { sanitizeImageSrc } from "../../utils/sanitizeImageSrc.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { AUTO_PARAGRAPH_SPACING_PX, halfPointsToPixels, halfPointsToPoints, pointsToPixels } from "../../utils/units.js";
 import { getColumns } from "../sectionColumns.js";
 import { groupParagraphFrames } from "./paragraphFrames.js";
+import { panic } from "better-result";
 //#region src/layout-bridge/convert/toFlowBlocks.ts
+const DETACHED_WATERMARK_HOST_ATTR = "_detachedWatermarkHost";
+const expectDetachedWatermarkHostAttr = (attrs) => {
+	const value = Reflect.get(attrs, DETACHED_WATERMARK_HOST_ATTR);
+	if (value === null || value === void 0) return false;
+	if (typeof value !== "boolean") panic("Invalid ProseMirror detached watermark host attrs:\nparagraph.attrs._detachedWatermarkHost: Expected a boolean.");
+	return value;
+};
 const DEFAULT_FONT = "Calibri";
+const TEXT_BOX_ANCHOR_BLOCK_ID = Symbol.for("stll.textBoxAnchorBlockId");
 const DEFAULT_TABLE_CELL_MARGIN_TWIPS = {
 	top: 0,
 	right: 108,
@@ -454,6 +465,9 @@ function buildImageRun(attrs, constrained, pmStart, pmEnd, trackedChange) {
 	if (trackedChange?.changeRevisionId !== void 0) run.changeRevisionId = trackedChange.changeRevisionId;
 	return run;
 }
+/** A package image whose bytes cannot paint still owns its authored line box. */
+const hasRelationshipBackedImageBox = (attrs) => typeof attrs.rId === "string" && attrs.rId.trim().length > 0 && typeof attrs.width === "number" && Number.isFinite(attrs.width) && attrs.width >= 0 && typeof attrs.height === "number" && Number.isFinite(attrs.height) && attrs.height >= 0;
+const hasPaintableImageSource = (src) => sanitizeImageSrc(src) !== void 0;
 /**
 * In TOC paragraphs, strip the resolved Hyperlink character-style colour and
 * underline so the painter's link fallback doesn't fire. The PM doc keeps the
@@ -564,7 +578,7 @@ function paragraphToRuns(node, startPos, _options) {
 		}
 		if (child.type.name === "image") {
 			const attrs = expectImageAttrs(child);
-			if (!attrs.src) return;
+			if (!hasPaintableImageSource(attrs.src) && !hasRelationshipBackedImageBox(attrs)) return;
 			const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, _options.pageContentHeight);
 			const trackedFmt = extractRunFormatting(child.marks, theme, fontAlternates);
 			const run = buildImageRun(attrs, constrained, childPos, childPos + child.nodeSize, trackedFmt);
@@ -878,6 +892,9 @@ function mapTabAlignment(align) {
 function hasOnlyVisuallyEmptyTextRuns(runs) {
 	return runs.length > 0 && runs.every((run) => run.kind === "text" && run.text.replace(/\u00a0/gu, " ").trim().length === 0);
 }
+function hasOnlyHiddenTextRuns(runs) {
+	return runs.length > 0 && runs.every((run) => run.kind === "text" && run.hidden === true);
+}
 function convertParagraph(node, startPos, options) {
 	const pmAttrs = expectParagraphAttrs(node);
 	const runs = paragraphToRuns(node, startPos, options);
@@ -903,10 +920,10 @@ function convertParagraph(node, startPos, options) {
 			if (alternate) attrs.defaultAlternateFontFamily = alternate;
 		}
 	}
-	if (runs.length === 0 && defaultTextFormatting?.hidden === true) {
-		attrs.suppressEmptyParagraphHeight = true;
-		if (attrs.listMarker !== void 0) attrs.listMarkerHidden = true;
-	}
+	const isFullyHiddenParagraph = defaultTextFormatting?.hidden === true && (runs.length === 0 || hasOnlyHiddenTextRuns(runs));
+	if (isFullyHiddenParagraph && attrs.listMarker !== void 0) attrs.listMarkerHidden = true;
+	if (isFullyHiddenParagraph) attrs.suppressEmptyParagraphHeight = true;
+	if (runs.length === 0 && expectDetachedWatermarkHostAttr(node.attrs)) attrs.suppressEmptyParagraphHeight = false;
 	const hasVisibleParagraphPayload = attrs.listMarker !== void 0 && !attrs.listMarkerHidden || attrs.borders?.top !== void 0 || attrs.borders?.bottom !== void 0 || attrs.borders?.left !== void 0 || attrs.borders?.right !== void 0 || attrs.borders?.between !== void 0 || attrs.borders?.bar !== void 0 || attrs.shading !== void 0;
 	if (runs.length === 0 && pmAttrs._pageBreakCarrier === true && !hasVisibleParagraphPayload) attrs.suppressEmptyParagraphHeight = true;
 	const bookmarkNames = pmAttrs.bookmarks?.map((b) => b.name);
@@ -934,6 +951,11 @@ function convertParagraph(node, startPos, options) {
 		...frame.yAlign !== void 0 ? { yAlign: frame.yAlign } : {},
 		...frame.wrap !== void 0 ? { wrap: frame.wrap } : {}
 	});
+	node.descendants((child) => {
+		if (child.type.name !== "textBoxAnchor") return true;
+		options.textBoxAnchorBlockIds.set(expectTextBoxAnchorAttrs(child).anchorId, block.id);
+		return false;
+	});
 	return block;
 }
 /**
@@ -945,6 +967,7 @@ function convertParagraph(node, startPos, options) {
 function isPaintlessTerminalParagraph(block) {
 	if (block?.kind !== "paragraph" || block.runs.length !== 0) return false;
 	const attrs = block.attrs;
+	if (attrs?.suppressEmptyParagraphHeight === false) return false;
 	return !(attrs?.listMarker !== void 0 && !attrs.listMarkerHidden || attrs?.borders?.top || attrs?.borders?.bottom || attrs?.borders?.left || attrs?.borders?.right || attrs?.borders?.between || attrs?.borders?.bar || attrs?.shading || attrs?.spacingExplicit?.before || attrs?.spacingExplicit?.after || attrs?.pageBreakBefore || attrs?.renderedPageBreakBefore);
 }
 function suppressFinalEmptyParagraphAfterTable(blocks) {
@@ -1188,6 +1211,7 @@ function convertTable(node, startPos, options) {
 */
 function convertImage(node, startPos, pageContentHeight) {
 	const attrs = expectImageAttrs(node);
+	if (!hasPaintableImageSource(attrs.src) && !hasRelationshipBackedImageBox(attrs)) return;
 	const wrapType = attrs.wrapType;
 	const shouldAnchor = wrapType === "behind" || wrapType === "inFront";
 	const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, pageContentHeight);
@@ -1269,6 +1293,8 @@ function convertTextBoxNode(node, startPos, opts) {
 	if (attrs.distRight !== void 0) textBox.distRight = attrs.distRight;
 	if (attrs.position !== void 0) textBox.position = attrs.position;
 	if (attrs._docxGroupId !== void 0) setTextBoxGroupId(textBox, attrs._docxGroupId);
+	const anchorBlockId = attrs._docxAnchorId ? opts.textBoxAnchorBlockIds.get(attrs._docxAnchorId) : void 0;
+	if (anchorBlockId !== void 0) Reflect.set(textBox, TEXT_BOX_ANCHOR_BLOCK_ID, anchorBlockId);
 	return textBox;
 }
 function getLastMapKey(map) {
@@ -1277,6 +1303,41 @@ function getLastMapKey(map) {
 	return lastKey;
 }
 /**
+* Translate section-owned start modes into the boundary-owned values consumed
+* by the paginator. Each flow section break carries the properties for the
+* section it ends, so its start mode belongs on the preceding boundary.
+*/
+function applySectionStartsToBoundaries(blocks, finalSectionStart) {
+	const breakIndexes = [];
+	for (let index = 0; index < blocks.length; index += 1) if (blocks[index]?.kind === "sectionBreak") breakIndexes.push(index);
+	if (breakIndexes.length === 0) return [...blocks];
+	const result = [...blocks];
+	for (let index = 0; index < breakIndexes.length; index += 1) {
+		const boundaryIndex = breakIndexes[index];
+		if (boundaryIndex === void 0) continue;
+		const boundary = blocks[boundaryIndex];
+		if (boundary?.kind !== "sectionBreak") continue;
+		const nextBoundaryIndex = breakIndexes[index + 1];
+		const nextBoundary = nextBoundaryIndex === void 0 ? void 0 : blocks[nextBoundaryIndex];
+		const nextStart = nextBoundary?.kind === "sectionBreak" ? nextBoundary.type : finalSectionStart;
+		const translated = { ...boundary };
+		if (nextStart === void 0) delete translated.type;
+		else translated.type = nextStart;
+		result[boundaryIndex] = translated;
+	}
+	return result;
+}
+function readFinalSectionStart(doc) {
+	const sectionStart = doc.attrs["_finalSectionStart"];
+	switch (sectionStart) {
+		case "continuous":
+		case "nextPage":
+		case "oddPage":
+		case "evenPage": return sectionStart;
+		default: return;
+	}
+}
+/**
 * Convert a ProseMirror document to FlowBlock array.
 *
 * Walks the document tree, converting each node to the appropriate block type.
@@ -1315,6 +1376,7 @@ function toFlowBlocks(doc, options = {}) {
 			final: listCounterState,
 			original: originalListCounterState
 		},
+		textBoxAnchorBlockIds: /* @__PURE__ */ new Map(),
 		numberedRefResults: resolveNumberedRefFields(doc, {
 			listCounterState: cloneListCounterState(listCounterState),
 			originalListCounterState: cloneListCounterState(originalListCounterState)
@@ -1521,9 +1583,11 @@ function toFlowBlocks(doc, options = {}) {
 			case "table":
 				trackedPush(convertTable(node, pos, opts));
 				break;
-			case "image":
-				trackedPush(convertImage(node, pos, opts.pageContentHeight));
+			case "image": {
+				const image = convertImage(node, pos, opts.pageContentHeight);
+				if (image !== void 0) trackedPush(image);
 				break;
+			}
 			case "textBox":
 				trackedPush(convertTextBoxNode(node, pos, opts));
 				break;
@@ -1548,24 +1612,43 @@ function toFlowBlocks(doc, options = {}) {
 	reserveLeadingEmptyOutlineHeight(blocks);
 	suppressFinalEmptyParagraphAfterTable(blocks);
 	suppressFinalParagraphInRepeatedEmptySuffix(blocks);
-	return groupParagraphFrames(applySectionDocumentGrid(mergeRunInParagraphs(blocks), opts.finalSectionDocumentGridLinePitchTwips), nextBlockId);
+	const mergedBlocks = mergeRunInParagraphs(blocks);
+	const tableCellLinePitch = doc.attrs["_adjustLineHeightInTable"] === true ? "sectionGrid" : void 0;
+	return groupParagraphFrames(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
+		finalLinePitchTwips: opts.finalSectionDocumentGridLinePitchTwips,
+		tableCellLinePitch
+	}), readFinalSectionStart(doc)), nextBlockId);
 }
-function applySectionDocumentGrid(blocks, finalLinePitchTwips) {
+function applySectionDocumentGrid(blocks, { finalLinePitchTwips, tableCellLinePitch }) {
 	const result = [...blocks];
 	let sectionStart = 0;
 	const stampSection = (end, linePitchTwips) => {
 		if (linePitchTwips === void 0 || linePitchTwips <= 0) return;
 		const linePitch = twipsToPixels(linePitchTwips);
-		for (let index = sectionStart; index < end; index += 1) {
-			const block = result[index];
-			if (block?.kind !== "paragraph") continue;
-			result[index] = {
+		const stampBlock = (block) => {
+			if (block.kind === "paragraph") return {
 				...block,
 				attrs: {
 					...block.attrs,
 					documentGridLinePitch: linePitch
 				}
 			};
+			if (block.kind !== "table" || tableCellLinePitch !== "sectionGrid") return block;
+			return {
+				...block,
+				rows: block.rows.map((row) => ({
+					...row,
+					cells: row.cells.map((cell) => ({
+						...cell,
+						blocks: cell.blocks.map(stampBlock)
+					}))
+				}))
+			};
+		};
+		for (let index = sectionStart; index < end; index += 1) {
+			const block = result[index];
+			if (!block) continue;
+			result[index] = stampBlock(block);
 		}
 	};
 	for (let index = 0; index < blocks.length; index += 1) {

package/dist/layout-engine/index.js

@@ -500,12 +500,15 @@ function getHeaderRowsHeight(measure, headerRowCount) {
 	return height;
 }
 const tableRowStartsWithRenderedPageBreak = (block, rowIndex) => {
-	const visibleCells = block.rows[rowIndex]?.cells.filter((cell) => cell.blocks.some((cellBlock) => cellBlock.kind !== "paragraph" || !isEmptyParagraph(cellBlock)));
+	const row = block.rows[rowIndex];
+	const visibleCells = row?.cells.filter((cell) => cell.blocks.some((cellBlock) => cellBlock.kind !== "paragraph" || !isEmptyParagraph(cellBlock)));
 	if (!visibleCells || visibleCells.length === 0) return false;
-	return visibleCells.every((cell) => {
+	const startsWithRenderedPageBreak = (cell) => {
 		const firstVisibleBlock = cell.blocks.find((cellBlock) => cellBlock.kind !== "paragraph" || !isEmptyParagraph(cellBlock));
 		return firstVisibleBlock?.kind === "paragraph" && firstVisibleBlock.attrs?.renderedPageBreakBefore === true;
-	});
+	};
+	if (row?.heightRule === "exact") return startsWithRenderedPageBreak(visibleCells[0]);
+	return visibleCells.every(startsWithRenderedPageBreak);
 };
 const getVerticallyMergedRows = (block) => {
 	const mergedRows = /* @__PURE__ */ new Set();
@@ -866,6 +869,8 @@ function layoutAnchoredImage(block, measure, paginator) {
 	};
 	paginator.addUnflowedFragment(fragment);
 }
+const TEXT_BOX_ANCHOR_BLOCK_ID = Symbol.for("stll.textBoxAnchorBlockId");
+const readTextBoxAnchorBlockId = (block) => Reflect.get(block, TEXT_BOX_ANCHOR_BLOCK_ID);
 /**
 * Layout a text box block onto pages.
 */
@@ -909,12 +914,14 @@ function layoutTextBox(block, measure, { paginator, sectionMarginTop, sectionPag
 			boxWidth: measure.width
 		}) : paginator.getColumnX(state.columnIndex);
 		const vertical = block.position.vertical;
+		const anchorBlockId = readTextBoxAnchorBlockId(block);
+		const anchorParagraph = vertical?.relativeTo === "paragraph" && typeof anchorBlockId === "string" ? state.page.fragments.find((fragment) => fragment.kind === "paragraph" && fragment.blockId === anchorBlockId) : void 0;
 		const y = isPageFrameRelativeAnchor(vertical?.relativeTo) ? state.topMargin + bandTopContentY(vertical, {
 			pageHeight: sectionPageHeight,
 			marginTop: sectionMarginTop,
 			marginBottom: sectionMarginBottom,
 			boxHeight: measure.height
-		}) : state.cursorY + emuToPixels(vertical?.posOffset ?? 0);
+		}) : (anchorParagraph?.y ?? state.cursorY) + emuToPixels(vertical?.posOffset ?? 0);
 		const fragment = {
 			kind: "textBox",
 			blockId: block.id,

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

@@ -1,7 +1,7 @@
 import { ParagraphBlock } from "./types.js";
 //#region src/layout-engine/justifiedLineFit.d.ts
-declare const JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO = 0.025;
-declare const JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO = 0.32;
-declare const supportsJustifiedListFinalLineContraction: (block: ParagraphBlock) => boolean;
+declare const JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO = 0.025;
+declare const JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO = 0.32;
+declare const supportsJustifiedFinalLineContraction: (block: ParagraphBlock) => boolean;
 //#endregion
-export { JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO, supportsJustifiedListFinalLineContraction };
+export { JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO, supportsJustifiedFinalLineContraction };

package/dist/layout-engine/justifiedLineFit.js

@@ -1,6 +1,6 @@
 //#region src/layout-engine/justifiedLineFit.ts
-const JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO = .025;
-const JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO = .32;
-const supportsJustifiedListFinalLineContraction = (block) => block.attrs?.justificationCompatibility?.type !== "legacy" && block.attrs?.listMarker !== void 0;
+const JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO = .025;
+const JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO = .32;
+const supportsJustifiedFinalLineContraction = (block) => block.attrs?.alignment === "justify" && block.attrs.justificationCompatibility?.type !== "legacy" && (block.attrs.listMarker !== void 0 || (block.attrs.indent?.left ?? 0) > 0);
 //#endregion
-export { JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO, supportsJustifiedListFinalLineContraction };
+export { JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO, supportsJustifiedFinalLineContraction };

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

@@ -169,6 +169,7 @@ const usesEastAsianLineBreaking = (text, locale) => localeUsesEastAsianLineBreak
 const allowsBreak = (text, index, policy, usesEastAsianRules, nextLineStart) => {
 	const previous = previousCodePoint(text, index);
 	const next = nextLineStart ?? firstCodePoint(text, index);
+	if (!(usesEastAsianRules || policy?.kinsoku === true || policy?.noLineBreaksBefore !== void 0 || policy?.noLineBreaksAfter !== void 0)) return true;
 	if (previous === " " && next === "%" && policy?.kinsoku !== true && policy?.noLineBreaksBefore === void 0 && !usesEastAsianRules) return !isProhibitedLineEnd(previous, policy);
 	return !isProhibitedLineEnd(previous, policy) && !isProhibitedLineStart(next, policy);
 };

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

@@ -587,7 +587,7 @@ function measureTextBoxBlock(tb, fieldValues) {
 	return {
 		kind: "textBox",
 		width: totalWidth,
-		height: tb.autoFit === "shape" ? Math.max(tb.height ?? 0, contentBoxHeight) : tb.height ?? contentBoxHeight,
+		height: tb.autoFit === "shape" ? contentBoxHeight : tb.height ?? contentBoxHeight,
 		innerMeasures
 	};
 }

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

@@ -1,9 +1,8 @@
 import { CJK_FALLBACK_FONT_FAMILY, isCjkFont } from "../../utils/fontResolver.js";
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
-import { isRtlParagraph } from "../../utils/paragraphBaseDirection.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
 import { hasCjk, hasComplexScript } from "../../utils/scriptSegments.js";
-import { JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO, supportsJustifiedListFinalLineContraction } from "../justifiedLineFit.js";
+import { JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO, supportsJustifiedFinalLineContraction } from "../justifiedLineFit.js";
 import { measuredLineAdvance } from "../lineFlow.js";
 import { isFloatingImageRun } from "../types.js";
 import { clampFloatingWrapMargins } from "./clampFloatingWrapMargins.js";
@@ -382,7 +381,7 @@ function resolveJustifyFitStrategy(block, isFirstLine, profile) {
 		};
 		return {
 			type: "space",
-			ratio: JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO,
+			ratio: JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO,
 			maxWidthRatio: JUSTIFY_SHRINK_TOLERANCE_RATIO
 		};
 	}
@@ -409,10 +408,10 @@ function resolveJustifyFitStrategy(block, isFirstLine, profile) {
 	};
 }
 function resolveFinalLineJustifyFitStrategy(block, profile) {
-	if (supportsJustifiedListFinalLineContraction(block)) return {
+	if (supportsJustifiedFinalLineContraction(block)) return {
 		type: "space",
-		ratio: JUSTIFIED_LIST_SPACE_CONTRACTION_RATIO,
-		maxWidthRatio: JUSTIFIED_LIST_FINAL_LINE_MAX_SHRINK_RATIO
+		ratio: JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO,
+		maxWidthRatio: JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO
 	};
 	return resolveJustifyFitStrategy(block, false, profile);
 }
@@ -433,11 +432,11 @@ function isFinalTextCandidate(block, runIndex, nextBreak) {
 	return true;
 }
 function resolveTextCandidateFit({ block, line, isFirstLine, isFinalCandidate, candidateWidth, candidateSpaceWidth, fallbackTolerancePx, continuationStrategy, finalStrategy }) {
-	if (isFirstLine || !isFinalCandidate || !supportsJustifiedListFinalLineContraction(block)) return {
+	if (!isFinalCandidate || !supportsJustifiedFinalLineContraction(block)) return {
 		type: "ordinary",
 		tolerancePx: fallbackTolerancePx
 	};
-	const ordinaryTolerancePx = justifyFitTolerance(line, continuationStrategy, candidateSpaceWidth);
+	const ordinaryTolerancePx = isFirstLine ? fallbackTolerancePx : justifyFitTolerance(line, continuationStrategy, candidateSpaceWidth);
 	if (candidateWidth <= line.availableWidth + ordinaryTolerancePx) return {
 		type: "ordinary",
 		tolerancePx: ordinaryTolerancePx
@@ -713,7 +712,6 @@ function findClearLineY(startY, lineHeight, zones, contentWidth, minWidth) {
 function measureParagraph(block, maxWidth, options) {
 	const runs = block.runs;
 	const attrs = block.attrs;
-	const isRtl = isRtlParagraph(block);
 	const spacing = attrs?.spacing;
 	const isJustifiedParagraph = attrs?.alignment === "justify";
 	const justificationProfile = {
@@ -754,24 +752,26 @@ function measureParagraph(block, maxWidth, options) {
 	const firstLineWidth = Math.max(1, getFloatingAvailableWidth(firstLineFloatingMargins, baseFirstLineWidth));
 	const lines = [];
 	let consecutiveHyphenatedLines = 0;
+	if (attrs?.suppressEmptyParagraphHeight) {
+		const finalRunIndex = Math.max(0, runs.length - 1);
+		const finalRun = runs.at(-1);
+		lines.push({
+			fromRun: 0,
+			fromChar: 0,
+			toRun: finalRunIndex,
+			toChar: finalRun?.kind === "text" ? finalRun.text.length : 0,
+			width: 0,
+			ascent: 0,
+			descent: 0,
+			lineHeight: 0
+		});
+		return {
+			kind: "paragraph",
+			lines,
+			totalHeight: 0
+		};
+	}
 	if (runs.length === 0) {
-		if (attrs?.suppressEmptyParagraphHeight) {
-			lines.push({
-				fromRun: 0,
-				fromChar: 0,
-				toRun: 0,
-				toChar: 0,
-				width: 0,
-				ascent: 0,
-				descent: 0,
-				lineHeight: 0
-			});
-			return {
-				kind: "paragraph",
-				lines,
-				totalHeight: 0
-			};
-		}
 		const emptyMetrics = calculateEmptyParagraphMetrics(attrs?.defaultFontSize ?? DEFAULT_FONT_SIZE, spacing, attrs?.defaultFontFamily ?? DEFAULT_FONT_FAMILY, attrs);
 		const outlineLineHeight = attrs?.reserveEmptyOutlineHeight ? emptyMetrics.lineHeight * 2 : emptyMetrics.lineHeight;
 		lines.push({
@@ -987,11 +987,11 @@ function measureParagraph(block, maxWidth, options) {
 			let tabWidth = tabResult.width;
 			const authoredEndpoint = contentX + tabWidth + followingWidth;
 			const activeContentRightEdge = maxWidth - currentLine.rightOffset;
-			const preservesLogicalRtlEndStop = isRtl && tabResult.alignment === "end" && authoredEndpoint <= activeContentRightEdge + WIDTH_TOLERANCE;
+			const preservesAuthoredEndStop = tabResult.alignment === "end" && authoredEndpoint <= activeContentRightEdge + WIDTH_TOLERANCE;
 			const landsOnLeftIndent = tabResult.alignment === "start" && indentLeft > 0 && Math.abs(contentX + tabWidth - indentLeft) <= WIDTH_TOLERANCE;
 			const lineRightEdgeX = indentLeft + (isFirstLine ? firstLineOffset + markerInlineWidth : 0) + currentLine.availableWidth + currentLine.leftOffset;
-			if (!preservesLogicalRtlEndStop && !landsOnLeftIndent && !hasFollowingTabOnLine(runs, runIndex) && canClampTabToRightEdge(tabResult.alignment, currentLine.width, hasPriorTabOnLine(runs, runIndex), followingWidth, currentLine.availableWidth) && (tabWidth > 0 || followingWidth > 0) && contentX + tabWidth + followingWidth > lineRightEdgeX + WIDTH_TOLERANCE) tabWidth = Math.max(1, lineRightEdgeX - contentX - followingWidth);
-			if (preservesLogicalRtlEndStop) currentLine.availableWidth = Math.max(currentLine.availableWidth, currentLine.width + tabWidth + followingWidth);
+			if (!preservesAuthoredEndStop && !landsOnLeftIndent && !hasFollowingTabOnLine(runs, runIndex) && canClampTabToRightEdge(tabResult.alignment, currentLine.width, hasPriorTabOnLine(runs, runIndex), followingWidth, currentLine.availableWidth) && (tabWidth > 0 || followingWidth > 0) && contentX + tabWidth + followingWidth > lineRightEdgeX + WIDTH_TOLERANCE) tabWidth = Math.max(1, lineRightEdgeX - contentX - followingWidth);
+			if (preservesAuthoredEndStop) currentLine.availableWidth = Math.max(currentLine.availableWidth, currentLine.width + tabWidth + followingWidth);
 			if (currentLine.width + tabWidth > currentLine.availableWidth + WIDTH_TOLERANCE) {
 				startNewLine(runIndex, 0);
 				updateMaxFont(style);

package/dist/layout-painter/renderPage.js

@@ -24,6 +24,7 @@ import { panic } from "better-result";
 * Renders a single page from Layout data to DOM elements.
 * Each page contains positioned fragments within a content area.
 */
+const TEXT_BOX_ANCHOR_BLOCK_ID = Symbol.for("stll.textBoxAnchorBlockId");
 const floatingTableReservesBand = ({ contentX, tableWidth, contentWidth, distLeft, distRight }) => {
 	const leftClearance = Math.max(0, contentX - distLeft);
 	const rightClearance = Math.max(0, contentWidth - contentX - tableWidth - distRight);
@@ -442,6 +443,7 @@ function renderHeaderFooterContent(content, context, options, layout) {
 		...context,
 		positioning: "absolute"
 	};
+	const paragraphStartYByBlockId = /* @__PURE__ */ new Map();
 	for (let i = 0; i < content.blocks.length; i++) {
 		const block = content.blocks[i];
 		const measure = content.measures[i];
@@ -450,6 +452,7 @@ function renderHeaderFooterContent(content, context, options, layout) {
 			const paragraphBlock = block;
 			const paragraphMeasure = measure;
 			const paragraphStartY = cursorY;
+			paragraphStartYByBlockId.set(paragraphBlock.id, paragraphStartY);
 			const inlineRuns = [];
 			for (const run of paragraphBlock.runs) if (run.kind === "image" && (isFloatingImageRun(run) || run.position)) floatingImages.push({
 				src: run.src,
@@ -530,9 +533,11 @@ function renderHeaderFooterContent(content, context, options, layout) {
 				document: doc,
 				renderTable: renderNestedTable
 			});
+			const anchorBlockId = Reflect.get(block, TEXT_BOX_ANCHOR_BLOCK_ID);
+			const paragraphY = block.position?.vertical?.relativeTo === "paragraph" && typeof anchorBlockId === "string" ? paragraphStartYByBlockId.get(anchorBlockId) ?? cursorY : cursorY;
 			const textBoxTop = block.position ? resolveHeaderFooterFloatTop({
 				height: measure.height,
-				paragraphY: cursorY,
+				paragraphY,
 				position: block.position
 			}, layout) : cursorY;
 			fragEl.style.top = `${textBoxTop}px`;

package/dist/layout-painter/renderParagraph.js

@@ -14,7 +14,7 @@ import "../utils/fontWeights.js";
 import { getHorizontalScaleFactor } from "../utils/horizontalScale.js";
 import { resolvePhysicalParagraphInlineLayout } from "../utils/paragraphInlineLayout.js";
 import { inlineImageBoundingBox, parseRotationDegrees, rotatedBoundingBox } from "../utils/rotationBoundingBox.js";
-import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
+import { sanitizeImageSrc } from "../utils/sanitizeImageSrc.js";
 import { SCRIPT_CLASS, hasCjk, hasComplexScript, segmentByScript } from "../utils/scriptSegments.js";
 import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { borderStrokeToCss, resolveParagraphBorderHorizontalOutsets } from "./borderStroke.js";
@@ -42,6 +42,14 @@ const PARAGRAPH_CLASS_NAMES = {
 	image: "layout-run-image",
 	lineBreak: "layout-run-linebreak"
 };
+const applyImageRunSource = (img, src) => {
+	const safeSrc = sanitizeImageSrc(src);
+	if (safeSrc === void 0) {
+		img.style.visibility = "hidden";
+		return;
+	}
+	img.src = safeSrc;
+};
 const LEFT_TO_RIGHT_DIRECTION = "ltr";
 const RIGHT_TO_LEFT_DIRECTION = "rtl";
 const DISPLAYED_URL_PATTERN = /^(?:https?:\/\/|www\.)\S+$/iu;
@@ -488,7 +496,7 @@ function getLeaderChar(leader) {
 function renderInlineImageRun(run, doc) {
 	const img = doc.createElement("img");
 	img.className = `${PARAGRAPH_CLASS_NAMES.run} ${PARAGRAPH_CLASS_NAMES.image}`;
-	applySanitizedImageSrc(img, run.src);
+	applyImageRunSource(img, run.src);
 	img.width = run.width;
 	img.height = run.height;
 	img.style.width = `${run.width}px`;
@@ -556,7 +564,7 @@ function renderBlockImage(run, doc) {
 	container.style.marginTop = `${run.distTop ?? 6}px`;
 	container.style.marginBottom = `${run.distBottom ?? 6}px`;
 	const img = doc.createElement("img");
-	applySanitizedImageSrc(img, run.src);
+	applyImageRunSource(img, run.src);
 	img.width = run.width;
 	img.height = run.height;
 	if (run.alt) img.alt = run.alt;
@@ -1241,7 +1249,7 @@ function renderLine(block, line, alignment, doc, options) {
 		}
 	}
 	lineEl.style.whiteSpace = "pre";
-	lineEl.style.overflow = "visible";
+	lineEl.style.overflow = block.attrs?.suppressEmptyParagraphHeight ? "hidden" : "visible";
 	let tabContext;
 	const hasScaledTextRun = runsForLine.some((run) => (isTextRun(run) || isFieldRun(run) || isMathRun(run)) && getHorizontalScaleFactor(run.horizontalScale) !== 1);
 	const measureText = collapsedSpaceMeasureText ?? (hasTabRuns || hasScaledTextRun ? createTextMeasurer(doc) : void 0);
@@ -1285,7 +1293,11 @@ function renderLine(block, line, alignment, doc, options) {
 					break;
 				}
 			}
-			if (lineRightEdgeX !== void 0 && options?.isRtl !== true && tabResult.alignment === "end" && !hasFollowingTab && currentX + tabResult.width + followingWidthForCheck >= lineRightEdgeX - RIGHT_EDGE_EPSILON_PX) {
+			const authoredEndpoint = currentX + tabResult.width + followingWidthForCheck;
+			const activeContentRightEdge = options?.contentWidthPx === void 0 ? void 0 : options.contentWidthPx - (options.floatingMargins?.rightMargin ?? 0);
+			const preservesAuthoredEndStop = activeContentRightEdge !== void 0 && tabResult.alignment === "end" && authoredEndpoint <= activeContentRightEdge + RIGHT_EDGE_EPSILON_PX;
+			const preservesAuthoredEndStopPastIndent = lineRightEdgeX !== void 0 && preservesAuthoredEndStop && authoredEndpoint > lineRightEdgeX + RIGHT_EDGE_EPSILON_PX;
+			if (lineRightEdgeX !== void 0 && options?.isRtl !== true && tabResult.alignment === "end" && !hasFollowingTab && !preservesAuthoredEndStopPastIndent && authoredEndpoint >= lineRightEdgeX - RIGHT_EDGE_EPSILON_PX) {
 				lineEl.style.display = "flex";
 				lineEl.style.alignItems = "baseline";
 				lineEl.style.whiteSpace = "pre";
@@ -1320,10 +1332,8 @@ function renderLine(block, line, alignment, doc, options) {
 				break;
 			}
 			let tabWidth = tabResult.width;
-			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);
+			if (!preservesAuthoredEndStop && !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;

package/dist/layout-painter/renderWatermark.js

@@ -1,7 +1,9 @@
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
+import { pointsToPixels } from "../utils/units.js";
 //#region src/layout-painter/renderWatermark.ts
 const WATERMARK_CLASS = "layout-page-watermark";
+const PICTURE_WASHOUT_OPACITY = .18;
 /**
 * Build the watermark overlay element for a page. Returns `null` when
 * the watermark is a picture without a resolved `imageSrc` (the
@@ -51,10 +53,15 @@ function renderPictureWatermark(watermark, imageSrc, doc) {
 	applySanitizedImageSrc(img, imageSrc);
 	img.alt = "";
 	img.setAttribute("aria-hidden", "true");
-	const scalePct = (watermark.scale ?? 1) * 100;
-	img.style.maxWidth = `${scalePct}%`;
-	img.style.maxHeight = `${scalePct}%`;
-	img.style.opacity = watermark.washout === false ? "1" : "0.4";
+	if (watermark.widthPt !== void 0 && watermark.heightPt !== void 0) {
+		img.style.width = `${pointsToPixels(watermark.widthPt)}px`;
+		img.style.height = `${pointsToPixels(watermark.heightPt)}px`;
+	} else {
+		const scalePct = (watermark.scale ?? 1) * 100;
+		img.style.maxWidth = `${scalePct}%`;
+		img.style.maxHeight = `${scalePct}%`;
+	}
+	img.style.opacity = String(watermark.washout === false ? 1 : PICTURE_WASHOUT_OPACITY);
 	img.style.objectFit = "contain";
 	return img;
 }

package/dist/prosemirror/attrs/index.js

@@ -91,6 +91,11 @@ const RUN_FORMATTING_OVERRIDE_BOOLEAN_KEYS = [
 	"outline"
 ];
 const RUN_FORMATTING_OVERRIDE_FALSE_KEYS = ["doubleStrike", "rtl"];
+const RUN_FORMATTING_OVERRIDE_DIRECT_FONT_PROPERTIES = [
+	"fontFamily",
+	"fontSize",
+	"color"
+];
 const SECTION_ORIENTATIONS = ["portrait", "landscape"];
 const SECTION_START_TYPES = [
 	"continuous",
@@ -678,6 +683,12 @@ const readRunFormattingOverrideMarkAttrs = (mark) => {
 	optionalNumber(attrs, "fontSizeCs", "runFormattingOverride.attrs.fontSizeCs", issues);
 	optionalBoolean(attrs, "cs", "runFormattingOverride.attrs.cs", issues);
 	optionalOneOf(attrs, "underline", "runFormattingOverride.attrs.underline", issues, ["none"]);
+	optionalOneOfArray(attrs, "directFontProperties", "runFormattingOverride.attrs.directFontProperties", issues, RUN_FORMATTING_OVERRIDE_DIRECT_FONT_PROPERTIES);
+	const directFontProperties = attrs["directFontProperties"];
+	if (Array.isArray(directFontProperties) && new Set(directFontProperties).size !== directFontProperties.length) issues.push({
+		path: "runFormattingOverride.attrs.directFontProperties",
+		message: "Expected unique direct font properties."
+	});
 	return attrsResult(attrs, issues);
 };
 const expectRunFormattingOverrideMarkAttrs = (mark) => expectCachedMarkAttrs(mark, runFormattingOverrideAttrsCache, readRunFormattingOverrideMarkAttrs, "run formatting override attrs");

package/dist/prosemirror/commands/comments.js

@@ -62,6 +62,7 @@ function resolveChange(from, to, mode, revisionIds) {
 		const keepType = mode === "accept" ? insertionType : deletionType;
 		const removeType = mode === "accept" ? deletionType : insertionType;
 		const revisionSet = revisionIds === void 0 ? null : new Set(revisionIds);
+		const removeKeptMarksInBulk = revisionSet === null && keepType !== void 0;
 		const matchesRevision = (mark) => revisionSet === null || typeof mark.attrs["revisionId"] === "number" && revisionSet.has(mark.attrs["revisionId"]);
 		if (dispatch) {
 			const tr = state.tr;
@@ -139,10 +140,29 @@ function resolveChange(from, to, mode, revisionIds) {
 					from: rangeFrom,
 					to: rangeTo
 				});
-				for (const mark of node.marks) if (keepType && mark.type === keepType && matchesRevision(mark)) tr.removeMark(rangeFrom, rangeTo, mark);
+				if (!removeKeptMarksInBulk) {
+					for (const mark of node.marks) if (keepType && mark.type === keepType && matchesRevision(mark)) tr.removeMark(rangeFrom, rangeTo, mark);
+				}
 				return true;
 			});
-			for (const range of deleteRanges.toReversed()) tr.delete(range.from, range.to);
+			if (removeKeptMarksInBulk) tr.removeMark(from, to, keepType);
+			let rangesToDelete = deleteRanges;
+			if (revisionSet === null) {
+				const coalescedDeleteRanges = [];
+				for (const range of deleteRanges) {
+					const previous = coalescedDeleteRanges.at(-1);
+					if (previous && range.from <= previous.to) {
+						previous.to = Math.max(previous.to, range.to);
+						continue;
+					}
+					coalescedDeleteRanges.push({
+						from: range.from,
+						to: range.to
+					});
+				}
+				rangesToDelete = coalescedDeleteRanges;
+			}
+			for (const range of rangesToDelete.toReversed()) tr.delete(range.from, range.to);
 			pPrMarkOps.sort((a, b) => b.paragraphPos - a.paragraphPos);
 			for (const op of pPrMarkOps) {
 				const mappedPos = tr.mapping.map(op.paragraphPos);