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

package/dist/index.js

@@ -59714,7 +59714,7 @@ var init_uuid_qzgm05fK_es = __esm(() => {
   v5_default = v35("v5", 80, sha1);
 });
 
-// ../../packages/superdoc/dist/chunks/constants-D-X7xF4s.es.js
+// ../../packages/superdoc/dist/chunks/constants-D9qj59G2.es.js
 function toProtocolSet(values) {
   const result = /* @__PURE__ */ new Set;
   if (!values)
@@ -60300,7 +60300,7 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
   return a.length === 1 ? "0" + a : a;
 }, rgbToHex = (rgb) => {
   return "#" + rgb.match(/\d+/g).map(componentToHex).join("");
-}, DEFAULT_SHADING_FOREGROUND_COLOR = "#000000", hexToRgb = (hex) => {
+}, DEFAULT_SHADING_FOREGROUND_COLOR = "#000000", DEFAULT_SHADING_FILL_COLOR = "#FFFFFF", hexToRgb = (hex) => {
   const normalized = normalizeHexColor(hex);
   if (!normalized)
     return null;
@@ -60327,16 +60327,19 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
 }, resolveShadingFillColor = (shading) => {
   if (!shading || typeof shading !== "object")
     return null;
-  const fill = normalizeHexColor(shading.fill);
-  if (!fill)
+  const val = typeof shading.val === "string" ? shading.val.trim().toLowerCase() : "";
+  if (val === "nil" || val === "none")
     return null;
-  const pctMatch = (typeof shading.val === "string" ? shading.val.trim().toLowerCase() : "").match(/^pct(\d{1,3})$/);
-  if (!pctMatch)
-    return fill;
-  const pct = Number.parseInt(pctMatch[1], 10);
+  const fillHex = typeof shading.fill === "string" && shading.fill.trim().toLowerCase() === "auto" ? null : normalizeHexColor(shading.fill);
+  const pctMatch = val.match(/^pct(\d{1,3})$/);
+  if (!(Boolean(pctMatch) || val === "solid"))
+    return fillHex;
+  const baseHex = fillHex ?? DEFAULT_SHADING_FILL_COLOR;
+  const foregroundHex = typeof shading.color !== "string" || shading.color.trim() === "" || shading.color.trim().toLowerCase() === "auto" ? DEFAULT_SHADING_FOREGROUND_COLOR : normalizeHexColor(shading.color) ?? DEFAULT_SHADING_FOREGROUND_COLOR;
+  const pct = pctMatch ? Number.parseInt(pctMatch[1], 10) : 100;
   if (!Number.isFinite(pct) || pct < 0 || pct > 100)
-    return fill;
-  return blendHexColors(fill, normalizeHexColor(shading.color) ?? DEFAULT_SHADING_FOREGROUND_COLOR, pct / 100) ?? fill;
+    return fillHex;
+  return blendHexColors(baseHex, foregroundHex, pct / 100) ?? fillHex;
 }, deobfuscateFont = (arrayBuffer, guidHex) => {
   const dta = new Uint8Array(arrayBuffer);
   const guidStr = guidHex.replace(/[-{}]/g, "");
@@ -60382,7 +60385,7 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
     return "webp";
   return null;
 }, COMMENT_FILE_BASENAMES, DEFAULT_XML_DECLARATION, COMMENT_RELATIONSHIP_TYPES;
-var init_constants_D_X7xF4s_es = __esm(() => {
+var init_constants_D9qj59G2_es = __esm(() => {
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_dist4();
@@ -68342,7 +68345,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-B9mZiCO9.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DBsJeu9t.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -78291,6 +78294,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 +78384,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 +83824,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 +101896,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 +104755,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 +120230,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");
@@ -127885,6 +127973,44 @@ var isRegExp = (value) => {
     ...comment,
     commentParaId: generateDocxRandomId()
   };
+}, getCommentIds = (comment) => {
+  if (!comment)
+    return [];
+  return [
+    comment.commentId,
+    comment.importedId,
+    comment.internalId
+  ].filter((id2) => id2 != null).map((id2) => String(id2));
+}, buildCommentLookup = (comments = []) => {
+  const byId = /* @__PURE__ */ new Map;
+  for (const comment of comments)
+    getCommentIds(comment).forEach((id2) => byId.set(id2, comment));
+  return byId;
+}, findCommentById = (comments = [], id2) => {
+  if (id2 == null)
+    return null;
+  return buildCommentLookup(comments).get(String(id2)) || null;
+}, isCommentResolvedInThread = (comment, allComments = []) => {
+  const isDone = (c$1) => Boolean(c$1?.resolvedTime || c$1?.isDone);
+  if (isDone(comment))
+    return true;
+  const byId = buildCommentLookup(allComments);
+  const seen = /* @__PURE__ */ new Set;
+  let current = comment;
+  while (current) {
+    const parentId = current.threadingParentCommentId || current.parentCommentId;
+    const parentKey = parentId != null ? String(parentId) : null;
+    if (parentKey == null || seen.has(parentKey))
+      break;
+    seen.add(parentKey);
+    const parent = byId.get(parentKey);
+    if (!parent)
+      break;
+    if (isDone(parent))
+      return true;
+    current = parent;
+  }
+  return false;
 }, getCommentDefinition = (comment, commentId, allComments, editor) => {
   const translatedParagraphs = (Array.isArray(comment.commentJSON) ? comment.commentJSON : comment.commentJSON ? [comment.commentJSON] : []).map((node3) => translator.decode({
     editor,
@@ -127895,7 +128021,7 @@ var isRegExp = (value) => {
     "w:author": comment.creatorName || comment.importedAuthor?.name,
     "w:date": toIsoNoFractional(comment.createdTime),
     "w:initials": getInitials(comment.creatorName),
-    "w:done": comment.resolvedTime ? "1" : "0",
+    "w:done": isCommentResolvedInThread(comment, allComments) ? "1" : "0",
     "w15:paraId": comment.commentParaId,
     "custom:internalId": comment.commentId || comment.internalId,
     "custom:trackedChange": comment.trackedChange,
@@ -127906,7 +128032,7 @@ var isRegExp = (value) => {
     "custom:email": comment.creatorEmail || comment.importedAuthor?.email
   };
   if (comment?.parentCommentId) {
-    const parentComment = allComments.find((c$1) => c$1.commentId === comment.parentCommentId);
+    const parentComment = findCommentById(allComments, comment.parentCommentId);
     if (parentComment && !parentComment.trackedChange)
       attributes["w15:paraIdParent"] = parentComment.commentParaId;
   }
@@ -127982,7 +128108,7 @@ var isRegExp = (value) => {
     return null;
   const xmlCopy = carbonCopy(commentsExtendedXml);
   const commentsEx = comments.map((comment) => {
-    const isResolved = comment.resolvedTime || comment.isDone;
+    const isResolved = isCommentResolvedInThread(comment, comments);
     const attributes = {
       "w15:paraId": comment.commentParaId,
       "w15:done": isResolved ? "1" : "0"
@@ -127990,7 +128116,7 @@ var isRegExp = (value) => {
     const parentId = comment.threadingParentCommentId || comment.parentCommentId;
     const threadingStyle = resolveThreadingStyle(comment, profile);
     if (parentId && (threadingStyle === "commentsExtended" || shouldIncludeForThreads)) {
-      const parentComment = comments.find((c$1) => c$1.commentId === parentId);
+      const parentComment = findCommentById(comments, parentId);
       const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
       if (parentComment && (allowTrackedParent || !parentComment.trackedChange))
         attributes["w15:paraIdParent"] = parentComment.commentParaId;
@@ -128717,6 +128843,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 +130662,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);
@@ -130998,15 +131137,17 @@ var isRegExp = (value) => {
     }
   }
   if (!cellBackgroundColor && resolvedTcProps?.shading) {
-    const { fill, themeFill, themeFillTint, themeFillShade } = resolvedTcProps.shading;
-    const normalizedFill = normalizeShadingColor(fill);
-    if (normalizedFill)
-      cellBackgroundColor = normalizedFill;
-    else if (themeFill && context.themeColors) {
-      const normalizedTheme = normalizeShadingColor(resolveThemeColorValue(themeFill, themeFillTint, themeFillShade, context.themeColors));
-      if (normalizedTheme)
-        cellBackgroundColor = normalizedTheme;
-    }
+    const { fill, color: color2, val, themeFill, themeFillTint, themeFillShade } = resolvedTcProps.shading;
+    let fillBase = normalizeShadingColor(fill);
+    if (!fillBase && themeFill && context.themeColors)
+      fillBase = normalizeShadingColor(resolveThemeColorValue(themeFill, themeFillTint, themeFillShade, context.themeColors));
+    const resolved = resolveShadingFillColor({
+      val,
+      color: color2,
+      fill: fillBase ?? fill
+    });
+    if (resolved)
+      cellBackgroundColor = resolved.startsWith("#") ? resolved : `#${resolved}`;
   }
   const cellConverterContext = tableInfo || cellBackgroundColor ? {
     ...context.converterContext,
@@ -131260,9 +131401,12 @@ var isRegExp = (value) => {
     return null;
   const rowProps = rowNode.attrs?.tableRowProperties;
   const rowHeight = normalizeRowHeight(rowProps);
+  const tblPrExBordersRaw = rowProps?.tblPrExBorders;
+  const rowBorders = tblPrExBordersRaw && typeof tblPrExBordersRaw === "object" ? extractTableBorders(tblPrExBordersRaw, { unit: "eighthPoints" }) : undefined;
   const attrs = rowProps && typeof rowProps === "object" ? {
     tableRowProperties: rowProps,
-    ...rowHeight ? { rowHeight } : {}
+    ...rowHeight ? { rowHeight } : {},
+    ...rowBorders ? { borders: rowBorders } : {}
   } : rowHeight ? { rowHeight } : undefined;
   return {
     id: context.nextBlockId(`row-${rowIndex}`),
@@ -131579,12 +131723,12 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_B9mZiCO9_es = __esm(() => {
+var init_SuperConverter_DBsJeu9t_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_lib_CYqLdG4z_es();
@@ -170614,7 +170758,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-BiY_0zZP.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -180947,10 +181091,10 @@ 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_BiY_0zZP_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
   init_uuid_qzgm05fK_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
   DOM_SIZE_UNITS = [
@@ -182847,7 +182991,7 @@ var init_decrypt_docx_G2a7hkiV_es = __esm(() => {
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/DocxZipper-VodIk8WL.es.js
+// ../../packages/superdoc/dist/chunks/DocxZipper-Bu2Fhqkw.es.js
 function sniffEncoding(u8) {
   if (u8.length >= 2) {
     const b0 = u8[0], b1 = u8[1];
@@ -183520,11 +183664,11 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
     return `image/${MIME_TYPE_FOR_EXT[detectedType] || detectedType}`;
   }
 }, DocxZipper_default;
-var init_DocxZipper_VodIk8WL_es = __esm(() => {
+var init_DocxZipper_Bu2Fhqkw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   MANAGED_PACKAGE_PARTS = [
     {
@@ -230111,7 +230255,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DvgAvHbj.es.js
+// ../../packages/superdoc/dist/chunks/src-DPx6wkCz.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -270395,6 +270539,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);
 }
@@ -272004,7 +272151,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;
@@ -272014,14 +272161,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
         },
@@ -272036,7 +272182,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;
@@ -272045,14 +272191,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
         },
@@ -272106,12 +272251,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;
@@ -272141,27 +272286,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)
@@ -272496,6 +272621,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)
@@ -272511,52 +272660,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);
@@ -272628,40 +272800,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)
@@ -272703,12 +272843,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;
@@ -272719,8 +272854,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;
@@ -272728,13 +272863,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)
@@ -272746,13 +272874,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;
@@ -272766,8 +272893,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;
@@ -272889,8 +273016,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,
@@ -272902,7 +273033,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;
@@ -274753,13 +274884,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)
@@ -275198,8 +275335,15 @@ function calculateChainHeight(chain, blocks2, measures, state) {
         const firstLineHeight = anchorMeasure.lines[0]?.lineHeight;
         const anchorHeight = typeof firstLineHeight === "number" && Number.isFinite(firstLineHeight) && firstLineHeight > 0 ? firstLineHeight : getMeasureHeight(anchorBlock, anchorMeasure);
         totalHeight += interParagraphSpacing + anchorHeight;
-      } else if (!(anchorBlock.kind === "table" && anchorBlock.anchor?.isAnchored === true))
-        totalHeight += prevSpacingAfter + getMeasureHeight(anchorBlock, anchorMeasure);
+      } else if (!(anchorBlock.kind === "table" && anchorBlock.anchor?.isAnchored === true)) {
+        let anchorHeight = getMeasureHeight(anchorBlock, anchorMeasure);
+        if (anchorBlock.kind === "table" && anchorMeasure.kind === "table" && anchorMeasure.rows.length > 0) {
+          const firstRowHeight = anchorMeasure.rows[0]?.height;
+          if (typeof firstRowHeight === "number" && Number.isFinite(firstRowHeight) && firstRowHeight > 0)
+            anchorHeight = firstRowHeight;
+        }
+        totalHeight += prevSpacingAfter + anchorHeight;
+      }
     }
   }
   return totalHeight;
@@ -276012,58 +276156,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
@@ -276374,7 +276488,6 @@ function layoutDocument(blocks2, measures, options = {}) {
             overrideSpacingAfter = 0;
         }
       }
-      const paragraphStartY = paginator.ensurePage().cursorY;
       layoutParagraphBlock({
         block,
         measure,
@@ -276404,7 +276517,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;
@@ -276412,15 +276530,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;
@@ -292188,28 +292308,61 @@ var Node$13 = class Node$14 {
     ranges
   };
 }, resolveCommentById = ({ commentId, importedId, state, tr, dispatch }) => {
+  const converted = resolveCommentsInTr({
+    items: [{
+      commentId,
+      importedId
+    }],
+    state,
+    tr
+  });
+  if (converted)
+    dispatch(tr);
+  return converted;
+}, resolveCommentsInTr = ({ items = [], state, tr }) => {
   const { schema } = state;
   const markType = schema.marks?.[CommentMarkName];
   if (!markType)
     return false;
-  const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
-  if (!segments.length)
-    return false;
-  segments.forEach(({ from: from$1, to, attrs }) => {
-    tr.removeMark(from$1, to, markType.create(attrs));
-  });
   const startType = schema.nodes?.commentRangeStart;
   const endType = schema.nodes?.commentRangeEnd;
-  if (startType && endType)
-    ranges.slice().sort((a2, b$1) => b$1.from - a2.from).forEach(({ from: from$1, to, internal }) => {
-      tr.insert(to, endType.create({ "w:id": commentId }));
-      tr.insert(from$1, startType.create({
+  const insertions = [];
+  const seen = /* @__PURE__ */ new Set;
+  let converted = false;
+  for (const item of items) {
+    if (!item)
+      continue;
+    const { commentId, importedId } = item;
+    if (commentId == null)
+      continue;
+    const key2 = `${commentId}:${importedId ?? ""}`;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
+    if (!segments.length)
+      continue;
+    converted = true;
+    segments.forEach(({ from: from$1, to, attrs }) => {
+      tr.removeMark(from$1, to, markType.create(attrs));
+    });
+    if (startType && endType && item.preserveAnchor !== false)
+      ranges.forEach(({ from: from$1, to, internal }) => insertions.push({
+        from: from$1,
+        to,
+        internal,
+        commentId
+      }));
+  }
+  if (startType && endType && insertions.length)
+    insertions.sort((a2, b$1) => b$1.from - a2.from || b$1.to - a2.to).forEach(({ from: from$1, to, internal, commentId }) => {
+      tr.insert(tr.mapping.map(to), endType.create({ "w:id": commentId }));
+      tr.insert(tr.mapping.map(from$1), startType.create({
         "w:id": commentId,
         internal
       }));
     });
-  dispatch(tr);
-  return true;
+  return converted;
 }, getCommentRangeAnchorsById = (commentId, doc$12, importedId) => {
   const anchors = [];
   doc$12.descendants((node3, pos) => {
@@ -292504,6 +292657,60 @@ var Node$13 = class Node$14 {
       });
     });
   }
+  const nodeAnchorsById = /* @__PURE__ */ new Map;
+  doc$12.descendants((node3, pos) => {
+    const typeName = node3.type?.name;
+    if (typeName !== "commentRangeStart" && typeName !== "commentRangeEnd")
+      return;
+    const anchorId = node3.attrs?.["w:id"];
+    if (anchorId == null)
+      return;
+    const entry = nodeAnchorsById.get(anchorId) || {};
+    if (typeName === "commentRangeStart")
+      entry.startPos = pos;
+    else
+      entry.endPos = pos;
+    nodeAnchorsById.set(anchorId, entry);
+  });
+  const isRepresented = (c) => seen.has(c.commentId) || c.importedId != null && seen.has(c.importedId) || nodeAnchorsById.has(c.commentId) || c.importedId != null && nodeAnchorsById.has(c.importedId);
+  const findAncestorNodeAnchor = (comment2) => {
+    let current = comment2;
+    const visited = /* @__PURE__ */ new Set;
+    while (current) {
+      const parentId = getThreadingParentId(current);
+      if (parentId == null || visited.has(parentId))
+        return null;
+      visited.add(parentId);
+      const parent = commentMap.get(parentId) || comments.find((c) => c.importedId === parentId || c.commentId === parentId);
+      const anchor = nodeAnchorsById.get(parentId) ?? (parent ? nodeAnchorsById.get(parent.commentId) ?? nodeAnchorsById.get(parent.importedId) : undefined);
+      if (anchor?.startPos != null && anchor?.endPos != null)
+        return anchor;
+      current = parent;
+    }
+    return null;
+  };
+  comments.filter((c) => !c.trackedChange && c.commentId != null && !isRepresented(c)).sort((a2, b$1) => (a2.createdTime || 0) - (b$1.createdTime || 0)).forEach((c) => {
+    const anchor = findAncestorNodeAnchor(c);
+    if (!anchor)
+      return;
+    seen.add(c.commentId);
+    const childAttrs = getPreparedComment({
+      commentId: c.commentId,
+      internal: c.isInternal
+    });
+    startNodes.push({
+      pos: anchor.startPos + 1,
+      node: schema.nodes.commentRangeStart.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+    endNodes.push({
+      pos: anchor.endPos + 1,
+      node: schema.nodes.commentRangeEnd.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+  });
   startNodes.sort((a2, b$1) => {
     if (a2.pos !== b$1.pos)
       return a2.pos - b$1.pos;
@@ -310060,6 +310267,45 @@ menclose::after {
   if (explicitSpec)
     return explicitSpec;
   return borderValueToSpec(fallback);
+}, BORDER_STYLE_NUMBER, BORDER_STYLE_LINES, isPresentBorder = (b$1) => !!b$1 && b$1.style !== undefined && b$1.style !== "none" && (b$1.width === undefined || b$1.width > 0), isExplicitNoneBorder = (b$1) => {
+  if (!b$1 || typeof b$1 !== "object")
+    return false;
+  const r$1 = b$1;
+  return r$1.style === "none" || r$1.none === true;
+}, borderWeight = (b$1) => (BORDER_STYLE_LINES[b$1.style] ?? 1) * (BORDER_STYLE_NUMBER[b$1.style] ?? 1), colorBrightness = (color2, formula) => {
+  const hex = (color2 ?? "#000000").replace("#", "");
+  if (hex.length < 6)
+    return 0;
+  return formula(parseInt(hex.slice(0, 2), 16), parseInt(hex.slice(2, 4), 16), parseInt(hex.slice(4, 6), 16));
+}, resolveBorderConflict = (a2, b$1) => {
+  const pa = isPresentBorder(a2);
+  const pb = isPresentBorder(b$1);
+  if (!pa && !pb)
+    return;
+  if (!pa)
+    return b$1;
+  if (!pb)
+    return a2;
+  const wa = borderWeight(a2);
+  const wb = borderWeight(b$1);
+  if (wa !== wb)
+    return wa > wb ? a2 : b$1;
+  const na = BORDER_STYLE_NUMBER[a2.style] ?? 99;
+  const nb = BORDER_STYLE_NUMBER[b$1.style] ?? 99;
+  if (na !== nb)
+    return na < nb ? a2 : b$1;
+  const formulas = [
+    (r$1, g$1, bl) => r$1 + bl + 2 * g$1,
+    (_r, g$1, bl) => bl + 2 * g$1,
+    (_r, g$1) => g$1
+  ];
+  for (const f2 of formulas) {
+    const ba = colorBrightness(a2.color, f2);
+    const bb = colorBrightness(b$1.color, f2);
+    if (ba !== bb)
+      return ba < bb ? a2 : b$1;
+  }
+  return a2;
 }, hasExplicitCellBorders = (cellBorders) => Boolean(cellBorders && (cellBorders.top !== undefined || cellBorders.right !== undefined || cellBorders.bottom !== undefined || cellBorders.left !== undefined)), resolveTableCellBorders = (tableBorders, cellPosition) => {
   const cellBounds = getTableCellGridBounds(cellPosition);
   return {
@@ -310139,7 +310385,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;
@@ -310191,12 +310437,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
     };
   }
@@ -310213,23 +310488,11 @@ menclose::after {
   }
   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
-      };
+    const { physical, reason } = this.#resolveFaceLadder(primary, face, hasFace);
     return {
       logicalFamily,
-      physicalFamily: primary,
-      reason: "fallback_face_absent"
+      physicalFamily: stripFamilyQuotes(physical),
+      reason
     };
   }
   resolvePhysicalFamilyForFace(cssFontFamily, face, hasFace) {
@@ -310238,12 +310501,10 @@ menclose::after {
     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(", ");
+    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;
@@ -310271,6 +310532,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;
@@ -310282,7 +310544,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)
@@ -310295,7 +310559,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);
     }
@@ -310307,6 +310575,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");
@@ -310351,7 +310620,8 @@ menclose::after {
     return "unloaded";
   }
   hasFace(family$1, weight, style2) {
-    return this.#facesByFamily.get(normalizeFamilyKey$1(family$1))?.has(faceKeyOf$1(family$1, weight, style2)) ?? false;
+    const key2 = faceKeyOf$1(family$1, weight, style2);
+    return this.#providerFaceKeys.has(key2) && this.#faceStatus.get(key2) !== "failed";
   }
   isAvailable(family$1) {
     if (!this.#fontSet)
@@ -311875,8 +312145,21 @@ menclose::after {
       }
   }
   return { cellElement: cellEl };
-}, hasAnyResolvedBorder = (borders) => Boolean(borders.top || borders.right || borders.bottom || borders.left), resolveRenderedCellBorders = ({ cellBorders, hasBordersAttribute, tableBorders, cellPosition, cellSpacingPx, continuesFromPrev, continuesOnNext }) => {
+}, hasAnyResolvedBorder = (borders) => Boolean(borders.top || borders.right || borders.bottom || borders.left), resolveRenderedCellBorders = ({ cellBorders, hasBordersAttribute, tableBorders, cellPosition, cellSpacingPx, continuesFromPrev, continuesOnNext, aboveCellBorders, leftCellBorders, rightCellBorders, nextRowLeavesRightGap, deferTopToAboveCell, nextRowSuppressesSharedTop }) => {
   const hasExplicitBorders = hasExplicitCellBorders(cellBorders);
+  const cellBounds = getTableCellGridBounds(cellPosition);
+  const touchesTopBoundary = cellBounds.touchesTopEdge || continuesFromPrev;
+  const touchesBottomBoundary = cellBounds.touchesBottomEdge || continuesOnNext || nextRowLeavesRightGap === true;
+  const hasInteriorNeighborBorder = !touchesTopBoundary && !deferTopToAboveCell && isPresentBorder(aboveCellBorders?.bottom) || !cellBounds.touchesLeftEdge && isPresentBorder(leftCellBorders?.right);
+  if (cellSpacingPx === 0 && (hasExplicitBorders || hasInteriorNeighborBorder)) {
+    const cb = cellBorders ?? {};
+    return {
+      top: touchesTopBoundary ? resolveTableBorderValue(cb.top, tableBorders?.top) : deferTopToAboveCell ? undefined : resolveBorderConflict(cb.top, aboveCellBorders?.bottom) ?? (isExplicitNoneBorder(cb.top) && isExplicitNoneBorder(aboveCellBorders?.bottom) ? undefined : borderValueToSpec(tableBorders?.insideH)),
+      left: cellBounds.touchesLeftEdge ? resolveTableBorderValue(cb.left, tableBorders?.left) : isPresentBorder(cb.left) ? resolveBorderConflict(cb.left, leftCellBorders?.right) ?? borderValueToSpec(tableBorders?.insideV) : isPresentBorder(leftCellBorders?.right) ? undefined : isExplicitNoneBorder(cb.left) && isExplicitNoneBorder(leftCellBorders?.right) ? undefined : borderValueToSpec(tableBorders?.insideV),
+      right: cellBounds.touchesRightEdge ? resolveTableBorderValue(cb.right, tableBorders?.right) : isPresentBorder(cb.right) && !isPresentBorder(rightCellBorders?.left) ? cb.right : undefined,
+      bottom: touchesBottomBoundary ? resolveTableBorderValue(cb.bottom, tableBorders?.bottom) : undefined
+    };
+  }
   if (hasBordersAttribute && !hasExplicitBorders)
     return;
   if (!tableBorders)
@@ -311886,24 +312169,13 @@ menclose::after {
       bottom: cellBorders.bottom,
       left: cellBorders.left
     } : undefined;
-  const cellBounds = getTableCellGridBounds(cellPosition);
-  const touchesTopBoundary = cellBounds.touchesTopEdge || continuesFromPrev;
-  const touchesBottomBoundary = cellBounds.touchesBottomEdge || continuesOnNext;
-  if (hasExplicitBorders) {
-    if (cellSpacingPx === 0)
-      return {
-        top: resolveTableBorderValue(cellBorders.top, touchesTopBoundary ? tableBorders.top : tableBorders.insideH),
-        right: cellBounds.touchesRightEdge ? resolveTableBorderValue(cellBorders.right, tableBorders.right) : undefined,
-        bottom: touchesBottomBoundary ? resolveTableBorderValue(cellBorders.bottom, tableBorders.bottom) : undefined,
-        left: resolveTableBorderValue(cellBorders.left, cellBounds.touchesLeftEdge ? tableBorders.left : tableBorders.insideV)
-      };
+  if (hasExplicitBorders)
     return {
       top: resolveTableBorderValue(cellBorders.top, touchesTopBoundary ? tableBorders.top : tableBorders.insideH),
       right: resolveTableBorderValue(cellBorders.right, cellBounds.touchesRightEdge ? tableBorders.right : undefined),
       bottom: resolveTableBorderValue(cellBorders.bottom, touchesBottomBoundary ? tableBorders.bottom : undefined),
       left: resolveTableBorderValue(cellBorders.left, cellBounds.touchesLeftEdge ? tableBorders.left : tableBorders.insideV)
     };
-  }
   if (cellSpacingPx > 0) {
     const interiorBorders = {
       top: touchesTopBoundary ? undefined : borderValueToSpec(tableBorders.insideH),
@@ -311914,15 +312186,29 @@ menclose::after {
     return hasAnyResolvedBorder(interiorBorders) ? interiorBorders : undefined;
   }
   const baseBorders = resolveTableCellBorders(tableBorders, cellPosition);
+  const insideHSpec = borderValueToSpec(tableBorders.insideH);
+  const interiorBottom = nextRowSuppressesSharedTop && isPresentBorder(insideHSpec) ? insideHSpec : baseBorders.bottom;
   return {
     top: touchesTopBoundary ? borderValueToSpec(tableBorders.top) : baseBorders.top,
     right: baseBorders.right,
-    bottom: touchesBottomBoundary ? borderValueToSpec(tableBorders.bottom) : baseBorders.bottom,
+    bottom: touchesBottomBoundary ? borderValueToSpec(tableBorders.bottom) : interiorBottom,
     left: baseBorders.left
   };
 }, renderTableRow = (deps) => {
-  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2, resolvePhysical } = deps;
+  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, prevRow, prevRowMeasure, nextRow, nextRowMeasure, rowOccupiedRightCol, nextRowOccupiedRightCol, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2, resolvePhysical } = deps;
   const totalCols = columnWidths.length;
+  const rowRightEdgeCol = rowOccupiedRightCol != null && rowOccupiedRightCol > 0 ? Math.min(totalCols, rowOccupiedRightCol) : rowMeasure.cells.length ? Math.min(totalCols, Math.max(...rowMeasure.cells.map((c) => (c.gridColumnStart ?? 0) + (c.colSpan ?? 1)))) : totalCols;
+  const rowBorderOverride = row2?.attrs?.borders;
+  const effectiveTableBorders = rowBorderOverride ? {
+    ...tableBorders ?? {},
+    ...rowBorderOverride
+  } : tableBorders;
+  const nextRowBorderOverride = nextRow?.attrs?.borders;
+  const nextRowEffectiveInsideH = nextRowBorderOverride ? {
+    ...tableBorders ?? {},
+    ...nextRowBorderOverride
+  }.insideH : undefined;
+  const nextRowSuppressesSharedTop = nextRowBorderOverride !== undefined && !isPresentBorder(borderValueToSpec(nextRowEffectiveInsideH));
   const calculateXPosition = (gridColumnStart) => {
     let x = cellSpacingPx;
     for (let i4 = 0;i4 < gridColumnStart && i4 < columnWidths.length; i4++)
@@ -311947,6 +312233,27 @@ menclose::after {
       width += columnWidths[i4];
     return width;
   };
+  const findCellBordersAtColumn = (cells, measureCells, gridCol) => {
+    if (!cells || !measureCells)
+      return;
+    for (let i4 = 0;i4 < measureCells.length; i4++) {
+      const start$1 = measureCells[i4].gridColumnStart ?? i4;
+      const span = measureCells[i4].colSpan ?? 1;
+      if (gridCol >= start$1 && gridCol < start$1 + span)
+        return cells[i4]?.attrs?.borders;
+    }
+  };
+  const findCellRightEdgeAtColumn = (measureCells, gridCol) => {
+    if (!measureCells)
+      return;
+    for (let i4 = 0;i4 < measureCells.length; i4++) {
+      const start$1 = measureCells[i4].gridColumnStart ?? i4;
+      const span = measureCells[i4].colSpan ?? 1;
+      if (gridCol >= start$1 && gridCol < start$1 + span)
+        return start$1 + span;
+    }
+  };
+  const nextRowMaxCol = nextRowOccupiedRightCol != null && nextRowOccupiedRightCol > 0 ? nextRowOccupiedRightCol : nextRowMeasure?.cells?.length ? Math.max(...nextRowMeasure.cells.map((c) => (c.gridColumnStart ?? 0) + (c.colSpan ?? 1))) : Infinity;
   for (let cellIndex = 0;cellIndex < rowMeasure.cells.length; cellIndex += 1) {
     const cellMeasure = rowMeasure.cells[cellIndex];
     const cell2 = row2?.cells?.[cellIndex];
@@ -311955,21 +312262,34 @@ menclose::after {
     const colSpan = cellMeasure.colSpan ?? 1;
     let x = calculateXPosition(gridColumnStart);
     const cellBordersAttr = cell2?.attrs?.borders;
+    const hasBordersAttribute = cellBordersAttr !== undefined;
+    const cellPosition = {
+      rowIndex,
+      rowSpan,
+      gridColumnStart,
+      colSpan,
+      totalRows,
+      totalCols: rowRightEdgeCol
+    };
+    const aboveCellBorders = findCellBordersAtColumn(prevRow?.cells, prevRowMeasure?.cells, gridColumnStart);
+    const leftCellBorders = gridColumnStart > 0 ? findCellBordersAtColumn(row2?.cells, rowMeasure.cells, gridColumnStart - 1) : undefined;
+    const rightCellBorders = findCellBordersAtColumn(row2?.cells, rowMeasure.cells, gridColumnStart + colSpan);
+    const nextRowLeavesRightGap = gridColumnStart + colSpan > nextRowMaxCol;
+    const aboveCellRightEdge = findCellRightEdgeAtColumn(prevRowMeasure?.cells, gridColumnStart);
     const resolvedBorders = resolveRenderedCellBorders({
       cellBorders: cellBordersAttr,
-      hasBordersAttribute: cellBordersAttr !== undefined,
-      tableBorders,
-      cellPosition: {
-        rowIndex,
-        rowSpan,
-        gridColumnStart,
-        colSpan,
-        totalRows,
-        totalCols
-      },
+      hasBordersAttribute,
+      tableBorders: effectiveTableBorders,
+      cellPosition,
       cellSpacingPx,
       continuesFromPrev: continuesFromPrev === true,
-      continuesOnNext: continuesOnNext === true
+      continuesOnNext: continuesOnNext === true,
+      aboveCellBorders,
+      leftCellBorders,
+      rightCellBorders,
+      nextRowLeavesRightGap,
+      deferTopToAboveCell: aboveCellRightEdge !== undefined && aboveCellRightEdge > rowRightEdgeCol,
+      nextRowSuppressesSharedTop
     });
     const finalBorders = isRtl && resolvedBorders ? swapCellBordersLR(resolvedBorders) : resolvedBorders;
     let cellHeight;
@@ -312102,12 +312422,22 @@ menclose::after {
       if (!rowMeasure)
         continue;
       const boundariesInRow = /* @__PURE__ */ new Set;
+      const occupiedCols = /* @__PURE__ */ new Set;
+      for (const cellMeasure of rowMeasure.cells) {
+        const s2 = cellMeasure.gridColumnStart ?? 0;
+        const sp = cellMeasure.colSpan ?? 1;
+        for (let c = s2;c < s2 + sp; c++)
+          occupiedCols.add(c);
+      }
+      const lastColIndex = columnCount - 1;
+      const lastColMeta = fragment2.metadata.columnBoundaries[lastColIndex];
+      const skipTrailingSpacerBoundary = lastColIndex > 0 && !occupiedCols.has(lastColIndex) && !!lastColMeta && typeof lastColMeta.width === "number" && typeof lastColMeta.minWidth === "number" && lastColMeta.width < lastColMeta.minWidth;
       for (const cellMeasure of rowMeasure.cells) {
         const startCol = cellMeasure.gridColumnStart ?? 0;
         const endCol = startCol + (cellMeasure.colSpan ?? 1);
         if (startCol > 0)
           boundariesInRow.add(startCol);
-        if (endCol < columnCount)
+        if (endCol < columnCount && !(skipTrailingSpacerBoundary && endCol === lastColIndex))
           boundariesInRow.add(endCol);
       }
       for (const boundaryCol of boundariesInRow) {
@@ -312164,6 +312494,16 @@ menclose::after {
       return fragment2.partialRow.partialHeight;
     return r$1?.height ?? 0;
   });
+  const rowOccupiedRightCols = new Array(measure.rows.length).fill(0);
+  measure.rows.forEach((rowM, r$1) => {
+    for (const c of rowM?.cells ?? []) {
+      const right$1 = (c.gridColumnStart ?? 0) + (c.colSpan ?? 1);
+      const lastRow = Math.min(measure.rows.length - 1, r$1 + (c.rowSpan ?? 1) - 1);
+      for (let rr = r$1;rr <= lastRow; rr += 1)
+        if (right$1 > rowOccupiedRightCols[rr])
+          rowOccupiedRightCols[rr] = right$1;
+    }
+  });
   let y$1 = cellSpacingPx;
   if (fragment2.repeatHeaderCount && fragment2.repeatHeaderCount > 0)
     for (let r$1 = 0;r$1 < fragment2.repeatHeaderCount; r$1 += 1) {
@@ -312177,6 +312517,12 @@ menclose::after {
         y: y$1,
         rowMeasure,
         row: block.rows[r$1],
+        prevRow: r$1 > 0 ? block.rows[r$1 - 1] : undefined,
+        prevRowMeasure: r$1 > 0 ? measure.rows[r$1 - 1] : undefined,
+        nextRow: r$1 < block.rows.length - 1 ? block.rows[r$1 + 1] : undefined,
+        nextRowMeasure: r$1 < block.rows.length - 1 ? measure.rows[r$1 + 1] : undefined,
+        rowOccupiedRightCol: rowOccupiedRightCols[r$1],
+        nextRowOccupiedRightCol: rowOccupiedRightCols[r$1 + 1],
         totalRows: block.rows.length,
         tableBorders,
         columnWidths: effectiveColumnWidths,
@@ -312295,6 +312641,12 @@ menclose::after {
       y: y$1,
       rowMeasure,
       row: block.rows[r$1],
+      prevRow: r$1 > 0 ? block.rows[r$1 - 1] : undefined,
+      prevRowMeasure: r$1 > 0 ? measure.rows[r$1 - 1] : undefined,
+      nextRow: r$1 < block.rows.length - 1 ? block.rows[r$1 + 1] : undefined,
+      nextRowMeasure: r$1 < block.rows.length - 1 ? measure.rows[r$1 + 1] : undefined,
+      rowOccupiedRightCol: rowOccupiedRightCols[r$1],
+      nextRowOccupiedRightCol: rowOccupiedRightCols[r$1 + 1],
       totalRows: block.rows.length,
       tableBorders,
       columnWidths: effectiveColumnWidths,
@@ -325737,6 +326089,7 @@ menclose::after {
   #requiredFaceKeys = /* @__PURE__ */ new Set;
   #seenAvailable = /* @__PURE__ */ new Set;
   #seenAvailableFaces = /* @__PURE__ */ new Set;
+  #seenFailedFaces = /* @__PURE__ */ new Set;
   #lastSummary = null;
   #loadingDoneHandler = null;
   #lateLoadScheduler;
@@ -325812,9 +326165,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;
   }
@@ -325871,6 +326233,7 @@ menclose::after {
     this.#requiredFamilies = /* @__PURE__ */ new Set;
     this.#seenAvailable.clear();
     this.#seenAvailableFaces.clear();
+    this.#seenFailedFaces.clear();
     this.#lastSummary = null;
   }
   dispose() {
@@ -325936,6 +326299,9 @@ menclose::after {
     }
     if (changedKeys.length === 0)
       return;
+    this.#scheduleAvailabilityReflow(changedKeys);
+  }
+  #scheduleAvailabilityReflow(changedKeys) {
     this.#fontConfigVersion += 1;
     bumpFontConfigVersion();
     this.#invalidateCaches();
@@ -326035,8 +326401,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"
     }));
@@ -326153,19 +326524,19 @@ 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_DvgAvHbj_es = __esm(() => {
+var init_src_DPx6wkCz_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_B9mZiCO9_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_pn_wKqsL_es();
-  init_constants_D_X7xF4s_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_remark_gfm_BhnWr3yf_es();
   init_remark_stringify_6MMJfY0k_es();
-  init_DocxZipper_VodIk8WL_es();
+  init_DocxZipper_Bu2Fhqkw_es();
   init__plugin_vue_export_helper_5t5P5NuM_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();
@@ -329240,6 +329611,17 @@ ${err.toString()}`);
             dispatch
           });
         },
+        resolveCommentThread: ({ comments } = {}) => ({ tr, dispatch, state }) => {
+          tr.setMeta(CommentsPluginKey, { event: "update" });
+          const converted = resolveCommentsInTr({
+            items: comments,
+            state,
+            tr
+          });
+          if (converted)
+            dispatch(tr);
+          return converted;
+        },
         reopenComment: ({ commentId, importedId, internal }) => ({ tr, dispatch, state }) => {
           tr.setMeta(CommentsPluginKey, { event: "update" });
           return reopenCommentById({
@@ -353028,6 +353410,30 @@ function print() { __p += __j.call(arguments, '') }
     "wave",
     "doubleWave"
   ]);
+  BORDER_STYLE_NUMBER = {
+    single: 1,
+    thick: 2,
+    double: 3,
+    dotted: 4,
+    dashed: 5,
+    dotDash: 6,
+    dotDotDash: 7,
+    triple: 8,
+    wave: 18,
+    doubleWave: 19
+  };
+  BORDER_STYLE_LINES = {
+    single: 1,
+    thick: 1,
+    double: 2,
+    dotted: 1,
+    dashed: 1,
+    dotDash: 1,
+    dotDotDash: 1,
+    triple: 3,
+    wave: 1,
+    doubleWave: 2
+  };
   SETTLED_STATUSES = [
     "loaded",
     "failed",
@@ -360868,11 +361274,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-k5vyPmpN.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_k5vyPmpN_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -360914,16 +361320,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DvgAvHbj_es();
-  init_SuperConverter_B9mZiCO9_es();
+  init_src_DPx6wkCz_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_pn_wKqsL_es();
-  init_constants_D_X7xF4s_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
-  init_DocxZipper_VodIk8WL_es();
-  init_create_super_doc_ui_CxQcY_QQ_es();
+  init_DocxZipper_Bu2Fhqkw_es();
+  init_create_super_doc_ui_k5vyPmpN_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();