@stll/folio-core 0.23.1 → 0.25.0

package/dist/controller/fontReadiness.js

@@ -1,4 +1,4 @@
-import { expectFontFamilyMarkAttrs } from "../prosemirror/attrs/index.js";
+import { expectFontFamilyMarkAttrs, expectParagraphAttrs } from "../prosemirror/attrs/index.js";
 import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
 //#region src/controller/fontReadiness.ts
 function getDocumentFontSet() {
@@ -62,13 +62,15 @@ function collectInitialLayoutFontFaces(documentModel, pmDoc) {
 	return Array.from(faces.values());
 }
 function addTextFormattingFontFaces(faces, formatting) {
-	addLayoutFontFamilyFace(faces, formatting?.fontFamily, layoutDescriptorFromFormatting(formatting));
+	const standardDescriptor = layoutDescriptorFromFormatting(formatting);
+	const complexScriptDescriptor = layoutDescriptorFromEmphasis(formatting?.boldCs ?? formatting?.bold, formatting?.italicCs ?? formatting?.italic);
+	addLayoutFontFamilyFace(faces, formatting?.fontFamily, standardDescriptor, complexScriptDescriptor);
 }
 function collectProseMirrorFontFaces(faces, node, inheritedTextFormatting) {
 	const paragraphDefaults = readParagraphDefaultTextFormatting(node);
 	const textFormatting = paragraphDefaults ?? inheritedTextFormatting;
 	if (paragraphDefaults) addTextFormattingFontFaces(faces, paragraphDefaults);
-	if (node.attrs["listMarkerFontFamily"]) addLayoutFontFamilyFace(faces, node.attrs["listMarkerFontFamily"], REGULAR_LAYOUT_FONT_DESCRIPTOR);
+	if (node.type.name === "paragraph") addTextFormattingFontFaces(faces, expectParagraphAttrs(node).listMarkerFormatting);
 	if (node.isText) {
 		const descriptor = layoutDescriptorFromFormattingAndMarks(textFormatting, node.marks);
 		addLayoutFontFamilyFace(faces, readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? DEFAULT_LAYOUT_FONT_FAMILY, descriptor);
@@ -86,9 +88,12 @@ function readFontFamilyMarkAttrs(marks) {
 	for (const mark of marks) if (mark.type.name === "fontFamily") return expectFontFamilyMarkAttrs(mark);
 }
 function layoutDescriptorFromFormatting(formatting) {
+	return layoutDescriptorFromEmphasis(formatting?.bold, formatting?.italic);
+}
+function layoutDescriptorFromEmphasis(bold, italic) {
 	return {
-		style: formatting?.italic ? "italic" : "normal",
-		weight: formatting?.bold ? 700 : 400
+		style: italic ? "italic" : "normal",
+		weight: bold ? 700 : 400
 	};
 }
 function layoutDescriptorFromFormattingAndMarks(formatting, marks) {
@@ -103,7 +108,7 @@ function layoutDescriptorFromFormattingAndMarks(formatting, marks) {
 		weight: bold ? 700 : 400
 	};
 }
-function addLayoutFontFamilyFace(faces, value, descriptor) {
+function addLayoutFontFamilyFace(faces, value, descriptor, complexScriptDescriptor = descriptor) {
 	if (typeof value === "string") {
 		addLayoutFontFamilyNameFace(faces, value, descriptor);
 		return;
@@ -112,7 +117,7 @@ function addLayoutFontFamilyFace(faces, value, descriptor) {
 	const fontFamily = value;
 	addLayoutFontFamilyFace(faces, fontFamily.ascii, descriptor);
 	addLayoutFontFamilyFace(faces, fontFamily.hAnsi, descriptor);
-	addLayoutFontFamilyFace(faces, fontFamily.cs, descriptor);
+	addLayoutFontFamilyFace(faces, fontFamily.cs, complexScriptDescriptor);
 	addLayoutFontFamilyFace(faces, fontFamily.eastAsia, descriptor);
 }
 function addLayoutFontFamilyNameFace(faces, family, descriptor) {

package/dist/controller/layoutPipeline.js

@@ -26,11 +26,12 @@ function bodyMarginsClearHeaderFooter({ authoredMargins, preparedHeader, prepare
 	const headerBottom = preparedHeader ? (authoredMargins.header ?? 0) + (preparedHeader.marginPushBottom ?? preparedHeader.height) : authoredMargins.top;
 	const footerClearance = preparedFooter ? (authoredMargins.footer ?? 0) + (preparedFooter.marginPushBottom ?? preparedFooter.height) : authoredMargins.bottom;
 	const top = Math.max(authoredMargins.top, headerBottom);
+	const clearedTop = Math.max(top, preparedHeader?.bodyTopClearance ?? 0);
 	const bottom = Math.max(authoredMargins.bottom, footerClearance);
-	if (top === authoredMargins.top && bottom === authoredMargins.bottom) return authoredMargins;
+	if (clearedTop === authoredMargins.top && bottom === authoredMargins.bottom) return authoredMargins;
 	return {
 		...authoredMargins,
-		top,
+		top: clearedTop,
 		bottom
 	};
 }
@@ -255,7 +256,6 @@ function runLayoutPipeline(deps, state, options = {}) {
 		let newLayout;
 		let pageFootnoteMap = /* @__PURE__ */ new Map();
 		let footnoteContentMap = /* @__PURE__ */ new Map();
-		const bodyBreakType = finalSectionProperties?.sectionStart;
 		const buildLayoutOpts = () => {
 			const nextLayoutOpts = {
 				pageSize,
@@ -279,7 +279,6 @@ function runLayoutPipeline(deps, state, options = {}) {
 				nextLayoutOpts.finalPageNumbering = finalLayoutConfig.pageNumbering;
 			}
 			if (columns !== void 0) nextLayoutOpts.columns = columns;
-			if (bodyBreakType !== void 0) nextLayoutOpts.bodyBreakType = bodyBreakType;
 			if (sectionHeaderFooterRefs !== void 0) nextLayoutOpts.sectionHeaderFooterRefs = sectionHeaderFooterRefs;
 			if (sectionEvenPageMargins !== void 0) nextLayoutOpts.sectionEvenPageMargins = sectionEvenPageMargins;
 			return nextLayoutOpts;

package/dist/docx/fieldParser.d.ts

@@ -188,7 +188,7 @@ declare function isTocField(field: document_d_exports.Field): boolean;
  * @param instruction - Parsed instruction for format switches
  * @returns Formatted page number string
  */
-declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction, sectionFormat?: string): string;
+declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction, sectionFormat?: document_d_exports.NumberFormat): string;
 /**
  * Format a date according to a format string
  *

package/dist/docx/fieldParser.js

@@ -1,3 +1,4 @@
+import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
 import { FieldTypeSchema, narrowEnum } from "./parserEnums.js";
 import { parseRun } from "./runParser.js";
 import { findChildren, getAttribute } from "./xmlParser.js";
@@ -354,15 +355,7 @@ function computePageNumber(pageNumber, instruction, sectionFormat) {
 		default: return String(pageNumber);
 	}
 }
-function formatSectionPageNumber(pageNumber, format) {
-	switch (format) {
-		case "upperRoman": return toRoman(pageNumber);
-		case "lowerRoman": return toRoman(pageNumber).toLowerCase();
-		case "upperLetter": return toLetter(pageNumber);
-		case "lowerLetter": return toLetter(pageNumber).toLowerCase();
-		default: return String(pageNumber);
-	}
-}
+const formatSectionPageNumber = (pageNumber, format) => formatOoxmlCounter(pageNumber, format);
 /**
 * Convert number to uppercase Roman numerals
 */

package/dist/docx/numberingParser.d.ts

@@ -24,6 +24,7 @@ type NumberingMap = {
  * @returns NumberingMap with definitions and helper functions
  */
 declare function parseNumbering(numberingXml: string | null): NumberingMap;
+declare const markerFormattingFromLevel: (formatting: document_d_exports.TextFormatting | undefined) => document_d_exports.ListMarkerFormatting | undefined;
 declare function getCachedNumberingMap(definitions: document_d_exports.NumberingDefinitions): NumberingMap;
 /**
  * Create a NumberingMap with helper functions
@@ -80,4 +81,4 @@ declare function getBulletCharacter(level: document_d_exports.ListLevel): string
  */
 declare function isBulletLevel(level: document_d_exports.ListLevel): boolean;
 //#endregion
-export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -1,5 +1,6 @@
 import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
-import { FontHintSchema, LevelSuffixSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { LevelSuffixSchema, narrowEnum } from "./parserEnums.js";
+import { parseRunProperties } from "./runParser.js";
 import { findChild, findChildren, getAttribute, parseBooleanElement, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/numberingParser.ts
 const NUMBER_FORMAT_MAP = {
@@ -315,7 +316,10 @@ function parseListLevel(element) {
 		};
 	}
 	if (pPrEl) level.pPr = parseLevelParagraphProps(pPrEl);
-	if (rPrEl) level.rPr = parseLevelRunProps(rPrEl);
+	if (rPrEl) {
+		const runProperties = parseRunProperties(rPrEl, null);
+		if (runProperties) level.rPr = runProperties;
+	}
 	return level;
 }
 /**
@@ -428,79 +432,21 @@ function parseTabLeader(val) {
 		default: return;
 	}
 }
-/**
-* Parse run properties for a list level (subset of full rPr)
-* Main concern: fonts for bullet characters
-*/
-function parseLevelRunProps(rPr) {
-	const formatting = {};
-	let rFontsEl;
-	let szEl;
-	let colorEl;
-	let bEl;
-	let iEl;
-	let vanishEl;
-	for (const child of rPr.elements ?? []) {
-		if (child.type !== "element") continue;
-		switch (child.name) {
-			case "w:rFonts":
-				rFontsEl ??= child;
-				break;
-			case "w:sz":
-				szEl ??= child;
-				break;
-			case "w:color":
-				colorEl ??= child;
-				break;
-			case "w:b":
-				bEl ??= child;
-				break;
-			case "w:i":
-				iEl ??= child;
-				break;
-			case "w:vanish":
-				vanishEl ??= child;
-				break;
-			default: break;
-		}
-	}
-	if (rFontsEl) {
-		const ascii = getAttribute(rFontsEl, "w", "ascii");
-		const hAnsi = getAttribute(rFontsEl, "w", "hAnsi");
-		const eastAsia = getAttribute(rFontsEl, "w", "eastAsia");
-		const cs = getAttribute(rFontsEl, "w", "cs");
-		const hint = narrowEnum(getAttribute(rFontsEl, "w", "hint"), FontHintSchema);
-		formatting.fontFamily = {
-			...ascii != null ? { ascii } : {},
-			...hAnsi != null ? { hAnsi } : {},
-			...eastAsia != null ? { eastAsia } : {},
-			...cs != null ? { cs } : {},
-			...hint !== void 0 ? { hint } : {}
-		};
-	}
-	if (szEl) {
-		const size = parseNumericAttribute(szEl, "w", "val");
-		if (size !== void 0) formatting.fontSize = size;
-	}
-	if (colorEl) {
-		const val = getAttribute(colorEl, "w", "val");
-		const validatedThemeColor = narrowEnum(getAttribute(colorEl, "w", "themeColor"), ThemeColorSlotSchema);
-		if (val === "auto") formatting.color = { auto: true };
-		else if (validatedThemeColor) {
-			const themeTint = getAttribute(colorEl, "w", "themeTint");
-			const themeShade = getAttribute(colorEl, "w", "themeShade");
-			formatting.color = {
-				themeColor: validatedThemeColor,
-				...themeTint != null ? { themeTint } : {},
-				...themeShade != null ? { themeShade } : {}
-			};
-		} else if (val) formatting.color = { rgb: val };
-	}
-	if (bEl) formatting.bold = parseBooleanElement(bEl);
-	if (iEl) formatting.italic = parseBooleanElement(iEl);
-	if (vanishEl) formatting.hidden = parseBooleanElement(vanishEl);
-	return formatting;
-}
+const markerFormattingFromLevel = (formatting) => {
+	if (!formatting) return;
+	const markerFormatting = {
+		...formatting.fontFamily !== void 0 ? { fontFamily: formatting.fontFamily } : {},
+		...formatting.fontSize !== void 0 ? { fontSize: formatting.fontSize } : {},
+		...formatting.fontSizeCs !== void 0 ? { fontSizeCs: formatting.fontSizeCs } : {},
+		...formatting.bold !== void 0 ? { bold: formatting.bold } : {},
+		...formatting.boldCs !== void 0 ? { boldCs: formatting.boldCs } : {},
+		...formatting.italic !== void 0 ? { italic: formatting.italic } : {},
+		...formatting.italicCs !== void 0 ? { italicCs: formatting.italicCs } : {},
+		...formatting.rtl !== void 0 ? { rtl: formatting.rtl } : {},
+		...formatting.cs !== void 0 ? { cs: formatting.cs } : {}
+	};
+	return Object.keys(markerFormatting).length > 0 ? markerFormatting : void 0;
+};
 /**
 * Per-definitions cache for `createNumberingMap`. Style application rebuilds
 * the lookup map on every picker click otherwise; the definitions object is
@@ -603,10 +549,8 @@ function computeListRendering(numPr, numbering) {
 	};
 	if (level.isLgl) rendering.isLegal = true;
 	if (level.rPr?.hidden) rendering.markerHidden = true;
-	const markerFont = level.rPr?.fontFamily?.ascii || level.rPr?.fontFamily?.hAnsi;
-	if (markerFont) rendering.markerFontFamily = markerFont;
-	if (level.rPr?.fontSize) rendering.markerFontSize = level.rPr.fontSize / 2;
-	if (level.rPr?.bold !== void 0) rendering.markerBold = level.rPr.bold;
+	const markerFormatting = markerFormattingFromLevel(level.rPr);
+	if (markerFormatting) rendering.markerFormatting = markerFormatting;
 	if (level.rPr?.allCaps) rendering.markerAllCaps = true;
 	if (level.lvlJc) rendering.markerAlignment = level.lvlJc;
 	if (level.suffix) rendering.markerSuffix = level.suffix;
@@ -666,4 +610,4 @@ function isBulletLevel(level) {
 	return level.numFmt === "bullet" || level.numFmt === "none";
 }
 //#endregion
-export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/paragraphParser.js

@@ -2,6 +2,7 @@ import { isValidHexId } from "../utils/hexId.js";
 import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
 import { parseFieldType } from "./fieldParser.js";
 import { parseHyperlink as parseHyperlink$1 } from "./hyperlinkParser.js";
+import { markerFormattingFromLevel } from "./numberingParser.js";
 import { BorderStyleSchema, FrameWrapSchema, FrameXAlignSchema, FrameYAlignSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, TabLeaderSchema, TabStopAlignmentSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { consolidateParagraphContent } from "./runConsolidator.js";
 import { parseRun, parseRunProperties } from "./runParser.js";
@@ -1016,10 +1017,8 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 				if (level.isLgl) listRendering.isLegal = true;
 				listRendering.numFmt = level.isLgl ? "decimal" : level.numFmt;
 				if (level.rPr?.hidden) listRendering.markerHidden = true;
-				const markerFont = level.rPr?.fontFamily?.ascii || level.rPr?.fontFamily?.hAnsi;
-				if (markerFont) listRendering.markerFontFamily = markerFont;
-				if (level.rPr?.fontSize) listRendering.markerFontSize = level.rPr.fontSize / 2;
-				if (level.rPr?.bold !== void 0) listRendering.markerBold = level.rPr.bold;
+				const markerFormatting = markerFormattingFromLevel(level.rPr);
+				if (markerFormatting) listRendering.markerFormatting = markerFormatting;
 				if (level.rPr?.allCaps) listRendering.markerAllCaps = true;
 				if (level.lvlJc) listRendering.markerAlignment = level.lvlJc;
 				if (level.suffix) listRendering.markerSuffix = level.suffix;

package/dist/docx/paragraphTextBoxEnrichment.js

@@ -158,6 +158,7 @@ const enrichTextBoxRuns = ({ content, xmlChildren, styles, theme, numbering, rel
 				textBody: {
 					content: textBox.content,
 					...textBox.autoFit !== void 0 ? { autoFit: textBox.autoFit } : {},
+					...textBox.textWrap !== void 0 ? { textWrap: textBox.textWrap } : {},
 					...textBox.margins !== void 0 ? { margins: textBox.margins } : {}
 				}
 			};

package/dist/docx/sectionParser.js

@@ -1,6 +1,6 @@
 import { parseFooterReference, parseHeaderReference } from "./headerFooterRefParser.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
-import { BorderStyleSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { BorderStyleSchema, NumberFormatSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { findChild, findChildren, getAttribute, getChildElements, getLocalName, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/sectionParser.ts
@@ -272,7 +272,7 @@ function parseSectionProperties(sectPr) {
 	const pgNumType = findChild(sectPr, "w", "pgNumType");
 	if (pgNumType) {
 		const pageNumbering = {};
-		const format = getAttribute(pgNumType, "w", "fmt");
+		const format = narrowEnum(getAttribute(pgNumType, "w", "fmt"), NumberFormatSchema);
 		if (format) pageNumbering.format = format;
 		const start = parseNumericAttribute(pgNumType, "w", "start");
 		if (start !== void 0) pageNumbering.start = start;

package/dist/docx/serializer/runSerializer.js

@@ -479,6 +479,7 @@ function serializeShapeContent(content) {
 	if (shape.textBody) {
 		const tb = shape.textBody;
 		const bpAttrs = ["rot=\"0\"", "vert=\"horz\""];
+		if (tb.textWrap) bpAttrs.push(`wrap="${tb.textWrap}"`);
 		if (tb.anchor) bpAttrs.push(`anchor="${tb.anchor === "middle" ? "ctr" : tb.anchor}"`);
 		if (tb.anchorCenter) bpAttrs.push("anchorCtr=\"1\"");
 		if (tb.margins) {

package/dist/docx/textBoxParser.js

@@ -11,6 +11,8 @@ const DEFAULT_MARGIN_EMU = 91440;
 function parseBodyProperties(bodyPr) {
 	if (!bodyPr) return {};
 	const result = {};
+	const textWrap = getAttribute(bodyPr, null, "wrap");
+	if (textWrap === "none" || textWrap === "square") result.textWrap = textWrap;
 	if (findChildByLocalName(bodyPr, "spAutoFit")) result.autoFit = "shape";
 	else if (findChildByLocalName(bodyPr, "normAutofit")) result.autoFit = "normal";
 	else if (findChildByLocalName(bodyPr, "noAutofit")) result.autoFit = "none";
@@ -128,6 +130,7 @@ function parseTextBox(drawingEl) {
 	if (outline) textBox.outline = outline;
 	if (bodyProps.margins) textBox.margins = bodyProps.margins;
 	if (bodyProps.autoFit) textBox.autoFit = bodyProps.autoFit;
+	if (bodyProps.textWrap) textBox.textWrap = bodyProps.textWrap;
 	if (isAnchor) {
 		const position = parseAnchorPosition(container);
 		if (position) textBox.position = position;
@@ -170,6 +173,7 @@ function parseTextBoxFromShape(wsp, size, position, wrap) {
 	if (outline) textBox.outline = outline;
 	if (bodyProps.margins) textBox.margins = bodyProps.margins;
 	if (bodyProps.autoFit) textBox.autoFit = bodyProps.autoFit;
+	if (bodyProps.textWrap) textBox.textWrap = bodyProps.textWrap;
 	if (position) textBox.position = position;
 	if (wrap) textBox.wrap = wrap;
 	return textBox;

package/dist/fields/fieldContext.d.ts

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../types/document.js";
 //#region src/fields/fieldContext.d.ts
 /**
  * Resolution context for evaluating dynamic DOCX fields against a laid-out
@@ -10,7 +11,7 @@ type FieldContext = {
   /** 1-indexed page the field is on (PAGE). */
   pageNumber: number;
   /** OOXML section-level format used when PAGE has no explicit format switch. */
-  pageNumberFormat?: string;
+  pageNumberFormat?: document_d_exports.NumberFormat;
   /** Total pages in the document (NUMPAGES). */
   totalPages: number;
   /** Pages in the field's current section (SECTIONPAGES); omit until the

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

@@ -30,6 +30,14 @@ declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], meas
   top: number;
   bottom: number;
 };
+/**
+ * Find the lower page edge of header `wrapTopAndBottom` artwork that overlaps
+ * the authored body start. Unlike ordinary anchored artwork, this wrap mode
+ * reserves a full-width horizontal band even when the drawing paints behind
+ * text. Bands wholly below the body start need page-local flow support and are
+ * intentionally not flattened into a top margin here.
+ */
+declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flowHeight: number, metrics: HeaderFooterMetrics): number | undefined;
 type ConvertHeaderFooterOptions = {
   styles?: document_d_exports.StyleDefinitions | null;
   theme?: document_d_exports.Theme | null;
@@ -74,4 +82,4 @@ declare function convertHeaderFooterToContent(headerFooter: document_d_exports.H
  */
 declare function convertHeaderFooterPmDocToContent(pmDoc: Node | null | undefined, contentWidth: number, metrics: HeaderFooterMetrics, options: Omit<ConvertHeaderFooterOptions, "styles">): HeaderFooterContent | undefined;
 //#endregion
-export { ConvertHeaderFooterOptions, HeaderFooterMetrics, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };
+export { ConvertHeaderFooterOptions, HeaderFooterMetrics, calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };

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

@@ -290,6 +290,29 @@ function calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, met
 	};
 }
 /**
+* Find the lower page edge of header `wrapTopAndBottom` artwork that overlaps
+* the authored body start. Unlike ordinary anchored artwork, this wrap mode
+* reserves a full-width horizontal band even when the drawing paints behind
+* text. Bands wholly below the body start need page-local flow support and are
+* intentionally not flattened into a top margin here.
+*/
+function calculateHeaderFooterBodyTopClearance(blocks, flowHeight, metrics) {
+	if (metrics.section !== "header") return;
+	const flowTop = metrics.margins.header ?? 48;
+	let clearance = 0;
+	for (const block of blocks) {
+		if (block.kind !== "paragraph") continue;
+		for (const run of block.runs) {
+			if (run.kind !== "image" || run.wrapType !== "topAndBottom" || run.position?.vertical?.relativeTo !== "page" && run.position?.vertical?.relativeTo !== "margin") continue;
+			const pageTop = flowTop + resolveHeaderFooterVisualTop(run, 0, flowHeight, metrics) - (run.distTop ?? 0);
+			if (pageTop > metrics.margins.top) continue;
+			const pageBottom = Math.min(metrics.pageSize.h, pageTop + (run.distTop ?? 0) + run.height + (run.distBottom ?? 0));
+			clearance = Math.max(clearance, pageBottom);
+		}
+	}
+	return clearance > 0 ? clearance : void 0;
+}
+/**
 * Convert HeaderFooter (document type) to HeaderFooterContent (render type).
 *
 * Routes through the same pipeline as the body: HF.content ->
@@ -350,6 +373,7 @@ function finalizeHeaderFooterContent(blocks, contentWidth, metrics, options) {
 	}
 	const { visualTop, visualBottom } = calculateHeaderFooterVisualBounds(blocks, measures, flowHeight, metrics);
 	const { top: marginPushTop, bottom: marginPushBottom } = calculateHeaderFooterMarginPushBounds(blocks, measures, flowHeight, metrics);
+	const bodyTopClearance = calculateHeaderFooterBodyTopClearance(blocks, flowHeight, metrics);
 	return {
 		blocks,
 		measures,
@@ -358,6 +382,7 @@ function finalizeHeaderFooterContent(blocks, contentWidth, metrics, options) {
 		visualBottom,
 		marginPushTop,
 		marginPushBottom,
+		...bodyTopClearance !== void 0 ? { bodyTopClearance } : {},
 		textSig: computeHeaderFooterTextSig(blocks),
 		...options.rId ? { rId: options.rId } : {}
 	};
@@ -442,7 +467,7 @@ function serializeParagraphAttrs(attrs) {
 		"listMarker",
 		"listIsBullet",
 		"listMarkerHidden",
-		"listMarkerBold",
+		"listMarkerFormatting",
 		"listMarkerAlignment",
 		"listMarkerSuffix",
 		"tabs"
@@ -489,4 +514,4 @@ function serializeRunFmt(run) {
 	return JSON.stringify(out);
 }
 //#endregion
-export { calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };
+export { calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };

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

@@ -362,8 +362,7 @@ function applyRunFormattingOverrides(formatting, attrs) {
 	if (attrs.fontSizeCs !== void 0) formatting.complexScriptFontSize = attrs.fontSizeCs / 2;
 	if (attrs.cs !== void 0) formatting.forceComplexScript = attrs.cs;
 }
-function paragraphRunDefaults(pmAttrs, theme) {
-	const defaultTextFormatting = pmAttrs.defaultTextFormatting;
+function textFormattingToRunFormatting(defaultTextFormatting, theme) {
 	if (!defaultTextFormatting) return {};
 	const result = {};
 	const fontFamily = defaultTextFormatting.fontFamily ? resolveWesternThemeFont(defaultTextFormatting.fontFamily, theme) : void 0;
@@ -379,6 +378,7 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (defaultTextFormatting.boldCs !== void 0) result.complexScriptBold = defaultTextFormatting.boldCs;
 	if (defaultTextFormatting.italic !== void 0) result.italic = defaultTextFormatting.italic;
 	if (defaultTextFormatting.italicCs !== void 0) result.complexScriptItalic = defaultTextFormatting.italicCs;
+	if (defaultTextFormatting.rtl !== void 0) result.rtl = defaultTextFormatting.rtl;
 	if (defaultTextFormatting.cs !== void 0) result.forceComplexScript = defaultTextFormatting.cs;
 	if (defaultTextFormatting.underline && defaultTextFormatting.underline.style !== "none") {
 		result.underline = { style: defaultTextFormatting.underline.style };
@@ -408,6 +408,9 @@ function paragraphRunDefaults(pmAttrs, theme) {
 	if (defaultTextFormatting.emphasisMark && defaultTextFormatting.emphasisMark !== "none") result.emphasisMark = defaultTextFormatting.emphasisMark;
 	return result;
 }
+function paragraphRunDefaults(pmAttrs, theme) {
+	return textFormattingToRunFormatting(pmAttrs.defaultTextFormatting, theme);
+}
 /**
 * Build an ImageRun from ProseMirror node attrs, applying conditional property assignment
 * to satisfy exactOptionalPropertyTypes.
@@ -653,12 +656,8 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listStartOverride !== void 0) attrs.listStartOverride = listStartOverride;
 	const listMarkerHidden = previousFormatting.listMarkerHidden;
 	if (listMarkerHidden !== void 0) attrs.listMarkerHidden = listMarkerHidden;
-	const listMarkerFontFamily = previousFormatting.listMarkerFontFamily;
-	if (listMarkerFontFamily !== void 0) attrs.listMarkerFontFamily = listMarkerFontFamily;
-	const listMarkerFontSize = previousFormatting.listMarkerFontSize;
-	if (listMarkerFontSize !== void 0) attrs.listMarkerFontSize = listMarkerFontSize;
-	const listMarkerBold = previousFormatting.listMarkerBold;
-	if (listMarkerBold !== void 0) attrs.listMarkerBold = listMarkerBold;
+	const listMarkerFormatting = previousFormatting.listMarkerFormatting;
+	if (listMarkerFormatting !== void 0) attrs.listMarkerFormatting = listMarkerFormatting;
 	const listMarkerAlignment = previousFormatting.listMarkerAlignment;
 	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
 	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
@@ -674,7 +673,7 @@ function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractC
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds) {
+function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCounters, listSeenNumIds, theme) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
 	const marker = resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds);
 	if (!marker) return;
@@ -682,9 +681,7 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounters, listAbstractCo
 	attrs.listMarkerRevision = toListMarkerRevision("del", change.info);
 	if (previousListAttrs.listIsBullet !== void 0) attrs.listIsBullet = previousListAttrs.listIsBullet;
 	if (previousListAttrs.listMarkerHidden !== void 0) attrs.listMarkerHidden = previousListAttrs.listMarkerHidden;
-	if (previousListAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = previousListAttrs.listMarkerFontFamily;
-	if (previousListAttrs.listMarkerFontSize) attrs.listMarkerFontSize = previousListAttrs.listMarkerFontSize;
-	if (previousListAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = previousListAttrs.listMarkerBold;
+	if (previousListAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(previousListAttrs.listMarkerFormatting, theme);
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
@@ -820,15 +817,13 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;
 	if (pmAttrs.listMarkerHidden) attrs.listMarkerHidden = true;
-	if (pmAttrs.listMarkerFontFamily) attrs.listMarkerFontFamily = pmAttrs.listMarkerFontFamily;
-	if (pmAttrs.listMarkerFontSize) attrs.listMarkerFontSize = pmAttrs.listMarkerFontSize;
-	if (pmAttrs.listMarkerBold !== null && pmAttrs.listMarkerBold !== void 0) attrs.listMarkerBold = pmAttrs.listMarkerBold;
+	if (pmAttrs.listMarkerFormatting) attrs.listMarkerFormatting = textFormattingToRunFormatting(pmAttrs.listMarkerFormatting, theme);
 	if (pmAttrs.listMarkerAlignment) attrs.listMarkerAlignment = pmAttrs.listMarkerAlignment;
 	if (pmAttrs.listMarkerSuffix) attrs.listMarkerSuffix = pmAttrs.listMarkerSuffix;
 	if (pmAttrs.listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = pmAttrs.listMarkerSecondSlotOffsetTwips;
 	if (!pmAttrs.numPr) {
 		const numberingRemovedChange = propertyChanges.find(isRemovedNumberingChange);
-		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds);
+		if (numberingRemovedChange) applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, originalListCounters, originalListAbstractCounters, originalListSeenNumIds, theme);
 	}
 	if (defaultTabStopTwips !== void 0) attrs.defaultTabStopTwips = defaultTabStopTwips;
 	const dtf = pmAttrs.defaultTextFormatting;
@@ -1226,6 +1221,7 @@ function convertTextBoxNode(node, startPos, opts) {
 	};
 	if (attrs.height !== void 0) textBox.height = attrs.height;
 	if (attrs.autoFit !== void 0) textBox.autoFit = attrs.autoFit;
+	if (attrs.textWrap !== void 0) textBox.textWrap = attrs.textWrap;
 	if (attrs.fillColor !== void 0) textBox.fillColor = attrs.fillColor;
 	if (attrs.outlineWidth !== void 0) textBox.outlineWidth = attrs.outlineWidth;
 	if (attrs.outlineColor !== void 0) textBox.outlineColor = attrs.outlineColor;

package/dist/layout-bridge/engine/selectionRects.js

@@ -4,7 +4,7 @@ import { buildRunFontStyle } from "../../layout-engine/measure/measureHelpers.js
 import { measureParagraph } from "../../layout-engine/measure/measureParagraph.js";
 import { measureRun } from "../../layout-engine/measure/measureProvider.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../../layout-engine/measure/tableCellFloating.js";
-import { getTableRowLeadingWidth } from "../../layout-engine/types.js";
+import { getTableRowLeadingWidth, resolveTableCellPadding } from "../../layout-engine/types.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
 import { getPageTop } from "./hitTest.js";
 //#region src/layout-bridge/engine/selectionRects.ts
@@ -24,8 +24,6 @@ import { getPageTop } from "./hitTest.js";
 * across blank lines visible (eigenpal/docx-editor#836).
 */
 const EMPTY_PARAGRAPH_SLIVER_WIDTH = 4;
-const DEFAULT_TABLE_CELL_PADDING_LEFT = 7;
-const DEFAULT_TABLE_CELL_PADDING_TOP = 1;
 /**
 * Extract FontStyle from a run for measurement.
 */
@@ -49,14 +47,14 @@ function findBlockById(blocks, blockId) {
 	return blocks.findIndex((block) => block.id === blockId);
 }
 function getCellContentOffsetY(cell, cellMeasure, rowHeight) {
-	const padTop = cell.padding?.top ?? DEFAULT_TABLE_CELL_PADDING_TOP;
+	const { top: padTop } = resolveTableCellPadding(cell);
 	const spareHeight = Math.max(0, rowHeight - cellMeasure.height);
 	if (cell.verticalAlign === "bottom") return padTop + spareHeight;
 	if (cell.verticalAlign === "center") return padTop + spareHeight / 2;
 	return padTop;
 }
 function getCellContentOffsetX(cell) {
-	return cell.padding?.left ?? DEFAULT_TABLE_CELL_PADDING_LEFT;
+	return resolveTableCellPadding(cell).left;
 }
 function getMeasuredBlockHeight(measure) {
 	if (!measure) return 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, 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, 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, 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, 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";
@@ -44,4 +44,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, 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, 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, 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, scheduleSectionBreak, tableColumnsArePinned };

package/dist/layout-engine/index.js

@@ -11,7 +11,7 @@ import { INITIAL_RENDERED_BREAK_STATE, reconcileAfterBlock, reconcileBreakBefore
 import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, scheduleSectionBreak } from "./section-breaks.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, 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, isTextWrappingFloatingImageRun, resolveTableCellPadding, tableColumnsArePinned } from "./types.js";
 import { panic } from "better-result";
 //#region src/layout-engine/index.ts
 /**
@@ -257,9 +257,7 @@ function layoutDocument(blocks, measures, options) {
 				break;
 			case "sectionBreak": {
 				const nextSectionConfig = sectionConfigs[sectionIdx + 1] ?? initialConfig;
-				let nextType = options.bodyBreakType ?? sectionBreakTypes[sectionIdx] ?? DEFAULT_SECTION_BREAK_TYPE;
-				if (sectionIdx + 1 < sectionBreakTypes.length) nextType = sectionBreakTypes[sectionIdx + 1] ?? DEFAULT_SECTION_BREAK_TYPE;
-				handleSectionBreak(block, paginator, nextSectionConfig, nextType, sectionIdx + 1);
+				handleSectionBreak(block, paginator, nextSectionConfig, sectionBreakTypes[sectionIdx] ?? DEFAULT_SECTION_BREAK_TYPE, sectionIdx + 1);
 				const nextColumns = nextSectionConfig.columns;
 				const nextBreakIndex = breakIndices[sectionIdx + 1] ?? blocks.length;
 				const nextBreak = blocks[nextBreakIndex];
@@ -937,4 +935,4 @@ function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionTyp
 	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, 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, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, scheduleSectionBreak, tableColumnsArePinned };