kordoc 4.24.1 → 4.24.2

package/README.md

@@ -119,15 +119,15 @@ await writeFile("보고서.hwpx", Buffer.from(hwpx))
 
 ## 최근 업데이트
 
-최신 배포: **[4.24.1](https://github.com/chrisryugj/kordoc/releases/tag/v4.24.1)** · 2026-10-21
+최신 배포: **[4.24.2](https://github.com/chrisryugj/kordoc/releases/tag/v4.24.2)** · 2026-10-24
 
 | 버전 | 주요 변경 |
 | --- | --- |
+| 4.24.2 | 렌더를 한컴 PDF 와 더 가깝게: 쪽을 넘어온 떠 있는 표·칸 안 여러 개체 쌓기·세로 오프셋 이중 계산·마지막 행 높이·줄바꿈 앞 공백·쪽 번호(렌더 글 위치 86,508 → 86,954 / 90,550) |
 | 4.24.1 | 검수 수정: 블록 검수 희소 표 메모리 폭주·천원 규칙 이차 시간·예산 검산(목록 줄·소계(A)·비율 행), `generate --template` 견본 덮어쓰기 차단 |
 | 4.24.0 | 블록 단위 검수 `lintBlocks`: 열린 문서의 문단·표 칸을 블록으로 넘기면 지적을 블록 id·블록 안 위치로 돌려줌(CLI `lint-blocks`, MCP `lint_document`, 워커, Python SDK) |
 | 4.23.1 | 견본 생성 제목표 결재선 칸을 직위별로, 산출근거 줄·표 칸 천원 단위 오탐 제거 |
 | 4.23.0 | 부서 서식 견본으로 새 문서 생성(`generate --template`), 예산 문서 검수(`lint --budget`), MCP `lint_document` |
-| 4.22.18 | kordoc 생성 보고서의 제목 틀·장 띠·요약 상자 패치, 변경 추적 HWP 패치 결과가 한글에 보이지 않던 문제 |
 
 이전 버전과 상세 내용은 [변경 이력](CHANGELOG.md)에 있습니다.
 

package/dist/{-TSN4SWFV.js → -SRNEV7LS.js}

@@ -58,10 +58,10 @@ import {
   usesGaejosikMunche,
   usesLogicStructure,
   validateHwpx
-} from "./chunk-4BCQ3FQS.js";
+} from "./chunk-C6ZVB547.js";
 import {
   blocksToChunks
-} from "./chunk-MI25BZSU.js";
+} from "./chunk-NMFFIUI6.js";
 import {
   SPACE_EM_FIXED,
   SPACE_EM_FONT,
@@ -86,20 +86,20 @@ import {
   renderSceneToHtml,
   simulateWrap,
   simulateWrapKeepWord
-} from "./chunk-LBPUPT6S.js";
-import "./chunk-LEL5UBGR.js";
+} from "./chunk-DHMBPMKC.js";
+import "./chunk-E6VBLBOO.js";
 import {
   blocksToPages
-} from "./chunk-RS2Q64N5.js";
+} from "./chunk-7NTMM6PO.js";
 import "./chunk-VKVDMH7X.js";
 import "./chunk-VQFA55IC.js";
 import "./chunk-BYMPPVT3.js";
-import "./chunk-W4P3QPSB.js";
+import "./chunk-KUC5I5MB.js";
 import {
   blocksToMarkdown,
   flattenLayoutTables,
   hasStructuredCellContent
-} from "./chunk-BIVO2GMU.js";
+} from "./chunk-WDSTW3BD.js";
 import {
   ValueCursor,
   applySplices,
@@ -113,11 +113,11 @@ import {
   isLabelCell,
   placeSealHwpx,
   scanSectionXml
-} from "./chunk-5EP6VFP5.js";
-import "./chunk-L2OJUIII.js";
+} from "./chunk-NJ5RUDCW.js";
+import "./chunk-RIRPLFPN.js";
 import {
   VERSION
-} from "./chunk-YE4T2P6F.js";
+} from "./chunk-LMEF7FN5.js";
 import {
   DEFAULT_REDACT_RULES,
   redactMarkdown,
@@ -227,4 +227,4 @@ export {
   usesLogicStructure,
   validateHwpx
 };
-//# sourceMappingURL=-TSN4SWFV.js.map
+//# sourceMappingURL=-SRNEV7LS.js.map

package/dist/{chunk-B77K6J3U.js → chunk-3HN65YAL.js}

@@ -1,6 +1,6 @@
 import {
   blocksToMarkdown
-} from "./chunk-G7SKCXQG.js";
+} from "./chunk-TW3V6FSH.js";
 
 // src/image/transcode.ts
 import { deflateSync } from "zlib";
@@ -168,4 +168,4 @@ export {
   inlineImagesIntoMarkdown,
   blocksToPages
 };
-//# sourceMappingURL=chunk-B77K6J3U.js.map
+//# sourceMappingURL=chunk-3HN65YAL.js.map

package/dist/{chunk-SWCO5NP6.js → chunk-4745MFQU.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   parse
-} from "./chunk-4BCQ3FQS.js";
+} from "./chunk-C6ZVB547.js";
 import {
   classifyError,
   sanitizeError,
   toArrayBuffer
-} from "./chunk-YE4T2P6F.js";
+} from "./chunk-LMEF7FN5.js";
 
 // src/cli/worker-parse.ts
 import { readFileSync, statSync } from "fs";
@@ -26,4 +26,4 @@ async function parseWorkerFile(absPath, options) {
 export {
   parseWorkerFile
 };
-//# sourceMappingURL=chunk-SWCO5NP6.js.map
+//# sourceMappingURL=chunk-4745MFQU.js.map

package/dist/{chunk-2SMANR76.js → chunk-4XC4O7FJ.js}

@@ -5,7 +5,7 @@ import {
 import {
   UNRULED_REGION_TABLES,
   extractPageBlocksWithLines
-} from "./chunk-ZR3BPESP.js";
+} from "./chunk-VPSF5LEM.js";
 import {
   validateOcrOptions
 } from "./chunk-BYMPPVT3.js";
@@ -16,11 +16,11 @@ import {
   ocrSourcePath,
   parseCharacterDict,
   resolveOcrModels
-} from "./chunk-V2GW3M2F.js";
+} from "./chunk-R2GIGE5H.js";
 import {
   KordocError,
   OPTIONAL_DEP_INSTALL_HINT
-} from "./chunk-YE4T2P6F.js";
+} from "./chunk-LMEF7FN5.js";
 
 // src/ocr/ruling-lines.ts
 var INK_LUMA_MAX = 205;
@@ -2215,4 +2215,4 @@ export {
   groupOcrLines,
   ocrItemsToBlocks
 };
-//# sourceMappingURL=chunk-2SMANR76.js.map
+//# sourceMappingURL=chunk-4XC4O7FJ.js.map

package/dist/{chunk-RS2Q64N5.js → chunk-7NTMM6PO.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   blocksToMarkdown
-} from "./chunk-BIVO2GMU.js";
+} from "./chunk-WDSTW3BD.js";
 
 // src/page-markdown.ts
 function blocksToPages(blocks, render = blocksToMarkdown) {
@@ -29,4 +29,4 @@ function blocksToPages(blocks, render = blocksToMarkdown) {
 export {
   blocksToPages
 };
-//# sourceMappingURL=chunk-RS2Q64N5.js.map
+//# sourceMappingURL=chunk-7NTMM6PO.js.map

package/dist/{chunk-4BCQ3FQS.js → chunk-C6ZVB547.js}

@@ -51,10 +51,10 @@ import {
   resolveParaHeading,
   simulateWrap,
   takeTocLeaders
-} from "./chunk-LBPUPT6S.js";
+} from "./chunk-DHMBPMKC.js";
 import {
   blocksToPages
-} from "./chunk-RS2Q64N5.js";
+} from "./chunk-7NTMM6PO.js";
 import {
   bmpToPng,
   inlineImagesIntoMarkdown
@@ -76,7 +76,7 @@ import {
   tidyScriptTags,
   unframeLayoutTables,
   wrapScript
-} from "./chunk-W4P3QPSB.js";
+} from "./chunk-KUC5I5MB.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -99,7 +99,7 @@ import {
   noteTableHtml,
   sanitizeText,
   visibleText
