@stll/folio-core 0.45.0 → 0.47.0

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/managers/autoSaveCodec.d.ts

@@ -1,6 +1,14 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/managers/autoSaveCodec.d.ts
-declare const AUTOSAVE_FORMAT_VERSION = 2;
+/**
+ * Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
+ * `kind`. The codec serialises the model itself, so a version-2 envelope holds
+ * paragraph content under the old discriminator: the model validator would
+ * reject it, and a reader that did not validate would drop the wrapper. The
+ * envelope is a local draft of one editing session, so it is refused and
+ * re-taken rather than migrated.
+ */
+declare const AUTOSAVE_FORMAT_VERSION = 3;
 type DecodedAutoSave = {
   document: document_d_exports.Document;
   savedAt: string;

package/dist/managers/autoSaveCodec.js

@@ -1,7 +1,15 @@
 import { validateFolioDocumentModel } from "../docx/modelValidation.js";
 import { bytesToBase64 } from "../utils/base64.js";
 //#region src/managers/autoSaveCodec.ts
-const AUTOSAVE_FORMAT_VERSION = 2;
+/**
+* Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
+* `kind`. The codec serialises the model itself, so a version-2 envelope holds
+* paragraph content under the old discriminator: the model validator would
+* reject it, and a reader that did not validate would drop the wrapper. The
+* envelope is a local draft of one editing session, so it is refused and
+* re-taken rather than migrated.
+*/
+const AUTOSAVE_FORMAT_VERSION = 3;
 const decodeBase64 = (value) => {
 	const binary = atob(value);
 	const bytes = new Uint8Array(binary.length);
@@ -80,20 +88,20 @@ const encodeAutoSaveDocument = (document) => {
 	};
 	return { json: JSON.stringify(encodeValue(snapshot)) };
 };
-const encodeAutoSaveEnvelopeFromDocument = (document, savedAt) => `{"document":${document.json},"savedAt":${JSON.stringify(savedAt)},"version":2}`;
+const encodeAutoSaveEnvelopeFromDocument = (document, savedAt) => `{"document":${document.json},"savedAt":${JSON.stringify(savedAt)},"version":3}`;
 const encodeAutoSaveEnvelope = (document, savedAt) => encodeAutoSaveEnvelopeFromDocument(encodeAutoSaveDocument(document), savedAt);
 const decodeAutoSaveEnvelope = (json) => {
 	try {
 		const parsed = JSON.parse(json);
 		if (typeof parsed !== "object" || !parsed || !("document" in parsed) || !("savedAt" in parsed) || !("version" in parsed)) return null;
-		if (parsed.version !== 2 || typeof parsed.savedAt !== "string" || !Number.isFinite(Date.parse(parsed.savedAt))) return null;
+		if (parsed.version !== 3 || typeof parsed.savedAt !== "string" || !Number.isFinite(Date.parse(parsed.savedAt))) return null;
 		const document = decodeValue(parsed.document);
 		if (typeof document !== "object" || !document) return null;
 		if (!validateFolioDocumentModel(document).valid) return null;
 		return {
 			document,
 			savedAt: parsed.savedAt,
-			version: 2
+			version: 3
 		};
 	} catch {
 		return null;

package/dist/markdown/renderBlock.js

@@ -71,6 +71,9 @@ function renderBlocks(ctx, pkg, blocks) {
 			}
 			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.d.ts

@@ -5,6 +5,6 @@ import { RenderContext } from "./types.js";
  * Render the full inline content of a paragraph, tracking comment-range
  * boundaries to apply the configured wrapper.
  */
-declare function renderParagraphInline(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, content: document_d_exports.ParagraphContent[], paraId: string | undefined): string;
+declare function renderParagraphInline(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, content: readonly document_d_exports.ParagraphContent[], paraId: string | undefined): string;
 //#endregion
 export { renderParagraphInline };

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";
@@ -76,6 +77,9 @@ function renderRunContent(ctx, pkg, content, paraId) {
 		case "noBreakHyphen":
 			out += "‑";
 			break;
+		case "preservedXml":
+			out += escapeInline(item.text);
+			break;
 		case "footnoteRef":
 		case "endnoteRef": {
 			if (ctx.opts.footnotes === "strip") break;
@@ -128,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) {
@@ -147,10 +151,23 @@ function renderHyperlink(ctx, pkg, link, paraId) {
 }
 function renderTrackedWrapper(ctx, pkg, wrapper, paraId) {
 	const renderChild = (child) => {
-		if (child.type === "run") return renderRun(ctx, pkg, child, paraId);
-		if (child.type === "hyperlink") return renderHyperlink(ctx, pkg, child, paraId);
-		if (child.type === "mathEquation") return child.plainText ? escapeInline(child.plainText) : "";
-		return "";
+		switch (child.type) {
+			case "run": return renderRun(ctx, pkg, child, paraId);
+			case "hyperlink": return renderHyperlink(ctx, pkg, child, paraId);
+			case "mathEquation": return child.plainText ? escapeInline(child.plainText) : "";
+			case "inlineWrapper":
+			case "inlineSdt": return renderParagraphInline(ctx, pkg, child.content, paraId);
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return renderTrackedWrapper(ctx, pkg, child, paraId);
+			case "simpleField":
+			case "complexField": return renderParagraphInline(ctx, pkg, [child], paraId);
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "preservedInline": return "";
+			default: return child;
+		}
 	};
 	if (ctx.opts.trackedChanges === "clean") {
 		if (wrapper.type === "insertion" || wrapper.type === "moveTo") return wrapper.content.map(renderChild).join("");
@@ -196,10 +213,21 @@ function renderParagraphInline(ctx, pkg, content, paraId) {
 		case "simpleField":
 		case "complexField": {
 			const runs = item.type === "simpleField" ? item.content : item.fieldResult;
-			for (const child of runs) out += child.type === "run" ? renderRun(ctx, pkg, child, paraId) : renderHyperlink(ctx, pkg, child, paraId);
+			for (const child of runs) {
+				if (child.type === "run") {
+					out += renderRun(ctx, pkg, child, paraId);
+					continue;
+				}
+				if (child.type === "hyperlink") {
+					out += renderHyperlink(ctx, pkg, child, paraId);
+					continue;
+				}
+				out += child.type === "inlineWrapper" ? renderParagraphInline(ctx, pkg, child.content, paraId) : child.text;
+			}
 			break;
 		}
 		case "inlineSdt":
+		case "inlineWrapper":
 			out += renderParagraphInline(ctx, pkg, item.content, paraId);
 			break;
 		case "mathEquation":

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";
@@ -113,7 +114,7 @@ function renderHtmlCell(ctx, pkg, cell) {
 	for (const item of cell.content) if (item.type === "paragraph") {
 		const inner = renderHtmlInline(ctx, pkg, item.content, item.paraId);
 		if (inner) parts.push(inner);
-	} else {
+	} else if (item.type === "table") {
 		const nested = renderHtmlTable(ctx, pkg, item.rows, true);
 		if (nested) parts.push(nested);
 	}
@@ -148,6 +149,7 @@ function renderHtmlInline(ctx, pkg, content, paraId) {
 			break;
 		}
 		case "inlineSdt":
+		case "inlineWrapper":
 			out += renderHtmlInline(ctx, pkg, item.content, paraId);
 			break;
 		case "mathEquation":
@@ -159,10 +161,23 @@ function renderHtmlInline(ctx, pkg, content, paraId) {
 }
 function renderHtmlChildren(ctx, pkg, children, paraId) {
 	return children.map((child) => {
-		if (child.type === "run") return renderHtmlRun(ctx, pkg, child, paraId);
-		if (child.type === "hyperlink") return renderHtmlHyperlink(ctx, pkg, child, paraId);
-		if (child.type === "mathEquation") return child.plainText ? escapeHtml(child.plainText) : "";
-		return "";
+		switch (child.type) {
+			case "run": return renderHtmlRun(ctx, pkg, child, paraId);
+			case "hyperlink": return renderHtmlHyperlink(ctx, pkg, child, paraId);
+			case "mathEquation": return child.plainText ? escapeHtml(child.plainText) : "";
+			case "inlineWrapper":
+			case "inlineSdt":
+			case "simpleField":
+			case "complexField":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return renderHtmlInline(ctx, pkg, [child], paraId);
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "preservedInline": return "";
+			default: return child;
+		}
 	}).join("");
 }
 function renderHtmlRun(ctx, pkg, run, paraId) {
@@ -184,6 +199,9 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 		case "noBreakHyphen":
 			text += "‑";
 			break;
+		case "preservedXml":
+			text += escapeHtml(item.text);
+			break;
 		case "softHyphen": break;
 		case "drawing": {
 			const ref = resolveRelationshipIdOfType(pkg?.relationships, item.image.rId, RELATIONSHIP_TYPES.image);
@@ -226,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/markdown/trailers.js

@@ -65,12 +65,15 @@ function inlineText(content) {
 		case "moveFrom":
 		case "moveTo":
 		case "inlineSdt":
-		case "bidiWrapper":
+		case "inlineWrapper":
 			out += inlineText(item.content);
 			break;
 		case "mathEquation":
 			out += item.plainText ?? "";
 			break;
+		case "preservedInline":
+			out += item.text;
+			break;
 		case "bookmarkStart":
 		case "bookmarkEnd":
 		case "commentRangeStart":

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,