@stll/folio-core 0.37.1 → 0.37.3

package/dist/docx/server/materializeYjsDocx.d.ts

@@ -4,7 +4,7 @@ declare const FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME = "prosemirror";
 /** Maximum accepted size of a complete Yjs collaboration state update. */
 declare const FOLIO_YJS_UPDATE_MAX_BYTES: number;
 /** Stable failure codes returned by server-side Yjs-to-DOCX materialization. */
-declare const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES: readonly ["empty_update", "invalid_update", "missing_document", "update_too_large"];
+declare const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES: readonly ["empty_update", "invalid_update", "missing_document", "source_mismatch", "update_too_large"];
 /** Failure code for a rejected Yjs-to-DOCX materialization request. */
 type FolioYjsDocxMaterializationErrorCode = (typeof FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES)[number];
 declare const FolioYjsDocxMaterializationError_base: import("better-result").TaggedErrorClass<"FolioYjsDocxMaterializationError">;

package/dist/docx/server/materializeYjsDocx.js

@@ -1,5 +1,7 @@
 import { fromProseDoc } from "../../prosemirror/conversion/fromProseDoc.js";
 import { schema } from "../../prosemirror/schema/index.js";
+import { readYjsParagraphSourceContract, withParagraphSourceContract } from "../../prosemirror/yjsParagraphSourceContract.js";
+import { ParagraphPropertySourceValidationError } from "../paragraphPropertySource.js";
 import { parseDocx } from "../parser.js";
 import { repackDocx } from "../rezip.js";
 import { Result, TaggedError } from "better-result";
@@ -15,6 +17,7 @@ const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES = [
 	"empty_update",
 	"invalid_update",
 	"missing_document",
+	"source_mismatch",
 	"update_too_large"
 ];
 /** Typed failure raised when a collaboration snapshot cannot be materialized. */
@@ -37,7 +40,12 @@ const readProseMirrorDocument = (yjsUpdate) => {
 				code: "missing_document",
 				message: "Yjs update does not contain a Folio document."
 			});
-			return initProseMirrorDoc(fragment, schema).doc;
+			const contract = readYjsParagraphSourceContract(ydoc);
+			if (!contract) throw new FolioYjsDocxMaterializationError({
+				code: "source_mismatch",
+				message: "Yjs update does not identify its paragraph-property source document."
+			});
+			return withParagraphSourceContract(initProseMirrorDoc(fragment, schema).doc, contract);
 		},
 		catch: (cause) => cause instanceof FolioYjsDocxMaterializationError ? cause : new FolioYjsDocxMaterializationError({
 			code: "invalid_update",
@@ -55,7 +63,18 @@ const readProseMirrorDocument = (yjsUpdate) => {
 * of the browser editor's full save path for the main document story.
 */
 const materializeYjsDocx = async ({ sourceDocx, yjsUpdate }) => {
-	return await repackDocx(fromProseDoc(readProseMirrorDocument(yjsUpdate), await parseDocx(sourceDocx, { preloadFonts: false })));
+	const proseMirrorDocument = readProseMirrorDocument(yjsUpdate);
+	const baseDocument = await parseDocx(sourceDocx, { preloadFonts: false });
+	const converted = Result.try({
+		try: () => fromProseDoc(proseMirrorDocument, baseDocument),
+		catch: (cause) => cause instanceof ParagraphPropertySourceValidationError ? new FolioYjsDocxMaterializationError({
+			code: "source_mismatch",
+			message: "The collaboration snapshot belongs to a different source document.",
+			cause
+		}) : cause
+	});
+	if (converted.isErr()) throw converted.error;
+	return await repackDocx(converted.value);
 };
 //#endregion
 export { FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES, FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME, FOLIO_YJS_UPDATE_MAX_BYTES, FolioYjsDocxMaterializationError, materializeYjsDocx };

package/dist/headless-layout.js

@@ -132,7 +132,7 @@ const convertStories = ({ parts, contentWidth, metrics, storyOptions, pageCount,
 	for (const [rId, part] of parts ?? []) {
 		const content = convertHeaderFooterToContent(part, contentWidth, metrics, {
 			...storyOptions,
-			measureBlocks: (blocks, width) => measureBlocks(blocks, width, void 0, void 0, buildHeaderFooterFieldValues(blocks, pageCount, now)),
+			measureBlocks: (blocks, width) => measureBlocks(blocks, width, void 0, void 0, buildHeaderFooterFieldValues(blocks, pageCount, now), { allowEndTabOverflow: true }),
 			rId
 		});
 		if (content) contentByRId.set(rId, content);

package/dist/layout-bridge/convert/headerFooterLayout.d.ts

@@ -13,6 +13,12 @@ type HeaderFooterMetrics = {
   margins: PageMargins;
 };
 declare function normalizeHeaderFooterMeasureBlocks(blocks: FlowBlock[], section?: HeaderFooterMetrics["section"]): FlowBlock[];
+/**
+ * Header/footer auto-fit tables use `w:tblGrid` as a provisional ratio, not a
+ * license to paint beyond the page furniture frame. Scale an oversized grid
+ * for measurement while leaving the authored block untouched for round trips.
+ */
+declare function fitHeaderFooterTablesToContentWidth(blocks: FlowBlock[], contentWidth: number): FlowBlock[];
 declare function resolveHeaderFooterPositionedVisualTop(position: ImageRunPosition | undefined, elementHeight: number, sourceY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
 declare function resolveHeaderFooterVisualTop(run: ImageRun, paragraphY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
 declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
@@ -96,4 +102,4 @@ type ReserveHeaderFooterFullWidthWrapBandsOptions = {
 };
 declare function reserveHeaderFooterFullWidthWrapBands({ blocks, measures, contentWidth, metrics }: ReserveHeaderFooterFullWidthWrapBandsOptions): Measure[];
 //#endregion
-export { ConvertHeaderFooterOptions, HeaderFooterMetrics, calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, reserveHeaderFooterFullWidthWrapBands, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };
+export { ConvertHeaderFooterOptions, HeaderFooterMetrics, calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, fitHeaderFooterTablesToContentWidth, normalizeHeaderFooterMeasureBlocks, reserveHeaderFooterFullWidthWrapBands, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };

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

@@ -1,5 +1,5 @@
 import { cloneParagraphWithPropertySource } from "../../docx/paragraphPropertySource.js";
-import { isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "../../layout-engine/types.js";
+import { isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, tableColumnsArePinned } from "../../layout-engine/types.js";
 import { headerFooterToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
 import { emuToPixels } from "../../utils/units.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
@@ -33,6 +33,23 @@ function preservesInheritedSpacing(block) {
 function normalizeHeaderFooterMeasureBlocks(blocks, section = "header") {
 	return normalizeFlowBlockArray(blocks, { suppressTrailingEmptyAfterTable: section === "header" });
 }
+/**
+* Header/footer auto-fit tables use `w:tblGrid` as a provisional ratio, not a
+* license to paint beyond the page furniture frame. Scale an oversized grid
+* for measurement while leaving the authored block untouched for round trips.
+*/
+function fitHeaderFooterTablesToContentWidth(blocks, contentWidth) {
+	return blocks.map((block) => {
+		if (block.kind !== "table" || block.floating !== void 0 || tableColumnsArePinned(block) || block.columnWidths === void 0) return block;
+		const totalWidth = block.columnWidths.reduce((sum, width) => sum + width, 0);
+		if (totalWidth <= contentWidth || totalWidth <= 0) return block;
+		const scale = contentWidth / totalWidth;
+		return {
+			...block,
+			columnWidths: block.columnWidths.map((width) => width * scale)
+		};
+	});
+}
 function normalizeFlowBlockArray(blocks, normalization) {
 	const trailingEmptyAfterTable = /* @__PURE__ */ new Set();
 	const lastIndex = blocks.length - 1;
@@ -414,7 +431,7 @@ function reserveHeaderFooterFullWidthWrapBands({ blocks, measures, contentWidth,
 }
 function finalizeHeaderFooterContent(blocks, contentWidth, metrics, options) {
 	if (blocks.length === 0) return;
-	const blocksForMeasure = normalizeHeaderFooterMeasureBlocks(blocks, metrics.section);
+	const blocksForMeasure = fitHeaderFooterTablesToContentWidth(normalizeHeaderFooterMeasureBlocks(blocks, metrics.section), contentWidth);
 	const measures = reserveHeaderFooterFullWidthWrapBands({
 		blocks,
 		measures: options.measureBlocks(blocksForMeasure, contentWidth),
@@ -575,4 +592,4 @@ function serializeRunFmt(run) {
 	return JSON.stringify(out);
 }
 //#endregion
-export { calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, reserveHeaderFooterFullWidthWrapBands, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };
+export { calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, fitHeaderFooterTablesToContentWidth, normalizeHeaderFooterMeasureBlocks, reserveHeaderFooterFullWidthWrapBands, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };

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

@@ -1162,6 +1162,25 @@ function paragraphFragmentAttrs(source, index, count) {
 	}
 	return attrs;
 }
+const runIsZeroWidthBoundaryMarker = (run) => {
+	switch (run.kind) {
+		case "text": return run.text.length === 0;
+		case "field": return (run.fallback ?? "").length === 0;
+		case "renderedPageBreak": return true;
+		case "image":
+		case "lineBreak":
+		case "math":
+		case "tab": return false;
+		default: return run;
+	}
+};
+/** Decide leading-break eligibility from the exact projected runs consumed by layout. */
+const hasSingleLeadingProjectedPageBreak = (runs, pageBreaks) => {
+	if (pageBreaks.length !== 1) return false;
+	const partitioned = partitionRunsAtPageBreaks(runs, pageBreaks);
+	if (partitioned.type === "overlap") return false;
+	return partitioned.partitions[0]?.before.every(runIsZeroWidthBoundaryMarker) === true;
+};
 function splitParagraphAtPageBreaks({ pageBreaks, paragraph, splitPageBreakAndParagraphMark }) {
 	if (pageBreaks.length === 0) return [paragraph];
 	const result = [];
@@ -1324,17 +1343,16 @@ function extractCellBorders(borders, theme) {
 	}
 	return Object.keys(result).length > 0 ? result : void 0;
 }
-/**
-* Convert a table cell node.
-*/
 function convertTableCell(node, startPos, options, tableCellMargins) {
-	const pageBreakPosition = options.firstPageBreakRunPosition(node);
-	if (pageBreakPosition !== void 0) panic(`An explicit page-break run at ${String(pageBreakPosition)} cannot be projected inside a table cell`);
 	const blocks = [];
 	let offset = startPos + 1;
+	const authoredPageBreakPosition = options.firstPageBreakRunPosition(node);
+	const singleParagraph = node.childCount === 1 && node.firstChild?.type.name === "paragraph" ? node.firstChild : void 0;
+	if (authoredPageBreakPosition !== void 0 && singleParagraph === void 0) panic(`An explicit page-break run at ${String(authoredPageBreakPosition)} cannot be projected inside a table cell`);
+	const pageBreaks = [];
 	node.forEach((child) => {
 		if (child.type.name === "paragraph") {
-			const block = convertParagraph(child, offset, options);
+			const block = convertParagraph(child, offset, options, child === singleParagraph ? pageBreaks : void 0);
 			blocks.push(block);
 		} else if (child.type.name === "table") blocks.push(convertTable(child, offset, options));
 		else if (child.type.name === "textBox") blocks.push(convertTextBoxNode(child, offset, options));
@@ -1376,7 +1394,13 @@ function convertTableCell(node, startPos, options, tableCellMargins) {
 	const cellBorders = extractCellBorders(attrs.borders, options.theme);
 	if (cellBorders) cell.borders = cellBorders;
 	if (attrs.noWrap) cell.noWrap = true;
-	return cell;
+	if (authoredPageBreakPosition === void 0 || pageBreaks.length === 0) return { cell };
+	const paragraph = blocks.at(0);
+	if (paragraph?.kind !== "paragraph" || !hasSingleLeadingProjectedPageBreak(paragraph.runs, pageBreaks)) panic(`An explicit page-break run at ${String(authoredPageBreakPosition)} cannot be projected inside a table cell`);
+	return {
+		cell,
+		breakBefore: "page"
+	};
 }
 /**
 * Convert a table row node.
@@ -1384,8 +1408,13 @@ function convertTableCell(node, startPos, options, tableCellMargins) {
 function convertTableRow(node, startPos, options, tableCellMargins) {
 	const cells = [];
 	let offset = startPos + 1;
+	let breakBefore;
 	node.forEach((child) => {
-		if (child.type.name === "tableCell" || child.type.name === "tableHeader") cells.push(convertTableCell(child, offset, options, tableCellMargins));
+		if (child.type.name === "tableCell" || child.type.name === "tableHeader") {
+			const converted = convertTableCell(child, offset, options, tableCellMargins);
+			if (converted.breakBefore !== void 0) breakBefore = converted.breakBefore;
+			cells.push(converted.cell);
+		}
 		offset += child.nodeSize;
 	});
 	const attrs = expectTableRowAttrs(node);
@@ -1399,6 +1428,7 @@ function convertTableRow(node, startPos, options, tableCellMargins) {
 	if (attrs.heightRule) row.heightRule = attrs.heightRule;
 	if (attrs.isHeader) row.isHeader = attrs.isHeader;
 	if (attrs._originalFormatting?.cantSplit) row.cantSplit = true;
+	if (breakBefore !== void 0) row.breakBefore = breakBefore;
 	if (attrs.hidden) row.hidden = attrs.hidden;
 	const effectiveJustification = attrs._originalFormatting?.justification ?? attrs._resolvedJustification;
 	if (effectiveJustification) row.justification = effectiveJustification;
@@ -1539,6 +1569,7 @@ function convertTextBoxNode(node, startPos, opts) {
 	if (attrs.outlineWidth !== void 0) textBox.outlineWidth = attrs.outlineWidth;
 	if (attrs.outlineColor !== void 0) textBox.outlineColor = attrs.outlineColor;
 	if (attrs.outlineStyle !== void 0) textBox.outlineStyle = attrs.outlineStyle;
+	if (attrs.transform !== void 0) textBox.transform = attrs.transform;
 	if (attrs.displayMode !== void 0) textBox.displayMode = attrs.displayMode;
 	if (attrs.cssFloat !== void 0) textBox.cssFloat = attrs.cssFloat;
 	if (attrs.wrapType !== void 0) textBox.wrapType = attrs.wrapType;
@@ -1703,12 +1734,12 @@ function toFlowBlocks(doc, options = {}) {
 		blocks.push(block);
 	};
 	const pushParagraphProjection = (node, pos, stripLeadingLineBreak = false) => {
-		if (opts.firstPageBreakRunPosition(node) !== void 0) {
-			const disposition = pageBreakRunParagraphProjectionDisposition(node);
-			if (disposition.status === "unsupported") panic(disposition.message);
-		}
 		const pageBreaks = [];
 		const paragraph = convertParagraph(node, pos, opts, pageBreaks);
+		if (pageBreaks.length > 0) {
+			const disposition = pageBreakRunParagraphProjectionDisposition(node);
+			if (disposition.status === "unsupported" && (disposition.reason === "textBoxAnchor" || !hasSingleLeadingProjectedPageBreak(paragraph.runs, pageBreaks))) panic(disposition.message);
+		}
 		if (stripLeadingLineBreak && paragraph.runs.at(0)?.kind === "lineBreak") paragraph.runs.shift();
 		for (const block of splitParagraphAtPageBreaks({
 			pageBreaks,

package/dist/layout-engine/index.js

@@ -303,10 +303,10 @@ function layoutDocumentPass(blocks, measures, options) {
 			block,
 			pageNumberBefore: pageBeforeBlockLayout,
 			pageNumberAfter: paginator.getCurrentState().page.number,
-			previousPage: paginator.pages[pageBeforeBlockLayout - 1]
+			previousPage: paginator.states[pageBeforeBlockLayout - 1]?.page
 		});
 	}
-	if (paginator.pages.length === 0) paginator.getCurrentState();
+	if (paginator.states.length === 0) paginator.getCurrentState();
 	return {
 		pageSize,
 		pages: paginator.pages,
@@ -359,6 +359,7 @@ function layoutParagraph({ block, measure, paginator, contentWidth, footnoteHeig
 		const state = paginator.getCurrentState();
 		const fragment = {
 			kind: "paragraph",
+			...block.attrs?.suppressEmptyParagraphHeight === true ? { paginationRole: "empty-carrier" } : {},
 			blockId: block.id,
 			x: paginator.getColumnX(state.columnIndex),
 			y: state.cursorY + spaceBefore,
@@ -454,6 +455,7 @@ function layoutParagraph({ block, measure, paginator, contentWidth, footnoteHeig
 		const pmRange = getParagraphFragmentPmRange(block, measure, currentLineIndex, currentLineIndex + fittingLines);
 		const fragment = {
 			kind: "paragraph",
+			...block.attrs?.suppressEmptyParagraphHeight === true ? { paginationRole: "empty-carrier" } : {},
 			blockId: block.id,
 			x: paginator.getColumnX(state.columnIndex),
 			y: 0,
@@ -575,7 +577,12 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 		const rowState = paginator.getCurrentState();
 		const rowHeaderOverhead = shouldRepeatHeaderRows(currentRowIndex, 0, rowState) ? headerRowsHeight : 0;
 		const rowAvailableHeight = paginator.getAvailableHeight() - rowHeaderOverhead - rowState.trailingSpacing;
-		if (!(rowState.cursorY === rowState.topMargin && rowState.page.fragments.length === 0) && tableRowStartsWithRenderedPageBreak(block, currentRowIndex) && !tableRowHasTrackedChanges(block, currentRowIndex) && rows[currentRowIndex].height > rowAvailableHeight) {
+		const rowStartsFreshPage = rowState.cursorY === rowState.topMargin && rowState.page.fragments.length === 0;
+		if (block.rows[currentRowIndex]?.breakBefore === "page" && !rowStartsFreshPage) {
+			paginator.forcePageBreak();
+			continue;
+		}
+		if (!rowStartsFreshPage && tableRowStartsWithRenderedPageBreak(block, currentRowIndex) && !tableRowHasTrackedChanges(block, currentRowIndex) && rows[currentRowIndex].height > rowAvailableHeight) {
 			paginator.forcePageBreak();
 			continue;
 		}
@@ -676,6 +683,7 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 			rowIndex: currentRowIndex
 		});
 		for (let j = currentRowIndex; j < rows.length; j++) {
+			if (j > currentRowIndex && block.rows[j]?.breakBefore === "page") break;
 			if (j > currentRowIndex && computeTableX({
 				columnIndex: state.columnIndex,
 				rowIndex: j
@@ -883,13 +891,14 @@ function layoutTextBox(block, measure, { paginator, sectionMarginTop, sectionPag
 			marginBottom: sectionMarginBottom,
 			boxHeight: measure.height
 		});
-		const horizontal = block.position?.horizontal;
-		const x = horizontal ? bandFragmentX(horizontal, {
+		const x = bandFragmentX(block.position?.horizontal, {
 			pageWidth: state.page.size.w,
 			marginLeft: state.page.margins.left,
 			marginRight: state.page.margins.right,
+			activeColumnLeft: paginator.getColumnX(state.columnIndex),
+			activeColumnWidth: paginator.columnWidth,
 			boxWidth: measure.width
-		}) : paginator.getColumnX(state.columnIndex);
+		});
 		const fragment = {
 			kind: "textBox",
 			blockId: block.id,
@@ -906,13 +915,14 @@ function layoutTextBox(block, measure, { paginator, sectionMarginTop, sectionPag
 	}
 	if (block.position !== void 0) {
 		const state = paginator.getCurrentState();
-		const horizontal = block.position.horizontal;
-		const x = horizontal ? bandFragmentX(horizontal, {
+		const x = bandFragmentX(block.position.horizontal, {
 			pageWidth: state.page.size.w,
 			marginLeft: state.page.margins.left,
 			marginRight: state.page.margins.right,
+			activeColumnLeft: paginator.getColumnX(state.columnIndex),
+			activeColumnWidth: paginator.columnWidth,
 			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;
@@ -1004,7 +1014,7 @@ function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionTyp
 			if (!paginator.retargetCurrentBlankPage()) panic("Odd-page section target must be blank");
 			break;
 		case "continuous": {
-			const currentPage = paginator.pages.at(-1);
+			const currentPage = paginator.states.at(-1)?.page;
 			const nextSize = nextSectionConfig.pageSize;
 			const pageSizeChanges = currentPage != null && (Math.round(nextSize.w) !== Math.round(currentPage.size.w) || Math.round(nextSize.h) !== Math.round(currentPage.size.h));
 			if (nextSectionIndex !== void 0) paginator.startSection({

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

@@ -2,6 +2,10 @@ import { FlowBlock, Measure, TableBlock, TableMeasure, TextBoxBlock, TextBoxMeas
 import { FloatingImageZone } from "./floatingZones.js";
 import "./measureParagraph.js";
 //#region src/layout-engine/measure/measureBlocks.d.ts
+type MeasureBlocksOptions = {
+  /** Header/footer tabs may be authored in the page margin, beyond body width. */
+  allowEndTabOverflow?: boolean;
+};
 declare function measureTableBlock(tableBlock: TableBlock, contentWidth: number, fieldValues?: ReadonlyMap<number, string>): TableMeasure;
 type PhysicalBandPageGeometry = {
   pageWidth: number | number[];
@@ -28,7 +32,7 @@ type BandPageGeometry = {
 /**
  * Measure a block based on its type.
  */
-declare function measureBlock(block: FlowBlock, contentWidth: number, floatingZones?: FloatingImageZone[], cumulativeY?: number, fieldValues?: ReadonlyMap<number, string>): Measure;
+declare function measureBlock(block: FlowBlock, contentWidth: number, floatingZones?: FloatingImageZone[], cumulativeY?: number, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure;
 declare function measureTextBoxBlock(tb: TextBoxBlock, fieldValues?: ReadonlyMap<number, string>): TextBoxMeasure;
 /**
  * Measure all blocks with floating image support.
@@ -37,7 +41,7 @@ declare function measureTextBoxBlock(tb: TextBoxBlock, fieldValues?: ReadonlyMap
  * Then measures each block, passing the zones so paragraphs can calculate
  * per-line widths based on vertical overlap with floating images.
  */
-declare function measureBlocks(blocks: FlowBlock[], contentWidth: number | number[], marginTop?: number | number[], pageGeometry?: BandPageGeometry, fieldValues?: ReadonlyMap<number, string>): Measure[];
+declare function measureBlocks(blocks: FlowBlock[], contentWidth: number | number[], marginTop?: number | number[], pageGeometry?: BandPageGeometry, fieldValues?: ReadonlyMap<number, string>, options?: MeasureBlocksOptions): Measure[];
 declare function measureSingleBlockWithoutFloatingZones(block: FlowBlock, blockWidth: number, blockIndex: number): Measure;
 //#endregion
-export { measureBlock, measureBlocks, measureSingleBlockWithoutFloatingZones, measureTableBlock, measureTextBoxBlock };
+export { MeasureBlocksOptions, measureBlock, measureBlocks, measureSingleBlockWithoutFloatingZones, measureTableBlock, measureTextBoxBlock };

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

@@ -385,6 +385,7 @@ function extractFloatingZones(blocks, contentWidth, marginTop = 0, pageGeometry)
 		const blockMarginRight = perBlockNumberValue(marginRightInput, blockIndex, defaultMarginRight);
 		const blockPageWidth = perBlockNumberValue(pageWidthInput, blockIndex, defaultPageWidth);
 		const blockContentWidth = perBlockNumberValue(contentWidth, blockIndex, defaultContentWidth);
+		const blockContentLeft = perBlockNumberValue(contentLeftInput, blockIndex, defaultContentLeft);
 		const vertical = tb.position.vertical;
 		const pageFrameRelative = isPageFrameRelativeAnchor(vertical?.relativeTo);
 		const topY = pageFrameRelative ? bandTopContentY(vertical, {
@@ -408,13 +409,14 @@ function extractFloatingZones(blocks, contentWidth, marginTop = 0, pageGeometry)
 			});
 			continue;
 		}
-		const horizontal = tb.position.horizontal;
-		const contentX = (horizontal ? bandFragmentX(horizontal, {
+		const contentX = bandFragmentX(tb.position.horizontal, {
 			pageWidth: blockPageWidth,
 			marginLeft: blockMarginLeft,
 			marginRight: blockMarginRight,
+			activeColumnLeft: blockContentLeft,
+			activeColumnWidth: blockContentWidth,
 			boxWidth: measure.width
-		}) : blockMarginLeft) - blockMarginLeft;
+		}) - blockContentLeft;
 		const wrapSide = textBoxWrapSide({
 			box: tb,
 			contentX,
@@ -518,12 +520,12 @@ function activateFloatingTablePageRect(template, anchorPageY) {
 /**
 * Measure a block based on its type.
 */
-function measureBlock(block, contentWidth, floatingZones, cumulativeY, fieldValues) {
+function measureBlock(block, contentWidth, floatingZones, cumulativeY, fieldValues, options) {
 	switch (block.kind) {
 		case "paragraph": {
 			const pBlock = block;
 			const hasFieldRuns = pBlock.runs.some((run) => run.kind === "field");
-			const cacheable = (!floatingZones || floatingZones.length === 0) && (!fieldValues || !hasFieldRuns);
+			const cacheable = (!floatingZones || floatingZones.length === 0) && (!fieldValues || !hasFieldRuns) && options?.allowEndTabOverflow !== true;
 			if (cacheable) {
 				const cached = getCachedParagraphMeasure(pBlock, contentWidth);
 				if (cached) return cached;
@@ -531,6 +533,7 @@ function measureBlock(block, contentWidth, floatingZones, cumulativeY, fieldValu
 			const measureOpts = { paragraphYOffset: cumulativeY ?? 0 };
 			if (floatingZones) measureOpts.floatingZones = floatingZones;
 			if (fieldValues) measureOpts.fieldValues = fieldValues;
+			if (options?.allowEndTabOverflow === true) measureOpts.allowEndTabOverflow = true;
 			const result = measureParagraph(pBlock, contentWidth, measureOpts);
 			if (cacheable) setCachedParagraphMeasure(pBlock, contentWidth, result);
 			return result;
@@ -604,7 +607,7 @@ function isContinuousSectionBreak(block) {
 * Then measures each block, passing the zones so paragraphs can calculate
 * per-line widths based on vertical overlap with floating images.
 */
-function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldValues) {
+function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldValues, options) {
 	const defaultWidth = Array.isArray(contentWidth) ? contentWidth[0] ?? 0 : contentWidth;
 	const extractedZones = extractFloatingZones(blocks, contentWidth, marginTop, pageGeometry);
 	const floatingZonesWithAnchors = [];
@@ -694,7 +697,7 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 		}));
 		const zones = activeZones.length > 0 || projectedTableZones.length > 0 ? [...activeZones, ...projectedTableZones] : void 0;
 		try {
-			const measure = measureBlock(block, blockWidth, zones, cumulativeY, fieldValues);
+			const measure = measureBlock(block, blockWidth, zones, cumulativeY, fieldValues, options);
 			const clearingZones = measure.kind === "table" ? zones : zones?.filter((zone) => zone.fullWidthBlock);
 			if (clearingZones?.length && (measure.kind === "image" || measure.kind === "table" && !block.floating)) {
 				const blockHeight = measure.kind === "image" ? measure.height : measure.totalHeight;

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

@@ -13,6 +13,8 @@ type MeasureParagraphOptions = {
   /** Field run `pmStart` -> resolved display text, so a field measures at its
    *  painted width instead of the cached fallback. */
   fieldValues?: ReadonlyMap<number, string>;
+  /** Header/footer tabs may be authored in the page margin, beyond body width. */
+  allowEndTabOverflow?: boolean;
 };
 /**
  * Minimum horizontal room a line must offer before we treat it as usable for

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

@@ -987,7 +987,7 @@ function measureParagraph(block, maxWidth, options) {
 			let tabWidth = tabResult.width;
 			const authoredEndpoint = contentX + tabWidth + followingWidth;
 			const activeContentRightEdge = maxWidth - currentLine.rightOffset;
-			const preservesAuthoredEndStop = tabResult.alignment === "end" && authoredEndpoint <= activeContentRightEdge + WIDTH_TOLERANCE;
+			const preservesAuthoredEndStop = tabResult.alignment === "end" && (options?.allowEndTabOverflow === true || 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 (!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);

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

@@ -92,7 +92,7 @@ declare function resolveColumnLeft({ leftMargin, columnWidths, columns, columnIn
  */
 declare function createPaginator(options: PaginatorOptions): {
   /** All pages created so far. */
-  pages: Page[];
+  readonly pages: Page[];
   /** All page states. */
   states: PageState[];
   /** Column width in pixels (use getColumnWidth() for current value after updates). */

package/dist/layout-engine/paginator.js

@@ -12,6 +12,7 @@ const SECTION_START_PLACEMENT = {
 	CONTINUOUS: "continuous",
 	NEXT_PAGE: "nextPage"
 };
+const isEmptyCarrier = (fragment) => fragment.kind === "paragraph" && fragment.paginationRole === "empty-carrier";
 /** Calculate active column widths, preferring authored unequal widths. */
 function calculateColumnWidths(pageWidth, leftMargin, rightMargin, columns) {
 	if (columns.widths?.length === columns.count && columns.widths.every((width) => Number.isFinite(width) && width > 0)) return [...columns.widths];
@@ -63,6 +64,7 @@ function createPaginator(options) {
 	};
 	const pages = [];
 	const states = [];
+	const paginationStateByPage = /* @__PURE__ */ new WeakMap();
 	function getContentBottom() {
 		return pageSize.h - margins.bottom;
 	}
@@ -112,10 +114,30 @@ function createPaginator(options) {
 			columnIndex
 		});
 	}
+	function getPagePaginationState(page) {
+		const state = paginationStateByPage.get(page);
+		if (!state) panic("Paginator: page visibility state is missing");
+		return state;
+	}
+	function materializeCarrierGeometry(state) {
+		if (!state) return;
+		const paginationState = getPagePaginationState(state.page);
+		if (!paginationState.carrierGeometryNeedsMaterialization) return;
+		const x = getColumnX(0);
+		const width = columnWidths[0] ?? getContentWidth();
+		for (const fragment of state.page.fragments) {
+			if (!isEmptyCarrier(fragment)) continue;
+			fragment.x = x;
+			fragment.y = state.topMargin;
+			fragment.width = width;
+		}
+		paginationState.carrierGeometryNeedsMaterialization = false;
+	}
 	/**
 	* Create a new page and add it to the list.
 	*/
 	function createNewPage() {
+		materializeCarrierGeometry(states.at(-1));
 		if (pendingPageSize || pendingMargins) applyPendingLayout();
 		const pageNumber = pages.length + 1;
 		const logicalNumber = nextLogicalPageNumber;
@@ -150,6 +172,10 @@ function createPaginator(options) {
 			footnoteDemandHeight: 0,
 			trailingSpacing: 0
 		};
+		paginationStateByPage.set(page, {
+			visibleFragmentCount: 0,
+			carrierGeometryNeedsMaterialization: false
+		});
 		pages.push(page);
 		states.push(state);
 		columnRegionTop = topMargin;
@@ -242,6 +268,11 @@ function createPaginator(options) {
 	}
 	function commitFragment(state, fragment) {
 		consumeSharedSectionPage(state);
+		const paginationState = getPagePaginationState(state.page);
+		if (!isEmptyCarrier(fragment)) {
+			materializeCarrierGeometry(state);
+			paginationState.visibleFragmentCount += 1;
+		}
 		state.page.fragments.push(fragment);
 	}
 	function addUnflowedFragment(fragment) {
@@ -289,7 +320,7 @@ function createPaginator(options) {
 	function forcePageBreak(breakOptions = {}) {
 		const current = states.at(-1);
 		if (current?.page.fragments.length) consumeSharedSectionPage(current);
-		if (breakOptions.coalesceBlankPage && current && current.page.fragments.length === 0 && current.cursorY === current.topMargin) {
+		if (breakOptions.coalesceBlankPage && current && getPagePaginationState(current.page).visibleFragmentCount === 0 && current.cursorY === current.topMargin) {
 			if (current.page.sectionIndex !== currentSectionIndex) {
 				retargetCurrentBlankPage();
 				return current;
@@ -312,7 +343,9 @@ function createPaginator(options) {
 		const pageMargins = getPageMargins(state.page.number, logicalNumber);
 		const xDelta = pageMargins.left - previousMargins.left;
 		const yDelta = pageMargins.top - previousMargins.top;
-		for (const fragment of state.page.fragments) {
+		const paginationState = getPagePaginationState(state.page);
+		if (paginationState.visibleFragmentCount === 0) paginationState.carrierGeometryNeedsMaterialization = state.page.fragments.length > 0;
+		else for (const fragment of state.page.fragments) {
 			fragment.x += xDelta;
 			fragment.y += yDelta;
 		}
@@ -327,7 +360,7 @@ function createPaginator(options) {
 	}
 	function retargetCurrentBlankPage() {
 		const current = states.at(-1);
-		if (!current || current.page.fragments.length > 0 || current.cursorY !== current.topMargin) return false;
+		if (!current || getPagePaginationState(current.page).visibleFragmentCount > 0 || current.cursorY !== current.topMargin) return false;
 		if (pendingPageSize || pendingMargins) applyPendingLayout();
 		retargetSectionMetadata(current.page);
 		const pageMargins = getPageMargins(current.page.number, current.page.logicalNumber);
@@ -342,6 +375,7 @@ function createPaginator(options) {
 		else delete current.page.columns;
 		current.topMargin = topMargin;
 		current.cursorY = topMargin;
+		getPagePaginationState(current.page).carrierGeometryNeedsMaterialization = current.page.fragments.length > 0;
 		current.columnIndex = 0;
 		current.rawContentBottom = rawContentBottom;
 		current.footnoteHeight = footnoteHeightFloor;
@@ -421,7 +455,10 @@ function createPaginator(options) {
 	}
 	return {
 		/** All pages created so far. */
-		pages,
+		get pages() {
+			materializeCarrierGeometry(states.at(-1));
+			return pages;
+		},
 		/** All page states. */
 		states,
 		/** Column width in pixels (use getColumnWidth() for current value after updates). */

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

@@ -33,6 +33,8 @@ type BandHorizontalGeometry = {
   pageWidth: number;
   marginLeft: number;
   marginRight: number;
+  activeColumnLeft: number;
+  activeColumnWidth: number;
   boxWidth: number;
 };
 /**

package/dist/layout-engine/textBoxFlow.js

@@ -97,11 +97,12 @@ function bandTopContentY(vertical, geometry) {
 /**
 * Page-absolute `[left, right]` (px) of the frame a horizontal anchor positions
 * within. `inside`/`outsideMargin` map to the left/right margin strips (page
-* parity is not modelled); `column`/`character` fall back to the content box
-* (folio has no per-column/character X here). eigenpal #694.
+* parity is not modelled); `column` and an omitted horizontal anchor use the
+* active flow-column frame, while `character` falls back to the content box
+* because character X is unavailable. eigenpal #694.
 */
 function bandHorizontalFrame(relativeTo, geometry) {
-	const { pageWidth, marginLeft, marginRight } = geometry;
+	const { pageWidth, marginLeft, marginRight, activeColumnLeft, activeColumnWidth } = geometry;
 	switch (relativeTo) {
 		case "page": return {
 			left: 0,
@@ -117,10 +118,13 @@ function bandHorizontalFrame(relativeTo, geometry) {
 			left: pageWidth - marginRight,
 			right: pageWidth
 		};
-		case "margin":
 		case "column":
-		case "character":
 		case void 0: return {
+			left: activeColumnLeft,
+			right: activeColumnLeft + activeColumnWidth
+		};
+		case "margin":
+		case "character": return {
 			left: marginLeft,
 			right: pageWidth - marginRight
 		};