@json-to-office/core-docx 2.4.0 → 2.6.0

package/dist/plugin/example/index.js

@@ -9,6 +9,7 @@ var __export = (target, all) => {
 };
 
 // src/themes/defaults.ts
+import { designColors } from "@json-to-office/shared";
 function ensureThemeDefaults(theme) {
   return {
     ...theme,
@@ -41,10 +42,13 @@ function ensureThemeDefaults(theme) {
   };
 }
 function getThemeColors(theme) {
-  return {
-    ...DEFAULT_COLORS,
-    ...theme.colors || {}
-  };
+  return designColors(
+    {
+      ...DEFAULT_COLORS,
+      ...theme.colors || {}
+    },
+    theme.palette
+  );
 }
 function getThemeFonts(theme) {
   return {
@@ -786,6 +790,320 @@ var init_vermilion_docx_theme = __esm({
   }
 });
 
+// src/templates/themes/consulting.docx.theme.json
+var consulting_docx_theme_default;
+var init_consulting_docx_theme = __esm({
+  "src/templates/themes/consulting.docx.theme.json"() {
+    consulting_docx_theme_default = {
+      name: "consulting",
+      displayName: "Consulting House",
+      description: "The house style for client and technical reports \u2014 near-black ink, three greys and one deep-blue accent, Calibri body under Arial headings, hairline rules, no fills behind body text, safe fonts only",
+      version: "1.0.0",
+      colors: {
+        primary: "#1A1F26",
+        secondary: "#4B5563",
+        accent: "#1B4F8A",
+        text: "#1A1F26",
+        background: "#FFFFFF",
+        border: "#C9CED6",
+        textPrimary: "#1A1F26",
+        textSecondary: "#4B5563",
+        textMuted: "#7B8794",
+        borderPrimary: "#C9CED6",
+        borderSecondary: "#E4E7EB",
+        backgroundPrimary: "#FFFFFF",
+        backgroundSecondary: "#F2F4F7",
+        accent4: "#5B8DC9",
+        accent5: "#A9C4E4",
+        accent6: "#7B8794"
+      },
+      palette: {
+        rule: "#C9CED6",
+        textMuted: "#7B8794",
+        onPrimary: "#FFFFFF",
+        surfaceInverse: "#1A1F26",
+        positive: "#1E7F4F",
+        negative: "#B42318",
+        chart: ["accent", "secondary", "accent4", "textMuted", "accent5", "rule"]
+      },
+      fonts: {
+        heading: { family: "Arial", size: 16 },
+        body: { family: "Calibri", size: 10.5 },
+        mono: { family: "Consolas", size: 9.5 },
+        light: { family: "Arial", size: 16 }
+      },
+      page: {
+        size: "A4",
+        margins: {
+          top: 1440,
+          bottom: 1440,
+          left: 1440,
+          right: 1440,
+          header: 680,
+          footer: 680,
+          gutter: 0
+        }
+      },
+      typography: {
+        roles: {
+          eyebrow: {
+            face: "heading",
+            size: 8,
+            weight: 700,
+            case: "upper",
+            tracking: 8,
+            color: "accent",
+            spaceAfter: 4
+          },
+          display: {
+            face: "heading",
+            weight: 700,
+            color: "primary",
+            lineHeight: 1.05,
+            spaceAfter: 8
+          },
+          stat: {
+            face: "heading",
+            weight: 700,
+            color: "accent",
+            lineHeight: 1
+          },
+          quote: {
+            face: "body",
+            color: "textSecondary",
+            lineHeight: 1.3
+          },
+          label: {
+            face: "body",
+            size: 9,
+            weight: 700,
+            color: "textSecondary"
+          },
+          footer: { face: "body", size: 8, color: "textMuted" },
+          tableHeader: {
+            face: "body",
+            size: 9,
+            weight: 700,
+            color: "primary"
+          },
+          tableCell: { face: "body", size: 9.5, color: "textPrimary" },
+          chartLabel: {
+            face: "body",
+            size: 9,
+            weight: 400,
+            color: "textSecondary"
+          },
+          tracker: {
+            face: "body",
+            size: 8,
+            case: "upper",
+            tracking: 6,
+            color: "textMuted"
+          },
+          source: { face: "body", size: 8, color: "textMuted" }
+        },
+        scale: {
+          a4: { base: 10.5, ratio: 1.2, baselinePt: 2 },
+          letter: { base: 10.5, ratio: 1.2, baselinePt: 2 }
+        }
+      },
+      spacing: {
+        basePt: 8,
+        blockGap: { tight: 4, normal: 8, loose: 16 },
+        canvas: {
+          a4: { safeAreaIn: 1, gutterIn: 0, columns: 12 },
+          letter: { safeAreaIn: 1, gutterIn: 0, columns: 12 }
+        }
+      },
+      chrome: {
+        runningHead: {
+          type: "tracker",
+          color: "textMuted",
+          rule: { weightPt: 0.5, color: "rule" },
+          alignment: "right"
+        },
+        tracker: {
+          type: "tracker",
+          color: "textMuted",
+          alignment: "right"
+        },
+        actionTitle: { type: "display", color: "primary" },
+        keyTakeaways: {
+          type: "label",
+          color: "primary",
+          rule: { weightPt: 2, color: "accent" },
+          padPt: 8
+        },
+        sourceLine: { type: "source", color: "textMuted" },
+        confidentialFooter: {
+          type: "footer",
+          color: "textMuted",
+          rule: { weightPt: 0.5, color: "rule" },
+          alignment: "left"
+        },
+        logoSlot: { alignment: "right" },
+        cover: {
+          type: "display",
+          color: "primary",
+          rule: { weightPt: 3, color: "accent" }
+        }
+      },
+      motif: {
+        kind: "rule",
+        color: "accent",
+        weightPt: 3,
+        placement: "top"
+      },
+      styles: {
+        normal: {
+          font: "body",
+          color: "textPrimary",
+          lineSpacing: { type: "multiple", value: 1.2 },
+          alignment: "left",
+          spacing: { after: 8 }
+        },
+        title: {
+          font: "heading",
+          size: 26,
+          bold: true,
+          color: "primary",
+          alignment: "left",
+          lineSpacing: { type: "multiple", value: 1.05 },
+          spacing: { before: 0, after: 6 }
+        },
+        subtitle: {
+          font: "body",
+          size: 13,
+          color: "textSecondary",
+          alignment: "left",
+          lineSpacing: { type: "multiple", value: 1.2 },
+          spacing: { before: 0, after: 18 }
+        },
+        heading1: {
+          font: "heading",
+          size: 16,
+          bold: true,
+          color: "primary",
+          lineSpacing: { type: "multiple", value: 1.1 },
+          spacing: { before: 24, after: 8 },
+          keepNext: true,
+          alignment: "left",
+          borders: {
+            bottom: { style: "single", size: 4, color: "rule", space: 4 }
+          }
+        },
+        heading2: {
+          font: "heading",
+          size: 12.5,
+          bold: true,
+          color: "primary",
+          spacing: { before: 16, after: 6 },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading3: {
+          font: "body",
+          size: 11,
+          bold: true,
+          color: "primary",
+          spacing: { before: 12, after: 4 },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading4: {
+          font: "body",
+          size: 10.5,
+          bold: true,
+          color: "textSecondary",
+          spacing: { before: 10, after: 4 },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading5: {
+          font: "body",
+          size: 10.5,
+          bold: false,
+          italic: true,
+          color: "textSecondary",
+          spacing: { before: 8, after: 4 },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading6: {
+          font: "body",
+          size: 9,
+          bold: true,
+          case: "upper",
+          color: "textMuted",
+          characterSpacing: { type: "expanded", value: 20 },
+          spacing: { before: 8, after: 4 },
+          keepNext: true,
+          alignment: "left"
+        },
+        TOC1: {
+          font: "body",
+          size: 10.5,
+          bold: true,
+          color: "textPrimary",
+          spacing: { before: 4, after: 3 },
+          tabStops: [{ type: "right", position: 9026, leader: "none" }]
+        },
+        TOC2: {
+          font: "body",
+          size: 10.5,
+          color: "textSecondary",
+          indent: { left: 240 },
+          spacing: { after: 2 },
+          tabStops: [{ type: "right", position: 9026, leader: "none" }]
+        },
+        TOC3: {
+          font: "body",
+          size: 10,
+          color: "textMuted",
+          indent: { left: 480 },
+          spacing: { after: 2 },
+          tabStops: [{ type: "right", position: 9026, leader: "none" }]
+        }
+      },
+      componentDefaults: {
+        table: {
+          width: 100,
+          borderColor: "#C9CED6",
+          borderSize: 0.5,
+          hideBorders: { left: true, right: true, insideVertical: true },
+          cellDefaults: {
+            font: { size: 9.5 },
+            padding: { top: 4, bottom: 4 },
+            verticalAlignment: "middle"
+          },
+          headerCellDefaults: {
+            color: "#1A1F26",
+            font: { size: 9, bold: true },
+            padding: { top: 0, bottom: 5 },
+            verticalAlignment: "bottom",
+            borderColor: { bottom: "#1A1F26" },
+            borderSize: { bottom: 0.75 }
+          }
+        },
+        list: {
+          format: "bullet",
+          bullet: "\u2022",
+          spacing: { item: 2 }
+        },
+        image: {
+          alignment: "center"
+        },
+        statistic: {
+          alignment: "left"
+        },
+        section: {
+          pageBreak: false
+        }
+      }
+    };
+  }
+});
+
 // src/templates/themes/index.ts
 import fs from "fs";
 import path from "path";
@@ -800,7 +1118,8 @@ function loadThemesFromJson() {
   const themes2 = {
     minimal: ensureThemeDefaults(minimal_docx_theme_default),
     devportal: ensureThemeDefaults(devportal_docx_theme_default),
-    vermilion: ensureThemeDefaults(vermilion_docx_theme_default)
+    vermilion: ensureThemeDefaults(vermilion_docx_theme_default),
+    consulting: ensureThemeDefaults(consulting_docx_theme_default)
   };
   try {
     const __filename2 = fileURLToPath(import.meta.url);
@@ -838,7 +1157,7 @@ function loadThemesFromJson() {
   _themesCache = themes2;
   return themes2;
 }
-var _themesCache, themes, getTheme, getThemeWithFallback, hasTheme, getThemeNames, minimalTheme, devportalTheme, vermilionTheme;
+var _themesCache, themes, getTheme, getThemeWithFallback, hasTheme, getThemeNames, minimalTheme, devportalTheme, vermilionTheme, consultingTheme;
 var init_themes = __esm({
   "src/templates/themes/index.ts"() {
     "use strict";
@@ -846,6 +1165,7 @@ var init_themes = __esm({
     init_minimal_docx_theme();
     init_devportal_docx_theme();
     init_vermilion_docx_theme();
+    init_consulting_docx_theme();
     _themesCache = null;
     themes = loadThemesFromJson();
     getTheme = (themeName) => {
@@ -869,10 +1189,15 @@ var init_themes = __esm({
     minimalTheme = themes["minimal"];
     devportalTheme = themes["devportal"];
     vermilionTheme = themes["vermilion"];
+    consultingTheme = themes["consulting"];
   }
 });
 
 // src/styles/utils/colorUtils.ts
+import {
+  DEFAULT_CHART_THEME_COLORS,
+  resolveDesignColor
+} from "@json-to-office/shared";
 function resolveColor(colorValue, theme) {
   if (colorValue.startsWith("#")) {
     const hexValue = colorValue.slice(1);
@@ -886,7 +1211,11 @@ function resolveColor(colorValue, theme) {
   const colors = getThemeColors(theme);
   const resolvedColor = colors[colorValue];
   if (typeof resolvedColor === "string") {
-    return resolveColor(resolvedColor, theme);
+    const hex = resolveDesignColor(colorValue, colors);
+    if (hex) return hex.toUpperCase();
+    throw new Error(
+      `Unresolvable theme color: "${colorValue}" (missing reference or cycle).`
+    );
   }
   if (/^[0-9A-Fa-f]{6}$/.test(colorValue)) {
     return colorValue.toUpperCase();
@@ -895,6 +1224,15 @@ function resolveColor(colorValue, theme) {
     `Invalid color value: "${colorValue}". Must be a hex color with # prefix (e.g., "#000000") or a valid theme color name.`
   );
 }
+function chartPaletteValues(theme) {
+  const explicit = theme.palette?.chart;
+  if (explicit) return [...explicit];
+  const colors = getThemeColors(theme);
+  return DEFAULT_CHART_THEME_COLORS.flatMap((token) => {
+    const value = colors[token];
+    return typeof value === "string" && value.length > 0 ? [value] : [];
+  });
+}
 var init_colorUtils = __esm({
   "src/styles/utils/colorUtils.ts"() {
     "use strict";
@@ -902,43 +1240,6 @@ var init_colorUtils = __esm({
   }
 });
 
-// src/utils/generationContext.ts
-import { AsyncLocalStorage } from "async_hooks";
-import { isAbsolute, resolve } from "path";
-function runWithBaseDir(baseDir, callback) {
-  return baseDir === void 0 ? callback() : baseDirStorage.run(resolve(baseDir), callback);
-}
-function resolveFromBaseDir(filePath) {
-  const base = baseDirStorage.getStore();
-  if (!base || isAbsolute(filePath)) return filePath;
-  return resolve(base, filePath);
-}
-function runWithWarnings(warnings, callback) {
-  return warnings === void 0 ? callback() : warningsStorage.run(warnings, callback);
-}
-function reportWarning(component, code, message, context) {
-  const warnings = warningsStorage.getStore();
-  if (warnings) {
-    warnings.push({
-      component,
-      message,
-      severity: "warning",
-      context: { code, ...context }
-    });
-    return;
-  }
-  console.warn(`[json-to-docx] [${code}] ${message}`);
-}
-var generationDateStorage, baseDirStorage, warningsStorage;
-var init_generationContext = __esm({
-  "src/utils/generationContext.ts"() {
-    "use strict";
-    generationDateStorage = new AsyncLocalStorage();
-    baseDirStorage = new AsyncLocalStorage();
-    warningsStorage = new AsyncLocalStorage();
-  }
-});
-
 // src/styles/utils/styleHelpers.ts
 function pointsToTwips(points) {
   return Math.round(points * TWIPS_PER_POINT);
@@ -984,6 +1285,8 @@ function resolveFontProperties(theme, fontRef) {
     size: fontDef.size,
     color: fontDef.color,
     bold: fontDef.bold,
+    fontWeight: fontDef.fontWeight,
+    case: fontDef.case,
     italic: fontDef.italic,
     underline: fontDef.underline,
     alignment: fontDef.alignment,
@@ -1250,6 +1553,43 @@ var init_layoutUtils = __esm({
   }
 });
 
+// src/utils/generationContext.ts
+import { AsyncLocalStorage } from "async_hooks";
+import { isAbsolute, resolve } from "path";
+function runWithBaseDir(baseDir, callback) {
+  return baseDir === void 0 ? callback() : baseDirStorage.run(resolve(baseDir), callback);
+}
+function resolveFromBaseDir(filePath) {
+  const base = baseDirStorage.getStore();
+  if (!base || isAbsolute(filePath)) return filePath;
+  return resolve(base, filePath);
+}
+function runWithWarnings(warnings, callback) {
+  return warnings === void 0 ? callback() : warningsStorage.run(warnings, callback);
+}
+function reportWarning(component, code, message, context) {
+  const warnings = warningsStorage.getStore();
+  if (warnings) {
+    warnings.push({
+      component,
+      message,
+      severity: "warning",
+      context: { code, ...context }
+    });
+    return;
+  }
+  console.warn(`[json-to-docx] [${code}] ${message}`);
+}
+var generationDateStorage, baseDirStorage, warningsStorage;
+var init_generationContext = __esm({
+  "src/utils/generationContext.ts"() {
+    "use strict";
+    generationDateStorage = new AsyncLocalStorage();
+    baseDirStorage = new AsyncLocalStorage();
+    warningsStorage = new AsyncLocalStorage();
+  }
+});
+
 // src/themes/json/parser.ts
 import { validateThemeJson } from "@json-to-office/shared-docx/validation/unified";
 var ThemeValidationError, ThemeParseError, ThemeParser;
@@ -2044,6 +2384,9 @@ function runOptions(formatting) {
     options.underline = formatting.underline ? { type: formatting.underline.type } : void 0;
   }
   if (formatting.strike !== void 0) options.strike = formatting.strike;
+  if (formatting.allCaps !== void 0) options.allCaps = formatting.allCaps;
+  if (formatting.smallCaps !== void 0)
+    options.smallCaps = formatting.smallCaps;
   if (formatting.scalePercent !== void 0) {
     options.scale = formatting.scalePercent;
   }
@@ -2734,6 +3077,44 @@ var init_styles2 = __esm({
   }
 });
 
+// src/utils/normalizeTextCase.ts
+function normalizeTextCase(zip) {
+  let changed = false;
+  for (const entry of zip.getEntries()) {
+    if (!WORD_XML.test(entry.entryName)) continue;
+    const xml = entry.getData().toString("utf8");
+    if (!ANY_CASE_FLAG.test(xml)) continue;
+    const normalized = xml.replace(RUN_PROPERTIES, completeCaseFlags);
+    if (normalized === xml) continue;
+    zip.updateFile(entry, Buffer.from(normalized, "utf8"));
+    changed = true;
+  }
+  return changed;
+}
+function completeCaseFlags(runProperties3) {
+  const flag = CASE_FLAG.exec(runProperties3);
+  if (!flag) return runProperties3;
+  const isCaps = flag[1] === "caps";
+  const opposite = `<w:${isCaps ? "smallCaps" : "caps"} w:val="false"/>`;
+  if (runProperties3.includes(`<w:${isCaps ? "smallCaps" : "caps"}`)) {
+    return runProperties3;
+  }
+  return runProperties3.replace(
+    flag[0],
+    isCaps ? `${flag[0]}${opposite}` : `${opposite}${flag[0]}`
+  );
+}
+var WORD_XML, ANY_CASE_FLAG, RUN_PROPERTIES, CASE_FLAG;
+var init_normalizeTextCase = __esm({
+  "src/utils/normalizeTextCase.ts"() {
+    "use strict";
+    WORD_XML = /^word\/.*\.xml$/;
+    ANY_CASE_FLAG = /<w:(?:caps|smallCaps)\b/;
+    RUN_PROPERTIES = /<w:rPr\b[^>]*>[\s\S]*?<\/w:rPr>/g;
+    CASE_FLAG = /<w:(caps|smallCaps)\b[^>]*(?:\/>|>[\s\S]*?<\/w:\1>)/;
+  }
+});
+
 // src/utils/packageDocument.ts
 import AdmZip from "adm-zip";
 function resolveGenerationDate(options) {
@@ -2802,6 +3183,7 @@ function canonicalizeRelationshipIds(zip) {
 }
 function canonicalizeDocxBuffer(buffer, generatedAt = DEFAULT_GENERATION_DATE) {
   const zip = new AdmZip(buffer);
+  normalizeTextCase(zip);
   canonicalizeRelationshipIds(zip);
   const isoTimestamp = generatedAt.toISOString();
   const coreProperties3 = zip.getEntry("docProps/core.xml");
@@ -2818,10 +3200,15 @@ function canonicalizeDocxBuffer(buffer, generatedAt = DEFAULT_GENERATION_DATE) {
   }
   return zip.toBuffer();
 }
+function normalizeDocxCaseBuffer(buffer) {
+  const zip = new AdmZip(buffer);
+  return normalizeTextCase(zip) ? zip.toBuffer() : buffer;
+}
 var DEFAULT_GENERATION_DATE, STABLE_RELATIONSHIP_ID;
 var init_packageDocument = __esm({
   "src/utils/packageDocument.ts"() {
     "use strict";
+    init_normalizeTextCase();
     DEFAULT_GENERATION_DATE = /* @__PURE__ */ new Date("2000-01-01T00:00:00.000Z");
     STABLE_RELATIONSHIP_ID = /^rId\d+$/;
   }
@@ -2880,7 +3267,8 @@ function createDocxJsRenderer() {
       const document = buildDocument(ir, resources);
       const packed = await Packer.toBuffer(document);
       const fixed = fixFloatingImageIdsInBuffer(packed);
-      if (renderOptions?.deterministic === false) return new Uint8Array(fixed);
+      if (renderOptions?.deterministic === false)
+        return new Uint8Array(normalizeDocxCaseBuffer(fixed));
       return new Uint8Array(
         canonicalizeDocxBuffer(
           fixed,
@@ -4159,7 +4547,8 @@ async function createOfficeOpenDocxRenderer() {
         spliceChartParts(zip, charts);
         raw = zip.toBuffer();
       }
-      if (options?.deterministic === false) return new Uint8Array(raw);
+      if (options?.deterministic === false)
+        return new Uint8Array(normalizeDocxCaseBuffer(raw));
       return new Uint8Array(
         canonicalizeDocxBuffer(
           raw,
@@ -4518,6 +4907,7 @@ init_themes();
 import { applyExportMode } from "@json-to-office/shared";
 
 // src/themes/overrides.ts
+import { mergeWithDefaults } from "@json-to-office/shared";
 function applyThemeOverrides(theme, overrides) {
   if (!overrides) return theme;
   const fonts = { ...theme.fonts };
@@ -4531,12 +4921,87 @@ function applyThemeOverrides(theme, overrides) {
   }
   return {
     ...theme,
+    ...Object.fromEntries(
+      ["palette", "typography", "spacing", "chrome", "motif"].flatMap(
+        (name) => {
+          const key = name;
+          return overrides[key] === void 0 ? [] : [[key, mergeWithDefaults(overrides[key], theme[key] ?? {})]];
+        }
+      )
+    ),
     colors: { ...theme.colors, ...overrides.colors ?? {} },
     fonts,
     ...Object.keys(styles).length > 0 && { styles }
   };
 }
 
+// src/themes/design-system.ts
+init_defaults();
+import {
+  designCanvas,
+  resolveTypeRoles,
+  validateDesignColors
+} from "@json-to-office/shared";
+function resolveDocxDesignSystem(theme) {
+  validateDesignColors(theme, getThemeColors(theme));
+  if (!theme.typography && !theme.spacing) return theme;
+  const canvas = designCanvas("docx", theme.page.size);
+  const roles = resolveTypeRoles(theme, canvas, theme.fonts.body.size ?? 11);
+  const styles = { ...theme.styles };
+  for (const [name, role] of Object.entries(roles)) {
+    const spacing = {
+      ...role.spaceBefore !== void 0 && { before: role.spaceBefore },
+      ...role.spaceAfter !== void 0 && { after: role.spaceAfter }
+    };
+    styles[name] = {
+      font: role.face ?? "body",
+      size: role.size,
+      ...role.weight !== void 0 && { fontWeight: role.weight },
+      ...role.color !== void 0 && { color: role.color },
+      ...role.case !== void 0 && { case: role.case },
+      ...role.lineHeight !== void 0 && {
+        lineSpacing: { type: "multiple", value: role.lineHeight }
+      },
+      ...role.tracking !== void 0 && {
+        characterSpacing: {
+          type: role.tracking < 0 ? "condensed" : "expanded",
+          value: Math.abs(role.tracking) * role.size / 5
+        }
+      },
+      ...Object.keys(spacing).length && { spacing },
+      ...styles[name]
+    };
+  }
+  const gap = theme.spacing?.blockGap?.normal ?? theme.spacing?.basePt;
+  const scale = theme.typography?.scale?.[canvas];
+  if (scale || gap !== void 0) {
+    styles.normal = {
+      ...scale && { size: scale.base },
+      ...gap !== void 0 && { spacing: { after: gap } },
+      ...styles.normal
+    };
+  }
+  const space = theme.spacing?.canvas?.[canvas];
+  const safe = space?.safeAreaIn;
+  return {
+    ...theme,
+    styles,
+    page: {
+      ...theme.page,
+      margins: {
+        ...theme.page.margins,
+        ...safe !== void 0 && {
+          top: safe * 1440,
+          bottom: safe * 1440,
+          left: safe * 1440,
+          right: safe * 1440
+        },
+        ...space?.gutterIn !== void 0 && { gutter: space.gutterIn * 1440 }
+      }
+    }
+  };
+}
+
 // src/core/generationContext.ts
 function defaultNamedThemeLookup(themeName, customThemes, warnings) {
   if (customThemes) {
@@ -4569,6 +5034,7 @@ function resolveThemeContext(documentIn, options = {}) {
   if (themeOverrides) {
     theme = applyThemeOverrides(theme, themeOverrides);
   }
+  theme = resolveDocxDesignSystem(theme);
   const mode = applyExportMode({ doc: document, theme, fonts });
   for (const w of mode.warnings) {
     if (warnings) {
@@ -4802,7 +5268,10 @@ async function resolveDocumentFonts(document, theme, fonts, warnings, forceMater
 }
 
 // src/core/generateFromIr.ts
-import { toRasterizeFontFaces } from "@json-to-office/shared/fonts/node";
+import {
+  toChartFontFaces,
+  toRasterizeFontFaces
+} from "@json-to-office/shared/fonts/node";
 
 // src/core/prerasterizeVisuals.ts
 import {
@@ -5200,9 +5669,90 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
         outcome = retry;
       }
     }
-    if (!outcome.applied) await rasterizeIndividually(chunk);
+    if (!outcome.applied) await rasterizeIndividually(chunk);
+  }
+  return map;
+}
+
+// src/core/componentTransform.ts
+async function transformComponents(doc, replace) {
+  return await walk(doc, replace);
+}
+async function walk(node, replace) {
+  if (Array.isArray(node)) {
+    return Promise.all(node.map((child) => walk(child, replace)));
+  }
+  if (!node || typeof node !== "object") return node;
+  const obj = node;
+  if (typeof obj.name === "string" && obj.props) {
+    const replacement = await replace(obj);
+    if (replacement) return replacement;
+  }
+  const next = { ...obj };
+  if (Array.isArray(obj.children)) {
+    next.children = await walk(obj.children, replace);
+  }
+  if (obj.props && typeof obj.props === "object") {
+    const props = obj.props;
+    let changed = false;
+    const nextProps = { ...props };
+    for (const key of ["header", "footer"]) {
+      if (Array.isArray(props[key])) {
+        nextProps[key] = await walk(props[key], replace);
+        changed = true;
+      }
+    }
+    if (Array.isArray(props.columns)) {
+      nextProps.columns = await Promise.all(
+        props.columns.map(
+          (column) => walkColumn(column, replace)
+        )
+      );
+      changed = true;
+    }
+    if (changed) next.props = nextProps;
   }
-  return map;
+  return next;
+}
+async function walkColumn(column, replace) {
+  if (!column || typeof column !== "object") return column;
+  const source = column;
+  const next = { ...source };
+  const header = source.header;
+  if (header && typeof header === "object" && "content" in header) {
+    next.header = { ...header, content: await walk(header.content, replace) };
+  }
+  if (Array.isArray(source.cells)) {
+    next.cells = await Promise.all(
+      source.cells.map(async (cell) => {
+        if (cell && typeof cell === "object" && "content" in cell) {
+          const source2 = cell;
+          return { ...source2, content: await walk(source2.content, replace) };
+        }
+        return cell;
+      })
+    );
+  }
+  return next;
+}
+function withNodeIdentity(original, replacement) {
+  const out = { ...replacement };
+  if (original.id !== void 0) out.id = original.id;
+  if (original.enabled !== void 0) out.enabled = original.enabled;
+  return out;
+}
+function containsComponent(root, name) {
+  const seen = /* @__PURE__ */ new WeakSet();
+  const visit = (node) => {
+    if (!node || typeof node !== "object" || seen.has(node)) return false;
+    seen.add(node);
+    if (Array.isArray(node)) return node.some(visit);
+    const obj = node;
+    if (typeof obj.name === "string" && obj.enabled === false) return false;
+    if (obj.name === name && obj.props !== void 0) return true;
+    return Object.values(obj).some(visit);
+  };
+  return visit(root);
 }
 
 // src/core/desugarExternals.ts
@@ -5216,7 +5766,14 @@ import {
 
 // src/components/highcharts.ts
 init_colorUtils();
-import { DEFAULT_CHART_THEME_COLORS } from "@json-to-office/shared";
+init_layoutUtils();
+import {
+  chartFamilyResolver,
+  chartPointsPerPixel,
+  POINTS_PER_PIXEL_96DPI,
+  withChartFontFaceCss,
+  withChartTypography
+} from "@json-to-office/shared";
 var DEFAULT_EXPORT_SERVER_URL = "http://localhost:7801";
 async function generateChart(config, servicesConfig) {
   if (!isNodeEnvironment()) {
@@ -5270,19 +5827,83 @@ function toChartColor(value, theme) {
 function withThemeColors(config, theme) {
   const options = config.options;
   if (!options || options.colors || !theme?.colors) return config;
-  const themeColors = theme.colors;
-  const palette = DEFAULT_CHART_THEME_COLORS.map((token) => {
-    const value = themeColors[token];
-    return typeof value === "string" && value.length > 0 ? toChartColor(value, theme) : void 0;
-  }).filter((c) => c !== void 0);
+  const palette = chartPaletteValues(theme).flatMap((value) => {
+    const color = toChartColor(value, theme);
+    return color ? [color] : [];
+  });
   if (palette.length === 0) return config;
   return {
     ...config,
     options: { ...config.options, colors: palette }
   };
 }
-async function renderChartToImageProps(props, theme, servicesConfig) {
-  const config = withThemeColors(props, theme);
+var POINTS_PER_TWIP = 1 / 20;
+var POINTS_PER_PIXEL = POINTS_PER_PIXEL_96DPI;
+function placedWidthPt(config, theme) {
+  const { width, height } = config;
+  const chart = config.options.chart;
+  if (typeof width === "number") return width * POINTS_PER_PIXEL;
+  if (typeof width === "string") {
+    const page = getPageSetup(theme);
+    const contentWidthPt = (page.size.width - page.margin.left - page.margin.right) * POINTS_PER_TWIP;
+    return parseFloat(width) / 100 * contentWidthPt;
+  }
+  if (typeof height === "number" && chart.height > 0) {
+    return height / chart.height * chart.width * POINTS_PER_PIXEL;
+  }
+  return void 0;
+}
+function toHex(token, theme) {
+  return `#${resolveColor(token, theme)}`;
+}
+function themeChartTypography(theme) {
+  const styles = theme.styles ?? {};
+  const family = chartFamilyResolver(theme);
+  const bodyPt = styles.normal?.size ?? theme.fonts.body.size ?? 11;
+  const label = styles.chartLabel;
+  const heading = styles.heading3;
+  const labelPt = label?.size ?? Math.max(bodyPt - 1, 6);
+  return {
+    bodyFamily: family(theme.fonts.body.family),
+    headingFamily: family(theme.fonts.heading.family),
+    textColor: toHex("textPrimary", theme),
+    mutedColor: toHex("textSecondary", theme),
+    labelPt,
+    labelWeight: label?.fontWeight ?? (label?.bold ? 700 : void 0),
+    titlePt: heading?.size ?? bodyPt + 2,
+    titleWeight: heading?.fontWeight ?? (heading?.bold === false ? void 0 : 700),
+    sourcePt: styles.source?.size ?? Math.max(labelPt - 1, 6)
+  };
+}
+function withThemeTypography(config, theme) {
+  if (!theme?.fonts?.body?.family || !theme.fonts.heading?.family) {
+    return config;
+  }
+  return {
+    ...config,
+    options: withChartTypography(
+      config.options,
+      themeChartTypography(theme),
+      chartPointsPerPixel(
+        config.options.chart.width,
+        placedWidthPt(config, theme)
+      )
+    )
+  };
+}
+function withChartFontFaces(config, theme, faces) {
+  if (!faces?.length || !theme?.fonts) return config;
+  return withChartFontFaceCss(config, faces, [
+    theme.fonts.body.family,
+    theme.fonts.heading.family
+  ]);
+}
+async function renderChartToImageProps(props, theme, servicesConfig, chartFonts) {
+  const config = withChartFontFaces(
+    withThemeTypography(withThemeColors(props, theme), theme),
+    theme,
+    chartFonts
+  );
   const chart = await generateChart(config, servicesConfig);
   const hasConfigDimensions = config.width !== void 0 || config.height !== void 0;
   return {
@@ -5293,74 +5914,6 @@ async function renderChartToImageProps(props, theme, servicesConfig) {
   };
 }
 
-// src/core/componentTransform.ts
-async function transformComponents(doc, replace) {
-  return await walk(doc, replace);
-}
-async function walk(node, replace) {
-  if (Array.isArray(node)) {
-    return Promise.all(node.map((child) => walk(child, replace)));
-  }
-  if (!node || typeof node !== "object") return node;
-  const obj = node;
-  if (typeof obj.name === "string" && obj.props) {
-    const replacement = await replace(obj);
-    if (replacement) return replacement;
-  }
-  const next = { ...obj };
-  if (Array.isArray(obj.children)) {
-    next.children = await walk(obj.children, replace);
-  }
-  if (obj.props && typeof obj.props === "object") {
-    const props = obj.props;
-    let changed = false;
-    const nextProps = { ...props };
-    for (const key of ["header", "footer"]) {
-      if (Array.isArray(props[key])) {
-        nextProps[key] = await walk(props[key], replace);
-        changed = true;
-      }
-    }
-    if (Array.isArray(props.columns)) {
-      nextProps.columns = await Promise.all(
-        props.columns.map(
-          (column) => walkColumn(column, replace)
-        )
-      );
-      changed = true;
-    }
-    if (changed) next.props = nextProps;
-  }
-  return next;
-}
-async function walkColumn(column, replace) {
-  if (!column || typeof column !== "object") return column;
-  const source = column;
-  const next = { ...source };
-  const header = source.header;
-  if (header && typeof header === "object" && "content" in header) {
-    next.header = { ...header, content: await walk(header.content, replace) };
-  }
-  if (Array.isArray(source.cells)) {
-    next.cells = await Promise.all(
-      source.cells.map(async (cell) => {
-        if (cell && typeof cell === "object" && "content" in cell) {
-          const source2 = cell;
-          return { ...source2, content: await walk(source2.content, replace) };
-        }
-        return cell;
-      })
-    );
-  }
-  return next;
-}
-function withNodeIdentity(original, replacement) {
-  const out = { ...replacement };
-  if (original.id !== void 0) out.id = original.id;
-  if (original.enabled !== void 0) out.enabled = original.enabled;
-  return out;
-}
-
 // src/core/desugarExternals.ts
 async function desugarExternals(document, options) {
   const prerastered = await prerasterizeVisuals(
@@ -5390,7 +5943,8 @@ async function desugarExternals(document, options) {
         props: await renderChartToImageProps(
           node.props,
           options.theme,
-          options.services?.highcharts
+          options.services?.highcharts,
+          options.chartFonts
         )
       });
     }
@@ -5520,10 +6074,7 @@ init_colorUtils();
 import {
   FeatureRequirementCollector
 } from "@json-to-office/shared/rendering";
-import {
-  synthesizeFamilyName,
-  DEFAULT_CHART_THEME_COLORS as DEFAULT_CHART_THEME_COLORS2
-} from "@json-to-office/shared";
+import { capsFormatting as capsFormatting2, synthesizeFamilyName as synthesizeFamilyName2 } from "@json-to-office/shared";
 import {
   isNativeVisualProps as isNativeVisualProps4
 } from "@json-to-office/shared-docx";
@@ -6039,6 +6590,7 @@ function resolveColors(entries, at, deps) {
 init_themes();
 init_colorUtils();
 init_styleHelpers();
+import { capsFormatting, synthesizeFamilyName } from "@json-to-office/shared";
 var RIGHT_MARGIN_TAB_TWIPS = 9026 * 2;
 var STATISTIC_NUMBER_STYLE_ID = "StatisticNumber";
 var STATISTIC_DESCRIPTION_STYLE_ID = "StatisticDescription";
@@ -6047,25 +6599,8 @@ var STATISTIC_SIZE_POINTS = {
   medium: 28,
   large: 40
 };
-function isValidStyleName(name) {
-  return [
-    "normal",
-    "heading1",
-    "heading2",
-    "heading3",
-    "heading4",
-    "heading5",
-    "heading6",
-    "title",
-    "subtitle"
-  ].includes(name);
-}
 function getStyleSafe(theme, styleName) {
-  if (!isValidStyleName(styleName)) {
-    console.warn(`Invalid style name: ${styleName}`);
-    return void 0;
-  }
-  return theme.styles?.[styleName];
+  return theme.styles && Object.hasOwn(theme.styles, styleName) ? theme.styles[styleName] : void 0;
 }
 function resolveStyleWithBaseStyle(theme, styleName, visited = /* @__PURE__ */ new Set()) {
   if (visited.has(styleName)) {
@@ -6122,9 +6657,17 @@ function resolveSpacing(spacing) {
     ...spacing?.after ? { afterTwips: pointsToTwips(spacing.after) } : {}
   };
 }
+function weightedFamily(props) {
+  return props.fontWeight === void 0 ? void 0 : synthesizeFamilyName(
+    props.family || "Arial",
+    props.fontWeight,
+    props.italic === true
+  );
+}
 function convertRunProperties(merged, theme, defaultColor, defaultSize) {
+  const weighted = weightedFamily(merged);
   return {
-    fontFamily: merged.family || "Arial",
+    fontFamily: weighted?.family ?? merged.family ?? "Arial",
     sizeHalfPoints: (merged.size || defaultSize || 11) * 2,
     color: {
       hex: resolveColor(
@@ -6134,6 +6677,8 @@ function convertRunProperties(merged, theme, defaultColor, defaultSize) {
     },
     ...merged.bold !== void 0 && { bold: merged.bold },
     ...merged.italic !== void 0 && { italic: merged.italic },
+    ...weighted && { bold: weighted.bold, italic: weighted.italic },
+    ...merged.case !== void 0 && capsFormatting(merged.case),
     ...merged.underline !== void 0 && merged.underline && { underline: { type: "single" } },
     ...merged.characterSpacing && {
       characterSpacingTwentieths: merged.characterSpacing.type === "condensed" ? -merged.characterSpacing.value : merged.characterSpacing.value
@@ -6206,12 +6751,15 @@ function convertBorders(borders3, theme) {
   return Object.keys(converted).length > 0 ? converted : void 0;
 }
 function fallbackRun(fontProps, theme, defaultColor, defaultSize) {
+  const weighted = weightedFamily(fontProps);
   return {
-    fontFamily: fontProps.family || "Arial",
+    fontFamily: weighted?.family ?? fontProps.family ?? "Arial",
     sizeHalfPoints: (fontProps.size || defaultSize) * 2,
     color: { hex: resolveColor(fontProps.color || defaultColor, theme) },
     ...fontProps.bold !== void 0 && { bold: fontProps.bold },
     ...fontProps.italic !== void 0 && { italic: fontProps.italic },
+    ...weighted && { bold: weighted.bold, italic: weighted.italic },
+    ...fontProps.case !== void 0 && capsFormatting(fontProps.case),
     ...fontProps.underline !== void 0 && fontProps.underline && { underline: { type: "single" } }
   };
 }
@@ -6241,6 +6789,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
           size: normalStyle?.size,
           color: normalStyle?.color,
           bold: normalStyle?.bold,
+          fontWeight: normalStyle?.fontWeight,
+          case: normalStyle?.case,
           italic: normalStyle?.italic,
           underline: normalStyle?.underline,
           characterSpacing: normalStyle?.characterSpacing,
@@ -6280,6 +6830,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
             size: headingStyle.size,
             color: headingStyle.color,
             bold: headingStyle.bold,
+            fontWeight: headingStyle.fontWeight,
+            case: headingStyle.case,
             italic: headingStyle.italic,
             underline: headingStyle.underline,
             characterSpacing: headingStyle.characterSpacing,
@@ -6340,6 +6892,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
             size: headingStyle.size,
             color: headingStyle.color,
             bold: headingStyle.bold,
+            fontWeight: headingStyle.fontWeight,
+            case: headingStyle.case,
             italic: headingStyle.italic,
             underline: headingStyle.underline,
             characterSpacing: headingStyle.characterSpacing,
@@ -6401,6 +6955,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
           size: titleStyle.size,
           color: titleStyle.color,
           bold: titleStyle.bold,
+          fontWeight: titleStyle.fontWeight,
+          case: titleStyle.case,
           italic: titleStyle.italic,
           underline: titleStyle.underline,
           characterSpacing: titleStyle.characterSpacing,
@@ -6456,6 +7012,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
           size: subtitleStyle.size,
           color: subtitleStyle.color,
           bold: subtitleStyle.bold,
+          fontWeight: subtitleStyle.fontWeight,
+          case: subtitleStyle.case,
           italic: subtitleStyle.italic,
           underline: subtitleStyle.underline,
           characterSpacing: subtitleStyle.characterSpacing,
@@ -6578,6 +7136,8 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
             size: customStyle.size,
             color: customStyle.color,
             bold: customStyle.bold,
+            fontWeight: customStyle.fontWeight,
+            case: customStyle.case,
             italic: customStyle.italic,
             underline: customStyle.underline,
             characterSpacing: customStyle.characterSpacing,
@@ -8142,6 +8702,210 @@ function emptyToUndefined(formatting) {
   return entries.length === 0 ? void 0 : Object.fromEntries(entries);
 }
 
+// src/blocks/index.ts
+import { KEY_TAKEAWAYS_BUDGET } from "@json-to-office/shared-docx";
+
+// src/blocks/keyTakeaways.ts
+var MIN_RULE_PT = 0.25;
+var MAX_RULE_PT = 12;
+var KEY_TAKEAWAYS_DEFAULT_LABEL = "Key takeaways";
+var FALLBACK_RECIPE = {
+  ruleWeightPt: 1.5,
+  ruleColor: "accent",
+  padPt: 6,
+  type: "label"
+};
+function compileKeyTakeaways(props, theme) {
+  const recipe = theme.chrome?.keyTakeaways;
+  const labelRole = recipe?.type ?? FALLBACK_RECIPE.type;
+  const labelStyle = theme.styles?.[labelRole];
+  const ruleWeightPt = Math.min(
+    MAX_RULE_PT,
+    Math.max(
+      MIN_RULE_PT,
+      recipe?.rule?.weightPt ?? FALLBACK_RECIPE.ruleWeightPt
+    )
+  );
+  const ruleColor = recipe?.rule?.color ?? recipe?.color ?? FALLBACK_RECIPE.ruleColor;
+  const padPt = recipe?.padPt ?? FALLBACK_RECIPE.padPt;
+  const children = [
+    {
+      name: "divider",
+      props: {
+        thickness: ruleWeightPt,
+        color: ruleColor,
+        spacing: { before: 12, after: padPt }
+      }
+    },
+    {
+      name: "paragraph",
+      props: {
+        text: props.label ?? KEY_TAKEAWAYS_DEFAULT_LABEL,
+        keepNext: true,
+        spacing: { after: 4 },
+        // The label role when the theme resolves one; a bold run in the
+        // recipe's colour otherwise, so the label still reads as a label.
+        ...labelStyle ? { themeStyle: labelRole } : {
+          font: {
+            bold: true,
+            ...recipe?.color !== void 0 && { color: recipe.color }
+          }
+        }
+      }
+    },
+    {
+      name: "list",
+      props: { items: [...props.items] }
+    },
+    {
+      name: "divider",
+      props: {
+        thickness: 0.5,
+        color: "borderPrimary",
+        spacing: { before: padPt, after: 12 }
+      }
+    }
+  ];
+  return {
+    children,
+    sourceMap: {
+      "/children/0": "",
+      "/children/1": "",
+      "/children/1/props/text": "/props/label",
+      "/children/2": "",
+      "/children/2/props/items": "/props/items",
+      "/children/3": ""
+    }
+  };
+}
+
+// src/blocks/index.ts
+var BLOCK_NAMES = ["key-takeaways"];
+var BLOCKS = {
+  "key-takeaways": {
+    compile: (props, theme) => compileKeyTakeaways(props, theme),
+    budgets: (props, pointer) => (Array.isArray(props.items) ? props.items : []).flatMap(
+      (item, index) => typeof item === "string" ? [
+        {
+          block: "key-takeaways",
+          slot: "items",
+          path: `${pointer}/props/items/${index}`,
+          words: wordCount(item),
+          maxWords: KEY_TAKEAWAYS_BUDGET.items.maxWords
+        }
+      ] : []
+    )
+  }
+};
+function isBlockName(name) {
+  return BLOCK_NAMES.includes(name);
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function expandBlocks(document, theme) {
+  const sourceMap = {};
+  const blocks = [];
+  const walk2 = (node, pointer) => {
+    if (Array.isArray(node)) {
+      return node.map((child, index) => walk2(child, `${pointer}/${index}`));
+    }
+    if (!isRecord(node)) return node;
+    if (typeof node.name === "string" && isRecord(node.props)) {
+      if (node.enabled !== false && isBlockName(node.name)) {
+        const compiled = BLOCKS[node.name].compile(node.props, theme);
+        blocks.push(pointer);
+        for (const [emitted, authored] of Object.entries(compiled.sourceMap)) {
+          sourceMap[`${pointer}${emitted}`] = `${pointer}${authored}`;
+        }
+        return { ...node, children: compiled.children };
+      }
+    }
+    const next = { ...node };
+    if (isRecord(node.props)) {
+      const props = { ...node.props };
+      let changed = false;
+      for (const key of ["header", "footer"]) {
+        if (Array.isArray(props[key])) {
+          props[key] = walk2(props[key], `${pointer}/props/${key}`);
+          changed = true;
+        }
+      }
+      if (Array.isArray(props.columns)) {
+        props.columns = props.columns.map((column, index) => {
+          if (!isRecord(column)) return column;
+          const base = `${pointer}/props/columns/${index}`;
+          const out = { ...column };
+          if (isRecord(column.header) && "content" in column.header) {
+            out.header = {
+              ...column.header,
+              content: walk2(column.header.content, `${base}/header/content`)
+            };
+          }
+          if (Array.isArray(column.cells)) {
+            out.cells = column.cells.map(
+              (cell, cellIndex) => isRecord(cell) && "content" in cell ? {
+                ...cell,
+                content: walk2(
+                  cell.content,
+                  `${base}/cells/${cellIndex}/content`
+                )
+              } : cell
+            );
+          }
+          return out;
+        });
+        changed = true;
+      }
+      if (changed) next.props = props;
+    }
+    if (Array.isArray(node.children)) {
+      next.children = walk2(node.children, `${pointer}/children`);
+    }
+    return next;
+  };
+  const expanded = walk2(document, "");
+  return {
+    document: blocks.length > 0 ? expanded : document,
+    sourceMap,
+    blocks
+  };
+}
+function toAuthoredPointer(sourceMap, pointer) {
+  let best;
+  for (const emitted of Object.keys(sourceMap)) {
+    if ((pointer === emitted || pointer.startsWith(`${emitted}/`)) && (best === void 0 || emitted.length > best.length)) {
+      best = emitted;
+    }
+  }
+  if (best === void 0) return pointer;
+  return `${sourceMap[best]}${pointer.slice(best.length)}`;
+}
+function blockSlotBudgets(document, blocks) {
+  return blocks.flatMap((pointer) => {
+    const node = nodeAt(document, pointer);
+    if (!isRecord(node) || !isRecord(node.props) || !isBlockName(node.name)) {
+      return [];
+    }
+    return BLOCKS[node.name].budgets(node.props, pointer);
+  });
+}
+function wordCount(text) {
+  const trimmed = text.trim();
+  return trimmed === "" ? 0 : trimmed.split(/\s+/).length;
+}
+function nodeAt(root, pointer) {
+  if (pointer === "") return root;
+  let current = root;
+  for (const segment of pointer.slice(1).split("/")) {
+    const key = segment.replace(/~1/g, "/").replace(/~0/g, "~");
+    if (Array.isArray(current)) current = current[Number(key)];
+    else if (isRecord(current)) current = current[key];
+    else return void 0;
+  }
+  return current;
+}
+
 // src/ir/compiler.ts
 init_types();
 init_units();
@@ -8453,6 +9217,7 @@ function compileChromeParagraph(component, scope) {
       italic: font.italic ?? false,
       ...font.underline !== void 0 ? { underline: font.underline } : {},
       ...font.fontWeight !== void 0 ? { fontWeight: font.fontWeight } : {},
+      ...font.case !== void 0 ? { case: font.case } : {},
       ...font.lineSpacing !== void 0 ? { lineSpacing: font.lineSpacing } : {}
     }
   };
@@ -8552,6 +9317,10 @@ function compileComponent(component, scope) {
     case "table":
       return compileTable(component, scope);
     default:
+      if (isBlockName(component.name)) {
+        if (component.enabled === false) return [];
+        return compileBlock(component, scope);
+      }
       scope.ctx.unsupported.push({
         name: component.name,
         path: scope.path
@@ -8559,6 +9328,20 @@ function compileComponent(component, scope) {
       return [];
   }
 }
+function compileBlock(component, scope) {
+  const children = component.children ?? [];
+  if (children.length === 0) {
+    scope.ctx.unsupported.push({ name: component.name, path: scope.path });
+    return [];
+  }
+  return children.flatMap(
+    (child, index) => compileComponent(child, {
+      ...scope,
+      path: `${scope.path}.children[${index}]`,
+      id: `${scope.id}:b${index}`
+    })
+  );
+}
 var MARKDOWN_LIST_LEVELS = {
   unordered: [
     { level: 0, format: "bullet", text: "\u2022", alignment: "left" },
@@ -9756,7 +10539,11 @@ function isoDateTime(date) {
 }
 function runFormatting3(font, props, ctx) {
   const hasWeightRequest = font.fontWeight != null || font.bold === true;
-  const effectiveFamily = font.family ?? (hasWeightRequest ? resolveBodyFamily(ctx.theme) : void 0);
+  const roleName = props.themeStyle;
+  const role = roleName ? ctx.theme.typography?.roles?.[roleName] : void 0;
+  const roleStyles = ctx.theme.styles;
+  const roleFamily = role && roleName ? resolveFontFamily(ctx.theme, roleStyles?.[roleName]?.font ?? role.face) : void 0;
+  const effectiveFamily = font.family ?? (hasWeightRequest ? roleFamily ?? resolveBodyFamily(ctx.theme) : void 0);
   const weighted = applyFontWeightAlias({
     fontFamily: effectiveFamily,
     bold: font.bold,
@@ -9764,7 +10551,7 @@ function runFormatting3(font, props, ctx) {
     fontWeight: font.fontWeight
   });
   const formatting = {};
-  if (font.family || weighted.font && weighted.font !== effectiveFamily) {
+  if (font.family || hasWeightRequest && roleFamily || weighted.font && weighted.font !== effectiveFamily) {
     formatting.fontFamily = weighted.font;
   }
   if (font.size) formatting.sizeHalfPoints = pointsToHalfPoints(font.size);
@@ -9776,6 +10563,8 @@ function runFormatting3(font, props, ctx) {
     formatting.underline = font.underline ? { type: "single" } : void 0;
   }
   if (font.scale) formatting.scalePercent = font.scale;
+  if (font.case !== void 0)
+    Object.assign(formatting, capsFormatting2(font.case));
   if (font.characterSpacing) {
     const { type, value } = font.characterSpacing;
     formatting.characterSpacingTwentieths = type === "condensed" ? -value : value;
@@ -9789,7 +10578,7 @@ function applyFontWeightAlias(opts) {
     return { bold: opts.bold, italic: opts.italic };
   }
   const weight = opts.fontWeight ?? (opts.bold === true ? 700 : void 0);
-  const synth = synthesizeFamilyName(
+  const synth = synthesizeFamilyName2(
     opts.fontFamily,
     weight,
     opts.italic === true
@@ -10128,15 +10917,13 @@ function compileChart(component, scope) {
   }
   const colors = Array.isArray(props.chartColors) ? props.chartColors.map(
     (color) => resolveColor(String(color), ctx.theme)
-  ) : DEFAULT_CHART_THEME_COLORS2.map((token) => {
-    const value = ctx.theme?.colors?.[token];
-    if (typeof value !== "string" || value.length === 0) return void 0;
+  ) : chartPaletteValues(ctx.theme).flatMap((value) => {
     try {
-      return resolveColor(token, ctx.theme);
+      return [resolveColor(value, ctx.theme)];
     } catch {
-      return void 0;
+      return [];
     }
-  }).filter((color) => color !== void 0);
+  });
   const page = getPageSetup(ctx.theme);
   const contentWidthInches = (page.size.width - page.margin.left - page.margin.right) / 1440;
   const widthInches = typeof props.width === "number" ? props.width : contentWidthInches;
@@ -11203,8 +11990,8 @@ var formatDate = (date, formatString = "MMMM d, yyyy") => {
 };
 
 // src/styles/utils/componentDefaults.ts
-import { mergeWithDefaults } from "@json-to-office/shared";
 import { mergeWithDefaults as mergeWithDefaults2 } from "@json-to-office/shared";
+import { mergeWithDefaults as mergeWithDefaults3 } from "@json-to-office/shared";
 function getComponentDefaults(theme) {
   return theme.componentDefaults || {};
 }
@@ -11253,35 +12040,35 @@ function getListDefaults(theme) {
 }
 function resolveHeadingProps(props, theme) {
   const defaults = getHeadingDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveParagraphProps(props, theme) {
   const defaults = getTextDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveImageProps(props, theme) {
   const defaults = getImageDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveStatisticProps(props, theme) {
   const defaults = getStatisticDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveTableProps(props, theme) {
   const defaults = getTableDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveSectionProps(props, theme) {
   const defaults = getSectionDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveColumnsProps(props, theme) {
   const defaults = getColumnsDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveListProps(props, theme) {
   const defaults = getListDefaults(theme);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 function resolveHighchartsProps(props, _theme) {
   return props;
@@ -11295,7 +12082,7 @@ function getCustomComponentDefaults(theme, componentName) {
 }
 function resolveCustomComponentProps(props, theme, componentName) {
   const defaults = getCustomComponentDefaults(theme, componentName);
-  return mergeWithDefaults(props, defaults);
+  return mergeWithDefaults2(props, defaults);
 }
 
 // src/styles/utils/resolveComponentTree.ts
@@ -11348,7 +12135,7 @@ function resolveComponentTree(components, theme) {
 // src/core/structure.ts
 function resolveDocumentTree(document, theme) {
   const docDefaults = document.props.componentDefaults;
-  const mergedComponentDefaults = docDefaults ? mergeWithDefaults2(docDefaults, theme.componentDefaults || {}) : void 0;
+  const mergedComponentDefaults = docDefaults ? mergeWithDefaults3(docDefaults, theme.componentDefaults || {}) : void 0;
   const docNoProofWords = document.props.noProofWords;
   const mergedNoProofWords = docNoProofWords || theme.noProofWords ? Array.from(
     /* @__PURE__ */ new Set([...theme.noProofWords || [], ...docNoProofWords || []])
@@ -11489,6 +12276,7 @@ import {
   normalizeHighchartsChart
 } from "@json-to-office/quality";
 import { DEFAULT_DOCX_RENDERER_ID as DEFAULT_DOCX_RENDERER_ID2 } from "@json-to-office/shared-docx";
+import { designColors as designColors2, resolveDesignColor as resolveDesignColor2 } from "@json-to-office/shared";
 
 // src/json/normalizer.ts
 function normalizeComponent(component) {
@@ -11998,11 +12786,13 @@ function walkActive(node, path3, page, visit) {
   );
 }
 function prepareDocxQualityDocument(document, options = {}) {
-  const context = options.context ?? resolveThemeContext(normalizeDocument(document)[0], {
+  const themed = options.context ?? resolveThemeContext(normalizeDocument(document)[0], {
     customThemes: options.customThemes,
     fonts: options.fonts,
     warnings: options.warnings
   });
+  const expanded = expandBlocks(themed.document, themed.theme);
+  const context = expanded.blocks.length > 0 ? { ...themed, document: expanded.document } : themed;
   const resolved = resolveDocumentTree(context.document, context.theme);
   const basePage = pageBox(resolved.theme, context.themeName);
   const typography = {
@@ -12012,24 +12802,50 @@ function prepareDocxQualityDocument(document, options = {}) {
   const facts = [];
   const provenance = {};
   let previousHeadingLevel;
-  const addFact = (fact) => {
+  const authoredPath = (path3) => toAuthoredPointer(expanded.sourceMap, path3);
+  const addFact = (raw) => {
+    const fact = {
+      ...raw,
+      path: authoredPath(raw.path),
+      ...raw.relatedPaths && {
+        relatedPaths: raw.relatedPaths.map(authoredPath)
+      }
+    };
     facts.push(fact);
     provenance[fact.id] = {
       path: fact.path,
       ...fact.relatedPaths && { relatedPaths: fact.relatedPaths }
     };
   };
+  for (const budget of blockSlotBudgets(context.document, expanded.blocks)) {
+    addFact({
+      id: `docx:block-slot:${budget.path}`,
+      kind: "docx/block-slot",
+      ...budget
+    });
+  }
   const paletteHexes = {};
-  for (const [token, value] of Object.entries(
-    resolved.theme.colors ?? {}
-  )) {
+  const visualColors = designColors2(
+    resolved.theme.colors,
+    resolved.theme.palette
+  );
+  const entries = {
+    ...visualColors,
+    ...Object.fromEntries(
+      (resolved.theme.palette?.chart ?? []).map((value) => {
+        const hex = resolveDesignColor2(value, visualColors);
+        return [hex ? `#${hex}` : value, value];
+      })
+    )
+  };
+  for (const [token, value] of Object.entries(entries)) {
     if (typeof value !== "string") continue;
-    const hex = normalizeHex(value);
+    const hex = normalizeHex(resolveDesignColor2(value, visualColors) ?? value);
     if (hex) paletteHexes[token] = hex;
   }
-  const paletteTokens = SERIES_COLOR_TOKENS.filter(
-    (token) => paletteHexes[token] !== void 0
-  );
+  const paletteTokens = resolved.theme.palette?.chart?.map(
+    (value) => `#${resolveDesignColor2(value, visualColors)}`
+  ) ?? SERIES_COLOR_TOKENS.filter((token) => paletteHexes[token] !== void 0);
   const authoredPropsAt = (pointer) => asRecord(asRecord(nodeAtPointer(context.document, pointer))?.props);
   addFact({
     id: "docx:theme",
@@ -12150,7 +12966,16 @@ function prepareDocxQualityDocument(document, options = {}) {
     },
     facts,
     provenance,
-    renderer: options.renderer ?? DEFAULT_DOCX_RENDERER_ID2
+    renderer: options.renderer ?? DEFAULT_DOCX_RENDERER_ID2,
+    ...expanded.blocks.length > 0 && {
+      metadata: {
+        blocks: {
+          sourceMap: expanded.sourceMap,
+          blocks: expanded.blocks,
+          document: context.document
+        }
+      }
+    }
   };
 }
 
@@ -12190,19 +13015,22 @@ async function compileDocumentScoped(document, options, warnings) {
   });
   const { context } = prepared.model;
   const hasVisual = collectVisualProps(context.document).length > 0;
+  const hasHighcharts = containsComponent(context.document, "highcharts");
   const resolvedFonts = await resolveDocumentFonts(
     context.document,
     context.theme,
     options.fonts,
     warnings,
-    hasVisual
+    hasVisual || hasHighcharts
   );
   const visualFonts = hasVisual ? toRasterizeFontFaces(resolvedFonts, warnings) : [];
+  const chartFonts = hasHighcharts ? toChartFontFaces(resolvedFonts) : [];
   const desugared = await desugarExternals(context.document, {
     theme: context.theme,
     ...options.services ? { services: options.services } : {},
     ...options.baseDir !== void 0 ? { baseDir: options.baseDir } : {},
-    ...visualFonts.length > 0 ? { visualFonts } : {}
+    ...visualFonts.length > 0 ? { visualFonts } : {},
+    ...chartFonts.length > 0 ? { chartFonts } : {}
   });
   const resolved = desugared === context.document ? prepared.model.document : resolveDocumentTree(desugared, context.theme);
   const structure = await processResolvedDocument(