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

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-B1aSE-tB.es.js
+// ../../packages/superdoc/dist/chunks/src-DvgAvHbj.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -270407,8 +270407,8 @@ function resolveFontFamily2(logicalFamily) {
 function resolvePhysicalFamily(cssFontFamily) {
   return defaultResolver.resolvePhysicalFamily(cssFontFamily);
 }
-function resolvePrimaryPhysicalFamily(family$1) {
-  return defaultResolver.resolvePrimaryPhysicalFamily(family$1);
+function resolveFace(logicalFamily, face, hasFace) {
+  return defaultResolver.resolveFace(logicalFamily, face, hasFace);
 }
 function getFontConfigVersion() {
   return fontConfigVersion;
@@ -270518,6 +270518,40 @@ function buildFontReport(logicalFamilies, registry2, resolver2) {
   }
   return report;
 }
+function buildFaceReport(usedFaces, registry2, resolver2) {
+  const hasFace = (family$1, weight, style2) => registry2.hasFace(family$1, weight, style2);
+  const seen = /* @__PURE__ */ new Set;
+  const report = [];
+  for (const { logicalFamily, weight, style: style2 } of usedFaces) {
+    if (!logicalFamily)
+      continue;
+    const key2 = `${logicalFamily.toLowerCase()}|${weight}|${style2}`;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    const face = {
+      weight,
+      style: style2
+    };
+    const { physicalFamily, reason } = resolver2 ? resolver2.resolveFace(logicalFamily, face, hasFace) : resolveFace(logicalFamily, face, hasFace);
+    const loadStatus = registry2.getFaceStatus({
+      family: physicalFamily,
+      weight,
+      style: style2
+    });
+    const missing = reason === "fallback_face_absent" || isSettled(loadStatus) && loadStatus !== "loaded";
+    report.push({
+      logicalFamily,
+      physicalFamily,
+      reason,
+      loadStatus,
+      exportFamily: logicalFamily,
+      missing,
+      face
+    });
+  }
+  return report;
+}
 function quoteFamily(family$1) {
   return `"${family$1.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 }
@@ -286067,7 +286101,11 @@ function buildFontString$1(run2, fontContext) {
   if (run2.bold)
     parts.push("bold");
   parts.push(`${normalizeFontSize$1(run2.fontSize)}px`);
-  const physicalFamily = normalizeFontFamily$1(fontContext.resolvePhysical(normalizeFontFamily$1(run2.fontFamily)));
+  const face = {
+    weight: run2.bold ? "700" : "400",
+    style: run2.italic ? "italic" : "normal"
+  };
+  const physicalFamily = normalizeFontFamily$1(fontContext.resolvePhysical(normalizeFontFamily$1(run2.fontFamily), face));
   parts.push(toCssFontFamily(physicalFamily) ?? physicalFamily);
   return parts.join(" ");
 }
@@ -286174,6 +286212,12 @@ function getCanvasContext() {
   }
   return canvasContext;
 }
+function faceOf(run2) {
+  return {
+    weight: run2.bold ? "700" : "400",
+    style: run2.italic ? "italic" : "normal"
+  };
+}
 function buildFontString(run2, fontContext) {
   const parts = [];
   if (run2.italic)
@@ -286181,7 +286225,7 @@ function buildFontString(run2, fontContext) {
   if (run2.bold)
     parts.push("bold");
   parts.push(`${run2.fontSize}px`);
-  const physicalFamily = fontContext.resolvePhysical(run2.fontFamily);
+  const physicalFamily = fontContext.resolvePhysical(run2.fontFamily, faceOf(run2));
   if (measurementConfig.mode === "deterministic")
     parts.push(measurementConfig.fonts.fallbackStack.length > 0 ? measurementConfig.fonts.fallbackStack.join(", ") : measurementConfig.fonts.deterministicFamily);
   else
@@ -286248,7 +286292,7 @@ function lineHeightFontSize(run2) {
 }
 function getFontInfoFromRun(run2, fontContext) {
   return {
-    fontFamily: normalizeFontFamily(fontContext.resolvePhysical(run2.fontFamily)),
+    fontFamily: normalizeFontFamily(fontContext.resolvePhysical(run2.fontFamily, faceOf(run2))),
     fontSize: normalizeFontSize2(lineHeightFontSize(run2)),
     bold: run2.bold,
     italic: run2.italic
@@ -287051,7 +287095,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
     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 = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif");
+      const annotationFontFamily = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif", faceOf(run2));
       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;
@@ -288109,7 +288153,7 @@ async function measureListBlock(block, constraints, fontContext) {
     totalHeight
   };
 }
-async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps, fontResolver) {
+async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps, fontResolver, hasFace, effectiveSignature) {
   deps.headerLayoutsByRId.clear();
   deps.footerLayoutsByRId.clear();
   if (!headerFooterInput)
@@ -288132,21 +288176,21 @@ 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, fontResolver);
-    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId, fontResolver);
+    await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId, fontResolver, hasFace, effectiveSignature);
+    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId, fontResolver, hasFace, effectiveSignature);
   } else {
     const effectiveHeaderRefsBySection = buildEffectiveHeaderFooterRefsBySection(sectionMetadata, "header");
     const effectiveFooterRefsBySection = buildEffectiveHeaderFooterRefsBySection(sectionMetadata, "footer");
-    await layoutBlocksByRId("header", headerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveHeaderRefsBySection), constraints, pageResolver, deps.headerLayoutsByRId, fontResolver);
-    await layoutBlocksByRId("footer", footerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveFooterRefsBySection), constraints, pageResolver, deps.footerLayoutsByRId, fontResolver);
+    await layoutBlocksByRId("header", headerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveHeaderRefsBySection), constraints, pageResolver, deps.headerLayoutsByRId, fontResolver, hasFace, effectiveSignature);
+    await layoutBlocksByRId("footer", footerBlocksByRId, collectReferencedHeaderFooterRIds(effectiveFooterRefsBySection), constraints, pageResolver, deps.footerLayoutsByRId, fontResolver, hasFace, effectiveSignature);
   }
 }
-async function layoutBlocksByRId(kind, blocksByRId, referencedRIds, constraints, pageResolver, layoutsByRId, fontResolver) {
+async function layoutBlocksByRId(kind, blocksByRId, referencedRIds, constraints, pageResolver, layoutsByRId, fontResolver, hasFace, effectiveSignature) {
   if (!blocksByRId || referencedRIds.size === 0)
     return;
-  const fontSignature = fontResolver?.signature ?? "";
+  const fontSignature = effectiveSignature ?? "";
   const fontMeasureContext = fontResolver ? {
-    resolvePhysical: (css) => fontResolver.resolvePhysicalFamily(css),
+    resolvePhysical: (css, face) => hasFace ? fontResolver.resolvePhysicalFamilyForFace(css, face, hasFace) : fontResolver.resolvePhysicalFamily(css),
     fontSignature
   } : undefined;
   for (const [rId, blocks2] of blocksByRId) {
@@ -288201,12 +288245,12 @@ function adjustFramePositionsForContentWidth(layout, blocks2, effectiveWidth, co
         fragment2.x -= widthDiff / 2;
     }
 }
-async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId, fontResolver) {
+async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId, fontResolver, hasFace, effectiveSignature) {
   if (!blocksByRId)
     return;
-  const fontSignature = fontResolver?.signature ?? "";
+  const fontSignature = effectiveSignature ?? "";
   const fontMeasureContext = fontResolver ? {
-    resolvePhysical: (css) => fontResolver.resolvePhysicalFamily(css),
+    resolvePhysical: (css, face) => hasFace ? fontResolver.resolvePhysicalFamilyForFace(css, face, hasFace) : fontResolver.resolvePhysicalFamily(css),
     fontSignature
   } : undefined;
   const groups = buildSectionAwareHeaderFooterMeasurementGroups(kind, blocksByRId, sectionMetadata, fallbackConstraints);
@@ -288875,80 +288919,136 @@ function defaultScheduleMicrotask(callback) {
   }
   Promise.resolve().then(callback);
 }
-function faceKey(req) {
-  return `${req.family.toLowerCase()}|${req.weight}|${req.style}`;
+function primaryFamily(css) {
+  const comma = css.indexOf(",");
+  return (comma === -1 ? css : css.slice(0, comma)).trim().replace(/^["']|["']$/g, "");
 }
-function collect(out, node3, resolve3) {
+function makeResolveFace(resolver2, hasFace) {
+  if (resolver2 && hasFace)
+    return (logical, face) => {
+      const r$1 = resolver2.resolveFace(logical, face, hasFace);
+      return {
+        physicalFamily: r$1.physicalFamily,
+        reason: r$1.reason
+      };
+    };
+  if (resolver2)
+    return (logical) => {
+      const r$1 = resolver2.resolveFontFamily(logical);
+      return {
+        physicalFamily: r$1.physicalFamily,
+        reason: r$1.reason
+      };
+    };
+  return (logical) => {
+    const r$1 = resolveFontFamily2(logical);
+    return {
+      physicalFamily: r$1.physicalFamily,
+      reason: r$1.reason
+    };
+  };
+}
+function collect(acc, node3, resolveFace$1) {
   if (!node3 || typeof node3.fontFamily !== "string" || !node3.fontFamily)
     return;
-  const family$1 = resolve3(node3.fontFamily);
-  if (!family$1)
+  const weight = node3.bold === true ? "700" : "400";
+  const style2 = node3.italic === true ? "italic" : "normal";
+  const logicalPrimary = primaryFamily(node3.fontFamily);
+  if (!logicalPrimary)
     return;
-  const req = {
-    family: family$1,
-    weight: node3.bold === true ? "700" : "400",
-    style: node3.italic === true ? "italic" : "normal"
-  };
-  const key2 = faceKey(req);
-  if (!out.has(key2))
-    out.set(key2, req);
+  const usedKey = `${logicalPrimary.toLowerCase()}|${weight}|${style2}`;
+  if (acc.usedFaces.has(usedKey))
+    return;
+  const { physicalFamily, reason } = resolveFace$1(node3.fontFamily, {
+    weight,
+    style: style2
+  });
+  acc.usedFaces.set(usedKey, {
+    logicalFamily: logicalPrimary,
+    weight,
+    style: style2
+  });
+  acc.sigEntries.set(usedKey, [
+    logicalPrimary.toLowerCase(),
+    weight,
+    style2,
+    (physicalFamily || "").toLowerCase(),
+    reason
+  ]);
+  if (physicalFamily) {
+    const reqKey = `${physicalFamily.toLowerCase()}|${weight}|${style2}`;
+    if (!acc.requiredFaces.has(reqKey))
+      acc.requiredFaces.set(reqKey, {
+        family: physicalFamily,
+        weight,
+        style: style2
+      });
+  }
 }
-function collectRuns(out, runs2, resolve3) {
+function collectRuns(acc, runs2, resolveFace$1) {
   if (!runs2)
     return;
   for (const run2 of runs2) {
     const bearing = run2;
     if (run2.kind === "fieldAnnotation" && (typeof bearing.fontFamily !== "string" || !bearing.fontFamily))
-      collect(out, {
+      collect(acc, {
         ...bearing,
         fontFamily: "Arial"
-      }, resolve3);
+      }, resolveFace$1);
     else
-      collect(out, bearing, resolve3);
+      collect(acc, bearing, resolveFace$1);
   }
 }
-function collectParagraph(out, paragraph2, resolve3) {
+function collectParagraph(acc, paragraph2, resolveFace$1) {
   if (!paragraph2)
     return;
-  collectRuns(out, paragraph2.runs, resolve3);
-  collect(out, paragraph2.attrs?.wordLayout?.marker?.run, resolve3);
-  collect(out, paragraph2.attrs?.dropCapDescriptor?.run, resolve3);
+  collectRuns(acc, paragraph2.runs, resolveFace$1);
+  collect(acc, paragraph2.attrs?.wordLayout?.marker?.run, resolveFace$1);
+  collect(acc, paragraph2.attrs?.dropCapDescriptor?.run, resolveFace$1);
 }
-function collectTable(out, table2, resolve3) {
+function collectTable(acc, table2, resolveFace$1) {
   for (const row2 of table2.rows)
     for (const cell2 of row2.cells) {
-      collectParagraph(out, cell2.paragraph, resolve3);
+      collectParagraph(acc, cell2.paragraph, resolveFace$1);
       if (cell2.blocks)
         for (const b$1 of cell2.blocks)
-          collectBlock(out, b$1, resolve3);
+          collectBlock(acc, b$1, resolveFace$1);
     }
 }
-function collectList(out, list5, resolve3) {
+function collectList(acc, list5, resolveFace$1) {
   for (const item of list5.items)
-    collectParagraph(out, item.paragraph, resolve3);
+    collectParagraph(acc, item.paragraph, resolveFace$1);
 }
-function collectBlock(out, block, resolve3) {
+function collectBlock(acc, block, resolveFace$1) {
   switch (block.kind) {
     case "paragraph":
-      collectParagraph(out, block, resolve3);
+      collectParagraph(acc, block, resolveFace$1);
       break;
     case "table":
-      collectTable(out, block, resolve3);
+      collectTable(acc, block, resolveFace$1);
       break;
     case "list":
-      collectList(out, block, resolve3);
+      collectList(acc, block, resolveFace$1);
       break;
     default:
       break;
   }
 }
-function planRequiredFontFaces(blocks2, resolver2) {
-  const resolve3 = resolver2 ? (family$1) => resolver2.resolvePrimaryPhysicalFamily(family$1) : resolvePrimaryPhysicalFamily;
-  const out = /* @__PURE__ */ new Map;
+function planFontFaces(blocks2, resolver2, hasFace) {
+  const resolveFace$1 = makeResolveFace(resolver2, hasFace);
+  const acc = {
+    requiredFaces: /* @__PURE__ */ new Map,
+    usedFaces: /* @__PURE__ */ new Map,
+    sigEntries: /* @__PURE__ */ new Map
+  };
   if (blocks2)
     for (const block of blocks2)
-      collectBlock(out, block, resolve3);
-  return [...out.values()];
+      collectBlock(acc, block, resolveFace$1);
+  return {
+    requiredFaces: [...acc.requiredFaces.values()],
+    usedFaces: [...acc.usedFaces.values()],
+    effectiveSignature: acc.sigEntries.size === 0 ? "" : JSON.stringify([...acc.sigEntries.entries()].sort(([a2], [b$1]) => a2 < b$1 ? -1 : a2 > b$1 ? 1 : 0).map(([, tuple]) => tuple))
+  };
 }
 function buildSemanticFootnoteBlocks(input2, footnotesMode) {
   if (!input2 || input2.refs.length === 0 || input2.blocksById.size === 0)
@@ -310111,6 +310211,40 @@ menclose::after {
       return cssFontFamily;
     return [physical, ...parts.slice(1)].join(", ");
   }
+  resolveFace(logicalFamily, face, hasFace) {
+    const primary = splitStack(logicalFamily)[0] ?? logicalFamily;
+    const { physical, reason } = this.#physicalFor(primary);
+    if (reason === "as_requested")
+      return {
+        logicalFamily,
+        physicalFamily: physical,
+        reason
+      };
+    if (hasFace(physical, face.weight, face.style))
+      return {
+        logicalFamily,
+        physicalFamily: physical,
+        reason
+      };
+    return {
+      logicalFamily,
+      physicalFamily: primary,
+      reason: "fallback_face_absent"
+    };
+  }
+  resolvePhysicalFamilyForFace(cssFontFamily, face, hasFace) {
+    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;
+    if (!hasFace(physical, face.weight, face.style))
+      return cssFontFamily;
+    return [physical, ...parts.slice(1)].join(", ");
+  }
   resolvePrimaryPhysicalFamily(family$1) {
     const primary = splitStack(family$1)[0] ?? family$1;
     return this.#physicalFor(primary).physical;
@@ -310216,6 +310350,9 @@ menclose::after {
         return s2;
     return "unloaded";
   }
+  hasFace(family$1, weight, style2) {
+    return this.#facesByFamily.get(normalizeFamilyKey$1(family$1))?.has(faceKeyOf$1(family$1, weight, style2)) ?? false;
+  }
   isAvailable(family$1) {
     if (!this.#fontSet)
       return false;
@@ -310708,7 +310845,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, resolvePhysical = resolvePhysicalFamily) => {
+}, 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 = (css) => resolvePhysicalFamily(css)) => {
   const markerContainer = doc$12.createElement("span");
   markerContainer.classList.add(DOM_CLASS_NAMES.LIST_MARKER);
   markerContainer.style.display = "inline-block";
@@ -310718,7 +310855,10 @@ menclose::after {
   markerEl.textContent = markerText;
   markerEl.style.pointerEvents = "none";
   const cssFontFamily = toCssFontFamily(run2.fontFamily) ?? run2.fontFamily ?? "";
-  markerEl.style.fontFamily = resolvePhysical(cssFontFamily);
+  markerEl.style.fontFamily = resolvePhysical(cssFontFamily, {
+    weight: run2.bold ? "700" : "400",
+    style: run2.italic ? "italic" : "normal"
+  });
   if (run2.fontSize != null)
     markerEl.style.fontSize = `${run2.fontSize}px`;
   markerEl.style.fontWeight = run2.bold ? "bold" : "";
@@ -310736,7 +310876,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, resolvePhysical = resolvePhysicalFamily } = params$1;
+  const { doc: doc$12, lineEl, wordLayout, markerLayout, markerMeasure, markerTextWidthPx, indentLeftPx, hangingIndentPx, firstLineIndentPx, isRtl, sourceAnchor, resolvePhysical = (css) => resolvePhysicalFamily(css) } = 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,
@@ -310794,7 +310934,7 @@ 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, resolvePhysical = resolvePhysicalFamily } = params$1;
+  const { doc: doc$12, lineEl, marker, isRtl, sourceAnchor, resolvePhysical } = params$1;
   if (isRtl)
     lineEl.style.paddingRight = `${marker.firstLinePaddingLeftPx}px`;
   else
@@ -311069,7 +311209,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, resolvePhysical = resolvePhysicalFamily } = params$1;
+  const { frameEl, block, resolvedContent: content3, markerTextWidth, renderLine: renderLine$1, captureLineSnapshot, convertFinalParagraphMark, lineTopOffset = 0, sourceAnchor, resolvePhysical = (css) => resolvePhysicalFamily(css) } = params$1;
   const renderedLines = [];
   const resolvedMarker = content3.marker;
   const expandedRunsForBlock = expandRunsForInlineNewlines(block.runs);
@@ -311123,7 +311263,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, resolvePhysical = resolvePhysicalFamily } = 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 = (css) => resolvePhysicalFamily(css) } = params$1;
   const lines = linesOverride ?? measure.lines ?? [];
   const paraIndent = block.attrs?.indent;
   const paraIndentLeft = paraIndent?.left ?? 0;
@@ -312394,7 +312534,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, resolvePhysical = resolvePhysicalFamily } = 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 = (css) => resolvePhysicalFamily(css) } = params$1;
   try {
     if (!doc$12)
       throw new Error("DomPainter: document is not available");
@@ -312473,12 +312613,15 @@ menclose::after {
     });
     return createErrorPlaceholder(fragment2.blockId, error3);
   }
-}, renderDropCap = (doc$12, descriptor, measure, resolvePhysical = resolvePhysicalFamily) => {
+}, renderDropCap = (doc$12, descriptor, measure, resolvePhysical = (css) => resolvePhysicalFamily(css)) => {
   const { run: run2, mode } = descriptor;
   const dropCapEl = doc$12.createElement("span");
   dropCapEl.classList.add("superdoc-drop-cap");
   dropCapEl.textContent = run2.text;
-  dropCapEl.style.fontFamily = resolvePhysical(run2.fontFamily);
+  dropCapEl.style.fontFamily = resolvePhysical(run2.fontFamily, {
+    weight: run2.bold ? "700" : "400",
+    style: run2.italic ? "italic" : "normal"
+  });
   dropCapEl.style.fontSize = `${run2.fontSize}px`;
   if (run2.bold)
     dropCapEl.style.fontWeight = "bold";
@@ -312594,7 +312737,10 @@ menclose::after {
 }, 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 = resolvePhysical(run2.fontFamily);
+  element3.style.fontFamily = resolvePhysical(run2.fontFamily, {
+    weight: run2.bold ? "700" : "400",
+    style: run2.italic ? "italic" : "normal"
+  });
   element3.style.fontSize = `${run2.fontSize}px`;
   if (run2.bold)
     element3.style.fontWeight = "bold";
@@ -312777,7 +312923,10 @@ menclose::after {
   }
   {
     const resolvePhysical = context.resolvePhysical ?? resolvePhysicalFamily;
-    annotation.style.fontFamily = resolvePhysical(run2.fontFamily || "Arial, sans-serif");
+    annotation.style.fontFamily = resolvePhysical(run2.fontFamily || "Arial, sans-serif", {
+      weight: run2.bold ? "700" : "400",
+      style: run2.italic ? "italic" : "normal"
+    });
   }
   {
     const fontSize = run2.fontSize ? typeof run2.fontSize === "number" ? `${run2.fontSize}pt` : run2.fontSize : BROWSER_DEFAULT_FONT_SIZE;
@@ -324709,11 +324858,11 @@ menclose::after {
   #resolveResult(result, storyId) {
     return resolveResult(result, storyId, this.#options.getFontSignature?.() ?? "");
   }
-  async layoutPerRId(headerFooterInput, layout, sectionMetadata, fontResolver) {
+  async layoutPerRId(headerFooterInput, layout, sectionMetadata, fontResolver, hasFace, effectiveSignature) {
     await layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, {
       headerLayoutsByRId: this.#headerLayoutsByRId,
       footerLayoutsByRId: this.#footerLayoutsByRId
-    }, fontResolver);
+    }, fontResolver, hasFace, effectiveSignature);
     this.#resolvedHeaderByRId.clear();
     for (const [key2, result] of this.#headerLayoutsByRId)
       this.#resolvedHeaderByRId.set(key2, this.#resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
@@ -325571,6 +325720,7 @@ menclose::after {
 }, FontReadinessGate = class {
   #getDocumentFonts;
   #getRequiredFaces;
+  #getUsedFaces;
   #resolveFamilies;
   #fontResolver;
   #requestReflow;
@@ -325580,6 +325730,7 @@ menclose::after {
   #timeoutMs;
   #invalidateCaches;
   #context = null;
+  #packInstalledFor = null;
   #fontConfigVersion = 0;
   #requiredSignature = "";
   #requiredFamilies = /* @__PURE__ */ new Set;
@@ -325592,6 +325743,7 @@ menclose::after {
   constructor(options) {
     this.#getDocumentFonts = options.getDocumentFonts;
     this.#getRequiredFaces = options.getRequiredFaces ?? null;
+    this.#getUsedFaces = options.getUsedFaces ?? null;
     this.#fontResolver = options.fontResolver ?? null;
     const resolver2 = this.#fontResolver;
     this.#resolveFamilies = options.resolveFamilies ?? (resolver2 ? (families) => resolver2.resolvePhysicalFamilies(families) : (families) => families);
@@ -325616,13 +325768,19 @@ menclose::after {
     return this.#lastSummary;
   }
   getReport() {
-    let logical = [];
+    let declared = [];
     try {
-      logical = this.#getDocumentFonts();
+      declared = this.#getDocumentFonts();
     } catch {
       return [];
     }
-    return buildFontReport(logical, this.#resolveContext().registry, this.#fontResolver ?? undefined);
+    const registry2 = this.#resolveContext().registry;
+    const resolver2 = this.#fontResolver ?? undefined;
+    const usedFaces = this.#getUsedFaces?.() ?? [];
+    const faceRows = buildFaceReport(usedFaces, registry2, resolver2);
+    const usedFamilies = new Set(usedFaces.map((u) => u.logicalFamily.toLowerCase()));
+    const declaredRows = buildFontReport(declared.filter((family$1) => family$1 && !usedFamilies.has(family$1.toLowerCase())), registry2, resolver2);
+    return [...faceRows, ...declaredRows];
   }
   async ensureReadyForMeasure() {
     if (this.#getRequiredFaces)
@@ -325732,10 +325890,12 @@ menclose::after {
       fontSet,
       registry: registry2
     };
-    if (fontSet && this.#onRegistryResolved)
+    if (this.#onRegistryResolved && registry2 !== this.#packInstalledFor) {
+      this.#packInstalledFor = registry2;
       try {
         this.#onRegistryResolved(registry2);
       } catch {}
+    }
     return this.#context;
   }
   #ensureSubscribed() {
@@ -325993,7 +326153,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_B1aSE_tB_es = __esm(() => {
+var init_src_DvgAvHbj_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_B9mZiCO9_es();
   init_jszip_C49i9kUs_es();
@@ -352883,7 +353043,7 @@ function print() { __p += __j.call(arguments, '') }
   });
   defaultResolver = new FontResolver;
   DEFAULT_FONT_MEASURE_CONTEXT = Object.freeze({
-    resolvePhysical: resolvePhysicalFamily,
+    resolvePhysical: (cssFontFamily, _face) => resolvePhysicalFamily(cssFontFamily),
     fontSignature: ""
   });
   BUNDLED_MANIFEST = Object.freeze([
@@ -354167,7 +354327,10 @@ function print() { __p += __j.call(arguments, '') }
       }
     });
     #fontPlanBlocks = null;
+    #fontPlan = null;
+    #hasFace = (family$1, weight, style2) => this.#fontGate ? this.#fontGate.resolveRegistry().hasFace(family$1, weight, style2) : false;
     #lastFontsChangedKey = null;
+    #lastFontsChangedVersion = -1;
     #lastFontsChangedPayload = null;
     #shouldScrollSelectionIntoView = false;
     #suppressSelectionScrollUntilRaf = false;
@@ -354398,7 +354561,7 @@ function print() { __p += __j.call(arguments, '') }
         initBudgetMs: HEADER_FOOTER_INIT_BUDGET_MS,
         defaultPageSize: DEFAULT_PAGE_SIZE,
         defaultMargins: DEFAULT_MARGINS,
-        getFontSignature: () => this.#fontResolver.signature
+        getFontSignature: () => this.#layoutFontSignature
       });
       this.#headerFooterSession.setHoverElements({
         hoverOverlay: this.#hoverOverlay,
@@ -354453,7 +354616,8 @@ function print() { __p += __j.call(arguments, '') }
             return this.#editor.converter?.getDocumentFonts?.() ?? [];
           },
           requestReflow: () => this.#requestFontReflow(),
-          getRequiredFaces: () => planRequiredFontFaces(this.#fontPlanBlocks, this.#fontResolver),
+          getRequiredFaces: () => this.#fontPlan?.requiredFaces ?? [],
+          getUsedFaces: () => this.#fontPlan?.usedFaces ?? [],
           fontResolver: this.#fontResolver,
           onRegistryResolved: (registry2) => installBundledSubstitutes(registry2, {
             assetBaseUrl: this.#options.fontAssets?.assetBaseUrl,
@@ -355428,7 +355592,7 @@ function print() { __p += __j.call(arguments, '') }
       return this.#fontGate?.getReport() ?? [];
     }
     getMissingFonts() {
-      return this.getFontReport().filter((record) => record.missing).map((record) => record.logicalFamily);
+      return [...new Set(this.getFontReport().filter((record) => record.missing).map((record) => record.logicalFamily))];
     }
     mapFonts(mappings) {
       this.#fontController.map(mappings);
@@ -355457,14 +355621,17 @@ function print() { __p += __j.call(arguments, '') }
       if (!gate)
         return;
       const version$1 = gate.fontConfigVersion;
-      const key2 = `${version$1}|${summary ? summary.results.map((result) => `${result.family}:${result.status}`).sort().join(",") : ""}`;
+      const statusKey = summary ? summary.results.map((result) => `${result.family}:${result.status}`).sort().join(",") : "";
+      const key2 = `${version$1}|${this.#fontPlan?.effectiveSignature ?? ""}|${statusKey}`;
       if (key2 === this.#lastFontsChangedKey)
         return;
       const isInitial = this.#lastFontsChangedKey === null;
+      const epochBumped = !isInitial && version$1 !== this.#lastFontsChangedVersion;
       this.#lastFontsChangedKey = key2;
+      this.#lastFontsChangedVersion = version$1;
       const pendingSource = this.#nextFontsChangedSource;
       this.#nextFontsChangedSource = null;
-      const source = isInitial ? "initial" : pendingSource ?? "late-load";
+      const source = isInitial ? "initial" : pendingSource ?? (epochBumped ? "late-load" : "render-change");
       let resolutions;
       try {
         resolutions = gate.getReport();
@@ -355472,9 +355639,9 @@ function print() { __p += __j.call(arguments, '') }
         return;
       }
       const payload = {
-        documentFonts: resolutions.map((record) => record.logicalFamily),
+        documentFonts: [...new Set(resolutions.map((record) => record.logicalFamily))],
         resolutions,
-        missingFonts: resolutions.filter((record) => record.missing).map((record) => record.logicalFamily),
+        missingFonts: [...new Set(resolutions.filter((record) => record.missing).map((record) => record.logicalFamily))],
         loadSummary: summary ?? {
           loaded: 0,
           failed: 0,
@@ -355496,7 +355663,10 @@ function print() { __p += __j.call(arguments, '') }
     #resetFontReportStateForDocumentChange() {
       this.#nextFontsChangedSource = null;
       this.#lastFontsChangedKey = null;
+      this.#lastFontsChangedVersion = -1;
       this.#lastFontsChangedPayload = null;
+      this.#fontPlan = null;
+      this.#fontPlanBlocks = null;
     }
     getLayoutOptions() {
       return { ...this.#layoutOptions };
@@ -355646,7 +355816,7 @@ function print() { __p += __j.call(arguments, '') }
         flowMode: this.#layoutOptions.flowMode ?? "paginated",
         blocks: blocks2,
         measures,
-        fontSignature: this.#fontResolver.signature
+        fontSignature: this.#layoutFontSignature
       });
       const isSemanticFlow = this.#layoutOptions.flowMode === "semantic";
       this.#ensurePainter();
@@ -357855,10 +358025,10 @@ 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 resolvePhysical = (css, face) => this.#fontResolver.resolvePhysicalFamilyForFace(css, face, this.#hasFace);
+        let fontSignature = "";
         const previousFontSignature = this.#layoutFontSignature;
-        const fontMeasureContext = {
+        let fontMeasureContext = {
           resolvePhysical,
           fontSignature
         };
@@ -357880,6 +358050,12 @@ function print() { __p += __j.call(arguments, '') }
             ...headerFooterInput ? this.#collectHeaderFooterFaceBlocks(headerFooterInput) : [],
             ...!isSemanticFlow && footnotesLayoutInput?.blocksById ? [...footnotesLayoutInput.blocksById.values()].flat() : []
           ];
+          this.#fontPlan = planFontFaces(this.#fontPlanBlocks, this.#fontResolver, this.#hasFace);
+          fontSignature = this.#fontPlan.effectiveSignature;
+          fontMeasureContext = {
+            resolvePhysical,
+            fontSignature
+          };
           const fontSummary = await this.#fontGate?.ensureReadyForMeasure() ?? null;
           this.#emitFontsChangedIfChanged(fontSummary);
         } catch {}
@@ -358039,7 +358215,7 @@ function print() { __p += __j.call(arguments, '') }
         pageGap: this.#layoutState.layout?.pageGap ?? effectiveGap,
         showFormattingMarks: this.#layoutOptions.showFormattingMarks ?? false,
         contentControlsChrome: this.#layoutOptions.contentControlsChrome ?? "default",
-        resolvePhysical: (css) => this.#fontResolver.resolvePhysicalFamily(css)
+        resolvePhysical: (css, face) => this.#fontResolver.resolvePhysicalFamilyForFace(css, face, this.#hasFace)
       });
       const currentZoom = this.#layoutOptions.zoom ?? 1;
       if (currentZoom !== 1)
@@ -358791,7 +358967,7 @@ function print() { __p += __j.call(arguments, '') }
     }
     async#layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata) {
       if (this.#headerFooterSession)
-        await this.#headerFooterSession.layoutPerRId(headerFooterInput, layout, sectionMetadata, this.#fontResolver);
+        await this.#headerFooterSession.layoutPerRId(headerFooterInput, layout, sectionMetadata, this.#fontResolver, this.#hasFace, this.#fontPlan?.effectiveSignature ?? "");
     }
     #updateDecorationProviders(resolvedLayout) {
       this.#headerFooterSession?.updateDecorationProviders(resolvedLayout);
@@ -360738,7 +360914,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_B1aSE_tB_es();
+  init_src_DvgAvHbj_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.22",
+  "version": "0.16.0-next.23",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -33,11 +33,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.22",
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.22",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.22",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.22",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.22"
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.23",
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.23",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.23",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.23",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.23"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",