ooxml-core 1.10.0 → 1.12.0

package/dist/docx/embedded.mjs

@@ -8678,7 +8678,7 @@ function parseRowProperties(row) {
   const result = {};
   const height = first2(trPr, "trHeight");
   const heightTwips = dxa(getW(height, "val"));
-  if (heightTwips) {
+  if (heightTwips !== void 0) {
     result.heightTwips = heightTwips;
     result.heightRule = getW(height, "hRule") === "exact" ? "exact" : "atLeast";
   }

package/dist/docx/index.cjs

@@ -11891,7 +11891,7 @@ function parseRowProperties(row) {
   const result = {};
   const height = first2(trPr, "trHeight");
   const heightTwips = dxa(getW(height, "val"));
-  if (heightTwips) {
+  if (heightTwips !== void 0) {
     result.heightTwips = heightTwips;
     result.heightRule = getW(height, "hRule") === "exact" ? "exact" : "atLeast";
   }

package/dist/docx/index.mjs

@@ -11885,7 +11885,7 @@ function parseRowProperties(row) {
   const result = {};
   const height = first2(trPr, "trHeight");
   const heightTwips = dxa(getW(height, "val"));
-  if (heightTwips) {
+  if (heightTwips !== void 0) {
     result.heightTwips = heightTwips;
     result.heightRule = getW(height, "hRule") === "exact" ? "exact" : "atLeast";
   }

package/dist/docx/layout/adapt-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapt-table.d.ts","sourceRoot":"","sources":["../../../docx/layout/adapt-table.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,eAAe,EAEpB,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EACX,YAAY,EAGZ,eAAe,EACf,WAAW,EAGX,MAAM,SAAS,CAAC;AAWjB,qFAAqF;AACrF,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED,wBAAgB,MAAM,CACrB,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAC7B,mBAAmB,UAAQ,GACzB,YAAY,GAAG,SAAS,CAoB1B;AAgBD;;;;GAIG;AACH,wBAAgB,UAAU,CACzB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,aAAa,EACpB,cAAc,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,eAAe,EACzD,OAAO,UAAQ,GACb,WAAW,CAoFb"}
+{"version":3,"file":"adapt-table.d.ts","sourceRoot":"","sources":["../../../docx/layout/adapt-table.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,eAAe,EAEpB,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EACX,YAAY,EAGZ,eAAe,EACf,WAAW,EAGX,MAAM,SAAS,CAAC;AAWjB,qFAAqF;AACrF,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED,wBAAgB,MAAM,CACrB,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAC7B,mBAAmB,UAAQ,GACzB,YAAY,GAAG,SAAS,CAoB1B;AAiBD;;;;GAIG;AACH,wBAAgB,UAAU,CACzB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,aAAa,EACpB,cAAc,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,eAAe,EACzD,OAAO,UAAQ,GACb,WAAW,CAsFb"}

package/dist/docx/layout/flow-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flow-table.d.ts","sourceRoot":"","sources":["../../../docx/layout/flow-table.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAG3D;;;;;;GAMG;AACH,wBAAgB,UAAU,CACzB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAC/B,gBAAgB,CAAC,EAAE,kBAAkB,GACnC,IAAI,CA8QN"}
+{"version":3,"file":"flow-table.d.ts","sourceRoot":"","sources":["../../../docx/layout/flow-table.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAG3D;;;;;;GAMG;AACH,wBAAgB,UAAU,CACzB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAC/B,gBAAgB,CAAC,EAAE,kBAAkB,GACnC,IAAI,CAwUN"}

package/dist/docx/layout/index.cjs

@@ -4526,10 +4526,14 @@ function fontOf(run) {
   };
 }
 var graphemes2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
-function runTextWidth(text2, run, measurer) {
+function runTextWidth(text2, run, measurer, font = fontOf(run)) {
+  let characters = 0;
+  if (run.characterSpacingPx) {
+    for (const _segment of graphemes2.segment(text2)) characters++;
+  }
   return Math.max(
     0,
-    measurer.widthOf(text2, fontOf(run)) * (run.textScalePercent ?? 100) / 100 + [...graphemes2.segment(text2)].length * (run.characterSpacingPx ?? 0)
+    measurer.widthOf(text2, font) * (run.textScalePercent ?? 100) / 100 + characters * (run.characterSpacingPx ?? 0)
   );
 }
 function resolveIndents(paragraph) {
@@ -4663,8 +4667,45 @@ function alignFragments(fragments, width, isLastLine, effectiveAlign) {
   return offset === 0 ? fragments : fragments.map((f) => ({ ...f, xPx: f.xPx + offset }));
 }
 
+// docx/layout/paragraph-cache.ts
+var sessions = /* @__PURE__ */ new WeakMap();
+function registerParagraphCache(measurer) {
+  sessions.set(measurer, /* @__PURE__ */ new Map());
+}
+function cachedParagraphLayout(measurer, key, note, compute) {
+  const cache = sessions.get(measurer);
+  if (!cache) return compute(note);
+  const { index, signature } = key();
+  const cached = cache.get(index);
+  if (cached?.signature === signature) {
+    for (const warning of cached.warnings) note(warning);
+    return structuredClone(cached.result);
+  }
+  const warnings = [];
+  const result = compute((warning) => {
+    warnings.push(warning);
+    note(warning);
+  });
+  if (!cache.has(index) && cache.size >= 4e3) cache.delete(cache.keys().next().value);
+  cache.set(index, { signature, result: structuredClone(result), warnings });
+  return result;
+}
+
 // docx/layout/paragraph-layout.ts
 function layoutParagraph(paragraph, contentWidthPx, measurer, note, lineBox, startToken = 0) {
+  if (lineBox)
+    return measureParagraph(paragraph, contentWidthPx, measurer, note, lineBox, startToken);
+  return cachedParagraphLayout(
+    measurer,
+    () => ({
+      index: JSON.stringify([paragraph.id, contentWidthPx, startToken]),
+      signature: JSON.stringify(paragraph)
+    }),
+    note,
+    (report) => measureParagraph(paragraph, contentWidthPx, measurer, report, void 0, startToken)
+  );
+}
+function measureParagraph(paragraph, contentWidthPx, measurer, note, lineBox, startToken = 0) {
   const { leftPx, rightPx, firstLineExtraPx: initialIndent } = resolveIndents(paragraph);
   const firstLineExtraPx = startToken ? 0 : initialIndent;
   const bodyWidth = Math.max(1, contentWidthPx - leftPx - rightPx);
@@ -4721,7 +4762,8 @@ function layoutParagraph(paragraph, contentWidthPx, measurer, note, lineBox, sta
   const tokenWidth = (token) => token.kind === "word" || token.kind === "space" ? runTextWidth(
     token.text,
     expectDefined(paragraph.runs[token.runIndex], "token run"),
-    measurer
+    measurer,
+    fonts[token.runIndex]
   ) : token.kind === "object" ? paragraph.runs[token.runIndex]?.object?.widthPx ?? 0 : 0;
   const widths = tokens.map(tokenWidth);
   const ends = /* @__PURE__ */ new Set(["tab", "lineBreak", "pageBreak", "columnBreak"]);
@@ -4897,6 +4939,75 @@ function widowControlEnabled(value) {
   return value !== false;
 }
 
+// docx/layout/nested-frame-profile.ts
+var equal = (a, b) => a !== void 0 && b !== void 0 && a.style === b.style && a.color === b.color && Math.abs(a.widthPx - b.widthPx) < 1e-6;
+function nestedFrameProfile(table, tableWidthPx = table.widthPx) {
+  const sides = table.rows.flatMap(
+    (row) => row.cells.flatMap(
+      (cell) => ["top", "right", "bottom", "left"].map((side) => cell.borders?.[side])
+    )
+  );
+  if (sides.every((side) => !side)) return { leftPx: 0, rightPx: 0, bottomPx: 0 };
+  if (!sides.every((side) => side?.style === "solid" && side.widthPx > 0)) return void 0;
+  const first3 = table.rows[0], left = first3.cells[0].borders.left, right = first3.cells.at(-1).borders.right;
+  for (const [index, row] of table.rows.entries()) {
+    if (row.cells.length !== first3.cells.length || !equal(row.cells[0]?.borders?.left, left) || !equal(row.cells.at(-1)?.borders?.right, right))
+      return void 0;
+    for (const [column, cell] of row.cells.entries()) {
+      const sourceWidth = cell.widthPx ?? (tableWidthPx === void 0 ? void 0 : tableWidthPx / row.cells.length);
+      const paintWidth = sourceWidth === void 0 ? void 0 : sourceWidth + (cell.borders.left.widthPx - cell.borders.right.widthPx) / 2 + (column === row.cells.length - 1 ? cell.borders.right.widthPx : 0);
+      if (paintWidth !== void 0 && paintWidth <= 0) return void 0;
+      if (!equal(cell.borders?.top, row.cells[0]?.borders?.top) || !equal(cell.borders?.bottom, row.cells[0]?.borders?.bottom))
+        return void 0;
+      if (column && !equal(row.cells[column - 1]?.borders?.right, cell.borders?.left))
+        return void 0;
+      if (index) {
+        const previous = table.rows[index - 1].cells[column];
+        if (previous.xPx !== cell.xPx || previous.widthPx !== cell.widthPx || !equal(previous.borders?.bottom, cell.borders?.top))
+          return void 0;
+      }
+    }
+  }
+  return {
+    leftPx: left.widthPx,
+    rightPx: right.widthPx,
+    bottomPx: table.rows.at(-1).cells[0].borders.bottom.widthPx
+  };
+}
+
+// docx/layout/nested-fragment-edges.ts
+var plain = (paragraph) => !paragraph.keepLines && !paragraph.keepNext && !paragraph.pageBreakBefore && !paragraph.footnotes?.length && !paragraph.runs.some((run) => run.footnoteReferenceId !== void 0 || run.breakAfter);
+function nestedFragmentEdges(table) {
+  if (table.widthPx === void 0 || !Number.isFinite(table.widthPx) || table.widthPx <= 0 || table.rows.length < 2 || !nestedFrameProfile(table, table.widthPx) || table.rows.some(
+    (row) => row.heightPx !== void 0 || row.heightSpecified || row.cantSplit || row.isHeader || row.cells.length !== 2 || row.cells.some(
+      (cell) => (cell.gridSpan ?? 1) !== 1 || cell.verticalMerge !== void 0 || cell.verticalAlign && cell.verticalAlign !== "top" || cell.blocks?.some((block) => block.kind !== "paragraph") || !(cell.blocks ?? cell.paragraphs).every(
+        (block) => block.kind === "paragraph" && plain(block)
+      )
+    )
+  ))
+    return void 0;
+  const top = table.rows[0].cells.map((cell) => cell.borders?.top);
+  const bottom = table.rows.at(-1).cells.map((cell) => cell.borders?.bottom);
+  return top.every(Boolean) && bottom.every(Boolean) ? { top, bottom } : void 0;
+}
+function reflowNestedFragments(row) {
+  if (row.heightPx !== void 0 || row.heightSpecified || row.cantSplit || row.isHeader || row.cells.length !== 2)
+    return false;
+  let tables = 0;
+  for (const cell of row.cells) {
+    if ((cell.gridSpan ?? 1) !== 1 || cell.verticalMerge !== void 0) return false;
+    if (cell.verticalAlign && cell.verticalAlign !== "top") return false;
+    for (const [index, block] of (cell.blocks ?? cell.paragraphs).entries()) {
+      if (block.kind === "paragraph") {
+        if (!plain(block)) return false;
+      } else {
+        if (index !== 0 || !nestedFragmentEdges(block) || ++tables > 1) return false;
+      }
+    }
+  }
+  return tables === 1;
+}
+
 // docx/layout/table-content.ts
 function cellContentBottom(boxes, paddingBottom = 0) {
   return Math.max(
@@ -4930,44 +5041,21 @@ function clipTableFrames(tables, start, end, inset = 0) {
         }
       ];
     });
-    return [{ ...table, yPx: top - start + inset, heightPx: bottom - top, rows }];
-  });
-}
-
-// docx/layout/nested-frame-profile.ts
-var equal = (a, b) => a !== void 0 && b !== void 0 && a.style === b.style && a.color === b.color && Math.abs(a.widthPx - b.widthPx) < 1e-6;
-function nestedFrameProfile(table, tableWidthPx = table.widthPx) {
-  const sides = table.rows.flatMap(
-    (row) => row.cells.flatMap(
-      (cell) => ["top", "right", "bottom", "left"].map((side) => cell.borders?.[side])
-    )
-  );
-  if (sides.every((side) => !side)) return { leftPx: 0, rightPx: 0, bottomPx: 0 };
-  if (!sides.every((side) => side?.style === "solid" && side.widthPx > 0)) return void 0;
-  const first3 = table.rows[0], left = first3.cells[0].borders.left, right = first3.cells.at(-1).borders.right;
-  for (const [index, row] of table.rows.entries()) {
-    if (row.cells.length !== first3.cells.length || !equal(row.cells[0]?.borders?.left, left) || !equal(row.cells.at(-1)?.borders?.right, right))
-      return void 0;
-    for (const [column, cell] of row.cells.entries()) {
-      const sourceWidth = cell.widthPx ?? (tableWidthPx === void 0 ? void 0 : tableWidthPx / row.cells.length);
-      const paintWidth = sourceWidth === void 0 ? void 0 : sourceWidth + (cell.borders.left.widthPx - cell.borders.right.widthPx) / 2 + (column === row.cells.length - 1 ? cell.borders.right.widthPx : 0);
-      if (paintWidth !== void 0 && paintWidth <= 0) return void 0;
-      if (!equal(cell.borders?.top, row.cells[0]?.borders?.top) || !equal(cell.borders?.bottom, row.cells[0]?.borders?.bottom))
-        return void 0;
-      if (column && !equal(row.cells[column - 1]?.borders?.right, cell.borders?.left))
-        return void 0;
-      if (index) {
-        const previous = table.rows[index - 1].cells[column];
-        if (previous.xPx !== cell.xPx || previous.widthPx !== cell.widthPx || !equal(previous.borders?.bottom, cell.borders?.top))
-          return void 0;
+    if (table.fragmentEdges && rows.length) {
+      const edges = table.fragmentEdges;
+      for (const [row, side] of [
+        [rows[0], "top"],
+        [rows.at(-1), "bottom"]
+      ]) {
+        if (row.geometry)
+          row.geometry = row.geometry.map((cell, index) => ({
+            ...cell,
+            borders: { ...cell.borders, [side]: edges[side][index] }
+          }));
       }
     }
-  }
-  return {
-    leftPx: left.widthPx,
-    rightPx: right.widthPx,
-    bottomPx: table.rows.at(-1).cells[0].borders.bottom.widthPx
-  };
+    return [{ ...table, yPx: top - start + inset, heightPx: bottom - top, rows }];
+  });
 }
 
 // docx/layout/table-cell-layout.ts
@@ -4977,7 +5065,7 @@ function cellParagraphs(cell) {
   );
   return cell.blocks ? walk(cell.blocks) : cell.paragraphs;
 }
-function stackCellBlocks(cell, width, measurer, note, top, starts) {
+function stackCellBlocks(cell, width, measurer, note, top, starts, physicalFragments = false) {
   if (!cell.blocks)
     return stackParagraphs(
       starts ? cell.paragraphs.filter((p) => starts.has(p.id)) : cell.paragraphs,
@@ -4998,6 +5086,7 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
       y = result.heightPx;
       continue;
     }
+    const edges = physicalFragments ? nestedFragmentEdges(block) : void 0;
     const tableWidth = block.widthPx ?? width;
     const profile = nestedFrameProfile(block, tableWidth);
     const reserveBorders = profile !== void 0;
@@ -5015,13 +5104,21 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
       widthPx: paintedWidth,
       yPx: y,
       heightPx: 0,
-      rows: []
+      rows: [],
+      ...edges ? { fragmentEdges: edges } : {}
     };
     for (const row of block.rows) {
       if (starts && !row.cells.some((nested) => cellParagraphs(nested).some((p) => starts.has(p.id))))
         continue;
+      const visibleRow = edges && starts && !frame.rows.length ? {
+        ...row,
+        cells: row.cells.map((cell2, index) => ({
+          ...cell2,
+          borders: { ...cell2.borders, top: edges.top[index] }
+        }))
+      } : row;
       const layout = layoutRow(
-        row,
+        visibleRow,
         tableWidth,
         measurer,
         note,
@@ -5047,6 +5144,7 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
             xPx: x + geometry.xPx + geometry.paddingLeftPx + (paragraph.xPx ?? 0),
             widthPx: paragraph.widthPx ?? Math.max(1, geometry.widthPx - geometry.paddingLeftPx - geometry.paddingRightPx),
             readOnly: true,
+            ...edges ? { tableFragmentBottomPx: edges.bottom[index].widthPx } : {},
             tableFrameInsets: {
               top: (paragraph.tableFrameInsets?.top ?? 0) + (reserveBorders ? geometry.borders?.top?.widthPx ?? 0 : 0),
               bottom: (paragraph.tableFrameInsets?.bottom ?? 0) + (reserveBorders ? geometry.borders?.bottom?.widthPx ?? 0 : 0)
@@ -5095,7 +5193,7 @@ function stackParagraphs(paragraphs, widthPx, measurer, note, topPx = 0, startTo
   }
   return { heightPx: y, boxes };
 }
-function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, frameBorders = false, frameLeftBorderPx) {
+function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, frameBorders = false, frameLeftBorderPx, physicalFragments = reflowNestedFragments(row)) {
   const count = row.cells.length || 1;
   let x = 0;
   const geometry = [];
@@ -5121,7 +5219,8 @@ function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, fr
       measurer,
       note,
       padding.top,
-      starts
+      starts,
+      physicalFragments
     );
     const heightPx2 = content2.heightPx + padding.bottom;
     geometry.push({
@@ -5158,16 +5257,16 @@ function splitCellAtHeight(boxes, cutHeightPx, paragraphCuts) {
   let beforeHeightPx = 0;
   for (const box of boxes) {
     const cut = paragraphCuts?.get(box.blockId) ?? cutHeightPx;
-    if (box.yPx + box.heightPx + (box.tableFrameInsets?.bottom ?? 0) <= cut) {
+    if (box.yPx + box.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0) <= cut) {
       before.push(box);
       beforeHeightPx = Math.max(
         beforeHeightPx,
-        box.yPx + box.heightPx + (box.tableFrameInsets?.bottom ?? 0)
+        box.yPx + box.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0)
       );
       continue;
     }
     const beforeLines = box.lines.filter(
-      (line2) => box.yPx + line2.yPx + line2.heightPx + (box.tableFrameInsets?.bottom ?? 0) <= cut
+      (line2) => box.yPx + line2.yPx + line2.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0) <= cut
     );
     const afterLines = box.lines.slice(beforeLines.length);
     if (beforeLines.length) {
@@ -5175,7 +5274,7 @@ function splitCellAtHeight(boxes, cutHeightPx, paragraphCuts) {
       before.push({ ...box, heightPx: bottom, lines: beforeLines });
       beforeHeightPx = Math.max(
         beforeHeightPx,
-        box.yPx + bottom + (box.tableFrameInsets?.bottom ?? 0)
+        box.yPx + bottom + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0)
       );
     }
     if (afterLines.length) {
@@ -5983,6 +6082,55 @@ function placeParagraph(cursor, placement, note) {
   }
 }
 
+// docx/layout/table-paragraph-keeps.ts
+function tableParagraphKeeps(table) {
+  const row = table.rows[0];
+  if (table.rows.length !== 1 || !row || row.cells.length !== 2 || row.heightPx !== void 0 || row.heightSpecified || row.cantSplit || row.isHeader || table.widthPx === void 0 || !Number.isFinite(table.widthPx) || table.widthPx <= 0 || !nestedFrameProfile(table, table.widthPx) || row.cells.some(
+    (cell) => !cell.borders?.top || (cell.gridSpan ?? 1) !== 1 || cell.verticalMerge !== void 0 || cell.verticalAlign && cell.verticalAlign !== "top" || cell.blocks?.some((block) => block.kind !== "paragraph")
+  ))
+    return void 0;
+  const paragraphs = row.cells.flatMap(cellParagraphs);
+  if (paragraphs.some(
+    (p) => p.keepNext || p.pageBreakBefore || p.footnotes?.length || p.floats?.length || p.borders || p.shading || p.widowControl !== false || p.lineSpacingRule !== "exact" || p.lineSpacingTwips === void 0 || !Number.isFinite(p.lineSpacingTwips) || p.lineSpacingTwips <= 0 || (p.spacingBeforeTwips ?? 0) !== 0 || (p.spacingAfterTwips ?? 0) !== 0 || p.runs.some((run) => run.footnoteReferenceId !== void 0 || run.breakAfter || run.object)
+  ))
+    return void 0;
+  const sources = new Map(paragraphs.map((p) => [p.id, p]));
+  if (sources.size !== paragraphs.length || !paragraphs.some((p) => p.keepLines)) return void 0;
+  return new TableParagraphKeeps(sources);
+}
+var TableParagraphKeeps = class {
+  constructor(sources) {
+    this.sources = sources;
+  }
+  sources;
+  /** Before an ordinary row starts, a first kept paragraph can defer the entire row. */
+  startupMinimum(row) {
+    return Math.max(
+      0,
+      ...row.cells.map((cell, index) => {
+        const first3 = cell[0];
+        return first3 && this.sources.get(first3.blockId)?.keepLines ? first3.yPx + first3.heightPx + (row.cellPadding?.[index]?.bottom ?? 0) : 0;
+      })
+    );
+  }
+  /** Defer an unstarted paragraph and its following cell content, leaving other cells independent. */
+  cuts(row, available, fresh) {
+    const cuts = /* @__PURE__ */ new Map();
+    row.cells.forEach((cell, index) => {
+      const padding = row.cellPadding?.[index] ?? { top: 0, bottom: 0 };
+      let deferred = false;
+      for (const [position, box] of cell.entries()) {
+        const source = this.sources.get(box.blockId);
+        const atFreshOrigin = fresh && position === 0 && Math.abs(box.yPx - padding.top) < 1e-6;
+        if (!deferred && source?.keepLines && (box.lines[0]?.firstToken ?? 0) === 0 && box.yPx + box.heightPx + padding.bottom > available + 1e-6 && !atFreshOrigin)
+          deferred = true;
+        if (deferred) cuts.set(box.blockId, 0);
+      }
+    });
+    return cuts.size ? cuts : void 0;
+  }
+};
+
 // docx/layout/table-note-stories.ts
 function independentNoteStories(cell) {
   const first3 = cell.blocks?.[0];
@@ -6022,7 +6170,7 @@ function measuredNoteReferences(paragraphs) {
 }
 
 // docx/layout/table-border-layout.ts
-function layoutBorderedRow(row, width, measurer, note, profile, remaining) {
+function layoutBorderedRow(row, width, measurer, note, profile, remaining, physicalFragments) {
   const reserved = profile !== void 0 && (profile.leftPx > 0 || profile.rightPx > 0 || profile.bottomPx > 0);
   const layout = layoutRow(
     row,
@@ -6032,7 +6180,8 @@ function layoutBorderedRow(row, width, measurer, note, profile, remaining) {
     remaining,
     void 0,
     reserved,
-    profile?.leftPx
+    profile?.leftPx,
+    physicalFragments
   );
   if (!reserved) return layout;
   const bottom = Math.max(0, ...layout.geometry.map((cell) => cell.borders?.bottom?.widthPx ?? 0));
@@ -6332,6 +6481,12 @@ var TableFootnotes = class {
 function placeTable(cursor, table, measurer, note, resolveFootnotes) {
   const firstBodyRow = table.rows.findIndex((row) => !row.isHeader);
   const headerRows = table.rows.slice(0, firstBodyRow < 0 ? table.rows.length : firstBodyRow);
+  const nativeFragments = new Map(table.rows.map((row) => [row, reflowNestedFragments(row)]));
+  const paragraphKeeps = tableParagraphKeeps(table);
+  const hasParagraphKeeps = table.rows.some(
+    (row) => row.cells.some((cell) => cellParagraphs(cell).some((paragraph) => paragraph.keepLines))
+  );
+  let keepWarning = false;
   const xPosition = () => {
     const width = (table.widthPx ?? cursor.columnWidthPx) + (activeBorders ? (profile.leftPx + profile.rightPx) / 2 : 0);
     return table.alignment === "center" ? Math.max(0, (cursor.columnWidthPx - width) / 2) : table.alignment === "right" ? Math.max(0, cursor.columnWidthPx - width) : table.indentPx ?? 0;
@@ -6342,13 +6497,14 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
     note(
       "Ordinary table border occupancy remains approximate for missing edges, non-solid or conflicting shared borders and changing row grids."
     );
-  const layoutRow2 = (row, width, m, n2, remaining) => layoutBorderedRow(
+  const layoutRow2 = (row, width, m, n2, remaining, sourceRow = row) => layoutBorderedRow(
     row,
     activeBorders ? table.widthPx ?? width : width,
     m,
     n2,
     profile,
-    remaining
+    remaining,
+    nativeFragments.get(sourceRow) ?? false
   );
   const fragmentBorders = new TableFragmentBorders();
   let fragmentRows = [];
@@ -6405,6 +6561,17 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
     let remainingRow = initial;
     while (remainingRow) {
       fragmentHeight += fragmentBorders.remove(fragmentRows.at(-1));
+      const keeps = paragraphKeeps && cursor.page.columns.length === 1 && cursor.column.startYPx === void 0 && Math.abs(cursor.remainingHeightPx() - (cursor.columnHeightPx - cursor.usedColumnHeightPx)) < 1e-6 ? paragraphKeeps : void 0;
+      if (hasParagraphKeeps && !keeps && !keepWarning) {
+        note(
+          "Table-cell keep-lines pagination remains approximate outside the measured ordinary automatic two-cell, top-aligned, single-column, note-free row with direct exact-spaced paragraphs, zero paragraph spacing and widow control off."
+        );
+        keepWarning = true;
+      }
+      if (keeps && remainingRow === initial && !cursor.atColumnTop && keeps.startupMinimum(remainingRow) > cursor.remainingHeightPx() - fragmentHeight + 1e-6) {
+        startNewFragment();
+        continue;
+      }
       const minimum = cantSplit ? Math.min(remainingRow.heightPx, cursor.columnHeightPx) : Math.min(
         ...remainingRow.cells.flatMap(
           (cell, index) => cell.map(
@@ -6421,7 +6588,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
             cursor.columnWidthPx,
             measurer,
             note,
-            remainingRow.cells
+            remainingRow.cells,
+            row
           );
           if (fragmentRows.length) {
             fragmentRows = [];
@@ -6431,7 +6599,7 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
           continue;
         }
       }
-      if (footnotes) {
+      if (footnotes && !keeps) {
         const selected = footnotes.choose(remainingRow, cantSplit);
         if (selected) {
           if (selected.layout === remainingRow) {
@@ -6453,7 +6621,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
             cursor.columnWidthPx,
             measurer,
             note,
-            after2.cells
+            after2.cells,
+            row
           ) : after2;
           continue;
         }
@@ -6466,7 +6635,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
               cursor.columnWidthPx,
               measurer,
               note,
-              remainingRow === initial ? void 0 : remainingRow.cells
+              remainingRow === initial ? void 0 : remainingRow.cells,
+              row
             );
           continue;
         }
@@ -6501,7 +6671,17 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
         remainingRow = null;
         continue;
       }
-      const { before, after } = splitRowAtHeight(remainingRow, Math.max(0, remaining));
+      const paragraphCuts = keeps?.cuts(
+        remainingRow,
+        remaining,
+        cursor.atColumnTop && fragmentRows.length === 0
+      );
+      const { before, after } = splitRowAtHeight(
+        remainingRow,
+        Math.max(0, remaining),
+        void 0,
+        paragraphCuts
+      );
       if (!before.cells.some((cell) => cell.length) && cursor.atColumnTop && fragmentRows.every((row2) => row2.repeated)) {
         note(
           "A table row cannot fit a line in an empty page/column and was placed without splitting."
@@ -6513,17 +6693,24 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
       const previousWidth = cursor.columnWidthPx;
       if (before.cells.some((cell) => cell.length)) fragmentRows.push(toRowBox(before, false));
       startNewFragment();
-      remainingRow = after && previousWidth !== cursor.columnWidthPx ? layoutRow2(
+      remainingRow = after && (paragraphCuts || previousWidth !== cursor.columnWidthPx || nativeFragments.get(row)) ? layoutRow2(
         { ...row, heightPx: 0, heightRule: "atLeast" },
         cursor.columnWidthPx,
         measurer,
         note,
-        after.cells
+        after.cells,
+        row
       ) : after;
     }
   }
   for (const row of table.rows) {
     const layout = layoutRow2(row, cursor.columnWidthPx, measurer, note);
+    if (layout.heightPx > cursor.remainingHeightPx() && !nativeFragments.get(row) && row.cells.some(
+      (cell) => cell.blocks?.some((block) => block.kind === "table" && block.rows.length > 1)
+    ))
+      note(
+        "Nested physical border edges at page cuts remain approximate outside automatic, top-aligned tables with two or more two-cell, note-free rows, direct paragraphs and complete shared borders."
+      );
     if (activeBorders && layout.heightPx > cursor.remainingHeightPx() && row.cells.some(
       (cell) => (!measuredNoteReferences(row.cells.flatMap(cellParagraphs)) || !independentNoteStories(cell)) && cell.blocks?.some((block) => block.kind === "table") && cellParagraphs(cell).some((p) => p.footnotes?.length)
     ))
@@ -6787,9 +6974,9 @@ var SectionFlow = class {
     const page = this.cursor.page;
     const exclusions = this.exclusions?.get(page.index);
     if (!exclusions) return void 0;
-    const plain = this.paragraphLayout(index);
+    const plain2 = this.paragraphLayout(index);
     const topPx = page.marginTopPx + this.cursor.y + spacingBeforePx;
-    const bottomPx = topPx + plain.contentHeightPx;
+    const bottomPx = topPx + plain2.contentHeightPx;
     if (!exclusions.some((item) => item.yPx < bottomPx && item.yPx + item.heightPx > topPx))
       return void 0;
     return layoutParagraph(
@@ -7054,6 +7241,7 @@ function border(side, theme, preserveSingleWidth = false) {
 function rowLayout(props) {
   if (!props) return {};
   return {
+    ...props.heightTwips !== void 0 ? { heightSpecified: true } : {},
     ...props.heightTwips ? { heightPx: twipsToPx2(props.heightTwips), heightRule: props.heightRule ?? "atLeast" } : {},
     ...props.cantSplit ? { cantSplit: true } : {},
     ...props.header ? { isHeader: true } : {}
@@ -7118,6 +7306,8 @@ function adaptTable(table, model, adaptParagraph, _nested = false) {
         const fill = cssHex(visuals.shadingFill);
         return {
           paragraphs: cell.paragraphs.map(adaptParagraph),
+          ...cell.gridSpan !== void 0 ? { gridSpan: cell.gridSpan } : {},
+          ...cell.verticalMerge ? { verticalMerge: cell.verticalMerge } : {},
           ...cell.sourceBlocks ? {
             blocks: cellSourceBlocks(cell).map(
               (block) => block.type === "paragraph" ? adaptParagraph(block) : adaptTable(block, model, adaptParagraph, true)
@@ -7687,6 +7877,20 @@ function cssFontStack(family) {
   );
 }
 
+// docx/layout/layout-session.ts
+function createLayoutSession(measurer) {
+  const sessionMeasurer = {
+    widthOf: (text2, font) => measurer.widthOf(text2, font),
+    lineHeightOf: (font) => measurer.lineHeightOf(font),
+    ...measurer.ascentOf ? { ascentOf: measurer.ascentOf.bind(measurer) } : {}
+  };
+  registerParagraphCache(sessionMeasurer);
+  return {
+    layoutDocument: (input) => layoutDocument(input, sessionMeasurer),
+    layoutDocumentModel: (model, options = {}) => layoutDocumentModel(model, sessionMeasurer, options)
+  };
+}
+
 exports.DEFAULT_FONT_FAMILY = DEFAULT_FONT_FAMILY;
 exports.DEFAULT_FONT_SIZE_PT = DEFAULT_FONT_SIZE_PT;
 exports.DEFAULT_TAB_STOP_PX = DEFAULT_TAB_STOP_PX;
@@ -7699,6 +7903,7 @@ exports.adjustForWidowOrphan = adjustForWidowOrphan;
 exports.appendBreakMarker = appendBreakMarker;
 exports.cellVerticalOffset = cellVerticalOffset;
 exports.createFakeMeasurer = createFakeMeasurer;
+exports.createLayoutSession = createLayoutSession;
 exports.cssFontStack = cssFontStack;
 exports.fieldDisplayText = fieldDisplayText;
 exports.floatPosition = floatPosition;

package/dist/docx/layout/index.d.ts

@@ -19,4 +19,5 @@ export type { LayoutReviewOptions } from './review-display.js';
 export { floatPosition, positionFloats, FLOAT_WRAP_NOTE } from './floats.js';
 export { cssFontStack } from './fonts.js';
 export { placeTab, type TabPlacement } from './tab-stops.js';
+export { createLayoutSession } from './layout-session.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/docx/layout/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../docx/layout/index.ts"],"names":[],"mappings":"AACA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../docx/layout/index.ts"],"names":[],"mappings":"AACA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC"}