kordoc 3.8.1 → 3.8.3

package/dist/mcp.js

@@ -10,7 +10,7 @@ import {
   parse,
   patchHwp,
   patchHwpx
-} from "./chunk-KT2BCHXI.js";
+} from "./chunk-B27QMVL7.js";
 import {
   detectFormat,
   detectZipFormat
@@ -21,7 +21,7 @@ import {
   blocksToMarkdown,
   sanitizeError,
   toArrayBuffer
-} from "./chunk-IFYJFWD2.js";
+} from "./chunk-KIWKBRCJ.js";
 import "./chunk-MOL7MDBG.js";
 
 // src/mcp.ts
@@ -193,7 +193,7 @@ server.tool(
           break;
         case "pdf":
           try {
-            const { extractPdfMetadataOnly } = await import("./parser-FFEBMLSH.js");
+            const { extractPdfMetadataOnly } = await import("./parser-6GP535ZB.js");
             metadata = await extractPdfMetadataOnly(buffer);
           } catch {
             metadata = void 0;

package/dist/{parser-FFEBMLSH.js → parser-6GP535ZB.js}

@@ -7,7 +7,7 @@ import {
   blocksToMarkdown,
   safeMax,
   safeMin
-} from "./chunk-IFYJFWD2.js";
+} from "./chunk-KIWKBRCJ.js";
 import {
   parsePageRange
 } from "./chunk-MOL7MDBG.js";
@@ -21,21 +21,30 @@ function extractLines(fnArray, argsArray) {
   const horizontals = [];
   const verticals = [];
   let lineWidth = 1;
+  let ctm = [1, 0, 0, 1, 0, 0];
+  const ctmStack = [];
+  const applyCtm = (x, y) => [ctm[0] * x + ctm[2] * y + ctm[4], ctm[1] * x + ctm[3] * y + ctm[5]];
+  const ctmScale = () => (Math.hypot(ctm[0], ctm[1]) + Math.hypot(ctm[2], ctm[3])) / 2;
   let currentPath = [];
   let pathStartX = 0, pathStartY = 0;
   let curX = 0, curY = 0;
-  function pushRectangle(path, rx, ry, rw, rh) {
-    if (Math.abs(rh) < ORIENTATION_TOL * 2) {
-      path.push({ x1: rx, y1: ry + rh / 2, x2: rx + rw, y2: ry + rh / 2 });
-    } else if (Math.abs(rw) < ORIENTATION_TOL * 2) {
-      path.push({ x1: rx + rw / 2, y1: ry, x2: rx + rw / 2, y2: ry + rh });
+  function pushSeg(x1, y1, x2, y2) {
+    const [tx1, ty1] = applyCtm(x1, y1);
+    const [tx2, ty2] = applyCtm(x2, y2);
+    currentPath.push({ x1: tx1, y1: ty1, x2: tx2, y2: ty2 });
+  }
+  function pushRectangle(rx, ry, rw, rh) {
+    const effH = Math.abs(rh) * Math.hypot(ctm[2], ctm[3]);
+    const effW = Math.abs(rw) * Math.hypot(ctm[0], ctm[1]);
+    if (effH < ORIENTATION_TOL * 2) {
+      pushSeg(rx, ry + rh / 2, rx + rw, ry + rh / 2);
+    } else if (effW < ORIENTATION_TOL * 2) {
+      pushSeg(rx + rw / 2, ry, rx + rw / 2, ry + rh);
     } else {
-      path.push(
-        { x1: rx, y1: ry, x2: rx + rw, y2: ry },
-        { x1: rx + rw, y1: ry, x2: rx + rw, y2: ry + rh },
-        { x1: rx + rw, y1: ry + rh, x2: rx, y2: ry + rh },
-        { x1: rx, y1: ry + rh, x2: rx, y2: ry }
-      );
+      pushSeg(rx, ry, rx + rw, ry);
+      pushSeg(rx + rw, ry, rx + rw, ry + rh);
+      pushSeg(rx + rw, ry + rh, rx, ry + rh);
+      pushSeg(rx, ry + rh, rx, ry);
     }
   }
   function flushPath(isStroke) {
@@ -43,8 +52,9 @@ function extractLines(fnArray, argsArray) {
       currentPath = [];
       return;
     }
+    const effWidth = lineWidth * ctmScale();
     for (const seg of currentPath) {
-      classifyAndAdd(seg, lineWidth, horizontals, verticals);
+      classifyAndAdd(seg, effWidth, horizontals, verticals);
     }
     currentPath = [];
   }
@@ -55,6 +65,24 @@ function extractLines(fnArray, argsArray) {
       case OPS.setLineWidth:
         lineWidth = args[0] || 1;
         break;
+      case OPS.save:
+        ctmStack.push(ctm.slice());
+        break;
+      case OPS.restore:
+        ctm = ctmStack.pop() ?? [1, 0, 0, 1, 0, 0];
+        break;
+      case OPS.transform: {
+        const t = args;
+        ctm = [
+          ctm[0] * t[0] + ctm[2] * t[1],
+          ctm[1] * t[0] + ctm[3] * t[1],
+          ctm[0] * t[2] + ctm[2] * t[3],
+          ctm[1] * t[2] + ctm[3] * t[3],
+          ctm[0] * t[4] + ctm[2] * t[5] + ctm[4],
+          ctm[1] * t[4] + ctm[3] * t[5] + ctm[5]
+        ];
+        break;
+      }
       case OPS.constructPath: {
         const arg0 = args[0];
         if (Array.isArray(arg0)) {
@@ -69,16 +97,16 @@ function extractLines(fnArray, argsArray) {
               pathStartY = curY;
             } else if (subOp === OPS.lineTo) {
               const x2 = coords[ci++], y2 = coords[ci++];
-              currentPath.push({ x1: curX, y1: curY, x2, y2 });
+              pushSeg(curX, curY, x2, y2);
               curX = x2;
               curY = y2;
             } else if (subOp === OPS.rectangle) {
               const rx = coords[ci++], ry = coords[ci++];
               const rw = coords[ci++], rh = coords[ci++];
-              pushRectangle(currentPath, rx, ry, rw, rh);
+              pushRectangle(rx, ry, rw, rh);
             } else if (subOp === OPS.closePath) {
               if (curX !== pathStartX || curY !== pathStartY) {
-                currentPath.push({ x1: curX, y1: curY, x2: pathStartX, y2: pathStartY });
+                pushSeg(curX, curY, pathStartX, pathStartY);
               }
               curX = pathStartX;
               curY = pathStartY;
@@ -104,7 +132,7 @@ function extractLines(fnArray, argsArray) {
                 pathStartY = curY;
               } else if (drawOp === 1 /* lineTo */) {
                 const x2 = pathData[di++], y2 = pathData[di++];
-                currentPath.push({ x1: curX, y1: curY, x2, y2 });
+                pushSeg(curX, curY, x2, y2);
                 curX = x2;
                 curY = y2;
               } else if (drawOp === 2 /* curveTo */) {
@@ -113,7 +141,7 @@ function extractLines(fnArray, argsArray) {
                 di += 4;
               } else if (drawOp === 4 /* closePath */) {
                 if (curX !== pathStartX || curY !== pathStartY) {
-                  currentPath.push({ x1: curX, y1: curY, x2: pathStartX, y2: pathStartY });
+                  pushSeg(curX, curY, pathStartX, pathStartY);
                 }
                 curX = pathStartX;
                 curY = pathStartY;
@@ -1235,7 +1263,106 @@ function detectClusterTables(items, pageNum) {
       }
     }
   }
-  return results;
+  return results.filter((r) => !isTwoColumnProse(r));
+}
+function isTwoColumnProse(r) {
+  const t = r.table;
+  if (t.rows < 8) return false;
+  const dense = [];
+  for (let c = 0; c < t.cols; c++) {
+    const filled = t.cells.filter((row) => row[c]?.text.trim()).length;
+    if (filled / t.rows >= 0.3) dense.push(c);
+  }
+  if (dense.length !== 2) return false;
+  for (const c of dense) {
+    const lens = t.cells.map((row) => row[c]?.text.replace(/\s+/g, "").length ?? 0).filter((n) => n > 0);
+    const avg = lens.reduce((s, v) => s + v, 0) / (lens.length || 1);
+    if (avg < 12) return false;
+  }
+  return findTwoColumnProseCutX([...r.usedItems]) !== null;
+}
+function findTwoColumnProseCutX(items) {
+  const lines = groupByBaseline(items);
+  if (lines.length < 8) return null;
+  let minX = Infinity;
+  let maxX = -Infinity;
+  for (const i of items) {
+    if (i.x < minX) minX = i.x;
+    if (i.x + i.w > maxX) maxX = i.x + i.w;
+  }
+  if (!Number.isFinite(maxX - minX)) return null;
+  if (maxX - minX < 100) return null;
+  const lo = minX + (maxX - minX) * 0.3;
+  const hi = minX + (maxX - minX) * 0.7;
+  const step = Math.max(2, (hi - lo) / 400);
+  let cutX = 0;
+  let bestCover = Infinity;
+  for (let x = lo; x <= hi; x += step) {
+    let cover = 0;
+    for (const line of lines) {
+      if (line.items.some((i) => i.x < x && i.x + i.w > x)) cover++;
+    }
+    if (cover < bestCover) {
+      bestCover = cover;
+      cutX = x;
+    }
+  }
+  if (bestCover / lines.length > 0.15) return null;
+  const left = [];
+  const right = [];
+  let twoSide = 0;
+  for (const line of lines) {
+    let hasL = false;
+    let hasR = false;
+    for (const i of line.items) {
+      if (i.x + i.w <= cutX) {
+        left.push(i);
+        hasL = true;
+      } else if (i.x >= cutX) {
+        right.push(i);
+        hasR = true;
+      }
+    }
+    if (hasL && hasR) twoSide++;
+  }
+  if (twoSide / lines.length < 0.55) return null;
+  if (left.length < 5 || right.length < 5) return null;
+  const allText = items.map((i) => i.text).join("").replace(/\s+/g, "");
+  const digits = (allText.match(/[\d,.%△—-]/g) || []).length;
+  if (allText.length === 0 || digits / allText.length > 0.15) return null;
+  const stats = [left, right].map((side) => {
+    let sMinX = Infinity;
+    let sMaxR = -Infinity;
+    let fsSum = 0;
+    const rowEnds = /* @__PURE__ */ new Map();
+    const rowLens = /* @__PURE__ */ new Map();
+    const rowFirst = /* @__PURE__ */ new Map();
+    for (const i of side) {
+      if (i.x < sMinX) sMinX = i.x;
+      const rgt = i.x + i.w;
+      if (rgt > sMaxR) sMaxR = rgt;
+      fsSum += i.fontSize;
+      const key = Math.round(i.y / 4);
+      rowEnds.set(key, Math.max(rowEnds.get(key) ?? -Infinity, rgt));
+      rowLens.set(key, (rowLens.get(key) ?? 0) + i.text.replace(/\s+/g, "").length);
+      const f = rowFirst.get(key);
+      if (!f || i.x < f.x) rowFirst.set(key, i);
+    }
+    const ends = [...rowEnds.values()].sort((a, b) => a - b);
+    const p85 = ends[Math.floor(ends.length * 0.85)] ?? sMaxR;
+    const fs = fsSum / side.length;
+    const justified = ends.filter((e) => Math.abs(e - p85) <= fs).length / ends.length;
+    const lens = [...rowLens.values()];
+    const avgLen = lens.reduce((s, v) => s + v, 0) / (lens.length || 1);
+    const markers = [...rowFirst.values()].filter((i) => /^[•▪◦‣∙·\-–—□■◇◆▶※*]/.test(i.text)).length;
+    return { width: sMaxR - sMinX, justified, avgLen, markerRatio: markers / (rowFirst.size || 1) };
+  });
+  if (stats.some((s) => s.avgLen < 12)) return null;
+  if (stats.some((s) => s.markerRatio > 0.1)) return null;
+  const widthSym = Math.min(stats[0].width, stats[1].width) / Math.max(stats[0].width, stats[1].width);
+  if (widthSym < 0.6) return null;
+  if (Math.min(stats[0].justified, stats[1].justified) < 0.55) return null;
+  return cutX;
 }
 function mergeEvenSpacedClusters(items) {
   const originMap = /* @__PURE__ */ new Map();
@@ -2432,7 +2559,7 @@ function extractPageBlocksWithLines(items, pageNum, opList, pageWidth, pageHeigh
   if (grids.length > 0) {
     return extractBlocksWithGrids(items, pageNum, grids, horizontals, verticals);
   }
-  return extractPageBlocksFallback(items, pageNum);
+  return extractPageBlocksFallback(items, pageNum, true);
 }
 var STRIKE_MAX_THICKNESS = 2;
 var STRIKE_MAX_THICKNESS_RATIO = 0.25;
@@ -2677,7 +2804,53 @@ function mergeAdjacentTableBlocks(blocks) {
   }
   return result;
 }
-function extractPageBlocksFallback(items, pageNum) {
+function splitTwoColumnProse(items, cutX) {
+  const left = [];
+  const right = [];
+  const cross = [];
+  for (const i of items) {
+    if (i.x + i.w <= cutX) left.push(i);
+    else if (i.x >= cutX) right.push(i);
+    else cross.push(i);
+  }
+  if (cross.length === 0) {
+    return [left, right].filter((g2) => g2.length > 0);
+  }
+  cross.sort((a, b) => b.y - a.y);
+  const crossLines = [];
+  for (const c of cross) {
+    const last = crossLines[crossLines.length - 1];
+    if (last && Math.abs(last[0].y - c.y) <= 3) last.push(c);
+    else crossLines.push([c]);
+  }
+  const bandItem = (arr) => arr.filter((i) => {
+    for (const cl of crossLines) {
+      if (Math.abs(cl[0].y - i.y) <= 3) {
+        cl.push(i);
+        return false;
+      }
+    }
+    return true;
+  });
+  const leftRest = bandItem(left);
+  const rightRest = bandItem(right);
+  const boundYs = crossLines.map((cl) => cl[0].y);
+  const bandOf = (y) => {
+    let k = 0;
+    while (k < boundYs.length && y < boundYs[k]) k++;
+    return k;
+  };
+  const groups = [];
+  for (let k = 0; k <= crossLines.length; k++) {
+    const L = leftRest.filter((i) => bandOf(i.y) === k);
+    const R = rightRest.filter((i) => bandOf(i.y) === k);
+    if (L.length > 0) groups.push(L);
+    if (R.length > 0) groups.push(R);
+    if (k < crossLines.length) groups.push(crossLines[k]);
+  }
+  return groups;
+}
+function extractPageBlocksFallback(items, pageNum, fullPage = false) {
   if (items.length === 0) return [];
   const blocks = [];
   const clusterItems = items.map((i) => ({
@@ -2718,8 +2891,9 @@ function extractPageBlocksFallback(items, pageNum) {
       return by - ay;
     });
   } else {
+    const proseCutX = fullPage ? findTwoColumnProseCutX(items) : null;
     const allYLines = mergeSuperscriptLines(groupByY(items));
-    const columns = detectColumns(allYLines);
+    const columns = proseCutX !== null ? null : detectColumns(allYLines);
     if (columns && columns.length >= 3) {
       const tableText = extractWithColumns(allYLines, columns);
       const bbox = computeBBox(items, pageNum);
@@ -2728,7 +2902,7 @@ function extractPageBlocksFallback(items, pageNum) {
       const allY = items.map((i) => i.y);
       const pageHeight = safeMax(allY) - safeMin(allY);
       const gapThreshold = Math.max(15, pageHeight * 0.03);
-      const orderedGroups = xyCutOrder(items, gapThreshold);
+      const orderedGroups = proseCutX !== null ? splitTwoColumnProse(items, proseCutX) : xyCutOrder(items, gapThreshold);
       for (const group of orderedGroups) {
         if (group.length === 0) continue;
         const yLines = mergeSuperscriptLines(groupByY(group));
@@ -2949,16 +3123,28 @@ g.pdfjsWorker = pdfjsWorker;
 
 // src/pdf/parser.ts
 import { getDocument, GlobalWorkerOptions } from "pdfjs-dist/legacy/build/pdf.mjs";
+import { createRequire } from "module";
+import { dirname, join } from "path";
 GlobalWorkerOptions.workerSrc = "";
 var MAX_PAGES = 5e3;
 var MAX_TOTAL_TEXT = 100 * 1024 * 1024;
 var PDF_LOAD_TIMEOUT_MS = 3e4;
+var pdfjsAssets = {};
+try {
+  const _require = createRequire(import.meta.url);
+  const pkgDir = dirname(_require.resolve("pdfjs-dist/package.json"));
+  pdfjsAssets.cMapUrl = join(pkgDir, "cmaps") + "/";
+  pdfjsAssets.cMapPacked = true;
+  pdfjsAssets.standardFontDataUrl = join(pkgDir, "standard_fonts") + "/";
+} catch {
+}
 async function loadPdfWithTimeout(buffer) {
   const loadingTask = getDocument({
     data: new Uint8Array(buffer),
     useSystemFonts: true,
     disableFontFace: true,
-    isEvalSupported: false
+    isEvalSupported: false,
+    ...pdfjsAssets
   });
   let timer;
   try {
@@ -3171,4 +3357,4 @@ export {
   parsePdfDocument,
   removeHeaderFooterBlocks
 };
-//# sourceMappingURL=parser-FFEBMLSH.js.map
+//# sourceMappingURL=parser-6GP535ZB.js.map