kordoc 4.2.2 → 4.2.4

package/dist/index.d.cts

@@ -99,7 +99,8 @@ interface IRCell {
     rowSpan: number;
     /**
      * 셀 내부 블록 콘텐츠 — v3.0.
-     * 중첩 표·이미지·다중 문단을 구조 그대로 보존한다.
+     * 중첩 표·이미지·다중 문단을 구조 그대로, 문서(원문) 순서대로 보존한다.
+     * 표와 텍스트가 한 줄에 번갈아 놓인 셀도 배치 순서를 따른다 (v4.2.3, #49).
      * blocks가 있으면 text는 blocks의 평탄화 텍스트(하위 호환용)다.
      */
     blocks?: IRBlock[];
@@ -218,7 +219,11 @@ interface ParseSuccess extends ParseResultBase {
     success: true;
     /** 추출된 마크다운 텍스트 */
     markdown: string;
-    /** 중간 표현 블록 (구조화된 데이터 접근용) */
+    /**
+     * 중간 표현 블록 (구조화된 데이터 접근용).
+     * 블록은 문서(원문) 읽기 순서를 따른다 — 한 문단 안에 글자취급(treatAsChar)
+     * 표와 텍스트가 섞여 있어도 배치 순서대로 방출된다 (v4.2.3, #50).
+     */
     blocks: IRBlock[];
     /** 문서 메타데이터 */
     metadata?: DocumentMetadata;

package/dist/index.d.ts

@@ -99,7 +99,8 @@ interface IRCell {
     rowSpan: number;
     /**
      * 셀 내부 블록 콘텐츠 — v3.0.
-     * 중첩 표·이미지·다중 문단을 구조 그대로 보존한다.
+     * 중첩 표·이미지·다중 문단을 구조 그대로, 문서(원문) 순서대로 보존한다.
+     * 표와 텍스트가 한 줄에 번갈아 놓인 셀도 배치 순서를 따른다 (v4.2.3, #49).
      * blocks가 있으면 text는 blocks의 평탄화 텍스트(하위 호환용)다.
      */
     blocks?: IRBlock[];
@@ -218,7 +219,11 @@ interface ParseSuccess extends ParseResultBase {
     success: true;
     /** 추출된 마크다운 텍스트 */
     markdown: string;
-    /** 중간 표현 블록 (구조화된 데이터 접근용) */
+    /**
+     * 중간 표현 블록 (구조화된 데이터 접근용).
+     * 블록은 문서(원문) 읽기 순서를 따른다 — 한 문단 안에 글자취급(treatAsChar)
+     * 표와 텍스트가 섞여 있어도 배치 순서대로 방출된다 (v4.2.3, #50).
+     */
     blocks: IRBlock[];
     /** 문서 메타데이터 */
     metadata?: DocumentMetadata;

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   flattenLayoutTables,
   inlineImagesIntoMarkdown,
   mapPuaText
-} from "./chunk-IXHBRMDB.js";
+} from "./chunk-PQ46DC6Y.js";
 import {
   parsePageRange
 } from "./chunk-GE43BE46.js";
@@ -27,7 +27,7 @@ import {
   sanitizeHref,
   stripDtd,
   toArrayBuffer
-} from "./chunk-GUYIXVV7.js";
+} from "./chunk-OBX3VSIZ.js";
 
 // src/index.ts
 import { readFile } from "fs/promises";
@@ -2105,7 +2105,7 @@ function walkSection(node, blocks, tableCtx, tableStack, ctx, depth = 0) {
         }
         break;
       case "p": {
-        const { text: rawText, href, footnote, style } = extractParagraphInfo(el, ctx.styleMap, ctx);
+        const { text: rawText, href, footnote, style, segments } = extractParagraphInfo(el, ctx.styleMap, ctx);
         let text = rawText;
         let headingLevel;
         const ph = resolveParaHeading(el, ctx);
@@ -2113,6 +2113,35 @@ function walkSection(node, blocks, tableCtx, tableStack, ctx, depth = 0) {
           if (ph?.prefix) text = ph.prefix + " " + text;
           headingLevel = ph?.headingLevel;
         }
+        if (segments) {
+          const cell2 = tableCtx?.cell ?? null;
+          const segs = [...segments];
+          if (ph?.prefix) {
+            const fi = segs.findIndex((s) => s);
+            if (fi >= 0) segs[fi] = ph.prefix + " " + segs[fi];
+          }
+          let segIdx = 0;
+          let first = true;
+          const flush = () => {
+            const s = segs[segIdx++];
+            if (!s) return;
+            const block = { type: "paragraph", text: s, pageNumber: ctx.sectionNum };
+            if (first && !cell2) {
+              first = false;
+              if (style) block.style = style;
+              if (href) block.href = href;
+              if (footnote) block.footnoteText = footnote;
+            }
+            if (cell2) {
+              cell2.text += (cell2.text ? "\n" : "") + s;
+              (cell2.blocks ??= []).push(block);
+            } else blocks.push(block);
+          };
+          tableCtx = walkParagraphChildren(el, blocks, tableCtx, tableStack, ctx, depth + 1, flush);
+          while (segIdx < segs.length) flush();
+          if (footnote && cell2) cell2.text += (cell2.text ? "\n" : "") + `(\uC8FC: ${footnote})`;
+          break;
+        }
         if (text) {
           if (tableCtx?.cell) {
             const cell2 = tableCtx.cell;
@@ -2331,7 +2360,7 @@ function findTopLevelTbls(el, out, depth = 0) {
     findTopLevelTbls(ch, out, depth + 1);
   }
 }
-function walkParagraphChildren(node, blocks, tableCtx, tableStack, ctx, depth = 0) {
+function walkParagraphChildren(node, blocks, tableCtx, tableStack, ctx, depth = 0, onTbl) {
   if (depth > MAX_XML_DEPTH) return tableCtx;
   const children = node.childNodes;
   if (!children) return tableCtx;
@@ -2345,6 +2374,7 @@ function walkParagraphChildren(node, blocks, tableCtx, tableStack, ctx, depth =
       const tag = el.tagName || el.localName || "";
       const localTag = tag.replace(/^[^:]+:/, "");
       if (localTag === "tbl") {
+        if (onTbl) onTbl();
         if (!tableCtx) {
           const chan = kordocTableChannel(el, ctx);
           if (chan) {
@@ -2391,6 +2421,9 @@ function walkParagraphChildren(node, blocks, tableCtx, tableStack, ctx, depth =
   walkChildren(node, depth);
   return tableCtx;
 }
+function isInlineTbl(tbl2) {
+  return findChildByLocalName(tbl2, "pos")?.getAttribute("treatAsChar") === "1";
+}
 function findDescendant(node, targetTag, depth = 0) {
   if (depth > 5) return null;
   const children = node.childNodes;
@@ -2564,7 +2597,7 @@ function extractParagraphInfo(para2, styleMap, ctx) {
             ctx.warnings?.push({ page: ctx.sectionNum, message: "\uBCC0\uACBD\uCD94\uC801 \uC0AD\uC81C \uD14D\uC2A4\uD2B8 \uCD9C\uB825 \uC81C\uC678", code: "HIDDEN_TEXT_FILTERED" });
           }
         } else {
-          text += t;
+          text += t.replace(/\x1E/g, "");
         }
         continue;
       }
@@ -2595,9 +2628,12 @@ function extractParagraphInfo(para2, styleMap, ctx) {
         case "hwSpace":
           text += " ";
           break;
+        // 테이블 자체는 walkSection에서 처리 — 글자취급(inline) 표만 경계 마커를 남겨
+        // 표 앞뒤 텍스트를 문서 순서대로 분할 방출할 수 있게 한다 (#49/#50).
+        // float·페이지 앵커 표는 텍스트 흐름 불참(reflow 모델 정합) — 종전대로 텍스트 뒤 방출
         case "tbl":
+          if (isInlineTbl(child)) text += "";
           break;
-        // 테이블은 walkSection에서 처리
         // 하이퍼링크
         case "hyperlink": {
           const url = child.getAttribute("url") || child.getAttribute("href") || "";
@@ -2692,7 +2728,7 @@ function extractParagraphInfo(para2, styleMap, ctx) {
     for (const r of closed) {
       if (applied.some(([s, e]) => r.start < e && r.end > s)) continue;
       const anchor = text.slice(r.start, r.end);
-      if (!anchor.trim() || /[\n\x1F\[\]]/.test(anchor)) continue;
+      if (!anchor.trim() || /[\n\x1F\x1E\[\]]/.test(anchor)) continue;
       text = text.slice(0, r.start) + `[${anchor}](${r.url})` + text.slice(r.end);
       applied.push([r.start, r.end]);
     }
@@ -2700,10 +2736,18 @@ function extractParagraphInfo(para2, styleMap, ctx) {
   }
   const leaderIdx = text.indexOf("");
   if (leaderIdx >= 0) text = text.substring(0, leaderIdx);
-  let cleanText = text.replace(/[ \t]+/g, " ").trim();
-  if (/^그림입니다\.?\s*원본\s*그림의\s*(이름|크기)/.test(cleanText)) cleanText = "";
-  cleanText = cleanText.replace(/그림입니다\.?\s*원본\s*그림의\s*(이름|크기)[^\n]*(\n[^\n]*원본\s*그림의\s*(이름|크기)[^\n]*)*/g, "").trim();
-  cleanText = cleanText.replace(/^(?:모서리가 둥근 |둥근 )?(?:사각형|직사각형|정사각형|원|타원|삼각형|선|직선|곡선|화살표|오각형|육각형|팔각형|별|십자|구름|마름모|도넛|평행사변형|사다리꼴|개체|그리기\s?개체|묶음\s?개체|글상자|표|그림|OLE\s?개체)\s?입니다\.?$/gm, "").trim();
+  const cleanParaText = (raw) => {
+    let t = raw.replace(/[ \t]+/g, " ").trim();
+    if (/^그림입니다\.?\s*원본\s*그림의\s*(이름|크기)/.test(t)) t = "";
+    t = t.replace(/그림입니다\.?\s*원본\s*그림의\s*(이름|크기)[^\n]*(\n[^\n]*원본\s*그림의\s*(이름|크기)[^\n]*)*/g, "").trim();
+    return t.replace(/^(?:모서리가 둥근 |둥근 )?(?:사각형|직사각형|정사각형|원|타원|삼각형|선|직선|곡선|화살표|오각형|육각형|팔각형|별|십자|구름|마름모|도넛|평행사변형|사다리꼴|개체|그리기\s?개체|묶음\s?개체|글상자|표|그림|OLE\s?개체)\s?입니다\.?$/gm, "").trim();
+  };
+  let segments;
+  if (text.includes("")) {
+    segments = text.split("").map(cleanParaText);
+    text = text.replace(/\x1E/g, "");
+  }
+  const cleanText = cleanParaText(text);
   let style;
   if (styleMap && charPrId) {
     const charProp = styleMap.charProperties.get(charPrId);
@@ -2716,7 +2760,7 @@ function extractParagraphInfo(para2, styleMap, ctx) {
       if (!style.fontSize && !style.bold && !style.italic) style = void 0;
     }
   }
-  return { text: cleanText, href, footnote, style };
+  return { text: cleanText, href, footnote, style, segments };
 }
 var KORDOC_CHAR_CODE = "4";
 var KORDOC_PARA_QUOTE = "6";
@@ -23669,6 +23713,18 @@ function htmlCellInnerToLines(inner) {
   const lines = work.split(/<br\s*\/?>/gi).map((s) => s.trim()).filter((s) => s.length > 0);
   return { lines, hadNonText, imgSrcs };
 }
+function splitCellByTopLevelTables(html) {
+  const tables = extractTopLevelTables(html);
+  const texts = [];
+  let rest = html;
+  for (const t of tables) {
+    const i = rest.indexOf(t);
+    texts.push(rest.slice(0, i));
+    rest = rest.slice(i + t.length);
+  }
+  texts.push(rest);
+  return { texts, tables };
+}
 function extractTopLevelTables(html) {
   const result = [];
   let depth = 0;
@@ -24347,17 +24403,18 @@ function generateHtmlTableXml(rawHtml, theme, totalWidth = 44e3, style = null, r
     const rowSpan = Math.min(cell2.rowSpan, rowCnt - cell2.r);
     const lines = cellLines[i];
     let nestedH = 0;
-    const nestedXmls = [];
-    for (const nested of extractTopLevelTables(cell2.inner)) {
+    const { texts: segTexts, tables: nestedTables } = splitCellByTopLevelTables(cell2.inner);
+    const nestedXmls = nestedTables.map((nested) => {
       const sw = spanW(cell2);
       const nestedW = Math.max(Math.min(Math.max(sw - 1020, 4e3), sw - 282), 500);
       const nestedXml = generateHtmlTableXml(nested, theme, nestedW, style ? { ...style, totalWidth: nestedW } : null);
       if (nestedXml) {
-        nestedXmls.push(nestedXml);
         const szH = nestedXml.match(/<hp:sz [^>]*height="(\d+)"/)?.[1];
         nestedH += (szH ? Number(szH) : (nested.match(/<tr[\s>]/gi) ?? []).length * cellH) + 300;
       }
-    }
+      return nestedXml;
+    });
+    const segLines = segTexts.map((t) => htmlCellInnerToLines(t).lines);
     const usable = Math.max(spanW(cell2) - CELL_PAD, 1e3);
     let wrapLines = 0;
     for (const line of lines) wrapLines += Math.max(1, Math.ceil(measureTextWidth(unescapeHtml(line).trim(), measureH, 100) / usable));
@@ -24366,9 +24423,9 @@ function generateHtmlTableXml(rawHtml, theme, totalWidth = 44e3, style = null, r
     const cellHeight = Math.max(prof?.cellH.get(`${cell2.r},${cell2.c}`) ?? 0, contentH);
     const perRow = Math.ceil(cellHeight / rowSpan);
     for (let r = cell2.r; r < cell2.r + rowSpan; r++) tableRowHeights[r] = Math.max(tableRowHeights[r], perRow);
-    return { cell: cell2, rowSpan, lines, nestedXmls, imgSrcs: cellParsed[i].imgSrcs };
+    return { cell: cell2, rowSpan, lines, nestedXmls, segLines, imgSrcs: cellParsed[i].imgSrcs };
   });
-  const tcXmls = meta.map(({ cell: cell2, rowSpan, lines, nestedXmls, imgSrcs }) => {
+  const tcXmls = meta.map(({ cell: cell2, rowSpan, nestedXmls, segLines, imgSrcs }) => {
     const k = `${cell2.r},${cell2.c}`;
     const isHeader = cell2.isHeader;
     const baseCharPr = style ? style.charPr : CHAR_NORMAL;
@@ -24379,7 +24436,7 @@ function generateHtmlTableXml(rawHtml, theme, totalWidth = 44e3, style = null, r
     const paraPrId = style ? centered ? reg ? style.tblCenterParaPr ?? style.centerParaPr : style.centerParaPr : reg ? style.tblLeftParaPr ?? PARA_NORMAL : PARA_NORMAL : PARA_NORMAL;
     const picUrls = images ? [...imgSrcs] : [];
     const paras = [];
-    for (const line of lines) {
+    const pushTextLine = (line) => {
       let text = unescapeHtml(line);
       if (images) {
         const { text: rest, urls } = splitImageRefs(text);
@@ -24391,7 +24448,14 @@ function generateHtmlTableXml(rawHtml, theme, totalWidth = 44e3, style = null, r
       if (!images || text.trim() || picUrls.length === 0) {
         paras.push(`<hp:p paraPrIDRef="${paraPrId}" styleIDRef="0"><hp:run charPrIDRef="${charPrId}"><hp:t>${escapeXml(text)}</hp:t></hp:run></hp:p>`);
       }
-    }
+    };
+    segLines.forEach((seg, si) => {
+      for (const line of seg) pushTextLine(line);
+      const nestedXml = nestedXmls[si];
+      if (nestedXml) {
+        paras.push(`<hp:p paraPrIDRef="0" styleIDRef="0"><hp:run charPrIDRef="0">${nestedXml}</hp:run></hp:p>`);
+      }
+    });
     if (images && picUrls.length > 0) {
       const pics = picUrls.map((u) => {
         const part = images.take(u);
@@ -24401,9 +24465,6 @@ function generateHtmlTableXml(rawHtml, theme, totalWidth = 44e3, style = null, r
         paras.push(`<hp:p paraPrIDRef="${paraPrId}" styleIDRef="0"><hp:run charPrIDRef="${charPrId}">${pics.join("")}</hp:run></hp:p>`);
       }
     }
-    for (const nestedXml of nestedXmls) {
-      paras.push(`<hp:p paraPrIDRef="0" styleIDRef="0"><hp:run charPrIDRef="0">${nestedXml}</hp:run></hp:p>`);
-    }
     if (paras.length === 0) {
       paras.push(`<hp:p paraPrIDRef="${paraPrId}" styleIDRef="0"><hp:run charPrIDRef="${charPrId}"><hp:t></hp:t></hp:run></hp:p>`);
     }
@@ -30497,7 +30558,7 @@ async function parse(input, options) {
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-TGHAMIQL.js");
+    const { parseImageDocument } = await import("./image-ocr-WCIDB6RY.js");
     const { blocks, warnings } = await parseImageDocument(buffer, options);
     return {
       success: true,
@@ -30555,7 +30616,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-KMC4YOZH.js");
+    const mod = await import("./parser-WRNS6MX2.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {