@stll/folio-core 0.45.0 → 0.47.0

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

@@ -1,4 +1,4 @@
-import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned } from "./types.js";
+import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned } from "./types.js";
 import { PageState, Paginator, PaginatorOptions, createPaginator } from "./paginator.js";
 import { KeepNextChain, calculateChainHeight, computeKeepNextChains, getMidChainIndices, hasKeepLines, hasPageBreakBefore } from "./keep-together.js";
 import { resolveSectionHeaderFooterRefs } from "./headerFooterRefs.js";
@@ -42,4 +42,4 @@ declare function layoutDocument(blocks: FlowBlock[], measures: Measure[], option
  */
 declare function getHeaderRowsHeight(measure: TableMeasure, headerRowCount: number): number;
 //#endregion
-export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, SectionPageNumbering, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, tableColumnsArePinned };
+export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, SectionPageNumbering, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, tableColumnsArePinned };

package/dist/layout-engine/index.js

@@ -10,11 +10,11 @@ import { getParagraphFragmentPmRange } from "./paragraphFragmentRange.js";
 import { collapseParagraphSpacing, getParagraphSpacingAfter, getParagraphSpacingBefore, isEmptyParagraph, paragraphsShareStyle, resolveEffectiveParagraphSpacingTree } from "./paragraphSpacing.js";
 import { assertExhaustiveFlowBlock, findPageIndexContainingPmPos } from "./pmPageIndex.js";
 import { INITIAL_RENDERED_BREAK_STATE, PAGE_ADVANCE, reconcileAfterBlock, reconcileBreakBeforeBlock, recordReflowBoundary } from "./renderedBreakReconciliation.js";
-import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, scheduleSectionBreak } from "./section-breaks.js";
+import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, physicalColumnRegionIsShared, scheduleSectionBreak } from "./section-breaks.js";
 import { applySectionVerticalAlignment } from "./sectionVerticalAlignment.js";
 import { buildTableRowBreakInfo, getRowContinuationSkip, snapRowBreak } from "./tableRowBreak.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "./textBoxFlow.js";
-import { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned } from "./types.js";
+import { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned } from "./types.js";
 import { panic } from "better-result";
 //#region src/layout-engine/index.ts
 /**
@@ -979,13 +979,45 @@ function isPagePinnedBandTextBox(block) {
 	return isPageFrameRelativeAnchor(block.position?.vertical?.relativeTo);
 }
 /**
+* Start the next section in the current page region, below the outgoing
+* content.
+*
+* ECMA-376 §17.6.22: a `continuous` break normally keeps the current page
+* geometry and defers the new size/margins to the next natural page break. But
+* a break that changes page size or orientation cannot share a physical sheet
+* with the preceding section, so Word and LibreOffice promote it to a page
+* break (eigenpal/docx-editor#841).
+*
+* Compare against the last laid-out page without materializing one: a break
+* before any content has no sheet to share, so it defers (the first content
+* then opens a page with the new geometry) rather than stranding a blank
+* leading page.
+*/
+function startSectionInPlace(paginator, nextSectionConfig, nextSectionIndex) {
+	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({
+		sectionIndex: nextSectionIndex,
+		pageNumbering: nextSectionConfig.pageNumbering,
+		placement: pageSizeChanges ? SECTION_START_PLACEMENT.NEXT_PAGE : SECTION_START_PLACEMENT.CONTINUOUS
+	});
+	if (pageSizeChanges) {
+		paginator.updatePageLayout(nextSize, nextSectionConfig.margins);
+		if (!paginator.retargetCurrentBlankPage()) paginator.forcePageBreak({ coalesceBlankPage: true });
+		return;
+	}
+	paginator.updatePageLayout(nextSize, nextSectionConfig.margins, false);
+	paginator.retargetCurrentBlankPage();
+}
+/**
 * Handle a section break block.
 * @param block - The section break block (current section's properties)
 * @param paginator - The paginator instance
 * @param nextSectionConfig - Page layout for the NEXT section
 * @param nextSectionType - Break type of the NEXT section (how it starts relative to current)
 */