-} from "./chunk-BIVO2GMU.js";
+} from "./chunk-WDSTW3BD.js";
 import {
   ANNOTATION_BLANK_RE,
   ValueCursor,
@@ -132,7 +132,7 @@ import {
   resolveUnmatched,
   scanInlineSegments,
   scanSectionXml
-} from "./chunk-5EP6VFP5.js";
+} from "./chunk-NJ5RUDCW.js";
 import {
   MAX_DECOMPRESS_SIZE,
   MAX_XML_DEPTH,
@@ -149,7 +149,7 @@ import {
   localName,
   rawTextContent,
   readZipEntry
-} from "./chunk-L2OJUIII.js";
+} from "./chunk-RIRPLFPN.js";
 import {
   KordocError,
   classifyError,
@@ -165,7 +165,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-YE4T2P6F.js";
+} from "./chunk-LMEF7FN5.js";
 
 // src/table/visual.ts
 import { readFile as readFile2 } from "fs/promises";
@@ -19329,7 +19329,7 @@ var MIN_SIDE = 24;
 async function ocrEmbeddedImages(blocks, options, warnings) {
   const ocr = options?.ocr;
   if (ocr !== true && ocr !== "force" && typeof ocr !== "function") return false;
-  const { parseImageDocument } = await import("./image-ocr-UNTKJLQL.js");
+  const { parseImageDocument } = await import("./image-ocr-3QB2HLSI.js");
   let inserted = false, unreadable = 0;
   let failed = null;
   const walk = async (list, depth) => {
@@ -33059,7 +33059,7 @@ function scriptsOff(r, off) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-UNTKJLQL.js");
+    const { parseImageDocument } = await import("./image-ocr-3QB2HLSI.js");
     const { blocks, warnings, lines } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -33123,7 +33123,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-YKATDDQV.js");
+    const mod = await import("./parser-C3ARF26I.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {
@@ -33356,4 +33356,4 @@ export {
   parseHwpml,
   fillForm
 };
-//# sourceMappingURL=chunk-4BCQ3FQS.js.map
+//# sourceMappingURL=chunk-C6ZVB547.js.map

package/dist/{chunk-LBPUPT6S.js → chunk-DHMBPMKC.js}

@@ -2,7 +2,7 @@
 import {
   loadSharp,
   rasterizePageSvg
-} from "./chunk-LEL5UBGR.js";
+} from "./chunk-E6VBLBOO.js";
 import {
   inlineImagesIntoMarkdown
 } from "./chunk-VKVDMH7X.js";
@@ -16,7 +16,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-W4P3QPSB.js";
+} from "./chunk-KUC5I5MB.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -32,7 +32,7 @@ import {
   mapPuaText,
   markNonLayoutTable,
   romanNumeral
-} from "./chunk-BIVO2GMU.js";
+} from "./chunk-WDSTW3BD.js";
 import {
   DEFAULT_CHAR,
   DEFAULT_PARA_GEOM,
@@ -46,7 +46,7 @@ import {
   hwpxAppMajor,
   parseRenderStyles,
   readZipEntry
-} from "./chunk-L2OJUIII.js";
+} from "./chunk-RIRPLFPN.js";
 import {
   KordocError,
   compareSectionPaths,
@@ -54,7 +54,7 @@ import {
   precheckZipSize,
   sanitizeHref,
   toArrayBuffer
-} from "./chunk-YE4T2P6F.js";
+} from "./chunk-LMEF7FN5.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -130,7 +130,7 @@ function tableColumnBoundaries(constraints, count, total, noExactRow = false) {
   const lp = longestPathBoundaries(constraints, count);
   return lp && Math.abs(lp.x[count] - total) <= 2 && (noExactRow || lp.x.every((v, k) => Math.abs(v - prop[k]) <= 2 || lp.tight[k])) ? lp.x : prop;
 }
-function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY) {
+function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, shrinkLast = false) {
   const h = new Array(rowCount).fill(0);
   for (const c of cells) {
     if (c.rowSpan === 1 && c.rowAddr >= 0 && c.rowAddr < rowCount) {
@@ -177,6 +177,9 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY) {
       total += add;
     }
   }
+  const last = rowCount - 1, over = total - maxTotal;
+  const lastCells = cells.filter((c) => c.rowAddr + c.rowSpan - 1 === last);
+  if (shrinkLast && over > 0 && last >= 0 && lastCells.length && lastCells.every((c) => c.rowSpan === 1 && c.contentH != null && c.contentH <= h[last] - over)) h[last] -= over;
   return h;
 }
 
