@stll/folio-core 0.62.0 → 0.63.1

package/dist/controller/layoutScheduler.d.ts

@@ -1,15 +1,15 @@
 import { LayoutRunOptions } from "./layoutRunOptions.js";
 //#region src/controller/layoutScheduler.d.ts
-type RunLayout<TState> = (state: TState, options: LayoutRunOptions) => void;
-type SchedulerClock = {
+export type RunLayout<TState> = (state: TState, options: LayoutRunOptions) => void;
+export type SchedulerClock = {
   requestFrame: (callback: () => void) => number;
   cancelFrame: (id: number) => void;
   setTimer: (callback: () => void, delayMs: number) => number;
   clearTimer: (id: number) => void;
   now: () => number;
 };
-declare const browserClock: SchedulerClock;
-type LayoutSchedulerConfig<TState> = {
+export declare const browserClock: SchedulerClock;
+export type LayoutSchedulerConfig<TState> = {
   /**
    * The editor's current state, read when a pass runs; `null` (no editor)
    * skips the pass.
@@ -30,12 +30,12 @@ type LayoutSchedulerConfig<TState> = {
   clock: SchedulerClock;
 };
 /** Interactive transaction layout timing shared by framework adapters. */
-declare const TRANSACTION_LAYOUT_TIMING: {
+export declare const TRANSACTION_LAYOUT_TIMING: {
   readonly debounceMs: 32;
   readonly maxDelayMs: 96;
   readonly leadingFrame: true;
 };
-type LayoutScheduler = {
+export type LayoutScheduler = {
   /**
    * Request an incremental layout pass after a short coalescing window.
    * Repeated calls in the window join the pending request, so a typing burst
@@ -45,6 +45,5 @@ type LayoutScheduler = {
   /** Cancel any pending timer/frame. Call on teardown. */
   dispose: () => void;
 };
-declare const createLayoutScheduler: <TState>(config: LayoutSchedulerConfig<TState>) => LayoutScheduler;
-//#endregion
-export { LayoutScheduler, LayoutSchedulerConfig, RunLayout, SchedulerClock, TRANSACTION_LAYOUT_TIMING, browserClock, createLayoutScheduler };
+export declare const createLayoutScheduler: <TState>(config: LayoutSchedulerConfig<TState>) => LayoutScheduler;
+//#endregion

package/dist/controller/layoutSession.d.ts

@@ -5,12 +5,12 @@ import { FlowBlock, Measure } from "../layout-engine/types.js";
 import { FontAlternates } from "../fonts/fontAlternates.js";
 import { EditorState } from "prosemirror-state";
 //#region src/controller/layoutSession.d.ts
-type LayoutArtifacts = {
+export type LayoutArtifacts = {
   blocks: FlowBlock[];
   blockWidths: number[];
   measures: Measure[];
 };
-type LayoutTemplatePreview = {
+export type LayoutTemplatePreview = {
   entries: readonly TemplatePreviewEntry[];
   hidden: readonly TemplatePreviewHiddenRange[];
   mode: TemplatePreviewValues["mode"];
@@ -22,8 +22,9 @@ type LayoutTemplatePreview = {
  * not among them: adapters hand back a new one after every edit, while a load
  * that changes how text measures brings new styles or font alternates.
  */
-type LayoutMeasureInputs = {
+export type LayoutMeasureInputs = {
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
+  documentFontFactsCacheIdentity: string | undefined;
   styles: document_d_exports.StyleDefinitions | null | undefined;
   theme: document_d_exports.Theme | null | undefined;
   defaultTabStop: number | undefined;
@@ -38,7 +39,7 @@ type LayoutMeasureInputs = {
   markupView: DisplayMode;
   showCommentHighlights?: boolean;
 };
-type LayoutSession = {
+export type LayoutSession = {
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   artifacts: LayoutArtifacts | null;
   lastEditorState: EditorState | null;
@@ -46,6 +47,5 @@ type LayoutSession = {
   lastMeasureInputs: LayoutMeasureInputs | null;
   lastTemplatePreview: LayoutTemplatePreview;
 };
-declare const createLayoutSession: () => LayoutSession;
-//#endregion
-export { LayoutArtifacts, LayoutMeasureInputs, LayoutSession, LayoutTemplatePreview, createLayoutSession };
+export declare const createLayoutSession: () => LayoutSession;
+//#endregion

package/dist/controller/noteEditorManager.d.ts

@@ -5,13 +5,13 @@ import { HiddenEditorApi } from "./hiddenEditorApi.js";
 import { Plugin } from "prosemirror-state";
 import { DirectEditorProps, EditorView } from "prosemirror-view";
 //#region src/controller/noteEditorManager.d.ts
-type NoteStoryKind = NoteStoryKey["kind"];
-type NoteEditorTransaction = NoteStoryKey & {
+export type NoteStoryKind = NoteStoryKey["kind"];
+export type NoteEditorTransaction = NoteStoryKey & {
   docChanged: boolean;
   selectionChanged: boolean;
   view: EditorView;
 };
-type NoteEditorManagerDeps = {
+export type NoteEditorManagerDeps = {
   createView?: ((mountNode: HTMLElement, props: DirectEditorProps) => EditorView) | undefined;
   getDocument: () => document_d_exports.Document | null;
   getCanonicalApi?: (() => HiddenEditorApi | null) | undefined;
@@ -23,7 +23,7 @@ type NoteEditorManagerDeps = {
   getTheme: () => document_d_exports.Theme | null | undefined;
   onTransaction?: ((transaction: NoteEditorTransaction) => void) | undefined;
 };
-type NoteEditorManager = {
+export type NoteEditorManager = {
   activate: (story: NoteStoryKey | null) => EditorView | null;
   destroy: () => void;
   getActive: () => NoteStoryKey | null;
@@ -32,7 +32,7 @@ type NoteEditorManager = {
   snapshotDocument: (document: document_d_exports.Document) => document_d_exports.Document;
   sync: () => void;
 };
-declare const enumerateDocumentNoteStories: (document: document_d_exports.Document | null) => NoteStoryKey[];
-declare const createNoteEditorManager: (deps: NoteEditorManagerDeps) => NoteEditorManager;
+export declare const enumerateDocumentNoteStories: (document: document_d_exports.Document | null) => NoteStoryKey[];
+export declare const createNoteEditorManager: (deps: NoteEditorManagerDeps) => NoteEditorManager;
 //#endregion
-export { NoteEditorManager, NoteEditorManagerDeps, NoteEditorTransaction, type NoteStoryKey, NoteStoryKind, createNoteEditorManager, enumerateDocumentNoteStories };
+export type { NoteStoryKey };

package/dist/controller/noteEditorManager.js

@@ -19,7 +19,6 @@ import { OP_STORIES } from "@stll/docx-core/ops";
 import { EditorState, TextSelection } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/controller/noteEditorManager.ts
-/** Framework-neutral lifecycle owner for editable footnote and endnote stories. */
 const createEditorView = (mountNode, props) => new EditorView(mountNode, props);
 const EMPTY_PLUGINS = [];
 const storyMapKey = ({ kind, noteId }) => `${kind}:${String(noteId)}`;

package/dist/controller/readOnlySelection.d.ts

@@ -0,0 +1,12 @@
+import { EditorView } from "prosemirror-view";
+//#region src/controller/readOnlySelection.d.ts
+type ReadOnlySelectionView = Pick<EditorView, "dispatch" | "state">;
+type ReadOnlySelectionKeyEvent = Pick<KeyboardEvent, "altKey" | "ctrlKey" | "key" | "metaKey" | "preventDefault" | "shiftKey">;
+/**
+ * Handle Ctrl/Cmd+A and unmodified horizontal Shift arrows in LTR paragraphs.
+ * Word/document navigation, vertical movement, and RTL visual arrows stay
+ * native because this helper does not model their platform-specific semantics.
+ */
+export declare const handleReadOnlySelectionKeyDown: (view: ReadOnlySelectionView, event: ReadOnlySelectionKeyEvent) => boolean;
+//#endregion
+export {};

package/dist/controller/readOnlySelection.js

@@ -0,0 +1,62 @@
+import { splitsGraphemeCluster } from "../ai-edits/character-boundaries.js";
+import { directionIsRtl } from "../prosemirror/paragraphDirection.js";
+import { Selection, TextSelection } from "prosemirror-state";
+//#region src/controller/readOnlySelection.ts
+const textPositionInDirection = ({ view, head, direction }) => {
+	const $head = view.state.doc.resolve(head);
+	const parent = $head.parent;
+	let childOffset = 0;
+	for (let childIndex = 0; childIndex < parent.childCount;) {
+		const child = parent.child(childIndex);
+		if (!child.isText) {
+			childOffset += child.nodeSize;
+			childIndex += 1;
+			continue;
+		}
+		const runStart = childOffset;
+		let runText = "";
+		while (childIndex < parent.childCount && parent.child(childIndex).isText) {
+			const textNode = parent.child(childIndex);
+			runText += textNode.text ?? "";
+			childOffset += textNode.nodeSize;
+			childIndex += 1;
+		}
+		if ($head.parentOffset < runStart || $head.parentOffset > childOffset) continue;
+		const localOffset = $head.parentOffset - runStart;
+		let target = localOffset + direction;
+		while (target > 0 && target < runText.length && splitsGraphemeCluster(runText, target)) target += direction;
+		if (target >= 0 && target <= runText.length && target !== localOffset) return $head.start() + runStart + target;
+		break;
+	}
+	const candidate = head + direction;
+	if (candidate < 0 || candidate > view.state.doc.content.size) return null;
+	return Selection.findFrom(view.state.doc.resolve(candidate), direction, true)?.head ?? null;
+};
+/**
+* Handle Ctrl/Cmd+A and unmodified horizontal Shift arrows in LTR paragraphs.
+* Word/document navigation, vertical movement, and RTL visual arrows stay
+* native because this helper does not model their platform-specific semantics.
+*/
+const handleReadOnlySelectionKeyDown = (view, event) => {
+	if ((event.metaKey || event.ctrlKey) && !event.altKey && event.key.toLowerCase() === "a") {
+		event.preventDefault();
+		const { doc } = view.state;
+		view.dispatch(view.state.tr.setSelection(TextSelection.create(doc, Selection.atStart(doc).from, Selection.atEnd(doc).to)));
+		return true;
+	}
+	if (!event.shiftKey || event.altKey || event.ctrlKey || event.metaKey || event.key !== "ArrowLeft" && event.key !== "ArrowRight") return false;
+	const { doc, selection } = view.state;
+	const direction = event.key === "ArrowLeft" ? -1 : 1;
+	if (directionIsRtl(selection.$head.parent.attrs["direction"])) return false;
+	const nextHead = textPositionInDirection({
+		view,
+		head: selection.head,
+		direction
+	});
+	if (nextHead === null) return false;
+	view.dispatch(view.state.tr.setSelection(TextSelection.between(doc.resolve(selection.anchor), doc.resolve(nextHead), direction)));
+	event.preventDefault();
+	return true;
+};
+//#endregion
+export { handleReadOnlySelectionKeyDown };

package/dist/display-list/build/buildContext.d.ts

@@ -1,22 +1,23 @@
+import { HorizontalClipViewport } from "../../utils/paragraphInlineLayout.js";
 import { DisplayColor, DisplayLink, DisplayLinkTarget, DisplayRect, DisplayStoryRef } from "../types.js";
 import { FontTable } from "./fontTable.js";
 import { ImageTable } from "./imagePrimitives.js";
 import { UnsupportedCollector } from "./unsupported.js";
 //#region src/display-list/build/buildContext.d.ts
 /** Word's per-author redline palette, assigned in first-seen order per build. */
-declare class AuthorColorTable {
+export declare class AuthorColorTable {
   private readonly indexByAuthor;
   colorFor(author: string | undefined): DisplayColor;
 }
 /** Colour a tracked change paints in: the author's hue, or the proposal hue. */
-declare const trackedChangeColor: (authorColors: AuthorColorTable, changeAuthor: string | undefined, isSuggestion: boolean | undefined) => DisplayColor;
+export declare const trackedChangeColor: (authorColors: AuthorColorTable, changeAuthor: string | undefined, isSuggestion: boolean | undefined) => DisplayColor;
 /**
  * Which OOXML story the primitives being built belong to, named precisely
  * enough to address it: a document has many headers and many notes, and a
  * position only means something against one of them.
  */
-type DisplayStory = DisplayStoryRef;
-type BuildContext = {
+export type DisplayStory = DisplayStoryRef;
+export type BuildContext = {
   readonly fonts: FontTable;
   readonly images: ImageTable;
   readonly unsupported: UnsupportedCollector;
@@ -36,6 +37,7 @@ type BuildContext = {
   /** Authored page number, for `PAGE` fields. */
   readonly pageNumber: number;
   readonly totalPages: number;
+  /** Horizontal crop bounds for inline images in this painted story. */
+  readonly inlinePictureViewport?: HorizontalClipViewport;
 };
-//#endregion
-export { AuthorColorTable, BuildContext, DisplayStory, trackedChangeColor };
+//#endregion

package/dist/display-list/build/buildDisplayList.d.ts

@@ -22,8 +22,8 @@ declare const DOCUMENT_FEATURE_GAPS: readonly [readonly ["pageBorders", "w:pgBor
  * Which of those features the source document actually has. The builder cannot
  * detect them, so the caller that parsed the document states it.
  */
-type DocumentFeatures = { readonly [Feature in (typeof DOCUMENT_FEATURE_GAPS)[number][0]]: boolean; };
-type BuildDisplayListOptions = PageFurnitureInputs & {
+export type DocumentFeatures = { readonly [Feature in (typeof DOCUMENT_FEATURE_GAPS)[number][0]]: boolean; };
+export type BuildDisplayListOptions = PageFurnitureInputs & {
   readonly layout: Layout;
   readonly blockLookup: BlockLookup;
   readonly metadata?: DisplayMetadata;
@@ -61,7 +61,7 @@ type BuildDisplayListOptions = PageFurnitureInputs & {
  * so a caller that wants the whole list asks for every page first — which is
  * what {@link buildDisplayList} does.
  */
-type DisplayListBuilder = {
+export type DisplayListBuilder = {
   readonly pageCount: number;
   /** The page at that index, built on first request and kept. */
   readonly pageAt: (pageIndex: number) => DisplayPage | undefined;
@@ -71,12 +71,12 @@ type DisplayListBuilder = {
    */
   readonly snapshot: () => DisplayList;
 };
-declare const createDisplayListBuilder: ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, comments, ...furniture }: BuildDisplayListOptions) => DisplayListBuilder;
+export declare const createDisplayListBuilder: ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, comments, ...furniture }: BuildDisplayListOptions) => DisplayListBuilder;
 /**
  * The whole document's display list. Every page is built, so the tables, the
  * outline and the gap report are complete; an editor that paints a window of
  * pages uses {@link createDisplayListBuilder} instead.
  */
-declare const buildDisplayList: (options: BuildDisplayListOptions) => DisplayList;
+export declare const buildDisplayList: (options: BuildDisplayListOptions) => DisplayList;
 //#endregion
-export { BuildDisplayListOptions, DisplayListBuilder, DocumentFeatures, buildDisplayList, createDisplayListBuilder };
+export {};

package/dist/display-list/build/buildDisplayList.js

@@ -1,3 +1,4 @@
+import { pageHorizontalColumns, paragraphInlinePictureViewport } from "../../utils/paragraphInlineLayout.js";
 import { HIT_REGION_KINDS } from "../primitives.js";
 import { AuthorColorTable } from "./buildContext.js";
 import { DOC_CANVAS } from "./colors.js";
@@ -109,7 +110,7 @@ const collectDocumentTargets = (layout, blockLookup) => {
 	};
 };
 const bordersOfNeighbour = (entry) => entry?.block.kind === "paragraph" ? entry.block.attrs?.borders : void 0;
-const paintFragment = ({ fragment, entry, context, composer, prevEntry, nextEntry }) => {
+const paintFragment = ({ fragment, entry, context, composer, prevEntry, nextEntry, inlinePictureViewport }) => {
 	const { block, measure } = entry;
 	const mismatch = () => {
 		context.unsupported.report(UNSUPPORTED_CONSTRUCT.measureMismatch, context.pageIndex, `${fragment.kind} fragment ${String(fragment.blockId)} has a ${block.kind} block and a ${measure.kind} measure`);
@@ -128,6 +129,7 @@ const paintFragment = ({ fragment, entry, context, composer, prevEntry, nextEntr
 				measure,
 				context,
 				composer,
+				...inlinePictureViewport === void 0 ? {} : { inlinePictureViewport },
 				...prevBorders === void 0 ? {} : { prevBorders },
 				...nextBorders === void 0 ? {} : { nextBorders }
 			});
@@ -191,6 +193,15 @@ const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, b
 	};
 	const entries = page.fragments.map((fragment) => blockLookup.get(String(fragment.blockId)));
 	const geometry = pageGeometryOf(page);
+	const paperPictureViewport = {
+		left: 0,
+		right: page.size.w
+	};
+	const pictureColumns = pageHorizontalColumns({
+		layout: page.columns,
+		contentLeft: page.margins.left,
+		contentWidth: page.size.w - page.margins.left - page.margins.right
+	});
 	const placedFloats = /* @__PURE__ */ new Set();
 	const behindFloats = [];
 	const frontFloats = [];
@@ -232,6 +243,12 @@ const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, b
 				continue;
 			}
 			const paint = (fragmentContext) => {
+				const inlinePictureViewport = fragment.kind === "paragraph" && entry.block.kind === "paragraph" ? paragraphInlinePictureViewport({
+					block: entry.block,
+					fragment,
+					paper: paperPictureViewport,
+					columns: pictureColumns
+				}) : void 0;
 				composer.region(blockRegion({
 					fragment,
 					kind: FRAGMENT_REGION_KIND[fragment.kind],
@@ -243,7 +260,8 @@ const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, b
 						context: fragmentContext,
 						composer,
 						prevEntry: entries[index - 1],
-						nextEntry: entries[index + 1]
+						nextEntry: entries[index + 1],
+						...inlinePictureViewport === void 0 ? {} : { inlinePictureViewport }
 					});
 				});
 			};

package/dist/display-list/build/colors.d.ts

@@ -6,15 +6,14 @@ import { DisplayColor } from "../types.js";
  * `--suggestion-color` the AI-proposal hue (`renderParagraph.ts`'s
  * `SUGGESTION_COLOR_CSS` fallback).
  */
-declare const DOC_CANVAS: DisplayColor;
-declare const DOC_CANVAS_TEXT: DisplayColor;
-declare const SUGGESTION_COLOR: DisplayColor;
-declare const TRANSPARENT: DisplayColor;
+export declare const DOC_CANVAS: DisplayColor;
+export declare const DOC_CANVAS_TEXT: DisplayColor;
+export declare const SUGGESTION_COLOR: DisplayColor;
+export declare const TRANSPARENT: DisplayColor;
 /**
  * Resolve an authored CSS colour. Returns `undefined` for a value this module
  * cannot turn into concrete channels (`color-mix()`, `oklch()`, an unknown
  * name) so the caller can report it rather than paint a guess.
  */
-declare const parseDisplayColor: (color: string | undefined) => DisplayColor | undefined;
-//#endregion
-export { DOC_CANVAS, DOC_CANVAS_TEXT, SUGGESTION_COLOR, TRANSPARENT, parseDisplayColor };
+export declare const parseDisplayColor: (color: string | undefined) => DisplayColor | undefined;
+//#endregion

package/dist/display-list/build/commentAnnotations.d.ts

@@ -1,10 +1,9 @@
 import { document_d_exports } from "../../types/document.js";
 //#region src/display-list/build/commentAnnotations.d.ts
-type DisplayCommentInput = {
+export type DisplayCommentInput = {
   readonly id: number;
   readonly author: string;
   readonly contents: string;
 };
-declare const displayCommentsFrom: (comments: readonly document_d_exports.Comment[]) => readonly DisplayCommentInput[];
-//#endregion
-export { DisplayCommentInput, displayCommentsFrom };
+export declare const displayCommentsFrom: (comments: readonly document_d_exports.Comment[]) => readonly DisplayCommentInput[];
+//#endregion

package/dist/display-list/build/floatingImages.d.ts

@@ -3,14 +3,14 @@ import { PageGeometry } from "../../layout-painter/anchoredImagePosition.js";
 import { DisplayPrimitive } from "../types.js";
 import { BuildContext } from "./buildContext.js";
 //#region src/display-list/build/floatingImages.d.ts
-declare const pageGeometryOf: (page: Page) => PageGeometry;
-type FloatingImagePlacement = {
+export declare const pageGeometryOf: (page: Page) => PageGeometry;
+export type FloatingImagePlacement = {
   readonly run: ImageRun;
   /** `w:wrap behind` paints under the body text; everything else paints over it. */
   readonly behindDoc: boolean;
   readonly primitives: readonly DisplayPrimitive[];
 };
-type CollectFloatingImagesOptions = {
+export type CollectFloatingImagesOptions = {
   readonly block: ParagraphBlock;
   /** The paragraph fragment's y, page-absolute. */
   readonly fragmentYPx: number;
@@ -19,6 +19,5 @@ type CollectFloatingImagesOptions = {
   /** Runs already placed on this page, so a split paragraph cannot double-paint. */
   readonly placed: Set<ImageRun>;
 };
-declare const collectFloatingImages: ({ block, fragmentYPx, geometry, context, placed }: CollectFloatingImagesOptions) => readonly FloatingImagePlacement[];
-//#endregion
-export { CollectFloatingImagesOptions, FloatingImagePlacement, collectFloatingImages, pageGeometryOf };
+export declare const collectFloatingImages: ({ block, fragmentYPx, geometry, context, placed }: CollectFloatingImagesOptions) => readonly FloatingImagePlacement[];
+//#endregion

package/dist/display-list/build/fontTable.d.ts

@@ -1,8 +1,8 @@
 import { EmbeddedFont } from "../../fonts/embeddedFonts.js";
-import { DisplayFontFace, DisplayFontRef } from "../types.js";
 import { FontStyle } from "../../layout-engine/measure/measureTypes.js";
+import { DisplayFontFace, DisplayFontRef } from "../types.js";
 //#region src/display-list/build/fontTable.d.ts
-type FontFaceRequest = {
+export type FontFaceRequest = {
   readonly fontFamily: string;
   readonly alternateFontFamily?: string;
   readonly bold?: boolean;
@@ -14,7 +14,7 @@ type FontFaceRequest = {
    */
   readonly measureStyle: FontStyle;
 };
-declare class FontTable {
+export declare class FontTable {
   private readonly faces;
   private readonly indexByKey;
   private readonly embeddedByKey;
@@ -27,5 +27,4 @@ declare class FontTable {
   intern({ fontFamily, alternateFontFamily, bold, italic, measureStyle }: FontFaceRequest): DisplayFontRef;
   snapshot(): readonly DisplayFontFace[];
 }
-//#endregion
-export { FontFaceRequest, FontTable };
+//#endregion

package/dist/display-list/build/fontTable.js

@@ -65,7 +65,8 @@ var FontTable = class {
 	intern({ fontFamily, alternateFontFamily, bold, italic, measureStyle }) {
 		const stack = parseFontFamilyList(resolveFontFamily(fontFamily, {
 			alternateFontName: alternateFontFamily,
-			embeddedFontFamilyMap: measureStyle.embeddedFontFamilyMap
+			embeddedFontFamilyMap: measureStyle.embeddedFontFamilyMap,
+			documentFontFacts: measureStyle.documentFontFacts
 		}).cssFallback);
 		const family = stack.at(0) ?? fontFamily;
 		const weight = bold ? CSS_BOLD_WEIGHT : CSS_NORMAL_WEIGHT;

package/dist/display-list/build/furniture.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
+import { DocumentFontFacts } from "../../fonts/documentFontFacts.js";
 import { FootnoteContent, HeaderFooterContent, Page } from "../../layout-engine/types.js";
 import { DisplayPrimitive } from "../types.js";
 import { BuildContext } from "./buildContext.js";
@@ -11,8 +12,9 @@ import { PageComposer } from "./regions.js";
  * construct is not painted, and it is reported wherever the layout or the
  * caller's `documentFeatures` shows the document had one.
  */
-type PageFurnitureInputs = {
+export type PageFurnitureInputs = {
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
+  documentFontFacts?: DocumentFontFacts;
   /**
    * `w:pgBorders` for the section. Absent: no border is painted, and the gap is
    * reported unless `documentFeatures` says the document has none.
@@ -71,17 +73,16 @@ type PageFurnitureInputs = {
  * Furniture split by where it sits in the page's paint order: `behind` goes
  * under the body, `above` over it. `renderPage.ts` establishes both.
  */
-type PageFurniturePrimitives = {
+export type PageFurniturePrimitives = {
   /** Painted under the body: a back page border, the watermark. */
   readonly behind: readonly DisplayPrimitive[];
   /** Painted over it, into the composer, so its regions nest. */
   readonly above: (composer: PageComposer) => void;
 };
-type PaintPageFurnitureOptions = {
+export type PaintPageFurnitureOptions = {
   readonly page: Page;
   readonly furniture: PageFurnitureInputs;
   readonly context: BuildContext;
 };
-declare const paintPageFurniture: ({ page, furniture, context }: PaintPageFurnitureOptions) => PageFurniturePrimitives;
-//#endregion
-export { PageFurnitureInputs, PageFurniturePrimitives, PaintPageFurnitureOptions, paintPageFurniture };
+export declare const paintPageFurniture: ({ page, furniture, context }: PaintPageFurnitureOptions) => PageFurniturePrimitives;
+//#endregion

package/dist/display-list/build/furniture.js

@@ -62,6 +62,7 @@ const paintPageFurniture = ({ page, furniture, context }) => {
 		page,
 		watermark: selected.watermark,
 		...furniture.embeddedFontFamilyMap ? { embeddedFontFamilyMap: furniture.embeddedFontFamilyMap } : {},
+		...furniture.documentFontFacts ? { documentFontFacts: furniture.documentFontFacts } : {},
 		...furniture.watermarkImageSrc === void 0 ? {} : { imageSrc: furniture.watermarkImageSrc },
 		context
 	});

package/dist/display-list/build/glyphs.d.ts

@@ -1,7 +1,7 @@
-import { DisplayRunAdjustments } from "../types.js";
 import { FontStyle } from "../../layout-engine/measure/measureTypes.js";
+import { DisplayRunAdjustments } from "../types.js";
 //#region src/display-list/build/glyphs.d.ts
-type Glyphs = {
+export type Glyphs = {
   readonly text: string;
   readonly advancesPx: number[];
   readonly widthPx: number;
@@ -15,7 +15,8 @@ type Glyphs = {
    */
   readonly adjustments?: DisplayRunAdjustments;
 };
-type BuildGlyphsOptions = {
+export type BuildGlyphsOptions = {
+  readonly trailingAutomaticSpacingPx?: number;
   readonly text: string;
   readonly style: FontStyle;
   readonly allCaps: boolean;
@@ -35,7 +36,7 @@ type BuildGlyphsOptions = {
  * advance on the first output code point and gives the rest zero, so the sum
  * still equals what the measurer decided the line on.
  */
-declare const buildGlyphs: (options: BuildGlyphsOptions) => Glyphs;
+export declare const buildGlyphs: (options: BuildGlyphsOptions) => Glyphs;
 /**
  * Everything a measured run contributes to a `glyphRun`.
  *
@@ -44,12 +45,11 @@ declare const buildGlyphs: (options: BuildGlyphsOptions) => Glyphs;
  * and forgot the adjustments would silently paint a run the line was not fitted
  * with.
  */
-declare const glyphRunText: (glyphs: Glyphs) => {
+export declare const glyphRunText: (glyphs: Glyphs) => {
   adjustments?: DisplayRunAdjustments;
   text: string;
   advancesPx: number[];
   kerning: boolean;
   smallCaps: boolean;
 };
-//#endregion
-export { BuildGlyphsOptions, Glyphs, buildGlyphs, glyphRunText };
+//#endregion

package/dist/display-list/build/glyphs.js

@@ -1,4 +1,5 @@
-import { measureRun, measureTextWidth } from "../../layout-engine/measure/measureProvider.js";
+import { automaticTextSpacingGaps } from "../../layout-engine/measure/automaticTextSpacing.js";
+import { measurePositionedRun } from "../../layout-engine/measure/measureProvider.js";
 import { FONT_KERNING_MODE, getFontKerningMode } from "../../layout-engine/measure/textMeasurementPolicy.js";
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
 //#region src/display-list/build/glyphs.ts
@@ -20,14 +21,17 @@ import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
 const buildGlyphs = (options) => {
 	const { text, style, allCaps, spaceDeltaPx, collapsed } = options;
 	const adjustments = adjustmentsOf(options);
-	const { charWidths } = measureRun(text, style);
+	const { charWidths } = measurePositionedRun({
+		text,
+		style,
+		trailingAutomaticSpacingPx: collapsed ? 0 : options.trailingAutomaticSpacingPx ?? 0
+	});
 	const advancesPx = [];
 	let painted = "";
 	let widthPx = 0;
 	let unitOffset = 0;
-	const shapedScale = shapedScaleOf(text, style, charWidths);
 	for (const char of text) {
-		const measured = (charWidths[unitOffset] ?? 0) * shapedScale;
+		const measured = charWidths[unitOffset] ?? 0;
 		unitOffset += char.length;
 		const advance = collapsed ? 0 : measured + (char === " " ? spaceDeltaPx : 0);
 		widthPx += advance;
@@ -48,40 +52,27 @@ const buildGlyphs = (options) => {
 	};
 };
 /**
-* What every per-character width has to be multiplied by for the run to occupy
-* the width the line was fitted at.
-*
-* The two numbers come from the same measurer and differ by what shaping does
-* across a boundary: a pair that kerns or ligates is narrower in the string
-* than the two characters are apart. Line breaking used the string's width, so
-* that is the run's width, and advances that summed to anything else would
-* declare an extent no backend paints.
-*
-* Spread over every character rather than dropped on the last, because the
-* difference is not one boundary's: concentrating it would move the run's final
-* glyph by the whole of it.
-*/
-const shapedScaleOf = (text, style, charWidths) => {
-	const perCharacterPx = charWidths.reduce((total, width) => total + width, 0);
-	if (perCharacterPx <= 0) return 1;
-	return measureTextWidth(text, style) / perCharacterPx;
-};
-/**
 * The three adjustments named, or nothing when none applies.
 *
 * A collapsed run carries no advances at all, so it has nothing to reapply
 * either: naming a spacing on a run painted at zero width would have a backend
 * widen what the line was fitted without.
 */
-const adjustmentsOf = ({ style, spaceDeltaPx, collapsed }) => {
+const adjustmentsOf = ({ text, style, spaceDeltaPx, collapsed, trailingAutomaticSpacingPx = 0 }) => {
 	const horizontalScale = getHorizontalScaleFactor(style.horizontalScale);
 	const letterSpacingPx = collapsed ? 0 : (style.letterSpacing ?? 0) * horizontalScale;
 	const wordSpacingPx = collapsed ? 0 : spaceDeltaPx;
-	if (letterSpacingPx === 0 && wordSpacingPx === 0 && horizontalScale === 1) return;
+	const gaps = collapsed ? [] : automaticTextSpacingGaps(text, style);
+	if (!collapsed && trailingAutomaticSpacingPx > 0) gaps.push({
+		offset: text.length,
+		advancePx: trailingAutomaticSpacingPx
+	});
+	if (letterSpacingPx === 0 && wordSpacingPx === 0 && horizontalScale === 1 && gaps.length === 0) return;
 	return {
 		letterSpacingPx,
 		horizontalScale,
-		wordSpacingPx
+		wordSpacingPx,
+		...gaps.length === 0 ? {} : { automaticTextSpacingGaps: gaps }
 	};
 };
 /**

package/dist/display-list/build/headerFooterPrimitives.d.ts

@@ -2,8 +2,8 @@ import { HeaderFooterContent, Page } from "../../layout-engine/types.js";
 import { BuildContext } from "./buildContext.js";
 import { PageComposer } from "./regions.js";
 //#region src/display-list/build/headerFooterPrimitives.d.ts
-type HeaderFooterSection = "header" | "footer";
-type HeaderFooterPaintOptions = {
+export type HeaderFooterSection = "header" | "footer";
+export type HeaderFooterPaintOptions = {
   readonly composer: PageComposer;
   readonly page: Page;
   readonly section: HeaderFooterSection;
@@ -12,6 +12,5 @@ type HeaderFooterPaintOptions = {
   readonly distancePx?: number;
   readonly context: BuildContext;
 };
-declare const paintHeaderFooter: ({ composer, page, section, content, distancePx, context }: HeaderFooterPaintOptions) => void;
-//#endregion
-export { HeaderFooterPaintOptions, HeaderFooterSection, paintHeaderFooter };
+export declare const paintHeaderFooter: ({ composer, page, section, content, distancePx, context }: HeaderFooterPaintOptions) => void;
+//#endregion

package/dist/display-list/build/headerFooterPrimitives.js

@@ -31,7 +31,11 @@ const paintHeaderFooter = ({ composer, page, section, content, distancePx, conte
 			page,
 			context: {
 				...context,
-				story
+				story,
+				inlinePictureViewport: {
+					left: 0,
+					right: page.size.w
+				}
 			},
 			label: content.rId === void 0 ? section : `${section} ${content.rId}`
 		});