hwpkit-dev 0.0.3 → 0.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hwpkit-dev",
   "description": "HWP/HWPX/DOCX/MD 양방향 문서 변환 라이브러리",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "author": {
     "name": "INMD1",
     "email": "lyw514549@gmail.com",

package/src/decoders/hwp/HwpScanner.ts

@@ -1,9 +1,9 @@
 import type { Decoder } from '../../contract/decoder';
-import type { DocRoot, ContentNode, ParaNode, SpanNode, ImgNode, GridNode } from '../../model/doc-tree';
+import type { DocRoot, ContentNode, ParaNode, SpanNode, ImgNode, GridNode, PageNumNode } from '../../model/doc-tree';
 import type { Outcome } from '../../contract/result';
 import type { Align, Stroke, StrokeKind, PageDims, TextProps, ParaProps, CellProps, GridProps } from '../../model/doc-props';
 import { succeed, fail } from '../../contract/result';
-import { buildRoot, buildSheet, buildPara, buildSpan, buildGrid, buildRow, buildCell, buildImg } from '../../model/builders';
+import { buildRoot, buildSheet, buildPara, buildSpan, buildGrid, buildRow, buildCell, buildImg, buildPb, buildPageNum } from '../../model/builders';
 import { ShieldedParser } from '../../safety/ShieldedParser';
 import { BinaryKit } from '../../toolkit/BinaryKit';
 import { TextKit } from '../../toolkit/TextKit';
@@ -39,11 +39,14 @@ function isTableTag(t: number) { return t === TAG_TABLE_A || t === TAG_TABLE_B;
 function isCellTag(t: number)  { return t === TAG_CELL_A || t === TAG_CELL_B || t === TAG_LIST_HEADER; }
 
 // CTRL_HEADER ctrlId values (UINT32-LE as ASCII)
-const CTRL_TABLE = 0x74626C20;  // ' lbt' = 표(table)
+const CTRL_TABLE = 0x74626C20;  // 'tbl ' = 표(table)
 const CTRL_IMAGE = 0x696D6720;  // 'img '
 const CTRL_OBJ   = 0x6F626A20;  // 'obj '
 const CTRL_FIG   = 0x66696720;  // 'fig '
 const CTRL_GSO   = 0x67736F20;  // 'gso ' = 그리기 객체 (drawing object, contains embedded images)
+const CTRL_HEAD  = 0x68656164;  // 'head' = 머리말
+const CTRL_FOOT  = 0x666F6F74;  // 'foot' = 꼬리말
+const CTRL_ATNO  = 0x61746E6F;  // 'atno' = 자동 번호 (쪽번호 등)
 
 /* ═══════════════════════════════════════════════════════════════
    Types
@@ -66,16 +69,18 @@ interface HwpCharShape {
   subscript: boolean;
   textColor: string;
 }
-
 interface HwpParaShape {
   align: Align;
   spaceBefore: number;
   spaceAfter: number;
   lineSpacing: number;
+  lineSpacingType: 0 | 1 | 2 | 3; // 0=PERCENT, 1=FIXED, 2=BETWEEN_LINES, 3=AT_LEAST
   leftMargin: number;
+  rightMargin: number;
   indent: number;
+  verAlign?: 'baseline' | 'top' | 'center' | 'bottom';
+  lineWrap?: 'break' | 'squeeze' | 'keep';
 }
-
 interface HwpBorderFill {
   borders: { type: number; widthPt: number; color: string }[];
   bgColor?: string;
@@ -213,7 +218,7 @@ function parseCharShape(d: Uint8Array): HwpCharShape {
 
 /* ── PARA_SHAPE ─────────────────────────────────────────────── */
 /*  offset  size  field
-    0       4     attr1   (bits 0-1 = alignment: 0=justify,1=left,2=right,3=center)
+    0       4     attr1   (bits 0-1 = line spacing type, bits 2-4 = alignment)
     4       4     leftMargin   (HWPUNIT)
     8       4     rightMargin
     12      4     indent
@@ -221,18 +226,36 @@ function parseCharShape(d: Uint8Array): HwpCharShape {
     20      4     spaceAfter
     24      4     lineSpacing                                         */
 
-const ALIGN_TBL: Record<number, Align> = { 0: 'justify', 1: 'left', 2: 'right', 3: 'center', 4: 'justify' };
+const ALIGN_TBL: Record<number, Align> = { 0: 'justify', 1: 'left', 2: 'right', 3: 'center', 4: 'distribute', 5: 'distribute_space' };
 
 function parseParaShape(d: Uint8Array): HwpParaShape {
-  if (d.length < 4) return { align: 'left', spaceBefore: 0, spaceAfter: 0, lineSpacing: 160, leftMargin: 0, indent: 0 };
+  if (d.length < 4) return { align: 'left', spaceBefore: 0, spaceAfter: 0, lineSpacing: 160, lineSpacingType: 0, leftMargin: 0, rightMargin: 0, indent: 0 };
   const attr = BinaryKit.readU32LE(d, 0);
+
+  // bits 0-1: 줄 간격 종류 (0=PERCENT, 1=FIXED, 2=BETWEEN_LINES, 3=AT_LEAST)
+  const lineSpacingType = (attr & 0x3) as 0 | 1 | 2 | 3;
+
+  // bits 2-4: 정렬 방식 (0=justify,1=left,2=right,3=center,4=distribute,5=split)
+  const align = ALIGN_TBL[(attr >> 2) & 0x7] ?? 'left';
+
+  // 세로 정렬 (Bit 18 ~ Bit 19)
+  const vVal = (attr >> 18) & 0x3;
+  const verAlign = vVal === 1 ? 'top' : vVal === 2 ? 'center' : vVal === 3 ? 'bottom' : 'baseline';
+
+  // 줄 바꿈 기준: attr1 에는 별도 비트 없음, 기본값 'break'
+  const lineWrap: 'break' = 'break';
+
   return {
-    align:       ALIGN_TBL[(attr >> 2) & 0x7] ?? 'left',
-    leftMargin:  d.length >= 8  ? i32(d, 4)  : 0,  // offset 4: leftMargin (들여쓰기)
-    indent:      d.length >= 16 ? i32(d, 12) : 0,  // offset 12: first-line indent
+    align,
+    lineSpacingType,
+    leftMargin:  d.length >= 8  ? i32(d, 4)  : 0,  // offset 4: 문단 몸체 왼쪽 여백 (HWPUNIT)
+    rightMargin: d.length >= 12 ? i32(d, 8)  : 0,  // offset 8: 문단 몸체 오른쪽 여백 (HWPUNIT)
+    indent:      d.length >= 16 ? i32(d, 12) : 0,  // offset 12: 첫 줄 들여쓰기 (HWPUNIT)
     spaceBefore: d.length >= 20 ? i32(d, 16) : 0,
     spaceAfter:  d.length >= 24 ? i32(d, 20) : 0,
     lineSpacing: d.length >= 28 ? i32(d, 24) : 160,
+    verAlign,
+    lineWrap,
   };
 }
 
@@ -282,7 +305,11 @@ function parseBorderFill(d: Uint8Array): HwpBorderFill {
 // gsoCtx: shared mutable counter for 'gso ' drawing objects.
 // Each 'gso ' CTRL_HEADER encountered increments this counter.
 // objectMap is keyed by 0-based gso order = sequential BinData insertion order.
-interface GsoCtx { count: number }
+interface GsoCtx {
+  count: number;
+  headers?: ParaNode[];
+  footers?: ParaNode[];
+}
 
 function parseBody(
   raw: Uint8Array, compressed: boolean, di: DocInfo, shield: ShieldedParser, gsoCtx: GsoCtx,
@@ -326,15 +353,20 @@ function parseParagraphGroup(
   const hdr = recs[start];
   const lv  = hdr.level;
 
-  // paraShapeId at offset 8 (UINT16)
-  const psId = hdr.data.length >= 10 ? BinaryKit.readU16LE(hdr.data, 8) : 0;
-  const ps   = di.paraShapes[psId];
+  // P1: PARA_HEADER 레이아웃
+  //   offset 8-9: paraShapeId (UINT16)
+  //   offset 10:  styleId (UINT8)
+  //   offset 11:  divideSort (UINT8) — 0x04=쪽나누기
+  const psId       = hdr.data.length >= 10 ? BinaryKit.readU16LE(hdr.data, 8) : 0;
+  const hwpStyleId = hdr.data.length >= 11 ? hdr.data[10] : 0;
+  const divideSort = hdr.data.length >= 12 ? hdr.data[11] : 0;
+  const ps         = di.paraShapes[psId];
 
   let text: ParaTextResult | null = null;
   let csPairs: [number, number][] = [];
   const grids: ContentNode[] = [];
   // imgId: for 'gso' uses sequential gsoCtx.count; for others uses flags-based objId
-  const ctrlHeaders: { ctrlId: number; imgId: number; wPt: number; hPt: number }[] = [];
+  const ctrlHeaders: { ctrlId: number; imgId: number; wPt: number; hPt: number; atnoType?: number }[] = [];
   let i = start + 1;
 
   while (i < recs.length && recs[i].level > lv) {
@@ -350,29 +382,59 @@ function parseParagraphGroup(
       if (r.data.length >= 4) {
         const ctrlId = BinaryKit.readU32LE(r.data, 0);
 
-        // HWP 5.0 general-object layout:
-        //   [0:4] ctrlId  [4:4] flags  [8:4] xOff  [12:4] yOff
-        //   [16:4] width(HWPUNIT)  [20:4] height(HWPUNIT)
-        const MAX_HWP = 1_000_000;
-        const rawW = r.data.length >= 24 ? BinaryKit.readU32LE(r.data, 16) : 0;
-        const rawH = r.data.length >= 28 ? BinaryKit.readU32LE(r.data, 20) : 0;
-        const wPt = rawW > 0 && rawW < MAX_HWP ? Metric.hwpToPt(rawW) : 0;
-        const hPt = rawH > 0 && rawH < MAX_HWP ? Metric.hwpToPt(rawH) : 0;
-
-        // 'gso ' (그리기 객체) uses sequential counter; others use flags-based id
-        const imgId = ctrlId === CTRL_GSO ? gsoCtx.count++ : (r.data.length >= 6 ? BinaryKit.readU16LE(r.data, 4) : 0);
-        ctrlHeaders.push({ ctrlId, imgId, wPt, hPt });
-
-        if (ctrlId === CTRL_TABLE) {
-          const tr = shield.guard(
-            () => parseTableCtrl(recs, i, di, shield, gsoCtx),
-            { grid: null, next: skipKids(recs, i) },
-            `hwp:tbl@${i}`,
-          );
-          if (tr.grid) grids.push(tr.grid);
-          i = tr.next;
+        if (ctrlId === CTRL_HEAD || ctrlId === CTRL_FOOT) {
+          // P8: 머리말/꼬리말 컨트롤 — 자식 문단을 파싱해 gsoCtx에 저장
+          const ctrlLv = r.level;
+          const hfParas: ParaNode[] = [];
+          let j = i + 1;
+          while (j < recs.length && recs[j].level > ctrlLv) {
+            if (recs[j].tag === TAG_PARA_HEADER) {
+              const pr = shield.guard(
+                () => parseParagraphGroup(recs, j, di, shield, gsoCtx),
+                { nodes: [] as ContentNode[], next: j + 1 },
+                `hwp:hf@${j}`,
+              );
+              hfParas.push(...pr.nodes.filter((n): n is ParaNode => n.tag === 'para'));
+              j = pr.next;
+            } else {
+              j++;
+            }
+          }
+          if (hfParas.length > 0) {
+            const key = ctrlId === CTRL_HEAD ? 'headers' : 'footers';
+            if (!gsoCtx[key]) gsoCtx[key] = hfParas;
+          }
+          i = j;
         } else {
-          i = skipKids(recs, i);
+          // HWP 5.0 general-object layout:
+          //   [0:4] ctrlId  [4:4] flags  [8:4] xOff  [12:4] yOff
+          //   [16:4] width(HWPUNIT)  [20:4] height(HWPUNIT)
+          const MAX_HWP = 1_000_000;
+          const rawW = r.data.length >= 24 ? BinaryKit.readU32LE(r.data, 16) : 0;
+          const rawH = r.data.length >= 28 ? BinaryKit.readU32LE(r.data, 20) : 0;
+          const wPt = rawW > 0 && rawW < MAX_HWP ? Metric.hwpToPt(rawW) : 0;
+          const hPt = rawH > 0 && rawH < MAX_HWP ? Metric.hwpToPt(rawH) : 0;
+
+          // P9: atno — offset 4 u32 하위 4bit = 번호 종류 (0=쪽번호, 6=전체쪽수)
+          const atnoType = ctrlId === CTRL_ATNO && r.data.length >= 8
+            ? BinaryKit.readU32LE(r.data, 4) & 15
+            : undefined;
+
+          // 'gso ' (그리기 객체) uses sequential counter; others use flags-based id
+          const imgId = ctrlId === CTRL_GSO ? gsoCtx.count++ : (r.data.length >= 6 ? BinaryKit.readU16LE(r.data, 4) : 0);
+          ctrlHeaders.push({ ctrlId, imgId, wPt, hPt, atnoType });
+
+          if (ctrlId === CTRL_TABLE) {
+            const tr = shield.guard(
+              () => parseTableCtrl(recs, i, di, shield, gsoCtx),
+              { grid: null, next: skipKids(recs, i) },
+              `hwp:tbl@${i}`,
+            );
+            if (tr.grid) grids.push(tr.grid);
+            i = tr.next;
+          } else {
+            i = skipKids(recs, i);
+          }
         }
       } else {
         i = skipKids(recs, i);
@@ -384,18 +446,42 @@ function parseParagraphGroup(
 
   const nodes: ContentNode[] = [];
 
-  // Build paragraph from text and inline controls (images)
-  if (text && (text.chars.length > 0 || text.controls.length > 0)) {
-    const paraContent: (SpanNode | ContentNode)[] = [];
+  {
+    const paraContent: Array<SpanNode | GridNode | PageNumNode> = [];
+
+    // P9: atno 컨트롤 위치 수집 (pos 기준 정렬)
+    const atnoCtrls: { pos: number; type: number }[] = [];
+    if (text && text.controls.length > 0) {
+      for (let ci = 0; ci < text.controls.length; ci++) {
+        const ch = ctrlHeaders[ci];
+        if (ch && ch.ctrlId === CTRL_ATNO)
+          atnoCtrls.push({ pos: text.controls[ci].pos, type: ch.atnoType ?? 0 });
+      }
+      atnoCtrls.sort((a, b) => a.pos - b.pos);
+    }
 
-    if (text.chars.length > 0) {
-      const spans = resolveCharShapes(text.chars, csPairs, di);
-      paraContent.push(...spans);
+    // P9: 텍스트 chars를 atno 위치 기준으로 분할하여 PageNumNode 삽입
+    if (text && text.chars.length > 0) {
+      if (atnoCtrls.length > 0) {
+        let k = 0;
+        for (const ac of atnoCtrls) {
+          const seg: ParsedChar[] = [];
+          while (k < text.chars.length && text.chars[k].pos < ac.pos) seg.push(text.chars[k++]);
+          if (seg.length > 0) paraContent.push(...resolveCharShapes(seg, csPairs, di));
+          paraContent.push(buildPageNum(ac.type === 0 ? 'decimal' : 'total'));
+        }
+        const rest = text.chars.slice(k);
+        if (rest.length > 0) paraContent.push(...resolveCharShapes(rest, csPairs, di));
+      } else {
+        paraContent.push(...resolveCharShapes(text.chars, csPairs, di));
+      }
+    } else if (atnoCtrls.length > 0) {
+      for (const ac of atnoCtrls) paraContent.push(buildPageNum(ac.type === 0 ? 'decimal' : 'total'));
     }
 
     // Image placeholder spans: only for actual image controls.
     // Non-image controls (footnotes, TOC entries, etc.) are silently skipped.
-    if (text.controls.length > 0) {
+    if (text && text.controls.length > 0) {
       for (let ci = 0; ci < text.controls.length; ci++) {
         const ch = ctrlHeaders[ci];
         if (!ch) continue; // anchor-only ctrl (gso is sibling, not inline)
@@ -408,12 +494,18 @@ function parseParagraphGroup(
       }
     }
 
-    if (paraContent.length > 0) {
-      nodes.push(buildPara(paraContent as any, buildParaProps(ps)));
+    // P5: 쪽나누기(divideSort & 4) → page-break 문단 먼저 출력
+    if (divideSort & 4) {
+      nodes.push(buildPara([{ tag: 'span', props: {}, kids: [buildPb()] } as SpanNode]));
     }
+    // P5: 표 → 앵커 문단 순서 (앵커 문단 드롭 금지)
+    nodes.push(...grids);
+    nodes.push(buildPara(
+      paraContent.length > 0 ? paraContent as any : [buildSpan('')],
+      buildParaProps(ps, hwpStyleId),
+    ));
   }
 
-  nodes.push(...grids);
   return { nodes, next: i };
 }
 
@@ -426,8 +518,8 @@ function skipKids(recs: HwpRecord[], idx: number): number {
 
 /* ── PARA_TEXT ───────────────────────────────────────────────── */
 
-// Extended controls: 8 WORDs, associated CTRL_HEADER
-const EXT_CTRL = new Set([2, 3, 11, 12, 14, 15]);
+// Extended controls: 8 WORDs, associated CTRL_HEADER (16-25 also skip 16 bytes)
+const EXT_CTRL = new Set([2, 3, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]);
 // Inline controls: 8 WORDs, no CTRL_HEADER
 const INL_CTRL = new Set([4, 5, 6, 7, 8]);
 
@@ -766,6 +858,9 @@ function parseCellRec(
           const hdr = recs[k];
           const lv = hdr.level;
           const psId = hdr.data.length >= 10 ? BinaryKit.readU16LE(hdr.data, 8) : 0;
+          // P6: 셀 내부 문단의 styleId / divideSort 읽기
+          const cellStyleId = hdr.data.length >= 11 ? hdr.data[10] : 0;
+          const cellDivide  = hdr.data.length >= 12 ? hdr.data[11] : 0;
           const ps = di.paraShapes[psId];
           let txt: ParaTextResult | null = null;
           let csp: [number, number][] = [];
@@ -815,7 +910,9 @@ function parseCellRec(
             }
           }
           const kids = paraContent.length > 0 ? paraContent as any : [buildSpan('')];
-          const items: (ParaNode | GridNode)[] = [buildPara(kids, buildParaProps(ps)), ...innerGrids];
+          // P6: innerGrids 먼저, 앵커 문단 나중 (P5와 동일한 순서)
+          const items: (ParaNode | GridNode)[] = [...innerGrids, buildPara(kids, buildParaProps(ps, cellStyleId))];
+          if (cellDivide & 4) items.unshift(buildPara([{ tag: 'span', props: {}, kids: [buildPb()] } as SpanNode]));
           return { items, next: j };
         },
         { items: [buildPara([buildSpan('')])] as (ParaNode | GridNode)[], next: k + 1 },
@@ -858,7 +955,7 @@ function parseCellRec(
 
 /* ── PAGE_DEF ───────────────────────────────────────────────── */
 /*  [0:4] width  [4:4] height  [8:4] ml  [12:4] mr
-    [16:4] mt  [20:4] mb  [36:4] attr (bit0=landscape)           */
+    [16:4] mt  [20:4] mb  [24:4] header  [28:4] footer  [36:4] attr (bit0=landscape) */
 
 function parsePageDef(d: Uint8Array): PageDims {
   if (d.length < 24) return A4;
@@ -868,11 +965,15 @@ function parsePageDef(d: Uint8Array): PageDims {
   const mr = BinaryKit.readU32LE(d, 12);
   const mt = BinaryKit.readU32LE(d, 16);
   const mb = BinaryKit.readU32LE(d, 20);
+  const header = d.length >= 28 ? BinaryKit.readU32LE(d, 24) : 0;
+  const footer = d.length >= 32 ? BinaryKit.readU32LE(d, 28) : 0;
   const at = d.length >= 40 ? BinaryKit.readU32LE(d, 36) : 0;
   return {
     wPt: Metric.hwpToPt(w),  hPt: Metric.hwpToPt(h),
     ml: Metric.hwpToPt(ml),  mr: Metric.hwpToPt(mr),
     mt: Metric.hwpToPt(mt),  mb: Metric.hwpToPt(mb),
+    headerPt: header > 0 ? Metric.hwpToPt(header) : undefined,
+    footerPt: footer > 0 ? Metric.hwpToPt(footer) : undefined,
     orient: (at & 1) ? 'landscape' : 'portrait',
   };
 }
@@ -915,18 +1016,30 @@ function strokeFromBF(bfId: number, di: DocInfo): Stroke | undefined {
   return { kind: BORDER_KIND[b.type] ?? 'solid', pt: b.widthPt, color: b.color };
 }
 
-function buildParaProps(ps?: HwpParaShape): ParaProps {
-  if (!ps) return {};
-  const p: ParaProps = {};
+function buildParaProps(ps?: HwpParaShape, hwpStyleId?: number): ParaProps {
+  // P2: hwpStyleId를 초기값으로 포함 (undefined이면 빈 객체)
+  const p: ParaProps = hwpStyleId !== undefined ? { hwpStyleId } : {};
+  if (!ps) return p;
   if (ps.align && ps.align !== 'left') p.align = ps.align;
   if (ps.spaceBefore > 0) p.spaceBefore = Metric.hwpToPt(ps.spaceBefore);
   if (ps.spaceAfter > 0)  p.spaceAfter  = Metric.hwpToPt(ps.spaceAfter);
-  if (ps.lineSpacing > 0 && ps.lineSpacing !== 160) p.lineHeight = ps.lineSpacing / 100;
+  // 줄 간격: type=0(PERCENT) → lineHeight, type=1(FIXED) → lineHeightFixed
+  if (ps.lineSpacingType === 1) {
+    if (ps.lineSpacing > 0) p.lineHeightFixed = Metric.hwpToPt(ps.lineSpacing);
+  } else {
+    // P10: 160%(HWP 기본값) 생략 버그 수정 — 항상 lineHeight 설정
+    if (ps.lineSpacing > 0) p.lineHeight = ps.lineSpacing / 100;
+  }
   // leftMargin (offset 4) = 문단 몸체 왼쪽 여백 → leftMargin (pt), ensure non-negative
   const leftMarginPt = Math.max(0, Metric.hwpToPt(ps.leftMargin));
   if (leftMarginPt > 0) p.leftMargin = leftMarginPt;
+  // rightMargin (offset 8) = 문단 몸체 오른쪽 여백 → indentRightPt (pt)
+  const rightMarginPt = Math.max(0, Metric.hwpToPt(ps.rightMargin));
+  if (rightMarginPt > 0) p.indentRightPt = rightMarginPt;
   // indent (offset 12) = 첫 줄 들여쓰기(양수) / 내어쓰기(음수) → firstLineIndentPt
   if (ps.indent !== 0) p.firstLineIndentPt = Metric.hwpToPt(ps.indent);
+  if (ps.verAlign && ps.verAlign !== 'baseline') p.verAlign = ps.verAlign;
+  if (ps.lineWrap && ps.lineWrap !== 'break') p.lineWrap = ps.lineWrap;
   return p;
 }
 
@@ -1021,7 +1134,11 @@ export class HwpScanner implements Decoder {
 
       warns.push(...shield.flush());
       const content = allContent.length > 0 ? allContent : [buildPara([buildSpan('')])];
-      return succeed(buildRoot({}, [buildSheet(content, pageDims)]), warns);
+      // P8: 머리말/꼬리말을 gsoCtx에서 가져와 buildSheet에 전달
+      return succeed(buildRoot({}, [buildSheet(content, pageDims, {
+        headers: gsoCtx.headers ? { default: gsoCtx.headers } : undefined,
+        footers: gsoCtx.footers ? { default: gsoCtx.footers } : undefined,
+      })]), warns);
     } catch (e: any) {
       warns.push(...shield.flush());
       return fail(`HWP decode error: ${e?.message ?? String(e)}`, warns);

package/src/decoders/hwpx/HwpxDecoder.ts

@@ -1028,6 +1028,16 @@ function decodeGrid(tbl: any, ctx: DecCtx): GridNode {
   const gridProps: GridProps = { headerRow: headerRow || undefined };
   if (borderFill?.stroke) gridProps.defaultStroke = borderFill.stroke;
 
+  // 표 정렬 — <hp:pos horzAlign="..."> 에서 읽음 (OWPML CAbstractShapeObjectType)
+  const posAttr = tbl?.["hp:pos"]?.[0]?._attr ?? {};
+  if (posAttr.horzAlign) {
+    const alignMap: Record<string, "left" | "right" | "center" | "justify"> = {
+      LEFT: "left", RIGHT: "right", CENTER: "center", JUSTIFY: "justify",
+    };
+    const a = alignMap[posAttr.horzAlign];
+    if (a) gridProps.align = a;
+  }
+
   const rowArr = getTag(tbl, "hp:tr", "hp:ROW");
 
   // Read column widths: first try a row where ALL cells have cs=1
@@ -1112,7 +1122,7 @@ function decodeGrid(tbl: any, ctx: DecCtx): GridNode {
         cellProps.right = cellBf.right ?? cellBf.stroke;
       }
 
-      // Vertical alignment and cell padding from subList
+      // 수직 정렬 — <hp:subList vertAlign="..."> (OWPML CParaListType::GetVertAlign)
       const subList = cell?.["hp:subList"]?.[0] ?? cell?.subList?.[0];
       const subAttr = subList?._attr ?? {};
       if (subAttr.vertAlign) {
@@ -1123,17 +1133,18 @@ function decodeGrid(tbl: any, ctx: DecCtx): GridNode {
         };
         cellProps.va = vaMap[subAttr.vertAlign];
       }
-      // Cell margins (stored in HWPUNIT on subList attributes)
-      const HWPX_DEFAULT_MARGIN_LR = 360; // typical default: 3.6pt
-      const HWPX_DEFAULT_MARGIN_TB = 141; // typical default: ~1.4pt
-      const mL = Number(subAttr.marginLeft ?? HWPX_DEFAULT_MARGIN_LR);
-      const mR = Number(subAttr.marginRight ?? HWPX_DEFAULT_MARGIN_LR);
-      const mT = Number(subAttr.marginTop ?? HWPX_DEFAULT_MARGIN_TB);
-      const mB = Number(subAttr.marginBottom ?? HWPX_DEFAULT_MARGIN_TB);
-      if (mL !== HWPX_DEFAULT_MARGIN_LR) cellProps.padL = Metric.hwpToPt(mL);
-      if (mR !== HWPX_DEFAULT_MARGIN_LR) cellProps.padR = Metric.hwpToPt(mR);
-      if (mT !== HWPX_DEFAULT_MARGIN_TB) cellProps.padT = Metric.hwpToPt(mT);
-      if (mB !== HWPX_DEFAULT_MARGIN_TB) cellProps.padB = Metric.hwpToPt(mB);
+      // 셀 여백 — <hp:cellMargin left/right/top/bottom> (OWPML CTc::SetcellMargin)
+      // subList 속성이 아닌 <hp:cellMargin> 자식 요소에서 읽어야 함
+      const cellMarginAttr =
+        cell?.["hp:cellMargin"]?.[0]?._attr ?? {};
+      const mL = cellMarginAttr.left !== undefined ? Number(cellMarginAttr.left) : -1;
+      const mR = cellMarginAttr.right !== undefined ? Number(cellMarginAttr.right) : -1;
+      const mT = cellMarginAttr.top !== undefined ? Number(cellMarginAttr.top) : -1;
+      const mB = cellMarginAttr.bottom !== undefined ? Number(cellMarginAttr.bottom) : -1;
+      if (mL >= 0) cellProps.padL = Metric.hwpToPt(mL);
+      if (mR >= 0) cellProps.padR = Metric.hwpToPt(mR);
+      if (mT >= 0) cellProps.padT = Metric.hwpToPt(mT);
+      if (mB >= 0) cellProps.padB = Metric.hwpToPt(mB);
 
       // Colspan/rowspan from cellSpan element or attributes
       const cellSpan = cell?.["hp:cellSpan"]?.[0]?._attr ?? {};

package/src/encoders/docx/DocxEncoder.ts

@@ -320,6 +320,40 @@ function stylesXml(): string {
     </w:pPr></w:pPrDefault>
   </w:docDefaults>
   <w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="0"><w:name w:val="바탕글"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="1"><w:name w:val="본문"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="2"><w:name w:val="개요 1"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="3"><w:name w:val="개요 2"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="4"><w:name w:val="개요 3"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="5"><w:name w:val="개요 4"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="6"><w:name w:val="개요 5"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="7"><w:name w:val="개요 6"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="8"><w:name w:val="개요 7"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="9"><w:name w:val="개요 8"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="10"><w:name w:val="개요 9"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="11"><w:name w:val="개요 10"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="12"><w:name w:val="쪽 번호"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="13"><w:name w:val="머리말"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="14"><w:name w:val="각주"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="15"><w:name w:val="미주"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="16"><w:name w:val="메모"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="17"><w:name w:val="차례 제목"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="18"><w:name w:val="차례 1"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="19"><w:name w:val="차례 2"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="20"><w:name w:val="차례 3"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="21"><w:name w:val="본문 제목"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="22"><w:name w:val="그림"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="23"><w:name w:val="표"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="24"><w:name w:val="수식"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="25"><w:name w:val="인용문"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="26"><w:name w:val="날짜"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="27"><w:name w:val="발신명의"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="28"><w:name w:val="제목"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="29"><w:name w:val="부제목"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="30"><w:name w:val="문단 제목"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="31"><w:name w:val="MEMO"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="32"><w:name w:val="개요"/><w:basedOn w:val="Normal"/></w:style>
+  <w:style w:type="paragraph" w:styleId="33"><w:name w:val="표 제목"/><w:basedOn w:val="Normal"/></w:style>
   <w:style w:type="paragraph" w:styleId="Heading1"><w:name w:val="heading 1"/><w:basedOn w:val="Normal"/><w:pPr><w:keepNext/><w:outlineLvl w:val="0"/></w:pPr><w:rPr><w:b/><w:sz w:val="44"/><w:szCs w:val="44"/></w:rPr></w:style>
   <w:style w:type="paragraph" w:styleId="Heading2"><w:name w:val="heading 2"/><w:basedOn w:val="Normal"/><w:pPr><w:keepNext/><w:outlineLvl w:val="1"/></w:pPr><w:rPr><w:b/><w:sz w:val="36"/><w:szCs w:val="36"/></w:rPr></w:style>
   <w:style w:type="paragraph" w:styleId="Heading3"><w:name w:val="heading 3"/><w:basedOn w:val="Normal"/><w:pPr><w:keepNext/><w:outlineLvl w:val="2"/></w:pPr><w:rPr><w:b/><w:sz w:val="28"/><w:szCs w:val="28"/></w:rPr></w:style>
@@ -447,9 +481,13 @@ function encodeContent(
 
 function encodeParaInner(para: ParaNode, ctx: EncCtx): string {
   const align = para.props.align ?? "left";
-  const headStyle = para.props.heading
-    ? `<w:pStyle w:val="Heading${para.props.heading}"/>`
-    : "";
+  // P3: hwpStyleId(숫자 ID) 우선, 없으면 heading 스타일, 둘 다 없으면 빈 문자열
+  let headStyle = "";
+  if (para.props.hwpStyleId !== undefined) {
+    headStyle = `<w:pStyle w:val="${para.props.hwpStyleId}"/>`;
+  } else if (para.props.heading) {
+    headStyle = `<w:pStyle w:val="Heading${para.props.heading}"/>`;
+  }
 
   // List numbering
   let numPr = "";
@@ -506,6 +544,11 @@ function encodeParaInner(para: ParaNode, ctx: EncCtx): string {
     .map((k) => {
       if (k.tag === "span") return encodeRun(k, ctx);
       if (k.tag === "img") return encodeImage(k, ctx);
+      // P9: PageNumNode가 para.kids에 직접 있는 경우 (머리말/꼬리말 등)
+      if (k.tag === "pagenum") {
+        const instr = k.format === "total" ? " NUMPAGES " : " PAGE ";
+        return `<w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText>${instr}</w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>1</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r>`;
+      }
       return "";
     })
     .join("");
@@ -548,8 +591,10 @@ function encodeRun(span: SpanNode, _ctx: EncCtx): string {
         );
       }
     } else if (kid.tag === "pagenum") {
+      // P9: format === 'total' → NUMPAGES 필드, 나머지 → PAGE 필드
+      const instr = kid.format === "total" ? " NUMPAGES " : " PAGE ";
       parts.push(
-        `<w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:instrText> PAGE </w:instrText></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:t>1</w:t></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="end"/></w:r>`,
+        `<w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:instrText>${instr}</w:instrText></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:t>1</w:t></w:r><w:r><w:rPr>${rPr.join("")}</w:rPr><w:fldChar w:fldCharType="end"/></w:r>`,
       );
     } else if (kid.tag === "br") {
       parts.push(`<w:r><w:br/></w:r>`);