@masumdev/markforge 0.2.3 → 0.2.5

package/dist/{App-DKCNXX3Z.mjs → App-GNRUPFM7.mjs}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-NGC2ZAWZ.mjs";
 import {
   DEFAULT_CONFIG
-} from "./chunk-ASXSHC6H.mjs";
+} from "./chunk-IYGPJIK5.mjs";
 import "./chunk-YZHGBG4N.mjs";
 
 // src/ui/App.tsx
@@ -22,7 +22,8 @@ import { Box as Box4 } from "ink";
 // src/ui/Header.tsx
 import { Box, Text } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
-var Header = ({ inputFile, theme = "default" }) => {
+var Header = ({ inputFile, theme = "corporate" }) => {
+  const themeLabel = typeof theme === "object" ? "custom (ThemeProps)" : String(theme || "corporate");
   return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginY: 1, children: /* @__PURE__ */ jsxs(
     Box,
     {
@@ -45,7 +46,7 @@ var Header = ({ inputFile, theme = "default" }) => {
         ] }),
         /* @__PURE__ */ jsxs(Box, { children: [
           /* @__PURE__ */ jsx(Text, { color: "gray", children: "Theme:  " }),
-          /* @__PURE__ */ jsx(Text, { color: "blue", children: theme })
+          /* @__PURE__ */ jsx(Text, { color: "blue", children: themeLabel })
         ] })
       ]
     }
@@ -649,6 +650,51 @@ var SYNTAX_COLORS_LIGHT = {
   plain: "24292E"
   // Near-black        — identifiers
 };