-function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionType = "nextPage", nextSectionIndex) {
+function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionType, nextSectionIndex) {
 	switch (nextSectionType) {
 		case "nextPage":
 			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
@@ -1013,27 +1045,31 @@ function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionTyp
 			});
 			if (!paginator.retargetCurrentBlankPage()) panic("Odd-page section target must be blank");
 			break;
-		case "continuous": {
+		case "nextColumn": {
 			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 (currentPage === void 0 || !physicalColumnRegionIsShared({
+				pageSize: currentPage.size,
+				margins: currentPage.margins,
+				columns: paginator.columns
+			}, nextSectionConfig)) {
+				startSectionInPlace(paginator, nextSectionConfig, nextSectionIndex);
+				break;
+			}
 			if (nextSectionIndex !== void 0) paginator.startSection({
 				sectionIndex: nextSectionIndex,
 				pageNumbering: nextSectionConfig.pageNumbering,
-				placement: pageSizeChanges ? SECTION_START_PLACEMENT.NEXT_PAGE : SECTION_START_PLACEMENT.CONTINUOUS
+				placement: SECTION_START_PLACEMENT.CONTINUOUS
 			});
-			if (pageSizeChanges) {
-				paginator.updatePageLayout(nextSize, nextSectionConfig.margins);
-				if (!paginator.retargetCurrentBlankPage()) paginator.forcePageBreak({ coalesceBlankPage: true });
-			} else {
-				paginator.updatePageLayout(nextSize, nextSectionConfig.margins, false);
-				paginator.retargetCurrentBlankPage();
-			}
-			break;
+			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins, false);
+			paginator.forceColumnBreak();
+			return;
 		}
-		default: break;
+		case "continuous":
+			startSectionInPlace(paginator, nextSectionConfig, nextSectionIndex);
+			break;
+		default:
 	}
 	paginator.updateColumns(nextSectionConfig.columns ?? DEFAULT_COLUMNS);
 }
 //#endregion
-export { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, tableColumnsArePinned };
+export { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, tableColumnsArePinned };

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

@@ -1,4 +1,5 @@
 import { FlowBlock, Measure, TableBlock, TableMeasure, TextBoxBlock, TextBoxMeasure } from "../types.js";
+import { SectionStartAdvance } from "../section-breaks.js";
 import { FloatingImageZone } from "./floatingZones.js";
 import "./measureParagraph.js";
 //#region src/layout-engine/measure/measureBlocks.d.ts
