kordoc 4.24.3 → 4.24.4

package/dist/{chunk-HU7POUBS.js → chunk-YBCW544D.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   visibleText
-} from "./chunk-HNX2I7D6.js";
+} from "./chunk-44E52JJ7.js";
 
 // src/script-tags.ts
 var LITERAL_TAG = /<(?=\/?(?:u|sup|sub)>)/g;
@@ -328,4 +328,4 @@ export {
   HEADING_RATIO_H2,
   HEADING_RATIO_H3
 };
-//# sourceMappingURL=chunk-HU7POUBS.js.map
+//# sourceMappingURL=chunk-YBCW544D.js.map

package/dist/{chunk-J45OVEUM.js → chunk-YEYNBH5W.js}

@@ -2,7 +2,7 @@
 import {
   loadSharp,
   rasterizePageSvg
-} from "./chunk-Q2QKRE4P.js";
+} from "./chunk-D4YWVZHD.js";
 import {
   inlineImagesIntoMarkdown
 } from "./chunk-VKVDMH7X.js";
@@ -16,7 +16,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-HU7POUBS.js";
+} from "./chunk-YBCW544D.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -32,7 +32,7 @@ import {
   mapPuaText,
   markNonLayoutTable,
   romanNumeral
-} from "./chunk-HNX2I7D6.js";
+} from "./chunk-44E52JJ7.js";
 import {
   DEFAULT_CHAR,
   DEFAULT_PARA_GEOM,
@@ -46,7 +46,7 @@ import {
   hwpxAppMajor,
   parseRenderStyles,
   readZipEntry
-} from "./chunk-PMX5CPK5.js";
+} from "./chunk-JHUW5PKO.js";
 import {
   KordocError,
   compareSectionPaths,
@@ -54,7 +54,7 @@ import {
   precheckZipSize,
   sanitizeHref,
   toArrayBuffer
-} from "./chunk-EWCJCWTT.js";
+} from "./chunk-6CPBNK5O.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -185,7 +185,8 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
   }
   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;
+  const spanH = (c) => h.slice(c.rowAddr, c.rowAddr + c.rowSpan).reduce((t, x) => t + x, 0);
+  if (shrinkLast && over > 0 && last >= 0 && lastCells.length && lastCells.every((c) => c.contentH != null && c.contentH <= (c.rowSpan === 1 ? h[last] : spanH(c)) - over)) h[last] -= over;
   return h;
 }
 
@@ -11456,7 +11457,7 @@ function cellContentExtent(cell, memo) {
       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);
+      ext = Math.max(ext, anchor + num(om, "top") + Math.max(0, vo) + oh + num(om, "bottom"));
     }
   }
   memo?.cell.set(cell.el, ext);
@@ -11523,7 +11524,7 @@ function measureTableRowHeights(tbl, memo) {
   const rows = solveRowHeights(
     // 여러 행 칸은 내용(+ 칸 여백)이 저장 높이보다 크면 내용 높이로 — 솔버가 모자란 만큼 그 칸 마지막 행을 키운다
     // (같은 판 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 })),
+    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: cellContentExtent(c, memo) + c.marginT + c.marginB })),
     nRows,
     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))
@@ -13072,6 +13073,53 @@ function flowEndNotes(root, bodyH) {
   });
 }
 
+// src/render/font-env.ts
+function hasKoPubSubst(headXml) {
+  return /<hh:font\b[^>]*\bface="KoPub[^"]*"[^>]*\btype="TTF"[^>]*>\s*<hh:substFont\b/.test(headXml);
+}
+function lineStarts(root) {
+  const out = [];
+  for (const p of Array.from(root.getElementsByTagName("hp:p"))) {
+    const lsa = elements(p).find((e) => ln(e) === "linesegarray");
+    const segs = lsa ? elements(lsa).filter((e) => ln(e) === "lineseg") : [];
+    out.push(segs.length >= 2 ? segs.map((s) => s.getAttribute("textpos") ?? "0").join(",") : null);
+  }
+  return out;
+}
+function matchCount(xml, saved, styles) {
+  const root = createXmlParser().parseFromString(xml, "text/xml").documentElement;
+  const pagePr = root.getElementsByTagName("hp:pagePr")[0];
+  if (!pagePr) return 0;
+  const margin = pagePr.getElementsByTagName("hp:margin")[0];
+  let PW = num(pagePr, "width", 59528), PH = num(pagePr, "height", 84188);
+  if (pagePr.getAttribute("landscape") === "NARROWLY" && PW < PH) [PW, PH] = [PH, PW];
+  const gutterTB = pagePr.getAttribute("gutterType") === "TOP_BOTTOM", gutter = num(margin ?? null, "gutter", 0);
+  const BODY_W = PW - num(margin ?? null, "left", 8504) - num(margin ?? null, "right", 8504) - (gutterTB ? 0 : gutter);
+  const BODY_H = PH - num(margin ?? null, "top", 5668) - num(margin ?? null, "header", 0) - num(margin ?? null, "bottom", 4252) - num(margin ?? null, "footer", 0) - (gutterTB ? gutter : 0);
+  for (const p of Array.from(root.getElementsByTagName("hp:p"))) {
+    const lsa = elements(p).find((e) => ln(e) === "linesegarray");
+    if (lsa) p.removeChild(lsa);
+  }
+  reflowSection(root, styles, { BODY_W, BODY_H });
+  const got = lineStarts(root);
+  let n = 0;
+  saved.forEach((s, i) => {
+    if (s !== null && s === got[i]) n++;
+  });
+  return n;
+}
+function kopubSubstituted(secXmls, base, alt) {
+  let a = 0, b = 0, seen = 0;
+  for (const xml of secXmls) {
+    const saved = lineStarts(createXmlParser().parseFromString(xml, "text/xml").documentElement);
+    a += matchCount(xml, saved, base);
+    b += matchCount(xml, saved, alt);
+    seen += saved.filter((x) => x !== null).length;
+    if (seen >= 60) break;
+  }
+  return b >= a + 5 && b > a * 1.1;
+}
+
 // src/render/scene.ts
 function regionId(type, seq) {
   return `${type}-${String(seq).padStart(6, "0")}`;
@@ -13499,11 +13547,11 @@ function planTableRows(tbl, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, n
         continue;
       }
     }
-    if (splittable && y + h > pageBottom) {
+    if (splittable && y + h + outB > pageBottom) {
       const from = /* @__PURE__ */ new Map();
       const lines = new Map(rowCells.map((c) => [c.el, cellLines(c)]));
-      while (y + h > pageBottom && BODY_H > rowY[hdrRows]) {
-        const avail = pageBottom - y;
+      while (y + h + outB > pageBottom && BODY_H > rowY[hdrRows]) {
+        const avail = pageBottom - y - outB;
         let rem = 0, placed = false, allFit = true, blocked = false;
         const cuts = [];
         for (const c of rowCells) {
@@ -14649,30 +14697,53 @@ function planLines(m, styles, numText = "") {
       }
     }
     const stretch = align === "JUSTIFY" || align === "DISTRIBUTE" || align === "DISTRIBUTE_SPACE";
-    let spaceAdd = 0, spaceFrom = fixedTo;
+    let spaceAdd = 0, spaceFrom = fixedTo, charAdd = 0;
+    const squeeze = (spFrom) => {
+      const short = nat.text - lastSp - avail;
+      let nSp = 0, cap = 0, nG = 0;
+      for (let k = spFrom; k < textEnd; k++) {
+        const c = m.chars[k];
+        if (c.ch === " ") {
+          nSp++;
+          cap += charW(c, styles, m.chars[k - 1]) * 0.2;
+        } else if (c.ch && !c.tab) nG++;
+      }
+      if (nSp > 0) {
+        spaceAdd = -Math.min(short, cap) / nSp;
+        spaceFrom = spFrom;
+      }
+      if (short > cap && nG > 0) charAdd = -(short - (nSp > 0 ? cap : 0)) / nG;
+    };
     if (nat.text > 0 && stretch && (!isLast || align === "DISTRIBUTE" || align === "DISTRIBUTE_SPACE")) {
       let nSp = 0, spFrom = fixedTo;
-      while (spFrom < textEnd && (m.chars[spFrom].ch === " " || m.chars[spFrom].ch === "")) spFrom++;
+      while (spFrom < textEnd && (m.chars[spFrom].ch === " " || m.chars[spFrom].ch === "") && !m.chars[spFrom].ctrl) spFrom++;
       for (let k = spFrom; k < textEnd; k++) if (m.chars[k].ch === " ") nSp++;
       if (nSp > 0 && align !== "DISTRIBUTE") {
         spaceAdd = (avail - nat.text + lastSp) / nSp;
         spaceFrom = spFrom;
+        if (spaceAdd < 0) squeeze(spFrom);
       } else scale = avail > 0 ? avail / nat.text : 1;
     } else if (nat.text + nat.obj > 0 && (isLast || !stretch)) {
       const w = nat.text + nat.obj - lastSp;
       if (align === "CENTER") xoff = Math.max(0, (lineW - w) / 2);
       else if (align === "RIGHT") xoff = Math.max(0, lineW - w);
     }
+    if (spaceAdd === 0 && charAdd === 0 && scale === 1 && nat.text - lastSp > avail) {
+      let spFrom = fixedTo;
+      while (spFrom < textEnd && (m.chars[spFrom].ch === " " || m.chars[spFrom].ch === "") && !m.chars[spFrom].ctrl) spFrom++;
+      squeeze(spFrom);
+    }
     if (!Number.isFinite(scale) || scale <= 0) scale = 1;
     scale = Math.min(4, Math.max(0.25, scale));
-    plans.push({ seg, xoff: xoff + lead, scale, spaceAdd, spFrom: spaceFrom, start, end, tabs, fixedTo, textEnd, ...i === 0 && bu ? { bullet: { ch: bu.ch, w: bulletW, prId: bu.charPrId ?? firstPr } } : {} });
+    plans.push({ seg, xoff: xoff + lead, scale, spaceAdd, spFrom: spaceFrom, ...charAdd ? { charAdd } : {}, start, end, tabs, fixedTo, textEnd, ...i === 0 && bu ? { bullet: { ch: bu.ch, w: bulletW, prId: bu.charPrId ?? firstPr } } : {} });
   }
   return plans;
 }
 function advanceTo(m, styles, plan, upto) {
   let x = 0;
   for (let i = plan.start; i < upto && i < m.chars.length; i++) {
-    x += m.chars[i].tab ? plan.tabs.get(i) ?? 0 : charW(m.chars[i], styles, m.chars[i - 1]) * (i < plan.fixedTo ? 1 : plan.scale) + (i >= plan.spFrom && i < plan.textEnd && m.chars[i].ch === " " ? plan.spaceAdd : 0);
+    const c = m.chars[i], inStretch = i >= plan.spFrom && i < plan.textEnd;
+    x += c.tab ? plan.tabs.get(i) ?? 0 : charW(c, styles, m.chars[i - 1]) * (i < plan.fixedTo ? 1 : plan.scale) + (inStretch && c.ch === " " ? plan.spaceAdd : 0) + (inStretch && plan.charAdd && c.ch && c.ch !== " " ? plan.charAdd : 0);
   }
   for (const o of m.objs) if (o.inline && o.index >= plan.start && o.index < upto) x += o.omL + o.width + o.omR;
   return x;
@@ -14790,7 +14861,7 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
         return n;
       };
       const renderSeg = (text, cx, hit) => {
-        const sw = measure(text) * scale + (plan.spaceAdd && i >= plan.fixedTo ? plan.spaceAdd * spacesIn(text) : 0);
+        const sw = measure(text) * scale + (plan.spaceAdd && i >= plan.fixedTo ? plan.spaceAdd * spacesIn(text) : 0) + (plan.charAdd && i >= plan.fixedTo ? plan.charAdd * [...text].filter((ch) => ch !== " ").length : 0);
         if (st.shade) emit(ctx, `<rect x="${pt2(cx)}" y="${pt2(glyphY(st.height) - Math.round(st.height * 0.85))}" width="${pt2(sw)}" height="${pt2(st.height)}" fill="${escapeXml(st.shade)}"/>`);
         if (hit) {
           emit(ctx, `<rect x="${pt2(cx)}" y="${pt2(oy + seg.vertpos)}" width="${pt2(sw)}" height="${pt2(seg.textheight)}" fill="#ffd54f" fill-opacity="0.45"/>`);
@@ -14872,11 +14943,15 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       let anchorLineV;
       let anchorLineH = 0;
       let anchorSeg;
-      for (const pl of plans) if (pl.start <= o.index) {
-        anchorLineV = pl.seg.vertpos;
-        anchorLineH = pl.seg.textheight;
-        anchorSeg = pl.seg;
-      }
+      let anchorK = -1;
+      plans.forEach((pl, k) => {
+        if (pl.start <= o.index) {
+          anchorLineV = pl.seg.vertpos;
+          anchorLineH = pl.seg.textheight;
+          anchorSeg = pl.seg;
+          anchorK = k;
+        }
+      });
       let objBaseV = baseV;
       const pTop = depth === 0 ? ctx.paraTops?.get(p) : void 0;
       const wrapA = o.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM";
@@ -14895,6 +14970,11 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       let stay = tbFloats < 2 && !m.objs.some((q) => q.inline) && !m.chars.some((c) => c.ch !== "" && !c.nb && c.ch.trim() !== "");
       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;
+      let carried;
+      if (segPages && anchorK > 0 && segPages[anchorK] !== segPages[0] && segPages[anchorK - 1] === segPages[0] && wrapA === "TOP_AND_BOTTOM" && (findChildByLocalName(o.el, "pos")?.getAttribute("vertRelTo") ?? "PARA") === "PARA") {
+        const s0 = plans[anchorK - 1].seg;
+        carried = s0.vertpos + s0.textheight + (s0.spacing ?? 0);
+      }
       const firstLine = anchorLineV === void 0 || anchorLineV === baseV;
       let { x, y } = anchorObject(
         o,
@@ -14911,6 +14991,10 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
         // 문단 중간 글자 앵커인데 첫 줄부터 앵커 줄만큼 좁게 저장됐으면 개체는 문단 위에 있다(같은 판 한컴 PDF: 둘째 줄 앵커 사진, 네 줄 모두 34602)
         m.chars.slice(o.index).some((c) => c.ch.trim() !== "") && !!anchorSeg && plans.length > 0 && plans[0].seg !== anchorSeg && Math.abs(plans[0].seg.horzsize - anchorSeg.horzsize) <= 100 && anchorSeg.horzpos + anchorSeg.horzsize < aw - 1e3 ? "top" : m.chars.slice(o.index).some((c) => c.ch.trim() !== "") ? "mid" : "end"
       );
+      if (carried !== void 0) {
+        const posC = findChildByLocalName(o.el, "pos"), rawC = num(posC, "vertOffset");
+        y = oy + carried + num(findChildByLocalName(o.el, "outMargin"), "top") + Math.max(0, rawC >= 2 ** 31 ? rawC - 2 ** 32 : rawC);
+      }
       let stackTop = depth === 0 ? pTop ?? 0 : cellParaTop(p, ctx.styles.paraGeom);
       if (tbFloats >= 2 && wrapA === "TOP_AND_BOTTOM" && stackTop !== void 0) {
         if (!tbStack) {
@@ -15819,7 +15903,8 @@ 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 styles = headFile ? parseRenderStyles(await readZipEntry(headFile, "text"), { appMajor, appBuild }) : { charPr: /* @__PURE__ */ new Map(), paraAlign: /* @__PURE__ */ new Map(), paraGeom: /* @__PURE__ */ new Map(), borderFill: /* @__PURE__ */ new Map() };
+  const headXml = headFile ? 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) {
@@ -15827,6 +15912,10 @@ async function renderHwpxInternal(input, options) {
     if (xml.length > MAX_DECOMPRESS_SIZE) throw new KordocError("\uC139\uC158 XML\uC774 \uD5C8\uC6A9 \uD06C\uAE30\uB97C \uCD08\uACFC");
     secXmls.push(xml);
   }
+  if (headXml && hasKoPubSubst(headXml)) {
+    const alt = parseRenderStyles(headXml, { appMajor, appBuild, substKoPub: true });
+    if (kopubSubstituted(secXmls, styles, alt)) styles = alt;
+  }
   const masterPages = /* @__PURE__ */ new Map();
   const masterXmls = [];
   for (const file of zip.file(/Contents\/masterpage[^/]*\.xml$/i)) {
@@ -20086,4 +20175,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-J45OVEUM.js.map
+//# sourceMappingURL=chunk-YEYNBH5W.js.map