@stll/folio-core 0.28.0 → 0.28.1

package/dist/layout-engine/paginator.js

@@ -99,8 +99,8 @@ function createPaginator(options) {
 		const pageMargins = getPageMargins(pageNumber, logicalNumber);
 		const topMargin = pageMargins.top;
 		const contentBottom = pageSize.h - pageMargins.bottom;
-		const footnoteHeight = options.footnoteReservedHeights?.get(pageNumber) ?? 0;
-		const pageContentBottom = contentBottom - footnoteHeight;
+		const footnoteHeightFloor = options.footnoteReservedHeights?.get(pageNumber) ?? 0;
+		const pageContentBottom = contentBottom - footnoteHeightFloor;
 		const page = {
 			number: pageNumber,
 			logicalNumber,
@@ -108,7 +108,7 @@ function createPaginator(options) {
 			fragments: [],
 			margins: pageMargins,
 			size: { ...pageSize },
-			...footnoteHeight > 0 ? { footnoteReservedHeight: footnoteHeight } : {},
+			...footnoteHeightFloor > 0 ? { footnoteReservedHeight: footnoteHeightFloor } : {},
 			...columns.count > 1 ? { columns: { ...columns } } : {}
 		};
 		applySectionMetadata(page);
@@ -119,7 +119,9 @@ function createPaginator(options) {
 			topMargin,
 			contentBottom: pageContentBottom,
 			rawContentBottom: contentBottom,
-			footnoteHeight,
+			footnoteHeight: footnoteHeightFloor,
+			footnoteHeightFloor,
+			footnoteDemandHeight: 0,
 			trailingSpacing: 0
 		};
 		pages.push(page);
@@ -197,7 +199,7 @@ function createPaginator(options) {
 		const y = state.cursorY + actualSpaceBefore;
 		fragment.x = x;
 		fragment.y = y;
-		state.page.fragments.push(fragment);
+		commitFragment(state, fragment);
 		state.cursorY = y + height;
 		state.trailingSpacing = spaceAfter;
 		return {
@@ -206,6 +208,18 @@ function createPaginator(options) {
 			y
 		};
 	}
+	function commitFragment(state, fragment) {
+		if (sectionStartPending && state.page.sectionIndex !== currentSectionIndex) {
+			if (currentPageNumbering.type === "restart") nextLogicalPageNumber = currentPageNumbering.start + 1;
+			sectionStartPending = false;
+		}
+		state.page.fragments.push(fragment);
+	}
+	function addUnflowedFragment(fragment) {
+		const state = getCurrentState();
+		commitFragment(state, fragment);
+		return state;
+	}
 	/**
 	* Reserve additional footnote area on the current page.
 	*
@@ -229,8 +243,9 @@ function createPaginator(options) {
 	function addFootnoteHeight(additionalHeight, footnoteIds) {
 		if (!Number.isFinite(additionalHeight) || additionalHeight <= 0) return;
 		const state = getCurrentState();
-		const separatorOverhead = state.footnoteHeight === 0 ? 12 : 0;
-		state.footnoteHeight += additionalHeight + separatorOverhead;
+		const separatorOverhead = state.footnoteDemandHeight === 0 ? 12 : 0;
+		state.footnoteDemandHeight += additionalHeight + separatorOverhead;
+		state.footnoteHeight = Math.max(state.footnoteHeightFloor, state.footnoteDemandHeight);
 		state.contentBottom = state.rawContentBottom - state.footnoteHeight;
 		state.page.footnoteReservedHeight = state.footnoteHeight;
 		if (footnoteIds && footnoteIds.length > 0) {
@@ -261,10 +276,10 @@ function createPaginator(options) {
 		const pageMargins = getPageMargins(current.page.number, current.page.logicalNumber);
 		const topMargin = pageMargins.top;
 		const rawContentBottom = pageSize.h - pageMargins.bottom;
-		const footnoteHeight = options.footnoteReservedHeights?.get(current.page.number) ?? 0;
+		const footnoteHeightFloor = options.footnoteReservedHeights?.get(current.page.number) ?? 0;
 		current.page.size = { ...pageSize };
 		current.page.margins = pageMargins;
-		if (footnoteHeight > 0) current.page.footnoteReservedHeight = footnoteHeight;
+		if (footnoteHeightFloor > 0) current.page.footnoteReservedHeight = footnoteHeightFloor;
 		else delete current.page.footnoteReservedHeight;
 		if (columns.count > 1) current.page.columns = { ...columns };
 		else delete current.page.columns;
@@ -272,8 +287,10 @@ function createPaginator(options) {
 		current.cursorY = topMargin;
 		current.columnIndex = 0;
 		current.rawContentBottom = rawContentBottom;
-		current.footnoteHeight = footnoteHeight;
-		current.contentBottom = rawContentBottom - footnoteHeight;
+		current.footnoteHeight = footnoteHeightFloor;
+		current.footnoteHeightFloor = footnoteHeightFloor;
+		current.footnoteDemandHeight = 0;
+		current.contentBottom = rawContentBottom - footnoteHeightFloor;
 		current.trailingSpacing = 0;
 		columnRegionTop = topMargin;
 		return true;
@@ -370,6 +387,8 @@ function createPaginator(options) {
 		ensureFits,
 		/** Add a fragment to current page. */
 		addFragment,
+		/** Add an already-positioned fragment without advancing normal flow. */
+		addUnflowedFragment,
 		/** Reserve additional footnote area on the current page. */
 		addFootnoteHeight,
 		/** Force a page break. */

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

@@ -1059,6 +1059,8 @@ type TextBoxFragment = FragmentBase & {
   kind: "textBox";
   /** Height of the text box. */
   height: number;
+  /** True if this text box is positioned outside normal body flow. */
+  isPositioned?: true;
 };
 /**
  * Union of all fragment types.
@@ -1226,18 +1228,21 @@ type LayoutOptions = {
   evenAndOddHeaders?: boolean;
   /** Swap left/right margins on even physical pages. */
   mirrorMargins?: boolean;
-  /** Per-page footnote reserved heights (pageNumber → height in pixels). */
+  /**
+   * Per-page footnote reserved heights (pageNumber → height in pixels).
+   * When `footnoteHeightById` is also supplied, a value is a retry floor only
+   * while that page has assigned footnote IDs; without the dynamic height map,
+   * the value remains a static reservation.
+   */
   footnoteReservedHeights?: Map<number, number>;
   /**
    * Footnote content heights keyed by internal footnote id (the OOXML
    * `<w:footnoteReference w:id>`). When provided, the layout engine
    * tracks footnote demand per body line: each line carrying a fn ref
    * grows its page's reservation by that fn's height before the next
-   * line is fitted. This single-pass approach avoids the static-
-   * reservation + iterative-convergence loop that produced oscillation
-   * (and either body-overflow into the footer or large empty gaps
-   * above the fn area) on documents with multiple long footnotes per
-   * page.
+   * line is fitted. Multi-column pages may retry with the observed
+   * reservation as a shared floor when a later column invalidates
+   * earlier-column placement.
    */
   footnoteHeightById?: Map<number, number>;
   /** Header/footer references for each document section, by section index. */

package/dist/prosemirror/attrs/index.js

@@ -77,11 +77,10 @@ const TEXT_BOX_TRACKED_CHANGE_TYPES = [
 	"moveTo"
 ];
 const HARD_BREAK_TYPES = ["column"];
-const RUN_FORMATTING_OVERRIDE_FALSE_KEYS = [
+const RUN_FORMATTING_OVERRIDE_BOOLEAN_KEYS = [
 	"bold",
 	"italic",
 	"strike",
-	"doubleStrike",
 	"allCaps",
 	"smallCaps",
 	"hidden",
@@ -90,6 +89,7 @@ const RUN_FORMATTING_OVERRIDE_FALSE_KEYS = [
 	"shadow",
 	"outline"
 ];
+const RUN_FORMATTING_OVERRIDE_FALSE_KEYS = ["doubleStrike", "rtl"];
 const SECTION_ORIENTATIONS = ["portrait", "landscape"];
 const SECTION_START_TYPES = [
 	"continuous",
@@ -659,6 +659,7 @@ const readRunFormattingOverrideMarkAttrs = (mark) => {
 	const attrs = attrsRecord(mark.attrs);
 	const issues = [];
 	expectMarkType(mark, "runFormattingOverride", issues);
+	for (const key of RUN_FORMATTING_OVERRIDE_BOOLEAN_KEYS) optionalBoolean(attrs, key, `runFormattingOverride.attrs.${key}`, issues);
 	for (const key of RUN_FORMATTING_OVERRIDE_FALSE_KEYS) optionalFalse(attrs, key, `runFormattingOverride.attrs.${key}`, issues);
 	optionalBoolean(attrs, "boldCs", "runFormattingOverride.attrs.boldCs", issues);
 	optionalBoolean(attrs, "italicCs", "runFormattingOverride.attrs.italicCs", issues);

package/dist/prosemirror/commands/formatPainter.js

@@ -1,3 +1,4 @@
+import { expectCharacterStyleMarkAttrs, expectParagraphAttrs } from "../attrs/index.js";
 //#region src/prosemirror/commands/formatPainter.ts
 /**
 * Character-formatting marks the painter copies. Structural marks — comments,
@@ -64,6 +65,40 @@ function sanitizeOverrideMark(mark) {
 	if (Object.keys(kept).length === 0) return null;
 	return mark.type.create(kept);
 }
+const PAINTABLE_STYLE_TOGGLE_MARKS = [
+	["allCaps", "allCaps"],
+	["bold", "bold"],
+	["emboss", "emboss"],
+	["imprint", "imprint"],
+	["italic", "italic"],
+	["outline", "textOutline"],
+	["shadow", "textShadow"],
+	["smallCaps", "smallCaps"],
+	["strike", "strike"]
+];
+const PAINTABLE_COMPLEX_SCRIPT_TOGGLES = ["boldCs", "italicCs"];
+function materializeStyleToggleNegatives({ inheritedFormatting, marks }) {
+	const characterStyle = marks.find((mark) => mark.type.name === "characterStyle");
+	if (!characterStyle) return [...marks];
+	const styleRPr = expectCharacterStyleMarkAttrs(characterStyle)._styleRPr;
+	if (!styleRPr) return [...marks];
+	const negativeAttrs = {};
+	for (const [key, markName] of PAINTABLE_STYLE_TOGGLE_MARKS) if (styleRPr[key] === true && !marks.some((mark) => mark.type.name === markName)) negativeAttrs[key] = false;
+	for (const key of PAINTABLE_COMPLEX_SCRIPT_TOGGLES) {
+		if (styleRPr[key] === void 0) continue;
+		const inheritedValue = inheritedFormatting?.[key] ?? false;
+		if (!(styleRPr[key] === true ? !inheritedValue : false)) negativeAttrs[key] = false;
+	}
+	if (Object.keys(negativeAttrs).length === 0) return [...marks];
+	const existingOverride = marks.find((mark) => mark.type.name === "runFormattingOverride");
+	const overrideType = existingOverride?.type ?? characterStyle.type.schema.marks["runFormattingOverride"];
+	if (!overrideType) return [...marks];
+	const override = overrideType.create({
+		...negativeAttrs,
+		...existingOverride?.attrs
+	});
+	return existingOverride ? marks.map((mark) => mark === existingOverride ? override : mark) : [...marks, override];
+}
 /**
 * Marks of the first text node inside [from, to). A word processor's format
 * brush copies from the start of the source selection, so a mixed selection
@@ -81,6 +116,12 @@ function firstTextMarks(state, from, to) {
 	});
 	return marks ?? [];
 }
+function paragraphDefaultTextFormatting(position) {
+	for (let depth = position.depth; depth >= 0; depth -= 1) {
+		const ancestor = position.node(depth);
+		if (ancestor.type.name === "paragraph") return expectParagraphAttrs(ancestor).defaultTextFormatting;
+	}
+}
 /**
 * Capture the paintable character marks active over the current selection.
 * Returns the marks (with their attrs) to hand to `applyFormatMarks`. An empty
@@ -100,7 +141,10 @@ function captureFormatMarks(state) {
 		}
 		captured.push(mark);
 	}
-	return captured;
+	return materializeStyleToggleNegatives({
+		inheritedFormatting: paragraphDefaultTextFormatting($from),
+		marks: captured
+	});
 }
 /**
 * Apply captured marks onto the current selection's range: clear every paintable

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -8,7 +8,10 @@ declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Doc
 /**
  * Convert ProseMirror marks to TextFormatting
  */
-declare function marksToTextFormatting(marks: readonly Mark[]): document_d_exports.TextFormatting;
+type MarksToTextFormattingOptions = {
+  inheritedFormatting: document_d_exports.TextFormatting | undefined;
+};
+declare function marksToTextFormatting(marks: readonly Mark[], options?: MarksToTextFormattingOptions): document_d_exports.TextFormatting;
 declare const standaloneTableCellFromProseMirror: (node: Node) => document_d_exports.TableCell;
 /**
  * Update a Document with content from a ProseMirror document

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -8,6 +8,7 @@ import { applyRunFormattingOverrideAttrs } from "../extensions/marks/RunFormatti
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
+import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading } from "./runShadingMark.js";
@@ -647,6 +648,7 @@ function paragraphAttrsToFormatting(attrs) {
 */
 function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false) {
 	const content = [];
+	const inheritedFormatting = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0;
 	const sortedEmptyHyperlinks = (emptyHyperlinks ?? []).map((attrs, order) => ({
 		attrs,
 		order
@@ -763,7 +765,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			const changeMark = insertionMark ?? deletionMark;
 			if (!changeMark) return;
 			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
-			const run = createTrackedChangeRun(node, node.marks.filter((m) => m.type.name !== "insertion" && m.type.name !== "deletion"));
+			const otherMarks = node.marks.filter((m) => m.type.name !== "insertion" && m.type.name !== "deletion");
+			const run = createTrackedChangeRun({
+				inheritedFormatting,
+				marks: otherMarks,
+				node
+			});
 			if (!run) return;
 			const trackedContent = linkMark ? {
 				...createHyperlink(linkMark),
@@ -809,7 +816,11 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				currentHyperlink = createHyperlink(linkMark);
 				currentHyperlinkKey = linkKey;
 			}
-			addNodeToHyperlink(currentHyperlink, node);
+			addNodeToHyperlink({
+				hyperlink: currentHyperlink,
+				inheritedFormatting,
+				node
+			});
 			return;
 		}
 		if (currentHyperlink) flushCurrentInline();
@@ -818,7 +829,11 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (currentRun && currentMarksKey === marksKey) appendTextToRun(currentRun, node.text || "");
 			else {
 				if (currentRun) content.push(currentRun);
-				currentRun = createRunFromText(node.text || "", node.marks);
+				currentRun = createRunFromText({
+					inheritedFormatting,
+					marks: node.marks,
+					text: node.text || ""
+				});
 				currentMarksKey = marksKey;
 			}
 		} else if (node.type.name === "symbol") {
@@ -880,11 +895,11 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	});
 	return content;
 }
-function createTrackedChangeRun(node, marks) {
+function createTrackedChangeRun({ inheritedFormatting, marks, node }) {
 	const noteRefMark = marks.find((mark) => mark.type.name === "footnoteRef");
 	if (noteRefMark) return createNoteReferenceRun(noteRefMark, marks);
 	if (node.isText) {
-		const formatting = marksToTextFormatting(marks);
+		const formatting = marksToTextFormatting(marks, { inheritedFormatting });
 		const run = {
 			type: "run",
 			content: node.text ? [{
@@ -989,10 +1004,7 @@ function createHyperlink(linkMark) {
 	if (attrs.rId) hyperlink.rId = attrs.rId;
 	return hyperlink;
 }
-/**
-* Add a node to a hyperlink
-*/
-function addNodeToHyperlink(hyperlink, node) {
+function addNodeToHyperlink({ hyperlink, inheritedFormatting, node }) {
 	const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 	if (noteRefMark) {
 		hyperlink.children.push(createNoteReferenceRun(noteRefMark, node.marks));
@@ -1000,7 +1012,11 @@ function addNodeToHyperlink(hyperlink, node) {
 	}
 	const nonLinkMarks = node.marks.filter((m) => m.type.name !== "hyperlink");
 	if (node.isText && node.text) {
-		const run = createRunFromText(node.text, nonLinkMarks);
+		const run = createRunFromText({
+			inheritedFormatting,
+			marks: nonLinkMarks,
+			text: node.text
+		});
 		hyperlink.children.push(run);
 		return;
 	}
@@ -1044,11 +1060,8 @@ function createNoteReferenceRun(noteRefMark, marks) {
 	if (vertAlign) run.formatting = { vertAlign };
 	return run;
 }
-/**
-* Create a Run from text and marks
-*/
-function createRunFromText(text, marks) {
-	const formatting = getRunFormattingFromMarks(marks);
+function createRunFromText({ inheritedFormatting, marks, text }) {
+	const formatting = getRunFormattingFromMarks(marks, { inheritedFormatting });
 	const run = {
 		type: "run",
 		content: [{
@@ -1082,9 +1095,9 @@ function restoreRunPropertyChanges(run, marks) {
 	if (changes.length === 0) return;
 	run.propertyChanges = [...changes];
 }
-function getRunFormattingFromMarks(marks) {
+function getRunFormattingFromMarks(marks, options) {
 	if (!marks || marks.length === 0) return;
-	const formatting = marksToTextFormatting(marks);
+	const formatting = marksToTextFormatting(marks, options);
 	return Object.keys(formatting).length > 0 ? formatting : void 0;
 }
 /**
@@ -1354,11 +1367,9 @@ function createShapeRun(node) {
 		}]
 	};
 }
-/**
-* Convert ProseMirror marks to TextFormatting
-*/
-function marksToTextFormatting(marks) {
+function marksToTextFormatting(marks, options) {
 	const formatting = {};
+	let directOverrideFormatting;
 	let characterStyleRPr;
 	let runFormattingOverrideMark;
 	for (const mark of marks) switch (mark.type.name) {
@@ -1483,8 +1494,18 @@ function marksToTextFormatting(marks) {
 		}
 		default: break;
 	}
-	if (runFormattingOverrideMark) applyRunFormattingOverrideAttrs(formatting, expectRunFormattingOverrideMarkAttrs(runFormattingOverrideMark));
-	if (characterStyleRPr) return subtractCharacterStyleFormatting(formatting, characterStyleRPr);
+	if (runFormattingOverrideMark) {
+		const overrideAttrs = expectRunFormattingOverrideMarkAttrs(runFormattingOverrideMark);
+		applyRunFormattingOverrideAttrs(formatting, overrideAttrs);
+		directOverrideFormatting = {};
+		applyRunFormattingOverrideAttrs(directOverrideFormatting, overrideAttrs);
+	}
+	if (characterStyleRPr) return subtractCharacterStyleFormatting({
+		directOverrideFormatting,
+		formatting,
+		inheritedFormatting: options?.inheritedFormatting,
+		styleRPr: characterStyleRPr
+	});
 	return formatting;
 }
 /**
@@ -1509,35 +1530,29 @@ const NEGATABLE_STYLE_KEYS = [
 	["outline", null],
 	["rtl", null]
 ];
-/**
-* Drop run formatting values that the run's character style already provides
-* (the `w:rStyle` reference re-imposes them on load), so a styled run
-* serializes back to a style reference instead of baked direct formatting.
-*
-* `styleRPr` is the load-time snapshot from the characterStyle mark, captured
-* in the same normal form this module produces from marks, so value equality
-* is a faithful "came from the style and is unchanged" check. Values that
-* differ (user edits, direct overrides from the source document) stay as
-* direct formatting, which wins over the style per the OOXML cascade.
-*
-* When the user *removes* a boolean property the style supplied (e.g. toggling
-* off bold on text whose `w:rStyle` is bold), that key is no longer present in
-* `formatting`, so the subtraction loop above never sees it. Without a counter,
-* the run keeps the style reference and Word re-applies the removed formatting
-* on load. The second pass emits an explicit negative override (`false`) for
-* each negatable boolean the style set to `true` but the run no longer carries.
-*/
-function subtractCharacterStyleFormatting(formatting, styleRPr) {
+function subtractCharacterStyleFormatting({ directOverrideFormatting, formatting, inheritedFormatting, styleRPr }) {
 	const result = {};
+	const effectiveStyleFormatting = cascadeStyleTextFormatting([{
+		formatting: inheritedFormatting,
+		type: "direct"
+	}, {
+		formatting: styleRPr,
+		type: "style"
+	}]).formatting;
 	for (const key of Object.keys(formatting)) {
 		const value = formatting[key];
 		if (value === void 0) continue;
-		const styleValue = key === "styleId" ? void 0 : styleRPr[key];
+		if (directOverrideFormatting?.[key] !== void 0) {
+			result[key] = value;
+			continue;
+		}
+		const styleValue = key === "styleId" ? void 0 : effectiveStyleFormatting?.[key];
+		if ((key === "boldCs" || key === "italicCs") && styleValue === false && value === true) continue;
 		if (styleValue !== void 0 && JSON.stringify(value) === JSON.stringify(styleValue)) continue;
 		result[key] = value;
 	}
 	for (const [key, csKey] of NEGATABLE_STYLE_KEYS) {
-		if (styleRPr[key] !== true || formatting[key] !== void 0) continue;
+		if (effectiveStyleFormatting?.[key] !== true || formatting[key] !== void 0) continue;
 		result[key] = false;
 		if (csKey !== null) result[csKey] = false;
 	}

package/dist/prosemirror/conversion/toProseDoc.d.ts

@@ -22,7 +22,10 @@ declare function standaloneTableCellToProseMirror(cell: document_d_exports.Table
 /**
  * Convert TextFormatting to ProseMirror marks
  */
-declare function textFormattingToMarks(formatting: document_d_exports.TextFormatting | undefined): ReturnType<typeof schema.mark>[];
+type TextFormattingToMarksOptions = {
+  overrideFormatting: document_d_exports.TextFormatting | undefined;
+};
+declare function textFormattingToMarks(formatting: document_d_exports.TextFormatting | undefined, options?: TextFormattingToMarksOptions): ReturnType<typeof schema.mark>[];
 /**
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
  * Used for editing headers/footers in their own ProseMirror editor and for