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

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-CF4og_LY.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -270607,44 +270607,17 @@ function normalizeFamilyKey$2(family$1) {
 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 createFontResolver() {
+  return new FontResolver;
 }
 function resolveFontFamily2(logicalFamily) {
-  const { physical, mapped } = physicalFor(splitStack(logicalFamily)[0] ?? logicalFamily);
-  return {
-    logicalFamily,
-    physicalFamily: physical,
-    reason: mapped ? "bundled_substitute" : "as_requested"
-  };
+  return defaultResolver.resolveFontFamily(logicalFamily);
 }
 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(", ");
+  return defaultResolver.resolvePhysicalFamily(cssFontFamily);
 }
 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];
+  return defaultResolver.resolvePrimaryPhysicalFamily(family$1);
 }
 function getFontConfigVersion() {
   return fontConfigVersion;
@@ -270734,14 +270707,14 @@ function installBundledSubstitutes(registry2, options = {}) {
       });
     }
 }
-function buildFontReport(logicalFamilies, registry2) {
+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 } = resolveFontFamily2(logical);
+    const { physicalFamily, reason } = resolver2 ? resolver2.resolveFontFamily(logical) : resolveFontFamily2(logical);
     const loadStatus = registry2.getStatus(physicalFamily);
     report.push({
       logicalFamily: logical,
@@ -271792,7 +271765,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 +271775,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 +271788,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 +271893,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 +271904,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 +271927,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 +271943,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 +277559,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 +277568,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 +277585,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 +277610,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 +278395,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?.fontSignature ?? "";
+  const previousFontSignature = fontRuntime?.previousFontSignature ?? "";
   const isSemanticFlow = options.flowMode === "semantic";
   if (isSemanticFlow) {
     headerFooter = undefined;
@@ -278435,7 +278412,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 +278442,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 +278452,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 +278513,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 +278554,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;
@@ -278717,13 +278694,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 +279656,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);
@@ -286175,14 +286152,14 @@ function getCanvasContext() {
   }
   return canvasContext;
 }
-function buildFontString(run2) {
+function buildFontString(run2, resolvePhysical = resolvePhysicalFamily) {
   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 = resolvePhysical(run2.fontFamily);
   if (measurementConfig.mode === "deterministic")
     parts.push(measurementConfig.fonts.fallbackStack.length > 0 ? measurementConfig.fonts.fallbackStack.join(", ") : measurementConfig.fonts.deterministicFamily);
   else
@@ -286275,7 +286252,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 = ".", resolvePhysical = resolvePhysicalFamily) {
   const result = {
     totalWidth: 0,
     runs: [],
@@ -286296,7 +286273,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, resolvePhysical);
         const width = measureRunWidth(text5, font, ctx$1, textRun, 0);
         let beforeDecimalWidth;
         if (!foundDecimal) {
@@ -286350,7 +286327,7 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
         fontSize,
         bold: run2.bold,
         italic: run2.italic
-      });
+      }, resolvePhysical);
       const pillWidth = (run2.displayLabel ? measureRunWidth(run2.displayLabel, font, ctx$1, run2, 0) : 0) + FIELD_ANNOTATION_PILL_PADDING;
       result.runs.push({
         runIndex: i4,
@@ -286366,25 +286343,25 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
   }
   return result;
 }
-async function measureBlock(block, constraints) {
+async function measureBlock(block, constraints, resolvePhysical = resolvePhysicalFamily) {
   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, resolvePhysical);
   if (block.kind === "table")
-    return measureTableBlock(block, normalized);
+    return measureTableBlock(block, normalized, resolvePhysical);
   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, resolvePhysical);
 }
-async function measureParagraphBlock(block, maxWidth) {
+async function measureParagraphBlock(block, maxWidth, resolvePhysical = resolvePhysicalFamily) {
   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 +286374,7 @@ async function measureParagraphBlock(block, maxWidth) {
       fontSize: wordLayout.marker.run.fontSize ?? fallbackFontSize,
       bold: wordLayout.marker.run.bold,
       italic: wordLayout.marker.run.italic
-    });
+    }, resolvePhysical);
     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 +286407,7 @@ async function measureParagraphBlock(block, maxWidth) {
       fontSize: marker.run?.fontSize ?? fallbackFontSize,
       bold: marker.run?.bold ?? false,
       italic: marker.run?.italic ?? false
-    });
+    }, resolvePhysical);
     return measureText(markerText, markerFont, ctx$1);
   }) ?? textStartPx;
   if (typeof effectiveTextStartPx === "number" && effectiveTextStartPx > indentLeft)
@@ -286454,7 +286431,7 @@ 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, resolvePhysical);
       dropCapMeasure = dropCapMeasured;
       dropCapDescriptor.measuredWidth = dropCapMeasured.width;
       dropCapDescriptor.measuredHeight = dropCapMeasured.height;
@@ -286679,7 +286656,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, resolvePhysical);
     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);
@@ -286876,7 +286853,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, resolvePhysical);
           if (groupMeasure.totalWidth > 0) {
             const relativeTarget = clampedTarget - effectiveIndent;
             let groupStartX;
@@ -287153,7 +287130,7 @@ async function measureParagraphBlock(block, maxWidth) {
       continue;
     }
     if (isEmptySdtPlaceholderRun(run2)) {
-      const placeholderFont = buildFontString(run2).font;
+      const placeholderFont = buildFontString(run2, resolvePhysical).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;
@@ -287225,7 +287202,7 @@ async function measureParagraphBlock(block, maxWidth) {
     }
     lastFontSize = run2.fontSize;
     hasSeenTextRun = true;
-    const { font } = buildFontString(run2);
+    const { font } = buildFontString(run2, resolvePhysical);
     const tabSegments = run2.text.split("\t");
     let charPosInRun = 0;
     for (let segmentIndex = 0;segmentIndex < tabSegments.length; segmentIndex++) {
@@ -287779,7 +287756,7 @@ async function measureParagraphBlock(block, maxWidth) {
     ...dropCapMeasure ? { dropCap: dropCapMeasure } : {}
   };
 }
-async function measureTableBlock(block, constraints) {
+async function measureTableBlock(block, constraints, resolvePhysical = resolvePhysicalFamily) {
   const workingInput = buildAutoFitWorkingGridInput(block, { maxWidth: typeof constraints === "number" ? constraints : constraints.maxWidth });
   const columnWidths = await resolveRuntimeTableColumnWidths(block, workingInput);
   const gridColumnCount = columnWidths.length;
@@ -287832,7 +287809,7 @@ async function measureTableBlock(block, constraints) {
         const measure = await measureBlock(block$1, {
           maxWidth: contentWidth$1,
           maxHeight: Infinity
-        });
+        }, resolvePhysical);
         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")
@@ -288060,7 +288037,7 @@ function normalizeConstraints(constraints) {
     return { maxWidth: constraints };
   return constraints;
 }
-async function measureListBlock(block, constraints) {
+async function measureListBlock(block, constraints, resolvePhysical = resolvePhysicalFamily) {
   const ctx$1 = getCanvasContext();
   const items = [];
   let totalHeight = 0;
@@ -288079,12 +288056,12 @@ async function measureListBlock(block, constraints) {
         bold: marker.run.bold,
         italic: marker.run.italic,
         letterSpacing: marker.run.letterSpacing
-      });
+      }, resolvePhysical);
       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), resolvePhysical);
       const markerText = item.marker.text ?? "";
       markerTextWidth = markerText ? measureText(markerText, markerFont, ctx$1) : 0;
       indentLeft = resolveIndentLeft(item);
