kordoc 2.2.0 → 2.2.2

package/dist/index.d.cts

@@ -234,20 +234,14 @@ declare function diffBlocks(blocksA: IRBlock[], blocksB: IRBlock[]): DiffResult;
 declare function extractFormFields(blocks: IRBlock[]): FormResult;
 
 /**
- * Markdown → HWPX 역변환 (MVP)
+ * Markdown → HWPX 역변환
  *
- * 지원: 단락, 헤딩, 테이블 (텍스트+구조만, 스타일 없음)
+ * 지원: 헤딩(h1~h6), 단락, 볼드, 이탤릭, 인라인코드, 코드블록,
+ *       순서/비순서 리스트, 수평선, 인용문, 테이블
  * jszip으로 HWPX ZIP 패키징.
  */
 /**
  * 마크다운 텍스트를 HWPX (ArrayBuffer)로 변환.
- *
- * @example
- * ```ts
- * import { markdownToHwpx } from "kordoc"
- * const hwpxBuffer = await markdownToHwpx("# 제목\n\n본문 텍스트")
- * writeFileSync("output.hwpx", Buffer.from(hwpxBuffer))
- * ```
  */
 declare function markdownToHwpx(markdown: string): Promise<ArrayBuffer>;
 

package/dist/index.d.ts

@@ -234,20 +234,14 @@ declare function diffBlocks(blocksA: IRBlock[], blocksB: IRBlock[]): DiffResult;
 declare function extractFormFields(blocks: IRBlock[]): FormResult;
 
 /**
- * Markdown → HWPX 역변환 (MVP)
+ * Markdown → HWPX 역변환
  *
- * 지원: 단락, 헤딩, 테이블 (텍스트+구조만, 스타일 없음)
+ * 지원: 헤딩(h1~h6), 단락, 볼드, 이탤릭, 인라인코드, 코드블록,
+ *       순서/비순서 리스트, 수평선, 인용문, 테이블
  * jszip으로 HWPX ZIP 패키징.
  */
 /**
  * 마크다운 텍스트를 HWPX (ArrayBuffer)로 변환.
- *
- * @example
- * ```ts
- * import { markdownToHwpx } from "kordoc"
- * const hwpxBuffer = await markdownToHwpx("# 제목\n\n본문 텍스트")
- * writeFileSync("output.hwpx", Buffer.from(hwpxBuffer))
- * ```
  */
 declare function markdownToHwpx(markdown: string): Promise<ArrayBuffer>;
 

package/dist/index.js

@@ -139,7 +139,7 @@ import { inflateRawSync } from "zlib";
 import { DOMParser } from "@xmldom/xmldom";
 
 // src/utils.ts
