ooxml-core 1.17.0 → 1.19.0

package/dist/docx/ui/index.mjs

@@ -133,8 +133,8 @@ function resolveRunFormatting(run, context = {}) {
     if (state) result[key] = true;
   }
   for (const key of OVERRIDE_KEYS) {
-    for (const level of levels) {
-      const value = level[key];
+    for (const level2 of levels) {
+      const value = level2[key];
       if (value !== void 0) result[key] = value;
     }
   }
@@ -804,17 +804,17 @@ function checkXmlLimits(xml, label, limits = {}) {
       throw new Error(`${label} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
-function parseXml(xml, options = {}) {
-  const label = options.label ?? "OOXML";
+function parseXml(xml, options2 = {}) {
+  const label = options2.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
     throw new Error(`${label} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label, options.limits);
+  checkXmlLimits(xml, label, options2.limits);
   let parseError = "";
   let parsed;
   try {
     parsed = new DOMParser({
-      onError: (level, message) => {
-        if (level !== "warning") parseError = message;
+      onError: (level2, message) => {
+        if (level2 !== "warning") parseError = message;
       }
     }).parseFromString(xml, "application/xml");
   } catch (error) {
@@ -1558,8 +1558,8 @@ function parseTableStyleCatalog(xml) {
 
 // docx/default-styles.ts
 var W = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
-var heading = (id, name, level, before, size, color) => `<w:style w:type="paragraph" w:styleId="${id}"><w:name w:val="${name}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:uiPriority w:val="9"/><w:qFormat/><w:pPr><w:keepNext/><w:keepLines/><w:spacing w:before="${before}" w:after="0"/><w:outlineLvl w:val="${level}"/></w:pPr><w:rPr><w:rFonts w:ascii="Calibri Light" w:hAnsi="Calibri Light" w:eastAsia="Calibri Light" w:cs="Times New Roman"/><w:color w:val="${color}"/><w:sz w:val="${size}"/><w:szCs w:val="${size}"/></w:rPr></w:style>`;
-var toc = (level) => `<w:style w:type="paragraph" w:styleId="TOC${level}"><w:name w:val="toc ${level}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:uiPriority w:val="39"/><w:unhideWhenUsed/><w:pPr><w:spacing w:after="100"/>${level > 1 ? `<w:ind w:left="${(level - 1) * 220}"/>` : ""}</w:pPr></w:style>`;
+var heading = (id, name, level2, before, size, color) => `<w:style w:type="paragraph" w:styleId="${id}"><w:name w:val="${name}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:uiPriority w:val="9"/><w:qFormat/><w:pPr><w:keepNext/><w:keepLines/><w:spacing w:before="${before}" w:after="0"/><w:outlineLvl w:val="${level2}"/></w:pPr><w:rPr><w:rFonts w:ascii="Calibri Light" w:hAnsi="Calibri Light" w:eastAsia="Calibri Light" w:cs="Times New Roman"/><w:color w:val="${color}"/><w:sz w:val="${size}"/><w:szCs w:val="${size}"/></w:rPr></w:style>`;
+var toc = (level2) => `<w:style w:type="paragraph" w:styleId="TOC${level2}"><w:name w:val="toc ${level2}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:uiPriority w:val="39"/><w:unhideWhenUsed/><w:pPr><w:spacing w:after="100"/>${level2 > 1 ? `<w:ind w:left="${(level2 - 1) * 220}"/>` : ""}</w:pPr></w:style>`;
 var noteStyles = (id, name) => `<w:style w:type="paragraph" w:styleId="${id}Text"><w:name w:val="${name} text"/><w:basedOn w:val="Normal"/><w:link w:val="${id}TextChar"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/><w:pPr><w:spacing w:after="0" w:line="240" w:lineRule="auto"/></w:pPr><w:rPr><w:sz w:val="20"/><w:szCs w:val="20"/></w:rPr></w:style><w:style w:type="character" w:styleId="${id}TextChar"><w:name w:val="${name} Text Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="${id}Text"/><w:uiPriority w:val="99"/><w:semiHidden/><w:rPr><w:sz w:val="20"/><w:szCs w:val="20"/></w:rPr></w:style><w:style w:type="character" w:styleId="${id}Reference"><w:name w:val="${name} reference"/><w:basedOn w:val="DefaultParagraphFont"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/><w:rPr><w:vertAlign w:val="superscript"/></w:rPr></w:style>`;
 var DEFAULT_STYLES_XML = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:styles xmlns:w="${W}"><w:docDefaults><w:rPrDefault><w:rPr><w:rFonts w:ascii="Calibri" w:eastAsia="Calibri" w:hAnsi="Calibri" w:cs="Times New Roman"/><w:sz w:val="22"/><w:szCs w:val="22"/><w:lang w:val="en-US" w:eastAsia="en-US" w:bidi="ar-SA"/></w:rPr></w:rPrDefault><w:pPrDefault><w:pPr><w:spacing w:after="160" w:line="259" w:lineRule="auto"/></w:pPr></w:pPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:qFormat/></w:style><w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont"><w:name w:val="Default Paragraph Font"/><w:uiPriority w:val="1"/><w:semiHidden/><w:unhideWhenUsed/></w:style><w:style w:type="table" w:default="1" w:styleId="TableNormal"><w:name w:val="Normal Table"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/><w:tblPr><w:tblInd w:w="0" w:type="dxa"/><w:tblCellMar><w:top w:w="0" w:type="dxa"/><w:left w:w="108" w:type="dxa"/><w:bottom w:w="0" w:type="dxa"/><w:right w:w="108" w:type="dxa"/></w:tblCellMar></w:tblPr></w:style><w:style w:type="numbering" w:default="1" w:styleId="NoList"><w:name w:val="No List"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/></w:style><w:style w:type="paragraph" w:styleId="Title"><w:name w:val="Title"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:uiPriority w:val="10"/><w:qFormat/><w:pPr><w:spacing w:after="0" w:line="240" w:lineRule="auto"/><w:contextualSpacing/></w:pPr><w:rPr><w:rFonts w:ascii="Calibri Light" w:hAnsi="Calibri Light" w:eastAsia="Calibri Light" w:cs="Times New Roman"/><w:spacing w:val="-10"/><w:kern w:val="28"/><w:sz w:val="56"/><w:szCs w:val="56"/></w:rPr></w:style>` + heading("Heading1", "heading 1", 0, 240, 32, "2F5496") + heading("Heading2", "heading 2", 1, 40, 26, "2F5496") + heading("Heading3", "heading 3", 2, 40, 24, "1F3763") + toc(1) + toc(2) + toc(3) + noteStyles("Footnote", "footnote") + noteStyles("Endnote", "endnote") + '<w:style w:type="character" w:styleId="Hyperlink"><w:name w:val="Hyperlink"/><w:basedOn w:val="DefaultParagraphFont"/><w:uiPriority w:val="99"/><w:unhideWhenUsed/><w:rPr><w:color w:val="0563C1"/><w:u w:val="single"/></w:rPr></w:style><w:style w:type="character" w:styleId="PlaceholderText"><w:name w:val="Placeholder Text"/><w:basedOn w:val="DefaultParagraphFont"/><w:uiPriority w:val="99"/><w:semiHidden/><w:rPr><w:color w:val="808080"/></w:rPr></w:style></w:styles>';
 var cached;
@@ -1730,8 +1730,8 @@ function rgbToHsl(r, g, b) {
   }
   return { h, s: clampUnitInterval(s), l: clampUnitInterval(l) };
 }
-function hslToRgb(h, s, l, roundChannel = Math.round, options) {
-  const sC = options?.clampSaturation === false ? s : clampUnitInterval(s);
+function hslToRgb(h, s, l, roundChannel = Math.round, options2) {
+  const sC = options2?.clampSaturation === false ? s : clampUnitInterval(s);
   const lC = clampUnitInterval(l);
   const hN = (h % 360 + 360) % 360;
   const c = (1 - Math.abs(2 * lC - 1)) * sC;
@@ -2220,13 +2220,13 @@ var APPLIED = /* @__PURE__ */ new Set([
   "lumMod",
   "lumOff"
 ]);
-function resolveDrawingColor(color, theme, options) {
+function resolveDrawingColor(color, theme, options2) {
   const base = baseHex(color, theme);
   const rgb = base ? hexToRgbChannels(base) : null;
   if (!rgb) return void 0;
-  if (options?.transformOrder === "document") {
+  if (options2?.transformOrder === "document") {
     const value = orderedColorTransforms(rgb, color.transforms);
-    const round = options.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
+    const round = options2.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
     return {
       hex: `#${toHex(round(value.r))}${toHex(round(value.g))}${toHex(round(value.b))}`,
       alpha: value.alpha,
@@ -2277,7 +2277,7 @@ function resolveDrawingColor(color, theme, options) {
     if (lumMod !== void 0) hsl.l = clampUnitInterval(hsl.l * lumMod);
     const lumOff = parseDrawingFraction(find("lumOff"));
     if (lumOff !== void 0) hsl.l = clampUnitInterval(hsl.l + lumOff);
-    const round = options?.hslRounding === "halfDown" ? (value) => Math.ceil(value - 0.5) : Math.round;
+    const round = options2?.hslRounding === "halfDown" ? (value) => Math.ceil(value - 0.5) : Math.round;
     ({ r, g, b } = hslToRgb(hsl.h, hsl.s, hsl.l, round));
   }
   let alpha = parseDrawingPercent(find("alpha")) ?? 1;
@@ -2388,13 +2388,13 @@ function parseKind(sdtPr) {
   return "richText";
 }
 var generated = 0;
-function parseContentControl(sdt, level) {
+function parseContentControl(sdt, level2) {
   const sdtPr = first2(sdt, "sdtPr");
-  if (!sdtPr) return { id: `sdt-gen-${++generated}`, level, kind: "richText" };
+  if (!sdtPr) return { id: `sdt-gen-${++generated}`, level: level2, kind: "richText" };
   const kind = parseKind(sdtPr);
   const control = {
     id: getW(first2(sdtPr, "id"), "val") ?? `sdt-gen-${++generated}`,
-    level,
+    level: level2,
     kind
   };
   const alias = getW(first2(sdtPr, "alias"), "val");
@@ -3738,7 +3738,7 @@ function resolveInnerRect(fillToRect, focalPoint) {
 function lerpEdge(inner, outer, t) {
   return inner + (outer - inner) * t;
 }
-function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
+function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options2) {
   if (stops.length === 0) {
     return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"/>';
   }
@@ -3747,7 +3747,7 @@ function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
   const rects = [];
   const alphaRects = [];
   const masked = sorted.some((stop) => (stop.opacity ?? 1) < 1);
-  const bands = options?.bands;
+  const bands = options2?.bands;
   if (!Number.isInteger(bands) || bands < 1) throw new RangeError("Invalid gradient band count");
   for (let i = bands; i >= 0; i -= 1) {
     const t = i / bands;
@@ -3881,13 +3881,297 @@ function groupRowsByCategory(rawCategories) {
   return { uniqueCategories, rowIndexesByCategory };
 }
 
+// chart/number-format-pattern.ts
+var NAMED_FORMAT_COLORS = {
+  black: "#000000",
+  blue: "#0000FF",
+  cyan: "#00FFFF",
+  green: "#00FF00",
+  magenta: "#FF00FF",
+  red: "#FF0000",
+  white: "#FFFFFF",
+  yellow: "#FFFF00"
+};
+var PLACEHOLDER = /[0#?]/u;
+function parsePattern(code) {
+  let scale = 1;
+  let scientific = false;
+  let color;
+  const chars = [];
+  let inQuotes = false;
+  for (let i = 0; i < code.length; i += 1) {
+    const ch = code[i] ?? "";
+    if (ch === '"') {
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (inQuotes) {
+      chars.push({ ch, literal: true });
+      continue;
+    }
+    if (ch === "\\" || ch === "*" || ch === "_") {
+      const next = code[i + 1];
+      i += 1;
+      if (ch === "\\" && next !== void 0) {
+        chars.push({ ch: next, literal: true });
+      }
+      continue;
+    }
+    if (ch === "%") {
+      scale *= 100;
+      chars.push({ ch, literal: true });
+      continue;
+    }
+    if (ch === "E" && (code[i + 1] === "+" || code[i + 1] === "-")) {
+      scientific = true;
+      chars.push({ ch: "E", literal: false });
+      i += 1;
+      continue;
+    }
+    if (ch === "[") {
+      const close = code.indexOf("]", i);
+      const token = code.slice(i + 1, close === -1 ? code.length : close);
+      const named3 = NAMED_FORMAT_COLORS[token.trim().toLowerCase()];
+      if (named3 && color === void 0) {
+        color = named3;
+      }
+      i = close === -1 ? code.length : close;
+      continue;
+    }
+    chars.push({ ch, literal: false });
+  }
+  const firstDigit = chars.findIndex((c) => !c.literal && PLACEHOLDER.test(c.ch));
+  if (firstDigit === -1) {
+    return void 0;
+  }
+  let lastDigit = firstDigit;
+  for (let i = chars.length - 1; i >= firstDigit; i -= 1) {
+    const c = chars[i];
+    if (c && !c.literal && (PLACEHOLDER.test(c.ch) || c.ch === "." || c.ch === "," || c.ch === "E")) {
+      lastDigit = i;
+      break;
+    }
+  }
+  const numeric = chars.slice(firstDigit, lastDigit + 1);
+  const prefix = chars.slice(0, firstDigit).map((c) => c.ch).join("");
+  const suffix = chars.slice(lastDigit + 1).map((c) => c.ch).join("");
+  let grouped = false;
+  let intDigits = 0;
+  let required = 0;
+  let optional = 0;
+  let afterPoint = false;
+  let inExponent = false;
+  for (let i = 0; i < numeric.length; i += 1) {
+    const { ch, literal } = numeric[i] ?? { ch: "", literal: true };
+    if (literal) {
+      continue;
+    }
+    if (ch === "E") {
+      inExponent = true;
+      continue;
+    }
+    if (inExponent) {
+      continue;
+    }
+    if (ch === ".") {
+      afterPoint = true;
+      continue;
+    }
+    if (ch === ",") {
+      const next = numeric.slice(i + 1).find((c) => !c.literal);
+      if (!next || next.ch === "." || !PLACEHOLDER.test(next.ch)) {
+        scale /= 1e3;
+      } else {
+        grouped = true;
+      }
+      continue;
+    }
+    if (!PLACEHOLDER.test(ch)) {
+      continue;
+    }
+    if (afterPoint) {
+      if (ch === "0") {
+        required += 1;
+      } else {
+        optional += 1;
+      }
+    } else if (ch === "0") {
+      intDigits += 1;
+    }
+  }
+  return {
+    prefix,
+    suffix,
+    intDigits,
+    decimals: { required, optional },
+    grouped,
+    scale,
+    scientific,
+    color
+  };
+}
+function group(intPart) {
+  return intPart.replace(/\B(?=(\d{3})+(?!\d))/gu, ",");
+}
+function applyPattern(value, pattern, forcePositive) {
+  const scaled = value * pattern.scale;
+  const magnitude = forcePositive ? Math.abs(scaled) : scaled;
+  if (pattern.scientific) {
+    const digits = pattern.decimals.required + pattern.decimals.optional;
+    const exponential = magnitude.toExponential(digits);
+    const [mantissa = "", exponent = "0"] = exponential.split("e");
+    const sign = exponent.startsWith("-") ? "-" : "+";
+    const power = Math.abs(Number(exponent)).toString().padStart(2, "0");
+    return `${pattern.prefix}${mantissa}E${sign}${power}${pattern.suffix}`;
+  }
+  const maxDecimals = pattern.decimals.required + pattern.decimals.optional;
+  let body = magnitude.toFixed(maxDecimals);
+  if (pattern.decimals.optional > 0) {
+    body = body.replace(/(\.\d*?)0+$/u, "$1").replace(/\.$/u, "");
+    const [, frac = ""] = body.split(".");
+    if (frac.length < pattern.decimals.required) {
+      body = Number(body).toFixed(pattern.decimals.required);
+    }
+  }
+  const [rawIntPart = "", fracPart] = body.split(".");
+  let intPart = rawIntPart;
+  const hasMinusChar = intPart.startsWith("-");
+  const negative = hasMinusChar && Number(body) !== 0;
+  if (hasMinusChar) {
+    intPart = intPart.slice(1);
+  }
+  if (intPart.length < pattern.intDigits) {
+    intPart = intPart.padStart(pattern.intDigits, "0");
+  }
+  if (pattern.intDigits === 0 && intPart === "0" && fracPart !== void 0) {
+    intPart = "";
+  }
+  if (pattern.grouped) {
+    intPart = group(intPart);
+  }
+  const number = fracPart === void 0 ? intPart : `${intPart}.${fracPart}`;
+  return `${negative ? "-" : ""}${pattern.prefix}${number}${pattern.suffix}`;
+}
+
+// chart/number-format.ts
+var GENERAL = /* @__PURE__ */ new Set(["", "general", "@"]);
+function sections(code) {
+  const out = [];
+  let current = "";
+  let inQuotes = false;
+  for (let i = 0; i < code.length; i += 1) {
+    const ch = code[i];
+    if (ch === '"') {
+      inQuotes = !inQuotes;
+      current += ch;
+      continue;
+    }
+    if (ch === "\\") {
+      current += ch + (code[i + 1] ?? "");
+      i += 1;
+      continue;
+    }
+    if (ch === ";" && !inQuotes) {
+      out.push(current);
+      current = "";
+      continue;
+    }
+    current += ch;
+  }
+  out.push(current);
+  return out;
+}
+function sectionFor(value, parts) {
+  if (parts.length === 1) {
+    return { code: parts[0] ?? "", forcePositive: false };
+  }
+  if (value < 0 && parts[1] !== void 0) {
+    return { code: parts[1] ?? "", forcePositive: true };
+  }
+  if (value === 0 && parts[2] !== void 0) {
+    return { code: parts[2] ?? "", forcePositive: false };
+  }
+  return { code: parts[0] ?? "", forcePositive: false };
+}
+function formatChartNumberWithColor(value, formatCode) {
+  if (!Number.isFinite(value)) {
+    return void 0;
+  }
+  const code = (formatCode ?? "").trim();
+  if (GENERAL.has(code.toLowerCase())) {
+    return void 0;
+  }
+  if (/(?:^|[^\\"])(?:yy|mm?m|dd?|hh|ss)/iu.test(code) && !/[0#?]/u.test(code)) {
+    return void 0;
+  }
+  const { code: section, forcePositive } = sectionFor(value, sections(code));
+  const pattern = parsePattern(section);
+  if (!pattern) {
+    return void 0;
+  }
+  try {
+    return { text: applyPattern(value, pattern, forcePositive), color: pattern.color };
+  } catch {
+    return void 0;
+  }
+}
+function formatChartNumber(value, formatCode) {
+  return formatChartNumberWithColor(value, formatCode)?.text;
+}
+
+// chart/data-label-text.ts
+var DATA_LABEL_SEPARATOR = ", ";
+var DATA_LABEL_CATEGORY_PERCENT_SEPARATOR = "\n";
+var FLAG_KEYS = [
+  "showValue",
+  "showCategory",
+  "showSeriesName",
+  "showPercent",
+  "showBubbleSize"
+];
+function resolveDataLabelFlags(levels) {
+  const { point, series, chart } = levels;
+  const picked = {};
+  for (const key of FLAG_KEYS) picked[key] = point?.[key] ?? series?.[key] ?? chart?.[key];
+  const anyDeclared = FLAG_KEYS.some((key) => picked[key] !== void 0);
+  return {
+    showValue: anyDeclared ? picked.showValue === true : levels.siblingOwnsLabels !== true,
+    showCategory: picked.showCategory === true,
+    showSeriesName: picked.showSeriesName === true,
+    showPercent: picked.showPercent === true,
+    showBubbleSize: picked.showBubbleSize === true,
+    separator: point?.separator ?? series?.separator ?? chart?.separator ?? (picked.showCategory === true && picked.showPercent === true ? DATA_LABEL_CATEGORY_PERCENT_SEPARATOR : DATA_LABEL_SEPARATOR)
+  };
+}
+function composeDataLabelText(input) {
+  const { flags, value, numberFormat } = input;
+  const parts = [];
+  let valueColor;
+  if (flags.showSeriesName && input.seriesName) parts.push(input.seriesName);
+  if (flags.showCategory && input.category) parts.push(input.category);
+  if (flags.showValue) {
+    const formatted = formatChartNumberWithColor(value, numberFormat);
+    parts.push(formatted?.text ?? (input.formatValue ?? String)(value, numberFormat));
+    valueColor = formatted?.color;
+  }
+  if (flags.showPercent) {
+    const base = input.percentBase;
+    parts.push(base > 0 ? `${Math.round(Math.abs(value) / base * 100)}%` : "0%");
+  }
+  if (flags.showBubbleSize && input.bubbleSize !== void 0)
+    parts.push((input.formatBubbleSize ?? String)(input.bubbleSize));
+  const text2 = parts.join(flags.separator);
+  if (text2.length === 0) return void 0;
+  return { text: text2, color: parts.length === 1 && flags.showValue ? valueColor : void 0 };
+}
+
 // chart/bubble-radius.ts
-function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options) {
-  const scale = (options?.bubbleScale ?? 100) / 100;
+function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options2) {
+  const scale = (options2?.bubbleScale ?? 100) / 100;
   if (sizeVal === void 0) return medianRadius * scale;
   const denom = maxBubble > 0 ? maxBubble : 1;
   const magnitude = Math.abs(sizeVal);
-  const ratio = (options?.sizeRepresents ?? "w") === "area" ? Math.sqrt(magnitude) / Math.sqrt(denom) : magnitude / denom;
+  const ratio = (options2?.sizeRepresents ?? "w") === "area" ? Math.sqrt(magnitude) / Math.sqrt(denom) : magnitude / denom;
   return medianRadius * scale * 0.5 + ratio * medianRadius * scale * 1.5;
 }
 function maxBubbleSize(sizes) {
@@ -3993,10 +4277,10 @@ function squarify(nodes, box) {
 
 // chart/hierarchy.ts
 function normalizeLevels(levels, pointCount) {
-  return levels.map((level) => {
+  return levels.map((level2) => {
     let previous = "";
     return Array.from({ length: pointCount }, (_, index) => {
-      const label = level[index]?.trim() ?? "";
+      const label = level2[index]?.trim() ?? "";
       if (label) previous = label;
       return label || previous;
     });
@@ -4154,12 +4438,12 @@ function computeSunburstArcs(series, cx, cy, maxR) {
   });
   return out;
 }
-function hierarchyKey(levels, level, index) {
-  return levels.slice(level).map((labels) => labels[index] ?? "").join("\0");
+function hierarchyKey(levels, level2, index) {
+  return levels.slice(level2).map((labels) => labels[index] ?? "").join("\0");
 }
 function computeHierarchicalSunburstArcs(categoryLevels, values, cx, cy, maxR) {
-  const levels = categoryLevels.filter((level) => level.length > 0);
-  const leafCount = Math.max(values.length, ...levels.map((level) => level.length), 0);
+  const levels = categoryLevels.filter((level2) => level2.length > 0);
+  const leafCount = Math.max(values.length, ...levels.map((level2) => level2.length), 0);
   if (levels.length === 0 || leafCount === 0) return [];
   const rawWeights = Array.from({ length: leafCount }, (_, index) => Math.abs(values[index] ?? 0));
   const weights = rawWeights.some((value) => value !== 0) ? rawWeights : rawWeights.map(() => 1);
@@ -4170,15 +4454,15 @@ function computeHierarchicalSunburstArcs(categoryLevels, values, cx, cy, maxR) {
   const rootLabels = levels[levels.length - 1] ?? [];
   const rootColors = /* @__PURE__ */ new Map();
   const out = [];
-  for (let level = levels.length - 1; level >= 0; level--) {
-    const ringIndex = levels.length - 1 - level;
+  for (let level2 = levels.length - 1; level2 >= 0; level2--) {
+    const ringIndex = levels.length - 1 - level2;
     const innerRadius = ringWidth * (ringIndex + 0.5);
     const outerRadius = ringWidth * (ringIndex + 1.5);
     let start = 0;
     while (start < leafCount) {
-      const key = hierarchyKey(levels, level, start);
+      const key = hierarchyKey(levels, level2, start);
       let end = start + 1;
-      while (end < leafCount && hierarchyKey(levels, level, end) === key) end++;
+      while (end < leafCount && hierarchyKey(levels, level2, end) === key) end++;
       const startAngle = -Math.PI / 2 + (prefix[start] ?? 0) / total * Math.PI * 2;
       const endAngle = -Math.PI / 2 + (prefix[end] ?? 0) / total * Math.PI * 2;
       const rootLabel = rootLabels[start] ?? "";
@@ -4188,8 +4472,8 @@ function computeHierarchicalSunburstArcs(categoryLevels, values, cx, cy, maxR) {
         colorIndex: rootColors.get(rootLabel) ?? start,
         opacity: Math.max(0.1, 0.9 - ringIndex * 0.1),
         level: ringIndex,
-        label: levels[level]?.[start] ?? "",
-        ...level === 0 && end === start + 1 ? { pointIndex: start } : {},
+        label: levels[level2]?.[start] ?? "",
+        ...level2 === 0 && end === start + 1 ? { pointIndex: start } : {},
         ...arcLabelPlacement(cx, cy, (innerRadius + outerRadius) / 2, startAngle, endAngle)
       });
       start = end;
@@ -4215,14 +4499,14 @@ function scottBinCount(values, min, max) {
   const width = 3.49 * sd * values.length ** (-1 / 3);
   return Math.max(1, Math.ceil((max - min) / width));
 }
-function computeHistogramBins(values, options, format = String) {
-  const closed = options.intervalClosed ?? "l";
+function computeHistogramBins(values, options2, format = String) {
+  const closed = options2.intervalClosed ?? "l";
   const finite2 = values.map((value, sourceIndex) => ({ value, sourceIndex })).filter((item) => Number.isFinite(item.value));
   if (finite2.length === 0) {
     return [];
   }
-  const underflow = typeof options.underflow === "number" ? options.underflow : void 0;
-  const overflow = typeof options.overflow === "number" ? options.overflow : void 0;
+  const underflow = typeof options2.underflow === "number" ? options2.underflow : void 0;
+  const overflow = typeof options2.overflow === "number" ? options2.overflow : void 0;
   const under = underflow === void 0 ? [] : finite2.filter(
     (item) => closed === "r" ? item.value <= underflow : item.value < underflow
   );
@@ -4239,8 +4523,8 @@ function computeHistogramBins(values, options, format = String) {
   if (regular.length > 0) {
     const min = Math.min(...regular.map((item) => item.value));
     const max = Math.max(...regular.map((item) => item.value));
-    const requestedSize = options.binSize && options.binSize > 0 ? options.binSize : void 0;
-    const requestedCount = options.binCount && options.binCount > 0 ? options.binCount : void 0;
+    const requestedSize = options2.binSize && options2.binSize > 0 ? options2.binSize : void 0;
+    const requestedCount = options2.binCount && options2.binCount > 0 ? options2.binCount : void 0;
     const start = requestedSize ? Math.floor(min / requestedSize) * requestedSize : min;
     const count = requestedSize ? Math.max(
       closed === "l" ? Math.floor((max - start) / requestedSize) + 1 : Math.ceil((max - start) / requestedSize),
@@ -4291,9 +4575,9 @@ function aggregateByCategory(values, rawCategories) {
 }
 
 // chart/waterfall.ts
-function buildWaterfallSteps(values, options) {
+function buildWaterfallSteps(values, options2) {
   const subtotalIndices = new Set(
-    options?.subtotalIndices ?? (values.length > 0 ? [values.length - 1] : [])
+    options2?.subtotalIndices ?? (values.length > 0 ? [values.length - 1] : [])
   );
   const steps = [];
   let runningTotal = 0;
@@ -4353,13 +4637,13 @@ var noFit = () => ({
   rSquared: 0,
   coefficients: []
 });
-function fitModel(options, xVals, yVals) {
+function fitModel(options2, xVals, yVals) {
   const xs = [...xVals];
   const ys = [...yVals];
-  switch (options.kind) {
+  switch (options2.kind) {
     case "linear": {
       const reg = computeLinearRegression(xs, ys);
-      const fixed = options.intercept;
+      const fixed = options2.intercept;
       const slope = fixed !== void 0 ? ys.reduce((s, y, i) => s + (y - fixed) * xs[i], 0) / xs.reduce((s, x) => s + x * x, 0) : reg.slope;
       const b = fixed ?? reg.intercept;
       return {
@@ -4409,7 +4693,7 @@ function fitModel(options, xVals, yVals) {
       };
     }
     case "polynomial": {
-      const order = Math.min(options.order ?? 2, 6);
+      const order = Math.min(options2.order ?? 2, 6);
       const coeffs = fitPolynomial(xs, ys, order);
       const evaluate = (x) => coeffs.reduce((s, c, i) => s + c * x ** i, 0);
       return {
@@ -4423,11 +4707,11 @@ function fitModel(options, xVals, yVals) {
       return void 0;
   }
 }
-function fitChartTrendline(options, xVals, yVals) {
+function fitChartTrendline(options2, xVals, yVals) {
   const count = yVals.length;
   if (count < 2) return noFit();
-  if (options.kind === "movingAvg") {
-    const period = options.period ?? 2;
+  if (options2.kind === "movingAvg") {
+    const period = options2.period ?? 2;
     const points2 = [];
     for (let i = period - 1; i < count; i++) {
       let sum = 0;
@@ -4436,10 +4720,10 @@ function fitChartTrendline(options, xVals, yVals) {
     }
     return { points: points2, equation: `${period}-period moving average`, rSquared: 0, coefficients: [] };
   }
-  const model = fitModel(options, xVals, yVals);
+  const model = fitModel(options2, xVals, yVals);
   if (!model) return noFit();
-  const startX = Math.min(...xVals) - (options.backward ?? 0);
-  const endX = Math.max(...xVals) + (options.forward ?? 0);
+  const startX = Math.min(...xVals) - (options2.backward ?? 0);
+  const endX = Math.max(...xVals) + (options2.forward ?? 0);
   const steps = Math.max(Math.ceil((endX - startX) * 4), 20);
   const points = [];
   for (let step = 0; step <= steps; step++) {
@@ -4462,19 +4746,78 @@ function chartSampleVariance(values) {
   const mean = values.reduce((sum, value) => sum + value, 0) / count;
   return values.reduce((sum, value) => sum + (value - mean) ** 2, 0) / Math.max(count - 1, 1);
 }
-function chartErrorBarAmount(options, values, displayIndex, sourceIndex, side) {
-  switch (options.valueType) {
+function chartErrorBarAmount(options2, values, displayIndex, sourceIndex, side) {
+  switch (options2.valueType) {
     case "fixedVal":
-      return options.value ?? 0;
+      return options2.value ?? 0;
     case "percentage":
-      return Math.abs(values[displayIndex] ?? 0) * ((options.value ?? 0) / 100);
+      return Math.abs(values[displayIndex] ?? 0) * ((options2.value ?? 0) / 100);
     case "stdDev":
-      return Math.sqrt(chartSampleVariance(values)) * (options.value ?? 1);
+      return Math.sqrt(chartSampleVariance(values)) * (options2.value ?? 1);
     case "stdErr":
       return Math.sqrt(chartSampleVariance(values) / Math.max(values.length, 1));
     case "cust":
-      return side === "plus" ? options.customPlus?.[sourceIndex] ?? 0 : options.customMinus?.[sourceIndex] ?? 0;
+      return side === "plus" ? options2.customPlus?.[sourceIndex] ?? 0 : options2.customMinus?.[sourceIndex] ?? 0;
+  }
+}
+
+// chart/pie-best-fit.ts
+var PX_PER_PT = 4 / 3;
+var BEST_FIT_RIM_INSET = 4 * PX_PER_PT;
+var BEST_FIT_EDGE_TOLERANCE = 1.5 * PX_PER_PT;
+var BEST_FIT_OUTSIDE_GAP = 2 * PX_PER_PT;
+function farCorner(x, y, w, h) {
+  return Math.hypot(Math.abs(x) + w / 2, Math.abs(y) + h / 2);
+}
+function insideDistance(ux, uy, w, h, limit) {
+  if (farCorner(0, 0, w, h) > limit) {
+    return void 0;
+  }
+  let lo = 0;
+  let hi = limit;
+  for (let i = 0; i < 40; i++) {
+    const mid = (lo + hi) / 2;
+    if (farCorner(mid * ux, mid * uy, w, h) > limit) {
+      hi = mid;
+    } else {
+      lo = mid;
+    }
+  }
+  return lo;
+}
+function edgeOverhang(x, y, w, h, slice) {
+  let worst = Number.NEGATIVE_INFINITY;
+  const corners = [
+    [-w / 2, -h / 2],
+    [w / 2, -h / 2],
+    [-w / 2, h / 2],
+    [w / 2, h / 2]
+  ];
+  for (const [dx, dy] of corners) {
+    const px = x + dx;
+    const py = y + dy;
+    const fromStart = Math.cos(slice.startAngle) * py - Math.sin(slice.startAngle) * px;
+    const fromEnd = Math.sin(slice.endAngle) * px - Math.cos(slice.endAngle) * py;
+    worst = Math.max(worst, -fromStart, -fromEnd);
   }
+  return worst;
+}
+function placeBestFitLabel(slice, w, h) {
+  const mid = (slice.startAngle + slice.endAngle) / 2;
+  const ux = Math.cos(mid);
+  const uy = Math.sin(mid);
+  const distance = insideDistance(ux, uy, w, h, slice.outerR - BEST_FIT_RIM_INSET);
+  if (distance !== void 0) {
+    const x = distance * ux;
+    const y = distance * uy;
+    const reflex = slice.endAngle - slice.startAngle >= Math.PI;
+    if (reflex || edgeOverhang(x, y, w, h, slice) <= BEST_FIT_EDGE_TOLERANCE) {
+      return { x: slice.cx + x, y: slice.cy + y, inside: true };
+    }
+  }
+  const extent = Math.abs(ux) * w / 2 + Math.abs(uy) * h / 2;
+  const outside = slice.outerR + BEST_FIT_OUTSIDE_GAP + extent;
+  return { x: slice.cx + outside * ux, y: slice.cy + outside * uy, inside: false };
 }
 
 // chart/color-palettes.ts
@@ -4835,6 +5178,191 @@ function drawingLineXml(line2) {
   return buildXml(doc);
 }
 
+// chart/marker-shape.ts
+var CHART_PX_PER_PT = 4 / 3;
+var DEFAULT_MARKER_OUTLINE_PT = 0.75;
+var AUTOMATIC_MARKER_CYCLE = [
+  "diamond",
+  "square",
+  "triangle",
+  "x",
+  "star",
+  "circle",
+  "plus",
+  "dot",
+  "dash"
+];
+function automaticMarkerSymbol(seriesIdx) {
+  const length = AUTOMATIC_MARKER_CYCLE.length;
+  const normalized = (Math.trunc(seriesIdx) % length + length) % length;
+  return AUTOMATIC_MARKER_CYCLE[Number.isFinite(normalized) ? normalized : 0];
+}
+function markerRadius(size, defaultRadius) {
+  if (size === void 0 || !Number.isFinite(size) || size <= 0) {
+    return defaultRadius;
+  }
+  return size / 2;
+}
+function polygonPoints(vertices) {
+  return vertices.map(([x, y]) => `${x.toFixed(2)},${y.toFixed(2)}`).join(" ");
+}
+function starVertices(cx, cy, r) {
+  const inner = r * 0.5;
+  const out = [];
+  for (let i = 0; i < 10; i++) {
+    const radius = i % 2 === 0 ? r : inner;
+    const angle = -Math.PI / 2 + Math.PI * i / 5;
+    out.push([cx + radius * Math.cos(angle), cy + radius * Math.sin(angle)]);
+  }
+  return out;
+}
+function rectPolygon(x, y, w, h) {
+  return polygonPoints([
+    [x, y],
+    [x + w, y],
+    [x + w, y + h],
+    [x, y + h]
+  ]);
+}
+function buildMarkerPrimitive(input) {
+  const { symbol, cx, cy, fill } = input;
+  const part = input.part === void 0 ? {} : { part: input.part };
+  if (symbol === "none") {
+    return null;
+  }
+  const r = markerRadius(input.size, input.defaultRadius);
+  const outline2 = input.stroke ? {
+    stroke: input.stroke,
+    strokeWidth: input.strokeWidth ?? DEFAULT_MARKER_OUTLINE_PT * CHART_PX_PER_PT
+  } : void 0;
+  const polygonStroke = outline2 ?? { stroke: fill, strokeWidth: 0 };
+  const lineStroke = input.stroke ?? fill;
+  switch (symbol) {
+    case "square":
+    case "dash": {
+      const h = symbol === "dash" ? r * 0.64 : r * 2;
+      const y = cy - h / 2;
+      if (outline2) {
+        return {
+          kind: "polygon",
+          points: rectPolygon(cx - r, y, r * 2, h),
+          fill,
+          ...outline2,
+          ...part
+        };
+      }
+      return { kind: "rect", x: cx - r, y, w: r * 2, h, fill, ...part };
+    }
+    case "diamond":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx, cy - r],
+          [cx + r, cy],
+          [cx, cy + r],
+          [cx - r, cy]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "triangle":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx, cy - r],
+          [cx + r * 0.9, cy + r * 0.75],
+          [cx - r * 0.9, cy + r * 0.75]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "star":
+      return {
+        kind: "polygon",
+        points: polygonPoints(starVertices(cx, cy, r)),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "plus":
+      return {
+        kind: "path",
+        d: `M${(cx - r).toFixed(2)},${cy.toFixed(2)} L${(cx + r).toFixed(2)},${cy.toFixed(2)} M${cx.toFixed(2)},${(cy - r).toFixed(2)} L${cx.toFixed(2)},${(cy + r).toFixed(2)}`,
+        fill: "none",
+        stroke: lineStroke,
+        strokeWidth: Math.max(1, r * 0.4),
+        ...part
+      };
+    case "x":
+      return {
+        kind: "path",
+        d: `M${(cx - r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx + r).toFixed(2)},${(cy + r).toFixed(2)} M${(cx + r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx - r).toFixed(2)},${(cy + r).toFixed(2)}`,
+        fill: "none",
+        stroke: lineStroke,
+        strokeWidth: Math.max(1, r * 0.4),
+        ...part
+      };
+    case "dot":
+      return { kind: "circle", cx, cy, r: Math.max(r * 0.6, 1), fill, ...part, ...outline2 };
+    default:
+      return { kind: "circle", cx, cy, r, fill, ...part, ...outline2 };
+  }
+}
+
+// chart/render/chart-view-markers.ts
+function summaryMarkers(source, group2, seriesPosition) {
+  if (!["line", "scatter", "radar"].includes(group2.kind)) return {};
+  const enabled2 = group2.kind === "line" ? group2.marker === true : group2.kind === "radar" ? group2.radarStyle === "marker" : !["line", "smooth", "none"].includes(group2.scatterStyle ?? "marker");
+  const symbol = source.marker?.symbol;
+  const marker = {
+    ...source.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source.marker || enabled2 ? automaticMarkerSymbol(source.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point of source.dataPoints) {
+    if (point.index === void 0 || !point.marker) continue;
+    const override = point.marker;
+    pointMarkers[point.index] = {
+      ...marker,
+      ...override,
+      ...override.symbol === "auto" || !source.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source.index ?? seriesPosition) } : {},
+      ...marker.spPr || override.spPr ? {
+        spPr: {
+          ...marker.spPr,
+          ...override.spPr,
+          ...marker.spPr?.line || override.spPr?.line ? { line: { ...marker.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
+function seriesMarkerViews(source, drawingColor) {
+  const fillColor = (fill) => fill?.kind === "none" ? "none" : fill?.kind === "solid" ? drawingColor(fill.color) : void 0;
+  const resolve = (marker) => {
+    const fill = fillColor(marker.spPr?.fill);
+    const stroke = fillColor(marker.spPr?.line?.fill);
+    const width = marker.spPr?.line?.widthEmu;
+    return {
+      ...marker.symbol !== void 0 ? { symbol: marker.symbol } : {},
+      ...marker.size !== void 0 ? { size: marker.size } : {},
+      ...fill !== void 0 ? { fill } : {},
+      ...stroke !== void 0 ? { stroke } : {},
+      ...width !== void 0 ? { strokeWidth: width / 9525 } : {}
+    };
+  };
+  return {
+    ...source.marker ? { marker: resolve(source.marker) } : {},
+    ...source.pointMarkers ? {
+      pointMarkers: Object.fromEntries(
+        Object.entries(source.pointMarkers).map(([i, marker]) => [i, resolve(marker)])
+      )
+    } : {}
+  };
+}
+
 // chart/render/summary-analysis.ts
 function summaryTrendline(source) {
   const kind = chartTrendlineKind(source.trendlineType);
@@ -4875,6 +5403,41 @@ function summaryAnalysis(series) {
   };
 }
 
+// chart/render/summary-labels.ts
+function level(options2, custom) {
+  const out = {};
+  if (options2.deleted !== void 0) out.deleted = options2.deleted;
+  if (options2.showValue !== void 0) out.showValue = options2.showValue;
+  if (options2.showCategoryName !== void 0) out.showCategory = options2.showCategoryName;
+  if (options2.showSeriesName !== void 0) out.showSeriesName = options2.showSeriesName;
+  if (options2.showPercent !== void 0) out.showPercent = options2.showPercent;
+  if (options2.showBubbleSize !== void 0) out.showBubbleSize = options2.showBubbleSize;
+  if (options2.separator !== void 0) out.separator = options2.separator;
+  if (options2.position) out.position = options2.position;
+  if (options2.numberFormat?.formatCode) out.numberFormat = options2.numberFormat.formatCode;
+  if (custom?.text !== void 0) out.text = custom.text;
+  return out;
+}
+function shows(levels, point) {
+  const flags = resolveDataLabelFlags({ ...levels, ...point ? { point } : {} });
+  return point?.text !== void 0 || Object.values(flags).some((value) => value === true);
+}
+function summaryDataLabels(series, group2) {
+  const own2 = series.dataLabels;
+  if (!own2 && !group2) return void 0;
+  const out = {};
+  if (group2) out.chart = level(group2);
+  if (own2) out.series = level(own2);
+  const points = {};
+  for (const labels of [group2, own2])
+    for (const label of labels?.labels ?? [])
+      if (label.index !== void 0)
+        points[label.index] = { ...points[label.index], ...level(label, label.tx) };
+  if (Object.keys(points).length) out.points = points;
+  if (!shows(out) && !Object.values(points).some((point) => shows(out, point))) return void 0;
+  return out;
+}
+
 // chart/render/summary-from-space.ts
 var solidColor = (fill) => fill?.kind === "solid" ? fill.color : void 0;
 var isSolidFill = (fill) => fill?.kind === "solid" || fill?.kind === "unsupported" && fill.element === "solidFill";
@@ -4892,7 +5455,7 @@ var GROUP_TYPES = {
   surface: "surface"
 };
 var GROUPINGS = /* @__PURE__ */ new Set(["clustered", "stacked", "percentStacked", "standard"]);
-function chartSummarySeries(source, chartType) {
+function chartSummarySeries(source, chartType, groupLabels) {
   const categories = source.categories ?? source.xValues;
   const values = source.values ?? source.yValues;
   const numeric = (v) => typeof v === "number" ? v : v === "" ? null : Number.isFinite(Number(v)) ? Number(v) : null;
@@ -4900,6 +5463,7 @@ function chartSummarySeries(source, chartType) {
     categories: chartSourceValues(categories),
     values: chartSourceValues(values).map(numeric)
   };
+  if (values?.cache?.formatCode !== void 0) out.numberFormat = values.cache.formatCode;
   if (source.bubbleSizes) {
     out.bubbleSizes = chartSourceValues(source.bubbleSizes).map(numeric);
     if (source.bubbleSizes.formula) out.bubbleSizesRef = source.bubbleSizes.formula;
@@ -4928,6 +5492,8 @@ function chartSummarySeries(source, chartType) {
   }
   if (Object.keys(points).length) out.pointColors = points;
   if (Object.keys(pointFills).length) out.pointFills = pointFills;
+  const dataLabels = summaryDataLabels(source, groupLabels);
+  if (dataLabels) out.dataLabels = dataLabels;
   Object.assign(out, summaryAnalysis(source));
   return out;
 }
@@ -4936,12 +5502,12 @@ function valueAxisId(chartSpace, axisIds) {
     (id) => chartSpace.plotArea.axes.some((a) => a.id === id && a.kind === "val")
   );
 }
-function stockStyle(group) {
+function stockStyle(group2) {
   return {
-    ...group.hiLowLinesSpPr ? { hiLowLines: group.hiLowLinesSpPr } : {},
-    ...group.upBars?.spPr ? { upBars: group.upBars.spPr } : {},
-    ...group.downBars?.spPr ? { downBars: group.downBars.spPr } : {},
-    ...group.upDownBarsGapWidth === void 0 ? {} : { gapWidth: group.upDownBarsGapWidth }
+    ...group2.hiLowLinesSpPr ? { hiLowLines: group2.hiLowLinesSpPr } : {},
+    ...group2.upBars?.spPr ? { upBars: group2.upBars.spPr } : {},
+    ...group2.downBars?.spPr ? { downBars: group2.downBars.spPr } : {},
+    ...group2.upDownBarsGapWidth === void 0 ? {} : { gapWidth: group2.upDownBarsGapWidth }
   };
 }
 function extraGroups(chartSpace, firstType) {
@@ -4949,54 +5515,62 @@ function extraGroups(chartSpace, firstType) {
   if (!first3 || !["column", "line", "area"].includes(firstType)) return [];
   const primary = valueAxisId(chartSpace, first3.axisIds);
   const out = [];
-  for (const group of rest) {
-    const stockOverColumns = group.kind === "stock" && firstType === "column";
-    if (group.is3D || !(["bar", "line", "area"].includes(group.kind) || stockOverColumns)) continue;
-    const type = group.kind === "bar" ? "column" : group.kind;
+  for (const group2 of rest) {
+    const stockOverColumns = group2.kind === "stock" && firstType === "column";
+    if (group2.is3D || !(["bar", "line", "area"].includes(group2.kind) || stockOverColumns)) continue;
+    const type = group2.kind === "bar" ? "column" : group2.kind;
     const entry = {
       chartType: type,
-      series: group.series.map((source) => chartSummarySeries(source, type)),
-      secondary: valueAxisId(chartSpace, group.axisIds) !== primary
+      series: group2.series.map((source, index) => ({
+        ...chartSummarySeries(source, type, group2.dataLabels),
+        ...summaryMarkers(source, group2, index)
+      })),
+      secondary: valueAxisId(chartSpace, group2.axisIds) !== primary
     };
-    if (group.grouping && GROUPINGS.has(group.grouping))
-      entry.grouping = group.grouping;
-    if (type === "stock") entry.stock = stockStyle(group);
+    if (group2.grouping && GROUPINGS.has(group2.grouping))
+      entry.grouping = group2.grouping;
+    if (type === "stock") entry.stock = stockStyle(group2);
     if (type === "column") {
-      if (group.gapWidth !== void 0) entry.barGapWidth = group.gapWidth;
-      if (group.overlap !== void 0) entry.barOverlap = group.overlap;
+      if (group2.gapWidth !== void 0) entry.barGapWidth = group2.gapWidth;
+      if (group2.overlap !== void 0) entry.barOverlap = group2.overlap;
     }
     if (entry.series.length) out.push(entry);
   }
   return out;
 }
 function chartSummaryFromSpace(chartSpace, extras = {}) {
-  const group = chartSpace.plotArea.groups[0];
-  let chartType = group ? GROUP_TYPES[group.kind] : "column";
-  if (chartType === "bar" && group?.barDirection !== "bar") chartType = "column";
-  const series = (group?.series ?? []).map((source) => chartSummarySeries(source, chartType));
+  const group2 = chartSpace.plotArea.groups[0];
+  let chartType = group2 ? GROUP_TYPES[group2.kind] : "column";
+  if (chartType === "bar" && group2?.barDirection !== "bar") chartType = "column";
+  const series = (group2?.series ?? []).map((source, index) => ({
+    ...chartSummarySeries(source, chartType, group2?.dataLabels),
+    ...group2 ? summaryMarkers(source, group2, index) : {}
+  }));
   const summary = {
     chartType,
     series,
-    showLegend: chartSpace.legend !== void 0
+    showLegend: chartSpace.legend !== void 0,
+    axes: chartSpace.plotArea.axes,
+    axisIds: group2?.axisIds ?? []
   };
   const combined = extraGroups(chartSpace, chartType);
   if (combined.length) summary.extraGroups = combined;
-  if (chartType === "stock" && group) summary.stock = stockStyle(group);
-  if (chartType === "bubble" && group) {
-    const sizeRepresents = group.sizeRepresents === "w" ? "w" : "area";
+  if (chartType === "stock" && group2) summary.stock = stockStyle(group2);
+  if (chartType === "bubble" && group2) {
+    const sizeRepresents = group2.sizeRepresents === "w" ? "w" : "area";
     summary.bubble = {
       sizeRepresents,
-      ...group.bubbleScale === void 0 ? {} : { bubbleScale: group.bubbleScale },
-      showNegativeBubbles: group.showNegativeBubbles === true
+      ...group2.bubbleScale === void 0 ? {} : { bubbleScale: group2.bubbleScale },
+      showNegativeBubbles: group2.showNegativeBubbles === true
     };
   }
-  const grouping = group?.grouping;
+  const grouping = group2?.grouping;
   if (grouping && GROUPINGS.has(grouping))
     summary.grouping = grouping;
   if (chartType === "bar" || chartType === "column") {
     for (const [value, field, fallback, min, max] of [
-      [group?.gapWidth, "barGapWidth", 150, 0, 500],
-      [group?.overlap, "barOverlap", 0, -100, 100]
+      [group2?.gapWidth, "barGapWidth", 150, 0, 500],
+      [group2?.overlap, "barOverlap", 0, -100, 100]
     ]) {
       const resolved = value ?? fallback;
       if (Number.isInteger(resolved) && resolved >= min && resolved <= max)
@@ -5058,72 +5632,438 @@ function chartBarSpacing(chart) {
   };
 }
 
-// chart/render/chart-svg-bars.ts
-function barLayout(model, frame) {
-  const count = Math.max(1, model.series.length);
-  const geometry2 = clusteredBarGeometry(frame.bandSize, count, chartBarSpacing(model));
-  const barSize = geometry2.singleBarWidth;
-  const offset = (si) => model.horizontal ? geometry2.clusterWidth / 2 - barSize - si * geometry2.step : -geometry2.clusterWidth / 2 + si * geometry2.step;
-  return { barSize, offset };
-}
-function bars(model, frame, out, values) {
-  const stacked = model.grouping === "stacked" || model.grouping === "percentStacked";
-  const { barSize, offset: barOffset } = barLayout(model, frame);
-  const base = frame.value(0);
-  const pos = new Array(model.categories.length).fill(0);
-  const neg = new Array(model.categories.length).fill(0);
-  model.series.forEach((s, si) => {
-    values[si]?.forEach((v, i) => {
-      if (v === null || i >= model.categories.length) return;
-      let from = 0;
-      let to = v;
-      if (stacked) {
-        const acc = v >= 0 ? pos : neg;
-        from = acc[i] ?? 0;
-        to = from + v;
-        acc[i] = to;
-      }
-      const a = stacked ? frame.value(from) : base;
-      const b = frame.value(to);
-      const offset = barOffset(si);
-      const center = frame.band(i);
-      const width = model.horizontal ? Math.abs(b - a) : barSize;
-      const height = model.horizontal ? barSize : Math.abs(b - a);
-      let color = s.pointColors?.[i] ?? s.color;
-      const gradient = s.pointGradients?.[i] ?? (s.pointColors?.[i] === void 0 ? s.gradient : void 0);
-      if (gradient && (gradient.path === "circle" || gradient.path === "shape")) {
-        const baseId = color.match(/^url\(#(.+)\)$/)?.[1];
-        if (baseId) {
-          const id = baseId.replace(/(-s\d+(?:-p\d+)?)$/, `-mark${i}$1`);
-          const def = buildChartGradientDef(id, gradient, {
-            width: Number(n(width)),
-            height: Number(n(height)),
-            shape: "rect"
-          });
-          out.push(`<defs>${chartGradientMarkup(def)}</defs>`);
-          color = `url(#${id})`;
-        }
-      }
-      out.push(`<g data-chart-series="${si}" data-chart-point="${i}">`);
-      if (model.horizontal)
-        out.push(
-          rect(Math.min(a, b), center + offset, Math.abs(b - a), barSize, color, s.shadowFilter)
-        );
-      else
-        out.push(
-          rect(center + offset, Math.min(a, b), barSize, Math.abs(b - a), color, s.shadowFilter)
-        );
-      out.push("</g>");
-    });
-  });
+// chart/render/theme-palette.ts
+var THEME_SLOTS = [
+  "lt1",
+  "dk1",
+  "lt2",
+  "dk2",
+  "accent1",
+  "accent2",
+  "accent3",
+  "accent4",
+  "accent5",
+  "accent6",
+  "hlink",
+  "folHlink"
+];
+var DEFAULT_THEME_COLORS = [
+  "FFFFFF",
+  "000000",
+  "E7E6E6",
+  "44546A",
+  "4472C4",
+  "ED7D31",
+  "A5A5A5",
+  "FFC000",
+  "5B9BD5",
+  "70AD47",
+  "0563C1",
+  "954F72"
+];
+function themeColor(theme, index) {
+  const hex = theme.colors[index] ?? DEFAULT_THEME_COLORS[index];
+  return hex && parseArgbHex(hex) ? hex.replace(/^#/, "") : void 0;
 }
 
-// chart/render/chart-svg-analysis.ts
-var DASHES = {
-  dot: [1, 3],
-  dash: [4, 3],
-  lgDash: [8, 3],
-  dashDot: [4, 3, 1, 3],
+// chart/render/chart-colors.ts
+function chartColorScheme(theme) {
+  const slots = Object.fromEntries(
+    THEME_SLOTS.map((slot, index) => [slot, `#${themeColor(theme, index) ?? "000000"}`])
+  );
+  return {
+    ...slots,
+    bg1: slots.lt1,
+    tx1: slots.dk1,
+    bg2: slots.lt2,
+    tx2: slots.dk2
+  };
+}
+function autoSeriesColor(theme, index) {
+  const i = Math.max(0, Math.floor(index));
+  return chartPaletteSeriesColor(findChartColorPalette(10), i, i + 1, chartColorScheme(theme));
+}
+
+// chart/text-inheritance.ts
+var TEXT_KEYS = [
+  "fontSize",
+  "bold",
+  "italic",
+  "underline",
+  "typeface",
+  "textColor",
+  "fontRef"
+];
+var TEXT_PARTS = [
+  "title",
+  "axisTitle",
+  "categoryAxis",
+  "valueAxis",
+  "legend",
+  "dataLabel"
+];
+function inheritChartText(part, entry, builtIn, root) {
+  if (!root || !TEXT_PARTS.includes(part)) return entry;
+  const out = { ...entry };
+  for (const key of TEXT_KEYS) {
+    delete out[key];
+    const value = root[key] ?? builtIn?.[key];
+    if (value !== void 0) Object.assign(out, { [key]: value });
+  }
+  if (part === "title" && root.fontSize !== void 0) out.fontSize = root.fontSize * 1.2;
+  if (root.textEffectsXml !== void 0) out.textEffectsXml = root.textEffectsXml;
+  return out;
+}
+
+// chart/render/chart-appearance.ts
+var chartPointsToPixels = (points) => points * EMU_PER_POINT / EMU_PER_PIXEL;
+function typeface(entry, theme) {
+  const name = entry.typeface;
+  if (name?.startsWith("+mj-")) return theme.majorFont;
+  if (name?.startsWith("+mn-")) return theme.minorFont;
+  return name ?? (entry.fontRef?.index === "major" ? theme.majorFont : entry.fontRef?.index === "minor" ? theme.minorFont : void 0);
+}
+function chartAppearance(chart, theme) {
+  const defaults = builtInChartTextStyle(effectiveBuiltInChartStyle(chart.formatting));
+  const entries = {};
+  for (const part of CHART_STYLE_PARTS) {
+    const base = chart.styleDefinition?.entries[part];
+    const direct = chart.formatting?.entries[part];
+    if (!defaults[part] && !base && !direct) continue;
+    const entry = {
+      ...inheritChartText(
+        part,
+        { ...defaults[part], ...base, sourceXml: base?.sourceXml ?? "" },
+        defaults[part],
+        chart.formatting?.textDefaults
+      ),
+      ...direct,
+      sourceXml: direct?.sourceXml ?? base?.sourceXml ?? ""
+    };
+    if (base?.line || direct?.line) entry.line = { ...base?.line, ...direct?.line };
+    entries[part] = entry;
+  }
+  const scheme = chartColorScheme(theme);
+  const resolve = (color) => resolveDrawingColor(
+    color,
+    { scheme: (name) => scheme[name] },
+    { hslRounding: "halfDown", transformOrder: "document" }
+  );
+  const out = resolveChartStyleDefinition(
+    { entries},
+    (color) => drawingColorCss(resolve(color))
+  ) ?? {};
+  for (const part of CHART_STYLE_PARTS) {
+    const entry = entries[part];
+    if (!entry) continue;
+    const family = typeface(entry, theme);
+    const shadow = resolveDrawingShadowXml(entry.textEffectsXml, {
+      scheme: (name) => scheme[name]
+    });
+    if (shadow) (out[part] ??= {}).textShadow = shadow;
+    if (family) (out[part] ??= {}).typeface = family;
+    if (entry.axisVisible !== void 0) (out[part] ??= {}).axisVisible = entry.axisVisible;
+    if (entry.labelsVisible !== void 0) (out[part] ??= {}).labelsVisible = entry.labelsVisible;
+    if (entry.line?.widthEmu === 0) (out[part] ??= {}).lineWidth = 0;
+    if (entry.fill?.kind === "gradient") {
+      (out[part] ??= {}).gradient = resolveChartGradient(entry.fill, resolve);
+    }
+  }
+  return out;
+}
+
+// text/css-font-family.ts
+var FALLBACKS = {
+  calibri: '"Calibri", "Carlito", "Segoe UI", Arial, sans-serif',
+  "calibri light": '"Calibri Light", "Calibri", "Carlito", "Segoe UI", Arial, sans-serif',
+  cambria: '"Cambria", "Caladea", Georgia, serif',
+  arial: 'Arial, "Liberation Sans", Helvetica, sans-serif',
+  "times new roman": '"Times New Roman", "Liberation Serif", Times, serif',
+  "courier new": '"Courier New", "Liberation Mono", monospace',
+  aptos: '"Aptos", "Calibri", "Carlito", "Segoe UI", sans-serif'
+};
+function cssFontFamily(name) {
+  const known = FALLBACKS[name.toLowerCase()];
+  if (known) return known;
+  const quoted = `"${name.replace(/["\\]/g, "")}"`;
+  return `${quoted}, "Calibri", "Carlito", "Segoe UI", sans-serif`;
+}
+
+// chart/render/chart-svg-appearance.ts
+var nextPaintId = 0;
+function chartGradientPaint(model, width = 1024, height = 768) {
+  const prefix = `xlsx-chart-${++nextPaintId}`;
+  const appearance = { ...model.appearance };
+  const defs = [];
+  const shadowPaint = (shadow, suffix) => {
+    const id = `${prefix}-${suffix}`;
+    const pad = Math.max(4, shadow.blur * 3 + Math.abs(shadow.dx) + Math.abs(shadow.dy));
+    defs.push(
+      `<filter id="${id}" filterUnits="userSpaceOnUse" x="${n(-pad)}" y="${n(-pad)}" width="${n(width + pad * 2)}" height="${n(height + pad * 2)}" color-interpolation-filters="sRGB">${svgDropShadowElement(shadow, { number: n, color: (value) => esc(value) })}</filter>`
+    );
+    return `url(#${id})`;
+  };
+  for (const [part, entry] of Object.entries(appearance)) {
+    if (entry?.textShadow)
+      appearance[part] = {
+        ...entry,
+        textShadowFilter: shadowPaint(entry.textShadow, `${part}-text-shadow`)
+      };
+  }
+  const paint2 = (gradient, suffix, bounds) => {
+    const def = buildChartGradientDef(`${prefix}-${suffix}`, gradient, bounds);
+    defs.push(chartGradientMarkup(def));
+    return `url(#${def.id})`;
+  };
+  for (const part of ["chartArea", "plotArea"]) {
+    const entry = appearance[part];
+    if (!entry?.gradient) continue;
+    if (part === "plotArea" && ["circle", "shape"].includes(entry.gradient.path ?? "")) continue;
+    appearance[part] = {
+      ...entry,
+      fillColor: paint2(entry.gradient, part, { width, height, shape: "rect" })
+    };
+  }
+  const series = model.series.map((source, index) => {
+    const view = { ...source };
+    if (source.shadow) view.shadowFilter = shadowPaint(source.shadow, `s${index}-shadow`);
+    const bounds = model.type === "bar" || model.type === "column" ? { width: 1, height: 1, shape: "rect" } : void 0;
+    if (source.gradient) view.color = paint2(source.gradient, `s${index}`, bounds);
+    if (source.pointGradients) {
+      view.pointColors = [...source.pointColors ?? []];
+      for (const [key, gradient] of Object.entries(source.pointGradients))
+        view.pointColors[Number(key)] = paint2(gradient, `s${index}-p${key}`, bounds);
+    }
+    return view;
+  });
+  return defs.length ? { model: { ...model, appearance, series }, defs: `<defs>${defs.join("")}</defs>` } : { model, defs: "" };
+}
+function chartTextAttributes(model, part, fallbackSize = FONT_SIZE) {
+  const entry = model.appearance?.[part];
+  return {
+    size: entry?.fontSize === void 0 ? fallbackSize : chartPointsToPixels(entry.fontSize),
+    ...entry?.color === void 0 ? {} : { fill: entry.color },
+    ...entry?.bold === void 0 ? {} : { weight: entry.bold ? "bold" : "normal" },
+    ...entry?.italic === void 0 ? {} : { italic: entry.italic },
+    ...entry?.underline === void 0 ? {} : { underline: entry.underline },
+    ...entry?.typeface === void 0 ? {} : { family: cssFontFamily(entry.typeface) },
+    ...entry?.textShadowFilter === void 0 ? {} : { filter: entry.textShadowFilter }
+  };
+}
+function chartStroke(model, part) {
+  const entry = model.appearance?.[part];
+  return {
+    color: entry?.axisVisible === false ? "none" : entry?.lineColor ?? (part.startsWith("gridline") ? GRID_COLOR : AXIS_COLOR),
+    width: entry?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry.lineWidth)
+  };
+}
+function chartAreaRect(model, part, area) {
+  if (area.w <= 0 || area.h <= 0) return "";
+  const entry = model.appearance?.[part];
+  let fill = entry?.fillColor ?? (part === "chartArea" ? "#FFFFFF" : "none");
+  let defs = "";
+  if (part !== "chartArea" && entry?.gradient && (part !== "plotArea" || ["circle", "shape"].includes(entry.gradient.path ?? ""))) {
+    const def = buildChartGradientDef(`xlsx-chart-${++nextPaintId}-${part}`, entry.gradient, {
+      width: area.w,
+      height: area.h,
+      shape: "rect"
+    });
+    defs = `<defs>${chartGradientMarkup(def)}</defs>`;
+    fill = `url(#${def.id})`;
+  }
+  const stroke = entry?.lineColor ?? "none";
+  if (fill === "none" && stroke === "none") return "";
+  const width = entry?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry.lineWidth);
+  return `${defs}<rect x="${n(area.x)}" y="${n(area.y)}" width="${n(area.w)}" height="${n(area.h)}" fill="${esc(fill)}" stroke="${esc(stroke)}" stroke-width="${n(width)}" data-chart-part="${part}"/>`;
+}
+
+// chart/render/chart-svg-labels.ts
+var GAP = 3;
+var LINE = 1.2;
+var NAMED_COLORS = /^(black|blue|cyan|green|magenta|red|white|yellow)$/iu;
+function measure(model, label) {
+  const attrs2 = chartTextAttributes(model, "dataLabel", 10);
+  const size = attrs2.size ?? 10;
+  const lines = label.text.split("\n");
+  return {
+    lines,
+    size,
+    w: Math.max(...lines.map((l) => textWidth(l, size))),
+    h: lines.length * size * LINE,
+    attrs: attrs2
+  };
+}
+function draw(m, label, x, y, anchor, out) {
+  const fill = label.color && NAMED_COLORS.test(label.color) ? label.color.toLowerCase() : void 0;
+  m.lines.forEach((line2, k) => {
+    const lineY = y - m.h / 2 + (k + 0.5) * m.size * LINE + m.size * 0.35;
+    out.push(text(x, lineY, line2, { ...m.attrs, ...fill ? { fill } : {}, anchor }));
+  });
+}
+function barLabels(model, marks, out) {
+  const stacked = model.grouping === "stacked" || model.grouping === "percentStacked";
+  for (const mark of marks) {
+    const label = mark.series.labels?.[mark.index];
+    if (!label) continue;
+    const m = measure(model, label);
+    let position2 = label.position ?? (stacked ? "ctr" : "outEnd");
+    if (stacked && position2 === "outEnd") position2 = "ctr";
+    const cx = mark.x + mark.w / 2;
+    const cy = mark.y + mark.h / 2;
+    if (model.horizontal) {
+      const end = mark.negative ? mark.x : mark.x + mark.w;
+      const base = mark.negative ? mark.x + mark.w : mark.x;
+      const dir2 = mark.negative ? -1 : 1;
+      const side = (at, outward) => [
+        at + (outward ? dir2 : -dir2) * GAP,
+        (outward ? dir2 : -dir2) > 0 ? "start" : "end"
+      ];
+      const [x, anchor] = position2 === "ctr" ? [cx, "middle"] : position2 === "inEnd" ? side(end, false) : position2 === "inBase" ? side(base, true) : side(end, true);
+      draw(m, label, x, cy, anchor, out);
+      continue;
+    }
+    const top = mark.negative ? mark.y + mark.h : mark.y;
+    const bottom = mark.negative ? mark.y : mark.y + mark.h;
+    const dir = mark.negative ? 1 : -1;
+    const y = position2 === "ctr" ? cy : position2 === "inEnd" ? top - dir * (GAP + m.h / 2) : position2 === "inBase" ? bottom + dir * (GAP + m.h / 2) : top + dir * (GAP + m.h / 2);
+    draw(m, label, cx, y, "middle", out);
+  }
+}
+function pointLabels(model, marks, out) {
+  for (const mark of marks) {
+    const label = mark.series.labels?.[mark.index];
+    if (!label) continue;
+    const m = measure(model, label);
+    const reach = mark.radius + GAP;
+    switch (model.type === "area" ? "ctr" : label.position ?? "r") {
+      case "ctr":
+        draw(m, label, mark.x, mark.y, "middle", out);
+        break;
+      case "t":
+        draw(m, label, mark.x, mark.y - reach - m.h / 2, "middle", out);
+        break;
+      case "b":
+        draw(m, label, mark.x, mark.y + reach + m.h / 2, "middle", out);
+        break;
+      case "l":
+        draw(m, label, mark.x - reach, mark.y, "end", out);
+        break;
+      default:
+        draw(m, label, mark.x + reach, mark.y, "start", out);
+    }
+  }
+}
+function sliceLabels(model, marks, out) {
+  for (const mark of marks) {
+    const label = mark.series.labels?.[mark.index];
+    if (!label) continue;
+    const m = measure(model, label);
+    const mid = (mark.start + mark.end) / 2;
+    const ux = Math.sin(mid);
+    const uy = -Math.cos(mid);
+    const place2 = (radius) => [
+      mark.cx + radius * ux,
+      mark.cy + radius * uy
+    ];
+    const position2 = model.type === "doughnut" ? "ctr" : label.position ?? "bestFit";
+    let x;
+    let y;
+    if (position2 === "ctr") [x, y] = place2(mark.inner + (mark.outer - mark.inner) / 2);
+    else if (position2 === "inEnd") {
+      const extent = Math.abs(ux) * m.w / 2 + Math.abs(uy) * m.h / 2;
+      [x, y] = place2(Math.max(0, mark.outer - GAP - extent));
+    } else if (position2 === "outEnd") {
+      const extent = Math.abs(ux) * m.w / 2 + Math.abs(uy) * m.h / 2;
+      [x, y] = place2(mark.outer + GAP + extent);
+    } else {
+      const placed = placeBestFitLabel(
+        {
+          cx: mark.cx,
+          cy: mark.cy,
+          outerR: mark.outer,
+          startAngle: mark.start - Math.PI / 2,
+          endAngle: mark.end - Math.PI / 2
+        },
+        m.w,
+        m.h
+      );
+      x = placed.x;
+      y = placed.y;
+    }
+    draw(m, label, x, y, "middle", out);
+  }
+}
+function hasOutsideLabels(model) {
+  return model.series.some(
+    (s) => s.labels?.some(
+      (l) => l !== void 0 && ["bestFit", "outEnd"].includes(l.position ?? "bestFit")
+    )
+  );
+}
+
+// chart/render/chart-svg-bars.ts
+function barLayout(model, frame) {
+  const count = Math.max(1, model.series.length);
+  const geometry2 = clusteredBarGeometry(frame.bandSize, count, chartBarSpacing(model));
+  const barSize = geometry2.singleBarWidth;
+  const offset = (si) => model.horizontal ? geometry2.clusterWidth / 2 - barSize - si * geometry2.step : -geometry2.clusterWidth / 2 + si * geometry2.step;
+  return { barSize, offset };
+}
+function bars(model, frame, out, values) {
+  const stacked = model.grouping === "stacked" || model.grouping === "percentStacked";
+  const { barSize, offset: barOffset } = barLayout(model, frame);
+  const base = frame.value(0);
+  const pos = new Array(model.categories.length).fill(0);
+  const neg = new Array(model.categories.length).fill(0);
+  const marks = [];
+  model.series.forEach((s, si) => {
+    values[si]?.forEach((v, i) => {
+      if (v === null || i >= model.categories.length) return;
+      let from = 0;
+      let to = v;
+      if (stacked) {
+        const acc = v >= 0 ? pos : neg;
+        from = acc[i] ?? 0;
+        to = from + v;
+        acc[i] = to;
+      }
+      const a = stacked ? frame.value(from) : base;
+      const b = frame.value(to);
+      const offset = barOffset(si);
+      const center = frame.band(i);
+      const width = model.horizontal ? Math.abs(b - a) : barSize;
+      const height = model.horizontal ? barSize : Math.abs(b - a);
+      let color = s.pointColors?.[i] ?? s.color;
+      const gradient = s.pointGradients?.[i] ?? (s.pointColors?.[i] === void 0 ? s.gradient : void 0);
+      if (gradient && (gradient.path === "circle" || gradient.path === "shape")) {
+        const baseId = color.match(/^url\(#(.+)\)$/)?.[1];
+        if (baseId) {
+          const id = baseId.replace(/(-s\d+(?:-p\d+)?)$/, `-mark${i}$1`);
+          const def = buildChartGradientDef(id, gradient, {
+            width: Number(n(width)),
+            height: Number(n(height)),
+            shape: "rect"
+          });
+          out.push(`<defs>${chartGradientMarkup(def)}</defs>`);
+          color = `url(#${id})`;
+        }
+      }
+      out.push(`<g data-chart-series="${si}" data-chart-point="${i}">`);
+      const box = model.horizontal ? { x: Math.min(a, b), y: center + offset, w: Math.abs(b - a), h: barSize } : { x: center + offset, y: Math.min(a, b), w: barSize, h: Math.abs(b - a) };
+      out.push(rect(box.x, box.y, box.w, box.h, color, s.shadowFilter));
+      out.push("</g>");
+      marks.push({ series: s, index: i, ...box, negative: v < 0 });
+    });
+  });
+  barLabels(model, marks, out);
+}
+
+// chart/render/chart-svg-analysis.ts
+var DASHES = {
+  dot: [1, 3],
+  dash: [4, 3],
+  lgDash: [8, 3],
+  dashDot: [4, 3, 1, 3],
   lgDashDot: [8, 3, 1, 3],
   lgDashDotDot: [8, 3, 1, 3, 1, 3],
   sysDash: [3, 1],
@@ -5204,6 +6144,60 @@ function scatterAnalysis(model, px, py, out) {
   });
 }
 
+// chart/render/chart-svg-markers.ts
+function chartMarkerRadius(series, index, defaultRadius = 3) {
+  const marker = { ...series.marker, ...series.pointMarkers?.[index] };
+  if (marker.symbol === "none") return 0;
+  const radius = markerRadius(marker.size, defaultRadius);
+  return marker.symbol === "dot" ? Math.max(radius * 0.6, 1) : radius;
+}
+function chartSeriesMarkerSvg(series, index, cx, cy, defaultRadius = 3) {
+  const marker = { ...series.marker, ...series.pointMarkers?.[index] };
+  const primitive = buildMarkerPrimitive({
+    ...marker,
+    symbol: marker.symbol,
+    size: marker.size,
+    cx,
+    cy,
+    fill: marker.fill ?? series.pointColors?.[index] ?? series.color,
+    defaultRadius
+  });
+  if (!primitive) return "";
+  let geometry2;
+  switch (primitive.kind) {
+    case "circle":
+      geometry2 = `cx="${n(primitive.cx)}" cy="${n(primitive.cy)}" r="${n(primitive.r)}"`;
+      break;
+    case "rect":
+      geometry2 = `x="${n(primitive.x)}" y="${n(primitive.y)}" width="${n(primitive.w)}" height="${n(primitive.h)}"`;
+      break;
+    case "path":
+      geometry2 = `d="${esc(primitive.d)}"`;
+      break;
+    case "polygon":
+      geometry2 = `points="${esc(primitive.points)}"`;
+      break;
+  }
+  const outline2 = primitive.stroke ? ` stroke="${esc(primitive.stroke)}" stroke-width="${n(primitive.strokeWidth ?? 1)}"` : "";
+  const filter = series.shadowFilter ? ` filter="${esc(series.shadowFilter)}"` : "";
+  return `<${primitive.kind} ${geometry2} fill="${esc(primitive.fill)}"${outline2}${filter}/>`;
+}
+
+// chart/line-dash.ts
+function chartLineDashArray(style, width) {
+  if (!style || style === "solid") {
+    return void 0;
+  }
+  const unit = Math.max(width, 1);
+  if (style === "dot" || style === "sysDot") {
+    return `${unit} ${unit * 2}`;
+  }
+  if (style === "lgDash") {
+    return `${unit * 6} ${unit * 3}`;
+  }
+  return `${unit * 3} ${unit * 2}`;
+}
+
 // chart/render/chart-scale.ts
 var clean = (n2) => Number(n2.toPrecision(12));
 function* units(raw) {
@@ -5214,14 +6208,14 @@ function* units(raw) {
     exp++;
   }
 }
-function niceScale(dataMin, dataMax, options = {}) {
-  const maxIntervals = Math.max(1, options.maxIntervals ?? 10);
+function niceScale(dataMin, dataMax, options2 = {}) {
+  const maxIntervals = Math.max(1, options2.maxIntervals ?? 10);
   let lo = Number.isFinite(dataMin) ? dataMin : 0;
   let hi = Number.isFinite(dataMax) ? dataMax : 0;
   if (lo > hi) [lo, hi] = [hi, lo];
   if (lo === hi) {
     if (lo === 0) hi = 1;
-    else if (options.noZero) {
+    else if (options2.noZero) {
       const pad = Math.abs(lo) * 0.1 || 1;
       lo -= pad;
       hi += pad;
@@ -5230,7 +6224,7 @@ function niceScale(dataMin, dataMax, options = {}) {
   }
   let fixedLo = false;
   let fixedHi = false;
-  if (!options.noZero) {
+  if (!options2.noZero) {
     if (lo >= 0 && hi - lo >= hi / 6) {
       lo = 0;
       fixedLo = true;
@@ -5263,151 +6257,238 @@ var PERCENT_SCALE = {
 function formatAxisValue(value, percent = false) {
   if (percent) return `${clean(value * 100)}%`;
   const v = clean(value);
-  if (Math.abs(v) >= 1e15 || v !== 0 && Math.abs(v) < 1e-6)
-    return v.toExponential(2).replace("e+", "E+").replace("e-", "E-");
-  const [int = "0", frac] = String(Math.abs(v)).split(".");
-  const grouped = int.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-  return `${v < 0 ? "-" : ""}${grouped}${frac ? `.${frac}` : ""}`;
-}
-
-// chart/render/theme-palette.ts
-var THEME_SLOTS = [
-  "lt1",
-  "dk1",
-  "lt2",
-  "dk2",
-  "accent1",
-  "accent2",
-  "accent3",
-  "accent4",
-  "accent5",
-  "accent6",
-  "hlink",
-  "folHlink"
-];
-var DEFAULT_THEME_COLORS = [
-  "FFFFFF",
-  "000000",
-  "E7E6E6",
-  "44546A",
-  "4472C4",
-  "ED7D31",
-  "A5A5A5",
-  "FFC000",
-  "5B9BD5",
-  "70AD47",
-  "0563C1",
-  "954F72"
-];
-function themeColor(theme, index) {
-  const hex = theme.colors[index] ?? DEFAULT_THEME_COLORS[index];
-  return hex && parseArgbHex(hex) ? hex.replace(/^#/, "") : void 0;
-}
-
-// chart/render/chart-colors.ts
-function chartColorScheme(theme) {
-  const slots = Object.fromEntries(
-    THEME_SLOTS.map((slot, index) => [slot, `#${themeColor(theme, index) ?? "000000"}`])
-  );
-  return {
-    ...slots,
-    bg1: slots.lt1,
-    tx1: slots.dk1,
-    bg2: slots.lt2,
-    tx2: slots.dk2
-  };
-}
-function autoSeriesColor(theme, index) {
-  const i = Math.max(0, Math.floor(index));
-  return chartPaletteSeriesColor(findChartColorPalette(10), i, i + 1, chartColorScheme(theme));
-}
-
-// chart/text-inheritance.ts
-var TEXT_KEYS = [
-  "fontSize",
-  "bold",
-  "italic",
-  "underline",
-  "typeface",
-  "textColor",
-  "fontRef"
-];
-var TEXT_PARTS = [
-  "title",
-  "axisTitle",
-  "categoryAxis",
-  "valueAxis",
-  "legend",
-  "dataLabel"
-];
-function inheritChartText(part, entry, builtIn, root) {
-  if (!root || !TEXT_PARTS.includes(part)) return entry;
-  const out = { ...entry };
-  for (const key of TEXT_KEYS) {
-    delete out[key];
-    const value = root[key] ?? builtIn?.[key];
-    if (value !== void 0) Object.assign(out, { [key]: value });
+  if (Math.abs(v) >= 1e15 || v !== 0 && Math.abs(v) < 1e-6)
+    return v.toExponential(2).replace("e+", "E+").replace("e-", "E-");
+  const [int = "0", frac] = String(Math.abs(v)).split(".");
+  const grouped = int.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  return `${v < 0 ? "-" : ""}${grouped}${frac ? `.${frac}` : ""}`;
+}
+
+// chart/render/chart-svg-axes.ts
+function axisTickText(value, axis, percent = false) {
+  return formatChartNumber(value, axis?.source.numberFormat?.formatCode) ?? formatAxisValue(value, percent);
+}
+function axisLine(model, axis, part, x1, y1, x2, y2) {
+  if (axis?.source.deleted) return "";
+  return styledAxisLine(x1, y1, x2, y2, axis?.line, chartStroke(model, part));
+}
+function styledAxisLine(x1, y1, x2, y2, paint2, fallback) {
+  const color = paint2?.color ?? fallback.color;
+  const width = paint2?.width ?? fallback.width;
+  if (color === "none" || width === 0) return "";
+  const dash = chartLineDashArray(paint2?.dash, width);
+  return line(x1, y1, x2, y2, esc(color), width).replace(
+    "/>",
+    dash ? ` stroke-dasharray="${dash}"/>` : "/>"
+  );
+}
+function axisGridlines(model, axis, ticks, position2, plot, vertical) {
+  const draw2 = (values, paint2, minor2) => {
+    const fallback = chartStroke(model, minor2 ? "gridlineMinor" : "gridlineMajor");
+    return values.map((value) => {
+      const p = position2(value);
+      return vertical ? styledAxisLine(p, plot.y, p, plot.y + plot.h, paint2, fallback) : styledAxisLine(plot.x, p, plot.x + plot.w, p, paint2, fallback);
+    }).join("");
+  };
+  const major = !axis || axis.source.majorGridlines ? draw2(ticks, axis?.majorGrid, false) : "";
+  const minor = axis?.source.minorGridlines ? draw2(axis.minorTicks, axis.minorGrid, true) : "";
+  return major + minor;
+}
+
+// chart/axis-range.ts
+function computeLogValueRange(series, logBase) {
+  const allValues = series.flatMap((item) => item.values).filter((value) => value !== null && Number.isFinite(value) && value > 0);
+  if (allValues.length === 0) {
+    return { min: 1, max: logBase, span: 1, logScale: true, logBase };
+  }
+  const dataMin = Math.min(...allValues);
+  const dataMax = Math.max(...allValues);
+  const logMin = Math.floor(Math.log(dataMin) / Math.log(logBase));
+  const logMax = Math.ceil(Math.log(dataMax) / Math.log(logBase));
+  const min = logBase ** logMin;
+  const max = logBase ** Math.max(logMax, logMin + 1);
+  return {
+    min,
+    max,
+    span: Math.max(Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase), 1),
+    logScale: true,
+    logBase
+  };
+}
+function withAxisBounds(automatic, axis, logBase) {
+  const validMin = typeof axis?.min === "number" && Number.isFinite(axis.min) && (!logBase || axis.min > 0) ? axis.min : void 0;
+  const validMax = typeof axis?.max === "number" && Number.isFinite(axis.max) && (!logBase || axis.max > 0) ? axis.max : void 0;
+  const min = validMin ?? automatic.min;
+  let max = validMax ?? automatic.max;
+  const majorUnit = validMin === void 0 && validMax === void 0 ? automatic.majorUnit : void 0;
+  if (max <= min) {
+    max = logBase ? min * logBase : min + 1;
   }
-  if (part === "title" && root.fontSize !== void 0) out.fontSize = root.fontSize * 1.2;
-  if (root.textEffectsXml !== void 0) out.textEffectsXml = root.textEffectsXml;
-  return out;
+  const span = logBase ? Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase) : max - min;
+  return {
+    min,
+    max,
+    span: Math.max(span, Number.EPSILON),
+    ...majorUnit !== void 0 ? { majorUnit } : {},
+    ...logBase ? { logScale: true, logBase } : {},
+    ...axis?.orientation === "maxMin" ? { reverseOrder: true } : {}
+  };
 }
 
-// chart/render/chart-appearance.ts
-var chartPointsToPixels = (points) => points * EMU_PER_POINT / EMU_PER_PIXEL;
-function typeface(entry, theme) {
-  const name = entry.typeface;
-  if (name?.startsWith("+mj-")) return theme.majorFont;
-  if (name?.startsWith("+mn-")) return theme.minorFont;
-  return name ?? (entry.fontRef?.index === "major" ? theme.majorFont : entry.fontRef?.index === "minor" ? theme.minorFont : void 0);
+// chart/axis-ticks.ts
+var LOG_EXPONENT_TOLERANCE = 1e-12;
+function generateLogTicks(range) {
+  if (!range.logScale || !range.logBase) {
+    return [];
+  }
+  const base = range.logBase;
+  const logMin = Math.log(range.min) / Math.log(base);
+  const logMax = Math.log(range.max) / Math.log(base);
+  const firstExponent = Math.ceil(logMin - LOG_EXPONENT_TOLERANCE);
+  const lastExponent = Math.floor(logMax + LOG_EXPONENT_TOLERANCE);
+  if (lastExponent < firstExponent) {
+    return range.min === range.max ? [range.min] : [range.min, range.max];
+  }
+  return Array.from(
+    { length: lastExponent - firstExponent + 1 },
+    (_unused, index) => base ** (firstExponent + index)
+  );
 }
-function chartAppearance(chart, theme) {
-  const defaults = builtInChartTextStyle(effectiveBuiltInChartStyle(chart.formatting));
-  const entries = {};
-  for (const part of CHART_STYLE_PARTS) {
-    const base = chart.styleDefinition?.entries[part];
-    const direct = chart.formatting?.entries[part];
-    if (!defaults[part] && !base && !direct) continue;
-    const entry = {
-      ...inheritChartText(
-        part,
-        { ...defaults[part], ...base, sourceXml: base?.sourceXml ?? "" },
-        defaults[part],
-        chart.formatting?.textDefaults
-      ),
-      ...direct,
-      sourceXml: direct?.sourceXml ?? base?.sourceXml ?? ""
-    };
-    if (base?.line || direct?.line) entry.line = { ...base?.line, ...direct?.line };
-    entries[part] = entry;
+function generateIntervalTicks(range, unit) {
+  if (!Number.isFinite(unit) || unit <= 0 || range.logScale) {
+    return [];
   }
-  const scheme = chartColorScheme(theme);
-  const resolve = (color) => resolveDrawingColor(
-    color,
-    { scheme: (name) => scheme[name] },
-    { hslRounding: "halfDown", transformOrder: "document" }
+  const tolerance = Math.max(1, Math.abs(range.min), Math.abs(range.max)) * 1e-12;
+  const first3 = Math.ceil((range.min - tolerance) / unit);
+  const last = Math.floor((range.max + tolerance) / unit);
+  const count = Math.min(Math.max(last - first3 + 1, 0), 2e3);
+  return Array.from({ length: count }, (_, index) => (first3 + index) * unit);
+}
+function generateAxisTicks(range, axis, defaultIntervals) {
+  if (range.logScale && range.logBase) {
+    return generateLogTicks(range);
+  }
+  const explicit = generateIntervalTicks(range, axis?.majorUnit ?? 0);
+  if (explicit.length > 0) {
+    return explicit;
+  }
+  const automatic = generateIntervalTicks(range, range.majorUnit ?? 0);
+  if (automatic.length > 0) {
+    return automatic;
+  }
+  return Array.from(
+    { length: defaultIntervals + 1 },
+    (_, index) => range.min + range.span / defaultIntervals * index
   );
-  const out = resolveChartStyleDefinition(
-    { entries},
-    (color) => drawingColorCss(resolve(color))
-  ) ?? {};
-  for (const part of CHART_STYLE_PARTS) {
-    const entry = entries[part];
-    if (!entry) continue;
-    const family = typeface(entry, theme);
-    const shadow = resolveDrawingShadowXml(entry.textEffectsXml, {
-      scheme: (name) => scheme[name]
-    });
-    if (shadow) (out[part] ??= {}).textShadow = shadow;
-    if (family) (out[part] ??= {}).typeface = family;
-    if (entry.axisVisible !== void 0) (out[part] ??= {}).axisVisible = entry.axisVisible;
-    if (entry.labelsVisible !== void 0) (out[part] ??= {}).labelsVisible = entry.labelsVisible;
-    if (entry.line?.widthEmu === 0) (out[part] ??= {}).lineWidth = 0;
-    if (entry.fill?.kind === "gradient") {
-      (out[part] ??= {}).gradient = resolveChartGradient(entry.fill, resolve);
-    }
+}
+function generateMinorAxisTicks(range, axis) {
+  const minor = generateIntervalTicks(range, axis?.minorUnit ?? 0);
+  if (minor.length === 0) {
+    return [];
   }
-  return out;
+  const majorUnit = axis?.majorUnit;
+  if (!majorUnit || !Number.isFinite(majorUnit) || majorUnit <= 0) {
+    return minor;
+  }
+  const tolerance = Math.max(1, Math.abs(range.min), Math.abs(range.max)) * 1e-10;
+  return minor.filter(
+    (value) => Math.abs(value / majorUnit - Math.round(value / majorUnit)) > tolerance
+  );
+}
+
+// chart/render/chart-view-axes.ts
+function chartAxisRatio(value, scale, axis) {
+  const range = axis?.range;
+  const ratio = range?.logScale ? Math.log(Math.max(value, range.min) / range.min) / Math.log(range.max / range.min) : (value - scale.min) / (scale.max - scale.min || 1);
+  return range?.reverseOrder ? 1 - ratio : ratio;
+}
+function chartAxisLabels(axis) {
+  return axis?.source.deleted !== true && axis?.source.tickLabelPosition !== "none";
+}
+function options(axis) {
+  return {
+    ...axis.scaling,
+    ...axis.scaling.logBase === void 0 ? {} : { logScale: true },
+    ...axis.majorUnit === void 0 ? {} : { majorUnit: axis.majorUnit },
+    ...axis.minorUnit === void 0 ? {} : { minorUnit: axis.minorUnit }
+  };
+}
+function applyChartAxes(model, chart, color) {
+  if (!chart.axes?.length) return;
+  const axes = chart.axes;
+  const linked = axes.filter((axis) => axis.id !== void 0 && chart.axisIds?.includes(axis.id));
+  const candidates = linked.length ? linked : axes;
+  const xy = model.type === "scatter" || model.type === "bubble";
+  const value = candidates.find((axis) => axis.kind === "val" && !["b", "t"].includes(axis.position ?? "")) ?? candidates.find((axis) => axis.kind === "val");
+  const category = candidates.find(
+    (axis) => xy ? axis.kind === "val" && axis !== value : axis.kind === "cat" || axis.kind === "date"
+  );
+  const secondary = axes.find((axis) => axis.kind === "val" && axis !== value && axis !== category);
+  const paint2 = (shape) => {
+    const ln = shape?.line;
+    const fill = ln?.fill;
+    const resolved = fill?.kind === "none" ? "none" : color(fill?.kind === "solid" ? fill.color : void 0);
+    return {
+      ...resolved === void 0 ? {} : { color: resolved },
+      ...ln?.widthEmu === void 0 ? {} : { width: ln.widthEmu / EMU_PER_PIXEL },
+      ...ln?.dash === void 0 ? {} : { dash: ln.dash }
+    };
+  };
+  const bind = (axis, scale, values) => {
+    const opts = options(axis);
+    const automatic = opts.logScale ? computeLogValueRange(
+      [{ values: values ?? [] }],
+      opts.logBase && Number.isFinite(opts.logBase) && opts.logBase > 1 ? opts.logBase : 10
+    ) : {
+      min: scale?.min ?? 0,
+      max: scale?.max ?? 1,
+      span: (scale?.max ?? 1) - (scale?.min ?? 0),
+      ...scale ? { majorUnit: scale.majorUnit } : {}
+    };
+    const logBase = automatic.logBase;
+    const range = withAxisBounds(automatic, opts, logBase);
+    if (scale) {
+      scale.min = range.min;
+      scale.max = range.max;
+      scale.ticks = generateAxisTicks(range, opts, 5);
+    }
+    return {
+      source: axis,
+      range,
+      minorTicks: generateMinorAxisTicks(range, opts),
+      line: paint2(axis.spPr),
+      majorGrid: paint2(axis.majorGridlinesSpPr),
+      minorGrid: paint2(axis.minorGridlinesSpPr)
+    };
+  };
+  const out = {};
+  if (value)
+    out.value = bind(
+      value,
+      model.valueAxis,
+      [
+        ...model.series,
+        ...model.extraGroups?.filter((g) => !g.secondary).flatMap((g) => g.series) ?? []
+      ].flatMap((s) => s.values)
+    );
+  if (category)
+    out.category = bind(
+      category,
+      model.xAxis ?? {
+        min: 0,
+        max: Math.max(1, model.categories.length - 1),
+        majorUnit: 1,
+        ticks: []
+      },
+      model.series.flatMap((s) => s.xValues ?? [])
+    );
+  if (secondary)
+    out.secondary = bind(
+      secondary,
+      model.secondaryAxis,
+      model.extraGroups?.filter((g) => g.secondary).flatMap((g) => g.series.flatMap((s) => s.values))
+    );
+  model.axes = out;
 }
 
 // chart/render/chart-view-analysis.ts
@@ -5459,15 +6540,15 @@ function seriesName(series, index, evaluateRef) {
   const fromRef = resolveRef(series.nameRef, evaluateRef)?.map(toText).filter((t) => t !== "").join(" ");
   return fromRef || series.name || `Series${index + 1}`;
 }
-function seriesContext(chart, theme, options) {
+function seriesContext(chart, theme, options2) {
   const scheme = chartColorScheme(theme);
   const resolver = { scheme: (name) => scheme[name] };
   return {
     theme,
     scheme,
     palette: chart.colorPalette === void 0 ? void 0 : findChartColorPalette(chart.colorPalette),
-    evaluateRef: options.evaluateRef ?? (() => []),
-    seriesColor: options.seriesColor,
+    evaluateRef: options2.evaluateRef ?? (() => []),
+    seriesColor: options2.seriesColor,
     drawingColor: (color) => color && drawingColorCss(resolveDrawingColor(color, resolver, { transformOrder: "document" })),
     gradient: (fill) => fill?.kind === "gradient" ? resolveChartGradient(
       fill,
@@ -5493,7 +6574,11 @@ function seriesView(ctx, s, index, total, categoriesOf) {
     })
   );
   if (Object.keys(points).length) view.pointGradients = points;
-  Object.assign(view, analysisView(s, color, ctx.drawingColor));
+  Object.assign(
+    view,
+    analysisView(s, color, ctx.drawingColor),
+    seriesMarkerViews(s, ctx.drawingColor)
+  );
   return view;
 }
 
@@ -5666,12 +6751,70 @@ function chartTitleText(chart, theme) {
   };
 }
 
+// chart/render/chart-view-labels.ts
+function labelsOf(source, view, categories, numberFormat) {
+  const { chart, series, points } = source;
+  if ((series?.deleted ?? chart?.deleted) === true) return void 0;
+  const percentBase = view.values.reduce(
+    (sum, v) => sum + (v === null ? 0 : Math.abs(v)),
+    0
+  );
+  const out = [];
+  let any = false;
+  view.values.forEach((value, i) => {
+    const point = points?.[i];
+    if (value === null || point?.deleted === true) return;
+    const position2 = point?.position ?? series?.position ?? chart?.position;
+    const x = view.xValues?.[i];
+    const category = x === void 0 || x === null ? categories[i] : formatAxisValue(x);
+    let built;
+    if (point?.text !== void 0) built = { text: point.text };
+    else {
+      const flags = resolveDataLabelFlags({
+        ...point ? { point } : {},
+        ...series ? { series } : {},
+        ...chart ? { chart } : {}
+      });
+      built = composeDataLabelText({
+        flags,
+        seriesName: view.name,
+        category,
+        value,
+        numberFormat: point?.numberFormat ?? series?.numberFormat ?? chart?.numberFormat ?? numberFormat,
+        percentBase,
+        bubbleSize: view.sizes?.[i] ?? void 0,
+        formatValue: (v) => formatAxisValue(v),
+        formatBubbleSize: (size) => formatAxisValue(size)
+      });
+    }
+    if (!built) return;
+    any = true;
+    out[i] = {
+      text: built.text,
+      ...position2 ? { position: position2 } : {},
+      ...built.color ? { color: built.color } : {}
+    };
+  });
+  return any ? out : void 0;
+}
+function applyDataLabels(model, sources, extra) {
+  const apply = (source, view) => {
+    if (!source?.dataLabels) return;
+    const labels = labelsOf(source.dataLabels, view, model.categories, source.numberFormat);
+    if (labels) view.labels = labels;
+  };
+  model.series.forEach((view, i) => apply(sources[i], view));
+  model.extraGroups?.forEach(
+    (group2, g) => group2.series.forEach((view, i) => apply(extra[g]?.series[i], view))
+  );
+}
+
 // chart/render/chart-view-ex.ts
 function groupsAxis(groups, categories) {
   let min = Infinity;
   let max = -Infinity;
-  for (const group of groups) {
-    const extent = valueExtent(group.type, group.grouping, group.series, categories);
+  for (const group2 of groups) {
+    const extent = valueExtent(group2.type, group2.grouping, group2.series, categories);
     min = Math.min(min, extent.min);
     max = Math.max(max, extent.max);
   }
@@ -5680,17 +6823,17 @@ function groupsAxis(groups, categories) {
 function chartExtraView(chart, model, ctx, total, categoriesOf) {
   let index = chart.series.length;
   const groups = [];
-  for (const group of chart.extraGroups ?? []) {
-    const series = group.series.map((s) => seriesView(ctx, s, index++, total, categoriesOf));
+  for (const group2 of chart.extraGroups ?? []) {
+    const series = group2.series.map((s) => seriesView(ctx, s, index++, total, categoriesOf));
     const view = {
-      type: group.chartType,
-      grouping: group.grouping ?? (group.chartType === "column" ? "clustered" : "standard"),
+      type: group2.chartType,
+      grouping: group2.grouping ?? (group2.chartType === "column" ? "clustered" : "standard"),
       series,
-      secondary: group.secondary
+      secondary: group2.secondary
     };
-    if (group.chartType === "stock") view.stock = stockView(group.stock, ctx);
-    if (group.barGapWidth !== void 0) view.barGapWidth = group.barGapWidth;
-    if (group.barOverlap !== void 0) view.barOverlap = group.barOverlap;
+    if (group2.chartType === "stock") view.stock = stockView(group2.stock, ctx);
+    if (group2.barGapWidth !== void 0) view.barGapWidth = group2.barGapWidth;
+    if (group2.barOverlap !== void 0) view.barOverlap = group2.barOverlap;
     groups.push(view);
   }
   if (!groups.length) return;
@@ -5707,8 +6850,8 @@ function chartExtraAxes(model) {
   const own2 = valueExtent(model.type, model.grouping, model.series, count);
   let min = own2.min;
   let max = own2.max;
-  for (const group of shared) {
-    const extent = valueExtent(group.type, group.grouping, group.series, count);
+  for (const group2 of shared) {
+    const extent = valueExtent(group2.type, group2.grouping, group2.series, count);
     min = Math.min(min, extent.min);
     max = Math.max(max, extent.max);
   }
@@ -5735,11 +6878,11 @@ function histogramView(chart, model) {
   const first3 = model.series[0];
   if (!first3) return;
   const raw = first3.values.map((v) => v ?? Number.NaN);
-  const options = chart.histogram ?? {};
-  const bins = options.aggregateByCategory ? aggregateByCategory(
+  const options2 = chart.histogram ?? {};
+  const bins = options2.aggregateByCategory ? aggregateByCategory(
     first3.values.map((v) => v ?? 0),
     model.categories
-  ) : computeHistogramBins(raw, options, formatAxisValue);
+  ) : computeHistogramBins(raw, options2, formatAxisValue);
   model.categories = bins.map((bin) => bin.label);
   first3.values = bins.map((bin) => bin.value);
   model.barGapWidth = 0;
@@ -5763,11 +6906,11 @@ var SUPPORTED = /* @__PURE__ */ new Set([
   "treemap",
   "sunburst"
 ]);
-function chartSummaryView(chart, theme, options = {}) {
+function chartSummaryView(chart, theme, options2 = {}) {
   const type = chart.chartType;
   const radial = type === "pie" || type === "doughnut";
   const byPoint = radial || type === "treemap" || type === "sunburst";
-  const ctx = seriesContext(chart, theme, options);
+  const ctx = seriesContext(chart, theme, options2);
   const { palette, scheme, drawingColor } = ctx;
   const grouping = chart.grouping ?? (type === "bar" || type === "column" ? "clustered" : "standard");
   const rawCategories = [];
@@ -5851,128 +6994,23 @@ function chartSummaryView(chart, theme, options = {}) {
     chartExtraView(chart, model, ctx, total, collect);
   if (type === "waterfall") waterfallView(chart, model, ctx);
   else if (!byPoint) model.valueAxis = valueAxis(model);
+  applyDataLabels(model, chart.series, extra);
   chartExtraAxes(model);
+  applyChartAxes(model, chart, ctx.drawingColor);
   return model;
 }
 
-// text/css-font-family.ts
-var FALLBACKS = {
-  calibri: '"Calibri", "Carlito", "Segoe UI", Arial, sans-serif',
-  "calibri light": '"Calibri Light", "Calibri", "Carlito", "Segoe UI", Arial, sans-serif',
-  cambria: '"Cambria", "Caladea", Georgia, serif',
-  arial: 'Arial, "Liberation Sans", Helvetica, sans-serif',
-  "times new roman": '"Times New Roman", "Liberation Serif", Times, serif',
-  "courier new": '"Courier New", "Liberation Mono", monospace',
-  aptos: '"Aptos", "Calibri", "Carlito", "Segoe UI", sans-serif'
-};
-function cssFontFamily(name) {
-  const known = FALLBACKS[name.toLowerCase()];
-  if (known) return known;
-  const quoted = `"${name.replace(/["\\]/g, "")}"`;
-  return `${quoted}, "Calibri", "Carlito", "Segoe UI", sans-serif`;
-}
-
-// chart/render/chart-svg-appearance.ts
-var nextPaintId = 0;
-function chartGradientPaint(model, width = 1024, height = 768) {
-  const prefix = `xlsx-chart-${++nextPaintId}`;
-  const appearance = { ...model.appearance };
-  const defs = [];
-  const shadowPaint = (shadow, suffix) => {
-    const id = `${prefix}-${suffix}`;
-    const pad = Math.max(4, shadow.blur * 3 + Math.abs(shadow.dx) + Math.abs(shadow.dy));
-    defs.push(
-      `<filter id="${id}" filterUnits="userSpaceOnUse" x="${n(-pad)}" y="${n(-pad)}" width="${n(width + pad * 2)}" height="${n(height + pad * 2)}" color-interpolation-filters="sRGB">${svgDropShadowElement(shadow, { number: n, color: (value) => esc(value) })}</filter>`
-    );
-    return `url(#${id})`;
-  };
-  for (const [part, entry] of Object.entries(appearance)) {
-    if (entry?.textShadow)
-      appearance[part] = {
-        ...entry,
-        textShadowFilter: shadowPaint(entry.textShadow, `${part}-text-shadow`)
-      };
-  }
-  const paint2 = (gradient, suffix, bounds) => {
-    const def = buildChartGradientDef(`${prefix}-${suffix}`, gradient, bounds);
-    defs.push(chartGradientMarkup(def));
-    return `url(#${def.id})`;
-  };
-  for (const part of ["chartArea", "plotArea"]) {
-    const entry = appearance[part];
-    if (!entry?.gradient) continue;
-    if (part === "plotArea" && ["circle", "shape"].includes(entry.gradient.path ?? "")) continue;
-    appearance[part] = {
-      ...entry,
-      fillColor: paint2(entry.gradient, part, { width, height, shape: "rect" })
-    };
-  }
-  const series = model.series.map((source, index) => {
-    const view = { ...source };
-    if (source.shadow) view.shadowFilter = shadowPaint(source.shadow, `s${index}-shadow`);
-    const bounds = model.type === "bar" || model.type === "column" ? { width: 1, height: 1, shape: "rect" } : void 0;
-    if (source.gradient) view.color = paint2(source.gradient, `s${index}`, bounds);
-    if (source.pointGradients) {
-      view.pointColors = [...source.pointColors ?? []];
-      for (const [key, gradient] of Object.entries(source.pointGradients))
-        view.pointColors[Number(key)] = paint2(gradient, `s${index}-p${key}`, bounds);
-    }
-    return view;
-  });
-  return defs.length ? { model: { ...model, appearance, series }, defs: `<defs>${defs.join("")}</defs>` } : { model, defs: "" };
-}
-function chartTextAttributes(model, part, fallbackSize = FONT_SIZE) {
-  const entry = model.appearance?.[part];
-  return {
-    size: entry?.fontSize === void 0 ? fallbackSize : chartPointsToPixels(entry.fontSize),
-    ...entry?.color === void 0 ? {} : { fill: entry.color },
-    ...entry?.bold === void 0 ? {} : { weight: entry.bold ? "bold" : "normal" },
-    ...entry?.italic === void 0 ? {} : { italic: entry.italic },
-    ...entry?.underline === void 0 ? {} : { underline: entry.underline },
-    ...entry?.typeface === void 0 ? {} : { family: cssFontFamily(entry.typeface) },
-    ...entry?.textShadowFilter === void 0 ? {} : { filter: entry.textShadowFilter }
-  };
-}
-function chartStroke(model, part) {
-  const entry = model.appearance?.[part];
-  return {
-    color: entry?.axisVisible === false ? "none" : entry?.lineColor ?? (part === "gridlineMajor" ? GRID_COLOR : AXIS_COLOR),
-    width: entry?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry.lineWidth)
-  };
-}
-function chartAreaRect(model, part, area) {
-  if (area.w <= 0 || area.h <= 0) return "";
-  const entry = model.appearance?.[part];
-  let fill = entry?.fillColor ?? (part === "chartArea" ? "#FFFFFF" : "none");
-  let defs = "";
-  if (part !== "chartArea" && entry?.gradient && (part !== "plotArea" || ["circle", "shape"].includes(entry.gradient.path ?? ""))) {
-    const def = buildChartGradientDef(`xlsx-chart-${++nextPaintId}-${part}`, entry.gradient, {
-      width: area.w,
-      height: area.h,
-      shape: "rect"
-    });
-    defs = `<defs>${chartGradientMarkup(def)}</defs>`;
-    fill = `url(#${def.id})`;
-  }
-  const stroke = entry?.lineColor ?? "none";
-  if (fill === "none" && stroke === "none") return "";
-  const width = entry?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry.lineWidth);
-  return `${defs}<rect x="${n(area.x)}" y="${n(area.y)}" width="${n(area.w)}" height="${n(area.h)}" fill="${esc(fill)}" stroke="${esc(stroke)}" stroke-width="${n(width)}" data-chart-part="${part}"/>`;
-}
-
 // chart/render/chart-svg-cartesian.ts
 function cartesianAxes(model, area, out) {
   const scale = model.valueAxis;
   if (!scale) return void 0;
-  const labels = scale.ticks.map((t) => formatAxisValue(t, scale.percent));
+  const labels = scale.ticks.map((t) => axisTickText(t, model.axes?.value, scale.percent));
   const valueAttrs = chartTextAttributes(model, "valueAxis");
   const categoryAttrs = chartTextAttributes(model, "categoryAxis");
   const valueSize = valueAttrs.size ?? 10;
   const categorySize = categoryAttrs.size ?? 10;
-  const grid = chartStroke(model, "gridlineMajor");
-  const axis = chartStroke(model, "categoryAxis");
-  const valueLabels = model.appearance?.valueAxis?.labelsVisible !== false;
-  const categoryLabels = model.appearance?.categoryAxis?.labelsVisible !== false;
+  const valueLabels = chartAxisLabels(model.axes?.value) && model.appearance?.valueAxis?.labelsVisible !== false;
+  const categoryLabels = chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false;
   const labelW = valueLabels ? Math.max(...labels.map((l) => textWidth(l, valueSize)), 8) + 6 : 4;
   const horizontal = model.horizontal;
   const cats = Math.max(1, model.categories.length);
@@ -5981,7 +7019,7 @@ function cartesianAxes(model, area, out) {
     Math.max(...model.categories.map((c) => textWidth(c, categorySize)), 8) + 6
   );
   const second = horizontal ? void 0 : model.secondaryAxis;
-  const secondLabels = second?.ticks.map((t) => formatAxisValue(t, second.percent)) ?? [];
+  const secondLabels = second?.ticks.map((t) => axisTickText(t, model.axes?.secondary, second.percent)) ?? [];
   const secondW = second ? valueLabels ? Math.max(...secondLabels.map((l) => textWidth(l, valueSize)), 8) + 8 : 4 : 0;
   const plot = horizontal ? {
     x: area.x + catW,
@@ -5994,29 +7032,47 @@ function cartesianAxes(model, area, out) {
     w: Math.max(1, area.w - labelW - 4 - secondW),
     h: Math.max(1, area.h - Math.max(20, categorySize * 1.5))
   };
-  const span = scale.max - scale.min || 1;
-  const value = horizontal ? (v) => plot.x + (v - scale.min) / span * plot.w : (v) => plot.y + plot.h - (v - scale.min) / span * plot.h;
+  const value = horizontal ? (v) => plot.x + chartAxisRatio(v, scale, model.axes?.value) * plot.w : (v) => plot.y + plot.h - chartAxisRatio(v, scale, model.axes?.value) * plot.h;
   const bandSize = (horizontal ? plot.h : plot.w) / cats;
-  const band = horizontal ? (i) => plot.y + plot.h - bandSize * (i + 0.5) : (i) => plot.x + bandSize * (i + 0.5);
+  const index = (i) => model.axes?.category?.range.reverseOrder ? cats - 1 - i : i;
+  const band = horizontal ? (i) => plot.y + plot.h - bandSize * (index(i) + 0.5) : (i) => plot.x + bandSize * (index(i) + 0.5);
   out.push(chartAreaRect(model, "plotArea", plot));
+  out.push(axisGridlines(model, model.axes?.value, scale.ticks, value, plot, horizontal));
+  if (model.axes?.category?.source.majorGridlines || model.axes?.category?.source.minorGridlines)
+    out.push(
+      axisGridlines(
+        model,
+        model.axes.category,
+        model.categories.map((_, i) => i),
+        band,
+        plot,
+        !horizontal
+      )
+    );
   scale.ticks.forEach((t, i) => {
     const p = value(t);
     const label = labels[i] ?? "";
     if (horizontal) {
-      out.push(line(p, plot.y, p, plot.y + plot.h, grid.color, grid.width));
       if (valueLabels)
         out.push(
           text(p, plot.y + plot.h + valueSize + 2, label, { anchor: "middle", ...valueAttrs })
         );
     } else {
-      out.push(line(plot.x, p, plot.x + plot.w, p, grid.color, grid.width));
       if (valueLabels)
         out.push(text(plot.x - 4, p + valueSize * 0.3, label, { anchor: "end", ...valueAttrs }));
     }
   });
-  const zero = value(Math.min(Math.max(0, scale.min), scale.max));
-  if (horizontal) out.push(line(zero, plot.y, zero, plot.y + plot.h, axis.color, axis.width));
-  else out.push(line(plot.x, zero, plot.x + plot.w, zero, axis.color, axis.width));
+  const source = model.axes?.value?.source;
+  const crossing = source?.crosses === "max" ? scale.max : source?.crosses === "min" ? scale.min : source?.crossesAt ?? 0;
+  const zero = value(Math.min(Math.max(crossing, scale.min), scale.max));
+  if (horizontal)
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", zero, plot.y, zero, plot.y + plot.h)
+    );
+  else
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", plot.x, zero, plot.x + plot.w, zero)
+    );
   const step = Math.max(
     1,
     Math.ceil(cats / Math.max(1, Math.floor((horizontal ? plot.h : plot.w) / 14)))
@@ -6041,20 +7097,23 @@ function cartesianAxes(model, area, out) {
   });
   const frame = { plot, value, band, bandSize };
   if (second) {
-    const secondSpan = second.max - second.min || 1;
-    frame.secondary = (v) => plot.y + plot.h - (v - second.min) / secondSpan * plot.h;
-    const secondAxis = chartStroke(model, "valueAxis");
+    frame.secondary = (v) => plot.y + plot.h - chartAxisRatio(v, second, model.axes?.secondary) * plot.h;
     out.push(
-      line(
+      axisLine(
+        model,
+        model.axes?.secondary,
+        "valueAxis",
         plot.x + plot.w,
         plot.y,
         plot.x + plot.w,
-        plot.y + plot.h,
-        secondAxis.color,
-        secondAxis.width
+        plot.y + plot.h
       )
     );
-    if (valueLabels)
+    if (model.axes?.secondary?.source.majorGridlines || model.axes?.secondary?.source.minorGridlines)
+      out.push(
+        axisGridlines(model, model.axes.secondary, second.ticks, frame.secondary, plot, false)
+      );
+    if (chartAxisLabels(model.axes?.secondary))
       second.ticks.forEach(
         (t, i) => out.push(
           text(plot.x + plot.w + 4, frame.secondary(t) + valueSize * 0.3, secondLabels[i] ?? "", {
@@ -6078,6 +7137,7 @@ function linesAndAreas(model, frame, out) {
   const stacked = model.grouping === "stacked" || model.grouping === "percentStacked";
   const acc = new Array(model.categories.length).fill(0);
   const area = model.type === "area";
+  const marks = [];
   const layers = [];
   model.series.forEach((s, si) => {
     const points = [];
@@ -6092,16 +7152,24 @@ function linesAndAreas(model, frame, out) {
       const top = below + (v ?? 0);
       if (stacked) acc[i] = top;
       points.push([frame.band(i), frame.value(top)]);
+      marks.push({
+        series: s,
+        index: i,
+        x: frame.band(i),
+        y: frame.value(top),
+        radius: area ? 0 : chartMarkerRadius(s, i, 2.5)
+      });
       lower.push([frame.band(i), frame.value(below)]);
     });
     layers.push({
+      series: s,
       points,
       lower,
       color: s.color,
       filter: s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""
     });
   });
-  for (const { points, lower, color, filter } of area ? [...layers].reverse() : layers) {
+  for (const { points, lower, color, filter, series } of area ? [...layers].reverse() : layers) {
     if (area) {
       const poly = [...points, ...[...lower].reverse()].map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
       out.push(`<polygon points="${poly}" fill="${color}" fill-opacity="0.85"${filter}/>`);
@@ -6120,10 +7188,11 @@ function linesAndAreas(model, frame, out) {
       else segment2.push(`${n(x)},${n(y)}`);
     }
     flush();
-    for (const [x, y] of points)
-      if (!Number.isNaN(x))
-        out.push(`<circle cx="${n(x)}" cy="${n(y)}" r="2.5" fill="${color}"${filter}/>`);
+    points.forEach(([x, y], index) => {
+      if (!Number.isNaN(x)) out.push(chartSeriesMarkerSvg(series, index, x, y, 2.5));
+    });
   }
+  pointLabels(model, marks, out);
 }
 
 // chart/render/chart-svg-xy.ts
@@ -6131,16 +7200,14 @@ function scatter(model, area, out) {
   const ys = model.valueAxis;
   const xs = model.xAxis;
   if (!ys || !xs) return;
-  const yLabels = ys.ticks.map((t) => formatAxisValue(t));
+  const yLabels = ys.ticks.map((t) => axisTickText(t, model.axes?.value));
   const valueAttrs = chartTextAttributes(model, "valueAxis");
   const categoryAttrs = chartTextAttributes(model, "categoryAxis");
   const valueSize = valueAttrs.size ?? 10;
   const categorySize = categoryAttrs.size ?? 10;
-  const grid = chartStroke(model, "gridlineMajor");
   const xAxis = chartStroke(model, "categoryAxis");
-  const yAxis = chartStroke(model, "valueAxis");
-  const valueLabels = model.appearance?.valueAxis?.labelsVisible !== false;
-  const categoryLabels = model.appearance?.categoryAxis?.labelsVisible !== false;
+  const valueLabels = chartAxisLabels(model.axes?.value) && model.appearance?.valueAxis?.labelsVisible !== false;
+  const categoryLabels = chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false;
   const labelW = valueLabels ? Math.max(...yLabels.map((l) => textWidth(l, valueSize)), 8) + 6 : 4;
   const plot = {
     x: area.x + labelW,
@@ -6160,17 +7227,24 @@ function scatter(model, area, out) {
       s.values.forEach((_, i) => {
         reach = Math.max(reach, radiusOf(s.sizes?.[i] ?? void 0) ?? 0);
       });
-  const widen = (s, length) => {
+  const widen = (s, length, axis) => {
+    if (axis?.range.logScale) return s;
     const pad = reach * (s.max - s.min || 1) / Math.max(1, length - 2 * reach);
-    return { ...s, min: s.min - pad, max: s.max + pad };
+    return {
+      ...s,
+      min: axis?.source.scaling.min === void 0 ? s.min - pad : s.min,
+      max: axis?.source.scaling.max === void 0 ? s.max + pad : s.max
+    };
   };
-  const xView = widen(xs, plot.w);
-  const yView = widen(ys, plot.h);
-  const px = (v) => plot.x + (v - xView.min) / (xView.max - xView.min || 1) * plot.w;
-  const py = (v) => plot.y + plot.h - (v - yView.min) / (yView.max - yView.min || 1) * plot.h;
+  const xView = widen(xs, plot.w, model.axes?.category);
+  const yView = widen(ys, plot.h, model.axes?.value);
+  const px = (v) => plot.x + chartAxisRatio(v, xView, model.axes?.category) * plot.w;
+  const py = (v) => plot.y + plot.h - chartAxisRatio(v, yView, model.axes?.value) * plot.h;
   out.push(chartAreaRect(model, "plotArea", plot));
+  out.push(axisGridlines(model, model.axes?.value, ys.ticks, py, plot, false));
+  if (model.axes?.category)
+    out.push(axisGridlines(model, model.axes.category, xs.ticks, px, plot, true));
   ys.ticks.forEach((t, i) => {
-    out.push(line(plot.x, py(t), plot.x + plot.w, py(t), grid.color, grid.width));
     if (valueLabels)
       out.push(
         text(plot.x - 4, py(t) + valueSize * 0.3, yLabels[i] ?? "", {
@@ -6180,19 +7254,31 @@ function scatter(model, area, out) {
       );
   });
   for (const t of xs.ticks) {
-    out.push(line(px(t), plot.y + plot.h, px(t), plot.y + plot.h + 3, xAxis.color, xAxis.width));
+    if (!model.axes?.category?.source.deleted)
+      out.push(line(px(t), plot.y + plot.h, px(t), plot.y + plot.h + 3, xAxis.color, xAxis.width));
     if (categoryLabels)
       out.push(
-        text(px(t), plot.y + plot.h + categorySize + 3, formatAxisValue(t), {
+        text(px(t), plot.y + plot.h + categorySize + 3, axisTickText(t, model.axes?.category), {
           anchor: "middle",
           ...categoryAttrs
         })
       );
   }
   out.push(
-    line(plot.x, plot.y + plot.h, plot.x + plot.w, plot.y + plot.h, xAxis.color, xAxis.width)
+    axisLine(
+      model,
+      model.axes?.category,
+      "categoryAxis",
+      plot.x,
+      plot.y + plot.h,
+      plot.x + plot.w,
+      plot.y + plot.h
+    )
+  );
+  out.push(
+    axisLine(model, model.axes?.value, "valueAxis", plot.x, plot.y, plot.x, plot.y + plot.h)
   );
-  out.push(line(plot.x, plot.y, plot.x, plot.y + plot.h, yAxis.color, yAxis.width));
+  const marks = [];
   for (const [si, s] of model.series.entries())
     s.values.forEach((v, i) => {
       const x = s.xValues?.[i] ?? null;
@@ -6200,15 +7286,18 @@ function scatter(model, area, out) {
       const filter = s.shadowFilter ? ` filter="${s.shadowFilter}"` : "";
       const fill = s.pointColors?.[i] ?? s.color;
       if (!bubble) {
-        out.push(`<circle cx="${n(px(x))}" cy="${n(py(v))}" r="3" fill="${fill}"${filter}/>`);
+        out.push(chartSeriesMarkerSvg(s, i, px(x), py(v)));
+        marks.push({ series: s, index: i, x: px(x), y: py(v), radius: chartMarkerRadius(s, i) });
         return;
       }
       const r = radiusOf(s.sizes?.[i] ?? void 0);
       if (r === void 0) return;
+      marks.push({ series: s, index: i, x: px(x), y: py(v), radius: r });
       out.push(
         `<circle cx="${n(px(x))}" cy="${n(py(v))}" r="${n(r)}" fill="${fill}" fill-opacity="0.6" data-chart-series="${si}" data-chart-point="${i}"${filter}/>`
       );
     });
+  pointLabels(model, marks, out);
   scatterAnalysis(model, px, py, out);
 }
 
@@ -6325,21 +7414,21 @@ function cartesianSvg(model, area) {
     return out.join("");
   }
   const layers = [{ model, frame }];
-  for (const group of model.extraGroups ?? []) {
+  for (const group2 of model.extraGroups ?? []) {
     const grouped = {
       ...model,
-      type: group.type,
-      grouping: group.grouping,
-      series: group.series,
+      type: group2.type,
+      grouping: group2.grouping,
+      series: group2.series,
       horizontal: false
     };
-    if (group.stock) grouped.stock = group.stock;
+    if (group2.stock) grouped.stock = group2.stock;
     else delete grouped.stock;
-    if (group.barGapWidth !== void 0) grouped.barGapWidth = group.barGapWidth;
+    if (group2.barGapWidth !== void 0) grouped.barGapWidth = group2.barGapWidth;
     else delete grouped.barGapWidth;
-    if (group.barOverlap !== void 0) grouped.barOverlap = group.barOverlap;
+    if (group2.barOverlap !== void 0) grouped.barOverlap = group2.barOverlap;
     else delete grouped.barOverlap;
-    const value = group.secondary && frame.secondary ? frame.secondary : frame.value;
+    const value = group2.secondary && frame.secondary ? frame.secondary : frame.value;
     layers.push({ model: grouped, frame: { ...frame, value } });
   }
   layers.map((layer, order) => ({ layer, order })).sort(
@@ -6373,7 +7462,9 @@ function pieSvg(model, area) {
   const out = [chartAreaRect(model, "plotArea", area)];
   const cx = area.x + area.w / 2;
   const cy = area.y + area.h / 2;
-  const radius = Math.max(1, Math.min(area.w, area.h) / 2 - 4);
+  const margin = hasOutsideLabels(model) ? Math.min(area.w, area.h) * 0.12 : 0;
+  const radius = Math.max(1, Math.min(area.w, area.h) / 2 - 4 - margin);
+  const slices = [];
   const rings = model.type === "doughnut" ? model.series : model.series.slice(0, 1);
   const hole = model.type === "doughnut" ? radius * 0.5 : 0;
   const ringSize = (radius - hole) / Math.max(1, rings.length);
@@ -6390,9 +7481,20 @@ function pieSvg(model, area) {
       out.push(
         `<path d="${slicePath(cx, cy, outer, inner, angle, angle + sweep)}" fill="${color}" stroke="#FFFFFF" stroke-width="1"${s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""}/>`
       );
+      slices.push({
+        series: s,
+        index: i,
+        cx,
+        cy,
+        outer,
+        inner,
+        start: angle,
+        end: angle + sweep
+      });
       angle += sweep;
     });
   });
+  sliceLabels(model, slices, out);
   return out.join("");
 }
 function radarSvg(model, area) {
@@ -6405,32 +7507,37 @@ function radarSvg(model, area) {
   const valueSize = valueAttrs.size ?? 9;
   const categorySize = categoryAttrs.size ?? 10;
   const grid = chartStroke(model, "gridlineMajor");
-  const axis = chartStroke(model, "categoryAxis");
   const cx = area.x + area.w / 2;
   const cy = area.y + area.h / 2 + 4;
   const radius = Math.max(1, Math.min(area.w, area.h) / 2 - Math.max(18, categorySize * 1.8));
   const angle = (i) => i / count * Math.PI * 2;
-  const r = (v) => (v - scale.min) / (scale.max - scale.min || 1) * radius;
+  const r = (v) => chartAxisRatio(v, scale, model.axes?.value) * radius;
   const labelEvery = Math.max(
     1,
     Math.ceil(12 / Math.max(1, radius / Math.max(1, scale.ticks.length - 1)))
   );
   for (const [k, t] of scale.ticks.entries()) {
     const ring = Array.from({ length: count }, (_, i) => polar(cx, cy, r(t), angle(i))).map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
-    out.push(
-      `<polygon points="${ring}" fill="none" stroke="${grid.color}" stroke-width="${n(grid.width)}"/>`
-    );
-    if (model.appearance?.valueAxis?.labelsVisible !== false && k % labelEvery === 0)
+    if (!model.axes?.value || model.axes.value.source.majorGridlines)
+      out.push(
+        `<polygon points="${ring}" fill="none" stroke="${grid.color}" stroke-width="${n(grid.width)}"/>`
+      );
+    if (chartAxisLabels(model.axes?.value) && model.appearance?.valueAxis?.labelsVisible !== false && k % labelEvery === 0)
       out.push(
-        text(cx + 3, cy - r(t) + valueSize * 0.3, formatAxisValue(t, scale.percent), valueAttrs)
+        text(
+          cx + 3,
+          cy - r(t) + valueSize * 0.3,
+          axisTickText(t, model.axes?.value, scale.percent),
+          valueAttrs
+        )
       );
   }
   model.categories.forEach((c, i) => {
     const [x, y] = polar(cx, cy, radius, angle(i));
-    out.push(line(cx, cy, x, y, axis.color, axis.width));
+    out.push(axisLine(model, model.axes?.category, "categoryAxis", cx, cy, x, y));
     const [lx, ly] = polar(cx, cy, radius + 10, angle(i));
     const anchor = Math.abs(lx - cx) < 2 ? "middle" : lx > cx ? "start" : "end";
-    if (model.appearance?.categoryAxis?.labelsVisible !== false)
+    if (chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false)
       out.push(
         text(lx, ly + categorySize * 0.3, fit(c, area.w / 4, categorySize), {
           anchor,
@@ -6438,12 +7545,22 @@ function radarSvg(model, area) {
         })
       );
   });
+  const marks = [];
   for (const s of model.series) {
-    const points = s.values.slice(0, count).map((v, i) => polar(cx, cy, r(v ?? scale.min), angle(i))).map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
+    const vertices = s.values.slice(0, count).map((v, i) => polar(cx, cy, r(v ?? scale.min), angle(i)));
+    vertices.forEach(([x, y], i) => {
+      if (s.values[i] === null) return;
+      const markerSeries = s;
+      if (markerSeries.marker || markerSeries.pointMarkers)
+        out.push(chartSeriesMarkerSvg(s, i, x, y));
+      marks.push({ series: s, index: i, x, y, radius: chartMarkerRadius(s, i) });
+    });
+    const points = vertices.map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
     out.push(
       `<polygon points="${points}" fill="none" stroke="${s.color}" stroke-width="2"${s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""}/>`
     );
   }
+  pointLabels(model, marks, out);
   return out.join("");
 }
 
@@ -6534,33 +7651,33 @@ var CHART_FONT_FAMILY = "Calibri, Carlito, Arial, sans-serif";
 function cssFont(attrs2) {
   return `${attrs2.italic ? "italic" : "normal"} ${attrs2.weight ?? "normal"} ${attrs2.size ?? 10}px ${attrs2.family ?? CHART_FONT_FAMILY}`;
 }
-function chartFontMetrics(attrs2, options) {
-  const metrics = options.measureFont?.(cssFont(attrs2));
+function chartFontMetrics(attrs2, options2) {
+  const metrics = options2.measureFont?.(cssFont(attrs2));
   return metrics && Number.isFinite(metrics.ascent) && Number.isFinite(metrics.descent) && metrics.ascent >= 0 && metrics.descent >= 0 && metrics.ascent + metrics.descent > 0 ? metrics : void 0;
 }
-function chartTextWidth(content, attrs2, options) {
-  const width = options.measureText?.(content, cssFont(attrs2));
+function chartTextWidth(content, attrs2, options2) {
+  const width = options2.measureText?.(content, cssFont(attrs2));
   return width !== void 0 && Number.isFinite(width) && width >= 0 ? width : textWidth(content, attrs2.size);
 }
-function fitChartText(content, maxWidth, attrs2, options) {
-  if (!options.measureText) return fit(content, maxWidth, attrs2.size);
-  if (chartTextWidth(content, attrs2, options) <= maxWidth) return content;
+function fitChartText(content, maxWidth, attrs2, options2) {
+  if (!options2.measureText) return fit(content, maxWidth, attrs2.size);
+  if (chartTextWidth(content, attrs2, options2) <= maxWidth) return content;
   const points = [...content];
   let low = 0;
   let high = points.length;
   while (low < high) {
     const mid = Math.ceil((low + high) / 2);
-    if (chartTextWidth(`${points.slice(0, mid).join("")}\u2026`, attrs2, options) <= maxWidth) low = mid;
+    if (chartTextWidth(`${points.slice(0, mid).join("")}\u2026`, attrs2, options2) <= maxWidth) low = mid;
     else high = mid - 1;
   }
   return `${points.slice(0, low).join("")}\u2026`;
 }
 
 // chart/render/chart-svg-legend.ts
-function chartLegendSvg(model, area, frame, options) {
+function chartLegendSvg(model, area, frame, options2) {
   const automatic = [];
   const bounds = {};
-  const reserved = automaticLegend(model, area, automatic, options, bounds);
+  const reserved = automaticLegend(model, area, automatic, options2, bounds);
   const plot = model.legendOverlay ? area : reserved;
   const box = bounds.box;
   if (!box) return { plot, markup: "", foreground: false };
@@ -6574,11 +7691,11 @@ function chartLegendSvg(model, area, frame, options) {
   const entries = legendEntries(model);
   const attrs2 = chartTextAttributes(model, "legend");
   const size = attrs2.size ?? 10;
-  const font = chartFontMetrics(attrs2, options);
+  const font = chartFontMetrics(attrs2, options2);
   const keySize = size / 2;
   const keyGap = size / 4;
   const widths = entries.map(
-    (entry) => chartTextWidth(entry.label, attrs2, options) + keySize + keyGap
+    (entry) => chartTextWidth(entry.label, attrs2, options2) + keySize + keyGap
   );
   const horizontal = manual.width > manual.height && widths.reduce((sum, width) => sum + width, 0) + size <= manual.width;
   const rowWidth = horizontal ? manual.width / entries.length : manual.width;
@@ -6593,8 +7710,8 @@ function chartLegendSvg(model, area, frame, options) {
   ];
   const baselineOffset = font ? (font.ascent - font.descent) / 2 : size * 0.35;
   entries.forEach((entry, i) => {
-    const available = horizontal ? chartTextWidth(entry.label, attrs2, options) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
-    const label = fitChartText(entry.label, available, attrs2, options);
+    const available = horizontal ? chartTextWidth(entry.label, attrs2, options2) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
+    const label = fitChartText(entry.label, available, attrs2, options2);
     const contentWidth = Math.min(
       horizontal ? widths[i] ?? 0 : Math.max(...widths),
       rowWidth - size / 2
@@ -6637,7 +7754,7 @@ function legendEntries(model) {
     color: s.color
   }));
 }
-function automaticLegend(model, area, out, options, bounds) {
+function automaticLegend(model, area, out, options2, bounds) {
   const entries = legendEntries(model);
   if (!model.showLegend || entries.length === 0) return area;
   const pos = model.legendPosition;
@@ -6646,7 +7763,7 @@ function automaticLegend(model, area, out, options, bounds) {
   const rowH = Math.max(16, size * 1.4);
   if (pos === "t" || pos === "b") {
     const widths = entries.map(
-      (e) => Math.min(chartTextWidth(e.label, attrs2, options) + 20, area.w / 2)
+      (e) => Math.min(chartTextWidth(e.label, attrs2, options2) + 20, area.w / 2)
     );
     const total = widths.reduce((a, b) => a + b, 0);
     let x2 = area.x + Math.max(0, (area.w - total) / 2);
@@ -6663,14 +7780,14 @@ function automaticLegend(model, area, out, options, bounds) {
     entries.forEach((e, i) => {
       const w = widths[i] ?? 0;
       out.push(rect(x2, y, 8, 8, e.color));
-      out.push(text(x2 + 12, y + 8, fitChartText(e.label, w - 16, attrs2, options), attrs2));
+      out.push(text(x2 + 12, y + 8, fitChartText(e.label, w - 16, attrs2, options2), attrs2));
       x2 += w;
     });
     return pos === "t" ? { x: area.x, y: area.y + rowH + 4, w: area.w, h: area.h - rowH - 4 } : { x: area.x, y: area.y, w: area.w, h: area.h - rowH - 4 };
   }
   const width = Math.min(
     area.w * 0.35,
-    Math.max(...entries.map((e) => chartTextWidth(e.label, attrs2, options))) + 22
+    Math.max(...entries.map((e) => chartTextWidth(e.label, attrs2, options2))) + 22
   );
   const height = entries.length * rowH;
   const x = pos === "l" ? area.x + 4 : area.x + area.w - width;
@@ -6688,24 +7805,24 @@ function automaticLegend(model, area, out, options, bounds) {
     const y = y0 + i * rowH;
     if (y + rowH > area.y + area.h + 2) return;
     out.push(rect(x, y + 3, 8, 8, e.color));
-    out.push(text(x + 12, y + 11, fitChartText(e.label, width - 16, attrs2, options), attrs2));
+    out.push(text(x + 12, y + 11, fitChartText(e.label, width - 16, attrs2, options2), attrs2));
   });
   return pos === "l" ? { x: area.x + width + 8, y: area.y, w: area.w - width - 8, h: area.h } : { x: area.x, y: area.y, w: area.w - width - 8, h: area.h };
 }
 
 // text/wrap-styled-runs.ts
 var graphemes = new Intl.Segmenter(void 0, { granularity: "grapheme" });
-function wrapStyledRuns(runs, maxWidth, measure, options = {}) {
+function wrapStyledRuns(runs, maxWidth, measure2, options2 = {}) {
   const groups = [];
   for (const [source, run] of runs.entries()) {
     for (const token of run.text.split(/(\r\n|[\r\n]|[ \t]+)/u).filter(Boolean)) {
       const kind = /^[\r\n]+$/u.test(token) ? "break" : /^[ \t]+$/u.test(token) ? "space" : "word";
-      let group = groups.at(-1);
-      if (!group || group.kind !== kind || kind === "break") {
-        group = { kind, pieces: [] };
-        groups.push(group);
+      let group2 = groups.at(-1);
+      if (!group2 || group2.kind !== kind || kind === "break") {
+        group2 = { kind, pieces: [] };
+        groups.push(group2);
       }
-      if (kind !== "break") group.pieces.push({ run, source, text: token });
+      if (kind !== "break") group2.pieces.push({ run, source, text: token });
     }
   }
   const merged = (left, right) => {
@@ -6718,7 +7835,7 @@ function wrapStyledRuns(runs, maxWidth, measure, options = {}) {
     return result2;
   };
   const width = (pieces) => pieces.reduce((sum, piece) => {
-    const advance = measure(piece.text, piece.run);
+    const advance = measure2(piece.text, piece.run);
     return sum + (Number.isFinite(advance) && advance >= 0 ? advance : 0);
   }, 0);
   const result = [];
@@ -6729,29 +7846,29 @@ function wrapStyledRuns(runs, maxWidth, measure, options = {}) {
     line2 = [];
     spaces = [];
   };
-  for (const group of groups) {
-    if (group.kind === "break") {
+  for (const group2 of groups) {
+    if (group2.kind === "break") {
       flush();
       continue;
     }
-    if (group.kind === "space") {
-      spaces = group.pieces;
+    if (group2.kind === "space") {
+      spaces = group2.pieces;
       continue;
     }
     const separator = line2.length ? spaces : [];
-    const wordWidth = width(group.pieces);
-    if (line2.length && width(merged(line2, [...separator, ...group.pieces])) > maxWidth) flush();
+    const wordWidth = width(group2.pieces);
+    if (line2.length && width(merged(line2, [...separator, ...group2.pieces])) > maxWidth) flush();
     else line2 = merged(line2, separator);
     spaces = [];
-    if (options.breakWords && wordWidth > maxWidth) {
-      for (const piece of group.pieces) {
+    if (options2.breakWords && wordWidth > maxWidth) {
+      for (const piece of group2.pieces) {
         for (const { segment: segment2 } of graphemes.segment(piece.text)) {
           const next = { ...piece, text: segment2 };
           if (line2.length && width(merged(line2, [next])) > maxWidth) flush();
           line2 = merged(line2, [next]);
         }
       }
-    } else line2 = merged(line2, group.pieces);
+    } else line2 = merged(line2, group2.pieces);
   }
   flush();
   return result;
@@ -6761,11 +7878,11 @@ function wrapStyledRuns(runs, maxWidth, measure, options = {}) {
 function spacing(value, naturalHeight, fallback) {
   return value ? value.unit === "points" ? chartPointsToPixels(value.value) : naturalHeight * value.value : fallback;
 }
-function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
+function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
   if (!model.title) return void 0;
   const base = chartTextAttributes(model, "title", 14);
   const capacity = Math.max(1, width * 0.8 - 8);
-  if (!model.titleText && !hasManualLayoutFields(model.titleLayout) && !model.titleOverlay && !model.title.includes("\n") && chartTextWidth(model.title, base, options) <= capacity)
+  if (!model.titleText && !hasManualLayoutFields(model.titleLayout) && !model.titleOverlay && !model.title.includes("\n") && chartTextWidth(model.title, base, options2) <= capacity)
     return void 0;
   const paragraphs = model.titleText?.paragraphs ?? [
     {
@@ -6801,7 +7918,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           "title",
           base.size
         ),
-        options
+        options2
       ),
       { breakWords: true }
     );
@@ -6825,10 +7942,10 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
     return {
       ...line2,
       runs,
-      width: runs.reduce((sum, run) => sum + chartTextWidth(run.text, run.attrs, options), 0),
+      width: runs.reduce((sum, run) => sum + chartTextWidth(run.text, run.attrs, options2), 0),
       size: runs.length ? Math.max(...runs.map((run) => run.attrs.size ?? 14)) : base.size ?? 14,
       fontMetrics: (runs.length ? runs.map((run) => run.attrs) : [base]).map(
-        (attrs2) => chartFontMetrics(attrs2, options)
+        (attrs2) => chartFontMetrics(attrs2, options2)
       )
     };
   });
@@ -6866,7 +7983,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           anchor: "start"
         }).replace("<text ", '<tspan data-chart-title-run="true" ').replace("</text>", "</tspan>")
       );
-      x += chartTextWidth(run.text, run.attrs, options);
+      x += chartTextWidth(run.text, run.attrs, options2);
     }
   }
   const parent = text(0, 0, "", { ...base, underline: false }).replace(
@@ -6892,7 +8009,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
 }
 
 // chart/render/chart-svg.ts
-function renderChartSvg(model, width, height, options = {}) {
+function renderChartSvg(model, width, height, options2 = {}) {
   const paint2 = chartGradientPaint(model, Math.max(1, width), Math.max(1, height));
   model = paint2.model;
   const w = Math.max(1, width);
@@ -6906,7 +8023,7 @@ function renderChartSvg(model, width, height, options = {}) {
   if (paint2.defs) out.push(paint2.defs);
   out.push(chartAreaRect(model, "chartArea", { x: 0, y: 0, w, h }));
   let area = { x: 8, y: 8, w: w - 16, h: h - 16 };
-  const richTitle = chartRichTitleSvg(model, w, options, h);
+  const richTitle = chartRichTitleSvg(model, w, options2, h);
   if (richTitle) {
     if (model.titleLayout || model.titleOverlay) foregroundTitle = richTitle.markup;
     else out.push(richTitle.markup);
@@ -6915,9 +8032,9 @@ function renderChartSvg(model, width, height, options = {}) {
   } else if (model.title) {
     const attrs2 = chartTextAttributes(model, "title", 14);
     const size = attrs2.size ?? 14;
-    const label = fitChartText(model.title, w - 16, attrs2, options);
-    const titleWidth = Math.min(w - 16, chartTextWidth(label, attrs2, options) + 8);
-    const font = chartFontMetrics(attrs2, options);
+    const label = fitChartText(model.title, w - 16, attrs2, options2);
+    const titleWidth = Math.min(w - 16, chartTextWidth(label, attrs2, options2) + 8);
+    const font = chartFontMetrics(attrs2, options2);
     const titleHeight = Math.max(24, font ? font.ascent + font.descent + 4 : size * 1.4 + 4);
     out.push(
       chartAreaRect(model, "title", {
@@ -6945,7 +8062,7 @@ function renderChartSvg(model, width, height, options = {}) {
     out.push("</svg>");
     return out.join("");
   }
-  const legend = chartLegendSvg(model, area, { width: w, height: h }, options);
+  const legend = chartLegendSvg(model, area, { width: w, height: h }, options2);
   area = legend.plot;
   if (!legend.foreground) out.push(legend.markup);
   if (area.w > 4 && area.h > 4) {
@@ -6992,8 +8109,8 @@ function chartSpaceKind(space) {
   const type = chartSummaryFromSpace(space).chartType;
   return { type, drawn: DRAWN_CHART_TYPES.has(type) };
 }
-function renderChartSpaceSvg(space, options) {
-  const { width, height, theme, fonts, formatting, colorPalette, styleDefinition, ...svg } = options;
+function renderChartSpaceSvg(space, options2) {
+  const { width, height, theme, fonts, formatting, colorPalette, styleDefinition, ...svg } = options2;
   const summary = chartSummaryFromSpace(space, {
     ...formatting ? { formatting } : {},
     ...colorPalette !== void 0 ? { colorPalette } : {},
@@ -7002,8 +8119,8 @@ function renderChartSpaceSvg(space, options) {
   const view = chartSummaryView(summary, chartThemePalette(theme, fonts));
   return renderChartSvg(view, width, height, svg);
 }
-function renderChartSummarySvg(summary, options) {
-  const { width, height, theme, fonts, ...svg } = options;
+function renderChartSummarySvg(summary, options2) {
+  const { width, height, theme, fonts, ...svg } = options2;
   const view = chartSummaryView(summary, chartThemePalette(theme, fonts));
   return renderChartSvg(view, width, height, svg);
 }
@@ -7931,30 +9048,30 @@ function buildInlineContent(doc, runs, base, slots, allocator, ranges) {
   const output = [];
   let index = 0;
   while (index < runs.length) {
-    const group = containerGroup(runAt(index));
-    if (!group) {
+    const group2 = containerGroup(runAt(index));
+    if (!group2) {
       output.push(...nodesFor(index));
       index++;
       continue;
     }
     const start = index;
-    while (index < runs.length && sameGroup(containerGroup(runAt(index)), group)) index++;
+    while (index < runs.length && sameGroup(containerGroup(runAt(index)), group2)) index++;
     const oldContainers = new Set(slots.slice(start, index).map((slot) => slot?.container));
     const [onlyContainer] = oldContainers;
-    oldContainers.size === 1 && onlyContainer !== void 0 && onlyContainer.localName === (group.kind === "link" ? "hyperlink" : group.kind === "control" ? "sdt" : "fldSimple") && base?.slice(start, index).every((run) => sameGroup(run && containerGroup(run), group)) === true;
+    oldContainers.size === 1 && onlyContainer !== void 0 && onlyContainer.localName === (group2.kind === "link" ? "hyperlink" : group2.kind === "control" ? "sdt" : "fldSimple") && base?.slice(start, index).every((run) => sameGroup(run && containerGroup(run), group2)) === true;
     let container;
     let target;
-    if (group.kind === "control") {
-      const created = createContentControl(doc, group.control);
+    if (group2.kind === "control") {
+      const created = createContentControl(doc, group2.control);
       container = created.sdt;
       target = created.content;
-    } else if (group.kind === "link") container = newHyperlink(doc, group.link);
+    } else if (group2.kind === "link") container = newHyperlink(doc, group2.link);
     else {
       container = makeW(doc, "fldSimple");
-      setW2(container, "instr", ` ${group.instr} `);
+      setW2(container, "instr", ` ${group2.instr} `);
     }
-    if (group.kind === "simpleField") writeFieldFlags(container, runAt(start).fieldFlags);
-    const edges = group.kind === "simpleField" ? takeSimpleFieldCommentEdges(doc, runs, start, index, opens, closes) : { before: [], after: [] };
+    if (group2.kind === "simpleField") writeFieldFlags(container, runAt(start).fieldFlags);
+    const edges = group2.kind === "simpleField" ? takeSimpleFieldCommentEdges(doc, runs, start, index, opens, closes) : { before: [], after: [] };
     for (let item = start; item < index; item++)
       for (const node of nodesFor(item)) (target ?? container).appendChild(node);
     output.push(...edges.before, container, ...edges.after);
@@ -8152,11 +9269,11 @@ function createParagraph(doc, paragraph, allocator, spans) {
 
 // docx/numbering-parse.ts
 var own = (map, key) => Object.prototype.hasOwnProperty.call(map, key) ? map[key] : void 0;
-function resolveNumberingLevel(catalog, numId, level) {
+function resolveNumberingLevel(catalog, numId, level2) {
   const num = own(catalog.nums, numId);
   if (!num) return void 0;
-  const override = num.levelOverrides?.[level];
-  const sourceAbstract = own(catalog.abstractNums, num.abstractNumId)?.levels[level];
+  const override = num.levelOverrides?.[level2];
+  const sourceAbstract = own(catalog.abstractNums, num.abstractNumId)?.levels[level2];
   const abstract = sourceAbstract?.startWasOmitted && sourceAbstract.start === 1 ? { ...sourceAbstract, start: 0 } : sourceAbstract;
   let base = override?.lvl ?? abstract;
   if (!base) return void 0;
@@ -8264,10 +9381,10 @@ function resolveParagraphNumbering(paragraph, styleCatalog, numberingCatalog) {
   const inherited = resolveStyleNumbering(paragraph.style, styleCatalog);
   if (!inherited || inherited.numId <= 0) return void 0;
   if (numberingCatalog && paragraph.style && styleCatalog.styles[paragraph.style]) {
-    for (let level = 0; level < 9; level++) {
-      const definition = resolveNumberingLevel(numberingCatalog, String(inherited.numId), level);
+    for (let level2 = 0; level2 < 9; level2++) {
+      const definition = resolveNumberingLevel(numberingCatalog, String(inherited.numId), level2);
       if (definition?.paragraphStyleId === paragraph.style)
-        return { numId: inherited.numId, level };
+        return { numId: inherited.numId, level: level2 };
     }
   }
   return inherited;
@@ -8492,7 +9609,7 @@ var rejectAllRevisions = (model) => applyAll(model, rejectRevision);
 // docx/field-date.ts
 var TOKENS = /yyyy|yy|MMMM|MMM|MM|M|dddd|ddd|dd|d|HH|H|hh|h|mm|ss|am\/pm|AM\/PM|'[^']*'/g;
 function formatWordDate(date, picture, locale = "en-US") {
-  const name = (options) => new Intl.DateTimeFormat(locale, options).format(date);
+  const name = (options2) => new Intl.DateTimeFormat(locale, options2).format(date);
   const pad = (value) => String(value).padStart(2, "0");
   const hours12 = date.getHours() % 12 || 12;
   return picture.replace(TOKENS, (token) => {
@@ -8572,9 +9689,9 @@ function resolveCellVisuals(table, cell, placement, styles) {
 }
 
 // docx/section-layout.ts
-function sectionLayoutJson(sections) {
+function sectionLayoutJson(sections2) {
   return JSON.stringify(
-    sections.map(({ headers: _headers, footers: _footers, ...layout }) => layout)
+    sections2.map(({ headers: _headers, footers: _footers, ...layout }) => layout)
   );
 }
 function sectionsFromLayout(json, prior, blocks) {
@@ -10145,11 +11262,11 @@ function wordYjsDocumentAttributes(attrs2, canWrite) {
 }
 var wordYjsPluginKey = new PluginKey("docx-yjs");
 var WordYjsCollaboration = class {
-  constructor(session, initial, options) {
+  constructor(session, initial, options2) {
     this.session = session;
     if (!session.synced)
       throw new Error("Wait for initial provider synchronization before joining Word.");
-    if (!options.documentId.trim()) throw new Error("A matching source documentId is required.");
+    if (!options2.documentId.trim()) throw new Error("A matching source documentId is required.");
     this.fragment = session.doc.getXmlFragment("docx:body");
     this.media = new WordYjsMedia(session);
     this.attributes = session.doc.getMap("docx:attributes");
@@ -10165,17 +11282,17 @@ var WordYjsCollaboration = class {
       () => this.sharedInlineComments
     );
     if (!identity.has("documentId")) {
-      if (!options.initializeIfEmpty || !session.canWrite() || this.fragment.length)
+      if (!options2.initializeIfEmpty || !session.canWrite() || this.fragment.length)
         throw new Error("The Word room has not been initialized by its designated creator.");
       session.doc.transact(() => {
-        for (const [name, part] of options.initialMedia ?? []) this.media.publish(name, part);
-        identity.set("documentId", options.documentId);
+        for (const [name, part] of options2.initialMedia ?? []) this.media.publish(name, part);
+        identity.set("documentId", options2.documentId);
         identity.set("format", format);
         identity.set(
           "comments",
           format === "word-yjs-v3" ? "inline-relative-v1" : "independent-v1"
         );
-        for (const comment of options.initialComments ?? []) {
+        for (const comment of options2.initialComments ?? []) {
           this.comments.records.set(comment.id, { ...comment });
           if (comment.resolved !== void 0)
             this.comments.resolved.set(comment.id, comment.resolved);
@@ -10189,7 +11306,7 @@ var WordYjsCollaboration = class {
           this.comments.inlineAnchors.seed(doc, mapping);
         }
       }, this);
-    } else if (identity.get("documentId") !== options.documentId) {
+    } else if (identity.get("documentId") !== options2.documentId) {
       throw new Error("Load the matching source package before joining this Word room.");
     } else if (identity.get("format") !== format) {
       throw new Error("Unsupported Word collaboration room format.");
@@ -10232,7 +11349,7 @@ var WordYjsCollaboration = class {
     this.session.doc.transact(() => seedEmptyParagraphText(this.fragment), this);
   };
   /** Fresh plugins per live view; the Y.Doc and local undo history survive view teardown. */
-  state(schema, options = {}) {
+  state(schema, options2 = {}) {
     if (this.destroyed) throw new Error("The Word Yjs binding has been destroyed.");
     if (wordInlinePropertyCodec(schema) !== this.roomFormat)
       throw new Error("Unsupported Word collaboration schema for this room format.");
@@ -10262,8 +11379,8 @@ var WordYjsCollaboration = class {
             const unguard = binding ? guardDeletedNodeSelection(this.session.doc, view, binding) : () => {
             };
             const originalVisibility = binding?._isDomSelectionInView;
-            if (binding && options.selectionVisible)
-              binding._isDomSelectionInView = () => options.selectionVisible(view);
+            if (binding && options2.selectionVisible)
+              binding._isDomSelectionInView = () => options2.selectionVisible(view);
             const added = ({ stackItem }) => {
               const binding2 = ySyncPluginKey.getState(view.state)?.binding;
               if (binding2) stackItem.meta.set(this.selectionKey, this.previousSelection);
@@ -10336,8 +11453,8 @@ function isWordYjsRemoteTransaction(transaction) {
     transaction.getMeta("dve-remote") || transaction.getMeta(ySyncPluginKey)?.isChangeOrigin
   );
 }
-function wordYjsPresencePlugin(session, options) {
-  return yCursorPlugin(session.awareness, options);
+function wordYjsPresencePlugin(session, options2) {
+  return yCursorPlugin(session.awareness, options2);
 }
 function refreshWordYjsPresence(state) {
   return state.tr.setMeta(yCursorPluginKey, { awarenessUpdated: true });
@@ -10421,9 +11538,9 @@ var SectionPartsStep = class _SectionPartsStep extends DocAttrStep {
     return new _SectionPartsStep(doc.attrs.sectionParts);
   }
 };
-function sectionPartsJson(sections) {
+function sectionPartsJson(sections2) {
   return JSON.stringify(
-    (sections ?? []).map(({ endsAtBlockId, headers, footers }) => ({
+    (sections2 ?? []).map(({ endsAtBlockId, headers, footers }) => ({
       endsAtBlockId,
       ...headers ? { headers } : {},
       ...footers ? { footers } : {}
@@ -11428,9 +12545,9 @@ function safeParagraph(node, allowInsertion = false) {
 function endsSection(state, node) {
   if (typeof state.doc.attrs.sections !== "string") return false;
   try {
-    const sections = JSON.parse(state.doc.attrs.sections);
-    return sections.some(
-      (section, index) => section.endsAtBlockId === node.attrs.id && (index < sections.length - 1 || state.doc.lastChild !== node)
+    const sections2 = JSON.parse(state.doc.attrs.sections);
+    return sections2.some(
+      (section, index) => section.endsAtBlockId === node.attrs.id && (index < sections2.length - 1 || state.doc.lastChild !== node)
     );
   } catch {
     return true;
@@ -11727,8 +12844,8 @@ function resolveParagraphMarkRange(tr, pos, mode) {
   const $next = tr.doc.resolve(nextPos);
   const following = $next.nodeAfter;
   if (!keepBreak && typeof tr.doc.attrs.sections === "string") {
-    const sections = JSON.parse(tr.doc.attrs.sections);
-    if (sections.some((section) => section.endsAtBlockId === current.id))
+    const sections2 = JSON.parse(tr.doc.attrs.sections);
+    if (sections2.some((section) => section.endsAtBlockId === current.id))
       throw new Error("Cannot resolve a paragraph mark across a section boundary.");
   }
   const blocks = [current];
@@ -12438,7 +13555,7 @@ function normalizeRibbonActions(input) {
 }
 
 // docx/ui/ribbon-colors.ts
-var NAMED_COLORS = {
+var NAMED_COLORS2 = {
   yellow: "#ffff00",
   green: "#00ff00",
   cyan: "#00ffff",
@@ -12457,7 +13574,7 @@ var NAMED_COLORS = {
   white: "#ffffff"
 };
 function swatchColor(value) {
-  return value === "none" ? "transparent" : NAMED_COLORS[value] ?? value;
+  return value === "none" ? "transparent" : NAMED_COLORS2[value] ?? value;
 }
 
 // docx/ui/run-compare.ts
@@ -13157,7 +14274,7 @@ var newControlId = (doc) => {
   while (used.has(id));
   return id;
 };
-function insertContentControl(state, kind, options = {}) {
+function insertContentControl(state, kind, options2 = {}) {
   const type = state.schema.marks.contentControl;
   if (!type) return void 0;
   const { selection } = state;
@@ -13165,10 +14282,10 @@ function insertContentControl(state, kind, options = {}) {
     id: newControlId(state.doc),
     level: "inline",
     kind,
-    ...options.alias ? { alias: options.alias } : {},
-    ...options.tag ? { tag: options.tag } : {},
-    ...options.items ? { items: options.items } : {},
-    ...kind === "date" ? { dateFormat: options.dateFormat ?? "M/d/yyyy", dateLocale: "en-US" } : {}
+    ...options2.alias ? { alias: options2.alias } : {},
+    ...options2.tag ? { tag: options2.tag } : {},
+    ...options2.items ? { items: options2.items } : {},
+    ...kind === "date" ? { dateFormat: options2.dateFormat ?? "M/d/yyyy", dateLocale: "en-US" } : {}
   };
   const wrapsText = !selection.empty && (kind === "richText" || kind === "text");
   if (wrapsText) {