kordoc 4.24.21 → 4.24.23

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   blocksToPages,
   bmpToPng,
   inlineImagesIntoMarkdown
-} from "./chunk-CPVXUEKF.js";
+} from "./chunk-VK3ZZLT7.js";
 import {
   parsePageRange
 } from "./chunk-V4BH5SRQ.js";
@@ -44,7 +44,7 @@ import {
   validateOcrOptions,
   visibleText,
   wrapScript
-} from "./chunk-PDOWSDNM.js";
+} from "./chunk-2UNY7AKC.js";
 import {
   KordocError,
   OPTIONAL_DEP_INSTALL_HINT,
@@ -62,7 +62,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-UNYH6MTO.js";
+} from "./chunk-XLVQUVL4.js";
 
 // src/plain-markdown.ts
 function toPlainMarkdown(md2) {
@@ -24645,7 +24645,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-5YWVBRY6.js");
+  const { parseImageDocument } = await import("./image-ocr-Q7ZPUDKM.js");
   let inserted = false, unreadable = 0;
   let failed = null;
   const walk = async (list, depth) => {
@@ -53506,6 +53506,7 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
       return false;
     }
     if (evenOnly && missing.length !== 1) return false;
+    if (evenOnly && c.height > maxTotal) return false;
     done.add(k);
     if (c.height <= known) return false;
     const each = (c.height - known) / missing.length;
@@ -53515,7 +53516,7 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
   for (let r = 0; r < rowCount; r++) {
     if (h[r] !== 0) continue;
     let need = 0;
-    for (const { c, rows } of spans) if (rows[rows.length - 1] === r && rows.slice(0, -1).every((q) => h[q] > 0)) need = Math.max(need, c.height - rows.slice(0, -1).reduce((t, q) => t + h[q], 0));
+    for (const { c, rows } of spans) if (rows[rows.length - 1] === r && rows.slice(0, -1).every((q) => h[q] > 0) && c.height <= maxTotal) need = Math.max(need, c.height - rows.slice(0, -1).reduce((t, q) => t + h[q], 0));
     if (need > 0) h[r] = need;
   }
   for (let again = true; again; ) {
@@ -53527,7 +53528,7 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
   const overSz = total > maxTotal;
   for (const { c, rows } of [...spans].sort((a, b) => a.rows[a.rows.length - 1] - b.rows[b.rows.length - 1] || b.rows[0] - a.rows[0])) {
     const known = rows.reduce((s, r) => s + h[r], 0);
-    const add = Math.min(c.height - known, overSz && c.contentH != null && c.contentH >= c.height ? Number.POSITIVE_INFINITY : maxTotal - total);
+    const add = Math.min(c.height - known, overSz && (c.contentH != null && c.contentH >= c.height || c.height <= maxTotal / 2) ? Number.POSITIVE_INFINITY : maxTotal - total);
     if (rows.length && add > 0) {
       h[rows[rows.length - 1]] += add;
       total += add;
@@ -55168,6 +55169,11 @@ function reflowBlockFlow(container, doc, styles, areaW, mode, counter, bodyH) {
         if (Number.isFinite(bottom)) {
           cursorV = bottom;
           prevSpaceAfter = g3?.spaceAfter ?? 0;
+          const segsL = elements2(lsa).filter((e) => ln2(e) === "lineseg"), lastL = segsL[segsL.length - 1];
+          if (bodyFlow && lastL && num3(lastL, "vertpos") + num3(lastL, "vertsize") > bodyH) {
+            cursorV = num3(lastL, "vertsize") + num3(lastL, "spacing");
+            prevSpaceAfter = 0;
+          }
         }
       }
       continue;
@@ -55849,8 +55855,15 @@ function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan,
     if (outT + rowY[nRows] + outB <= BODY_H) return rowH.map((h, r) => [{ page: 1, y: contMT + outT + rowY[r], h }]);
   }
   const spanStarts = cellSplit ? spanPartRows(cells, rowY, BODY_H) : /* @__PURE__ */ new Set();
+  const declaredH = num2(findChildByLocalName(tbl2, "sz"), "height");
+  const cutRow = declaredH > 0 && declaredH < rowY[nRows] - 1e3 ? rowY.findIndex((v, k) => k > hdrRows && k < nRows && Math.abs(v - declaredH) <= 20 && ty + v <= pageBottom) : -1;
   for (let r = 0; r < nRows; r++) {
     let h = rowH[r];
+    if (r === cutRow && page === 0 && !first) {
+      page++;
+      y = contTop;
+      first = true;
+    }
     const pieces = [];
     if (!first && r >= hdrRows && spanStarts.has(r) && !cells.some((c) => c.rs > 1 && c.ra < r && c.ra + c.rs > r && (out[c.ra]?.[0]?.page ?? page) < page)) {
       page++;
@@ -55934,6 +55947,11 @@ function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan,
           }
           if (inK.length && next) toNext = Math.max(toNext, next.top - from + c.marginT + c.marginB);
         }
+        if (k > 0) for (const c of cells) {
+          if (c.rs < 2 || c.ra + c.rs - 1 !== r) continue;
+          const inK = cellLineBoxes(c, BODY_H).filter((b) => b.part === k);
+          if (inK.length) ext = Math.max(ext, inK[inK.length - 1].bottom - inK[0].origin + c.marginT + c.marginB);
+        }
         const last = k === hParts;
         const cellH = Math.max(0, ...rowCells.map((c) => num2(findChildByLocalName(c.el, "cellSz"), "height")));
         const firstH = Math.min(declared > 0 && ty + declared - y >= ext ? Math.min(pageBottom - y, ty + declared - y) : pageBottom - y, Math.max(ext, cellH));
@@ -56864,6 +56882,13 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
         ax = ox + col * (ctx.cols.w + ctx.cols.gap);
         aw = ctx.cols.w;
       }
+      if (findChildByLocalName(o.el, "pos")?.getAttribute("horzRelTo") === "PARA" && m.paraPrId != null) {
+        const g3 = ctx.styles.paraGeom.get(m.paraPrId);
+        if (g3) {
+          ax += g3.marginLeft;
+          aw -= g3.marginLeft + g3.marginRight;
+        }
+      }
       let anchorLineV;
       let anchorLineH = 0;
       let anchorSeg;
@@ -57464,6 +57489,16 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
       const lsa = findChildByLocalName(q, "linesegarray");
       if (lsa) q.removeChild(lsa);
     }
+    else if (paras.some((q) => {
+      const runs = elements(q).filter((r) => ln(r) === "run");
+      if (!runs.length || runs.some((r) => elements(r).some((c) => ln(c) !== "t"))) return false;
+      const ch = Math.max(...runs.map((r) => (ctxBase.styles.charPr.get(r.getAttribute("charPrIDRef") ?? "") ?? DEFAULT_CHAR).height));
+      const lsa = findChildByLocalName(q, "linesegarray");
+      return (lsa ? elements(lsa) : []).some((sg) => ln(sg) === "lineseg" && num2(sg, "textheight") > ch * 1.5);
+    })) for (const q of paras) {
+      const lsa = findChildByLocalName(q, "linesegarray");
+      if (lsa) q.removeChild(lsa);
+    }
   }
   const absolute = !degenerate && absoluteTopCache(root, ML, BODY_W);
   if (absolute) {
@@ -58985,7 +59020,7 @@ function scriptsOff(r, off) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-5YWVBRY6.js");
+    const { parseImageDocument } = await import("./image-ocr-Q7ZPUDKM.js");
     const { blocks, warnings, lines } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -59049,7 +59084,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-G5QTRKII.js");
+    const mod = await import("./parser-OSH4JPYU.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {