@stll/folio-core 0.62.0 → 0.63.1

package/dist/controller/fontReadiness.js

@@ -1,4 +1,5 @@
 import { blockPlainText } from "../docx/blockPlainText.js";
+import { buildDocumentFontFacts } from "../fonts/documentFontFacts.js";
 import { buildFontAlternates, getFontAlternate } from "../fonts/fontAlternates.js";
 import { DEFAULT_FONT_FAMILY, isLayoutFontFamily } from "../layout-engine/measure/measureHelpers.js";
 import { expectFontFamilyMarkAttrs, expectParagraphAttrs } from "../prosemirror/attrs/index.js";
@@ -143,32 +144,92 @@ function collectInitialLayoutFontFamilies(documentModel, pmDoc) {
 }
 function collectInitialLayoutFontFaces(documentModel, pmDoc) {
 	const faces = /* @__PURE__ */ new Map();
-	const fontAlternates = buildFontAlternates(documentModel?.package.fontTable);
-	addLayoutFontFamilyFace(faces, DEFAULT_FONT_FAMILY, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
-	for (const family of documentModel?.requiredFonts ?? []) addLayoutFontFamilyFace(faces, family, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
-	addLayoutFontFamilyFace(faces, documentModel?.package.theme?.fontScheme?.majorFont?.latin, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
-	addLayoutFontFamilyFace(faces, documentModel?.package.theme?.fontScheme?.minorFont?.latin, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
-	addTextFormattingFontFaces(faces, documentModel?.package.styles?.docDefaults?.rPr, fontAlternates);
-	for (const style of documentModel?.package.styles?.styles ?? []) addTextFormattingFontFaces(faces, style.rPr, fontAlternates);
-	collectProseMirrorFontFaces(faces, pmDoc, void 0, fontAlternates);
+	const resolution = {
+		fontAlternates: buildFontAlternates(documentModel?.package.fontTable),
+		documentFontFacts: buildDocumentFontFacts(documentModel?.package.fontTable)
+	};
+	addLayoutFontFamilyFace({
+		faces,
+		value: DEFAULT_FONT_FAMILY,
+		descriptor: REGULAR_LAYOUT_FONT_DESCRIPTOR,
+		...resolution
+	});
+	for (const family of documentModel?.requiredFonts ?? []) addLayoutFontFamilyFace({
+		faces,
+		value: family,
+		descriptor: REGULAR_LAYOUT_FONT_DESCRIPTOR,
+		...resolution
+	});
+	addLayoutFontFamilyFace({
+		faces,
+		value: documentModel?.package.theme?.fontScheme?.majorFont?.latin,
+		descriptor: REGULAR_LAYOUT_FONT_DESCRIPTOR,
+		...resolution
+	});
+	addLayoutFontFamilyFace({
+		faces,
+		value: documentModel?.package.theme?.fontScheme?.minorFont?.latin,
+		descriptor: REGULAR_LAYOUT_FONT_DESCRIPTOR,
+		...resolution
+	});
+	addTextFormattingFontFaces({
+		faces,
+		formatting: documentModel?.package.styles?.docDefaults?.rPr,
+		resolution
+	});
+	for (const style of documentModel?.package.styles?.styles ?? []) addTextFormattingFontFaces({
+		faces,
+		formatting: style.rPr,
+		resolution
+	});
+	collectProseMirrorFontFaces({
+		faces,
+		node: pmDoc,
+		inheritedTextFormatting: void 0,
+		resolution
+	});
 	return Array.from(faces.values());
 }
-function addTextFormattingFontFaces(faces, formatting, fontAlternates) {
+function addTextFormattingFontFaces({ faces, formatting, resolution }) {
 	const standardDescriptor = layoutDescriptorFromFormatting(formatting);
 	const complexScriptDescriptor = layoutDescriptorFromEmphasis(formatting?.boldCs ?? formatting?.bold, formatting?.italicCs ?? formatting?.italic);
-	addLayoutFontFamilyFace(faces, formatting?.fontFamily, standardDescriptor, fontAlternates, complexScriptDescriptor);
+	addLayoutFontFamilyFace({
+		faces,
+		value: formatting?.fontFamily,
+		descriptor: standardDescriptor,
+		...resolution,
+		complexScriptDescriptor
+	});
 }
-function collectProseMirrorFontFaces(faces, node, inheritedTextFormatting, fontAlternates) {
+function collectProseMirrorFontFaces({ faces, node, inheritedTextFormatting, resolution }) {
 	const paragraphDefaults = readParagraphDefaultTextFormatting(node);
 	const textFormatting = paragraphDefaults ?? inheritedTextFormatting;
-	if (paragraphDefaults) addTextFormattingFontFaces(faces, paragraphDefaults, fontAlternates);
-	if (node.type.name === "paragraph") addTextFormattingFontFaces(faces, expectParagraphAttrs(node).listMarkerFormatting, fontAlternates);
+	if (paragraphDefaults) addTextFormattingFontFaces({
+		faces,
+		formatting: paragraphDefaults,
+		resolution
+	});
+	if (node.type.name === "paragraph") addTextFormattingFontFaces({
+		faces,
+		formatting: expectParagraphAttrs(node).listMarkerFormatting,
+		resolution
+	});
 	if (node.isText) {
 		const descriptor = layoutDescriptorFromFormattingAndMarks(textFormatting, node.marks);
-		addLayoutFontFamilyFace(faces, readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? "Times New Roman", descriptor, fontAlternates);
+		addLayoutFontFamilyFace({
+			faces,
+			value: readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? "Times New Roman",
+			descriptor,
+			...resolution
+		});
 	}
 	node.forEach((child) => {
-		collectProseMirrorFontFaces(faces, child, textFormatting, fontAlternates);
+		collectProseMirrorFontFaces({
+			faces,
+			node: child,
+			inheritedTextFormatting: textFormatting,
+			resolution
+		});
 	});
 }
 function readParagraphDefaultTextFormatting(node) {
@@ -200,34 +261,65 @@ function layoutDescriptorFromFormattingAndMarks(formatting, marks) {
 		weight: bold ? 700 : 400
 	};
 }
-function addLayoutFontFamilyFace(faces, value, descriptor, fontAlternates, complexScriptDescriptor = descriptor) {
+function addLayoutFontFamilyFace({ faces, value, descriptor, fontAlternates, documentFontFacts, complexScriptDescriptor = descriptor }) {
 	if (typeof value === "string") {
-		addLayoutFontFamilyNameFace(faces, value, descriptor, fontAlternates);
+		addLayoutFontFamilyNameFace({
+			faces,
+			family: value,
+			descriptor,
+			fontAlternates,
+			documentFontFacts
+		});
 		return;
 	}
 	if (!value || typeof value !== "object") return;
 	const fontFamily = value;
-	addLayoutFontFamilyFace(faces, fontFamily.ascii, descriptor, fontAlternates);
-	addLayoutFontFamilyFace(faces, fontFamily.hAnsi, descriptor, fontAlternates);
-	addLayoutFontFamilyFace(faces, fontFamily.cs, complexScriptDescriptor, fontAlternates);
-	addLayoutFontFamilyFace(faces, fontFamily.eastAsia, descriptor, fontAlternates);
+	addLayoutFontFamilyFace({
+		faces,
+		value: fontFamily.ascii,
+		descriptor,
+		fontAlternates,
+		documentFontFacts
+	});
+	addLayoutFontFamilyFace({
+		faces,
+		value: fontFamily.hAnsi,
+		descriptor,
+		fontAlternates,
+		documentFontFacts
+	});
+	addLayoutFontFamilyFace({
+		faces,
+		value: fontFamily.cs,
+		descriptor: complexScriptDescriptor,
+		fontAlternates,
+		documentFontFacts
+	});
+	addLayoutFontFamilyFace({
+		faces,
+		value: fontFamily.eastAsia,
+		descriptor,
+		fontAlternates,
+		documentFontFacts
+	});
 }
-function addLayoutFontFamilyNameFace(faces, family, descriptor, fontAlternates) {
+function addLayoutFontFamilyNameFace({ faces, family, descriptor, fontAlternates, documentFontFacts }) {
 	const normalized = family.trim();
 	if (!normalized || CSS_GENERIC_FONT_FAMILIES.has(normalized)) return;
 	addLayoutFontFace(faces, normalized, descriptor);
 	const alternate = getFontAlternate(normalized, fontAlternates);
 	if (alternate) addLayoutFontFace(faces, alternate, descriptor);
-	for (const stackFamily of resolvedStackFamilies(normalized, alternate)) addLayoutFontFace(faces, stackFamily, descriptor);
+	for (const stackFamily of resolvedStackFamilies({
+		family: normalized,
+		alternate,
+		documentFontFacts
+	})) addLayoutFontFace(faces, stackFamily, descriptor);
 }
-/**
-* The concrete families in a resolved CSS font stack, generics dropped.
-*
-* Parsed from the stack rather than read from a map because the stack is what
-* the painter and the measurer put in `ctx.font` and `style.fontFamily`.
-*/
-function resolvedStackFamilies(family, alternate) {
-	const { cssFallback } = resolveFontFamily(family, { alternateFontName: alternate });
+function resolvedStackFamilies({ family, alternate, documentFontFacts }) {
+	const { cssFallback } = resolveFontFamily(family, {
+		alternateFontName: alternate,
+		documentFontFacts
+	});
 	return parseFontFamilyList(cssFallback).filter((name) => !CSS_GENERIC_FONT_FAMILIES.has(name));
 }
 function addLayoutFontFace(faces, family, descriptor) {

package/dist/controller/headerFooterEditorManager.d.ts

@@ -3,19 +3,19 @@ import { CanonicalGap } from "../types/canonicalCapabilities.js";
 import { HiddenEditorApi } from "./hiddenEditorApi.js";
 import { DirectEditorProps, EditorView } from "prosemirror-view";
 //#region src/controller/headerFooterEditorManager.d.ts
-type HeaderFooterPartKind = "header" | "footer";
-type HeaderFooterPartKey = {
+export type HeaderFooterPartKind = "header" | "footer";
+export type HeaderFooterPartKey = {
   kind: HeaderFooterPartKind;
   rId: string;
 };
-type HeaderFooterEditorTransaction = {
+export type HeaderFooterEditorTransaction = {
   docChanged: boolean;
   kind: HeaderFooterPartKind;
   rId: string;
   selectionChanged: boolean;
   view: EditorView;
 };
-type HeaderFooterEditorManagerDeps = {
+export type HeaderFooterEditorManagerDeps = {
   createView?: ((mountNode: HTMLElement, props: DirectEditorProps) => EditorView) | undefined;
   getDocument: () => document_d_exports.Document | null;
   getReadOnly?: (() => boolean) | undefined;
@@ -27,18 +27,17 @@ type HeaderFooterEditorManagerDeps = {
   getTheme: () => document_d_exports.Theme | null | undefined;
   onTransaction?: ((transaction: HeaderFooterEditorTransaction) => void) | undefined;
 };
-type HeaderFooterEditorManager = {
+export type HeaderFooterEditorManager = {
   destroy: () => void;
   getView: (rId: string) => EditorView | null;
   listSlots: () => HeaderFooterPartKey[];
   snapshotDocument: (document: document_d_exports.Document) => document_d_exports.Document;
   sync: () => void;
 };
-declare const enumerateHeaderFooterParts: ({ headers, footers }: {
+export declare const enumerateHeaderFooterParts: ({ headers, footers }: {
   headers: Map<string, document_d_exports.HeaderFooter> | undefined;
   footers: Map<string, document_d_exports.HeaderFooter> | undefined;
 }) => HeaderFooterPartKey[];
-declare const enumerateDocumentHeaderFooterParts: (document: document_d_exports.Document | null) => HeaderFooterPartKey[];
-declare const createHeaderFooterEditorManager: (deps: HeaderFooterEditorManagerDeps) => HeaderFooterEditorManager;
-//#endregion
-export { HeaderFooterEditorManager, HeaderFooterEditorManagerDeps, HeaderFooterEditorTransaction, HeaderFooterPartKey, HeaderFooterPartKind, createHeaderFooterEditorManager, enumerateDocumentHeaderFooterParts, enumerateHeaderFooterParts };
+export declare const enumerateDocumentHeaderFooterParts: (document: document_d_exports.Document | null) => HeaderFooterPartKey[];
+export declare const createHeaderFooterEditorManager: (deps: HeaderFooterEditorManagerDeps) => HeaderFooterEditorManager;
+//#endregion

package/dist/controller/headerFooterEditorManager.js

@@ -18,23 +18,16 @@ import { OP_STORIES } from "@stll/docx-core/ops";
 import { EditorState, TextSelection } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/controller/headerFooterEditorManager.ts
-/**
-* Framework-neutral lifecycle owner for persistent header/footer EditorViews.
-*
-* Each distinct relationship id owns one off-screen ProseMirror view. Painted
-* header/footer instances that share that relationship therefore share live
-* editor state, and adapters only decide when to synchronize or destroy the
-* manager.
-*/
 const createEditorView = (mountNode, props) => new EditorView(mountNode, props);
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const headerFooterToProseDocWithDetachedWatermarkHost = (headerFooter, options) => {
-	return headerFooterToProseDoc(headerFooter.content.map((block, blockIndex) => {
+	const markedContent = headerFooter.content.map((block, blockIndex) => {
 		if (blockIndex !== headerFooter.watermarkBlockIndex || block.type !== "paragraph") return block;
 		const marked = cloneParagraphWithPropertySource(block, {});
 		Reflect.set(marked, DETACHED_WATERMARK_HOST, true);
 		return marked;
-	}), options);
+	});
+	return headerFooterToProseDoc(markedContent, options);
 };
 const buildInitialState = (headerFooter, styles, theme, numbering, manager) => {
 	const proseDocOptions = {};

package/dist/controller/hiddenEditorApi.d.ts

@@ -5,8 +5,8 @@ import { CanonicalSaveSnapshot } from "../types/canonicalSave.js";
 import { CanonicalSessionMode } from "./canonicalSession.js";
 import { createCanonicalInputBoundary } from "./canonicalInput.js";
 import { CanonicalPublicOperationOptions } from "./canonicalPublicOperations.js";
-import { CanonicalSectionPropertiesResult } from "../types/canonicalSections.js";
 import { CanonicalCommentRequest, CanonicalCommentResult } from "../types/canonicalComments.js";
+import { CanonicalSectionPropertiesResult } from "../types/canonicalSections.js";
 import { Node } from "prosemirror-model";
 import { Command, EditorState, Transaction } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
@@ -22,7 +22,7 @@ type CanonicalStoryTextOptions = {
   story: OpStory;
   intent: Parameters<Parameters<typeof createCanonicalInputBoundary>[0]["replace"]>[0];
 };
-type HiddenEditorApi = {
+export type HiddenEditorApi = {
   /** Request the off-screen EditorView (idempotent; creates it when possible). */
   ensureView: () => void;
   /** Whether view creation has been requested. */
@@ -86,7 +86,7 @@ type HiddenEditorApi = {
   /** Scroll the PM view to selection (no-op since hidden) */
   scrollToSelection: () => void;
 };
-type HiddenEditorApiDeps = {
+export type HiddenEditorApiDeps = {
   getView: () => EditorView | null;
   getDocumentContext: () => document_d_exports.Document | null;
   getCanonicalComments?: () => Comment[] | null;
@@ -103,6 +103,6 @@ type HiddenEditorApiDeps = {
   ensureView: () => void;
   isViewRequested: () => boolean;
 };
-declare const createHiddenEditorApi: (deps: HiddenEditorApiDeps) => HiddenEditorApi;
+export declare const createHiddenEditorApi: (deps: HiddenEditorApiDeps) => HiddenEditorApi;
 //#endregion
-export { HiddenEditorApi, HiddenEditorApiDeps, createHiddenEditorApi };
+export {};

package/dist/controller/hiddenEditorManager.d.ts

@@ -6,19 +6,20 @@ import { HiddenEditorStateReason } from "../layout-engine/layoutInstrumentation.
 import { ExtensionManager } from "../prosemirror/extensions/ExtensionManager.js";
 import { RemoteSelection } from "../types/remote-selection.js";
 import { EditorState, Plugin, Transaction } from "prosemirror-state";
+import { TaggedErrorClass } from "better-result";
 import { EditorView } from "prosemirror-view";
 import * as Yjs from "yjs";
 import { XmlFragment } from "yjs";
 import * as YProseMirror from "y-prosemirror";
 //#region src/controller/hiddenEditorManager.d.ts
-declare const CanonicalSessionRefusalError_base: import("better-result").TaggedErrorClass<"CanonicalSessionRefusalError">;
-declare class CanonicalSessionRefusalError extends CanonicalSessionRefusalError_base<{
+declare const CanonicalSessionRefusalErrorBase: TaggedErrorClass<"CanonicalSessionRefusalError">;
+export declare class CanonicalSessionRefusalError extends CanonicalSessionRefusalErrorBase<{
   gap: CanonicalGap;
   message: string;
 }> {}
 type YProseMirrorModule = typeof YProseMirror;
 type YjsModule = typeof Yjs;
-type CollaborationModules = {
+export type CollaborationModules = {
   yProseMirror: YProseMirrorModule;
   yjs: YjsModule;
 };
@@ -28,21 +29,21 @@ type CollaborationAwareness = {
   off: (event: "change" | "update", handler: () => void) => void;
   on: (event: "change" | "update", handler: () => void) => void;
 };
-type HiddenProseMirrorCollaboration = {
+export type HiddenProseMirrorCollaboration = {
   awareness?: CollaborationAwareness | undefined;
   onSeeded?: (() => void) | undefined;
   shouldSeed?: boolean | undefined;
   yXmlFragment: XmlFragment;
 };
-type HiddenProseMirrorRemoteSelection = RemoteSelection;
-declare const collectRemoteSelections: (state: EditorState, awareness: CollaborationAwareness, collaborationModules: CollaborationModules) => HiddenProseMirrorRemoteSelection[];
+export type HiddenProseMirrorRemoteSelection = RemoteSelection;
+export declare const collectRemoteSelections: (state: EditorState, awareness: CollaborationAwareness, collaborationModules: CollaborationModules) => HiddenProseMirrorRemoteSelection[];
 /**
  * Create ProseMirror state from document
  *
  * When an ExtensionManager is provided, it supplies the schema and plugins.
  * Otherwise falls back to the default singleton schema with no extension plugins.
  */
-type CreateHiddenEditorStateOptions = {
+export type CreateHiddenEditorStateOptions = {
   document: document_d_exports.Document | null;
   styles?: document_d_exports.StyleDefinitions | null | undefined;
   manager?: ExtensionManager | undefined;
@@ -51,8 +52,8 @@ type CreateHiddenEditorStateOptions = {
   collaborationModules?: CollaborationModules | null | undefined;
   reason?: HiddenEditorStateReason | undefined;
 };
-declare function createHiddenEditorState(options: CreateHiddenEditorStateOptions): EditorState;
-type HiddenEditorManagerDeps = {
+export declare function createHiddenEditorState(options: CreateHiddenEditorStateOptions): EditorState;
+export type HiddenEditorManagerDeps = {
   getHost: () => HTMLElement | null;
   getDocument: () => document_d_exports.Document | null;
   getStyles: () => document_d_exports.StyleDefinitions | null | undefined;
@@ -85,7 +86,7 @@ type HiddenEditorManagerDeps = {
   onEditorViewDestroy: () => void;
   onRemoteSelectionsChange: (selections: HiddenProseMirrorRemoteSelection[]) => void;
 };
-type HiddenEditorTransactionUpdate = {
+export type HiddenEditorTransactionUpdate = {
   transactions: readonly Transaction[];
   newState: EditorState;
   docChanged: boolean;
@@ -93,12 +94,12 @@ type HiddenEditorTransactionUpdate = {
 type PreventableDomEvent = {
   preventDefault: () => void;
 };
-declare const createHiddenEditorClipboardHandlers: (deps: Pick<HiddenEditorManagerDeps, "getReadOnly" | "onCopy" | "onCut" | "onPaste" | "onReadOnlyEditAttempt">) => {
+export declare const createHiddenEditorClipboardHandlers: (deps: Pick<HiddenEditorManagerDeps, "getReadOnly" | "onCopy" | "onCut" | "onPaste" | "onReadOnlyEditAttempt">) => {
   copy: () => boolean;
   cut: (_view: unknown, event: PreventableDomEvent) => boolean;
   paste: (_view: unknown, event: PreventableDomEvent) => boolean;
 };
-type HiddenEditorManager = {
+export type HiddenEditorManager = {
   /** Whether the canonical owner still holds a provisional composition. */
   isCanonicalComposing: () => boolean;
   /** Request the view (sets the requested flag, then attempts creation). */
@@ -113,6 +114,6 @@ type HiddenEditorManager = {
   isInitialized: () => boolean;
   api: HiddenEditorApi;
 };
-declare const createHiddenEditorManager: (deps: HiddenEditorManagerDeps) => HiddenEditorManager;
+export declare const createHiddenEditorManager: (deps: HiddenEditorManagerDeps) => HiddenEditorManager;
 //#endregion
-export { CanonicalSessionRefusalError, CollaborationModules, CreateHiddenEditorStateOptions, HiddenEditorManager, HiddenEditorManagerDeps, HiddenEditorTransactionUpdate, HiddenProseMirrorCollaboration, HiddenProseMirrorRemoteSelection, collectRemoteSelections, createHiddenEditorClipboardHandlers, createHiddenEditorManager, createHiddenEditorState };
+export {};

package/dist/controller/hiddenEditorManager.js

@@ -27,12 +27,14 @@ import { restoreCanonicalSelection } from "./canonicalSelection.js";
 import { createCanonicalSession, publishCanonicalProjection } from "./canonicalSession.js";
 import { prepareCanonicalAutoformat, prepareCanonicalCommands } from "./canonicalStructure.js";
 import { createHiddenEditorApi } from "./hiddenEditorApi.js";
+import { handleReadOnlySelectionKeyDown } from "./readOnlySelection.js";
 import { Result, TaggedError, panic } from "better-result";
 import { OP_STORIES, freshCommentId } from "@stll/docx-core/ops";
 import { EditorState, Plugin } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/controller/hiddenEditorManager.ts
-var CanonicalSessionRefusalError = class extends TaggedError("CanonicalSessionRefusalError") {};
+const CanonicalSessionRefusalErrorBase = TaggedError("CanonicalSessionRefusalError");
+var CanonicalSessionRefusalError = class extends CanonicalSessionRefusalErrorBase {};
 const normalizeSeedState = (state) => ensureBaseDirectionInState(ensureParaIdsInState(state));
 const normalizeLocalSeedState = (state) => ensureBaseDirectionInState(state);
 const isObjectRecord = (value) => typeof value === "object" && value !== null;
@@ -612,6 +614,7 @@ const createHiddenEditorManager = (deps) => {
 				if (currentCollaboration?.awareness && currentCollaborationModules) deps.onRemoteSelectionsChange(collectRemoteSelections(applied.state, currentCollaboration.awareness, currentCollaborationModules));
 			},
 			handleKeyDown: (pmView, event) => {
+				if (deps.getReadOnly() && handleReadOnlySelectionKeyDown(pmView, event)) return true;
 				if (deps.getReadOnly() && isReadOnlyEditKey(event)) {
 					deps.onReadOnlyEditAttempt();
 					event.preventDefault();

package/dist/controller/hyphenationReadiness.d.ts

@@ -1,6 +1,6 @@
 import { HyphenationDictionaryError, HyphenationDictionaryId } from "../layout-engine/measure/hyphenationDictionaries.js";
 //#region src/controller/hyphenationReadiness.d.ts
-type HyphenationReadiness = {
+export type HyphenationReadiness = {
   /** Follow up on the dictionaries one layout run lacked. */
   track: (missing: ReadonlySet<HyphenationDictionaryId>) => void;
   /**
@@ -10,10 +10,9 @@ type HyphenationReadiness = {
    */
   cancel: () => void;
 };
-type HyphenationReadinessOptions = {
+export type HyphenationReadinessOptions = {
   relayout: () => void;
   onError: (error: HyphenationDictionaryError) => void;
 };
-declare const createHyphenationReadiness: ({ relayout, onError }: HyphenationReadinessOptions) => HyphenationReadiness;
-//#endregion
-export { HyphenationReadiness, HyphenationReadinessOptions, createHyphenationReadiness };
+export declare const createHyphenationReadiness: ({ relayout, onError }: HyphenationReadinessOptions) => HyphenationReadiness;
+//#endregion

package/dist/controller/hyphenationReadiness.js

@@ -30,7 +30,6 @@ const createHyphenationReadiness = ({ relayout, onError }) => {
 					onError(settled.error);
 				}
 				return;
-			default:
 		}
 	};
 	return {

package/dist/controller/latestRequestGate.d.ts

@@ -4,12 +4,11 @@
  * commit a result. Each guard closes over an opaque identity, so callers
  * cannot accidentally make an older request current again.
  */
-type LatestRequestGate = {
+export type LatestRequestGate = {
   /** Start a request and return a guard that remains true while it is latest. */
   begin: () => () => boolean;
   /** Supersede the current request without starting another one. */
   invalidate: () => void;
 };
-declare const createLatestRequestGate: () => LatestRequestGate;
-//#endregion
-export { LatestRequestGate, createLatestRequestGate };
+export declare const createLatestRequestGate: () => LatestRequestGate;
+//#endregion

package/dist/controller/layoutPipeline.d.ts

@@ -5,21 +5,21 @@ import { ColumnLayout, FlowBlock, FootnoteContent, HeaderFooterContent, Layout,
 import { LayoutRunOptions } from "./layoutRunOptions.js";
 import { LayoutSession } from "./layoutSession.js";
 import { HyphenationReadiness } from "./hyphenationReadiness.js";
-import { ConvertHeaderFooterOptions, HeaderFooterMetrics } from "../layout-bridge/convert/headerFooterLayout.js";
-import "../layout-engine/index.js";
-import { FootnoteRenderItem } from "../layout-painter/renderPage.js";
 import { BlockLookup, LayoutPainter } from "../layout-painter/index.js";
+import { FootnoteRenderItem } from "../layout-painter/renderPage.js";
 import { PageRendererName } from "../display-list/editor/pageRenderer.js";
+import { ConvertHeaderFooterOptions, HeaderFooterMetrics } from "../layout-bridge/convert/headerFooterLayout.js";
+import "../layout-engine/index.js";
 import { LayoutSelectionGate } from "../paged-layout/LayoutSelectionGate.js";
 import { EditorState } from "prosemirror-state";
 //#region src/controller/layoutPipeline.d.ts
-type LayoutOutcome = {
+export type LayoutOutcome = {
   blocks?: FlowBlock[];
   measures?: Measure[];
   layout?: Layout;
   blockLookup?: BlockLookup;
 };
-type LayoutPipelineDeps<THfPMs> = {
+export type LayoutPipelineDeps<THfPMs> = {
   contentWidth: number;
   columns: ColumnLayout | undefined;
   pageSize: {
@@ -82,6 +82,5 @@ type LayoutPipelineDeps<THfPMs> = {
   /** Independent highlight visibility in All Markup; resolved views always hide comments. */
   showCommentHighlights?: boolean;
 };
-declare function runLayoutPipeline<THfPMs>(deps: LayoutPipelineDeps<THfPMs>, state: EditorState, options?: LayoutRunOptions): LayoutOutcome;
-//#endregion
-export { LayoutOutcome, LayoutPipelineDeps, runLayoutPipeline };
+export declare function runLayoutPipeline<THfPMs>(deps: LayoutPipelineDeps<THfPMs>, state: EditorState, options?: LayoutRunOptions): LayoutOutcome;
+//#endregion

package/dist/controller/layoutPipeline.js

@@ -8,6 +8,7 @@ import { buildBookmarkText } from "../fields/bookmarkText.js";
 import { buildHeaderFooterFieldValues, fieldValuesEqual, resolveFieldValues } from "../fields/resolveFieldValues.js";
 import { buildSectionPageCounts } from "../fields/sectionPageCounts.js";
 import { buildSeqValues } from "../fields/seqValues.js";
+import { buildDocumentFontFacts, documentFontFactsCacheIdentity } from "../fonts/documentFontFacts.js";
 import { buildFontAlternates } from "../fonts/fontAlternates.js";
 import { prepareEndnoteAreas, resolveEndnotePosition, spliceEndnoteAreas, trailingEndnoteIds } from "../layout-bridge/convert/endnoteLayout.js";
 import { buildFootnoteContentMap, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, remapNoteMarkerText } from "../layout-bridge/convert/footnoteLayout.js";
@@ -23,6 +24,7 @@ import { labelMeasureCachesFontSet, syncMeasureCachesToFontSet } from "../layout
 import { collectRequestedHyphenationDictionaries } from "../layout-engine/measure/hyphenationDictionaries.js";
 import { measureBlocks, measureSingleBlockWithoutFloatingZones } from "../layout-engine/measure/measureBlocks.js";
 import { installCanvasMeasureProvider, resetCanvasContext } from "../layout-engine/measure/measureContainer.js";
+import { columnBalancingForCompatibility } from "../layout-engine/noColumnBalanceCompatibility.js";
 import { resolveEffectiveParagraphSpacingTree } from "../layout-engine/paragraphSpacing.js";
 import { resolveTableIndentCompatibility } from "../layout-engine/tableIndentCompatibility.js";
 import "../layout-engine/types.js";
@@ -36,13 +38,14 @@ import { templatePreviewValuesKey } from "../prosemirror/plugins/templatePreview
 import { getDocumentWatermark } from "../watermark/index.js";
 import { diffAgainstCommittedLayout } from "./committedLayoutDiff.js";
 import { LAYOUT_MEASURE } from "./layoutRunOptions.js";
+import { survivingComments } from "@stll/docx-core/ops";
 //#region src/controller/layoutPipeline.ts
 const formatEndnoteTexts = (numbers, formatNumber) => {
 	const texts = /* @__PURE__ */ new Map();
 	for (const [id, displayNumber] of numbers) texts.set(id, formatNumber(displayNumber));
 	return texts;
 };
-const sameMeasureInputs = (left, right) => left.embeddedFontFamilyMap === right.embeddedFontFamilyMap && left.styles === right.styles && left.theme === right.theme && left.defaultTabStop === right.defaultTabStop && left.pageContentHeight === right.pageContentHeight && left.fontSet === right.fontSet && left.fontAlternates.size === right.fontAlternates.size && [...left.fontAlternates].every(([name, alternate]) => right.fontAlternates.get(name) === alternate) && left.markupView === right.markupView && left.showCommentHighlights === right.showCommentHighlights;
+const sameMeasureInputs = (left, right) => left.embeddedFontFamilyMap === right.embeddedFontFamilyMap && left.documentFontFactsCacheIdentity === right.documentFontFactsCacheIdentity && left.styles === right.styles && left.theme === right.theme && left.defaultTabStop === right.defaultTabStop && left.pageContentHeight === right.pageContentHeight && left.fontSet === right.fontSet && left.fontAlternates.size === right.fontAlternates.size && [...left.fontAlternates].every(([name, alternate]) => right.fontAlternates.get(name) === alternate) && left.markupView === right.markupView && left.showCommentHighlights === right.showCommentHighlights;
 /**
 * The range an incremental pass re-measures, or `null` for a full measure: the
 * committed measures must come from the same measure inputs, and the range is
@@ -154,10 +157,12 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		let phaseStartedAt = performance.now();
 		const pageContentHeight = pageSize.h - margins.top - margins.bottom;
 		const fontAlternates = buildFontAlternates(document?.package.fontTable);
+		const documentFontFacts = buildDocumentFontFacts(document?.package.fontTable);
 		const displayCommentHighlights = showCommentHighlights && markupView !== "no-markup" && markupView !== "original";
 		const embeddedFontFamilies = session.embeddedFontFamilyMap ? { embeddedFontFamilyMap: session.embeddedFontFamilyMap } : {};
 		const measureInputs = {
 			...embeddedFontFamilies,
+			documentFontFactsCacheIdentity: documentFontFactsCacheIdentity(documentFontFacts),
 			styles,
 			theme: _theme,
 			defaultTabStop,
@@ -170,6 +175,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		const flowOpts = {
 			showCommentHighlights: displayCommentHighlights,
 			...embeddedFontFamilies,
+			...documentFontFacts === void 0 ? {} : { documentFontFacts },
 			pageContentHeight,
 			fontAlternates,
 			...styles ? { styles } : {},
@@ -199,10 +205,11 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		const projection = projectMarkupView(state, markupView);
 		if (projection.type === "resolved" && projection.completeness === "partial") recordMarkupViewIncomplete(markupView);
 		const viewDoc = projection.type === "resolved" ? projection.doc : state.doc;
-		let newBlocks = toFlowBlocks(document === null ? viewDoc.type.create({
+		const flowDoc = document === null ? viewDoc.type.create({
 			...viewDoc.attrs,
 			_finalSectionStart: sectionProperties?.sectionStart ?? null
-		}, viewDoc.content, viewDoc.marks) : viewDoc, flowOpts);
+		}, viewDoc.content, viewDoc.marks) : viewDoc;
+		let newBlocks = toFlowBlocks(flowDoc, flowOpts);
 		if (projection.type === "resolved") newBlocks = remapMarkupViewBlocks(newBlocks, projection);
 		const previewState = templatePreviewValuesKey.getState(state);
 		const previewEntries = previewState?.entries ?? EMPTY_TEMPLATE_PREVIEW_ENTRIES;
@@ -257,6 +264,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 				..._theme !== void 0 ? { theme: _theme } : {},
 				fontAlternates,
 				...embeddedFontFamilies,
+				...flowOpts.documentFontFacts === void 0 ? {} : { documentFontFacts: flowOpts.documentFontFacts },
 				measureBlocks: hfMeasureBlocks,
 				...defaultTabStop !== void 0 ? { defaultTabStopTwips: defaultTabStop } : {},
 				...flowOpts.lineBreakRules ? { lineBreakRules: flowOpts.lineBreakRules } : {},
@@ -394,6 +402,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 			if (document?.package.numbering !== void 0) noteOptions.numbering = document.package.numbering;
 			noteOptions.fontAlternates = fontAlternates;
 			if (session.embeddedFontFamilyMap) noteOptions.embeddedFontFamilyMap = session.embeddedFontFamilyMap;
+			if (flowOpts.documentFontFacts !== void 0) noteOptions.documentFontFacts = flowOpts.documentFontFacts;
 			if (defaultTabStop !== void 0) noteOptions.defaultTabStopTwips = defaultTabStop;
 			if (flowOpts.lineBreakRules) noteOptions.lineBreakRules = flowOpts.lineBreakRules;
 			if (flowOpts.justificationCompatibility) noteOptions.justificationCompatibility = flowOpts.justificationCompatibility;
@@ -428,7 +437,8 @@ function runLayoutPipelineMeasured(deps, state, options) {
 				margins: initialBodyMargins,
 				pageNumbering: bodyLayoutConfig.pageNumbering,
 				pageGap,
-				mirrorMargins
+				mirrorMargins,
+				columnBalancing: columnBalancingForCompatibility(document?.package.settings?.noColumnBalance, document?.package.settings?.compatibilityMode)
 			};
 			if (document?.package.document.sections !== void 0) nextLayoutOpts.sectionVerticalAlignments = document.package.document.sections.map(({ properties }) => properties.verticalAlign);
 			else if (sectionProperties !== null && sectionProperties !== void 0) nextLayoutOpts.sectionVerticalAlignments = [sectionProperties.verticalAlign];
@@ -594,6 +604,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 			const footnotesByPage = hasFootnotes ? buildFootnoteRenderItems(pageFootnoteMap, footnoteContentMap, document) : void 0;
 			const renderOpts = {
 				...embeddedFontFamilies,
+				...documentFontFacts === void 0 ? {} : { documentFontFacts },
 				pageGap,
 				showShadow: true,
 				blockLookup,
@@ -642,7 +653,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 				layout: newLayout,
 				blockLookup,
 				doc: pagesContainer.ownerDocument,
-				...document?.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(document.package.document.comments) },
+				...document?.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(survivingComments(document)) },
 				...displayListFurnitureFrom(renderOpts),
 				...footnoteContentMap.size === 0 ? {} : { footnoteContentById: footnoteContentMap }
 			}).paintPage;

package/dist/controller/layoutRunOptions.d.ts

@@ -10,15 +10,14 @@ import { LayoutRunReason } from "../layout-engine/layoutInstrumentation.js";
  *   never supplies a changed range, so the range cannot be relative to a
  *   document the committed measures did not come from.
  */
-declare const LAYOUT_MEASURE: {
+export declare const LAYOUT_MEASURE: {
   readonly full: "full";
   readonly incremental: "incremental";
 };
-type LayoutMeasure = (typeof LAYOUT_MEASURE)[keyof typeof LAYOUT_MEASURE];
-type LayoutRunOptions = {
+export type LayoutMeasure = (typeof LAYOUT_MEASURE)[keyof typeof LAYOUT_MEASURE];
+export type LayoutRunOptions = {
   /** Defaults to {@link LAYOUT_MEASURE.full}. */
   measure?: LayoutMeasure;
   reason?: LayoutRunReason;
 };
-//#endregion
-export { LAYOUT_MEASURE, LayoutMeasure, LayoutRunOptions };
+//#endregion