@stll/folio-core 0.59.0 → 0.61.0

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

@@ -1,7 +1,9 @@
 import { cloneParagraphWithPropertySource } from "../../docx/paragraphPropertySource.js";
 import { isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "../../layout-engine/types.js";
 import { headerFooterToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
+import { projectStoryMarkupView } from "../../prosemirror/markupViewProjection.js";
 import { emuToPixels } from "../../utils/units.js";
+import { remapMarkupViewBlocks } from "./markupViewFlow.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/headerFooterLayout.ts
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
@@ -341,18 +343,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 	if (options.styles) proseDocOptions.styles = options.styles;
 	if (options.theme !== void 0) proseDocOptions.theme = options.theme;
 	if (options.numbering !== void 0) proseDocOptions.numbering = options.numbering;
-	const pmDoc = headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions);
-	const flowOptions = {};
-	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
-	if (options.styles) flowOptions.styles = options.styles;
-	if (options.theme !== void 0) flowOptions.theme = options.theme;
-	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;
-	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
-	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
-	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	return finalizeHeaderFooterContent(toFlowBlocks(pmDoc, flowOptions), contentWidth, metrics, options);
+	return convertHeaderFooterPmDocToContent(headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions), contentWidth, metrics, options);
 }
 /**
 * Same as {@link convertHeaderFooterToContent}, but sourced from a live
@@ -367,17 +358,25 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 */
 function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options) {
 	if (!pmDoc || pmDoc.content.size === 0) return;
-	const flowOptions = {};
+	const flowOptions = { showCommentHighlights: options.showCommentHighlights !== false && options.markupView !== "no-markup" && options.markupView !== "original" };
 	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
 	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.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
 	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
 	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	return finalizeHeaderFooterContent(toFlowBlocks(pmDoc, flowOptions), contentWidth, metrics, options);
+	const projection = projectStoryMarkupView({
+		doc: pmDoc,
+		markupView: options.markupView ?? "all-markup",
+		styles: options.styles,
+		numbering: options.numbering
+	});
+	const flowBlocks = toFlowBlocks(projection.type === "resolved" ? projection.doc : pmDoc, flowOptions);
+	return finalizeHeaderFooterContent(projection.type === "resolved" ? remapMarkupViewBlocks(flowBlocks, projection) : flowBlocks, contentWidth, metrics, options);
 }
 function horizontalImageLeft({ run, contentWidth, metrics }) {
 	const horizontal = run.position?.horizontal;

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

@@ -1,6 +1,7 @@
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { expectParagraphAttrs } from "../../prosemirror/attrs/index.js";
+import { expectBookmarkBoundaryAttrs } from "../../prosemirror/bookmarkBoundaryAttrs.js";
 import { expectTextBoxAnchorAttrs } from "../../prosemirror/textBoxAnchorAttrs.js";
 import { nextBlockId, twipsToPixels } from "./flowConversionShared.js";
 import { convertParagraphAttrs } from "./paragraphAttrs.js";
@@ -76,7 +77,13 @@ function convertParagraph(node, startPos, options, pageBreaks) {
 	if (isFullyHiddenParagraph) attrs.suppressEmptyParagraphHeight = true;
 	if (runs.length === 0 && expectDetachedWatermarkHostAttr(node.attrs)) attrs.suppressEmptyParagraphHeight = false;
 	if (runs.length === 0 && pmAttrs._pageBreakCarrier === true && !hasVisibleParagraphPayload(attrs)) attrs.suppressEmptyParagraphHeight = true;
-	const bookmarkNames = pmAttrs.bookmarks?.map((b) => b.name);
+	const bookmarkNames = pmAttrs.bookmarks?.map((b) => b.name) ?? [];
+	node.descendants((child) => {
+		if (child.type.name !== "bookmarkBoundary") return true;
+		const marker = expectBookmarkBoundaryAttrs(child);
+		if (marker.type === "start") bookmarkNames.push(marker.name);
+		return false;
+	});
 	const block = {
 		kind: "paragraph",
 		id: nextBlockId(),

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

@@ -58,7 +58,8 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 			});
 			return;
 		}
-		const effectiveMarks = mergeProjectedInlineMarks(inheritedMarks, child.marks);
+		const projectedMarks = mergeProjectedInlineMarks(inheritedMarks, child.marks);
+		const effectiveMarks = _options.showCommentHighlights === false ? projectedMarks.filter((mark) => mark.type.name !== "comment") : projectedMarks;
 		if (child.type.name === "pageBreakRun") {
 			const trackedChange = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			if (trackedChange.isDeletion) {

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

@@ -412,10 +412,34 @@ function toFlowBlocks(doc, options = {}) {
 	}
 	const mergedBlocks = mergeRunInParagraphs(blocks);
 	const tableCellLinePitch = doc.attrs["_adjustLineHeightInTable"] === true ? "sectionGrid" : void 0;
-	return groupParagraphFrames(coalesceTrailingPageBreakBeforeContinuousSection(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
+	const result = groupParagraphFrames(coalesceTrailingPageBreakBeforeContinuousSection(applySectionStartsToBoundaries(applySectionDocumentGrid(mergedBlocks, {
 		finalLinePitchTwips: opts.finalSectionDocumentGridLinePitchTwips,
 		tableCellLinePitch
 	}), readFinalSectionStart(doc)), options.splitPageBreakAndParagraphMark === true, sectionBreaksWithoutMarker), nextBlockId);
+	if (options.embeddedFontFamilyMap) attachEmbeddedFontFamilies(result, options.embeddedFontFamilyMap);
+	return result;
 }
+/** Attach editor-owned resolution to freshly derived blocks without changing authored data. */
+const attachEmbeddedFontFamilies = (blocks, familyMap) => {
+	for (const block of blocks) switch (block.kind) {
+		case "paragraph":
+			for (const run of block.runs) if (run.kind !== "image" && run.kind !== "lineBreak") run.embeddedFontFamilyMap = familyMap;
+			block.attrs ??= {};
+			block.attrs.embeddedFontFamilyMap = familyMap;
+			if (block.attrs.listMarkerFormatting) block.attrs.listMarkerFormatting.embeddedFontFamilyMap = familyMap;
+			break;
+		case "table":
+			for (const row of block.rows) for (const cell of row.cells) attachEmbeddedFontFamilies(cell.blocks, familyMap);
+			break;
+		case "textBox":
+			attachEmbeddedFontFamilies(block.content, familyMap);
+			break;
+		case "image":
+		case "sectionBreak":
+		case "pageBreak":
+		case "columnBreak": break;
+		default: return block;
+	}
+};
 //#endregion
 export { WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };

package/dist/layout-engine/measure/cache.js

@@ -1,7 +1,14 @@
+import { embeddedFontFingerprint } from "../../fonts/embeddedFontFingerprint.js";
 import { getLineBreakProviderGeneration } from "./lineBreakProvider.js";
 import { clearFontResolvedCache } from "./measureHelpers.js";
 //#region src/layout-engine/measure/cache.ts
 /**
+* Measurement Cache
+*
+* LRU cache for text width measurements and paragraph layout results.
+* Improves performance by avoiding repeated measurements of identical content.
+*/
+/**
 * Default max entries for text width cache
 * Large documents (30+ pages) can generate 20,000+ unique text measurements.
 * A generous default avoids cache thrashing on big docs.
@@ -176,21 +183,31 @@ const imageMeasureCacheInput = (run) => ({
 	exactLineHeight: run.exactLineHeight,
 	positioned: run.position !== void 0
 });
-const runMeasureCacheInput = (run) => {
+const runMeasureCacheInput = (run, fontContextRef) => {
 	switch (run.kind) {
 		case "text":
 		case "tab":
-		case "lineBreak":
 		case "renderedPageBreak":
 		case "field":
-		case "math": return run;
+		case "math": {
+			const { embeddedFontFamilyMap, ...formatting } = run;
+			return {
+				...formatting,
+				embeddedFontFamilies: fontContextRef(embeddedFontFamilyMap)
+			};
+		}
+		case "lineBreak": return run;
 		case "image": return imageMeasureCacheInput(run);
 		default: return run;
 	}
 };
-const paragraphAttrsMeasureCacheInput = (attrs) => {
+const paragraphAttrsMeasureCacheInput = (attrs, fontContextRef) => {
 	if (attrs === void 0) return void 0;
-	const { snapToGrid, ...measurementAttrs } = attrs;
+	const { snapToGrid, embeddedFontFamilyMap, ...rest } = attrs;
+	const measurementAttrs = {
+		...rest,
+		embeddedFontFamilies: fontContextRef(embeddedFontFamilyMap)
+	};
 	if (measurementAttrs.documentGridLinePitch === void 0) return measurementAttrs;
 	return {
 		...measurementAttrs,
@@ -199,10 +216,25 @@ const paragraphAttrsMeasureCacheInput = (attrs) => {
 };
 /** Serialize the complete, semantically normalized paragraph measurement contract into a cache key. */
 function hashParagraphBlock(block) {
+	const fontContexts = [];
+	const contextRefs = /* @__PURE__ */ new Map();
+	const fontContextRef = (families) => {
+		if (!families) return void 0;
+		const fingerprint = embeddedFontFingerprint(families);
+		const existing = contextRefs.get(fingerprint);
+		if (existing !== void 0) return existing;
+		const index = fontContexts.length;
+		contextRefs.set(fingerprint, index);
+		fontContexts.push(fingerprint);
+		return index;
+	};
+	const attrs = paragraphAttrsMeasureCacheInput(block.attrs, fontContextRef);
+	const runs = block.runs.map((run) => runMeasureCacheInput(run, fontContextRef));
 	return JSON.stringify({
 		lineBreakProviderGeneration: getLineBreakProviderGeneration(),
-		attrs: paragraphAttrsMeasureCacheInput(block.attrs),
-		runs: block.runs.map(runMeasureCacheInput)
+		attrs,
+		runs,
+		fontContexts
 	});
 }
 /**

package/dist/layout-engine/measure/crossRunWords.js

@@ -1,3 +1,4 @@
+import { sliceText } from "../../utils/sliceText.js";
 import { splitTrailingToken } from "../../utils/trailingText.js";
 import { resolveEffectiveLineBreakPolicy } from "./effectiveLineBreakPolicy.js";
 import "./lineBreakProvider.js";
@@ -47,7 +48,11 @@ function computeFollowingTextLeads(block) {
 		leads[index] = lead;
 		const run = block.runs[index];
 		if (!run || !isTextRun(run)) lead = void 0;
-		else if (run.text) lead = run.text[0];
+		else if (run.text) lead = sliceText({
+			text: run.text,
+			units: "codePoints",
+			end: 1
+		});
 	}
 	return leads;
 }
@@ -101,6 +106,7 @@ function computeProtectedCrossRunGlueWidths(block) {
 * invoked from, without the per-word text-length budget ever kicking in.
 */
 const MAX_CROSS_RUN_SEGMENTS = 64;
+const MAX_SCALAR_CODE_UNITS = 2;
 /** Collect one lexical word continued through adjacent formatting runs. */
 function collectCrossRunWord({ block, startRunIndex, startChar }) {
 	const segments = [];
@@ -115,7 +121,11 @@ function collectCrossRunWord({ block, startRunIndex, startChar }) {
 		if (remainder.length === 0) continue;
 		if (runIndex !== startRunIndex && isSpaceOrTab(remainder[0])) break;
 		const remainingBudget = 256 - text.length;
-		const boundedRemainder = remainder.slice(0, remainingBudget + 1);
+		const boundedRemainder = sliceText({
+			text: remainder,
+			units: "codeUnits",
+			end: remainingBudget + MAX_SCALAR_CODE_UNITS
+		});
 		const firstBreak = findWordBreaks(boundedRemainder, resolveEffectiveLineBreakPolicy({
 			attrs: block.attrs,
 			run

package/dist/layout-engine/measure/lineTypography.js

@@ -96,6 +96,7 @@ const WORD_SINGLE_LINE_FLOOR = 1.15;
 */
 function calculateEmptyParagraphMetrics(fontSize, spacing, fontFamily, attrs) {
 	const result = calculateTypographyMetrics(fontSize, spacing, getFontMetrics({
+		...attrs?.embeddedFontFamilyMap ? { embeddedFontFamilyMap: attrs.embeddedFontFamilyMap } : {},
 		fontSize,
 		fontFamily: fontFamily ?? "Times New Roman",
 		...attrs?.defaultAlternateFontFamily !== void 0 ? { alternateFontFamily: attrs.defaultAlternateFontFamily } : {}

package/dist/layout-engine/measure/listMarkerWidth.d.ts

@@ -13,6 +13,7 @@ declare const DEFAULT_TAB_STOP_TWIPS = 720;
  * of the paragraph do not format its number.
  */
 declare function resolveListMarkerFont(block: ParagraphBlock): {
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   fontFamily: string;
   alternateFontFamily?: string;
   fontSize: number;

package/dist/layout-engine/measure/listMarkerWidth.js

@@ -27,6 +27,7 @@ function resolveListMarkerFont(block) {
 		alternateFontFamily = markerFormatting.alternateFontFamily;
 	}
 	const base = {
+		...attrs?.embeddedFontFamilyMap ? { embeddedFontFamilyMap: attrs.embeddedFontFamilyMap } : {},
 		fontFamily,
 		...alternateFontFamily !== void 0 ? { alternateFontFamily } : {},
 		fontSize: markerFormatting?.fontSize ?? attrs?.defaultFontSize ?? DEFAULT_FONT_SIZE,

package/dist/layout-engine/measure/measureContainer.js

@@ -61,8 +61,7 @@ function canvasGetFontMetrics(style) {
 	const bold = style.bold ?? false;
 	const italic = style.italic ?? false;
 	const fontVariant = style.fontVariant;
-	const alternateFontFamily = style.alternateFontFamily;
-	const fontCacheFamily = alternateFontFamily ? `${fontFamily}\u0000${alternateFontFamily}` : fontFamily;
+	const fontCacheFamily = getResolvedData(fontFamily, style).cssFallback;
 	const cached = getCachedFontMetrics(fontCacheFamily, fontSize, bold, italic, fontVariant);
 	if (cached !== void 0) return {
 		fontSize,
@@ -98,7 +97,7 @@ function canvasGetFontMetrics(style) {
 		}
 	} catch {}
 	lineHeight = Math.max(lineHeight, ascent + descent);
-	const singleLineRatio = getResolvedData(fontFamily, alternateFontFamily).singleLineRatio;
+	const singleLineRatio = getResolvedData(fontFamily, style).singleLineRatio;
 	const result = {
 		fontSize,
 		ascent,
@@ -165,7 +164,7 @@ function canvasMeasureTextWidth(text, sourceStyle) {
 * takes the single-font path (no double-counting, no recursion).
 */
 function glyphAdvanceStyle(style) {
-	const result = {};
+	const result = { ...style.embeddedFontFamilyMap ? { embeddedFontFamilyMap: style.embeddedFontFamilyMap } : {} };
 	if (style.fontFamily !== void 0) result.fontFamily = style.fontFamily;
 	if (style.alternateFontFamily !== void 0) result.alternateFontFamily = style.alternateFontFamily;
 	if (style.fontSize !== void 0) result.fontSize = style.fontSize;

package/dist/layout-engine/measure/measureHelpers.d.ts

@@ -33,20 +33,17 @@ type ResolvedFontCache = {
 /**
  * Get the resolved font data for a font family, with caching.
  */
-declare function getResolvedData(fontFamily: string, alternateFontFamily?: string): ResolvedFontCache;
+type ResolvedDataOptions = {
+  alternateFontFamily?: string | undefined;
+  embeddedFontFamilyMap?: ReadonlyMap<string, string> | undefined;
+};
+declare function getResolvedData(fontFamily: string, options?: ResolvedDataOptions): ResolvedFontCache;
 /**
  * Whether a face of `family` (a `FontFace.family`, possibly quoted) can change
  * a width this page has measured.
  */
 declare function isLayoutFontFamily(family: string): boolean;
-/**
- * Clear the resolved-font-family cache. `resolveFontFamily`'s output for a
- * given key can change even when the raw font names don't — e.g. when the
- * active document's embedded-font family map changes (see
- * `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) — so this must be
- * cleared whenever that happens, not just on font-name changes. Folded into
- * `clearAllCaches` (`./cache.ts`) so callers get it for free.
- */
+/** Clear cached resolution after a browser font-set or font-policy change. */
 declare function clearFontResolvedCache(): void;
 /**
  * Build a CSS font string from styling properties

package/dist/layout-engine/measure/measureHelpers.js

@@ -59,6 +59,7 @@ function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
 	const horizontalScale = normalizeHorizontalScalePercent(run.horizontalScale);
 	return {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
+		...run.embeddedFontFamilyMap ? { embeddedFontFamilyMap: run.embeddedFontFamilyMap } : {},
 		...run.alternateFontFamily !== void 0 ? { alternateFontFamily: run.alternateFontFamily } : {},
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
 		...run.eastAsiaAlternateFontFamily !== void 0 ? { eastAsiaAlternateFontFamily: run.eastAsiaAlternateFontFamily } : {},
@@ -80,19 +81,27 @@ function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
 }
 /** Cache for resolved font data */
 const fontResolvedCache = /* @__PURE__ */ new Map();
-/**
-* Get the resolved font data for a font family, with caching.
-*/
-function getResolvedData(fontFamily, alternateFontFamily) {
+let embeddedFontResolvedCaches = /* @__PURE__ */ new WeakMap();
+function getResolvedData(fontFamily, options = {}) {
+	const { alternateFontFamily, embeddedFontFamilyMap } = options;
+	let cache = fontResolvedCache;
+	if (embeddedFontFamilyMap) {
+		const owned = embeddedFontResolvedCaches.get(embeddedFontFamilyMap);
+		cache = owned ?? /* @__PURE__ */ new Map();
+		if (!owned) embeddedFontResolvedCaches.set(embeddedFontFamilyMap, cache);
+	}
 	const cacheKey = `${fontFamily}\u0000${alternateFontFamily ?? ""}`;
-	let cached = fontResolvedCache.get(cacheKey);
+	let cached = cache.get(cacheKey);
 	if (cached === void 0) {
-		const resolved = resolveFontFamily(fontFamily, alternateFontFamily);
+		const resolved = resolveFontFamily(fontFamily, {
+			alternateFontName: alternateFontFamily,
+			embeddedFontFamilyMap
+		});
 		cached = {
 			cssFallback: resolved.cssFallback,
 			singleLineRatio: resolved.singleLineRatio
 		};
-		fontResolvedCache.set(cacheKey, cached);
+		cache.set(cacheKey, cached);
 		for (const family of parseFontFamilyList(resolved.cssFallback)) layoutFontFamilies.add(normalizeFontFamilyName(family));
 	}
 	return cached;
@@ -119,19 +128,13 @@ function isLayoutFontFamily(family) {
 /**
 * Get the CSS fallback string for a font family, with caching.
 */
-function getResolvedFallback(fontFamily, alternateFontFamily) {
-	return getResolvedData(fontFamily, alternateFontFamily).cssFallback;
+function getResolvedFallback(fontFamily, style) {
+	return getResolvedData(fontFamily, style).cssFallback;
 }
-/**
-* Clear the resolved-font-family cache. `resolveFontFamily`'s output for a
-* given key can change even when the raw font names don't — e.g. when the
-* active document's embedded-font family map changes (see
-* `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) — so this must be
-* cleared whenever that happens, not just on font-name changes. Folded into
-* `clearAllCaches` (`./cache.ts`) so callers get it for free.
-*/
+/** Clear cached resolution after a browser font-set or font-policy change. */
 function clearFontResolvedCache() {
 	fontResolvedCache.clear();
+	embeddedFontResolvedCaches = /* @__PURE__ */ new WeakMap();
 }
 /**
 * Build a CSS font string from styling properties
@@ -154,7 +157,7 @@ function buildFontString(style) {
 	const fontSizePx = ptToPx(style.fontSize ?? 11);
 	parts.push(`${fontSizePx}px`);
 	const fontFamily = style.fontFamily ?? "Times New Roman";
-	parts.push(getResolvedFallback(fontFamily, style.alternateFontFamily));
+	parts.push(getResolvedFallback(fontFamily, style));
 	return parts.join(" ");
 }
 /**

package/dist/layout-engine/measure/measureParagraph.js

@@ -169,6 +169,7 @@ function measureParagraph(block, maxWidth, options) {
 		const metrics = lineFontMetrics ?? getFontMetrics({
 			fontSize: paragraphFontSize,
 			fontFamily: paragraphFontFamily,
+			...attrs?.embeddedFontFamilyMap ? { embeddedFontFamilyMap: attrs.embeddedFontFamilyMap } : {},
 			...attrs?.defaultAlternateFontFamily !== void 0 ? { alternateFontFamily: attrs.defaultAlternateFontFamily } : {}
 		});
 		const finalTypography = { ...calculateTypographyMetrics(fontSize, spacing, metrics) };
@@ -402,6 +403,7 @@ function measureParagraph(block, maxWidth, options) {
 		if (isMathRun(run)) {
 			const style = {
 				fontFamily: run.fontFamily ?? "Cambria Math",
+				...run.embeddedFontFamilyMap ? { embeddedFontFamilyMap: run.embeddedFontFamilyMap } : {},
 				fontSize: run.fontSize ?? 11,
 				...run.bold !== void 0 ? { bold: run.bold } : {},
 				...run.italic !== void 0 ? { italic: run.italic } : {}

package/dist/layout-engine/measure/measureTypes.d.ts

@@ -13,6 +13,8 @@ declare namespace measureTypes_d_exports {
  * Font styling properties for measurement
  */
 type FontStyle = {
+  /** Embedded families owned by this editor, never ambient process state. */
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   fontFamily?: string;
   alternateFontFamily?: string;
   /**

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

@@ -13,6 +13,8 @@ type BlockId = string | number;
  * Common run formatting properties applied to text runs.
  */
 type RunFormatting = {
+  /** Embedded families owned by this editor, never ambient process state. */
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   bold?: boolean;
   italic?: boolean;
   /**
@@ -160,7 +162,7 @@ type RunFormatting = {
   /** Groups a suggestion's runs for accept/reject and scroll-to. */
   suggestionId?: string;
 };
-type ListMarkerFormatting = Pick<RunFormatting, "fontFamily" | "alternateFontFamily" | "eastAsiaFontFamily" | "eastAsiaAlternateFontFamily" | "complexScriptFontFamily" | "complexScriptAlternateFontFamily" | "fontSize" | "complexScriptFontSize" | "bold" | "complexScriptBold" | "italic" | "complexScriptItalic" | "rtl" | "forceComplexScript" | "color">;
+type ListMarkerFormatting = Pick<RunFormatting, "embeddedFontFamilyMap" | "fontFamily" | "alternateFontFamily" | "eastAsiaFontFamily" | "eastAsiaAlternateFontFamily" | "complexScriptFontFamily" | "complexScriptAlternateFontFamily" | "fontSize" | "complexScriptFontSize" | "bold" | "complexScriptBold" | "italic" | "complexScriptItalic" | "rtl" | "forceComplexScript" | "color">;
 /**
  * Hyperlink information for a run.
  */
@@ -416,6 +418,7 @@ declare const isListNumPr: (value: ParagraphNumberingOverride | null | undefined
  * Paragraph block attributes.
  */
 type ParagraphAttrs = {
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   alignment?: "left" | "center" | "right" | "justify";
   /** Document-generation policy for justified line fitting. */
   justificationCompatibility?: {

package/dist/layout-painter/renderPage.d.ts

@@ -93,6 +93,7 @@ type PaintPageRequest = {
   readonly options: RenderPageOptions;
 };
 type RenderPageOptions = {
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   /** Document to create elements in (default: window.document) */
   document?: Document;
   /** Bookmark name -> 1-indexed page, for resolving PAGEREF fields at paint. */

package/dist/layout-painter/renderPage.js

@@ -1,3 +1,4 @@
+import { embeddedFontFingerprint } from "../fonts/embeddedFontFingerprint.js";
 import "../layout-engine/measure/floatingLineClearance.js";
 import { resolveFloatingTableX } from "../layout-engine/measure/floatingTablePosition.js";
 import { rectsToFloatingZones } from "../layout-engine/measure/floatingZones.js";
@@ -59,7 +60,7 @@ function applyPageStyles(element, width, height, options) {
 	element.style.border = "none";
 	element.style.boxShadow = "none";
 	element.style.outline = "none";
-	element.style.fontFamily = getDefaultPageFontFamily();
+	element.style.fontFamily = resolveFontFamily(DEFAULT_FONT_FAMILY, options).cssFallback;
 	element.style.fontSize = `${1056 / 72}px`;
 	element.style.color = "var(--doc-canvas-text, #000)";
 }
@@ -179,7 +180,10 @@ function syncPageWatermarkOverlay(pageEl, page, options, doc) {
 	for (const stale of Array.from(pageEl.querySelectorAll(":scope > .layout-page-watermark"))) stale.remove();
 	const watermark = options.watermark;
 	if (!watermark) return;
-	const overlay = renderWatermarkLayer(watermark, page, doc, options.watermarkImageSrc !== void 0 ? { imageSrc: options.watermarkImageSrc } : {});
+	const overlay = renderWatermarkLayer(watermark, page, doc, {
+		...options.watermarkImageSrc !== void 0 ? { imageSrc: options.watermarkImageSrc } : {},
+		...options.embeddedFontFamilyMap ? { embeddedFontFamilyMap: options.embeddedFontFamilyMap } : {}
+	});
 	if (!overlay) return;
 	const contentEl = pageEl.querySelector(`:scope > .${PAGE_CLASS_NAMES.content}`);
 	if (contentEl) {
@@ -785,7 +789,10 @@ function renderPage(page, context, options = {}) {
 	const pageBorderEl = renderPageBorderOverlay(page, options, doc);
 	if (pageBorderEl && options.pageBorders?.zOrder === "back") pageEl.append(pageBorderEl);
 	if (options.watermark) {
-		const watermarkEl = renderWatermarkLayer(options.watermark, page, doc, options.watermarkImageSrc !== void 0 ? { imageSrc: options.watermarkImageSrc } : {});
+		const watermarkEl = renderWatermarkLayer(options.watermark, page, doc, {
+			...options.watermarkImageSrc !== void 0 ? { imageSrc: options.watermarkImageSrc } : {},
+			...options.embeddedFontFamilyMap ? { embeddedFontFamilyMap: options.embeddedFontFamilyMap } : {}
+		});
 		if (watermarkEl) pageEl.append(watermarkEl);
 	}
 	const contentEl = doc.createElement("div");
@@ -1403,6 +1410,7 @@ function headerFooterContentFingerprint(prefix, entries) {
 */
 function computeOptionsHash(options) {
 	const parts = [];
+	if (options.embeddedFontFamilyMap) parts.push(`embedded-fonts:${embeddedFontFingerprint(options.embeddedFontFamilyMap)}`);
 	if (options.headerContent) parts.push(`hdr:${options.headerContent.blocks.length},${options.headerContent.height},${options.headerContent.visualTop ?? 0},${options.headerContent.visualBottom ?? options.headerContent.height},${options.headerContent.rId ?? ""},${options.headerContent.textSig ?? ""}`);
 	if (options.footerContent) parts.push(`ftr:${options.footerContent.blocks.length},${options.footerContent.height},${options.footerContent.visualTop ?? 0},${options.footerContent.visualBottom ?? options.footerContent.height},${options.footerContent.rId ?? ""},${options.footerContent.textSig ?? ""}`);
 	parts.push(...headerFooterContentFingerprint("hdr-map", options.headerContentByRId));

package/dist/layout-painter/renderParagraph.js

@@ -190,7 +190,10 @@ const UNICODE_BIDI_BY_WRAPPER_CONTROL = {
 * Apply text run styles to an element
 */
 function applyRunStyles(element, run) {
-	if (run.fontFamily) element.style.fontFamily = resolveFontFamily(run.fontFamily, run.alternateFontFamily).cssFallback;
+	if (run.fontFamily) element.style.fontFamily = resolveFontFamily(run.fontFamily, {
+		alternateFontName: run.alternateFontFamily,
+		embeddedFontFamilyMap: run.embeddedFontFamilyMap
+	}).cssFallback;
 	if (run.fontSize) element.style.fontSize = `${fontSizePtToPx(run.fontSize)}px`;
 	if (run.bold) element.style.fontWeight = "700";
 	if (run.italic) element.style.fontStyle = "italic";
@@ -1043,6 +1046,7 @@ function runVisualSpaceContraction({ text, horizontalScale, visualSpaceContracti
 */
 function runMeasureStyle(run) {
 	return {
+		...run.embeddedFontFamilyMap ? { embeddedFontFamilyMap: run.embeddedFontFamilyMap } : {},
 		...run.bold !== void 0 ? { bold: run.bold } : {},
 		...run.italic !== void 0 ? { italic: run.italic } : {},
 		...run.letterSpacing !== void 0 ? { letterSpacing: run.letterSpacing } : {},
@@ -1168,7 +1172,10 @@ function createTextMeasurer(doc) {
 			if (style.smallCaps) fontPrefixParts.push("small-caps");
 			if (bold) fontPrefixParts.push("700");
 			fontPrefixParts.push(`${size * 96 / 72}px`);
-			return `${fontPrefixParts.join(" ")} ${resolveFontFamily(family, alternateFamily).cssFallback}`;
+			return `${fontPrefixParts.join(" ")} ${resolveFontFamily(family, {
+				alternateFontName: alternateFamily,
+				embeddedFontFamilyMap: style.embeddedFontFamilyMap
+			}).cssFallback}`;
 		};
 		const baseFont = fontString(fontFamily, fontSize, style.bold, style.italic, style.alternateFontFamily);
 		const complex = resolveComplexScriptFormatting(style);
@@ -1670,7 +1677,10 @@ function renderListMarker({ marker, inlineWidth, visualOffset, doc, formatting,
 	const span = doc.createElement("span");
 	span.className = "layout-list-marker";
 	span.style.display = "inline-block";
-	span.style.fontFamily = resolveFontFamily(formatting.fontFamily, formatting.alternateFontFamily).cssFallback;
+	span.style.fontFamily = resolveFontFamily(formatting.fontFamily, {
+		alternateFontName: formatting.alternateFontFamily,
+		embeddedFontFamilyMap: formatting.embeddedFontFamilyMap
+	}).cssFallback;
 	if (formatting.fontSize) span.style.fontSize = `${formatting.fontSize * 96 / 72}px`;
 	if (formatting.bold !== void 0) span.style.fontWeight = formatting.bold ? "700" : "normal";
 	if (formatting.italic !== void 0) span.style.fontStyle = formatting.italic ? "italic" : "normal";

package/dist/layout-painter/renderWatermark.d.ts

@@ -2,6 +2,7 @@ import { document_d_exports } from "../types/document.js";
 import { Page } from "../layout-engine/types.js";
 //#region src/layout-painter/renderWatermark.d.ts
 type RenderWatermarkOptions = {
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   /** Resolved image src for picture watermarks (`data:` / `blob:` only). */
   imageSrc?: string;
 };

package/dist/layout-painter/renderWatermark.js

@@ -25,7 +25,11 @@ function renderWatermarkLayer(watermark, page, doc, options = {}) {
 	layer.style.display = "flex";
 	layer.style.alignItems = "center";
 	layer.style.justifyContent = "center";
-	if (watermark.kind === "text") layer.append(renderTextWatermark(watermark, doc));
+	if (watermark.kind === "text") layer.append(renderTextWatermark({
+		watermark,
+		doc,
+		options
+	}));
 	else {
 		const imageSrc = options.imageSrc;
 		if (!imageSrc) return null;
@@ -33,10 +37,10 @@ function renderWatermarkLayer(watermark, page, doc, options = {}) {
 	}
 	return layer;
 }
-function renderTextWatermark(watermark, doc) {
+function renderTextWatermark({ watermark, doc, options }) {
 	const el = doc.createElement("div");
 	el.textContent = watermark.text;
-	el.style.fontFamily = resolveFontFamily(watermark.font ?? "Calibri").cssFallback;
+	el.style.fontFamily = resolveFontFamily(watermark.font ?? "Calibri", options).cssFallback;
 	el.style.fontSize = "144px";
 	el.style.fontWeight = "bold";
 	el.style.whiteSpace = "nowrap";

package/dist/managers/AutoSaveManager.js

@@ -1,3 +1,4 @@
+import { encodeUtf8 } from "../utils/textEncoding.js";
 import { Subscribable } from "./Subscribable.js";
 import { decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelopeFromDocument } from "./autoSaveCodec.js";
 //#region src/managers/AutoSaveManager.ts
@@ -228,7 +229,7 @@ function getAutoSaveStorageSize(storageKey = DEFAULT_STORAGE_KEY) {
 	try {
 		const data = localStorage.getItem(storageKey);
 		if (!data) return 0;
-		return new Blob([data]).size;
+		return encodeUtf8(data).byteLength;
 	} catch {
 		return 0;
 	}

package/dist/managers/EditorModeManager.d.ts

@@ -5,6 +5,15 @@ type EditorMode = "editing" | "suggesting" | "viewing";
 /** How tracked changes render. Drives the display mode dropdown. */
 declare const DISPLAY_MODES: readonly ["all-markup", "simple-markup", "no-markup", "original"];
 type DisplayMode = (typeof DISPLAY_MODES)[number];
+/** Why a user action cannot edit the displayed document. */
+type EditorReadOnlyReason = "host-read-only" | "viewing-mode" | "review-display-mode";
+declare const getReviewViewReadOnlyReason: (displayMode: DisplayMode) => EditorReadOnlyReason | null;
+type EditorReadOnlyReasonOptions = {
+  editingMode: EditorMode;
+  readOnlyProp: boolean;
+  displayMode: DisplayMode;
+};
+declare const getEditorReadOnlyReason: ({ editingMode, readOnlyProp, displayMode }: EditorReadOnlyReasonOptions) => EditorReadOnlyReason | null;
 /** EditorModeManager snapshot. */
 type EditorModeSnapshot = {
   /** Uncontrolled internal editing mode (the host's controlled prop wins over this). */
@@ -26,4 +35,4 @@ declare class EditorModeManager extends Subscribable<EditorModeSnapshot> {
   setDisplayMode(mode: DisplayMode): void;
 }
 //#endregion
-export { DISPLAY_MODES, DisplayMode, EditorMode, EditorModeManager, EditorModeSnapshot, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };
+export { DISPLAY_MODES, DisplayMode, EditorMode, EditorModeManager, EditorModeSnapshot, EditorReadOnlyReason, getEditorReadOnlyReason, getReviewViewReadOnlyReason, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };