@superdoc-dev/mcp 0.12.0-next.46 → 0.12.0-next.48

package/dist/index.js

@@ -50479,7 +50479,7 @@ var init_remark_gfm_BUJjZJLy_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-DRKaQwZS.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-Ed3nFN54.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -60055,6 +60055,50 @@ function getCellSpacingPx(cellSpacing) {
   const asPx = (cellSpacing.type ?? "").toLowerCase() === "dxa" && v >= 20 ? v / TWIPS_PER_PX : v;
   return Math.max(0, asPx);
 }
+function getBorderBandProfile(value) {
+  if (value == null || typeof value !== "object")
+    return null;
+  if ("none" in value && value.none)
+    return null;
+  const raw = value;
+  if (!raw.style)
+    return null;
+  const formula = COMPOUND_PROFILES[raw.style];
+  if (!formula)
+    return null;
+  const w = typeof raw.width === "number" ? raw.width : typeof raw.size === "number" ? raw.size : 1;
+  if (w <= 0)
+    return null;
+  const segments = formula(w).map((s) => Math.max(1, s));
+  return {
+    segments,
+    band: segments.reduce((sum, s) => sum + s, 0)
+  };
+}
+function getBorderBandWidthPx(value) {
+  if (value == null)
+    return 0;
+  if (typeof value !== "object")
+    return 0;
+  if ("none" in value && value.none)
+    return 0;
+  const raw = value;
+  if (raw.style === "none")
+    return 0;
+  const w = typeof raw.width === "number" ? raw.width : typeof raw.size === "number" ? raw.size : 1;
+  const width = Math.max(0, w);
+  if (width === 0)
+    return 0;
+  if (raw.style === "thick")
+    return Math.max(width, 1);
+  const profile = getBorderBandProfile(value);
+  if (profile)
+    return profile.band;
+  return width;
+}
+function isNativeCssDoubleStyle(style) {
+  return style === "double";
+}
 function coerceRelativeHeight(raw) {
   if (typeof raw === "number" && Number.isFinite(raw))
     return raw;
@@ -61662,6 +61706,11 @@ function resolveConditionalProps(propertyType, styleType, styleId, translatedLin
     const props = def?.tableStyleProperties?.[styleType]?.[propertyType];
     if (props)
       chain.push(props);
+    if (styleType === "wholeTable" && propertyType === "tableCellProperties") {
+      const baseProps = def?.tableCellProperties;
+      if (baseProps)
+        chain.push(baseProps);
+    }
     currentId = def?.basedOn;
   }
   if (chain.length === 0)
@@ -61675,7 +61724,7 @@ function resolveCellStyles(propertyType, tableInfo, translatedLinkedStyles) {
   const cellStyleProps = [];
   const tableStyleId = tableInfo.tableProperties.tableStyleId;
   const { rowBandSize, colBandSize } = resolveEffectiveBandSizes(tableStyleId, translatedLinkedStyles);
-  determineCellStyleTypes(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle).forEach((styleType) => {
+  determineCellStyleTypes(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle, tableInfo.gridColumnStart, tableInfo.gridColumnSpan, tableInfo.numGridCols).forEach((styleType) => {
     const typeProps = resolveConditionalProps(propertyType, styleType, tableStyleId, translatedLinkedStyles);
     if (typeProps)
       cellStyleProps.push(typeProps);
@@ -61693,12 +61742,15 @@ function resolveTableCellProperties(inlineProps, tableInfo, translatedLinkedStyl
     chain.push(inlineProps);
   return combineProperties(chain, { fullOverrideProps: ["shading"] });
 }
-function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle) {
+function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle, gridColumnStart, gridColumnSpan, numGridCols) {
   const applicable = new Set(["wholeTable"]);
   const normalizedRowBandSize = rowBandSize > 0 ? rowBandSize : 1;
   const normalizedColBandSize = colBandSize > 0 ? colBandSize : 1;
+  const columnStart = gridColumnStart ?? cellIndex;
+  const columnEnd = columnStart + (gridColumnSpan ?? 1);
+  const columnCount = numGridCols != null && numCells != null ? Math.max(numGridCols, numCells) : numGridCols ?? numCells;
   const bandRowIndex = Math.max(0, rowIndex - (tblLook?.firstRow ? 1 : 0));
-  const bandColIndex = Math.max(0, cellIndex - (tblLook?.firstColumn ? 1 : 0));
+  const bandColIndex = Math.max(0, columnStart - (tblLook?.firstColumn ? 1 : 0));
   const rowGroup = Math.floor(bandRowIndex / normalizedRowBandSize);
   const colGroup = Math.floor(bandColIndex / normalizedColBandSize);
   if (!tblLook?.noHBand)
@@ -61707,8 +61759,8 @@ function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells
     applicable.add(colGroup % 2 === 0 ? "band1Vert" : "band2Vert");
   const isFirstRow = !!tblLook?.firstRow && rowIndex === 0;
   const isLastRow = !!tblLook?.lastRow && numRows != null && numRows > 0 && rowIndex === numRows - 1;
-  const isFirstCol = !!tblLook?.firstColumn && cellIndex === 0;
-  const isLastCol = !!tblLook?.lastColumn && numCells != null && numCells > 0 && cellIndex === numCells - 1;
+  const isFirstCol = !!tblLook?.firstColumn && columnStart === 0;
+  const isLastCol = !!tblLook?.lastColumn && columnCount != null && columnCount > 0 && columnEnd >= columnCount;
   if (isFirstRow)
     applicable.add("firstRow");
   if (isFirstCol)
@@ -87050,34 +87102,62 @@ function hydrateImageBlocks(blocks, mediaFiles) {
       if (blk.kind === "drawing") {
         const drawingBlock = blk;
         if (drawingBlock.drawingKind === "vectorShape" || drawingBlock.drawingKind === "textboxShape") {
-          const parts = drawingBlock.textContent?.parts;
-          if (!parts || parts.length === 0)
-            return blk;
-          let partsChanged = false;
-          const hydratedParts = parts.map((part) => {
-            if (part?.kind !== "image" || !part.src || part.src.startsWith("data:"))
+          let blockChanged = false;
+          let nextBlock = drawingBlock;
+          if (drawingBlock.drawingKind === "textboxShape") {
+            const contentBlocks = drawingBlock.contentBlocks;
+            if (Array.isArray(contentBlocks) && contentBlocks.length > 0) {
+              let contentBlocksChanged = false;
+              const hydratedContentBlocks = contentBlocks.map((paragraphBlock) => {
+                if (paragraphBlock.kind !== "paragraph" || !paragraphBlock.runs?.length)
+                  return paragraphBlock;
+                const hydratedRuns = hydrateRuns(paragraphBlock.runs);
+                if (hydratedRuns !== paragraphBlock.runs) {
+                  contentBlocksChanged = true;
+                  return {
+                    ...paragraphBlock,
+                    runs: hydratedRuns
+                  };
+                }
+                return paragraphBlock;
+              });
+              if (contentBlocksChanged) {
+                blockChanged = true;
+                nextBlock = {
+                  ...drawingBlock,
+                  contentBlocks: hydratedContentBlocks
+                };
+              }
+            }
+          }
+          const parts = nextBlock.textContent?.parts;
+          if (parts && parts.length > 0) {
+            let partsChanged = false;
+            const hydratedParts = parts.map((part) => {
+              if (part?.kind !== "image" || !part.src || part.src.startsWith("data:"))
+                return part;
+              const resolvedSrc = resolveImageSrc(part.src, part.rId, undefined, part.extension);
+              if (resolvedSrc) {
+                partsChanged = true;
+                return {
+                  ...part,
+                  src: resolvedSrc
+                };
+              }
               return part;
-            const resolvedSrc = resolveImageSrc(part.src, part.rId, undefined, part.extension);
-            if (resolvedSrc) {
-              partsChanged = true;
-              return {
-                ...part,
-                src: resolvedSrc
+            });
+            if (partsChanged) {
+              blockChanged = true;
+              nextBlock = {
+                ...nextBlock,
+                textContent: {
+                  ...nextBlock.textContent,
+                  parts: hydratedParts
+                }
               };
             }
-            return part;
-          });
-          if (partsChanged) {
-            const vectorShapeBlock = drawingBlock;
-            return {
-              ...vectorShapeBlock,
-              textContent: {
-                ...vectorShapeBlock.textContent,
-                parts: hydratedParts
-              }
-            };
           }
-          return blk;
+          return blockChanged ? nextBlock : blk;
         }
         if (drawingBlock.drawingKind !== "shapeGroup")
           return blk;
@@ -89242,6 +89322,7 @@ function shapeContainerNodeToDrawingBlock(node2, nextBlockId, positions) {
   const textContent = shapeTextboxNode ? extractTextboxTextContent(shapeTextboxNode) : undefined;
   return buildDrawingBlock({
     ...rawAttrs,
+    ...resolveInlineAlignmentFromWrapper(rawAttrs),
     ...textContent ? { textContent } : {},
     ...rawAttrs.textAlign == null && textContent?.horizontalAlign ? { textAlign: textContent.horizontalAlign } : {},
     ...rawAttrs.textInsets == null ? { textInsets: resolveTextboxInsetsFromAttrs(textboxAttrs) } : {},
@@ -89532,10 +89613,40 @@ function normalizeLegacyBorderStyle(value) {
       return "dotDash";
     case "dotdotdash":
       return "dotDotDash";
+    case "dashsmallgap":
+      return "dashSmallGap";
+    case "thinthicksmallgap":
+      return "thinThickSmallGap";
+    case "thickthinsmallgap":
+      return "thickThinSmallGap";
+    case "thinthickthinsmallgap":
+      return "thinThickThinSmallGap";
+    case "thinthickmediumgap":
+      return "thinThickMediumGap";
+    case "thickthinmediumgap":
+      return "thickThinMediumGap";
+    case "thinthickthinmediumgap":
+      return "thinThickThinMediumGap";
+    case "thinthicklargegap":
+      return "thinThickLargeGap";
+    case "thickthinlargegap":
+      return "thickThinLargeGap";
+    case "thinthickthinlargegap":
+      return "thinThickThinLargeGap";
     case "wave":
       return "wave";
     case "doublewave":
       return "doubleWave";
+    case "dashdotstroked":
+      return "dashDotStroked";
+    case "threedemboss":
+      return "threeDEmboss";
+    case "threedengrave":
+      return "threeDEngrave";
+    case "outset":
+      return "outset";
+    case "inset":
+      return "inset";
     case "single":
     default:
       return "single";
@@ -89646,14 +89757,21 @@ function tableNodeToBlock(node2, { nextBlockId, positions, storyKey, trackedChan
     tableStyleId: effectiveStyleId ?? undefined
   } : undefined;
   const rows = [];
+  const grid = node2.attrs?.grid;
+  const numGridCols = Array.isArray(grid) && grid.length > 0 ? grid.length : undefined;
+  let activeRowSpans = [];
   node2.content.forEach((rowNode, rowIndex) => {
+    const { placements, nextActiveRowSpans } = placeRowCellsOnGrid(rowNode, activeRowSpans);
+    activeRowSpans = nextActiveRowSpans;
     const parsedRow = parseTableRow({
       rowNode,
       rowIndex,
       numRows: node2?.content?.length ?? 1,
       context: parserDeps,
       defaultCellPadding,
-      tableProperties: tablePropertiesForCascade
+      tableProperties: tablePropertiesForCascade,
+      cellGridPlacements: placements,
+      numGridCols
     });
     if (parsedRow) {
       if (!shouldHideTrackedNode(parsedRow.attrs?.trackedChange, parserDeps.trackedChangesConfig))
@@ -99361,7 +99479,7 @@ var isRegExp = (value) => {
   return true;
 }, areAttrsEqual = (attrsA = {}, attrsB = {}) => {
   return objectIncludes(attrsA, attrsB);
-}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TrackedFormatMarkNames, TAB_POSITION_TOLERANCE_TWIPS = 20, OOXML_PCT_DIVISOR = 5000, TWIPS_PER_PX = 15, isPlainObject$3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value), OOXML_Z_INDEX_BASE = 251658240, resolveOuterShadowOffset = (shadow) => {
+}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TrackedFormatMarkNames, TAB_POSITION_TOLERANCE_TWIPS = 20, OOXML_PCT_DIVISOR = 5000, TWIPS_PER_PX = 15, PT_075 = 1, PT_150 = 2, COMPOUND_PROFILES, isPlainObject$3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value), OOXML_Z_INDEX_BASE = 251658240, resolveOuterShadowOffset = (shadow) => {
   const radians = shadow.direction * Math.PI / 180;
   return {
     dx: shadow.distance * Math.cos(radians),
@@ -117461,6 +117579,37 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
     required2.bottom = Math.max(required2.bottom, Math.max(0, childY + childHeight + paintExtent.bottom - height));
   }
   return hasEffectExtent(required2) ? required2 : undefined;
+}, resolveWrapperAlignment = (justification) => {
+  switch (justification) {
+    case "center":
+    case "distribute":
+      return "center";
+    case "right":
+    case "end":
+      return "right";
+    default:
+      return;
+  }
+}, resolveInlineAlignmentFromWrapper = (rawAttrs) => {
+  if (rawAttrs.wrap?.type !== "Inline" || !isPlainObject4(rawAttrs.wrapperParagraph))
+    return {};
+  const wrapper = rawAttrs.wrapperParagraph;
+  const justification = (isPlainObject4(wrapper.paragraphProperties) ? wrapper.paragraphProperties : undefined)?.justification;
+  const textAlign = typeof wrapper.textAlign === "string" ? wrapper.textAlign : undefined;
+  const effectiveAlignment = resolveWrapperAlignment(justification) ?? textAlign;
+  if (effectiveAlignment !== "center" && effectiveAlignment !== "right")
+    return {};
+  const metadata = { inlineParagraphAlignment: effectiveAlignment };
+  const { paragraphAttrs } = computeParagraphAttrs({
+    type: "paragraph",
+    attrs: wrapper
+  });
+  const indent2 = paragraphAttrs.indent;
+  if (typeof indent2?.left === "number")
+    metadata.paragraphIndentLeft = indent2.left;
+  if (typeof indent2?.right === "number")
+    metadata.paragraphIndentRight = indent2.right;
+  return metadata;
 }, getAttrs$1 = (node2) => {
   return isPlainObject4(node2.attrs) ? { ...node2.attrs } : {};
 }, parseFullWidth = (value) => {
@@ -117843,6 +117992,39 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
     value: measurement.value,
     type: measurement.type ?? "px"
   };
+}, placeRowCellsOnGrid = (rowNode, activeRowSpans) => {
+  const placements = [];
+  const nextActiveRowSpans = activeRowSpans.map((count) => Math.max(0, count - 1));
+  let column = 0;
+  const cellSpan = (cellNode) => {
+    const colspan = cellNode.attrs?.colspan;
+    if (typeof colspan === "number" && colspan > 0)
+      return colspan;
+    const colwidth = cellNode.attrs?.colwidth;
+    return Array.isArray(colwidth) && colwidth.length > 0 ? colwidth.length : 1;
+  };
+  for (const cellNode of Array.isArray(rowNode.content) ? rowNode.content : []) {
+    if (!isTableCellNode(cellNode)) {
+      placements.push(null);
+      continue;
+    }
+    while ((activeRowSpans[column] ?? 0) > 0)
+      column += 1;
+    const span = cellSpan(cellNode);
+    placements.push({
+      gridColumnStart: column,
+      gridColumnSpan: span
+    });
+    const rowspan = typeof cellNode.attrs?.rowspan === "number" ? cellNode.attrs.rowspan : 1;
+    if (rowspan > 1)
+      for (let covered = column;covered < column + span; covered += 1)
+        nextActiveRowSpans[covered] = Math.max(nextActiveRowSpans[covered] ?? 0, rowspan - 1);
+    column += span;
+  }
+  return {
+    placements,
+    nextActiveRowSpans
+  };
 }, isTableRowNode = (node2) => node2.type === "tableRow" || node2.type === "table_row", isTableCellNode = (node2) => node2.type === "tableCell" || node2.type === "table_cell" || node2.type === "tableHeader" || node2.type === "table_header", isTableSkipPlaceholderCell = (node2) => {
   const placeholder = node2.attrs?.__placeholder;
   return placeholder === "gridBefore" || placeholder === "gridAfter";
@@ -117885,7 +118067,12 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
     numCells,
     numRows,
     rowCnfStyle,
-    cellCnfStyle
+    cellCnfStyle,
+    ...args.gridPlacement != null && args.numGridCols != null ? {
+      gridColumnStart: args.gridPlacement.gridColumnStart,
+      gridColumnSpan: args.gridPlacement.gridColumnSpan,
+      numGridCols: args.numGridCols
+    } : {}
   } : undefined;
   const inlineTcProps = cellNode.attrs?.tableCellProperties;
   const resolvedTcProps = resolveTableCellProperties(inlineTcProps, tableInfo, context.converterContext?.translatedLinkedStyles);
@@ -118176,7 +118363,9 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
       tableProperties,
       numCells: rowNode?.content?.length || 1,
       numRows,
-      rowCnfStyle
+      rowCnfStyle,
+      gridPlacement: args.cellGridPlacements?.[cellIndex] ?? null,
+      numGridCols: args.numGridCols
     });
     if (parsedCell)
       cells.push(parsedCell);
@@ -118763,7 +118952,7 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_DRKaQwZS_es = __esm(() => {
+var init_SuperConverter_Ed3nFN54_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -123209,6 +123398,71 @@ var init_SuperConverter_DRKaQwZS_es = __esm(() => {
     "highlight",
     "link"
   ];
+  COMPOUND_PROFILES = {
+    double: (w) => [
+      w,
+      w,
+      w
+    ],
+    triple: (w) => [
+      w,
+      w,
+      w,
+      w,
+      w
+    ],
+    thinThickSmallGap: (w) => [
+      w,
+      PT_075,
+      PT_075
+    ],
+    thickThinSmallGap: (w) => [
+      PT_075,
+      PT_075,
+      w
+    ],
+    thinThickMediumGap: (w) => [
+      w,
+      w / 2,
+      w / 2
+    ],
+    thickThinMediumGap: (w) => [
+      w / 2,
+      w / 2,
+      w
+    ],
+    thinThickLargeGap: (w) => [
+      PT_150,
+      w,
+      PT_075
+    ],
+    thickThinLargeGap: (w) => [
+      PT_075,
+      w,
+      PT_150
+    ],
+    thinThickThinSmallGap: (w) => [
+      PT_075,
+      PT_075,
+      w,
+      PT_075,
+      PT_075
+    ],
+    thinThickThinMediumGap: (w) => [
+      w / 2,
+      w / 2,
+      w,
+      w / 2,
+      w / 2
+    ],
+    thinThickThinLargeGap: (w) => [
+      PT_075,
+      w,
+      PT_150,
+      w,
+      PT_075
+    ]
+  };
   SPACE_CHARS = new Set([" ", " "]);
   idlessSdtContainerKeys = /* @__PURE__ */ new WeakMap;
   DRAWING_DIAGNOSTIC_CODES = {
@@ -146034,13 +146288,28 @@ var init_SuperConverter_DRKaQwZS_es = __esm(() => {
     "single",
     "double",
     "dashed",
+    "dashSmallGap",
     "dotted",
     "thick",
     "triple",
     "dotDash",
     "dotDotDash",
+    "thinThickSmallGap",
+    "thickThinSmallGap",
+    "thinThickThinSmallGap",
+    "thinThickMediumGap",
+    "thickThinMediumGap",
+    "thinThickThinMediumGap",
+    "thinThickLargeGap",
+    "thickThinLargeGap",
+    "thinThickThinLargeGap",
     "wave",
-    "doubleWave"
+    "doubleWave",
+    "dashDotStroked",
+    "threeDEmboss",
+    "threeDEngrave",
+    "outset",
+    "inset"
   ]);
   FONT_FAMILY_FALLBACKS$1 = Object.freeze({
     swiss: "Arial, sans-serif",
@@ -147689,7 +147958,7 @@ var init_SuperConverter_DRKaQwZS_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-ChACxHAH.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-PSeH6IV5.es.js
 function parseSizeUnit(val = "0") {
   const length = val.toString() || "0";
   const value = Number.parseFloat(length);
@@ -158492,9 +158761,9 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN, PU
     }
   };
 };
-var init_create_headless_toolbar_ChACxHAH_es = __esm(() => {
+var init_create_headless_toolbar_PSeH6IV5_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_DRKaQwZS_es();
+  init_SuperConverter_Ed3nFN54_es();
   init_jszip_C49i9kUs_es();
   init_uuid_B2wVPhPi_es();
   init_constants_D9qj59G2_es();
@@ -214108,7 +214377,7 @@ var init_remark_gfm_DCND_V_3_es = __esm(() => {
   init_remark_gfm_BUJjZJLy_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-ly1ZYfUZ.es.js
+// ../../packages/superdoc/dist/chunks/src-bMRzO9Kl.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -218953,6 +219222,12 @@ function updateTableWrapper(tableWrapper, table2) {
   borderWidth = Math.ceil(Math.max(borderLeftMax, borderRightMax));
   tableWrapper.style.setProperty("--table-border-width", `${borderWidth || defaultBorderWidth}px`);
 }
+function cellWidthDxa(widthPx) {
+  return {
+    value: widthPx * 15,
+    type: "dxa"
+  };
+}
 function cloneBorders(borders, sides) {
   if (!borders || typeof borders !== "object")
     return {};
@@ -257996,6 +258271,19 @@ function countHeaderRows(block) {
       break;
   return count;
 }
+function countRepeatableHeaderRows(block) {
+  const headerCount = countHeaderRows(block);
+  if (headerCount === 0)
+    return 0;
+  let bandEnd = headerCount;
+  for (let r$1 = 0;r$1 < headerCount && r$1 < block.rows.length; r$1++)
+    for (const cell2 of block.rows[r$1]?.cells ?? []) {
+      const rowSpan = cell2.rowSpan ?? 1;
+      if (rowSpan > 1)
+        bandEnd = Math.max(bandEnd, r$1 + rowSpan);
+    }
+  return Math.min(bandEnd, block.rows.length);
+}
 function sumRowHeights(rows, fromRow, toRow) {
   let total = 0;
   for (let i3 = fromRow;i3 < toRow && i3 < rows.length; i3++)
@@ -258380,7 +258668,7 @@ function layoutTableBlock({ block, measure, columnWidth, ensurePage, advanceColu
     });
     return;
   }
-  const headerCount = countHeaderRows(block);
+  const headerCount = countRepeatableHeaderRows(block);
   const headerPrefixHeights = [0];
   for (let i3 = 0;i3 < headerCount; i3 += 1)
     headerPrefixHeights.push(headerPrefixHeights[i3] + (measure.rows[i3]?.height ?? 0));
@@ -259279,7 +259567,7 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
   const indentRight = typeof attrs?.hrIndentRight === "number" ? attrs.hrIndentRight : 0;
   const maxWidthForBlock = attrs?.isFullWidth === true && maxWidth > 0 ? Math.max(1, maxWidth - indentLeft - indentRight) : maxWidth;
   const rawWrap = attrs?.wrap;
-  const isInlineShapeGroup = block.drawingKind === "shapeGroup" && rawWrap?.type === "Inline";
+  const isInlineAlignableDrawing = (block.drawingKind === "shapeGroup" || block.drawingKind === "textboxShape") && rawWrap?.type === "Inline";
   const inlineParagraphAlignment = attrs?.inlineParagraphAlignment === "center" || attrs?.inlineParagraphAlignment === "right" ? attrs.inlineParagraphAlignment : undefined;
   if (width > maxWidthForBlock && maxWidthForBlock > 0) {
     const scale = maxWidthForBlock / width;
@@ -259298,7 +259586,7 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
     state = advanceColumn(state);
   const pmRange = extractBlockPmRange(block);
   let x = columnX(state) + marginLeft + indentLeft;
-  if (isInlineShapeGroup && inlineParagraphAlignment) {
+  if (isInlineAlignableDrawing && inlineParagraphAlignment) {
     const pIndentLeft = typeof attrs?.paragraphIndentLeft === "number" ? attrs.paragraphIndentLeft : 0;
     const pIndentRight = typeof attrs?.paragraphIndentRight === "number" ? attrs.paragraphIndentRight : 0;
     const alignBox = Math.max(0, maxWidthForBlock - pIndentLeft - pIndentRight);
@@ -263623,6 +263911,17 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
         endChar = text5.length > 0 ? text5.length : start$1 + 1;
         continue;
       }
+      if (text5.length === 0 && isAtomicLayoutRun(run2)) {
+        const atomicWidth = getAtomicRunLayoutWidth(run2);
+        if (width > 0 && width + atomicWidth > effectiveMaxWidth - WIDTH_FUDGE_PX) {
+          didBreakInThisLine = true;
+          break;
+        }
+        width += atomicWidth;
+        endRun = r$1;
+        endChar = 1;
+        continue;
+      }
       for (let c = start$1;c < text5.length; c += 1) {
         const ch = text5[c];
         if (ch === "\t") {
@@ -263711,6 +264010,7 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       endRun = startRun;
       endChar = startChar + 1;
     }
+    const lineMaxAtomicHeight = getLineMaxAtomicHeight(runs2, startRun, startChar, endRun, endChar);
     const line = {
       fromRun: startRun,
       fromChar: startChar,
@@ -263719,8 +264019,9 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       width,
       ascent: 0,
       descent: 0,
-      lineHeight: lineHeightForRuns(runs2, startRun, endRun, lastMeasuredFontSize),
-      maxWidth: effectiveMaxWidth
+      lineHeight: Math.max(lineHeightForRuns(runs2, startRun, endRun, lastMeasuredFontSize), lineMaxAtomicHeight),
+      maxWidth: effectiveMaxWidth,
+      ...lineMaxAtomicHeight > 0 ? { maxImageHeight: lineMaxAtomicHeight } : {}
     };
     lines.push(line);
     if (lineMaxTextFontSize > 0)
@@ -271172,12 +271473,14 @@ function computeAutoFitColumnWidths(input2) {
   const currentWidths = fixedLayout.columnWidths.slice(0, gridColumnCount);
   const minBounds = new Array(gridColumnCount).fill(0);
   const maxBounds = new Array(gridColumnCount).fill(0);
+  const textBounds = new Array(gridColumnCount).fill(0);
   const preferredOverrides = new Array(gridColumnCount).fill(undefined);
   const multiSpanCells = [];
   accumulateBounds({
     rows: normalizedRows,
     minBounds,
     maxBounds,
+    textBounds,
     preferredOverrides,
     multiSpanCells
   });
@@ -271200,7 +271503,26 @@ function computeAutoFitColumnWidths(input2) {
     targetTableWidth = Math.min(targetTableWidth, maxResolvedTableWidth);
   } else {
     targetTableWidth = Math.min(targetTableWidth, maxResolvedTableWidth);
-    if (!shouldPreservePreferredGrid) {
+    if (workingInput.contentSizeAutoTable === true) {
+      const columnBandAllowances = workingInput.columnBandAllowances;
+      resolvedWidths = maxBounds.map((max$2, index2) => {
+        const allowance = columnBandAllowances?.[index2] ?? 0;
+        const withAllowance = Math.max(max$2, minBounds[index2]) + allowance;
+        const textFloor = textBounds[index2] + allowance * 2;
+        return Math.max(withAllowance, textFloor);
+      });
+      for (const spanCell of multiSpanCells) {
+        const covered = resolvedWidths.slice(spanCell.startColumn, spanCell.startColumn + spanCell.span);
+        const currentTotal = sumWidths$1(covered);
+        const demand = spanCell.preferredWidth ?? spanCell.maxContentWidth;
+        if (currentTotal < demand && covered.length > 0) {
+          const topUp = (demand - currentTotal) / covered.length;
+          for (let index2 = 0;index2 < covered.length; index2++)
+            resolvedWidths[spanCell.startColumn + index2] += topUp;
+        }
+      }
+      targetTableWidth = Math.min(sumWidths$1(resolvedWidths), maxResolvedTableWidth);
+    } else if (!shouldPreservePreferredGrid) {
       resolvedWidths = redistributeTowardMaximumsWithinCurrentTable(resolvedWidths, minBounds, maxBounds);
       resolvedWidths = redistributeTowardContentWeightedShape(resolvedWidths, minBounds, maxBounds);
     }
@@ -271262,7 +271584,8 @@ function resolveAutoFitContext(input2) {
         span: cell2.span,
         preferredWidth: cell2.preferredWidth,
         minContentWidth: cell2.minContentWidth,
-        maxContentWidth: cell2.maxContentWidth
+        maxContentWidth: cell2.maxContentWidth,
+        horizontalInsets: cell2.horizontalInsets
       }))
     })),
     minColumnWidth
@@ -271295,7 +271618,8 @@ function normalizeLegacyRows(rows) {
         span,
         preferredWidth: sanitizeOptionalWidth(cell2.preferredWidth),
         minContentWidth: Math.max(0, cell2.minContentWidth ?? 0),
-        maxContentWidth: Math.max(0, cell2.maxContentWidth ?? cell2.minContentWidth ?? 0)
+        maxContentWidth: Math.max(0, cell2.maxContentWidth ?? cell2.minContentWidth ?? 0),
+        horizontalInsets: Math.max(0, cell2.horizontalInsets ?? 0)
       });
       columnIndex += span;
     }
@@ -271332,7 +271656,8 @@ function buildNormalizedRows(workingInput, rowMetrics) {
           span: Math.max(1, placedCell.span ?? metrics?.span ?? 1),
           preferredWidth: sanitizeOptionalWidth(metrics?.preferredWidth ?? placedCell.preferredWidth),
           minContentWidth: Math.max(0, metrics?.minContentWidth ?? 0),
-          maxContentWidth: Math.max(0, metrics?.maxContentWidth ?? metrics?.minContentWidth ?? 0)
+          maxContentWidth: Math.max(0, metrics?.maxContentWidth ?? metrics?.minContentWidth ?? 0),
+          horizontalInsets: Math.max(0, metrics?.horizontalInsets ?? 0)
         };
       }),
       skippedColumns: (workingRow.skippedColumns ?? []).map((skipped) => ({
@@ -271346,7 +271671,7 @@ function buildNormalizedRows(workingInput, rowMetrics) {
   });
 }
 function accumulateBounds(args$1) {
-  const { rows, minBounds, maxBounds, preferredOverrides, multiSpanCells } = args$1;
+  const { rows, minBounds, maxBounds, textBounds, preferredOverrides, multiSpanCells } = args$1;
   for (const row2 of rows) {
     for (const skipped of row2.skippedColumns) {
       minBounds[skipped.columnIndex] = Math.max(minBounds[skipped.columnIndex], skipped.minContentWidth);
@@ -271358,6 +271683,7 @@ function accumulateBounds(args$1) {
       if (cell2.span === 1) {
         minBounds[cell2.startColumn] = Math.max(minBounds[cell2.startColumn], cell2.minContentWidth);
         maxBounds[cell2.startColumn] = Math.max(maxBounds[cell2.startColumn], cell2.maxContentWidth);
+        textBounds[cell2.startColumn] = Math.max(textBounds[cell2.startColumn], Math.max(0, cell2.maxContentWidth - cell2.horizontalInsets));
         if (preferredOverrides[cell2.startColumn] == null && cell2.preferredWidth != null)
           preferredOverrides[cell2.startColumn] = cell2.preferredWidth;
       } else
@@ -271801,16 +272127,29 @@ function buildAutoFitWorkingGridInput(block, constraints) {
     layoutMode,
     preferredColumnWidths,
     preferredTableWidth,
-    gridColumnCount
+    gridColumnCount,
+    rows
   });
   const preserveExplicitAutoGrid = shouldPreserveExplicitAutoGrid({
     layoutMode,
+    tableWidth,
     preferredColumnWidths,
     preferredTableWidth,
     gridColumnCount,
     rows
   });
-  const autoGridWidthBudget = resolveAutoGridWidthBudget({
+  const contentSizeAutoTable = resolveContentSizeAutoTable({
+    layoutMode,
+    tableWidth,
+    preferredTableWidth,
+    preferredColumnWidths,
+    maxTableWidth,
+    rows,
+    preserveAutoGrid,
+    preserveExplicitAutoGrid
+  });
+  const columnBandAllowances = contentSizeAutoTable ? resolveColumnBandAllowances(block.attrs?.borders, gridColumnCount) : undefined;
+  const autoGridWidthBudget = contentSizeAutoTable ? undefined : resolveAutoGridWidthBudget({
     layoutMode,
     tableWidth,
     preferredColumnWidths,
@@ -271825,6 +272164,8 @@ function buildAutoFitWorkingGridInput(block, constraints) {
     ...preserveAutoGrid ? { preserveAutoGrid } : {},
     ...preserveExplicitAutoGrid ? { preserveExplicitAutoGrid } : {},
     ...autoGridWidthBudget != null ? { autoGridWidthBudget } : {},
+    ...contentSizeAutoTable ? { contentSizeAutoTable } : {},
+    ...columnBandAllowances ? { columnBandAllowances } : {},
     preferredTableWidth,
     preferredColumnWidths,
     gridColumnCount,
@@ -271846,19 +272187,21 @@ function shouldPreserveAuthoredGrid(args$1) {
   return approximatelyEqual(totalPreferredColumnWidth, preferredTableWidth) || isSlightlyUnderPreferredTableWidth(totalPreferredColumnWidth, preferredTableWidth);
 }
 function shouldPreserveAutoGrid(args$1) {
-  const { layoutMode, preferredColumnWidths, preferredTableWidth, gridColumnCount } = args$1;
+  const { layoutMode, preferredColumnWidths, preferredTableWidth, gridColumnCount, rows } = args$1;
   if (layoutMode !== "autofit")
     return false;
   if (preferredTableWidth != null)
     return false;
   if (preferredColumnWidths.length === 0 || preferredColumnWidths.length !== gridColumnCount)
     return false;
+  if (preferredColumnWidths.length === 1 && !hasConcreteCellWidthRequest(rows))
+    return false;
   if (!hasNonUniformGrid(preferredColumnWidths))
     return false;
   return true;
 }
 function shouldPreserveExplicitAutoGrid(args$1) {
-  const { layoutMode, preferredColumnWidths, preferredTableWidth, gridColumnCount, rows } = args$1;
+  const { layoutMode, tableWidth, preferredColumnWidths, preferredTableWidth, gridColumnCount, rows } = args$1;
   if (layoutMode !== "autofit")
     return false;
   if (preferredTableWidth == null || preferredTableWidth <= 0)
@@ -271867,8 +272210,52 @@ function shouldPreserveExplicitAutoGrid(args$1) {
     return false;
   if (!hasNonUniformGrid(preferredColumnWidths) && !hasConcreteCellWidthRequest(rows))
     return false;
+  if (isPercentTableWidth(tableWidth))
+    return true;
   return approximatelyEqual(sumWidths(preferredColumnWidths), preferredTableWidth);
 }
+function isPercentTableWidth(tableWidth) {
+  return typeof tableWidth === "object" && tableWidth != null && typeof tableWidth.type === "string" && tableWidth.type.toLowerCase() === "pct";
+}
+function resolveContentSizeAutoTable(args$1) {
+  const { layoutMode, tableWidth, preferredTableWidth, preferredColumnWidths, maxTableWidth, rows, preserveAutoGrid, preserveExplicitAutoGrid } = args$1;
+  if (layoutMode !== "autofit")
+    return false;
+  if (preferredTableWidth != null)
+    return false;
+  if (preserveAutoGrid || preserveExplicitAutoGrid)
+    return false;
+  if (!isAutoOrNilTableWidth(tableWidth))
+    return false;
+  if (hasConcreteCellWidthRequest(rows))
+    return false;
+  if (sumWidths(preferredColumnWidths) > maxTableWidth + 0.5)
+    return false;
+  return true;
+}
+function isAutoOrNilTableWidth(tableWidth) {
+  if (tableWidth == null)
+    return true;
+  if (hasAutoTableWidthSemantics(tableWidth))
+    return true;
+  if (typeof tableWidth === "object" && typeof tableWidth.type === "string")
+    return tableWidth.type.toLowerCase() === "nil";
+  return false;
+}
+function resolveColumnBandAllowances(borders, gridColumnCount) {
+  if (gridColumnCount <= 0)
+    return;
+  const left$1 = getBorderBandWidthPx(borders?.left);
+  const insideV = getBorderBandWidthPx(borders?.insideV);
+  const right$1 = getBorderBandWidthPx(borders?.right);
+  const allowances = [];
+  for (let i3 = 0;i3 < gridColumnCount; i3++) {
+    const edgeLeft = i3 === 0 ? left$1 : insideV;
+    const edgeRight = i3 === gridColumnCount - 1 ? right$1 : insideV;
+    allowances.push((edgeLeft + edgeRight) / 2);
+  }
+  return allowances.some((a2) => a2 > 0) ? allowances : undefined;
+}
 function resolveAutoGridWidthBudget(args$1) {
   const { layoutMode, tableWidth, preferredColumnWidths, preferredTableWidth, gridColumnCount, maxTableWidth } = args$1;
   if (layoutMode !== "autofit")
@@ -272169,7 +272556,8 @@ async function measureTableCellContentMetrics(cell2, options) {
   if (contentBlocks.length === 0) {
     const emptyMetrics = {
       minWidthPx: horizontalInsets,
-      maxWidthPx: horizontalInsets
+      maxWidthPx: horizontalInsets,
+      horizontalInsetsPx: horizontalInsets
     };
     tableCellMetricsCache.set(cacheKey, emptyMetrics);
     return emptyMetrics;
@@ -272183,7 +272571,8 @@ async function measureTableCellContentMetrics(cell2, options) {
   }
   const result = {
     minWidthPx: minContentWidthPx + horizontalInsets,
-    maxWidthPx: maxContentWidthPx + horizontalInsets
+    maxWidthPx: maxContentWidthPx + horizontalInsets,
+    horizontalInsetsPx: horizontalInsets
   };
   tableCellMetricsCache.set(cacheKey, result);
   return result;
@@ -272213,7 +272602,8 @@ async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayo
           span,
           preferredWidth: normalizedCell?.preferredWidth,
           minContentWidth: metrics.minWidthPx,
-          maxContentWidth: metrics.maxWidthPx
+          maxContentWidth: metrics.maxWidthPx,
+          horizontalInsets: metrics.horizontalInsetsPx
         };
       }))
     };
@@ -272228,7 +272618,8 @@ async function measureTableAutoFitContentMetrics(table2, workingInput, fixedLayo
           span: cellMetrics.span,
           preferredWidth: cellMetrics.preferredWidth,
           minContentWidth: cellMetrics.minContentWidth,
-          maxContentWidth: cellMetrics.maxContentWidth
+          maxContentWidth: cellMetrics.maxContentWidth,
+          horizontalInsets: cellMetrics.horizontalInsets
         })),
         skippedAfter: normalizedRow.skippedAfter ?? []
       };
@@ -272432,14 +272823,14 @@ function capitalizeText$1(text5, fullText, startOffset) {
   return result;
 }
 function measureFieldAnnotationWidth(run2, fontContext) {
-  const fontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1 : DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1;
+  const fontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
   const font = buildFontString$1({
     fontFamily: normalizeFontFamily$1(run2.fontFamily ?? "Arial"),
     fontSize,
     bold: run2.bold,
     italic: run2.italic
   }, fontContext);
-  return getMeasuredTextWidth(applyTextTransform$1(run2.displayLabel || "", { text: run2.displayLabel || "" }), font, 0, getCanvasContext$1()) + (run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING$1);
+  return getMeasuredTextWidth(applyTextTransform$1(run2.displayLabel || "", { text: run2.displayLabel || "" }), font, 0, getCanvasContext$1()) + (run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING);
 }
 function isExplicitLineBreakRun(run2) {
   return run2.kind === "lineBreak" || run2.kind === "break" && run2.breakType === "line";
@@ -272480,18 +272871,7 @@ function clearTextMeasurementCaches() {
   canvasContext = null;
 }
 function getTableBorderWidthPx(value) {
-  if (value == null)
-    return 0;
-  if (typeof value === "object" && "none" in value && value.none)
-    return 0;
-  const raw = value;
-  const w = typeof raw.width === "number" ? raw.width : typeof raw.size === "number" ? raw.size : 1;
-  const width = Math.max(0, w);
-  if (raw.style === "none")
-    return 0;
-  if (raw.style === "thick")
-    return Math.max(width * 2, 3);
-  return width;
+  return getBorderBandWidthPx(value);
 }
 function getTableBorderWidths(borders) {
   return {
@@ -272625,6 +273005,15 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
     endRunIndex: runs2.length
   };
   let foundDecimal = false;
+  const measureAtomicText$1 = (text5, atomicRun, fontSize) => {
+    const { font } = buildFontString({
+      fontFamily: atomicRun.fontFamily ?? "Arial",
+      fontSize,
+      bold: atomicRun.bold,
+      italic: atomicRun.italic
+    }, fontContext);
+    return measureRunWidth(text5, font, ctx$1, atomicRun, 0);
+  };
   for (let i3 = startRunIndex;i3 < runs2.length; i3++) {
     const run2 = runs2[i3];
     if (isTabRun(run2)) {
@@ -272666,40 +273055,13 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
         });
       continue;
     }
-    if (isImageRun(run2)) {
-      const leftSpace = run2.distLeft ?? 0;
-      const rightSpace = run2.distRight ?? 0;
-      const imageWidth = run2.width + leftSpace + rightSpace;
+    if (isImageRun(run2) || run2.kind === "math" || isFieldAnnotationRun(run2)) {
+      const { width } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       result.runs.push({
         runIndex: i3,
-        width: imageWidth
-      });
-      result.totalWidth += imageWidth;
-      continue;
-    }
-    if (run2.kind === "math") {
-      const mathWidth = run2.width ?? 20;
-      result.runs.push({
-        runIndex: i3,
-        width: mathWidth
-      });
-      result.totalWidth += mathWidth;
-      continue;
-    }
-    if (isFieldAnnotationRun(run2)) {
-      const fontSize = run2.fontSize ?? DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
-      const { font } = buildFontString({
-        fontFamily: run2.fontFamily ?? "Arial",
-        fontSize,
-        bold: run2.bold,
-        italic: run2.italic
-      }, fontContext);
-      const pillWidth = (run2.displayLabel ? measureRunWidth(run2.displayLabel, font, ctx$1, run2, 0) : 0) + FIELD_ANNOTATION_PILL_PADDING;
-      result.runs.push({
-        runIndex: i3,
-        width: pillWidth
+        width
       });
-      result.totalWidth += pillWidth;
+      result.totalWidth += width;
       continue;
     }
     result.runs.push({
@@ -272729,6 +273091,13 @@ async function measureBlock(block, constraints, fontContext = DEFAULT_FONT_MEASU
 }
 async function measureParagraphBlock(block, maxWidth, fontContext) {
   const ctx$1 = getCanvasContext();
+  const measureAtomicText$1 = (text5, run2, fontSize) => {
+    const family2 = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif", faceOf(run2));
+    const weight = run2.bold ? "bold" : "normal";
+    ctx$1.font = `${run2.italic ? "italic" : "normal"} ${weight} ${fontSize}px ${family2}`;
+    const displayText = applyTextTransform(text5, run2);
+    return displayText ? ctx$1.measureText(displayText).width : 0;
+  };
   const wordLayout = block.attrs?.wordLayout;
   const firstTextRunWithSize = block.runs.find((run2) => isTextRun$22(run2) && ("fontSize" in run2) && run2.fontSize != null);
   const fallbackFontSize = normalizeFontSize2((firstTextRunWithSize ?? block.runs.find((run2) => typeof run2.fontSize === "number" && run2.fontSize > 0))?.fontSize, DEFAULT_PARAGRAPH_FONT_SIZE);
@@ -273258,12 +273627,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     if (isImageRun(run2)) {
-      const leftSpace = run2.distLeft ?? 0;
-      const rightSpace = run2.distRight ?? 0;
-      const imageWidth = run2.width + leftSpace + rightSpace;
-      const topSpace = run2.distTop ?? 0;
-      const bottomSpace = run2.distBottom ?? 0;
-      const imageHeight = run2.height + topSpace + bottomSpace;
+      const { width: imageWidth, height: imageHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       let imageStartX;
       if (activeTabGroup && currentLine) {
         imageStartX = activeTabGroup.currentX;
@@ -273354,9 +273718,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     if (run2.kind === "math") {
-      const mathRun = run2;
-      const mathWidth = mathRun.width ?? 20;
-      const mathHeight = mathRun.height ?? 24;
+      const { width: mathWidth, height: mathHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       if (!currentLine)
         currentLine = {
           fromRun: runIndex,
@@ -273393,26 +273755,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     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", 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;
-      const annotationHorizontalPadding = run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING;
-      const annotationVerticalPadding = run2.highlighted === false ? 0 : FIELD_ANNOTATION_VERTICAL_PADDING;
-      const annotationWidth = textWidth + annotationHorizontalPadding;
-      let annotationHeight = annotationFontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + annotationVerticalPadding;
-      if (run2.variant === "signature" && run2.imageSrc) {
-        const signatureHeight = 28 + annotationVerticalPadding;
-        annotationHeight = Math.max(annotationHeight, signatureHeight);
-      }
-      if (run2.variant === "image" && run2.imageSrc && run2.size?.height) {
-        const imageHeight = run2.size.height + annotationVerticalPadding;
-        annotationHeight = Math.max(annotationHeight, imageHeight);
-      }
-      if (run2.variant === "html" && run2.size?.height)
-        annotationHeight = Math.max(annotationHeight, run2.size.height);
+      const { width: annotationWidth, height: annotationHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       let annotationStartX;
       if (pendingTabAlignment && currentLine)
         annotationStartX = alignPendingTabForWidth(annotationWidth);
@@ -274229,12 +274572,17 @@ async function measureTableBlock(block, constraints, fontContext) {
       });
       if (rowspan === 1)
         rowBaseHeights[rowIndex] = Math.max(rowBaseHeights[rowIndex], totalCellHeight);
-      else
+      else {
+        const firstBlockMeasure = blockMeasures[0];
+        const firstLineHeight = firstBlockMeasure?.kind === "paragraph" && firstBlockMeasure.lines.length > 0 ? firstBlockMeasure.lines[0].lineHeight : undefined;
+        const minRowHeight = Math.min(totalCellHeight, firstLineHeight != null ? firstLineHeight + paddingTop + paddingBottom : totalCellHeight / rowspan);
         spanConstraints.push({
           startRow: rowIndex,
           rowSpan: rowspan,
-          requiredHeight: totalCellHeight
+          requiredHeight: totalCellHeight,
+          minRowHeight
         });
+      }
       gridColIndex += colspan;
     }
     for (let col = gridColIndex;col < gridColumnCount; col++)
@@ -274246,6 +274594,12 @@ async function measureTableBlock(block, constraints, fontContext) {
     });
   }
   const rowHeights = [...rowBaseHeights];
+  for (const constraint of spanConstraints) {
+    const spanLength = Math.min(constraint.rowSpan, rowHeights.length - constraint.startRow);
+    for (let i3 = 0;i3 < spanLength; i3++)
+      if (rowBaseHeights[constraint.startRow + i3] === 0)
+        rowHeights[constraint.startRow + i3] = Math.max(rowHeights[constraint.startRow + i3], constraint.minRowHeight);
+  }
   for (const constraint of spanConstraints) {
     const { startRow, rowSpan, requiredHeight } = constraint;
     if (rowSpan <= 0)
@@ -274260,6 +274614,34 @@ async function measureTableBlock(block, constraints, fontContext) {
         rowHeights[startRow + i3] += increment2;
     }
   }
+  if ((block.attrs?.borderCollapse ?? (block.attrs?.cellSpacing != null ? "separate" : "collapse")) !== "separate" && block.rows.length > 0) {
+    const tableBordersForBands = block.attrs?.borders;
+    const bandReservation = (band) => band > 2 ? band - 1 : 0;
+    const gridlineBand = (gridline) => {
+      let band = 0;
+      const rowAbove = gridline > 0 ? block.rows[gridline - 1] : undefined;
+      const rowBelow = gridline < block.rows.length ? block.rows[gridline] : undefined;
+      for (const row2 of [rowAbove, rowBelow]) {
+        if (!row2)
+          continue;
+        const override = row2.attrs?.borders;
+        const eff = override ? {
+          ...tableBordersForBands ?? {},
+          ...override
+        } : tableBordersForBands;
+        const value = gridline === 0 ? eff?.top : gridline === block.rows.length ? eff?.bottom : eff?.insideH;
+        band = Math.max(band, getBorderBandWidthPx(value));
+      }
+      for (const cell2 of rowAbove?.cells ?? [])
+        band = Math.max(band, getBorderBandWidthPx(cell2.attrs?.borders?.bottom));
+      for (const cell2 of rowBelow?.cells ?? [])
+        band = Math.max(band, getBorderBandWidthPx(cell2.attrs?.borders?.top));
+      return band;
+    };
+    for (let i3 = 0;i3 < block.rows.length; i3++)
+      rowHeights[i3] += bandReservation(gridlineBand(i3));
+    rowHeights[block.rows.length - 1] += bandReservation(gridlineBand(block.rows.length));
+  }
   block.rows.forEach((row2, index2) => {
     const spec = row2.attrs?.rowHeight;
     if (spec?.value != null && Number.isFinite(spec.value))
@@ -281907,7 +282289,10 @@ var Node$13 = class Node$14 {
   const headerCells = [];
   const cells = [];
   for (let index2 = 0;index2 < colsCount; index2++) {
-    const cellAttrs = columnWidths ? { colwidth: [columnWidths[index2]] } : null;
+    const cellAttrs = columnWidths ? {
+      colwidth: [columnWidths[index2]],
+      tableCellProperties: { cellWidth: cellWidthDxa(columnWidths[index2]) }
+    } : null;
     const cell2 = createCell2(types2.tableCell, cellContent, cellAttrs);
     if (cell2)
       cells.push(cell2);
@@ -297216,15 +297601,30 @@ menclose::after {
     single: "solid",
     double: "double",
     dashed: "dashed",
+    dashSmallGap: "dashed",
     dotted: "dotted",
     thick: "solid",
     triple: "solid",
     dotDash: "dashed",
     dotDotDash: "dashed",
+    thinThickSmallGap: "solid",
+    thickThinSmallGap: "solid",
+    thinThickThinSmallGap: "solid",
+    thinThickMediumGap: "solid",
+    thickThinMediumGap: "solid",
+    thinThickThinMediumGap: "solid",
+    thinThickLargeGap: "solid",
+    thickThinLargeGap: "solid",
+    thinThickThinLargeGap: "solid",
     wave: "solid",
-    doubleWave: "solid"
+    doubleWave: "solid",
+    dashDotStroked: "dashed",
+    threeDEmboss: "ridge",
+    threeDEngrave: "groove",
+    outset: "solid",
+    inset: "solid"
   }[style2];
-}, isValidHexColor2 = (color2) => /^#[0-9A-Fa-f]{6}$/.test(color2), applyBorder = (element3, side, border) => {
+}, isValidHexColor2 = (color2) => /^#[0-9A-Fa-f]{6}$/.test(color2), applyBorder = (element3, side, border, widthOverridePx) => {
   if (!border)
     return;
   if (border.style === "none" || border.width === 0) {
@@ -297232,18 +297632,40 @@ menclose::after {
     return;
   }
   const style2 = borderStyleToCSS(border.style);
-  const width = border.width ?? 1;
   const color2 = border.color ?? "#000000";
   const safeColor = isValidHexColor2(color2) ? color2 : "#000000";
-  const actualWidth = border.style === "thick" ? Math.max(width * 2, 3) : width;
+  const actualWidth = widthOverridePx ?? getBorderBandWidthPx(border);
   element3.style[`border${side}`] = `${actualWidth}px ${style2} ${safeColor}`;
-}, applyCellBorders = (element3, borders) => {
+}, applyCellBorders = (element3, borders, widthOverridesPx) => {
   if (!borders)
     return;
   applyBorder(element3, "Top", borders.top);
-  applyBorder(element3, "Right", borders.right);
+  applyBorder(element3, "Right", borders.right, widthOverridesPx?.right);
   applyBorder(element3, "Bottom", borders.bottom);
-  applyBorder(element3, "Left", borders.left);
+  applyBorder(element3, "Left", borders.left, widthOverridesPx?.left);
+}, BEVEL_LIGHT_AUTO = "#F0F0F0", BEVEL_DARK_AUTO = "#A0A0A0", bevelDarkColor = (color2) => {
+  if (!color2 || !/^#[0-9A-Fa-f]{6}$/.test(color2) || color2.toLowerCase() === "#000000")
+    return BEVEL_DARK_AUTO;
+  const half = (i3) => Math.floor(parseInt(color2.slice(i3, i3 + 2), 16) / 2);
+  return `#${[
+    1,
+    3,
+    5
+  ].map((i3) => half(i3).toString(16).padStart(2, "0")).join("")}`;
+}, bevelLightColor = (color2) => {
+  if (!color2 || !/^#[0-9A-Fa-f]{6}$/.test(color2) || color2.toLowerCase() === "#000000")
+    return BEVEL_LIGHT_AUTO;
+  return color2;
+}, bevelToneSpec = (spec, visualSide, owner) => {
+  if (!spec || spec.style !== "outset" && spec.style !== "inset")
+    return spec;
+  const raisedSide = visualSide === "top" || visualSide === "left";
+  const light = spec.style === "outset" === (owner === "table") === raisedSide;
+  return {
+    ...spec,
+    style: "single",
+    color: light ? bevelLightColor(spec.color) : bevelDarkColor(spec.color)
+  };
 }, borderValueToSpec = (value) => {
   if (!value)
     return;
@@ -297326,7 +297748,7 @@ menclose::after {
     left: borders.right,
     right: borders.left
   };
-}, getFiniteNumber = (value) => {
+}, FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER = 1.2, getFiniteNumber = (value) => {
   if (typeof value !== "number" || !Number.isFinite(value))
     return;
   return value;
@@ -298352,7 +298774,7 @@ menclose::after {
     hasSdtContainerChrome
   };
 }, renderTableCell = (deps) => {
-  const { doc: doc$12, x, y: y$1, rowHeight, cellMeasure, cell: cell2, borders, useDefaultBorder, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, context, applySdtDataset: applySdtDataset$1, chrome: chrome2, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, tableIndent, isRtl, cellWidth, fromLine, toLine, resolvePhysical } = deps;
+  const { doc: doc$12, x, y: y$1, rowHeight, cellMeasure, cell: cell2, borders, useDefaultBorder, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, context, applySdtDataset: applySdtDataset$1, chrome: chrome2, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, tableIndent, isRtl, cellWidth, fromLine, toLine, resolvePhysical, borderBandOverridesPx } = deps;
   const padding = cell2?.attrs?.padding || {
     top: 0,
     left: 4,
@@ -298360,9 +298782,16 @@ menclose::after {
     bottom: 0
   };
   const buildTableImageHyperlinkAnchor = (imageEl, hyperlink, display) => buildImageHyperlinkAnchor(doc$12, imageEl, hyperlink, display);
-  const paddingLeft = isRtl ? padding.right ?? 4 : padding.left ?? 4;
+  const compoundBandEats = (border, bandInCellPx) => {
+    const profile = border ? getBorderBandProfile(border) : null;
+    if (!profile)
+      return 0;
+    const bandInCell = bandInCellPx ?? profile.band;
+    return Math.max(0, bandInCell - profile.band / 2);
+  };
+  const paddingLeft = Math.max(0, (isRtl ? padding.right ?? 4 : padding.left ?? 4) - compoundBandEats(borders?.left, borderBandOverridesPx?.left));
   const paddingTop = padding.top ?? 0;
-  const paddingRight = isRtl ? padding.left ?? 4 : padding.right ?? 4;
+  const paddingRight = Math.max(0, (isRtl ? padding.left ?? 4 : padding.right ?? 4) - compoundBandEats(borders?.right, borderBandOverridesPx?.right));
   const paddingBottom = padding.bottom ?? 0;
   const cellEl = doc$12.createElement("div");
   cellEl.style.position = "absolute";
@@ -298377,7 +298806,7 @@ menclose::after {
   cellEl.style.paddingRight = `${paddingRight}px`;
   cellEl.style.paddingBottom = `${paddingBottom}px`;
   if (borders)
-    applyCellBorders(cellEl, borders);
+    applyCellBorders(cellEl, borders, borderBandOverridesPx);
   else if (useDefaultBorder)
     cellEl.style.border = "1px solid rgba(0,0,0,0.6)";
   if (cell2?.attrs?.background)
@@ -298851,16 +299280,25 @@ menclose::after {
     elem.dataset.trackChangeAuthorColor = meta4.color;
   if (meta4.date)
     elem.dataset.trackChangeDate = meta4.date;
-}, 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 }) => {
+}, hasAnyResolvedBorder = (borders) => Boolean(borders.top || borders.right || borders.bottom || borders.left), resolveRenderedCellBorders = ({ cellBorders, hasBordersAttribute, tableBorders, cellPosition, cellSpacingPx, continuesFromPrev, continuesOnNext, aboveCellBorders, leftCellBorders, rightCellBorders, separateBorders, 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);
+  const touchesBottomBoundary = cellBounds.touchesBottomEdge || continuesOnNext;
+  const hasInteriorNeighborBorder = !touchesTopBoundary && isPresentBorder(aboveCellBorders?.bottom) || !cellBounds.touchesLeftEdge && isPresentBorder(leftCellBorders?.right);
+  if (separateBorders && cellSpacingPx === 0) {
+    const cb = cellBorders ?? {};
+    return {
+      top: resolveTableBorderValue(cb.top, touchesTopBoundary ? tableBorders?.top : tableBorders?.insideH),
+      right: resolveTableBorderValue(cb.right, cellBounds.touchesRightEdge ? tableBorders?.right : tableBorders?.insideV),
+      bottom: resolveTableBorderValue(cb.bottom, touchesBottomBoundary ? tableBorders?.bottom : tableBorders?.insideH),
+      left: resolveTableBorderValue(cb.left, cellBounds.touchesLeftEdge ? tableBorders?.left : tableBorders?.insideV)
+    };
+  }
   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)),
+      top: touchesTopBoundary ? resolveTableBorderValue(cb.top, tableBorders?.top) : 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
@@ -298900,8 +299338,102 @@ menclose::after {
     bottom: touchesBottomBoundary ? borderValueToSpec(tableBorders.bottom) : interiorBottom,
     left: baseBorders.left
   };
+}, appendCompoundBorderRects = (doc$12, container, cellElement, borders, rect, edges) => {
+  if (!borders)
+    return;
+  const { ownsBottomBand, rightIsBoundary, leftIsBoundary, suppressMid } = edges;
+  const sideInfo = [
+    "top",
+    "right",
+    "bottom",
+    "left"
+  ].map((side) => {
+    const spec = borders[side];
+    const profile = spec ? getBorderBandProfile(spec) : null;
+    if (!spec || !profile)
+      return null;
+    if (isNativeCssDoubleStyle(spec.style)) {
+      if (side === "top" || side === "bottom" && ownsBottomBand || side === "left" && leftIsBoundary || side === "right" && rightIsBoundary)
+        return null;
+    }
+    const { segments } = profile;
+    return {
+      side,
+      band: Math.max(1, Math.round(profile.band)),
+      outerRule: Math.max(1, Math.round(segments[0])),
+      innerRule: Math.max(1, Math.round(segments[segments.length - 1])),
+      midRule: segments.length === 5 ? Math.max(1, Math.round(segments[2])) : 0,
+      midOffset: segments.length === 5 ? Math.round(segments[0] + segments[1]) : 0,
+      color: spec.color && /^#[0-9A-Fa-f]{6}$/.test(spec.color) ? spec.color : "#000000"
+    };
+  });
+  if (!sideInfo.some(Boolean))
+    return;
+  const x0$1 = Math.round(rect.x);
+  const y0 = Math.round(rect.y);
+  const x1 = Math.round(rect.x + rect.width);
+  const y1 = Math.round(rect.y + rect.height);
+  for (const info of sideInfo) {
+    if (!info)
+      continue;
+    const cssSide = info.side[0].toUpperCase() + info.side.slice(1);
+    cellElement.style[`border${cssSide}Color`] = "transparent";
+  }
+  const [top$1, right$1, bottom$1, left$1] = sideInfo;
+  const rectEl = doc$12.createElement("div");
+  rectEl.className = "superdoc-compound-border-rect";
+  const st = rectEl.style;
+  st.position = "absolute";
+  st.boxSizing = "border-box";
+  st.pointerEvents = "none";
+  const topInset = top$1 ? top$1.band - top$1.innerRule : 0;
+  const leftInset = left$1 ? leftIsBoundary ? left$1.band - left$1.innerRule : Math.round(left$1.band / 2) - left$1.innerRule : 0;
+  const bottomInset = bottom$1 ? ownsBottomBand ? bottom$1.band - bottom$1.innerRule : Math.round(bottom$1.band / 2) - bottom$1.outerRule : 0;
+  const rightInset = right$1 ? rightIsBoundary ? right$1.band - right$1.innerRule : Math.round(right$1.band / 2) - right$1.outerRule : 0;
+  st.left = `${x0$1 + leftInset}px`;
+  st.top = `${y0 + topInset}px`;
+  st.width = `${x1 - x0$1 - leftInset - rightInset}px`;
+  st.height = `${y1 - y0 - topInset - bottomInset}px`;
+  if (top$1)
+    st.borderTop = `${top$1.innerRule}px solid ${top$1.color}`;
+  if (bottom$1)
+    st.borderBottom = `${ownsBottomBand ? bottom$1.innerRule : bottom$1.outerRule}px solid ${bottom$1.color}`;
+  if (left$1)
+    st.borderLeft = `${left$1.innerRule}px solid ${left$1.color}`;
+  if (right$1)
+    st.borderRight = `${rightIsBoundary ? right$1.innerRule : right$1.outerRule}px solid ${right$1.color}`;
+  container.appendChild(rectEl);
+  const midTop = top$1 && top$1.midRule > 0 && !suppressMid?.top ? top$1 : null;
+  const midLeft = left$1 && left$1.midRule > 0 && !suppressMid?.left ? left$1 : null;
+  const midBottom = bottom$1 && bottom$1.midRule > 0 && ownsBottomBand && !suppressMid?.bottom ? bottom$1 : null;
+  const midRight = right$1 && right$1.midRule > 0 && rightIsBoundary && !suppressMid?.right ? right$1 : null;
+  if (midTop || midLeft || midBottom || midRight) {
+    const mid = doc$12.createElement("div");
+    mid.className = "superdoc-compound-border-mid";
+    const ms = mid.style;
+    ms.position = "absolute";
+    ms.boxSizing = "border-box";
+    ms.pointerEvents = "none";
+    const tIn = midTop ? midTop.midOffset : 0;
+    const lIn = midLeft ? midLeft.midOffset : 0;
+    const bIn = midBottom ? midBottom.midOffset : 0;
+    const rIn = midRight ? midRight.midOffset : 0;
+    ms.left = `${x0$1 + lIn}px`;
+    ms.top = `${y0 + tIn}px`;
+    ms.width = `${x1 - x0$1 - lIn - rIn}px`;
+    ms.height = `${y1 - y0 - tIn - bIn}px`;
+    if (midTop)
+      ms.borderTop = `${midTop.midRule}px solid ${midTop.color}`;
+    if (midBottom)
+      ms.borderBottom = `${midBottom.midRule}px solid ${midBottom.color}`;
+    if (midLeft)
+      ms.borderLeft = `${midLeft.midRule}px solid ${midLeft.color}`;
+    if (midRight)
+      ms.borderRight = `${midRight.midRule}px solid ${midRight.color}`;
+    container.appendChild(mid);
+  }
 }, renderTableRow = (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 { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, prevRow, prevRowMeasure, nextRow, rowOccupiedRightCol, separateBorders, 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 rowTrackedChange = row2?.attrs?.trackedChange;
   let rowTrackedChangeConfig;
@@ -298965,17 +299497,6 @@ menclose::after {
         return cells[i3]?.attrs?.borders;
     }
   };
-  const findCellRightEdgeAtColumn = (measureCells, gridCol) => {
-    if (!measureCells)
-      return;
-    for (let i3 = 0;i3 < measureCells.length; i3++) {
-      const start$1 = measureCells[i3].gridColumnStart ?? i3;
-      const span = measureCells[i3].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];
@@ -298996,8 +299517,6 @@ menclose::after {
     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,
@@ -299009,11 +299528,16 @@ menclose::after {
       aboveCellBorders,
       leftCellBorders,
       rightCellBorders,
-      nextRowLeavesRightGap,
-      deferTopToAboveCell: aboveCellRightEdge !== undefined && aboveCellRightEdge > rowRightEdgeCol,
+      separateBorders,
       nextRowSuppressesSharedTop
     });
     const finalBorders = isRtl && resolvedBorders ? swapCellBordersLR(resolvedBorders) : resolvedBorders;
+    const tonedBorders = separateBorders && finalBorders ? {
+      top: bevelToneSpec(finalBorders.top, "top", "cell"),
+      right: bevelToneSpec(finalBorders.right, "right", "cell"),
+      bottom: bevelToneSpec(finalBorders.bottom, "bottom", "cell"),
+      left: bevelToneSpec(finalBorders.left, "left", "cell")
+    } : finalBorders;
     let cellHeight;
     if (partialRow)
       cellHeight = partialRow.partialHeight;
@@ -299026,6 +299550,34 @@ menclose::after {
     const computedCellWidth = calculateColspanWidth(gridColumnStart, colSpan);
     if (isRtl && computedCellWidth > 0)
       x = tableContentWidth - x - computedCellWidth;
+    const cellGridBounds = getTableCellGridBounds(cellPosition);
+    const cellIsIntentionallyBorderless = hasBordersAttribute && !hasExplicitCellBorders(cellBordersAttr);
+    const cb = cellBordersAttr ?? {};
+    const effectiveSideSpecs = cellIsIntentionallyBorderless ? {} : {
+      top: cellGridBounds.touchesTopEdge || continuesFromPrev === true ? resolveTableBorderValue(cb.top, effectiveTableBorders?.top) : resolveBorderConflict(cb.top, aboveCellBorders?.bottom) ?? borderValueToSpec(effectiveTableBorders?.insideH),
+      bottom: cellGridBounds.touchesBottomEdge || continuesOnNext === true ? resolveTableBorderValue(cb.bottom, effectiveTableBorders?.bottom) : resolveBorderConflict(cb.bottom, undefined) ?? borderValueToSpec(effectiveTableBorders?.insideH),
+      left: cellGridBounds.touchesLeftEdge ? resolveTableBorderValue(cb.left, effectiveTableBorders?.left) : resolveBorderConflict(cb.left, leftCellBorders?.right) ?? borderValueToSpec(effectiveTableBorders?.insideV),
+      right: cellGridBounds.touchesRightEdge ? resolveTableBorderValue(cb.right, effectiveTableBorders?.right) : resolveBorderConflict(cb.right, rightCellBorders?.left) ?? borderValueToSpec(effectiveTableBorders?.insideV)
+    };
+    const rectBorders = (isRtl ? swapCellBordersLR(effectiveSideSpecs) : effectiveSideSpecs) ?? effectiveSideSpecs;
+    const visualTouchesLeft = isRtl ? cellGridBounds.touchesRightEdge : cellGridBounds.touchesLeftEdge;
+    const visualTouchesRight = isRtl ? cellGridBounds.touchesLeftEdge : cellGridBounds.touchesRightEdge;
+    const leftStraddleProfile = !visualTouchesLeft && rectBorders.left ? getBorderBandProfile(rectBorders.left) : null;
+    const rightStraddleProfile = !visualTouchesRight && rectBorders.right ? getBorderBandProfile(rectBorders.right) : null;
+    let paintBorders = tonedBorders;
+    let borderBandOverridesPx;
+    if (leftStraddleProfile || rightStraddleProfile) {
+      paintBorders = { ...tonedBorders ?? {} };
+      borderBandOverridesPx = {};
+      if (leftStraddleProfile) {
+        paintBorders.left = rectBorders.left;
+        borderBandOverridesPx.left = leftStraddleProfile.band / 2;
+      }
+      if (rightStraddleProfile) {
+        paintBorders.right = rectBorders.right;
+        borderBandOverridesPx.right = rightStraddleProfile.band / 2;
+      }
+    }
     const { cellElement } = renderTableCell({
       doc: doc$12,
       x,
@@ -299033,7 +299585,8 @@ menclose::after {
       rowHeight: cellHeight,
       cellMeasure,
       cell: cell2,
-      borders: finalBorders,
+      borders: paintBorders,
+      borderBandOverridesPx,
       useDefaultBorder: false,
       renderLine: renderLine$1,
       captureLineSnapshot,
@@ -299056,7 +299609,68 @@ menclose::after {
     if (rowTrackedChange && rowTrackedChangeConfig)
       applyRowTrackedChangeToCell(cellElement, rowTrackedChange, rowTrackedChangeConfig);
     container.appendChild(cellElement);
+    const tableProvidesMid = (value) => {
+      const profile = value != null && typeof value === "object" ? getBorderBandProfile(value) : null;
+      return profile != null && profile.segments.length === 5;
+    };
+    const suppressMid = {
+      top: tableProvidesMid(cellGridBounds.touchesTopEdge || continuesFromPrev === true ? effectiveTableBorders?.top : effectiveTableBorders?.insideH),
+      bottom: tableProvidesMid(cellGridBounds.touchesBottomEdge || continuesOnNext === true ? effectiveTableBorders?.bottom : effectiveTableBorders?.insideH),
+      left: tableProvidesMid(visualTouchesLeft ? isRtl ? effectiveTableBorders?.right : effectiveTableBorders?.left : effectiveTableBorders?.insideV),
+      right: tableProvidesMid(visualTouchesRight ? isRtl ? effectiveTableBorders?.left : effectiveTableBorders?.right : effectiveTableBorders?.insideV)
+    };
+    appendCompoundBorderRects(doc$12, container, cellElement, rectBorders, {
+      x,
+      y: y$1,
+      width: computedCellWidth > 0 ? computedCellWidth : cellMeasure.width ?? 0,
+      height: cellHeight
+    }, {
+      ownsBottomBand: cellGridBounds.touchesBottomEdge || continuesOnNext === true,
+      rightIsBoundary: visualTouchesRight,
+      leftIsBoundary: visualTouchesLeft,
+      suppressMid
+    });
+  }
+}, buildColumnOccupancy = (rows, numCols) => {
+  const occupancy = rows.map(() => new Array(numCols).fill(null));
+  rows.forEach((row2, rowIndex) => {
+    row2?.cells?.forEach((cell2, cellIndex) => {
+      const startCol = cell2.gridColumnStart ?? 0;
+      const endCol = Math.min(numCols, startCol + (cell2.colSpan ?? 1));
+      const endRow = Math.min(rows.length, rowIndex + (cell2.rowSpan ?? 1));
+      const ref$1 = {
+        rowIndex,
+        cellIndex
+      };
+      for (let r$1 = rowIndex;r$1 < endRow; r$1 += 1)
+        for (let c = startCol;c < endCol; c += 1)
+          occupancy[r$1][c] = ref$1;
+    });
+  });
+  return occupancy;
+}, computeBoundaryGapSegments = (occupancy, belowRowIndex) => {
+  const above = occupancy[belowRowIndex - 1];
+  const below = occupancy[belowRowIndex];
+  if (!above || !below)
+    return [];
+  const segments = [];
+  let current = null;
+  for (let c = 0;c < above.length; c += 1) {
+    const aboveCell = above[c];
+    const isGap = aboveCell !== null && below[c] === null;
+    if (isGap && current && current.aboveCell === aboveCell)
+      current.endColExclusive = c + 1;
+    else if (isGap) {
+      current = {
+        startCol: c,
+        endColExclusive: c + 1,
+        aboveCell
+      };
+      segments.push(current);
+    } else
+      current = null;
   }
+  return segments;
 }, renderTableFragment = (deps) => {
   const { doc: doc$12, fragment, block, measure, cellSpacingPx, effectiveColumnWidths, chrome: chrome2, context, sdtBoundary, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applyFragmentFrame, applySdtDataset: applySdtDataset$1, applyContainerSdtDataset: applyContainerSdtDataset$1, applyStyles: applyStyles$3, resolvePhysical } = deps;
   if (!doc$12) {
@@ -299208,11 +299822,23 @@ menclose::after {
   }
   if (block.id)
     container.setAttribute("data-sd-block-id", block.id);
-  if ((block.attrs?.borderCollapse ?? (block.attrs?.cellSpacing != null ? "separate" : "collapse")) === "separate" && tableBorders) {
-    applyBorder(container, "Top", borderValueToSpec(tableBorders.top));
-    applyBorder(container, "Right", borderValueToSpec(isRtl ? tableBorders.left : tableBorders.right));
-    applyBorder(container, "Bottom", borderValueToSpec(tableBorders.bottom));
-    applyBorder(container, "Left", borderValueToSpec(isRtl ? tableBorders.right : tableBorders.left));
+  const borderCollapse = block.attrs?.borderCollapse ?? (block.attrs?.cellSpacing != null ? "separate" : "collapse");
+  const separateBorders = borderCollapse === "separate";
+  if (borderCollapse === "separate" && tableBorders) {
+    applyBorder(container, "Top", bevelToneSpec(borderValueToSpec(tableBorders.top), "top", "table"));
+    applyBorder(container, "Right", bevelToneSpec(borderValueToSpec(isRtl ? tableBorders.left : tableBorders.right), "right", "table"));
+    applyBorder(container, "Bottom", bevelToneSpec(borderValueToSpec(tableBorders.bottom), "bottom", "table"));
+    applyBorder(container, "Left", bevelToneSpec(borderValueToSpec(isRtl ? tableBorders.right : tableBorders.left), "left", "table"));
+    for (const [cssSide, value] of [
+      ["Top", tableBorders.top],
+      ["Right", isRtl ? tableBorders.left : tableBorders.right],
+      ["Bottom", tableBorders.bottom],
+      ["Left", isRtl ? tableBorders.right : tableBorders.left]
+    ]) {
+      const spec = borderValueToSpec(value);
+      if (spec && getBorderBandProfile(spec) && !isNativeCssDoubleStyle(spec.style))
+        container.style[`border${cssSide}Color`] = "transparent";
+    }
   }
   const allRowHeights = measure.rows.map((r$1, idx) => {
     if (fragment.partialRow && fragment.partialRow.rowIndex === idx)
@@ -299245,9 +299871,8 @@ menclose::after {
         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],
+        separateBorders,
         totalRows: block.rows.length,
         tableBorders,
         columnWidths: effectiveColumnWidths,
@@ -299351,10 +299976,16 @@ menclose::after {
       }
     }
   }
+  const interiorRowBoundaries = [];
   for (let r$1 = fragment.fromRow;r$1 < fragment.toRow; r$1 += 1) {
     const rowMeasure = measure.rows[r$1];
     if (!rowMeasure)
       break;
+    if (r$1 > fragment.fromRow)
+      interiorRowBoundaries.push({
+        y: y$1,
+        belowRowIndex: r$1
+      });
     const isFirstRenderedBodyRow = r$1 === fragment.fromRow;
     const isLastRenderedBodyRow = r$1 === fragment.toRow - 1;
     const partialRowData = fragment.partialRow && fragment.partialRow.rowIndex === r$1 ? fragment.partialRow : undefined;
@@ -299369,9 +300000,8 @@ menclose::after {
       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],
+      separateBorders,
       totalRows: block.rows.length,
       tableBorders,
       columnWidths: effectiveColumnWidths,
@@ -299397,6 +300027,171 @@ menclose::after {
     });
     y$1 += actualRowHeight + cellSpacingPx;
   }
+  {
+    const sides = [
+      [
+        "top",
+        tableBorders?.top,
+        fragment.continuesFromPrev !== true
+      ],
+      [
+        "right",
+        isRtl ? tableBorders?.left : tableBorders?.right,
+        true
+      ],
+      [
+        "bottom",
+        tableBorders?.bottom,
+        fragment.continuesOnNext !== true
+      ],
+      [
+        "left",
+        isRtl ? tableBorders?.right : tableBorders?.left,
+        true
+      ]
+    ];
+    let outlineEl = null;
+    for (const [side, value, enabled] of sides) {
+      if (!enabled || value == null || typeof value !== "object")
+        continue;
+      const spec = value;
+      const profile = getBorderBandProfile(value);
+      if (!profile)
+        continue;
+      if (isNativeCssDoubleStyle(spec.style))
+        continue;
+      const rule = Math.max(1, Math.round(profile.segments[0]));
+      const color2 = spec.color && /^#[0-9A-Fa-f]{6}$/.test(spec.color) ? spec.color : "#000000";
+      if (!outlineEl) {
+        outlineEl = doc$12.createElement("div");
+        outlineEl.className = "superdoc-compound-border-outline";
+        const st = outlineEl.style;
+        st.position = "absolute";
+        st.inset = "0";
+        st.boxSizing = "border-box";
+        st.pointerEvents = "none";
+        container.appendChild(outlineEl);
+      }
+      const cssSide = side[0].toUpperCase() + side.slice(1);
+      outlineEl.style[`border${cssSide}`] = `${rule}px solid ${color2}`;
+    }
+  }
+  {
+    const midProfileOf = (value) => {
+      if (value == null || typeof value !== "object")
+        return null;
+      const profile = getBorderBandProfile(value);
+      return profile && profile.segments.length === 5 ? profile : null;
+    };
+    const colorOf = (value) => {
+      const c = value?.color;
+      return c && /^#[0-9A-Fa-f]{6}$/.test(c) ? c : "#000000";
+    };
+    const midOffsetOf = (profile) => Math.round(profile.segments[0] + profile.segments[1]);
+    const midRuleOf = (profile) => Math.max(1, Math.round(profile.segments[2]));
+    const topBorder = tableBorders?.top;
+    const bottomBorder = tableBorders?.bottom;
+    const leftBorder = isRtl ? tableBorders?.right : tableBorders?.left;
+    const rightBorder = isRtl ? tableBorders?.left : tableBorders?.right;
+    const topMid = fragment.continuesFromPrev !== true ? midProfileOf(topBorder) : null;
+    const bottomMid = fragment.continuesOnNext !== true ? midProfileOf(bottomBorder) : null;
+    const leftMid = midProfileOf(leftBorder);
+    const rightMid = midProfileOf(rightBorder);
+    const insideHMid = midProfileOf(tableBorders?.insideH);
+    const insideVMid = midProfileOf(tableBorders?.insideV);
+    const fragmentWidth = fragment.width;
+    const fragmentHeight = fragment.height;
+    const ringTopInset = topMid ? midOffsetOf(topMid) : 0;
+    const ringBottomInset = bottomMid ? midOffsetOf(bottomMid) : 0;
+    const ringLeftInset = leftMid ? midOffsetOf(leftMid) : 0;
+    const ringRightInset = rightMid ? midOffsetOf(rightMid) : 0;
+    if (topMid || bottomMid || leftMid || rightMid) {
+      const ring = doc$12.createElement("div");
+      ring.className = "superdoc-compound-border-midring";
+      const rs = ring.style;
+      rs.position = "absolute";
+      rs.boxSizing = "border-box";
+      rs.pointerEvents = "none";
+      rs.left = `${ringLeftInset}px`;
+      rs.top = `${ringTopInset}px`;
+      rs.width = `${fragmentWidth - ringLeftInset - ringRightInset}px`;
+      rs.height = `${fragmentHeight - ringTopInset - ringBottomInset}px`;
+      if (topMid)
+        rs.borderTop = `${midRuleOf(topMid)}px solid ${colorOf(topBorder)}`;
+      if (bottomMid)
+        rs.borderBottom = `${midRuleOf(bottomMid)}px solid ${colorOf(bottomBorder)}`;
+      if (leftMid)
+        rs.borderLeft = `${midRuleOf(leftMid)}px solid ${colorOf(leftBorder)}`;
+      if (rightMid)
+        rs.borderRight = `${midRuleOf(rightMid)}px solid ${colorOf(rightBorder)}`;
+      container.appendChild(ring);
+    }
+    const appendStrip = (className, l, t, w, h$2, color2) => {
+      const strip = doc$12.createElement("div");
+      strip.className = className;
+      const ss = strip.style;
+      ss.position = "absolute";
+      ss.pointerEvents = "none";
+      ss.left = `${l}px`;
+      ss.top = `${t}px`;
+      ss.width = `${w}px`;
+      ss.height = `${h$2}px`;
+      ss.background = color2;
+      container.appendChild(strip);
+    };
+    if (insideVMid && effectiveColumnWidths.length > 1) {
+      const rule = midRuleOf(insideVMid);
+      const color2 = colorOf(tableBorders?.insideV);
+      let cum = 0;
+      for (let i3 = 0;i3 < effectiveColumnWidths.length - 1; i3 += 1) {
+        cum += effectiveColumnWidths[i3];
+        const gx = isRtl ? fragmentWidth - cum : cum;
+        appendStrip("superdoc-compound-border-midv", Math.round(gx - rule / 2), ringTopInset, rule, fragmentHeight - ringTopInset - ringBottomInset, color2);
+      }
+    }
+    if (insideHMid && interiorRowBoundaries.length > 0) {
+      const rule = midRuleOf(insideHMid);
+      const color2 = colorOf(tableBorders?.insideH);
+      for (const { y: gy } of interiorRowBoundaries)
+        appendStrip("superdoc-compound-border-midh", ringLeftInset, Math.round(gy + midOffsetOf(insideHMid)), fragmentWidth - ringLeftInset - ringRightInset, rule, color2);
+    }
+  }
+  if (cellSpacingPx === 0 && !separateBorders && interiorRowBoundaries.length > 0 && block.rows?.length) {
+    const occupancy = buildColumnOccupancy(measure.rows, effectiveColumnWidths.length);
+    const columnX = [0];
+    for (const width of effectiveColumnWidths)
+      columnX.push(columnX[columnX.length - 1] + width);
+    for (const { y: boundaryY, belowRowIndex } of interiorRowBoundaries)
+      for (const segment of computeBoundaryGapSegments(occupancy, belowRowIndex)) {
+        if (segment.aboveCell.rowIndex < fragment.fromRow)
+          continue;
+        const aboveCell = block.rows[segment.aboveCell.rowIndex]?.cells?.[segment.aboveCell.cellIndex];
+        const boundaryRowBorders = block.rows[belowRowIndex - 1]?.attrs?.borders;
+        const effectiveInsideH = boundaryRowBorders ? {
+          ...tableBorders ?? {},
+          ...boundaryRowBorders
+        }.insideH : tableBorders?.insideH;
+        const cellBottom = aboveCell?.attrs?.borders?.bottom;
+        const spec = isExplicitNoneBorder(cellBottom) ? undefined : resolveTableBorderValue(cellBottom, effectiveInsideH);
+        if (!isPresentBorder(spec))
+          continue;
+        const x = columnX[segment.startCol];
+        const width = columnX[segment.endColExclusive] - x;
+        if (width <= 0)
+          continue;
+        const strip = doc$12.createElement("div");
+        strip.className = "superdoc-row-boundary-gap";
+        const ss = strip.style;
+        ss.position = "absolute";
+        ss.pointerEvents = "none";
+        ss.left = `${isRtl ? fragment.width - x - width : x}px`;
+        ss.top = `${boundaryY}px`;
+        ss.width = `${width}px`;
+        ss.height = "0";
+        applyBorder(strip, "Top", spec);
+        container.appendChild(strip);
+      }
+  }
   return container;
 }, getOwnContainerKey = (item) => {
   if (item.kind !== "fragment")
@@ -305834,7 +306629,51 @@ menclose::after {
   getStats() {
     return this.cache.getStats();
   }
-}, sharedHeaderFooterCache, HEADER_FOOTER_VARIANTS$12, canvas = null, ctx = null, isWordChar$1 = (char) => {
+}, sharedHeaderFooterCache, HEADER_FOOTER_VARIANTS$12, isAtomicLayoutRun = (run2) => typeof run2.src === "string" || run2.kind === "math" || run2.kind === "fieldAnnotation", resolveFieldAnnotationFontSize = (value) => {
+  if (typeof value === "number" && Number.isFinite(value))
+    return value;
+  if (typeof value === "string") {
+    const parsed = parseFloat(value);
+    if (Number.isFinite(parsed) && parsed > 0)
+      return parsed;
+  }
+  return 16;
+}, getImageRunSize = (run2) => {
+  const distLeft = run2.distLeft ?? 0;
+  const distRight = run2.distRight ?? 0;
+  const distTop = run2.distTop ?? 0;
+  const distBottom = run2.distBottom ?? 0;
+  return {
+    width: (run2.width ?? 0) + distLeft + distRight,
+    height: (run2.height ?? 0) + distTop + distBottom
+  };
+}, getMathRunSize = (run2) => ({
+  width: run2.width ?? 20,
+  height: run2.height ?? 24
+}), getFieldAnnotationRunSize = (run2, measureText$1) => {
+  const fontSize = resolveFieldAnnotationFontSize(run2.fontSize);
+  const horizontalPadding = run2.highlighted === false ? 0 : 8;
+  const verticalPadding = run2.highlighted === false ? 0 : 6;
+  const label = run2.displayLabel ?? "";
+  const width = (label ? measureText$1(label, run2, fontSize) : 0) + horizontalPadding;
+  let height = fontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + verticalPadding;
+  if (run2.variant === "signature" && run2.imageSrc)
+    height = Math.max(height, 28 + verticalPadding);
+  if (run2.variant === "image" && run2.imageSrc && run2.size?.height)
+    height = Math.max(height, run2.size.height + verticalPadding);
+  if (run2.variant === "html" && run2.size?.height)
+    height = Math.max(height, run2.size.height);
+  return {
+    width,
+    height
+  };
+}, getAtomicRunLayoutSize = (run2, measureText$1) => {
+  if (typeof run2.src === "string")
+    return getImageRunSize(run2);
+  if (run2.kind === "math")
+    return getMathRunSize(run2);
+  return getFieldAnnotationRunSize(run2, measureText$1);
+}, canvas = null, ctx = null, isWordChar$1 = (char) => {
   if (!char)
     return false;
   const code6 = char.charCodeAt(0);
@@ -305863,6 +306702,26 @@ menclose::after {
 }, DEFAULT_TAB_INTERVAL_TWIPS$12 = 720, TWIPS_PER_PX$2, TAB_EPSILON$1 = 0.1, WIDTH_FUDGE_PX = 0.5, twipsToPx$1 = (twips) => twips / TWIPS_PER_PX$2, pxToTwips$1 = (px) => Math.round(px * TWIPS_PER_PX$2), sanitizeIndent$1 = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0, sanitizeRawIndent = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0, sanitizeDecimalSeparator$1 = (value) => value === "," ? "," : ".", getRunWidth = (run2) => {
   const width = run2.width;
   return typeof width === "number" ? width : 0;
+}, measureAtomicText = (text5, run2, fontSize) => {
+  const family2 = run2.fontFamily || "Arial";
+  const context = getCtx();
+  if (!context)
+    return Math.max(0, text5.length * (fontSize * 0.6));
+  context.font = `${run2.italic ? "italic " : ""}${run2.bold ? "bold " : ""}${fontSize}px ${family2}`.trim();
+  return context.measureText(text5).width;
+}, getAtomicRunLayoutWidth = (run2) => getAtomicRunLayoutSize(run2, measureAtomicText).width, getAtomicRunLayoutHeight = (run2) => getAtomicRunLayoutSize(run2, measureAtomicText).height, getLineMaxAtomicHeight = (runs2, fromRun, fromChar, toRun, toChar) => {
+  let max$2 = 0;
+  for (let r$1 = fromRun;r$1 <= toRun; r$1 += 1) {
+    const run2 = runs2[r$1];
+    if (!isAtomicLayoutRun(run2))
+      continue;
+    if (r$1 === toRun && toChar === 0)
+      continue;
+    if (r$1 === fromRun && r$1 === toRun && toChar <= fromChar)
+      continue;
+    max$2 = Math.max(max$2, getAtomicRunLayoutHeight(run2));
+  }
+  return max$2;
 }, isLineBreakRun$1 = (run2) => run2.kind === "lineBreak" || run2.kind === "break" && run2.breakType === "line", markerFontString = (run2) => {
   const size$1 = run2?.fontSize ?? 16;
   const family2 = run2?.fontFamily ?? "Arial";
@@ -305935,7 +306794,7 @@ menclose::after {
       };
     const text5 = runText(run2);
     if (!text5) {
-      const runWidth = getRunWidth(run2);
+      const runWidth = isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
       if (runWidth > 0) {
         totalWidth += runWidth;
         endRun = r$1;
@@ -305994,7 +306853,7 @@ menclose::after {
       break;
     const text5 = runText(run2);
     if (!text5) {
-      totalWidth += getRunWidth(run2);
+      totalWidth += isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
       continue;
     }
     const sliceStart = r$1 === startRunIndex ? startChar : 0;
@@ -306172,7 +307031,21 @@ menclose::after {
       }
       const text5 = runText(run2);
       if (!text5) {
-        cursorX += getRunWidth(run2);
+        const atomicWidth = isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
+        const pendingTabAlign = consumePendingTabAlignStart();
+        if (pendingTabAlign != null) {
+          const segment = {
+            runIndex,
+            fromChar: 0,
+            toChar: 1,
+            width: atomicWidth,
+            x: pendingTabAlign.paintX,
+            ...pendingTabAlign.precedingTabEndX !== undefined ? { precedingTabEndX: pendingTabAlign.precedingTabEndX } : {}
+          };
+          cursorX = pendingTabAlign.layoutX + atomicWidth;
+          segments.push(segment);
+        } else
+          cursorX += atomicWidth;
         lineWidth = Math.max(lineWidth, cursorX);
         continue;
       }
@@ -311590,7 +312463,7 @@ menclose::after {
   }
 }, EMUS_PER_INCH = 914400, maxSize = 5000, cache, makeKey = (text5, font, letterSpacing) => {
   return `${text5}|${font}|${letterSpacing || 0}`;
-}, fontMetricsCache, MAX_CACHE_SIZE = 1000, METRICS_TEST_STRING = "MHgypbdlÁÉÍ", DEFAULT_MIN_COLUMN_WIDTH = 8, TWIPS_PER_PX$1 = 15, PLACEHOLDER_COLUMN_MAX_WIDTH = 1, DEFAULT_CELL_PADDING$1, DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1 = 16, FIELD_ANNOTATION_PILL_PADDING$1 = 8, TABLE_CELL_METRICS_CACHE_SIZE = 2000, TABLE_AUTOFIT_RESULT_CACHE_SIZE = 500, NO_WRAP_MAX_WIDTH, TOKEN_BOUNDARY_PATTERN, LruCache = class {
+}, fontMetricsCache, MAX_CACHE_SIZE = 1000, METRICS_TEST_STRING = "MHgypbdlÁÉÍ", DEFAULT_MIN_COLUMN_WIDTH = 8, TWIPS_PER_PX$1 = 15, PLACEHOLDER_COLUMN_MAX_WIDTH = 1, DEFAULT_CELL_PADDING$1, DEFAULT_FIELD_ANNOTATION_FONT_SIZE = 16, FIELD_ANNOTATION_PILL_PADDING = 8, TABLE_CELL_METRICS_CACHE_SIZE = 2000, TABLE_AUTOFIT_RESULT_CACHE_SIZE = 500, NO_WRAP_MAX_WIDTH, TOKEN_BOUNDARY_PATTERN, LruCache = class {
   constructor(maxSize$1) {
     this.cache = /* @__PURE__ */ new Map;
     this.maxSize = maxSize$1;
@@ -311624,7 +312497,7 @@ menclose::after {
       this.cache.delete(oldestKey);
     }
   }
-}, tableCellMetricsCache, autoFitTableResultCache, canvasContext$1 = null, computeTabStops2, measurementConfig, canvasContext = null, DEFAULT_TAB_INTERVAL_TWIPS2 = 720, TWIPS_PER_PX2, twipsToPx2 = (twips) => twips / TWIPS_PER_PX2, pxToTwips = (px) => Math.round(px * TWIPS_PER_PX2), DEFAULT_TAB_INTERVAL_PX, TAB_EPSILON = 0.1, DEFAULT_CELL_PADDING, DEFAULT_DECIMAL_SEPARATOR2 = ".", ALLOWED_TAB_VALS, FIELD_ANNOTATION_PILL_PADDING = 8, FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER = 1.2, FIELD_ANNOTATION_VERTICAL_PADDING = 6, DEFAULT_FIELD_ANNOTATION_FONT_SIZE = 16, DEFAULT_PARAGRAPH_FONT_SIZE = 12, DEFAULT_PARAGRAPH_FONT_FAMILY = "Arial", isValidFontSize = (value) => typeof value === "number" && Number.isFinite(value) && value > 0, normalizeFontSize2 = (value, fallback = DEFAULT_PARAGRAPH_FONT_SIZE) => {
+}, tableCellMetricsCache, autoFitTableResultCache, canvasContext$1 = null, computeTabStops2, measurementConfig, canvasContext = null, DEFAULT_TAB_INTERVAL_TWIPS2 = 720, TWIPS_PER_PX2, twipsToPx2 = (twips) => twips / TWIPS_PER_PX2, pxToTwips = (px) => Math.round(px * TWIPS_PER_PX2), DEFAULT_TAB_INTERVAL_PX, TAB_EPSILON = 0.1, DEFAULT_CELL_PADDING, DEFAULT_DECIMAL_SEPARATOR2 = ".", ALLOWED_TAB_VALS, DEFAULT_PARAGRAPH_FONT_SIZE = 12, DEFAULT_PARAGRAPH_FONT_FAMILY = "Arial", isValidFontSize = (value) => typeof value === "number" && Number.isFinite(value) && value > 0, normalizeFontSize2 = (value, fallback = DEFAULT_PARAGRAPH_FONT_SIZE) => {
   if (isValidFontSize(value))
     return value;
   if (typeof value === "string") {
@@ -314196,13 +315069,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_ly1ZYfUZ_es = __esm(() => {
+var init_src_bMRzO9Kl_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_DRKaQwZS_es();
+  init_SuperConverter_Ed3nFN54_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_B2wVPhPi_es();
-  init_create_headless_toolbar_ChACxHAH_es();
+  init_create_headless_toolbar_PSeH6IV5_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_remark_gfm_BUJjZJLy_es();
@@ -324749,7 +325622,10 @@ ${err.toString()}`);
             for (let r$1 = 0;r$1 < rows; r$1++) {
               const cellNodes = [];
               for (let c = 0;c < columns; c++) {
-                const cellAttrs = widths ? { colwidth: [widths[c]] } : {};
+                const cellAttrs = widths ? {
+                  colwidth: [widths[c]],
+                  tableCellProperties: { cellWidth: cellWidthDxa(widths[c]) }
+                } : {};
                 const cell2 = tableCellType.createAndFill(cellAttrs);
                 if (!cell2)
                   return false;
@@ -327412,6 +328288,10 @@ ${err.toString()}`);
           return { style: attrs.style };
         } },
         wrapAttributes: { rendered: false },
+        wrapperParagraph: {
+          default: null,
+          rendered: false
+        },
         anchorData: { rendered: false },
         marginOffset: { rendered: false },
         attributes: { rendered: false },
@@ -348974,13 +349854,28 @@ function print() { __p += __j.call(arguments, '') }
     "single",
     "double",
     "dashed",
+    "dashSmallGap",
     "dotted",
     "thick",
     "triple",
     "dotDash",
     "dotDotDash",
+    "thinThickSmallGap",
+    "thickThinSmallGap",
+    "thinThickThinSmallGap",
+    "thinThickMediumGap",
+    "thickThinMediumGap",
+    "thinThickThinMediumGap",
+    "thinThickLargeGap",
+    "thickThinLargeGap",
+    "thinThickThinLargeGap",
     "wave",
-    "doubleWave"
+    "doubleWave",
+    "dashDotStroked",
+    "threeDEmboss",
+    "threeDEngrave",
+    "outset",
+    "inset"
   ]);
   BORDER_STYLE_NUMBER = {
     single: 1,
@@ -348991,8 +349886,23 @@ function print() { __p += __j.call(arguments, '') }
     dotDash: 6,
     dotDotDash: 7,
     triple: 8,
+    thinThickSmallGap: 9,
+    thickThinSmallGap: 10,
+    thinThickThinSmallGap: 11,
+    thinThickMediumGap: 12,
+    thickThinMediumGap: 13,
+    thinThickThinMediumGap: 14,
+    thinThickLargeGap: 15,
+    thickThinLargeGap: 16,
+    thinThickThinLargeGap: 17,
     wave: 18,
-    doubleWave: 19
+    doubleWave: 19,
+    dashSmallGap: 20,
+    dashDotStroked: 21,
+    threeDEmboss: 22,
+    threeDEngrave: 23,
+    outset: 24,
+    inset: 25
   };
   BORDER_STYLE_LINES = {
     single: 1,
@@ -349003,8 +349913,21 @@ function print() { __p += __j.call(arguments, '') }
     dotDash: 1,
     dotDotDash: 1,
     triple: 3,
+    thinThickSmallGap: 2,
+    thickThinSmallGap: 2,
+    thinThickThinSmallGap: 3,
+    thinThickMediumGap: 2,
+    thickThinMediumGap: 2,
+    thinThickThinMediumGap: 3,
+    thinThickLargeGap: 2,
+    thickThinLargeGap: 2,
+    thinThickThinLargeGap: 3,
     wave: 1,
-    doubleWave: 2
+    doubleWave: 2,
+    dashSmallGap: 1,
+    dashDotStroked: 1,
+    threeDEmboss: 1,
+    threeDEngrave: 1
   };
   PX_PER_PT$12 = 96 / 72;
   BORDER_SIDES2 = [
@@ -357457,11 +358380,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CjKDFHjb.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-DNNbMZCp.es.js
 var DEFAULT_TEXT_ALIGN_OPTIONS, DEFAULT_LINE_HEIGHT_OPTIONS, DEFAULT_ZOOM_OPTIONS, DEFAULT_DOCUMENT_MODE_OPTIONS, DEFAULT_FONT_SIZE_OPTIONS, headlessToolbarConstants, 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, FONT_SIZE_OPTIONS;
-var init_create_super_doc_ui_CjKDFHjb_es = __esm(() => {
-  init_SuperConverter_DRKaQwZS_es();
-  init_create_headless_toolbar_ChACxHAH_es();
+var init_create_super_doc_ui_DNNbMZCp_es = __esm(() => {
+  init_SuperConverter_Ed3nFN54_es();
+  init_create_headless_toolbar_PSeH6IV5_es();
   DEFAULT_TEXT_ALIGN_OPTIONS = [
     {
       label: "Left",
@@ -357752,15 +358675,15 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_ly1ZYfUZ_es();
-  init_SuperConverter_DRKaQwZS_es();
+  init_src_bMRzO9Kl_es();
+  init_SuperConverter_Ed3nFN54_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_ChACxHAH_es();
+  init_create_headless_toolbar_PSeH6IV5_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_DocxZipper_BzS208BW_es();
-  init_create_super_doc_ui_CjKDFHjb_es();
+  init_create_super_doc_ui_DNNbMZCp_es();
   init_ui_CGB3qmy3_es();
   init_eventemitter3_UwU_CLPU_es();
   init_errors_C_DoKMoN_es();
@@ -380847,6 +381770,9 @@ function resolveEffectiveHeaderFooterRef2({
   }
   return null;
 }
+// ../../packages/layout-engine/contracts/src/border-band.ts
+var init_border_band = () => {};
+
 // ../../packages/layout-engine/contracts/src/ooxml-z-index.ts
 function coerceRelativeHeight2(raw) {
   if (typeof raw === "number" && Number.isFinite(raw))
@@ -381360,6 +382286,7 @@ var init_engines = () => {};
 
 // ../../packages/layout-engine/contracts/src/index.ts
 var init_src = __esm(() => {
+  init_border_band();
   init_justify_utils();
   init_pm_range();
   init_graphic_placement();
@@ -387923,13 +388850,28 @@ var init_borders = __esm(() => {
     "single",
     "double",
     "dashed",
+    "dashSmallGap",
     "dotted",
     "thick",
     "triple",
     "dotDash",
     "dotDotDash",
+    "thinThickSmallGap",
+    "thickThinSmallGap",
+    "thinThickThinSmallGap",
+    "thinThickMediumGap",
+    "thickThinMediumGap",
+    "thinThickThinMediumGap",
+    "thinThickLargeGap",
+    "thickThinLargeGap",
+    "thinThickThinLargeGap",
     "wave",
-    "doubleWave"
+    "doubleWave",
+    "dashDotStroked",
+    "threeDEmboss",
+    "threeDEngrave",
+    "outset",
+    "inset"
   ]);
 });
 
@@ -388539,6 +389481,11 @@ function resolveConditionalProps2(propertyType, styleType, styleId2, translatedL
     const props = def?.tableStyleProperties?.[styleType]?.[propertyType];
     if (props)
       chain.push(props);
+    if (styleType === "wholeTable" && propertyType === "tableCellProperties") {
+      const baseProps = def?.tableCellProperties;
+      if (baseProps)
+        chain.push(baseProps);
+    }
     currentId = def?.basedOn;
   }
   if (chain.length === 0)
@@ -388553,7 +389500,7 @@ function resolveCellStyles2(propertyType, tableInfo, translatedLinkedStyles) {
   const cellStyleProps = [];
   const tableStyleId = tableInfo.tableProperties.tableStyleId;
   const { rowBandSize, colBandSize } = resolveEffectiveBandSizes2(tableStyleId, translatedLinkedStyles);
-  const cellStyleTypes = determineCellStyleTypes2(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK2, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle);
+  const cellStyleTypes = determineCellStyleTypes2(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK2, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle, tableInfo.gridColumnStart, tableInfo.gridColumnSpan, tableInfo.numGridCols);
   cellStyleTypes.forEach((styleType) => {
     const typeProps = resolveConditionalProps2(propertyType, styleType, tableStyleId, translatedLinkedStyles);
     if (typeProps) {
@@ -388576,12 +389523,15 @@ function resolveTableCellProperties2(inlineProps, tableInfo, translatedLinkedSty
   }
   return combineProperties2(chain, { fullOverrideProps: ["shading"] });
 }
-function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle) {
+function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle, gridColumnStart, gridColumnSpan, numGridCols) {
   const applicable = new Set(["wholeTable"]);
   const normalizedRowBandSize = rowBandSize > 0 ? rowBandSize : 1;
   const normalizedColBandSize = colBandSize > 0 ? colBandSize : 1;
+  const columnStart = gridColumnStart ?? cellIndex;
+  const columnEnd = columnStart + (gridColumnSpan ?? 1);
+  const columnCount = numGridCols != null && numCells != null ? Math.max(numGridCols, numCells) : numGridCols ?? numCells;
   const bandRowIndex = Math.max(0, rowIndex - (tblLook?.firstRow ? 1 : 0));
-  const bandColIndex = Math.max(0, cellIndex - (tblLook?.firstColumn ? 1 : 0));
+  const bandColIndex = Math.max(0, columnStart - (tblLook?.firstColumn ? 1 : 0));
   const rowGroup = Math.floor(bandRowIndex / normalizedRowBandSize);
   const colGroup = Math.floor(bandColIndex / normalizedColBandSize);
   if (!tblLook?.noHBand) {
@@ -388592,8 +389542,8 @@ function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCell
   }
   const isFirstRow = !!tblLook?.firstRow && rowIndex === 0;
   const isLastRow = !!tblLook?.lastRow && numRows != null && numRows > 0 && rowIndex === numRows - 1;
-  const isFirstCol = !!tblLook?.firstColumn && cellIndex === 0;
-  const isLastCol = !!tblLook?.lastColumn && numCells != null && numCells > 0 && cellIndex === numCells - 1;
+  const isFirstCol = !!tblLook?.firstColumn && columnStart === 0;
+  const isLastCol = !!tblLook?.lastColumn && columnCount != null && columnCount > 0 && columnEnd >= columnCount;
   if (isFirstRow)
     applicable.add("firstRow");
   if (isFirstCol)
@@ -391366,6 +392316,7 @@ var WRAP_TYPES2, WRAP_TEXT_VALUES2, H_RELATIVE_VALUES2, V_RELATIVE_VALUES2, H_AL
 var init_shapes = __esm(() => {
   init_src();
   init_utilities();
+  init_attributes();
   init_paragraph2();
   WRAP_TYPES2 = new Set(["None", "Square", "Tight", "Through", "TopAndBottom", "Inline"]);
   WRAP_TEXT_VALUES2 = new Set(["bothSides", "left", "right", "largest"]);
@@ -391933,10 +392884,40 @@ function normalizeLegacyBorderStyle2(value) {
       return "dotDash";
     case "dotdotdash":
       return "dotDotDash";
+    case "dashsmallgap":
+      return "dashSmallGap";
+    case "thinthicksmallgap":
+      return "thinThickSmallGap";
+    case "thickthinsmallgap":
+      return "thickThinSmallGap";
+    case "thinthickthinsmallgap":
+      return "thinThickThinSmallGap";
+    case "thinthickmediumgap":
+      return "thinThickMediumGap";
+    case "thickthinmediumgap":
+      return "thickThinMediumGap";
+    case "thinthickthinmediumgap":
+      return "thinThickThinMediumGap";
+    case "thinthicklargegap":
+      return "thinThickLargeGap";
+    case "thickthinlargegap":
+      return "thickThinLargeGap";
+    case "thinthickthinlargegap":
+      return "thinThickThinLargeGap";
     case "wave":
       return "wave";
     case "doublewave":
       return "doubleWave";
+    case "dashdotstroked":
+      return "dashDotStroked";
+    case "threedemboss":
+      return "threeDEmboss";
+    case "threedengrave":
+      return "threeDEngrave";
+    case "outset":
+      return "outset";
+    case "inset":
+      return "inset";
     case "single":
     default:
       return "single";
@@ -392074,14 +393055,21 @@ function tableNodeToBlock2(node3, {
     tableStyleId: effectiveStyleId ?? undefined
   } : undefined;
   const rows = [];
+  const grid = node3.attrs?.grid;
+  const numGridCols = Array.isArray(grid) && grid.length > 0 ? grid.length : undefined;
+  let activeRowSpans = [];
   node3.content.forEach((rowNode, rowIndex) => {
+    const { placements: placements2, nextActiveRowSpans } = placeRowCellsOnGrid2(rowNode, activeRowSpans);
+    activeRowSpans = nextActiveRowSpans;
     const parsedRow = parseTableRow2({
       rowNode,
       rowIndex,
       numRows: node3?.content?.length ?? 1,
       context: parserDeps,
       defaultCellPadding,
-      tableProperties: tablePropertiesForCascade
+      tableProperties: tablePropertiesForCascade,
+      cellGridPlacements: placements2,
+      numGridCols
     });
     if (parsedRow) {
       if (!shouldHideTrackedNode2(parsedRow.attrs?.trackedChange, parserDeps.trackedChangesConfig)) {
@@ -392212,7 +393200,36 @@ function tableNodeToBlock2(node3, {
   };
   return tableBlock;
 }
-var isTableRowNode2 = (node3) => node3.type === "tableRow" || node3.type === "table_row", isTableCellNode2 = (node3) => node3.type === "tableCell" || node3.type === "table_cell" || node3.type === "tableHeader" || node3.type === "table_header", isTableSkipPlaceholderCell2 = (node3) => {
+var placeRowCellsOnGrid2 = (rowNode, activeRowSpans) => {
+  const placements2 = [];
+  const nextActiveRowSpans = activeRowSpans.map((count) => Math.max(0, count - 1));
+  let column = 0;
+  const cellSpan = (cellNode) => {
+    const colspan = cellNode.attrs?.colspan;
+    if (typeof colspan === "number" && colspan > 0)
+      return colspan;
+    const colwidth = cellNode.attrs?.colwidth;
+    return Array.isArray(colwidth) && colwidth.length > 0 ? colwidth.length : 1;
+  };
+  for (const cellNode of Array.isArray(rowNode.content) ? rowNode.content : []) {
+    if (!isTableCellNode2(cellNode)) {
+      placements2.push(null);
+      continue;
+    }
+    while ((activeRowSpans[column] ?? 0) > 0)
+      column += 1;
+    const span = cellSpan(cellNode);
+    placements2.push({ gridColumnStart: column, gridColumnSpan: span });
+    const rowspan = typeof cellNode.attrs?.rowspan === "number" ? cellNode.attrs.rowspan : 1;
+    if (rowspan > 1) {
+      for (let covered = column;covered < column + span; covered += 1) {
+        nextActiveRowSpans[covered] = Math.max(nextActiveRowSpans[covered] ?? 0, rowspan - 1);
+      }
+    }
+    column += span;
+  }
+  return { placements: placements2, nextActiveRowSpans };
+}, isTableRowNode2 = (node3) => node3.type === "tableRow" || node3.type === "table_row", isTableCellNode2 = (node3) => node3.type === "tableCell" || node3.type === "table_cell" || node3.type === "tableHeader" || node3.type === "table_header", isTableSkipPlaceholderCell2 = (node3) => {
   const placeholder = node3.attrs?.__placeholder;
   return placeholder === "gridBefore" || placeholder === "gridAfter";
 }, convertResolvedCellBorder2 = (value) => {
@@ -392247,7 +393264,20 @@ var isTableRowNode2 = (node3) => node3.type === "tableRow" || node3.type === "ta
   const blocks2 = [];
   const rowCnfStyle = args3.rowCnfStyle ?? null;
   const cellCnfStyle = cellNode.attrs?.tableCellProperties?.cnfStyle ?? null;
-  const tableInfo = tableProperties ? { tableProperties, rowIndex, cellIndex, numCells, numRows, rowCnfStyle, cellCnfStyle } : undefined;
+  const tableInfo = tableProperties ? {
+    tableProperties,
+    rowIndex,
+    cellIndex,
+    numCells,
+    numRows,
+    rowCnfStyle,
+    cellCnfStyle,
+    ...args3.gridPlacement != null && args3.numGridCols != null ? {
+      gridColumnStart: args3.gridPlacement.gridColumnStart,
+      gridColumnSpan: args3.gridPlacement.gridColumnSpan,
+      numGridCols: args3.numGridCols
+    } : {}
+  } : undefined;
   const inlineTcProps = cellNode.attrs?.tableCellProperties;
   const resolvedTcProps = resolveTableCellProperties2(inlineTcProps, tableInfo, context.converterContext?.translatedLinkedStyles);
   const cellBackground = cellNode.attrs?.background;
@@ -392547,7 +393577,9 @@ var isTableRowNode2 = (node3) => node3.type === "tableRow" || node3.type === "ta
       tableProperties,
       numCells: rowNode?.content?.length || 1,
       numRows,
-      rowCnfStyle
+      rowCnfStyle,
+      gridPlacement: args3.cellGridPlacements?.[cellIndex] ?? null,
+      numGridCols: args3.numGridCols
     });
     if (parsedCell) {
       cells.push(parsedCell);