@@ -11443,9 +11446,9 @@ function cellContentExtent(cell, memo) {
       const pos = findChildByLocalName(o.el, "pos");
       if ((pos?.getAttribute("vertRelTo") ?? "PARA") !== "PARA") continue;
       const om = findChildByLocalName(o.el, "outMargin");
-      const pushed = baseV - (num(om, "top") + o.height + num(om, "bottom"));
-      const anchor = pushed >= (paraStart > 0 ? paraStart - 100 : -100) ? pushed : baseV - (memo?.paraGeom?.get(p.getAttribute("paraPrIDRef") ?? "")?.spaceBefore ?? 0);
       const vo = num(pos, "vertOffset");
+      const pushed = baseV - (Math.max(0, vo) + num(om, "top") + o.height + num(om, "bottom"));
+      const anchor = pushed >= (paraStart > 0 ? paraStart - 100 : -100) ? pushed : baseV - (memo?.paraGeom?.get(p.getAttribute("paraPrIDRef") ?? "")?.spaceBefore ?? 0);
       const oh = o.tag === "tbl" ? Math.max(o.height, measureTableHeight(o.el, memo)) : o.height;
       ext = Math.max(ext, anchor + num(om, "top") + Math.max(0, vo) + oh);
     }
@@ -11491,6 +11494,21 @@ function collectCells(tbl) {
   }
   return cells;
 }
