kordoc 4.18.2 → 4.18.3

package/dist/{chunk-T4MXCSBP.js → chunk-ZN3LHNJG.js}

@@ -9,7 +9,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-F5HING4Y.js";
+} from "./chunk-UVUKT3IQ.js";
 import {
   parsePageRange
 } from "./chunk-VQFA55IC.js";
@@ -22,7 +22,7 @@ import {
   findChildByLocalName,
   hwpFaceToCssStack,
   parseRenderStyles
-} from "./chunk-LACO375L.js";
+} from "./chunk-RSDUH4XF.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -33,18 +33,18 @@ import {
   flattenLayoutTables,
   mapPuaText,
   markNonLayoutTable
-} from "./chunk-IA3UKDHA.js";
+} from "./chunk-W3RADOLO.js";
 import {
   loadSharp,
   rasterizePageSvg
-} from "./chunk-CKUIFTXJ.js";
+} from "./chunk-KSJ7GKNQ.js";
 import {
   KordocError,
   escapeHtml,
   precheckZipSize,
   sanitizeHref,
   toArrayBuffer
-} from "./chunk-OBILAVWC.js";
+} from "./chunk-VGDTONTB.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -1732,7 +1732,7 @@ var CHAR_CTRL_1SLOT = /* @__PURE__ */ new Set(["lineBreak", "hyphen", "nbSpace",
 function pushFillers(chars, n, prId) {
   for (let i = 0; i < n; i++) chars.push({ ch: "", prId });
 }
-function pushTextSlots(t, chars, prId, depth) {
+function pushTextSlots(t, chars, prId, depth, del = { deleted: 0 }) {
   if (depth > 32) return;
   const kids = t.childNodes;
   if (!kids) return;
@@ -1740,19 +1740,24 @@ function pushTextSlots(t, chars, prId, depth) {
     const c = kids[i];
     if (c.nodeType === 3 || c.nodeType === 4) {
       for (const cp of c.textContent ?? "") {
-        chars.push({ ch: cp, prId });
+        chars.push({ ch: del.deleted ? "" : cp, prId });
         if (cp.length === 2) chars.push({ ch: "", prId });
       }
     } else if (c.nodeType === 1) {
       const el = c;
       const tag = ln(el);
-      if (tag === "tab") {
-        chars.push({ ch: "", prId, tab: true, tabW: num(el, "width") });
-        pushFillers(chars, 7, prId);
+      if (tag === "deleteBegin" || tag === "deleteEnd") {
+        del.deleted = deletionDelta(el, del.deleted);
+      } else if (tag === "tab") {
+        if (del.deleted) pushFillers(chars, 8, prId);
+        else {
+          chars.push({ ch: "", prId, tab: true, tabW: num(el, "width") });
+          pushFillers(chars, 7, prId);
+        }
       } else if (CHAR_CTRL_1SLOT.has(tag)) {
-        chars.push(tag === "nbSpace" ? { ch: " ", prId, nb: true } : { ch: tag === "fwSpace" ? " " : "", prId });
+        chars.push(del.deleted ? { ch: "", prId } : tag === "nbSpace" ? { ch: " ", prId, nb: true } : { ch: tag === "fwSpace" ? " " : "", prId });
       } else {
-        pushTextSlots(el, chars, prId, depth + 1);
+        pushTextSlots(el, chars, prId, depth + 1, del);
       }
     }
   }
@@ -1777,7 +1782,7 @@ function prepareDeletedRanges(root, depth = 0) {
     deletedStarts.set(p, deleted);
     const scan = (el, xmlDepth) => {
       if (xmlDepth > 64) return;
-      if (ln(el) === "ctrl") for (const ch of elements(el)) scan(ch, xmlDepth + 1);
+      if (ln(el) === "ctrl" || ln(el) === "t") for (const ch of elements(el)) scan(ch, xmlDepth + 1);
       else {
         if (ln(el) === "deleteBegin" || ln(el) === "deleteEnd") deleted = deletionDelta(el, deleted);
         deletedControls.set(el, deleted > 0);
@@ -1809,9 +1814,9 @@ function buildPara(p) {
       for (const ch of elements(runEl)) {
         const cn = ln(ch);
         if (cn === "t") {
-          const start = chars.length;
-          pushTextSlots(ch, chars, prId, 0);
-          if (deleted) for (let i = start; i < chars.length; i++) chars[i] = { ch: "", prId };
+          const del = { deleted };
+          pushTextSlots(ch, chars, prId, 0, del);
+          deleted = del.deleted;
         } else if (OBJ_TAGS.has(cn)) {
           const sz = findChildByLocalName(ch, "sz");
           const pos = findChildByLocalName(ch, "pos");
@@ -2333,14 +2338,15 @@ function shapeGeometry(o, boxX, boxY, defs, images, warn, local = false) {
   const color = esc(line?.getAttribute("color") || "#000000");
   const strokeW = style === "NONE" ? 0 : Math.max(0.2, num(line, "width", 33) / 100 * 2.834645);
   const dash = /DASH|DOT/.test(style) ? ` stroke-dasharray="${style.includes("DOT") ? "1,1.5" : "3,1.5"}"` : "";
-  const stroke = strokeW ? ` stroke="${color}" stroke-width="${strokeW.toFixed(2)}"${dash}` : "";
+  const keepWidth = local ? ` vector-effect="non-scaling-stroke"` : "";
+  const stroke = strokeW ? ` stroke="${color}" stroke-width="${strokeW.toFixed(2)}"${dash}${keepWidth}` : "";
   const fill = ` fill="${shapeFill(el, defs, images, warn)}"`;
   let svg = "";
   if (o.tag === "rect") svg = `<rect x="${pt(x)}" y="${pt(y)}" width="${pt(w)}" height="${pt(h)}"${fill}${stroke}/>`;
   else if (o.tag === "ellipse") svg = `<ellipse cx="${pt(x + w / 2)}" cy="${pt(y + h / 2)}" rx="${pt(w / 2)}" ry="${pt(h / 2)}"${fill}${stroke}/>`;
   else if (o.tag === "line") {
     const s = findChildByLocalName(el, "startPt"), e = findChildByLocalName(el, "endPt");
-    svg = `<line x1="${pt(x + num(s, "x") * sx)}" y1="${pt(y + num(s, "y") * sy)}" x2="${pt(x + num(e, "x") * sx)}" y2="${pt(y + num(e, "y") * sy)}" stroke="${color}" stroke-width="${(strokeW || 0.3).toFixed(2)}"${dash}/>`;
+    svg = `<line x1="${pt(x + num(s, "x") * sx)}" y1="${pt(y + num(s, "y") * sy)}" x2="${pt(x + num(e, "x") * sx)}" y2="${pt(y + num(e, "y") * sy)}" stroke="${color}" stroke-width="${(strokeW || 0.3).toFixed(2)}"${dash}${keepWidth}/>`;
   } else if (o.tag === "polygon" || o.tag === "curv") {
     const pts = elements(el).filter((c) => ln(c) === "pt").map((c) => `${pt(x + num(c, "x") * sx)},${pt(y + num(c, "y") * sy)}`);
     if (pts.length >= 2) svg = `<polygon points="${pts.join(" ")}"${fill}${stroke}/>`;
@@ -2696,15 +2702,15 @@ function drawGroupByMatrix(o, x, y, baseV, areaW, ctx, depth) {
     emit(ctx, `<g transform="matrix(${m.slice(0, 4).map((v) => Math.round(v * 1e6) / 1e6).join(" ")} ${pt2(m[4])} ${pt2(m[5])})">`);
     const sub = { el: leaf, tag, index: 0, inline: true, width: w, height: h, omL: 0, omR: 0 };
     if (tag === "pic") drawPicFrame(leaf, 0, 0, w, h, "", ctx);
-    else if (SHAPE_TAGS.has(tag)) drawShape(sub, 0, 0, ctx, depth + 1, true);
+    else if (SHAPE_TAGS.has(tag)) drawShape(sub, 0, 0, ctx, depth + 1, [Math.hypot(m[0], m[1]) || 1, Math.hypot(m[2], m[3]) || 1]);
     else drawObject(sub, 0, 0, baseV, areaW, ctx, depth + 1);
     emit(ctx, "</g>");
     ctx.regionRotations.pop();
   }
   return true;
 }
-function drawShape(o, x, y, ctx, depth, local = false) {
-  const geometry = shapeGeometry(o, x, y, ctx.defs, ctx.images, (key, msg) => warnOnce(ctx, key, msg), local);
+function drawShape(o, x, y, ctx, depth, groupScale) {
+  const geometry = shapeGeometry(o, x, y, ctx.defs, ctx.images, (key, msg) => warnOnce(ctx, key, msg), !!groupScale);
   const b = geometry;
   if (geometry.rotation) ctx.regionRotations.push(geometry.rotation);
   ctx.stats.shapes++;
@@ -2716,7 +2722,17 @@ function drawShape(o, x, y, ctx, depth, local = false) {
   const dt = findChildByLocalName(o.el, "drawText");
   const sub = dt ? findChildByLocalName(dt, "subList") : null;
   if (sub) {
-    for (const p of elements(sub)) if (ln(p) === "p") drawPara(p, x, y, geometry.w, ctx, depth + 1);
+    const [sx, sy] = groupScale ?? [1, 1];
+    const unscale = sx !== 1 || sy !== 1;
+    if (unscale) {
+      emit(ctx, `<g transform="scale(${1 / sx} ${1 / sy})">`);
+      ctx.regionRotations.push([1 / sx, 0, 0, 1 / sy, 0, 0]);
+    }
+    for (const p of elements(sub)) if (ln(p) === "p") drawPara(p, geometry.x * sx, geometry.y * sy, geometry.w * sx, ctx, depth + 1);
+    if (unscale) {
+      ctx.regionRotations.pop();
+      emit(ctx, "</g>");
+    }
   }
   if (geometry.rotation) ctx.regionRotations.pop();
   if (geometry.transform) emit(ctx, "</g>");
@@ -5741,6 +5757,7 @@ function createHwp5DocState() {
     outlineNumberingId: 0,
     autoCounters: /* @__PURE__ */ new Map(),
     headerTexts: /* @__PURE__ */ new Set(),
+    tocTexts: /* @__PURE__ */ new Set(),
     headerBlocks: [],
     footerBlocks: []
   };
@@ -5886,6 +5903,12 @@ function parseParagraph(records, start, end, ctx) {
       if (bullet && bullet.char !== "\uFFFF") headMarker = bullet.char;
     }
   }
+  if (toc.tocEntry) {
+    for (const line of text.split("\n")) if (line.trim()) {
+      ctx.doc.tocTexts.add(line.trim());
+      if (headMarker) ctx.doc.tocTexts.add(`${headMarker} ${line.trim()}`);
+    }
+  }
   return emitParagraphBlocks({
     text,
     headMarker,
@@ -6445,7 +6468,7 @@ function parseHwp5Document(buffer, options) {
     flatBlocks = deduped;
   }
   if (docInfo) {
-    detectHwp5Headings(flatBlocks, docInfo);
+    detectHwp5Headings(flatBlocks, docInfo, doc.tocTexts);
   }
   const outline = flatBlocks.filter((b) => b.type === "heading" && b.level && b.text).map((b) => ({ level: b.level, text: b.text, pageNumber: b.pageNumber }));
   let markdown = blocksToMarkdown(flatBlocks);
@@ -6478,7 +6501,7 @@ function parseDocInfoFromStream(raw, compressed) {
     return null;
   }
 }
-function detectHwp5Headings(blocks, docInfo) {
+function detectHwp5Headings(blocks, docInfo, tocTexts) {
   let baseFontSize = 0;
   const sizeFreq = /* @__PURE__ */ new Map();
   for (const b of blocks) {
@@ -6508,7 +6531,7 @@ function detectHwp5Headings(blocks, docInfo) {
   if (baseFontSize <= 0) return;
   for (const block of blocks) {
     if (block.type === "heading") continue;
-    if (block.type !== "paragraph" || !block.text || TOC_ENTRY_BLOCKS.has(block)) continue;
+    if (block.type !== "paragraph" || !block.text || TOC_ENTRY_BLOCKS.has(block) || tocTexts?.has(block.text.trim())) continue;
     const text = block.text.trim();
     if (text.length === 0 || text.length > 200) continue;
     if (/^\d+$/.test(text)) continue;
@@ -7746,4 +7769,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-T4MXCSBP.js.map
+//# sourceMappingURL=chunk-ZN3LHNJG.js.map