-var VERSION = true ? "2.2.0" : "0.0.0-dev";
+var VERSION = true ? "2.2.2" : "0.0.0-dev";
 function toArrayBuffer(buf) {
   if (buf.byteOffset === 0 && buf.byteLength === buf.buffer.byteLength) {
     return buf.buffer;
@@ -328,9 +328,12 @@ function trimAndReturn(grid, numRows, maxCols) {
 }
 function convertTableToText(rows) {
   return rows.map(
-    (row) => row.map((c) => c.text.trim().replace(/\n/g, " ")).filter(Boolean).join(" | ")
+    (row) => row.map((c) => c.text.trim().replace(/\n/g, " ").replace(/\|/g, "\\|")).filter(Boolean).join(" / ")
   ).filter(Boolean).join("\n");
 }
+function escapeGfm(text) {
+  return text.replace(/~/g, "\\~");
+}
 var HWP_SHAPE_ALT_TEXT_RE = /(?:모서리가 둥근 |둥근 )?(?:사각형|직사각형|정사각형|원|타원|삼각형|이등변 삼각형|직각 삼각형|선|직선|곡선|화살표|굵은 화살표|이중 화살표|오각형|육각형|팔각형|별|[4-8]점별|십자|십자형|구름|구름형|마름모|도넛|평행사변형|사다리꼴|부채꼴|호|반원|물결|번개|하트|빗금|블록 화살표|수식|표|그림|개체|그리기\s?개체|묶음\s?개체|글상자|수식\s?개체|OLE\s?개체)\s?입니다\.?/g;
 function sanitizeText(text) {
   let result = text.replace(/[\u{F0000}-\u{FFFFD}]/gu, "").replace(HWP_SHAPE_ALT_TEXT_RE, "").replace(/  +/g, " ").trim();
@@ -440,7 +443,7 @@ function blocksToMarkdown(blocks) {
       if (block.footnoteText) {
         text += ` (\uC8FC: ${block.footnoteText})`;
       }
-      lines.push(text);
+      lines.push(escapeGfm(text), "");
     } else if (block.type === "table" && block.table) {
       if (lines.length > 0 && lines[lines.length - 1] !== "") {
         lines.push("");
@@ -463,13 +466,13 @@ function tableToMarkdown(table) {
     return content.split(/\n/).map((line) => {
       const trimmed = line.trim();
       if (!trimmed) return "";
-      if (/^\d+\.\s/.test(trimmed)) return `**${trimmed}**`;
-      if (/^[가-힣]\.\s/.test(trimmed)) return `  ${trimmed}`;
-      return trimmed;
+      if (/^\d+\.\s/.test(trimmed)) return `**${escapeGfm(trimmed)}**`;
+      if (/^[가-힣]\.\s/.test(trimmed)) return `  ${escapeGfm(trimmed)}`;
+      return escapeGfm(trimmed);
     }).filter(Boolean).join("\n");
   }
   if (numCols === 1 && numRows >= 2) {
-    return cells.map((row) => sanitizeText(row[0].text).replace(/\n/g, " ")).filter(Boolean).join("\n");
+    return cells.map((row) => escapeGfm(sanitizeText(row[0].text)).replace(/\n/g, " ")).filter(Boolean).join("\n");
   }
   const display = Array.from({ length: numRows }, () => Array(numCols).fill(""));
   const skip = /* @__PURE__ */ new Set();
@@ -478,7 +481,7 @@ function tableToMarkdown(table) {
       if (skip.has(`${r},${c}`)) continue;
       const cell = cells[r]?.[c];
       if (!cell) continue;
-      display[r][c] = sanitizeText(cell.text).replace(/\n/g, "<br>");
+      display[r][c] = escapeGfm(sanitizeText(cell.text)).replace(/\|/g, "\\|").replace(/\n/g, "<br>");
       for (let dr = 0; dr < cell.rowSpan; dr++) {
         for (let dc = 0; dc < cell.colSpan; dc++) {
           if (dr === 0 && dc === 0) continue;
@@ -6258,6 +6261,23 @@ var NS_HEAD = "http://www.hancom.co.kr/hwpml/2011/head";
 var NS_OPF = "http://www.idpf.org/2007/opf/";
 var NS_HPF = "http://www.hancom.co.kr/schema/2011/hpf";
 var NS_OCF = "urn:oasis:names:tc:opendocument:xmlns:container";
+var CHAR_NORMAL = 0;
+var CHAR_BOLD = 1;
+var CHAR_ITALIC = 2;
+var CHAR_BOLD_ITALIC = 3;
+var CHAR_CODE = 4;
+var CHAR_H1 = 5;
+var CHAR_H2 = 6;
+var CHAR_H3 = 7;
+var CHAR_H4 = 8;
+var PARA_NORMAL = 0;
+var PARA_H1 = 1;
+var PARA_H2 = 2;
+var PARA_H3 = 3;
+var PARA_H4 = 4;
+var PARA_CODE = 5;
+var PARA_QUOTE = 6;
+var PARA_LIST = 7;
 async function markdownToHwpx(markdown) {
   const blocks = parseMarkdownToBlocks(markdown);
   const sectionXml = blocksToSectionXml(blocks);
@@ -6279,6 +6299,25 @@ function parseMarkdownToBlocks(md) {
       i++;
       continue;
     }
+    const fenceMatch = line.match(/^(`{3,}|~{3,})(.*)$/);
+    if (fenceMatch) {
+      const fence = fenceMatch[1];
+      const lang = fenceMatch[2].trim();
+      const codeLines = [];
+      i++;
+      while (i < lines.length && !lines[i].startsWith(fence)) {
+        codeLines.push(lines[i]);
+        i++;
+      }
+      if (i < lines.length) i++;
+      blocks.push({ type: "code_block", text: codeLines.join("\n"), lang });
+      continue;
+    }
+    if (/^(\*{3,}|-{3,}|_{3,})\s*$/.test(line.trim())) {
+      blocks.push({ type: "hr" });
+      i++;
+      continue;
+    }
     const headingMatch = line.match(/^(#{1,6})\s+(.+)$/);
     if (headingMatch) {
       blocks.push({ type: "heading", text: headingMatch[2].trim(), level: headingMatch[1].length });
@@ -6297,19 +6336,101 @@ function parseMarkdownToBlocks(md) {
         if (cells.length > 0) tableRows.push(cells);
         i++;
       }
-      if (tableRows.length > 0) {
-        blocks.push({ type: "table", rows: tableRows });
+      if (tableRows.length > 0) blocks.push({ type: "table", rows: tableRows });
+      continue;
+    }
+    if (line.trimStart().startsWith("> ")) {
+      const quoteLines = [];
+      while (i < lines.length && (lines[i].trimStart().startsWith("> ") || lines[i].trimStart().startsWith(">"))) {
+        quoteLines.push(lines[i].replace(/^>\s?/, ""));
+        i++;
+      }
+      for (const ql of quoteLines) {
+        blocks.push({ type: "blockquote", text: ql.trim() || "" });
       }
       continue;
     }
+    const listMatch = line.match(/^(\s*)([-*+]|\d+[.)]) (.+)$/);
+    if (listMatch) {
+      const indent = Math.floor(listMatch[1].length / 2);
+      const ordered = /\d/.test(listMatch[2]);
+      blocks.push({ type: "list_item", text: listMatch[3].trim(), ordered, indent });
+      i++;
+      continue;
+    }
     blocks.push({ type: "paragraph", text: line.trim() });
     i++;
   }
   return blocks;
 }
+function parseInlineMarkdown(text) {
+  text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, "$1");
+  text = text.replace(/\[([^\]]*)\]\(([^)]*)\)/g, (_, t, u) => t || u);
+  text = text.replace(/~~([^~]+)~~/g, "$1");
+  const spans = [];
+  const regex = /(`[^`]+`|\*{3}[^*]+\*{3}|\*{2}[^*]+\*{2}|\*[^*]+\*|_{2}[^_]+_{2}|_[^_]+_)/g;
+  let lastIdx = 0;
+  for (const match of text.matchAll(regex)) {
+    const idx = match.index;
+    if (idx > lastIdx) {
+      spans.push({ text: text.slice(lastIdx, idx), bold: false, italic: false, code: false });
+    }
+    const raw = match[0];
+    if (raw.startsWith("`")) {
+      spans.push({ text: raw.slice(1, -1), bold: false, italic: false, code: true });
+    } else if (raw.startsWith("***") || raw.startsWith("___")) {
+      spans.push({ text: raw.slice(3, -3), bold: true, italic: true, code: false });
+    } else if (raw.startsWith("**") || raw.startsWith("__")) {
+      spans.push({ text: raw.slice(2, -2), bold: true, italic: false, code: false });
+    } else {
+      spans.push({ text: raw.slice(1, -1), bold: false, italic: true, code: false });
+    }
+    lastIdx = idx + raw.length;
+  }
+  if (lastIdx < text.length) {
+    spans.push({ text: text.slice(lastIdx), bold: false, italic: false, code: false });
+  }
+  if (spans.length === 0) {
+    spans.push({ text, bold: false, italic: false, code: false });
+  }
+  return spans;
+}
+function spanToCharPrId(span) {
+  if (span.code) return CHAR_CODE;
+  if (span.bold && span.italic) return CHAR_BOLD_ITALIC;
+  if (span.bold) return CHAR_BOLD;
+  if (span.italic) return CHAR_ITALIC;
+  return CHAR_NORMAL;
+}
 function escapeXml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
+function generateRuns(text, defaultCharPr = CHAR_NORMAL) {
+  const spans = parseInlineMarkdown(text);
+  return spans.map((span) => {
+    const charId = span.code || span.bold || span.italic ? spanToCharPrId(span) : defaultCharPr;
+    return `<hp:run charPrIDRef="${charId}"><hp:t>${escapeXml(span.text)}</hp:t></hp:run>`;
+  }).join("");
+}
+function generateParagraph(text, paraPrId = PARA_NORMAL, charPrId = CHAR_NORMAL) {
+  if (paraPrId === PARA_CODE) {
+    return `<hp:p paraPrIDRef="${paraPrId}" styleIDRef="0"><hp:run charPrIDRef="${CHAR_CODE}"><hp:t>${escapeXml(text)}</hp:t></hp:run></hp:p>`;
+  }
+  const runs = generateRuns(text, charPrId);
+  return `<hp:p paraPrIDRef="${paraPrId}" styleIDRef="0">${runs}</hp:p>`;
+}
+function headingParaPrId(level) {
+  if (level === 1) return PARA_H1;
+  if (level === 2) return PARA_H2;
+  if (level === 3) return PARA_H3;
+  return PARA_H4;
+}
+function headingCharPrId(level) {
+  if (level === 1) return CHAR_H1;
+  if (level === 2) return CHAR_H2;
+  if (level === 3) return CHAR_H3;
+  return CHAR_H4;
+}
 function generateContainerXml() {
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <ocf:container xmlns:ocf="${NS_OCF}" xmlns:hpf="${NS_HPF}">
@@ -6331,21 +6452,50 @@ function generateManifest() {
   </opf:spine>
 </opf:package>`;
 }
+function charPr(id, height, bold, italic, fontId = 0) {
+  const boldAttr = bold ? ` bold="1"` : "";
+  const italicAttr = italic ? ` italic="1"` : "";
+  return `      <hh:charPr id="${id}" height="${height}" textColor="#000000" shadeColor="none" useFontSpace="0" useKerning="0" symMark="NONE" borderFillIDRef="0"${boldAttr}${italicAttr}>
+        <hh:fontRef hangul="${fontId}" latin="${fontId}" hanja="${fontId}" japanese="${fontId}" other="${fontId}" symbol="${fontId}" user="${fontId}"/>
+        <hh:ratio hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:spacing hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+        <hh:relSz hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:offset hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+      </hh:charPr>`;
+}
+function paraPr(id, opts = {}) {
+  const { align = "JUSTIFY", spaceBefore = 0, spaceAfter = 0, lineSpacing = 160, indent = 0 } = opts;
+  return `      <hh:paraPr id="${id}" tabPrIDRef="0" condense="0" fontLineHeight="0" snapToGrid="1" suppressLineNumbers="0" checked="0" textDir="AUTO">
+        <hh:align horizontal="${align}" vertical="BASELINE"/>
+        <hh:heading type="NONE" idRef="0" level="0"/>
+        <hh:breakSetting breakLatinWord="KEEP_WORD" breakNonLatinWord="BREAK_WORD" widowOrphan="0" keepWithNext="0" keepLines="0" pageBreakBefore="0" lineWrap="BREAK"/>
+        <hh:autoSpacing eAsianEng="0" eAsianNum="0"/>
+        <hh:margin indent="${indent}" left="0" right="0" prev="${spaceBefore}" next="${spaceAfter}"/>
+        <hh:lineSpacing type="PERCENT" value="${lineSpacing}"/>
+        <hh:border borderFillIDRef="0" offsetLeft="0" offsetRight="0" offsetTop="0" offsetBottom="0" connect="0" ignoreMargin="0"/>
+      </hh:paraPr>`;
+}
 function generateHeaderXml() {
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <hh:head xmlns:hh="${NS_HEAD}" xmlns:hp="${NS_PARA}" version="1.4" secCnt="1">
   <hh:beginNum page="1" footnote="1" endnote="1" pic="1" tbl="1" equation="1"/>
   <hh:refList>
     <hh:fontfaces itemCnt="7">
-      <hh:fontface lang="HANGUL" fontCnt="1">
+      <hh:fontface lang="HANGUL" fontCnt="2">
         <hh:font id="0" face="\uD568\uCD08\uB86C\uBC14\uD0D5" type="TTF" isEmbedded="0">
           <hh:typeInfo familyType="FCAT_GOTHIC" weight="6" proportion="4" contrast="0" strokeVariation="1" armStyle="1" letterform="1" midline="1" xHeight="1"/>
         </hh:font>
+        <hh:font id="1" face="\uD568\uCD08\uB86C\uB3CB\uC6C0" type="TTF" isEmbedded="0">
+          <hh:typeInfo familyType="FCAT_GOTHIC" weight="6" proportion="4" contrast="0" strokeVariation="1" armStyle="1" letterform="1" midline="1" xHeight="1"/>
+        </hh:font>
       </hh:fontface>
-      <hh:fontface lang="LATIN" fontCnt="1">
+      <hh:fontface lang="LATIN" fontCnt="2">
         <hh:font id="0" face="Times New Roman" type="TTF" isEmbedded="0">
           <hh:typeInfo familyType="FCAT_OLDSTYLE" weight="5" proportion="4" contrast="2" strokeVariation="0" armStyle="0" letterform="0" midline="0" xHeight="4"/>
         </hh:font>
+        <hh:font id="1" face="Consolas" type="TTF" isEmbedded="0">
+          <hh:typeInfo familyType="FCAT_MODERN" weight="5" proportion="0" contrast="0" strokeVariation="0" armStyle="0" letterform="0" midline="0" xHeight="0"/>
+        </hh:font>
       </hh:fontface>
       <hh:fontface lang="HANJA" fontCnt="1">
         <hh:font id="0" face="\uD568\uCD08\uB86C\uBC14\uD0D5" type="TTF" isEmbedded="0">
@@ -6377,34 +6527,37 @@ function generateHeaderXml() {
       <hh:borderFill id="0" threeD="0" shadow="0" centerLine="0" breakCellSeparateLine="0">
         <hh:slash type="NONE" Crooked="0" isCounter="0"/>
         <hh:backSlash type="NONE" Crooked="0" isCounter="0"/>
-        <hh:leftBorder type="NONE" width="0.1mm" color="0"/>
-        <hh:rightBorder type="NONE" width="0.1mm" color="0"/>
-        <hh:topBorder type="NONE" width="0.1mm" color="0"/>
-        <hh:bottomBorder type="NONE" width="0.1mm" color="0"/>
-        <hh:diagonal type="NONE" width="0.1mm" color="0"/>
+        <hh:leftBorder type="NONE" width="0.1mm" color="#000000"/>
+        <hh:rightBorder type="NONE" width="0.1mm" color="#000000"/>
+        <hh:topBorder type="NONE" width="0.1mm" color="#000000"/>
+        <hh:bottomBorder type="NONE" width="0.1mm" color="#000000"/>
+        <hh:diagonal type="NONE" width="0.1mm" color="#000000"/>
         <hh:fillInfo/>
       </hh:borderFill>
     </hh:borderFills>
-    <hh:charProperties itemCnt="1">
-      <hh:charPr id="0" height="1000" textColor="0" shadeColor="-1" useFontSpace="0" useKerning="0" symMark="NONE" borderFillIDRef="0">
-        <hh:fontRef hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
-        <hh:ratio hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
-        <hh:spacing hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
-        <hh:relSz hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
-        <hh:offset hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
-      </hh:charPr>
+    <hh:charProperties itemCnt="9">
+${charPr(0, 1e3, false, false)}
+${charPr(1, 1e3, true, false)}
+${charPr(2, 1e3, false, true)}
+${charPr(3, 1e3, true, true)}
+${charPr(4, 900, false, false, 1)}
+${charPr(5, 1800, true, false, 1)}
+${charPr(6, 1400, true, false, 1)}
+${charPr(7, 1200, true, false, 1)}
+${charPr(8, 1100, true, false, 1)}
     </hh:charProperties>
     <hh:tabProperties itemCnt="0"/>
     <hh:numberings itemCnt="0"/>
     <hh:bullets itemCnt="0"/>
-    <hh:paraProperties itemCnt="1">
-      <hh:paraPr id="0" tabIDRef="0" condense="0" fontLineHeight="0" snapToGrid="0" suppressOverlap="0" checked="0">
-        <hh:parLineBreak lineBreak="BREAK_LINE" wordBreak="BREAK_WORD" breakLatinWord="BREAK_WORD" breakNonLatinWord="BREAK_WORD"/>
-        <hh:parMargin left="0" right="0" prev="0" next="0" indent="0"/>
-        <hh:parBorder borderFillIDRef="0" offsetLeft="0" offsetRight="0" offsetTop="0" offsetBottom="0" connect="0" ignoreMargin="0"/>
-        <hh:parShade borderFillIDRef="0"/>
-        <hh:parTabList/>
-      </hh:paraPr>
+    <hh:paraProperties itemCnt="8">
+${paraPr(0)}
+${paraPr(1, { align: "LEFT", spaceBefore: 800, spaceAfter: 200, lineSpacing: 180 })}
+${paraPr(2, { align: "LEFT", spaceBefore: 600, spaceAfter: 150, lineSpacing: 170 })}
+${paraPr(3, { align: "LEFT", spaceBefore: 400, spaceAfter: 100, lineSpacing: 160 })}
+${paraPr(4, { align: "LEFT", spaceBefore: 300, spaceAfter: 100, lineSpacing: 160 })}
+${paraPr(5, { align: "LEFT", lineSpacing: 130, indent: 400 })}
+${paraPr(6, { align: "LEFT", lineSpacing: 150, indent: 600 })}
+${paraPr(7, { align: "LEFT", lineSpacing: 160, indent: 600 })}
     </hh:paraProperties>
     <hh:styles itemCnt="1">
       <hh:style id="0" type="PARA" name="\uBC14\uD0D5\uAE00" engName="Normal" paraPrIDRef="0" charPrIDRef="0" nextStyleIDRef="0" langIDRef="1042" lockForm="0"/>
@@ -6413,34 +6566,78 @@ function generateHeaderXml() {
   <hh:compatibleDocument targetProgram="HWP2018"/>
 </hh:head>`;
 }
-function generateParagraph(text) {
-  return `<hp:p paraPrIDRef="0" styleIDRef="0"><hp:run charPrIDRef="0"><hp:t>${escapeXml(text)}</hp:t></hp:run></hp:p>`;
+function generateSecPr() {
+  return `<hp:secPr textDirection="HORIZONTAL" spaceColumns="1134" tabStop="8000" outlineShapeIDRef="0" memoShapeIDRef="0" textVerticalWidthHead="0" masterPageCnt="0"><hp:grid lineGrid="0" charGrid="0" wonggojiFormat="0"/><hp:startNum pageStartsOn="BOTH" page="0" pic="0" tbl="0" equation="0"/><hp:visibility hideFirstHeader="0" hideFirstFooter="0" hideFirstMasterPage="0" border="SHOW_ALL" fill="SHOW_ALL" hideFirstPageNum="0" hideFirstEmptyLine="0" showLineNumber="0"/><hp:pagePr landscape="WIDELY" width="59528" height="84188" gutterType="LEFT_ONLY"><hp:margin header="2835" footer="2835" gutter="0" left="5670" right="4252" top="8504" bottom="4252"/></hp:pagePr><hp:footNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="-1" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="283" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="EACH_COLUMN" beneathText="0"/></hp:footNotePr><hp:endNotePr><hp:autoNumFormat type="DIGIT" userChar="" prefixChar="" suffixChar=")" supscript="0"/><hp:noteLine length="14692344" type="SOLID" width="0.12 mm" color="#000000"/><hp:noteSpacing betweenNotes="0" belowLine="567" aboveLine="850"/><hp:numbering type="CONTINUOUS" newNum="1"/><hp:placement place="END_OF_DOCUMENT" beneathText="0"/></hp:endNotePr></hp:secPr>`;
 }
 function generateTable(rows) {
   const trElements = rows.map((row) => {
-    const tdElements = row.map(
-      (cell) => `<hp:tc><hp:cellSpan colSpan="1" rowSpan="1"/>${generateParagraph(cell)}</hp:tc>`
-    ).join("");
+    const tdElements = row.map((cell) => {
+      const runs = generateRuns(cell);
+      return `<hp:tc><hp:cellSpan colSpan="1" rowSpan="1"/><hp:p paraPrIDRef="0" styleIDRef="0">${runs}</hp:p></hp:tc>`;
+    }).join("");
     return `<hp:tr>${tdElements}</hp:tr>`;
   }).join("");
   return `<hp:tbl>${trElements}</hp:tbl>`;
 }
 function blocksToSectionXml(blocks) {
-  const body = blocks.map((block) => {
+  const paraXmls = [];
+  let isFirst = true;
+  for (const block of blocks) {
+    let xml = "";
     switch (block.type) {
-      case "heading":
-        return generateParagraph(block.text || "");
-      case "table":
-        return block.rows ? generateTable(block.rows) : "";
+      case "heading": {
+        const pId = headingParaPrId(block.level || 1);
+        const cId = headingCharPrId(block.level || 1);
+        xml = generateParagraph(block.text || "", pId, cId);
+        break;
+      }
       case "paragraph":
-        return generateParagraph(block.text || "");
-      default:
-        return "";
+        xml = generateParagraph(block.text || "");
+        break;
+      case "code_block": {
+        const codeLines = (block.text || "").split("\n");
+        xml = codeLines.map((line) => generateParagraph(line || " ", PARA_CODE)).join("\n  ");
+        break;
+      }
+      case "blockquote":
+        xml = generateParagraph(block.text || "", PARA_QUOTE);
+        break;
+      case "list_item": {
+        const marker = block.ordered ? `${(block.indent || 0) + 1}. ` : "\xB7 ";
+        const indentPrefix = "  ".repeat(block.indent || 0);
+        xml = generateParagraph(indentPrefix + marker + (block.text || ""), PARA_LIST);
+        break;
+      }
+      case "hr":
+        xml = `<hp:p paraPrIDRef="0" styleIDRef="0"><hp:run charPrIDRef="0"><hp:t>\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500</hp:t></hp:run></hp:p>`;
+        break;
+      case "table":
+        if (block.rows) {
+          if (isFirst) {
+            const secRun = `<hp:run charPrIDRef="0">${generateSecPr()}<hp:t></hp:t></hp:run>`;
+            paraXmls.push(`<hp:p paraPrIDRef="0" styleIDRef="0">${secRun}</hp:p>`);
+            isFirst = false;
+          }
+          xml = generateTable(block.rows);
+        }
+        break;
     }
-  }).join("\n  ");
+    if (!xml) continue;
+    if (isFirst && block.type !== "table") {
+      xml = xml.replace(
+        /<hp:run charPrIDRef="(\d+)">/,
+        `<hp:run charPrIDRef="$1">${generateSecPr()}`
+      );
+      isFirst = false;
+    }
+    paraXmls.push(xml);
+  }
+  if (paraXmls.length === 0) {
+    paraXmls.push(`<hp:p paraPrIDRef="0" styleIDRef="0"><hp:run charPrIDRef="0">${generateSecPr()}<hp:t></hp:t></hp:run></hp:p>`);
+  }
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <hs:sec xmlns:hs="${NS_SECTION}" xmlns:hp="${NS_PARA}">
-  ${body}
+  ${paraXmls.join("\n  ")}
 </hs:sec>`;
 }