@@ -28,6 +29,8 @@ type BandPageGeometry = {
   columnIndex?: number | number[];
   /** Authored flow-column count for each block's section. */
   columnCount?: number | number[];
+  /** Resolved paginator transition at each section-break block. */
+  sectionAdvances?: readonly (SectionStartAdvance | undefined)[];
 };
 /**
  * Measure a block based on its type.

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

@@ -1,7 +1,7 @@
 import { hasPageBreakBefore } from "../keep-together.js";
 import { recordMeasureBlock, recordMeasureBlockError } from "../layoutInstrumentation.js";
 import { isParagraphFrameTextBox } from "../paragraphFrame.js";
-import { normalizeSectionBreakType } from "../section-breaks.js";
+import { sectionStartAdvanceOf } from "../section-breaks.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "../textBoxFlow.js";
 import { getTextBoxGroupId } from "../textBoxGroup.js";
 import { DEFAULT_TEXTBOX_MARGINS, floatingTextBoxReservesBand, floatingTextBoxWrapsText, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned } from "../types.js";
@@ -589,12 +589,6 @@ function measureTextBoxBlock(tb, fieldValues) {
 		innerMeasures
 	};
 }
-function isNextPageSectionBreak(block) {
-	return block.kind === "sectionBreak" && normalizeSectionBreakType(block.type) !== "continuous";
-}
-function isContinuousSectionBreak(block) {
-	return block.kind === "sectionBreak" && normalizeSectionBreakType(block.type) === "continuous";
-}
 /**
 * Measure all blocks with floating image support.
 *
@@ -657,6 +651,7 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 	const defaultPhysicalMarginTop = Array.isArray(physicalMarginTopInput) ? physicalMarginTopInput[0] ?? 0 : physicalMarginTopInput;
 	const columnIndexInput = pageGeometry?.columnIndex ?? 0;
 	const columnCountInput = pageGeometry?.columnCount ?? 1;
+	const sectionAdvances = pageGeometry?.sectionAdvances;
 	return blocks.map((block, blockIndex) => {
 		recordMeasureBlock(blockIndex, block);
 		const blockWidth = Array.isArray(contentWidth) ? contentWidth[blockIndex] ?? defaultWidth : contentWidth;
@@ -664,13 +659,14 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 		const blockContentTop = perBlockNumberValue(physicalMarginTopInput, blockIndex, defaultPhysicalMarginTop);
 		const blockColumnIndex = perBlockNumberValue(columnIndexInput, blockIndex, 0);
 		const blockColumnCount = perBlockNumberValue(columnCountInput, blockIndex, 1);
-		if (block.kind === "pageBreak" || isNextPageSectionBreak(block) || hasPageBreakBefore(block)) {
+		const sectionAdvance = sectionAdvances?.[blockIndex] ?? (block.kind === "sectionBreak" ? sectionStartAdvanceOf(block.type) : void 0);
+		if (block.kind === "pageBreak" || sectionAdvance === "page" || hasPageBreakBefore(block)) {
 			activeZones = [];
 			activeTablePageRects = [];
 			cumulativeY = 0;
 			pageRelativeY = 0;
 			columnRegionMaxBottom = 0;
-		} else if (block.kind === "columnBreak") {
+		} else if (block.kind === "columnBreak" || sectionAdvance === "column") {
 			if (blockColumnIndex + 1 >= blockColumnCount) {
 				activeZones = [];
 				activeTablePageRects = [];
@@ -708,7 +704,7 @@ function measureBlocks(blocks, contentWidth, marginTop = 0, pageGeometry, fieldV
 				cumulativeY += measure.totalHeight;
 				pageRelativeY += measure.totalHeight;
 			}
-			if (isContinuousSectionBreak(block)) {
+			if (sectionAdvance === "region") {
 				const nextSectionY = Math.max(pageRelativeY, columnRegionMaxBottom);
 				cumulativeY = nextSectionY;
 				pageRelativeY = nextSectionY;

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

@@ -8,6 +8,8 @@ type TableCellFloatingImage = {
   alt?: string;
   transform?: string;
   opacity?: number;
+  brightness?: number;
+  contrast?: number;
   cropTop?: number;
   cropRight?: number;
   cropBottom?: number;

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

@@ -68,6 +68,8 @@ function getTableCellFloatingImages(cell, cellMeasure, contentWidth, resolvePosi
 				...run.alt !== void 0 ? { alt: run.alt } : {},
 				...run.transform !== void 0 ? { transform: run.transform } : {},
 				...run.opacity != null ? { opacity: run.opacity } : {},
+				...run.brightness != null ? { brightness: run.brightness } : {},
+				...run.contrast != null ? { contrast: run.contrast } : {},
 				...run.cropTop != null ? { cropTop: run.cropTop } : {},
 				...run.cropRight != null ? { cropRight: run.cropRight } : {},
 				...run.cropBottom != null ? { cropBottom: run.cropBottom } : {},

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

@@ -1,3 +1,4 @@
+import { paintsCssBorder } from "../../utils/borderCss.js";
 //#region src/layout-engine/measure/tableCellGrid.ts
 const buildTableCellGrid = (rows, columnCount) => {
 	const occupiedColumnsByRow = /* @__PURE__ */ new Map();
