kordoc 4.24.19 → 4.24.21

package/dist/{chunk-TATLMLLJ.js → chunk-MGCIQ43Y.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   parse
-} from "./chunk-MP6CLG5T.js";
+} from "./chunk-MMZUWRH6.js";
 import {
   classifyError,
   sanitizeError,
   toArrayBuffer
-} from "./chunk-X6GHZRPS.js";
+} from "./chunk-WQC4XWVT.js";
 
 // src/cli/worker-parse.ts
 import { readFileSync, statSync } from "fs";
@@ -26,4 +26,4 @@ async function parseWorkerFile(absPath, options) {
 export {
   parseWorkerFile
 };
-//# sourceMappingURL=chunk-TATLMLLJ.js.map
+//# sourceMappingURL=chunk-MGCIQ43Y.js.map

package/dist/{chunk-MP6CLG5T.js → chunk-MMZUWRH6.js}

@@ -51,10 +51,10 @@ import {
   resolveParaHeading,
   simulateWrap,
   takeTocLeaders
-} from "./chunk-DCEXKPBH.js";
+} from "./chunk-MYDHNNPA.js";
 import {
   blocksToPages
-} from "./chunk-UTDQAY35.js";
+} from "./chunk-BTBFKDPH.js";
 import {
   bmpToPng,
   inlineImagesIntoMarkdown
@@ -76,7 +76,7 @@ import {
   tidyScriptTags,
   unframeLayoutTables,
   wrapScript
-} from "./chunk-EEJKU5SD.js";
+} from "./chunk-F4GZFIUJ.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -100,7 +100,7 @@ import {
   noteTableHtml,
   sanitizeText,
   visibleText
-} from "./chunk-IXCXFGYB.js";
+} from "./chunk-B3POEH7X.js";
 import {
   ANNOTATION_BLANK_RE,
   ValueCursor,
@@ -133,7 +133,7 @@ import {
   resolveUnmatched,
   scanInlineSegments,
   scanSectionXml
-} from "./chunk-WUU63RFU.js";
+} from "./chunk-N45RCYBL.js";
 import {
   MAX_DECOMPRESS_SIZE,
   MAX_XML_DEPTH,
@@ -150,7 +150,7 @@ import {
   localName,
   rawTextContent,
   readZipEntry
-} from "./chunk-QQAANXHZ.js";
+} from "./chunk-IZN5BTCW.js";
 import {
   KordocError,
   VERSION,
@@ -167,7 +167,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-X6GHZRPS.js";
+} from "./chunk-WQC4XWVT.js";
 
 // src/table/visual.ts
 import { readFile as readFile2 } from "fs/promises";
@@ -19351,7 +19351,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-AVMUMNAV.js");
+  const { parseImageDocument } = await import("./image-ocr-QUVBGNWD.js");
   let inserted = false, unreadable = 0;
   let failed = null;
   const walk = async (list, depth) => {
@@ -34072,7 +34072,7 @@ function scriptsOff(r, off) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-AVMUMNAV.js");
+    const { parseImageDocument } = await import("./image-ocr-QUVBGNWD.js");
     const { blocks, warnings, lines } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -34136,7 +34136,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-E7VENFW7.js");
+    const mod = await import("./parser-I2C5DUXC.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {
@@ -34375,4 +34375,4 @@ export {
   parseHwpml,
   fillForm
 };
-//# sourceMappingURL=chunk-MP6CLG5T.js.map
+//# sourceMappingURL=chunk-MMZUWRH6.js.map

package/dist/{chunk-DCEXKPBH.js → chunk-MYDHNNPA.js}

@@ -2,7 +2,7 @@
 import {
   loadSharp,
   rasterizePageSvg
-} from "./chunk-OI4LVKFX.js";
+} from "./chunk-NRCG3ASU.js";
 import {
   inlineImagesIntoMarkdown
 } from "./chunk-VKVDMH7X.js";
@@ -16,7 +16,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-EEJKU5SD.js";
+} from "./chunk-F4GZFIUJ.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -33,7 +33,7 @@ import {
   mapPuaText,
   markNonLayoutTable,
   romanNumeral
-} from "./chunk-IXCXFGYB.js";
+} from "./chunk-B3POEH7X.js";
 import {
   DEFAULT_CHAR,
   DEFAULT_PARA_GEOM,
@@ -47,7 +47,7 @@ import {
   hwpxAppMajor,
   parseRenderStyles,
   readZipEntry
-} from "./chunk-QQAANXHZ.js";
+} from "./chunk-IZN5BTCW.js";
 import {
   KordocError,
   compareSectionPaths,
@@ -56,7 +56,7 @@ import {
   sanitizeHref,
   stripDtd,
   toArrayBuffer
-} from "./chunk-X6GHZRPS.js";
+} from "./chunk-WQC4XWVT.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -177,9 +177,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;
@@ -13252,12 +13253,24 @@ function footNoteStories(root, paraPages, geom) {
   const above = num(sp, "aboveLine", 850), below = num(sp, "belowLine", 567), between = num(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");
@@ -13369,18 +13382,30 @@ function stackedFloats(c) {
   }
   return out;
 }
-function cellLineBoxes(c) {
+function cellLineBoxes(c, bodyH) {
   const out = [];
   let shift = 0, prevV = Number.NEGATIVE_INFINITY, prevH = 0, prevSavedEnd = 0, prevEnd = 0, part = 0;
   const cols = cellColumns(c.sub);
+  let floatBottom = Number.NEGATIVE_INFINITY;
+  let nestedCell = false;
+  for (let a = c.el.parentNode; a; a = a.parentNode) if (a !== c.el && a.nodeType === 1 && ln(a) === "tc") {
+    nestedCell = true;
+    break;
+  }
   for (const p of c.sub ? elements(c.sub) : []) if (ln(p) === "p") {
     const lsa = findChildByLocalName(p, "linesegarray");
+    let first = true, pTop = 0;
     for (const sg of lsa ? elements(lsa) : []) if (ln(sg) === "lineseg") {
       const v = num(sg, "vertpos"), hz = num(sg, "horzpos");
       if ((v < prevV || v === prevV && hz <= prevH && prevSavedEnd > v) && !cols) {
         shift = prevEnd - v;
         part++;
+      } else if (!nestedCell && bodyH !== void 0 && floatBottom > bodyH && first && !cols && v >= prevV && v < floatBottom - 1e3) {
+        shift = prevEnd - v;
+        part++;
       }
+      if (first) pTop = prevSavedEnd > 0 && prevSavedEnd <= v ? prevSavedEnd : v;
+      first = false;
       prevV = v;
       prevH = hz;
       prevSavedEnd = v + num(sg, "vertsize") + num(sg, "spacing");
@@ -13388,17 +13413,26 @@ function cellLineBoxes(c) {
       prevEnd = bottom + num(sg, "spacing");
       out.push({ seg: sg, top, bottom, part, origin: shift });
     }
+    floatBottom = Number.NEGATIVE_INFINITY;
+    for (const run of elements(p)) if (ln(run) === "run") for (const o of elements(run)) {
+      if (ln(o) !== "tbl" || (o.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") !== "TOP_AND_BOTTOM") continue;
+      const pos = findChildByLocalName(o, "pos");
+      if (!pos || pos.getAttribute("treatAsChar") === "1" || (pos.getAttribute("vertRelTo") ?? "PARA") !== "PARA") continue;
+      const om = findChildByLocalName(o, "outMargin"), vo = num(pos, "vertOffset"), sz = num(findChildByLocalName(o, "sz"), "height"), full = measureTableHeight(o);
+      const top = pTop + (vo < 2 ** 31 ? vo : 0) + num(om, "top");
+      if (full > sz + 1e3 && (bodyH === void 0 || top + (measureTableRowHeights(o)[0] ?? 0) <= bodyH)) floatBottom = Math.max(floatBottom, top + full + num(om, "bottom"));
+    }
   }
   return out;
 }
-function cellLines(c) {
-  return cellLineBoxes(c).map((b) => [b.top, b.bottom]);
+function cellLines(c, bodyH) {
+  return cellLineBoxes(c, bodyH).map((b) => [b.top, b.bottom]);
 }
-function spanPartRows(cells, rowY) {
+function spanPartRows(cells, rowY, bodyH) {
   const out = /* @__PURE__ */ new Set();
   for (const c of cells) {
     if (c.rs < 2) continue;
-    const bs = cellLineBoxes(c);
+    const bs = cellLineBoxes(c, bodyH);
     const parts = bs.length ? bs[bs.length - 1].part : 0;
     let s = c.ra;
     for (let k = 0; k < parts; k++) {
@@ -13442,12 +13476,12 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
     const st = stackedFloats(rc[0]);
     return st.length >= 2 && st.reduce((a, f) => a + f.h, 0) > h;
   });
-  if (slack > 0 && ty + rowY[nRows] > pageBottom && ty + rowY[nRows] <= pageBottom + slack && cells.some((c) => cellLineBoxes(c).some((b) => b.part > 0))) slack = 0;
+  if (slack > 0 && ty + rowY[nRows] > pageBottom && ty + rowY[nRows] <= pageBottom + slack && cells.some((c) => cellLineBoxes(c, BODY_H).some((b) => b.part > 0))) slack = 0;
   if (slack > 0 && ty + rowY[nRows] > pageBottom && ty + rowY[nRows] <= pageBottom + slack) {
     const declared = num(findChildByLocalName(tbl, "sz"), "height");
     if (rowY.some((v, k) => k > 0 && k < nRows && Math.abs(v - declared) <= 2)) slack = 0;
   }
-  const savedParts = tbl.getAttribute("pageBreak") === "CELL" && cells.some((c) => c.h > rowY[nRows] && cellLineBoxes(c).some((b) => b.part > 0));
+  const savedParts = tbl.getAttribute("pageBreak") === "CELL" && cells.some((c) => c.h > rowY[nRows] && cellLineBoxes(c, BODY_H).some((b) => b.part > 0));
   if (BODY_H <= 0 || ty + rowY[nRows] <= pageBottom + slack && !stackOver && !savedParts) return plain();
   if (findChildByLocalName(tbl, "pos")?.getAttribute("treatAsChar") === "1") {
     const declared = num(findChildByLocalName(tbl, "sz"), "height") || rowY[nRows];
@@ -13462,11 +13496,15 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
   const out = [];
   const flows = (findChildByLocalName(tbl, "pos")?.getAttribute("vertRelTo") ?? "PARA") === "PARA";
   let page = 0, y = ty, first = !flows || ty - MT < 2e3;
+  if (!first && (tbl.getAttribute("pageBreak") ?? "NONE") === "NONE") {
+    const outT = num(findChildByLocalName(tbl, "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(tbl)) {
     const outT = num(findChildByLocalName(tbl, "outMargin"), "top");
     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) : /* @__PURE__ */ new Set();
+  const spanStarts = cellSplit ? spanPartRows(cells, rowY, BODY_H) : /* @__PURE__ */ new Set();
   for (let r = 0; r < nRows; r++) {
     let h = rowH[r];
     const pieces = [];
@@ -13505,7 +13543,7 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
         continue;
       }
     }
-    const boxes = splittable ? new Map(rowCells.map((c) => [c.el, cellLineBoxes(c)])) : void 0;
+    const boxes = splittable ? new Map(rowCells.map((c) => [c.el, cellLineBoxes(c, BODY_H)])) : void 0;
     const hParts = boxes ? Math.max(0, ...[...boxes.values()].flatMap((bs) => bs.map((b) => b.part))) : 0;
     if (boxes && hParts > 0) {
       if (!first && rowCells.some((c) => {
@@ -13615,9 +13653,9 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
     }
     if (splittable && y + h + outB > pageBottom) {
       const from = /* @__PURE__ */ new Map();
-      const lines = new Map(rowCells.map((c) => [c.el, cellLines(c)]));
+      const lines = new Map(rowCells.map((c) => [c.el, cellLines(c, BODY_H)]));
       const sp0 = new Map(rowCells.map((c) => {
-        const b = cellLineBoxes(c)[0];
+        const b = cellLineBoxes(c, BODY_H)[0];
         return [c.el, b ? num(b.seg, "spacing") : 0];
       }));
       while (y + h + outB > pageBottom && BODY_H > rowY[hdrRows]) {
@@ -13646,7 +13684,7 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
         if (allFit) {
           const spanCells = cells.filter((c) => c.ra === r && c.rs > 1);
           const spanExt = (c) => {
-            const bs = cellLineBoxes(c);
+            const bs = cellLineBoxes(c, BODY_H);
             return bs.some((b) => b.part > 0) ? Math.max(...bs.filter((b) => b.part === 0).map((b) => b.bottom)) : cellContentExtent(c);
           };
           if (!first && h <= pageBottom - contTop && [...rowCells.map((c) => cellContentExtent(c) + c.marginT + c.marginB), ...spanCells.map((c) => spanExt(c) + c.marginT + c.marginB)].some((e) => e > avail)) {
@@ -15333,7 +15371,7 @@ function drawTable(tbl, tx, ty, ctx, depth) {
       const span = plan.slice(c.ra, Math.min(c.ra + c.rs, nRows)).flat();
       const pages = [...new Set(span.map((pc) => pc.page))];
       if (pages.length > 1) {
-        const bs = cellLineBoxes(c);
+        const bs = cellLineBoxes(c, ctx.geom.BODY_H);
         const partTop = (k) => bs.find((b) => b.part === k);
         const groups = pages.map((pg, k) => {
           const on = span.filter((pc) => pc.page === pg);
@@ -15366,7 +15404,7 @@ function drawTable(tbl, tx, ty, ctx, depth) {
     ctx.page = g.page;
     if (g.pieces) {
       const base = g.pieces[0].y + c.marginT;
-      const boxes = cellLineBoxes(c);
+      const boxes = cellLineBoxes(c, ctx.geom.BODY_H);
       const contV = new Map(boxes.map((b) => [b.seg, b.top]));
       const pieceOf = (v) => Math.max(0, g.pieces.findIndex((pc) => {
         const r = pc.range?.get(c.el);
@@ -15569,6 +15607,19 @@ function staleTopCache(root, BODY_H) {
   }
   return false;
 }
+function overrunTopCache(root, BODY_H) {
+  if (BODY_H <= 0) return false;
+  let over = 0;
+  for (const p of elements(root)) {
+    if (ln(p) !== "p") continue;
+    const lsa = findChildByLocalName(p, "linesegarray");
+    for (const sg of lsa ? elements(lsa) : []) if (ln(sg) === "lineseg") {
+      over = num(sg, "vertpos") > BODY_H ? over + 1 : 0;
+      if (over >= 3) return true;
+    }
+  }
+  return false;
+}
 function absoluteTopCache(root, ML, BODY_W) {
   let tot = 0, over = 0;
   for (const p of elements(root)) {
@@ -15586,7 +15637,7 @@ function absoluteTopCache(root, ML, BODY_W) {
 function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters = [], hasDeletionMarkers = true, lastSection = true) {
   const { PW, PH, ML, MT, BODY_W, BODY_H } = geom;
   if (hasDeletionMarkers) prepareDeletedRanges(root);
-  const degenerate = staleTopCache(root, BODY_H);
+  const degenerate = staleTopCache(root, BODY_H) || overrunTopCache(root, BODY_H);
   if (degenerate) {
     for (const p of elements(root)) if (ln(p) === "p") {
       const lsa = findChildByLocalName(p, "linesegarray");
@@ -15594,6 +15645,19 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
     }
     ctxBase.warnings.push("\uC870\uD310 \uCE90\uC2DC\uAC00 \uB9DE\uC9C0 \uC54A\uC544(\uCD5C\uC0C1\uC704 \uBB38\uB2E8\uC774 \uBAA8\uB450 \uAC19\uC740 \uC790\uB9AC) \uB2E4\uC2DC \uC870\uD310\uD574 \uB80C\uB354");
   }
+  for (const tc of Array.from(root.getElementsByTagName("*")).filter((e) => ln(e) === "tc")) {
+    const sub = findChildByLocalName(tc, "subList");
+    const paras = sub ? elements(sub).filter((q) => ln(q) === "p") : [];
+    const vs = [];
+    for (const q of paras) {
+      const lsa = findChildByLocalName(q, "linesegarray");
+      for (const sg of lsa ? elements(lsa) : []) if (ln(sg) === "lineseg") vs.push(num(sg, "vertpos"));
+    }
+    if (vs.length >= 3 && (vs.every((v) => v === vs[0]) || vs.some((v, i) => i >= 2 && v === vs[i - 1] && v === vs[i - 2]))) 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) {
     for (const lsa of Array.from(root.getElementsByTagName("*")).filter((e) => ln(e) === "linesegarray")) lsa.parentNode?.removeChild(lsa);
@@ -15627,7 +15691,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;
@@ -15652,7 +15716,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 {
@@ -15724,9 +15788,10 @@ function renderSectionToPages(root, geom, ctxBase, doReflow, reflowMode, masters
             lastPage = pagesOf[pagesOf.length - 1];
             continue;
           }
-          if (span.pages > 0 && (pagesOf[0] ?? cur) + span.pages > pendingEnd) {
+          if (span.pages > 0 && o.el.getAttribute("pageBreak") !== "NONE" && (pagesOf[0] ?? cur) + span.pages > pendingEnd) {
             pendingEnd = (pagesOf[0] ?? cur) + span.pages;
             pendingEndY = span.endY - MT;
+            pendingTopY = below && voP > 0 && ty - MT < BODY_H ? ty - MT : -1;
           }
         }
       }
@@ -15961,7 +16026,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);
@@ -20266,4 +20331,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-DCEXKPBH.js.map
+//# sourceMappingURL=chunk-MYDHNNPA.js.map