@masumdev/markforge 0.4.0 → 0.4.1

package/dist/index.mjs

@@ -189,7 +189,16 @@ function parseInlineSpans(text) {
       remaining = remaining.slice(nextSpecial);
     }
   }
-  return spans;
+  const merged = [];
+  for (const s of spans) {
+    const prev = merged[merged.length - 1];
+    if (prev && prev.type === "text" && s.type === "text") {
+      prev.content += s.content;
+    } else {
+      merged.push(s);
+    }
+  }
+  return merged;
 }
 function slugify(text) {
   return text.toLowerCase().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
@@ -201,6 +210,7 @@ function applyHeadingNumbering(nodes, tocEntries, options) {
   const counters = [0, 0, 0, 0, 0, 0];
   for (const node of nodes) {
     if (node.type === "heading" && node.level) {
+      if (node._numbered) continue;
       const lvl = node.level;
       if (lvl > depth) continue;
       if (lvl === 1 && skipH1) continue;
@@ -216,6 +226,7 @@ function applyHeadingNumbering(nodes, tocEntries, options) {
       const originalText = node.text || "";
       node.text = fullPrefix + originalText;
       node.inlines = parseInlineSpans(node.text);
+      node._numbered = true;
       const toc = tocEntries.find((t) => t.id === node.id);
       if (toc) {
         toc.text = node.text;
@@ -578,7 +589,9 @@ import {
   convertMillimetersToTwip,
   ShadingType,
   ExternalHyperlink,
-  TabStopType
+  TabStopType,
+  PageBreak,
+  NumberFormat
 } from "docx";
 
 // src/core/imageResolver.ts
@@ -1125,7 +1138,7 @@ var THEME_COMPONENTS = `
 .document-meta { font-size: 0.9rem; color: var(--mf-text-muted); display: flex; gap: 1.5rem; flex-wrap: wrap; }
 
 /* Table of Contents */
-.table-of-contents { background: var(--mf-card-bg); border: 1px solid var(--mf-border); border-radius: 8px; padding: 1.5rem 2rem; margin: 2rem 0; }
+.table-of-contents { background: var(--mf-card-bg); border: 1px solid var(--mf-border); border-radius: 8px; padding: 1.5rem 2rem; margin: 2rem 0; page-break-after: always; break-after: page; }
 .table-of-contents h2 { font-size: 1rem; text-transform: uppercase; letter-spacing: 0.08em; color: var(--mf-text-muted); margin: 0 0 1rem 0; }
 .table-of-contents ul { list-style: none; padding: 0; margin: 0; }
 .table-of-contents li { padding: 0.25rem 0; }
@@ -1198,11 +1211,13 @@ var THEME_CORPORATE = `
 }
 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; }
+h1, h2, h3, h4, h5, h6 { color: var(--mf-primary-dark); font-weight: 700; margin-top: 1.8rem; margin-bottom: 0.8rem; line-height: 1.25; }
+h1 { font-size: 2.2rem; color: var(--mf-primary-dark); border-bottom: 2.5px 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; }
+h3 { font-size: 1.3rem; color: var(--mf-primary-dark); }
+h4 { font-size: 1.1rem; color: var(--mf-primary-dark); }
+h5 { font-size: 1.0rem; color: var(--mf-primary-dark); }
+h6 { font-size: 0.9rem; color: var(--mf-primary-dark); }
 p  { margin: 0.8rem 0; }
 `;
 var THEME_DEFAULT = THEME_CORPORATE;
@@ -1244,11 +1259,13 @@ function generateThemeCss(theme) {
 }
 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; }
+h1, h2, h3, h4, h5, h6 { color: var(--mf-primary-dark); font-weight: 700; margin-top: 1.8rem; margin-bottom: 0.8rem; line-height: 1.25; }
+h1 { font-size: 2.2rem; color: var(--mf-primary-dark); border-bottom: 2.5px 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; }
+h3 { font-size: 1.3rem; color: var(--mf-primary-dark); }
+h4 { font-size: 1.1rem; color: var(--mf-primary-dark); }
+h5 { font-size: 1.0rem; color: var(--mf-primary-dark); }
+h6 { font-size: 0.9rem; color: var(--mf-primary-dark); }
 p  { margin: 0.8rem 0; }
 ${theme.customCss || ""}
 `;
@@ -1457,16 +1474,45 @@ function formatMarginCss(margin, defaultCss = "2.5cm") {
   if (/^[0-9.]+$/.test(str)) return `${str}pt`;
   return str;
 }
-function replaceDocumentTokens(template = "", meta) {
-  const currentYear = meta.year || (/* @__PURE__ */ new Date()).getFullYear().toString();
-  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(/\{year\}/gi, currentYear).replace(/\{company\}/gi, meta.company || "");
+function replaceDocumentTokens(template = "", meta = {}) {
+  if (!template) return "";
+  const currentYear = meta.year ? String(meta.year) : (/* @__PURE__ */ new Date()).getFullYear().toString();
+  const tokenMap = {
+    title: meta.title ? String(meta.title) : "",
+    subtitle: meta.subtitle ? String(meta.subtitle) : "",
+    author: meta.author ? Array.isArray(meta.author) ? meta.author.join(", ") : String(meta.author) : "",
+    version: meta.version ? String(meta.version) : "",
+    date: meta.date ? String(meta.date) : "",
+    company: meta.company ? String(meta.company) : "",
+    year: currentYear
+  };
+  if (meta.metadata && typeof meta.metadata === "object") {
+    for (const [key, val] of Object.entries(meta.metadata)) {
+      if (val !== void 0 && val !== null) {
+        tokenMap[key.toLowerCase()] = String(val);
+      }
+    }
+  }
+  for (const [key, val] of Object.entries(meta)) {
+    if (val !== void 0 && val !== null && typeof val !== "object") {
+      tokenMap[key.toLowerCase()] = String(val);
+    }
+  }
+  return template.replace(/\{([a-zA-Z0-9_\-]+)\}/gi, (match, tokenKey) => {
+    const lowerKey = tokenKey.toLowerCase();
+    if (lowerKey in tokenMap) {
+      return tokenMap[lowerKey];
+    }
+    return match;
+  });
 }
-function normalizeWatermark(rawWatermark) {
+function normalizeWatermark(rawWatermark, tokens) {
   if (!rawWatermark) {
     return void 0;
   }
   if (typeof rawWatermark === "string") {
-    const text = rawWatermark.trim();
+    let text = rawWatermark.trim();
+    if (tokens) text = replaceDocumentTokens(text, tokens);
     if (!text) return void 0;
     return {
       text,
@@ -1479,8 +1525,10 @@ function normalizeWatermark(rawWatermark) {
   }
   if (typeof rawWatermark === "object") {
     if (!rawWatermark.text || !rawWatermark.text.trim()) return void 0;
+    let text = rawWatermark.text.trim();
+    if (tokens) text = replaceDocumentTokens(text, tokens);
     return {
-      text: rawWatermark.text.trim(),
+      text,
       color: rawWatermark.color || "#94a3b8",
       opacity: typeof rawWatermark.opacity === "number" ? rawWatermark.opacity : 0.08,
       fontSize: rawWatermark.fontSize || 54,
@@ -1601,27 +1649,46 @@ function normalizeCoverPage(rawCover, tokenCtx = {}) {
   const cfg = typeof rawCover === "object" ? rawCover : {};
   if (cfg.enabled === false) return void 0;
   const preset = cfg.preset || "modern";
-  const title = cfg.title ? replaceDocumentTokens(String(cfg.title), tokenCtx) : tokenCtx.title || "Document Title";
-  const subtitle = cfg.subtitle ? replaceDocumentTokens(String(cfg.subtitle), tokenCtx) : tokenCtx.subtitle;
-  const author = Array.isArray(cfg.author) ? cfg.author.join(", ") : cfg.author ? replaceDocumentTokens(String(cfg.author), tokenCtx) : tokenCtx.author;
-  const company = cfg.company ? replaceDocumentTokens(String(cfg.company), tokenCtx) : tokenCtx.company;
-  const version = cfg.version ? replaceDocumentTokens(String(cfg.version), tokenCtx) : tokenCtx.version;
+  const title = cfg.title ? replaceDocumentTokens(String(cfg.title), tokenCtx) : tokenCtx.title ? String(tokenCtx.title) : "Document Title";
+  const subtitle = cfg.subtitle ? replaceDocumentTokens(String(cfg.subtitle), tokenCtx) : tokenCtx.subtitle ? String(tokenCtx.subtitle) : void 0;
+  const author = Array.isArray(cfg.author) ? cfg.author.join(", ") : cfg.author ? replaceDocumentTokens(String(cfg.author), tokenCtx) : tokenCtx.author ? String(tokenCtx.author) : void 0;
+  const company = cfg.company ? replaceDocumentTokens(String(cfg.company), tokenCtx) : tokenCtx.company ? String(tokenCtx.company) : void 0;
+  const version = cfg.version ? replaceDocumentTokens(String(cfg.version), tokenCtx) : tokenCtx.version ? String(tokenCtx.version) : void 0;
   let dateStr;
   if (typeof cfg.date === "string") {
     dateStr = replaceDocumentTokens(cfg.date, tokenCtx);
   } else if (cfg.date === true) {
-    dateStr = tokenCtx.date || (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+    dateStr = tokenCtx.date ? String(tokenCtx.date) : (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   } else {
-    dateStr = tokenCtx.date;
+    dateStr = tokenCtx.date ? String(tokenCtx.date) : void 0;
   }
   const badge = cfg.badge ? replaceDocumentTokens(String(cfg.badge), tokenCtx) : void 0;
   const badgeColor = typeof cfg.badgeColor === "string" ? cfg.badgeColor : void 0;
   const badgeTextColor = typeof cfg.badgeTextColor === "string" ? cfg.badgeTextColor : void 0;
   const logo = typeof cfg.logo === "string" ? cfg.logo : void 0;
   const logoWidth = cfg.logoWidth;
-  const bgGradient = typeof cfg.bgGradient === "string" ? cfg.bgGradient : void 0;
+  const bgGradient = typeof cfg.bgGradient === "string" ? cfg.bgGradient : typeof cfg.backgroundColor === "string" ? cfg.backgroundColor : void 0;
+  const backgroundColor = typeof cfg.backgroundColor === "string" ? cfg.backgroundColor : void 0;
   const textColor = typeof cfg.textColor === "string" ? cfg.textColor : void 0;
+  const titleColor = typeof cfg.titleColor === "string" ? cfg.titleColor : void 0;
+  const subtitleColor = typeof cfg.subtitleColor === "string" ? cfg.subtitleColor : void 0;
+  const accentColor = typeof cfg.accentColor === "string" ? cfg.accentColor : void 0;
   const footerText = cfg.footerText ? replaceDocumentTokens(String(cfg.footerText), tokenCtx) : void 0;
+  const address = cfg.address ? replaceDocumentTokens(String(cfg.address), tokenCtx) : void 0;
+  const email = cfg.email ? replaceDocumentTokens(String(cfg.email), tokenCtx) : void 0;
+  const phone = cfg.phone ? replaceDocumentTokens(String(cfg.phone), tokenCtx) : void 0;
+  const website = cfg.website ? replaceDocumentTokens(String(cfg.website), tokenCtx) : void 0;
+  let socialMap;
+  if (cfg.social && typeof cfg.social === "object") {
+    socialMap = {};
+    for (const [k, v] of Object.entries(cfg.social)) {
+      if (typeof v === "string") {
+        socialMap[k] = replaceDocumentTokens(v, tokenCtx);
+      }
+    }
+  }
+  const currentYear = (/* @__PURE__ */ new Date()).getFullYear().toString();
+  const copyright = cfg.copyright ? replaceDocumentTokens(String(cfg.copyright), { ...tokenCtx, year: currentYear }) : void 0;
   return {
     enabled: true,
     preset,
@@ -1637,8 +1704,18 @@ function normalizeCoverPage(rawCover, tokenCtx = {}) {
     logo,
     logoWidth,
     bgGradient,
+    backgroundColor,
     textColor,
-    footerText
+    titleColor,
+    subtitleColor,
+    accentColor,
+    footerText,
+    address,
+    email,
+    phone,
+    website,
+    social: socialMap,
+    copyright
   };
 }
 function normalizeBackCover(rawBack, tokenCtx = {}) {
@@ -1648,7 +1725,10 @@ function normalizeBackCover(rawBack, tokenCtx = {}) {
   const preset = cfg.preset || "modern";
   const title = cfg.title ? replaceDocumentTokens(String(cfg.title), tokenCtx) : "Thank You";
   const subtitle = cfg.subtitle ? replaceDocumentTokens(String(cfg.subtitle), tokenCtx) : void 0;
-  const company = cfg.company ? replaceDocumentTokens(String(cfg.company), tokenCtx) : tokenCtx.company;
+  const author = Array.isArray(cfg.author) ? cfg.author.join(", ") : cfg.author ? replaceDocumentTokens(String(cfg.author), tokenCtx) : tokenCtx.author ? String(tokenCtx.author) : void 0;
+  const company = cfg.company ? replaceDocumentTokens(String(cfg.company), tokenCtx) : tokenCtx.company ? String(tokenCtx.company) : void 0;
+  const version = cfg.version ? replaceDocumentTokens(String(cfg.version), tokenCtx) : tokenCtx.version ? String(tokenCtx.version) : void 0;
+  const date = typeof cfg.date === "string" ? replaceDocumentTokens(cfg.date, tokenCtx) : tokenCtx.date ? String(tokenCtx.date) : void 0;
   const address = cfg.address ? replaceDocumentTokens(String(cfg.address), tokenCtx) : void 0;
   const email = cfg.email ? replaceDocumentTokens(String(cfg.email), tokenCtx) : void 0;
   const phone = cfg.phone ? replaceDocumentTokens(String(cfg.phone), tokenCtx) : void 0;
@@ -1664,32 +1744,45 @@ function normalizeBackCover(rawBack, tokenCtx = {}) {
   }
   const currentYear = (/* @__PURE__ */ new Date()).getFullYear().toString();
   const copyright = cfg.copyright ? replaceDocumentTokens(String(cfg.copyright), { ...tokenCtx, year: currentYear }) : company ? `Copyright (c) ${currentYear} ${company}. All Rights Reserved.` : void 0;
+  const footerText = cfg.footerText ? replaceDocumentTokens(String(cfg.footerText), tokenCtx) : void 0;
   const badge = cfg.badge ? replaceDocumentTokens(String(cfg.badge), tokenCtx) : void 0;
   const badgeColor = typeof cfg.badgeColor === "string" ? cfg.badgeColor : void 0;
   const badgeTextColor = typeof cfg.badgeTextColor === "string" ? cfg.badgeTextColor : void 0;
   const logo = typeof cfg.logo === "string" ? cfg.logo : void 0;
   const logoWidth = cfg.logoWidth;
-  const bgGradient = typeof cfg.bgGradient === "string" ? cfg.bgGradient : void 0;
+  const bgGradient = typeof cfg.bgGradient === "string" ? cfg.bgGradient : typeof cfg.backgroundColor === "string" ? cfg.backgroundColor : void 0;
+  const backgroundColor = typeof cfg.backgroundColor === "string" ? cfg.backgroundColor : void 0;
   const textColor = typeof cfg.textColor === "string" ? cfg.textColor : void 0;
+  const titleColor = typeof cfg.titleColor === "string" ? cfg.titleColor : void 0;
+  const subtitleColor = typeof cfg.subtitleColor === "string" ? cfg.subtitleColor : void 0;
+  const accentColor = typeof cfg.accentColor === "string" ? cfg.accentColor : void 0;
   return {
     enabled: true,
     preset,
     title,
     subtitle,
+    author,
     company,
+    version,
+    date,
     address,
     email,
     phone,
     website,
     social: socialMap,
     copyright,
+    footerText,
     badge,
     badgeColor,
     badgeTextColor,
     logo,
     logoWidth,
     bgGradient,
-    textColor
+    backgroundColor,
+    textColor,
+    titleColor,
+    subtitleColor,
+    accentColor
   };
 }
 function normalizeNumberHeadings(raw) {
@@ -1729,7 +1822,15 @@ function resolveDocumentConfig(frontmatter = {}, userConfig = {}) {
   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 tokenContext = {
+    ...mergedMeta,
+    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;
@@ -1758,7 +1859,7 @@ function resolveDocumentConfig(frontmatter = {}, userConfig = {}) {
   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 watermark = normalizeWatermark(rawWatermark, tokenContext);
   const rawSignatures = mergedMeta.signatures || userConfig.signatures;
   const signatures = normalizeSignatures(rawSignatures, tokenContext);
   const rawCover = mergedMeta.coverPage !== void 0 ? mergedMeta.coverPage : userConfig.coverPage;
@@ -1854,7 +1955,7 @@ var KATEX_INLINE_CSS = `
 function escapeHtml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
-async function renderInlinesToHtml(spans = [], baseDir = process.cwd()) {
+async function renderInlinesToHtml(spans = [], baseDir = process.cwd(), tokens) {
   let result = "";
   for (const span of spans) {
     if (span.type === "image" && span.url) {
@@ -1868,23 +1969,23 @@ async function renderInlinesToHtml(spans = [], baseDir = process.cwd()) {
       continue;
     }
     if (span.type === "link" && span.url) {
-      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir) : escapeHtml(span.content);
+      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir, tokens) : escapeHtml(tokens ? replaceDocumentTokens(span.content, tokens) : span.content);
       const title = span.title ? ` title="${escapeHtml(span.title)}"` : "";
       result += `<a href="${escapeHtml(span.url)}"${title}>${inner}</a>`;
       continue;
     }
     if (span.type === "bold") {
-      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir) : escapeHtml(span.content);
+      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir, tokens) : escapeHtml(tokens ? replaceDocumentTokens(span.content, tokens) : span.content);
       result += `<strong>${inner}</strong>`;
       continue;
     }
     if (span.type === "italic") {
-      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir) : escapeHtml(span.content);
+      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir, tokens) : escapeHtml(tokens ? replaceDocumentTokens(span.content, tokens) : span.content);
       result += `<em>${inner}</em>`;
       continue;
     }
     if (span.type === "strikethrough") {
-      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir) : escapeHtml(span.content);
+      const inner = span.children ? await renderInlinesToHtml(span.children, baseDir, tokens) : escapeHtml(tokens ? replaceDocumentTokens(span.content, tokens) : span.content);
       result += `<del>${inner}</del>`;
       continue;
     }
@@ -1905,21 +2006,23 @@ async function renderInlinesToHtml(spans = [], baseDir = process.cwd()) {
       result += span.content;
       continue;
     }
-    result += escapeHtml(span.content);
+    const content = tokens ? replaceDocumentTokens(span.content, tokens) : span.content;
+    result += escapeHtml(content);
   }
   return result;
 }
-async function renderNodesToHtml(nodes, resolved, baseDir = process.cwd()) {
+async function renderNodesToHtml(nodes, resolved, baseDir = process.cwd(), tokens) {
   let bodyHtml = "";
+  const tokenCtx = tokens || resolved;
   for (const node of nodes) {
     if (node.type === "heading") {
-      const inner = await renderInlinesToHtml(node.inlines, baseDir);
+      const inner = await renderInlinesToHtml(node.inlines, baseDir, tokenCtx);
       bodyHtml += `  <h${node.level} id="${node.id}">${inner}</h${node.level}>
 `;
       continue;
     }
     if (node.type === "paragraph") {
-      const inner = await renderInlinesToHtml(node.inlines, baseDir);
+      const inner = await renderInlinesToHtml(node.inlines, baseDir, tokenCtx);
       bodyHtml += `  <p>${inner}</p>
 `;
       continue;
@@ -1934,7 +2037,7 @@ async function renderNodesToHtml(nodes, resolved, baseDir = process.cwd()) {
       const gap = node.columnGap || "1.5rem";
       let colChildrenHtml = "";
       for (const col of node.children || []) {
-        const colInner = await renderNodesToHtml(col.children || [], resolved, baseDir);
+        const colInner = await renderNodesToHtml(col.children || [], resolved, baseDir, tokenCtx);
         colChildrenHtml += `    <div class="markforge-col">
 ${colInner}    </div>
 `;
@@ -1960,7 +2063,7 @@ ${escapeHtml(node.text || "")}
       continue;
     }
     if (node.type === "callout") {
-      const inner = await renderInlinesToHtml(node.inlines, baseDir);
+      const inner = await renderInlinesToHtml(node.inlines, baseDir, tokenCtx);
       const CALLOUT_STYLES = {
         NOTE: { bg: "#ECFDFD", border: "#33CDCF", titleColor: "#009DA0" },
         TIP: { bg: "#ecfdf5", border: "#10b981", titleColor: "#10b981" },
@@ -1980,7 +2083,7 @@ ${escapeHtml(node.text || "")}
       continue;
     }
     if (node.type === "blockquote") {
-      const inner = await renderInlinesToHtml(node.inlines, baseDir);
+      const inner = await renderInlinesToHtml(node.inlines, baseDir, tokenCtx);
       bodyHtml += `  <blockquote>${inner}</blockquote>
 `;
       continue;
@@ -1994,7 +2097,7 @@ ${escapeHtml(node.text || "")}
         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);
+          const inner = await renderInlinesToHtml(cell.inlines, baseDir, tokenCtx);
           bodyHtml += `      <${tag}${align}>${inner}</${tag}>
 `;
         }
@@ -2010,7 +2113,7 @@ ${escapeHtml(node.text || "")}
       bodyHtml += `  <${tag}>
 `;
       for (const item of node.children) {
-        const inner = await renderInlinesToHtml(item.inlines, baseDir);
+        const inner = await renderInlinesToHtml(item.inlines, baseDir, tokenCtx);
         bodyHtml += `    <li>${inner}</li>
 `;
       }
@@ -2324,7 +2427,7 @@ async function renderBackCoverHtml(backCover, baseDir = process.cwd()) {
   return { html, css };
 }
 async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
-  var _a;
+  var _a, _b;
   const resolved = resolveDocumentConfig(doc.metadata, config);
   const baseThemeCss = generateThemeCss(resolved.theme);
   let customCss = "";
@@ -2420,6 +2523,9 @@ async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
     bodyHtml += `  </header>
 `;
   }
+  if (((_b = resolved.numberHeadings) == null ? void 0 : _b.enabled) !== false && resolved.numberHeadings) {
+    applyHeadingNumbering(doc.nodes, doc.tocEntries, resolved.numberHeadings);
+  }
   if (resolved.toc && doc.tocEntries.length > 0) {
     bodyHtml += `  <nav class="table-of-contents">
 `;
@@ -2435,12 +2541,26 @@ async function buildHtmlDocument(doc, config, baseDir = process.cwd()) {
   </nav>
 `;
   }
-  bodyHtml += await renderNodesToHtml(doc.nodes, resolved, baseDir);
+  const mergedTokens = {
+    ...config.metadata,
+    ...doc.metadata,
+    ...resolved,
+    title: resolved.title,
+    subtitle: resolved.subtitle,
+    author: resolved.author,
+    version: resolved.version,
+    date: resolved.date,
+    company: resolved.company
+  };
+  const nodesHtml = await renderNodesToHtml(doc.nodes, resolved, baseDir, mergedTokens);
+  bodyHtml += `  <main class="markforge-content-body">
+${nodesHtml}  </main>
+`;
   let footnotesHtml = "";
   if (doc.footnoteDefs && doc.footnoteDefs.length > 0) {
     let fnListHtml = "";
     for (const def of doc.footnoteDefs) {
-      const defInner = await renderInlinesToHtml(def.inlines, baseDir);
+      const defInner = await renderInlinesToHtml(def.inlines, baseDir, mergedTokens);
       fnListHtml += `    <li id="fn-${escapeHtml(def.id)}">${defInner} <a href="#fnref-${escapeHtml(def.id)}" class="markforge-fn-return">&#8617;</a></li>
 `;
     }
@@ -2478,17 +2598,7 @@ ${fnListHtml}    </ol>
   }
   @media print {
     .document-watermark {
-      position: fixed;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      width: 100vw;
-      height: 100vh;
-      pointer-events: none;
-      z-index: 0;
-      -webkit-print-color-adjust: exact;
-      print-color-adjust: exact;
+      display: none !important;
     }
   }
   `;
@@ -2808,7 +2918,7 @@ function findChromeExecutable() {
   return null;
 }
 function injectPagedMediaStyles(html, config, metadata) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const resolved = resolveDocumentConfig(metadata || {}, config);
   const size = resolved.paperSize;
   const orientation = resolved.orientation;
@@ -2883,9 +2993,11 @@ function injectPagedMediaStyles(html, config, metadata) {
     min-height: 100vh;
     height: 100vh;
     box-sizing: border-box;
+    break-before: page;
+    break-after: avoid;
   }` : "";
-  const pagedCss = `
-  @page {
+  const tocPageCss = resolved.toc ? `
+  @page toc-page {
     size: ${size} ${orientation};
     margin-top: ${top};
     margin-bottom: ${bottom};
@@ -2896,9 +3008,36 @@ function injectPagedMediaStyles(html, config, metadata) {
     ${buildZoneCss("top-right", (_e = resolved.header) == null ? void 0 : _e.right)}
     ${buildZoneCss("bottom-left", (_f = resolved.footer) == null ? void 0 : _f.left)}
     ${buildZoneCss("bottom-center", (_g = resolved.footer) == null ? void 0 : _g.center)}
-    ${buildZoneCss("bottom-right", (_h = resolved.footer) == null ? void 0 : _h.right, true)}
+    @bottom-right {
+      content: counter(page, lower-roman);
+      font-size: 9pt;
+      color: #94a3b8;
+    }
+  }
+  .table-of-contents {
+    page: toc-page;
+    page-break-after: always;
+    break-after: page;
+  }
+  .markforge-content-body {
+    counter-reset: page 1;
+  }` : "";
+  const pagedCss = `
+  @page {
+    size: ${size} ${orientation};
+    margin-top: ${top};
+    margin-bottom: ${bottom};
+    margin-left: ${left};
+    margin-right: ${right};
+    ${buildZoneCss("top-left", (_h = resolved.header) == null ? void 0 : _h.left)}
+    ${buildZoneCss("top-center", (_i = resolved.header) == null ? void 0 : _i.center)}
+    ${buildZoneCss("top-right", (_j = resolved.header) == null ? void 0 : _j.right)}
+    ${buildZoneCss("bottom-left", (_k = resolved.footer) == null ? void 0 : _k.left)}
+    ${buildZoneCss("bottom-center", (_l = resolved.footer) == null ? void 0 : _l.center)}
+    ${buildZoneCss("bottom-right", (_m = resolved.footer) == null ? void 0 : _m.right, true)}
   }
   ${coverPageCss}
+  ${tocPageCss}
   ${backCoverCss}
   @media print {
     body { padding: 0; }
@@ -3029,9 +3168,10 @@ async function buildPdfDocument(doc, config, baseDir = process.cwd()) {
             const wmPng = generateWatermarkPngBuffer(chromePath, resolved.watermark);
             if (wmPng) {
               const embeddedPng = await pdfDoc.embedPng(wmPng);
+              const totalPages = pdfDoc.getPageCount();
               const pages = pdfDoc.getPages();
               const startPageIndex = ((_b = resolved.coverPage) == null ? void 0 : _b.enabled) ? 1 : 0;
-              const endPageIndex = ((_c = resolved.backCover) == null ? void 0 : _c.enabled) ? pages.length - 1 : pages.length;
+              const endPageIndex = ((_c = resolved.backCover) == null ? void 0 : _c.enabled) ? totalPages - 1 : totalPages;
               for (let i = startPageIndex; i < endPageIndex; i++) {
                 const page = pages[i];
                 const { width, height } = page.getSize();
@@ -3371,7 +3511,7 @@ async function convertInlinesToTextRuns(spans = [], baseDir = process.cwd(), opt
   return runs;
 }
 async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const resolved = resolveDocumentConfig(doc.metadata, config);
   const docElements = [];
   const themeProps = typeof resolved.theme === "object" ? resolved.theme : {};
@@ -3443,6 +3583,9 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
       );
     }
   }
+  if (((_b = resolved.numberHeadings) == null ? void 0 : _b.enabled) !== false && resolved.numberHeadings) {
+    applyHeadingNumbering(doc.nodes, doc.tocEntries, resolved.numberHeadings);
+  }
   if (resolved.toc) {
     const headingNodes = doc.nodes.filter(
       (n) => n.type === "heading" && typeof n.level === "number" && n.level >= 1 && n.level <= 3
@@ -3512,7 +3655,11 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         ]
       });
       docElements.push(tocCard);
-      docElements.push(new Paragraph({ spacing: { after: 200 } }));
+      docElements.push(
+        new Paragraph({
+          children: [new PageBreak()]
+        })
+      );
     }
   }
   for (const node of doc.nodes) {
@@ -3522,7 +3669,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
           font: defaultFont,
           size: 34,
           // 17pt
-          color: textHex,
+          color: primaryDarkHex,
           bold: true
         });
         docElements.push(
@@ -3568,7 +3715,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
           font: defaultFont,
           size: 22,
           // 11pt
-          color: textHex,
+          color: primaryDarkHex,
           bold: true
         });
         docElements.push(
@@ -3798,7 +3945,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     }
     if (node.type === "table" && node.children) {
       const tableRows = [];
-      const numCols = ((_c = (_b = node.children[0]) == null ? void 0 : _b.children) == null ? void 0 : _c.length) || 1;
+      const numCols = ((_d = (_c = node.children[0]) == null ? void 0 : _c.children) == null ? void 0 : _d.length) || 1;
       const colWidth = Math.floor(9e3 / numCols);
       for (let rowIdx = 0; rowIdx < node.children.length; rowIdx++) {
         const rowNode = node.children[rowIdx];
@@ -3808,7 +3955,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
         if (rowNode.children) {
           for (let colIdx = 0; colIdx < rowNode.children.length; colIdx++) {
             const cellNode = rowNode.children[colIdx];
-            const align = (_d = node.align) == null ? void 0 : _d[colIdx];
+            const align = (_e = node.align) == null ? void 0 : _e[colIdx];
             let alignment = AlignmentType.LEFT;
             if (align === "center") alignment = AlignmentType.CENTER;
             if (align === "right") alignment = AlignmentType.RIGHT;
@@ -4115,7 +4262,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
   const centerPos = Math.round(contentWidthTwip / 2);
   const rightPos = contentWidthTwip;
   const headerRuns = [];
-  if ((_e = resolved.header) == null ? void 0 : _e.left) {
+  if ((_f = resolved.header) == null ? void 0 : _f.left) {
     headerRuns.push(
       new TextRun({
         text: resolved.header.left.text,
@@ -4128,7 +4275,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     );
   }
   headerRuns.push(new TextRun({ text: "	" }));
-  if ((_f = resolved.header) == null ? void 0 : _f.center) {
+  if ((_g = resolved.header) == null ? void 0 : _g.center) {
     headerRuns.push(
       new TextRun({
         text: resolved.header.center.text,
@@ -4141,7 +4288,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     );
   }
   headerRuns.push(new TextRun({ text: "	" }));
-  if ((_g = resolved.header) == null ? void 0 : _g.right) {
+  if ((_h = resolved.header) == null ? void 0 : _h.right) {
     headerRuns.push(
       new TextRun({
         text: resolved.header.right.text,
@@ -4180,7 +4327,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     ]
   }) : void 0;
   const footerRuns = [];
-  if ((_h = resolved.footer) == null ? void 0 : _h.left) {
+  if ((_i = resolved.footer) == null ? void 0 : _i.left) {
     footerRuns.push(
       new TextRun({
         text: resolved.footer.left.text,
@@ -4193,7 +4340,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     );
   }
   footerRuns.push(new TextRun({ text: "	" }));
-  if ((_i = resolved.footer) == null ? void 0 : _i.center) {
+  if ((_j = resolved.footer) == null ? void 0 : _j.center) {
     footerRuns.push(
       new TextRun({
         text: resolved.footer.center.text,
@@ -4206,7 +4353,7 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
     );
   }
   footerRuns.push(new TextRun({ text: "	" }));
-  if ((_j = resolved.footer) == null ? void 0 : _j.right) {
+  if ((_k = resolved.footer) == null ? void 0 : _k.right) {
     const rZone = resolved.footer.right;
     const rColor = rZone.color.replace("#", "");
     const rSize = (rZone.fontSize || 9) * 2;
@@ -4326,6 +4473,10 @@ async function buildDocxDocument(doc, config, baseDir = process.cwd()) {
   docSections.push({
     properties: {
       page: {
+        pageNumbers: {
+          start: 1,
+          formatType: NumberFormat.DECIMAL
+        },
         size: {
           width: resolved.paperDimensions.widthTwip,
           height: resolved.paperDimensions.heightTwip,
@@ -5767,10 +5918,9 @@ try {
   }
 } catch {
 }
-var FALLBACK_VERSION = "0.4.0";
 function readVersionFromPackageJson(fromDir) {
   let currentDir = fromDir;
-  for (let i = 0; i < 6; i++) {
+  for (let i = 0; i < 10; i++) {
     try {
       const pkgJsonPath = path8.join(currentDir, "package.json");
       if (fs8.existsSync(pkgJsonPath)) {
@@ -5785,7 +5935,9 @@ function readVersionFromPackageJson(fromDir) {
     if (parentDir === currentDir) break;
     currentDir = parentDir;
   }
-  return FALLBACK_VERSION;
+  throw new Error(
+    "Failed to resolve '@masumdev/markforge' package version: package.json was not found or is missing a valid 'version' field."
+  );
 }
 function getPackageDir() {
   if (typeof __dirname !== "undefined") {
@@ -5816,6 +5968,7 @@ export {
   THEME_DEFAULT,
   Theme,
   WatermarkPosition,
+  applyHeadingNumbering,
   buildDocxDocument,
   buildHtmlDocument,
   buildPdfDocument,