@stll/folio-core 0.33.2 → 0.34.0

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);

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -689,9 +689,9 @@ function createTrackedRunWrapper(type, info, child) {
 		content
 	};
 }
-function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false) {
+function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
 	const content = [];
-	const inheritedFormatting = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0;
+	const inheritedFormatting = inheritedFormattingOverride ?? (paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0);
 	const sortedEmptyHyperlinks = (emptyHyperlinks ?? []).map((attrs, order) => ({
 		attrs,
 		order
@@ -966,7 +966,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			}));
 		} else if (node.type.name === "sdt") {
 			flushCurrentInline();
-			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers));
+			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers, inheritedFormatting));
 		} else if (node.type.name === "math") {
 			flushCurrentInline();
 			content.push(createMathFromNode(node));
@@ -1369,11 +1369,11 @@ function createMathFromNode(node) {
 /**
 * Create an InlineSdt from a PM sdt node
 */
-function createInlineSdtFromNode(node, textBoxAnchorMarkers) {
+function createInlineSdtFromNode(node, textBoxAnchorMarkers, inheritedFormatting) {
 	return {
 		type: "inlineSdt",
 		properties: sdtPropertiesFromAttrs(expectSdtAttrs(node)),
-		content: extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "moveFrom" || c.type === "moveTo" || c.type === "mathEquation")
+		content: extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers, false, inheritedFormatting).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "moveFrom" || c.type === "moveTo" || c.type === "mathEquation")
 	};
 }
 /**
@@ -1524,6 +1524,7 @@ function createShapeRun(node) {
 function marksToTextFormatting(marks, options) {
 	const formatting = {};
 	let directOverrideFormatting;
+	let directFontProperties;
 	let characterStyleRPr;
 	let runFormattingOverrideMark;
 	for (const mark of marks) switch (mark.type.name) {
@@ -1651,9 +1652,14 @@ function marksToTextFormatting(marks, options) {
 	}
 	if (runFormattingOverrideMark) {
 		const overrideAttrs = expectRunFormattingOverrideMarkAttrs(runFormattingOverrideMark);
+		directFontProperties = overrideAttrs.directFontProperties;
 		applyRunFormattingOverrideAttrs(formatting, overrideAttrs);
 		directOverrideFormatting = {};
 		applyRunFormattingOverrideAttrs(directOverrideFormatting, overrideAttrs);
+		for (const property of directFontProperties ?? []) {
+			const value = formatting[property];
+			if (value !== void 0) Reflect.set(directOverrideFormatting, property, value);
+		}
 	}
 	if (characterStyleRPr) return subtractCharacterStyleFormatting({
 		directOverrideFormatting,
@@ -1661,8 +1667,29 @@ function marksToTextFormatting(marks, options) {
 		inheritedFormatting: options?.inheritedFormatting,
 		styleRPr: characterStyleRPr
 	});
+	for (const property of [
+		"fontFamily",
+		"fontSize",
+		"color"
+	]) {
+		if (directFontProperties?.includes(property)) continue;
+		const value = formatting[property];
+		const inheritedValue = options?.inheritedFormatting?.[property];
+		const matchesInherited = property === "fontFamily" ? sameFontFamily(formatting.fontFamily, options?.inheritedFormatting?.fontFamily) : JSON.stringify(value) === JSON.stringify(inheritedValue);
+		if (inheritedValue !== void 0 && matchesInherited) Reflect.deleteProperty(formatting, property);
+	}
 	return formatting;
 }
+const sameFontFamily = (left, right) => [
+	"ascii",
+	"hAnsi",
+	"eastAsia",
+	"hint",
+	"asciiTheme",
+	"hAnsiTheme",
+	"eastAsiaTheme",
+	"csTheme"
+].every((property) => left?.[property] === right?.[property]) && (left?.cs ?? left?.ascii) === (right?.cs ?? right?.ascii);
 /**
 * Negatable boolean run-property keys whose serializer emits an explicit
 * `w:val="0"` override when the value is `false` (see `serializeTextFormatting`

package/dist/prosemirror/conversion/toProseDoc.js

@@ -18,6 +18,7 @@ import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
 //#region src/prosemirror/conversion/toProseDoc.ts
+const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 /**
 * Build a `nextTextBoxGroupId()` generator salted with a random per-load
 * nonce, so minted text-box anchor ids (`<salt>:<group>:<index>`) are unique
@@ -139,7 +140,12 @@ function toProseDoc(document, options) {
 	};
 	nodes.push(...convertBodyBlocks(paragraphs));
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
-	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, nodes));
+	const finalSectionStart = document.package.document.sections?.at(-1)?.properties.sectionStart ?? null;
+	const adjustLineHeightInTable = document.package.settings?.adjustLineHeightInTable === true;
+	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", {
+		_finalSectionStart: finalSectionStart,
+		_adjustLineHeightInTable: adjustLineHeightInTable
+	}, nodes));
 	assertValidProseMirrorDocument(pmDoc, "Document conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }
@@ -210,6 +216,7 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
+	const ordinaryStyleFormatting = paragraph.formatting?.styleId === void 0 ? mergeTextFormatting(styleRunFormatting, extraRunFormatting) : mergeTextFormatting(extraRunFormatting, styleRunFormatting);
 	const orderedToggleFormatting = cascadeStyleTextFormatting([
 		{
 			formatting: styleResolver?.getDocDefaults()?.rPr,
@@ -223,7 +230,7 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 			formatting: paragraphStyleRunFormatting,
 			type: "style"
 		}
-	], { ordinaryFormatting: mergeTextFormatting(styleRunFormatting, extraRunFormatting) });
+	], { ordinaryFormatting: ordinaryStyleFormatting });
 	let baseRunFormatting = orderedToggleFormatting.formatting;
 	if (paragraphStyleFontFamily) baseRunFormatting = mergeTextFormatting(baseRunFormatting, { fontFamily: paragraphStyleFontFamily });
 	const paragraphMarkPrecedesStyle = paragraph.formatting?.styleId !== void 0;
@@ -1000,10 +1007,10 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		let cellConditionalStyle = conditionalStyles?.wholeTable;
 		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, effectiveRowBandStyle);
 		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, vertBandStyle);
-		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
-		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
 		if (cellIsFirstCol && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstCol);
 		if (cellIsLastCol && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastCol);
+		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
+		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
 		if (cellIsFirstRow && cellIsFirstCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.nwCell);
 		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
 		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
@@ -1265,6 +1272,7 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		hasCharacterStyle: styleId !== void 0,
 		paragraphMarkOverrides: inherited.paragraphMarkOverrides
 	}) });
+	addDirectFontProvenance(marks, runFormatting);
 	if (styleId) {
 		const styleRPr = characterStyleFormatting ? marksToTextFormatting(textFormattingToMarks(characterStyleFormatting)) : void 0;
 		marks.push(schema.mark("characterStyle", {
@@ -1277,6 +1285,24 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		mergedFormatting
 	};
 }
+const addDirectFontProvenance = (marks, directFormatting) => {
+	const directFontProperties = [];
+	if (directFormatting?.fontFamily !== void 0) directFontProperties.push("fontFamily");
+	if (directFormatting?.fontSize !== void 0) directFontProperties.push("fontSize");
+	if (directFormatting?.color !== void 0) directFontProperties.push("color");
+	if (!directFormatting || !Object.keys(directFormatting).some((property) => property !== "styleId")) return;
+	const index = marks.findIndex(({ type }) => type.name === "runFormattingOverride");
+	const existing = index >= 0 ? marks.at(index) : void 0;
+	const override = schema.mark("runFormattingOverride", {
+		...existing?.attrs,
+		...directFontProperties.length > 0 && { directFontProperties }
+	});
+	if (index >= 0) {
+		marks[index] = override;
+		return;
+	}
+	marks.push(override);
+};
 const ORDINARY_STYLE_TOGGLE_KEYS = [
 	"bold",
 	"italic",
@@ -1658,12 +1684,12 @@ function convertShape(shape) {
 		position
 	});
 }
-function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, tableParagraphOverlay }) {
+function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, preserveEmptyWrapper, tableParagraphOverlay }) {
 	const { textBoxes, textBoxAnchors } = extractTextBoxesFromParagraph(block, textBoxGroupId);
 	const pmParagraph = convertParagraph(block, styleResolver, context.nextHyperlinkInstanceIndex, context.pairedBookmarkIds, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && !hasContentBesidesTextBoxAnchors(pmParagraph);
-	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
+	const keepWrapperParagraph = isEmptyAfterExtraction && (preserveEmptyWrapper === true || hasParagraphBoundaryPayload(block, pmParagraph));
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
 	for (const { textBox, anchorId, trackedChange, inlineSdts } of textBoxes) nodes.push(convertTextBox(textBox, styleResolver, {
 		placement: isEmptyAfterExtraction && !keepWrapperParagraph ? "standalone" : "inlineWithPrevious",
@@ -1929,11 +1955,23 @@ function headerFooterToProseDoc(content, options) {
 	};
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
-			textBoxGroupId: nextTextBoxGroupId(),
-			context: conversionContext
-		}));
-		else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
+		for (const block of blocks) if (block.type === "paragraph") {
+			const isDetachedWatermarkHost = Reflect.get(block, DETACHED_WATERMARK_HOST) === true;
+			const paragraphNodes = convertParagraphWithTextBoxes(block, styleResolver, {
+				textBoxGroupId: nextTextBoxGroupId(),
+				context: conversionContext,
+				preserveEmptyWrapper: isDetachedWatermarkHost
+			});
+			if (isDetachedWatermarkHost) {
+				const paragraphNodeIndex = paragraphNodes.findIndex(({ type }) => type.name === "paragraph");
+				const paragraphNode = paragraphNodes[paragraphNodeIndex];
+				if (paragraphNode) paragraphNodes[paragraphNodeIndex] = paragraphNode.type.create({
+					...paragraphNode.attrs,
+					_detachedWatermarkHost: true
+				}, paragraphNode.content, paragraphNode.marks);
+			}
+			out.push(...paragraphNodes);
+		} else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
 		else out.push(convertBlockSdt(block, convertBlocks));
 		return out;
 	};

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

@@ -6,7 +6,13 @@ import { createNodeExtension } from "../create.js";
 const DocExtension = createNodeExtension({
 	name: "doc",
 	schemaNodeName: "doc",
-	nodeSpec: { content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt)+" }
+	nodeSpec: {
+		attrs: {
+			_finalSectionStart: { default: null },
+			_adjustLineHeightInTable: { default: false }
+		},
+		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt)+"
+	}
 });
 //#endregion
 export { DocExtension };