hwpkit-dev 0.0.1 → 0.0.2

package/src/encoders/docx/DocxEncoder.ts

@@ -17,8 +17,8 @@ export class DocxEncoder implements Encoder {
   async encode(doc: DocRoot): Promise<Outcome<Uint8Array>> {
     try {
       const sheet = doc.kids[0];
-      const dims  = normalizeDims(sheet?.dims ?? A4);
-      const kids  = sheet?.kids ?? [];
+      const dims = normalizeDims(sheet?.dims ?? A4);
+      const kids = sheet?.kids ?? [];
 
       const images: ImageEntry[] = [];
       const ctx: EncCtx = { images, nextId: 10, nextImgNum: 1, warns: [], imgMap: new WeakMap() };
@@ -43,14 +43,14 @@ export class DocxEncoder implements Encoder {
       const numInfo = collectNumbering(kids);
 
       const entries: { name: string; data: Uint8Array }[] = [
-        { name: '[Content_Types].xml',            data: TextKit.encode(contentTypes(images, hasHeader, hasFooter)) },
-        { name: '_rels/.rels',                    data: TextKit.encode(pkgRels()) },
-        { name: 'word/document.xml',              data: TextKit.encode(documentXml(kids, dims, ctx, headerRId, footerRId)) },
-        { name: 'word/styles.xml',                data: TextKit.encode(stylesXml()) },
-        { name: 'word/settings.xml',              data: TextKit.encode(settingsXml()) },
-        { name: 'word/_rels/document.xml.rels',   data: TextKit.encode(docRels(images, headerRId, footerRId, numInfo.hasLists)) },
-        { name: 'docProps/app.xml',               data: TextKit.encode(appXml()) },
-        { name: 'docProps/core.xml',              data: TextKit.encode(coreXml(doc.meta)) },
+        { name: '[Content_Types].xml', data: TextKit.encode(contentTypes(images, hasHeader, hasFooter)) },
+        { name: '_rels/.rels', data: TextKit.encode(pkgRels()) },
+        { name: 'word/document.xml', data: TextKit.encode(documentXml(kids, dims, ctx, headerRId, footerRId)) },
+        { name: 'word/styles.xml', data: TextKit.encode(stylesXml()) },
+        { name: 'word/settings.xml', data: TextKit.encode(settingsXml()) },
+        { name: 'word/_rels/document.xml.rels', data: TextKit.encode(docRels(images, headerRId, footerRId, numInfo.hasLists)) },
+        { name: 'docProps/app.xml', data: TextKit.encode(appXml()) },
+        { name: 'docProps/core.xml', data: TextKit.encode(coreXml(doc.meta)) },
       ];
 
       // Add numbering.xml if needed
@@ -252,7 +252,7 @@ function stylesXml(): string {
   <w:style w:type="paragraph" w:styleId="Header"><w:name w:val="header"/><w:basedOn w:val="Normal"/></w:style>
   <w:style w:type="paragraph" w:styleId="Footer"><w:name w:val="footer"/><w:basedOn w:val="Normal"/></w:style>
   <w:style w:type="paragraph" w:styleId="ListParagraph"><w:name w:val="List Paragraph"/><w:basedOn w:val="Normal"/><w:pPr><w:ind w:left="720"/></w:pPr></w:style>
-  <w:style w:type="table" w:styleId="TableGrid"><w:name w:val="Table Grid"/><w:tblPr><w:tblBorders><w:top w:val="single" w:sz="4" w:space="0" w:color="000000"/><w:left w:val="single" w:sz="4" w:space="0" w:color="000000"/><w:bottom w:val="single" w:sz="4" w:space="0" w:color="000000"/><w:right w:val="single" w:sz="4" w:space="0" w:color="000000"/><w:insideH w:val="single" w:sz="4" w:space="0" w:color="000000"/><w:insideV w:val="single" w:sz="4" w:space="0" w:color="000000"/></w:tblBorders></w:tblPr></w:style>
+  <w:style w:type="table" w:styleId="TableGrid"><w:name w:val="Table Grid"/><w:tblPr><w:tblBorders><w:top w:val="none" w:sz="0" w:space="0" w:color="auto"/><w:left w:val="none" w:sz="0" w:space="0" w:color="auto"/><w:bottom w:val="none" w:sz="0" w:space="0" w:color="auto"/><w:right w:val="none" w:sz="0" w:space="0" w:color="auto"/><w:insideH w:val="none" w:sz="0" w:space="0" w:color="auto"/><w:insideV w:val="none" w:sz="0" w:space="0" w:color="auto"/></w:tblBorders></w:tblPr></w:style>
 </w:styles>`;
 }
 
@@ -366,8 +366,8 @@ function encodeParaInner(para: ParaNode, ctx: EncCtx): string {
   if (spaceBefore !== undefined || spaceAfter !== undefined || lineHeight !== undefined) {
     const parts: string[] = [];
     if (spaceBefore !== undefined) parts.push(`w:before="${Metric.ptToDxa(spaceBefore)}"`);
-    if (spaceAfter  !== undefined) parts.push(`w:after="${Metric.ptToDxa(spaceAfter)}"`);
-    if (lineHeight  !== undefined) parts.push(`w:line="${Math.round(lineHeight * 240)}" w:lineRule="auto"`);
+    if (spaceAfter !== undefined) parts.push(`w:after="${Metric.ptToDxa(spaceAfter)}"`);
+    if (lineHeight !== undefined) parts.push(`w:line="${Math.round(lineHeight * 240)}" w:lineRule="auto"`);
     spacingXml = `<w:spacing ${parts.join(' ')}/>`;
   }
 
@@ -491,12 +491,12 @@ const VERT_ALIGN_DOCX: Record<string, string> = {
   top: 'top', center: 'center', bottom: 'bottom',
 };
 const WRAP_DOCX: Record<string, string> = {
-  square:  '<wp:wrapSquare wrapText="bothSides"/>',
-  tight:   '<wp:wrapTight><wp:wrapPolygon edited="0"><wp:start x="0" y="0"/><wp:lineTo x="0" y="21600"/><wp:lineTo x="21600" y="21600"/><wp:lineTo x="21600" y="0"/><wp:lineTo x="0" y="0"/></wp:wrapPolygon></wp:wrapTight>',
+  square: '<wp:wrapSquare wrapText="bothSides"/>',
+  tight: '<wp:wrapTight><wp:wrapPolygon edited="0"><wp:start x="0" y="0"/><wp:lineTo x="0" y="21600"/><wp:lineTo x="21600" y="21600"/><wp:lineTo x="21600" y="0"/><wp:lineTo x="0" y="0"/></wp:wrapPolygon></wp:wrapTight>',
   through: '<wp:wrapThrough wrapText="bothSides"><wp:wrapPolygon edited="0"><wp:start x="0" y="0"/><wp:lineTo x="0" y="21600"/><wp:lineTo x="21600" y="21600"/><wp:lineTo x="21600" y="0"/><wp:lineTo x="0" y="0"/></wp:wrapPolygon></wp:wrapThrough>',
-  none:    '<wp:wrapNone/>',
-  behind:  '<wp:wrapNone/>',
-  front:   '<wp:wrapNone/>',
+  none: '<wp:wrapNone/>',
+  behind: '<wp:wrapNone/>',
+  front: '<wp:wrapNone/>',
 };
 
 function encodeGrid(grid: GridNode, ctx: EncCtx, dims?: PageDims): string {
@@ -504,185 +504,200 @@ function encodeGrid(grid: GridNode, ctx: EncCtx, dims?: PageDims): string {
   const look = gp.look;
 
   // tblLook attributes
-  const firstRow  = look?.firstRow  ? '1' : '0';
-  const lastRow   = look?.lastRow   ? '1' : '0';
-  const firstCol  = look?.firstCol  ? '1' : '0';
-  const lastCol   = look?.lastCol   ? '1' : '0';
-  const noHBand   = look?.bandedRows ? '0' : '1';
-  const noVBand   = look?.bandedCols ? '0' : '1';
-
-  // Determine actual grid column count from colWidths or by scanning all rows
+  const firstRow = look?.firstRow ? '1' : '0';
+  const lastRow = look?.lastRow ? '1' : '0';
+  const firstCol = look?.firstCol ? '1' : '0';
+  const lastCol = look?.lastCol ? '1' : '0';
+  const noHBand = look?.bandedRows ? '0' : '1';
+  const noVBand = look?.bandedCols ? '0' : '1';
+
   const d = dims ?? A4;
   const availDxa = Metric.ptToDxa(d.wPt - d.ml - d.mr);
 
-  // Compute true column count: max total colSpan across all rows
+  // 1단계: 표의 가상 2D 맵핑 (Virtual Table Map) 생성
+  // 'real': 데이터 셀, 'continue': 세로 병합 지속 셀, 'absorbed': 가로/세로 병합으로 흡수된 자리, 'void': 빈 공간
+  interface CellMap {
+    type: 'real' | 'continue' | 'absorbed' | 'void';
+    cell?: any;
+    width?: number;
+  }
+  const tableMap: CellMap[][] = Array.from({ length: grid.kids.length }, () => []);
+
+  for (let ri = 0; ri < grid.kids.length; ri++) {
+    let c = 0;
+    for (const cell of grid.kids[ri].kids) {
+      // 이미 이전 행의 rowspan이나 현재 행의 colspan으로 차지된 자리 건너뜀
+      while (tableMap[ri][c]) c++;
+
+      // 실제 데이터 셀 배치
+      tableMap[ri][c] = { type: 'real', cell, width: cell.cs };
+
+      // 병합 영역(colspan, rowspan) 예약 처리
+      for (let rr = 0; rr < cell.rs; rr++) {
+        const targetRi = ri + rr;
+        if (targetRi >= grid.kids.length) break;
+        if (!tableMap[targetRi]) tableMap[targetRi] = [];
+
+        for (let cc = 0; cc < cell.cs; cc++) {
+          if (rr === 0 && cc === 0) continue; // 시작 셀은 이미 'real'로 처리됨
+
+          if (rr > 0 && cc === 0) {
+            // 세로 병합이 시작된 이후 행의 첫 번째 칸
+            tableMap[targetRi][c + cc] = { type: 'continue', width: cell.cs };
+          } else {
+            // 가로 병합으로 흡수된 칸 또는 세로 병합 중 가로 병합된 칸
+            tableMap[targetRi][c + cc] = { type: 'absorbed' };
+          }
+        }
+      }
+      c += cell.cs;
+    }
+  }
+
+  // 정확한 전체 열 개수(colCount) 계산 (모든 행 중 최대 길이)
   let colCount = 0;
-  for (const row of grid.kids) {
-    let rowCols = 0;
-    for (const cell of row.kids) rowCols += cell.cs;
-    if (rowCols > colCount) colCount = rowCols;
+  for (let ri = 0; ri < grid.kids.length; ri++) {
+    colCount = Math.max(colCount, tableMap[ri].length);
   }
-  if (colCount === 0) colCount = grid.kids[0]?.kids.length ?? 1;
+  if (colCount === 0) colCount = 1;
 
+  // 빈 공간(void) 채우기 및 colCount에 맞춰 배열 길이 정규화
+  for (let ri = 0; ri < grid.kids.length; ri++) {
+    for (let c = 0; c < colCount; c++) {
+      if (!tableMap[ri][c]) tableMap[ri][c] = { type: 'void' };
+    }
+  }
+
+  // 2단계: 컬럼 너비(dxa) 계산
   const defaultColDxa = Math.round(availDxa / colCount);
+  let colWidthsDxa: number[] = [];
 
-  // Use actual column widths if available from source format
-  const colWidthsDxa: number[] = [];
-  if (grid.props.colWidths && grid.props.colWidths.length === colCount) {
-    // Fill zero-width columns by distributing remaining space
+  if (grid.props.colWidths && grid.props.colWidths.length > 0) {
     const srcPt = [...grid.props.colWidths];
-    const knownTotal = srcPt.filter(w => w > 0).reduce((s, w) => s + w, 0);
+    while (srcPt.length < colCount) srcPt.push(0);
+    srcPt.length = colCount;
+
+    const knownTotalPt = srcPt.filter(w => w > 0).reduce((s, w) => s + w, 0);
     const zeroCount = srcPt.filter(w => w <= 0).length;
-    const remaining = Math.max(0, Metric.dxaToPt(availDxa) - knownTotal);
-    const zeroFill = zeroCount > 0 ? remaining / zeroCount : 0;
+    const availPt = Metric.dxaToPt(availDxa);
+
+    const remainingPt = Math.max(0, availPt - knownTotalPt);
+    const zeroFillPt = zeroCount > 0 ? remainingPt / zeroCount : 0;
+
     for (let i = 0; i < srcPt.length; i++) {
-      if (srcPt[i] <= 0) srcPt[i] = zeroFill > 0 ? zeroFill : Metric.dxaToPt(defaultColDxa);
+      if (srcPt[i] <= 0) {
+        srcPt[i] = zeroFillPt > 0 ? zeroFillPt : (availPt / colCount);
+      }
+    }
+
+    colWidthsDxa = srcPt.map(w => Math.round(Metric.ptToDxa(w)));
+    const computedTotalDxa = colWidthsDxa.reduce((s, w) => s + w, 0);
+    if (computedTotalDxa > availDxa) {
+      const scale = availDxa / computedTotalDxa;
+      colWidthsDxa = colWidthsDxa.map(w => Math.round(w * scale));
     }
-    const srcWidths = srcPt.map(w => Metric.ptToDxa(w));
-    const srcTotal = srcWidths.reduce((s, w) => s + w, 0);
-    // Normalize to fit available page width if source widths exceed it
-    const scale = srcTotal > availDxa ? availDxa / srcTotal : 1;
-    for (const w of srcWidths) colWidthsDxa.push(Math.round(w * scale));
   } else {
     for (let c = 0; c < colCount; c++) colWidthsDxa.push(defaultColDxa);
   }
-  const totalDxa = colWidthsDxa.reduce((s, w) => s + w, 0);
-
-  // Grid columns
-  const gridCols = colWidthsDxa.map(w => `<w:gridCol w:w="${Math.round(w)}"/>`).join('');
 
-  // Pre-compute vMerge map: for each (ri, colIdx), track if a cell with rs>1 spans into this row
-  // Key: "ri,colIdx", Value: 'restart' | 'continue'
-  const vMergeMap = new Map<string, 'restart' | 'continue'>();
-  for (let ri = 0; ri < grid.kids.length; ri++) {
-    let colIdx = 0;
-    for (const cell of grid.kids[ri].kids) {
-      if (cell.rs > 1) {
-        vMergeMap.set(`${ri},${colIdx}`, 'restart');
-        for (let sr = 1; sr < cell.rs; sr++) {
-          vMergeMap.set(`${ri + sr},${colIdx}`, 'continue');
-        }
-      }
-      colIdx += cell.cs;
-    }
-  }
+  const totalDxa = colWidthsDxa.reduce((s, w) => s + w, 0);
+  const gridCols = colWidthsDxa.map(w => `<w:gridCol w:w="${w}"/>`).join('');
 
+  // 3단계: XML 렌더링
   const rows = grid.kids.map((row, ri) => {
-    let colIdx = 0;
-
-    // Build actual cells including continuation cells for vMerge
     const cellXmls: string[] = [];
-    let srcCellIdx = 0;
-
-    // Walk through grid columns, emitting either real cells or vMerge continue cells
-    while (srcCellIdx < row.kids.length) {
-      const cell = row.kids[srcCellIdx];
-      const mergeType = vMergeMap.get(`${ri},${colIdx}`);
 
-      const cp = cell.props;
-      const tcPrParts: string[] = [];
+    for (let c = 0; c < colCount; c++) {
+      const mapEntry = tableMap[ri][c];
 
-      // Cell width in DXA (sum of spanned columns)
-      let cellW = 0;
-      for (let sc = colIdx; sc < colIdx + cell.cs && sc < colWidthsDxa.length; sc++) cellW += colWidthsDxa[sc];
-      if (cellW === 0) cellW = defaultColDxa * cell.cs;
-      tcPrParts.push(`<w:tcW w:w="${Math.round(cellW)}" w:type="dxa"/>`);
+      // 가로 병합으로 흡수된 칸은 렌더링하지 않음 (앞선 칸의 gridSpan이 차지)
+      if (mapEntry.type === 'absorbed') continue;
 
-      if (cell.cs > 1) tcPrParts.push(`<w:gridSpan w:val="${cell.cs}"/>`);
+      // 세로 병합 지속(continue), 실제 셀(real), 또는 빈 공간(void) 처리
+      const isContinue = mapEntry.type === 'continue';
+      const isReal = mapEntry.type === 'real';
+      const isVoid = mapEntry.type === 'void';
 
-      // vMerge
-      if (cell.rs > 1) {
-        tcPrParts.push(`<w:vMerge w:val="restart"/>`);
-      }
+      if (isContinue || isReal || isVoid) {
+        let cw = 0;
+        const cellWidth = mapEntry.width || 1;
 
-      // Cell borders
-      const borders = encodeCellBorders(cp);
-      if (borders) tcPrParts.push(borders);
+        // 너비 계산: 현재 칸부터 colspan(width) 만큼의 컬럼 너비 합산
+        for (let sc = c; sc < c + cellWidth && sc < colWidthsDxa.length; sc++) {
+          cw += colWidthsDxa[sc];
+        }
+        if (cw === 0) cw = defaultColDxa * cellWidth;
 
-      // Cell background
-      if (cp.bg) tcPrParts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${cp.bg}"/>`);
+        const tcPrParts: string[] = [];
+        tcPrParts.push(`<w:tcW w:w="${Math.round(cw)}" w:type="dxa"/>`);
 
-      // Vertical alignment
-      if (cp.va) {
-        const vaMap: Record<string, string> = { top: 'top', mid: 'center', bot: 'bottom' };
-        tcPrParts.push(`<w:vAlign w:val="${vaMap[cp.va] ?? 'top'}"/>`);
-      }
+        if (cellWidth > 1) {
+          tcPrParts.push(`<w:gridSpan w:val="${cellWidth}"/>`);
+        }
 
-      const tcPr = `<w:tcPr>${tcPrParts.join('')}</w:tcPr>`;
-      cellXmls.push(`      <w:tc>${tcPr}${cell.kids.map(p => encodeParaInner(p, ctx)).join('')}</w:tc>`);
-      colIdx += cell.cs;
-      srcCellIdx++;
-    }
+        if (isContinue) {
+          tcPrParts.push(`<w:vMerge/>`);
+        }
 
-    // Now emit vMerge continue cells for rows that are spanned into
-    // We need to check if any cells from rows above span into this row
-    // Re-walk grid columns looking for continue cells not covered by this row's cells
-    const finalCells: string[] = [];
-    let finalColIdx = 0;
-    let cellIter = 0;
-
-    // Use the computed colCount (max across all rows)
-    const totalGridCols = colCount;
-
-    // Re-check: we need to interleave vMerge continue cells
-    // The current row may have fewer cells because the model already skipped continuation cells
-    // So we need to insert continuation cells where vMergeMap says 'continue' for this row
-    finalColIdx = 0;
-    cellIter = 0;
-    for (let gc = 0; gc < totalGridCols; ) {
-      const mergeType = vMergeMap.get(`${ri},${gc}`);
-      if (mergeType === 'continue') {
-        // Find the original cell's cs from the restart row
-        let origCs = 1;
-        for (let sr = ri - 1; sr >= 0; sr--) {
-          const mt = vMergeMap.get(`${sr},${gc}`);
-          if (mt === 'restart') {
-            // Find the cell at this column in that row
-            let col = 0;
-            for (const c of grid.kids[sr].kids) {
-              if (col === gc) { origCs = c.cs; break; }
-              col += c.cs;
-            }
-            break;
+        let cellContent = '';
+        if (isReal) {
+          const cell = mapEntry.cell!;
+          const cp = cell.props;
+          if (cell.rs > 1) tcPrParts.push(`<w:vMerge w:val="restart"/>`);
+
+          const borders = encodeCellBorders(cp);
+          if (borders) tcPrParts.push(borders);
+          if (cp.bg) tcPrParts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${cp.bg}"/>`);
+          if (cp.va) {
+            const vaMap: Record<string, string> = { top: 'top', mid: 'center', bot: 'bottom' };
+            tcPrParts.push(`<w:vAlign w:val="${vaMap[cp.va] ?? 'top'}"/>`);
           }
-        }
-        let cw = 0;
-        for (let sc = gc; sc < gc + origCs && sc < colWidthsDxa.length; sc++) cw += colWidthsDxa[sc];
-        if (cw === 0) cw = defaultColDxa * origCs;
-        let contParts = `<w:tcW w:w="${Math.round(cw)}" w:type="dxa"/>`;
-        if (origCs > 1) contParts += `<w:gridSpan w:val="${origCs}"/>`;
-        contParts += `<w:vMerge/>`;
-        finalCells.push(`      <w:tc><w:tcPr>${contParts}</w:tcPr><w:p><w:pPr/></w:p></w:tc>`);
-        gc += origCs;
-      } else {
-        if (cellIter < cellXmls.length) {
-          finalCells.push(cellXmls[cellIter]);
-          gc += row.kids[cellIter]?.cs ?? 1;
-          cellIter++;
+          cellContent = cell.kids.map((p: any) => encodeParaInner(p, ctx)).join('');
         } else {
-          gc++;
+          // continue 거나 void 인 경우 빈 단락 추가
+          cellContent = `<w:p><w:pPr/></w:p>`;
         }
+
+        const tcPr = `<w:tcPr>${tcPrParts.join('')}</w:tcPr>`;
+        cellXmls.push(`      <w:tc>${tcPr}${cellContent}</w:tc>`);
       }
     }
 
-    // Header row
-    let trPr = '';
+    const trPrParts: string[] = [];
     if (ri === 0 && (gp.headerRow || look?.firstRow)) {
-      trPr = '<w:trPr><w:tblHeader/></w:trPr>';
+      trPrParts.push('<w:tblHeader/>');
+    }
+    if (row.heightPt != null && row.heightPt > 0) {
+      const hDxa = Math.round(Metric.ptToDxa(row.heightPt));
+      trPrParts.push(`<w:trHeight w:val="${hDxa}" w:hRule="exact"/>`);
     }
+    const trPr = trPrParts.length > 0 ? `<w:trPr>${trPrParts.join('')}</w:trPr>` : '';
 
-    return `    <w:tr>${trPr}\n${finalCells.join('\n')}\n    </w:tr>`;
+    return `    <w:tr>${trPr}\n${cellXmls.join('\n')}\n    </w:tr>`;
   }).join('\n');
 
-  // Table borders from defaultStroke
+  // 4단계: 테두리 및 최종 테이블 XML 조립
   let tblBorders = '';
+  const strokeKindMap: Record<string, string> = {
+    solid: 'single', dash: 'dash', dot: 'dot', double: 'double', none: 'none',
+    dotDash: 'dotDash', dotDotDash: 'dotDotDash', triple: 'triple', thinThickSmallGap: 'thinThickSmallGap',
+    thickThinSmallGap: 'thickThinSmallGap', thinThickThinSmallGap: 'thinThickThinSmallGap',
+  };
+
   if (gp.defaultStroke) {
     const s = gp.defaultStroke;
-    const strokeKindMap: Record<string, string> = { solid: 'single', dash: 'dashed', dot: 'dotted', double: 'double', none: 'none' };
     const val = strokeKindMap[s.kind] ?? 'single';
-    const sz = Math.round(s.pt * 8);
-    const bdr = `w:val="${val}" w:sz="${sz}" w:space="0" w:color="${s.color}"`;
-    tblBorders = `<w:tblBorders><w:top ${bdr}/><w:left ${bdr}/><w:bottom ${bdr}/><w:right ${bdr}/><w:insideH ${bdr}/><w:insideV ${bdr}/></w:tblBorders>`;
+
+    if (val === 'none' || s.pt <= 0) {
+      tblBorders = '<w:tblBorders><w:top w:val="none"/><w:left w:val="none"/><w:bottom w:val="none"/><w:right w:val="none"/><w:insideH w:val="none"/><w:insideV w:val="none"/></w:tblBorders>';
+    } else {
+      // DOCX sz는 1/8pt 단위. 최소 굵기 2(0.25pt) 보장
+      const sz = Math.max(2, Math.round(s.pt * 8));
+      // 색상 '#' 제거 및 빈 값일 경우 auto 처리
+      const clr = s.color ? s.color.replace('#', '') : 'auto';
+      const bdr = `w:val="${val}" w:sz="${sz}" w:space="0" w:color="${clr}"`;
+      tblBorders = `<w:tblBorders><w:top ${bdr}/><w:left ${bdr}/><w:bottom ${bdr}/><w:right ${bdr}/><w:insideH ${bdr}/><w:insideV ${bdr}/></w:tblBorders>`;
+    }
   }
 
   return `    <w:tbl>
@@ -691,20 +706,46 @@ function encodeGrid(grid: GridNode, ctx: EncCtx, dims?: PageDims): string {
 ${rows}
     </w:tbl>`;
 }
-
 function encodeCellBorders(cp: CellProps): string {
   if (!cp.top && !cp.bot && !cp.left && !cp.right) return '';
-  const strokeKindMap: Record<string, string> = { solid: 'single', dash: 'dashed', dot: 'dotted', double: 'double', none: 'none' };
+  const strokeKindMap: Record<string, string> = {
+    solid: 'single', dash: 'dash', dot: 'dot', double: 'double', none: 'none',
+    dotDash: 'dotDash', dotDotDash: 'dotDotDash', triple: 'triple',
+  };
 
   const encode = (s?: { kind: string; pt: number; color: string }, tag?: string) => {
     if (!s || !tag) return '';
     const val = strokeKindMap[s.kind] ?? 'single';
-    return `<w:${tag} w:val="${val}" w:sz="${Math.round(s.pt * 8)}" w:space="0" w:color="${s.color}"/>`;
+
+    // 선이 없거나 굵기가 0 이하인 경우 확실하게 제거 처리
+    if (val === 'none' || s.pt <= 0) {
+      return `<w:${tag} w:val="none" w:sz="0" w:space="0" w:color="auto"/>`;
+    }
+
+    // 최소 굵기 sz=2 (0.25pt) 보장
+    const sz = Math.max(2, Math.round(s.pt * 8));
+    // 색상 '#' 제거 및 빈 값일 경우 auto 처리
+    const clr = s.color ? s.color.replace('#', '') : 'auto';
+
+    return `<w:${tag} w:val="${val}" w:sz="${sz}" w:space="0" w:color="${clr}"/>`;
   };
 
   return `<w:tcBorders>${encode(cp.top, 'top')}${encode(cp.bot, 'bottom')}${encode(cp.left, 'left')}${encode(cp.right, 'right')}</w:tcBorders>`;
 }
 
-function esc(s: string): string { return TextKit.escapeXml(s); }
+function esc(s: string): string {
+  if (!s) return '';
+  // 1. 내부 처리용 플레이스홀더(__EXT_0__ 등) 제거
+  s = s.replace(/__EXT_\d+__/g, '');
+
+  // 2. 글자 깨짐을 유발하는 쓰레기값 및 BOM 기호 명시적 제거 (이 부분 추가!)
+  s = s.replace(/湰灧/g, '');
+  s = s.replace(/\uFEFF/g, '');
+
+  // 3. DOCX(XML 1.0)에서 허용하지 않는 보이지 않는 제어문자 모두 제거
+  s = s.replace(/[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD]/g, '');
+
+  return TextKit.escapeXml(s);
+}
 
 registry.registerEncoder(new DocxEncoder());