@@ -59,7 +60,7 @@ const buildTableCellPlacements = ({ grid, columnWidths, bidi }) => {
 const getTableCellVerticalBorderHeight = (grid, cell, rowIndex) => {
 	const sourceColumn = cell ? getSourceCellColumn(grid, cell) : void 0;
 	const aboveBottom = (sourceColumn === void 0 ? void 0 : getSourceCellAt(grid, rowIndex - 1, sourceColumn))?.borders?.bottom;
-	const aboveOwnsEdge = aboveBottom !== void 0 && aboveBottom.style !== "none" && aboveBottom.style !== "nil";
+	const aboveOwnsEdge = aboveBottom !== void 0 && paintsCssBorder(aboveBottom.style);
 	return (rowIndex === 0 || !aboveOwnsEdge ? cell?.borders?.top?.width ?? 0 : 0) + (cell?.borders?.bottom?.width ?? 0);
 };
 const firstAvailableColumn = (occupiedColumns, startingColumn) => {

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

@@ -1,6 +1,7 @@
+import { paintsCssBorder } from "../../utils/borderCss.js";
 import { buildTableCellGrid, buildTableCellPlacements } from "./tableCellGrid.js";
 //#region src/layout-engine/measure/tableFragmentBorderGeometry.ts
-const isVisible = (border) => border !== void 0 && border.style !== "none" && border.style !== "nil";
+const isVisible = (border) => border !== void 0 && paintsCssBorder(border.style);
 const tableFragmentBottomBorders = ({ fragment, block, measure, placements: suppliedPlacements }) => {
 	if (fragment.continuesOnNext !== true || fragment.bottomClip === void 0) return [];
 	const splitRow = block.rows.at(fragment.toRow - 1);

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

@@ -1,3 +1,4 @@
+import { resolveTablePlacementAlignment } from "../../utils/tablePlacement.js";
 import { resolveTableCellPadding } from "../types.js";
 //#region src/layout-engine/measure/tableInlinePlacement.ts
 /**
@@ -17,12 +18,8 @@ const resolveTableInlinePlacement = (table, rowJustification) => {
 	const logicalJustification = rowJustification ?? table.justification ?? "left";
 	if (logicalJustification === "center") return { alignment: "center" };
 	const offset = logicalJustification === "left" ? (table.indent ?? 0) - leadingEdgeCompensation(table) : 0;
-	if (table.bidi !== true) return {
-		alignment: logicalJustification,
-		offset
-	};
 	return {
-		alignment: logicalJustification === "left" ? "right" : "left",
+		alignment: resolveTablePlacementAlignment(logicalJustification, table.bidi === true),
 		offset
 	};
 };

package/dist/layout-engine/paragraphSequence.js

@@ -1,10 +1,11 @@
+import { sameStatedParagraphNumbering } from "@stll/docx-core/model";
 //#region src/layout-engine/paragraphSequence.ts
 const continuesNumberedSequence = (previous, current) => {
 	if (previous?.kind !== "paragraph" || current.kind !== "paragraph") return false;
 	const previousNumPr = previous.attrs?.numPr;
 	const currentNumPr = current.attrs?.numPr;
-	if (previousNumPr?.numId === void 0 || currentNumPr?.numId === void 0) return false;
-	return previousNumPr.numId === currentNumPr.numId && previousNumPr.ilvl === currentNumPr.ilvl;
+	if (previousNumPr?.kind !== "reference" || currentNumPr?.kind !== "reference") return false;
+	return sameStatedParagraphNumbering(previousNumPr, currentNumPr);
 };
 const continuesTabbedParagraphSequence = (previous, current) => {
 	if (previous?.kind !== "paragraph" || current.kind !== "paragraph") return false;

package/dist/layout-engine/renderedBreakReconciliation.js

@@ -1,3 +1,4 @@
+import { paintsCssBorder } from "../utils/borderCss.js";
 import { continuesNumberedSequence, continuesTabbedParagraphSequence } from "./paragraphSequence.js";
 //#region src/layout-engine/renderedBreakReconciliation.ts
 const INITIAL_RENDERED_BREAK_STATE = { type: "noPageAdvance" };
@@ -98,7 +99,7 @@ const isPaginationEmptyParagraph = (block) => !hasVisibleEmptyParagraphDecoratio
 const hasVisibleEmptyParagraphDecoration = (block) => {
 	if (block.attrs?.listMarker !== void 0 && block.attrs.listMarker.length > 0 && block.attrs.listMarkerHidden !== true) return true;
 	if (block.attrs?.shading) return true;
-	return Object.values(block.attrs?.borders ?? {}).some((border) => border !== void 0 && border.style !== "none" && border.style !== "nil" && border.width !== 0);
+	return Object.values(block.attrs?.borders ?? {}).some((border) => border !== void 0 && paintsCssBorder(border.style) && border.width !== 0);
 };
 const pageHasVisibleBodyContent = (page, blocksById) => {
 	for (const fragment of page.fragments) {

package/dist/layout-engine/section-breaks.d.ts

@@ -1,4 +1,5 @@
 import { ColumnLayout, PageMargins, SectionBreakBlock } from "./types.js";
+import { SectionStart } from "@stll/docx-core/model";
 //#region src/layout-engine/section-breaks.d.ts
 /**
  * State tracking for sections during layout.
@@ -53,8 +54,54 @@ type BreakDecision = {
   /** Required page parity (even or odd). */
   requiredParity?: "even" | "odd";
 };
+/** `w:sectPr` may omit `w:type`; §17.6.22's omitted value is `nextPage`. */
 declare const DEFAULT_SECTION_BREAK_TYPE = "nextPage";
-declare function normalizeSectionBreakType(type: SectionBreakBlock["type"]): "continuous" | "nextPage" | "evenPage" | "oddPage";
+/**
+ * The section start a boundary states, with the omitted value resolved.
+ *
+ * Absence is a reading the specification gives; a value outside
+ * `ST_SectionMark` is not, so it panics rather than resolving to the same
+ * default and hiding whichever producer invented it.
+ */
+declare function normalizeSectionBreakType(sectionStart: SectionBreakBlock["type"]): SectionStart;
+/**
+ * What a section start does to the page it begins on.
+ *
+ * - `page`: it opens a new sheet.
+ * - `column`: it begins in the next column of the region it shares with the
+ *   outgoing section (§17.18.77), and opens a sheet only when that region has
+ *   no further column.
+ * - `region`: it begins in place, below the outgoing content.
+ */
+declare const SECTION_START_ADVANCE: {
+  readonly nextPage: "page";
+  readonly evenPage: "page";
+  readonly oddPage: "page";
+  readonly nextColumn: "column";
+  readonly continuous: "region";
+};
+type SectionStartAdvance = (typeof SECTION_START_ADVANCE)[SectionStart];
+/** The disposition of the section starting at a boundary. Total over `ST_SectionMark`. */
+declare const sectionStartAdvanceOf: (sectionStart: SectionBreakBlock["type"]) => SectionStartAdvance;
+/**
+ * Whether a section start can continue into the column region the outgoing
+ * section occupies: it needs a further column, and the incoming section has to
+ * repeat the geometry rather than redefine it.
+ */
+declare const columnRegionIsShared: (active: ColumnLayout, next: ColumnLayout | undefined) => boolean;
+type PhysicalColumnRegion = {
+  pageSize: {
+    w: number;
+    h: number;
+  };
+  margins: PageMargins;
+  columns: ColumnLayout;
+};
+type CandidatePhysicalColumnRegion = Omit<PhysicalColumnRegion, "columns"> & {
+  columns?: ColumnLayout;
+};
+/** Whether two sections describe the same physical column region on a sheet. */
+declare const physicalColumnRegionIsShared: (active: PhysicalColumnRegion, next: CandidatePhysicalColumnRegion) => boolean;
 /**
  * Create initial section state from default options.
  */
@@ -94,4 +141,4 @@ declare function getEffectivePageSize(state: SectionState): {
  */
 declare function getEffectiveColumns(state: SectionState): ColumnLayout;
 //#endregion
-export { BreakDecision, DEFAULT_SECTION_BREAK_TYPE, SectionState, applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, scheduleSectionBreak };
+export { BreakDecision, DEFAULT_SECTION_BREAK_TYPE, SectionStartAdvance, SectionState, applyPendingToActive, columnRegionIsShared, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, physicalColumnRegionIsShared, scheduleSectionBreak, sectionStartAdvanceOf };

package/dist/layout-engine/section-breaks.js

@@ -1,16 +1,66 @@
+import { panic } from "better-result";
 //#region src/layout-engine/section-breaks.ts
 /**
+* Section Breaks - Handle page layout changes at section boundaries
+*
+* Sections in DOCX can have different page sizes, margins, columns, and orientations.
+* This module manages the state transitions between sections during layout.
+*/
+/**
 * Default single-column layout.
 */
 const DEFAULT_COLUMNS = {
 	count: 1,
 	gap: 0
 };
+/** `w:sectPr` may omit `w:type`; §17.6.22's omitted value is `nextPage`. */
 const DEFAULT_SECTION_BREAK_TYPE = "nextPage";
-function normalizeSectionBreakType(type) {
-	return type ?? "nextPage";
+/**
+* The section start a boundary states, with the omitted value resolved.
+*
+* Absence is a reading the specification gives; a value outside
+* `ST_SectionMark` is not, so it panics rather than resolving to the same
+* default and hiding whichever producer invented it.
+*/
+function normalizeSectionBreakType(sectionStart) {
+	switch (sectionStart) {
+		case void 0: return DEFAULT_SECTION_BREAK_TYPE;
+		case "nextPage":
+		case "nextColumn":
+		case "continuous":
+		case "evenPage":
+		case "oddPage": return sectionStart;
+		default: return panic(`Section break: "${String(sectionStart)}" is not an ST_SectionMark member`);
+	}
 }
 /**
+* What a section start does to the page it begins on.
+*
+* - `page`: it opens a new sheet.
+* - `column`: it begins in the next column of the region it shares with the
+*   outgoing section (§17.18.77), and opens a sheet only when that region has
+*   no further column.
+* - `region`: it begins in place, below the outgoing content.
+*/
+const SECTION_START_ADVANCE = {
+	nextPage: "page",
+	evenPage: "page",
+	oddPage: "page",
+	nextColumn: "column",
+	continuous: "region"
+};
+/** The disposition of the section starting at a boundary. Total over `ST_SectionMark`. */
+const sectionStartAdvanceOf = (sectionStart) => SECTION_START_ADVANCE[normalizeSectionBreakType(sectionStart)];
+const sameTrack = (left, right) => left === void 0 || right === void 0 ? left === right : left.length === right.length && left.every((value, index) => value === right[index]);
+/**
+* Whether a section start can continue into the column region the outgoing
+* section occupies: it needs a further column, and the incoming section has to
+* repeat the geometry rather than redefine it.
+*/
+const columnRegionIsShared = (active, next) => active.count > 1 && next !== void 0 && next.count === active.count && next.gap === active.gap && sameTrack(active.widths, next.widths) && sameTrack(active.gaps, next.gaps);
+/** Whether two sections describe the same physical column region on a sheet. */
+const physicalColumnRegionIsShared = (active, next) => Math.round(active.pageSize.w) === Math.round(next.pageSize.w) && Math.round(active.pageSize.h) === Math.round(next.pageSize.h) && active.margins.top === next.margins.top && active.margins.right === next.margins.right && active.margins.bottom === next.margins.bottom && active.margins.left === next.margins.left && columnRegionIsShared(active.columns, next.columns);
+/**
 * Create initial section state from default options.
 */
 function createInitialSectionState(margins, pageSize, columns) {
@@ -102,7 +152,8 @@ function scheduleSectionBreak(block, state, _baseMargins) {
 				},
 				state: next
 			};
-		default:
+		case "nextColumn":
+		case "continuous":
 			if (columnsChanging) {
 				next.pendingColumns = getColumnConfig();
 				return {
@@ -183,4 +234,4 @@ function getEffectiveColumns(state) {
 	return state.pendingColumns ?? state.activeColumns;
 }
 //#endregion
-export { DEFAULT_SECTION_BREAK_TYPE, applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, scheduleSectionBreak };
+export { DEFAULT_SECTION_BREAK_TYPE, applyPendingToActive, columnRegionIsShared, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, physicalColumnRegionIsShared, scheduleSectionBreak, sectionStartAdvanceOf };