+function inCell(el) {
+  for (let n = el.parentNode; n; n = n.parentNode) if (ln(n) === "tc") return true;
+  return false;
+}
+function splitSaved(c) {
+  let prev = Number.NEGATIVE_INFINITY;
+  for (const p of c.sub ? elements(c.sub) : []) {
+    if (ln(p) !== "p") continue;
+    for (const s of buildPara(p).segs) {
+      if (s.vertpos < prev) return true;
+      prev = s.vertpos;
+    }
+  }
+  return false;
+}
 function measureTableRowHeights(tbl, memo) {
   const cells = collectCells(tbl);
   if (cells.length === 0 || cells.length > 4096) return [];
@@ -11501,7 +11519,8 @@ function measureTableRowHeights(tbl, memo) {
     // (같은 판 PDF: 두 줄 든 2행 병합 칸 내용 2882 > 저장 2564 → 둘째 행이 318 자라고 첫 행은 그대로)
     cells.map((c) => ({ rowAddr: c.ra, rowSpan: c.rs, height: (c.rs > 1 ? Math.max(c.h, cellContentExtent(c, memo) + c.marginT + c.marginB) : c.h) - sp * (c.rs - 1), contentH: c.rs === 1 ? cellContentExtent(c, memo) + c.marginT + c.marginB : void 0 })),
     nRows,
-    num(findChildByLocalName(tbl, "sz"), "height") - (sp > 0 ? sp * (nRows + 1) : 0) || Number.POSITIVE_INFINITY
+    num(findChildByLocalName(tbl, "sz"), "height") - (sp > 0 ? sp * (nRows + 1) : 0) || Number.POSITIVE_INFINITY,
+    !inCell(tbl) && !cells.some((c) => c.ra + c.rs === nRows && splitSaved(c))
   );
   if (sp > 0) {
     for (let r = 0; r < rows.length; r++) rows[r] += sp;
@@ -13461,7 +13480,8 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
           rem = Math.max(rem, end - ls[k][0] + c.marginT + c.marginB);
         }
         if (allFit) {
-          if (!first && h <= pageBottom - contTop && rowCells.some((c) => cellContentExtent(c) + c.marginT + c.marginB > avail)) {
+          const spanCells = cells.filter((c) => c.ra === r && c.rs > 1);
+          if (!first && h <= pageBottom - contTop && [...rowCells, ...spanCells].some((c) => cellContentExtent(c) + c.marginT + c.marginB > avail)) {
             page++;
             y = contTop;
             first = true;
@@ -13659,9 +13679,11 @@ function shapeGeometry(o, boxX, boxY, defs, images, warn, local = false) {
 function linePushedBy(o, lineV, paraTop) {
   if (paraTop === void 0) return false;
   const om = findChildByLocalName(o.el, "outMargin");
-  return Math.abs(lineV - (num(om, "top") + o.height + num(om, "bottom")) - paraTop) <= 10;
+  const pos = findChildByLocalName(o.el, "pos");
+  const raw = num(pos, "vertOffset"), vo = (pos?.getAttribute("vertRelTo") ?? "PARA") === "PARA" ? Math.max(0, raw >= 2 ** 31 ? raw - 2 ** 32 : raw) : 0;
+  return Math.abs(lineV - (vo + num(om, "top") + o.height + num(om, "bottom")) - paraTop) <= 10;
 }
-function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = false, paraStartV, laterLineH) {
+function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = false, paraStartV, lineH, lineSB = 0) {
   const { PW, PH, ML, MT, BODY_W, BODY_H } = ctx.geom;
   const pos = findChildByLocalName(o.el, "pos");
   const om = findChildByLocalName(o.el, "outMargin");
@@ -13683,13 +13705,14 @@ function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = fals
     y = va === "BOTTOM" ? MT + BODY_H - h - vo : va === "CENTER" ? MT + (BODY_H - h) / 2 + vo : MT + vo;
   } else if (wrap === "TOP_AND_BOTTOM") {
     const lineV = anchorLineV ?? baseV;
-    const pushed = lineV - (omT + h + omB);
-    const below = laterLineH !== void 0 && vo + omT >= laterLineH;
-    const anchor = below ? lineV : stayLine !== false ? lineV - stayLine : pushed >= -100 ? pushed : paraStartV !== void 0 ? paraStartV : lineV;
+    const pushed = lineV - (vo + omT + h + omB);
+    const below = lineH !== void 0 && vo + omT >= lineH && !(paraStartV !== void 0 && Math.abs(pushed - paraStartV) <= 10);
+    const anchor = below ? lineV - lineSB : stayLine !== false ? lineV - stayLine : pushed >= -100 ? pushed : paraStartV !== void 0 ? paraStartV : lineV;
     y = oy + anchor + omT + vo;
   } else {
     const origin = vrel === "PARA" && wrap === "SQUARE" ? paraStartV ?? baseV : baseV;
-    y = oy + Math.max(origin + vo, wrap === "SQUARE" && anchorLineV !== void 0 ? anchorLineV : -Infinity) + omT;
+    const later = vrel === "PARA" && wrap === "SQUARE" && anchorLineV !== void 0 && anchorLineV > baseV;
+    y = later ? oy + anchorLineV + vo + omT : oy + Math.max(origin + vo, wrap === "SQUARE" && anchorLineV !== void 0 ? anchorLineV : -Infinity) + omT;
   }
   let x;
   const omL = num(om, "left"), omR = num(om, "right");
@@ -14525,6 +14548,7 @@ function planLines(m, styles, numText = "") {
     }
     if (fixedTo > start) fixedW = lineNaturalWidth(m, styles, start, fixedTo).text + [...tabs.values()].reduce((a, b) => a + b, 0);
     let textEnd = Math.min(end, m.chars.length);
+    while (textEnd > fixedTo && m.chars[textEnd - 1].br) textEnd--;
     while (textEnd > fixedTo && m.chars[textEnd - 1].ch === " ") textEnd--;
     const nat = lineNaturalWidth(m, styles, fixedTo, textEnd);
     for (const o of m.objs) if (o.inline && o.index >= textEnd && o.index < end) nat.obj += o.omL + o.width + o.omR;
@@ -14744,6 +14768,7 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
   if (gOpenOn >= 0) ctx.pages[gOpenOn].push("</g>");
   if (paraRegionId) ctx.parentStack.push(paraRegionId);
   let tbStack;
+  let tbStackTop;
   for (const o of m.objs) {
     if (o.inline) {
       let planIdx = 0;
@@ -14788,21 +14813,26 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       const sbA = m.paraPrId != null ? ctx.styles.paraGeom.get(m.paraPrId)?.spaceBefore ?? 0 : 0;
       if (stay && wrapA === "TOP_AND_BOTTOM" && linePushedBy(o, anchorLineV ?? baseV, pTop ?? (depth > 0 ? cellParaTop(p, ctx.styles.paraGeom) : void 0))) stay = false;
       const firstLine = anchorLineV === void 0 || anchorLineV === baseV;
-      let { x, y } = anchorObject(o, ax, oy, objBaseV, aw, ctx, anchorLineV, stay ? sbA : false, (firstLine || wrapA === "SQUARE") && pTop !== void 0 && pTop < baseV ? pTop : void 0, firstLine ? void 0 : anchorLineH);
-      if (depth === 0 && tbFloats >= 2 && wrapA === "TOP_AND_BOTTOM") {
+      let { x, y } = anchorObject(o, ax, oy, objBaseV, aw, ctx, anchorLineV, stay ? sbA : false, (firstLine || wrapA === "SQUARE") && pTop !== void 0 && pTop < baseV ? pTop : void 0, anchorLineH, firstLine ? sbA : 0);
+      let stackTop = depth === 0 ? pTop ?? 0 : cellParaTop(p, ctx.styles.paraGeom);
+      if (tbFloats >= 2 && wrapA === "TOP_AND_BOTTOM" && stackTop !== void 0) {
         if (!tbStack) {
           tbStack = /* @__PURE__ */ new Map();
-          let below = 0;
+          const placed = [];
           const stackable = m.objs.filter((q) => !q.inline && (q.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") === "TOP_AND_BOTTOM" && (findChildByLocalName(q.el, "pos")?.getAttribute("vertRelTo") ?? "PARA") === "PARA" && findChildByLocalName(q.el, "pos")?.getAttribute("allowOverlap") !== "1");
           for (const q of stackable.length >= 2 ? stackable.sort((a, b) => a.index - b.index) : []) {
-            const omQ = findChildByLocalName(q.el, "outMargin"), raw = num(findChildByLocalName(q.el, "pos"), "vertOffset");
-            const top = Math.max(below, raw >= 2 ** 31 ? raw - 2 ** 32 : raw);
+            const posQ = findChildByLocalName(q.el, "pos"), omQ = findChildByLocalName(q.el, "outMargin"), raw = num(posQ, "vertOffset");
+            const x0 = num(posQ, "horzOffset"), x1 = x0 + num(omQ, "left") + q.width + num(omQ, "right");
+            const below = Math.max(0, ...placed.filter((r) => r.x0 < x1 && x0 < r.x1).map((r) => r.bottom));
+            const top = Math.max(below, depth > 0 ? Math.max(0, raw) : raw);
             tbStack.set(q.el, top + num(omQ, "top"));
-            below = top + num(omQ, "top") + (q.tag === "tbl" ? Math.max(q.height, measureTableHeight(q.el, ctx.extentMemo)) : q.height) + num(omQ, "bottom");
+            placed.push({ x0, x1, bottom: top + num(omQ, "top") + (q.tag === "tbl" ? Math.max(q.height, measureTableHeight(q.el, ctx.extentMemo)) : q.height) + num(omQ, "bottom") });
           }
+          if (depth > 0 && placed.length) tbStackTop = Math.max(stackTop, baseV - Math.max(...placed.map((r) => r.bottom)));
         }
+        if (depth > 0 && tbStackTop !== void 0) stackTop = tbStackTop;
         const st = tbStack.get(o.el);
-        if (st !== void 0) y = oy + (pTop ?? 0) + st;
+        if (st !== void 0) y = oy + stackTop + st;
       }
       const moved = ctx.objPlace?.get(o.el);
       if (moved) {
@@ -15025,7 +15055,7 @@ function drawTable(tbl, tx, ty, ctx, depth) {
   const slack = ctx.geom.PH - ctx.geom.MT - ctx.geom.BODY_H;
   const splitHere = depth === 1 || !!ctx.splitCell && findChildByLocalName(tbl, "pos")?.getAttribute("treatAsChar") !== "1";
   const plan = splitHere ? planTableRows(tbl, cells, rowH, ty, ctx.geom.MT, ctx.geom.BODY_H, slack, cellFloatSpan(ctx.geom.MT, ctx.geom.BODY_H, ctx.extentMemo, slack), depth !== 1, depth !== 1 && ctx.splitContMT !== void 0 ? ctx.splitContMT : ctx.geom.MT) : rowH.map((h, r) => [{ page: 0, y: ty + rowY[r], h }]);
-  const splitSaved = ctx.splitCell;
+  const splitSaved2 = ctx.splitCell;
   ctx.splitCell = false;
   for (const pc of plan.flat()) for (const [el, py] of pc.place ?? []) (ctx.objPlace ??= /* @__PURE__ */ new Map()).set(el, { page: startPage + pc.page, y: py });
   const contPages = [...new Set(plan.flat().map((pc) => pc.page).filter((pg) => pg > 0))].map((pg) => startPage + pg);
@@ -15145,7 +15175,7 @@ function drawTable(tbl, tx, ty, ctx, depth) {
     if (bf.right) emit(ctx, edgeLine(g.x + g.w, g.y, g.x + g.w, g.y + g.h, bf.right));
   }
   ctx.page = startPage;
-  ctx.splitCell = splitSaved;
+  ctx.splitCell = splitSaved2;
   ctx.parentStack.pop();
   emit(ctx, "</g>");
 }
@@ -15304,6 +15334,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
   }
   const paraSegPages = /* @__PURE__ */ new Map();
   const paraTops = /* @__PURE__ */ new Map();
+  const backPlace = /* @__PURE__ */ new Map();
   const geom0 = ctxBase.styles.paraGeom;
   let tableEndPage = -1;
   let nPages = 1;
@@ -15315,6 +15346,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
     let cur = 0, col = 0;
     let pendingEnd = 0, pendingEndY = 0;
     let lastEnd = 0, lastPage = -1;
+    let lastSA = 0;
     let prevSeg;
     for (const p of elements(root)) {
       if (ln(p) !== "p") continue;
@@ -15352,6 +15384,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
               if (prevSeg.p !== p) {
                 lastPage = cur;
                 lastEnd = v;
+                lastSA = 0;
               }
             }
           }
@@ -15365,11 +15398,13 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
         prevEnd = v + num(s, "vertsize") + num(s, "spacing");
       }
       paraSegPages.set(p, pagesOf);
-      if (segEls.length) paraTops.set(p, pagesOf[0] === lastPage ? lastEnd : 0);
+      const prevEnd0 = lastEnd, prevPage0 = lastPage;
+      if (segEls.length) paraTops.set(p, pagesOf[0] === lastPage ? lastEnd + lastSA : 0);
       if (segEls.length) {
         const ls = segEls[segEls.length - 1];
         lastEnd = num(ls, "vertpos") + num(ls, "vertsize") + num(ls, "spacing");
         lastPage = pagesOf[pagesOf.length - 1];
+        lastSA = geom0.get(p.getAttribute("paraPrIDRef") ?? "")?.spaceAfter ?? 0;
       }
       if (!localCols && segEls.length) {
         const m0 = buildPara(p);
@@ -15381,6 +15416,13 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
           const segV = num(segEls[segK], "vertpos");
           const h = Math.max(o.height, measureTableHeight(o.el, ctxBase.extentMemo)), omT = num(om, "top"), omB = num(om, "bottom");
           const pushed = segV - (omT + h + omB);
+          if (!o.inline && segK === 0 && pushed < -100 && prevPage0 >= 0 && pagesOf[0] === prevPage0 + 1 && (o.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") === "TOP_AND_BOTTOM") {
+            const back = tableContPages(o.el, MT + prevEnd0 + omT, MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H, cellFloatSpan(MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H));
+            if (back.pages === 1 && Math.abs(back.endY - MT + omB - segV) <= 300) {
+              backPlace.set(o.el, { page: prevPage0, y: MT + prevEnd0 + omT });
+              continue;
+            }
+          }
           const nTb = m0.objs.filter((q) => !q.inline && (q.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") === "TOP_AND_BOTTOM").length;
           const wrapP = o.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM";
           const pTop = paraTops.get(p), sbP = m0.paraPrId != null ? geom0.get(m0.paraPrId)?.spaceBefore ?? 0 : 0;
@@ -15388,7 +15430,8 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
           const nonPush = wrapP !== "TOP_AND_BOTTOM" && pTop !== void 0 && segV > pTop + sbP + 100 ? pTop + sbP : void 0;
           const voP = Math.max(0, toInt32(pos?.getAttribute("vertOffset") ?? void 0, 0));
           const paraStart = segK === 0 && pTop !== void 0 && pTop < segV ? pTop : segV;
-          const ty = o.inline ? MT + segV + omT : nonPush !== void 0 ? MT + nonPush + omT + voP : MT + (stay ? segV - sbP : pushed >= -100 ? pushed : paraStart) + omT + voP;
+          const below = !o.inline && wrapP === "TOP_AND_BOTTOM" && voP + omT >= num(segEls[segK], "textheight") && !linePushedBy(o, segV, pTop);
+          const ty = o.inline ? MT + segV + omT : nonPush !== void 0 ? MT + nonPush + omT + voP : MT + (below ? segV - (segK === 0 ? sbP : 0) : stay ? segV - sbP : pushed - voP >= -100 ? pushed - voP : paraStart) + omT + voP;
           const span = tableContPages(o.el, ty, MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H, cellFloatSpan(MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H));
           const anchorPage = pagesOf[segK];
           const sp = !o.inline && !stay && nonPush === void 0 && segV - (omT + o.height + omB) >= -100 && pagesOf.some((pg, j) => j > segK && pg > anchorPage) ? tableContPages(o.el, MT + segV - o.height - omB, MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H, cellFloatSpan(MT, BODY_H, ctxBase.extentMemo, PH - MT - BODY_H)) : void 0;
@@ -15473,6 +15516,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
   if (geom.mirrorDx) ctx.bodyDx = mirrorDx;
   ctx.cols = multiCol ? { w: colW, gap: colGap } : void 0;
   ctx.paraTops = paraTops;
+  if (backPlace.size) ctx.objPlace = new Map([...ctx.objPlace ?? [], ...backPlace]);
   for (const p of elements(root)) {
     if (ln(p) !== "p") continue;
     drawPara(p, ML, MT, BODY_W, ctx, 0, paraSegPages.get(p));
@@ -15592,7 +15636,7 @@ function drawPageNumbers(root, paraPages, ctx) {
   const side = decl.el.getAttribute("sideChar") ?? "";
   const pnId = ctx.styles.pageNumCharPr ?? decl.prId;
   const st = (pnId != null ? ctx.styles.charPr.get(pnId) : void 0) ?? DEFAULT_CHAR;
-  const { PW, PH, ML, BODY_W } = ctx.geom;
+  const { PH, ML, BODY_W } = ctx.geom;
   const pagePr = findFirst(root, "pagePr"), margin = pagePr ? findChildByLocalName(pagePr, "margin") : null;
   const h = 1e3;
   for (let page = decl.page; page < ctx.pages.length; page++) {
@@ -15600,7 +15644,7 @@ function drawPageNumbers(root, paraPages, ctx) {
     const n = ctx.pageBase + page + 1;
     const text = side ? `${side} ${formatHeadNumber2(n, decl.el.getAttribute("formatType") ?? "DIGIT")} ${side}` : formatHeadNumber2(n, decl.el.getAttribute("formatType") ?? "DIGIT");
     const w = measureTextWidth(text, h, 100, { faceClass: faceClassOf(st.face) });
-    const x = /LEFT/.test(pos) ? ML : /RIGHT/.test(pos) ? ML + BODY_W - w : (PW - w) / 2;
+    const x = /LEFT/.test(pos) ? ML : /RIGHT/.test(pos) ? ML + BODY_W - w : ML + (BODY_W - w) / 2;
     const y = /^TOP/.test(pos) ? num(margin, "top", 5668) - 225 : num(margin, "footer", 0) > 0 ? PH - num(margin, "bottom", 4252) - 225 : PH - Math.round(num(margin, "bottom", 4252) / 2) - 243;
     const attrs = [`x="${pt2(x)}"`, `y="${pt2(y)}"`, `font-size="${pt2(h)}"`];
     if (st.fontFamily) attrs.push(`font-family="${escapeXml(st.fontFamily)}"`);
@@ -19918,4 +19962,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-LBPUPT6S.js.map
+//# sourceMappingURL=chunk-DHMBPMKC.js.map