@stll/folio-core 0.35.1 → 0.37.0

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

@@ -1,6 +1,8 @@
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
+import { buildPageBreakRunDescendantIndex } from "../../internal/pageBreakRunDescendantIndex.js";
+import { partitionRunsAtPageBreaks } from "../../internal/pageBreakRunPartition.js";
 import { setHyperlinkInstanceIndex } from "../../layout-engine/measure/hyperlinkInstance.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
@@ -11,10 +13,12 @@ import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
 import { advanceListMarker, advanceVisibleListMarker, cloneListCounterState, formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
 import { resolveNumberedRefFields } from "../../prosemirror/numberedRefFields.js";
+import { pageBreakRunParagraphProjectionDisposition } from "../../prosemirror/pageBreakRunProjection.js";
 import { directionToBidi } from "../../prosemirror/paragraphDirection.js";
-import { cascadeStyleTextFormatting } from "../../prosemirror/styles/styleToggleCascade.js";
+import { resolveEffectiveRunStyleFormatting } from "../../prosemirror/runStyleFormatting.js";
 import { expectTextBoxAnchorAttrs } from "../../prosemirror/textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
+import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
@@ -23,6 +27,7 @@ import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js"
 import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { sanitizeImageSrc } from "../../utils/sanitizeImageSrc.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
+import { STYLE_TOGGLE_KEYS } from "../../utils/textFormattingMerge.js";
 import { AUTO_PARAGRAPH_SPACING_PX, halfPointsToPixels, halfPointsToPoints, pointsToPixels } from "../../utils/units.js";
 import { getColumns } from "../sectionColumns.js";
 import { groupParagraphFrames } from "./paragraphFrames.js";
@@ -102,6 +107,7 @@ function resetBlockIdCounter() {
 function extractRunFormatting(marks, theme, fontAlternates) {
 	const formatting = {};
 	let hasNoteRef = false;
+	let runFormattingOverride;
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
 			formatting.bold = true;
@@ -216,7 +222,7 @@ function extractRunFormatting(marks, theme, fontAlternates) {
 			formatting.textEffect = expectTextEffectMarkAttrs(mark).effect;
 			break;
 		case "runFormattingOverride":
-			applyRunFormattingOverrides(formatting, expectRunFormattingOverrideMarkAttrs(mark));
+			runFormattingOverride = expectRunFormattingOverrideMarkAttrs(mark);
 			break;
 		case "emphasisMark":
 			formatting.emphasisMark = expectEmphasisMarkAttrs(mark).type ?? "dot";
@@ -278,6 +284,7 @@ function extractRunFormatting(marks, theme, fontAlternates) {
 		}
 		default: break;
 	}
+	if (runFormattingOverride) applyRunFormattingOverrides(formatting, runFormattingOverride);
 	if (hasNoteRef && formatting.subscript) delete formatting.superscript;
 	return formatting;
 }
@@ -314,54 +321,135 @@ function mergeRunFormatting(paraDefaults, formatting) {
 	if (formatting.horizontalScale === 100 && paraDefaults.horizontalScale === void 0) delete merged.horizontalScale;
 	return merged;
 }
+const CHARACTER_STYLE_TOGGLE_LAYOUT_PROPERTIES = {
+	allCaps: "allCaps",
+	bold: "bold",
+	boldCs: "complexScriptBold",
+	emboss: "emboss",
+	hidden: "hidden",
+	imprint: "imprint",
+	italic: "italic",
+	italicCs: "complexScriptItalic",
+	outline: "textOutline",
+	shadow: "textShadow",
+	smallCaps: "smallCaps",
+	strike: "strike"
+};
 /** Restore character-style toggle values that plain visual marks cannot represent. */
-function applyCharacterStyleToggleFormatting({ formatting, marks, paraDefaults }) {
+function applyCharacterStyleToggleFormatting({ formatting, marks, paragraphFormatting, styleResolver }) {
 	const characterStyleMark = marks.find((mark) => mark.type.name === "characterStyle");
-	if (!characterStyleMark) return;
-	const styleRPr = expectCharacterStyleMarkAttrs(characterStyleMark)._styleRPr;
+	const styleRPr = characterStyleMark ? styleResolver.getRunStyleOwnProperties(expectCharacterStyleMarkAttrs(characterStyleMark).styleId) : styleResolver.getDefaultCharacterStyle()?.rPr;
 	if (!styleRPr) return;
-	const effectiveStyleFormatting = cascadeStyleTextFormatting([{
-		formatting: {
-			bold: paraDefaults.bold ?? false,
-			boldCs: paraDefaults.complexScriptBold ?? false,
-			italic: paraDefaults.italic ?? false,
-			italicCs: paraDefaults.complexScriptItalic ?? false
-		},
-		type: "direct"
-	}, {
-		formatting: styleRPr,
-		type: "style"
-	}]).formatting;
-	if (styleRPr.bold !== void 0 && formatting.bold === void 0) formatting.bold = effectiveStyleFormatting?.bold ?? false;
-	if (styleRPr.boldCs !== void 0 && formatting.complexScriptBold === void 0) formatting.complexScriptBold = effectiveStyleFormatting?.boldCs ?? false;
-	if (styleRPr.italic !== void 0 && formatting.italic === void 0) formatting.italic = effectiveStyleFormatting?.italic ?? false;
-	if (styleRPr.italicCs !== void 0 && formatting.complexScriptItalic === void 0) formatting.complexScriptItalic = effectiveStyleFormatting?.italicCs ?? false;
-	if (styleRPr.allCaps === true && formatting.allCaps === void 0) formatting.allCaps = false;
-	if (styleRPr.emboss === true && formatting.emboss === void 0) formatting.emboss = false;
-	if (styleRPr.imprint === true && formatting.imprint === void 0) formatting.imprint = false;
-	if (styleRPr.outline === true && formatting.textOutline === void 0) formatting.textOutline = false;
-	if (styleRPr.shadow === true && formatting.textShadow === void 0) formatting.textShadow = false;
-	if (styleRPr.smallCaps === true && formatting.smallCaps === void 0) formatting.smallCaps = false;
-	if (styleRPr.strike === true && formatting.strike === void 0) formatting.strike = false;
-	if (styleRPr.hidden === true && formatting.hidden === void 0) formatting.hidden = false;
+	const effectiveStyleFormatting = resolveEffectiveRunStyleFormatting({
+		marks,
+		paragraphFormatting,
+		styleResolver
+	});
+	for (const property of STYLE_TOGGLE_KEYS) {
+		if (styleRPr[property] === void 0) continue;
+		const layoutProperty = CHARACTER_STYLE_TOGGLE_LAYOUT_PROPERTIES[property];
+		if (formatting[layoutProperty] === void 0) Reflect.set(formatting, layoutProperty, effectiveStyleFormatting?.[property] ?? false);
+	}
 }
+const suppressInheritedRunFormatting = (formatting, property) => {
+	Reflect.set(formatting, property, void 0);
+};
+const RUN_FORMATTING_OVERRIDE_HANDLER_ENTRIES = Object.entries({
+	_authoredOff() {},
+	_authoredOn() {},
+	_authoredValues() {},
+	allCaps(formatting, value) {
+		if (typeof value === "boolean") formatting.allCaps = value;
+	},
+	bold(formatting, value) {
+		if (typeof value === "boolean") formatting.bold = value;
+	},
+	boldCs(formatting, value) {
+		if (typeof value === "boolean") formatting.complexScriptBold = value;
+	},
+	color(formatting, value) {
+		if (value === "auto") {
+			suppressInheritedRunFormatting(formatting, "color");
+			suppressInheritedRunFormatting(formatting, "textColorSource");
+		}
+	},
+	complexScriptPropertyAbsences() {},
+	cs(formatting, value) {
+		if (typeof value === "boolean") formatting.forceComplexScript = value;
+	},
+	directFontProperties() {},
+	doubleStrike(formatting, value) {
+		if (value === false && formatting.strike === void 0) formatting.strike = false;
+	},
+	effect(formatting, value) {
+		if (value === "none") suppressInheritedRunFormatting(formatting, "textEffect");
+	},
+	emboss(formatting, value) {
+		if (typeof value === "boolean") formatting.emboss = value;
+	},
+	emphasisMark(formatting, value) {
+		if (value === "none") suppressInheritedRunFormatting(formatting, "emphasisMark");
+	},
+	fontSizeCs(formatting, value) {
+		if (typeof value === "number") formatting.complexScriptFontSize = value / 2;
+	},
+	hidden(formatting, value) {
+		if (typeof value === "boolean") formatting.hidden = value;
+	},
+	highlight(formatting, value) {
+		if (value === "none") suppressInheritedRunFormatting(formatting, "highlight");
+	},
+	imprint(formatting, value) {
+		if (typeof value === "boolean") formatting.imprint = value;
+	},
+	italic(formatting, value) {
+		if (typeof value === "boolean") formatting.italic = value;
+	},
+	italicCs(formatting, value) {
+		if (typeof value === "boolean") formatting.complexScriptItalic = value;
+	},
+	kerning(formatting, value) {
+		if (value === 0) formatting.kerningMinPt = 0;
+	},
+	outline(formatting, value) {
+		if (typeof value === "boolean") formatting.textOutline = value;
+	},
+	position(formatting, value) {
+		if (value === 0) formatting.positionPx = 0;
+	},
+	rtl(formatting, value) {
+		if (value === false) formatting.rtl = false;
+	},
+	scale(formatting, value) {
+		if (value === 100) formatting.horizontalScale = 100;
+	},
+	shading(formatting, value) {
+		if (typeof value === "object" && value !== null && Reflect.get(value, "pattern") === "nil") suppressInheritedRunFormatting(formatting, "shading");
+	},
+	shadow(formatting, value) {
+		if (typeof value === "boolean") formatting.textShadow = value;
+	},
+	smallCaps(formatting, value) {
+		if (typeof value === "boolean") formatting.smallCaps = value;
+	},
+	spacing(formatting, value) {
+		if (value === 0) formatting.letterSpacing = 0;
+	},
+	strike(formatting, value) {
+		if (typeof value === "boolean") formatting.strike = value;
+	},
+	underline(formatting, value) {
+		if (value === "none") formatting.underline = false;
+	},
+	vertAlign(formatting, value) {
+		if (value === "baseline") {
+			formatting.superscript = false;
+			formatting.subscript = false;
+		}
+	}
+});
 function applyRunFormattingOverrides(formatting, attrs) {
-	if (attrs.bold !== void 0) formatting.bold = attrs.bold;
-	if (attrs.italic !== void 0) formatting.italic = attrs.italic;
-	if (attrs.underline === "none") formatting.underline = false;
-	if (attrs.strike !== void 0) formatting.strike = attrs.strike;
-	if (attrs.allCaps !== void 0) formatting.allCaps = attrs.allCaps;
-	if (attrs.smallCaps !== void 0) formatting.smallCaps = attrs.smallCaps;
-	if (attrs.hidden !== void 0) formatting.hidden = attrs.hidden;
-	if (attrs.emboss !== void 0) formatting.emboss = attrs.emboss;
-	if (attrs.imprint !== void 0) formatting.imprint = attrs.imprint;
-	if (attrs.shadow !== void 0) formatting.textShadow = attrs.shadow;
-	if (attrs.outline !== void 0) formatting.textOutline = attrs.outline;
-	if (attrs.rtl === false) formatting.rtl = false;
-	if (attrs.boldCs !== void 0) formatting.complexScriptBold = attrs.boldCs;
-	if (attrs.italicCs !== void 0) formatting.complexScriptItalic = attrs.italicCs;
-	if (attrs.fontSizeCs !== void 0) formatting.complexScriptFontSize = attrs.fontSizeCs / 2;
-	if (attrs.cs !== void 0) formatting.forceComplexScript = attrs.cs;
+	for (const [key, handler] of RUN_FORMATTING_OVERRIDE_HANDLER_ENTRIES) handler(formatting, Reflect.get(attrs, key));
 }
 function textFormattingToRunFormatting(defaultTextFormatting, theme, fontAlternates) {
 	if (!defaultTextFormatting) return {};
@@ -483,10 +571,19 @@ function stripTocHyperlinkStyle(formatting) {
 	delete formatting.color;
 	delete formatting.underline;
 }
+const isTrackedRunMark = ({ type }) => type.name === "insertion" || type.name === "deletion";
 /**
-* Convert a paragraph node to runs.
+* Inline wrappers own marks that apply to every projected descendant. A
+* descendant's mark of the same type is more specific, and any descendant
+* revision replaces (rather than combines with) an inherited revision.
 */
-function paragraphToRuns(node, startPos, _options) {
+const mergeProjectedInlineMarks = (inheritedMarks, ownMarks) => {
+	if (inheritedMarks.length === 0) return ownMarks;
+	const ownMarkTypes = new Set(ownMarks.map(({ type }) => type));
+	const hasOwnTrackedMark = ownMarks.some(isTrackedRunMark);
+	return [...inheritedMarks.filter((mark) => !ownMarkTypes.has(mark.type) && !(hasOwnTrackedMark && isTrackedRunMark(mark))), ...ownMarks];
+};
+function paragraphToRuns(node, startPos, _options, pageBreaks) {
 	const runs = [];
 	const offset = startPos + 1;
 	const theme = _options.theme;
@@ -496,7 +593,7 @@ function paragraphToRuns(node, startPos, _options) {
 	const paragraphStyleId = pmAttrs.styleId;
 	const inTocParagraph = pmAttrs._tableOfContentsLevel !== void 0 || tableOfContentsStyleLevel({ styleId: paragraphStyleId }) !== void 0;
 	let leadingRenderedPageBreakPending = pmAttrs.renderedPageBreakBefore === true;
-	function pushRunsForChild(child, childPos) {
+	function pushRunsForChild(child, childPos, inheritedMarks = []) {
 		if (child.type.name === "bookmarkBoundary") return;
 		if (child.type.name === "renderedPageBreak") {
 			if (leadingRenderedPageBreakPending) {
@@ -510,13 +607,46 @@ function paragraphToRuns(node, startPos, _options) {
 			});
 			return;
 		}
+		const effectiveMarks = mergeProjectedInlineMarks(inheritedMarks, child.marks);
+		if (child.type.name === "pageBreakRun") {
+			const trackedChange = extractRunFormatting(effectiveMarks, theme, fontAlternates);
+			if (trackedChange.isDeletion) {
+				runs.push({
+					kind: "text",
+					text: "",
+					isDeletion: true,
+					...trackedChange.changeAuthor !== void 0 ? { changeAuthor: trackedChange.changeAuthor } : {},
+					...trackedChange.changeDate !== void 0 ? { changeDate: trackedChange.changeDate } : {},
+					...trackedChange.changeRevisionId !== void 0 ? { changeRevisionId: trackedChange.changeRevisionId } : {},
+					...trackedChange.isSuggestion === true ? { isSuggestion: true } : {},
+					...trackedChange.suggestionId !== void 0 ? { suggestionId: trackedChange.suggestionId } : {},
+					pmStart: childPos,
+					pmEnd: childPos + child.nodeSize
+				});
+				return;
+			}
+			pageBreaks?.push({
+				pmStart: childPos,
+				pmEnd: childPos + child.nodeSize,
+				...trackedChange.isInsertion ? { trackedChange: {
+					isInsertion: true,
+					...trackedChange.changeAuthor !== void 0 ? { changeAuthor: trackedChange.changeAuthor } : {},
+					...trackedChange.changeDate !== void 0 ? { changeDate: trackedChange.changeDate } : {},
+					...trackedChange.changeRevisionId !== void 0 ? { changeRevisionId: trackedChange.changeRevisionId } : {},
+					...trackedChange.isSuggestion === true ? { isSuggestion: true } : {},
+					...trackedChange.suggestionId !== void 0 ? { suggestionId: trackedChange.suggestionId } : {}
+				} } : {}
+			});
+			return;
+		}
 		if (child.type.name !== "sdt") leadingRenderedPageBreakPending = false;
 		if (child.isText && child.text) {
-			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
+			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
-				marks: child.marks,
-				paraDefaults
+				marks: effectiveMarks,
+				paragraphFormatting: pmAttrs.defaultTextFormatting,
+				styleResolver: _options.styleResolver
 			});
 			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
 			const run = {
@@ -533,11 +663,12 @@ function paragraphToRuns(node, startPos, _options) {
 			const attrs = expectSymbolAttrs(child);
 			const text = decodeOoxmlSymbolCharacter(attrs.char);
 			if (text === null) return;
-			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
+			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
-				marks: child.marks,
-				paraDefaults
+				marks: effectiveMarks,
+				paragraphFormatting: pmAttrs.defaultTextFormatting,
+				styleResolver: _options.styleResolver
 			});
 			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
 			const alternateFontFamily = getFontAlternate(attrs.font, fontAlternates);
@@ -561,11 +692,12 @@ function paragraphToRuns(node, startPos, _options) {
 			return;
 		}
 		if (child.type.name === "tab") {
-			const formatting = extractRunFormatting(child.marks, theme, fontAlternates);
+			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting,
-				marks: child.marks,
-				paraDefaults
+				marks: effectiveMarks,
+				paragraphFormatting: pmAttrs.defaultTextFormatting,
+				styleResolver: _options.styleResolver
 			});
 			const run = {
 				kind: "tab",
@@ -580,11 +712,28 @@ function paragraphToRuns(node, startPos, _options) {
 			const attrs = expectImageAttrs(child);
 			if (!hasPaintableImageSource(attrs.src) && !hasRelationshipBackedImageBox(attrs)) return;
 			const constrained = constrainImageToPage(attrs.width ?? 100, attrs.height ?? 100, _options.pageContentHeight);
-			const trackedFmt = extractRunFormatting(child.marks, theme, fontAlternates);
+			const trackedFmt = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			const run = buildImageRun(attrs, constrained, childPos, childPos + child.nodeSize, trackedFmt);
 			runs.push(run);
 			return;
 		}
+		if (child.type.name === "structuredField") {
+			let containsPageBreak = false;
+			child.descendants((descendant) => {
+				if (descendant.type.name === "pageBreakRun") {
+					containsPageBreak = true;
+					return false;
+				}
+				return true;
+			});
+			if (containsPageBreak) {
+				const fieldContentStart = childPos + 1;
+				child.forEach((fieldChild, fieldChildOffset) => {
+					pushRunsForChild(fieldChild, fieldContentStart + fieldChildOffset, effectiveMarks);
+				});
+				return;
+			}
+		}
 		if (child.type.name === "field" || child.type.name === "structuredField") {
 			const attrs = expectFieldAttrs(child);
 			const ft = attrs.fieldType;
@@ -593,11 +742,12 @@ function paragraphToRuns(node, startPos, _options) {
 			else if (ft === "NUMPAGES") mappedType = "NUMPAGES";
 			else if (ft === "DATE") mappedType = "DATE";
 			else if (ft === "TIME") mappedType = "TIME";
-			const extractedFieldFormatting = extractRunFormatting(child.marks, theme, fontAlternates);
+			const extractedFieldFormatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
 				formatting: extractedFieldFormatting,
-				marks: child.marks,
-				paraDefaults
+				marks: effectiveMarks,
+				paragraphFormatting: pmAttrs.defaultTextFormatting,
+				styleResolver: _options.styleResolver
 			});
 			if (inTocParagraph) stripTocHyperlinkStyle(extractedFieldFormatting);
 			const fieldFormatting = markDefaultBlackTextColorSource(extractedFieldFormatting, paraDefaults);
@@ -632,7 +782,7 @@ function paragraphToRuns(node, startPos, _options) {
 		if (child.type.name === "sdt") {
 			const sdtInnerOffset = childPos + 1;
 			child.forEach((sdtChild, sdtChildOffset) => {
-				pushRunsForChild(sdtChild, sdtInnerOffset + sdtChildOffset);
+				pushRunsForChild(sdtChild, sdtInnerOffset + sdtChildOffset, effectiveMarks);
 			});
 		}
 	}
@@ -676,6 +826,8 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listIsLegal !== void 0) attrs.listIsLegal = listIsLegal;
 	const listMarker = previousFormatting.listMarker;
 	if (listMarker !== void 0) attrs.listMarker = listMarker;
+	const listMarkerTemplate = previousFormatting.listMarkerTemplate;
+	if (listMarkerTemplate !== void 0) attrs.listMarkerTemplate = listMarkerTemplate;
 	const listNumFmt = previousFormatting.listNumFmt;
 	if (listNumFmt !== void 0) attrs.listNumFmt = listNumFmt;
 	const listLevelNumFmts = previousFormatting.listLevelNumFmts;
@@ -694,6 +846,12 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
 	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
 	if (listMarkerSuffix !== void 0) attrs.listMarkerSuffix = listMarkerSuffix;
+	const listMarkerAllCaps = previousFormatting.listMarkerAllCaps;
+	if (listMarkerAllCaps !== void 0) attrs.listMarkerAllCaps = listMarkerAllCaps;
+	const listImplicitChildLevelAdvances = previousFormatting.listImplicitChildLevelAdvances;
+	if (listImplicitChildLevelAdvances !== void 0) attrs.listImplicitChildLevelAdvances = listImplicitChildLevelAdvances;
+	const listMarkerSecondSlotOffsetTwips = previousFormatting.listMarkerSecondSlotOffsetTwips;
+	if (listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = listMarkerSecondSlotOffsetTwips;
 	return attrs;
 }
 function resolveDeletedListMarker(previousListAttrs, listCounterState) {
@@ -717,15 +875,20 @@ function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme, fon
 	if (previousListAttrs.listMarkerAlignment) attrs.listMarkerAlignment = previousListAttrs.listMarkerAlignment;
 	if (previousListAttrs.listMarkerSuffix) attrs.listMarkerSuffix = previousListAttrs.listMarkerSuffix;
 }
+const FLOW_ALIGNMENT_BY_PARAGRAPH_ALIGNMENT = {
+	left: "left",
+	center: "center",
+	right: "right",
+	both: "justify",
+	distribute: "justify",
+	mediumKashida: "justify",
+	highKashida: "justify",
+	lowKashida: "justify",
+	thaiDistribute: "justify"
+};
 function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStreams, defaultTabStopTwips }) {
 	const attrs = {};
-	if (pmAttrs.alignment) {
-		const align = pmAttrs.alignment;
-		if (align === "both" || align === "distribute") attrs.alignment = "justify";
-		else if (align === "left") attrs.alignment = "left";
-		else if (align === "center") attrs.alignment = "center";
-		else if (align === "right") attrs.alignment = "right";
-	}
+	if (pmAttrs.alignment) attrs.alignment = FLOW_ALIGNMENT_BY_PARAGRAPH_ALIGNMENT[pmAttrs.alignment];
 	if (typeof pmAttrs.outlineLevel === "number") attrs.outlineLevel = pmAttrs.outlineLevel;
 	const spaceBefore = pmAttrs.spaceBefore;
 	const spaceAfter = pmAttrs.spaceAfter;
@@ -895,9 +1058,12 @@ function hasOnlyVisuallyEmptyTextRuns(runs) {
 function hasOnlyHiddenTextRuns(runs) {
 	return runs.length > 0 && runs.every((run) => run.kind === "text" && run.hidden === true);
 }
-function convertParagraph(node, startPos, options) {
+function hasVisibleParagraphPayload(attrs) {
+	return attrs.listMarker !== void 0 && !attrs.listMarkerHidden || attrs.borders?.top !== void 0 || attrs.borders?.bottom !== void 0 || attrs.borders?.left !== void 0 || attrs.borders?.right !== void 0 || attrs.borders?.between !== void 0 || attrs.borders?.bar !== void 0 || attrs.shading !== void 0;
+}
+function convertParagraph(node, startPos, options, pageBreaks) {
 	const pmAttrs = expectParagraphAttrs(node);
-	const runs = paragraphToRuns(node, startPos, options);
+	const runs = paragraphToRuns(node, startPos, options, pageBreaks);
 	const attrs = convertParagraphAttrs(pmAttrs, {
 		theme: options.theme,
 		fontAlternates: options.fontAlternates,
@@ -924,8 +1090,7 @@ function convertParagraph(node, startPos, options) {
 	if (isFullyHiddenParagraph && attrs.listMarker !== void 0) attrs.listMarkerHidden = true;
 	if (isFullyHiddenParagraph) attrs.suppressEmptyParagraphHeight = true;
 	if (runs.length === 0 && expectDetachedWatermarkHostAttr(node.attrs)) attrs.suppressEmptyParagraphHeight = false;
-	const hasVisibleParagraphPayload = attrs.listMarker !== void 0 && !attrs.listMarkerHidden || attrs.borders?.top !== void 0 || attrs.borders?.bottom !== void 0 || attrs.borders?.left !== void 0 || attrs.borders?.right !== void 0 || attrs.borders?.between !== void 0 || attrs.borders?.bar !== void 0 || attrs.shading !== void 0;
-	if (runs.length === 0 && pmAttrs._pageBreakCarrier === true && !hasVisibleParagraphPayload) attrs.suppressEmptyParagraphHeight = true;
+	if (runs.length === 0 && pmAttrs._pageBreakCarrier === true && !hasVisibleParagraphPayload(attrs)) attrs.suppressEmptyParagraphHeight = true;
 	const bookmarkNames = pmAttrs.bookmarks?.map((b) => b.name);
 	const block = {
 		kind: "paragraph",
@@ -958,6 +1123,95 @@ function convertParagraph(node, startPos, options) {
 	});
 	return block;
 }
+function paragraphFragmentAttrs(source, index, count) {
+	if (!source) return;
+	const attrs = {
+		...source,
+		...source.indent ? { indent: { ...source.indent } } : {},
+		...source.spacing ? { spacing: { ...source.spacing } } : {},
+		...source.automaticSpacing ? { automaticSpacing: { ...source.automaticSpacing } } : {},
+		...source.spacingExplicit ? { spacingExplicit: { ...source.spacingExplicit } } : {}
+	};
+	if (index > 0) {
+		delete attrs.listMarker;
+		delete attrs.listIsBullet;
+		delete attrs.listMarkerFormatting;
+		delete attrs.listMarkerHidden;
+		delete attrs.listMarkerAlignment;
+		delete attrs.listMarkerSuffix;
+		delete attrs.listMarkerRevision;
+		delete attrs.listMarkerSecondSlotOffsetTwips;
+		delete attrs.reserveEmptyOutlineHeight;
+		delete attrs.pageBreakBefore;
+		delete attrs.renderedPageBreakBefore;
+		if (attrs.indent) {
+			delete attrs.indent.firstLine;
+			delete attrs.indent.hanging;
+		}
+		if (attrs.spacing) delete attrs.spacing.before;
+		if (attrs.automaticSpacing) delete attrs.automaticSpacing.before;
+		if (attrs.spacingExplicit) delete attrs.spacingExplicit.before;
+	}
+	if (index < count - 1) {
+		delete attrs.keepNext;
+		delete attrs.runInWithNext;
+		delete attrs.listParagraphMarkFontSize;
+		if (attrs.spacing) delete attrs.spacing.after;
+		if (attrs.automaticSpacing) delete attrs.automaticSpacing.after;
+		if (attrs.spacingExplicit) delete attrs.spacingExplicit.after;
+	}
+	return attrs;
+}
+function splitParagraphAtPageBreaks({ pageBreaks, paragraph, splitPageBreakAndParagraphMark }) {
+	if (pageBreaks.length === 0) return [paragraph];
+	const result = [];
+	let fragmentStart = paragraph.pmStart ?? pageBreaks[0].pmStart;
+	let emittedParagraph = false;
+	const appendParagraph = (runs, pmStart, pmEnd) => {
+		const fragment = {
+			...paragraph,
+			id: emittedParagraph ? nextBlockId() : paragraph.id,
+			runs,
+			pmStart,
+			pmEnd
+		};
+		if (emittedParagraph) delete fragment.bookmarks;
+		result.push(fragment);
+		emittedParagraph = true;
+	};
+	const partitioned = partitionRunsAtPageBreaks(paragraph.runs, pageBreaks);
+	if (partitioned.type === "overlap") panic("An inline layout run overlaps an explicit page-break carrier");
+	for (const { before, pageBreak } of partitioned.partitions) {
+		if (before.length > 0) appendParagraph(before, fragmentStart, pageBreak.pmStart);
+		result.push({
+			kind: "pageBreak",
+			id: nextBlockId(),
+			pmStart: pageBreak.pmStart,
+			pmEnd: pageBreak.pmEnd,
+			...pageBreak.trackedChange
+		});
+		fragmentStart = pageBreak.pmEnd;
+	}
+	const remainingRuns = partitioned.remaining;
+	if (remainingRuns.length > 0) appendParagraph(remainingRuns, fragmentStart, paragraph.pmEnd ?? fragmentStart);
+	else if (paragraph.runs.length === 0 || splitPageBreakAndParagraphMark && pageBreaks.at(-1)?.pmEnd === (paragraph.pmEnd ?? fragmentStart) - 1) {
+		appendParagraph([], fragmentStart, paragraph.pmEnd ?? fragmentStart);
+		const carrier = result.at(-1);
+		if (carrier?.kind === "paragraph" && !splitPageBreakAndParagraphMark && !hasVisibleParagraphPayload(carrier.attrs ?? {})) carrier.attrs = {
+			...carrier.attrs,
+			suppressEmptyParagraphHeight: true
+		};
+	}
+	const fragments = result.filter((block) => block.kind === "paragraph");
+	for (let index = 0; index < fragments.length; index += 1) {
+		const fragment = fragments[index];
+		if (!fragment) continue;
+		const attrs = paragraphFragmentAttrs(fragment.attrs, index, fragments.length);
+		if (attrs) fragment.attrs = attrs;
+		else delete fragment.attrs;
+	}
+	return result;
+}
 /**
 * Word keeps a final empty body paragraph after a table as an editable anchor,
 * but that final anchor does not create a page of its own. Earlier authored
@@ -1074,6 +1328,8 @@ function extractCellBorders(borders, theme) {
 * Convert a table cell node.
 */
 function convertTableCell(node, startPos, options, tableCellMargins) {
+	const pageBreakPosition = options.firstPageBreakRunPosition(node);
+	if (pageBreakPosition !== void 0) panic(`An explicit page-break run at ${String(pageBreakPosition)} cannot be projected inside a table cell`);
 	const blocks = [];
 	let offset = startPos + 1;
 	node.forEach((child) => {
@@ -1246,10 +1502,10 @@ function convertImage(node, startPos, pageContentHeight) {
 	if (attrs.borderStyle) imgBlock.borderStyle = attrs.borderStyle;
 	return imgBlock;
 }
-/**
-* Convert a textBox PM node to a TextBoxBlock.
-*/
+/** Convert a textBox PM node to a TextBoxBlock. */
 function convertTextBoxNode(node, startPos, opts) {
+	const pageBreakPosition = opts.firstPageBreakRunPosition(node);
+	if (pageBreakPosition !== void 0) panic(`An explicit page-break run at ${String(pageBreakPosition)} cannot be projected inside a text box`);
 	const attrs = expectTextBoxAttrs(node);
 	const contentBlocks = [];
 	node.forEach((child, offset) => {
@@ -1327,6 +1583,32 @@ function applySectionStartsToBoundaries(blocks, finalSectionStart) {
 	}
 	return result;
 }
+/**
+* A trailing page break belongs to its section-ending paragraph. When the
+* paragraph mark stays on the current page, an immediately following
+* continuous section resumes there too. Accept both the legacy generated
+* carrier and the inline atom's one-token paragraph-mark fragment; neither is
+* a physical layout boundary.
+*/
+function coalesceTrailingPageBreakBeforeContinuousSection(blocks, splitPageBreakAndParagraphMark) {
+	if (splitPageBreakAndParagraphMark) return [...blocks];
+	const result = [];
+	for (let index = 0; index < blocks.length; index += 1) {
+		const block = blocks[index];
+		const carrier = blocks[index + 1];
+		const section = blocks[index + 2];
+		const isLegacyGeneratedCarrier = block?.kind === "pageBreak" && carrier?.kind === "paragraph" && carrier.runs.length === 0 && block.pmStart !== void 0 && block.pmStart === carrier.pmStart && carrier.pmStart === carrier.pmEnd;
+		const isInlineParagraphMarkCarrier = block?.kind === "pageBreak" && carrier?.kind === "paragraph" && carrier.runs.length === 0 && block.pmEnd !== void 0 && carrier.pmStart === block.pmEnd && carrier.pmEnd === block.pmEnd + 1;
+		const isUnresolvedInsertion = block?.kind === "pageBreak" && block.isInsertion === true;
+		if (block?.kind === "pageBreak" && !isUnresolvedInsertion && carrier?.kind === "sectionBreak" && carrier.type === "continuous") continue;
+		if (block?.kind === "pageBreak" && !isUnresolvedInsertion && (isLegacyGeneratedCarrier || isInlineParagraphMarkCarrier) && section?.kind === "sectionBreak" && section.type === "continuous") {
+			index += 1;
+			continue;
+		}
+		if (block) result.push(block);
+	}
+	return result;
+}
 function readFinalSectionStart(doc) {
 	const sectionStart = doc.attrs["_finalSectionStart"];
 	switch (sectionStart) {
@@ -1354,14 +1636,27 @@ function toFlowBlocks(doc, options = {}) {
 		counters: listCounters,
 		abstractCounters: options.listAbstractCounters ?? /* @__PURE__ */ new Map(),
 		seenLevels: options.listSeenNumIds ?? /* @__PURE__ */ new Set(),
+		restartedNumIds: /* @__PURE__ */ new Set(),
+		previousList: {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		},
 		...lastAdvancedNumId !== void 0 ? { lastAdvancedNumId } : {}
 	};
 	const originalListCounterState = {
 		counters: originalListCounters,
 		abstractCounters: options.originalListAbstractCounters ?? /* @__PURE__ */ new Map(),
 		seenLevels: options.originalListSeenNumIds ?? /* @__PURE__ */ new Set(),
+		restartedNumIds: /* @__PURE__ */ new Set(),
+		previousList: {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		},
 		...lastAdvancedOriginalNumId !== void 0 ? { lastAdvancedNumId: lastAdvancedOriginalNumId } : {}
 	};
+	const { firstPageBreakRunPosition } = buildPageBreakRunDescendantIndex(doc);
 	const opts = {
 		...options,
 		defaultFont: options.defaultFont ?? DEFAULT_FONT,
@@ -1376,7 +1671,9 @@ function toFlowBlocks(doc, options = {}) {
 			final: listCounterState,
 			original: originalListCounterState
 		},
+		firstPageBreakRunPosition,
 		textBoxAnchorBlockIds: /* @__PURE__ */ new Map(),
+		styleResolver: createStyleEngine(options.styles),
 		numberedRefResults: resolveNumberedRefFields(doc, {
 			listCounterState: cloneListCounterState(listCounterState),
 			originalListCounterState: cloneListCounterState(originalListCounterState)
@@ -1405,6 +1702,20 @@ function toFlowBlocks(doc, options = {}) {
 		tagBlockWithSdtStack(block);
 		blocks.push(block);
 	};
+	const pushParagraphProjection = (node, pos, stripLeadingLineBreak = false) => {
+		if (opts.firstPageBreakRunPosition(node) !== void 0) {
+			const disposition = pageBreakRunParagraphProjectionDisposition(node);
+			if (disposition.status === "unsupported") panic(disposition.message);
+		}
+		const pageBreaks = [];
+		const paragraph = convertParagraph(node, pos, opts, pageBreaks);
+		if (stripLeadingLineBreak && paragraph.runs.at(0)?.kind === "lineBreak") paragraph.runs.shift();
+		for (const block of splitParagraphAtPageBreaks({
+			pageBreaks,
+			paragraph,
+			splitPageBreakAndParagraphMark: options.splitPageBreakAndParagraphMark === true
+		})) trackedPush(block);
+	};
 	const trailingPageBreakSectionPositions = /* @__PURE__ */ new Set();
 	const consumedPageBreakPositions = /* @__PURE__ */ new Set();
 	const collectTrailingPageBreakSections = (parent, contentStart) => {
@@ -1502,10 +1813,8 @@ function toFlowBlocks(doc, options = {}) {
 						pmEnd: pos + 1 + firstChild.nodeSize
 					};
 					trackedPush(columnBreak);
-					const paragraph = convertParagraph(node, pos, opts);
-					if (paragraph.runs.at(0)?.kind === "lineBreak") paragraph.runs.shift();
-					trackedPush(paragraph);
-				} else if (node.content.size > 0 || hasListFormatting || !hasSectionBreak) trackedPush(convertParagraph(node, pos, opts));
+					pushParagraphProjection(node, pos, true);
+				} else if (node.content.size > 0 || hasListFormatting || !hasSectionBreak) pushParagraphProjection(node, pos);
 				if (hasSectionBreak) {
 					if (trailingPageBreakSectionPositions.has(pos)) {
 						const sourceParagraph = blocks.at(-1);
@@ -1614,10 +1923,10 @@ function toFlowBlocks(doc, options = {}) {
 	suppressFinalParagraphInRepeatedEmptySuffix(blocks);
 	const mergedBlocks = mergeRunInParagraphs(blocks);
 	const tableCellLinePitch = doc.attrs["_adjustLineHeightInTable"] === true ? "sectionGrid" : void 0;
-	return groupParagraphFrames(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
+	return groupParagraphFrames(coalesceTrailingPageBreakBeforeContinuousSection(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
 		finalLinePitchTwips: opts.finalSectionDocumentGridLinePitchTwips,
 		tableCellLinePitch
-	}), readFinalSectionStart(doc)), nextBlockId);
+	}), readFinalSectionStart(doc)), options.splitPageBreakAndParagraphMark === true), nextBlockId);
 }
 function applySectionDocumentGrid(blocks, { finalLinePitchTwips, tableCellLinePitch }) {
 	const result = [...blocks];