kordoc 3.8.3 → 3.8.4

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   sanitizeHref,
   stripDtd,
   toArrayBuffer
-} from "./chunk-7J73IGMK.js";
+} from "./chunk-T4SGNVVS.js";
 import {
   parsePageRange
 } from "./chunk-GE43BE46.js";
@@ -1150,14 +1150,14 @@ function resolveParaHeading(paraEl, ctx) {
   const head = numDef.heads.get(level);
   counters[level] = counters[level] === 0 ? head?.start ?? 1 : counters[level] + 1;
   for (let l = level + 1; l <= 10; l++) counters[l] = 0;
-  const fmtText = head?.text?.trim() || `^${level}.`;
+  const fmtText = head ? head.text.trim() : `^${level}.`;
   const prefix = fmtText.replace(/\^(10|[1-9])/g, (_, d) => {
     const lv = parseInt(d, 10);
     const refHead = numDef.heads.get(lv);
     const n = counters[lv] || refHead?.start || 1;
     return formatHeadNumber(n, refHead?.numFormat || "DIGIT");
   });
-  return { prefix, headingLevel };
+  return { prefix: prefix || void 0, headingLevel };
 }
 
 // src/hwpx/table-build.ts
@@ -18309,74 +18309,79 @@ function parseParagraph2(p, styles, numbering, footnotes, rels) {
   if (footnoteText) block.footnoteText = footnoteText;
   return block;
 }
+function collectTextboxParagraphs(node, inTxbx = false, out = [], depth = 0) {
+  if (depth > 40) return out;
+  for (const el of effectiveChildElements(node)) {
+    if (matchesLocal(el, "Fallback")) continue;
+    const nowIn = inTxbx || matchesLocal(el, "txbxContent");
+    if (nowIn && matchesLocal(el, "p")) out.push(el);
+    collectTextboxParagraphs(el, nowIn, out, depth + 1);
+  }
+  return out;
+}
 function parseTable(tbl, styles, numbering, footnotes, rels) {
   const trElements = getChildElements(tbl, "tr");
   if (trElements.length === 0) return null;
-  const rows = [];
-  let maxCols = 0;
+  const rawRows = [];
   for (const tr of trElements) {
-    const tcElements = getChildElements(tr, "tc");
     const row = [];
-    for (const tc of tcElements) {
+    let col = 0;
+    for (const tc of getChildElements(tr, "tc")) {
       let colSpan = 1;
-      let rowSpan = 1;
+      let vMerge = null;
       const tcPrEls = getChildElements(tc, "tcPr");
       if (tcPrEls.length > 0) {
         const gridSpanEls = getChildElements(tcPrEls[0], "gridSpan");
         if (gridSpanEls.length > 0) {
-          colSpan = parseInt(getAttr(gridSpanEls[0], "val") ?? "1", 10);
+          colSpan = parseInt(getAttr(gridSpanEls[0], "val") ?? "1", 10) || 1;
         }
         const vMergeEls = getChildElements(tcPrEls[0], "vMerge");
         if (vMergeEls.length > 0) {
-          const val = getAttr(vMergeEls[0], "val");
-          if (val !== "restart" && val !== null) {
-            row.push({ text: "", colSpan, rowSpan: 0 });
-            continue;
-          }
+          vMerge = getAttr(vMergeEls[0], "val") === "restart" ? "restart" : "continue";
+        }
+      }
+      const text = vMerge === "continue" ? "" : collectCellText(tc, styles, numbering, footnotes, rels, 0).join("\n");
+      row.push({ col, colSpan, vMerge, text });
+      col += colSpan;
+    }
+    rawRows.push(row);
+  }
+  const cellRows = rawRows.map(
+    (row, r) => row.filter((cell) => cell.vMerge !== "continue").map((cell) => {
+      let rowSpan = 1;
+      if (cell.vMerge === "restart") {
+        for (let nr = r + 1; nr < rawRows.length; nr++) {
+          if (!rawRows[nr].some((nc) => nc.col === cell.col && nc.vMerge === "continue")) break;
+          rowSpan++;
         }
       }
-      const cellTexts = [];
-      const pElements = getChildElements(tc, "p");
-      for (const p of pElements) {
-        const block = parseParagraph2(p, styles, numbering, footnotes, rels);
-        if (block?.text) cellTexts.push(block.text);
+      return { text: cell.text, colSpan: cell.colSpan, rowSpan, colAddr: cell.col, rowAddr: r };
+    })
+  );
+  const table = buildTable(cellRows);
+  if (table.rows === 0 || table.cols === 0) return null;
+  return { type: "table", table };
+}
+function collectCellText(tc, styles, numbering, footnotes, rels, depth) {
+  const parts = [];
+  if (depth > 20) return parts;
+  for (const el of effectiveChildElements(tc)) {
+    if (matchesLocal(el, "p")) {
+      const block = parseParagraph2(el, styles, numbering, footnotes, rels);
+      if (block?.text) parts.push(block.text);
+      for (const tp of collectTextboxParagraphs(el)) {
+        const tb = parseParagraph2(tp, styles, numbering, footnotes, rels);
+        if (tb?.text) parts.push(tb.text);
       }
-      row.push({ text: cellTexts.join("\n"), colSpan, rowSpan });
-    }
-    rows.push(row);
-    if (row.length > maxCols) maxCols = row.length;
-  }
-  for (let c = 0; c < maxCols; c++) {
-    for (let r = 0; r < rows.length; r++) {
-      const cell = rows[r][c];
-      if (!cell || cell.rowSpan === 0) continue;
-      let span = 1;
-      for (let nr = r + 1; nr < rows.length; nr++) {
-        if (rows[nr][c]?.rowSpan === 0) span++;
-        else break;
+    } else if (matchesLocal(el, "tbl")) {
+      for (const tr of getChildElements(el, "tr")) {
+        for (const nestedTc of getChildElements(tr, "tc")) {
+          parts.push(...collectCellText(nestedTc, styles, numbering, footnotes, rels, depth + 1));
+        }
       }
-      cell.rowSpan = span;
     }
   }
-  const cleanRows = [];
-  for (const row of rows) {
-    const clean = row.filter((cell) => cell.rowSpan !== 0);
-    cleanRows.push(clean);
-  }
-  if (cleanRows.length === 0) return null;
-  let cols = 0;
-  for (const row of cleanRows) {
-    let c = 0;
-    for (const cell of row) c += cell.colSpan;
-    if (c > cols) cols = c;
-  }
-  const table = {
-    rows: cleanRows.length,
-    cols,
-    cells: cleanRows,
-    hasHeader: cleanRows.length > 1
-  };
-  return { type: "table", table };
+  return parts;
 }
 async function extractImages(zip, rels, doc, warnings) {
   const blocks = [];
@@ -18482,6 +18487,10 @@ async function parseDocxDocument(buffer, options) {
     if (localName2 === "p") {
       const block = parseParagraph2(el, styles, numbering, footnotes, rels);
       if (block) blocks.push(block);
+      for (const tp of collectTextboxParagraphs(el)) {
+        const tb = parseParagraph2(tp, styles, numbering, footnotes, rels);
+        if (tb) blocks.push(tb);
+      }
     } else if (localName2 === "tbl") {
       const block = parseTable(el, styles, numbering, footnotes, rels);
       if (block) blocks.push(block);
@@ -18739,10 +18748,10 @@ function parseTable2(el, blocks, paraShapeMap, sectionNum, warnings) {
 }
 function extractCellText(cellEl) {
   const textParts = [];
-  collectCellText(cellEl, textParts, 0);
+  collectCellText2(cellEl, textParts, 0);
   return textParts.filter(Boolean).join("\n").trim();
 }
-function collectCellText(node, parts, depth) {
+function collectCellText2(node, parts, depth) {
   if (depth > 20) return;
   const children = node.childNodes;
   for (let i = 0; i < children.length; i++) {
@@ -18754,9 +18763,9 @@ function collectCellText(node, parts, depth) {
       if (t) parts.push(t);
       collectNestedTableText(el, parts, depth + 1);
     } else if (tag === "TABLE") {
-      collectCellText(el, parts, depth + 1);
+      collectCellText2(el, parts, depth + 1);
     } else {
-      collectCellText(el, parts, depth + 1);
+      collectCellText2(el, parts, depth + 1);
     }
   }
 }
@@ -18768,7 +18777,7 @@ function collectNestedTableText(node, parts, depth) {
     if (el.nodeType !== 1) continue;
     const tag = localName(el);
     if (tag === "TABLE") {
-      collectCellText(el, parts, depth + 1);
+      collectCellText2(el, parts, depth + 1);
       continue;
     }
     if (tag === "FOOTNOTE" || tag === "ENDNOTE" || tag === "HEADER" || tag === "FOOTER") continue;
@@ -20727,12 +20736,13 @@ function charPr(id, height, bold, italic, fontId = 0, textColor = DEFAULT_TEXT_C
       </hh:charPr>`;
 }
 function paraPr(id, opts = {}) {
-  const { align = "JUSTIFY", spaceBefore = 0, spaceAfter = 0, lineSpacing = 160, indent = 0, left = 0, keepWord = false } = opts;
+  const { align = "JUSTIFY", spaceBefore = 0, spaceAfter = 0, lineSpacing = 160, indent = 0, left = 0, keepWord = false, outlineLevel } = opts;
   const breakNonLatin = keepWord ? "KEEP_WORD" : "BREAK_WORD";
   const snapGrid = keepWord ? "0" : "1";
+  const heading = outlineLevel !== void 0 ? `<hh:heading type="OUTLINE" idRef="0" level="${outlineLevel}"/>` : `<hh:heading type="NONE" idRef="0" level="0"/>`;
   return `      <hh:paraPr id="${id}" tabPrIDRef="0" condense="0" fontLineHeight="0" snapToGrid="${snapGrid}" suppressLineNumbers="0" checked="0" textDir="AUTO">
         <hh:align horizontal="${align}" vertical="BASELINE"/>
-        <hh:heading type="NONE" idRef="0" level="0"/>
+        ${heading}
         <hh:breakSetting breakLatinWord="KEEP_WORD" breakNonLatinWord="${breakNonLatin}" widowOrphan="0" keepWithNext="0" keepLines="0" pageBreakBefore="0" lineWrap="BREAK"/>
         <hh:autoSpacing eAsianEng="0" eAsianNum="0"/>
         <hh:margin><hc:intent value="${indent}" unit="HWPUNIT"/><hc:left value="${left}" unit="HWPUNIT"/><hc:right value="0" unit="HWPUNIT"/><hc:prev value="${spaceBefore}" unit="HWPUNIT"/><hc:next value="${spaceAfter}" unit="HWPUNIT"/></hh:margin>
@@ -20839,7 +20849,7 @@ function parseMarkdownToBlocks(md2) {
     if (listMatch) {
       const indent = Math.floor(listMatch[1].length / 2);
       const ordered = /\d/.test(listMatch[2]);
-      blocks.push({ type: "list_item", text: listMatch[3].trim(), ordered, indent });
+      blocks.push({ type: "list_item", text: listMatch[3].trim(), ordered, indent, marker: listMatch[2] });
       i++;
       continue;
     }
@@ -20849,6 +20859,11 @@ function parseMarkdownToBlocks(md2) {
   return blocks;
 }
 function parseInlineMarkdown(text) {
+  const literals = [];
+  text = text.replace(/\x00/g, "").replace(/\\([\\`*_{}[\]()#+\-.!|>~])/g, (_, c) => {
+    literals.push(c);
+    return `\0${literals.length - 1}\0`;
+  });
   text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, "$1");
   text = text.replace(/\[([^\]]*)\]\(([^)]*)\)/g, (_, t, u) => t || u);
   text = text.replace(/~~([^~]+)~~/g, "$1");
@@ -20878,6 +20893,13 @@ function parseInlineMarkdown(text) {
   if (spans.length === 0) {
     spans.push({ text, bold: false, italic: false, code: false });
   }
+  for (const span of spans) {
+    if (!span.text.includes("\0")) continue;
+    span.text = span.text.replace(/\x00(\d+)\x00/g, (_, i) => {
+      const c = literals[+i] ?? "";
+      return span.code ? "\\" + c : c;
+    });
+  }
   return spans;
 }
 function spanToCharPrId(span) {
@@ -20965,10 +20987,10 @@ function buildParaProperties(gongmun) {
   if (!gongmun) {
     const base2 = [
       paraPr(0),
-      paraPr(1, { align: "LEFT", spaceBefore: 800, spaceAfter: 200, lineSpacing: 180 }),
-      paraPr(2, { align: "LEFT", spaceBefore: 600, spaceAfter: 150, lineSpacing: 170 }),
-      paraPr(3, { align: "LEFT", spaceBefore: 400, spaceAfter: 100, lineSpacing: 160 }),
-      paraPr(4, { align: "LEFT", spaceBefore: 300, spaceAfter: 100, lineSpacing: 160 }),
+      paraPr(1, { align: "LEFT", spaceBefore: 800, spaceAfter: 200, lineSpacing: 180, outlineLevel: 0 }),
+      paraPr(2, { align: "LEFT", spaceBefore: 600, spaceAfter: 150, lineSpacing: 170, outlineLevel: 1 }),
+      paraPr(3, { align: "LEFT", spaceBefore: 400, spaceAfter: 100, lineSpacing: 160, outlineLevel: 2 }),
+      paraPr(4, { align: "LEFT", spaceBefore: 300, spaceAfter: 100, lineSpacing: 160, outlineLevel: 3 }),
       paraPr(5, { align: "LEFT", lineSpacing: 130, indent: 400 }),
       paraPr(6, { align: "LEFT", lineSpacing: 150, indent: 600 }),
       paraPr(7, { align: "LEFT", lineSpacing: 160, indent: 600 })
@@ -20981,10 +21003,10 @@ ${base2.join("\n")}
   const titleAlign = gongmun.centerTitle ? "CENTER" : "LEFT";
   const base = [
     paraPr(0, { lineSpacing: ls, keepWord: true }),
-    paraPr(1, { align: titleAlign, spaceBefore: 400, spaceAfter: 400, lineSpacing: ls, keepWord: true }),
-    paraPr(2, { align: "LEFT", spaceBefore: 600, spaceAfter: 150, lineSpacing: ls, keepWord: true }),
-    paraPr(3, { align: "LEFT", spaceBefore: 400, spaceAfter: 100, lineSpacing: ls, keepWord: true }),
-    paraPr(4, { align: "LEFT", spaceBefore: 300, spaceAfter: 100, lineSpacing: ls, keepWord: true }),
+    paraPr(1, { align: titleAlign, spaceBefore: 400, spaceAfter: 400, lineSpacing: ls, keepWord: true, outlineLevel: 0 }),
+    paraPr(2, { align: "LEFT", spaceBefore: 600, spaceAfter: 150, lineSpacing: ls, keepWord: true, outlineLevel: 1 }),
+    paraPr(3, { align: "LEFT", spaceBefore: 400, spaceAfter: 100, lineSpacing: ls, keepWord: true, outlineLevel: 2 }),
+    paraPr(4, { align: "LEFT", spaceBefore: 300, spaceAfter: 100, lineSpacing: ls, keepWord: true, outlineLevel: 3 }),
     paraPr(5, { align: "LEFT", lineSpacing: 130, indent: 400, keepWord: true }),
     paraPr(6, { align: "LEFT", lineSpacing: ls, indent: 600, keepWord: true }),
     paraPr(7, { align: "LEFT", lineSpacing: ls, indent: 600, keepWord: true })
@@ -20999,6 +21021,17 @@ ${base2.join("\n")}
 ${base.join("\n")}
     </hh:paraProperties>`;
 }
+function buildNumberings() {
+  const heads = Array.from(
+    { length: 7 },
+    (_, i) => `        <hh:paraHead start="1" level="${i + 1}" align="LEFT" useInstWidth="1" autoIndent="1" widthAdjust="0" textOffsetType="PERCENT" textOffset="50" numFormat="DIGIT" charPrIDRef="4294967295" checkable="0"/>`
+  ).join("\n");
+  return `<hh:numberings itemCnt="1">
+      <hh:numbering id="1" start="0">
+${heads}
+      </hh:numbering>
+    </hh:numberings>`;
+}
 function generateHeaderXml(theme, gongmun, ratioVariants = []) {
   const bodyFace = gongmun?.bodyFont === "gothic" ? "\uB9D1\uC740 \uACE0\uB515" : "\uD568\uCD08\uB86C\uBC14\uD0D5";
   const charPropsXml = buildCharProperties(theme, gongmun, ratioVariants);
@@ -21076,7 +21109,7 @@ function generateHeaderXml(theme, gongmun, ratioVariants = []) {
     </hh:borderFills>
     ${charPropsXml}
     <hh:tabProperties itemCnt="0"/>
-    <hh:numberings itemCnt="0"/>
+    ${buildNumberings()}
     <hh:bullets itemCnt="0"/>
     ${paraPropsXml}
     <hh:styles itemCnt="1">
@@ -21341,7 +21374,7 @@ function bestSimInRange(arr, from, to, target) {
   return best;
 }
 function escapeGfm(text) {
-  return text.replace(/~/g, "\\~");
+  return text.replace(/([~*])/g, "\\$1");
 }
 var HWP_SHAPE_ALT_TEXT_RE = /(?:모서리가 둥근 |둥근 )?(?:사각형|직사각형|정사각형|원|타원|삼각형|이등변 삼각형|직각 삼각형|선|직선|곡선|화살표|굵은 화살표|이중 화살표|오각형|육각형|팔각형|별|[4-8]점별|십자|십자형|구름|구름형|마름모|도넛|평행사변형|사다리꼴|부채꼴|호|반원|물결|번개|하트|빗금|블록 화살표|수식|표|그림|개체|그리기\s?개체|묶음\s?개체|글상자|수식\s?개체|OLE\s?개체)\s?입니다\.?/g;
 function sanitizeText(text) {
@@ -21359,7 +21392,7 @@ function normForMatch(text) {
   return sanitizeText(text).replace(/\s+/g, " ").trim();
 }
 function unescapeGfm(text) {
-  return text.replace(/\\~/g, "~");
+  return text.replace(/\\([~*])/g, "$1");
 }
 function summarize(text) {
   const t = text.replace(/\s+/g, " ").trim();
@@ -21426,7 +21459,7 @@ function parseGfmTable(lines) {
   return rows;
 }
 function unescapeGfmCell(text) {
-  return text.replace(/<br\s*\/?>/gi, "\n").replace(/\\\|/g, "|").replace(/\\~/g, "~");
+  return text.replace(/<br\s*\/?>/gi, "\n").replace(/\\\|/g, "|").replace(/\\([~*])/g, "$1");
 }
 function replicateCellInnerHtml(cell) {
   if (cell.blocks?.length) {
@@ -21685,7 +21718,7 @@ function generateSecPr(gongmun) {
     header: 0,
     footer: 0
   } : { top: 8504, bottom: 4252, left: 5670, right: 4252, header: 2835, footer: 2835 };
-  return `<hp:secPr textDirection="HORIZONTAL" spaceColumns="1134" tabStop="8000" outlineShapeIDRef="0" memoShapeIDRef="0" textVerticalWidthHead="0" masterPageCnt="0"><hp:grid lineGrid="0" charGrid="0" wonggojiFormat="0"/><hp:startNum pageStartsOn="BOTH" page="0" pic="0" tbl="0" equation="0"/><hp:visibility hideFirstHeader="0" hideFirstFooter="0" hideFirstMasterPage="0" border="SHOW_ALL" fill="SHOW_ALL" hideFirstPageNum="0" hideFirstEmptyLine="0" showLineNumber="0"/><hp:pagePr landscape="WIDELY" width="59528" height="84188" gutterType="LEFT_ONLY"><hp:margin header="${m.header}" footer="${m.footer}" gutter="0" left="${m.left}" right="${m.right}" top="${m.top}" bottom="${m.bottom}"/></hp:pagePr><hp:footNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="-1" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="283" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="EACH_COLUMN" beneathText="0"/></hp:footNotePr><hp:endNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="14692344" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="0" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="END_OF_DOCUMENT" beneathText="0"/></hp:endNotePr></hp:secPr>`;
+  return `<hp:secPr textDirection="HORIZONTAL" spaceColumns="1134" tabStop="8000" outlineShapeIDRef="1" memoShapeIDRef="0" textVerticalWidthHead="0" masterPageCnt="0"><hp:grid lineGrid="0" charGrid="0" wonggojiFormat="0"/><hp:startNum pageStartsOn="BOTH" page="0" pic="0" tbl="0" equation="0"/><hp:visibility hideFirstHeader="0" hideFirstFooter="0" hideFirstMasterPage="0" border="SHOW_ALL" fill="SHOW_ALL" hideFirstPageNum="0" hideFirstEmptyLine="0" showLineNumber="0"/><hp:pagePr landscape="WIDELY" width="59528" height="84188" gutterType="LEFT_ONLY"><hp:margin header="${m.header}" footer="${m.footer}" gutter="0" left="${m.left}" right="${m.right}" top="${m.top}" bottom="${m.bottom}"/></hp:pagePr><hp:footNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="-1" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="283" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="EACH_COLUMN" beneathText="0"/></hp:footNotePr><hp:endNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="14692344" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="0" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="END_OF_DOCUMENT" beneathText="0"/></hp:endNotePr></hp:secPr>`;
 }
 function blocksToSectionXml(blocks, theme, gongmun, gongmunList = gongmun ? precomputeGongmunList(blocks, gongmun) : null, fit = null) {
   const paraXmls = [];
@@ -21742,7 +21775,10 @@ function blocksToSectionXml(blocks, theme, gongmun, gongmunList = gongmun ? prec
         }
         const indent = block.indent || 0;
         let marker;
-        if (block.ordered) {
+        if (block.marker) {
+          marker = `${block.marker} `;
+          prevWasOrdered = !!block.ordered;
+        } else if (block.ordered) {
           orderedCounters[indent] = (orderedCounters[indent] || 0) + 1;
           for (const k of Object.keys(orderedCounters)) {
             if (+k > indent) delete orderedCounters[+k];
@@ -24550,7 +24586,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-TM3AS25T.js");
+    const mod = await import("./parser-2THIF623.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {