@superdoc-dev/cli 0.16.0-next.20 → 0.16.0-next.22

package/dist/index.js

@@ -230111,7 +230111,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CEhzpYi5.es.js
+// ../../packages/superdoc/dist/chunks/src-B1aSE-tB.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -270389,6 +270389,187 @@ function computeTabWidth(currentPos, justification, tabs, hangingIndent, firstLi
     tabWidth = nextDefaultTabStop - currentPos;
   return tabWidth;
 }
+function isSettled(status) {
+  return SETTLED_STATUSES.includes(status);
+}
+function normalizeFamilyKey$2(family$1) {
+  return family$1.trim().replace(/^["']|["']$/g, "").toLowerCase();
+}
+function splitStack(cssFontFamily) {
+  return cssFontFamily.split(",").map((part) => part.trim()).filter(Boolean);
+}
+function createFontResolver() {
+  return new FontResolver;
+}
+function resolveFontFamily2(logicalFamily) {
+  return defaultResolver.resolveFontFamily(logicalFamily);
+}
+function resolvePhysicalFamily(cssFontFamily) {
+  return defaultResolver.resolvePhysicalFamily(cssFontFamily);
+}
+function resolvePrimaryPhysicalFamily(family$1) {
+  return defaultResolver.resolvePrimaryPhysicalFamily(family$1);
+}
+function getFontConfigVersion() {
+  return fontConfigVersion;
+}
+function bumpFontConfigVersion() {
+  return fontConfigVersion += 1;
+}
+function fourFaces(filePrefix) {
+  return [
+    {
+      weight: "normal",
+      style: "normal",
+      file: `${filePrefix}-Regular.woff2`
+    },
+    {
+      weight: "bold",
+      style: "normal",
+      file: `${filePrefix}-Bold.woff2`
+    },
+    {
+      weight: "normal",
+      style: "italic",
+      file: `${filePrefix}-Italic.woff2`
+    },
+    {
+      weight: "bold",
+      style: "italic",
+      file: `${filePrefix}-BoldItalic.woff2`
+    }
+  ];
+}
+function family(name, filePrefix, license) {
+  return {
+    family: name,
+    license,
+    faces: fourFaces(filePrefix)
+  };
+}
+function withTrailingSlash(base5) {
+  return base5.endsWith("/") ? base5 : `${base5}/`;
+}
+function joinUrl(base5, file) {
+  return `${withTrailingSlash(base5)}${file}`;
+}
+function weightToken(weight) {
+  return weight === "bold" ? "700" : "400";
+}
+function bundledAssetSignature(resolve3) {
+  const family$1 = BUNDLED_MANIFEST[0];
+  const face = family$1?.faces[0];
+  if (!family$1 || !face)
+    return "";
+  return resolve3({
+    file: face.file,
+    family: family$1.family,
+    weight: weightToken(face.weight),
+    style: face.style,
+    source: "bundled-substitute"
+  });
+}
+function installBundledSubstitutes(registry2, options = {}) {
+  const resolve3 = options.resolveAssetUrl ?? ((context) => joinUrl(options.assetBaseUrl ?? defaultAssetBase, context.file));
+  const signature = bundledAssetSignature(resolve3);
+  const installed = installedRegistries.get(registry2);
+  if (installed !== undefined) {
+    if (installed !== signature)
+      console.warn(`[superdoc] bundled fonts are already registered for this document from "${installed}"; a later fonts config resolving to "${signature}" is ignored. Use one fonts.assetBaseUrl / fonts.resolveAssetUrl per document.`);
+    return;
+  }
+  installedRegistries.set(registry2, signature);
+  for (const family$1 of BUNDLED_MANIFEST)
+    for (const face of family$1.faces) {
+      const context = {
+        file: face.file,
+        family: family$1.family,
+        weight: weightToken(face.weight),
+        style: face.style,
+        source: "bundled-substitute"
+      };
+      registry2.register({
+        family: family$1.family,
+        source: `url(${resolve3(context)})`,
+        descriptors: {
+          weight: face.weight,
+          style: face.style
+        }
+      });
+    }
+}
+function buildFontReport(logicalFamilies, registry2, resolver2) {
+  const seen = /* @__PURE__ */ new Set;
+  const report = [];
+  for (const logical of logicalFamilies) {
+    if (!logical || seen.has(logical))
+      continue;
+    seen.add(logical);
+    const { physicalFamily, reason } = resolver2 ? resolver2.resolveFontFamily(logical) : resolveFontFamily2(logical);
+    const loadStatus = registry2.getStatus(physicalFamily);
+    report.push({
+      logicalFamily: logical,
+      physicalFamily,
+      reason,
+      loadStatus,
+      exportFamily: logical,
+      missing: isSettled(loadStatus) && loadStatus !== "loaded"
+    });
+  }
+  return report;
+}
+function quoteFamily(family$1) {
+  return `"${family$1.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+}
+function canonicalizeFontSource(source) {
+  const match$1 = /^\s*url\(\s*([\s\S]*?)\s*\)\s*$/i.exec(source);
+  if (!match$1)
+    return source;
+  let inner = match$1[1].trim();
+  if (inner.startsWith('"') && inner.endsWith('"') || inner.startsWith("'") && inner.endsWith("'"))
+    inner = inner.slice(1, -1);
+  return `url(${JSON.stringify(inner)})`;
+}
+function normalizeFamilyKey$1(family$1) {
+  return family$1.trim().replace(/^["']|["']$/g, "").toLowerCase();
+}
+function normalizeWeight(weight) {
+  if (weight === undefined)
+    return "400";
+  const w = String(weight).trim().toLowerCase();
+  if (w === "bold" || w === "bolder")
+    return "700";
+  const n = Number(w);
+  return Number.isFinite(n) && n >= 600 ? "700" : "400";
+}
+function normalizeStyle$1(style2) {
+  if (!style2)
+    return "normal";
+  const s2 = style2.trim().toLowerCase();
+  return s2.startsWith("italic") || s2.startsWith("oblique") ? "italic" : "normal";
+}
+function faceKeyOf$1(family$1, weight, style2) {
+  return `${normalizeFamilyKey$1(family$1)}|${weight}|${style2}`;
+}
+function faceProbe(family$1, weight, style2, size$1) {
+  return `${style2 === "italic" ? "italic " : ""}${weight} ${size$1} ${quoteFamily(family$1)}`;
+}
+function getFontRegistryFor(fontSet, FontFaceCtor) {
+  if (!fontSet) {
+    if (!domlessRegistry)
+      domlessRegistry = new FontRegistry({});
+    return domlessRegistry;
+  }
+  let registry2 = registriesByFontSet.get(fontSet);
+  if (!registry2) {
+    registry2 = new FontRegistry({
+      fontSet,
+      FontFaceCtor
+    });
+    registriesByFontSet.set(fontSet, registry2);
+  }
+  return registry2;
+}
 function isResolvedFragmentWithBorders(item) {
   return item !== undefined && item.kind === "fragment" && "paragraphBorders" in item && item.paragraphBorders !== undefined;
 }
@@ -270598,205 +270779,6 @@ function renderPartialEmbeddedTable(params$1) {
     hasSdtContainerChrome: tableResult.hasSdtContainerChrome
   };
 }
-function isSettled(status) {
-  return SETTLED_STATUSES.includes(status);
-}
-function normalizeFamilyKey$2(family$1) {
-  return family$1.trim().replace(/^["']|["']$/g, "").toLowerCase();
-}
-function splitStack(cssFontFamily) {
-  return cssFontFamily.split(",").map((part) => part.trim()).filter(Boolean);
-}
-function physicalFor(bareFamily) {
-  const physical = BUNDLED_SUBSTITUTES[normalizeFamilyKey$2(bareFamily)];
-  return physical ? {
-    physical,
-    mapped: true
-  } : {
-    physical: bareFamily,
-    mapped: false
-  };
-}
-function resolveFontFamily2(logicalFamily) {
-  const { physical, mapped } = physicalFor(splitStack(logicalFamily)[0] ?? logicalFamily);
-  return {
-    logicalFamily,
-    physicalFamily: physical,
-    reason: mapped ? "bundled_substitute" : "as_requested"
-  };
-}
-function resolvePhysicalFamily(cssFontFamily) {
-  if (!cssFontFamily)
-    return cssFontFamily;
-  const parts = splitStack(cssFontFamily);
-  if (parts.length === 0)
-    return cssFontFamily;
-  const { physical, mapped } = physicalFor(parts[0]);
-  if (!mapped)
-    return cssFontFamily;
-  return [physical, ...parts.slice(1)].join(", ");
-}
-function resolvePrimaryPhysicalFamily(family$1) {
-  return physicalFor(splitStack(family$1)[0] ?? family$1).physical;
-}
-function resolvePhysicalFamilies(families) {
-  const out = /* @__PURE__ */ new Set;
-  for (const family$1 of families)
-    if (family$1)
-      out.add(resolvePrimaryPhysicalFamily(family$1));
-  return [...out];
-}
-function getFontConfigVersion() {
-  return fontConfigVersion;
-}
-function bumpFontConfigVersion() {
-  return fontConfigVersion += 1;
-}
-function fourFaces(filePrefix) {
-  return [
-    {
-      weight: "normal",
-      style: "normal",
-      file: `${filePrefix}-Regular.woff2`
-    },
-    {
-      weight: "bold",
-      style: "normal",
-      file: `${filePrefix}-Bold.woff2`
-    },
-    {
-      weight: "normal",
-      style: "italic",
-      file: `${filePrefix}-Italic.woff2`
-    },
-    {
-      weight: "bold",
-      style: "italic",
-      file: `${filePrefix}-BoldItalic.woff2`
-    }
-  ];
-}
-function family(name, filePrefix, license) {
-  return {
-    family: name,
-    license,
-    faces: fourFaces(filePrefix)
-  };
-}
-function withTrailingSlash(base5) {
-  return base5.endsWith("/") ? base5 : `${base5}/`;
-}
-function joinUrl(base5, file) {
-  return `${withTrailingSlash(base5)}${file}`;
-}
-function weightToken(weight) {
-  return weight === "bold" ? "700" : "400";
-}
-function bundledAssetSignature(resolve3) {
-  const family$1 = BUNDLED_MANIFEST[0];
-  const face = family$1?.faces[0];
-  if (!family$1 || !face)
-    return "";
-  return resolve3({
-    file: face.file,
-    family: family$1.family,
-    weight: weightToken(face.weight),
-    style: face.style,
-    source: "bundled-substitute"
-  });
-}
-function installBundledSubstitutes(registry2, options = {}) {
-  const resolve3 = options.resolveAssetUrl ?? ((context) => joinUrl(options.assetBaseUrl ?? defaultAssetBase, context.file));
-  const signature = bundledAssetSignature(resolve3);
-  const installed = installedRegistries.get(registry2);
-  if (installed !== undefined) {
-    if (installed !== signature)
-      console.warn(`[superdoc] bundled fonts are already registered for this document from "${installed}"; a later fonts config resolving to "${signature}" is ignored. Use one fonts.assetBaseUrl / fonts.resolveAssetUrl per document.`);
-    return;
-  }
-  installedRegistries.set(registry2, signature);
-  for (const family$1 of BUNDLED_MANIFEST)
-    for (const face of family$1.faces) {
-      const context = {
-        file: face.file,
-        family: family$1.family,
-        weight: weightToken(face.weight),
-        style: face.style,
-        source: "bundled-substitute"
-      };
-      registry2.register({
-        family: family$1.family,
-        source: `url(${resolve3(context)})`,
-        descriptors: {
-          weight: face.weight,
-          style: face.style
-        }
-      });
-    }
-}
-function buildFontReport(logicalFamilies, registry2) {
-  const seen = /* @__PURE__ */ new Set;
-  const report = [];
-  for (const logical of logicalFamilies) {
-    if (!logical || seen.has(logical))
-      continue;
-    seen.add(logical);
-    const { physicalFamily, reason } = resolveFontFamily2(logical);
-    const loadStatus = registry2.getStatus(physicalFamily);
-    report.push({
-      logicalFamily: logical,
-      physicalFamily,
-      reason,
-      loadStatus,
-      exportFamily: logical,
-      missing: isSettled(loadStatus) && loadStatus !== "loaded"
-    });
-  }
-  return report;
-}
-function quoteFamily(family$1) {
-  return `"${family$1.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
-}
-function normalizeFamilyKey$1(family$1) {
-  return family$1.trim().replace(/^["']|["']$/g, "").toLowerCase();
-}
-function normalizeWeight(weight) {
-  if (weight === undefined)
-    return "400";
-  const w = String(weight).trim().toLowerCase();
-  if (w === "bold" || w === "bolder")
-    return "700";
-  const n = Number(w);
-  return Number.isFinite(n) && n >= 600 ? "700" : "400";
-}
-function normalizeStyle$1(style2) {
-  if (!style2)
-    return "normal";
-  const s2 = style2.trim().toLowerCase();
-  return s2.startsWith("italic") || s2.startsWith("oblique") ? "italic" : "normal";
-}
-function faceKeyOf$1(family$1, weight, style2) {
-  return `${normalizeFamilyKey$1(family$1)}|${weight}|${style2}`;
-}
-function faceProbe(family$1, weight, style2, size$1) {
-  return `${style2 === "italic" ? "italic " : ""}${weight} ${size$1} ${quoteFamily(family$1)}`;
-}
-function getFontRegistryFor(fontSet, FontFaceCtor) {
-  if (!fontSet) {
-    if (!domlessRegistry)
-      domlessRegistry = new FontRegistry({});
-    return domlessRegistry;
-  }
-  let registry2 = registriesByFontSet.get(fontSet);
-  if (!registry2) {
-    registry2 = new FontRegistry({
-      fontSet,
-      FontFaceCtor
-    });
-    registriesByFontSet.set(fontSet, registry2);
-  }
-  return registry2;
-}
 function isDigit(ch) {
   return ch >= "0" && ch <= "9";
 }
@@ -271792,7 +271774,7 @@ function resolveFragmentSdtContainerKey(fragment2, blockMap) {
     return getSdtContainerKey(block.attrs?.sdt, block.attrs?.containerSdt);
   return null;
 }
-function computeBlockVersion(blockId, blockMap, cache$2) {
+function computeBlockVersion(blockId, blockMap, cache$2, fontSignature = "") {
   const cached = cache$2.get(blockId);
   if (cached !== undefined)
     return cached;
@@ -271802,8 +271784,9 @@ function computeBlockVersion(blockId, blockMap, cache$2) {
     return "missing";
   }
   const version$1 = deriveBlockVersion(entry.block);
-  cache$2.set(blockId, version$1);
-  return version$1;
+  const versioned = fontSignature ? `${fontSignature}|${version$1}` : version$1;
+  cache$2.set(blockId, versioned);
+  return versioned;
 }
 function applyPaintVersions(item, visualVersion) {
   const evidenceVersion = sourceAnchorSignature(item.sourceAnchor);
@@ -271814,9 +271797,9 @@ function applyPaintVersions(item, visualVersion) {
   } else
     item.paintCacheVersion = visualVersion;
 }
-function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache, story) {
+function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache, story, fontSignature = "") {
   const sdtContainerKey = resolveFragmentSdtContainerKey(fragment2, blockMap);
-  const version$1 = fragmentSignature(fragment2, computeBlockVersion(fragment2.blockId, blockMap, blockVersionCache));
+  const version$1 = fragmentSignature(fragment2, computeBlockVersion(fragment2.blockId, blockMap, blockVersionCache, fontSignature));
   const layoutSourceIdentity = resolveFragmentLayoutIdentity(fragment2, story);
   switch (fragment2.kind) {
     case "table": {
@@ -271919,6 +271902,7 @@ function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, bloc
 }
 function resolveLayout(input2) {
   const { layout, flowMode, blocks: blocks2, measures } = input2;
+  const fontSignature = input2.fontSignature ?? "";
   const blockMap = buildBlockMap(blocks2, measures);
   const blockVersionCache = /* @__PURE__ */ new Map;
   const pages = layout.pages.map((page, pageIndex) => ({
@@ -271929,7 +271913,7 @@ function resolveLayout(input2) {
     number: page.number,
     width: page.size?.w ?? layout.pageSize.w,
     height: page.size?.h ?? layout.pageSize.h,
-    items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache)),
+    items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache, undefined, fontSignature)),
     margins: page.margins,
     footnoteReserved: page.footnoteReserved,
     displayNumber: page.displayNumber,
@@ -271952,12 +271936,12 @@ function resolveLayout(input2) {
     ...layout.documentBackground ? { documentBackground: layout.documentBackground } : {}
   };
   if (blocks2.length > 0)
-    resolved.blockVersions = Object.fromEntries(blocks2.map((block) => [block.id, computeBlockVersion(block.id, blockMap, blockVersionCache)]));
+    resolved.blockVersions = Object.fromEntries(blocks2.map((block) => [block.id, computeBlockVersion(block.id, blockMap, blockVersionCache, fontSignature)]));
   if (layout.layoutEpoch != null)
     resolved.layoutEpoch = layout.layoutEpoch;
   return resolved;
 }
-function resolveHeaderFooterLayout(layout, blocks2, measures, story) {
+function resolveHeaderFooterLayout(layout, blocks2, measures, story, fontSignature = "") {
   const pages = layout.pages.map((page) => {
     const blockMap = buildBlockMap(page.blocks ?? blocks2, page.measures ?? measures);
     const blockVersionCache = /* @__PURE__ */ new Map;
@@ -271968,7 +271952,7 @@ function resolveHeaderFooterLayout(layout, blocks2, measures, story) {
       pageNumberFormat: page.pageNumberFormat,
       pageNumberChapterText: page.pageNumberChapterText,
       pageNumberChapterSeparator: page.pageNumberChapterSeparator,
-      items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, page.number - 1, blockMap, blockVersionCache, story))
+      items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, page.number - 1, blockMap, blockVersionCache, story, fontSignature))
     };
   });
   return {
@@ -277584,7 +277568,7 @@ function hasPageNumberTokensRequiringPerPageLayout(blocks2) {
     }
   return false;
 }
-async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1, cache$2 = sharedHeaderFooterCache, totalPages, pageResolver, kind) {
+async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1, cache$2 = sharedHeaderFooterCache, totalPages, pageResolver, kind, fontSignature = "") {
   const result = {};
   if (!pageResolver) {
     const numPages = totalPages ?? 1;
@@ -277593,7 +277577,7 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
         continue;
       const clonedBlocks = cloneHeaderFooterBlocks(blocks2);
       resolveHeaderFooterTokens(clonedBlocks, 1, numPages);
-      const measures = await cache$2.measureBlocks(clonedBlocks, constraints, measureBlock$1);
+      const measures = await cache$2.measureBlocks(clonedBlocks, constraints, measureBlock$1, fontSignature);
       result[type] = {
         blocks: clonedBlocks,
         measures,
@@ -277610,7 +277594,7 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
     if (!blocks2 || blocks2.length === 0)
       continue;
     if (!hasPageTokens(blocks2)) {
-      const measures = await cache$2.measureBlocks(blocks2, constraints, measureBlock$1);
+      const measures = await cache$2.measureBlocks(blocks2, constraints, measureBlock$1, fontSignature);
       result[type] = {
         blocks: blocks2,
         measures,
@@ -277635,7 +277619,7 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
       const clonedBlocks = cloneHeaderFooterBlocks(blocks2);
       const { displayText, displayNumber, totalPages: totalPagesForPage, sectionPageCount, pageFormat, chapterNumberText, chapterSeparator } = pageResolver(pageNum);
       resolveHeaderFooterTokens(clonedBlocks, pageNum, totalPagesForPage, displayText, displayNumber, sectionPageCount, pageFormat, chapterNumberText, chapterSeparator);
-      const measures = await cache$2.measureBlocks(clonedBlocks, constraints, measureBlock$1);
+      const measures = await cache$2.measureBlocks(clonedBlocks, constraints, measureBlock$1, fontSignature);
       const pageLayout = layoutHeaderFooter(clonedBlocks, measures, constraints, kind);
       const measuresById = /* @__PURE__ */ new Map;
       for (let i4 = 0;i4 < clonedBlocks.length; i4 += 1)
@@ -278420,7 +278404,9 @@ function invalidateHeaderFooterCache(cache$2, cacheState, headerBlocks, footerBl
     HeaderFooterCacheLogger.logInvalidation(invalidationReasons.join(", "), uniqueBlockIds);
   }
 }
-async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, options, measureBlock$1, headerFooter, previousMeasures) {
+async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, options, measureBlock$1, headerFooter, previousMeasures, fontRuntime) {
+  const fontSignature = fontRuntime?.fontContext?.fontSignature ?? "";
+  const previousFontSignature = fontRuntime?.previousFontSignature ?? "";
   const isSemanticFlow = options.flowMode === "semantic";
   if (isSemanticFlow) {
     headerFooter = undefined;
@@ -278435,7 +278421,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     throw new Error("incrementalLayout: invalid measurement constraints resolved from options");
   const hasPreviousMeasures = Array.isArray(previousMeasures) && previousMeasures.length === previousBlocks.length;
   const previousConstraints = hasPreviousMeasures && !isSemanticFlow ? resolveMeasurementConstraints(options, previousBlocks) : null;
-  const canReusePreviousMeasures = hasPreviousMeasures && previousConstraints?.measurementWidth === measurementWidth && previousConstraints?.measurementHeight === measurementHeight;
+  const canReusePreviousMeasures = hasPreviousMeasures && fontSignature === previousFontSignature && previousConstraints?.measurementWidth === measurementWidth && previousConstraints?.measurementHeight === measurementHeight;
   const previousPerSectionConstraints = canReusePreviousMeasures ? computePerSectionConstraints(options, previousBlocks) : null;
   const previousMeasuresById = canReusePreviousMeasures ? new Map(previousBlocks.map((block, index2) => [block.id, previousMeasures[index2]])) : null;
   const previousConstraintsById = canReusePreviousMeasures ? new Map(previousBlocks.map((block, index2) => [block.id, previousPerSectionConstraints[index2]])) : null;
@@ -278465,7 +278451,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       }
     }
     const lookupStart = performance.now();
-    const cached = measureCache.get(block, blockMeasureWidth, blockMeasureHeight);
+    const cached = measureCache.get(block, blockMeasureWidth, blockMeasureHeight, fontSignature);
     cacheLookupTime += performance.now() - lookupStart;
     if (cached) {
       measures.push(cached);
@@ -278475,7 +278461,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     const measureBlockStart = performance.now();
     const measurement = await measureBlock$1(block, sectionConstraints);
     actualMeasureTime += performance.now() - measureBlockStart;
-    measureCache.set(block, blockMeasureWidth, blockMeasureHeight, measurement);
+    measureCache.set(block, blockMeasureWidth, blockMeasureHeight, measurement, fontSignature);
     measures.push(measurement);
     cacheMisses++;
   }
@@ -278536,7 +278522,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     };
     headerContentHeights = {};
     if (hasHeaderBlocks && headerFooter.headerBlocks) {
-      const preHeaderLayouts = await layoutHeaderFooterWithCache(headerFooter.headerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT, prelayoutPageResolver, "header");
+      const preHeaderLayouts = await layoutHeaderFooterWithCache(headerFooter.headerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT, prelayoutPageResolver, "header", fontSignature);
       for (const [type, value] of Object.entries(preHeaderLayouts)) {
         if (!isValidHeaderType(type))
           continue;
@@ -278577,7 +278563,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     footerContentHeights = {};
     try {
       if (hasFooterBlocks && headerFooter.footerBlocks) {
-        const preFooterLayouts = await layoutHeaderFooterWithCache(headerFooter.footerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT, prelayoutPageResolver, "footer");
+        const preFooterLayouts = await layoutHeaderFooterWithCache(headerFooter.footerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT, prelayoutPageResolver, "footer", fontSignature);
         for (const [type, value] of Object.entries(preFooterLayouts)) {
           if (!isValidFooterType(type))
             continue;
@@ -278640,7 +278626,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       measureCache.invalidate(Array.from(tokenResult.affectedBlockIds));
       const remeasureStart = performance.now();
       const currentPerSectionConstraints = computePerSectionConstraints(options, currentBlocks);
-      currentMeasures = await remeasureAffectedBlocks(currentBlocks, currentMeasures, tokenResult.affectedBlockIds, currentPerSectionConstraints, measureBlock$1, measureCache);
+      currentMeasures = await remeasureAffectedBlocks(currentBlocks, currentMeasures, tokenResult.affectedBlockIds, currentPerSectionConstraints, measureBlock$1, fontSignature, measureCache);
       const remeasureTime = performance.now() - remeasureStart;
       totalRemeasureTime += remeasureTime;
       perfLog$1(`[Perf] 4.3.${iteration + 1}.1 Re-measure: ${remeasureTime.toFixed(2)}ms`);
@@ -278717,13 +278703,13 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
         const blocks2 = Array.from(needed.values());
         const measuresById$1 = /* @__PURE__ */ new Map;
         await Promise.all(blocks2.map(async (block) => {
-          const cached = measureCache.get(block, footnoteConstraints.maxWidth, footnoteConstraints.maxHeight);
+          const cached = measureCache.get(block, footnoteConstraints.maxWidth, footnoteConstraints.maxHeight, fontSignature);
           if (cached) {
             measuresById$1.set(block.id, cached);
             return;
           }
           const measurement = await measureBlock$1(block, footnoteConstraints);
-          measureCache.set(block, footnoteConstraints.maxWidth, footnoteConstraints.maxHeight, measurement);
+          measureCache.set(block, footnoteConstraints.maxWidth, footnoteConstraints.maxHeight, measurement, fontSignature);
           measuresById$1.set(block.id, measurement);
         }));
         return {
@@ -279679,9 +279665,9 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       };
     } : undefined;
     if (headerFooter.headerBlocks)
-      headers = serializeHeaderFooterResults("header", await layoutHeaderFooterWithCache(headerFooter.headerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? undefined : numberingCtx.totalPages, pageResolver, "header"));
+      headers = serializeHeaderFooterResults("header", await layoutHeaderFooterWithCache(headerFooter.headerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? undefined : numberingCtx.totalPages, pageResolver, "header", fontSignature));
     if (headerFooter.footerBlocks)
-      footers = serializeHeaderFooterResults("footer", await layoutHeaderFooterWithCache(headerFooter.footerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? undefined : numberingCtx.totalPages, pageResolver, "footer"));
+      footers = serializeHeaderFooterResults("footer", await layoutHeaderFooterWithCache(headerFooter.footerBlocks, headerFooter.constraints, measureFn, headerMeasureCache, FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? undefined : numberingCtx.totalPages, pageResolver, "footer", fontSignature));
     perfLog$1(`[Perf] 4.4 Header/footer layout: ${(performance.now() - hfStart).toFixed(2)}ms`);
     const cacheStats = headerMeasureCache.getStats();
     globalMetrics.recordHeaderFooterCacheMetrics(cacheStats);
@@ -279958,7 +279944,7 @@ function buildNumberingContext(layout, sections, blockById, chapterContextCache)
     }))
   };
 }
-async function remeasureAffectedBlocks(blocks2, measures, affectedBlockIds, perBlockConstraints, measureBlock$1, measureCache$1) {
+async function remeasureAffectedBlocks(blocks2, measures, affectedBlockIds, perBlockConstraints, measureBlock$1, fontSignature, measureCache$1) {
   const updatedMeasures = [...measures];
   for (let i4 = 0;i4 < blocks2.length; i4++) {
     const block = blocks2[i4];
@@ -279968,7 +279954,7 @@ async function remeasureAffectedBlocks(blocks2, measures, affectedBlockIds, perB
       const newMeasure = await measureBlock$1(block, perBlockConstraints[i4]);
       updatedMeasures[i4] = newMeasure;
       const blockConstraints = perBlockConstraints[i4];
-      measureCache$1?.set(block, blockConstraints.maxWidth, blockConstraints.maxHeight, newMeasure);
+      measureCache$1?.set(block, blockConstraints.maxWidth, blockConstraints.maxHeight, newMeasure, fontSignature);
     } catch (error3) {
       console.warn(`[incrementalLayout] Failed to re-measure block ${block.id} after token resolution:`, error3);
     }
@@ -285800,8 +285786,10 @@ function clearTableAutoFitMeasurementCaches() {
   autoFitTableResultCache.clear();
 }
 function buildTableCellContentMetricsCacheKey(cell2, options) {
+  const fontContext = options.fontContext ?? DEFAULT_FONT_MEASURE_CONTEXT;
   return stableSerialize({
     maxWidth: Math.max(1, Math.round(options.maxWidth)),
+    fontSignature: fontContext.fontSignature ?? "",
     layoutEpoch: options.layoutEpoch ?? null,
     attrs: cell2.attrs ?? null,
     paragraph: cell2.paragraph ?? null,
@@ -285815,6 +285803,7 @@ function buildAutoFitTableResultCacheKey(table2, options) {
     columnWidths: table2.columnWidths ?? null,
     rowCount: table2.rows.length,
     maxWidth: Math.max(1, Math.round(options.maxWidth)),
+    fontSignature: options.fontSignature ?? "",
     layoutEpoch: options.layoutEpoch ?? null,
     cellMetricKeys: options.cellMetricKeys,
     workingGrid: {
@@ -285854,7 +285843,12 @@ function setCachedAutoFitTableResult(cacheKey, result) {
   autoFitTableResultCache.set(cacheKey, result);
 }
 async function measureTableCellContentMetrics(cell2, options) {
-  const cacheKey = buildTableCellContentMetricsCacheKey(cell2, options);
+  const fontContext = options.fontContext ?? DEFAULT_FONT_MEASURE_CONTEXT;
+  const normalizedOptions = {
+    ...options,
+    fontContext
+  };
+  const cacheKey = buildTableCellContentMetricsCacheKey(cell2, normalizedOptions);
   const cached = tableCellMetricsCache.get(cacheKey);
   if (cached)
     return cached;
@@ -285871,7 +285865,7 @@ async function measureTableCellContentMetrics(cell2, options) {
   let minContentWidthPx = 0;
   let maxContentWidthPx = 0;
   for (const block of contentBlocks) {
-    const metrics = await measureIntrinsicBlockWidthMetrics(block, options);
+    const metrics = await measureIntrinsicBlockWidthMetrics(block, normalizedOptions);
     minContentWidthPx = Math.max(minContentWidthPx, metrics.minWidthPx);
     maxContentWidthPx = Math.max(maxContentWidthPx, metrics.maxWidthPx);
   }
@@ -285882,7 +285876,7 @@ async function measureTableCellContentMetrics(cell2, options) {
   tableCellMetricsCache.set(cacheKey, result);
   return result;
 }
-async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayout, measureBlock$1) {
+async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayout, measureBlock$1, fontContext = DEFAULT_FONT_MEASURE_CONTEXT) {
   const tableMeasurementBasis = Math.max(1, fixedLayout.totalWidth);
   const cellMetricKeys = [];
   const rowMetrics = await Promise.all(table2.rows.map(async (row2, rowIndex) => {
@@ -285893,10 +285887,14 @@ async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayo
         const normalizedCell = normalizedRow.cells?.[cellIndex];
         const span = normalizedCell?.span ?? cell2.colSpan ?? 1;
         const measurementMaxWidth = resolveAutoFitCellMeasurementMaxWidth(cell2, normalizedCell, span, fixedLayout, tableMeasurementBasis, workingInput.gridColumnCount);
-        cellMetricKeys.push(buildTableCellContentMetricsCacheKey(cell2, { maxWidth: measurementMaxWidth }));
+        cellMetricKeys.push(buildTableCellContentMetricsCacheKey(cell2, {
+          maxWidth: measurementMaxWidth,
+          fontContext
+        }));
         const metrics = await measureTableCellContentMetrics(cell2, {
           maxWidth: measurementMaxWidth,
-          measureBlock: measureBlock$1
+          measureBlock: measureBlock$1,
+          fontContext
         });
         return {
           cellIndex,
@@ -285928,7 +285926,7 @@ async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayo
 }
 async function measureIntrinsicBlockWidthMetrics(block, options) {
   if (block.kind === "paragraph")
-    return measureParagraphIntrinsicWidthMetrics(block, options.measureBlock);
+    return measureParagraphIntrinsicWidthMetrics(block, options.measureBlock, options.fontContext);
   if (block.kind === "table")
     return measureNestedTableIntrinsicWidthMetrics(block, options);
   const intrinsicWidth = getIntrinsicAtomicBlockWidth(block);
@@ -285937,13 +285935,13 @@ async function measureIntrinsicBlockWidthMetrics(block, options) {
     maxWidthPx: intrinsicWidth
   };
 }
-async function measureParagraphIntrinsicWidthMetrics(paragraph2, measureBlock$1) {
+async function measureParagraphIntrinsicWidthMetrics(paragraph2, measureBlock$1, fontContext) {
   const maxLineWidth = (await measureBlock$1(paragraph2, {
     maxWidth: NO_WRAP_MAX_WIDTH,
     maxHeight: Infinity
   })).lines.reduce((widest, line) => Math.max(widest, line.width), 0);
   return {
-    minWidthPx: measureParagraphMinTokenWidth(paragraph2),
+    minWidthPx: measureParagraphMinTokenWidth(paragraph2, fontContext),
     maxWidthPx: maxLineWidth
   };
 }
@@ -285962,7 +285960,7 @@ async function measureNestedTableIntrinsicWidthMetrics(table2, options) {
     maxWidthPx: nestedMeasure.totalWidth
   };
 }
-function measureParagraphMinTokenWidth(paragraph2) {
+function measureParagraphMinTokenWidth(paragraph2, fontContext) {
   let widestToken = 0;
   let currentTokenWidth = 0;
   const flushToken = () => {
@@ -285977,7 +285975,7 @@ function measureParagraphMinTokenWidth(paragraph2) {
     if (isTextLikeRun(run2)) {
       accumulateTextRunMinTokenWidth(run2, (width) => {
         currentTokenWidth += width;
-      }, flushToken);
+      }, flushToken, fontContext);
       continue;
     }
     flushToken();
@@ -285986,7 +285984,7 @@ function measureParagraphMinTokenWidth(paragraph2) {
       continue;
     }
     if (run2.kind === "fieldAnnotation") {
-      widestToken = Math.max(widestToken, measureFieldAnnotationWidth(run2));
+      widestToken = Math.max(widestToken, measureFieldAnnotationWidth(run2, fontContext));
       continue;
     }
     if (run2.kind === "math")
@@ -285995,8 +285993,8 @@ function measureParagraphMinTokenWidth(paragraph2) {
   flushToken();
   return widestToken;
 }
-function accumulateTextRunMinTokenWidth(run2, appendTokenPiece, flushToken) {
-  const font = buildFontString$1(run2);
+function accumulateTextRunMinTokenWidth(run2, appendTokenPiece, flushToken, fontContext) {
+  const font = buildFontString$1(run2, fontContext);
   let cursor = 0;
   for (const boundary of run2.text.matchAll(TOKEN_BOUNDARY_PATTERN)) {
     const boundaryStart = boundary.index ?? cursor;
@@ -286062,14 +286060,15 @@ function getCanvasContext$1() {
   }
   return canvasContext$1;
 }
-function buildFontString$1(run2) {
+function buildFontString$1(run2, fontContext) {
   const parts = [];
   if (run2.italic)
     parts.push("italic");
   if (run2.bold)
     parts.push("bold");
   parts.push(`${normalizeFontSize$1(run2.fontSize)}px`);
-  parts.push(toCssFontFamily(normalizeFontFamily$1(run2.fontFamily)) ?? normalizeFontFamily$1(run2.fontFamily));
+  const physicalFamily = normalizeFontFamily$1(fontContext.resolvePhysical(normalizeFontFamily$1(run2.fontFamily)));
+  parts.push(toCssFontFamily(physicalFamily) ?? physicalFamily);
   return parts.join(" ");
 }
 function applyTextTransform$1(text5, run2, startOffset = 0) {
@@ -286094,14 +286093,14 @@ function capitalizeText$1(text5, fullText, startOffset) {
   }
   return result;
 }
-function measureFieldAnnotationWidth(run2) {
+function measureFieldAnnotationWidth(run2, fontContext) {
   const fontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1 : DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1;
   const font = buildFontString$1({
     fontFamily: normalizeFontFamily$1(run2.fontFamily ?? "Arial"),
     fontSize,
     bold: run2.bold,
     italic: run2.italic
-  });
+  }, fontContext);
   return getMeasuredTextWidth(applyTextTransform$1(run2.displayLabel || "", { text: run2.displayLabel || "" }), font, 0, getCanvasContext$1()) + (run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING$1);
 }
 function isExplicitLineBreakRun(run2) {
@@ -286175,14 +286174,14 @@ function getCanvasContext() {
   }
   return canvasContext;
 }
-function buildFontString(run2) {
+function buildFontString(run2, fontContext) {
   const parts = [];
   if (run2.italic)
     parts.push("italic");
   if (run2.bold)
     parts.push("bold");
   parts.push(`${run2.fontSize}px`);
-  const physicalFamily = resolvePhysicalFamily(run2.fontFamily);
+  const physicalFamily = fontContext.resolvePhysical(run2.fontFamily);
   if (measurementConfig.mode === "deterministic")
     parts.push(measurementConfig.fonts.fallbackStack.length > 0 ? measurementConfig.fonts.fallbackStack.join(", ") : measurementConfig.fonts.deterministicFamily);
   else
@@ -286247,17 +286246,17 @@ function calculateEmptyParagraphMetrics(fontSize, spacing, fontInfo) {
 function lineHeightFontSize(run2) {
   return resolveBaseFontSizeForVerticalText(run2.fontSize, run2);
 }
-function getFontInfoFromRun(run2) {
+function getFontInfoFromRun(run2, fontContext) {
   return {
-    fontFamily: normalizeFontFamily(run2.fontFamily),
+    fontFamily: normalizeFontFamily(fontContext.resolvePhysical(run2.fontFamily)),
     fontSize: normalizeFontSize2(lineHeightFontSize(run2)),
     bold: run2.bold,
     italic: run2.italic
   };
 }
-function updateMaxFontInfo(currentMaxSize, currentMaxInfo, newRun) {
+function updateMaxFontInfo(currentMaxSize, currentMaxInfo, newRun, fontContext) {
   if (lineHeightFontSize(newRun) >= currentMaxSize)
-    return getFontInfoFromRun(newRun);
+    return getFontInfoFromRun(newRun, fontContext);
   return currentMaxInfo;
 }
 function isTextRun$22(run2) {
@@ -286275,7 +286274,7 @@ function isLineBreakRun(run2) {
 function isFieldAnnotationRun(run2) {
   return run2.kind === "fieldAnnotation";
 }
-function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator = ".") {
+function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator = ".", fontContext) {
   const result = {
     totalWidth: 0,
     runs: [],
@@ -286296,7 +286295,7 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
       const textRun = run2;
       const text5 = textRun.text || "";
       if (text5.length > 0) {
-        const { font } = buildFontString(textRun);
+        const { font } = buildFontString(textRun, fontContext);
         const width = measureRunWidth(text5, font, ctx$1, textRun, 0);
         let beforeDecimalWidth;
         if (!foundDecimal) {
@@ -286350,7 +286349,7 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
         fontSize,
         bold: run2.bold,
         italic: run2.italic
-      });
+      }, fontContext);
       const pillWidth = (run2.displayLabel ? measureRunWidth(run2.displayLabel, font, ctx$1, run2, 0) : 0) + FIELD_ANNOTATION_PILL_PADDING;
       result.runs.push({
         runIndex: i4,
@@ -286366,25 +286365,25 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
   }
   return result;
 }
-async function measureBlock(block, constraints) {
+async function measureBlock(block, constraints, fontContext = DEFAULT_FONT_MEASURE_CONTEXT) {
   const normalized = normalizeConstraints(constraints);
   if (block.kind === "drawing")
     return measureDrawingBlock(block, normalized);
   if (block.kind === "image")
     return measureImageBlock(block, normalized);
   if (block.kind === "list")
-    return measureListBlock(block, normalized);
+    return measureListBlock(block, normalized, fontContext);
   if (block.kind === "table")
-    return measureTableBlock(block, normalized);
+    return measureTableBlock(block, normalized, fontContext);
   if (block.kind === "sectionBreak")
     return { kind: "sectionBreak" };
   if (block.kind === "pageBreak")
     return { kind: "pageBreak" };
   if (block.kind === "columnBreak")
     return { kind: "columnBreak" };
-  return measureParagraphBlock(block, normalized.maxWidth);
+  return measureParagraphBlock(block, normalized.maxWidth, fontContext);
 }
-async function measureParagraphBlock(block, maxWidth) {
+async function measureParagraphBlock(block, maxWidth, fontContext) {
   const ctx$1 = getCanvasContext();
   const wordLayout = block.attrs?.wordLayout;
   const firstTextRunWithSize = block.runs.find((run2) => isTextRun$22(run2) && ("fontSize" in run2) && run2.fontSize != null);
@@ -286397,7 +286396,7 @@ async function measureParagraphBlock(block, maxWidth) {
       fontSize: wordLayout.marker.run.fontSize ?? fallbackFontSize,
       bold: wordLayout.marker.run.bold,
       italic: wordLayout.marker.run.italic
-    });
+    }, fontContext);
     const markerText = wordLayout.marker.markerText ?? "";
     const glyphWidth = markerText ? measureText(markerText, markerFont, ctx$1) : 0;
     const gutter = typeof wordLayout.marker.gutterWidthPx === "number" && isFinite(wordLayout.marker.gutterWidthPx) && wordLayout.marker.gutterWidthPx >= 0 ? wordLayout.marker.gutterWidthPx : 8;
@@ -286430,7 +286429,7 @@ async function measureParagraphBlock(block, maxWidth) {
       fontSize: marker.run?.fontSize ?? fallbackFontSize,
       bold: marker.run?.bold ?? false,
       italic: marker.run?.italic ?? false
-    });
+    }, fontContext);
     return measureText(markerText, markerFont, ctx$1);
   }) ?? textStartPx;
   if (typeof effectiveTextStartPx === "number" && effectiveTextStartPx > indentLeft)
@@ -286454,14 +286453,14 @@ async function measureParagraphBlock(block, maxWidth) {
     if (!dropCapDescriptor.run || !dropCapDescriptor.run.text || !dropCapDescriptor.lines)
       console.warn("Invalid drop cap descriptor - missing required fields:", dropCapDescriptor);
     else {
-      const dropCapMeasured = measureDropCap(ctx$1, dropCapDescriptor, spacing);
+      const dropCapMeasured = measureDropCap(ctx$1, dropCapDescriptor, spacing, fontContext);
       dropCapMeasure = dropCapMeasured;
       dropCapDescriptor.measuredWidth = dropCapMeasured.width;
       dropCapDescriptor.measuredHeight = dropCapMeasured.height;
     }
   const emptyParagraphRun = normalizedRuns.length === 1 && isEmptyTextRun2(normalizedRuns[0]) && !isEmptySdtPlaceholderRun(normalizedRuns[0]) ? normalizedRuns[0] : null;
   if (emptyParagraphRun) {
-    const metrics = calculateEmptyParagraphMetrics(emptyParagraphRun.fontSize ?? DEFAULT_PARAGRAPH_FONT_SIZE, spacing, getFontInfoFromRun(emptyParagraphRun));
+    const metrics = calculateEmptyParagraphMetrics(emptyParagraphRun.fontSize ?? DEFAULT_PARAGRAPH_FONT_SIZE, spacing, getFontInfoFromRun(emptyParagraphRun, fontContext));
     const emptyLine = {
       fromRun: 0,
       fromChar: 0,
@@ -286498,7 +286497,7 @@ async function measureParagraphBlock(block, maxWidth) {
       ...markerInfo ? { marker: markerInfo } : {}
     };
   }
-  const fallbackFontInfo = firstTextRunWithSize ? getFontInfoFromRun(firstTextRunWithSize) : undefined;
+  const fallbackFontInfo = firstTextRunWithSize ? getFontInfoFromRun(firstTextRunWithSize, fontContext) : undefined;
   let currentLine = null;
   const getEffectiveWidth = (baseWidth) => {
     if (dropCapMeasure && lines.length < dropCapMeasure.lines && dropCapMeasure.mode === "drop")
@@ -286679,7 +286678,7 @@ async function measureParagraphBlock(block, maxWidth) {
     if (lineToTrim.fromRun === lineToTrim.toRun && sliceText.trim().length === 0)
       return;
     const keptText = sliceText.slice(0, Math.max(0, sliceText.length - trimCount));
-    const { font } = buildFontString(lastRun);
+    const { font } = buildFontString(lastRun, fontContext);
     const fullWidth = measureRunWidth(sliceText, font, ctx$1, lastRun, sliceStart);
     const keptWidth = keptText.length > 0 ? measureRunWidth(keptText, font, ctx$1, lastRun, sliceStart) : 0;
     const delta = Math.max(0, fullWidth - keptWidth);
@@ -286826,7 +286825,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 1,
           width: 0,
           maxFontSize: lastFontSize,
-          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo ?? getFontInfoFromRun(run2),
+          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo ?? getFontInfoFromRun(run2, fontContext),
           maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
           segments: [],
           spaceCount: 0
@@ -286876,7 +286875,7 @@ async function measureParagraphBlock(block, maxWidth) {
       if (stop) {
         validateTabStopVal(stop);
         if (stop.val === "end" || stop.val === "center" || stop.val === "decimal") {
-          const groupMeasure = measureTabAlignmentGroup(runIndex + 1, runsToProcess, ctx$1, decimalSeparator);
+          const groupMeasure = measureTabAlignmentGroup(runIndex + 1, runsToProcess, ctx$1, decimalSeparator, fontContext);
           if (groupMeasure.totalWidth > 0) {
             const relativeTarget = clampedTarget - effectiveIndent;
             let groupStartX;
@@ -287052,7 +287051,7 @@ async function measureParagraphBlock(block, maxWidth) {
     if (isFieldAnnotationRun(run2)) {
       const displayText = applyTextTransform(run2.displayLabel || "", run2);
       const annotationFontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
-      const annotationFontFamily = run2.fontFamily || "Arial, sans-serif";
+      const annotationFontFamily = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif");
       const fontWeight = run2.bold ? "bold" : "normal";
       ctx$1.font = `${run2.italic ? "italic" : "normal"} ${fontWeight} ${annotationFontSize}px ${annotationFontFamily}`;
       const textWidth = displayText ? ctx$1.measureText(displayText).width : 0;
@@ -287153,7 +287152,7 @@ async function measureParagraphBlock(block, maxWidth) {
       continue;
     }
     if (isEmptySdtPlaceholderRun(run2)) {
-      const placeholderFont = buildFontString(run2).font;
+      const placeholderFont = buildFontString(run2, fontContext).font;
       const placeholderText = applyTextTransform(EMPTY_SDT_PLACEHOLDER_TEXT, run2);
       const measuredPlaceholderWidth = getMeasuredTextWidth(placeholderText, placeholderFont, run2.letterSpacing ?? 0, ctx$1);
       const fallbackPlaceholderWidth = placeholderText.length * run2.fontSize * 0.45;
@@ -287166,7 +287165,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 0,
           width: placeholderWidth,
           maxFontSize: lineHeightFontSize(run2),
-          maxFontInfo: getFontInfoFromRun(run2),
+          maxFontInfo: getFontInfoFromRun(run2, fontContext),
           maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
           segments: [{
             runIndex,
@@ -287199,7 +287198,7 @@ async function measureParagraphBlock(block, maxWidth) {
             toChar: 0,
             width: placeholderWidth,
             maxFontSize: lineHeightFontSize(run2),
-            maxFontInfo: getFontInfoFromRun(run2),
+            maxFontInfo: getFontInfoFromRun(run2, fontContext),
             maxWidth: getEffectiveWidth(bodyContentWidth),
             segments: [{
               runIndex,
@@ -287213,7 +287212,7 @@ async function measureParagraphBlock(block, maxWidth) {
           currentLine.toRun = runIndex;
           currentLine.toChar = 0;
           currentLine.width = roundValue(currentLine.width + boundarySpacing + placeholderWidth);
-          currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+          currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
           currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
           appendSegment(currentLine.segments, runIndex, 0, 0, placeholderWidth);
         }
@@ -287225,7 +287224,7 @@ async function measureParagraphBlock(block, maxWidth) {
     }
     lastFontSize = run2.fontSize;
     hasSeenTextRun = true;
-    const { font } = buildFontString(run2);
+    const { font } = buildFontString(run2, fontContext);
     const tabSegments = run2.text.split("\t");
     let charPosInRun = 0;
     for (let segmentIndex = 0;segmentIndex < tabSegments.length; segmentIndex++) {
@@ -287245,7 +287244,7 @@ async function measureParagraphBlock(block, maxWidth) {
             toChar: spacesEndChar,
             width: spacesWidth,
             maxFontSize: lineHeightFontSize(run2),
-            maxFontInfo: getFontInfoFromRun(run2),
+            maxFontInfo: getFontInfoFromRun(run2, fontContext),
             maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
             segments: [{
               runIndex,
@@ -287277,7 +287276,7 @@ async function measureParagraphBlock(block, maxWidth) {
               toChar: spacesEndChar,
               width: spacesWidth,
               maxFontSize: lineHeightFontSize(run2),
-              maxFontInfo: getFontInfoFromRun(run2),
+              maxFontInfo: getFontInfoFromRun(run2, fontContext),
               maxWidth: getEffectiveWidth(bodyContentWidth),
               segments: [{
                 runIndex,
@@ -287291,7 +287290,7 @@ async function measureParagraphBlock(block, maxWidth) {
             currentLine.toRun = runIndex;
             currentLine.toChar = spacesEndChar;
             currentLine.width = roundValue(currentLine.width + boundarySpacing + spacesWidth);
-            currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+            currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
             currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
             appendSegment(currentLine.segments, runIndex, spacesStartChar, spacesEndChar, spacesWidth);
             currentLine.spaceCount += spacesLength;
@@ -287344,7 +287343,7 @@ async function measureParagraphBlock(block, maxWidth) {
               toChar: spaceEndChar,
               width: singleSpaceWidth,
               maxFontSize: lineHeightFontSize(run2),
-              maxFontInfo: getFontInfoFromRun(run2),
+              maxFontInfo: getFontInfoFromRun(run2, fontContext),
               maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
               segments: [{
                 runIndex,
@@ -287378,7 +287377,7 @@ async function measureParagraphBlock(block, maxWidth) {
                 toChar: spaceEndChar,
                 width: singleSpaceWidth,
                 maxFontSize: lineHeightFontSize(run2),
-                maxFontInfo: getFontInfoFromRun(run2),
+                maxFontInfo: getFontInfoFromRun(run2, fontContext),
                 maxWidth: getEffectiveWidth(bodyContentWidth),
                 segments: [{
                   runIndex,
@@ -287392,7 +287391,7 @@ async function measureParagraphBlock(block, maxWidth) {
               currentLine.toRun = runIndex;
               currentLine.toChar = spaceEndChar;
               currentLine.width = roundValue(currentLine.width + boundarySpacing$1 + singleSpaceWidth);
-              currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+              currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
               currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
               let spaceExplicitX;
               let spacePrecedingTabEndX;
@@ -287448,7 +287447,7 @@ async function measureParagraphBlock(block, maxWidth) {
               currentLine.toChar = chunkEndChar;
               currentLine.width = roundValue(currentLine.width + chunk2.width);
               currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
-              currentLine.maxFontInfo = getFontInfoFromRun(run2);
+              currentLine.maxFontInfo = getFontInfoFromRun(run2, fontContext);
               currentLine.segments.push({
                 runIndex,
                 fromChar: chunkStartChar,
@@ -287487,7 +287486,7 @@ async function measureParagraphBlock(block, maxWidth) {
                 toChar: chunkEndChar,
                 width: chunk2.width,
                 maxFontSize: lineHeightFontSize(run2),
-                maxFontInfo: getFontInfoFromRun(run2),
+                maxFontInfo: getFontInfoFromRun(run2, fontContext),
                 maxWidth: getEffectiveWidth(contentWidth),
                 segments: [{
                   runIndex,
@@ -287507,7 +287506,7 @@ async function measureParagraphBlock(block, maxWidth) {
                 charPosInRun = wordEndWithSpace;
             } else {
               const chunkLineMaxWidth = getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : contentWidth);
-              const metrics = calculateTypographyMetrics(run2.fontSize, spacing, getFontInfoFromRun(run2));
+              const metrics = calculateTypographyMetrics(run2.fontSize, spacing, getFontInfoFromRun(run2, fontContext));
               const chunkLine = {
                 fromRun: runIndex,
                 fromChar: chunkStartChar,
@@ -287539,7 +287538,7 @@ async function measureParagraphBlock(block, maxWidth) {
             toChar: wordEndNoSpace,
             width: wordOnlyWidth,
             maxFontSize: lineHeightFontSize(run2),
-            maxFontInfo: getFontInfoFromRun(run2),
+            maxFontInfo: getFontInfoFromRun(run2, fontContext),
             maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
             segments: [{
               runIndex,
@@ -287607,7 +287606,7 @@ async function measureParagraphBlock(block, maxWidth) {
             toChar: wordEndNoSpace,
             width: wordOnlyWidth,
             maxFontSize: lineHeightFontSize(run2),
-            maxFontInfo: getFontInfoFromRun(run2),
+            maxFontInfo: getFontInfoFromRun(run2, fontContext),
             maxWidth: getEffectiveWidth(bodyContentWidth),
             segments: [{
               runIndex,
@@ -287633,7 +287632,7 @@ async function measureParagraphBlock(block, maxWidth) {
           if (shouldIncludeDelimiterSpace && currentLine.width + boundarySpacing + wordOnlyWidth + spaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX$1) {
             currentLine.toChar = wordEndNoSpace;
             currentLine.width = roundValue(currentLine.width + boundarySpacing + wordOnlyWidth);
-            currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+            currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
             currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
             let explicitXHere;
             if (inActiveTabGroup && activeTabGroup) {
@@ -287669,7 +287668,7 @@ async function measureParagraphBlock(block, maxWidth) {
           if (compressedWidth != null)
             currentLine.naturalWidth = roundValue(totalWidthWithWord);
           currentLine.width = roundValue(targetWidth);
-          currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+          currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
           currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
           appendSegment(currentLine.segments, runIndex, wordStartChar, newToChar, wordCommitWidth, explicitX, wordIndex === 0 ? consumeSegmentPrecedingTabEndX() : undefined);
           if (shouldIncludeDelimiterSpace)
@@ -287699,7 +287698,7 @@ async function measureParagraphBlock(block, maxWidth) {
             toChar: charPosInRun,
             width: 0,
             maxFontSize: lineHeightFontSize(run2),
-            maxFontInfo: getFontInfoFromRun(run2),
+            maxFontInfo: getFontInfoFromRun(run2, fontContext),
             maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
             segments: [],
             spaceCount: 0
@@ -287715,7 +287714,7 @@ async function measureParagraphBlock(block, maxWidth) {
         currentLine.width = roundValue(currentLine.width + tabAdvance);
         if (stop?.source === "explicit")
           currentLine.hasExplicitTabStops = true;
-        currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
+        currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2, fontContext);
         currentLine.maxFontSize = Math.max(currentLine.maxFontSize, lineHeightFontSize(run2));
         currentLine.toRun = runIndex;
         currentLine.toChar = charPosInRun;
@@ -287779,9 +287778,9 @@ async function measureParagraphBlock(block, maxWidth) {
     ...dropCapMeasure ? { dropCap: dropCapMeasure } : {}
   };
 }
-async function measureTableBlock(block, constraints) {
+async function measureTableBlock(block, constraints, fontContext) {
   const workingInput = buildAutoFitWorkingGridInput(block, { maxWidth: typeof constraints === "number" ? constraints : constraints.maxWidth });
-  const columnWidths = await resolveRuntimeTableColumnWidths(block, workingInput);
+  const columnWidths = await resolveRuntimeTableColumnWidths(block, workingInput, fontContext);
   const gridColumnCount = columnWidths.length;
   const calculateCellWidth = (startCol, colspan) => {
     let width = 0;
@@ -287832,7 +287831,7 @@ async function measureTableBlock(block, constraints) {
         const measure = await measureBlock(block$1, {
           maxWidth: contentWidth$1,
           maxHeight: Infinity
-        });
+        }, fontContext);
         blockMeasures.push(measure);
         const blockHeight = "totalHeight" in measure ? measure.totalHeight : ("height" in measure) ? measure.height : 0;
         if ((block$1.kind === "image" || block$1.kind === "drawing") && block$1.anchor?.isAnchored === true && (block$1.wrap?.type ?? "Inline") !== "Inline")
@@ -287920,14 +287919,15 @@ async function measureTableBlock(block, constraints) {
     tableBorderWidths: borderWidthH > 0 || borderWidthV > 0 ? tableBorderWidths : undefined
   };
 }
-async function resolveRuntimeTableColumnWidths(block, workingInput) {
+async function resolveRuntimeTableColumnWidths(block, workingInput, fontContext) {
   const fixedLayout = computeFixedTableColumnWidths(workingInput);
   if (workingInput.layoutMode === "fixed")
     return fixedLayout.columnWidths;
-  const { contentMetrics, cellMetricKeys } = await buildMeasuredAutoFitContentMetrics(block, workingInput, fixedLayout);
+  const { contentMetrics, cellMetricKeys } = await buildMeasuredAutoFitContentMetrics(block, workingInput, fixedLayout, fontContext);
   const cacheKey = buildAutoFitTableResultCacheKey(block, {
     maxWidth: workingInput.maxTableWidth,
     cellMetricKeys,
+    fontSignature: fontContext.fontSignature,
     workingInput,
     fixedLayout
   });
@@ -287945,8 +287945,9 @@ async function resolveRuntimeTableColumnWidths(block, workingInput) {
   });
   return result.columnWidths;
 }
-async function buildMeasuredAutoFitContentMetrics(block, workingInput, fixedLayout) {
-  const contentMetrics = await measureTableAutoFitContentMetrics(block, workingInput, fixedLayout, measureBlock);
+async function buildMeasuredAutoFitContentMetrics(block, workingInput, fixedLayout, fontContext) {
+  const measureBlockWithFontContext = (childBlock, childConstraints) => measureBlock(childBlock, childConstraints, fontContext);
+  const contentMetrics = await measureTableAutoFitContentMetrics(block, workingInput, fixedLayout, measureBlockWithFontContext, fontContext);
   return {
     contentMetrics,
     cellMetricKeys: contentMetrics.cellMetricKeys
@@ -288060,7 +288061,7 @@ function normalizeConstraints(constraints) {
     return { maxWidth: constraints };
   return constraints;
 }
-async function measureListBlock(block, constraints) {
+async function measureListBlock(block, constraints, fontContext) {
   const ctx$1 = getCanvasContext();
   const items = [];
   let totalHeight = 0;
@@ -288079,12 +288080,12 @@ async function measureListBlock(block, constraints) {
         bold: marker.run.bold,
         italic: marker.run.italic,
         letterSpacing: marker.run.letterSpacing
-      });
+      }, fontContext);
       markerTextWidth = marker.markerText ? measureText(marker.markerText, markerFont, ctx$1) : 0;
       markerWidth = 0;
       indentLeft = wordLayout.indentLeftPx ?? 0;
     } else {
-      const { font: markerFont } = buildFontString(getPrimaryRun(item.paragraph));
+      const { font: markerFont } = buildFontString(getPrimaryRun(item.paragraph), fontContext);
       const markerText = item.marker.text ?? "";
       markerTextWidth = markerText ? measureText(markerText, markerFont, ctx$1) : 0;
       indentLeft = resolveIndentLeft(item);
@@ -288092,7 +288093,7 @@ async function measureListBlock(block, constraints) {
       markerWidth = Math.max(24, markerTextWidth + 8, indentHanging);
     }
     const paragraphWidth = Math.max(1, constraints.maxWidth - indentLeft - markerWidth);
-    const paragraphMeasure = await measureParagraphBlock(item.paragraph, paragraphWidth);
+    const paragraphMeasure = await measureParagraphBlock(item.paragraph, paragraphWidth, fontContext);
     totalHeight += paragraphMeasure.totalHeight;
     items.push({
       itemId: item.id,
@@ -288108,7 +288109,7 @@ async function measureListBlock(block, constraints) {
     totalHeight
   };
 }
-async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps) {
+async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps, fontResolver) {
   deps.headerLayoutsByRId.clear();
   deps.footerLayoutsByRId.clear();
   if (!headerFooterInput)
@@ -288131,25 +288132,30 @@ async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetad
     };
   };
   if (sectionMetadata.length > 1 && sectionMetadata.some((s2) => s2.margins || s2.pageSize)) {
-    await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId);
-    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId);
+    await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId, fontResolver);
+    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId, fontResolver);
   } else {
     const effectiveHeaderRefsBySection = buildEffectiveHeaderFooterRefsBySection(sectionMetadata, "header");
     const effectiveFooterRefsBySection = buildEffectiveHeaderFooterRefsBySection(sectionMetadata, "footer");
-    await layoutBlocksByRId("header", headerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveHeaderRefsBySection), constraints, pageResolver, deps.headerLayoutsByRId);
-    await layoutBlocksByRId("footer", footerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveFooterRefsBySection), constraints, pageResolver, deps.footerLayoutsByRId);
+    await layoutBlocksByRId("header", headerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveHeaderRefsBySection), constraints, pageResolver, deps.headerLayoutsByRId, fontResolver);
+    await layoutBlocksByRId("footer", footerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveFooterRefsBySection), constraints, pageResolver, deps.footerLayoutsByRId, fontResolver);
   }
 }
-async function layoutBlocksByRId(kind, blocksByRId, referencedRIds, constraints, pageResolver, layoutsByRId) {
+async function layoutBlocksByRId(kind, blocksByRId, referencedRIds, constraints, pageResolver, layoutsByRId, fontResolver) {
   if (!blocksByRId || referencedRIds.size === 0)
     return;
+  const fontSignature = fontResolver?.signature ?? "";
+  const fontMeasureContext = fontResolver ? {
+    resolvePhysical: (css) => fontResolver.resolvePhysicalFamily(css),
+    fontSignature
+  } : undefined;
   for (const [rId, blocks2] of blocksByRId) {
     if (!referencedRIds.has(rId))
       continue;
     if (!blocks2 || blocks2.length === 0)
       continue;
     try {
-      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c) => measureBlock(block, c), undefined, undefined, pageResolver, kind);
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c) => measureBlock(block, c, fontMeasureContext), undefined, undefined, pageResolver, kind, fontSignature);
       if (batchResult.default)
         layoutsByRId.set(rId, {
           kind,
@@ -288195,16 +288201,21 @@ function adjustFramePositionsForContentWidth(layout, blocks2, effectiveWidth, co
         fragment2.x -= widthDiff / 2;
     }
 }
-async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId) {
+async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId, fontResolver) {
   if (!blocksByRId)
     return;
+  const fontSignature = fontResolver?.signature ?? "";
+  const fontMeasureContext = fontResolver ? {
+    resolvePhysical: (css) => fontResolver.resolvePhysicalFamily(css),
+    fontSignature
+  } : undefined;
   const groups = buildSectionAwareHeaderFooterMeasurementGroups(kind, blocksByRId, sectionMetadata, fallbackConstraints);
   for (const group of groups) {
     const blocks2 = blocksByRId.get(group.rId);
     if (!blocks2 || blocks2.length === 0)
       continue;
     try {
-      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, group.sectionConstraints, (block, c) => measureBlock(block, c), undefined, undefined, pageResolver, kind);
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, group.sectionConstraints, (block, c) => measureBlock(block, c, fontMeasureContext), undefined, undefined, pageResolver, kind, fontSignature);
       if (batchResult.default)
         for (const sectionIndex of group.sectionIndices) {
           const contentWidth = buildSectionContentWidth(sectionMetadata.find((s2) => s2.sectionIndex === sectionIndex), fallbackConstraints);
@@ -288567,9 +288578,9 @@ function refForVariant(refs, variant) {
     matchedVariant: "default"
   } : undefined;
 }
-function resolveResult(result, storyId) {
+function resolveResult(result, storyId, fontSignature = "") {
   const story = buildHeaderFooterStory(result.kind, storyId ?? String(result.type));
-  return resolveHeaderFooterLayout(result.layout, result.blocks, result.measures, story);
+  return resolveHeaderFooterLayout(result.layout, result.blocks, result.measures, story, fontSignature);
 }
 function shiftResolvedPaintItemY(item, yOffset) {
   if (item.kind === "group")
@@ -288854,13 +288865,23 @@ function defaultInvalidate() {
   clearTextMeasurementCaches();
   measureCache.clear();
 }
+function toCssFontSource(url2) {
+  return /^\s*url\(/i.test(url2) ? url2 : `url(${JSON.stringify(url2)})`;
+}
+function defaultScheduleMicrotask(callback) {
+  if (typeof queueMicrotask === "function") {
+    queueMicrotask(callback);
+    return;
+  }
+  Promise.resolve().then(callback);
+}
 function faceKey(req) {
   return `${req.family.toLowerCase()}|${req.weight}|${req.style}`;
 }
-function collect(out, node3) {
+function collect(out, node3, resolve3) {
   if (!node3 || typeof node3.fontFamily !== "string" || !node3.fontFamily)
     return;
-  const family$1 = resolvePrimaryPhysicalFamily(node3.fontFamily);
+  const family$1 = resolve3(node3.fontFamily);
   if (!family$1)
     return;
   const req = {
@@ -288872,7 +288893,7 @@ function collect(out, node3) {
   if (!out.has(key2))
     out.set(key2, req);
 }
-function collectRuns(out, runs2) {
+function collectRuns(out, runs2, resolve3) {
   if (!runs2)
     return;
   for (const run2 of runs2) {
@@ -288881,51 +288902,52 @@ function collectRuns(out, runs2) {
       collect(out, {
         ...bearing,
         fontFamily: "Arial"
-      });
+      }, resolve3);
     else
-      collect(out, bearing);
+      collect(out, bearing, resolve3);
   }
 }
-function collectParagraph(out, paragraph2) {
+function collectParagraph(out, paragraph2, resolve3) {
   if (!paragraph2)
     return;
-  collectRuns(out, paragraph2.runs);
-  collect(out, paragraph2.attrs?.wordLayout?.marker?.run);
-  collect(out, paragraph2.attrs?.dropCapDescriptor?.run);
+  collectRuns(out, paragraph2.runs, resolve3);
+  collect(out, paragraph2.attrs?.wordLayout?.marker?.run, resolve3);
+  collect(out, paragraph2.attrs?.dropCapDescriptor?.run, resolve3);
 }
-function collectTable(out, table2) {
+function collectTable(out, table2, resolve3) {
   for (const row2 of table2.rows)
     for (const cell2 of row2.cells) {
-      collectParagraph(out, cell2.paragraph);
+      collectParagraph(out, cell2.paragraph, resolve3);
       if (cell2.blocks)
         for (const b$1 of cell2.blocks)
-          collectBlock(out, b$1);
+          collectBlock(out, b$1, resolve3);
     }
 }
-function collectList(out, list5) {
+function collectList(out, list5, resolve3) {
   for (const item of list5.items)
-    collectParagraph(out, item.paragraph);
+    collectParagraph(out, item.paragraph, resolve3);
 }
-function collectBlock(out, block) {
+function collectBlock(out, block, resolve3) {
   switch (block.kind) {
     case "paragraph":
-      collectParagraph(out, block);
+      collectParagraph(out, block, resolve3);
       break;
     case "table":
-      collectTable(out, block);
+      collectTable(out, block, resolve3);
       break;
     case "list":
-      collectList(out, block);
+      collectList(out, block, resolve3);
       break;
     default:
       break;
   }
 }
-function planRequiredFontFaces(blocks2) {
+function planRequiredFontFaces(blocks2, resolver2) {
+  const resolve3 = resolver2 ? (family$1) => resolver2.resolvePrimaryPhysicalFamily(family$1) : resolvePrimaryPhysicalFamily;
   const out = /* @__PURE__ */ new Map;
   if (blocks2)
     for (const block of blocks2)
-      collectBlock(out, block);
+      collectBlock(out, block, resolve3);
   return [...out.values()];
 }
 function buildSemanticFootnoteBlocks(input2, footnotesMode) {
@@ -310006,7 +310028,370 @@ menclose::after {
     const minReadablePx = getMinimumReadableTextStartPx(markerContentEndPx, gutterWidthPx);
     return Math.max(nextTabStopPx, minReadablePx);
   }
-}, hashParagraphBorder$2 = (border) => {
+}, SETTLED_STATUSES, BUNDLED_SUBSTITUTES, FontResolver = class {
+  #overrides = /* @__PURE__ */ new Map;
+  #version = 0;
+  #cachedSignature = null;
+  map(logicalFamily, physicalFamily) {
+    const key2 = normalizeFamilyKey$2(logicalFamily);
+    const physical = physicalFamily?.trim();
+    if (!key2 || !physical)
+      return;
+    if (this.#overrides.get(key2) === physical)
+      return;
+    if ((BUNDLED_SUBSTITUTES[key2] ?? logicalFamily.trim()) === physical) {
+      if (this.#overrides.delete(key2)) {
+        this.#version += 1;
+        this.#cachedSignature = null;
+      }
+      return;
+    }
+    this.#overrides.set(key2, physical);
+    this.#version += 1;
+    this.#cachedSignature = null;
+  }
+  unmap(logicalFamily) {
+    if (this.#overrides.delete(normalizeFamilyKey$2(logicalFamily))) {
+      this.#version += 1;
+      this.#cachedSignature = null;
+    }
+  }
+  reset() {
+    if (this.#overrides.size === 0)
+      return;
+    this.#overrides.clear();
+    this.#version += 1;
+    this.#cachedSignature = null;
+  }
+  get version() {
+    return this.#version;
+  }
+  get signature() {
+    if (this.#cachedSignature !== null)
+      return this.#cachedSignature;
+    this.#cachedSignature = this.#overrides.size === 0 ? "" : JSON.stringify([...this.#overrides.entries()].sort(([a2], [b$1]) => a2 < b$1 ? -1 : a2 > b$1 ? 1 : 0));
+    return this.#cachedSignature;
+  }
+  #physicalFor(bareFamily) {
+    const key2 = normalizeFamilyKey$2(bareFamily);
+    const override = this.#overrides.get(key2);
+    if (override)
+      return {
+        physical: override,
+        reason: "custom_mapping"
+      };
+    const bundled = BUNDLED_SUBSTITUTES[key2];
+    if (bundled)
+      return {
+        physical: bundled,
+        reason: "bundled_substitute"
+      };
+    return {
+      physical: bareFamily,
+      reason: "as_requested"
+    };
+  }
+  resolveFontFamily(logicalFamily) {
+    const primary = splitStack(logicalFamily)[0] ?? logicalFamily;
+    const { physical, reason } = this.#physicalFor(primary);
+    return {
+      logicalFamily,
+      physicalFamily: physical,
+      reason
+    };
+  }
+  resolvePhysicalFamily(cssFontFamily) {
+    if (!cssFontFamily)
+      return cssFontFamily;
+    const parts = splitStack(cssFontFamily);
+    if (parts.length === 0)
+      return cssFontFamily;
+    const { physical, reason } = this.#physicalFor(parts[0]);
+    if (reason === "as_requested")
+      return cssFontFamily;
+    return [physical, ...parts.slice(1)].join(", ");
+  }
+  resolvePrimaryPhysicalFamily(family$1) {
+    const primary = splitStack(family$1)[0] ?? family$1;
+    return this.#physicalFor(primary).physical;
+  }
+  resolvePhysicalFamilies(families) {
+    const out = /* @__PURE__ */ new Set;
+    for (const family$1 of families)
+      if (family$1)
+        out.add(this.resolvePrimaryPhysicalFamily(family$1));
+    return [...out];
+  }
+}, defaultResolver, DEFAULT_FONT_MEASURE_CONTEXT, fontConfigVersion = 0, BUNDLED_MANIFEST, defaultAssetBase = "/fonts/", installedRegistries, DEFAULT_FONT_LOAD_TIMEOUT_MS = 3000, DEFAULT_PROBE_SIZE = "16px", FontRegistry = class {
+  #fontSet;
+  #FontFaceCtor;
+  #probeSize;
+  #scheduleTimeout;
+  #cancelTimeout;
+  #managed = /* @__PURE__ */ new Map;
+  #status = /* @__PURE__ */ new Map;
+  #sources = /* @__PURE__ */ new Map;
+  #warnedFailures = /* @__PURE__ */ new Set;
+  #inflight = /* @__PURE__ */ new Map;
+  #faceStatus = /* @__PURE__ */ new Map;
+  #faceInflight = /* @__PURE__ */ new Map;
+  #faceSources = /* @__PURE__ */ new Map;
+  #facesByFamily = /* @__PURE__ */ new Map;
+  #warnedFaceFailures = /* @__PURE__ */ new Set;
+  constructor(options = {}) {
+    this.#fontSet = options.fontSet ?? null;
+    this.#FontFaceCtor = options.FontFaceCtor ?? null;
+    this.#probeSize = options.probeSize ?? DEFAULT_PROBE_SIZE;
+    this.#scheduleTimeout = options.scheduleTimeout ?? ((cb, ms) => globalThis.setTimeout(cb, ms));
+    this.#cancelTimeout = options.cancelTimeout ?? ((handle3) => globalThis.clearTimeout(handle3));
+  }
+  register(descriptor) {
+    const { family: family$1, source, descriptors: descriptors2 } = descriptor;
+    const identitySource = typeof source === "string" ? canonicalizeFontSource(source) : source;
+    const key2 = faceKeyOf$1(family$1, normalizeWeight(descriptors2?.weight), normalizeStyle$1(descriptors2?.style));
+    if (typeof identitySource === "string") {
+      const existingSource = this.#faceSources.get(key2);
+      if (existingSource === identitySource)
+        return {
+          family: family$1,
+          status: this.getStatus(family$1),
+          changed: false
+        };
+      if (existingSource !== undefined)
+        throw new Error(`[superdoc] font face "${key2}" is already registered from a different source ("${existingSource}"); a registered face's source cannot be replaced`);
+    }
+    if (this.#FontFaceCtor && this.#fontSet) {
+      const face = new this.#FontFaceCtor(family$1, source, descriptors2);
+      this.#fontSet.add(face);
+      this.#managed.set(family$1, face);
+    }
+    if (typeof source === "string") {
+      const list5 = this.#sources.get(family$1) ?? [];
+      if (!list5.includes(source))
+        list5.push(source);
+      this.#sources.set(family$1, list5);
+    }
+    if (!this.#status.has(family$1))
+      this.#status.set(family$1, "unloaded");
+    this.#trackFace(family$1, key2);
+    if (!this.#faceStatus.has(key2))
+      this.#faceStatus.set(key2, "unloaded");
+    if (typeof identitySource === "string" && !this.#faceSources.has(key2))
+      this.#faceSources.set(key2, identitySource);
+    return {
+      family: family$1,
+      status: this.getStatus(family$1),
+      changed: true
+    };
+  }
+  #trackFace(family$1, key2) {
+    const fam = normalizeFamilyKey$1(family$1);
+    const set = this.#facesByFamily.get(fam) ?? /* @__PURE__ */ new Set;
+    set.add(key2);
+    this.#facesByFamily.set(fam, set);
+  }
+  isManaged(family$1) {
+    return this.#managed.has(family$1);
+  }
+  getStatus(family$1) {
+    const statuses = [];
+    const faceKeys = this.#facesByFamily.get(normalizeFamilyKey$1(family$1));
+    if (faceKeys)
+      for (const k$1 of faceKeys)
+        statuses.push(this.#faceStatus.get(k$1) ?? "unloaded");
+    const legacy = this.#status.get(family$1);
+    if (legacy)
+      statuses.push(legacy);
+    if (statuses.length === 0)
+      return "unloaded";
+    for (const s2 of [
+      "failed",
+      "timed_out",
+      "fallback_used",
+      "loaded",
+      "loading",
+      "unloaded"
+    ])
+      if (statuses.includes(s2))
+        return s2;
+    return "unloaded";
+  }
+  isAvailable(family$1) {
+    if (!this.#fontSet)
+      return false;
+    try {
+      return this.#fontSet.check(`${this.#probeSize} ${quoteFamily(family$1)}`);
+    } catch {
+      return false;
+    }
+  }
+  awaitFace(family$1, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
+    if (this.#status.get(family$1) === "loaded")
+      return Promise.resolve({
+        family: family$1,
+        status: "loaded"
+      });
+    const existing = this.#inflight.get(family$1);
+    if (existing)
+      return existing;
+    const probe = this.#loadOne(family$1, timeoutMs).finally(() => {
+      this.#inflight.delete(family$1);
+    });
+    this.#inflight.set(family$1, probe);
+    return probe;
+  }
+  async awaitFaces(families, options = {}) {
+    const unique$2 = [...new Set(families)];
+    const timeoutMs = options.timeoutMs ?? 3000;
+    return Promise.all(unique$2.map((family$1) => this.awaitFace(family$1, timeoutMs)));
+  }
+  getRequiredFaces(families, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
+    return [...new Set(families)].map((family$1) => ({
+      family: family$1,
+      status: this.getStatus(family$1),
+      ready: this.awaitFace(family$1, timeoutMs)
+    }));
+  }
+  getStates() {
+    return [...this.#status.entries()].map(([family$1, status]) => ({
+      family: family$1,
+      status
+    }));
+  }
+  getFaceStatus(request) {
+    return this.#faceStatus.get(faceKeyOf$1(request.family, request.weight, request.style)) ?? "unloaded";
+  }
+  awaitFaceRequest(request, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
+    const key2 = faceKeyOf$1(request.family, request.weight, request.style);
+    if (this.#faceStatus.get(key2) === "loaded")
+      return Promise.resolve({
+        request,
+        status: "loaded"
+      });
+    const existing = this.#faceInflight.get(key2);
+    if (existing)
+      return existing;
+    const probe = this.#loadOneFace(request, key2, timeoutMs).finally(() => {
+      this.#faceInflight.delete(key2);
+    });
+    this.#faceInflight.set(key2, probe);
+    return probe;
+  }
+  async awaitFaceRequests(requests, options = {}) {
+    const timeoutMs = options.timeoutMs ?? 3000;
+    const seen = /* @__PURE__ */ new Set;
+    const unique$2 = [];
+    for (const r$1 of requests) {
+      const key2 = faceKeyOf$1(r$1.family, r$1.weight, r$1.style);
+      if (seen.has(key2))
+        continue;
+      seen.add(key2);
+      unique$2.push(r$1);
+    }
+    return Promise.all(unique$2.map((r$1) => this.awaitFaceRequest(r$1, timeoutMs)));
+  }
+  async#loadOneFace(request, key2, timeoutMs) {
+    this.#trackFace(request.family, key2);
+    const fontSet = this.#fontSet;
+    if (!fontSet) {
+      this.#faceStatus.set(key2, "fallback_used");
+      return {
+        request,
+        status: "fallback_used"
+      };
+    }
+    this.#faceStatus.set(key2, "loading");
+    const probe = faceProbe(request.family, request.weight, request.style, this.#probeSize);
+    const TIMEOUT = Symbol("timeout");
+    let handle3;
+    const timeout$1 = new Promise((resolve3) => {
+      handle3 = this.#scheduleTimeout(() => resolve3(TIMEOUT), timeoutMs);
+    });
+    try {
+      const settled = await Promise.race([fontSet.load(probe), timeout$1]);
+      if (settled === TIMEOUT) {
+        this.#faceStatus.set(key2, "timed_out");
+        return {
+          request,
+          status: "timed_out"
+        };
+      }
+      const status = settled.length > 0 ? "loaded" : "fallback_used";
+      this.#faceStatus.set(key2, status);
+      return {
+        request,
+        status
+      };
+    } catch {
+      this.#faceStatus.set(key2, "failed");
+      this.#warnFaceFailureOnce(request, key2);
+      return {
+        request,
+        status: "failed"
+      };
+    } finally {
+      this.#cancelTimeout(handle3);
+    }
+  }
+  #warnFaceFailureOnce(request, key2) {
+    if (this.#warnedFaceFailures.has(key2))
+      return;
+    this.#warnedFaceFailures.add(key2);
+    const src = this.#faceSources.get(key2);
+    const detail = src ? ` from ${src}` : "";
+    console.warn(`[superdoc] font face failed to load: "${request.family}" ${request.weight} ${request.style}${detail}. Check fonts.assetBaseUrl / fonts.resolveAssetUrl so the bundled .woff2 are served.`);
+  }
+  async#loadOne(family$1, timeoutMs) {
+    const fontSet = this.#fontSet;
+    if (!fontSet) {
+      this.#status.set(family$1, "fallback_used");
+      return {
+        family: family$1,
+        status: "fallback_used"
+      };
+    }
+    this.#status.set(family$1, "loading");
+    const probe = `${this.#probeSize} ${quoteFamily(family$1)}`;
+    const TIMEOUT = Symbol("timeout");
+    let handle3;
+    const timeout$1 = new Promise((resolve3) => {
+      handle3 = this.#scheduleTimeout(() => resolve3(TIMEOUT), timeoutMs);
+    });
+    try {
+      const settled = await Promise.race([fontSet.load(probe), timeout$1]);
+      if (settled === TIMEOUT) {
+        this.#status.set(family$1, "timed_out");
+        return {
+          family: family$1,
+          status: "timed_out"
+        };
+      }
+      const status = settled.length > 0 ? "loaded" : "fallback_used";
+      this.#status.set(family$1, status);
+      return {
+        family: family$1,
+        status
+      };
+    } catch {
+      this.#status.set(family$1, "failed");
+      this.#warnLoadFailureOnce(family$1);
+      return {
+        family: family$1,
+        status: "failed"
+      };
+    } finally {
+      this.#cancelTimeout(handle3);
+    }
+  }
+  #warnLoadFailureOnce(family$1) {
+    if (this.#warnedFailures.has(family$1))
+      return;
+    this.#warnedFailures.add(family$1);
+    const sources = this.#sources.get(family$1);
+    const detail = sources && sources.length ? ` from ${sources.join(", ")}` : "";
+    console.warn(`[superdoc] font asset failed to load for "${family$1}"${detail}. Check fonts.assetBaseUrl / fonts.resolveAssetUrl so the bundled .woff2 are served.`);
+  }
+}, registriesByFontSet, domlessRegistry = null, hashParagraphBorder$2 = (border) => {
   const parts = [];
   if (border.style !== undefined)
     parts.push(`s:${border.style}`);
@@ -310323,7 +310708,7 @@ menclose::after {
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
     return;
   return value;
-}, resolvePainterMarkerTextWidth = (markerTextWidthPx, marker) => getFiniteNonNegativeNumber(markerTextWidthPx) ?? getFiniteNonNegativeNumber(marker.glyphWidthPx) ?? getFiniteNonNegativeNumber(marker.markerBoxWidthPx) ?? 0, resolvePainterListMarkerGeometry = ({ wordLayout, indentLeftPx, hangingIndentPx, firstLineIndentPx, markerTextWidthPx }) => resolveListMarkerGeometry(wordLayout, indentLeftPx, firstLineIndentPx, hangingIndentPx, (_markerText, marker) => resolvePainterMarkerTextWidth(markerTextWidthPx, marker)), resolvePainterListTextStartPx = ({ wordLayout, indentLeftPx, hangingIndentPx, firstLineIndentPx, markerTextWidthPx }) => resolveListTextStartPx(wordLayout, indentLeftPx, firstLineIndentPx, hangingIndentPx, (_markerText, marker) => resolvePainterMarkerTextWidth(markerTextWidthPx, marker)), isMarkerSuffix = (suffix) => suffix === "tab" || suffix === "space" || suffix === "nothing", createListMarkerElement = (doc$12, markerText, run2, sourceAnchor) => {
+}, resolvePainterMarkerTextWidth = (markerTextWidthPx, marker) => getFiniteNonNegativeNumber(markerTextWidthPx) ?? getFiniteNonNegativeNumber(marker.glyphWidthPx) ?? getFiniteNonNegativeNumber(marker.markerBoxWidthPx) ?? 0, resolvePainterListMarkerGeometry = ({ wordLayout, indentLeftPx, hangingIndentPx, firstLineIndentPx, markerTextWidthPx }) => resolveListMarkerGeometry(wordLayout, indentLeftPx, firstLineIndentPx, hangingIndentPx, (_markerText, marker) => resolvePainterMarkerTextWidth(markerTextWidthPx, marker)), resolvePainterListTextStartPx = ({ wordLayout, indentLeftPx, hangingIndentPx, firstLineIndentPx, markerTextWidthPx }) => resolveListTextStartPx(wordLayout, indentLeftPx, firstLineIndentPx, hangingIndentPx, (_markerText, marker) => resolvePainterMarkerTextWidth(markerTextWidthPx, marker)), isMarkerSuffix = (suffix) => suffix === "tab" || suffix === "space" || suffix === "nothing", createListMarkerElement = (doc$12, markerText, run2, sourceAnchor, resolvePhysical = resolvePhysicalFamily) => {
   const markerContainer = doc$12.createElement("span");
   markerContainer.classList.add(DOM_CLASS_NAMES.LIST_MARKER);
   markerContainer.style.display = "inline-block";
@@ -310332,7 +310717,8 @@ menclose::after {
   markerEl.classList.add("superdoc-paragraph-marker");
   markerEl.textContent = markerText;
   markerEl.style.pointerEvents = "none";
-  markerEl.style.fontFamily = toCssFontFamily(run2.fontFamily) ?? run2.fontFamily ?? "";
+  const cssFontFamily = toCssFontFamily(run2.fontFamily) ?? run2.fontFamily ?? "";
+  markerEl.style.fontFamily = resolvePhysical(cssFontFamily);
   if (run2.fontSize != null)
     markerEl.style.fontSize = `${run2.fontSize}px`;
   markerEl.style.fontWeight = run2.bold ? "bold" : "";
@@ -310350,7 +310736,7 @@ menclose::after {
     applySourceAnchorDataset(markerEl, sourceAnchor);
   return markerContainer;
 }, renderLegacyListMarker = (params$1) => {
-  const { doc: doc$12, lineEl, wordLayout, markerLayout, markerMeasure, markerTextWidthPx, indentLeftPx, hangingIndentPx, firstLineIndentPx, isRtl, sourceAnchor } = params$1;
+  const { doc: doc$12, lineEl, wordLayout, markerLayout, markerMeasure, markerTextWidthPx, indentLeftPx, hangingIndentPx, firstLineIndentPx, isRtl, sourceAnchor, resolvePhysical = resolvePhysicalFamily } = params$1;
   const markerTextWidth = markerTextWidthPx ?? markerMeasure?.markerTextWidth ?? 0;
   const markerGeometry = markerLayout?.justification === "left" && wordLayout?.firstLineIndentMode !== true && typeof markerTextWidth === "number" && Number.isFinite(markerTextWidth) && markerTextWidth >= 0 ? resolvePainterListMarkerGeometry({
     wordLayout,
@@ -310387,7 +310773,7 @@ menclose::after {
     lineEl.style.paddingLeft = `${anchorPoint}px`;
   if (markerLayout?.run?.vanish)
     return;
-  const markerContainer = createListMarkerElement(doc$12, markerLayout?.markerText ?? "", markerLayout?.run ?? {}, sourceAnchor);
+  const markerContainer = createListMarkerElement(doc$12, markerLayout?.markerText ?? "", markerLayout?.run ?? {}, sourceAnchor, resolvePhysical);
   markerContainer.style.position = "relative";
   if (markerJustification === "right") {
     markerContainer.style.position = "absolute";
@@ -310408,14 +310794,14 @@ menclose::after {
   prependMarkerSuffix(doc$12, lineEl, isMarkerSuffix(suffix) ? suffix : undefined, suffixWidthPx, markerLayout?.run?.fontSize);
   lineEl.prepend(markerContainer);
 }, renderResolvedListMarker = (params$1) => {
-  const { doc: doc$12, lineEl, marker, isRtl, sourceAnchor } = params$1;
+  const { doc: doc$12, lineEl, marker, isRtl, sourceAnchor, resolvePhysical = resolvePhysicalFamily } = params$1;
   if (isRtl)
     lineEl.style.paddingRight = `${marker.firstLinePaddingLeftPx}px`;
   else
     lineEl.style.paddingLeft = `${marker.firstLinePaddingLeftPx}px`;
   if (marker.vanish)
     return;
-  const markerContainer = createListMarkerElement(doc$12, marker.text, marker.run, marker.sourceAnchor ?? sourceAnchor);
+  const markerContainer = createListMarkerElement(doc$12, marker.text, marker.run, marker.sourceAnchor ?? sourceAnchor, resolvePhysical);
   markerContainer.style.position = "relative";
   if (marker.justification === "right") {
     markerContainer.style.position = "absolute";
@@ -310683,7 +311069,7 @@ menclose::after {
     skipJustifyOverride: (resolvedLine?.skipJustify ?? false) || hasMultipleExplicitPositionedSegments
   }) ? Math.max(lineWidth, availableWidth) : lineWidth;
 }, renderResolvedLines = (params$1) => {
-  const { frameEl, block, resolvedContent: content3, markerTextWidth, renderLine: renderLine$1, captureLineSnapshot, convertFinalParagraphMark, lineTopOffset = 0, sourceAnchor } = params$1;
+  const { frameEl, block, resolvedContent: content3, markerTextWidth, renderLine: renderLine$1, captureLineSnapshot, convertFinalParagraphMark, lineTopOffset = 0, sourceAnchor, resolvePhysical = resolvePhysicalFamily } = params$1;
   const renderedLines = [];
   const resolvedMarker = content3.marker;
   const expandedRunsForBlock = expandRunsForInlineNewlines(block.runs);
@@ -310713,7 +311099,8 @@ menclose::after {
         lineEl,
         marker: resolvedMarker,
         isRtl,
-        sourceAnchor
+        sourceAnchor,
+        resolvePhysical
       });
     if (convertFinalParagraphMark && index2 === content3.lines.length - 1 && !content3.continuesOnNext)
       convertParagraphMarkToCellMark(lineEl);
@@ -310736,7 +311123,7 @@ menclose::after {
     renderedLines
   };
 }, renderMeasuredLines = (params$1) => {
-  const { doc: doc$12, frameEl, block, measure, containerKind, width, localStartLine, localEndLine, linesOverride, lineIndexOffset = 0, continuesFromPrev, continuesOnNext, markerWidth, markerTextWidth, wordLayout, renderLine: renderLine$1, captureLineSnapshot, convertFinalParagraphMark, lineTopOffset = 0, sourceAnchor } = params$1;
+  const { doc: doc$12, frameEl, block, measure, containerKind, width, localStartLine, localEndLine, linesOverride, lineIndexOffset = 0, continuesFromPrev, continuesOnNext, markerWidth, markerTextWidth, wordLayout, renderLine: renderLine$1, captureLineSnapshot, convertFinalParagraphMark, lineTopOffset = 0, sourceAnchor, resolvePhysical = resolvePhysicalFamily } = params$1;
   const lines = linesOverride ?? measure.lines ?? [];
   const paraIndent = block.attrs?.indent;
   const paraIndentLeft = paraIndent?.left ?? 0;
@@ -310810,7 +311197,8 @@ menclose::after {
         hangingIndentPx: markerHanging,
         firstLineIndentPx: markerFirstLine,
         isRtl,
-        sourceAnchor
+        sourceAnchor,
+        resolvePhysical
       });
     } else
       applyParagraphLineIndentation({
@@ -310964,7 +311352,7 @@ menclose::after {
     hasSdtContainerChrome
   };
 }, renderTableCell = (deps) => {
-  const { doc: doc$12, x, y: y$1, rowHeight, cellMeasure, cell: cell2, borders, useDefaultBorder, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, context, applySdtDataset: applySdtDataset$1, chrome: chrome2, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, tableIndent, isRtl, cellWidth, fromLine, toLine } = deps;
+  const { doc: doc$12, x, y: y$1, rowHeight, cellMeasure, cell: cell2, borders, useDefaultBorder, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, context, applySdtDataset: applySdtDataset$1, chrome: chrome2, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, tableIndent, isRtl, cellWidth, fromLine, toLine, resolvePhysical } = deps;
   const padding = cell2?.attrs?.padding || {
     top: 0,
     left: 4,
@@ -311216,6 +311604,7 @@ menclose::after {
           },
           contentControlsChrome: chrome2,
           applySdtDataset: applySdtDataset$1,
+          resolvePhysical,
           renderLine: ({ block: block$1, line, lineIndex, isLastLine, resolvedListTextStartPx }) => renderLine$1(block$1, line, {
             ...context,
             section: "body"
@@ -311392,7 +311781,7 @@ menclose::after {
     left: baseBorders.left
   };
 }, renderTableRow = (deps) => {
-  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2 } = deps;
+  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2, resolvePhysical } = deps;
   const totalCols = columnWidths.length;
   const calculateXPosition = (gridColumnStart) => {
     let x = cellSpacingPx;
@@ -311479,12 +311868,13 @@ menclose::after {
       tableIndent,
       isRtl,
       cellWidth: computedCellWidth > 0 ? computedCellWidth : undefined,
-      chrome: chrome2
+      chrome: chrome2,
+      resolvePhysical
     });
     container.appendChild(cellElement);
   }
 }, renderTableFragment = (deps) => {
-  const { doc: doc$12, fragment: fragment2, block, measure, cellSpacingPx, effectiveColumnWidths, chrome: chrome2, context, sdtBoundary, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applyFragmentFrame, applySdtDataset: applySdtDataset$1, applyContainerSdtDataset: applyContainerSdtDataset$1, applyStyles: applyStyles$3 } = deps;
+  const { doc: doc$12, fragment: fragment2, block, measure, cellSpacingPx, effectiveColumnWidths, chrome: chrome2, context, sdtBoundary, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applyFragmentFrame, applySdtDataset: applySdtDataset$1, applyContainerSdtDataset: applyContainerSdtDataset$1, applyStyles: applyStyles$3, resolvePhysical } = deps;
   if (!doc$12) {
     console.error("DomPainter: document is not available");
     if (typeof document !== "undefined") {
@@ -311666,7 +312056,8 @@ menclose::after {
         chrome: chrome2,
         continuesFromPrev: false,
         continuesOnNext: false,
-        cellSpacingPx
+        cellSpacingPx,
+        resolvePhysical
       });
       y$1 += rowMeasure.height + cellSpacingPx;
     }
@@ -311784,7 +312175,8 @@ menclose::after {
       continuesFromPrev: isFirstRenderedBodyRow && fragment2.continuesFromPrev === true,
       continuesOnNext: isLastRenderedBodyRow && fragment2.continuesOnNext === true,
       partialRow: partialRowData,
-      cellSpacingPx
+      cellSpacingPx,
+      resolvePhysical
     });
     y$1 += actualRowHeight + cellSpacingPx;
   }
@@ -312002,7 +312394,7 @@ menclose::after {
   else
     delete el.dataset.continuesOnNext;
 }, isMinimalWordLayout$2 = (value) => isMinimalWordLayout(value), renderParagraphFragment = (params$1) => {
-  const { doc: doc$12, fragment: fragment2, sdtBoundary, betweenInfo, resolvedItem, applyStyles: applyStyles$3, applyResolvedFragmentFrame, applyFragmentFrame, applySdtDataset: applySdtDataset$1, applyContainerSdtDataset: applyContainerSdtDataset$1, renderLine: renderLine$1, captureLineSnapshot, createErrorPlaceholder, contentControlsChrome } = params$1;
+  const { doc: doc$12, fragment: fragment2, sdtBoundary, betweenInfo, resolvedItem, applyStyles: applyStyles$3, applyResolvedFragmentFrame, applyFragmentFrame, applySdtDataset: applySdtDataset$1, applyContainerSdtDataset: applyContainerSdtDataset$1, renderLine: renderLine$1, captureLineSnapshot, createErrorPlaceholder, contentControlsChrome, resolvePhysical = resolvePhysicalFamily } = params$1;
   try {
     if (!doc$12)
       throw new Error("DomPainter: document is not available");
@@ -312061,7 +312453,8 @@ menclose::after {
       sdtBoundary,
       applySdtDataset: applySdtDataset$1,
       applyContainerSdtDataset: applyContainerSdtDataset$1,
-      renderDropCap: (descriptor, dropCapMeasure) => renderDropCap(doc$12, descriptor, dropCapMeasure),
+      resolvePhysical,
+      renderDropCap: (descriptor, dropCapMeasure) => renderDropCap(doc$12, descriptor, dropCapMeasure, resolvePhysical),
       renderLine: renderLine$1,
       captureLineSnapshot: (lineEl, options) => {
         captureLineSnapshot(lineEl, {
@@ -312080,12 +312473,12 @@ menclose::after {
     });
     return createErrorPlaceholder(fragment2.blockId, error3);
   }
-}, renderDropCap = (doc$12, descriptor, measure) => {
+}, renderDropCap = (doc$12, descriptor, measure, resolvePhysical = resolvePhysicalFamily) => {
   const { run: run2, mode } = descriptor;
   const dropCapEl = doc$12.createElement("span");
   dropCapEl.classList.add("superdoc-drop-cap");
   dropCapEl.textContent = run2.text;
-  dropCapEl.style.fontFamily = run2.fontFamily;
+  dropCapEl.style.fontFamily = resolvePhysical(run2.fontFamily);
   dropCapEl.style.fontSize = `${run2.fontSize}px`;
   if (run2.bold)
     dropCapEl.style.fontWeight = "bold";
@@ -312178,263 +312571,7 @@ menclose::after {
   const visualTextEndOffset = lineEl.dir === "rtl" || lineEl.style.direction === "rtl" ? alignmentOffset : alignmentOffset + lineWidth;
   mark2.style.left = `${Math.max(0, leftOffsetPx + visualTextEndOffset)}px`;
   lineEl.appendChild(mark2);
-}, SETTLED_STATUSES, BUNDLED_SUBSTITUTES, fontConfigVersion = 0, BUNDLED_MANIFEST, defaultAssetBase = "/fonts/", installedRegistries, DEFAULT_FONT_LOAD_TIMEOUT_MS = 3000, DEFAULT_PROBE_SIZE = "16px", FontRegistry = class {
-  #fontSet;
-  #FontFaceCtor;
-  #probeSize;
-  #scheduleTimeout;
-  #cancelTimeout;
-  #managed = /* @__PURE__ */ new Map;
-  #status = /* @__PURE__ */ new Map;
-  #sources = /* @__PURE__ */ new Map;
-  #warnedFailures = /* @__PURE__ */ new Set;
-  #inflight = /* @__PURE__ */ new Map;
-  #faceStatus = /* @__PURE__ */ new Map;
-  #faceInflight = /* @__PURE__ */ new Map;
-  #faceSources = /* @__PURE__ */ new Map;
-  #facesByFamily = /* @__PURE__ */ new Map;
-  #warnedFaceFailures = /* @__PURE__ */ new Set;
-  constructor(options = {}) {
-    this.#fontSet = options.fontSet ?? null;
-    this.#FontFaceCtor = options.FontFaceCtor ?? null;
-    this.#probeSize = options.probeSize ?? DEFAULT_PROBE_SIZE;
-    this.#scheduleTimeout = options.scheduleTimeout ?? ((cb, ms) => globalThis.setTimeout(cb, ms));
-    this.#cancelTimeout = options.cancelTimeout ?? ((handle3) => globalThis.clearTimeout(handle3));
-  }
-  register(descriptor) {
-    const { family: family$1, source, descriptors: descriptors2 } = descriptor;
-    if (this.#FontFaceCtor && this.#fontSet) {
-      const face = new this.#FontFaceCtor(family$1, source, descriptors2);
-      this.#fontSet.add(face);
-      this.#managed.set(family$1, face);
-    }
-    if (typeof source === "string") {
-      const list5 = this.#sources.get(family$1) ?? [];
-      if (!list5.includes(source))
-        list5.push(source);
-      this.#sources.set(family$1, list5);
-    }
-    if (!this.#status.has(family$1))
-      this.#status.set(family$1, "unloaded");
-    const key2 = faceKeyOf$1(family$1, normalizeWeight(descriptors2?.weight), normalizeStyle$1(descriptors2?.style));
-    this.#trackFace(family$1, key2);
-    if (!this.#faceStatus.has(key2))
-      this.#faceStatus.set(key2, "unloaded");
-    if (typeof source === "string" && !this.#faceSources.has(key2))
-      this.#faceSources.set(key2, source);
-    return {
-      family: family$1,
-      status: this.getStatus(family$1)
-    };
-  }
-  #trackFace(family$1, key2) {
-    const fam = normalizeFamilyKey$1(family$1);
-    const set = this.#facesByFamily.get(fam) ?? /* @__PURE__ */ new Set;
-    set.add(key2);
-    this.#facesByFamily.set(fam, set);
-  }
-  isManaged(family$1) {
-    return this.#managed.has(family$1);
-  }
-  getStatus(family$1) {
-    const statuses = [];
-    const faceKeys = this.#facesByFamily.get(normalizeFamilyKey$1(family$1));
-    if (faceKeys)
-      for (const k$1 of faceKeys)
-        statuses.push(this.#faceStatus.get(k$1) ?? "unloaded");
-    const legacy = this.#status.get(family$1);
-    if (legacy)
-      statuses.push(legacy);
-    if (statuses.length === 0)
-      return "unloaded";
-    for (const s2 of [
-      "failed",
-      "timed_out",
-      "fallback_used",
-      "loaded",
-      "loading",
-      "unloaded"
-    ])
-      if (statuses.includes(s2))
-        return s2;
-    return "unloaded";
-  }
-  isAvailable(family$1) {
-    if (!this.#fontSet)
-      return false;
-    try {
-      return this.#fontSet.check(`${this.#probeSize} ${quoteFamily(family$1)}`);
-    } catch {
-      return false;
-    }
-  }
-  awaitFace(family$1, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
-    if (this.#status.get(family$1) === "loaded")
-      return Promise.resolve({
-        family: family$1,
-        status: "loaded"
-      });
-    const existing = this.#inflight.get(family$1);
-    if (existing)
-      return existing;
-    const probe = this.#loadOne(family$1, timeoutMs).finally(() => {
-      this.#inflight.delete(family$1);
-    });
-    this.#inflight.set(family$1, probe);
-    return probe;
-  }
-  async awaitFaces(families, options = {}) {
-    const unique$2 = [...new Set(families)];
-    const timeoutMs = options.timeoutMs ?? 3000;
-    return Promise.all(unique$2.map((family$1) => this.awaitFace(family$1, timeoutMs)));
-  }
-  getRequiredFaces(families, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
-    return [...new Set(families)].map((family$1) => ({
-      family: family$1,
-      status: this.getStatus(family$1),
-      ready: this.awaitFace(family$1, timeoutMs)
-    }));
-  }
-  getStates() {
-    return [...this.#status.entries()].map(([family$1, status]) => ({
-      family: family$1,
-      status
-    }));
-  }
-  getFaceStatus(request) {
-    return this.#faceStatus.get(faceKeyOf$1(request.family, request.weight, request.style)) ?? "unloaded";
-  }
-  awaitFaceRequest(request, timeoutMs = DEFAULT_FONT_LOAD_TIMEOUT_MS) {
-    const key2 = faceKeyOf$1(request.family, request.weight, request.style);
-    if (this.#faceStatus.get(key2) === "loaded")
-      return Promise.resolve({
-        request,
-        status: "loaded"
-      });
-    const existing = this.#faceInflight.get(key2);
-    if (existing)
-      return existing;
-    const probe = this.#loadOneFace(request, key2, timeoutMs).finally(() => {
-      this.#faceInflight.delete(key2);
-    });
-    this.#faceInflight.set(key2, probe);
-    return probe;
-  }
-  async awaitFaceRequests(requests, options = {}) {
-    const timeoutMs = options.timeoutMs ?? 3000;
-    const seen = /* @__PURE__ */ new Set;
-    const unique$2 = [];
-    for (const r$1 of requests) {
-      const key2 = faceKeyOf$1(r$1.family, r$1.weight, r$1.style);
-      if (seen.has(key2))
-        continue;
-      seen.add(key2);
-      unique$2.push(r$1);
-    }
-    return Promise.all(unique$2.map((r$1) => this.awaitFaceRequest(r$1, timeoutMs)));
-  }
-  async#loadOneFace(request, key2, timeoutMs) {
-    this.#trackFace(request.family, key2);
-    const fontSet = this.#fontSet;
-    if (!fontSet) {
-      this.#faceStatus.set(key2, "fallback_used");
-      return {
-        request,
-        status: "fallback_used"
-      };
-    }
-    this.#faceStatus.set(key2, "loading");
-    const probe = faceProbe(request.family, request.weight, request.style, this.#probeSize);
-    const TIMEOUT = Symbol("timeout");
-    let handle3;
-    const timeout$1 = new Promise((resolve3) => {
-      handle3 = this.#scheduleTimeout(() => resolve3(TIMEOUT), timeoutMs);
-    });
-    try {
-      const settled = await Promise.race([fontSet.load(probe), timeout$1]);
-      if (settled === TIMEOUT) {
-        this.#faceStatus.set(key2, "timed_out");
-        return {
-          request,
-          status: "timed_out"
-        };
-      }
-      const status = settled.length > 0 ? "loaded" : "fallback_used";
-      this.#faceStatus.set(key2, status);
-      return {
-        request,
-        status
-      };
-    } catch {
-      this.#faceStatus.set(key2, "failed");
-      this.#warnFaceFailureOnce(request, key2);
-      return {
-        request,
-        status: "failed"
-      };
-    } finally {
-      this.#cancelTimeout(handle3);
-    }
-  }
-  #warnFaceFailureOnce(request, key2) {
-    if (this.#warnedFaceFailures.has(key2))
-      return;
-    this.#warnedFaceFailures.add(key2);
-    const src = this.#faceSources.get(key2);
-    const detail = src ? ` from ${src}` : "";
-    console.warn(`[superdoc] font face failed to load: "${request.family}" ${request.weight} ${request.style}${detail}. Check fonts.assetBaseUrl / fonts.resolveAssetUrl so the bundled .woff2 are served.`);
-  }
-  async#loadOne(family$1, timeoutMs) {
-    const fontSet = this.#fontSet;
-    if (!fontSet) {
-      this.#status.set(family$1, "fallback_used");
-      return {
-        family: family$1,
-        status: "fallback_used"
-      };
-    }
-    this.#status.set(family$1, "loading");
-    const probe = `${this.#probeSize} ${quoteFamily(family$1)}`;
-    const TIMEOUT = Symbol("timeout");
-    let handle3;
-    const timeout$1 = new Promise((resolve3) => {
-      handle3 = this.#scheduleTimeout(() => resolve3(TIMEOUT), timeoutMs);
-    });
-    try {
-      const settled = await Promise.race([fontSet.load(probe), timeout$1]);
-      if (settled === TIMEOUT) {
-        this.#status.set(family$1, "timed_out");
-        return {
-          family: family$1,
-          status: "timed_out"
-        };
-      }
-      const status = settled.length > 0 ? "loaded" : "fallback_used";
-      this.#status.set(family$1, status);
-      return {
-        family: family$1,
-        status
-      };
-    } catch {
-      this.#status.set(family$1, "failed");
-      this.#warnLoadFailureOnce(family$1);
-      return {
-        family: family$1,
-        status: "failed"
-      };
-    } finally {
-      this.#cancelTimeout(handle3);
-    }
-  }
-  #warnLoadFailureOnce(family$1) {
-    if (this.#warnedFailures.has(family$1))
-      return;
-    this.#warnedFailures.add(family$1);
-    const sources = this.#sources.get(family$1);
-    const detail = sources && sources.length ? ` from ${sources.join(", ")}` : "";
-    console.warn(`[superdoc] font asset failed to load for "${family$1}"${detail}. Check fonts.assetBaseUrl / fonts.resolveAssetUrl so the bundled .woff2 are served.`);
-  }
-}, registriesByFontSet, domlessRegistry = null, DEFAULT_SUPERSCRIPT_RAISE_RATIO = 0.33, DEFAULT_SUBSCRIPT_LOWER_RATIO = 0.14, underlineThicknessPx = (fontSize) => Math.max(1, Math.round(fontSize / 14)), hasVerticalPositioning = (run2) => normalizeBaselineShift(run2.baselineShift) != null || run2.vertAlign === "superscript" || run2.vertAlign === "subscript", applyRunVerticalPositioning = (element3, run2) => {
+}, DEFAULT_SUPERSCRIPT_RAISE_RATIO = 0.33, DEFAULT_SUBSCRIPT_LOWER_RATIO = 0.14, underlineThicknessPx = (fontSize) => Math.max(1, Math.round(fontSize / 14)), hasVerticalPositioning = (run2) => normalizeBaselineShift(run2.baselineShift) != null || run2.vertAlign === "superscript" || run2.vertAlign === "subscript", applyRunVerticalPositioning = (element3, run2) => {
   if (hasVerticalPositioning(run2))
     element3.style.lineHeight = "1";
   const explicitBaselineShift = normalizeBaselineShift(run2.baselineShift);
@@ -312454,10 +312591,10 @@ menclose::after {
   }
   if (run2.vertAlign === "baseline")
     element3.style.verticalAlign = "baseline";
-}, applyRunStyles = (element3, run2, _isLink = false) => {
+}, applyRunStyles = (element3, run2, _isLink = false, resolvePhysical = resolvePhysicalFamily) => {
   if (run2.kind === "tab" || run2.kind === "image" || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" || run2.kind === "math")
     return;
-  element3.style.fontFamily = resolvePhysicalFamily(run2.fontFamily);
+  element3.style.fontFamily = resolvePhysical(run2.fontFamily);
   element3.style.fontSize = `${run2.fontSize}px`;
   if (run2.bold)
     element3.style.fontWeight = "bold";
@@ -312558,7 +312695,7 @@ menclose::after {
     if (linkData.tooltip)
       renderContext.pendingTooltips.set(elem, linkData.tooltip);
   }
-  applyRunStyles(elem, run2, isActiveLink);
+  applyRunStyles(elem, run2, isActiveLink, renderContext.resolvePhysical);
   const dirAttr = resolveRunDirectionAttribute({
     runText: run2.text,
     effectiveText,
@@ -312638,8 +312775,10 @@ menclose::after {
         annotation.style.height = `${run2.size.height}px`;
     }
   }
-  if (run2.fontFamily)
-    annotation.style.fontFamily = run2.fontFamily;
+  {
+    const resolvePhysical = context.resolvePhysical ?? resolvePhysicalFamily;
+    annotation.style.fontFamily = resolvePhysical(run2.fontFamily || "Arial, sans-serif");
+  }
   {
     const fontSize = run2.fontSize ? typeof run2.fontSize === "number" ? `${run2.fontSize}pt` : run2.fontSize : BROWSER_DEFAULT_FONT_SIZE;
     annotation.style.fontSize = fontSize;
@@ -313242,7 +313381,7 @@ menclose::after {
   if (run2.pmEnd != null)
     elem.dataset.pmEnd = String(run2.pmEnd);
   renderContext.applySdtDataset(elem, run2.sdt);
-  applyRunStyles(elem, run2);
+  applyRunStyles(elem, run2, false, renderContext.resolvePhysical);
   return elem;
 }, renderRun = (run2, context, renderContext, trackedConfig) => {
   if (isImageRun$1(run2))
@@ -315350,6 +315489,7 @@ menclose::after {
       applyFragmentFrame: (el, paraFragment) => this.applyFragmentFrame(el, paraFragment, context.section, context.story),
       applySdtDataset,
       applyContainerSdtDataset,
+      resolvePhysical: this.options.resolvePhysical,
       renderLine: ({ block, line, availableWidth, lineIndex, skipJustify, preExpandedRuns, resolvedListTextStartPx, indentOffsetOverride, paragraphMarkLeftOffsetOverride }) => this.renderLine(block, line, context, availableWidth, lineIndex, skipJustify, preExpandedRuns, resolvedListTextStartPx, indentOffsetOverride, paragraphMarkLeftOffsetOverride),
       captureLineSnapshot: (lineEl, options) => {
         this.capturePaintSnapshotLine(lineEl, context, {
@@ -316122,7 +316262,8 @@ menclose::after {
         applyFragmentFrame: applyFragmentFrameWithSection,
         applySdtDataset,
         applyContainerSdtDataset,
-        applyStyles
+        applyStyles,
+        resolvePhysical: this.options.resolvePhysical
       });
       if (resolvedItem) {
         this.applyResolvedFragmentFrame(el, resolvedItem, fragment2, context.section, context.story);
@@ -316163,6 +316304,7 @@ menclose::after {
       layoutEpoch: this.layoutEpoch,
       showFormattingMarks: this.showFormattingMarks,
       contentControlsChrome: this.contentControlsChrome,
+      resolvePhysical: this.options.resolvePhysical,
       pendingTooltips: this.pendingTooltips,
       getNextLinkId: () => `superdoc-link-${++this.linkIdCounter}`,
       applySdtDataset,
@@ -317850,10 +317992,10 @@ menclose::after {
     this.cache = /* @__PURE__ */ new Map;
     this.stats = createStats();
   }
-  get(block, width, height) {
+  get(block, width, height, fontSignature = "") {
     if (!block || !block.id)
       return;
-    const key2 = this.composeKey(block, width, height);
+    const key2 = this.composeKey(block, width, height, fontSignature);
     const value = this.cache.get(key2);
     if (value !== undefined) {
       this.stats.hits += 1;
@@ -317865,10 +318007,10 @@ menclose::after {
       return;
     }
   }
-  set(block, width, height, value) {
+  set(block, width, height, value, fontSignature = "") {
     if (!block || !block.id)
       return;
-    const key2 = this.composeKey(block, width, height);
+    const key2 = this.composeKey(block, width, height, fontSignature);
     if (this.cache.has(key2))
       this.cache.delete(key2);
     if (this.cache.size >= MAX_CACHE_SIZE$1) {
@@ -317922,11 +318064,11 @@ menclose::after {
     this.stats.size = this.cache.size;
     this.stats.memorySizeEstimate = this.cache.size * BYTES_PER_ENTRY_ESTIMATE;
   }
-  composeKey(block, width, height) {
+  composeKey(block, width, height, fontSignature) {
     const safeWidth = Number.isFinite(width) ? Math.max(0, Math.min(Math.floor(width), MAX_DIMENSION)) : 0;
     const safeHeight = Number.isFinite(height) ? Math.max(0, Math.min(Math.floor(height), MAX_DIMENSION)) : 0;
     const hash$3 = hashRuns(block);
-    return `${block.id}@${safeWidth}x${safeHeight}:${hash$3}`;
+    return `${block.id}@${safeWidth}x${safeHeight}:${hash$3}#${fontSignature}`;
   }
 }, FeatureFlags, PageTokenLogger, HeaderFooterCacheLogger, MetricsCollector = class {
   constructor() {
@@ -317983,10 +318125,10 @@ menclose::after {
   constructor() {
     this.cache = new MeasureCache;
   }
-  async measureBlocks(blocks2, constraints, measureBlock$1) {
+  async measureBlocks(blocks2, constraints, measureBlock$1, fontSignature = "") {
     const measures = [];
     for (const block of blocks2) {
-      const cached = this.cache.get(block, constraints.width, constraints.height);
+      const cached = this.cache.get(block, constraints.width, constraints.height, fontSignature);
       if (cached) {
         measures.push(cached);
         continue;
@@ -317995,7 +318137,7 @@ menclose::after {
         maxWidth: constraints.width,
         maxHeight: constraints.height
       });
-      this.cache.set(block, constraints.width, constraints.height, measurement);
+      this.cache.set(block, constraints.width, constraints.height, measurement, fontSignature);
       measures.push(measurement);
     }
     return measures;
@@ -323597,14 +323739,14 @@ menclose::after {
   if (value === ",")
     return ",";
   return DEFAULT_DECIMAL_SEPARATOR2;
-}, DROP_CAP_PADDING_PX = 4, measureDropCap = (ctx$1, descriptor, spacing) => {
+}, DROP_CAP_PADDING_PX = 4, measureDropCap = (ctx$1, descriptor, spacing, fontContext) => {
   const { run: run2, lines, mode } = descriptor;
   const { font } = buildFontString({
     fontFamily: run2.fontFamily,
     fontSize: run2.fontSize,
     bold: run2.bold,
     italic: run2.italic
-  });
+  }, fontContext);
   ctx$1.font = font;
   const displayText = applyTextTransform(run2.text, run2);
   const metrics = ctx$1.measureText(displayText);
@@ -323760,7 +323902,7 @@ menclose::after {
   set headerLayoutResults(results) {
     this.#headerFooterLayoutSnapshotPending = true;
     this.#headerLayoutResults = results;
-    this.#resolvedHeaderLayouts = results ? results.map((result) => resolveResult(result)) : null;
+    this.#resolvedHeaderLayouts = results ? results.map((result) => this.#resolveResult(result)) : null;
   }
   get footerLayoutResults() {
     return this.#footerLayoutResults;
@@ -323768,7 +323910,7 @@ menclose::after {
   set footerLayoutResults(results) {
     this.#headerFooterLayoutSnapshotPending = true;
     this.#footerLayoutResults = results;
-    this.#resolvedFooterLayouts = results ? results.map((result) => resolveResult(result)) : null;
+    this.#resolvedFooterLayouts = results ? results.map((result) => this.#resolveResult(result)) : null;
   }
   get headerLayoutsByRId() {
     return this.#headerLayoutsByRId;
@@ -323843,8 +323985,8 @@ menclose::after {
     this.#headerFooterLayoutSnapshotPending = true;
     this.#headerLayoutResults = headerResults;
     this.#footerLayoutResults = footerResults;
-    this.#resolvedHeaderLayouts = headerResults ? headerResults.map((result) => resolveResult(result)) : null;
-    this.#resolvedFooterLayouts = footerResults ? footerResults.map((result) => resolveResult(result)) : null;
+    this.#resolvedHeaderLayouts = headerResults ? headerResults.map((result) => this.#resolveResult(result)) : null;
+    this.#resolvedFooterLayouts = footerResults ? footerResults.map((result) => this.#resolveResult(result)) : null;
   }
   initialize() {
     if (!this.#options.editor)
@@ -324564,17 +324706,20 @@ menclose::after {
       overflowBaseHeight
     };
   }
-  async layoutPerRId(headerFooterInput, layout, sectionMetadata) {
+  #resolveResult(result, storyId) {
+    return resolveResult(result, storyId, this.#options.getFontSignature?.() ?? "");
+  }
+  async layoutPerRId(headerFooterInput, layout, sectionMetadata, fontResolver) {
     await layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, {
       headerLayoutsByRId: this.#headerLayoutsByRId,
       footerLayoutsByRId: this.#footerLayoutsByRId
-    });
+    }, fontResolver);
     this.#resolvedHeaderByRId.clear();
     for (const [key2, result] of this.#headerLayoutsByRId)
-      this.#resolvedHeaderByRId.set(key2, resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
+      this.#resolvedHeaderByRId.set(key2, this.#resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
     this.#resolvedFooterByRId.clear();
     for (const [key2, result] of this.#footerLayoutsByRId)
-      this.#resolvedFooterByRId.set(key2, resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
+      this.#resolvedFooterByRId.set(key2, this.#resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
   }
   #computeMetrics(kind, layoutHeight, box, pageHeight, footerMargin) {
     const validatedLayoutHeight = Number.isFinite(layoutHeight) && layoutHeight >= 0 ? layoutHeight : 0;
@@ -324984,7 +325129,7 @@ menclose::after {
       return cachedItems;
     if (cachedItems)
       console.warn(`[HeaderFooterSessionManager] Resolved items length (${cachedItems.length}) does not match fragments length (${fragments.length}) for ${contextLabel}. Recomputing items.`);
-    const freshItems = resolveResult(result, storyId).pages.find((page) => page.number === slotPageNumber)?.items;
+    const freshItems = this.#resolveResult(result, storyId).pages.find((page) => page.number === slotPageNumber)?.items;
     if (freshItems && freshItems.length === fragments.length)
       return freshItems;
     if (freshItems)
@@ -325427,6 +325572,7 @@ menclose::after {
   #getDocumentFonts;
   #getRequiredFaces;
   #resolveFamilies;
+  #fontResolver;
   #requestReflow;
   #getFontEnvironment;
   #registryOverride;
@@ -325446,7 +325592,9 @@ menclose::after {
   constructor(options) {
     this.#getDocumentFonts = options.getDocumentFonts;
     this.#getRequiredFaces = options.getRequiredFaces ?? null;
-    this.#resolveFamilies = options.resolveFamilies ?? ((families) => families);
+    this.#fontResolver = options.fontResolver ?? null;
+    const resolver2 = this.#fontResolver;
+    this.#resolveFamilies = options.resolveFamilies ?? (resolver2 ? (families) => resolver2.resolvePhysicalFamilies(families) : (families) => families);
     this.#requestReflow = options.requestReflow;
     this.#getFontEnvironment = options.getFontEnvironment ?? defaultFontEnvironment;
     this.#registryOverride = options.registry ?? null;
@@ -325474,7 +325622,7 @@ menclose::after {
     } catch {
       return [];
     }
-    return buildFontReport(logical, this.#resolveContext().registry);
+    return buildFontReport(logical, this.#resolveContext().registry, this.#fontResolver ?? undefined);
   }
   async ensureReadyForMeasure() {
     if (this.#getRequiredFaces)
@@ -325539,14 +325687,22 @@ menclose::after {
     this.#lastSummary = summarize(results);
     return this.#lastSummary;
   }
-  notifyFontConfigChanged() {
+  notifyDocumentFontConfigChanged(options) {
     this.#fontConfigVersion += 1;
-    bumpFontConfigVersion();
     this.#resetRequiredAndSeen();
     this.#lateLoadScheduler.cancel();
-    this.#invalidateCaches();
+    if (options?.availabilityChanged) {
+      bumpFontConfigVersion();
+      this.#invalidateCaches();
+    }
     this.#requestReflow();
   }
+  invalidateCachesForConfigRegistration() {
+    this.#invalidateCaches();
+  }
+  resolveRegistry() {
+    return this.#resolveContext().registry;
+  }
   resetForDocumentChange() {
     this.#lateLoadScheduler.cancel();
     this.#resetRequiredAndSeen();
@@ -325628,7 +325784,139 @@ menclose::after {
   #flushLateFontLoads() {
     this.#requestReflow();
   }
-}, FACE_STATUS_PRIORITY, DEFAULT_SEMANTIC_FOOTNOTE_HEADING_STYLE, NATIVE_SELECTION_STYLES = `
+}, FACE_STATUS_PRIORITY, DocumentFontController = class {
+  #resolver;
+  #getGate;
+  #onDocumentFontConfigApplied;
+  #scheduleMicrotask;
+  #runtimeReflowQueued = false;
+  #runtimeReflowToken = 0;
+  #runtimeAvailabilityChanged = false;
+  constructor(deps) {
+    this.#resolver = deps.resolver;
+    this.#getGate = deps.getGate;
+    this.#onDocumentFontConfigApplied = deps.onDocumentFontConfigApplied;
+    this.#scheduleMicrotask = deps.scheduleMicrotask ?? defaultScheduleMicrotask;
+  }
+  map(mappings) {
+    if (this.#applyMappings(mappings))
+      this.#queueRuntimeReflow();
+  }
+  unmap(families) {
+    const before2 = this.#resolver.signature;
+    for (const family$1 of Array.isArray(families) ? families : [families])
+      this.#resolver.unmap(family$1);
+    this.#reflowIfChanged(before2);
+  }
+  reset() {
+    this.#cancelPendingRuntimeReflow();
+    this.#resolver.reset();
+  }
+  dispose() {
+    this.#cancelPendingRuntimeReflow();
+  }
+  applyInitialConfig(config2) {
+    this.#cancelPendingRuntimeReflow();
+    if (!config2)
+      return;
+    const registered$1 = this.#registerFamilies(config2.families);
+    this.#applyMappings(config2.map);
+    if (registered$1)
+      this.#getGate()?.invalidateCachesForConfigRegistration();
+  }
+  add(families) {
+    let committed = false;
+    try {
+      this.#registerFamilies(families, () => {
+        committed = true;
+      });
+    } finally {
+      if (committed) {
+        this.#runtimeAvailabilityChanged = true;
+        this.#queueRuntimeReflow();
+      }
+    }
+  }
+  #registerFamilies(families, onFaceRegistered) {
+    if (!families?.length)
+      return false;
+    const registry2 = this.#getGate()?.resolveRegistry();
+    if (!registry2)
+      throw new Error("[superdoc] fonts.add: the font registry is not ready yet");
+    let changed = false;
+    for (const entry of families) {
+      const family$1 = entry?.family;
+      const faces = entry?.faces;
+      if (typeof family$1 !== "string" || !family$1.trim())
+        throw new Error('[superdoc] fonts.add: each family needs a non-empty "family" name');
+      if (!Array.isArray(faces) || faces.length === 0)
+        throw new Error(`[superdoc] fonts.add: family "${family$1}" needs at least one face in "faces"`);
+      for (const face of faces) {
+        if (!face || typeof face.source !== "string" || !face.source.trim())
+          throw new Error(`[superdoc] fonts.add: family "${family$1}" has a face with no "source" URL`);
+        if (registry2.register({
+          family: family$1,
+          source: toCssFontSource(face.source),
+          descriptors: {
+            weight: face.weight == null ? undefined : String(face.weight),
+            style: face.style
+          }
+        }).changed) {
+          changed = true;
+          onFaceRegistered?.();
+        }
+      }
+    }
+    return changed;
+  }
+  async preload(families) {
+    if (!Array.isArray(families))
+      throw new Error('[superdoc] fonts.preload expects an array of logical family names, e.g. preload(["Georgia"])');
+    const registry2 = this.#getGate()?.resolveRegistry();
+    if (!registry2)
+      throw new Error("[superdoc] fonts.preload: the font registry is not ready yet");
+    const requests = families.map((logical) => ({
+      family: this.#resolver.resolvePrimaryPhysicalFamily(logical),
+      weight: "400",
+      style: "normal"
+    }));
+    await registry2.awaitFaceRequests(requests);
+  }
+  #reflowIfChanged(signatureBefore) {
+    if (this.#resolver.signature !== signatureBefore)
+      this.#queueRuntimeReflow();
+  }
+  #applyMappings(mappings) {
+    if (!mappings)
+      return false;
+    const before2 = this.#resolver.signature;
+    for (const [logicalFamily, physicalFamily] of Object.entries(mappings))
+      this.#resolver.map(logicalFamily, physicalFamily);
+    return this.#resolver.signature !== before2;
+  }
+  #queueRuntimeReflow() {
+    if (this.#runtimeReflowQueued)
+      return;
+    this.#runtimeReflowQueued = true;
+    const token$1 = ++this.#runtimeReflowToken;
+    this.#scheduleMicrotask(() => {
+      if (!this.#runtimeReflowQueued || token$1 !== this.#runtimeReflowToken)
+        return;
+      this.#runtimeReflowQueued = false;
+      const availabilityChanged = this.#runtimeAvailabilityChanged;
+      this.#runtimeAvailabilityChanged = false;
+      this.#onDocumentFontConfigApplied();
+      this.#getGate()?.notifyDocumentFontConfigChanged({ availabilityChanged });
+    });
+  }
+  #cancelPendingRuntimeReflow() {
+    this.#runtimeAvailabilityChanged = false;
+    if (!this.#runtimeReflowQueued)
+      return;
+    this.#runtimeReflowQueued = false;
+    this.#runtimeReflowToken += 1;
+  }
+}, DEFAULT_SEMANTIC_FOOTNOTE_HEADING_STYLE, NATIVE_SELECTION_STYLES = `
 /* Hide native browser selection on layout engine content.
  * We render our own selection overlay via PresentationEditor's #localSelectionLayer
  * for precise control over selection geometry across pages and zoom levels. */
@@ -325705,7 +325993,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_CEhzpYi5_es = __esm(() => {
+var init_src_B1aSE_tB_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_B9mZiCO9_es();
   init_jszip_C49i9kUs_es();
@@ -352580,6 +352868,33 @@ function print() { __p += __j.call(arguments, '') }
     "wave",
     "doubleWave"
   ]);
+  SETTLED_STATUSES = [
+    "loaded",
+    "failed",
+    "timed_out",
+    "fallback_used"
+  ];
+  BUNDLED_SUBSTITUTES = Object.freeze({
+    calibri: "Carlito",
+    cambria: "Caladea",
+    arial: "Liberation Sans",
+    "times new roman": "Liberation Serif",
+    "courier new": "Liberation Mono"
+  });
+  defaultResolver = new FontResolver;
+  DEFAULT_FONT_MEASURE_CONTEXT = Object.freeze({
+    resolvePhysical: resolvePhysicalFamily,
+    fontSignature: ""
+  });
+  BUNDLED_MANIFEST = Object.freeze([
+    family("Carlito", "Carlito", "OFL-1.1"),
+    family("Caladea", "Caladea", "Apache-2.0"),
+    family("Liberation Sans", "LiberationSans", "OFL-1.1"),
+    family("Liberation Serif", "LiberationSerif", "OFL-1.1"),
+    family("Liberation Mono", "LiberationMono", "OFL-1.1")
+  ]);
+  installedRegistries = /* @__PURE__ */ new WeakMap;
+  registriesByFontSet = /* @__PURE__ */ new WeakMap;
   PX_PER_PT$12 = 96 / 72;
   BORDER_SIDES3 = [
     "top",
@@ -352611,28 +352926,6 @@ function print() { __p += __j.call(arguments, '') }
     "sdtDocpartId",
     "sdtDocpartInstruction"
   ];
-  SETTLED_STATUSES = [
-    "loaded",
-    "failed",
-    "timed_out",
-    "fallback_used"
-  ];
-  BUNDLED_SUBSTITUTES = Object.freeze({
-    calibri: "Carlito",
-    cambria: "Caladea",
-    arial: "Liberation Sans",
-    "times new roman": "Liberation Serif",
-    "courier new": "Liberation Mono"
-  });
-  BUNDLED_MANIFEST = Object.freeze([
-    family("Carlito", "Carlito", "OFL-1.1"),
-    family("Caladea", "Caladea", "Apache-2.0"),
-    family("Liberation Sans", "LiberationSans", "OFL-1.1"),
-    family("Liberation Serif", "LiberationSerif", "OFL-1.1"),
-    family("Liberation Mono", "LiberationMono", "OFL-1.1")
-  ]);
-  installedRegistries = /* @__PURE__ */ new WeakMap;
-  registriesByFontSet = /* @__PURE__ */ new WeakMap;
   OPERATOR_CHARS = new Set([
     "+",
     "-",
@@ -353840,6 +354133,7 @@ function print() { __p += __j.call(arguments, '') }
       layout: null,
       bookmarks: /* @__PURE__ */ new Map
     };
+    #layoutFontSignature = "";
     #layoutLookupBlocks = [];
     #layoutLookupMeasures = [];
     #flowBlockCache = new FlowBlockCache;
@@ -353863,6 +354157,15 @@ function print() { __p += __j.call(arguments, '') }
     #isRerendering = false;
     #selectionSync = new SelectionSyncCoordinator;
     #fontGate = null;
+    #fontResolver = createFontResolver();
+    #nextFontsChangedSource = null;
+    #fontController = new DocumentFontController({
+      resolver: this.#fontResolver,
+      getGate: () => this.#fontGate,
+      onDocumentFontConfigApplied: () => {
+        this.#nextFontsChangedSource = "config-change";
+      }
+    });
     #fontPlanBlocks = null;
     #lastFontsChangedKey = null;
     #lastFontsChangedPayload = null;
@@ -354094,7 +354397,8 @@ function print() { __p += __j.call(arguments, '') }
         isDebug: this.#options.isDebug,
         initBudgetMs: HEADER_FOOTER_INIT_BUDGET_MS,
         defaultPageSize: DEFAULT_PAGE_SIZE,
-        defaultMargins: DEFAULT_MARGINS
+        defaultMargins: DEFAULT_MARGINS,
+        getFontSignature: () => this.#fontResolver.signature
       });
       this.#headerFooterSession.setHoverElements({
         hoverOverlay: this.#hoverOverlay,
@@ -354148,18 +354452,9 @@ function print() { __p += __j.call(arguments, '') }
           getDocumentFonts: () => {
             return this.#editor.converter?.getDocumentFonts?.() ?? [];
           },
-          requestReflow: () => {
-            this.#layoutState = {
-              ...this.#layoutState,
-              blocks: [],
-              measures: [],
-              layout: null
-            };
-            this.#pendingDocChange = true;
-            this.#scheduleRerender();
-          },
-          getRequiredFaces: () => planRequiredFontFaces(this.#fontPlanBlocks),
-          resolveFamilies: resolvePhysicalFamilies,
+          requestReflow: () => this.#requestFontReflow(),
+          getRequiredFaces: () => planRequiredFontFaces(this.#fontPlanBlocks, this.#fontResolver),
+          fontResolver: this.#fontResolver,
           onRegistryResolved: (registry2) => installBundledSubstitutes(registry2, {
             assetBaseUrl: this.#options.fontAssets?.assetBaseUrl,
             resolveAssetUrl: this.#options.fontAssets?.resolveAssetUrl
@@ -354175,6 +354470,7 @@ function print() { __p += __j.call(arguments, '') }
             } : null;
           }
         });
+        this.#fontController.applyInitialConfig(this.#options.fontAssets);
         if (typeof this.#options.disableContextMenu === "boolean")
           this.setContextMenuDisabled(this.#options.disableContextMenu);
         this.#setupHeaderFooterSession();
@@ -355134,6 +355430,28 @@ function print() { __p += __j.call(arguments, '') }
     getMissingFonts() {
       return this.getFontReport().filter((record) => record.missing).map((record) => record.logicalFamily);
     }
+    mapFonts(mappings) {
+      this.#fontController.map(mappings);
+    }
+    unmapFonts(families) {
+      this.#fontController.unmap(families);
+    }
+    addFonts(families) {
+      this.#fontController.add(families);
+    }
+    async preloadFonts(families) {
+      await this.#fontController.preload(families);
+    }
+    #requestFontReflow() {
+      this.#layoutState = {
+        ...this.#layoutState,
+        blocks: [],
+        measures: [],
+        layout: null
+      };
+      this.#pendingDocChange = true;
+      this.#scheduleRerender();
+    }
     #emitFontsChangedIfChanged(summary) {
       const gate = this.#fontGate;
       if (!gate)
@@ -355144,6 +355462,9 @@ function print() { __p += __j.call(arguments, '') }
         return;
       const isInitial = this.#lastFontsChangedKey === null;
       this.#lastFontsChangedKey = key2;
+      const pendingSource = this.#nextFontsChangedSource;
+      this.#nextFontsChangedSource = null;
+      const source = isInitial ? "initial" : pendingSource ?? "late-load";
       let resolutions;
       try {
         resolutions = gate.getReport();
@@ -355161,7 +355482,7 @@ function print() { __p += __j.call(arguments, '') }
           fallbackUsed: 0,
           results: []
         },
-        source: isInitial ? "initial" : "late-load",
+        source,
         version: version$1
       };
       this.#lastFontsChangedPayload = payload;
@@ -355172,6 +355493,11 @@ function print() { __p += __j.call(arguments, '') }
     getLastFontsChangedPayload() {
       return this.#lastFontsChangedPayload;
     }
+    #resetFontReportStateForDocumentChange() {
+      this.#nextFontsChangedSource = null;
+      this.#lastFontsChangedKey = null;
+      this.#lastFontsChangedPayload = null;
+    }
     getLayoutOptions() {
       return { ...this.#layoutOptions };
     }
@@ -355319,7 +355645,8 @@ function print() { __p += __j.call(arguments, '') }
         layout,
         flowMode: this.#layoutOptions.flowMode ?? "paginated",
         blocks: blocks2,
-        measures
+        measures,
+        fontSignature: this.#fontResolver.signature
       });
       const isSemanticFlow = this.#layoutOptions.flowMode === "semantic";
       this.#ensurePainter();
@@ -356039,6 +356366,7 @@ function print() { __p += __j.call(arguments, '') }
       this.#postPaintPipeline.destroy();
       this.#proofingManager?.dispose();
       this.#proofingManager = null;
+      this.#fontController.dispose();
       this.#fontGate?.dispose();
       this.#fontGate = null;
       if (this.#cursorUpdateTimer !== null) {
@@ -356399,6 +356727,10 @@ function print() { __p += __j.call(arguments, '') }
       });
       const handleDocumentReplaced = () => {
         this.#fontGate?.resetForDocumentChange();
+        this.#fontController.reset();
+        this.#layoutFontSignature = "";
+        this.#fontController.applyInitialConfig(this.#options.fontAssets);
+        this.#resetFontReportStateForDocumentChange();
         this.#refreshHeaderFooterStructureThenRerender({ purgeCachedEditors: true });
       };
       this.#editor.on("documentReplaced", handleDocumentReplaced);
@@ -357523,6 +357855,13 @@ function print() { __p += __j.call(arguments, '') }
         const previousBlocks = this.#layoutState.blocks;
         const previousLayout = this.#layoutState.layout;
         const previousMeasures = this.#layoutState.measures;
+        const resolvePhysical = (css) => this.#fontResolver.resolvePhysicalFamily(css);
+        const fontSignature = this.#fontResolver.signature;
+        const previousFontSignature = this.#layoutFontSignature;
+        const fontMeasureContext = {
+          resolvePhysical,
+          fontSignature
+        };
         let layout;
         let measures;
         let resolvedLayout;
@@ -357546,7 +357885,10 @@ function print() { __p += __j.call(arguments, '') }
         } catch {}
         try {
           const incrementalLayoutStart = perfNow();
-          const result = await incrementalLayout(previousBlocks, previousLayout, blocksForLayout, layoutOptions, (block, constraints) => measureBlock(block, constraints), headerFooterInput ?? undefined, previousMeasures);
+          const result = await incrementalLayout(previousBlocks, previousLayout, blocksForLayout, layoutOptions, (block, constraints) => measureBlock(block, constraints, fontMeasureContext), headerFooterInput ?? undefined, previousMeasures, {
+            fontContext: fontMeasureContext,
+            previousFontSignature
+          });
           perfLog(`[Perf] incrementalLayout: ${(perfNow() - incrementalLayoutStart).toFixed(2)}ms`);
           if (!result || typeof result !== "object") {
             this.#handleLayoutError("render", /* @__PURE__ */ new Error("incrementalLayout returned invalid result"));
@@ -357573,7 +357915,8 @@ function print() { __p += __j.call(arguments, '') }
             layout,
             flowMode: this.#layoutOptions.flowMode ?? "paginated",
             blocks: bodyBlocksForPaint,
-            measures: bodyMeasuresForPaint
+            measures: bodyMeasuresForPaint,
+            fontSignature
           });
           headerLayouts = result.headers;
           footerLayouts = result.footers;
@@ -357597,6 +357940,7 @@ function print() { __p += __j.call(arguments, '') }
           bookmarks,
           anchorMap
         };
+        this.#layoutFontSignature = fontSignature;
         this.#layoutLookupBlocks = resolveBlocks;
         this.#layoutLookupMeasures = resolveMeasures;
         const tocStorage = this.#editor.storage?.tableOfContents;
@@ -357694,7 +358038,8 @@ function print() { __p += __j.call(arguments, '') }
         ruler: this.#layoutOptions.ruler,
         pageGap: this.#layoutState.layout?.pageGap ?? effectiveGap,
         showFormattingMarks: this.#layoutOptions.showFormattingMarks ?? false,
-        contentControlsChrome: this.#layoutOptions.contentControlsChrome ?? "default"
+        contentControlsChrome: this.#layoutOptions.contentControlsChrome ?? "default",
+        resolvePhysical: (css) => this.#fontResolver.resolvePhysicalFamily(css)
       });
       const currentZoom = this.#layoutOptions.zoom ?? 1;
       if (currentZoom !== 1)
@@ -358446,7 +358791,7 @@ function print() { __p += __j.call(arguments, '') }
     }
     async#layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata) {
       if (this.#headerFooterSession)
-        await this.#headerFooterSession.layoutPerRId(headerFooterInput, layout, sectionMetadata);
+        await this.#headerFooterSession.layoutPerRId(headerFooterInput, layout, sectionMetadata, this.#fontResolver);
     }
     #updateDecorationProviders(resolvedLayout) {
       this.#headerFooterSession?.updateDecorationProviders(resolvedLayout);
@@ -360393,7 +360738,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CEhzpYi5_es();
+  init_src_B1aSE_tB_es();
   init_SuperConverter_B9mZiCO9_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();