@stll/folio-core 0.46.0 → 0.47.0

package/dist/layout-painter/renderPage.js

@@ -3,6 +3,7 @@ import { rectsToFloatingZones } from "../layout-engine/measure/floatingZones.js"
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { resolveTableInlineOffset } from "../layout-engine/measure/tableInlinePlacement.js";
 import { floatingTextBoxReservesBand, floatingTextBoxWrapsText, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "../layout-engine/types.js";
+import { cssBorderStyle } from "../utils/borderCss.js";
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import { borderToStyle } from "../utils/formatToStyle.js";
 import { normalizeHorizontalScalePercent } from "../utils/horizontalScale.js";
@@ -17,6 +18,7 @@ import { renderTextBoxFragment } from "./renderTextBox.js";
 import { emuToPixels } from "./renderUtils.js";
 import { renderWatermarkLayer } from "./renderWatermark.js";
 import { panic } from "better-result";
+import { statesNoBorder } from "@stll/docx-core/model";
 //#region src/layout-painter/renderPage.ts
 /**
 * Page Renderer
@@ -76,13 +78,13 @@ function pageBorderSpacePx(border) {
 * exact stroke they will see on screen.
 */
 function pageBorderWidthPx(border) {
-	if (!border || border.style === "none" || border.style === "nil") return 0;
+	if (!border || statesNoBorder(border.style)) return 0;
 	const widthPx = border.size !== void 0 && border.size !== 0 ? eighthsToPixels(border.size) : 1;
 	const floored = Math.max(1, widthPx);
-	return border.style === "double" ? Math.max(3, floored) : floored;
+	return cssBorderStyle(border.style) === "double" ? Math.max(3, floored) : floored;
 }
 function applyPageBorderSide(element, border, side, theme) {
-	if (!border || border.style === "none" || border.style === "nil") return;
+	if (!border || statesNoBorder(border.style)) return;
 	const styles = borderToStyle(border, side, theme);
 	for (const [key, value] of Object.entries(styles)) element.style[key] = String(value);
 	const styleKey = `border${side}Style`;
@@ -100,7 +102,7 @@ function renderPageBorderOverlay(page, options, doc) {
 		pb.bottom,
 		pb.left,
 		pb.right
-	].some((border) => border && border.style !== "none" && border.style !== "nil")) return null;
+	].some((border) => border !== void 0 && !statesNoBorder(border.style))) return null;
 	const offsetFrom = pb.offsetFrom ?? "text";
 	const topOffset = pageBorderSpacePx(pb.top);
 	const rightOffset = pageBorderSpacePx(pb.right);

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