@@ -288092,7 +288069,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, resolvePhysical);
     totalHeight += paragraphMeasure.totalHeight;
     items.push({
       itemId: item.id,
@@ -288108,7 +288085,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 +288108,27 @@ 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 resolvePhysical = fontResolver ? (css) => fontResolver.resolvePhysicalFamily(css) : undefined;
+  const fontSignature = fontResolver?.signature ?? "";
   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, resolvePhysical), undefined, undefined, pageResolver, kind, fontSignature);
       if (batchResult.default)
         layoutsByRId.set(rId, {
           kind,
@@ -288195,16 +288174,18 @@ 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 resolvePhysical = fontResolver ? (css) => fontResolver.resolvePhysicalFamily(css) : undefined;
+  const fontSignature = fontResolver?.signature ?? "";
   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, resolvePhysical), 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 +288548,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")
@@ -288857,10 +288838,10 @@ function defaultInvalidate() {
 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 +288853,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 +288862,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) {
@@ -312178,7 +312160,88 @@ 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 {
+}, SETTLED_STATUSES, BUNDLED_SUBSTITUTES, FontResolver = class {
+  #overrides = /* @__PURE__ */ new Map;
+  #version = 0;
+  map(logicalFamily, physicalFamily) {
+    const key2 = normalizeFamilyKey$2(logicalFamily);
+    const physical = physicalFamily?.trim();
+    if (!key2 || !physical)
+      return;
+    if (this.#overrides.get(key2) === physical)
+      return;
+    this.#overrides.set(key2, physical);
+    this.#version += 1;
+  }
+  unmap(logicalFamily) {
+    if (this.#overrides.delete(normalizeFamilyKey$2(logicalFamily)))
+      this.#version += 1;
+  }
+  reset() {
+    if (this.#overrides.size === 0)
+      return;
+    this.#overrides.clear();
+    this.#version += 1;
+  }
+  get version() {
+    return this.#version;
+  }
+  get signature() {
+    if (this.#overrides.size === 0)
+      return "";
+    return JSON.stringify([...this.#overrides.entries()].sort(([a2], [b$1]) => a2 < b$1 ? -1 : a2 > b$1 ? 1 : 0));
+  }
+  #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, fontConfigVersion = 0, BUNDLED_MANIFEST, defaultAssetBase = "/fonts/", installedRegistries, DEFAULT_FONT_LOAD_TIMEOUT_MS = 3000, DEFAULT_PROBE_SIZE = "16px", FontRegistry = class {
   #fontSet;
   #FontFaceCtor;
   #probeSize;
@@ -312454,10 +312517,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 +312621,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,
@@ -313242,7 +313305,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))
@@ -316163,6 +316226,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 +317914,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 +317929,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 +317986,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 +318047,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 +318059,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 +323661,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, resolvePhysical = resolvePhysicalFamily) => {
   const { run: run2, lines, mode } = descriptor;
   const { font } = buildFontString({
     fontFamily: run2.fontFamily,
     fontSize: run2.fontSize,
     bold: run2.bold,
     italic: run2.italic
-  });
+  }, resolvePhysical);
   ctx$1.font = font;
   const displayText = applyTextTransform(run2.text, run2);
   const metrics = ctx$1.measureText(displayText);
@@ -323760,7 +323824,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 +323832,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 +323907,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 +324628,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 +325051,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 +325494,7 @@ menclose::after {
   #getDocumentFonts;
   #getRequiredFaces;
   #resolveFamilies;
+  #fontResolver;
   #requestReflow;
   #getFontEnvironment;
   #registryOverride;
@@ -325446,7 +325514,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 +325544,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)
@@ -325705,7 +325775,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_CF4og_LY_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_B9mZiCO9_es();
   init_jszip_C49i9kUs_es();
@@ -352624,6 +352694,7 @@ function print() { __p += __j.call(arguments, '') }
     "times new roman": "Liberation Serif",
     "courier new": "Liberation Mono"
   });
+  defaultResolver = new FontResolver;
   BUNDLED_MANIFEST = Object.freeze([
     family("Carlito", "Carlito", "OFL-1.1"),
     family("Caladea", "Caladea", "Apache-2.0"),
@@ -353840,6 +353911,7 @@ function print() { __p += __j.call(arguments, '') }
       layout: null,
       bookmarks: /* @__PURE__ */ new Map
     };
+    #layoutFontSignature = "";
     #layoutLookupBlocks = [];
     #layoutLookupMeasures = [];
     #flowBlockCache = new FlowBlockCache;
@@ -353863,6 +353935,7 @@ function print() { __p += __j.call(arguments, '') }
     #isRerendering = false;
     #selectionSync = new SelectionSyncCoordinator;
     #fontGate = null;
+    #fontResolver = createFontResolver();
     #fontPlanBlocks = null;
     #lastFontsChangedKey = null;
     #lastFontsChangedPayload = null;
@@ -354094,7 +354167,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,
@@ -354158,8 +354232,8 @@ function print() { __p += __j.call(arguments, '') }
             this.#pendingDocChange = true;
             this.#scheduleRerender();
           },
-          getRequiredFaces: () => planRequiredFontFaces(this.#fontPlanBlocks),
-          resolveFamilies: resolvePhysicalFamilies,
+          getRequiredFaces: () => planRequiredFontFaces(this.#fontPlanBlocks, this.#fontResolver),
+          fontResolver: this.#fontResolver,
           onRegistryResolved: (registry2) => installBundledSubstitutes(registry2, {
             assetBaseUrl: this.#options.fontAssets?.assetBaseUrl,
             resolveAssetUrl: this.#options.fontAssets?.resolveAssetUrl
@@ -355319,7 +355393,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();
@@ -356399,6 +356474,7 @@ function print() { __p += __j.call(arguments, '') }
       });
       const handleDocumentReplaced = () => {
         this.#fontGate?.resetForDocumentChange();
+        this.#fontResolver.reset();
         this.#refreshHeaderFooterStructureThenRerender({ purgeCachedEditors: true });
       };
       this.#editor.on("documentReplaced", handleDocumentReplaced);
@@ -357523,6 +357599,9 @@ 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;
         let layout;
         let measures;
         let resolvedLayout;
@@ -357546,7 +357625,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, resolvePhysical), headerFooterInput ?? undefined, previousMeasures, {
+            fontSignature,
+            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 +357655,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 +357680,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 +357778,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 +358531,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 +360478,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_CF4og_LY_es();
   init_SuperConverter_B9mZiCO9_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.16.0-next.20",
+  "version": "0.16.0-next.21",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -24,8 +24,8 @@
     "@types/node": "22.19.2",
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
-    "@superdoc/document-api": "0.0.1",
     "@superdoc/super-editor": "0.0.1",
+    "@superdoc/document-api": "0.0.1",
     "superdoc": "1.38.0"
   },
   "module": "src/index.ts",
@@ -33,11 +33,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.20",
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.20",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.20",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.20",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.20"
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.21",
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.21",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.21",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.21",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.21"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",