ooxml-core 1.18.0 → 1.19.0

package/dist/docx/layout/index.cjs

@@ -50,11 +50,11 @@ function checkXmlLimits(xml, label, limits = {}) {
       throw new Error(`${label} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
-function parseXml(xml, options = {}) {
-  const label = options.label ?? "OOXML";
+function parseXml(xml, options2 = {}) {
+  const label = options2.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
     throw new Error(`${label} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label, options.limits);
+  checkXmlLimits(xml, label, options2.limits);
   let parseError = "";
   let parsed;
   try {
@@ -804,8 +804,8 @@ function rgbToHsl(r, g, b) {
   }
   return { h, s: clampUnitInterval(s), l: clampUnitInterval(l) };
 }
-function hslToRgb(h, s, l, roundChannel = Math.round, options) {
-  const sC = options?.clampSaturation === false ? s : clampUnitInterval(s);
+function hslToRgb(h, s, l, roundChannel = Math.round, options2) {
+  const sC = options2?.clampSaturation === false ? s : clampUnitInterval(s);
   const lC = clampUnitInterval(l);
   const hN = (h % 360 + 360) % 360;
   const c = (1 - Math.abs(2 * lC - 1)) * sC;
@@ -1294,13 +1294,13 @@ var APPLIED = /* @__PURE__ */ new Set([
   "lumMod",
   "lumOff"
 ]);
-function resolveDrawingColor(color, theme, options) {
+function resolveDrawingColor(color, theme, options2) {
   const base = baseHex(color, theme);
   const rgb = base ? hexToRgbChannels(base) : null;
   if (!rgb) return void 0;
-  if (options?.transformOrder === "document") {
+  if (options2?.transformOrder === "document") {
     const value = orderedColorTransforms(rgb, color.transforms);
-    const round3 = options.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
+    const round3 = options2.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
     return {
       hex: `#${toHex(round3(value.r))}${toHex(round3(value.g))}${toHex(round3(value.b))}`,
       alpha: value.alpha,
@@ -1351,7 +1351,7 @@ function resolveDrawingColor(color, theme, options) {
     if (lumMod !== void 0) hsl.l = clampUnitInterval(hsl.l * lumMod);
     const lumOff = parseDrawingFraction(find("lumOff"));
     if (lumOff !== void 0) hsl.l = clampUnitInterval(hsl.l + lumOff);
-    const round3 = options?.hslRounding === "halfDown" ? (value) => Math.ceil(value - 0.5) : Math.round;
+    const round3 = options2?.hslRounding === "halfDown" ? (value) => Math.ceil(value - 0.5) : Math.round;
     ({ r, g, b } = hslToRgb(hsl.h, hsl.s, hsl.l, round3));
   }
   let alpha = parseDrawingPercent(find("alpha")) ?? 1;
@@ -1808,7 +1808,7 @@ function resolveInnerRect(fillToRect, focalPoint) {
 function lerpEdge(inner, outer, t) {
   return inner + (outer - inner) * t;
 }
-function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
+function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options2) {
   if (stops.length === 0) {
     return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"/>';
   }
@@ -1817,7 +1817,7 @@ function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
   const rects = [];
   const alphaRects = [];
   const masked = sorted.some((stop) => (stop.opacity ?? 1) < 1);
-  const bands = options?.bands;
+  const bands = options2?.bands;
   if (!Number.isInteger(bands) || bands < 1) throw new RangeError("Invalid gradient band count");
   for (let i = bands; i >= 0; i -= 1) {
     const t = i / bands;
@@ -11575,6 +11575,9 @@ function formatChartNumberWithColor(value, formatCode) {
     return void 0;
   }
 }
+function formatChartNumber(value, formatCode) {
+  return formatChartNumberWithColor(value, formatCode)?.text;
+}
 
 // chart/data-label-text.ts
 var DATA_LABEL_SEPARATOR = ", ";
@@ -11623,12 +11626,12 @@ function composeDataLabelText(input) {
 }
 
 // chart/bubble-radius.ts
-function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options) {
-  const scale = (options?.bubbleScale ?? 100) / 100;
+function computeBubbleRadius(sizeVal, maxBubble, medianRadius, options2) {
+  const scale = (options2?.bubbleScale ?? 100) / 100;
   if (sizeVal === void 0) return medianRadius * scale;
   const denom = maxBubble > 0 ? maxBubble : 1;
   const magnitude = Math.abs(sizeVal);
-  const ratio = (options?.sizeRepresents ?? "w") === "area" ? Math.sqrt(magnitude) / Math.sqrt(denom) : magnitude / denom;
+  const ratio = (options2?.sizeRepresents ?? "w") === "area" ? Math.sqrt(magnitude) / Math.sqrt(denom) : magnitude / denom;
   return medianRadius * scale * 0.5 + ratio * medianRadius * scale * 1.5;
 }
 function maxBubbleSize(sizes) {
@@ -11956,14 +11959,14 @@ function scottBinCount(values, min, max) {
   const width = 3.49 * sd * values.length ** (-1 / 3);
   return Math.max(1, Math.ceil((max - min) / width));
 }
-function computeHistogramBins(values, options, format = String) {
-  const closed = options.intervalClosed ?? "l";
+function computeHistogramBins(values, options2, format = String) {
+  const closed = options2.intervalClosed ?? "l";
   const finite2 = values.map((value, sourceIndex) => ({ value, sourceIndex })).filter((item) => Number.isFinite(item.value));
   if (finite2.length === 0) {
     return [];
   }
-  const underflow = typeof options.underflow === "number" ? options.underflow : void 0;
-  const overflow = typeof options.overflow === "number" ? options.overflow : void 0;
+  const underflow = typeof options2.underflow === "number" ? options2.underflow : void 0;
+  const overflow = typeof options2.overflow === "number" ? options2.overflow : void 0;
   const under = underflow === void 0 ? [] : finite2.filter(
     (item) => closed === "r" ? item.value <= underflow : item.value < underflow
   );
@@ -11980,8 +11983,8 @@ function computeHistogramBins(values, options, format = String) {
   if (regular.length > 0) {
     const min = Math.min(...regular.map((item) => item.value));
     const max = Math.max(...regular.map((item) => item.value));
-    const requestedSize = options.binSize && options.binSize > 0 ? options.binSize : void 0;
-    const requestedCount = options.binCount && options.binCount > 0 ? options.binCount : void 0;
+    const requestedSize = options2.binSize && options2.binSize > 0 ? options2.binSize : void 0;
+    const requestedCount = options2.binCount && options2.binCount > 0 ? options2.binCount : void 0;
     const start = requestedSize ? Math.floor(min / requestedSize) * requestedSize : min;
     const count = requestedSize ? Math.max(
       closed === "l" ? Math.floor((max - start) / requestedSize) + 1 : Math.ceil((max - start) / requestedSize),
@@ -12032,9 +12035,9 @@ function aggregateByCategory(values, rawCategories) {
 }
 
 // chart/waterfall.ts
-function buildWaterfallSteps(values, options) {
+function buildWaterfallSteps(values, options2) {
   const subtotalIndices = new Set(
-    options?.subtotalIndices ?? (values.length > 0 ? [values.length - 1] : [])
+    options2?.subtotalIndices ?? (values.length > 0 ? [values.length - 1] : [])
   );
   const steps = [];
   let runningTotal = 0;
@@ -12094,13 +12097,13 @@ var noFit = () => ({
   rSquared: 0,
   coefficients: []
 });
-function fitModel(options, xVals, yVals) {
+function fitModel(options2, xVals, yVals) {
   const xs = [...xVals];
   const ys = [...yVals];
-  switch (options.kind) {
+  switch (options2.kind) {
     case "linear": {
       const reg = computeLinearRegression(xs, ys);
-      const fixed = options.intercept;
+      const fixed = options2.intercept;
       const slope = fixed !== void 0 ? ys.reduce((s, y, i) => s + (y - fixed) * xs[i], 0) / xs.reduce((s, x) => s + x * x, 0) : reg.slope;
       const b = fixed ?? reg.intercept;
       return {
@@ -12150,7 +12153,7 @@ function fitModel(options, xVals, yVals) {
       };
     }
     case "polynomial": {
-      const order = Math.min(options.order ?? 2, 6);
+      const order = Math.min(options2.order ?? 2, 6);
       const coeffs = fitPolynomial(xs, ys, order);
       const evaluate = (x) => coeffs.reduce((s, c, i) => s + c * x ** i, 0);
       return {
@@ -12164,11 +12167,11 @@ function fitModel(options, xVals, yVals) {
       return void 0;
   }
 }
-function fitChartTrendline(options, xVals, yVals) {
+function fitChartTrendline(options2, xVals, yVals) {
   const count = yVals.length;
   if (count < 2) return noFit();
-  if (options.kind === "movingAvg") {
-    const period = options.period ?? 2;
+  if (options2.kind === "movingAvg") {
+    const period = options2.period ?? 2;
     const points2 = [];
     for (let i = period - 1; i < count; i++) {
       let sum = 0;
@@ -12177,10 +12180,10 @@ function fitChartTrendline(options, xVals, yVals) {
     }
     return { points: points2, equation: `${period}-period moving average`, rSquared: 0, coefficients: [] };
   }
-  const model = fitModel(options, xVals, yVals);
+  const model = fitModel(options2, xVals, yVals);
   if (!model) return noFit();
-  const startX = Math.min(...xVals) - (options.backward ?? 0);
-  const endX = Math.max(...xVals) + (options.forward ?? 0);
+  const startX = Math.min(...xVals) - (options2.backward ?? 0);
+  const endX = Math.max(...xVals) + (options2.forward ?? 0);
   const steps = Math.max(Math.ceil((endX - startX) * 4), 20);
   const points = [];
   for (let step = 0; step <= steps; step++) {
@@ -12203,18 +12206,18 @@ function chartSampleVariance(values) {
   const mean = values.reduce((sum, value) => sum + value, 0) / count;
   return values.reduce((sum, value) => sum + (value - mean) ** 2, 0) / Math.max(count - 1, 1);
 }
-function chartErrorBarAmount(options, values, displayIndex, sourceIndex, side) {
-  switch (options.valueType) {
+function chartErrorBarAmount(options2, values, displayIndex, sourceIndex, side) {
+  switch (options2.valueType) {
     case "fixedVal":
-      return options.value ?? 0;
+      return options2.value ?? 0;
     case "percentage":
-      return Math.abs(values[displayIndex] ?? 0) * ((options.value ?? 0) / 100);
+      return Math.abs(values[displayIndex] ?? 0) * ((options2.value ?? 0) / 100);
     case "stdDev":
-      return Math.sqrt(chartSampleVariance(values)) * (options.value ?? 1);
+      return Math.sqrt(chartSampleVariance(values)) * (options2.value ?? 1);
     case "stdErr":
       return Math.sqrt(chartSampleVariance(values) / Math.max(values.length, 1));
     case "cust":
-      return side === "plus" ? options.customPlus?.[sourceIndex] ?? 0 : options.customMinus?.[sourceIndex] ?? 0;
+      return side === "plus" ? options2.customPlus?.[sourceIndex] ?? 0 : options2.customMinus?.[sourceIndex] ?? 0;
   }
 }
 
@@ -12590,6 +12593,191 @@ function chartCacheValues(cache2) {
 }
 var chartSourceValues = (source) => chartCacheValues(source?.cache ?? source?.levels?.[0]);
 
+// chart/marker-shape.ts
+var CHART_PX_PER_PT = 4 / 3;
+var DEFAULT_MARKER_OUTLINE_PT = 0.75;
+var AUTOMATIC_MARKER_CYCLE = [
+  "diamond",
+  "square",
+  "triangle",
+  "x",
+  "star",
+  "circle",
+  "plus",
+  "dot",
+  "dash"
+];
+function automaticMarkerSymbol(seriesIdx) {
+  const length = AUTOMATIC_MARKER_CYCLE.length;
+  const normalized = (Math.trunc(seriesIdx) % length + length) % length;
+  return AUTOMATIC_MARKER_CYCLE[Number.isFinite(normalized) ? normalized : 0];
+}
+function markerRadius(size, defaultRadius) {
+  if (size === void 0 || !Number.isFinite(size) || size <= 0) {
+    return defaultRadius;
+  }
+  return size / 2;
+}
+function polygonPoints(vertices) {
+  return vertices.map(([x, y]) => `${x.toFixed(2)},${y.toFixed(2)}`).join(" ");
+}
+function starVertices(cx, cy, r) {
+  const inner = r * 0.5;
+  const out = [];
+  for (let i = 0; i < 10; i++) {
+    const radius = i % 2 === 0 ? r : inner;
+    const angle = -Math.PI / 2 + Math.PI * i / 5;
+    out.push([cx + radius * Math.cos(angle), cy + radius * Math.sin(angle)]);
+  }
+  return out;
+}
+function rectPolygon(x, y, w, h) {
+  return polygonPoints([
+    [x, y],
+    [x + w, y],
+    [x + w, y + h],
+    [x, y + h]
+  ]);
+}
+function buildMarkerPrimitive(input) {
+  const { symbol, cx, cy, fill } = input;
+  const part = input.part === void 0 ? {} : { part: input.part };
+  if (symbol === "none") {
+    return null;
+  }
+  const r = markerRadius(input.size, input.defaultRadius);
+  const 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 h = symbol === "dash" ? r * 0.64 : r * 2;
+      const y = cy - h / 2;
+      if (outline) {
+        return {
+          kind: "polygon",
+          points: rectPolygon(cx - r, y, r * 2, h),
+          fill,
+          ...outline,
+          ...part
+        };
+      }
+      return { kind: "rect", x: cx - r, y, w: r * 2, h, fill, ...part };
+    }
+    case "diamond":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx, cy - r],
+          [cx + r, cy],
+          [cx, cy + r],
+          [cx - r, cy]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "triangle":
+      return {
+        kind: "polygon",
+        points: polygonPoints([
+          [cx, cy - r],
+          [cx + r * 0.9, cy + r * 0.75],
+          [cx - r * 0.9, cy + r * 0.75]
+        ]),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "star":
+      return {
+        kind: "polygon",
+        points: polygonPoints(starVertices(cx, cy, r)),
+        fill,
+        ...polygonStroke,
+        ...part
+      };
+    case "plus":
+      return {
+        kind: "path",
+        d: `M${(cx - r).toFixed(2)},${cy.toFixed(2)} L${(cx + r).toFixed(2)},${cy.toFixed(2)} M${cx.toFixed(2)},${(cy - r).toFixed(2)} L${cx.toFixed(2)},${(cy + r).toFixed(2)}`,
+        fill: "none",
+        stroke: lineStroke,
+        strokeWidth: Math.max(1, r * 0.4),
+        ...part
+      };
+    case "x":
+      return {
+        kind: "path",
+        d: `M${(cx - r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx + r).toFixed(2)},${(cy + r).toFixed(2)} M${(cx + r).toFixed(2)},${(cy - r).toFixed(2)} L${(cx - r).toFixed(2)},${(cy + r).toFixed(2)}`,
+        fill: "none",
+        stroke: lineStroke,
+        strokeWidth: Math.max(1, r * 0.4),
+        ...part
+      };
+    case "dot":
+      return { kind: "circle", cx, cy, r: Math.max(r * 0.6, 1), fill, ...part, ...outline };
+    default:
+      return { kind: "circle", cx, cy, r, fill, ...part, ...outline };
+  }
+}
+
+// chart/render/chart-view-markers.ts
+function summaryMarkers(source, 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 = source.marker?.symbol;
+  const marker = {
+    ...source.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source.marker || enabled ? automaticMarkerSymbol(source.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point of source.dataPoints) {
+    if (point.index === void 0 || !point.marker) continue;
+    const override = point.marker;
+    pointMarkers[point.index] = {
+      ...marker,
+      ...override,
+      ...override.symbol === "auto" || !source.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source.index ?? seriesPosition) } : {},
+      ...marker.spPr || override.spPr ? {
+        spPr: {
+          ...marker.spPr,
+          ...override.spPr,
+          ...marker.spPr?.line || override.spPr?.line ? { line: { ...marker.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
+function seriesMarkerViews(source, drawingColor) {
+  const fillColor = (fill) => fill?.kind === "none" ? "none" : fill?.kind === "solid" ? drawingColor(fill.color) : void 0;
+  const resolve = (marker) => {
+    const fill = fillColor(marker.spPr?.fill);
+    const stroke = fillColor(marker.spPr?.line?.fill);
+    const width = marker.spPr?.line?.widthEmu;
+    return {
+      ...marker.symbol !== void 0 ? { symbol: marker.symbol } : {},
+      ...marker.size !== void 0 ? { size: marker.size } : {},
+      ...fill !== void 0 ? { fill } : {},
+      ...stroke !== void 0 ? { stroke } : {},
+      ...width !== void 0 ? { strokeWidth: width / 9525 } : {}
+    };
+  };
+  return {
+    ...source.marker ? { marker: resolve(source.marker) } : {},
+    ...source.pointMarkers ? {
+      pointMarkers: Object.fromEntries(
+        Object.entries(source.pointMarkers).map(([i, marker]) => [i, resolve(marker)])
+      )
+    } : {}
+  };
+}
+
 // chart/render/summary-analysis.ts
 function summaryTrendline(source) {
   const kind = chartTrendlineKind(source.trendlineType);
@@ -12631,17 +12819,17 @@ function summaryAnalysis(series) {
 }
 
 // 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;
 }
@@ -12748,7 +12936,10 @@ function extraGroups(chartSpace, firstType) {
     const type = group2.kind === "bar" ? "column" : group2.kind;
     const entry = {
       chartType: type,
-      series: group2.series.map((source) => chartSummarySeries(source, type, group2.dataLabels)),
+      series: group2.series.map((source, index) => ({
+        ...chartSummarySeries(source, type, group2.dataLabels),
+        ...summaryMarkers(source, group2, index)
+      })),
       secondary: valueAxisId(chartSpace, group2.axisIds) !== primary
     };
     if (group2.grouping && GROUPINGS.has(group2.grouping))
@@ -12766,13 +12957,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(
-    (source) => chartSummarySeries(source, chartType, group2?.dataLabels)
-  );
+  const series = (group2?.series ?? []).map((source, index) => ({
+    ...chartSummarySeries(source, chartType, group2?.dataLabels),
+    ...group2 ? summaryMarkers(source, group2, index) : {}
+  }));
   const summary = {
     chartType,
     series,
-    showLegend: chartSpace.legend !== void 0
+    showLegend: chartSpace.legend !== void 0,
+    axes: chartSpace.plotArea.axes,
+    axisIds: group2?.axisIds ?? []
   };
   const combined = extraGroups(chartSpace, chartType);
   if (combined.length) summary.extraGroups = combined;
@@ -13074,7 +13268,7 @@ function chartTextAttributes(model, part, fallbackSize = FONT_SIZE) {
 function chartStroke(model, part) {
   const entry = model.appearance?.[part];
   return {
-    color: entry?.axisVisible === false ? "none" : entry?.lineColor ?? (part === "gridlineMajor" ? GRID_COLOR : AXIS_COLOR),
+    color: entry?.axisVisible === false ? "none" : entry?.lineColor ?? (part.startsWith("gridline") ? GRID_COLOR : AXIS_COLOR),
     width: entry?.lineWidth === void 0 ? 1 : chartPointsToPixels(entry.lineWidth)
   };
 }
@@ -13365,6 +13559,60 @@ function scatterAnalysis(model, px, py, out) {
   });
 }
 
+// chart/render/chart-svg-markers.ts
+function chartMarkerRadius(series, index, defaultRadius = 3) {
+  const marker = { ...series.marker, ...series.pointMarkers?.[index] };
+  if (marker.symbol === "none") return 0;
+  const radius = markerRadius(marker.size, defaultRadius);
+  return marker.symbol === "dot" ? Math.max(radius * 0.6, 1) : radius;
+}
+function chartSeriesMarkerSvg(series, index, cx, cy, defaultRadius = 3) {
+  const marker = { ...series.marker, ...series.pointMarkers?.[index] };
+  const primitive = buildMarkerPrimitive({
+    ...marker,
+    symbol: marker.symbol,
+    size: marker.size,
+    cx,
+    cy,
+    fill: marker.fill ?? series.pointColors?.[index] ?? series.color,
+    defaultRadius
+  });
+  if (!primitive) return "";
+  let 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 filter = series.shadowFilter ? ` filter="${esc(series.shadowFilter)}"` : "";
+  return `<${primitive.kind} ${geometry} fill="${esc(primitive.fill)}"${outline}${filter}/>`;
+}
+
+// chart/line-dash.ts
+function chartLineDashArray(style, width) {
+  if (!style || style === "solid") {
+    return void 0;
+  }
+  const unit = Math.max(width, 1);
+  if (style === "dot" || style === "sysDot") {
+    return `${unit} ${unit * 2}`;
+  }
+  if (style === "lgDash") {
+    return `${unit * 6} ${unit * 3}`;
+  }
+  return `${unit * 3} ${unit * 2}`;
+}
+
 // chart/render/chart-scale.ts
 var clean = (n2) => Number(n2.toPrecision(12));
 function* units(raw) {
@@ -13375,14 +13623,14 @@ function* units(raw) {
     exp++;
   }
 }
-function niceScale(dataMin, dataMax, options = {}) {
-  const maxIntervals = Math.max(1, options.maxIntervals ?? 10);
+function niceScale(dataMin, dataMax, options2 = {}) {
+  const maxIntervals = Math.max(1, options2.maxIntervals ?? 10);
   let lo = Number.isFinite(dataMin) ? dataMin : 0;
   let hi = Number.isFinite(dataMax) ? dataMax : 0;
   if (lo > hi) [lo, hi] = [hi, lo];
   if (lo === hi) {
     if (lo === 0) hi = 1;
-    else if (options.noZero) {
+    else if (options2.noZero) {
       const pad = Math.abs(lo) * 0.1 || 1;
       lo -= pad;
       hi += pad;
@@ -13391,7 +13639,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;
@@ -13431,6 +13679,233 @@ function formatAxisValue(value, percent = false) {
   return `${v < 0 ? "-" : ""}${grouped}${frac ? `.${frac}` : ""}`;
 }
 
+// chart/render/chart-svg-axes.ts
+function axisTickText(value, axis, percent = false) {
+  return formatChartNumber(value, axis?.source.numberFormat?.formatCode) ?? formatAxisValue(value, percent);
+}
+function axisLine(model, axis, part, x1, y1, x2, y2) {
+  if (axis?.source.deleted) return "";
+  return styledAxisLine(x1, y1, x2, y2, axis?.line, chartStroke(model, part));
+}
+function styledAxisLine(x1, y1, x2, y2, paint2, fallback) {
+  const color = paint2?.color ?? fallback.color;
+  const width = paint2?.width ?? fallback.width;
+  if (color === "none" || width === 0) return "";
+  const dash = chartLineDashArray(paint2?.dash, width);
+  return line2(x1, y1, x2, y2, esc(color), width).replace(
+    "/>",
+    dash ? ` stroke-dasharray="${dash}"/>` : "/>"
+  );
+}
+function axisGridlines(model, axis, ticks, position, plot, vertical) {
+  const draw2 = (values, paint2, minor2) => {
+    const fallback = chartStroke(model, minor2 ? "gridlineMinor" : "gridlineMajor");
+    return values.map((value) => {
+      const p = position(value);
+      return vertical ? styledAxisLine(p, plot.y, p, plot.y + plot.h, paint2, fallback) : styledAxisLine(plot.x, p, plot.x + plot.w, p, paint2, fallback);
+    }).join("");
+  };
+  const major = !axis || axis.source.majorGridlines ? draw2(ticks, axis?.majorGrid, false) : "";
+  const minor = axis?.source.minorGridlines ? draw2(axis.minorTicks, axis.minorGrid, true) : "";
+  return major + minor;
+}
+
+// chart/axis-range.ts
+function computeLogValueRange(series, logBase) {
+  const allValues = series.flatMap((item) => item.values).filter((value) => value !== null && Number.isFinite(value) && value > 0);
+  if (allValues.length === 0) {
+    return { min: 1, max: logBase, span: 1, logScale: true, logBase };
+  }
+  const dataMin = Math.min(...allValues);
+  const dataMax = Math.max(...allValues);
+  const logMin = Math.floor(Math.log(dataMin) / Math.log(logBase));
+  const logMax = Math.ceil(Math.log(dataMax) / Math.log(logBase));
+  const min = logBase ** logMin;
+  const max = logBase ** Math.max(logMax, logMin + 1);
+  return {
+    min,
+    max,
+    span: Math.max(Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase), 1),
+    logScale: true,
+    logBase
+  };
+}
+function withAxisBounds(automatic, axis, logBase) {
+  const validMin = typeof axis?.min === "number" && Number.isFinite(axis.min) && (!logBase || axis.min > 0) ? axis.min : void 0;
+  const validMax = typeof axis?.max === "number" && Number.isFinite(axis.max) && (!logBase || axis.max > 0) ? axis.max : void 0;
+  const min = validMin ?? automatic.min;
+  let max = validMax ?? automatic.max;
+  const majorUnit = validMin === void 0 && validMax === void 0 ? automatic.majorUnit : void 0;
+  if (max <= min) {
+    max = logBase ? min * logBase : min + 1;
+  }
+  const span = logBase ? Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase) : max - min;
+  return {
+    min,
+    max,
+    span: Math.max(span, Number.EPSILON),
+    ...majorUnit !== void 0 ? { majorUnit } : {},
+    ...logBase ? { logScale: true, logBase } : {},
+    ...axis?.orientation === "maxMin" ? { reverseOrder: true } : {}
+  };
+}
+
+// chart/axis-ticks.ts
+var LOG_EXPONENT_TOLERANCE = 1e-12;
+function generateLogTicks(range) {
+  if (!range.logScale || !range.logBase) {
+    return [];
+  }
+  const base = range.logBase;
+  const logMin = Math.log(range.min) / Math.log(base);
+  const logMax = Math.log(range.max) / Math.log(base);
+  const firstExponent = Math.ceil(logMin - LOG_EXPONENT_TOLERANCE);
+  const lastExponent = Math.floor(logMax + LOG_EXPONENT_TOLERANCE);
+  if (lastExponent < firstExponent) {
+    return range.min === range.max ? [range.min] : [range.min, range.max];
+  }
+  return Array.from(
+    { length: lastExponent - firstExponent + 1 },
+    (_unused, index) => base ** (firstExponent + index)
+  );
+}
+function 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 first3 = Math.ceil((range.min - tolerance) / unit);
+  const last = Math.floor((range.max + tolerance) / unit);
+  const count = Math.min(Math.max(last - first3 + 1, 0), 2e3);
+  return Array.from({ length: count }, (_, index) => (first3 + index) * unit);
+}
+function generateAxisTicks(range, axis, defaultIntervals) {
+  if (range.logScale && range.logBase) {
+    return generateLogTicks(range);
+  }
+  const explicit = generateIntervalTicks(range, axis?.majorUnit ?? 0);
+  if (explicit.length > 0) {
+    return explicit;
+  }
+  const automatic = generateIntervalTicks(range, range.majorUnit ?? 0);
+  if (automatic.length > 0) {
+    return automatic;
+  }
+  return Array.from(
+    { length: defaultIntervals + 1 },
+    (_, index) => range.min + range.span / defaultIntervals * index
+  );
+}
+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(
+    (value) => Math.abs(value / majorUnit - Math.round(value / majorUnit)) > tolerance
+  );
+}
+
+// chart/render/chart-view-axes.ts
+function chartAxisRatio(value, scale, axis) {
+  const range = axis?.range;
+  const ratio = range?.logScale ? Math.log(Math.max(value, range.min) / range.min) / Math.log(range.max / range.min) : (value - scale.min) / (scale.max - scale.min || 1);
+  return range?.reverseOrder ? 1 - ratio : ratio;
+}
+function chartAxisLabels(axis) {
+  return axis?.source.deleted !== true && axis?.source.tickLabelPosition !== "none";
+}
+function options(axis) {
+  return {
+    ...axis.scaling,
+    ...axis.scaling.logBase === void 0 ? {} : { logScale: true },
+    ...axis.majorUnit === void 0 ? {} : { majorUnit: axis.majorUnit },
+    ...axis.minorUnit === void 0 ? {} : { minorUnit: axis.minorUnit }
+  };
+}
+function applyChartAxes(model, chart, color) {
+  if (!chart.axes?.length) return;
+  const axes = chart.axes;
+  const linked = axes.filter((axis) => axis.id !== void 0 && chart.axisIds?.includes(axis.id));
+  const candidates = linked.length ? linked : axes;
+  const xy = model.type === "scatter" || model.type === "bubble";
+  const value = candidates.find((axis) => axis.kind === "val" && !["b", "t"].includes(axis.position ?? "")) ?? candidates.find((axis) => axis.kind === "val");
+  const category = candidates.find(
+    (axis) => xy ? axis.kind === "val" && axis !== value : axis.kind === "cat" || axis.kind === "date"
+  );
+  const secondary = axes.find((axis) => axis.kind === "val" && axis !== value && axis !== category);
+  const paint2 = (shape) => {
+    const ln = shape?.line;
+    const fill = ln?.fill;
+    const resolved = fill?.kind === "none" ? "none" : color(fill?.kind === "solid" ? fill.color : void 0);
+    return {
+      ...resolved === void 0 ? {} : { color: resolved },
+      ...ln?.widthEmu === void 0 ? {} : { width: ln.widthEmu / EMU_PER_PIXEL },
+      ...ln?.dash === void 0 ? {} : { dash: ln.dash }
+    };
+  };
+  const bind = (axis, scale, values) => {
+    const opts = options(axis);
+    const automatic = opts.logScale ? computeLogValueRange(
+      [{ values: values ?? [] }],
+      opts.logBase && Number.isFinite(opts.logBase) && opts.logBase > 1 ? opts.logBase : 10
+    ) : {
+      min: scale?.min ?? 0,
+      max: scale?.max ?? 1,
+      span: (scale?.max ?? 1) - (scale?.min ?? 0),
+      ...scale ? { majorUnit: scale.majorUnit } : {}
+    };
+    const logBase = automatic.logBase;
+    const range = withAxisBounds(automatic, opts, logBase);
+    if (scale) {
+      scale.min = range.min;
+      scale.max = range.max;
+      scale.ticks = generateAxisTicks(range, opts, 5);
+    }
+    return {
+      source: axis,
+      range,
+      minorTicks: generateMinorAxisTicks(range, opts),
+      line: paint2(axis.spPr),
+      majorGrid: paint2(axis.majorGridlinesSpPr),
+      minorGrid: paint2(axis.minorGridlinesSpPr)
+    };
+  };
+  const out = {};
+  if (value)
+    out.value = bind(
+      value,
+      model.valueAxis,
+      [
+        ...model.series,
+        ...model.extraGroups?.filter((g) => !g.secondary).flatMap((g) => g.series) ?? []
+      ].flatMap((s) => s.values)
+    );
+  if (category)
+    out.category = bind(
+      category,
+      model.xAxis ?? {
+        min: 0,
+        max: Math.max(1, model.categories.length - 1),
+        majorUnit: 1,
+        ticks: []
+      },
+      model.series.flatMap((s) => s.xValues ?? [])
+    );
+  if (secondary)
+    out.secondary = bind(
+      secondary,
+      model.secondaryAxis,
+      model.extraGroups?.filter((g) => g.secondary).flatMap((g) => g.series.flatMap((s) => s.values))
+    );
+  model.axes = out;
+}
+
 // chart/render/chart-view-analysis.ts
 function strokeOf(line3, fallback, resolve) {
   if (line3?.fill?.kind === "none") return void 0;
@@ -13480,15 +13955,15 @@ function seriesName(series, index, evaluateRef) {
   const fromRef = resolveRef(series.nameRef, evaluateRef)?.map(toText).filter((t) => t !== "").join(" ");
   return fromRef || series.name || `Series${index + 1}`;
 }
-function seriesContext(chart, theme, options) {
+function seriesContext(chart, theme, options2) {
   const scheme = chartColorScheme(theme);
   const resolver = { scheme: (name) => scheme[name] };
   return {
     theme,
     scheme,
     palette: chart.colorPalette === void 0 ? void 0 : findChartColorPalette(chart.colorPalette),
-    evaluateRef: options.evaluateRef ?? (() => []),
-    seriesColor: options.seriesColor,
+    evaluateRef: options2.evaluateRef ?? (() => []),
+    seriesColor: options2.seriesColor,
     drawingColor: (color) => color && drawingColorCss(resolveDrawingColor(color, resolver, { transformOrder: "document" })),
     gradient: (fill) => fill?.kind === "gradient" ? resolveChartGradient(
       fill,
@@ -13514,7 +13989,11 @@ function seriesView(ctx, s, index, total, categoriesOf) {
     })
   );
   if (Object.keys(points).length) view.pointGradients = points;
-  Object.assign(view, analysisView(s, color, ctx.drawingColor));
+  Object.assign(
+    view,
+    analysisView(s, color, ctx.drawingColor),
+    seriesMarkerViews(s, ctx.drawingColor)
+  );
   return view;
 }
 
@@ -13814,11 +14293,11 @@ function histogramView(chart, model) {
   const first3 = model.series[0];
   if (!first3) return;
   const raw = first3.values.map((v) => v ?? Number.NaN);
-  const options = chart.histogram ?? {};
-  const bins = options.aggregateByCategory ? aggregateByCategory(
+  const options2 = chart.histogram ?? {};
+  const bins = options2.aggregateByCategory ? aggregateByCategory(
     first3.values.map((v) => v ?? 0),
     model.categories
-  ) : computeHistogramBins(raw, options, formatAxisValue);
+  ) : computeHistogramBins(raw, options2, formatAxisValue);
   model.categories = bins.map((bin) => bin.label);
   first3.values = bins.map((bin) => bin.value);
   model.barGapWidth = 0;
@@ -13842,11 +14321,11 @@ var SUPPORTED = /* @__PURE__ */ new Set([
   "treemap",
   "sunburst"
 ]);
-function chartSummaryView(chart, theme, options = {}) {
+function chartSummaryView(chart, theme, options2 = {}) {
   const type = chart.chartType;
   const radial = type === "pie" || type === "doughnut";
   const byPoint = radial || type === "treemap" || type === "sunburst";
-  const ctx = seriesContext(chart, theme, options);
+  const ctx = seriesContext(chart, theme, options2);
   const { palette, scheme, drawingColor } = ctx;
   const grouping = chart.grouping ?? (type === "bar" || type === "column" ? "clustered" : "standard");
   const rawCategories = [];
@@ -13932,6 +14411,7 @@ function chartSummaryView(chart, theme, options = {}) {
   else if (!byPoint) model.valueAxis = valueAxis(model);
   applyDataLabels(model, chart.series, extra);
   chartExtraAxes(model);
+  applyChartAxes(model, chart, ctx.drawingColor);
   return model;
 }
 
@@ -13939,15 +14419,13 @@ function chartSummaryView(chart, theme, options = {}) {
 function cartesianAxes(model, area, out) {
   const scale = model.valueAxis;
   if (!scale) return void 0;
-  const labels = scale.ticks.map((t) => formatAxisValue(t, scale.percent));
+  const labels = scale.ticks.map((t) => axisTickText(t, model.axes?.value, scale.percent));
   const valueAttrs = chartTextAttributes(model, "valueAxis");
   const categoryAttrs = chartTextAttributes(model, "categoryAxis");
   const valueSize = valueAttrs.size ?? 10;
   const categorySize = categoryAttrs.size ?? 10;
-  const grid = chartStroke(model, "gridlineMajor");
-  const axis = chartStroke(model, "categoryAxis");
-  const valueLabels = model.appearance?.valueAxis?.labelsVisible !== false;
-  const categoryLabels = model.appearance?.categoryAxis?.labelsVisible !== false;
+  const valueLabels = chartAxisLabels(model.axes?.value) && model.appearance?.valueAxis?.labelsVisible !== false;
+  const categoryLabels = chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false;
   const labelW = valueLabels ? Math.max(...labels.map((l) => textWidth(l, valueSize)), 8) + 6 : 4;
   const horizontal = model.horizontal;
   const cats = Math.max(1, model.categories.length);
@@ -13956,7 +14434,7 @@ function cartesianAxes(model, area, out) {
     Math.max(...model.categories.map((c) => textWidth(c, categorySize)), 8) + 6
   );
   const second = horizontal ? void 0 : model.secondaryAxis;
-  const secondLabels = second?.ticks.map((t) => formatAxisValue(t, second.percent)) ?? [];
+  const secondLabels = second?.ticks.map((t) => axisTickText(t, model.axes?.secondary, second.percent)) ?? [];
   const secondW = second ? valueLabels ? Math.max(...secondLabels.map((l) => textWidth(l, valueSize)), 8) + 8 : 4 : 0;
   const plot = horizontal ? {
     x: area.x + catW,
@@ -13969,29 +14447,47 @@ function cartesianAxes(model, area, out) {
     w: Math.max(1, area.w - labelW - 4 - secondW),
     h: Math.max(1, area.h - Math.max(20, categorySize * 1.5))
   };
-  const span = scale.max - scale.min || 1;
-  const value = horizontal ? (v) => plot.x + (v - scale.min) / span * plot.w : (v) => plot.y + plot.h - (v - scale.min) / span * plot.h;
+  const value = horizontal ? (v) => plot.x + chartAxisRatio(v, scale, model.axes?.value) * plot.w : (v) => plot.y + plot.h - chartAxisRatio(v, scale, model.axes?.value) * plot.h;
   const bandSize = (horizontal ? plot.h : plot.w) / cats;
-  const band = horizontal ? (i) => plot.y + plot.h - bandSize * (i + 0.5) : (i) => plot.x + bandSize * (i + 0.5);
+  const index = (i) => model.axes?.category?.range.reverseOrder ? cats - 1 - i : i;
+  const band = horizontal ? (i) => plot.y + plot.h - bandSize * (index(i) + 0.5) : (i) => plot.x + bandSize * (index(i) + 0.5);
   out.push(chartAreaRect(model, "plotArea", plot));
+  out.push(axisGridlines(model, model.axes?.value, scale.ticks, value, plot, horizontal));
+  if (model.axes?.category?.source.majorGridlines || model.axes?.category?.source.minorGridlines)
+    out.push(
+      axisGridlines(
+        model,
+        model.axes.category,
+        model.categories.map((_, i) => i),
+        band,
+        plot,
+        !horizontal
+      )
+    );
   scale.ticks.forEach((t, i) => {
     const p = value(t);
     const label = labels[i] ?? "";
     if (horizontal) {
-      out.push(line2(p, plot.y, p, plot.y + plot.h, grid.color, grid.width));
       if (valueLabels)
         out.push(
           text(p, plot.y + plot.h + valueSize + 2, label, { anchor: "middle", ...valueAttrs })
         );
     } else {
-      out.push(line2(plot.x, p, plot.x + plot.w, p, grid.color, grid.width));
       if (valueLabels)
         out.push(text(plot.x - 4, p + valueSize * 0.3, label, { anchor: "end", ...valueAttrs }));
     }
   });
-  const zero = value(Math.min(Math.max(0, scale.min), scale.max));
-  if (horizontal) out.push(line2(zero, plot.y, zero, plot.y + plot.h, axis.color, axis.width));
-  else out.push(line2(plot.x, zero, plot.x + plot.w, zero, axis.color, axis.width));
+  const source = model.axes?.value?.source;
+  const crossing = source?.crosses === "max" ? scale.max : source?.crosses === "min" ? scale.min : source?.crossesAt ?? 0;
+  const zero = value(Math.min(Math.max(crossing, scale.min), scale.max));
+  if (horizontal)
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", zero, plot.y, zero, plot.y + plot.h)
+    );
+  else
+    out.push(
+      axisLine(model, model.axes?.category, "categoryAxis", plot.x, zero, plot.x + plot.w, zero)
+    );
   const step = Math.max(
     1,
     Math.ceil(cats / Math.max(1, Math.floor((horizontal ? plot.h : plot.w) / 14)))
@@ -14016,20 +14512,23 @@ function cartesianAxes(model, area, out) {
   });
   const frame2 = { plot, value, band, bandSize };
   if (second) {
-    const secondSpan = second.max - second.min || 1;
-    frame2.secondary = (v) => plot.y + plot.h - (v - second.min) / secondSpan * plot.h;
-    const secondAxis = chartStroke(model, "valueAxis");
+    frame2.secondary = (v) => plot.y + plot.h - chartAxisRatio(v, second, model.axes?.secondary) * plot.h;
     out.push(
-      line2(
+      axisLine(
+        model,
+        model.axes?.secondary,
+        "valueAxis",
         plot.x + plot.w,
         plot.y,
         plot.x + plot.w,
-        plot.y + plot.h,
-        secondAxis.color,
-        secondAxis.width
+        plot.y + plot.h
       )
     );
-    if (valueLabels)
+    if (model.axes?.secondary?.source.majorGridlines || model.axes?.secondary?.source.minorGridlines)
+      out.push(
+        axisGridlines(model, model.axes.secondary, second.ticks, frame2.secondary, plot, false)
+      );
+    if (chartAxisLabels(model.axes?.secondary))
       second.ticks.forEach(
         (t, i) => out.push(
           text(plot.x + plot.w + 4, frame2.secondary(t) + valueSize * 0.3, secondLabels[i] ?? "", {
@@ -14073,18 +14572,19 @@ function linesAndAreas(model, frame2, out) {
         index: i,
         x: frame2.band(i),
         y: frame2.value(top),
-        radius: area ? 0 : 3
+        radius: area ? 0 : chartMarkerRadius(s, i, 2.5)
       });
       lower.push([frame2.band(i), frame2.value(below2)]);
     });
     layers.push({
+      series: s,
       points,
       lower,
       color: s.color,
       filter: s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""
     });
   });
-  for (const { points, lower, color, filter } of area ? [...layers].reverse() : layers) {
+  for (const { points, lower, color, filter, series } of area ? [...layers].reverse() : layers) {
     if (area) {
       const poly = [...points, ...[...lower].reverse()].map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
       out.push(`<polygon points="${poly}" fill="${color}" fill-opacity="0.85"${filter}/>`);
@@ -14103,9 +14603,9 @@ function linesAndAreas(model, frame2, out) {
       else segment2.push(`${n(x)},${n(y)}`);
     }
     flush();
-    for (const [x, y] of points)
-      if (!Number.isNaN(x))
-        out.push(`<circle cx="${n(x)}" cy="${n(y)}" r="2.5" fill="${color}"${filter}/>`);
+    points.forEach(([x, y], index) => {
+      if (!Number.isNaN(x)) out.push(chartSeriesMarkerSvg(series, index, x, y, 2.5));
+    });
   }
   pointLabels(model, marks, out);
 }
@@ -14115,16 +14615,14 @@ function scatter(model, area, out) {
   const ys = model.valueAxis;
   const xs = model.xAxis;
   if (!ys || !xs) return;
-  const yLabels = ys.ticks.map((t) => formatAxisValue(t));
+  const yLabels = ys.ticks.map((t) => axisTickText(t, model.axes?.value));
   const valueAttrs = chartTextAttributes(model, "valueAxis");
   const categoryAttrs = chartTextAttributes(model, "categoryAxis");
   const valueSize = valueAttrs.size ?? 10;
   const categorySize = categoryAttrs.size ?? 10;
-  const grid = chartStroke(model, "gridlineMajor");
   const xAxis = chartStroke(model, "categoryAxis");
-  const yAxis = chartStroke(model, "valueAxis");
-  const valueLabels = model.appearance?.valueAxis?.labelsVisible !== false;
-  const categoryLabels = model.appearance?.categoryAxis?.labelsVisible !== false;
+  const valueLabels = chartAxisLabels(model.axes?.value) && model.appearance?.valueAxis?.labelsVisible !== false;
+  const categoryLabels = chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false;
   const labelW = valueLabels ? Math.max(...yLabels.map((l) => textWidth(l, valueSize)), 8) + 6 : 4;
   const plot = {
     x: area.x + labelW,
@@ -14144,17 +14642,24 @@ function scatter(model, area, out) {
       s.values.forEach((_, i) => {
         reach = Math.max(reach, radiusOf(s.sizes?.[i] ?? void 0) ?? 0);
       });
-  const widen = (s, length) => {
+  const widen = (s, length, axis) => {
+    if (axis?.range.logScale) return s;
     const pad = reach * (s.max - s.min || 1) / Math.max(1, length - 2 * reach);
-    return { ...s, min: s.min - pad, max: s.max + pad };
+    return {
+      ...s,
+      min: axis?.source.scaling.min === void 0 ? s.min - pad : s.min,
+      max: axis?.source.scaling.max === void 0 ? s.max + pad : s.max
+    };
   };
-  const xView = widen(xs, plot.w);
-  const yView = widen(ys, plot.h);
-  const px = (v) => plot.x + (v - xView.min) / (xView.max - xView.min || 1) * plot.w;
-  const py = (v) => plot.y + plot.h - (v - yView.min) / (yView.max - yView.min || 1) * plot.h;
+  const xView = widen(xs, plot.w, model.axes?.category);
+  const yView = widen(ys, plot.h, model.axes?.value);
+  const px = (v) => plot.x + chartAxisRatio(v, xView, model.axes?.category) * plot.w;
+  const py = (v) => plot.y + plot.h - chartAxisRatio(v, yView, model.axes?.value) * plot.h;
   out.push(chartAreaRect(model, "plotArea", plot));
+  out.push(axisGridlines(model, model.axes?.value, ys.ticks, py, plot, false));
+  if (model.axes?.category)
+    out.push(axisGridlines(model, model.axes.category, xs.ticks, px, plot, true));
   ys.ticks.forEach((t, i) => {
-    out.push(line2(plot.x, py(t), plot.x + plot.w, py(t), grid.color, grid.width));
     if (valueLabels)
       out.push(
         text(plot.x - 4, py(t) + valueSize * 0.3, yLabels[i] ?? "", {
@@ -14164,19 +14669,30 @@ function scatter(model, area, out) {
       );
   });
   for (const t of xs.ticks) {
-    out.push(line2(px(t), plot.y + plot.h, px(t), plot.y + plot.h + 3, xAxis.color, xAxis.width));
+    if (!model.axes?.category?.source.deleted)
+      out.push(line2(px(t), plot.y + plot.h, px(t), plot.y + plot.h + 3, xAxis.color, xAxis.width));
     if (categoryLabels)
       out.push(
-        text(px(t), plot.y + plot.h + categorySize + 3, formatAxisValue(t), {
+        text(px(t), plot.y + plot.h + categorySize + 3, axisTickText(t, model.axes?.category), {
           anchor: "middle",
           ...categoryAttrs
         })
       );
   }
   out.push(
-    line2(plot.x, plot.y + plot.h, plot.x + plot.w, plot.y + plot.h, xAxis.color, xAxis.width)
+    axisLine(
+      model,
+      model.axes?.category,
+      "categoryAxis",
+      plot.x,
+      plot.y + plot.h,
+      plot.x + plot.w,
+      plot.y + plot.h
+    )
+  );
+  out.push(
+    axisLine(model, model.axes?.value, "valueAxis", plot.x, plot.y, plot.x, plot.y + plot.h)
   );
-  out.push(line2(plot.x, plot.y, plot.x, plot.y + plot.h, yAxis.color, yAxis.width));
   const marks = [];
   for (const [si, s] of model.series.entries())
     s.values.forEach((v, i) => {
@@ -14185,8 +14701,8 @@ function scatter(model, area, out) {
       const filter = s.shadowFilter ? ` filter="${s.shadowFilter}"` : "";
       const fill = s.pointColors?.[i] ?? s.color;
       if (!bubble) {
-        out.push(`<circle cx="${n(px(x))}" cy="${n(py(v))}" r="3" fill="${fill}"${filter}/>`);
-        marks.push({ series: s, index: i, x: px(x), y: py(v), radius: 3 });
+        out.push(chartSeriesMarkerSvg(s, i, px(x), py(v)));
+        marks.push({ series: s, index: i, x: px(x), y: py(v), radius: chartMarkerRadius(s, i) });
         return;
       }
       const r = radiusOf(s.sizes?.[i] ?? void 0);
@@ -14406,32 +14922,37 @@ function radarSvg(model, area) {
   const valueSize = valueAttrs.size ?? 9;
   const categorySize = categoryAttrs.size ?? 10;
   const grid = chartStroke(model, "gridlineMajor");
-  const axis = chartStroke(model, "categoryAxis");
   const cx = area.x + area.w / 2;
   const cy = area.y + area.h / 2 + 4;
   const radius = Math.max(1, Math.min(area.w, area.h) / 2 - Math.max(18, categorySize * 1.8));
   const angle = (i) => i / count * Math.PI * 2;
-  const r = (v) => (v - scale.min) / (scale.max - scale.min || 1) * radius;
+  const r = (v) => chartAxisRatio(v, scale, model.axes?.value) * radius;
   const labelEvery = Math.max(
     1,
     Math.ceil(12 / Math.max(1, radius / Math.max(1, scale.ticks.length - 1)))
   );
   for (const [k, t] of scale.ticks.entries()) {
     const ring = Array.from({ length: count }, (_, i) => polar(cx, cy, r(t), angle(i))).map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
-    out.push(
-      `<polygon points="${ring}" fill="none" stroke="${grid.color}" stroke-width="${n(grid.width)}"/>`
-    );
-    if (model.appearance?.valueAxis?.labelsVisible !== false && k % labelEvery === 0)
+    if (!model.axes?.value || model.axes.value.source.majorGridlines)
       out.push(
-        text(cx + 3, cy - r(t) + valueSize * 0.3, formatAxisValue(t, scale.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(
+        text(
+          cx + 3,
+          cy - r(t) + valueSize * 0.3,
+          axisTickText(t, model.axes?.value, scale.percent),
+          valueAttrs
+        )
       );
   }
   model.categories.forEach((c, i) => {
     const [x, y] = polar(cx, cy, radius, angle(i));
-    out.push(line2(cx, cy, x, y, axis.color, axis.width));
+    out.push(axisLine(model, model.axes?.category, "categoryAxis", cx, cy, x, y));
     const [lx, ly] = polar(cx, cy, radius + 10, angle(i));
     const anchor = Math.abs(lx - cx) < 2 ? "middle" : lx > cx ? "start" : "end";
-    if (model.appearance?.categoryAxis?.labelsVisible !== false)
+    if (chartAxisLabels(model.axes?.category) && model.appearance?.categoryAxis?.labelsVisible !== false)
       out.push(
         text(lx, ly + categorySize * 0.3, fit(c, area.w / 4, categorySize), {
           anchor,
@@ -14442,7 +14963,13 @@ function radarSvg(model, area) {
   const marks = [];
   for (const s of model.series) {
     const vertices = s.values.slice(0, count).map((v, i) => polar(cx, cy, r(v ?? scale.min), angle(i)));
-    vertices.forEach(([x, y], i) => marks.push({ series: s, index: i, x, y, radius: 3 }));
+    vertices.forEach(([x, y], i) => {
+      if (s.values[i] === null) return;
+      const markerSeries = s;
+      if (markerSeries.marker || markerSeries.pointMarkers)
+        out.push(chartSeriesMarkerSvg(s, i, x, y));
+      marks.push({ series: s, index: i, x, y, radius: chartMarkerRadius(s, i) });
+    });
     const points = vertices.map(([x, y]) => `${n(x)},${n(y)}`).join(" ");
     out.push(
       `<polygon points="${points}" fill="none" stroke="${s.color}" stroke-width="2"${s.shadowFilter ? ` filter="${s.shadowFilter}"` : ""}/>`
@@ -14539,33 +15066,33 @@ var CHART_FONT_FAMILY = "Calibri, Carlito, Arial, sans-serif";
 function cssFont(attrs) {
   return `${attrs.italic ? "italic" : "normal"} ${attrs.weight ?? "normal"} ${attrs.size ?? 10}px ${attrs.family ?? CHART_FONT_FAMILY}`;
 }
-function chartFontMetrics(attrs, options) {
-  const metrics = options.measureFont?.(cssFont(attrs));
+function chartFontMetrics(attrs, options2) {
+  const metrics = options2.measureFont?.(cssFont(attrs));
   return metrics && Number.isFinite(metrics.ascent) && Number.isFinite(metrics.descent) && metrics.ascent >= 0 && metrics.descent >= 0 && metrics.ascent + metrics.descent > 0 ? metrics : void 0;
 }
-function chartTextWidth(content, attrs, options) {
-  const width = options.measureText?.(content, cssFont(attrs));
+function chartTextWidth(content, attrs, options2) {
+  const width = options2.measureText?.(content, cssFont(attrs));
   return width !== void 0 && Number.isFinite(width) && width >= 0 ? width : textWidth(content, attrs.size);
 }
-function fitChartText(content, maxWidth, attrs, options) {
-  if (!options.measureText) return fit(content, maxWidth, attrs.size);
-  if (chartTextWidth(content, attrs, options) <= maxWidth) return content;
+function fitChartText(content, maxWidth, attrs, options2) {
+  if (!options2.measureText) return fit(content, maxWidth, attrs.size);
+  if (chartTextWidth(content, attrs, options2) <= maxWidth) return content;
   const points = [...content];
   let low = 0;
   let high = points.length;
   while (low < high) {
     const mid = Math.ceil((low + high) / 2);
-    if (chartTextWidth(`${points.slice(0, mid).join("")}\u2026`, attrs, options) <= maxWidth) low = mid;
+    if (chartTextWidth(`${points.slice(0, mid).join("")}\u2026`, attrs, 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, frame2, options) {
+function chartLegendSvg(model, area, frame2, options2) {
   const automatic = [];
   const bounds = {};
-  const reserved = automaticLegend(model, area, automatic, options, bounds);
+  const reserved = automaticLegend(model, area, automatic, options2, bounds);
   const plot = model.legendOverlay ? area : reserved;
   const box = bounds.box;
   if (!box) return { plot, markup: "", foreground: false };
@@ -14579,11 +15106,11 @@ function chartLegendSvg(model, area, frame2, options) {
   const entries = legendEntries(model);
   const attrs = chartTextAttributes(model, "legend");
   const size = attrs.size ?? 10;
-  const font = chartFontMetrics(attrs, options);
+  const font = chartFontMetrics(attrs, options2);
   const keySize = size / 2;
   const keyGap = size / 4;
   const widths = entries.map(
-    (entry) => chartTextWidth(entry.label, attrs, options) + keySize + keyGap
+    (entry) => chartTextWidth(entry.label, attrs, options2) + keySize + keyGap
   );
   const horizontal = manual.width > manual.height && widths.reduce((sum, width) => sum + width, 0) + size <= manual.width;
   const rowWidth = horizontal ? manual.width / entries.length : manual.width;
@@ -14598,8 +15125,8 @@ function chartLegendSvg(model, area, frame2, options) {
   ];
   const baselineOffset = font ? (font.ascent - font.descent) / 2 : size * 0.35;
   entries.forEach((entry, i) => {
-    const available = horizontal ? chartTextWidth(entry.label, attrs, options) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
-    const label = fitChartText(entry.label, available, attrs, options);
+    const available = horizontal ? chartTextWidth(entry.label, attrs, options2) : Math.max(0, rowWidth - size / 2 - keySize - keyGap);
+    const label = fitChartText(entry.label, available, attrs, options2);
     const contentWidth = Math.min(
       horizontal ? widths[i] ?? 0 : Math.max(...widths),
       rowWidth - size / 2
@@ -14642,7 +15169,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;
@@ -14651,7 +15178,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, attrs, options) + 20, area.w / 2)
+      (e) => Math.min(chartTextWidth(e.label, attrs, options2) + 20, area.w / 2)
     );
     const total = widths.reduce((a, b) => a + b, 0);
     let x2 = area.x + Math.max(0, (area.w - total) / 2);
@@ -14668,14 +15195,14 @@ function automaticLegend(model, area, out, options, bounds) {
     entries.forEach((e, i) => {
       const w = widths[i] ?? 0;
       out.push(rect2(x2, y, 8, 8, e.color));
-      out.push(text(x2 + 12, y + 8, fitChartText(e.label, w - 16, attrs, options), attrs));
+      out.push(text(x2 + 12, y + 8, fitChartText(e.label, w - 16, attrs, options2), attrs));
       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, attrs, options))) + 22
+    Math.max(...entries.map((e) => chartTextWidth(e.label, attrs, options2))) + 22
   );
   const height = entries.length * rowH;
   const x = pos === "l" ? area.x + 4 : area.x + area.w - width;
@@ -14693,14 +15220,14 @@ function automaticLegend(model, area, out, options, bounds) {
     const y = y0 + i * rowH;
     if (y + rowH > area.y + area.h + 2) return;
     out.push(rect2(x, y + 3, 8, 8, e.color));
-    out.push(text(x + 12, y + 11, fitChartText(e.label, width - 16, attrs, options), attrs));
+    out.push(text(x + 12, y + 11, fitChartText(e.label, width - 16, attrs, options2), attrs));
   });
   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 [source, run] of runs.entries()) {
     for (const token of run.text.split(/(\r\n|[\r\n]|[ \t]+)/u).filter(Boolean)) {
@@ -14748,7 +15275,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 };
@@ -14766,11 +15293,11 @@ function wrapStyledRuns(runs, maxWidth, measure2, options = {}) {
 function spacing(value, naturalHeight, fallback) {
   return value ? value.unit === "points" ? chartPointsToPixels(value.value) : naturalHeight * value.value : fallback;
 }
-function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
+function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
   if (!model.title) return void 0;
   const base = chartTextAttributes(model, "title", 14);
   const capacity = Math.max(1, width * 0.8 - 8);
-  if (!model.titleText && !hasManualLayoutFields(model.titleLayout) && !model.titleOverlay && !model.title.includes("\n") && chartTextWidth(model.title, base, options) <= capacity)
+  if (!model.titleText && !hasManualLayoutFields(model.titleLayout) && !model.titleOverlay && !model.title.includes("\n") && chartTextWidth(model.title, base, options2) <= capacity)
     return void 0;
   const paragraphs = model.titleText?.paragraphs ?? [
     {
@@ -14806,7 +15333,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           "title",
           base.size
         ),
-        options
+        options2
       ),
       { breakWords: true }
     );
@@ -14830,10 +15357,10 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
     return {
       ...line3,
       runs,
-      width: runs.reduce((sum, run) => sum + chartTextWidth(run.text, run.attrs, options), 0),
+      width: runs.reduce((sum, run) => sum + chartTextWidth(run.text, run.attrs, options2), 0),
       size: runs.length ? Math.max(...runs.map((run) => run.attrs.size ?? 14)) : base.size ?? 14,
       fontMetrics: (runs.length ? runs.map((run) => run.attrs) : [base]).map(
-        (attrs) => chartFontMetrics(attrs, options)
+        (attrs) => chartFontMetrics(attrs, options2)
       )
     };
   });
@@ -14871,7 +15398,7 @@ function chartRichTitleSvg(model, width, options = {}, frameHeight = 400) {
           anchor: "start"
         }).replace("<text ", '<tspan data-chart-title-run="true" ').replace("</text>", "</tspan>")
       );
-      x += chartTextWidth(run.text, run.attrs, options);
+      x += chartTextWidth(run.text, run.attrs, options2);
     }
   }
   const parent = text(0, 0, "", { ...base, underline: false }).replace(
@@ -14897,7 +15424,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);
@@ -14911,7 +15438,7 @@ function renderChartSvg(model, width, height, options = {}) {
   if (paint2.defs) out.push(paint2.defs);
   out.push(chartAreaRect(model, "chartArea", { x: 0, y: 0, w, h }));
   let area = { x: 8, y: 8, w: w - 16, h: h - 16 };
-  const richTitle = chartRichTitleSvg(model, w, options, h);
+  const richTitle = chartRichTitleSvg(model, w, options2, h);
   if (richTitle) {
     if (model.titleLayout || model.titleOverlay) foregroundTitle = richTitle.markup;
     else out.push(richTitle.markup);
@@ -14920,9 +15447,9 @@ function renderChartSvg(model, width, height, options = {}) {
   } else if (model.title) {
     const attrs = chartTextAttributes(model, "title", 14);
     const size = attrs.size ?? 14;
-    const label = fitChartText(model.title, w - 16, attrs, options);
-    const titleWidth = Math.min(w - 16, chartTextWidth(label, attrs, options) + 8);
-    const font = chartFontMetrics(attrs, options);
+    const label = fitChartText(model.title, w - 16, attrs, options2);
+    const titleWidth = Math.min(w - 16, chartTextWidth(label, attrs, options2) + 8);
+    const font = chartFontMetrics(attrs, options2);
     const titleHeight = Math.max(24, font ? font.ascent + font.descent + 4 : size * 1.4 + 4);
     out.push(
       chartAreaRect(model, "title", {
@@ -14950,7 +15477,7 @@ function renderChartSvg(model, width, height, options = {}) {
     out.push("</svg>");
     return out.join("");
   }
-  const legend = chartLegendSvg(model, area, { width: w, height: h }, options);
+  const legend = chartLegendSvg(model, area, { width: w, height: h }, options2);
   area = legend.plot;
   if (!legend.foreground) out.push(legend.markup);
   if (area.w > 4 && area.h > 4) {
@@ -14997,8 +15524,8 @@ function chartSpaceKind(space) {
   const type = chartSummaryFromSpace(space).chartType;
   return { type, drawn: DRAWN_CHART_TYPES.has(type) };
 }
-function renderChartSpaceSvg(space, options) {
-  const { width, height, theme, fonts, formatting, colorPalette, styleDefinition, ...svg } = options;
+function renderChartSpaceSvg(space, options2) {
+  const { width, height, theme, fonts, formatting, colorPalette, styleDefinition, ...svg } = options2;
   const summary = chartSummaryFromSpace(space, {
     ...formatting ? { formatting } : {},
     ...colorPalette !== void 0 ? { colorPalette } : {},
@@ -15007,8 +15534,8 @@ function renderChartSpaceSvg(space, options) {
   const view = chartSummaryView(summary, chartThemePalette(theme, fonts));
   return renderChartSvg(view, width, height, svg);
 }
-function renderChartSummarySvg(summary, options) {
-  const { width, height, theme, fonts, ...svg } = options;
+function renderChartSummarySvg(summary, options2) {
+  const { width, height, theme, fonts, ...svg } = options2;
   const view = chartSummaryView(summary, chartThemePalette(theme, fonts));
   return renderChartSvg(view, width, height, svg);
 }
@@ -15745,7 +16272,7 @@ function datePicture(instr) {
 }
 var TOKENS = /yyyy|yy|MMMM|MMM|MM|M|dddd|ddd|dd|d|HH|H|hh|h|mm|ss|am\/pm|AM\/PM|'[^']*'/g;
 function formatWordDate(date, picture, locale = "en-US") {
-  const name = (options) => new Intl.DateTimeFormat(locale, options).format(date);
+  const name = (options2) => new Intl.DateTimeFormat(locale, options2).format(date);
   const pad = (value) => String(value).padStart(2, "0");
   const hours12 = date.getHours() % 12 || 12;
   return picture.replace(TOKENS, (token) => {
@@ -15944,9 +16471,9 @@ function fontMetrics(measurer, font) {
   const ascent = Math.min(height, measurer.ascentOf?.(font) ?? height * 0.8);
   return { ascent, descent: height - ascent };
 }
-function createFakeMeasurer(options = {}) {
-  const charWidthFactor = options.charWidthFactor ?? 0.6;
-  const lineHeightFactor = options.lineHeightFactor ?? 1.15;
+function createFakeMeasurer(options2 = {}) {
+  const charWidthFactor = options2.charWidthFactor ?? 0.6;
+  const lineHeightFactor = options2.lineHeightFactor ?? 1.15;
   return {
     widthOf(text2, font) {
       let width = 0;
@@ -20368,8 +20895,8 @@ function sectionBreak(type, note) {
   return type;
 }
 function adaptDocumentModel(model, note = () => {
-}, options = {}) {
-  const reviewMode = options.reviewDisplayMode ?? "all";
+}, options2 = {}) {
+  const reviewMode = options2.reviewDisplayMode ?? "all";
   const visibleModel = visibleReviewModel(model, reviewMode);
   const catalog = model.paragraphStyles;
   const noted = /* @__PURE__ */ new Set();
@@ -20762,13 +21289,13 @@ function layoutDocument(input, measurer) {
   }
   return { ...result, approximations: [.../* @__PURE__ */ new Set([...result.approximations, FLOAT_WRAP_NOTE])] };
 }
-function layoutDocumentModel(model, measurer, options = {}, layout = layoutDocument) {
-  const projected = reviewDocumentFormatting(model, options.reviewDisplayMode ?? "all");
+function layoutDocumentModel(model, measurer, options2 = {}, layout = layoutDocument) {
+  const projected = reviewDocumentFormatting(model, options2.reviewDisplayMode ?? "all");
   const approximations = reviewFormattingWarnings(projected.diagnostics);
   const input = adaptDocumentModel(
     projected.model,
     (message) => approximations.push(message),
-    options
+    options2
   );
   const result = layout(input, measurer);
   return {
@@ -20951,7 +21478,7 @@ function layoutDocumentIncremental(input, measurer, memory) {
 }
 
 // docx/layout/layout-session.ts
-function createLayoutSession(measurer, options = {}) {
+function createLayoutSession(measurer, options2 = {}) {
   const sessionMeasurer = {
     widthOf: (text2, font) => measurer.widthOf(text2, font),
     lineHeightOf: (font) => measurer.lineHeightOf(font),
@@ -20959,7 +21486,7 @@ function createLayoutSession(measurer, options = {}) {
   };
   registerParagraphCache(sessionMeasurer);
   const memory = {};
-  const paginate = options.incremental ? (input, sessionMeasure) => layoutDocumentIncremental(input, sessionMeasure, memory) : layoutDocument;
+  const paginate = options2.incremental ? (input, sessionMeasure) => layoutDocumentIncremental(input, sessionMeasure, memory) : layoutDocument;
   return {
     layoutDocument: (input) => paginate(input, sessionMeasurer),
     layoutDocumentModel: (model, review = {}) => layoutDocumentModel(model, sessionMeasurer, review, paginate),