@@ -134,6 +134,7 @@ type RenderLineOptions = {
  * @returns The line DOM element
  */
 declare function renderLine(block: ParagraphBlock, line: MeasuredLine, alignment: "left" | "center" | "right" | "justify" | undefined, doc: Document, options?: RenderLineOptions): HTMLElement;
+declare const paragraphHasTrackedChanges: (block: ParagraphBlock) => boolean;
 /**
  * Render a paragraph fragment
  *
@@ -146,4 +147,4 @@ declare function renderLine(block: ParagraphBlock, line: MeasuredLine, alignment
  */
 declare function renderParagraphFragment(fragment: ParagraphFragment, block: ParagraphBlock, measure: ParagraphMeasure, context: RenderContext, options?: RenderParagraphOptions): HTMLElement;
 //#endregion
-export { PARAGRAPH_CLASS_NAMES, RenderParagraphOptions, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };
+export { PARAGRAPH_CLASS_NAMES, RenderParagraphOptions, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, paragraphHasTrackedChanges, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };

package/dist/layout-painter/renderParagraph.js

@@ -12,6 +12,7 @@ import { writeCommentAnchorIds } from "../render-dom/commentAnchorAttributes.js"
 import { AUTHOR_COLORS, getAuthorColorIdx } from "../utils/authorColors.js";
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import "../utils/fontWeights.js";
+import { underlineDecorationCss } from "../utils/formatToStyle.js";
 import { getHorizontalScaleFactor } from "../utils/horizontalScale.js";
 import { resolvePhysicalParagraphInlineLayout } from "../utils/paragraphInlineLayout.js";
 import { inlineImageBoundingBox, parseRotationDegrees, rotatedBoundingBox } from "../utils/rotationBoundingBox.js";
@@ -238,14 +239,15 @@ function applyRunStyles(element, run) {
 	const decorations = [];
 	let explicitDecorationStyle = false;
 	if (run.underline) {
-		if (!isNoteReferenceRun(run)) decorations.push("underline");
-		if (typeof run.underline === "object") {
-			if (run.underline.style) {
-				element.style.textDecorationStyle = run.underline.style;
-				explicitDecorationStyle = true;
-			}
-			if (run.underline.color) element.style.textDecorationColor = run.underline.color;
+		const authored = typeof run.underline === "object" ? run.underline.style : void 0;
+		const underline = authored === void 0 ? void 0 : underlineDecorationCss(authored);
+		if ((underline === void 0 || underline.decorationStyle !== void 0) && !isNoteReferenceRun(run)) decorations.push("underline");
+		if (underline?.decorationStyle !== void 0) {
+			element.style.textDecorationStyle = underline.decorationStyle;
+			explicitDecorationStyle = true;
 		}
+		if (underline?.decorationThickness !== void 0) element.style.textDecorationThickness = underline.decorationThickness;
+		if (typeof run.underline === "object" && run.underline.color) element.style.textDecorationColor = run.underline.color;
 	}
 	if (run.strike) decorations.push("line-through");
 	if (run.hidden) {
@@ -1451,6 +1453,7 @@ function bordersFormGroup(a, b) {
 	if (!a || !b) return false;
 	return bordersEqual(a.top, b.top) && bordersEqual(a.bottom, b.bottom) && bordersEqual(a.left, b.left) && bordersEqual(a.right, b.right) && bordersEqual(a.between, b.between);
 }
+const paragraphHasTrackedChanges = (block) => block.attrs?.listMarkerRevision !== void 0 || block.runs.some((run) => run.kind !== "lineBreak" && (run.isInsertion === true || run.isDeletion === true));
 /**
 * Render a paragraph fragment
 *
@@ -1470,6 +1473,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 	if (block.paraId) fragmentEl.dataset["paraId"] = block.paraId;
 	fragmentEl.dataset["fromLine"] = String(fragment.fromLine);
 	fragmentEl.dataset["toLine"] = String(fragment.toLine);
+	if (paragraphHasTrackedChanges(block)) fragmentEl.dataset["trackedChanges"] = "true";
 	applyPmPositions(fragmentEl, fragment.pmStart, fragment.pmEnd);
 	applySdtDataAttrs(fragmentEl, fragment.sdtGroups);
 	if (fragment.continuesFromPrev) fragmentEl.dataset["continuesFromPrev"] = "true";
@@ -1486,25 +1490,8 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 	const indent = block.attrs?.indent;
 	const borders = block.attrs?.borders;
 	if (borders) {
-		const borderStyleToCss = (style) => {
-			switch (style) {
-				case "single": return "solid";
-				case "double": return "double";
-				case "dotted": return "dotted";
-				case "dashed": return "dashed";
-				case "thick": return "solid";
-				case "wave": return "wavy";
-				case "dashSmallGap": return "dashed";
-				case "nil":
-				case "none": return "none";
-				default: return "solid";
-			}
-		};
 		fragmentEl.style.boxSizing = "border-box";
-		const borderToCss = (border) => borderStrokeToCss({
-			...border,
-			style: borderStyleToCss(border.style)
-		});
+		const borderToCss = (border) => borderStrokeToCss(border);
 		const groupedWithPrev = bordersFormGroup(options.prevBorders, borders);
 		const groupedWithNext = bordersFormGroup(borders, options.nextBorders);
 		const renderedTopBorder = groupedWithPrev ? borders.between : borders.top;
@@ -1686,4 +1673,4 @@ function renderListMarker({ marker, inlineWidth, visualOffset, doc, formatting,
 	return span;
 }
 //#endregion
-export { PARAGRAPH_CLASS_NAMES, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };
+export { PARAGRAPH_CLASS_NAMES, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, paragraphHasTrackedChanges, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };

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

@@ -1,6 +1,7 @@
 import { TableBlock, TableFragment, TableMeasure } from "../layout-engine/types.js";
 import { RenderContext } from "./renderUtils.js";
 import { PageGeometry } from "./anchoredImagePosition.js";
+import { TextDirection } from "@stll/docx-core/model";
 //#region src/layout-painter/renderTable.d.ts
 /**
  * CSS class names for table elements
@@ -15,6 +16,8 @@ declare const TABLE_CLASS_NAMES: {
   tableEdgeHandleBottom: string;
   tableEdgeHandleRight: string;
 };
+/** The quarter turn a cell's `w:textDirection` puts on its content. */
+declare const cellTextRotationDegrees: (direction: TextDirection | undefined) => number;
 /**
  * Options for rendering a table fragment
  */
@@ -38,4 +41,4 @@ declare function renderNestedTable(block: TableBlock, measure: TableMeasure, con
  */
 declare function renderTableFragment(fragment: TableFragment, block: TableBlock, measure: TableMeasure, context: RenderContext, options?: RenderTableFragmentOptions): HTMLElement;
 //#endregion
-export { RenderTableFragmentOptions, TABLE_CLASS_NAMES, renderNestedTable, renderTableFragment };
+export { RenderTableFragmentOptions, TABLE_CLASS_NAMES, cellTextRotationDegrees, renderNestedTable, renderTableFragment };

package/dist/layout-painter/renderTable.js

@@ -5,6 +5,7 @@ import { buildTableCellGrid, buildTableCellPlacements, getSourceCellAt } from ".
 import { tableFragmentBottomBorders } from "../layout-engine/measure/tableFragmentBorderGeometry.js";
 import { resolveTableInlineOffset, resolveTableInlinePlacement } from "../layout-engine/measure/tableInlinePlacement.js";
 import { isFloatingImageRun, isFloatingTextBoxBlock, resolveTableCellPadding, tableColumnsArePinned } from "../layout-engine/types.js";
+import { paintsCssBorder } from "../utils/borderCss.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 import { emuToPixels } from "../utils/units.js";
 import { resolveAnchoredImagePosition } from "./anchoredImagePosition.js";
@@ -14,6 +15,7 @@ import { applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs } from "./rend
 import { renderParagraphFragment } from "./renderParagraph.js";
 import { renderTextBoxFragment } from "./renderTextBox.js";
 import { ownedRowBottomBorderOffsets } from "./tableRowPaintGeometry.js";
+import { TEXT_DIRECTION_FLOW_BY_TOKEN } from "@stll/docx-core/model";
 //#region src/layout-painter/renderTable.ts
 /**
 * Table Renderer
@@ -40,29 +42,27 @@ const TABLE_CLASS_NAMES = {
 const CELL_DIAGONAL_BORDER_CLASS = "layout-table-cell-diagonal-border";
 const CELL_BOTTOM_BORDER_CLASS = "layout-table-cell-bottom-border";
 /**
-* Quarter turn a `w:textDirection` puts on cell content (§17.18.93, plus the
-* short spellings Word also writes).
+* Quarter turn a text flow puts on cell content.
 *
-* `btLr` runs bottom-to-top up the left edge, so it turns counter-clockwise;
-* every top-to-bottom direction runs down the right edge and turns clockwise.
-* The horizontal directions are the identity — `rl` is bidi, not rotation.
-* Only `btLr` was handled, so a rotated header cell (the common `tbRl` shape)
-* painted horizontally and overflowed its column.
+* Keyed by flow, not by token: `ST_TextDirection` spells each of these six
+* flows twice, and the two spellings have to turn the same way. `lr` runs
+* bottom-to-top up the left edge, so it turns counter-clockwise; `rl` and
+* `lrV` run down the right edge and turn clockwise. `tb` and `tbV` are the
+* horizontal flows and do not turn at all.
 *
-* Total over the union on purpose: a new direction has to state its turn here
-* rather than silently falling back to horizontal.
+* Total over the flows on purpose: a flow nobody mapped has to state its turn
+* here rather than silently falling back to horizontal.
 */
 const CELL_TEXT_ROTATION_DEGREES = {
-	lr: 0,
-	lrV: 0,
-	rl: 0,
-	rlV: 0,
-	tb: 90,
-	tbV: 90,
-	tbRl: 90,
-	tbRlV: 90,
-	btLr: -90
+	tb: 0,
+	tbV: 0,
+	rl: 90,
+	rlV: 90,
+	lrV: 90,
+	lr: -90
 };
+/** The quarter turn a cell's `w:textDirection` puts on its content. */
+const cellTextRotationDegrees = (direction) => direction === void 0 ? 0 : CELL_TEXT_ROTATION_DEGREES[TEXT_DIRECTION_FLOW_BY_TOKEN[direction]];
 function renderCellContent({ cell, cellMeasure, context, doc, contentWidthOverride, pageContentPosition }) {
 	const contentEl = doc.createElement("div");
 	contentEl.className = TABLE_CLASS_NAMES.cellContent;
@@ -336,7 +336,7 @@ function renderNestedTable(block, measure, context, doc, frameWidth = context.co
 */
 function applyBorder(el, side, border) {
 	const styleProp = `border${side.charAt(0).toUpperCase() + side.slice(1)}`;
-	if (!border || border.style === "none" || border.style === "nil") el.style[styleProp] = "none";
+	if (!border || !paintsCssBorder(border.style)) el.style[styleProp] = "none";
 	else el.style[styleProp] = borderStrokeToCss(border);
 }
 function renderCellDiagonalBorder({ border, direction, cellWidth, cellHeight, doc }) {
@@ -415,7 +415,7 @@ function renderTableCell({ cell, cellMeasure, x, width, rowHeight, borderFlags,
 			default: break;
 		}
 	}
-	const cellTextRotation = cell.textDirection ? CELL_TEXT_ROTATION_DEGREES[cell.textDirection] : 0;
+	const cellTextRotation = cellTextRotationDegrees(cell.textDirection);
 	const contentWidthOverride = cellTextRotation === 0 ? void 0 : Math.max(1, rowHeight - padTop - padBottom);
 	const renderedContent = renderCellContent({
 		cell,
@@ -479,7 +479,7 @@ function renderTableCell({ cell, cellMeasure, x, width, rowHeight, borderFlags,
 	}
 	return cellEl;
 }
-const hasVisibleBorder = (border) => border !== void 0 && border.style !== "none" && border.style !== "nil";
+const hasVisibleBorder = (border) => border !== void 0 && paintsCssBorder(border.style);
 const isMinimumHeightRow = (row) => row?.height !== void 0 && row.heightRule !== "exact";
 const rowHasVerticalMerge = (row) => row?.cells.some((cell) => (cell.rowSpan ?? 1) > 1) === true;
 const continuationRowBottomBorderOffsets = (fragment, block, measure, cellGrid) => {
@@ -803,4 +803,4 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 	return tableEl;
 }
 //#endregion
-export { TABLE_CLASS_NAMES, renderNestedTable, renderTableFragment };
+export { TABLE_CLASS_NAMES, cellTextRotationDegrees, renderNestedTable, renderTableFragment };

package/dist/layout-painter/renderTextBox.js

@@ -1,5 +1,7 @@
 import { layoutTextBoxContent } from "../layout-engine/measure/textBoxParagraphLayout.js";
 import { DEFAULT_TEXTBOX_MARGINS } from "../layout-engine/types.js";
+import { presetDashForOutlineAttr } from "../types/documentEnumValues.js";
+import { cssBorderStyleForDash } from "../utils/borderCss.js";
 import { setAuthoredBackgroundColor } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
 import { panic } from "better-result";
@@ -30,10 +32,10 @@ function renderTextBoxFragment(fragment, block, measure, context, options = {})
 	containerEl.style.overflow = block.textWrap === "none" ? "visible" : "hidden";
 	containerEl.style.boxSizing = "border-box";
 	if (block.fillColor) setAuthoredBackgroundColor(containerEl.style, block.fillColor);
-	if (block.outlineWidth && block.outlineWidth > 0) {
-		const style = block.outlineStyle || "solid";
+	const outlineDash = presetDashForOutlineAttr(block.outlineStyle) ?? "solid";
+	if (block.outlineWidth && block.outlineWidth > 0 && outlineDash !== "none") {
 		const color = block.outlineColor || "#000000";
-		containerEl.style.border = `${block.outlineWidth}px ${style} ${color}`;
+		containerEl.style.border = `${block.outlineWidth}px ${cssBorderStyleForDash(outlineDash)} ${color}`;
 	}
 	const margins = block.margins ?? DEFAULT_TEXTBOX_MARGINS;
 	containerEl.style.padding = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`;

package/dist/markdown/renderBlock.js

@@ -71,7 +71,9 @@ function renderBlocks(ctx, pkg, blocks) {
 			}
 			break;
 		}
-		case "preservedBlock": break;
+		case "preservedBlock":
+		case "bookmarkStart":
+		case "bookmarkEnd": break;
 		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
 	}
 	return out.join("\n");

package/dist/markdown/renderRuns.js

@@ -1,3 +1,4 @@
+import { getHyperlinkRuns } from "../docx/hyperlinkParser.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "../docx/relsParser.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { wrapComment, wrapDeletion, wrapInsertion, wrapMoveFrom, wrapMoveTo } from "./annotations.js";
@@ -131,7 +132,7 @@ function renderRun(ctx, pkg, run, paraId) {
 	return `${lead}${applyMarks(core, marksFor(run))}${trail}`;
 }
 function renderHyperlink(ctx, pkg, link, paraId) {
-	const inner = link.children.map((child) => child.type === "run" ? renderRun(ctx, pkg, child, paraId) : "").join("");
+	const inner = getHyperlinkRuns(link).map((run) => renderRun(ctx, pkg, run, paraId)).join("");
 	if (!inner) return "";
 	const href = link.href ?? (link.anchor ? `#${link.anchor}` : "");
 	if (!href) {
@@ -217,7 +218,11 @@ function renderParagraphInline(ctx, pkg, content, paraId) {
 					out += renderRun(ctx, pkg, child, paraId);
 					continue;
 				}
-				out += child.type === "hyperlink" ? renderHyperlink(ctx, pkg, child, paraId) : child.text;
+				if (child.type === "hyperlink") {
+					out += renderHyperlink(ctx, pkg, child, paraId);
+					continue;
+				}
+				out += child.type === "inlineWrapper" ? renderParagraphInline(ctx, pkg, child.content, paraId) : child.text;
 			}
 			break;
 		}

package/dist/markdown/renderTable.js

@@ -1,3 +1,4 @@
+import { getHyperlinkRuns } from "../docx/hyperlinkParser.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "../docx/relsParser.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { escapeTableCell } from "./escape.js";
@@ -243,7 +244,7 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 	return text;
 }
 function renderHtmlHyperlink(ctx, pkg, link, paraId) {
-	const inner = link.children.filter((c) => c.type === "run").map((r) => renderHtmlRun(ctx, pkg, r, paraId)).join("");
+	const inner = getHyperlinkRuns(link).map((run) => renderHtmlRun(ctx, pkg, run, paraId)).join("");
 	if (!inner) return "";
 	const href = link.href ?? (link.anchor ? `#${link.anchor}` : "");
 	if (!href) return inner;

package/dist/model.d.ts

@@ -1,11 +1,11 @@
 import { document_d_exports } from "./types/document.js";
-import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor } from "./types/documentEnumValues.js";
+import { CONDITIONAL_STYLE_TYPE_VALUES, COUNTER_FORMAT_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor, outlineAttrForDash, presetDashForOutlineAttr } from "./types/documentEnumValues.js";
 import { DeriveBlockIdInput, FolioBlockId, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import { types_d_exports } from "./layout-engine/types.js";
 import { measureTypes_d_exports } from "./layout-engine/measure/measureTypes.js";
 export * from "@stll/docx-core/model";
 declare namespace model_d_exports {
-  export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };
+  export { CONDITIONAL_STYLE_TYPE_VALUES, COUNTER_FORMAT_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor, outlineAttrForDash, presetDashForOutlineAttr };
 }
 //#endregion
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, type measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };
+export { CONDITIONAL_STYLE_TYPE_VALUES, COUNTER_FORMAT_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, type measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor, outlineAttrForDash, presetDashForOutlineAttr };

package/dist/model.js

@@ -1,4 +1,4 @@
 import { types_exports } from "./layout-engine/types.js";
 import { currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
-import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor } from "./types/documentEnumValues.js";
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_exports as Layout, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };
+import { CONDITIONAL_STYLE_TYPE_VALUES, COUNTER_FORMAT_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor, outlineAttrForDash, presetDashForOutlineAttr } from "./types/documentEnumValues.js";
+export { CONDITIONAL_STYLE_TYPE_VALUES, COUNTER_FORMAT_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_exports as Layout, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES, currentFolioBlockId, deriveBlankBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isBlankFolioBlockId, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor, outlineAttrForDash, presetDashForOutlineAttr };

package/dist/paged-layout/sectionBlockWidths.d.ts

@@ -1,4 +1,5 @@
 import { FlowBlock } from "../layout-engine/types.js";
+import { SectionStartAdvance } from "../layout-engine/section-breaks.js";
 import { SectionLayoutConfig } from "../layout-engine/index.js";
 //#region src/paged-layout/sectionBlockWidths.d.ts
 type ComputePerBlockMeasureInput = {
@@ -27,6 +28,8 @@ type PerBlockMeasureInputs = {
   contentLefts: number[];
   columnIndices: number[];
   columnCounts: number[];
+  /** Resolved paginator transition at each section-break block. */
+  sectionAdvances: (SectionStartAdvance | undefined)[];
   physicalPageGeometry: PerBlockPhysicalPageGeometry;
 };
 /**

package/dist/paged-layout/sectionBlockWidths.js

@@ -1,7 +1,7 @@
 import { collectSectionConfigs } from "../layout-engine/index.js";
 import { hasPageBreakBefore } from "../layout-engine/keep-together.js";
 import { calculateColumnLefts, calculateColumnWidths } from "../layout-engine/paginator.js";
-import { normalizeSectionBreakType } from "../layout-engine/section-breaks.js";
+import { physicalColumnRegionIsShared, sectionStartAdvanceOf } from "../layout-engine/section-breaks.js";
 //#region src/paged-layout/sectionBlockWidths.ts
 function resolvePreBlockPageTransition(block, config) {
 	if (!hasPageBreakBefore(block)) return { type: "none" };
@@ -57,11 +57,13 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 	const contentLefts = [];
 	const columnIndices = [];
 	const columnCounts = [];
+	const sectionAdvances = [];
 	const initialConfig = sectionConfigs[0] ?? finalConfig;
 	let physicalPageGeometry = {
 		pageSize: initialConfig.pageSize,
 		margins: initialConfig.margins
 	};
+	let hasPhysicalPage = false;
 	let hasPhysicalPageContent = false;
 	for (let i = 0; i < blocks.length; i++) {
 		const config = sectionConfigs[sectionIdx] ?? finalConfig;
@@ -70,6 +72,7 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		switch (preBlockTransition.type) {
 			case "physicalPage":
 				physicalPageGeometry = preBlockTransition.geometry;
+				hasPhysicalPage = true;
 				hasPhysicalPageContent = false;
 				columnGeometryDirty = true;
 				columnIndex = 0;
@@ -88,6 +91,7 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		contentLefts.push(activeContentLefts[columnIndex] ?? physicalPageGeometry.margins.left);
 		columnIndices.push(columnIndex);
 		columnCounts.push(activeColumns.count);
+		sectionAdvances.push(void 0);
 		marginTops.push(config.margins.top);
 		physicalMarginTops.push(physicalPageGeometry.margins.top);
 		pageHeights.push(config.pageSize.h);
@@ -103,21 +107,34 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) {
 			const sectionBreak = block;
 			const nextConfig = sectionConfigs[sectionIdx + 1] ?? finalConfig;
-			if (!(sectionBreak?.kind === "sectionBreak" && normalizeSectionBreakType(sectionBreak.type) === "continuous" && hasPhysicalPageContent && Math.round(nextConfig.pageSize.w) === Math.round(physicalPageGeometry.pageSize.w) && Math.round(nextConfig.pageSize.h) === Math.round(physicalPageGeometry.pageSize.h))) {
+			const advance = sectionBreak?.kind === "sectionBreak" ? sectionStartAdvanceOf(sectionBreak.type) : "page";
+			const sharesColumnRegion = hasPhysicalPage && advance === "column" && physicalColumnRegionIsShared({
+				...physicalPageGeometry,
+				columns: activeColumns
+			}, nextConfig);
+			const continuesInNextColumn = sharesColumnRegion && columnIndex + 1 < activeColumns.count;
+			const pageSizeIsShared = Math.round(nextConfig.pageSize.w) === Math.round(physicalPageGeometry.pageSize.w) && Math.round(nextConfig.pageSize.h) === Math.round(physicalPageGeometry.pageSize.h);
+			let sectionAdvance = "region";
+			if (advance === "page" || !pageSizeIsShared || sharesColumnRegion && !continuesInNextColumn) sectionAdvance = "page";
+			else if (continuesInNextColumn) sectionAdvance = "column";
+			sectionAdvances[i] = sectionAdvance;
+			if (!(sectionAdvance === "column" || sectionAdvance === "region" && hasPhysicalPageContent)) {
 				physicalPageGeometry = {
 					pageSize: nextConfig.pageSize,
 					margins: nextConfig.margins
 				};
 				hasPhysicalPageContent = false;
 			}
+			if (sectionAdvance === "page") hasPhysicalPage = true;
 			columnGeometryDirty = true;
 			sectionIdx++;
-			columnIndex = 0;
+			columnIndex = sectionAdvance === "column" ? columnIndex + 1 : 0;
 		} else if (block.kind === "pageBreak") {
 			physicalPageGeometry = {
 				pageSize: config.pageSize,
 				margins: config.margins
 			};
+			hasPhysicalPage = true;
 			hasPhysicalPageContent = false;
 			columnGeometryDirty = true;
 			columnIndex = 0;
@@ -130,8 +147,12 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 				hasPhysicalPageContent = false;
 				columnGeometryDirty = true;
 			}
+			hasPhysicalPage = true;
 			columnIndex = (columnIndex + 1) % activeColumns.count;
-		} else hasPhysicalPageContent = true;
+		} else {
+			hasPhysicalPage = true;
+			hasPhysicalPageContent = true;
+		}
 	}
 	return {
 		widths,
@@ -144,6 +165,7 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		contentLefts,
 		columnIndices,
 		columnCounts,
+		sectionAdvances,
 		physicalPageGeometry: {
 			pageHeights: physicalPageHeights,
 			pageWidths: physicalPageWidths,

package/dist/prosemirror/attrs/index.d.ts

@@ -1,4 +1,4 @@
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperLayer, LanguageAttrs, PageBreakRunOwnerMarkAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
 import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, MathAttrs, PageBreakRunAttrs, ParagraphAttrs, PreservedBlockAttrs, PreservedXmlAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "../schema/nodes.js";
 import "../schema/index.js";
 import { Mark, Node } from "prosemirror-model";
@@ -80,8 +80,17 @@ declare const readTrackedChangeMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsRe
 declare const expectTrackedChangeMarkAttrs: (mark: Mark) => TrackedChangeMarkAttrs;
 declare const readRunPropertyChangeMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<RunPropertyChangeMarkAttrs>;
 declare const expectRunPropertyChangeMarkAttrs: (mark: Mark) => RunPropertyChangeMarkAttrs;
-declare const readPageBreakRunOwnerMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<PageBreakRunOwnerMarkAttrs>;
-declare const expectPageBreakRunOwnerMarkAttrs: (mark: Mark) => PageBreakRunOwnerMarkAttrs;
+/**
+ * The identity mark's payload, field by field.
+ *
+ * Every field is read strictly because the mark reaches this build from three
+ * places it does not control: a paste, a collaboration snapshot written by
+ * another build, and a host that edited the document through the public API.
+ * A remainder entry that is not a resolved name and a string value would be
+ * written straight back into a `w:r` start tag.
+ */
+declare const readRunIdentityMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<RunIdentityMarkAttrs>;
+declare const expectRunIdentityMarkAttrs: (mark: Mark) => RunIdentityMarkAttrs;
 /**
  * A wrapper stack read from outside the editor — the DOM on paste, a stored
  * snapshot — validated layer by layer.
@@ -98,6 +107,15 @@ declare const mergeImageAttrs: (node: Node, patch: NodeAttrPatch<ImageAttrs>) =>
 declare const mergeParagraphAttrs: (node: Node, patch: NodeAttrPatch<ParagraphAttrs>) => ParagraphAttrs;
 declare const mergeTableAttrs: (node: Node, patch: NodeAttrPatch<TableAttrs>) => TableAttrs;
 declare const mergeTableRowAttrs: (node: Node, patch: NodeAttrPatch<TableRowAttrs>) => TableRowAttrs;
+/**
+ * A command that moves a cell's width states one.
+ *
+ * `width` is also where the table's resolved grid width lands for a cell that
+ * declares no `w:tcW`, so the save leg reads `_authoredWidth` instead. Deriving
+ * it here rather than at each command keeps the two from drifting: a command
+ * cannot set a width without recording that the cell now states it, and one
+ * that clears the width clears the record with it.
+ */
 declare const mergeTableCellAttrs: (node: Node, patch: NodeAttrPatch<TableCellAttrs>) => TableCellAttrs;
 //#endregion
-export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectPageBreakRunOwnerMarkAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readPageBreakRunOwnerMarkAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };