kordoc 4.21.22 → 4.21.23

package/README.md

@@ -117,10 +117,11 @@ await writeFile("보고서.hwpx", Buffer.from(hwpx))
 
 ## 최근 업데이트
 
-최신 배포: **[4.21.22](https://github.com/chrisryugj/kordoc/releases/tag/v4.21.22)** · 2026-10-11
+최신 배포: **[4.21.23](https://github.com/chrisryugj/kordoc/releases/tag/v4.21.23)** · 2026-10-11
 
 | 버전 | 주요 변경 |
 | --- | --- |
+| 4.21.23 | HWP·HWPX 삽입 그림 속 글 OCR — `ocr: true` 일 때 그림 블록 뒤에 그림 속 글(#143, 기본 산출 불변) |
 | 4.21.22 | PDF 양쪽 정렬 영문 참고문헌 줄을 열로 읽어 낱말이 뒤섞이던 것 고침 (web052 읽기 순서 → 1, score 커버리지 2문서 → 1) |
 | 4.21.21 | PDF 쪽 테두리 틀 안 바닥글 걷기 · 첨부 이름표("<붙임2>"·"<별지 서식 제3호>")·강의 번호를 머리말로 지우던 것 고침 (PDF 글 정확도 99.64 → 99.67%, 어절 F1 99.00 → 99.02%) |
 | 4.21.20 | PDF 괘선 없는 표 칸의 어절 가운데 꺾임을 붙여 씀("남⏎편이") · 채우기·패치 서식 보존(바뀐 문단만 줄 배치 캐시 삭제·강조 표지·균등 띄어쓰기·라벨 칸 방향) (PDF 어절 F1 98.987 → 98.998%) |

package/dist/{-PLOEMNCA.js → -FLEBKE6V.js}

@@ -54,25 +54,10 @@ import {
   unknownFontWarnings,
   usesGaejosikMunche,
   validateHwpx
-} from "./chunk-NT4LPP2I.js";
-import {
-  blocksToPages
-} from "./chunk-LZVOL2H2.js";
-import {
-  applySplices,
-  buildParagraphSplices,
-  buildRangeSplices,
-  placeSealHwpx,
-  scanSectionXml
-} from "./chunk-H6EXISSP.js";
-import {
-  DEFAULT_REDACT_RULES,
-  redactMarkdown,
-  redactText
-} from "./chunk-3WSNLH4B.js";
+} from "./chunk-4F6OVO2A.js";
 import {
   blocksToChunks
-} from "./chunk-7TLZ56ZK.js";
+} from "./chunk-7MTKOSAF.js";
 import {
   SPACE_EM_FIXED,
   SPACE_EM_FONT,
@@ -97,20 +82,35 @@ import {
   renderSceneToHtml,
   simulateWrap,
   simulateWrapKeepWord
-} from "./chunk-6LJ22335.js";
-import "./chunk-7FCNOKOR.js";
-import "./chunk-7MIA3IFO.js";
+} from "./chunk-2S37CQUJ.js";
+import "./chunk-RKWJMA2B.js";
+import {
+  blocksToPages
+} from "./chunk-JLG7KK4M.js";
+import "./chunk-VKVDMH7X.js";
 import "./chunk-VQFA55IC.js";
-import "./chunk-K7FP2VOU.js";
+import "./chunk-YA6UGARL.js";
 import {
   blocksToMarkdown,
   flattenLayoutTables,
   hasStructuredCellContent
-} from "./chunk-3BJW5KXR.js";
-import "./chunk-BZC24YXS.js";
+} from "./chunk-GPIMKPEI.js";
+import {
+  applySplices,
+  buildParagraphSplices,
+  buildRangeSplices,
+  placeSealHwpx,
+  scanSectionXml
+} from "./chunk-JA4ZWCYL.js";
+import "./chunk-U6D7LUCR.js";
 import {
   VERSION
-} from "./chunk-ZQZDGIN4.js";
+} from "./chunk-TAU45SJK.js";
+import {
+  DEFAULT_REDACT_RULES,
+  redactMarkdown,
+  redactText
+} from "./chunk-3WSNLH4B.js";
 export {
   AGENCY_COMMON_NAME,
   BUILTIN_TEMPLATES,
@@ -204,4 +204,4 @@ export {
   usesGaejosikMunche,
   validateHwpx
 };
-//# sourceMappingURL=-PLOEMNCA.js.map
+//# sourceMappingURL=-FLEBKE6V.js.map

package/dist/{chunk-6LJ22335.js → chunk-2S37CQUJ.js}

@@ -1,7 +1,14 @@
 #!/usr/bin/env node
+import {
+  loadSharp,
+  rasterizePageSvg
+} from "./chunk-RKWJMA2B.js";
 import {
   inlineImagesIntoMarkdown
-} from "./chunk-7FCNOKOR.js";
+} from "./chunk-VKVDMH7X.js";
+import {
+  parsePageRange
+} from "./chunk-VQFA55IC.js";
 import {
   CELL_EDGES,
   HEADING_RATIO_H1,
@@ -9,20 +16,7 @@ import {
   HEADING_RATIO_H3,
   tidyScriptTags,
   unframeLayoutTables
-} from "./chunk-7MIA3IFO.js";
-import {
-  parsePageRange
-} from "./chunk-VQFA55IC.js";
-import {
-  DEFAULT_CHAR,
-  DEFAULT_PARA_GEOM,
-  MAX_DECOMPRESS_SIZE,
-  MAX_ZIP_ENTRIES,
-  createXmlParser,
-  findChildByLocalName,
-  hwpFaceToCssStack,
-  parseRenderStyles
-} from "./chunk-K7FP2VOU.js";
+} from "./chunk-YA6UGARL.js";
 import {
   MAX_COLS,
   MAX_ROWS,
@@ -33,18 +27,24 @@ import {
   flattenLayoutTables,
   mapPuaText,
   markNonLayoutTable
-} from "./chunk-3BJW5KXR.js";
+} from "./chunk-GPIMKPEI.js";
 import {
-  loadSharp,
-  rasterizePageSvg
-} from "./chunk-BZC24YXS.js";
+  DEFAULT_CHAR,
+  DEFAULT_PARA_GEOM,
+  MAX_DECOMPRESS_SIZE,
+  MAX_ZIP_ENTRIES,
+  createXmlParser,
+  findChildByLocalName,
+  hwpFaceToCssStack,
+  parseRenderStyles
+} from "./chunk-U6D7LUCR.js";
 import {
   KordocError,
   escapeHtml,
   precheckZipSize,
   sanitizeHref,
   toArrayBuffer
-} from "./chunk-ZQZDGIN4.js";
+} from "./chunk-TAU45SJK.js";
 
 // src/render/svg-render.ts
 import JSZip from "jszip";
@@ -7804,4 +7804,4 @@ export {
   cropRect,
   extractRenderedRegions
 };
-//# sourceMappingURL=chunk-6LJ22335.js.map
+//# sourceMappingURL=chunk-2S37CQUJ.js.map

package/dist/{chunk-NT4LPP2I.js → chunk-4F6OVO2A.js}

@@ -1,23 +1,4 @@
 #!/usr/bin/env node
-import {
-  blocksToPages
-} from "./chunk-LZVOL2H2.js";
-import {
-  allLinesegRemovalSplices,
-  applySplices,
-  buildParagraphSplices,
-  buildRangeSplices,
-  changedLinesegRemovalSplices,
-  decodeXmlEntities,
-  escapeXmlText,
-  findElementEnd,
-  markerRunSplices,
-  paraTText,
-  paraTextPureT,
-  patchZipEntries,
-  readZipEntries,
-  scanSectionXml
-} from "./chunk-H6EXISSP.js";
 import {
   CONVERT_MAP,
   FLAG_COMPRESSED,
@@ -68,10 +49,17 @@ import {
   romanNumeral,
   simulateWrap,
   takeTocLeaders
-} from "./chunk-6LJ22335.js";
+} from "./chunk-2S37CQUJ.js";
 import {
+  blocksToPages
+} from "./chunk-JLG7KK4M.js";
+import {
+  bmpToPng,
   inlineImagesIntoMarkdown
-} from "./chunk-7FCNOKOR.js";
+} from "./chunk-VKVDMH7X.js";
+import {
+  parsePageRange
+} from "./chunk-VQFA55IC.js";
 import {
   CELL_EDGES,
   HEADING_RATIO_H1,
@@ -83,10 +71,38 @@ import {
   tidyScriptTags,
   unframeLayoutTables,
   wrapScript
-} from "./chunk-7MIA3IFO.js";
+} from "./chunk-YA6UGARL.js";
 import {
-  parsePageRange
-} from "./chunk-VQFA55IC.js";
+  MAX_COLS,
+  MAX_ROWS,
+  MAX_TABLE_CELLS,
+  blocksToMarkdown,
+  buildTable,
+  convertTableToText,
+  escapeGfm,
+  escapeHtmlCellText,
+  escapeLiteralDollar,
+  flattenLayoutTables,
+  hasStructuredCellContent,
+  mapPuaText,
+  noteSuffix
+} from "./chunk-GPIMKPEI.js";
+import {
+  allLinesegRemovalSplices,
+  applySplices,
+  buildParagraphSplices,
+  buildRangeSplices,
+  changedLinesegRemovalSplices,
+  decodeXmlEntities,
+  escapeXmlText,
+  findElementEnd,
+  markerRunSplices,
+  paraTText,
+  paraTextPureT,
+  patchZipEntries,
+  readZipEntries,
+  scanSectionXml
+} from "./chunk-JA4ZWCYL.js";
 import {
   MAX_DECOMPRESS_SIZE,
   MAX_XML_DEPTH,
@@ -103,22 +119,7 @@ import {
   localName,
   rawTextContent,
   readZipEntry
-} from "./chunk-K7FP2VOU.js";
-import {
-  MAX_COLS,
-  MAX_ROWS,
-  MAX_TABLE_CELLS,
-  blocksToMarkdown,
-  buildTable,
-  convertTableToText,
-  escapeGfm,
-  escapeHtmlCellText,
-  escapeLiteralDollar,
-  flattenLayoutTables,
-  hasStructuredCellContent,
-  mapPuaText,
-  noteSuffix
-} from "./chunk-3BJW5KXR.js";
+} from "./chunk-U6D7LUCR.js";
 import {
   KordocError,
   classifyError,
@@ -134,7 +135,7 @@ import {
   toArrayBuffer,
   unescapeHtml,
   unzipLimitBytes
-} from "./chunk-ZQZDGIN4.js";
+} from "./chunk-TAU45SJK.js";
 
 // src/table/visual.ts
 import { readFile as readFile2 } from "fs/promises";
@@ -19952,6 +19953,66 @@ function collectAllTables(scan) {
   return out;
 }
 
+// src/ocr/embedded-image-ocr.ts
+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-BKRQVMW6.js");
+  let inserted = false, unreadable = 0;
+  let failed = null;
+  const walk = async (list, depth) => {
+    if (depth > 64) return;
+    for (let i = 0; i < list.length; i++) {
+      const b = list[i];
+      if (b.children) await walk(b.children, depth + 1);
+      if (b.table) {
+        for (const row of b.table.cells) for (const cell2 of row) if (cell2.blocks) await walk(cell2.blocks, depth + 1);
+      }
+      if (b.type !== "image" || !b.imageData || failed) continue;
+      const bytes = ocrBytes(b.imageData);
+      if (!bytes) {
+        unreadable++;
+        continue;
+      }
+      if (await tooSmall(bytes)) continue;
+      let found;
+      try {
+        const buf = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+        found = (await parseImageDocument(buf, options)).blocks;
+      } catch (err) {
+        failed = err instanceof Error ? err.message : String(err);
+        continue;
+      }
+      if (!found.length) continue;
+      const placed = found.map((f) => ({ ...f, pageNumber: b.pageNumber, bbox: void 0 }));
+      list.splice(i + 1, 0, ...placed);
+      i += placed.length;
+      inserted = true;
+    }
+  };
+  await walk(blocks, 0);
+  if (unreadable) warnings.push({ code: "SKIPPED_IMAGE", message: `${unreadable}\uAC1C \uADF8\uB9BC\uC740 OCR \uB85C \uC77D\uC744 \uC218 \uC5C6\uB294 \uD615\uC2DD(WMF\xB7EMF \uB4F1)\uC774\uB77C \uAC74\uB108\uB700` });
+  if (failed) warnings.push({ code: "OCR_FAILED", message: `\uC0BD\uC785 \uADF8\uB9BC OCR \uC2E4\uD328 \u2014 \uADF8\uB9BC \uC18D \uAE00 \uC5C6\uC774 \uACC4\uC18D: ${failed}` });
+  return inserted;
+}
+function ocrBytes(img) {
+  const mime = img.mimeType.toLowerCase();
+  if (mime.includes("wmf") || mime.includes("emf")) return null;
+  if (mime.includes("bmp")) return bmpToPng(img.data);
+  return img.data;
+}
+async function tooSmall(bytes) {
+  try {
+    const mod = await import("sharp");
+    const sharp = typeof mod === "function" ? mod : mod.default;
+    const { width, height } = await sharp(Buffer.from(bytes)).metadata();
+    return !!width && !!height && (width < MIN_SIDE || height < MIN_SIDE);
+  } catch {
+    return false;
+  }
+}
+
 // src/table/classifier.ts
 var DIAGRAM_KEYWORDS = /조직도|비상\s*연락망|연락망|체계도|업무\s*체계도|기구표|배치도|흐름도|추진\s*체계/u;
 var KEYWORD_GATE = 0.3;
@@ -31094,12 +31155,24 @@ async function dispatch(format2, buffer, opts) {
       return { success: false, fileType: "unknown", error: "\uC9C0\uC6D0\uD558\uC9C0 \uC54A\uB294 \uD30C\uC77C \uD615\uC2DD\uC785\uB2C8\uB2E4.", code: "UNSUPPORTED_FORMAT" };
   }
 }
+async function withEmbeddedImageOcr(blocks, markdown, warnings, images, options) {
+  const list = [...warnings ?? []];
+  if (!await ocrEmbeddedImages(blocks, options, list)) return { markdown, warnings: list.length ? list : void 0 };
+  let md = blocksToMarkdown(blocks, { tableFormat: options?.tableFormat });
+  if (options?.inlineImages && options.images !== false && images?.length) {
+    try {
+      md = inlineImagesIntoMarkdown(md, images, { compress: true });
+    } catch {
+    }
+  }
+  return { markdown: md, warnings: list.length ? list : void 0 };
+}
 function scriptsOff(r, off) {
   return off ? stripScriptTags(r) : r;
 }
 async function parseImage(buffer, options) {
   try {
-    const { parseImageDocument } = await import("./image-ocr-I7IVLLPD.js");
+    const { parseImageDocument } = await import("./image-ocr-BKRQVMW6.js");
     const { blocks, warnings } = await parseImageDocument(buffer, options);
     stripScriptTags({ blocks });
     return {
@@ -31124,7 +31197,9 @@ async function parseHwp3(buffer, options) {
 }
 async function parseHwpx(buffer, options) {
   try {
-    const { markdown, blocks, metadata, outline, warnings, images } = await parseHwpxDocument(buffer, options);
+    const doc = await parseHwpxDocument(buffer, options);
+    const { blocks, metadata, outline, images } = doc;
+    const { markdown, warnings } = await withEmbeddedImageOcr(blocks, doc.markdown, doc.warnings, void 0, options);
     return scriptsOff({ success: true, fileType: "hwpx", markdown, blocks, metadata, outline, warnings, images: images?.length ? images : void 0, pageCount: metadata?.pageCount }, options?.scriptTags === false);
   } catch (err) {
     return { success: false, fileType: "hwpx", error: sanitizeError(err), code: classifyError(err) };
@@ -31151,7 +31226,8 @@ async function parseHwp(buffer, options) {
       } catch {
       }
     }
-    return scriptsOff({ success: true, fileType: "hwp", markdown, blocks, metadata, outline, warnings, images: images?.length ? images : void 0, pageCount: metadata?.pageCount }, options?.scriptTags === false);
+    const ocred = await withEmbeddedImageOcr(blocks, markdown, warnings, images, options);
+    return scriptsOff({ success: true, fileType: "hwp", markdown: ocred.markdown, blocks, metadata, outline, warnings: ocred.warnings, images: images?.length ? images : void 0, pageCount: metadata?.pageCount }, options?.scriptTags === false);
   } catch (err) {
     return { success: false, fileType: "hwp", error: sanitizeError(err), code: classifyError(err) };
   }
@@ -31159,7 +31235,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-QLNX2EFP.js");
+    const mod = await import("./parser-M45SFXWF.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {
@@ -31389,4 +31465,4 @@ export {
   parseHwpml,
   fillForm
 };
-//# sourceMappingURL=chunk-NT4LPP2I.js.map
+//# sourceMappingURL=chunk-4F6OVO2A.js.map