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

package/dist/index.js

@@ -68342,7 +68342,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-B9mZiCO9.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-BSMYiYJm.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -78291,6 +78291,70 @@ function computeFragmentPmRange(block, lines, fromLine, toLine) {
     pmEnd
   };
 }
+function resolveAnchoredGraphicY(input) {
+  const { anchor, objectHeight, contentTop, contentBottom, pageBottomMargin = 0, anchorParagraphY = contentTop, firstLineHeight = 0, preRegisteredFallbackToContentTop = false } = input;
+  const offsetV = anchor?.offsetV ?? 0;
+  const vRelativeFrom = anchor?.vRelativeFrom;
+  const alignV = anchor?.alignV;
+  const contentHeight = Math.max(0, contentBottom - contentTop);
+  if (vRelativeFrom === "margin") {
+    if (alignV === "bottom")
+      return contentBottom - objectHeight + offsetV;
+    if (alignV === "center")
+      return contentTop + (contentHeight - objectHeight) / 2 + offsetV;
+    return contentTop + offsetV;
+  }
+  if (vRelativeFrom === "page") {
+    const pageHeight = contentBottom + pageBottomMargin;
+    if (alignV === "bottom")
+      return pageHeight - objectHeight + offsetV;
+    if (alignV === "center")
+      return (pageHeight - objectHeight) / 2 + offsetV;
+    return offsetV;
+  }
+  if (vRelativeFrom === "paragraph") {
+    if (preRegisteredFallbackToContentTop)
+      return contentTop + offsetV;
+    const baseAnchorY = anchorParagraphY;
+    if (alignV === "bottom")
+      return baseAnchorY + firstLineHeight - objectHeight + offsetV;
+    if (alignV === "center")
+      return baseAnchorY + (firstLineHeight - objectHeight) / 2 + offsetV;
+    return baseAnchorY + offsetV;
+  }
+  if (preRegisteredFallbackToContentTop)
+    return contentTop + offsetV;
+  return anchorParagraphY + offsetV;
+}
+function resolveAnchoredGraphicX(anchor, columnIndex, columns, objectWidth, margins, pageWidth) {
+  const alignH = anchor.alignH ?? "left";
+  const offsetH = anchor.offsetH ?? 0;
+  const marginLeft = Math.max(0, margins?.left ?? 0);
+  const marginRight = Math.max(0, margins?.right ?? 0);
+  const contentWidth = pageWidth != null ? Math.max(1, pageWidth - (marginLeft + marginRight)) : columns.width;
+  const contentLeft = marginLeft;
+  const columnLeft = contentLeft + columnIndex * (columns.width + columns.gap);
+  const relativeFrom = anchor.hRelativeFrom ?? "column";
+  let baseX;
+  let availableWidth;
+  if (relativeFrom === "page") {
+    baseX = 0;
+    availableWidth = pageWidth != null ? pageWidth : contentWidth + marginLeft + marginRight;
+  } else if (relativeFrom === "margin") {
+    baseX = contentLeft;
+    availableWidth = contentWidth;
+  } else {
+    baseX = columnLeft;
+    availableWidth = columns.width;
+  }
+  if (alignH === "left")
+    return baseX + offsetH;
+  if (alignH === "right")
+    return baseX + availableWidth - objectWidth - offsetH;
+  if (alignH === "center")
+    return baseX + (availableWidth - objectWidth) / 2 + offsetH;
+  return baseX;
+}
 function widthsEqual(a, b) {
   if (!a && !b)
     return true;
@@ -78317,10 +78381,12 @@ function cloneColumnLayout(columns) {
 }
 function normalizeColumnLayout(input, contentWidth, epsilon = 0.0001) {
   const rawCount = input && Number.isFinite(input.count) ? Math.floor(input.count) : 1;
-  const count2 = Math.max(1, rawCount || 1);
+  let count2 = Math.max(1, rawCount || 1);
   const gap = Math.max(0, input?.gap ?? 0);
+  const explicitWidths = input?.equalWidth === false && Array.isArray(input?.widths) && input.widths.length > 0 ? input.widths.filter((width$1) => typeof width$1 === "number" && Number.isFinite(width$1) && width$1 > 0) : [];
+  if (explicitWidths.length > 0 && explicitWidths.length < count2)
+    count2 = explicitWidths.length;
   const availableWidth = contentWidth - gap * (count2 - 1);
-  const explicitWidths = Array.isArray(input?.widths) && input.widths.length > 0 ? input.widths.filter((width$1) => typeof width$1 === "number" && Number.isFinite(width$1) && width$1 > 0) : [];
   let widths = explicitWidths.length > 0 ? explicitWidths.slice(0, count2) : Array.from({ length: count2 }, () => availableWidth > 0 ? availableWidth / count2 : contentWidth);
   if (widths.length < count2) {
     const remaining = Math.max(0, availableWidth - widths.reduce((sum, width$1) => sum + width$1, 0));
@@ -83755,6 +83821,8 @@ function handleImageNode$1(node3, params3, isAnchor) {
     default:
       break;
   }
+  if (wrap$1.type === "Square" || wrap$1.type === "Tight" || wrap$1.type === "Through" || wrap$1.type === "TopAndBottom")
+    mergeAnchorPaddingIntoWrapDistances(wrap$1, padding);
   const docPr = node3.elements.find((el) => el.name === "wp:docPr");
   const isHidden = isDocPrHidden(docPr);
   let anchorData = null;
@@ -101825,18 +101893,22 @@ function extractColumns(elements) {
   const cols = elements.find((el) => el?.name === "w:cols");
   if (!cols?.attributes)
     return;
-  const count2 = parseColumnCount(cols.attributes["w:num"]);
+  let count2 = parseColumnCount(cols.attributes["w:num"]);
   const withSeparator = parseColumnSeparator(cols.attributes["w:sep"]);
   const equalWidthRaw = cols.attributes["w:equalWidth"];
   const equalWidth = equalWidthRaw === "0" || equalWidthRaw === 0 || equalWidthRaw === false ? false : equalWidthRaw === "1" || equalWidthRaw === 1 || equalWidthRaw === true ? true : undefined;
   const columnChildren = Array.isArray(cols.elements) ? cols.elements.filter((child) => child?.name === "w:col") : [];
-  const gapInches = parseColumnGap(cols.attributes["w:space"] ?? columnChildren.find((child) => child?.attributes?.["w:space"] != null)?.attributes?.["w:space"]);
+  const isExplicit = equalWidth === false;
+  const firstChildSpace = columnChildren.find((child) => child?.attributes?.["w:space"] != null)?.attributes?.["w:space"];
+  const gapInches = parseColumnGap(isExplicit ? firstChildSpace ?? 0 : cols.attributes["w:space"]);
   const widths = columnChildren.map((child) => Number(child.attributes?.["w:w"])).filter((widthTwips) => Number.isFinite(widthTwips) && widthTwips > 0).map((widthTwips) => widthTwips / 1440 * PX_PER_INCH$1);
+  if (isExplicit && widths.length > 0)
+    count2 = Math.min(count2, widths.length);
   return {
     count: count2,
     gap: gapInches * PX_PER_INCH$1,
     withSeparator,
-    ...widths.length > 0 ? { widths } : {},
+    ...isExplicit && widths.length > 0 ? { widths } : {},
     ...equalWidth !== undefined ? { equalWidth } : {}
   };
 }
@@ -104680,6 +104752,8 @@ function imageNodeToBlock(node3, nextBlockId, positions, _trackedMeta, _trackedC
   const height = typeof size2.height === "number" && Number.isFinite(size2.height) ? size2.height : undefined;
   const explicitDisplay = typeof attrs.display === "string" ? attrs.display : undefined;
   const normalizedWrap = normalizeWrap$1(attrs.wrap);
+  if (normalizedWrap)
+    mergeWrapDistancesFromPadding(normalizedWrap, toBoxSpacing$1(attrs.padding));
   let anchor = normalizeAnchorData(attrs.anchorData, attrs, normalizedWrap?.behindDoc);
   if (!anchor && normalizedWrap) {
     anchor = { isAnchored: true };
@@ -120153,6 +120227,17 @@ var isRegExp = (value) => {
   if (!hasValue || !hasPositive)
     return null;
   return `inset(${percentEdges.top ?? 0}% ${percentEdges.right ?? 0}% ${percentEdges.bottom ?? 0}% ${percentEdges.left ?? 0}%)`;
+}, mergeAnchorPaddingIntoWrapDistances = (wrap$1, padding) => {
+  if (!wrap$1?.attrs || !padding)
+    return;
+  if (wrap$1.attrs.distTop == null && Number.isFinite(padding.top) && padding.top !== 0)
+    wrap$1.attrs.distTop = padding.top;
+  if (wrap$1.attrs.distBottom == null && Number.isFinite(padding.bottom) && padding.bottom !== 0)
+    wrap$1.attrs.distBottom = padding.bottom;
+  if (wrap$1.attrs.distLeft == null && Number.isFinite(padding.left) && padding.left !== 0)
+    wrap$1.attrs.distLeft = padding.left;
+  if (wrap$1.attrs.distRight == null && Number.isFinite(padding.right) && padding.right !== 0)
+    wrap$1.attrs.distRight = padding.right;
 }, handleShapeDrawing = (params3, node3, graphicData, size2, padding, marginOffset, anchorData, wrap$1, isAnchor, isHidden) => {
   const wsp = graphicData.elements.find((el) => el.name === "wps:wsp");
   const textBoxContent = wsp.elements.find((el) => el.name === "wps:txbx")?.elements?.find((el) => el.name === "w:txbxContent");
@@ -128717,6 +128802,17 @@ var isRegExp = (value) => {
     const parsed = parseFloat(value);
     return Number.isFinite(parsed) ? parsed : undefined;
   }
+}, mergeWrapDistancesFromPadding = (wrap$1, padding) => {
+  if (!padding || wrap$1.type === "None" || wrap$1.type === "Inline")
+    return;
+  if (wrap$1.distTop == null && padding.top != null)
+    wrap$1.distTop = padding.top;
+  if (wrap$1.distBottom == null && padding.bottom != null)
+    wrap$1.distBottom = padding.bottom;
+  if (wrap$1.distLeft == null && padding.left != null)
+    wrap$1.distLeft = padding.left;
+  if (wrap$1.distRight == null && padding.right != null)
+    wrap$1.distRight = padding.right;
 }, normalizeColor = (value) => {
   if (typeof value !== "string")
     return;
@@ -130525,6 +130621,8 @@ var isRegExp = (value) => {
   return anchor.isAnchored || anchor.hRelativeFrom != null || anchor.vRelativeFrom != null || anchor.alignH != null || anchor.alignV != null || anchor.offsetH != null || anchor.offsetV != null || anchor.behindDoc != null ? anchor : undefined;
 }, buildDrawingBlock = (rawAttrs, nextBlockId, positions, node3, geometry, drawingKind, extraProps) => {
   const normalizedWrap = normalizeWrap$2(rawAttrs.wrap);
+  if (normalizedWrap)
+    mergeWrapDistancesFromPadding(normalizedWrap, toBoxSpacing(rawAttrs.padding));
   const sourceAnchor = isPlainObject3(rawAttrs.sourceAnchor) ? rawAttrs.sourceAnchor : undefined;
   const baseAnchor = normalizeAnchorData$1(rawAttrs.anchorData, rawAttrs, normalizedWrap?.behindDoc);
   const pos = positions.get(node3);
@@ -131579,7 +131677,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_B9mZiCO9_es = __esm(() => {
+var init_SuperConverter_BSMYiYJm_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -170614,7 +170712,7 @@ var init_SuperConverter_B9mZiCO9_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-pn-wKqsL.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DeKyOdIi.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -180947,8 +181045,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_pn_wKqsL_es = __esm(() => {
-  init_SuperConverter_B9mZiCO9_es();
+var init_create_headless_toolbar_DeKyOdIi_es = __esm(() => {
+  init_SuperConverter_BSMYiYJm_es();
   init_uuid_qzgm05fK_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
@@ -230111,7 +230209,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-plIVvSkL.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -270395,6 +270493,9 @@ function isSettled(status) {
 function normalizeFamilyKey$2(family$1) {
   return family$1.trim().replace(/^["']|["']$/g, "").toLowerCase();
 }
+function stripFamilyQuotes(family$1) {
+  return family$1.trim().replace(/^["']|["']$/g, "");
+}
 function splitStack(cssFontFamily) {
   return cssFontFamily.split(",").map((part) => part.trim()).filter(Boolean);
 }
@@ -270407,8 +270508,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 +270619,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, "\\\"")}"`;
 }
@@ -271970,7 +272105,7 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
   let currentPageWidth = pageWidth;
   let marginLeft = Math.max(0, currentMargins?.left ?? 0);
   return {
-    registerDrawing(drawingBlock, measure, anchorY, columnIndex, pageNumber) {
+    registerDrawing(drawingBlock, measure, resolvedAnchorY, columnIndex, pageNumber) {
       if (!drawingBlock.anchor?.isAnchored)
         return;
       const { wrap: wrap5, anchor } = drawingBlock;
@@ -271980,14 +272115,13 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
       const objectWidth = measure.width ?? 0;
       const objectHeight = measure.height ?? 0;
       const x = computeAnchorX(anchor, columnIndex, currentColumns, objectWidth, currentMargins, currentPageWidth);
-      const y$1 = anchorY + (anchor.offsetV ?? 0);
       const zone = {
         imageBlockId: drawingBlock.id,
         pageNumber,
         columnIndex,
         bounds: {
           x,
-          y: y$1,
+          y: resolvedAnchorY,
           width: objectWidth,
           height: objectHeight
         },
@@ -272002,7 +272136,7 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
       };
       zones.push(zone);
     },
-    registerTable(tableBlock, measure, anchorY, columnIndex, pageNumber) {
+    registerTable(tableBlock, measure, resolvedAnchorY, columnIndex, pageNumber) {
       if (!tableBlock.anchor?.isAnchored)
         return;
       const { wrap: wrap5, anchor } = tableBlock;
@@ -272011,14 +272145,13 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
       const tableWidth = measure.totalWidth ?? 0;
       const tableHeight = measure.totalHeight ?? 0;
       const x = computeTableAnchorX(anchor, columnIndex, currentColumns, tableWidth, currentMargins, currentPageWidth);
-      const y$1 = anchorY + (anchor.offsetV ?? 0);
       const zone = {
         imageBlockId: tableBlock.id,
         pageNumber,
         columnIndex,
         bounds: {
           x,
-          y: y$1,
+          y: resolvedAnchorY,
           width: tableWidth,
           height: tableHeight
         },
@@ -272072,12 +272205,12 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
             rightFloats.push(zone);
       let leftBoundary = 0;
       for (const zone of leftFloats) {
-        const boundary = zone.bounds.x + zone.bounds.width + zone.distances.left + zone.distances.right;
+        const boundary = zone.bounds.x + zone.bounds.width + zone.distances.right;
         leftBoundary = Math.max(leftBoundary, boundary);
       }
       let rightBoundary = columnOrigin + baseWidth;
       for (const zone of rightFloats) {
-        const boundary = zone.bounds.x - zone.distances.left - zone.distances.right;
+        const boundary = zone.bounds.x - zone.distances.left;
         rightBoundary = Math.min(rightBoundary, boundary);
       }
       const availableWidth = rightBoundary - leftBoundary;
@@ -272107,27 +272240,7 @@ function createFloatingObjectManager(columns, margins, pageWidth) {
   };
 }
 function computeAnchorX(anchor, columnIndex, columns, imageWidth, margins, pageWidth) {
-  const alignH = anchor.alignH ?? "left";
-  const offsetH = anchor.offsetH ?? 0;
-  const marginLeft = Math.max(0, margins?.left ?? 0);
-  const marginRight = Math.max(0, margins?.right ?? 0);
-  const contentWidth = pageWidth != null ? Math.max(1, pageWidth - (marginLeft + marginRight)) : columns.width;
-  const contentLeft = marginLeft;
-  const columnLeft = contentLeft + columnIndex * (columns.width + columns.gap);
-  const relativeFrom = anchor.hRelativeFrom ?? "column";
-  let baseX;
-  let availableWidth;
-  if (relativeFrom === "page") {
-    baseX = 0;
-    availableWidth = pageWidth != null ? pageWidth : contentWidth + marginLeft + marginRight;
-  } else if (relativeFrom === "margin") {
-    baseX = contentLeft;
-    availableWidth = contentWidth;
-  } else {
-    baseX = columnLeft;
-    availableWidth = columns.width;
-  }
-  return alignH === "left" ? baseX + offsetH : alignH === "right" ? baseX + availableWidth - imageWidth - offsetH : alignH === "center" ? baseX + (availableWidth - imageWidth) / 2 + offsetH : baseX;
+  return resolveAnchoredGraphicX(anchor, columnIndex, columns, imageWidth, margins, pageWidth);
 }
 function computeWrapMode(wrap5, _anchor) {
   if (!wrap5)
@@ -272462,6 +272575,30 @@ function normalizeLines(measure) {
 function shouldSuppressOwnSpacing(ownStyleId, ownContextualSpacing, adjacentStyleId) {
   return ownContextualSpacing && !!ownStyleId && !!adjacentStyleId && ownStyleId === adjacentStyleId;
 }
+function collapseSpacingBefore(spacingBefore, trailingSpacing) {
+  const prevTrailing = trailingSpacing ?? 0;
+  return Math.max(spacingBefore - prevTrailing, 0);
+}
+function rewindPreviousParagraphTrailing(cursorY, trailingSpacing) {
+  const prevTrailing = trailingSpacing ?? 0;
+  return prevTrailing > 0 ? cursorY - prevTrailing : cursorY;
+}
+function computeParagraphContentStartY(cursorY, spacingBefore, appliedSpacingBefore, trailingSpacing) {
+  if (appliedSpacingBefore || spacingBefore <= 0)
+    return cursorY;
+  return cursorY + collapseSpacingBefore(spacingBefore, trailingSpacing);
+}
+function computeParagraphLayoutStartY(input2) {
+  let y$1 = input2.cursorY;
+  let trailingForCollapse = input2.trailingSpacing;
+  if (input2.rewindTrailingFromPrevious) {
+    y$1 = rewindPreviousParagraphTrailing(y$1, input2.trailingSpacing);
+    if ((input2.trailingSpacing ?? 0) > 0)
+      trailingForCollapse = 0;
+  }
+  const effectiveSpacingBefore = input2.suppressSpacingBefore ? 0 : input2.spacingBefore;
+  return computeParagraphContentStartY(y$1, effectiveSpacingBefore, effectiveSpacingBefore === 0, trailingForCollapse);
+}
 function calculateFirstLineIndent(block, measure) {
   const wordLayout = block.attrs?.wordLayout;
   if (!wordLayout?.firstLineIndentMode)
@@ -272477,52 +272614,75 @@ function layoutParagraphBlock(ctx$1, anchors) {
   const { block, measure, columnWidth, ensurePage, advanceColumn, columnX, floatManager } = ctx$1;
   const remeasureParagraph$1 = ctx$1.remeasureParagraph;
   const frame = getParagraphAttrs(block)?.frame;
-  if (anchors?.anchoredDrawings?.length)
+  let lines = normalizeLines(measure);
+  const measurementWidth = lines[0]?.maxWidth;
+  const paraIndent = block.attrs?.indent;
+  const indentLeft = typeof paraIndent?.left === "number" && Number.isFinite(paraIndent.left) ? paraIndent.left : 0;
+  const indentRight = typeof paraIndent?.right === "number" && Number.isFinite(paraIndent.right) ? paraIndent.right : 0;
+  const negativeLeftIndent = indentLeft < 0 ? indentLeft : 0;
+  const negativeRightIndent = indentRight < 0 ? indentRight : 0;
+  const remeasureWidth = Math.max(1, columnWidth - indentLeft - indentRight);
+  let didRemeasureForColumnWidth = false;
+  let remeasuredMarkerInfo;
+  if (typeof remeasureParagraph$1 === "function" && typeof measurementWidth === "number" && measurementWidth > remeasureWidth) {
+    const newMeasure = remeasureParagraph$1(block, columnWidth, calculateFirstLineIndent(block, measure));
+    lines = normalizeLines(newMeasure);
+    didRemeasureForColumnWidth = true;
+    if (newMeasure.marker)
+      remeasuredMarkerInfo = newMeasure.marker;
+  }
+  let fromLine = 0;
+  const attrs = getParagraphAttrs(block);
+  const spacing = attrs?.spacing ?? {};
+  const spacingExplicit = attrs?.spacingExplicit;
+  const styleId$1 = asString2(attrs?.styleId);
+  const contextualSpacing = asBoolean$1(attrs?.contextualSpacing);
+  let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
+  let spacingAfter = ctx$1.overrideSpacingAfter ?? Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
+  if (isEmptyTextParagraph(block) && spacingExplicit) {
+    if (!spacingExplicit.before)
+      spacingBefore = 0;
+    if (!spacingExplicit.after)
+      spacingAfter = 0;
+  }
+  const baseSpacingBefore = spacingBefore;
+  let appliedSpacingBefore = spacingBefore === 0;
+  let lastState = null;
+  const previewState = ensurePage();
+  const rawBorderExpansion = computeBorderVerticalExpansion(attrs?.borders);
+  const currentBorderHash = hashBorders(attrs?.borders);
+  const inBorderGroup = currentBorderHash != null && currentBorderHash === previewState.lastParagraphBorderHash;
+  const borderExpansion = {
+    top: inBorderGroup ? 0 : rawBorderExpansion.top,
+    bottom: rawBorderExpansion.bottom
+  };
+  const paragraphAnchorBaseY = computeParagraphLayoutStartY({
+    cursorY: previewState.cursorY,
+    spacingBefore,
+    trailingSpacing: previewState.trailingSpacing,
+    suppressSpacingBefore: shouldSuppressOwnSpacing(styleId$1, contextualSpacing, previewState.lastParagraphStyleId),
+    rewindTrailingFromPrevious: shouldSuppressOwnSpacing(previewState.lastParagraphStyleId, previewState.lastParagraphContextualSpacing, styleId$1)
+  }) + borderExpansion.top - (inBorderGroup ? rawBorderExpansion.bottom : 0);
+  const registerAnchoredDrawingsAt = (paragraphContentStartY) => {
+    if (!anchors?.anchoredDrawings?.length)
+      return;
     for (const entry of anchors.anchoredDrawings) {
       if (anchors.placedAnchoredIds.has(entry.block.id))
         continue;
       const state = ensurePage();
-      const vRelativeFrom = entry.block.anchor?.vRelativeFrom;
-      const alignV = entry.block.anchor?.alignV;
-      const offsetV = entry.block.anchor?.offsetV ?? 0;
-      const imageHeight = entry.measure.height;
       const contentTop = state.topMargin;
       const contentBottom = state.contentBottom;
-      const contentHeight = Math.max(0, contentBottom - contentTop);
-      let anchorY;
-      if (vRelativeFrom === "margin")
-        if (alignV === "top")
-          anchorY = contentTop + offsetV;
-        else if (alignV === "bottom")
-          anchorY = contentBottom - imageHeight + offsetV;
-        else if (alignV === "center")
-          anchorY = contentTop + (contentHeight - imageHeight) / 2 + offsetV;
-        else
-          anchorY = contentTop + offsetV;
-      else if (vRelativeFrom === "page")
-        if (alignV === "top")
-          anchorY = offsetV;
-        else if (alignV === "bottom")
-          anchorY = contentBottom + (anchors.pageMargins.bottom ?? 0) - imageHeight + offsetV;
-        else if (alignV === "center")
-          anchorY = (contentBottom + (anchors.pageMargins.bottom ?? 0) - imageHeight) / 2 + offsetV;
-        else
-          anchorY = offsetV;
-      else if (vRelativeFrom === "paragraph") {
-        const baseAnchorY = state.cursorY;
-        const firstLineHeight = measure.lines?.[0]?.lineHeight ?? 0;
-        if (alignV === "top")
-          anchorY = baseAnchorY + offsetV;
-        else if (alignV === "bottom")
-          anchorY = baseAnchorY + firstLineHeight - imageHeight + offsetV;
-        else if (alignV === "center")
-          anchorY = baseAnchorY + (firstLineHeight - imageHeight) / 2 + offsetV;
-        else
-          anchorY = baseAnchorY + offsetV;
-      } else
-        anchorY = state.cursorY + offsetV;
+      const anchorY = resolveAnchoredGraphicY({
+        anchor: entry.block.anchor,
+        objectHeight: entry.measure.height,
+        contentTop,
+        contentBottom,
+        pageBottomMargin: anchors.pageMargins.bottom ?? 0,
+        anchorParagraphY: paragraphContentStartY,
+        firstLineHeight: measure.lines?.[0]?.lineHeight ?? 0
+      });
       floatManager.registerDrawing(entry.block, entry.measure, anchorY, state.columnIndex, state.page.number);
-      const anchorX = entry.block.anchor ? computeAnchorX(entry.block.anchor, state.columnIndex, anchors.columns, entry.measure.width, {
+      const anchorX = entry.block.anchor ? resolveAnchoredGraphicX(entry.block.anchor, state.columnIndex, anchors.columns, entry.measure.width, {
         left: anchors.pageMargins.left,
         right: anchors.pageMargins.right
       }, anchors.pageWidth) : columnX(state.columnIndex);
@@ -272594,40 +272754,8 @@ function layoutParagraphBlock(ctx$1, anchors) {
       }
       anchors.placedAnchoredIds.add(entry.block.id);
     }
-  let lines = normalizeLines(measure);
-  const measurementWidth = lines[0]?.maxWidth;
-  const paraIndent = block.attrs?.indent;
-  const indentLeft = typeof paraIndent?.left === "number" && Number.isFinite(paraIndent.left) ? paraIndent.left : 0;
-  const indentRight = typeof paraIndent?.right === "number" && Number.isFinite(paraIndent.right) ? paraIndent.right : 0;
-  const negativeLeftIndent = indentLeft < 0 ? indentLeft : 0;
-  const negativeRightIndent = indentRight < 0 ? indentRight : 0;
-  const remeasureWidth = Math.max(1, columnWidth - indentLeft - indentRight);
-  let didRemeasureForColumnWidth = false;
-  let remeasuredMarkerInfo;
-  if (typeof remeasureParagraph$1 === "function" && typeof measurementWidth === "number" && measurementWidth > remeasureWidth) {
-    const newMeasure = remeasureParagraph$1(block, columnWidth, calculateFirstLineIndent(block, measure));
-    lines = normalizeLines(newMeasure);
-    didRemeasureForColumnWidth = true;
-    if (newMeasure.marker)
-      remeasuredMarkerInfo = newMeasure.marker;
-  }
-  let fromLine = 0;
-  const attrs = getParagraphAttrs(block);
-  const spacing = attrs?.spacing ?? {};
-  const spacingExplicit = attrs?.spacingExplicit;
-  const styleId$1 = asString2(attrs?.styleId);
-  const contextualSpacing = asBoolean$1(attrs?.contextualSpacing);
-  let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
-  let spacingAfter = ctx$1.overrideSpacingAfter ?? Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
-  if (isEmptyTextParagraph(block) && spacingExplicit) {
-    if (!spacingExplicit.before)
-      spacingBefore = 0;
-    if (!spacingExplicit.after)
-      spacingAfter = 0;
-  }
-  const baseSpacingBefore = spacingBefore;
-  let appliedSpacingBefore = spacingBefore === 0;
-  let lastState = null;
+  };
+  registerAnchoredDrawingsAt(paragraphAnchorBaseY);
   if (frame?.wrap === "none") {
     let state = ensurePage();
     if (state.cursorY >= state.contentBottom)
@@ -272669,12 +272797,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
   let didRemeasureForFloats = false;
   if (typeof remeasureParagraph$1 === "function") {
     const tempState = ensurePage();
-    let tempY = tempState.cursorY;
-    if (!appliedSpacingBefore && spacingBefore > 0) {
-      const prevTrailing = tempState.trailingSpacing ?? 0;
-      const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
-      tempY += neededSpacingBefore;
-    }
+    let tempY = paragraphAnchorBaseY;
     for (let i4 = 0;i4 < lines.length; i4++) {
       const lineY = tempY;
       const lineHeight = lines[i4]?.lineHeight || 0;
@@ -272685,8 +272808,8 @@ function layoutParagraphBlock(ctx$1, anchors) {
       }
       tempY += lineHeight;
     }
-    const narrowestRemeasureWidth = Math.max(1, narrowestWidth - indentLeft - indentRight);
-    if (narrowestRemeasureWidth < remeasureWidth) {
+    const narrowestRemeasureWidth = narrowestWidth < columnWidth || narrowestOffsetX > 0 ? Math.max(1, narrowestWidth - Math.max(indentLeft, 0) - Math.max(indentRight, 0)) : Math.max(1, narrowestWidth - indentLeft - indentRight);
+    if (narrowestRemeasureWidth < remeasureWidth || narrowestOffsetX > 0) {
       const newMeasure = remeasureParagraph$1(block, narrowestRemeasureWidth, calculateFirstLineIndent(block, measure));
       lines = normalizeLines(newMeasure);
       didRemeasureForFloats = true;
@@ -272694,13 +272817,6 @@ function layoutParagraphBlock(ctx$1, anchors) {
         remeasuredMarkerInfo = newMeasure.marker;
     }
   }
-  const rawBorderExpansion = computeBorderVerticalExpansion(attrs?.borders);
-  const currentBorderHash = hashBorders(attrs?.borders);
-  const inBorderGroup = currentBorderHash != null && currentBorderHash === ensurePage().lastParagraphBorderHash;
-  const borderExpansion = {
-    top: inBorderGroup ? 0 : rawBorderExpansion.top,
-    bottom: rawBorderExpansion.bottom
-  };
   while (fromLine < lines.length) {
     let state = ensurePage();
     if (state.trailingSpacing == null)
@@ -272712,13 +272828,12 @@ function layoutParagraphBlock(ctx$1, anchors) {
     if (shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, styleId$1)) {
       const prevTrailing = asSafeNumber(state.trailingSpacing);
       if (prevTrailing > 0) {
-        state.cursorY -= prevTrailing;
+        state.cursorY = rewindPreviousParagraphTrailing(state.cursorY, prevTrailing);
         state.trailingSpacing = 0;
       }
     }
     if (attrs?.keepLines === true && fromLine === 0) {
-      const prevTrailing = state.trailingSpacing ?? 0;
-      const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
+      const neededSpacingBefore = collapseSpacingBefore(spacingBefore, state.trailingSpacing);
       const pageContentHeight = state.contentBottom - state.topMargin;
       const fullHeight = lines.reduce((sum, line) => sum + (line.lineHeight || 0), 0) + borderExpansion.top + borderExpansion.bottom;
       const fitsOnBlankPage = fullHeight + baseSpacingBefore <= pageContentHeight;
@@ -272732,8 +272847,8 @@ function layoutParagraphBlock(ctx$1, anchors) {
     }
     if (!appliedSpacingBefore && spacingBefore > 0)
       while (!appliedSpacingBefore) {
-        const prevTrailing = state.trailingSpacing ?? 0;
-        const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
+        state.trailingSpacing;
+        const neededSpacingBefore = collapseSpacingBefore(spacingBefore, state.trailingSpacing);
         if (state.cursorY + neededSpacingBefore > state.contentBottom) {
           if (state.cursorY <= state.topMargin) {
             state.trailingSpacing = 0;
@@ -272855,8 +272970,12 @@ function layoutParagraphBlock(ctx$1, anchors) {
             state.footnoteAnchorsThisPage.push(a2);
       }
     }
-    const adjustedX = columnX(state.columnIndex) + offsetX + negativeLeftIndent;
-    const adjustedWidth = effectiveColumnWidth - negativeLeftIndent - negativeRightIndent;
+    const floatAdjustedX = columnX(state.columnIndex) + offsetX;
+    const adjustedX = didRemeasureForFloats ? floatAdjustedX + Math.max(negativeLeftIndent, 0) : floatAdjustedX + negativeLeftIndent;
+    const columnRight = columnX(state.columnIndex) + columnWidth;
+    let adjustedWidth = didRemeasureForFloats ? effectiveColumnWidth : effectiveColumnWidth - negativeLeftIndent - negativeRightIndent;
+    if (didRemeasureForFloats)
+      adjustedWidth = Math.min(adjustedWidth, Math.max(1, columnRight - adjustedX));
     const fragment2 = {
       kind: "para",
       blockId: block.id,
@@ -272868,7 +272987,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
       sourceAnchor: block.sourceAnchor,
       ...computeFragmentPmRange2(block, lines, fromLine, slice2.toLine)
     };
-    if (didRemeasureForColumnWidth)
+    if (didRemeasureForColumnWidth || didRemeasureForFloats)
       fragment2.lines = lines.slice(fromLine, slice2.toLine);
     if ((measure.marker || remeasuredMarkerInfo) && fromLine === 0) {
       fragment2.markerWidth = (remeasuredMarkerInfo ?? measure.marker)?.markerWidth ?? measure.marker?.markerWidth ?? 0;
@@ -274719,13 +274838,19 @@ function getBalancingHeight(fragment2, measureMap, sectPrMarkerBlockIds) {
     return 0;
   return getFragmentHeight(fragment2, measureMap);
 }
+function allColumnWidthsEqual(widths) {
+  if (widths.length <= 1)
+    return true;
+  const first$1 = widths[0];
+  return widths.every((w) => Math.abs(w - first$1) <= 0.5);
+}
 function balanceSectionOnPage(args$1) {
   const { sectionColumns, sectionHasExplicitColumnBreak, sectionIndex, blockSectionMap, fragments } = args$1;
   if (sectionColumns.count <= 1)
     return null;
   if (sectionHasExplicitColumnBreak)
     return null;
-  if (sectionColumns.equalWidth === false && Array.isArray(sectionColumns.widths) && sectionColumns.widths.length > 0)
+  if (sectionColumns.equalWidth === false && Array.isArray(sectionColumns.widths) && sectionColumns.widths.length > 0 && !allColumnWidthsEqual(sectionColumns.widths))
     return null;
   const sectionFragments = fragments.filter((f2) => blockSectionMap.get(f2.blockId) === sectionIndex);
   if (sectionFragments.length === 0)
@@ -275978,58 +276103,28 @@ function layoutDocument(blocks2, measures, options = {}) {
   const resolveParagraphlessAnchoredTableY = (block, measure, state) => {
     const contentTop = state.topMargin;
     const contentBottom = state.contentBottom;
-    const contentHeight = Math.max(0, contentBottom - contentTop);
     const tableHeight = measure.totalHeight ?? 0;
-    const anchor = block.anchor;
-    const offsetV = anchor?.offsetV ?? 0;
-    const vRelativeFrom = anchor?.vRelativeFrom;
-    const alignV = anchor?.alignV;
-    if (vRelativeFrom === "margin") {
-      if (alignV === "bottom")
-        return contentBottom - tableHeight + offsetV;
-      if (alignV === "center")
-        return contentTop + (contentHeight - tableHeight) / 2 + offsetV;
-      return contentTop + offsetV;
-    }
-    if (vRelativeFrom === "page") {
-      if (alignV === "bottom")
-        return contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - tableHeight + offsetV;
-      if (alignV === "center")
-        return (contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - tableHeight) / 2 + offsetV;
-      return offsetV;
-    }
-    return contentTop + offsetV;
+    return resolveAnchoredGraphicY({
+      anchor: block.anchor,
+      objectHeight: tableHeight,
+      contentTop,
+      contentBottom,
+      pageBottomMargin: state.page.margins?.bottom ?? activeBottomMargin,
+      preRegisteredFallbackToContentTop: true
+    });
   };
   for (const entry of preRegisteredAnchors) {
     const state = paginator.ensurePage();
-    const vRelativeFrom = entry.block.anchor?.vRelativeFrom ?? "paragraph";
-    const alignV = entry.block.anchor?.alignV ?? "top";
-    const offsetV = entry.block.anchor?.offsetV ?? 0;
-    const imageHeight = entry.measure.height ?? 0;
     const contentTop = state.topMargin;
     const contentBottom = state.contentBottom;
-    const contentHeight = Math.max(0, contentBottom - contentTop);
-    let anchorY;
-    if (vRelativeFrom === "margin")
-      if (alignV === "top")
-        anchorY = contentTop + offsetV;
-      else if (alignV === "bottom")
-        anchorY = contentBottom - imageHeight + offsetV;
-      else if (alignV === "center")
-        anchorY = contentTop + (contentHeight - imageHeight) / 2 + offsetV;
-      else
-        anchorY = contentTop + offsetV;
-    else if (vRelativeFrom === "page")
-      if (alignV === "top")
-        anchorY = offsetV;
-      else if (alignV === "bottom")
-        anchorY = contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - imageHeight + offsetV;
-      else if (alignV === "center")
-        anchorY = (contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - imageHeight) / 2 + offsetV;
-      else
-        anchorY = offsetV;
-    else
-      anchorY = contentTop + offsetV;
+    const anchorY = resolveAnchoredGraphicY({
+      anchor: entry.block.anchor,
+      objectHeight: entry.measure.height ?? 0,
+      contentTop,
+      contentBottom,
+      pageBottomMargin: state.page.margins?.bottom ?? activeBottomMargin,
+      preRegisteredFallbackToContentTop: true
+    });
     const anchorX = entry.block.anchor ? computeAnchorX(entry.block.anchor, state.columnIndex, normalizeColumns(activeColumns, activePageSize.w - (activeLeftMargin + activeRightMargin)), entry.measure.width, {
       left: activeLeftMargin,
       right: activeRightMargin
@@ -276340,7 +276435,6 @@ function layoutDocument(blocks2, measures, options = {}) {
             overrideSpacingAfter = 0;
         }
       }
-      const paragraphStartY = paginator.ensurePage().cursorY;
       layoutParagraphBlock({
         block,
         measure,
@@ -276370,7 +276464,12 @@ function layoutDocument(blocks2, measures, options = {}) {
       if (tablesForPara) {
         const state = paginator.ensurePage();
         const columnWidthForTable = getCurrentColumnWidth();
+        let anchorParagraphTopY = state.cursorY;
+        for (const fragment2 of state.page.fragments)
+          if (fragment2.kind === "para" && fragment2.blockId === block.id)
+            anchorParagraphTopY = Math.min(anchorParagraphTopY, fragment2.y);
         let tableBottomY = state.cursorY;
+        let nextStackY = state.cursorY;
         for (const { block: tableBlock, measure: tableMeasure } of tablesForPara) {
           if (placedAnchoredTableIds.has(tableBlock.id))
             continue;
@@ -276378,15 +276477,17 @@ function layoutDocument(blocks2, measures, options = {}) {
           if (columnWidthForTable > 0 && totalWidth >= columnWidthForTable * 0.99)
             continue;
           const offsetV = tableBlock.anchor?.offsetV ?? 0;
-          const anchorY = Math.max(paragraphStartY, state.cursorY) + offsetV;
+          const anchorY = Math.max(anchorParagraphTopY, nextStackY) + offsetV;
           floatManager.registerTable(tableBlock, tableMeasure, anchorY, state.columnIndex, state.page.number);
           const tableFragment = createAnchoredTableFragment(tableBlock, tableMeasure, tableBlock.anchor?.offsetH ?? columnX(state.columnIndex), anchorY);
           state.page.fragments.push(tableFragment);
           placedAnchoredTableIds.add(tableBlock.id);
           if ((tableBlock.wrap?.type ?? "None") !== "None") {
             const bottom$1 = anchorY + (tableMeasure.totalHeight ?? 0);
+            const distBottom = tableBlock.wrap?.distBottom ?? 0;
             if (bottom$1 > tableBottomY)
               tableBottomY = bottom$1;
+            nextStackY = bottom$1 + distBottom;
           }
         }
         state.cursorY = tableBottomY;
@@ -286067,7 +286168,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 +286279,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 +286292,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 +286359,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 +287162,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 +288220,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 +288243,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 +288312,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 +288986,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)
@@ -310039,7 +310206,7 @@ menclose::after {
       return;
     if (this.#overrides.get(key2) === physical)
       return;
-    if ((BUNDLED_SUBSTITUTES[key2] ?? logicalFamily.trim()) === physical) {
+    if (key2 === normalizeFamilyKey$2(physical)) {
       if (this.#overrides.delete(key2)) {
         this.#version += 1;
         this.#cachedSignature = null;
@@ -310091,12 +310258,41 @@ menclose::after {
       reason: "as_requested"
     };
   }
+  #resolveFaceLadder(primary, face, hasFace) {
+    const key2 = normalizeFamilyKey$2(primary);
+    const override = this.#overrides.get(key2);
+    if (override && hasFace(override, face.weight, face.style))
+      return {
+        physical: override,
+        reason: "custom_mapping"
+      };
+    if (hasFace(primary, face.weight, face.style))
+      return {
+        physical: primary,
+        reason: "registered_face"
+      };
+    const bundled = BUNDLED_SUBSTITUTES[key2];
+    if (bundled && hasFace(bundled, face.weight, face.style))
+      return {
+        physical: bundled,
+        reason: "bundled_substitute"
+      };
+    if (override || bundled)
+      return {
+        physical: primary,
+        reason: "fallback_face_absent"
+      };
+    return {
+      physical: primary,
+      reason: "as_requested"
+    };
+  }
   resolveFontFamily(logicalFamily) {
     const primary = splitStack(logicalFamily)[0] ?? logicalFamily;
     const { physical, reason } = this.#physicalFor(primary);
     return {
       logicalFamily,
-      physicalFamily: physical,
+      physicalFamily: stripFamilyQuotes(physical),
       reason
     };
   }
@@ -310111,6 +310307,26 @@ menclose::after {
       return cssFontFamily;
     return [physical, ...parts.slice(1)].join(", ");
   }
+  resolveFace(logicalFamily, face, hasFace) {
+    const primary = splitStack(logicalFamily)[0] ?? logicalFamily;
+    const { physical, reason } = this.#resolveFaceLadder(primary, face, hasFace);
+    return {
+      logicalFamily,
+      physicalFamily: stripFamilyQuotes(physical),
+      reason
+    };
+  }
+  resolvePhysicalFamilyForFace(cssFontFamily, face, hasFace) {
+    if (!cssFontFamily)
+      return cssFontFamily;
+    const parts = splitStack(cssFontFamily);
+    if (parts.length === 0)
+      return cssFontFamily;
+    const { physical, reason } = this.#resolveFaceLadder(parts[0], face, hasFace);
+    if (reason === "custom_mapping" || reason === "bundled_substitute")
+      return [physical, ...parts.slice(1)].join(", ");
+    return cssFontFamily;
+  }
   resolvePrimaryPhysicalFamily(family$1) {
     const primary = splitStack(family$1)[0] ?? family$1;
     return this.#physicalFor(primary).physical;
@@ -310137,6 +310353,7 @@ menclose::after {
   #faceInflight = /* @__PURE__ */ new Map;
   #faceSources = /* @__PURE__ */ new Map;
   #facesByFamily = /* @__PURE__ */ new Map;
+  #providerFaceKeys = /* @__PURE__ */ new Set;
   #warnedFaceFailures = /* @__PURE__ */ new Set;
   constructor(options = {}) {
     this.#fontSet = options.fontSet ?? null;
@@ -310148,7 +310365,9 @@ menclose::after {
   register(descriptor) {
     const { family: family$1, source, descriptors: descriptors2 } = descriptor;
     const identitySource = typeof source === "string" ? canonicalizeFontSource(source) : source;
-    const key2 = faceKeyOf$1(family$1, normalizeWeight(descriptors2?.weight), normalizeStyle$1(descriptors2?.style));
+    const weight = normalizeWeight(descriptors2?.weight);
+    const style2 = normalizeStyle$1(descriptors2?.style);
+    const key2 = faceKeyOf$1(family$1, weight, style2);
     if (typeof identitySource === "string") {
       const existingSource = this.#faceSources.get(key2);
       if (existingSource === identitySource)
@@ -310161,7 +310380,11 @@ menclose::after {
         throw new Error(`[superdoc] font face "${key2}" is already registered from a different source ("${existingSource}"); a registered face's source cannot be replaced`);
     }
     if (this.#FontFaceCtor && this.#fontSet) {
-      const face = new this.#FontFaceCtor(family$1, source, descriptors2);
+      const face = new this.#FontFaceCtor(family$1, source, {
+        ...descriptors2,
+        weight,
+        style: style2
+      });
       this.#fontSet.add(face);
       this.#managed.set(family$1, face);
     }
@@ -310173,6 +310396,7 @@ menclose::after {
     }
     if (!this.#status.has(family$1))
       this.#status.set(family$1, "unloaded");
+    this.#providerFaceKeys.add(key2);
     this.#trackFace(family$1, key2);
     if (!this.#faceStatus.has(key2))
       this.#faceStatus.set(key2, "unloaded");
@@ -310216,6 +310440,10 @@ menclose::after {
         return s2;
     return "unloaded";
   }
+  hasFace(family$1, weight, style2) {
+    const key2 = faceKeyOf$1(family$1, weight, style2);
+    return this.#providerFaceKeys.has(key2) && this.#faceStatus.get(key2) !== "failed";
+  }
   isAvailable(family$1) {
     if (!this.#fontSet)
       return false;
@@ -310708,7 +310936,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 +310946,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 +310967,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 +311025,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 +311300,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 +311354,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 +312625,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 +312704,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 +312828,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 +313014,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 +324949,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 +325811,7 @@ menclose::after {
 }, FontReadinessGate = class {
   #getDocumentFonts;
   #getRequiredFaces;
+  #getUsedFaces;
   #resolveFamilies;
   #fontResolver;
   #requestReflow;
@@ -325580,18 +325821,21 @@ menclose::after {
   #timeoutMs;
   #invalidateCaches;
   #context = null;
+  #packInstalledFor = null;
   #fontConfigVersion = 0;
   #requiredSignature = "";
   #requiredFamilies = /* @__PURE__ */ new Set;
   #requiredFaceKeys = /* @__PURE__ */ new Set;
   #seenAvailable = /* @__PURE__ */ new Set;
   #seenAvailableFaces = /* @__PURE__ */ new Set;
+  #seenFailedFaces = /* @__PURE__ */ new Set;
   #lastSummary = null;
   #loadingDoneHandler = null;
   #lateLoadScheduler;
   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 +325860,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)
@@ -325654,9 +325904,18 @@ menclose::after {
     } catch {
       results = [];
     }
-    for (const result of results)
+    const failedKeys = [];
+    for (const result of results) {
+      const key2 = faceKeyOf(result.request.family, result.request.weight, result.request.style);
       if (result.status === "loaded")
-        this.#seenAvailableFaces.add(faceKeyOf(result.request.family, result.request.weight, result.request.style));
+        this.#seenAvailableFaces.add(key2);
+      else if (result.status === "failed" && !this.#seenFailedFaces.has(key2)) {
+        this.#seenFailedFaces.add(key2);
+        failedKeys.push(key2);
+      }
+    }
+    if (failedKeys.length > 0)
+      this.#scheduleAvailabilityReflow(failedKeys);
     this.#lastSummary = summarizeFaces(results);
     return this.#lastSummary;
   }
@@ -325713,6 +325972,7 @@ menclose::after {
     this.#requiredFamilies = /* @__PURE__ */ new Set;
     this.#seenAvailable.clear();
     this.#seenAvailableFaces.clear();
+    this.#seenFailedFaces.clear();
     this.#lastSummary = null;
   }
   dispose() {
@@ -325732,10 +325992,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() {
@@ -325776,6 +326038,9 @@ menclose::after {
     }
     if (changedKeys.length === 0)
       return;
+    this.#scheduleAvailabilityReflow(changedKeys);
+  }
+  #scheduleAvailabilityReflow(changedKeys) {
     this.#fontConfigVersion += 1;
     bumpFontConfigVersion();
     this.#invalidateCaches();
@@ -325875,8 +326140,13 @@ menclose::after {
     const registry2 = this.#getGate()?.resolveRegistry();
     if (!registry2)
       throw new Error("[superdoc] fonts.preload: the font registry is not ready yet");
+    const hasFace = (family$1, weight, style2) => registry2.hasFace(family$1, weight, style2);
+    const face = {
+      weight: "400",
+      style: "normal"
+    };
     const requests = families.map((logical) => ({
-      family: this.#resolver.resolvePrimaryPhysicalFamily(logical),
+      family: this.#resolver.resolveFace(logical, face, hasFace).physicalFamily,
       weight: "400",
       style: "normal"
     }));
@@ -325993,13 +326263,13 @@ 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_plIVvSkL_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_B9mZiCO9_es();
+  init_SuperConverter_BSMYiYJm_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_pn_wKqsL_es();
+  init_create_headless_toolbar_DeKyOdIi_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -352883,7 +353153,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 +354437,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 +354671,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 +354726,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 +355702,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 +355731,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 +355749,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 +355773,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 +355926,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 +358135,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 +358160,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 +358325,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 +359077,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);
@@ -360692,11 +360978,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CxQcY_QQ.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CJMIa98h.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_CxQcY_QQ_es = __esm(() => {
-  init_SuperConverter_B9mZiCO9_es();
-  init_create_headless_toolbar_pn_wKqsL_es();
+var init_create_super_doc_ui_CJMIa98h_es = __esm(() => {
+  init_SuperConverter_BSMYiYJm_es();
+  init_create_headless_toolbar_DeKyOdIi_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -360738,16 +361024,16 @@ 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_SuperConverter_B9mZiCO9_es();
+  init_src_plIVvSkL_es();
+  init_SuperConverter_BSMYiYJm_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_pn_wKqsL_es();
+  init_create_headless_toolbar_DeKyOdIi_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_VodIk8WL_es();
-  init_create_super_doc_ui_CxQcY_QQ_es();
+  init_create_super_doc_ui_CJMIa98h_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();