kordoc 4.24.2 → 4.24.4

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   blocksToPages,
   bmpToPng,
   inlineImagesIntoMarkdown
-} from "./chunk-3HN65YAL.js";
+} from "./chunk-MC4DPT4I.js";
 import {
   parsePageRange
 } from "./chunk-V4BH5SRQ.js";
@@ -43,7 +43,7 @@ import {
   validateOcrOptions,
   visibleText,
   wrapScript
-} from "./chunk-TW3V6FSH.js";
+} from "./chunk-VBY3JQL2.js";
 import {
   KordocError,
   OPTIONAL_DEP_INSTALL_HINT,
@@ -61,7 +61,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-WJAFE3Z6.js";
+} from "./chunk-FK3JPTHI.js";
 
 // src/plain-markdown.ts
 function toPlainMarkdown(md2) {
@@ -24620,7 +24620,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-J54Q3YWP.js");
+  const { parseImageDocument } = await import("./image-ocr-THA5BASF.js");
   let inserted = false, unreadable = 0;
   let failed = null;
   const walk = async (list, depth) => {
@@ -44217,7 +44217,7 @@ function hwpFaceToCssStack(face) {
   const head = FONT_ALIASES[trimmed] ?? cssQuote(trimmed);
   return `${head},${generic}`;
 }
-function collectHangulFonts(root, lang = "HANGUL", hftIds) {
+function collectHangulFonts(root, lang = "HANGUL", hftIds, substKoPub = false) {
   const map = /* @__PURE__ */ new Map();
   const findFaces = (el, depth) => {
     if (depth > 24) return null;
@@ -44253,7 +44253,7 @@ function collectHangulFonts(root, lang = "HANGUL", hftIds) {
     const id = e.getAttribute("id");
     let face = e.getAttribute("face");
     let type = e.getAttribute("type");
-    if (face && type === "TTF" && /^한양/.test(face)) {
+    if (face && type === "TTF" && (/^한양/.test(face) || substKoPub && /^KoPub/.test(face))) {
       const sub = Array.from(e.childNodes).find((c) => c.nodeType === 1 && (c.tagName || "").replace(/^[^:]+:/, "") === "substFont");
       const sf = sub?.getAttribute("face");
       if (sf) {
@@ -44344,10 +44344,11 @@ function parseRenderStyles(headXml, opts) {
   const hv = Number.parseFloat(root.getAttribute("version") ?? "");
   const oldUnit = Number.isFinite(hv) && hv < 1.4;
   const hftHangul = /* @__PURE__ */ new Set(), hftLatin = /* @__PURE__ */ new Set();
-  const hangulFonts = collectHangulFonts(root, "HANGUL", hftHangul);
-  const latinFonts = collectHangulFonts(root, "LATIN", hftLatin);
+  const sk = !!opts?.substKoPub;
+  const hangulFonts = collectHangulFonts(root, "HANGUL", hftHangul, sk);
+  const latinFonts = collectHangulFonts(root, "LATIN", hftLatin, sk);
   const hftHanja = /* @__PURE__ */ new Set(), hftJapanese = /* @__PURE__ */ new Set(), hftSymbol = /* @__PURE__ */ new Set();
-  const langFonts = { hanja: [collectHangulFonts(root, "HANJA", hftHanja), hftHanja], japanese: [collectHangulFonts(root, "JAPANESE", hftJapanese), hftJapanese], symbol: [collectHangulFonts(root, "SYMBOL", hftSymbol), hftSymbol] };
+  const langFonts = { hanja: [collectHangulFonts(root, "HANJA", hftHanja, sk), hftHanja], japanese: [collectHangulFonts(root, "JAPANESE", hftJapanese, sk), hftJapanese], symbol: [collectHangulFonts(root, "SYMBOL", hftSymbol, sk), hftSymbol] };
   const autoTabPr = /* @__PURE__ */ new Set();
   const paraTabRef = /* @__PURE__ */ new Map();
   const paraBullet = /* @__PURE__ */ new Map();
@@ -52495,6 +52496,12 @@ function solveRowHeights(cells, rowCount, maxTotal = Number.POSITIVE_INFINITY, s
     for (const r of missing) h[r] = each;
     return true;
   };
+  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));
+    if (need > 0) h[r] = need;
+  }
   for (let again = true; again; ) {
     again = false;
     for (let k = 0; k < spans.length; k++) if (!done.has(k) && solve(k, true)) again = true;
@@ -52511,7 +52518,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;
 }
 
@@ -52779,7 +52787,7 @@ function cellContentExtent(cell2, memo) {
       const pushed = baseV - (Math.max(0, vo) + num2(om, "top") + o.height + num2(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 + num2(om, "top") + Math.max(0, vo) + oh);
+      ext = Math.max(ext, anchor + num2(om, "top") + Math.max(0, vo) + oh + num2(om, "bottom"));
     }
   }
   memo?.cell.set(cell2.el, ext);
@@ -52846,7 +52854,7 @@ function measureTableRowHeights(tbl2, 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,
     num2(findChildByLocalName(tbl2, "sz"), "height") - (sp > 0 ? sp * (nRows + 1) : 0) || Number.POSITIVE_INFINITY,
     !inCell(tbl2) && !cells.some((c) => c.ra + c.rs === nRows && splitSaved(c))
@@ -52973,6 +52981,7 @@ function splitTableRows(tbl2, top, lim, bodyH, styles, notes) {
   const fl = () => notes && nN > 0 ? Math.min(floor, bodyH - notes.area((moved ? 0 : notes.n0) + nN, (moved ? 0 : notes.s0) + nS)) : floor;
   const sp = num2(tbl2, "cellSpacing");
   const cells = mode === "CELL" ? collectCells(tbl2) : [];
+  const tableCells = mode === "TABLE" ? collectCells(tbl2) : [];
   const record = mode === "CELL" ? /* @__PURE__ */ new Map() : void 0;
   const carries = /* @__PURE__ */ new Map();
   for (let r = 0; r < rows.length; r++) {
@@ -53001,7 +53010,20 @@ function splitTableRows(tbl2, top, lim, bodyH, styles, notes) {
       y += h;
       continue;
     }
-    if (y + h + outB > fl() && !(moved && y === outT + headH)) {
+    let need = h;
+    if (!tableCells.some((c) => c.ra < r && c.ra + c.rs > r)) {
+      let end = r + 1;
+      for (let grown = true; grown; ) {
+        grown = false;
+        for (const c of tableCells) if (c.ra >= r && c.ra < end && c.ra + c.rs > end) {
+          end = c.ra + c.rs;
+          grown = true;
+        }
+      }
+      const groupH = rows.slice(r, end).reduce((a, b) => a + b, 0);
+      if (end > r + 1 && groupH <= bodyH - outT - outB - headH) need = groupH;
+    }
+    if (y + need + outB > fl() && !(moved && y === outT + headH)) {
       if (!moved && r === 0) splitWhole = true;
       y = outT + headH;
       floor = bodyH;
@@ -54381,6 +54403,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 = num2(pagePr, "width", 59528), PH = num2(pagePr, "height", 84188);
+  if (pagePr.getAttribute("landscape") === "NARROWLY" && PW < PH) [PW, PH] = [PH, PW];
+  const gutterTB = pagePr.getAttribute("gutterType") === "TOP_BOTTOM", gutter = num2(margin ?? null, "gutter", 0);
+  const BODY_W = PW - num2(margin ?? null, "left", 8504) - num2(margin ?? null, "right", 8504) - (gutterTB ? 0 : gutter);
+  const BODY_H = PH - num2(margin ?? null, "top", 5668) - num2(margin ?? null, "header", 0) - num2(margin ?? null, "bottom", 4252) - num2(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, alt2) {
+  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, alt2);
+    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")}`;
@@ -54609,6 +54678,26 @@ function cellLineBoxes(c) {
 function cellLines(c) {
   return cellLineBoxes(c).map((b) => [b.top, b.bottom]);
 }
+function spanPartRows(cells, rowY) {
+  const out = /* @__PURE__ */ new Set();
+  for (const c of cells) {
+    if (c.rs < 2) continue;
+    const bs = cellLineBoxes(c);
+    const parts = bs.length ? bs[bs.length - 1].part : 0;
+    let s = c.ra;
+    for (let k = 0; k < parts; k++) {
+      const inK = bs.filter((b) => b.part === k);
+      if (!inK.length) break;
+      const ext = Math.max(...inK.map((b) => b.bottom)) - inK[0].origin + c.marginT + c.marginB;
+      let r = s + 1;
+      while (r < c.ra + c.rs && rowY[r] - rowY[s] < ext - 100) r++;
+      if (r >= c.ra + c.rs) break;
+      out.add(r);
+      s = r;
+    }
+  }
+  return out;
+}
 function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan, nested = false, contMT = MT) {
   if (nested) slack = 0;
   const nRows = rowH.length;
@@ -54641,9 +54730,15 @@ 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;
+  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)) {
+      page++;
+      y = contTop;
+      first = true;
+    }
     const rowCells = cells.filter((c) => c.ra === r && c.rs === 1);
     const splittable = cellSplit && r >= hdrRows && rowCells.length > 0;
     const stack = splittable && rowCells.length === 1 ? stackedFloats(rowCells[0]) : [];
@@ -54782,11 +54877,11 @@ function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan,
         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) {
@@ -54858,6 +54953,21 @@ function planTableRows(tbl2, cells, rowH, ty, MT, BODY_H, slack = 0, floatSpan,
       page++;
       y = contTop;
       first = true;
+    } else if (!first && tbl2.getAttribute("pageBreak") === "TABLE" && r >= hdrRows && !cells.some((c) => c.ra < r && c.ra + c.rs > r)) {
+      let end = r + 1;
+      for (let grown = true; grown; ) {
+        grown = false;
+        for (const c of cells) if (c.ra >= r && c.ra < end && c.ra + c.rs > end) {
+          end = c.ra + c.rs;
+          grown = true;
+        }
+      }
+      const groupH = rowY[Math.min(end, nRows)] - rowY[r];
+      if (end > r + 1 && y + groupH + outB > pageBottom && groupH <= pageBottom - contTop) {
+        page++;
+        y = contTop;
+        first = true;
+      }
     }
     out.push([{ page, y, h }]);
     y += h;
@@ -54900,12 +55010,27 @@ function renderingMatrix(el) {
   const info = findChildByLocalName(el, "renderingInfo");
   if (!info) return null;
   let m = null;
+  let pendingS = null;
+  const apply = (n) => {
+    m = m ? mulAffine(m, n) : n;
+  };
   for (const c of elements(info)) {
     const tag = ln(c);
     if (tag !== "transMatrix" && tag !== "scaMatrix" && tag !== "rotMatrix") continue;
     const n = [num2(c, "e1", 1), num2(c, "e4"), num2(c, "e2"), num2(c, "e5", 1), num2(c, "e3"), num2(c, "e6")];
-    m = m ? mulAffine(m, n) : n;
+    if (tag === "scaMatrix") {
+      if (pendingS) apply(pendingS);
+      pendingS = n;
+      continue;
+    }
+    if (tag === "rotMatrix" && pendingS) {
+      apply(mulAffine(n, pendingS));
+      pendingS = null;
+      continue;
+    }
+    apply(n);
   }
+  if (pendingS) apply(pendingS);
   return m;
 }
 function objectGeometry(el, x, y, w, h, boxW = w, boxH = h) {
@@ -55012,7 +55137,7 @@ function linePushedBy(o, lineV, paraTop) {
   const raw = num2(pos, "vertOffset"), vo = (pos?.getAttribute("vertRelTo") ?? "PARA") === "PARA" ? Math.max(0, raw >= 2 ** 31 ? raw - 2 ** 32 : raw) : 0;
   return Math.abs(lineV - (vo + num2(om, "top") + o.height + num2(om, "bottom")) - paraTop) <= 10;
 }
-function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = false, paraStartV, lineH, lineSB = 0) {
+function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = false, paraStartV, lineH, lineSB = 0, anchorAt = "end") {
   const { PW, PH, ML, MT, BODY_W, BODY_H } = ctx.geom;
   const pos = findChildByLocalName(o.el, "pos");
   const om = findChildByLocalName(o.el, "outMargin");
@@ -55040,8 +55165,9 @@ function anchorObject(o, ox, oy, baseV, areaW, ctx, anchorLineV, stayLine = fals
     y = oy + anchor + omT + vo;
   } else {
     const origin = vrel === "PARA" && wrap === "SQUARE" ? paraStartV ?? baseV : baseV;
-    const later = vrel === "PARA" && wrap === "SQUARE" && anchorLineV !== void 0 && anchorLineV > baseV;
-    y = later ? oy + anchorLineV + vo + omT : oy + Math.max(origin + vo, wrap === "SQUARE" && anchorLineV !== void 0 ? anchorLineV : -Infinity) + omT;
+    const later = vrel === "PARA" && wrap === "SQUARE" && anchorAt === "end" && anchorLineV !== void 0 && anchorLineV > baseV;
+    const midLater = vrel === "PARA" && wrap === "SQUARE" && anchorAt === "top" && anchorLineV !== void 0 && anchorLineV > baseV;
+    y = later ? oy + anchorLineV + vo + omT : oy + Math.max(origin + vo, wrap === "SQUARE" && !midLater && anchorLineV !== void 0 ? anchorLineV : -Infinity) + omT;
   }
   let x;
   const omL = num2(om, "left"), omR = num2(om, "right");
@@ -55364,30 +55490,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 scale2 = 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 && scale2 === 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(scale2) || scale2 <= 0) scale2 = 1;
     scale2 = Math.min(4, Math.max(0.25, scale2));
-    plans.push({ seg, xoff: xoff + lead, scale: scale2, 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: scale2, 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;
@@ -55505,7 +55654,7 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
         return n;
       };
       const renderSeg = (text, cx, hit) => {
-        const sw = measure(text) * scale2 + (plan.spaceAdd && i >= plan.fixedTo ? plan.spaceAdd * spacesIn(text) : 0);
+        const sw = measure(text) * scale2 + (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="${escapeXml7(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"/>`);
@@ -55571,7 +55720,8 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       const plan = plans[planIdx];
       if (segPages && segPages[planIdx] !== void 0) ctx.page = segPages[planIdx];
       const x = ox + plan.seg.horzpos + plan.xoff + advanceTo(m, ctx.styles, plan, o.index) + o.omL;
-      const eqAsc = o.tag === "equation" && Number(o.el.getAttribute("baseLine")) > 0 ? Math.round(o.height * Number(o.el.getAttribute("baseLine")) / 100) : o.tag === "pic" ? Math.round(o.height * 0.85) : o.height;
+      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.height;
       const iom = findChildByLocalName(o.el, "outMargin"), iomT = num2(iom, "top"), iomB = num2(iom, "bottom");
       const yTop = oy + plan.seg.vertpos + Math.max(iomT, plan.seg.baseline - eqAsc - iomB - captionExtra(o.el));
       drawObject(o, x, yTop, baseV, areaW, ctx, depth);
@@ -55585,10 +55735,16 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
       }
       let anchorLineV;
       let anchorLineH = 0;
-      for (const pl of plans) if (pl.start <= o.index) {
-        anchorLineV = pl.seg.vertpos;
-        anchorLineH = pl.seg.textheight;
-      }
+      let anchorSeg;
+      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";
@@ -55598,14 +55754,40 @@ function drawPara(p, ox, oy, areaW, ctx, depth, segPages) {
         if (baseV > start + 100) {
           objBaseV = start;
           if (anchorLineV === baseV) anchorLineV = start;
+        } else if (depth > 0 && start > top0 && Math.abs(baseV - start) <= 100) {
+          objBaseV = top0;
+          if (anchorLineV === baseV) anchorLineV = top0;
         }
       }
       const tbFloats = m.objs.filter((q) => !q.inline && (q.el.getAttribute("textWrap") ?? "TOP_AND_BOTTOM") === "TOP_AND_BOTTOM" && (findChildByLocalName(q.el, "pos")?.getAttribute("vertRelTo") ?? "PARA") === "PARA").length;
       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, ax, oy, objBaseV, aw, ctx, anchorLineV, stay ? sbA : false, (firstLine || wrapA === "SQUARE") && pTop !== void 0 && pTop < baseV ? pTop : void 0, anchorLineH, firstLine ? sbA : 0);
+      let { x, y } = anchorObject(
+        o,
+        ax,
+        oy,
+        objBaseV,
+        aw,
+        ctx,
+        anchorLineV,
+        stay ? sbA : false,
+        (firstLine || wrapA === "SQUARE") && pTop !== void 0 && pTop < baseV ? pTop : void 0,
+        anchorLineH,
+        firstLine ? sbA : 0,
+        // 문단 중간 글자 앵커인데 첫 줄부터 앵커 줄만큼 좁게 저장됐으면 개체는 문단 위에 있다(같은 판 한컴 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 = num2(posC, "vertOffset");
+        y = oy + carried + num2(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) {
@@ -55860,10 +56042,28 @@ function drawTable(tbl2, tx, ty, ctx, depth) {
       pcs.forEach((pc, k) => geom.push({ c, page: startPage + pc.page, ...xw(c), y: pc.y, h: pc.h, pieces: k === 0 ? pcs : [] }));
       continue;
     }
+    if (c.rs > 1) {
+      const span2 = plan.slice(c.ra, Math.min(c.ra + c.rs, nRows)).flat();
+      const pages = [...new Set(span2.map((pc) => pc.page))];
+      if (pages.length > 1) {
+        const bs = cellLineBoxes(c);
+        const partTop = (k) => bs.find((b) => b.part === k);
+        const groups = pages.map((pg, k) => {
+          const on = span2.filter((pc) => pc.page === pg);
+          const y0 = Math.min(...on.map((pc) => pc.y)), y1 = Math.max(...on.map((pc) => pc.y + pc.h));
+          const from = k === 0 ? 0 : partTop(k)?.origin ?? Number.POSITIVE_INFINITY;
+          const to = k === pages.length - 1 ? Number.POSITIVE_INFINITY : partTop(k + 1)?.top ?? Number.POSITIVE_INFINITY;
+          return { page: pg, y: y0, h: y1 - y0, range: /* @__PURE__ */ new Map([[c.el, [from, to]]]) };
+        });
+        groups.forEach((pc, k) => geom.push({ c, page: startPage + pc.page, ...xw(c), y: pc.y, h: pc.h, pieces: k === 0 ? groups : [] }));
+        continue;
+      }
+    }
     const h = c.rs === 1 ? pcs[0].h : rowY[Math.min(c.ra + c.rs, nRows)] - rowY[c.ra];
     geom.push({ c, page: startPage + pcs[0].page, ...xw(c), y: pcs[0].y, h });
   }
-  for (const page of contPages) for (const c of cells) if (c.ra < hdrRows) geom.push({ c, page, ...xw(c), y: ctx.geom.MT + num2(findChildByLocalName(tbl2, "outMargin"), "top") + rowY[c.ra], h: rowY[Math.min(c.ra + c.rs, nRows)] - rowY[c.ra] });
+  const contBase = depth !== 1 && ctx.splitContMT !== void 0 ? ctx.splitContMT : ctx.geom.MT;
+  for (const page of contPages) for (const c of cells) if (c.ra < hdrRows) geom.push({ c, page, ...xw(c), y: contBase + num2(findChildByLocalName(tbl2, "outMargin"), "top") + rowY[c.ra], h: rowY[Math.min(c.ra + c.rs, nRows)] - rowY[c.ra] });
   for (const g3 of geom) {
     ctx.page = g3.page;
     const bf = g3.c.bfId != null ? ctx.styles.borderFill.get(g3.c.bfId) : void 0;
@@ -55908,7 +56108,7 @@ function drawTable(tbl2, tx, ty, ctx, depth) {
         });
         ctx.splitCell = splitHere;
         const contMTSaved = ctx.splitContMT;
-        ctx.splitContMT = ctx.geom.MT + num2(findChildByLocalName(tbl2, "outMargin"), "top") + rowY[hdrRows] + c.marginT;
+        ctx.splitContMT = (depth > 1 && contMTSaved !== void 0 ? contMTSaved : ctx.geom.MT) + num2(findChildByLocalName(tbl2, "outMargin"), "top") + rowY[hdrRows] + c.marginT;
         drawPara(p, g3.x + c.marginL, base, g3.w - c.marginL - c.marginR, ctx, depth + 1, pages);
         ctx.splitContMT = contMTSaved;
         ctx.splitCell = false;
@@ -56496,7 +56696,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) {
@@ -56504,6 +56705,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 alt2 = parseRenderStyles(headXml, { appMajor, appBuild, substKoPub: true });
+    if (kopubSubstituted(secXmls, styles, alt2)) styles = alt2;
+  }
   const masterPages = /* @__PURE__ */ new Map();
   const masterXmls = [];
   for (const file of zip.file(/Contents\/masterpage[^/]*\.xml$/i)) {
@@ -56555,6 +56760,7 @@ async function renderHwpxInternal(input, options) {
   }
   const roots = [];
   let noCacheSkipped = false;
+  const lastParity = /* @__PURE__ */ new Map();
   for (let si = 0; si < secXmls.length; si++) {
     const secXml = secXmls[si];
     const hasCache = /<(?:[A-Za-z][\w.-]*:)?linesegarray[\s/>]/.test(secXml);
@@ -56571,6 +56777,14 @@ async function renderHwpxInternal(input, options) {
     }
     const secPr = findFirst(root, "secPr");
     const referenced = secPr ? elements(secPr).filter((el) => ln(el) === "masterPage").map((el) => masterPages.get(el.getAttribute("idRef") || "")).filter((el) => !!el) : [];
+    const typeOf = (m) => m.getAttribute("type") || "BOTH";
+    const has3 = (t) => referenced.some((m) => typeOf(m) === t);
+    if (!has3("BOTH")) for (const [t, other] of [["EVEN", "ODD"], ["ODD", "EVEN"]]) {
+      const prev = lastParity.get(t);
+      if (prev && !has3(t) && has3(other)) referenced.unshift(prev);
+    }
+    for (const m of referenced) if (typeOf(m) === "EVEN" || typeOf(m) === "ODD") lastParity.set(typeOf(m), m);
+    if (has3("BOTH")) lastParity.clear();
     roots.push({ root, index: si, masterPages: referenced, hasDeletionMarkers: secXml.includes("deleteBegin") || secXml.includes("deleteEnd") });
   }
   if (roots.length === 0) {
@@ -57605,7 +57819,7 @@ function scriptsOff(r, off) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-J54Q3YWP.js");
+    const { parseImageDocument } = await import("./image-ocr-THA5BASF.js");
     const { blocks, warnings, lines } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -57669,7 +57883,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-OBGWEWSU.js");
+    const mod = await import("./parser-MNNJSFEZ.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {