kordoc 4.24.20 → 4.24.21

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   blocksToPages,
   bmpToPng,
   inlineImagesIntoMarkdown
-} from "./chunk-G5WFGGUL.js";
+} from "./chunk-CPVXUEKF.js";
 import {
   parsePageRange
 } from "./chunk-V4BH5SRQ.js";
@@ -44,7 +44,7 @@ import {
   validateOcrOptions,
   visibleText,
   wrapScript
-} from "./chunk-IR6ZXRAK.js";
+} from "./chunk-PDOWSDNM.js";
 import {
   KordocError,
   OPTIONAL_DEP_INSTALL_HINT,
@@ -62,7 +62,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-NBQDGYCQ.js";
+} from "./chunk-UNYH6MTO.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-SAW7A4YW.js");
+  const { parseImageDocument } = await import("./image-ocr-5YWVBRY6.js");
   let inserted = false, unreadable = 0;
   let failed = null;
   const walk = async (list, depth) => {
@@ -53524,9 +53524,10 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
   }
   for (let k = 0; k < spans.length; k++) if (!done.has(k)) solve(k, false);
   let total = h.reduce((s, x) => s + x, 0);
+  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, maxTotal - total);
+    const add = Math.min(c.height - known, overSz && c.contentH != null && c.contentH >= c.height ? Number.POSITIVE_INFINITY : maxTotal - total);
     if (rows.length && add > 0) {
       h[rows[rows.length - 1]] += add;
       total += add;
@@ -55596,12 +55597,24 @@ function footNoteStories(root, paraPages, geom) {
   const above = num2(sp, "aboveLine", 850), below = num2(sp, "belowLine", 567), between = num2(sp, "betweenNotes", 283);
   const byPage = /* @__PURE__ */ new Map();
   for (const p of elements(root)) if (ln(p) === "p") {
-    const page = paraPages.get(p)?.[0] ?? 0;
+    const pages = paraPages.get(p) ?? [];
+    const m = pages.length > 1 ? buildPara(p) : null;
     for (const run of elements(p)) if (ln(run) === "run") {
       for (const ctrl of elements(run)) if (ln(ctrl) === "ctrl") {
         const fn = findChildByLocalName(ctrl, "footNote");
         const sub = fn && !isDeletedControl(fn) ? findChildByLocalName(fn, "subList") : null;
         if (!sub) continue;
+        let page = pages[0] ?? 0;
+        if (m) {
+          const at = m.chars.findIndex((c) => c.note === fn);
+          if (at >= 0) {
+            let k = 0;
+            m.segs.forEach((sg, i) => {
+              if (sg.textpos <= at) k = i;
+            });
+            page = pages[k] ?? page;
+          }
+        }
         let h = 0;
         for (const q of elements(sub)) if (ln(q) === "p") {
           const lsa = findChildByLocalName(q, "linesegarray");
@@ -55827,6 +55840,10 @@ function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan,
   const out = [];
   const flows = (findChildByLocalName(tbl2, "pos")?.getAttribute("vertRelTo") ?? "PARA") === "PARA";
   let page = 0, y = ty, first = !flows || ty - MT < 2e3;
+  if (!first && (tbl2.getAttribute("pageBreak") ?? "NONE") === "NONE") {
+    const outT = num2(findChildByLocalName(tbl2, "outMargin"), "top");
+    if (outT + rowY[nRows] + outB <= BODY_H) return rowH.map((h, r) => [{ page: 1, y: contMT + outT + rowY[r], h }]);
+  }
   if (!first && coAnchoredFollower(tbl2)) {
     const outT = num2(findChildByLocalName(tbl2, "outMargin"), "top");
     if (outT + rowY[nRows] + outB <= BODY_H) return rowH.map((h, r) => [{ page: 1, y: contMT + outT + rowY[r], h }]);
@@ -57481,7 +57498,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
     let prevH = Number.NEGATIVE_INFINITY;
     let prevEnd = Number.NEGATIVE_INFINITY;
     let cur = 0, col = 0;
-    let pendingEnd = 0, pendingEndY = 0;
+    let pendingEnd = 0, pendingEndY = 0, pendingTopY = -1;
     let lastEnd = 0, lastPage = -1;
     let lastSA = 0;
     let prevSeg;
@@ -57506,7 +57523,7 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
           }
           if (col > 0) s.setAttribute("horzpos", String(h + Math.round(col * (colW + colGap))));
         } else {
-          if (paraFirst && pendingEnd > cur) {
+          if (paraFirst && pendingEnd > cur && !(v > prevV && v < pendingTopY - 100)) {
             cur = v < pendingEndY - 100 ? pendingEnd + 1 : pendingEnd;
             pendingEnd = 0;
           } else {
@@ -57578,9 +57595,10 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
             lastPage = pagesOf[pagesOf.length - 1];
             continue;
           }
-          if (span2.pages > 0 && (pagesOf[0] ?? cur) + span2.pages > pendingEnd) {
+          if (span2.pages > 0 && o.el.getAttribute("pageBreak") !== "NONE" && (pagesOf[0] ?? cur) + span2.pages > pendingEnd) {
             pendingEnd = (pagesOf[0] ?? cur) + span2.pages;
             pendingEndY = span2.endY - MT;
+            pendingTopY = below && voP > 0 && ty - MT < BODY_H ? ty - MT : -1;
           }
         }
       }
@@ -57815,7 +57833,7 @@ function renderSectionRoots(sections, input) {
     return pm.objs.length > 0 || pm.chars.some((c) => c.ch.trim() !== "" || !!c.ctrlText);
   });
   let lastIdx = sections.length - 1;
-  while (lastIdx > 0 && !hasContent(sections[lastIdx].root)) lastIdx--;
+  while (lastIdx > 0 && !hasContent(sections[lastIdx].root) && !sections[lastIdx].masterPages?.length) lastIdx--;
   for (const [k, { root, index, masterPages, hasDeletionMarkers }] of sections.entries()) {
     if (k > lastIdx) break;
     const geom = readSectionGeom(root);
@@ -58967,7 +58985,7 @@ function scriptsOff(r, off) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-SAW7A4YW.js");
+    const { parseImageDocument } = await import("./image-ocr-5YWVBRY6.js");
     const { blocks, warnings, lines } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -59031,7 +59049,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-BD4VNEUA.js");
+    const mod = await import("./parser-G5QTRKII.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {