kordoc 4.24.17 → 4.24.19

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

@@ -2,7 +2,7 @@
 import {
   loadSharp,
   rasterizePageSvg
-} from "./chunk-SWEGYVUL.js";
+} from "./chunk-OI4LVKFX.js";
 import {
   inlineImagesIntoMarkdown
 } from "./chunk-VKVDMH7X.js";
@@ -16,7 +16,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-7X4BNPDR.js";
+} from "./chunk-EEJKU5SD.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -33,7 +33,7 @@ import {
   mapPuaText,
   markNonLayoutTable,
   romanNumeral
-} from "./chunk-QEOKQ5XD.js";
+} from "./chunk-IXCXFGYB.js";
 import {
   DEFAULT_CHAR,
   DEFAULT_PARA_GEOM,
@@ -47,15 +47,16 @@ import {
   hwpxAppMajor,
   parseRenderStyles,
   readZipEntry
-} from "./chunk-URA7A4PT.js";
+} from "./chunk-QQAANXHZ.js";
 import {
   KordocError,
   compareSectionPaths,
   escapeHtml,
   precheckZipSize,
   sanitizeHref,
+  stripDtd,
   toArrayBuffer
-} from "./chunk-NIKO5MNS.js";
+} from "./chunk-X6GHZRPS.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -12119,6 +12120,18 @@ function elements2(el) {
 function num2(el, attr, fallback = 0) {
   return el ? toInt32(el.getAttribute(attr) ?? void 0, fallback) : fallback;
 }
+function staleTableSz(tbl) {
+  const rows = /* @__PURE__ */ new Map();
+  for (const tr of elements2(tbl)) if (ln2(tr) === "tr") {
+    for (const tc of elements2(tr)) if (ln2(tc) === "tc") {
+      const ra = num2(findChildByLocalName(tc, "cellAddr"), "rowAddr"), rs = num2(findChildByLocalName(tc, "cellSpan"), "rowSpan") || 1;
+      if (rs === 1) rows.set(ra, Math.max(rows.get(ra) ?? 0, num2(findChildByLocalName(tc, "cellSz"), "height")));
+    }
+  }
+  let sum = 0;
+  for (const v of rows.values()) sum += v;
+  return rows.size > 0 && sum + 1e3 < num2(findChildByLocalName(tbl, "sz"), "height");
+}
 function shiftParaVert(p, delta) {
   for (const lsa of elements2(p)) {
     if (ln2(lsa) !== "linesegarray") continue;
@@ -12323,7 +12336,7 @@ function reflowPara(p, doc, styles, areaW, startV, mode, zones = [], nums = /* @
   let firstFloatVo = 0;
   const lineFloats = [];
   let objBottom = startV;
-  const effHOf = (o) => (o.tag === "tbl" ? Math.max(o.height, measureTableHeight(o.el, geomMemo(styles))) : o.inline ? Math.max(o.height, drawTextHeight(o.el)) : o.height) + captionExtra(o.el);
+  const effHOf = (o) => (o.tag === "tbl" ? staleTableSz(o.el) ? measureTableHeight(o.el, geomMemo(styles)) : Math.max(o.height, measureTableHeight(o.el, geomMemo(styles))) : o.inline ? Math.max(o.height, drawTextHeight(o.el)) : o.height) + captionExtra(o.el);
   let cellFloatBottom = 0, cellTextBelow = 0;
   const spacesOnly = spacesHost(p);
   const zoneStart = zones.length;
@@ -12636,6 +12649,7 @@ function carryZones(zones, bodyH, oneColumn) {
   zones.push(...moved);
 }
 var STALE_SLACK = 500;
+var STALE_CACHE_SHIFT = 2e3;
 function regrownInlineTables(p) {
   const out = [];
   for (const run of elements2(p)) {
@@ -12744,6 +12758,7 @@ function reflowBlockFlow(container, doc, styles, areaW, mode, counter, bodyH) {
   const cellW = areaW;
   let cellCols = 1, cellCol = 0;
   let staleRest = false;
+  let prevReflowed = false, cacheShift = 0, lastStored = 0;
   for (const p of elements2(container)) {
     if (ln2(p) !== "p") continue;
     if (bodyFlow) {
@@ -12791,6 +12806,18 @@ function reflowBlockFlow(container, doc, styles, areaW, mode, counter, bodyH) {
     }
     if (!res) {
       const lsa = findChildByLocalName(p, "linesegarray");
+      if (lsa && bodyFlow) {
+        const segs = elements2(lsa).filter((e) => ln2(e) === "lineseg");
+        const vs = segs.map((e) => num2(e, "vertpos")), v0 = vs[0] ?? 0;
+        const mono = vs.every((v, i) => i === 0 || v >= vs[i - 1]);
+        if (prevReflowed) {
+          const d = startV - v0;
+          cacheShift = mono && v0 > 0 && d <= STALE_CACHE_SHIFT ? d : 0;
+        } else if (cacheShift && (!mono || v0 < lastStored)) cacheShift = 0;
+        if (segs.length) lastStored = vs[vs.length - 1] + num2(segs[segs.length - 1], "vertsize");
+        if (cacheShift) shiftParaVert(p, cacheShift);
+      }
+      prevReflowed = false;
       if (lsa) {
         const bottom = cachedParagraphBottom(lsa, bodyFlow);
         if (Number.isFinite(bottom)) {
@@ -12801,6 +12828,7 @@ function reflowBlockFlow(container, doc, styles, areaW, mode, counter, bodyH) {
       continue;
     }
     const paraH = res.paraBottom - startV;
+    prevReflowed = true;
     const explicitBreak = bodyH > 0 && startV > 0 && (p.getAttribute("pageBreak") === "1" || p.getAttribute("columnBreak") === "1" || !!g?.pageBreakBefore);
     const lines = bodyH > 0 ? elements2(findChildByLocalName(p, "linesegarray") ?? p).filter((e) => ln2(e) === "lineseg") : [];
     const reserve = bodyH > 0 ? pageBottomReserve(p) : 0;
@@ -13386,6 +13414,21 @@ function spanPartRows(cells, rowY) {
   }
   return out;
 }
+function coAnchoredFollower(tbl) {
+  const isTb = (o) => {
+    const pos = findChildByLocalName(o, "pos");
+    return !!pos && pos.getAttribute("treatAsChar") !== "1" && (pos.getAttribute("vertRelTo") ?? "PARA") === "PARA" && (o.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") === "TOP_AND_BOTTOM";
+  };
+  const p = tbl.parentNode?.parentNode;
+  if (!p || ln(p) !== "p" || !isTb(tbl)) return false;
+  let seen = false;
+  for (const run of elements(p)) if (ln(run) === "run") for (const o of elements(run)) {
+    if (o === tbl) return seen;
+    if ((ln(o) === "tbl" || ln(o) === "pic") && isTb(o)) seen = true;
+  }
+  return false;
+}
+var ROW_CARRY_MIN = 1e3;
 function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, nested = false, contMT = MT) {
   if (nested) slack = 0;
   const nRows = rowH.length;
@@ -13404,7 +13447,8 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
     const declared = num(findChildByLocalName(tbl, "sz"), "height");
     if (rowY.some((v, k) => k > 0 && k < nRows && Math.abs(v - declared) <= 2)) slack = 0;
   }
-  if (BODY_H <= 0 || ty + rowY[nRows] <= pageBottom + slack && !stackOver) return plain();
+  const savedParts = tbl.getAttribute("pageBreak") === "CELL" && cells.some((c) => c.h > rowY[nRows] && cellLineBoxes(c).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];
     if (ty - MT < 2e3 || ty + declared <= pageBottom + slack) return plain();
@@ -13418,11 +13462,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 && 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();
   for (let r = 0; r < nRows; r++) {
     let h = rowH[r];
     const pieces = [];
-    if (!first && r >= hdrRows && spanStarts.has(r)) {
+    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++;
       y = contTop;
       first = true;
@@ -13568,6 +13616,10 @@ 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 sp0 = new Map(rowCells.map((c) => {
+        const b = cellLineBoxes(c)[0];
+        return [c.el, b ? num(b.seg, "spacing") : 0];
+      }));
       while (y + h + outB > pageBottom && BODY_H > rowY[hdrRows]) {
         const avail = pageBottom - y - outB;
         let rem = 0, placed = false, allFit = true, blocked = false;
@@ -13580,7 +13632,7 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
             continue;
           }
           const end = Math.max(...ls.map((l) => l[1]));
-          const k = ls.findIndex((l) => c.marginT + (l[1] - off) > avail - c.marginB);
+          const k = ls.findIndex((l, i) => c.marginT + (l[1] + (off === 0 && i === 0 && ls.length > 1 ? sp0.get(c.el) ?? 0 : 0) - off) > avail - c.marginB);
           if (k < 0) {
             cuts.push([c.el, off, end + 1]);
             continue;
@@ -13593,13 +13645,21 @@ 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);
-          if (!first && h <= pageBottom - contTop && [...rowCells, ...spanCells].some((c) => cellContentExtent(c) + c.marginT + c.marginB > avail)) {
+          const spanExt = (c) => {
+            const bs = cellLineBoxes(c);
+            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)) {
             page++;
             y = contTop;
             first = true;
             break;
           }
-          if (nested && avail > 0) {
+          const carry = !nested && h - avail > ROW_CARRY_MIN && h <= pageBottom - contTop && rowCells.every((c) => {
+            const e = cellContentExtent(c) + c.marginT + c.marginB, va = c.sub?.getAttribute("vertAlign") ?? "TOP";
+            return (va === "CENTER" ? (h + e) / 2 : va === "BOTTOM" ? h : e) <= avail;
+          });
+          if ((nested || carry) && avail > 0) {
             pieces.push({ page, y, h: avail, range: new Map(rowCells.map((c) => [c.el, [from.get(c.el) ?? 0, Number.POSITIVE_INFINITY]])) });
             for (const c of rowCells) from.set(c.el, Number.POSITIVE_INFINITY);
             page++;
@@ -14948,7 +15008,8 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       const shadowed = o.tag === "pic" && !!findChildByLocalName(findChildByLocalName(o.el, "effects") ?? o.el, "shadow") && plan.seg.textheight > o.height && Math.abs(plan.seg.baseline - Math.round(plan.seg.textheight * 0.85)) <= 2;
       const eqAsc = o.tag === "equation" && Number(o.el.getAttribute("baseLine")) > 0 ? Math.round(o.height * Number(o.el.getAttribute("baseLine")) / 100) : shadowed ? Math.round(plan.seg.textheight * 0.85) : o.tag === "pic" ? Math.round(o.height * 0.85) : o.tag === "tbl" ? Math.max(o.height, measureTableHeight(o.el, ctx.extentMemo)) : o.height;
       const iom = findChildByLocalName(o.el, "outMargin"), iomT = num(iom, "top"), iomB = num(iom, "bottom");
-      const yTop = oy + plan.seg.vertpos + Math.max(iomT, plan.seg.baseline - eqAsc - iomB - captionExtra(o.el));
+      const capX = captionExtra(o.el);
+      const yTop = oy + plan.seg.vertpos + Math.max(iomT, o.tag === "tbl" && capX === 0 ? plan.seg.baseline - Math.round((eqAsc + iomT + iomB) * 0.85) + iomT : plan.seg.baseline - eqAsc - iomB - capX);
       drawObject(o, x, yTop, baseV, areaW, ctx, depth);
     } else {
       if (segPages && segPages[0] !== void 0) ctx.page = segPages[0];
@@ -15929,12 +15990,12 @@ async function renderHwpxInternal(input, options) {
   const verFile = zip.file("version.xml");
   const verXml = verFile ? await readZipEntry(verFile, "text") : void 0;
   const appMajor = hwpxAppMajor(verXml), appBuild = hwpxAppBuild(verXml);
-  const headXml = headFile ? await readZipEntry(headFile, "text") : void 0;
+  const headXml = headFile ? stripDtd(await readZipEntry(headFile, "text")) : void 0;
   let styles = headXml ? parseRenderStyles(headXml, { appMajor, appBuild }) : { charPr: /* @__PURE__ */ new Map(), paraAlign: /* @__PURE__ */ new Map(), paraGeom: /* @__PURE__ */ new Map(), borderFill: /* @__PURE__ */ new Map() };
   if (!headFile) warnings.push("header.xml \uC5C6\uC74C \u2014 \uAE30\uBCF8 \uC2A4\uD0C0\uC77C\uB85C \uB80C\uB354");
   const secXmls = [];
   for (const f of secFiles) {
-    const xml = await readZipEntry(f, "text");
+    const xml = stripDtd(await readZipEntry(f, "text"));
     if (xml.length > MAX_DECOMPRESS_SIZE) throw new KordocError("\uC139\uC158 XML\uC774 \uD5C8\uC6A9 \uD06C\uAE30\uB97C \uCD08\uACFC");
     secXmls.push(xml);
   }
@@ -15945,7 +16006,7 @@ async function renderHwpxInternal(input, options) {
   const masterPages = /* @__PURE__ */ new Map();
   const masterXmls = [];
   for (const file of zip.file(/Contents\/masterpage[^/]*\.xml$/i)) {
-    const xml = await readZipEntry(file, "text");
+    const xml = stripDtd(await readZipEntry(file, "text"));
     if (xml.length > MAX_DECOMPRESS_SIZE) throw new KordocError("\uBC14\uD0D5\uCABD XML\uC774 \uD5C8\uC6A9 \uD06C\uAE30\uB97C \uCD08\uACFC");
     const root = createXmlParser().parseFromString(xml, "text/xml").documentElement;
     if (root && ln(root) === "masterPage") {
@@ -20205,4 +20266,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-MHZLOPOO.js.map
+//# sourceMappingURL=chunk-DCEXKPBH.js.map