ooxml-core 1.18.0 → 1.19.1

package/dist/xlsx/index.cjs

@@ -279,8 +279,8 @@ function createWorksheet(name, sheetId) {
     preserved: /* @__PURE__ */ new Map()
   };
 }
-function createWorkbook(options = {}) {
-  const names = options.sheets?.length ? options.sheets : ["Sheet1"];
+function createWorkbook(options2 = {}) {
+  const names = options2.sheets?.length ? options2.sheets : ["Sheet1"];
   return {
     sheets: names.map((name, index3) => createWorksheet(name, index3 + 1)),
     styles: [defaultCellStyle()],
@@ -1681,15 +1681,15 @@ function renderAbs(v, section, generalWidth) {
   }
   return { text: text4, zero: general === "0" };
 }
-function hashFill(options) {
-  const width = options.width ?? 0;
-  const one2 = options.measure ? options.measure("#") : 1;
+function hashFill(options2) {
+  const width = options2.width ?? 0;
+  const one2 = options2.measure ? options2.measure("#") : 1;
   return "#".repeat(Math.max(1, Math.floor(one2 > 0 ? width / one2 : width)));
 }
-function fitNumber(value2, format, options) {
-  const date1904 = options.date1904 ?? false;
-  const width = options.width ?? 0;
-  const fits = (text4) => (options.measure ? options.measure(text4) : text4.length) <= width;
+function fitNumber(value2, format, options2) {
+  const date1904 = options2.date1904 ?? false;
+  const width = options2.width ?? 0;
+  const fits = (text4) => (options2.measure ? options2.measure(text4) : text4.length) <= width;
   const first2 = formatNumber(value2, format, date1904);
   if (fits(first2.text) || first2.text === OVERFLOW_TEXT) return first2;
   const choice = chooseSection(compileFormat(format), value2);
@@ -1700,7 +1700,7 @@ function fitNumber(value2, format, options) {
       if (fits(next.text)) return next;
     }
   }
-  const fill = hashFill(options);
+  const fill = hashFill(options2);
   return first2.color ? { text: fill, color: first2.color } : { text: fill };
 }
 function formatNumber(value2, format, date1904, generalWidth) {
@@ -1722,13 +1722,13 @@ function formatNumber(value2, format, date1904, generalWidth) {
   const minus = value2 < 0 && !abs2 && !zero;
   return result(minus ? `-${text4}` : text4, section);
 }
-function formatValue(value2, format, options = {}) {
+function formatValue(value2, format, options2 = {}) {
   if (value2 === null) return { text: "" };
   if (typeof value2 === "boolean") return { text: value2 ? "TRUE" : "FALSE" };
   if (typeof value2 === "string") return formatText(value2, compileFormat(format).text);
   if (isCellError(value2)) return { text: value2.error };
-  if (options.width !== void 0) return fitNumber(value2, format, options);
-  return formatNumber(value2, format, options.date1904 ?? false);
+  if (options2.width !== void 0) return fitNumber(value2, format, options2);
+  return formatNumber(value2, format, options2.date1904 ?? false);
 }
 function isDateFormat(format) {
   return compileFormat(format).isDate;
@@ -1939,7 +1939,7 @@ function parseFractionInput(text4) {
     numFmt: den < 10 ? "# ?/?" : "# ??/??"
   };
 }
-function parseCellInput(text4, options = {}) {
+function parseCellInput(text4, options2 = {}) {
   if (text4 === "") return { value: null };
   if (text4.startsWith("=") && text4.length > 1) return { value: null, formula: text4.slice(1) };
   if (text4.startsWith("'")) return { value: text4.slice(1) };
@@ -1950,7 +1950,7 @@ function parseCellInput(text4, options = {}) {
     if (upper2 === "TRUE" || upper2 === "FALSE") return { value: upper2 === "TRUE" };
     if (isErrorCode(upper2)) return { value: cellError(upper2) };
   }
-  const parsed = parseNumberInput(trimmed2) ?? parseFractionInput(trimmed2) ?? parseDateTimeInput(trimmed2, options.date1904 ?? false);
+  const parsed = parseNumberInput(trimmed2) ?? parseFractionInput(trimmed2) ?? parseDateTimeInput(trimmed2, options2.date1904 ?? false);
   if (!parsed) return { value: text4 };
   return parsed.numFmt ? { value: parsed.value, numFmt: parsed.numFmt } : { value: parsed.value };
 }
@@ -3501,7 +3501,7 @@ var int = (value2) => Math.trunc(num(value2));
 var optNum = (args, i2, fallback) => i2 < args.length ? num(args[i2]) : fallback;
 var optBool = (args, i2, fallback) => i2 < args.length ? bool(args[i2]) : fallback;
 var omitted = (args, i2) => i2 >= args.length || args[i2] === null;
-function collectNumbers(ctx, args, options = {}) {
+function collectNumbers(ctx, args, options2 = {}) {
   const out = [];
   for (const arg of args) {
     ctx.forEach(arg, (value2, kind) => {
@@ -3510,7 +3510,7 @@ function collectNumbers(ctx, args, options = {}) {
         return;
       }
       if (isError(value2)) {
-        if (options.ignoreErrors) return;
+        if (options2.ignoreErrors) return;
         throw new ErrorSignal(value2);
       }
       if (kind === "direct") {
@@ -3518,7 +3518,7 @@ function collectNumbers(ctx, args, options = {}) {
         else out.push(toNumber(value2));
         return;
       }
-      if (options.includeAll) {
+      if (options2.includeAll) {
         if (typeof value2 === "boolean") out.push(value2 ? 1 : 0);
         else if (typeof value2 === "string") out.push(0);
       }
@@ -8483,11 +8483,11 @@ var SUM_FUNCTIONS = [
     255,
     (args, ctx) => {
       const code = int(args[0]);
-      const options = int(args[1]);
-      if (code < 1 || code > 19 || options < 0 || options > 7) fail(ERR.VALUE);
-      const skipNested = options <= 3;
-      const skipHidden = options === 1 || options === 3 || options === 5 || options === 7;
-      const skipErrors = options === 2 || options === 3 || options === 6 || options === 7;
+      const options2 = int(args[1]);
+      if (code < 1 || code > 19 || options2 < 0 || options2 > 7) fail(ERR.VALUE);
+      const skipNested = options2 <= 3;
+      const skipHidden = options2 === 1 || options2 === 3 || options2 === 5 || options2 === 7;
+      const skipErrors = options2 === 2 || options2 === 3 || options2 === 6 || options2 === 7;
       if (code >= 14) {
         if (args.length !== 4) fail(ERR.VALUE);
         const values2 = subtotalValues(ctx, [args[2] ?? null], skipHidden, skipErrors, skipNested);
@@ -11774,11 +11774,11 @@ function checkXmlLimits(xml, label2, limits = {}) {
       throw new Error(`${label2} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
-function parseXml(xml, options = {}) {
-  const label2 = options.label ?? "OOXML";
+function parseXml(xml, options2 = {}) {
+  const label2 = options2.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
     throw new Error(`${label2} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label2, options.limits);
+  checkXmlLimits(xml, label2, options2.limits);
   let parseError = "";
   let parsed;
   try {
@@ -11992,7 +11992,7 @@ var pivotColumnFields = (pivot) => [
 // i18n/locale.ts
 var SUPPORTED_OFFICE_LOCALES = ["en", "fr", "de", "es", "zh-CN"];
 var DEFAULT_REJECTED_SUBTAGS = ["hant", "tw", "hk", "mo"];
-function normalizeLocale(input, supported, fallback, options = {}) {
+function normalizeLocale(input, supported, fallback, options2 = {}) {
   const parts = (input ?? "").trim().toLowerCase().split(/[-_]/).filter(Boolean);
   const language = parts[0];
   if (!language) return fallback;
@@ -12001,7 +12001,7 @@ function normalizeLocale(input, supported, fallback, options = {}) {
   if (exact) return exact;
   const base = find3(language);
   if (base) return base;
-  const rejected = options.rejectedSubtags ?? DEFAULT_REJECTED_SUBTAGS;
+  const rejected = options2.rejectedSubtags ?? DEFAULT_REJECTED_SUBTAGS;
   if (parts.slice(1).some((part) => rejected.includes(part))) return fallback;
   return supported.find((item) => item.toLowerCase().split("-")[0] === language && item.includes("-")) ?? fallback;
 }
@@ -12201,8 +12201,8 @@ function trimmedCaptions(caps) {
   }
   return Object.keys(out).length ? out : void 0;
 }
-function authoredCaptions(options) {
-  const own = options.captions ?? localizedPivotCaptions(options.locale);
+function authoredCaptions(options2) {
+  const own = options2.captions ?? localizedPivotCaptions(options2.locale);
   return own && Object.keys(own).length ? structuredClone(own) : void 0;
 }
 
@@ -14724,9 +14724,9 @@ var Deferred = class {
 };
 var MAX_NESTED_COMPUTE = 40;
 var EngineHost = class {
-  constructor(workbook, options) {
+  constructor(workbook, options2) {
     this.workbook = workbook;
-    this.options = options;
+    this.options = options2;
   }
   workbook;
   options;
@@ -15823,8 +15823,8 @@ var Engine = class extends EngineStructure {
     return [...this.cycles].map(({ sheet, row: row2, col }) => ({ sheet, row: row2, col }));
   }
 };
-function createCalcEngine(workbook, options = {}) {
-  return new Engine(workbook, options);
+function createCalcEngine(workbook, options2 = {}) {
+  return new Engine(workbook, options2);
 }
 
 // xlsx/formula/ref-text.ts
@@ -19359,8 +19359,8 @@ function rgbToHsl(r, g2, b) {
   }
   return { h: h2, s: clampUnitInterval(s), l: clampUnitInterval(l) };
 }
-function hslToRgb(h2, s, l, roundChannel = Math.round, options) {
-  const sC = options?.clampSaturation === false ? s : clampUnitInterval(s);
+function hslToRgb(h2, s, l, roundChannel = Math.round, options2) {
+  const sC = options2?.clampSaturation === false ? s : clampUnitInterval(s);
   const lC = clampUnitInterval(l);
   const hN = (h2 % 360 + 360) % 360;
   const c2 = (1 - Math.abs(2 * lC - 1)) * sC;
@@ -19858,13 +19858,13 @@ var APPLIED = /* @__PURE__ */ new Set([
   "lumMod",
   "lumOff"
 ]);
-function resolveDrawingColor(color, theme2, options) {
+function resolveDrawingColor(color, theme2, options2) {
   const base = baseHex(color, theme2);
   const rgb2 = base ? hexToRgbChannels(base) : null;
   if (!rgb2) return void 0;
-  if (options?.transformOrder === "document") {
+  if (options2?.transformOrder === "document") {
     const value2 = orderedColorTransforms(rgb2, color.transforms);
-    const round4 = options.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
+    const round4 = options2.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
     return {
       hex: `#${toHex(round4(value2.r))}${toHex(round4(value2.g))}${toHex(round4(value2.b))}`,
       alpha: value2.alpha,
@@ -19915,7 +19915,7 @@ function resolveDrawingColor(color, theme2, options) {
     if (lumMod !== void 0) hsl.l = clampUnitInterval(hsl.l * lumMod);
     const lumOff = parseDrawingFraction(find3("lumOff"));
     if (lumOff !== void 0) hsl.l = clampUnitInterval(hsl.l + lumOff);
-    const round4 = options?.hslRounding === "halfDown" ? (value2) => Math.ceil(value2 - 0.5) : Math.round;
+    const round4 = options2?.hslRounding === "halfDown" ? (value2) => Math.ceil(value2 - 0.5) : Math.round;
     ({ r, g: g2, b } = hslToRgb(hsl.h, hsl.s, hsl.l, round4));
   }
   let alpha = parseDrawingPercent(find3("alpha")) ?? 1;
@@ -21661,7 +21661,7 @@ function resolveInnerRect(fillToRect, focalPoint) {
 function lerpEdge(inner2, outer, t) {
   return inner2 + (outer - inner2) * 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"/>';
   }
@@ -21670,7 +21670,7 @@ function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
   const rects = [];
   const alphaRects = [];
   const masked = sorted2.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 i2 = bands; i2 >= 0; i2 -= 1) {
     const t = i2 / bands;
@@ -23409,6 +23409,191 @@ function parseChartSpace(source2) {
   return { chartSpace, issues: context.issues };
 }
 
+// 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(cx2, cy, r) {
+  const inner2 = r * 0.5;
+  const out = [];
+  for (let i2 = 0; i2 < 10; i2++) {
+    const radius = i2 % 2 === 0 ? r : inner2;
+    const angle = -Math.PI / 2 + Math.PI * i2 / 5;
+    out.push([cx2 + radius * Math.cos(angle), cy + radius * Math.sin(angle)]);
+  }
+  return out;
+}
+function rectPolygon(x, y, w, h2) {
+  return polygonPoints([
+    [x, y],
+    [x + w, y],
+    [x + w, y + h2],
+    [x, y + h2]
+  ]);
+}
+function buildMarkerPrimitive(input) {
+  const { symbol, cx: cx2, 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 outline = input.stroke ? {
+    stroke: input.stroke,
+    strokeWidth: input.strokeWidth ?? DEFAULT_MARKER_OUTLINE_PT * CHART_PX_PER_PT
+  } : void 0;
+  const polygonStroke = outline ?? { stroke: fill, strokeWidth: 0 };
+  const lineStroke = input.stroke ?? fill;
+  switch (symbol) {
+    case "square":
+    case "dash": {
+      const h2 = symbol === "dash" ? r * 0.64 : r * 2;
+      const y = cy - h2 / 2;
+      if (outline) {
+        return {
+          kind: "polygon",
+          points: rectPolygon(cx2 - r, y, r * 2, h2),
+          fill,
+          ...outline,
+          ...part
+        };
+      }
+      return { kind: "rect", x: cx2 - r, y, w: r * 2, h: h2, fill, ...part };
+    }
+    case "diamond":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx2, cy - r],
+          [cx2 + r, cy],
+          [cx2, cy + r],
+          [cx2 - r, cy]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "triangle":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx2, cy - r],
+          [cx2 + r * 0.9, cy + r * 0.75],
+          [cx2 - r * 0.9, cy + r * 0.75]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "star":
+      return {
+        kind: "polygon",
+        points: polygonPoints(starVertices(cx2, cy, r)),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "plus":
+      return {
+        kind: "path",
+        d: `M${(cx2 - r).toFixed(2)},${cy.toFixed(2)} L${(cx2 + r).toFixed(2)},${cy.toFixed(2)} M${cx2.toFixed(2)},${(cy - r).toFixed(2)} L${cx2.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${(cx2 - r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx2 + r).toFixed(2)},${(cy + r).toFixed(2)} M${(cx2 + r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx2 - 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: cx2, cy, r: Math.max(r * 0.6, 1), fill, ...part, ...outline };
+    default:
+      return { kind: "circle", cx: cx2, cy, r, fill, ...part, ...outline };
+  }
+}
+
+// chart/render/chart-view-markers.ts
+function summaryMarkers(source2, group2, seriesPosition) {
+  if (!["line", "scatter", "radar"].includes(group2.kind)) return {};
+  const enabled = group2.kind === "line" ? group2.marker === true : group2.kind === "radar" ? group2.radarStyle === "marker" : !["line", "smooth", "none"].includes(group2.scatterStyle ?? "marker");
+  const symbol = source2.marker?.symbol;
+  const marker3 = {
+    ...source2.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source2.marker || enabled ? automaticMarkerSymbol(source2.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point of source2.dataPoints) {
+    if (point.index === void 0 || !point.marker) continue;
+    const override = point.marker;
+    pointMarkers[point.index] = {
+      ...marker3,
+      ...override,
+      ...override.symbol === "auto" || !source2.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source2.index ?? seriesPosition) } : {},
+      ...marker3.spPr || override.spPr ? {
+        spPr: {
+          ...marker3.spPr,
+          ...override.spPr,
+          ...marker3.spPr?.line || override.spPr?.line ? { line: { ...marker3.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker: marker3, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
+function seriesMarkerViews(source2, drawingColor) {
+  const fillColor = (fill) => fill?.kind === "none" ? "none" : fill?.kind === "solid" ? drawingColor(fill.color) : void 0;
+  const resolve3 = (marker3) => {
+    const fill = fillColor(marker3.spPr?.fill);
+    const stroke = fillColor(marker3.spPr?.line?.fill);
+    const width = marker3.spPr?.line?.widthEmu;
+    return {
+      ...marker3.symbol !== void 0 ? { symbol: marker3.symbol } : {},
+      ...marker3.size !== void 0 ? { size: marker3.size } : {},
+      ...fill !== void 0 ? { fill } : {},
+      ...stroke !== void 0 ? { stroke } : {},
+      ...width !== void 0 ? { strokeWidth: width / 9525 } : {}
+    };
+  };
+  return {
+    ...source2.marker ? { marker: resolve3(source2.marker) } : {},
+    ...source2.pointMarkers ? {
+      pointMarkers: Object.fromEntries(
+        Object.entries(source2.pointMarkers).map(([i2, marker3]) => [i2, resolve3(marker3)])
+      )
+    } : {}
+  };
+}
+
 // chart/render/summary-analysis.ts
 function summaryTrendline(source2) {
   const kind = chartTrendlineKind(source2.trendlineType);
@@ -23683,6 +23868,9 @@ function formatChartNumberWithColor(value2, formatCode) {
     return void 0;
   }
 }
+function formatChartNumber(value2, formatCode) {
+  return formatChartNumberWithColor(value2, formatCode)?.text;
+}
 
 // chart/data-label-text.ts
 var DATA_LABEL_SEPARATOR = ", ";
@@ -23731,17 +23919,17 @@ function composeDataLabelText(input) {
 }
 
 // chart/render/summary-labels.ts
-function level(options, custom) {
+function level(options2, custom) {
   const out = {};
-  if (options.deleted !== void 0) out.deleted = options.deleted;
-  if (options.showValue !== void 0) out.showValue = options.showValue;
-  if (options.showCategoryName !== void 0) out.showCategory = options.showCategoryName;
-  if (options.showSeriesName !== void 0) out.showSeriesName = options.showSeriesName;
-  if (options.showPercent !== void 0) out.showPercent = options.showPercent;
-  if (options.showBubbleSize !== void 0) out.showBubbleSize = options.showBubbleSize;
-  if (options.separator !== void 0) out.separator = options.separator;
-  if (options.position) out.position = options.position;
-  if (options.numberFormat?.formatCode) out.numberFormat = options.numberFormat.formatCode;
+  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;
 }
@@ -23848,7 +24036,10 @@ function extraGroups(chartSpace, firstType) {
     const type = group2.kind === "bar" ? "column" : group2.kind;
     const entry3 = {
       chartType: type,
-      series: group2.series.map((source2) => chartSummarySeries(source2, type, group2.dataLabels)),
+      series: group2.series.map((source2, index3) => ({
+        ...chartSummarySeries(source2, type, group2.dataLabels),
+        ...summaryMarkers(source2, group2, index3)
+      })),
       secondary: valueAxisId(chartSpace, group2.axisIds) !== primary
     };
     if (group2.grouping && GROUPINGS.has(group2.grouping))
@@ -23866,13 +24057,16 @@ function chartSummaryFromSpace(chartSpace, extras = {}) {
   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(
-    (source2) => chartSummarySeries(source2, chartType, group2?.dataLabels)
-  );
+  const series = (group2?.series ?? []).map((source2, index3) => ({
+    ...chartSummarySeries(source2, chartType, group2?.dataLabels),
+    ...group2 ? summaryMarkers(source2, group2, index3) : {}
+  }));
   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;
@@ -23955,6 +24149,8 @@ function parseChart(xml, anchor, partName, name) {
     showLegend: summary.showLegend,
     partName
   };
+  if (summary.axes) object.axes = summary.axes;
+  if (summary.axisIds) object.axisIds = summary.axisIds;
   if (summary.grouping) object.grouping = summary.grouping;
   if (summary.barGapWidth !== void 0) object.barGapWidth = summary.barGapWidth;
   if (summary.barOverlap !== void 0) object.barOverlap = summary.barOverlap;
@@ -24733,9 +24929,9 @@ function readPrintOptions(node2) {
   for (const key of KEYS) if (boolAttr(node2, key)) out[key] = true;
   return Object.keys(out).length ? out : void 0;
 }
-function printOptionsXml(options) {
-  if (!options) return "";
-  const attrs2 = KEYS.filter((key) => options[key]).map((key) => ` ${key}="1"`);
+function printOptionsXml(options2) {
+  if (!options2) return "";
+  const attrs2 = KEYS.filter((key) => options2[key]).map((key) => ` ${key}="1"`);
   return attrs2.length ? `<printOptions${attrs2.join("")}/>` : "";
 }
 
@@ -25274,12 +25470,12 @@ Reply:
 
 // chart/bar-cluster-geometry.ts
 var DEFAULT_BAR_GAP_WIDTH = 150;
-function assertBarClusterOptions(options) {
+function assertBarClusterOptions(options2) {
   for (const [field, min, max] of [
     ["barGapWidth", 0, 500],
     ["barOverlap", -100, 100]
   ]) {
-    const value2 = options[field];
+    const value2 = options2[field];
     if (value2 !== void 0 && (!Number.isInteger(value2) || value2 < min || value2 > max))
       throw new RangeError(`${field} must be an integer from ${min} to ${max}`);
   }
@@ -25730,8 +25926,8 @@ function titleXml(context, title) {
     chartTextXml(context, tx, false) + layoutXml(context, title.layout) + valXml("overlay", title.overlay) + shapePropertiesXml(context, title.spPr) + textBodyXml(context, title.txPr) + raw(context, title.extLst)
   );
 }
-function labelOptionsXml(context, options) {
-  return numberFormatXml(options.numberFormat) + shapePropertiesXml(context, options.spPr) + textBodyXml(context, options.txPr) + valXml("dLblPos", options.position) + valXml("showLegendKey", options.showLegendKey) + valXml("showVal", options.showValue) + valXml("showCatName", options.showCategoryName) + valXml("showSerName", options.showSeriesName) + valXml("showPercent", options.showPercent) + valXml("showBubbleSize", options.showBubbleSize) + (options.separator === void 0 ? "" : textElement("separator", options.separator));
+function labelOptionsXml(context, options2) {
+  return numberFormatXml(options2.numberFormat) + shapePropertiesXml(context, options2.spPr) + textBodyXml(context, options2.txPr) + valXml("dLblPos", options2.position) + valXml("showLegendKey", options2.showLegendKey) + valXml("showVal", options2.showValue) + valXml("showCatName", options2.showCategoryName) + valXml("showSerName", options2.showSeriesName) + valXml("showPercent", options2.showPercent) + valXml("showBubbleSize", options2.showBubbleSize) + (options2.separator === void 0 ? "" : textElement("separator", options2.separator));
 }
 function labelXml(context, label2) {
   return elementXml(
@@ -25901,7 +26097,7 @@ function styleXml(context, space) {
   );
 }
 var relationship = (local, id, content2 = "") => id === void 0 ? "" : elementXml(local, content2, ` r:id="${escapeAttribute(id)}"`);
-function writeChartSpace(space, options = {}) {
+function writeChartSpace(space, options2 = {}) {
   const bindings = new Map(CHART_ROOT_BINDINGS);
   for (const { prefix, uri } of space.namespaceDeclarations ?? [])
     if (!bindings.has(prefix) && /^[A-Za-z_][\w.-]*$/.test(prefix)) bindings.set(prefix, uri);
@@ -25916,7 +26112,7 @@ function writeChartSpace(space, options = {}) {
     space.externalDataRelId,
     valXml("autoUpdate", space.externalDataAutoUpdate)
   ) + raw(context, space.printSettings) + relationship("userShapes", space.userShapesRelId) + raw(context, space.extLst);
-  const breakAfter = options.declarationBreak ?? "\r\n";
+  const breakAfter = options2.declarationBreak ?? "\r\n";
   return `${DECLARATION3}${breakAfter}<c:chartSpace${declarations}>${body}</c:chartSpace>`;
 }
 
@@ -26101,6 +26297,14 @@ function chartColorPalettePatch(chart, id) {
     if (!previous) return copy;
     const previousChoice = chartPaletteSeriesColorChoice(previous, index3, chart.series.length);
     const nextChoice = chartPaletteSeriesColorChoice(next, index3, chart.series.length);
+    for (const marker3 of [copy.marker, ...Object.values(copy.pointMarkers ?? {})]) {
+      const shape2 = marker3?.spPr;
+      if (!shape2) continue;
+      for (const paint2 of [shape2, shape2.line]) {
+        if (paint2?.fill?.kind === "solid" && sameChartColor(paint2.fill.color, previousChoice))
+          paint2.fill = { kind: "solid", color: structuredClone(nextChoice) };
+      }
+    }
     const fill = recolorGradient(copy.fill, previousChoice, nextChoice);
     if (fill) copy.fill = fill;
     if (sameChartColor(
@@ -26506,10 +26710,10 @@ var PackageWriter = class {
   async build() {
     const zip = new JSZip2__default.default();
     const date = new Date(Date.UTC(1980, 0, 1));
-    const options = { date, createFolders: false };
-    zip.file("[Content_Types].xml", this.contentTypesXml(), options);
+    const options2 = { date, createFolders: false };
+    zip.file("[Content_Types].xml", this.contentTypesXml(), options2);
     const names = [...this.parts.keys()].sort((a2, b) => rank2(a2) - rank2(b) || a2.localeCompare(b));
-    for (const name of names) zip.file(name, this.parts.get(name) ?? "", options);
+    for (const name of names) zip.file(name, this.parts.get(name) ?? "", options2);
     return zip.generateAsync({
       type: "uint8array",
       compression: "DEFLATE",
@@ -33372,15 +33576,15 @@ function pasteAt(ctx, s, at, payload, request) {
 function pasteSelection(ctx, sheet, selection, payload, request) {
   const dest = normalizeRange(selection);
   const clip = typeof payload === "string" ? { tsv: payload, html: "", cells: cellsFromText(ctx.workbook, payload) } : payload;
-  const options = resolvePasteOptions(request);
-  if (options.mode === "widths")
-    return pasteWidths(ctx, sheet, dest, clip.cells, options.transpose, !!clip.cut);
-  const height = options.transpose ? clip.cells.cols : clip.cells.rows;
-  const width = options.transpose ? clip.cells.rows : clip.cells.cols;
+  const options2 = resolvePasteOptions(request);
+  if (options2.mode === "widths")
+    return pasteWidths(ctx, sheet, dest, clip.cells, options2.transpose, !!clip.cut);
+  const height = options2.transpose ? clip.cells.cols : clip.cells.rows;
+  const width = options2.transpose ? clip.cells.rows : clip.cells.cols;
   const rows = dest.end.row - dest.start.row + 1;
   const cols = dest.end.col - dest.start.col + 1;
   if (clip.cut || !height || !width || rows === 1 && cols === 1 || dest.start.row === 0 && dest.end.row === MAX_ROW || dest.start.col === 0 && dest.end.col === MAX_COL)
-    return pasteAt(ctx, sheet, dest.start, clip, options);
+    return pasteAt(ctx, sheet, dest.start, clip, options2);
   if (rows % height || cols % width)
     throw new RangeError("The copy and paste areas are not compatible sizes.");
   if (rows * cols > 25e4) throw new RangeError("The selected paste area is too large.");
@@ -33400,16 +33604,16 @@ function pasteSelection(ctx, sheet, selection, payload, request) {
     () => {
       for (let row2 = dest.start.row; row2 <= dest.end.row; row2 += height)
         for (let col = dest.start.col; col <= dest.end.col; col += width)
-          pasteAt(tileContext, sheet, { row: row2, col }, tileClip, options);
-      if (["all", "formats", "noBorders", "mergeFormats"].includes(options.mode))
+          pasteAt(tileContext, sheet, { row: row2, col }, tileClip, options2);
+      if (["all", "formats", "noBorders", "mergeFormats"].includes(options2.mode))
         pasteConditionalFormats(
           sheetAt(ctx.workbook, sheet),
           dest,
           clip.cells,
-          options.transpose,
-          options.skipBlanks,
+          options2.transpose,
+          options2.skipBlanks,
           void 0,
-          options.mode === "mergeFormats"
+          options2.mode === "mergeFormats"
         );
       return dest;
     },
@@ -33876,7 +34080,7 @@ function numberInputText(value2, numFmt, date1904 = false) {
   if (/%/.test(numFmt.replace(/"[^"]*"|\\./g, ""))) return `${plainNumber(value2 * 100)}%`;
   return plainNumber(value2);
 }
-function formulaBarText(workbook, cell, options = {}) {
+function formulaBarText(workbook, cell, options2 = {}) {
   if (!cell) return "";
   if (cell.formula !== void 0) return `=${cell.formula}`;
   const value2 = cell.value;
@@ -33890,7 +34094,7 @@ function formulaBarText(workbook, cell, options = {}) {
       workbook.date1904
     );
   const text4 = cell.richText?.length ? cell.richText.map((run2) => run2.text).join("") : value2;
-  if (text4 === "" || options.quote === false) return text4;
+  if (text4 === "" || options2.quote === false) return text4;
   const parsed = parseCellInput(text4, { date1904: workbook.date1904 });
   const literal2 = parsed.formula === void 0 && parsed.value === text4;
   return literal2 ? text4 : `'${text4}`;
@@ -34521,9 +34725,9 @@ var SessionCalculator = class {
 // xlsx/edit/goal-solver.ts
 var DEFAULT_GOAL_ITERATIONS = 100;
 var DEFAULT_GOAL_MAX_CHANGE = 1e-3;
-function solveGoal(f6, goal, start, options = {}) {
-  const maxIterations = options.maxIterations ?? DEFAULT_GOAL_ITERATIONS;
-  const tolerance = options.maxChange ?? DEFAULT_GOAL_MAX_CHANGE;
+function solveGoal(f6, goal, start, options2 = {}) {
+  const maxIterations = options2.maxIterations ?? DEFAULT_GOAL_ITERATIONS;
+  const tolerance = options2.maxChange ?? DEFAULT_GOAL_MAX_CHANGE;
   let iterations = 0;
   let best;
   let negative;
@@ -35030,10 +35234,10 @@ function columnOverrides(sheet, mdw, defaultPx) {
   }
   return out;
 }
-function createGridMetrics(sheet, options = {}) {
-  const zoom = zoomPercent(options.zoom ?? sheet.view.zoom);
+function createGridMetrics(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
   const factor = zoom / 100;
-  const mdw = options.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
+  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
   const scale2 = (px) => px > 0 ? Math.max(1, Math.round(px * factor)) : 0;
   const defaultColPx = defaultColumnPixels(sheet.defaultColWidth, mdw);
   const colOverrides = [...columnOverrides(sheet, mdw, defaultColPx)].map(
@@ -35055,8 +35259,8 @@ function createGridMetrics(sheet, options = {}) {
   for (const merge2 of sheet.merges) lastColUsed = Math.max(lastColUsed, merge2.end.col);
   for (const info of sheet.columns)
     if (info.max < MAX_COL) lastColUsed = Math.max(lastColUsed, info.max);
-  const lastRow = Math.min(MAX_ROW, lastRowUsed + (options.extraRows ?? 50));
-  const lastCol = Math.min(MAX_COL, lastColUsed + (options.extraCols ?? 20));
+  const lastRow = Math.min(MAX_ROW, lastRowUsed + (options2.extraRows ?? 50));
+  const lastCol = Math.min(MAX_COL, lastColUsed + (options2.extraCols ?? 20));
   return {
     zoom,
     lastRow,
@@ -35283,37 +35487,37 @@ function writePivot(ctx, s, pivot, old, label2, inside2) {
   );
 }
 var startRow = (range, offset2) => range.start.row + offset2;
-function createPivotTable(ctx, s, destination, options) {
-  const data = pivotSourceData(ctx.workbook, s, options.source);
-  const name = options.name ?? uniqueName(ctx);
+function createPivotTable(ctx, s, destination, options2) {
+  const data = pivotSourceData(ctx.workbook, s, options2.source);
+  const name = options2.name ?? uniqueName(ctx);
   checkName2(ctx, name);
-  const aggregate3 = options.aggregate ?? "sum";
-  const captions = authoredCaptions(options);
+  const aggregate3 = options2.aggregate ?? "sum";
+  const captions = authoredCaptions(options2);
   const pivot = {
     ...data,
     ...captions ? { captions } : {},
     name,
-    rowField: options.rowField,
-    layout: options.layout ?? "tabular",
-    subtotalPosition: options.subtotalPosition ?? (options.layout && options.layout !== "tabular" ? "top" : "bottom"),
-    ...options.secondRowField ? { secondRowField: options.secondRowField } : {},
-    ...options.secondRowField && options.moreRowFields?.length ? { moreRowFields: [...options.moreRowFields] } : {},
-    ...options.fieldSubtotals?.length ? { fieldSubtotals: normalizedFieldSubtotals(options.fieldSubtotals) } : {},
-    ...options.dateGroups?.length ? { dateGroups: structuredClone(options.dateGroups) } : {},
+    rowField: options2.rowField,
+    layout: options2.layout ?? "tabular",
+    subtotalPosition: options2.subtotalPosition ?? (options2.layout && options2.layout !== "tabular" ? "top" : "bottom"),
+    ...options2.secondRowField ? { secondRowField: options2.secondRowField } : {},
+    ...options2.secondRowField && options2.moreRowFields?.length ? { moreRowFields: [...options2.moreRowFields] } : {},
+    ...options2.fieldSubtotals?.length ? { fieldSubtotals: normalizedFieldSubtotals(options2.fieldSubtotals) } : {},
+    ...options2.dateGroups?.length ? { dateGroups: structuredClone(options2.dateGroups) } : {},
     ...ctx.workbook.date1904 ? { date1904: true } : {},
-    ...options.subtotals !== void 0 ? { subtotals: options.subtotals } : {},
-    ...options.repeatLabels !== void 0 ? { repeatLabels: options.repeatLabels } : {},
-    valueField: options.valueField,
+    ...options2.subtotals !== void 0 ? { subtotals: options2.subtotals } : {},
+    ...options2.repeatLabels !== void 0 ? { repeatLabels: options2.repeatLabels } : {},
+    valueField: options2.valueField,
     aggregate: aggregate3,
-    valueCaption: pivotCaption(aggregate3, options.valueField, { captions }),
-    ...options.pageFilter !== void 0 ? { pageFilter: structuredClone(options.pageFilter) } : {},
-    ...options.fieldGroups?.length ? { fieldGroups: structuredClone(options.fieldGroups) } : {},
-    ...options.valuesAxis !== void 0 ? { valuesAxis: options.valuesAxis } : {},
-    ...options.valuesPosition !== void 0 ? { valuesPosition: options.valuesPosition } : {},
-    ...options.additionalValues ? { additionalValues: normalizedPivotMeasures(options.additionalValues, { captions }) } : {},
+    valueCaption: pivotCaption(aggregate3, options2.valueField, { captions }),
+    ...options2.pageFilter !== void 0 ? { pageFilter: structuredClone(options2.pageFilter) } : {},
+    ...options2.fieldGroups?.length ? { fieldGroups: structuredClone(options2.fieldGroups) } : {},
+    ...options2.valuesAxis !== void 0 ? { valuesAxis: options2.valuesAxis } : {},
+    ...options2.valuesPosition !== void 0 ? { valuesPosition: options2.valuesPosition } : {},
+    ...options2.additionalValues ? { additionalValues: normalizedPivotMeasures(options2.additionalValues, { captions }) } : {},
     location: { start: { ...destination }, end: { ...destination } },
-    ...options.columnField ? { columnField: options.columnField } : {},
-    ...options.columnField && options.moreColumnFields?.length ? { moreColumnFields: [...options.moreColumnFields] } : {}
+    ...options2.columnField ? { columnField: options2.columnField } : {},
+    ...options2.columnField && options2.moreColumnFields?.length ? { moreColumnFields: [...options2.moreColumnFields] } : {}
   };
   if (pivot.dateGroups) reconcileDateAxes(pivot);
   const dates = pivotDateFieldsOf(ctx.workbook, s, pivot);
@@ -39019,8 +39223,8 @@ function hashBytes(password, { algorithmName, saltValue, spinCount }, limits) {
   if (!digest || !salt || !isValidSpinCount(spinCount, limits.maxSpinCount)) return void 0;
   return spinPasswordHash(password, salt, spinCount ?? 0, digest);
 }
-function hashPassword(password, options, limits = {}) {
-  const bytes = hashBytes(password, options, limits);
+function hashPassword(password, options2, limits = {}) {
+  const bytes = hashBytes(password, options2, limits);
   return bytes && encodeBase64(bytes);
 }
 function verifyPasswordHash(password, hash, limits = {}) {
@@ -39321,7 +39525,7 @@ function displayText2(value2, style2, numFmt, workbook, sheet) {
   });
   return formatted.color ? { text: formatted.text, color: formatted.color } : { text: formatted.text };
 }
-function cellView(workbook, sheetIndex2, row2, col, cf, options = {}) {
+function cellView(workbook, sheetIndex2, row2, col, cf, options2 = {}) {
   const sheet = workbook.sheets[sheetIndex2];
   if (!sheet) throw new RangeError(`No sheet at index ${sheetIndex2}`);
   const cell = getCell(sheet, row2, col);
@@ -39360,10 +39564,10 @@ function cellView(workbook, sheetIndex2, row2, col, cf, options = {}) {
     vAlign: alignment.vertical ?? "bottom",
     wrap: wrap3,
     shrink,
-    indentPx: indentable ? (alignment.indent ?? 0) * (options.indentPx ?? INDENT_PX_PER_LEVEL) : 0,
+    indentPx: indentable ? (alignment.indent ?? 0) * (options2.indentPx ?? INDENT_PX_PER_LEVEL) : 0,
     rotation,
     isNumber,
-    overflow: (formulaText !== void 0 || typeof value2 === "string" && value2 !== "") && !wrap3 && !shrink && rotation === 0 && !vertical && hAlign !== "fill" && !(options.merged ?? sheet.merges.some((m) => rangeContains(m, { row: row2, col }))),
+    overflow: (formulaText !== void 0 || typeof value2 === "string" && value2 !== "") && !wrap3 && !shrink && rotation === 0 && !vertical && hAlign !== "fill" && !(options2.merged ?? sheet.merges.some((m) => rangeContains(m, { row: row2, col }))),
     hasComment: sheet.comments.some((c2) => c2.address.row === row2 && c2.address.col === col),
     hasHyperlink: false,
     validationList: sheet.dataValidations.some(
@@ -39923,7 +40127,7 @@ function asNumber(value2) {
     return Number(value2);
   return void 0;
 }
-function listValidationOptions(workbook, sheet, row2, col, options = {}) {
+function listValidationOptions(workbook, sheet, row2, col, options2 = {}) {
   const dv = validationAt(workbook, sheet, row2, col);
   if (!dv || dv.type !== "list" || dv.showDropDown === false || dv.formula1 === void 0)
     return void 0;
@@ -39932,7 +40136,7 @@ function listValidationOptions(workbook, sheet, row2, col, options = {}) {
     workbook,
     sheet,
     relativeTo(dv, dv.formula1, at),
-    options.evaluate ?? defaultEvaluate(workbook),
+    options2.evaluate ?? defaultEvaluate(workbook),
     at
   );
   return items?.map((item) => item.text);
@@ -39993,11 +40197,11 @@ function check2(workbook, dv, value2, at, evaluate) {
   if (dv.type === "whole" && !Number.isInteger(n2)) return false;
   return compare(operator, n2, a2, b);
 }
-function validateCellInput(workbook, sheet, row2, col, value2, options = {}) {
+function validateCellInput(workbook, sheet, row2, col, value2, options2 = {}) {
   const dv = validationAt(workbook, sheet, row2, col);
   if (!dv || dv.type === "none" || dv.showErrorMessage !== true) return { ok: true };
   if (value2 === null || value2 === "") return dv.allowBlank === false ? failure(dv) : { ok: true };
-  const evaluate = options.evaluate ?? defaultEvaluate(workbook);
+  const evaluate = options2.evaluate ?? defaultEvaluate(workbook);
   return check2(workbook, dv, value2, { sheet, row: row2, col }, evaluate) ? { ok: true } : failure(dv);
 }
 function failure(dv) {
@@ -40011,10 +40215,10 @@ function failure(dv) {
 }
 
 // xlsx/edit/session.ts
-function createEditSession(workbook, options = {}) {
+function createEditSession(workbook, options2 = {}) {
   const calc = createCalcEngine(workbook);
-  const autoRecalc = options.recalc ?? true;
-  const history = new History(options.historyLimit ?? 100);
+  const autoRecalc = options2.recalc ?? true;
+  const history = new History(options2.historyLimit ?? 100);
   const listeners = /* @__PURE__ */ new Set();
   let open;
   const emit = (change) => {
@@ -40113,8 +40317,8 @@ function createEditSession(workbook, options = {}) {
     return result2;
   };
   const ctx = { workbook, calc, run: run2 };
-  if (options.defaultSheetBase) ctx.defaultSheetBase = options.defaultSheetBase;
-  const autoRows = options.autoRowHeight ?? true;
+  if (options2.defaultSheetBase) ctx.defaultSheetBase = options2.defaultSheetBase;
+  const autoRows = options2.autoRowHeight ?? true;
   const refitRows = (current) => {
     const { sheet: s, kind, ranges } = current;
     if (!autoRows || s === void 0 || !ranges.length || !current.step.entries.length) return;
@@ -40122,7 +40326,7 @@ function createEditSession(workbook, options = {}) {
     const sheet = workbook.sheets[s];
     if (!sheet) return;
     try {
-      autoGrowRows(ctx, s, rowsToRefit(sheet, ranges), options.measureText);
+      autoGrowRows(ctx, s, rowsToRefit(sheet, ranges), options2.measureText);
     } catch (error) {
       const message = `Row height update failed: ${error instanceof Error ? error.message : String(error)}`;
       if (!workbook.warnings.includes(message)) workbook.warnings.push(message);
@@ -40185,7 +40389,7 @@ function createEditSession(workbook, options = {}) {
     setDefinedName: (name) => setDefinedName(ctx, name),
     deleteDefinedName: (name, localSheet) => deleteDefinedName(ctx, name, localSheet),
     setDrawingAnchor: (s, index3, anchor) => setDrawingAnchor(ctx, s, index3, anchor),
-    createPivotTable: (s, destination, options2) => createPivotTable(ctx, s, destination, options2),
+    createPivotTable: (s, destination, options3) => createPivotTable(ctx, s, destination, options3),
     refreshPivotTable: (s, name, patch3) => refreshPivotTable(ctx, s, name, patch3),
     deletePivotTable: (s, name) => deletePivotTable(ctx, s, name),
     setSlicerSelection: (cache3, keys) => setSlicerSelection(ctx, cache3, keys),
@@ -40235,8 +40439,8 @@ function createEditSession(workbook, options = {}) {
     setDocumentProperties: (patch3) => setDocumentProperties(ctx, patch3),
     setAutoRecalc: (enabled) => setCalcMode(ctx, enabled ? "auto" : "manual"),
     autoRecalc: () => autoRecalc && calcModeOf(workbook) === "auto",
-    calculateNow(options2) {
-      calculator.now(options2?.full ?? false);
+    calculateNow(options3) {
+      calculator.now(options3?.full ?? false);
       emit({ kind: "cells", label: "Calculate now", structural: false });
     },
     prepareCalculation: (opts) => calculator.prepare(opts?.timeRemaining),
@@ -40337,17 +40541,17 @@ function formatCursorLabel(userName, maxChars = MAX_LABEL_CHARS) {
 }
 
 // xlsx/layout/remote-selections.ts
-function layoutRemoteSelections(metrics, peers, options) {
-  const tagHeight = options.tagHeight ?? 16;
+function layoutRemoteSelections(metrics, peers, options2) {
+  const tagHeight = options2.tagHeight ?? 16;
   const boxes = [];
   for (const peer of peers) {
-    if (peer.sheet !== options.sheet) continue;
+    if (peer.sheet !== options2.sheet) continue;
     const { start, end } = peer.range;
     const top = Math.min(start.row, end.row);
     const left2 = Math.min(start.col, end.col);
-    if (top > options.maxRow || left2 > options.maxCol) continue;
-    const bottom = Math.min(Math.max(start.row, end.row), options.maxRow);
-    const right2 = Math.min(Math.max(start.col, end.col), options.maxCol);
+    if (top > options2.maxRow || left2 > options2.maxCol) continue;
+    const bottom = Math.min(Math.max(start.row, end.row), options2.maxRow);
+    const right2 = Math.min(Math.max(start.col, end.col), options2.maxCol);
     const x = metrics.colLeft(left2);
     const y = metrics.rowTop(top);
     const w = metrics.colLeft(right2 + 1) - x;
@@ -40360,7 +40564,7 @@ function layoutRemoteSelections(metrics, peers, options) {
       w,
       h: h2,
       color: peer.userColor,
-      label: formatCursorLabel(peer.userName, options.maxLabelChars),
+      label: formatCursorLabel(peer.userName, options2.maxLabelChars),
       name: peer.userName,
       tag: y < tagHeight ? "inside" : "above"
     });
@@ -40457,14 +40661,14 @@ function dataBarAppearance(rule, workbook) {
 }
 
 // xlsx/layout/data-bar-geometry.ts
-function dataBarGeometry(value2, low, high, options) {
-  const lo = options.autoMin ? Math.min(0, low) : low;
-  const hi = options.autoMax ? Math.max(0, high) : high;
+function dataBarGeometry(value2, low, high, options2) {
+  const lo = options2.autoMin ? Math.min(0, low) : low;
+  const hi = options2.autoMax ? Math.max(0, high) : high;
   const clamp = (v) => Math.max(0, Math.min(1, v));
-  const minimum = options.minLength;
-  const delta = options.maxLength - minimum;
+  const minimum = options2.minLength;
+  const delta = options2.maxLength - minimum;
   const interpolate = (ratio, offset2 = minimum) => clamp(offset2 + clamp(ratio) * delta);
-  if (options.axis === "none") {
+  if (options2.axis === "none") {
     const ratio = hi > lo ? clamp((value2 - lo) / (hi - lo)) : 0.5;
     return {
       start: 0,
@@ -40472,7 +40676,7 @@ function dataBarGeometry(value2, low, high, options) {
       reverse: false
     };
   }
-  if (options.axis === "middle") {
+  if (options2.axis === "middle") {
     const span3 = Math.max(Math.abs(lo), Math.abs(hi));
     const fraction2 = interpolate(span3 > 0 ? Math.abs(value2) / span3 : 0) / 2;
     return { start: value2 < 0 ? 0.5 - fraction2 : 0.5, fraction: fraction2, axis: 0.5, reverse: value2 < 0 };
@@ -40484,7 +40688,7 @@ function dataBarGeometry(value2, low, high, options) {
   }
   if (hi <= 0) {
     const fraction2 = hi > lo ? interpolate((hi - value2) / (hi - lo), hi === 0 ? minimum / 2 : minimum) : interpolate(0.5);
-    const axis2 = hi === 0 ? (1 + options.maxLength - minimum) / 2 : options.maxLength;
+    const axis2 = hi === 0 ? (1 + options2.maxLength - minimum) / 2 : options2.maxLength;
     return {
       start: axis2 - fraction2,
       fraction: fraction2,
@@ -40492,7 +40696,7 @@ function dataBarGeometry(value2, low, high, options) {
       reverse: true
     };
   }
-  const axis = (1 - options.maxLength + minimum) / 2 + -lo / (hi - lo) * delta;
+  const axis = (1 - options2.maxLength + minimum) / 2 + -lo / (hi - lo) * delta;
   const bounded = Math.max(lo, Math.min(hi, value2));
   const fraction = interpolate(Math.abs(bounded) / (hi - lo), minimum / 2);
   return { start: bounded < 0 ? axis - fraction : axis, fraction, axis, reverse: bounded < 0 };
@@ -40598,10 +40802,10 @@ function valueText(value2) {
 
 // xlsx/layout/cf-evaluator.ts
 var GRAPHIC_RULES = /* @__PURE__ */ new Set(["colorScale", "dataBar", "iconSet"]);
-function createConditionalFormatEvaluator(workbook, sheetIndex2, evaluate, options = {}) {
+function createConditionalFormatEvaluator(workbook, sheetIndex2, evaluate, options2 = {}) {
   const sheet = workbook.sheets[sheetIndex2];
   if (!sheet) return { at: () => void 0 };
-  const translate = options.translate ?? translateFormula;
+  const translate = options2.translate ?? translateFormula;
   const entries = [];
   let order = 0;
   for (const format of sheet.conditionalFormats)
@@ -40621,7 +40825,7 @@ function createConditionalFormatEvaluator(workbook, sheetIndex2, evaluate, optio
   let todaySerial;
   const today = () => {
     if (todaySerial !== void 0) return todaySerial;
-    let serial = options.today?.();
+    let serial = options2.today?.();
     if (serial === void 0) {
       const anchor = { sheet: sheetIndex2, row: 0, col: 0 };
       let raw2 = null;
@@ -41072,14 +41276,14 @@ function* units(raw2) {
     exp2++;
   }
 }
-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 pad7 = Math.abs(lo) * 0.1 || 1;
       lo -= pad7;
       hi += pad7;
@@ -41088,7 +41292,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;
@@ -41128,6 +41332,202 @@ function formatAxisValue(value2, percent2 = false) {
   return `${v < 0 ? "-" : ""}${grouped}${frac ? `.${frac}` : ""}`;
 }
 
+// chart/axis-range.ts
+function computeLogValueRange(series, logBase) {
+  const allValues = series.flatMap((item) => item.values).filter((value2) => value2 !== null && Number.isFinite(value2) && value2 > 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;
+  }
+  const span3 = logBase ? Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase) : max - min;
+  return {
+    min,
+    max,
+    span: Math.max(span3, Number.EPSILON),
+    ...majorUnit !== void 0 ? { majorUnit } : {},
+    ...logBase ? { logScale: true, logBase } : {},
+    ...axis?.orientation === "maxMin" ? { reverseOrder: true } : {}
+  };
+}
+
+// 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, index3) => base ** (firstExponent + index3)
+  );
+}
+function generateIntervalTicks(range, unit) {
+  if (!Number.isFinite(unit) || unit <= 0 || range.logScale) {
+    return [];
+  }
+  const tolerance = Math.max(1, Math.abs(range.min), Math.abs(range.max)) * 1e-12;
+  const first2 = Math.ceil((range.min - tolerance) / unit);
+  const last = Math.floor((range.max + tolerance) / unit);
+  const count2 = Math.min(Math.max(last - first2 + 1, 0), 2e3);
+  return Array.from({ length: count2 }, (_, index3) => (first2 + index3) * 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 },
+    (_, index3) => range.min + range.span / defaultIntervals * index3
+  );
+}
+function generateMinorAxisTicks(range, axis) {
+  const minor = generateIntervalTicks(range, axis?.minorUnit ?? 0);
+  if (minor.length === 0) {
+    return [];
+  }
+  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(
+    (value2) => Math.abs(value2 / majorUnit - Math.round(value2 / majorUnit)) > tolerance
+  );
+}
+
+// chart/render/chart-view-axes.ts
+function chartAxisRatio(value2, scale2, axis) {
+  const range = axis?.range;
+  const ratio = range?.logScale ? Math.log(Math.max(value2, range.min) / range.min) / Math.log(range.max / range.min) : (value2 - scale2.min) / (scale2.max - scale2.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 axes2 = chart.axes;
+  const linked = axes2.filter((axis) => axis.id !== void 0 && chart.axisIds?.includes(axis.id));
+  const candidates = linked.length ? linked : axes2;
+  const xy = model.type === "scatter" || model.type === "bubble";
+  const value2 = 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 !== value2 : axis.kind === "cat" || axis.kind === "date"
+  );
+  const secondary = axes2.find((axis) => axis.kind === "val" && axis !== value2 && axis !== category);
+  const paint2 = (shape2) => {
+    const ln2 = shape2?.line;
+    const fill = ln2?.fill;
+    const resolved = fill?.kind === "none" ? "none" : color(fill?.kind === "solid" ? fill.color : void 0);
+    return {
+      ...resolved === void 0 ? {} : { color: resolved },
+      ...ln2?.widthEmu === void 0 ? {} : { width: ln2.widthEmu / EMU_PER_PIXEL },
+      ...ln2?.dash === void 0 ? {} : { dash: ln2.dash }
+    };
+  };
+  const bind = (axis, scale2, values2) => {
+    const opts = options(axis);
+    const automatic = opts.logScale ? computeLogValueRange(
+      [{ values: values2 ?? [] }],
+      opts.logBase && Number.isFinite(opts.logBase) && opts.logBase > 1 ? opts.logBase : 10
+    ) : {
+      min: scale2?.min ?? 0,
+      max: scale2?.max ?? 1,
+      span: (scale2?.max ?? 1) - (scale2?.min ?? 0),
+      ...scale2 ? { majorUnit: scale2.majorUnit } : {}
+    };
+    const logBase = automatic.logBase;
+    const range = withAxisBounds(automatic, opts, logBase);
+    if (scale2) {
+      scale2.min = range.min;
+      scale2.max = range.max;
+      scale2.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 (value2)
+    out.value = bind(
+      value2,
+      model.valueAxis,
+      [
+        ...model.series,
+        ...model.extraGroups?.filter((g2) => !g2.secondary).flatMap((g2) => g2.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((g2) => g2.secondary).flatMap((g2) => g2.series.flatMap((s) => s.values))
+    );
+  model.axes = out;
+}
+
 // chart/treemap-squarify.ts
 function worstAspectRatio(areas, side) {
   const sum3 = areas.reduce((total2, area) => total2 + area, 0);
@@ -41600,15 +42000,15 @@ function seriesName(series, index3, evaluateRef) {
   const fromRef = resolveRef(series.nameRef, evaluateRef)?.map(toText2).filter((t) => t !== "").join(" ");
   return fromRef || series.name || `Series${index3 + 1}`;
 }
-function seriesContext(chart, theme2, options) {
+function seriesContext(chart, theme2, options2) {
   const scheme = chartColorScheme(theme2);
   const resolver = { scheme: (name) => scheme[name] };
   return {
     theme: theme2,
     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,
@@ -41634,7 +42034,11 @@ function seriesView(ctx, s, index3, total2, 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;
 }
 
@@ -41940,14 +42344,14 @@ function scottBinCount(values2, min, max) {
   const width = 3.49 * sd * values2.length ** (-1 / 3);
   return Math.max(1, Math.ceil((max - min) / width));
 }
-function computeHistogramBins(values2, options, format = String) {
-  const closed = options.intervalClosed ?? "l";
+function computeHistogramBins(values2, options2, format = String) {
+  const closed = options2.intervalClosed ?? "l";
   const finite2 = values2.map((value2, sourceIndex) => ({ value: value2, 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
   );
@@ -41964,8 +42368,8 @@ function computeHistogramBins(values2, 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 count2 = requestedSize ? Math.max(
       closed === "l" ? Math.floor((max - start) / requestedSize) + 1 : Math.ceil((max - start) / requestedSize),
@@ -42016,9 +42420,9 @@ function aggregateByCategory(values2, rawCategories) {
 }
 
 // chart/waterfall.ts
-function buildWaterfallSteps(values2, options) {
+function buildWaterfallSteps(values2, options2) {
   const subtotalIndices = new Set(
-    options?.subtotalIndices ?? (values2.length > 0 ? [values2.length - 1] : [])
+    options2?.subtotalIndices ?? (values2.length > 0 ? [values2.length - 1] : [])
   );
   const steps = [];
   let runningTotal = 0;
@@ -42102,11 +42506,11 @@ function histogramView(chart, model) {
   const first2 = model.series[0];
   if (!first2) return;
   const raw2 = first2.values.map((v) => v ?? Number.NaN);
-  const options = chart.histogram ?? {};
-  const bins = options.aggregateByCategory ? aggregateByCategory(
+  const options2 = chart.histogram ?? {};
+  const bins = options2.aggregateByCategory ? aggregateByCategory(
     first2.values.map((v) => v ?? 0),
     model.categories
-  ) : computeHistogramBins(raw2, options, formatAxisValue);
+  ) : computeHistogramBins(raw2, options2, formatAxisValue);
   model.categories = bins.map((bin) => bin.label);
   first2.values = bins.map((bin) => bin.value);
   model.barGapWidth = 0;
@@ -42130,11 +42534,11 @@ var SUPPORTED = /* @__PURE__ */ new Set([
   "treemap",
   "sunburst"
 ]);
-function chartSummaryView(chart, theme2, options = {}) {
+function chartSummaryView(chart, theme2, options2 = {}) {
   const type = chart.chartType;
   const radial = type === "pie" || type === "doughnut";
   const byPoint = radial || type === "treemap" || type === "sunburst";
-  const ctx = seriesContext(chart, theme2, options);
+  const ctx = seriesContext(chart, theme2, options2);
   const { palette, scheme, drawingColor } = ctx;
   const grouping = chart.grouping ?? (type === "bar" || type === "column" ? "clustered" : "standard");
   const rawCategories = [];
@@ -42220,6 +42624,7 @@ function chartSummaryView(chart, theme2, options = {}) {
   else if (!byPoint) model.valueAxis = valueAxis(model);
   applyDataLabels(model, chart.series, extra);
   chartExtraAxes(model);
+  applyChartAxes(model, chart, ctx.drawingColor);
   return model;
 }
 
@@ -42251,18 +42656,18 @@ function chartSampleVariance(values2) {
   const mean2 = values2.reduce((sum3, value2) => sum3 + value2, 0) / count2;
   return values2.reduce((sum3, value2) => sum3 + (value2 - mean2) ** 2, 0) / Math.max(count2 - 1, 1);
 }
-function chartErrorBarAmount(options, values2, displayIndex, sourceIndex, side) {
-  switch (options.valueType) {
+function chartErrorBarAmount(options2, values2, displayIndex, sourceIndex, side) {
+  switch (options2.valueType) {
     case "fixedVal":
-      return options.value ?? 0;
+      return options2.value ?? 0;
     case "percentage":
-      return Math.abs(values2[displayIndex] ?? 0) * ((options.value ?? 0) / 100);
+      return Math.abs(values2[displayIndex] ?? 0) * ((options2.value ?? 0) / 100);
     case "stdDev":
-      return Math.sqrt(chartSampleVariance(values2)) * (options.value ?? 1);
+      return Math.sqrt(chartSampleVariance(values2)) * (options2.value ?? 1);
     case "stdErr":
       return Math.sqrt(chartSampleVariance(values2) / Math.max(values2.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;
   }
 }
 
@@ -42399,13 +42804,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 fixed2 = options.intercept;
+      const fixed2 = options2.intercept;
       const slope = fixed2 !== void 0 ? ys.reduce((s, y, i2) => s + (y - fixed2) * xs[i2], 0) / xs.reduce((s, x) => s + x * x, 0) : reg.slope;
       const b = fixed2 ?? reg.intercept;
       return {
@@ -42455,7 +42860,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, c2, i2) => s + c2 * x ** i2, 0);
       return {
@@ -42469,11 +42874,11 @@ function fitModel(options, xVals, yVals) {
       return void 0;
   }
 }
-function fitChartTrendline(options, xVals, yVals) {
+function fitChartTrendline(options2, xVals, yVals) {
   const count2 = yVals.length;
   if (count2 < 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 i2 = period - 1; i2 < count2; i2++) {
       let sum3 = 0;
@@ -42482,10 +42887,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 step2 = 0; step2 <= steps; step2++) {
@@ -42662,7 +43067,7 @@ function chartTextAttributes(model, part, fallbackSize = FONT_SIZE) {
 function chartStroke(model, part) {
   const entry3 = model.appearance?.[part];
   return {
-    color: entry3?.axisVisible === false ? "none" : entry3?.lineColor ?? (part === "gridlineMajor" ? GRID_COLOR : AXIS_COLOR),
+    color: entry3?.axisVisible === false ? "none" : entry3?.lineColor ?? (part.startsWith("gridline") ? GRID_COLOR : AXIS_COLOR),
     width: entry3?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry3.lineWidth)
   };
 }
@@ -42953,19 +43358,102 @@ function scatterAnalysis(model, px, py, out) {
   });
 }
 
+// chart/render/chart-svg-markers.ts
+function chartMarkerRadius(series, index3, defaultRadius = 3) {
+  const marker3 = { ...series.marker, ...series.pointMarkers?.[index3] };
+  if (marker3.symbol === "none") return 0;
+  const radius = markerRadius(marker3.size, defaultRadius);
+  return marker3.symbol === "dot" ? Math.max(radius * 0.6, 1) : radius;
+}
+function chartSeriesMarkerSvg(series, index3, cx2, cy, defaultRadius = 3) {
+  const marker3 = { ...series.marker, ...series.pointMarkers?.[index3] };
+  const primitive = buildMarkerPrimitive({
+    ...marker3,
+    symbol: marker3.symbol,
+    size: marker3.size,
+    cx: cx2,
+    cy,
+    fill: marker3.fill ?? series.pointColors?.[index3] ?? series.color,
+    defaultRadius
+  });
+  if (!primitive) return "";
+  let geometry;
+  switch (primitive.kind) {
+    case "circle":
+      geometry = `cx="${n(primitive.cx)}" cy="${n(primitive.cy)}" r="${n(primitive.r)}"`;
+      break;
+    case "rect":
+      geometry = `x="${n(primitive.x)}" y="${n(primitive.y)}" width="${n(primitive.w)}" height="${n(primitive.h)}"`;
+      break;
+    case "path":
+      geometry = `d="${esc(primitive.d)}"`;
+      break;
+    case "polygon":
+      geometry = `points="${esc(primitive.points)}"`;
+      break;
+  }
+  const outline = primitive.stroke ? ` stroke="${esc(primitive.stroke)}" stroke-width="${n(primitive.strokeWidth ?? 1)}"` : "";
+  const filter2 = series.shadowFilter ? ` filter="${esc(series.shadowFilter)}"` : "";
+  return `<${primitive.kind} ${geometry} fill="${esc(primitive.fill)}"${outline}${filter2}/>`;
+}
+
+// chart/line-dash.ts
+function chartLineDashArray(style2, width) {
+  if (!style2 || style2 === "solid") {
+    return void 0;
+  }
+  const unit = Math.max(width, 1);
+  if (style2 === "dot" || style2 === "sysDot") {
+    return `${unit} ${unit * 2}`;
+  }
+  if (style2 === "lgDash") {
+    return `${unit * 6} ${unit * 3}`;
+  }
+  return `${unit * 3} ${unit * 2}`;
+}
+
+// chart/render/chart-svg-axes.ts
+function axisTickText(value2, axis, percent2 = false) {
+  return formatChartNumber(value2, axis?.source.numberFormat?.formatCode) ?? formatAxisValue(value2, percent2);
+}
+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 line2(x1, y1, x2, y2, esc(color), width).replace(
+    "/>",
+    dash ? ` stroke-dasharray="${dash}"/>` : "/>"
+  );
+}
+function axisGridlines(model, axis, ticks, position, plot2, vertical) {
+  const draw2 = (values2, paint2, minor2) => {
+    const fallback = chartStroke(model, minor2 ? "gridlineMinor" : "gridlineMajor");
+    return values2.map((value2) => {
+      const p = position(value2);
+      return vertical ? styledAxisLine(p, plot2.y, p, plot2.y + plot2.h, paint2, fallback) : styledAxisLine(plot2.x, p, plot2.x + plot2.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/render/chart-svg-cartesian.ts
 function cartesianAxes(model, area, out) {
   const scale2 = model.valueAxis;
   if (!scale2) return void 0;
-  const labels = scale2.ticks.map((t) => formatAxisValue(t, scale2.percent));
+  const labels = scale2.ticks.map((t) => axisTickText(t, model.axes?.value, scale2.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);
@@ -42974,7 +43462,7 @@ function cartesianAxes(model, area, out) {
     Math.max(...model.categories.map((c2) => textWidth(c2, 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 plot2 = horizontal ? {
     x: area.x + catW,
@@ -42987,29 +43475,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 span3 = scale2.max - scale2.min || 1;
-  const value2 = horizontal ? (v) => plot2.x + (v - scale2.min) / span3 * plot2.w : (v) => plot2.y + plot2.h - (v - scale2.min) / span3 * plot2.h;
+  const value2 = horizontal ? (v) => plot2.x + chartAxisRatio(v, scale2, model.axes?.value) * plot2.w : (v) => plot2.y + plot2.h - chartAxisRatio(v, scale2, model.axes?.value) * plot2.h;
   const bandSize = (horizontal ? plot2.h : plot2.w) / cats;
-  const band = horizontal ? (i2) => plot2.y + plot2.h - bandSize * (i2 + 0.5) : (i2) => plot2.x + bandSize * (i2 + 0.5);
+  const index3 = (i2) => model.axes?.category?.range.reverseOrder ? cats - 1 - i2 : i2;
+  const band = horizontal ? (i2) => plot2.y + plot2.h - bandSize * (index3(i2) + 0.5) : (i2) => plot2.x + bandSize * (index3(i2) + 0.5);
   out.push(chartAreaRect(model, "plotArea", plot2));
+  out.push(axisGridlines(model, model.axes?.value, scale2.ticks, value2, plot2, horizontal));
+  if (model.axes?.category?.source.majorGridlines || model.axes?.category?.source.minorGridlines)
+    out.push(
+      axisGridlines(
+        model,
+        model.axes.category,
+        model.categories.map((_, i2) => i2),
+        band,
+        plot2,
+        !horizontal
+      )
+    );
   scale2.ticks.forEach((t, i2) => {
     const p = value2(t);
     const label2 = labels[i2] ?? "";
     if (horizontal) {
-      out.push(line2(p, plot2.y, p, plot2.y + plot2.h, grid.color, grid.width));
       if (valueLabels)
         out.push(
           text3(p, plot2.y + plot2.h + valueSize + 2, label2, { anchor: "middle", ...valueAttrs })
         );
     } else {
-      out.push(line2(plot2.x, p, plot2.x + plot2.w, p, grid.color, grid.width));
       if (valueLabels)
         out.push(text3(plot2.x - 4, p + valueSize * 0.3, label2, { anchor: "end", ...valueAttrs }));
     }
   });
-  const zero = value2(Math.min(Math.max(0, scale2.min), scale2.max));
-  if (horizontal) out.push(line2(zero, plot2.y, zero, plot2.y + plot2.h, axis.color, axis.width));
-  else out.push(line2(plot2.x, zero, plot2.x + plot2.w, zero, axis.color, axis.width));
+  const source2 = model.axes?.value?.source;
+  const crossing = source2?.crosses === "max" ? scale2.max : source2?.crosses === "min" ? scale2.min : source2?.crossesAt ?? 0;
+  const zero = value2(Math.min(Math.max(crossing, scale2.min), scale2.max));
+  if (horizontal)
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", zero, plot2.y, zero, plot2.y + plot2.h)
+    );
+  else
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", plot2.x, zero, plot2.x + plot2.w, zero)
+    );
   const step2 = Math.max(
     1,
     Math.ceil(cats / Math.max(1, Math.floor((horizontal ? plot2.h : plot2.w) / 14)))
@@ -43034,20 +43540,23 @@ function cartesianAxes(model, area, out) {
   });
   const frame = { plot: plot2, value: value2, band, bandSize };
   if (second) {
-    const secondSpan = second.max - second.min || 1;
-    frame.secondary = (v) => plot2.y + plot2.h - (v - second.min) / secondSpan * plot2.h;
-    const secondAxis = chartStroke(model, "valueAxis");
+    frame.secondary = (v) => plot2.y + plot2.h - chartAxisRatio(v, second, model.axes?.secondary) * plot2.h;
     out.push(
-      line2(
+      axisLine(
+        model,
+        model.axes?.secondary,
+        "valueAxis",
         plot2.x + plot2.w,
         plot2.y,
         plot2.x + plot2.w,
-        plot2.y + plot2.h,
-        secondAxis.color,
-        secondAxis.width
+        plot2.y + plot2.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, plot2, false)
+      );
+    if (chartAxisLabels(model.axes?.secondary))
       second.ticks.forEach(
         (t, i2) => out.push(
           text3(plot2.x + plot2.w + 4, frame.secondary(t) + valueSize * 0.3, secondLabels[i2] ?? "", {
@@ -43091,18 +43600,19 @@ function linesAndAreas(model, frame, out) {
         index: i2,
         x: frame.band(i2),
         y: frame.value(top),
-        radius: area ? 0 : 3
+        radius: area ? 0 : chartMarkerRadius(s, i2, 2.5)
       });
       lower3.push([frame.band(i2), frame.value(below)]);
     });
     layers.push({
+      series: s,
       points,
       lower: lower3,
       color: s.color,
       filter: s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""
     });
   });
-  for (const { points, lower: lower3, color, filter: filter2 } of area ? [...layers].reverse() : layers) {
+  for (const { points, lower: lower3, color, filter: filter2, series } of area ? [...layers].reverse() : layers) {
     if (area) {
       const poly = [...points, ...[...lower3].reverse()].map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
       out.push(`<polygon points="${poly}" fill="${color}" fill-opacity="0.85"${filter2}/>`);
@@ -43121,20 +43631,20 @@ 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}"${filter2}/>`);
+    points.forEach(([x, y], index3) => {
+      if (!Number.isNaN(x)) out.push(chartSeriesMarkerSvg(series, index3, x, y, 2.5));
+    });
   }
   pointLabels(model, marks, out);
 }
 
 // chart/bubble-radius.ts
-function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options) {
-  const scale2 = (options?.bubbleScale ?? 100) / 100;
+function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options2) {
+  const scale2 = (options2?.bubbleScale ?? 100) / 100;
   if (sizeVal === void 0) return medianRadius * scale2;
   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 * scale2 * 0.5 + ratio * medianRadius * scale2 * 1.5;
 }
 function maxBubbleSize(sizes) {
@@ -43149,16 +43659,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 plot2 = {
     x: area.x + labelW,
@@ -43178,17 +43686,24 @@ function scatter(model, area, out) {
       s.values.forEach((_, i2) => {
         reach = Math.max(reach, radiusOf(s.sizes?.[i2] ?? void 0) ?? 0);
       });
-  const widen = (s, length) => {
+  const widen = (s, length, axis) => {
+    if (axis?.range.logScale) return s;
     const pad7 = reach * (s.max - s.min || 1) / Math.max(1, length - 2 * reach);
-    return { ...s, min: s.min - pad7, max: s.max + pad7 };
+    return {
+      ...s,
+      min: axis?.source.scaling.min === void 0 ? s.min - pad7 : s.min,
+      max: axis?.source.scaling.max === void 0 ? s.max + pad7 : s.max
+    };
   };
-  const xView = widen(xs, plot2.w);
-  const yView = widen(ys, plot2.h);
-  const px = (v) => plot2.x + (v - xView.min) / (xView.max - xView.min || 1) * plot2.w;
-  const py = (v) => plot2.y + plot2.h - (v - yView.min) / (yView.max - yView.min || 1) * plot2.h;
+  const xView = widen(xs, plot2.w, model.axes?.category);
+  const yView = widen(ys, plot2.h, model.axes?.value);
+  const px = (v) => plot2.x + chartAxisRatio(v, xView, model.axes?.category) * plot2.w;
+  const py = (v) => plot2.y + plot2.h - chartAxisRatio(v, yView, model.axes?.value) * plot2.h;
   out.push(chartAreaRect(model, "plotArea", plot2));
+  out.push(axisGridlines(model, model.axes?.value, ys.ticks, py, plot2, false));
+  if (model.axes?.category)
+    out.push(axisGridlines(model, model.axes.category, xs.ticks, px, plot2, true));
   ys.ticks.forEach((t, i2) => {
-    out.push(line2(plot2.x, py(t), plot2.x + plot2.w, py(t), grid.color, grid.width));
     if (valueLabels)
       out.push(
         text3(plot2.x - 4, py(t) + valueSize * 0.3, yLabels[i2] ?? "", {
@@ -43198,19 +43713,30 @@ function scatter(model, area, out) {
       );
   });
   for (const t of xs.ticks) {
-    out.push(line2(px(t), plot2.y + plot2.h, px(t), plot2.y + plot2.h + 3, xAxis.color, xAxis.width));
+    if (!model.axes?.category?.source.deleted)
+      out.push(line2(px(t), plot2.y + plot2.h, px(t), plot2.y + plot2.h + 3, xAxis.color, xAxis.width));
     if (categoryLabels)
       out.push(
-        text3(px(t), plot2.y + plot2.h + categorySize + 3, formatAxisValue(t), {
+        text3(px(t), plot2.y + plot2.h + categorySize + 3, axisTickText(t, model.axes?.category), {
           anchor: "middle",
           ...categoryAttrs
         })
       );
   }
   out.push(
-    line2(plot2.x, plot2.y + plot2.h, plot2.x + plot2.w, plot2.y + plot2.h, xAxis.color, xAxis.width)
+    axisLine(
+      model,
+      model.axes?.category,
+      "categoryAxis",
+      plot2.x,
+      plot2.y + plot2.h,
+      plot2.x + plot2.w,
+      plot2.y + plot2.h
+    )
+  );
+  out.push(
+    axisLine(model, model.axes?.value, "valueAxis", plot2.x, plot2.y, plot2.x, plot2.y + plot2.h)
   );
-  out.push(line2(plot2.x, plot2.y, plot2.x, plot2.y + plot2.h, yAxis.color, yAxis.width));
   const marks = [];
   for (const [si, s] of model.series.entries())
     s.values.forEach((v, i2) => {
@@ -43219,8 +43745,8 @@ function scatter(model, area, out) {
       const filter2 = s.shadowFilter ? ` filter="${s.shadowFilter}"` : "";
       const fill = s.pointColors?.[i2] ?? s.color;
       if (!bubble) {
-        out.push(`<circle cx="${n(px(x))}" cy="${n(py(v))}" r="3" fill="${fill}"${filter2}/>`);
-        marks.push({ series: s, index: i2, x: px(x), y: py(v), radius: 3 });
+        out.push(chartSeriesMarkerSvg(s, i2, px(x), py(v)));
+        marks.push({ series: s, index: i2, x: px(x), y: py(v), radius: chartMarkerRadius(s, i2) });
         return;
       }
       const r = radiusOf(s.sizes?.[i2] ?? void 0);
@@ -43440,32 +43966,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 cx2 = 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 = (i2) => i2 / count2 * Math.PI * 2;
-  const r = (v) => (v - scale2.min) / (scale2.max - scale2.min || 1) * radius;
+  const r = (v) => chartAxisRatio(v, scale2, model.axes?.value) * radius;
   const labelEvery = Math.max(
     1,
     Math.ceil(12 / Math.max(1, radius / Math.max(1, scale2.ticks.length - 1)))
   );
   for (const [k, t] of scale2.ticks.entries()) {
     const ring = Array.from({ length: count2 }, (_, i2) => polar2(cx2, cy, r(t), angle(i2))).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(
-        text3(cx2 + 3, cy - r(t) + valueSize * 0.3, formatAxisValue(t, scale2.percent), valueAttrs)
+        `<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(
+        text3(
+          cx2 + 3,
+          cy - r(t) + valueSize * 0.3,
+          axisTickText(t, model.axes?.value, scale2.percent),
+          valueAttrs
+        )
       );
   }
   model.categories.forEach((c2, i2) => {
     const [x, y] = polar2(cx2, cy, radius, angle(i2));
-    out.push(line2(cx2, cy, x, y, axis.color, axis.width));
+    out.push(axisLine(model, model.axes?.category, "categoryAxis", cx2, cy, x, y));
     const [lx, ly] = polar2(cx2, cy, radius + 10, angle(i2));
     const anchor = Math.abs(lx - cx2) < 2 ? "middle" : lx > cx2 ? "start" : "end";
-    if (model.appearance?.categoryAxis?.labelsVisible !== false)
+    if (chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false)
       out.push(
         text3(lx, ly + categorySize * 0.3, fit(c2, area.w / 4, categorySize), {
           anchor,
@@ -43476,7 +44007,13 @@ function radarSvg(model, area) {
   const marks = [];
   for (const s of model.series) {
     const vertices = s.values.slice(0, count2).map((v, i2) => polar2(cx2, cy, r(v ?? scale2.min), angle(i2)));
-    vertices.forEach(([x, y], i2) => marks.push({ series: s, index: i2, x, y, radius: 3 }));
+    vertices.forEach(([x, y], i2) => {
+      if (s.values[i2] === null) return;
+      const markerSeries = s;
+      if (markerSeries.marker || markerSeries.pointMarkers)
+        out.push(chartSeriesMarkerSvg(s, i2, x, y));
+      marks.push({ series: s, index: i2, x, y, radius: chartMarkerRadius(s, i2) });
+    });
     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}"` : ""}/>`
@@ -43666,33 +44203,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(content2, attrs2, options) {
-  const width = options.measureText?.(content2, cssFont(attrs2));
+function chartTextWidth(content2, attrs2, options2) {
+  const width = options2.measureText?.(content2, cssFont(attrs2));
   return width !== void 0 && Number.isFinite(width) && width >= 0 ? width : textWidth(content2, attrs2.size);
 }
-function fitChartText(content2, maxWidth, attrs2, options) {
-  if (!options.measureText) return fit(content2, maxWidth, attrs2.size);
-  if (chartTextWidth(content2, attrs2, options) <= maxWidth) return content2;
+function fitChartText(content2, maxWidth, attrs2, options2) {
+  if (!options2.measureText) return fit(content2, maxWidth, attrs2.size);
+  if (chartTextWidth(content2, attrs2, options2) <= maxWidth) return content2;
   const points = [...content2];
   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 plot2 = model.legendOverlay ? area : reserved;
   const box2 = bounds.box;
   if (!box2) return { plot: plot2, markup: "", foreground: false };
@@ -43706,11 +44243,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(
-    (entry3) => chartTextWidth(entry3.label, attrs2, options) + keySize + keyGap
+    (entry3) => chartTextWidth(entry3.label, attrs2, options2) + keySize + keyGap
   );
   const horizontal = manual.width > manual.height && widths.reduce((sum3, width) => sum3 + width, 0) + size <= manual.width;
   const rowWidth = horizontal ? manual.width / entries.length : manual.width;
@@ -43725,8 +44262,8 @@ function chartLegendSvg(model, area, frame, options) {
   ];
   const baselineOffset = font ? (font.ascent - font.descent) / 2 : size * 0.35;
   entries.forEach((entry3, i2) => {
-    const available = horizontal ? chartTextWidth(entry3.label, attrs2, options) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
-    const label2 = fitChartText(entry3.label, available, attrs2, options);
+    const available = horizontal ? chartTextWidth(entry3.label, attrs2, options2) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
+    const label2 = fitChartText(entry3.label, available, attrs2, options2);
     const contentWidth = Math.min(
       horizontal ? widths[i2] ?? 0 : Math.max(...widths),
       rowWidth - size / 2
@@ -43769,7 +44306,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;
@@ -43778,7 +44315,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 total2 = widths.reduce((a2, b) => a2 + b, 0);
     let x2 = area.x + Math.max(0, (area.w - total2) / 2);
@@ -43795,14 +44332,14 @@ function automaticLegend(model, area, out, options, bounds) {
     entries.forEach((e, i2) => {
       const w = widths[i2] ?? 0;
       out.push(rect(x2, y, 8, 8, e.color));
-      out.push(text3(x2 + 12, y + 8, fitChartText(e.label, w - 16, attrs2, options), attrs2));
+      out.push(text3(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;
@@ -43820,14 +44357,14 @@ function automaticLegend(model, area, out, options, bounds) {
     const y = y0 + i2 * rowH;
     if (y + rowH > area.y + area.h + 2) return;
     out.push(rect(x, y + 3, 8, 8, e.color));
-    out.push(text3(x + 12, y + 11, fitChartText(e.label, width - 16, attrs2, options), attrs2));
+    out.push(text3(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, measure2, options = {}) {
+function wrapStyledRuns(runs, maxWidth, measure2, options2 = {}) {
   const groups = [];
   for (const [source2, run2] of runs.entries()) {
     for (const token of run2.text.split(/(\r\n|[\r\n]|[ \t]+)/u).filter(Boolean)) {
@@ -43875,7 +44412,7 @@ function wrapStyledRuns(runs, maxWidth, measure2, options = {}) {
     if (line3.length && width(merged(line3, [...separator, ...group2.pieces])) > maxWidth) flush();
     else line3 = merged(line3, separator);
     spaces = [];
-    if (options.breakWords && wordWidth > maxWidth) {
+    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 };
@@ -43893,11 +44430,11 @@ function wrapStyledRuns(runs, maxWidth, measure2, options = {}) {
 function spacing2(value2, naturalHeight, fallback) {
   return value2 ? value2.unit === "points" ? chartPointsToPixels(value2.value) : naturalHeight * value2.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 ?? [
     {
@@ -43933,7 +44470,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           "title",
           base.size
         ),
-        options
+        options2
       ),
       { breakWords: true }
     );
@@ -43957,10 +44494,10 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
     return {
       ...line3,
       runs,
-      width: runs.reduce((sum3, run2) => sum3 + chartTextWidth(run2.text, run2.attrs, options), 0),
+      width: runs.reduce((sum3, run2) => sum3 + chartTextWidth(run2.text, run2.attrs, options2), 0),
       size: runs.length ? Math.max(...runs.map((run2) => run2.attrs.size ?? 14)) : base.size ?? 14,
       fontMetrics: (runs.length ? runs.map((run2) => run2.attrs) : [base]).map(
-        (attrs2) => chartFontMetrics(attrs2, options)
+        (attrs2) => chartFontMetrics(attrs2, options2)
       )
     };
   });
@@ -43998,7 +44535,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           anchor: "start"
         }).replace("<text ", '<tspan data-chart-title-run="true" ').replace("</text>", "</tspan>")
       );
-      x += chartTextWidth(run2.text, run2.attrs, options);
+      x += chartTextWidth(run2.text, run2.attrs, options2);
     }
   }
   const parent = text3(0, 0, "", { ...base, underline: false }).replace(
@@ -44024,7 +44561,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);
@@ -44038,7 +44575,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: h2 }));
   let area = { x: 8, y: 8, w: w - 16, h: h2 - 16 };
-  const richTitle = chartRichTitleSvg(model, w, options, h2);
+  const richTitle = chartRichTitleSvg(model, w, options2, h2);
   if (richTitle) {
     if (model.titleLayout || model.titleOverlay) foregroundTitle = richTitle.markup;
     else out.push(richTitle.markup);
@@ -44047,9 +44584,9 @@ function renderChartSvg(model, width, height, options = {}) {
   } else if (model.title) {
     const attrs2 = chartTextAttributes(model, "title", 14);
     const size = attrs2.size ?? 14;
-    const label2 = fitChartText(model.title, w - 16, attrs2, options);
-    const titleWidth = Math.min(w - 16, chartTextWidth(label2, attrs2, options) + 8);
-    const font = chartFontMetrics(attrs2, options);
+    const label2 = fitChartText(model.title, w - 16, attrs2, options2);
+    const titleWidth = Math.min(w - 16, chartTextWidth(label2, 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", {
@@ -44077,7 +44614,7 @@ function renderChartSvg(model, width, height, options = {}) {
     out.push("</svg>");
     return out.join("");
   }
-  const legend = chartLegendSvg(model, area, { width: w, height: h2 }, options);
+  const legend = chartLegendSvg(model, area, { width: w, height: h2 }, options2);
   area = legend.plot;
   if (!legend.foreground) out.push(legend.markup);
   if (area.w > 4 && area.h > 4) {
@@ -44133,11 +44670,11 @@ function readRange(workbook, sheetIndex2, range) {
     for (let c2 = range.start.col; c2 <= end.col; c2++) out.push(getValue(sheet, r, c2));
   return out;
 }
-function createRefEvaluator(workbook, calc, options = {}) {
+function createRefEvaluator(workbook, calc, options2 = {}) {
   return (ref) => {
     const text4 = ref.trim().replace(/^=/, "");
     if (!text4) return [];
-    const sheetIndex2 = options.sheet ?? workbook.activeSheet;
+    const sheetIndex2 = options2.sheet ?? workbook.activeSheet;
     const plain3 = plainReference(workbook, text4, sheetIndex2);
     if (plain3) return readRange(workbook, plain3.sheet, plain3.range);
     const named2 = /^_xlchart\./i.test(text4) ? workbook.definedNames.find(