+var SYNTAX_THEMES = {
+  "github-dark": SYNTAX_COLORS,
+  "dark": SYNTAX_COLORS,
+  "github-light": SYNTAX_COLORS_LIGHT,
+  "light": SYNTAX_COLORS_LIGHT,
+  "dracula": {
+    keyword: "FF79C6",
+    string: "F1FA8C",
+    comment: "6272A4",
+    number: "BD93F9",
+    boolean: "BD93F9",
+    function: "50FA7B",
+    type: "8BE9FD",
+    operator: "FF79C6",
+    punctuation: "F8F8F2",
+    plain: "F8F8F2"
+  },
+  "monokai": {
+    keyword: "F92672",
+    string: "E6DB74",
+    comment: "75715E",
+    number: "AE81FF",
+    boolean: "AE81FF",
+    function: "A6E22E",
+    type: "66D9EF",
+    operator: "F92672",
+    punctuation: "F8F8F2",
+    plain: "F8F8F2"
+  },
+  "nord": {
+    keyword: "81A1C1",
+    string: "A3BE8C",
+    comment: "616E88",
+    number: "B48EAD",
+    boolean: "81A1C1",
+    function: "88C0D0",
+    type: "8FBCBB",
+    operator: "81A1C1",
+    punctuation: "ECEFF4",
+    plain: "D8DEE9"
+  }
+};
+function getSyntaxPalette(themeName = "github-dark") {
+  return SYNTAX_THEMES[themeName.toLowerCase()] || SYNTAX_THEMES["github-dark"];
+}
 var JS_KEYWORDS = /* @__PURE__ */ new Set([
   "import",
   "from",
@@ -792,9 +838,9 @@ var SQL_KEYWORDS = /* @__PURE__ */ new Set([
   "foreign",
   "references"
 ]);
-function tokenizeCodeLine(line, lang = "", theme = "dark") {
+function tokenizeCodeLine(line, lang = "", theme = "github-dark") {
   var _a;
-  const COLORS = theme === "light" ? SYNTAX_COLORS_LIGHT : SYNTAX_COLORS;
+  const COLORS = getSyntaxPalette(theme);
   if (!line) {
     return [{ text: " ", type: "plain", colorHex: COLORS.plain }];
   }
@@ -877,6 +923,10 @@ function tokenizeCodeLine(line, lang = "", theme = "dark") {
         tokens.push({ text: word, type: "keyword", colorHex: COLORS.keyword, bold: true });
         continue;
       }
+      if (/^[A-Z][a-zA-Z0-9_$]*$/.test(word)) {
+        tokens.push({ text: word, type: "type", colorHex: COLORS.type });
+        continue;
+      }
       let nextNonWs = pos;
       while (nextNonWs < line.length && /\s/.test(line[nextNonWs])) {
         nextNonWs++;
@@ -885,10 +935,6 @@ function tokenizeCodeLine(line, lang = "", theme = "dark") {
         tokens.push({ text: word, type: "function", colorHex: COLORS.function });
         continue;
       }
-      if (/^[A-Z][a-zA-Z0-9_$]*$/.test(word)) {
-        tokens.push({ text: word, type: "type", colorHex: COLORS.type });
-        continue;
-      }
       tokens.push({ text: word, type: "plain", colorHex: COLORS.plain });
       continue;
     }
@@ -901,10 +947,10 @@ function tokenizeCodeLine(line, lang = "", theme = "dark") {
   }
   return tokens;
 }
-function highlightCodeToHtml(code, lang = "") {
+function highlightCodeToHtml(code, lang = "", theme = "github-dark") {
   const lines = (code || "").split("\n");
   const htmlLines = lines.map((line) => {
-    const tokens = tokenizeCodeLine(line, lang);
+    const tokens = tokenizeCodeLine(line, lang, theme);
     return tokens.map((t) => {
       const escaped = t.text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
       if (t.type === "plain") return escaped;
@@ -1013,7 +1059,7 @@ hr { border: none; border-top: 1px solid var(--mf-border); margin: 2rem 0; }
   pre { overflow: visible; white-space: pre-wrap; word-break: break-all; }
 }
 `;
-var THEME_DEFAULT = `
+var THEME_CORPORATE = `
 :root {
   --mf-bg: #ffffff;
   --mf-text: #0f172a;
@@ -1025,49 +1071,266 @@ var THEME_DEFAULT = `
   --mf-card-bg: #f8fafc;
   --mf-code-bg: #0f172a;
   --mf-code-text: #f8fafc;
-  --mf-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+  --mf-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
   --mf-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
 }
 body { background-color: var(--mf-bg); color: var(--mf-text); font-family: var(--mf-font-family); font-size: 15px; line-height: 1.65; margin: 0; padding: 2.5rem; }
-.document-container { max-width: 860px; margin: 0 auto; }
+.document-container { max-width: 860px; margin: 0 auto; position: relative; z-index: 1; }
 h1, h2, h3, h4, h5, h6 { color: var(--mf-text); font-weight: 700; margin-top: 1.8rem; margin-bottom: 0.8rem; line-height: 1.25; }
-h1 { font-size: 2.2rem; border-bottom: 2px solid #33CDCF; padding-bottom: 0.5rem; }
-h2 { font-size: 1.6rem; color: #009DA0; border-bottom: 1px solid #CCFBF1; padding-bottom: 0.4rem; }
+h1 { font-size: 2.2rem; border-bottom: 2px solid var(--mf-primary); padding-bottom: 0.5rem; }
+h2 { font-size: 1.6rem; color: var(--mf-primary-dark); border-bottom: 1px solid #CCFBF1; padding-bottom: 0.4rem; }
 h3 { font-size: 1.3rem; }
 h4 { font-size: 1.1rem; }
 p  { margin: 0.8rem 0; }
 `;
-var THEME_ACADEMIC = `
+var THEMES = {
+  corporate: THEME_CORPORATE,
+  default: THEME_CORPORATE
+};
+function generateThemeCss(theme) {
+  if (!theme || theme === "corporate" || theme === "default" || theme === "corporate" /* CORPORATE */) {
+    return THEME_CORPORATE;
+  }
+  if (typeof theme === "object") {
+    const bg = theme.backgroundColor || "#ffffff";
+    const text = theme.textColor || "#0f172a";
+    const textMuted = theme.textMuted || "#64748b";
+    const primary = theme.primaryColor || "#33CDCF";
+    const primaryDark = theme.primaryDark || primary;
+    const primaryLight = theme.primaryLight || "#ECFDFD";
+    const border = theme.borderColor || "#e2e8f0";
+    const cardBg = theme.cardBackground || "#f8fafc";
+    const codeBg = theme.codeBackground || "#0f172a";
+    const codeText = theme.codeText || "#f8fafc";
+    const font = theme.fontFamily || "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif";
+    const fontMono = theme.fontMono || "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace";
+    return `
 :root {
-  --mf-bg: #ffffff;
-  --mf-text: #1a1a1a;
-  --mf-text-muted: #555;
-  --mf-primary: #33CDCF;
-  --mf-primary-dark: #009DA0;
-  --mf-primary-light: #ECFDFD;
-  --mf-border: #ccc;
-  --mf-card-bg: #f9f9f9;
-  --mf-code-bg: #1e1e1e;
-  --mf-code-text: #d4d4d4;
-  --mf-font-family: "Merriweather", "Georgia", "Times New Roman", serif;
-  --mf-font-mono: "Courier New", Courier, monospace;
+  --mf-bg: ${bg};
+  --mf-text: ${text};
+  --mf-text-muted: ${textMuted};
+  --mf-primary: ${primary};
+  --mf-primary-dark: ${primaryDark};
+  --mf-primary-light: ${primaryLight};
+  --mf-border: ${border};
+  --mf-card-bg: ${cardBg};
+  --mf-code-bg: ${codeBg};
+  --mf-code-text: ${codeText};
+  --mf-font-family: ${font};
+  --mf-font-mono: ${fontMono};
 }
-body { font-family: var(--mf-font-family); font-size: 16px; line-height: 1.8; padding: 3rem; color: var(--mf-text); }
-.document-container { max-width: 780px; margin: 0 auto; text-align: justify; }
-h1, h2, h3 { font-family: "Times New Roman", Times, serif; font-weight: bold; text-align: left; }
-h1 { font-size: 2rem; border-bottom: 1px solid #000; padding-bottom: 0.3rem; }
-h2 { font-size: 1.4rem; border-bottom: 1px solid #ccc; padding-bottom: 0.2rem; }
-h3 { font-size: 1.2rem; }
-p  { margin: 0.9rem 0; }
+body { background-color: var(--mf-bg); color: var(--mf-text); font-family: var(--mf-font-family); font-size: 15px; line-height: 1.65; margin: 0; padding: 2.5rem; }
+.document-container { max-width: 860px; margin: 0 auto; position: relative; z-index: 1; }
+h1, h2, h3, h4, h5, h6 { color: var(--mf-text); font-weight: 700; margin-top: 1.8rem; margin-bottom: 0.8rem; line-height: 1.25; }
+h1 { font-size: 2.2rem; border-bottom: 2px solid var(--mf-primary); padding-bottom: 0.5rem; }
+h2 { font-size: 1.6rem; color: var(--mf-primary-dark); border-bottom: 1px solid var(--mf-border); padding-bottom: 0.4rem; }
+h3 { font-size: 1.3rem; }
+h4 { font-size: 1.1rem; }
+p  { margin: 0.8rem 0; }
+${theme.customCss || ""}
 `;
-var THEMES = {
-  default: THEME_DEFAULT,
-  academic: THEME_ACADEMIC,
-  github: THEME_DEFAULT,
-  corporate: THEME_DEFAULT,
-  minimal: THEME_DEFAULT,
-  dracula: THEME_DEFAULT
+  }
+  if (typeof theme === "string" && THEMES[theme]) {
+    return THEMES[theme];
+  }
+  return THEME_CORPORATE;
+}
+
+// src/config/resolveConfig.ts
+var PAPER_DIMENSIONS_TWIP = {
+  A4: { width: 11906, height: 16838 },
+  // 210mm x 297mm
+  Letter: { width: 12240, height: 15840 },
+  // 8.5in x 11in
+  Legal: { width: 12240, height: 20160 },
+  // 8.5in x 14in
+  A3: { width: 16838, height: 23811 },
+  // 297mm x 420mm
+  A5: { width: 8390, height: 11906 }
+  // 148mm x 210mm
 };
+function parseMarginToTwip(margin, defaultTwip = 1440) {
+  if (typeof margin === "number") return margin;
+  if (!margin) return defaultTwip;
+  const str = margin.trim().toLowerCase();
+  if (str.endsWith("cm")) {
+    const cm = parseFloat(str);
+    return isNaN(cm) ? defaultTwip : Math.round(cm * 566.929);
+  }
+  if (str.endsWith("mm")) {
+    const mm = parseFloat(str);
+    return isNaN(mm) ? defaultTwip : Math.round(mm * 56.6929);
+  }
+  if (str.endsWith("in") || str.endsWith("inch")) {
+    const inch = parseFloat(str);
+    return isNaN(inch) ? defaultTwip : Math.round(inch * 1440);
+  }
+  if (str.endsWith("pt")) {
+    const pt = parseFloat(str);
+    return isNaN(pt) ? defaultTwip : Math.round(pt * 20);
+  }
+  const val = parseFloat(str);
+  return isNaN(val) ? defaultTwip : Math.round(val);
+}
+function formatMarginCss(margin, defaultCss = "2.5cm") {
+  if (margin === void 0 || margin === null) return defaultCss;
+  if (typeof margin === "number") return `${margin}pt`;
+  const str = margin.trim();
+  if (!str) return defaultCss;
+  if (/^[0-9.]+$/.test(str)) return `${str}pt`;
+  return str;
+}
+function replaceDocumentTokens(template = "", meta) {
+  return template.replace(/\{title\}/gi, meta.title || "").replace(/\{subtitle\}/gi, meta.subtitle || "").replace(/\{author\}/gi, meta.author || "").replace(/\{version\}/gi, meta.version || "").replace(/\{date\}/gi, meta.date || "").replace(/\{company\}/gi, meta.company || "");
+}
+function normalizeWatermark(rawWatermark) {
+  if (!rawWatermark) {
+    return void 0;
+  }
+  if (typeof rawWatermark === "string") {
+    const text = rawWatermark.trim();
+    if (!text) return void 0;
+    return {
+      text,
+      color: "#94a3b8",
+      opacity: 0.08,
+      fontSize: 54,
+      rotate: -45,
+      position: "diagonal"
+    };
+  }
+  if (typeof rawWatermark === "object") {
+    if (!rawWatermark.text || !rawWatermark.text.trim()) return void 0;
+    return {
+      text: rawWatermark.text.trim(),
+      color: rawWatermark.color || "#94a3b8",
+      opacity: typeof rawWatermark.opacity === "number" ? rawWatermark.opacity : 0.08,
+      fontSize: rawWatermark.fontSize || 54,
+      rotate: typeof rawWatermark.rotate === "number" ? rawWatermark.rotate : -45,
+      position: rawWatermark.position || "diagonal"
+    };
+  }
+  return void 0;
+}
+function normalizeHeaderFooterSlot(rawSlot, parent, meta) {
+  if (!rawSlot) return void 0;
+  if (typeof rawSlot === "string") {
+    const text = replaceDocumentTokens(rawSlot, meta).trim();
+    if (!text) return void 0;
+    return {
+      text,
+      color: (parent == null ? void 0 : parent.color) || "#94A3B8",
+      fontSize: (parent == null ? void 0 : parent.size) || 9,
+      fontFamily: (parent == null ? void 0 : parent.font) || "Segoe UI",
+      bold: false,
+      italic: false
+    };
+  }
+  if (typeof rawSlot === "object") {
+    const text = replaceDocumentTokens(rawSlot.text || "", meta).trim();
+    if (!text) return void 0;
+    return {
+      text,
+      color: rawSlot.color || (parent == null ? void 0 : parent.color) || "#94A3B8",
+      fontSize: rawSlot.fontSize || (parent == null ? void 0 : parent.size) || 9,
+      fontFamily: rawSlot.fontFamily || (parent == null ? void 0 : parent.font) || "Segoe UI",
+      bold: Boolean(rawSlot.bold),
+      italic: Boolean(rawSlot.italic)
+    };
+  }
+  return void 0;
+}
+function normalizeHeaderFooter(raw, meta) {
+  if (!raw) return void 0;
+  const left = normalizeHeaderFooterSlot(raw.left, raw, meta);
+  const center = normalizeHeaderFooterSlot(raw.center, raw, meta);
+  const right = normalizeHeaderFooterSlot(raw.right, raw, meta);
+  if (!left && !center && !right) return void 0;
+  return {
+    left,
+    center,
+    right,
+    font: raw.font || "Segoe UI",
+    size: raw.size || 9,
+    color: raw.color || "#94A3B8",
+    divider: Boolean(raw.divider),
+    dividerColor: raw.dividerColor || "#E2E8F0"
+  };
+}
+function resolveDocumentConfig(frontmatter = {}, userConfig = {}) {
+  const configMeta = userConfig.metadata || {};
+  const mergedMeta = { ...configMeta, ...frontmatter };
+  const title = mergedMeta.title || "MarkForge Document";
+  const subtitle = mergedMeta.subtitle || void 0;
+  const author = Array.isArray(mergedMeta.author) ? mergedMeta.author.join(", ") : mergedMeta.author || void 0;
+  const date = mergedMeta.date || void 0;
+  const version = mergedMeta.version || void 0;
+  const company = mergedMeta.company || void 0;
+  const lang = mergedMeta.lang || "en";
+  const tokenContext = { title, subtitle, author, version, date, company };
+  const theme = mergedMeta.theme || userConfig.theme || DEFAULT_CONFIG.theme;
+  const orientation = mergedMeta.orientation || userConfig.orientation || DEFAULT_CONFIG.orientation;
+  const paperSize = mergedMeta.paperSize || userConfig.paperSize || DEFAULT_CONFIG.paperSize;
+  const baseDim = PAPER_DIMENSIONS_TWIP[paperSize] || PAPER_DIMENSIONS_TWIP.A4;
+  const paperDimensions = orientation === "landscape" ? { widthTwip: baseDim.height, heightTwip: baseDim.width } : { widthTwip: baseDim.width, heightTwip: baseDim.height };
+  const fmMargin = mergedMeta.margins || {};
+  const cfgMargin = userConfig.margins || {};
+  const defMargin = DEFAULT_CONFIG.margins || {};
+  const topRaw = fmMargin.top ?? cfgMargin.top ?? defMargin.top ?? "2.5cm";
+  const bottomRaw = fmMargin.bottom ?? cfgMargin.bottom ?? defMargin.bottom ?? "2.5cm";
+  const leftRaw = fmMargin.left ?? cfgMargin.left ?? defMargin.left ?? "2.5cm";
+  const rightRaw = fmMargin.right ?? cfgMargin.right ?? defMargin.right ?? "2.5cm";
+  const margins = {
+    top: formatMarginCss(topRaw),
+    bottom: formatMarginCss(bottomRaw),
+    left: formatMarginCss(leftRaw),
+    right: formatMarginCss(rightRaw),
+    topTwip: parseMarginToTwip(topRaw),
+    bottomTwip: parseMarginToTwip(bottomRaw),
+    leftTwip: parseMarginToTwip(leftRaw),
+    rightTwip: parseMarginToTwip(rightRaw)
+  };
+  const rawHeader = mergedMeta.header || userConfig.header || DEFAULT_CONFIG.header;
+  const rawFooter = mergedMeta.footer || userConfig.footer || DEFAULT_CONFIG.footer;
+  const header = normalizeHeaderFooter(rawHeader, tokenContext);
+  const footer = normalizeHeaderFooter(rawFooter, tokenContext);
+  const toc = typeof mergedMeta.toc === "boolean" ? mergedMeta.toc : typeof userConfig.toc === "boolean" ? userConfig.toc : DEFAULT_CONFIG.toc;
+  const rawWatermark = mergedMeta.watermark !== void 0 ? mergedMeta.watermark : userConfig.watermark !== void 0 ? userConfig.watermark : DEFAULT_CONFIG.watermark;
+  const watermark = normalizeWatermark(rawWatermark);
+  const cssList = [];
+  const addCss = (item) => {
+    if (!item) return;
+    if (Array.isArray(item)) cssList.push(...item);
+    else cssList.push(item);
+  };
+  addCss(userConfig.css);
+  addCss(mergedMeta.css);
+  const embedImages = typeof userConfig.embedImages === "boolean" ? userConfig.embedImages : DEFAULT_CONFIG.embedImages;
+  const bundleHtml = typeof userConfig.bundleHtml === "boolean" ? userConfig.bundleHtml : DEFAULT_CONFIG.bundleHtml;
+  const syntaxTheme = userConfig.syntaxTheme || DEFAULT_CONFIG.syntaxTheme || "github-dark";
+  return {
+    title,
+    subtitle,
+    author,
+    date,
+    version,
+    company,
+    lang,
+    theme,
+    orientation,
+    paperSize,
+    paperDimensions,
+    margins,
+    header,
+    footer,
+    toc,
+    watermark,
+    css: cssList,
+    embedImages,
+    bundleHtml,
+    syntaxTheme
+  };
+}
 
 // src/core/html/htmlBuilder.ts
 function escapeHtml(str) {
@@ -1120,43 +1383,41 @@ async function renderInlinesToHtml(spans = [], baseDir = process.cwd()) {
   return result;
 }
 async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
-  var _a;
-  const metadata = { ...config.metadata, ...doc.metadata };
-  const themeName = metadata.theme || config.theme || "default";
-  const baseThemeCss = THEMES[themeName] || THEMES.default;
+  const resolved = resolveDocumentConfig(doc.metadata, config);
+  const baseThemeCss = generateThemeCss(resolved.theme);
   let customCss = "";
-  if (config.css) {
-    const cssList = Array.isArray(config.css) ? config.css : [config.css];
-    for (const cssPath of cssList) {
-      const fullCssPath = path2.isAbsolute(cssPath) ? cssPath : path2.resolve(baseDir, cssPath);
-      if (fs2.existsSync(fullCssPath)) {
-        customCss += `
+  for (const cssPath of resolved.css) {
+    const fullCssPath = path2.isAbsolute(cssPath) ? cssPath : path2.resolve(baseDir, cssPath);
+    if (fs2.existsSync(fullCssPath)) {
+      customCss += `
 /* Custom CSS: ${cssPath} */
 ` + fs2.readFileSync(fullCssPath, "utf-8");
-      }
     }
   }
   const inlinedCss = doc.inlinedStyles.join("\n");
   let bodyHtml = "";
-  if (metadata.title) {
+  if (resolved.title) {
     bodyHtml += `  <header class="document-header">
 `;
-    bodyHtml += `    <h1 class="document-title">${escapeHtml(metadata.title)}</h1>
+    bodyHtml += `    <h1 class="document-title">${escapeHtml(resolved.title)}</h1>
 `;
-    if (metadata.subtitle) {
-      bodyHtml += `    <div class="document-subtitle">${escapeHtml(metadata.subtitle)}</div>
+    if (resolved.subtitle) {
+      bodyHtml += `    <div class="document-subtitle">${escapeHtml(resolved.subtitle)}</div>
 `;
     }
-    if (metadata.author || metadata.date) {
+    if (resolved.author || resolved.date || resolved.version) {
       bodyHtml += `    <div class="document-meta">
 `;
-      if (metadata.author) {
-        const authors = Array.isArray(metadata.author) ? metadata.author.join(", ") : metadata.author;
-        bodyHtml += `      <span>Author: ${escapeHtml(authors)}</span>
+      if (resolved.author) {
+        bodyHtml += `      <span>Author: ${escapeHtml(resolved.author)}</span>
+`;
+      }
+      if (resolved.version) {
+        bodyHtml += `      <span>Version: ${escapeHtml(resolved.version)}</span>
 `;
       }
-      if (metadata.date) {
-        bodyHtml += `      <span>Date: ${escapeHtml(metadata.date)}</span>
+      if (resolved.date) {
+        bodyHtml += `      <span>Date: ${escapeHtml(resolved.date)}</span>
 `;
       }
       bodyHtml += `    </div>
@@ -1165,22 +1426,20 @@ async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
     bodyHtml += `  </header>
 `;
   }
-  if (config.toc || metadata.toc) {
-    if (doc.tocEntries.length > 0) {
-      bodyHtml += `  <nav class="table-of-contents">
+  if (resolved.toc && doc.tocEntries.length > 0) {
+    bodyHtml += `  <nav class="table-of-contents">
 `;
-      bodyHtml += `    <h2>Table of Contents</h2>
+    bodyHtml += `    <h2>Table of Contents</h2>
     <ul>
 `;
-      for (const entry of doc.tocEntries) {
-        const indent = "  ".repeat(entry.level);
-        bodyHtml += `    ${indent}<li><a href="#${entry.id}">${escapeHtml(entry.text)}</a></li>
+    for (const entry of doc.tocEntries) {
+      const indent = "  ".repeat(entry.level);
+      bodyHtml += `    ${indent}<li><a href="#${entry.id}">${escapeHtml(entry.text)}</a></li>
 `;
-      }
-      bodyHtml += `    </ul>
+    }
+    bodyHtml += `    </ul>
   </nav>
 `;
-    }
   }
   for (const node of doc.nodes) {
     if (node.type === "heading") {
@@ -1198,7 +1457,7 @@ async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
     if (node.type === "codeBlock") {
       const lang = node.language || "";
       const langClass = lang ? ` class="language-${escapeHtml(lang)}"` : "";
-      const highlighted = highlightCodeToHtml(node.text || "", lang);
+      const highlighted = highlightCodeToHtml(node.text || "", lang, resolved.syntaxTheme);
       bodyHtml += `  <pre><code${langClass}>${highlighted}</code></pre>
 `;
       continue;
@@ -1242,15 +1501,12 @@ ${escapeHtml(node.text || "")}
       for (const row of node.children) {
         bodyHtml += `    <tr>
 `;
-        if (row.children) {
-          for (let colIdx = 0; colIdx < row.children.length; colIdx++) {
-            const cell = row.children[colIdx];
-            const tag = row.isHeader ? "th" : "td";
-            const align = ((_a = node.align) == null ? void 0 : _a[colIdx]) ? ` style="text-align: ${node.align[colIdx]}"` : "";
-            const cellInner = await renderInlinesToHtml(cell.inlines, baseDir);
-            bodyHtml += `      <${tag}${align}>${cellInner}</${tag}>
+        for (const cell of row.children || []) {
+          const tag = cell.isHeader ? "th" : "td";
+          const align = cell.align ? ` align="${cell.align}"` : "";
+          const inner = await renderInlinesToHtml(cell.inlines, baseDir);
+          bodyHtml += `      <${tag}${align}>${inner}</${tag}>
 `;
-          }
         }
         bodyHtml += `    </tr>
 `;
@@ -1264,57 +1520,52 @@ ${escapeHtml(node.text || "")}
       bodyHtml += `  <${tag}>
 `;
       for (const item of node.children) {
-        const itemInner = await renderInlinesToHtml(item.inlines, baseDir);
-        let prefix = "";
-        if (item.checked !== void 0) {
-          prefix = `<input type="checkbox" disabled ${item.checked ? "checked" : ""}/> `;
-        }
-        bodyHtml += `    <li>${prefix}${itemInner}</li>
+        const inner = await renderInlinesToHtml(item.inlines, baseDir);
+        bodyHtml += `    <li>${inner}</li>
 `;
       }
       bodyHtml += `  </${tag}>
 `;
       continue;
     }
-    if (node.type === "htmlBlock") {
-      bodyHtml += `  ${node.rawHtml}
+    if (node.type === "thematicBreak") {
+      bodyHtml += `  <hr />
 `;
       continue;
     }
-    if (node.type === "thematicBreak") {
-      bodyHtml += `  <hr />
+    if (node.type === "htmlBlock") {
+      bodyHtml += `  ${node.text}
 `;
       continue;
     }
   }
-  const wmConfig = config.watermark ?? metadata.watermark;
-  let watermarkHtml = "";
   let watermarkCss = "";
-  if (wmConfig) {
-    const wmText = typeof wmConfig === "string" ? wmConfig : wmConfig.text;
-    const opacity = typeof wmConfig === "object" && wmConfig.opacity !== void 0 ? wmConfig.opacity : 0.12;
-    const rotate = typeof wmConfig === "object" && wmConfig.rotate !== void 0 ? wmConfig.rotate : -45;
-    const color = typeof wmConfig === "object" && wmConfig.color ? wmConfig.color : "#94A3B8";
-    const fontSize = typeof wmConfig === "object" && wmConfig.fontSize ? `${wmConfig.fontSize}pt` : "52pt";
+  let watermarkHtml = "";
+  if (resolved.watermark) {
+    const wm = resolved.watermark;
     watermarkCss = `
   .document-watermark {
     position: fixed;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, -50%) rotate(${rotate}deg);
-    font-size: ${fontSize};
-    font-weight: 800;
-    color: ${color};
-    opacity: ${opacity};
+    transform: translate(-50%, -50%) rotate(${wm.rotate}deg);
+    font-size: ${wm.fontSize}pt;
+    font-weight: 900;
+    color: ${wm.color};
+    opacity: ${wm.opacity};
     pointer-events: none;
+    z-index: 0;
     user-select: none;
-    z-index: 9999;
     text-transform: uppercase;
     letter-spacing: 0.15em;
     white-space: nowrap;
   }
+  .document-container {
+    position: relative;
+    z-index: 1;
+  }
   `;
-    watermarkHtml = `  <div class="document-watermark">${escapeHtml(wmText)}</div>
+    watermarkHtml = `  <div class="document-watermark">${escapeHtml(wm.text)}</div>
 `;
   }
   const hasMermaid = doc.nodes.some((n) => n.type === "mermaid");
@@ -1333,13 +1584,12 @@ ${escapeHtml(node.text || "")}
       }
     });
   </script>` : "";
-  const documentTitle = metadata.title || "MarkForge Document";
   return `<!DOCTYPE html>
-<html lang="${metadata.lang || "en"}">
+<html lang="${resolved.lang}">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>${escapeHtml(documentTitle)}</title>
+  <title>${escapeHtml(resolved.title)}</title>
   <style>
 ${THEME_COMPONENTS}
 ${baseThemeCss}
@@ -1383,14 +1633,14 @@ function findChromeExecutable() {
     "/Applications/Chromium.app/Contents/MacOS/Chromium",
     "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
     "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
+    // Windows — Microsoft Edge (Native Windows 10/11 browser, enterprise whitelist friendly)
+    `${winProgramFiles}\\Microsoft\\Edge\\Application\\msedge.exe`,
+    `${winProgramFilesX86}\\Microsoft\\Edge\\Application\\msedge.exe`,
+    `${winLocalAppData}\\Microsoft\\Edge\\Application\\msedge.exe`,
     // Windows — Google Chrome
     `${winProgramFiles}\\Google\\Chrome\\Application\\chrome.exe`,
     `${winProgramFilesX86}\\Google\\Chrome\\Application\\chrome.exe`,
     `${winLocalAppData}\\Google\\Chrome\\Application\\chrome.exe`,
-    // Windows — Microsoft Edge (ships with Windows 10/11)
-    `${winProgramFiles}\\Microsoft\\Edge\\Application\\msedge.exe`,
-    `${winProgramFilesX86}\\Microsoft\\Edge\\Application\\msedge.exe`,
-    `${winLocalAppData}\\Microsoft\\Edge\\Application\\msedge.exe`,
     // Windows — Brave Browser
     `${winProgramFiles}\\BraveSoftware\\Brave-Browser\\Application\\brave.exe`,
     `${winProgramFilesX86}\\BraveSoftware\\Brave-Browser\\Application\\brave.exe`,
@@ -1421,22 +1671,50 @@ function findChromeExecutable() {
   return null;
 }
 function injectPagedMediaStyles(html, config, metadata) {
-  var _a, _b, _c, _d;
-  const merged = { ...config.metadata, ...metadata };
-  const orientation = merged.orientation || config.orientation || "portrait";
-  const size = merged.paperSize || config.paperSize || "A4";
-  const margins = merged.margins || config.margins || {};
-  const top = margins.top || ((_a = config.margins) == null ? void 0 : _a.top) || "2.5cm";
-  const bottom = margins.bottom || ((_b = config.margins) == null ? void 0 : _b.bottom) || "2.5cm";
-  const left = margins.left || ((_c = config.margins) == null ? void 0 : _c.left) || "2.5cm";
-  const right = margins.right || ((_d = config.margins) == null ? void 0 : _d.right) || "2.5cm";
-  const headerCfg = merged.header;
-  const footerCfg = merged.footer;
-  const headerLeft = (headerCfg == null ? void 0 : headerCfg.left) ?? "";
-  const headerCenter = (headerCfg == null ? void 0 : headerCfg.center) ?? "";
-  const headerRight = (headerCfg == null ? void 0 : headerCfg.right) ?? "";
-  const footerLeft = ((footerCfg == null ? void 0 : footerCfg.left) ?? "").replace("{page}", "").replace("{pages}", "").trim();
-  const esc = (s) => s.replace(/"/g, '"').replace(/\\/g, "\\\\");
+  var _a, _b, _c, _d, _e, _f;
+  const resolved = resolveDocumentConfig(metadata || {}, config);
+  const size = resolved.paperSize;
+  const orientation = resolved.orientation;
+  const top = resolved.margins.top;
+  const bottom = resolved.margins.bottom;
+  const left = resolved.margins.left;
+  const right = resolved.margins.right;
+  const esc = (s) => s.replace(/"/g, '\\"').replace(/\\/g, "\\\\");
+  const buildZoneCss = (pos, zone, isPageCounter = false) => {
+    if (!zone && !isPageCounter) return "";
+    const color = (zone == null ? void 0 : zone.color) || "#94a3b8";
+    const fontSize = (zone == null ? void 0 : zone.fontSize) ? `${zone.fontSize}pt` : "9pt";
+    const fontFamily = (zone == null ? void 0 : zone.fontFamily) ? `font-family: ${zone.fontFamily};` : "";
+    const fontWeight = (zone == null ? void 0 : zone.bold) ? "font-weight: bold;" : "";
+    const fontStyle = (zone == null ? void 0 : zone.italic) ? "font-style: italic;" : "";
+    let content = "";
+    if (isPageCounter) {
+      if ((zone == null ? void 0 : zone.text) && (zone.text.includes("{page}") || zone.text.includes("{pages}"))) {
+        const parts = zone.text.split(/(\{page\}|\{pages\})/gi);
+        const cssParts = parts.map((part) => {
+          if (part.toLowerCase() === "{page}") return "counter(page)";
+          if (part.toLowerCase() === "{pages}") return "counter(pages)";
+          return `"${esc(part)}"`;
+        });
+        content = cssParts.join(" ");
+      } else if (zone == null ? void 0 : zone.text) {
+        content = `"${esc(zone.text)}"`;
+      } else {
+        content = `"Page " counter(page) " of " counter(pages)`;
+      }
+    } else if (zone == null ? void 0 : zone.text) {
+      content = `"${esc(zone.text)}"`;
+    }
+    if (!content) return "";
+    return `@${pos} {
+      content: ${content};
+      font-size: ${fontSize};
+      color: ${color};
+      ${fontFamily}
+      ${fontWeight}
+      ${fontStyle}
+    }`;
+  };
   const pagedCss = `
   @page {
     size: ${size} ${orientation};
@@ -1444,15 +1722,12 @@ function injectPagedMediaStyles(html, config, metadata) {
     margin-bottom: ${bottom};
     margin-left: ${left};
     margin-right: ${right};
-    ${headerLeft ? `@top-left { content: "${esc(headerLeft)}"; font-size: 9pt; color: #94a3b8; }` : ""}
-    ${headerCenter ? `@top-center { content: "${esc(headerCenter)}"; font-size: 9pt; color: #94a3b8; }` : ""}
-    ${headerRight ? `@top-right { content: "${esc(headerRight)}"; font-size: 9pt; color: #94a3b8; }` : ""}
-    ${footerLeft ? `@bottom-left { content: "${esc(footerLeft)}"; font-size: 9pt; color: #94a3b8; }` : ""}
-    @bottom-right {
-      content: "Page " counter(page) " of " counter(pages);
-      font-size: 9pt;
-      color: #94a3b8;
-    }
+    ${buildZoneCss("top-left", (_a = resolved.header) == null ? void 0 : _a.left)}
+    ${buildZoneCss("top-center", (_b = resolved.header) == null ? void 0 : _b.center)}
+    ${buildZoneCss("top-right", (_c = resolved.header) == null ? void 0 : _c.right)}
+    ${buildZoneCss("bottom-left", (_d = resolved.footer) == null ? void 0 : _d.left)}
+    ${buildZoneCss("bottom-center", (_e = resolved.footer) == null ? void 0 : _e.center)}
+    ${buildZoneCss("bottom-right", (_f = resolved.footer) == null ? void 0 : _f.right, true)}
   }
   @media print {
     body { padding: 0; }
@@ -1511,6 +1786,33 @@ async function buildPdfDocument(doc, config, baseDir = process.cwd()) {
     const tmpDir = os.tmpdir();
     const tmpHtml = path3.join(tmpDir, `markforge_${tmpId}.html`);
     const tmpPdf = path3.join(tmpDir, `markforge_${tmpId}.pdf`);
+    const tmpProfile = path3.join(tmpDir, `markforge_prof_${tmpId}`);
+    const isolatedFlags = [
+      `--user-data-dir=${tmpProfile}`,
+      "--no-first-run",
+      "--no-default-browser-check",
+      "--disable-sync",
+      "--disable-background-networking",
+      "--disable-component-update",
+      "--disable-default-apps",
+      "--disable-extensions",
+      "--disable-domain-reliability",
+      "--disable-client-side-phishing-detection",
+      "--disable-breakpad",
+      "--disable-component-extensions-with-background-pages",
+      "--disable-features=Translate,OptimizationHints,MediaRouter,DialMediaRouteProvider,CalculatedNewTabPage,ChromeWhatsNewUI,PrivacySandboxSettings4",
+      "--password-store=basic",
+      "--use-mock-keychain",
+      "--mute-audio",
+      "--no-service-autorun",
+      "--disable-gpu",
+      "--no-sandbox",
+      "--disable-setuid-sandbox",
+      "--allow-file-access-from-files",
+      "--disable-web-security",
+      "--force-color-profile=srgb",
+      "--no-pdf-header-footer"
+    ];
     try {
       fs3.writeFileSync(tmpHtml, pagedHtml, "utf-8");
       const fileUrl = pathToFileURL(tmpHtml).href;
@@ -1518,15 +1820,9 @@ async function buildPdfDocument(doc, config, baseDir = process.cwd()) {
         chromePath,
         [
           "--headless=new",
-          "--disable-gpu",
-          "--no-sandbox",
-          "--disable-setuid-sandbox",
-          "--allow-file-access-from-files",
-          "--disable-web-security",
-          "--force-color-profile=srgb",
+          ...isolatedFlags,
           "--run-all-compositor-stages-before-draw",
           "--virtual-time-budget=8000",
-          "--no-pdf-header-footer",
           `--print-to-pdf=${tmpPdf}`,
           fileUrl
         ],
@@ -1537,13 +1833,7 @@ async function buildPdfDocument(doc, config, baseDir = process.cwd()) {
           chromePath,
           [
             "--headless",
-            "--disable-gpu",
-            "--no-sandbox",
-            "--disable-setuid-sandbox",
-            "--allow-file-access-from-files",
-            "--disable-web-security",
-            "--force-color-profile=srgb",
-            "--no-pdf-header-footer",
+            ...isolatedFlags,
             `--print-to-pdf=${tmpPdf}`,
             fileUrl
           ],
@@ -1559,6 +1849,7 @@ async function buildPdfDocument(doc, config, baseDir = process.cwd()) {
       try {
         if (fs3.existsSync(tmpHtml)) fs3.unlinkSync(tmpHtml);
         if (fs3.existsSync(tmpPdf)) fs3.unlinkSync(tmpPdf);
+        if (fs3.existsSync(tmpProfile)) fs3.rmSync(tmpProfile, { recursive: true, force: true });
       } catch {
       }
     }
@@ -1649,30 +1940,7 @@ ${mermaidCode}
 }
 
 // src/core/docx/docxBuilder.ts
-function parseMarginToTwip(margin, defaultTwip = 1440) {
-  if (typeof margin === "number") return margin;
-  if (!margin) return defaultTwip;
-  const str = margin.trim().toLowerCase();
-  if (str.endsWith("cm")) {
-    const cm = parseFloat(str);
-    return Math.round(convertMillimetersToTwip(cm * 10));
-  }
-  if (str.endsWith("mm")) {
-    const mm = parseFloat(str);
-    return Math.round(convertMillimetersToTwip(mm));
-  }
-  if (str.endsWith("in") || str.endsWith("inch")) {
-    const inch = parseFloat(str);
-    return Math.round(convertInchesToTwip(inch));
-  }
-  if (str.endsWith("pt")) {
-    const pt = parseFloat(str);
-    return Math.round(pt * 20);
-  }
-  const val = parseFloat(str);
-  return isNaN(val) ? defaultTwip : Math.round(val);
-}
-async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
+async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd(), options = {}) {
   const runs = [];
   for (const span of spans) {
     if (span.type === "image" && span.url) {
@@ -1702,7 +1970,10 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
             new TextRun({
               text: span.content,
               style: "Hyperlink",
-              color: "0969DA",
+              color: "009DA0",
+              font: options.font,
+              size: options.size,
+              bold: options.bold,
               underline: {}
             })
           ],
@@ -1715,7 +1986,11 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
       runs.push(
         new TextRun({
           text: span.content,
-          bold: true
+          bold: true,
+          font: options.font,
+          size: options.size,
+          color: options.color,
+          italics: options.italics
         })
       );
       continue;
@@ -1724,7 +1999,11 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
       runs.push(
         new TextRun({
           text: span.content,
-          italics: true
+          italics: true,
+          font: options.font,
+          size: options.size,
+          color: options.color,
+          bold: options.bold
         })
       );
       continue;
@@ -1733,7 +2012,10 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
       runs.push(
         new TextRun({
           text: span.content,
-          strike: true
+          strike: true,
+          font: options.font,
+          size: options.size,
+          color: options.color
         })
       );
       continue;
@@ -1741,22 +2023,23 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
     if (span.type === "code") {
       runs.push(
         new TextRun({
-          text: ` ${span.content} `,
+          text: span.content,
           font: "Consolas",
+          size: options.size ? options.size - 2 : 19,
+          color: "0F172A",
           shading: {
             type: ShadingType.CLEAR,
-            fill: "F1F5F9",
-            color: "0F172A"
+            fill: "F1F5F9"
           }
         })
       );
       continue;
     }
     if (span.type === "htmlInline") {
-      let colorHex;
+      let colorHex = options.color;
       let bgHex;
-      let isBold = false;
-      let isItalic = false;
+      let isBold = !!options.bold;
+      let isItalic = !!options.italics;
       if (span.style) {
         if (span.style.color) {
           colorHex = span.style.color.replace("#", "").trim();
@@ -1772,13 +2055,9 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
         }
       }
       if (span.children && span.children.length > 0) {
-        const childRuns = await convertInlinesToTextRuns(span.children, baseDir);
+        const childRuns = await convertInlinesToTextRuns(span.children, baseDir, options);
         for (const child of childRuns) {
-          if (child instanceof TextRun) {
-            runs.push(child);
-          } else {
-            runs.push(child);
-          }
+          runs.push(child);
         }
         continue;
       }
@@ -1788,6 +2067,8 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
           color: colorHex,
           bold: isBold,
           italics: isItalic,
+          font: options.font,
+          size: options.size,
           shading: bgHex ? { type: ShadingType.CLEAR, fill: bgHex } : void 0
         })
       );
@@ -1795,91 +2076,239 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd()) {
     }
     runs.push(
       new TextRun({
-        text: span.content
+        text: span.content,
+        font: options.font,
+        size: options.size,
+        color: options.color,
+        bold: options.bold,
+        italics: options.italics
       })
     );
   }
   return runs;
 }
 async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-  const metadata = { ...config.metadata, ...doc.metadata };
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const resolved = resolveDocumentConfig(doc.metadata, config);
   const docElements = [];
-  if (metadata.title) {
+  const themeProps = typeof resolved.theme === "object" ? resolved.theme : {};
+  const primaryHex = (themeProps.primaryColor || "#33CDCF").replace("#", "");
+  const primaryDarkHex = (themeProps.primaryDark || "#009DA0").replace("#", "");
+  const textHex = (themeProps.textColor || "#0F172A").replace("#", "");
+  const textMutedHex = (themeProps.textMuted || "#64748B").replace("#", "");
+  const borderHex = (themeProps.borderColor || "#E2E8F0").replace("#", "");
+  const cardBgHex = (themeProps.cardBackground || "#F8FAFC").replace("#", "");
+  const defaultFont = themeProps.fontFamily ? themeProps.fontFamily.split(",")[0].replace(/['"]/g, "").trim() : "Segoe UI";
+  if (resolved.title) {
     docElements.push(
       new Paragraph({
-        text: metadata.title,
-        heading: HeadingLevel.TITLE,
-        spacing: { before: 200, after: 120 }
+        children: [
+          new TextRun({
+            text: resolved.title,
+            bold: true,
+            size: 44,
+            // 22pt
+            color: textHex,
+            font: defaultFont
+          })
+        ],
+        spacing: { before: 120, after: 80 }
       })
     );
-    if (metadata.subtitle) {
+    if (resolved.subtitle) {
       docElements.push(
         new Paragraph({
           children: [
             new TextRun({
-              text: metadata.subtitle,
-              italics: true,
-              color: "64748B",
-              size: 24
+              text: resolved.subtitle,
+              color: textMutedHex,
+              size: 24,
               // 12pt
+              font: defaultFont
             })
           ],
-          spacing: { after: 180 }
+          spacing: { before: 60, after: 120 }
         })
       );
     }
-    if (metadata.author || metadata.date) {
+    if (resolved.author || resolved.date || resolved.version || resolved.company) {
       const metaParts = [];
-      if (metadata.author) metaParts.push(`Author: ${Array.isArray(metadata.author) ? metadata.author.join(", ") : metadata.author}`);
-      if (metadata.date) metaParts.push(`Date: ${metadata.date}`);
+      if (resolved.author) metaParts.push(`Author: ${resolved.author}`);
+      if (resolved.version) metaParts.push(`Version: ${resolved.version}`);
+      if (resolved.date) metaParts.push(`Date: ${resolved.date}`);
       docElements.push(
         new Paragraph({
           children: [
             new TextRun({
-              text: metaParts.join("  |  "),
-              color: "94A3B8",
-              size: 20
-              // 10pt
+              text: metaParts.join("    "),
+              color: textMutedHex,
+              size: 18,
+              // 9pt
+              font: defaultFont
             })
           ],
-          spacing: { after: 360 },
+          spacing: { before: 40, after: 240 },
           border: {
             bottom: {
-              color: "E2E8F0",
-              space: 10,
+              color: borderHex,
+              space: 12,
               style: BorderStyle.SINGLE,
-              size: 6
+              size: 4
             }
           }
         })
       );
     }
   }
-  for (const node of doc.nodes) {
-    if (node.type === "heading") {
-      let headingLevel = HeadingLevel.HEADING_1;
-      if (node.level === 2) headingLevel = HeadingLevel.HEADING_2;
-      if (node.level === 3) headingLevel = HeadingLevel.HEADING_3;
-      if (node.level === 4) headingLevel = HeadingLevel.HEADING_4;
-      if (node.level === 5) headingLevel = HeadingLevel.HEADING_5;
-      if (node.level === 6) headingLevel = HeadingLevel.HEADING_6;
-      const runs = await convertInlinesToTextRuns(node.inlines, baseDir);
-      docElements.push(
+  if (resolved.toc) {
+    const headingNodes = doc.nodes.filter(
+      (n) => n.type === "heading" && typeof n.level === "number" && n.level >= 1 && n.level <= 3
+    );
+    if (headingNodes.length > 0) {
+      const tocParagraphs = [
         new Paragraph({
-          heading: headingLevel,
-          children: runs,
-          spacing: { before: 240, after: 120 }
+          children: [
+            new TextRun({
+              text: "TABLE OF CONTENTS",
+              bold: true,
+              size: 18,
+              // 9pt
+              color: textMutedHex,
+              font: defaultFont
+            })
+          ],
+          spacing: { after: 120 },
+          border: {
+            bottom: {
+              color: borderHex,
+              space: 6,
+              style: BorderStyle.SINGLE,
+              size: 4
+            }
+          }
         })
-      );
+      ];
+      for (const h of headingNodes) {
+        const indentLeft = (h.level - 1) * 240;
+        tocParagraphs.push(
+          new Paragraph({
+            indent: { left: indentLeft },
+            children: [
+              new TextRun({
+                text: h.text,
+                bold: h.level === 1,
+                color: primaryDarkHex,
+                size: h.level === 1 ? 21 : 20,
+                font: defaultFont
+              })
+            ],
+            spacing: { before: 20, after: 20 }
+          })
+        );
+      }
+      const tocCard = new Table({
+        width: { size: 100, type: WidthType.PERCENTAGE },
+        columnWidths: [9e3],
+        rows: [
+          new TableRow({
+            children: [
+              new TableCell({
+                width: { size: 9e3, type: WidthType.DXA },
+                shading: { fill: cardBgHex, type: ShadingType.CLEAR },
+                margins: { top: 140, bottom: 140, left: 180, right: 180 },
+                borders: {
+                  top: { style: BorderStyle.SINGLE, size: 4, color: borderHex },
+                  bottom: { style: BorderStyle.SINGLE, size: 4, color: borderHex },
+                  left: { style: BorderStyle.SINGLE, size: 4, color: borderHex },
+                  right: { style: BorderStyle.SINGLE, size: 4, color: borderHex }
+                },
+                children: tocParagraphs
+              })
+            ]
+          })
+        ]
+      });
+      docElements.push(tocCard);
+      docElements.push(new Paragraph({ spacing: { after: 200 } }));
+    }
+  }
+  for (const node of doc.nodes) {
+    if (node.type === "heading") {
+      if (node.level === 1) {
+        const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+          font: defaultFont,
+          size: 34,
+          // 17pt
+          color: textHex,
+          bold: true
+        });
+        docElements.push(
+          new Paragraph({
+            heading: HeadingLevel.HEADING_1,
+            children: runs,
+            spacing: { before: 360, after: 140 },
+            border: {
+              bottom: {
+                color: primaryHex,
+                space: 6,
+                style: BorderStyle.SINGLE,
+                size: 16
+              }
+            }
+          })
+        );
+      } else if (node.level === 2) {
+        const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+          font: defaultFont,
+          size: 26,
+          // 13pt
+          color: primaryDarkHex,
+          bold: true
+        });
+        docElements.push(
+          new Paragraph({
+            heading: HeadingLevel.HEADING_2,
+            children: runs,
+            spacing: { before: 280, after: 100 },
+            border: {
+              bottom: {
+                color: borderHex,
+                space: 4,
+                style: BorderStyle.SINGLE,
+                size: 4
+              }
+            }
+          })
+        );
+      } else {
+        const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+          font: defaultFont,
+          size: 22,
+          // 11pt
+          color: textHex,
+          bold: true
+        });
+        docElements.push(
+          new Paragraph({
+            heading: node.level === 3 ? HeadingLevel.HEADING_3 : HeadingLevel.HEADING_4,
+            children: runs,
+            spacing: { before: 200, after: 80 }
+          })
+        );
+      }
       continue;
     }
     if (node.type === "paragraph") {
-      const runs = await convertInlinesToTextRuns(node.inlines, baseDir);
+      const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+        font: defaultFont,
+        size: 22,
+        // 11pt
+        color: "334155"
+      });
       docElements.push(
         new Paragraph({
           children: runs,
-          spacing: { before: 60, after: 140 }
+          spacing: { before: 40, after: 140, line: 280 }
         })
       );
       continue;
@@ -1951,7 +2380,11 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         bgFill = "F5F3FF";
         title = "IMPORTANT";
       }
-      const runs = await convertInlinesToTextRuns(node.inlines, baseDir);
+      const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+        font: defaultFont,
+        size: 21,
+        color: "334155"
+      });
       const calloutTable = new Table({
         width: { size: 100, type: WidthType.PERCENTAGE },
         columnWidths: [9e3],
@@ -1966,7 +2399,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
                   top: { style: BorderStyle.NONE },
                   bottom: { style: BorderStyle.NONE },
                   right: { style: BorderStyle.NONE },
-                  left: { style: BorderStyle.SINGLE, size: 16, color: borderColor }
+                  left: { style: BorderStyle.SINGLE, size: 20, color: borderColor }
                 },
                 children: [
                   new Paragraph({
@@ -1975,13 +2408,15 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
                         text: `[${title}]`,
                         bold: true,
                         color: borderColor,
+                        font: defaultFont,
                         size: 20
                       })
                     ],
-                    spacing: { after: 60 }
+                    spacing: { after: 40 }
                   }),
                   new Paragraph({
-                    children: runs
+                    children: runs,
+                    spacing: { line: 270 }
                   })
                 ]
               })
@@ -1999,17 +2434,27 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
       if (lines.length > 0) {
         for (const lineText of lines) {
           const spans = parseInlineSpans(lineText.replace(/^>\s?/, "").trim());
-          const lineRuns = await convertInlinesToTextRuns(spans, baseDir);
+          const lineRuns = await convertInlinesToTextRuns(spans, baseDir, {
+            font: defaultFont,
+            size: 21,
+            color: "475569",
+            italics: true
+          });
           quoteParagraphs.push(
             new Paragraph({
               children: lineRuns,
-              spacing: { before: 40, after: 40 }
+              spacing: { before: 20, after: 20, line: 260 }
             })
           );
         }
       } else {
-        const runs = await convertInlinesToTextRuns(node.inlines, baseDir);
-        quoteParagraphs.push(new Paragraph({ children: runs }));
+        const runs = await convertInlinesToTextRuns(node.inlines, baseDir, {
+          font: defaultFont,
+          size: 21,
+          color: "475569",
+          italics: true
+        });
+        quoteParagraphs.push(new Paragraph({ children: runs, spacing: { line: 260 } }));
       }
       const quoteTable = new Table({
         width: { size: 100, type: WidthType.PERCENTAGE },
@@ -2025,7 +2470,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
                   top: { style: BorderStyle.NONE },
                   bottom: { style: BorderStyle.NONE },
                   right: { style: BorderStyle.NONE },
-                  left: { style: BorderStyle.SINGLE, size: 12, color: "33CDCF" }
+                  left: { style: BorderStyle.SINGLE, size: 16, color: primaryHex }
                 },
                 children: quoteParagraphs
               })
@@ -2060,7 +2505,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         docElements.push(
           new Paragraph({
             children: [
-              new TextRun({ text: "[Mermaid Diagram: " + (node.text || "").slice(0, 40) + "...]", bold: true, color: "33CDCF" })
+              new TextRun({ text: "[Mermaid Diagram: " + (node.text || "").slice(0, 40) + "...]", bold: true, color: primaryHex })
             ],
             spacing: { before: 60, after: 60 }
           })
@@ -2072,8 +2517,11 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
       const tableRows = [];
       const numCols = ((_b = (_a = node.children[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) || 1;
       const colWidth = Math.floor(9e3 / numCols);
-      for (const rowNode of node.children) {
+      for (let rowIdx = 0; rowIdx < node.children.length; rowIdx++) {
+        const rowNode = node.children[rowIdx];
         const cells = [];
+        const isHeader = rowNode.isHeader;
+        const rowBg = isHeader ? "F1F5F9" : rowIdx % 2 === 0 ? "FFFFFF" : "F8FAFC";
         if (rowNode.children) {
           for (let colIdx = 0; colIdx < rowNode.children.length; colIdx++) {
             const cellNode = rowNode.children[colIdx];
@@ -2081,22 +2529,27 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
             let alignment = AlignmentType.LEFT;
             if (align === "center") alignment = AlignmentType.CENTER;
             if (align === "right") alignment = AlignmentType.RIGHT;
-            const runs = await convertInlinesToTextRuns(cellNode.inlines, baseDir);
+            const runs = await convertInlinesToTextRuns(cellNode.inlines, baseDir, {
+              font: defaultFont,
+              size: 20,
+              color: isHeader ? "0F172A" : "334155",
+              bold: isHeader
+            });
             cells.push(
               new TableCell({
                 width: { size: colWidth, type: WidthType.DXA },
-                shading: rowNode.isHeader ? { fill: "F1F5F9", type: ShadingType.CLEAR } : void 0,
-                margins: { top: 100, bottom: 100, left: 120, right: 120 },
+                shading: { fill: rowBg, type: ShadingType.CLEAR },
+                margins: { top: 100, bottom: 100, left: 140, right: 140 },
                 borders: {
-                  top: { style: BorderStyle.SINGLE, size: 4, color: "CBD5E1" },
-                  bottom: { style: BorderStyle.SINGLE, size: 4, color: "CBD5E1" },
-                  left: { style: BorderStyle.SINGLE, size: 4, color: "CBD5E1" },
-                  right: { style: BorderStyle.SINGLE, size: 4, color: "CBD5E1" }
+                  top: { style: BorderStyle.SINGLE, size: 4, color: "E2E8F0" },
+                  bottom: { style: BorderStyle.SINGLE, size: isHeader ? 8 : 4, color: isHeader ? "CBD5E1" : "E2E8F0" },
+                  left: { style: BorderStyle.SINGLE, size: 4, color: "E2E8F0" },
+                  right: { style: BorderStyle.SINGLE, size: 4, color: "E2E8F0" }
                 },
                 children: [
                   new Paragraph({
                     alignment,
-                    children: rowNode.isHeader ? runs.map((r) => r instanceof TextRun ? new TextRun({ ...r, bold: true, color: "0F172A" }) : r) : runs
+                    children: runs
                   })
                 ]
               })
@@ -2105,7 +2558,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         }
         tableRows.push(
           new TableRow({
-            tableHeader: rowNode.isHeader,
+            tableHeader: isHeader,
             children: cells
           })
         );
@@ -2121,7 +2574,11 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     }
     if (node.type === "list" && node.children) {
       for (const item of node.children) {
-        const runs = await convertInlinesToTextRuns(item.inlines, baseDir);
+        const runs = await convertInlinesToTextRuns(item.inlines, baseDir, {
+          font: defaultFont,
+          size: 21,
+          color: "334155"
+        });
         let prefix = "";
         if (item.checked !== void 0) {
           prefix = item.checked ? "[X] " : "[ ] ";
@@ -2133,7 +2590,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
               ...prefix ? [new TextRun({ text: prefix, bold: true, font: "Consolas" })] : [],
               ...runs
             ],
-            spacing: { before: 40, after: 40 }
+            spacing: { before: 20, after: 20, line: 260 }
           })
         );
       }
@@ -2208,88 +2665,205 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
       continue;
     }
   }
-  const headerObj = metadata.header || config.header;
-  const footerObj = metadata.footer || config.footer;
-  const headerTabStops = [
-    { type: TabStopType.CENTER, position: 4513 },
-    { type: TabStopType.RIGHT, position: 9026 }
-  ];
-  const docHeader = headerObj ? new Header2({
+  const contentWidthTwip = Math.max(
+    1e3,
+    resolved.paperDimensions.widthTwip - resolved.margins.leftTwip - resolved.margins.rightTwip
+  );
+  const centerPos = Math.round(contentWidthTwip / 2);
+  const rightPos = contentWidthTwip;
+  const headerRuns = [];
+  if ((_d = resolved.header) == null ? void 0 : _d.left) {
+    headerRuns.push(
+      new TextRun({
+        text: resolved.header.left.text,
+        color: resolved.header.left.color.replace("#", ""),
+        size: (resolved.header.left.fontSize || 9) * 2,
+        font: resolved.header.left.fontFamily || defaultFont,
+        bold: resolved.header.left.bold,
+        italics: resolved.header.left.italic
+      })
+    );
+  }
+  headerRuns.push(new TextRun({ text: "	" }));
+  if ((_e = resolved.header) == null ? void 0 : _e.center) {
+    headerRuns.push(
+      new TextRun({
+        text: resolved.header.center.text,
+        color: resolved.header.center.color.replace("#", ""),
+        size: (resolved.header.center.fontSize || 9) * 2,
+        font: resolved.header.center.fontFamily || defaultFont,
+        bold: resolved.header.center.bold,
+        italics: resolved.header.center.italic
+      })
+    );
+  }
+  headerRuns.push(new TextRun({ text: "	" }));
+  if ((_f = resolved.header) == null ? void 0 : _f.right) {
+    headerRuns.push(
+      new TextRun({
+        text: resolved.header.right.text,
+        color: resolved.header.right.color.replace("#", ""),
+        size: (resolved.header.right.fontSize || 9) * 2,
+        font: resolved.header.right.fontFamily || defaultFont,
+        bold: resolved.header.right.bold,
+        italics: resolved.header.right.italic
+      })
+    );
+  }
+  const docHeader = resolved.header ? new Header2({
     children: [
       new Paragraph({
-        tabStops: headerTabStops,
-        children: [
-          // Left zone
-          ...headerObj.left ? [
+        tabStops: [
+          {
+            type: TabStopType.CENTER,
+            position: centerPos
+          },
+          {
+            type: TabStopType.RIGHT,
+            position: rightPos
+          }
+        ],
+        border: resolved.header.divider ? {
+          bottom: {
+            style: BorderStyle.SINGLE,
+            size: 4,
+            space: 6,
+            color: (resolved.header.dividerColor || "#CBD5E1").replace("#", "")
+          }
+        } : void 0,
+        children: headerRuns,
+        spacing: { after: 120 }
+      })
+    ]
+  }) : void 0;
+  const footerRuns = [];
+  if ((_g = resolved.footer) == null ? void 0 : _g.left) {
+    footerRuns.push(
+      new TextRun({
+        text: resolved.footer.left.text,
+        color: resolved.footer.left.color.replace("#", ""),
+        size: (resolved.footer.left.fontSize || 9) * 2,
+        font: resolved.footer.left.fontFamily || defaultFont,
+        bold: resolved.footer.left.bold,
+        italics: resolved.footer.left.italic
+      })
+    );
+  }
+  footerRuns.push(new TextRun({ text: "	" }));
+  if ((_h = resolved.footer) == null ? void 0 : _h.center) {
+    footerRuns.push(
+      new TextRun({
+        text: resolved.footer.center.text,
+        color: resolved.footer.center.color.replace("#", ""),
+        size: (resolved.footer.center.fontSize || 9) * 2,
+        font: resolved.footer.center.fontFamily || defaultFont,
+        bold: resolved.footer.center.bold,
+        italics: resolved.footer.center.italic
+      })
+    );
+  }
+  footerRuns.push(new TextRun({ text: "	" }));
+  if ((_i = resolved.footer) == null ? void 0 : _i.right) {
+    const rZone = resolved.footer.right;
+    const rColor = rZone.color.replace("#", "");
+    const rSize = (rZone.fontSize || 9) * 2;
+    const rFont = rZone.fontFamily || defaultFont;
+    const rBold = rZone.bold;
+    const rItalics = rZone.italic;
+    if (rZone.text.includes("{page}") || rZone.text.includes("{pages}")) {
+      const parts = rZone.text.split(/(\{page\}|\{pages\})/gi);
+      for (const part of parts) {
+        if (part.toLowerCase() === "{page}") {
+          footerRuns.push(
             new TextRun({
-              text: headerObj.left.replace("{title}", metadata.title || ""),
-              color: "94A3B8",
-              size: 18
+              children: [PageNumber.CURRENT],
+              color: rColor,
+              size: rSize,
+              font: rFont,
+              bold: rBold,
+              italics: rItalics
             })
-          ] : [],
-          // Center zone (tab + text)
-          ...headerObj.center ? [
-            new TextRun({ text: "	", color: "94A3B8", size: 18 }),
+          );
+        } else if (part.toLowerCase() === "{pages}") {
+          footerRuns.push(
             new TextRun({
-              text: headerObj.center.replace("{title}", metadata.title || ""),
-              color: "94A3B8",
-              size: 18
+              children: [PageNumber.TOTAL_PAGES],
+              color: rColor,
+              size: rSize,
+              font: rFont,
+              bold: rBold,
+              italics: rItalics
             })
-          ] : [],
-          // Right zone (tab + text) — skip extra tab if center already used one
-          ...headerObj.right ? [
-            new TextRun({
-              text: headerObj.left || headerObj.center ? "	" : "",
-              color: "94A3B8",
-              size: 18
-            }),
+          );
+        } else if (part) {
+          footerRuns.push(
             new TextRun({
-              text: headerObj.right.replace("{title}", metadata.title || ""),
-              color: "94A3B8",
-              size: 18
+              text: part,
+              color: rColor,
+              size: rSize,
+              font: rFont,
+              bold: rBold,
+              italics: rItalics
             })
-          ] : []
-        ]
-      })
-    ]
-  }) : void 0;
-  const docFooter = footerObj ? new Footer({
+          );
+        }
+      }
+    } else {
+      footerRuns.push(
+        new TextRun({
+          text: rZone.text,
+          color: rColor,
+          size: rSize,
+          font: rFont,
+          bold: rBold,
+          italics: rItalics
+        })
+      );
+    }
+  }
+  const docFooter = resolved.footer ? new Footer({
     children: [
       new Paragraph({
-        tabStops: headerTabStops,
-        children: [
-          // Left zone
-          ...footerObj.left ? [
-            new TextRun({
-              text: footerObj.left.replace("{page}", "").replace("{pages}", "").trim(),
-              color: "94A3B8",
-              size: 18
-            })
-          ] : [],
-          // Right zone: always includes page number if right is configured or footer exists
-          new TextRun({ text: "	", color: "94A3B8", size: 18 }),
-          new TextRun({ text: "Page ", color: "94A3B8", size: 18 }),
-          new TextRun({ children: [PageNumber.CURRENT], color: "94A3B8", size: 18 }),
-          new TextRun({ text: " of ", color: "94A3B8", size: 18 }),
-          new TextRun({ children: [PageNumber.TOTAL_PAGES], color: "94A3B8", size: 18 })
-        ]
+        tabStops: [
+          {
+            type: TabStopType.CENTER,
+            position: centerPos
+          },
+          {
+            type: TabStopType.RIGHT,
+            position: rightPos
+          }
+        ],
+        border: resolved.footer.divider ? {
+          top: {
+            style: BorderStyle.SINGLE,
+            size: 4,
+            space: 6,
+            color: (resolved.footer.dividerColor || "#CBD5E1").replace("#", "")
+          }
+        } : void 0,
+        children: footerRuns,
+        spacing: { before: 120 }
       })
     ]
   }) : void 0;
-  const topMargin = parseMarginToTwip(((_d = metadata.margins) == null ? void 0 : _d.top) || ((_e = config.margins) == null ? void 0 : _e.top), 1440);
-  const bottomMargin = parseMarginToTwip(((_f = metadata.margins) == null ? void 0 : _f.bottom) || ((_g = config.margins) == null ? void 0 : _g.bottom), 1440);
-  const leftMargin = parseMarginToTwip(((_h = metadata.margins) == null ? void 0 : _h.left) || ((_i = config.margins) == null ? void 0 : _i.left), 1440);
-  const rightMargin = parseMarginToTwip(((_j = metadata.margins) == null ? void 0 : _j.right) || ((_k = config.margins) == null ? void 0 : _k.right), 1440);
-  const isLandscape = (metadata.orientation || config.orientation) === "landscape";
+  const isLandscape = resolved.orientation === "landscape";
   const document = new Document({
     styles: {
       default: {
         document: {
           run: {
-            font: "Segoe UI",
-            size: 22,
-            // 11pt
-            color: "0F172A"
+            font: defaultFont,
+            size: 21,
+            // 10.5pt
+            color: textHex
+          },
+          paragraph: {
+            spacing: {
+              line: 276,
+              // 1.15 line spacing
+              after: 140
+            }
           }
         }
       }
@@ -2299,13 +2873,15 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         properties: {
           page: {
             size: {
+              width: resolved.paperDimensions.widthTwip,
+              height: resolved.paperDimensions.heightTwip,
               orientation: isLandscape ? PageOrientation.LANDSCAPE : PageOrientation.PORTRAIT
             },
             margin: {
-              top: topMargin,
-              bottom: bottomMargin,
-              left: leftMargin,
-              right: rightMargin,
+              top: resolved.margins.topTwip,
+              bottom: resolved.margins.bottomTwip,
+              left: resolved.margins.leftTwip,
+              right: resolved.margins.rightTwip,
               header: 720,
               footer: 720
             }