@stll/folio-core 0.62.0 → 0.63.1

package/dist/internal/wholeStoryRevisionResolution.js

@@ -5,32 +5,43 @@ import { inlineBookmarksOf } from "../prosemirror/commands/paragraphBookmarkJoin
 import { resolveAllTableChanges } from "../prosemirror/commands/resolveAllTableChanges.js";
 import { resolveAllNodePropertyChangeAttrs } from "../prosemirror/commands/resolveNodePropertyChangeAttrs.js";
 import { resolveParagraphChangeAttrs } from "../prosemirror/commands/resolveParagraphProperties.js";
+import { resolveCommentReferences } from "../prosemirror/commentReferenceIntegrity.js";
+import { isBlockBoundaryNode, paragraphRemainsOf } from "../prosemirror/keptRangeBoundaries.js";
+import { joinedParagraphAttrs } from "../prosemirror/paragraphMarkJoin.js";
 import { rebaseParagraphRunContent } from "../prosemirror/rebaseParagraphRuns.js";
 import { createResolvedCommentPointCollector } from "../prosemirror/replacedAnnotations.js";
 import { expandRunFormattingCarrier } from "../prosemirror/runFormattingInlineCarriers.js";
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
 import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
 import { runParagraphsIntoTables, runsIntoFollowingTable } from "../prosemirror/tableRunIn.js";
-import { holdsNoContent } from "../prosemirror/zeroWidthAnchors.js";
+import { paragraphContentOf } from "../prosemirror/zeroWidthAnchors.js";
 import { recordNodeResolution } from "./revisionResolutionEdits.js";
 import { resolveInlineRevisions } from "./revisionResolutionInline.js";
 import { composeRevisionResolutionMaps } from "./revisionResolutionStep.js";
 import { REVIEW_CARRIERS } from "@stll/docx-core/model";
 import { Fragment, Slice } from "prosemirror-model";
 import { Mapping, ReplaceStep, StepMap, Transform } from "prosemirror-transform";
+import { paragraphMarkOutcome } from "@stll/docx-core/ops";
 //#region src/internal/wholeStoryRevisionResolution.ts
 const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changedRanges }) => {
+	const removedMark = doc.type.schema.marks[mode === "accept" ? "deletion" : "insertion"];
 	const collector = createResolvedCommentPointCollector({
-		removes: (node) => mode === "accept" && doc.type.schema.marks["deletion"]?.isInSet(node.marks) !== void 0,
+		removes: (node) => removedMark?.isInSet(node.marks) !== void 0,
 		retiresStructure: () => mode === "accept"
 	});
 	let structural = false;
+	let removedEndpointCount = 0;
+	const removedReferences = [];
 	let runsIntoTable = false;
 	const walk = ({ node, position, eligibleComments = true, previous }) => {
 		const childComments = eligibleComments && collector.visit(node, position, previous);
 		if (node.isText) return node;
 		if (!runsIntoTable && !node.isTextblock) {
-			for (let index = 0; index + 1 < node.childCount; index++) if (runsIntoFollowingTable(node.child(index), node.child(index + 1), mode)) {
+			for (let index = 0; index + 1 < node.childCount; index++) if (runsIntoFollowingTable({
+				parent: node,
+				index,
+				mode
+			})) {
 				runsIntoTable = true;
 				break;
 			}
@@ -44,8 +55,23 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 			numbering
 		}) : null;
 		let resolved = node;
-		if (nextAttrs) resolved = recreateProseNodeWithParagraphPropertySource(node, { attrs: nextAttrs });
-		else if (node.type.name !== "paragraph") resolved = resolveAllNodePropertyChangeAttrs(node, mode);
+		if (nextAttrs) {
+			if (node.type.name === "paragraph" && ownsSection(node) && nextAttrs["_sectionProperties"] == null) {
+				const properties = expectParagraphAttrs(node)._sectionProperties;
+				removedEndpointCount++;
+				for (const { type, rId } of properties?.headerReferences ?? []) removedReferences.push({
+					part: "header",
+					type,
+					relationshipId: rId
+				});
+				for (const { type, rId } of properties?.footerReferences ?? []) removedReferences.push({
+					part: "footer",
+					type,
+					relationshipId: rId
+				});
+			}
+			resolved = recreateProseNodeWithParagraphPropertySource(node, { attrs: nextAttrs });
+		} else if (node.type.name !== "paragraph") resolved = resolveAllNodePropertyChangeAttrs(node, mode);
 		if (resolved !== node) {
 			if (node.type.name === "paragraph") changedRanges.push({
 				from: position,
@@ -68,13 +94,13 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 				const carrier = expandRunFormattingCarrier(inline, pos);
 				if (!carrier) return !inline.isAtom;
 				for (const { node: representation } of carrier.representations) {
-					if (mode === "reject" && representation.marks.some(({ type }) => type.name === "deletion") && representation.marks.some(({ type }) => type.name === "runFormattingOverride")) continue;
+					const authoredFormatting = readAuthoredRunFormatting({
+						context: previousContext,
+						marks: representation.marks,
+						styleResolver
+					});
 					const marks = reconcileRunFormattingMarks({
-						authoredFormatting: readAuthoredRunFormatting({
-							context: previousContext,
-							marks: representation.marks,
-							styleResolver
-						}),
+						authoredFormatting,
 						context: nextContext,
 						node: representation,
 						styleResolver
@@ -120,7 +146,9 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 		}),
 		structural,
 		runsIntoTable,
-		pointComments: new Set(collector.finish().keys())
+		removedEndpointCount,
+		removedReferences,
+		pointComments: mode === "accept" ? new Set(collector.finish().keys()) : /* @__PURE__ */ new Set()
 	};
 };
 const structuralReplacementMap = ({ replacements, tables, bookmarkJoins, origin }) => {
@@ -224,6 +252,14 @@ const removedEndpoint = (node, context) => {
 		relationshipId: rId
 	});
 };
+/** A cleared record (null) and an absent one (undefined) both end no section. */
+const ownsSection = (paragraph) => expectParagraphAttrs(paragraph)._sectionProperties != null;
+const precedingSectionOwner = (preceding, properties) => {
+	if (preceding?.type.name !== "paragraph") return "unavailable";
+	if (!ownsSection(preceding)) return "available";
+	const precedingProperties = expectParagraphAttrs(preceding)._sectionProperties;
+	return JSON.stringify(precedingProperties) === JSON.stringify(properties) ? "same" : "occupied";
+};
 const resolveStructure = ({ node, position, context }) => {
 	if (node.isLeaf) return node;
 	const textBoxAnchor = anchoredTextBoxId(node);
@@ -252,6 +288,12 @@ const resolveStructure = ({ node, position, context }) => {
 	let chain = null;
 	let pendingBookmarks = [];
 	let followingContainerChild = false;
+	const precedingParagraphs = [];
+	let previousSurvivorIsParagraph = false;
+	for (const { node: child } of entries) {
+		precedingParagraphs.push(previousSurvivorIsParagraph);
+		if (child !== null && !isBlockBoundaryNode(child)) previousSurvivorIsParagraph = child.type.name === "paragraph";
+	}
 	const flush = () => {
 		if (!chain) return;
 		let final = chain.node;
@@ -337,7 +379,7 @@ const resolveStructure = ({ node, position, context }) => {
 			paragraph = filler;
 		}
 		if (paragraph.type.name !== "paragraph") {
-			if (paragraph.type.name === "blockBookmarkBoundary") {
+			if (isBlockBoundaryNode(paragraph)) {
 				pendingBookmarks.push(paragraph);
 				continue;
 			}
@@ -350,6 +392,26 @@ const resolveStructure = ({ node, position, context }) => {
 		const markWasAdded = marker?.kind === "ins" || marker?.kind === "moveTo";
 		const joins = marker && markWasAdded !== (context.mode === "accept");
 		if (joins && chain) {
+			const properties = expectParagraphAttrs(paragraph)._sectionProperties;
+			const preceding = entries[index - 1]?.node;
+			const outcome = paragraphMarkOutcome({
+				follows: "paragraph",
+				holdsContent: paragraphContentOf(paragraph),
+				markWasAdded,
+				containerStillEndsWithParagraph: true,
+				followingTableCanReceiveRunIn: false,
+				removedSectionProperties: markWasAdded && properties !== void 0,
+				precedingSectionOwner: precedingSectionOwner(preceding, properties),
+				followingHasSectionProperties: ownsSection(chain.node)
+			});
+			if (outcome.sectionDestination === "preceding" && preceding?.type.name === "paragraph") entries[index - 1].node = recreateProseNodeWithParagraphPropertySource(preceding, { attrs: {
+				...preceding.attrs,
+				_sectionProperties: properties
+			} });
+			else if (outcome.sectionDestination === "following") chain.node = recreateProseNodeWithParagraphPropertySource(chain.node, { attrs: {
+				...chain.node.attrs,
+				_sectionProperties: properties
+			} });
 			const boundaries = pendingBookmarks.toReversed();
 			let bookmarks = Fragment.empty;
 			if (boundaries.length > 0) {
@@ -365,6 +427,8 @@ const resolveStructure = ({ node, position, context }) => {
 				});
 				pendingBookmarks = [];
 			}
+			const joinedAttrs = joinedParagraphAttrs(paragraph, chain.node);
+			if (joinedAttrs !== chain.node.attrs) chain.node = recreateProseNodeWithParagraphPropertySource(chain.node, { attrs: joinedAttrs });
 			const displacedToken = getProseParagraphPropertySourceToken(paragraph);
 			const selectedToken = getProseParagraphPropertySourceToken(chain.node);
 			context.transfers.push({
@@ -386,11 +450,54 @@ const resolveStructure = ({ node, position, context }) => {
 			continue;
 		}
 		flushBookmarks();
-		if (joins && holdsNoContent(paragraph) && (markWasAdded || followingContainerChild) && index + reversed.length + 1 > 1) {
-			context.deleted.push({
+		let follows = "nothing";
+		if (chain) follows = "paragraph";
+		else if (followingContainerChild) follows = "table";
+		let containerStillEndsWithParagraph = true;
+		if (follows === "table") containerStillEndsWithParagraph = node.lastChild?.type.name === "paragraph";
+		else if (follows === "nothing") containerStillEndsWithParagraph = precedingParagraphs[index] === true;
+		const outcome = paragraphMarkOutcome({
+			follows,
+			holdsContent: paragraphContentOf(paragraph),
+			markWasAdded,
+			containerStillEndsWithParagraph,
+			followingTableCanReceiveRunIn: false,
+			removedSectionProperties: markWasAdded && ownsSection(paragraph),
+			precedingSectionOwner: precedingSectionOwner(entries[index - 1]?.node, expectParagraphAttrs(paragraph)._sectionProperties),
+			followingHasSectionProperties: chain !== null && ownsSection(chain.node)
+		});
+		const remains = marker && !paragraphContentOf(paragraph) && outcome.kind === "remove" && joins && index + reversed.length + 1 > 1 ? paragraphRemainsOf(paragraph) : void 0;
+		const between = follows === "table" ? remains?.blocks ?? [] : [];
+		const toPrevious = follows === "table" ? remains?.comments ?? [] : remains?.inline ?? [];
+		const commentHost = entries[index - 1]?.node;
+		if (remains !== void 0 && (toPrevious.length === 0 || commentHost?.type.name === "paragraph")) {
+			const properties = expectParagraphAttrs(paragraph)._sectionProperties;
+			const hostEntry = entries[index - 1];
+			if (toPrevious.length > 0 && commentHost && hostEntry) {
+				const comments = Fragment.fromArray(toPrevious);
+				hostEntry.node = recreateProseNodeWithParagraphPropertySource(commentHost, { content: commentHost.content.append(comments) });
+				const hostEnd = hostEntry.position + hostEntry.original.nodeSize - 1;
+				context.replacements.push({
+					from: hostEnd,
+					to: hostEnd,
+					slice: new Slice(comments, 0, 0)
+				});
+			}
+			const preceding = entries[index - 1]?.node;
+			if (outcome.sectionDestination === "preceding" && preceding?.type.name === "paragraph") entries[index - 1].node = recreateProseNodeWithParagraphPropertySource(preceding, { attrs: {
+				...preceding.attrs,
+				_sectionProperties: properties
+			} });
+			else if (outcome.sectionDestination === "following" && chain) chain.node = recreateProseNodeWithParagraphPropertySource(chain.node, { attrs: {
+				...chain.node.attrs,
+				_sectionProperties: properties
+			} });
+			context.replacements.push({
 				from: entry.position,
-				to: entry.position + paragraph.nodeSize
+				to: entry.position + entry.original.nodeSize,
+				slice: new Slice(Fragment.fromArray(between), 0, 0)
 			});
+			for (const block of between.toReversed()) reversed.push(block);
 			removedEndpoint(paragraph, context);
 			continue;
 		}
@@ -424,37 +531,39 @@ const resolveStructure = ({ node, position, context }) => {
 				return !pending;
 			});
 			const entry = entries.at(-1);
-			if (!pending && entry) if (context.mode === "accept") {
-				const cleared = recreateProseNodeWithParagraphPropertySource(carrier, { attrs: {
-					...carrier.attrs,
-					reviewCarrier: void 0
-				} });
-				recordNodeResolution({
-					before: carrier,
-					after: cleared,
-					position: entry.position,
-					steps: context.steps
-				});
-				context.changedRanges.push({
-					from: entry.position,
-					to: entry.position + carrier.nodeSize
-				});
-				reversed[reversed.length - 1] = cleared;
-			} else if (reversed.length > 1) {
-				reversed.pop();
-				context.deleted.push({
-					from: entry.position,
-					to: entry.position + carrier.nodeSize
-				});
-			} else {
-				const filler = node.type.schema.nodes["paragraph"]?.createAndFill();
-				if (filler) {
-					reversed[0] = filler;
-					context.replacements.push({
+			if (!pending && entry) {
+				if (context.mode === "accept") {
+					const cleared = recreateProseNodeWithParagraphPropertySource(carrier, { attrs: {
+						...carrier.attrs,
+						reviewCarrier: void 0
+					} });
+					recordNodeResolution({
+						before: carrier,
+						after: cleared,
+						position: entry.position,
+						steps: context.steps
+					});
+					context.changedRanges.push({
+						from: entry.position,
+						to: entry.position + carrier.nodeSize
+					});
+					reversed[reversed.length - 1] = cleared;
+				} else if (reversed.length > 1) {
+					reversed.pop();
+					context.deleted.push({
 						from: entry.position,
-						to: entry.position + carrier.nodeSize,
-						slice: new Slice(Fragment.from(filler), 0, 0)
+						to: entry.position + carrier.nodeSize
 					});
+				} else {
+					const filler = node.type.schema.nodes["paragraph"]?.createAndFill();
+					if (filler) {
+						reversed[0] = filler;
+						context.replacements.push({
+							from: entry.position,
+							to: entry.position + carrier.nodeSize,
+							slice: new Slice(Fragment.from(filler), 0, 0)
+						});
+					}
 				}
 			}
 		}
@@ -559,6 +668,8 @@ const resolveStoryRevisions = ({ doc, mode, styleResolver, numbering }) => {
 		keepType: doc.type.schema.marks[mode === "accept" ? "insertion" : "deletion"],
 		removeType: doc.type.schema.marks[mode === "accept" ? "deletion" : "insertion"]
 	});
+	const inlineResolved = inline?.resolved ?? properties;
+	const comments = inline ? resolveCommentReferences(inlineResolved) : null;
 	const context = {
 		mode,
 		styleResolver,
@@ -571,16 +682,17 @@ const resolveStoryRevisions = ({ doc, mode, styleResolver, numbering }) => {
 		bookmarkJoins: [],
 		structural: propertyResult.structural,
 		failed: false,
-		removedEndpointCount: 0,
-		removedReferences: [],
-		droppedTextBoxAnchors: inline ? droppedTextBoxAnchorIds(properties, inline.resolved) : /* @__PURE__ */ new Set()
+		removedEndpointCount: propertyResult.removedEndpointCount,
+		removedReferences: [...propertyResult.removedReferences],
+		droppedTextBoxAnchors: inline ? droppedTextBoxAnchorIds(properties, inlineResolved) : /* @__PURE__ */ new Set()
 	};
 	const resolved = resolveStructure({
-		node: inline?.resolved ?? properties,
+		node: comments?.doc ?? inlineResolved,
 		position: -1,
 		context
 	}) ?? doc;
 	if (inline) steps.push(...inline.steps);
+	if (comments) steps.push(...comments.steps);
 	steps.push(...context.steps);
 	const replacements = [...context.replacements, ...context.deleted.map(({ from, to }) => ({
 		from,
@@ -594,14 +706,16 @@ const resolveStoryRevisions = ({ doc, mode, styleResolver, numbering }) => {
 		origin: 0
 	});
 	for (const { from, to, slice } of replacements.toReversed()) steps.push(new ReplaceStep(from, to, slice));
-	const positionMap = composeRevisionResolutionMaps(inline?.positionMap ?? StepMap.empty, structuralMap);
+	let preStructureMap = inline?.positionMap ?? StepMap.empty;
+	for (const map of comments?.positionMaps ?? []) preStructureMap = composeRevisionResolutionMaps(preStructureMap, map);
+	const positionMap = composeRevisionResolutionMaps(preStructureMap, structuralMap);
 	return {
 		resolved,
 		mapping: new Mapping([positionMap]),
 		positionMap,
 		steps,
 		changedRanges: [...propertyRanges, ...inline?.ranges ?? []],
-		inlineMap: inline?.positionMap ?? StepMap.empty,
+		preStructureMap,
 		tableRanges: context.tableRanges,
 		transfers: context.transfers,
 		structuralRanges: context.changedRanges,
@@ -610,7 +724,9 @@ const resolveStoryRevisions = ({ doc, mode, styleResolver, numbering }) => {
 		failed: context.failed,
 		removedEndpointCount: context.removedEndpointCount,
 		removedReferences: context.removedReferences,
-		runsIntoTable: propertyResult.runsIntoTable
+		runsIntoTable: propertyResult.runsIntoTable,
+		/** The boundaries removed content left standing, for the range repair. */
+		keptBoundaries: inline?.keptBoundaries ?? /* @__PURE__ */ new Set()
 	};
 };
 //#endregion

package/dist/layout-bridge/cellSelectionHighlight.d.ts

@@ -10,8 +10,7 @@ import { EditorState } from "prosemirror-state";
  * `instanceof` to dodge bundling issues across `prosemirror-tables` copies
  * (the same trick used inline in the selection-overlay update).
  */
-declare function applyCellSelectionHighlight(pagesContainer: HTMLElement, state: EditorState, options?: {
+export declare function applyCellSelectionHighlight(pagesContainer: HTMLElement, state: EditorState, options?: {
   scope?: "body" | "header" | "footer";
 }): void;
-//#endregion
-export { applyCellSelectionHighlight };
+//#endregion

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

@@ -13,13 +13,13 @@ type EndnoteArea = {
   blocks: FlowBlock[];
   measures: Measure[];
 };
-type PreparedEndnoteAreas = {
+export type PreparedEndnoteAreas = {
   areas: readonly EndnoteArea[];
   noteAreas: NoteAreaLayout;
   /** The endnote each area content block belongs to, by block id. */
   noteStoryByBlockId: ReadonlyMap<string, NoteStoryKey>;
 };
-type PrepareEndnoteAreasInput = {
+export type PrepareEndnoteAreasInput = {
   /** The body's top-level flow blocks, markers already renumbered. */
   blocks: readonly FlowBlock[];
   endnotes: readonly document_d_exports.Endnote[] | undefined;
@@ -42,12 +42,12 @@ type PrepareEndnoteAreasInput = {
  * for. `undefined` when no reference names a note, so a document without
  * endnotes lays out exactly as it did before.
  */
-declare function prepareEndnoteAreas(input: PrepareEndnoteAreasInput): PreparedEndnoteAreas | undefined;
+export declare function prepareEndnoteAreas(input: PrepareEndnoteAreasInput): PreparedEndnoteAreas | undefined;
 /**
  * The body blocks with each endnote area in place: before the section break
  * that ends the section it follows, or after the last body block.
  */
-declare function spliceEndnoteAreas(blocks: FlowBlock[], measures: Measure[], prepared: PreparedEndnoteAreas | undefined): {
+export declare function spliceEndnoteAreas(blocks: FlowBlock[], measures: Measure[], prepared: PreparedEndnoteAreas | undefined): {
   blocks: FlowBlock[];
   measures: Measure[];
 };
@@ -56,10 +56,10 @@ declare function spliceEndnoteAreas(blocks: FlowBlock[], measures: Measure[], pr
  * `toFlowBlocks`' `trailingEndnoteIds`. Empty for `sectEnd`, whose final area
  * depends on where the references fall.
  */
-declare function trailingEndnoteIds(endnotes: readonly document_d_exports.Endnote[] | undefined, position: document_d_exports.EndnotePosition): ReadonlySet<number>;
+export declare function trailingEndnoteIds(endnotes: readonly document_d_exports.Endnote[] | undefined, position: document_d_exports.EndnotePosition): ReadonlySet<number>;
 /** `w:pos` for the document: the settings value, else the final section's. */
-declare function resolveEndnotePosition(settingsPosition: document_d_exports.EndnotePosition | undefined, finalSection: document_d_exports.SectionProperties | undefined): document_d_exports.EndnotePosition;
+export declare function resolveEndnotePosition(settingsPosition: document_d_exports.EndnotePosition | undefined, finalSection: document_d_exports.SectionProperties | undefined): document_d_exports.EndnotePosition;
 /** The first column's width in a section: what an endnote area there wraps to. */
-declare function endnoteAreaWidth(section: document_d_exports.SectionProperties | undefined): number;
+export declare function endnoteAreaWidth(section: document_d_exports.SectionProperties | undefined): number;
 //#endregion
-export { PrepareEndnoteAreasInput, PreparedEndnoteAreas, endnoteAreaWidth, prepareEndnoteAreas, resolveEndnotePosition, spliceEndnoteAreas, trailingEndnoteIds };
+export {};

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

@@ -73,7 +73,8 @@ function prepareEndnoteAreas(input) {
 		const measures = [separator.measure];
 		separatorBlockIds.set(String(separator.block.id), "separator");
 		for (const noteId of noteIds) {
-			const content = convertFootnoteToContent(notesById.get(noteId), input.displayNumbers.get(noteId) ?? 0, width, {
+			const note = notesById.get(noteId);
+			const content = convertFootnoteToContent(note, input.displayNumbers.get(noteId) ?? 0, width, {
 				...input.options,
 				displayText: input.displayTexts.get(noteId) ?? String(noteId)
 			});

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

@@ -1,6 +1,5 @@
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/fixedTableColumnWidths.d.ts
 /** Resolve absolute cell preferences for an unbounded fixed-layout grid (§17.4.53). */
-declare const fixedTableColumnWidths: (table: Node, grid: readonly number[]) => readonly number[];
-//#endregion
-export { fixedTableColumnWidths };
+export declare const fixedTableColumnWidths: (table: Node, grid: readonly number[]) => readonly number[];
+//#endregion

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

@@ -1,8 +1,7 @@
 import { FlowBlock } from "../../layout-engine/types.js";
 //#region src/layout-bridge/convert/flowBlockPostprocessing.d.ts
-declare function suppressFinalEmptyParagraphAfterTable(blocks: FlowBlock[]): void;
-declare function suppressFinalParagraphInRepeatedEmptySuffix(blocks: FlowBlock[]): void;
-declare function reserveLeadingEmptyOutlineHeight(blocks: FlowBlock[]): void;
-declare function mergeRunInParagraphs(blocks: FlowBlock[]): FlowBlock[];
-//#endregion
-export { mergeRunInParagraphs, reserveLeadingEmptyOutlineHeight, suppressFinalEmptyParagraphAfterTable, suppressFinalParagraphInRepeatedEmptySuffix };
+export declare function suppressFinalEmptyParagraphAfterTable(blocks: FlowBlock[]): void;
+export declare function suppressFinalParagraphInRepeatedEmptySuffix(blocks: FlowBlock[]): void;
+export declare function reserveLeadingEmptyOutlineHeight(blocks: FlowBlock[]): void;
+export declare function mergeRunInParagraphs(blocks: FlowBlock[]): FlowBlock[];
+//#endregion

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

@@ -2,7 +2,7 @@ import { document_d_exports } from "../../types/document.js";
 import { BorderStyle } from "../../layout-engine/types.js";
 //#region src/layout-bridge/convert/flowBorders.d.ts
 /** A parsed border, or the same shape read off ProseMirror attributes. */
-type ConvertibleBorder = {
+export type ConvertibleBorder = {
   style?: document_d_exports.BorderStyleValue;
   size?: number;
   space?: number;
@@ -12,6 +12,5 @@ type ConvertibleBorder = {
  * Convert an OOXML BorderSpec to a layout-engine BorderStyle.
  * Shared by paragraph borders, cell borders, and header/footer borders.
  */
-declare function convertBorderSpecToLayout(border: ConvertibleBorder, theme?: document_d_exports.Theme | null): BorderStyle | undefined;
-//#endregion
-export { ConvertibleBorder, convertBorderSpecToLayout };
+export declare function convertBorderSpecToLayout(border: ConvertibleBorder, theme?: document_d_exports.Theme | null): BorderStyle | undefined;
+//#endregion

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

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../../types/document.js";
 import { RunStyleResolver } from "../../prosemirror/runStyleFormatting.js";
 import { ListCounterStreams } from "../../prosemirror/listMarker.js";
+import { DocumentFontFacts } from "../../fonts/documentFontFacts.js";
 import { ParagraphAttrs, ParagraphBlock, TableBlock } from "../../layout-engine/types.js";
 import { FontAlternates } from "../../fonts/fontAlternates.js";
 import { Node } from "prosemirror-model";
@@ -8,11 +9,13 @@ import { Node } from "prosemirror-model";
 /**
  * Options for the conversion.
  */
-type ToFlowBlocksOptions = {
+export type ToFlowBlocksOptions = {
   /** Paint comment anchors and highlights; false leaves authored marks intact. */
   showCommentHighlights?: boolean;
   /** Embedded families owned by this editor, never ambient process state. */
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
+  /** Authored font-table facts owned by this document. */
+  documentFontFacts?: DocumentFontFacts;
   /** Default font family. */
   defaultFont?: string;
   /** Default font size in points. */
@@ -92,7 +95,7 @@ type ToFlowBlocksOptions = {
    */
   trailingEndnoteIds?: ReadonlySet<number>;
 };
-type FlowConversionOptions = ToFlowBlocksOptions & {
+export type FlowConversionOptions = ToFlowBlocksOptions & {
   firstPageBreakRunPosition: (node: Node) => number | undefined;
   /** `w:doNotUseIndentAsNumberingTabStop`, read from the document node. */
   numberingTabIgnoresIndent: boolean;
@@ -105,11 +108,10 @@ type FlowConversionOptions = ToFlowBlocksOptions & {
  * Convert twips to pixels (1 twip = 1/1440 inch, 1 inch = 96 CSS px).
  * No rounding — precision prevents cumulative layout drift across paragraphs.
  */
-declare function twipsToPixels(twips: number): number;
-declare function nextBlockId(): string;
+export declare function twipsToPixels(twips: number): number;
+export declare function nextBlockId(): string;
 /**
  * Reset the block ID counter (useful for testing).
  */
-declare function resetBlockIdCounter(): void;
-//#endregion
-export { FlowConversionOptions, ToFlowBlocksOptions, nextBlockId, resetBlockIdCounter, twipsToPixels };
+export declare function resetBlockIdCounter(): void;
+//#endregion

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

@@ -4,8 +4,8 @@ import { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_S
 import { ToFlowBlocksOptions } from "./flowConversionShared.js";
 import "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.d.ts
-type MeasureBlocksFn = (blocks: FlowBlock[], contentWidth: number) => Measure[];
-type ConvertFootnoteOptions = Pick<ToFlowBlocksOptions, "embeddedFontFamilyMap"> & {
+export type MeasureBlocksFn = (blocks: FlowBlock[], contentWidth: number) => Measure[];
+export type ConvertFootnoteOptions = Pick<ToFlowBlocksOptions, "embeddedFontFamilyMap" | "documentFontFacts"> & {
   /** Whether comment highlights are painted. Defaults to true. */
   showCommentHighlights?: boolean;
   markupView?: DisplayMode;
@@ -38,7 +38,7 @@ type ConvertFootnoteOptions = Pick<ToFlowBlocksOptions, "embeddedFontFamilyMap">
  * render inside the body but never get an entry in the per-page footnote
  * area.
  */
-declare function collectFootnoteRefs(blocks: FlowBlock[]): {
+export declare function collectFootnoteRefs(blocks: FlowBlock[]): {
   footnoteId: number;
   pmPos: number;
 }[];
@@ -46,7 +46,7 @@ declare function collectFootnoteRefs(blocks: FlowBlock[]): {
  * Scan FlowBlocks for runs with endnoteRefId set, in document order.
  * Same recursive walk as `collectFootnoteRefs`.
  */
-declare function collectEndnoteRefs(blocks: FlowBlock[]): {
+export declare function collectEndnoteRefs(blocks: FlowBlock[]): {
   endnoteId: number;
   pmPos: number;
 }[];
@@ -61,8 +61,8 @@ type NumberableNote = {
  * `normal` notes are numbered; separator/continuation notes and refs to
  * missing notes consume no number.
  */
-declare function computeNoteDisplayNumbers(notes: readonly NumberableNote[], refNoteIds: readonly number[]): Map<number, number>;
-type NoteDisplayNumberMaps = {
+export declare function computeNoteDisplayNumbers(notes: readonly NumberableNote[], refNoteIds: readonly number[]): Map<number, number>;
+export type NoteDisplayNumberMaps = {
   /** footnote `w:id` → sequential display number */
   footnoteNumbers?: ReadonlyMap<number, number>;
   /** endnote `w:id` → formatted display text */
@@ -79,14 +79,14 @@ type NoteDisplayNumberMaps = {
  * so click-to-position still resolves into the marker (same contract as the
  * template preview substitution).
  */
-declare function remapNoteMarkerText(blocks: FlowBlock[], maps: NoteDisplayNumberMaps): FlowBlock[];
+export declare function remapNoteMarkerText(blocks: FlowBlock[], maps: NoteDisplayNumberMaps): FlowBlock[];
 /**
  * After layout, determine which footnotes appear on which pages.
  * Checks each page's fragments to see if any footnoteRef PM positions fall within.
  *
  * Returns Map<pageNumber, footnoteId[]> in document order.
  */
-declare function mapFootnotesToPages(pages: Page[], footnoteRefs: {
+export declare function mapFootnotesToPages(pages: Page[], footnoteRefs: {
   footnoteId: number;
   pmPos: number;
 }[]): Map<number, number[]>;
@@ -94,31 +94,31 @@ declare function mapFootnotesToPages(pages: Page[], footnoteRefs: {
  * Convert a Footnote's content paragraphs to FlowBlocks suitable for rendering.
  * Prepends the display number to the first run of the first paragraph.
  */
-declare function convertFootnoteToContent(footnote: document_d_exports.Footnote | document_d_exports.Endnote, displayNumber: number, contentWidth: number, options?: ConvertFootnoteOptions): FootnoteContent;
+export declare function convertFootnoteToContent(footnote: document_d_exports.Footnote | document_d_exports.Endnote, displayNumber: number, contentWidth: number, options?: ConvertFootnoteOptions): FootnoteContent;
 /**
  * A note story's content as flow blocks, through the same projection and
  * conversion a note's text takes. `referenceMarkText` is what the story's own
  * `w:footnoteRef`/`w:endnoteRef` mark shows; a story without one (a separator
  * story) is converted as authored.
  */
-declare function convertNoteStoryToFlowBlocks(content: document_d_exports.Footnote["content"], options: ConvertFootnoteOptions, referenceMarkText?: string): {
+export declare function convertNoteStoryToFlowBlocks(content: document_d_exports.Footnote["content"], options: ConvertFootnoteOptions, referenceMarkText?: string): {
   flowBlocks: FlowBlock[];
   hasReferenceMark: boolean;
 };
-declare function applyFootnotePresentation(blocks: FlowBlock[], displayNumber: number | string): FlowBlock[];
+export declare function applyFootnotePresentation(blocks: FlowBlock[], displayNumber: number | string): FlowBlock[];
 /**
  * Build footnote content for all footnotes referenced in the document.
  * Returns a Map<footnoteId, FootnoteContent>.
  */
-declare function buildFootnoteContentMap(footnotes: document_d_exports.Footnote[], footnoteRefs: {
+export declare function buildFootnoteContentMap(footnotes: document_d_exports.Footnote[], footnoteRefs: {
   footnoteId: number;
 }[], contentWidth: number, options?: ConvertFootnoteOptions): Map<number, FootnoteContent>;
 /**
  * Calculate per-page footnote reserved heights.
  * Returns Map<pageNumber, reservedHeight>.
  */
-declare function calculateFootnoteReservedHeights(pageFootnoteMap: Map<number, number[]>, footnoteContentMap: Map<number, {
+export declare function calculateFootnoteReservedHeights(pageFootnoteMap: Map<number, number[]>, footnoteContentMap: Map<number, {
   height: number;
 }>): Map<number, number>;
 //#endregion
-export { ConvertFootnoteOptions, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, MeasureBlocksFn, NoteDisplayNumberMaps, applyFootnotePresentation, buildFootnoteContentMap, calculateFootnoteReservedHeights, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, convertFootnoteToContent, convertNoteStoryToFlowBlocks, mapFootnotesToPages, remapNoteMarkerText };
+export { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT };

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

@@ -7,6 +7,13 @@ import { remapMarkupViewBlocks } from "./markupViewFlow.js";
 import { collectNoteRefs } from "./noteReferences.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.ts
+/**
+* Footnote Layout Utilities
+*
+* Handles scanning for footnote references, mapping them to pages,
+* converting footnote content to measurable FlowBlocks, and computing
+* per-page footnote area heights for layout space reservation.
+*/
 /** Default footnote font size in points */
 const FOOTNOTE_FONT_SIZE = 8;
 /**
@@ -211,6 +218,7 @@ function convertNoteStoryToFlowBlocks(content, options, referenceMarkText) {
 	if (options.styles) flowOptions.styles = options.styles;
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
 	if (options.embeddedFontFamilyMap !== void 0) flowOptions.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
+	if (options.documentFontFacts !== void 0) flowOptions.documentFontFacts = options.documentFontFacts;
 	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
@@ -405,6 +413,8 @@ function createFootnoteNumberRun(displayNumber, paragraph) {
 	};
 	const embeddedFontFamilyMap = firstFormattedRun?.embeddedFontFamilyMap ?? paragraph.attrs?.embeddedFontFamilyMap;
 	if (embeddedFontFamilyMap) numberRun.embeddedFontFamilyMap = embeddedFontFamilyMap;
+	const documentFontFacts = firstFormattedRun?.documentFontFacts ?? paragraph.attrs?.documentFontFacts;
+	if (documentFontFacts !== void 0) numberRun.documentFontFacts = documentFontFacts;
 	const fontFamily = firstFormattedRun?.fontFamily ?? paragraph.attrs?.defaultFontFamily;
 	if (fontFamily) numberRun.fontFamily = fontFamily;
 	const alternateFontFamily = firstFormattedRun?.fontFamily !== void 0 ? firstFormattedRun.alternateFontFamily : paragraph.attrs?.defaultAlternateFontFamily;