ooxml-ui 1.1.0 → 1.3.0

package/dist/pptx/{chunk-AIL3BNZS.cjs → chunk-IURZJAWP.cjs}

@@ -1532,6 +1532,88 @@ function formatChartNumber(value, formatCode) {
   return formatChartNumberWithColor(value, formatCode)?.text;
 }
 
+// src/pptx/render/chart-style-palette.ts
+function hexToRgb(hex) {
+  const h = hex.replace("#", "");
+  return [
+    parseInt(h.substring(0, 2), 16),
+    parseInt(h.substring(2, 4), 16),
+    parseInt(h.substring(4, 6), 16)
+  ];
+}
+function rgbToHex(r, g, b) {
+  const clamp3 = (v) => Math.max(0, Math.min(255, Math.round(v)));
+  return `#${clamp3(r).toString(16).padStart(2, "0")}${clamp3(g).toString(16).padStart(2, "0")}${clamp3(b).toString(16).padStart(2, "0")}`;
+}
+function tint(hex, amount) {
+  const [r, g, b] = hexToRgb(hex);
+  return rgbToHex(r + (255 - r) * amount, g + (255 - g) * amount, b + (255 - b) * amount);
+}
+function shade(hex, amount) {
+  const [r, g, b] = hexToRgb(hex);
+  return rgbToHex(r * (1 - amount), g * (1 - amount), b * (1 - amount));
+}
+var OFFICE_ACCENTS = [
+  "#4472C4",
+  "#ED7D31",
+  "#A5A5A5",
+  "#FFC000",
+  "#5B9BD5",
+  "#70AD47"
+];
+var DEFAULT_EXTRAS = ["#FF0000", "#00B0F0"];
+var DEFAULT_CHART_PALETTE = [...OFFICE_ACCENTS, ...DEFAULT_EXTRAS];
+function monochromaticRamp(base) {
+  return [
+    shade(base, 0.5),
+    shade(base, 0.35),
+    shade(base, 0.15),
+    base,
+    tint(base, 0.2),
+    tint(base, 0.4),
+    tint(base, 0.6),
+    tint(base, 0.8)
+  ];
+}
+var GREY = "#7F7F7F";
+function buildPalette(column, accents) {
+  if (column === 0) {
+    return monochromaticRamp(GREY);
+  }
+  if (column === 1) {
+    return [...accents, ...accents.map((accent) => shade(accent, 0.4))];
+  }
+  return monochromaticRamp(accents[column - 2]);
+}
+function usableAccents(accents) {
+  return accents?.length === 6 && accents.every((accent) => /^#[0-9a-f]{6}$/iu.test(accent)) ? accents : OFFICE_ACCENTS;
+}
+var paletteCache = /* @__PURE__ */ new Map();
+function getChartStylePalette(styleId, themeAccents) {
+  const accents = usableAccents(themeAccents);
+  const valid = styleId !== void 0 && styleId >= 1 && styleId <= 48;
+  if (!valid && accents === OFFICE_ACCENTS) {
+    return DEFAULT_CHART_PALETTE;
+  }
+  const column = valid ? (Math.trunc(styleId) - 1) % 8 : -1;
+  const key = `${column}:${accents.join(",")}`;
+  let palette = paletteCache.get(key);
+  if (!palette) {
+    palette = column < 0 ? [...accents, ...DEFAULT_EXTRAS] : buildPalette(column, accents);
+    paletteCache.set(key, palette);
+  }
+  return palette;
+}
+function resolveChartPalette(chartData) {
+  if (chartData.colorPalette && chartData.colorPalette.length > 0) {
+    return [...chartData.colorPalette];
+  }
+  return [...getChartStylePalette(chartData.style?.styleId, chartData.themeAccentColors)];
+}
+function withResolvedPalette(chartData) {
+  return chartData.colorPalette && chartData.colorPalette.length > 0 ? chartData : { ...chartData, colorPalette: resolveChartPalette(chartData) };
+}
+
 // src/pptx/render/chart-style-defaults.ts
 var DEFAULT_LABEL_COLOR = "#334155";
 var DEFAULT_TITLE_TEXT_PX = 12;
@@ -1716,114 +1798,6 @@ function withChartTitleBand(vm, chartData) {
 }
 
 // src/pptx/render/chart-helpers.ts
-var ACCENT1 = "#4472C4";
-var ACCENT2 = "#ED7D31";
-var ACCENT3 = "#A5A5A5";
-var ACCENT4 = "#FFC000";
-var ACCENT5 = "#5B9BD5";
-var ACCENT6 = "#70AD47";
-var ACCENTS = [ACCENT1, ACCENT2, ACCENT3, ACCENT4, ACCENT5, ACCENT6];
-var DEFAULT_CHART_PALETTE = [
-  "#4472C4",
-  "#ED7D31",
-  "#A5A5A5",
-  "#FFC000",
-  "#5B9BD5",
-  "#70AD47",
-  "#FF0000",
-  "#00B0F0"
-];
-function hexToRgb(hex) {
-  const h = hex.replace("#", "");
-  return [
-    parseInt(h.substring(0, 2), 16),
-    parseInt(h.substring(2, 4), 16),
-    parseInt(h.substring(4, 6), 16)
-  ];
-}
-function rgbToHex(r, g, b) {
-  const clamp3 = (v) => Math.max(0, Math.min(255, Math.round(v)));
-  return `#${clamp3(r).toString(16).padStart(2, "0")}${clamp3(g).toString(16).padStart(2, "0")}${clamp3(b).toString(16).padStart(2, "0")}`;
-}
-function tint(hex, amount) {
-  const [r, g, b] = hexToRgb(hex);
-  return rgbToHex(r + (255 - r) * amount, g + (255 - g) * amount, b + (255 - b) * amount);
-}
-function shade(hex, amount) {
-  const [r, g, b] = hexToRgb(hex);
-  return rgbToHex(r * (1 - amount), g * (1 - amount), b * (1 - amount));
-}
-function colorfulSequential(offset) {
-  const out = [];
-  for (let i = 0; i < 8; i++) {
-    out.push(ACCENTS[(i + offset) % ACCENTS.length]);
-  }
-  return out;
-}
-function monochromaticRamp(base) {
-  return [
-    shade(base, 0.5),
-    shade(base, 0.35),
-    shade(base, 0.15),
-    base,
-    tint(base, 0.2),
-    tint(base, 0.4),
-    tint(base, 0.6),
-    tint(base, 0.8)
-  ];
-}
-function colorfulVariant(offset, tintAmount) {
-  return ACCENTS.map((_, i) => {
-    const idx = (i + offset) % ACCENTS.length;
-    return tintAmount > 0 ? tint(ACCENTS[idx], tintAmount) : shade(ACCENTS[idx], -tintAmount);
-  }).concat([
-    tint(ACCENTS[offset % ACCENTS.length], 0.4),
-    shade(ACCENTS[(offset + 1) % ACCENTS.length], 0.2)
-  ]);
-}
-function darkPalette(offset, shadeAmount) {
-  return colorfulSequential(offset).map((c) => shade(c, shadeAmount));
-}
-function tonedPalette(offset, tintAmount) {
-  return colorfulSequential(offset).map((c) => tint(c, tintAmount));
-}
-function buildPalette(styleId) {
-  const id = Math.max(1, Math.min(48, styleId));
-  if (id <= 8) {
-    return colorfulSequential(id - 1);
-  }
-  if (id <= 16) {
-    const accentIdx = (id - 9) % ACCENTS.length;
-    return monochromaticRamp(ACCENTS[accentIdx]);
-  }
-  if (id <= 24) {
-    const sub2 = id - 17;
-    const tintAmt = sub2 < 4 ? sub2 * 0.1 : -(sub2 - 4) * 0.1;
-    return colorfulVariant(sub2, tintAmt);
-  }
-  if (id <= 32) {
-    const sub2 = id - 25;
-    return darkPalette(sub2, 0.25 + sub2 % 4 * 0.1);
-  }
-  if (id <= 40) {
-    const sub2 = id - 33;
-    return tonedPalette(sub2, 0.15 + sub2 % 4 * 0.08);
-  }
-  const sub = id - 41;
-  return tonedPalette(sub, 0.4 + sub % 4 * 0.1);
-}
-var paletteCache = /* @__PURE__ */ new Map();
-function getChartStylePalette(styleId) {
-  if (styleId === void 0 || styleId < 1 || styleId > 48) {
-    return DEFAULT_CHART_PALETTE;
-  }
-  let palette = paletteCache.get(styleId);
-  if (!palette) {
-    palette = buildPalette(styleId);
-    paletteCache.set(styleId, palette);
-  }
-  return palette;
-}
 function seriesColor(series, index, styleId, colorPalette) {
   const explicit = series.color ?? series.marker?.spPr?.fillColor;
   if (explicit) {
@@ -2090,7 +2064,7 @@ function buildLegend(series, colorPalette, svgWidth, legendPos, svgHeight, plotT
 
 // src/pptx/render/chart-view-model-bars.ts
 function computeBarRects(series, catCount, layout, range, colorPalette) {
-  const rects = [], seriesCount = Math.max(series.length, 1), barGroupWidth = layout.plotWidth / Math.max(catCount, 1), singleBarWidth = barGroupWidth * 0.7 / seriesCount, groupOffset = (barGroupWidth - singleBarWidth * seriesCount) / 2;
+  const rects = [], seriesCount = Math.max(series.length, 1), barGroupWidth = layout.plotWidth / Math.max(catCount, 1), { singleBarWidth, clusterWidth } = chart.clusteredBarGeometry(barGroupWidth, seriesCount, {}), groupOffset = (barGroupWidth - clusterWidth) / 2;
   for (let ci = 0; ci < catCount; ci++) {
     for (let si = 0; si < series.length; si++) {
       const val = series[si].values[ci] ?? 0, x = layout.plotLeft + barGroupWidth * ci + groupOffset + singleBarWidth * si, zeroY = valueToY2(0, range, layout.plotTop, layout.plotBottom), valY = valueToY2(val, range, layout.plotTop, layout.plotBottom), y = Math.min(zeroY, valY), h = Math.max(Math.abs(zeroY - valY), 1);
@@ -2105,46 +2079,56 @@ function computeBarRects(series, catCount, layout, range, colorPalette) {
   }
   return rects;
 }
-function computeStackedBarRects(series, catCount, layout, range, colorPalette) {
-  const rects = [], barW = layout.plotWidth / Math.max(catCount, 1) * 0.7, barOffset = (layout.plotWidth / Math.max(catCount, 1) - barW) / 2, zeroY = valueToY2(0, range, layout.plotTop, layout.plotBottom);
+function stackedBarWidth(slotWidth, gapWidth) {
+  return chart.clusteredBarGeometry(slotWidth, 1, gapWidth === void 0 ? {} : { barGapWidth: gapWidth }).singleBarWidth;
+}
+function clipStackedSegment(base, value, range) {
+  const low = Math.max(Math.min(base, base + value), range.min), high = Math.min(Math.max(base, base + value), range.max);
+  return high > low ? { low, high } : void 0;
+}
+function stackedSegmentExtent(baseCoord, tipCoord, minSize) {
+  const size = Math.max(Math.abs(tipCoord - baseCoord), minSize);
+  return { start: tipCoord < baseCoord ? baseCoord - size : baseCoord, size };
+}
+function computeStackedBarRects(series, catCount, layout, range, colorPalette, gapWidth) {
+  const rects = [], slot = layout.plotWidth / Math.max(catCount, 1), barW = stackedBarWidth(slot, gapWidth), barOffset = (slot - barW) / 2;
   for (let ci = 0; ci < catCount; ci++) {
-    let posTop = zeroY, negBottom = zeroY;
+    let posTotal = 0, negTotal = 0;
     for (let si = 0; si < series.length; si++) {
       const val = series[si].values[ci] ?? 0;
       if (val === 0) {
         continue;
       }
-      const x = layout.plotLeft + layout.plotWidth / Math.max(catCount, 1) * ci + barOffset, h = Math.max(
-        Math.abs(
-          valueToY2(val, range, layout.plotTop, layout.plotBottom) - valueToY2(0, range, layout.plotTop, layout.plotBottom)
-        ),
-        1
-      );
+      const base = val > 0 ? posTotal : negTotal;
       if (val > 0) {
-        const y = posTop - h;
-        rects.push({
-          x,
-          y,
-          w: barW,
-          h,
-          fill: seriesColor2(series[si], si, colorPalette),
-          seriesIndex: si,
-          pointIndex: ci
-        });
-        posTop = y;
+        posTotal += val;
       } else {
-        const y = negBottom;
-        rects.push({
-          x,
-          y,
-          w: barW,
-          h,
-          fill: seriesColor2(series[si], si, colorPalette),
-          seriesIndex: si,
-          pointIndex: ci
-        });
-        negBottom = y + h;
+        negTotal += val;
       }
+      const segment = clipStackedSegment(base, val, range);
+      if (!segment) {
+        continue;
+      }
+      const baseY = valueToY2(
+        val > 0 ? segment.low : segment.high,
+        range,
+        layout.plotTop,
+        layout.plotBottom
+      ), tipY = valueToY2(
+        val > 0 ? segment.high : segment.low,
+        range,
+        layout.plotTop,
+        layout.plotBottom
+      ), { start, size } = stackedSegmentExtent(baseY, tipY, 1);
+      rects.push({
+        x: layout.plotLeft + slot * ci + barOffset,
+        y: start,
+        w: barW,
+        h: size,
+        fill: seriesColor2(series[si], si, colorPalette),
+        seriesIndex: si,
+        pointIndex: ci
+      });
     }
   }
   return rects;
@@ -2383,28 +2367,6 @@ function resolveDataPointPictureFill(series, pointIndex, seriesIndex, face) {
   };
 }
 
-// src/pptx/render/chart-palette.ts
-function hexToRgb2(hex) {
-  const h = hex.replace("#", "");
-  return [
-    parseInt(h.substring(0, 2), 16),
-    parseInt(h.substring(2, 4), 16),
-    parseInt(h.substring(4, 6), 16)
-  ];
-}
-function rgbToHex2(r, g, b) {
-  const clamp3 = (v) => Math.max(0, Math.min(255, Math.round(v)));
-  return `#${clamp3(r).toString(16).padStart(2, "0")}${clamp3(g).toString(16).padStart(2, "0")}${clamp3(b).toString(16).padStart(2, "0")}`;
-}
-function tint2(hex, amount) {
-  const [r, g, b] = hexToRgb2(hex);
-  return rgbToHex2(r + (255 - r) * amount, g + (255 - g) * amount, b + (255 - b) * amount);
-}
-function shade2(hex, amount) {
-  const [r, g, b] = hexToRgb2(hex);
-  return rgbToHex2(r * (1 - amount), g * (1 - amount), b * (1 - amount));
-}
-
 // src/pptx/render/chart-picture-pattern-def.ts
 function polygonBoundingBox(points) {
   const coords = points.trim().split(/\s+/u).map((pair) => pair.split(",").map(Number));
@@ -2433,7 +2395,7 @@ function buildPictureFillPatternDef(id, href, format, box, tileHeightPx) {
 
 // src/pptx/render/chart-bar3d-face-picture.ts
 function resolveUntargetedBarFaceFill(face, baseColor) {
-  return face === "end" ? tint2(baseColor, 0.22) : shade2(baseColor, 0.25);
+  return face === "end" ? tint(baseColor, 0.22) : shade(baseColor, 0.25);
 }
 function resolveExtrusionFaceFill(facePoints, face, resolvedColor, rect, picture, defs) {
   const fallback = resolveUntargetedBarFaceFill(face, resolvedColor);
@@ -2633,8 +2595,8 @@ function pieExtrusion(paths, depth) {
   return paths.map((p) => ({
     kind: "path",
     d: translateSlicePath(p.d, 0, offsetY),
-    fill: shade2(p.fill, 0.32),
-    stroke: shade2(p.fill, 0.4),
+    fill: shade(p.fill, 0.32),
+    stroke: shade(p.fill, 0.4),
     strokeWidth: 0.5
   }));
 }
@@ -2646,7 +2608,7 @@ function ribbonExtrusion(prims, depth) {
       out.push({
         ...pl,
         points: shiftPoints(pl.points, depth.dx, depth.dy),
-        stroke: shade2(pl.stroke, 0.3),
+        stroke: shade(pl.stroke, 0.3),
         fill: "none",
         part: void 0
       });
@@ -2655,7 +2617,7 @@ function ribbonExtrusion(prims, depth) {
       out.push({
         ...pg,
         points: shiftPoints(pg.points, depth.dx, depth.dy),
-        fill: shade2(pg.fill === "none" ? "#888888" : pg.fill, 0.3),
+        fill: shade(pg.fill === "none" ? "#888888" : pg.fill, 0.3),
         part: void 0
       });
     }
@@ -2793,6 +2755,39 @@ function computeValueRangeForAxis(series, axis, plotHeightPx) {
   const requestedLogBase = axis?.logBase ?? 10;
   const logBase = axis?.logScale && Number.isFinite(requestedLogBase) && requestedLogBase > 1 ? requestedLogBase : axis?.logScale ? 10 : void 0;
   const automatic = logBase ? computeLogValueRange(series, logBase) : computeValueRange(series, plotHeightPx);
+  return withAxisBounds(automatic, axis, logBase);
+}
+function computeStackedValueRangeForAxis(series, catCount, axis, isPercent, plotSizePx) {
+  if (isPercent) {
+    return {
+      ...percentStackedRange(series, catCount, plotSizePx),
+      ...axis?.orientation === "maxMin" ? { reverseOrder: true } : {}
+    };
+  }
+  return withAxisBounds(computeStackedValueRange(series, catCount, plotSizePx), axis);
+}
+function percentStackedRange(series, catCount, plotSizePx) {
+  const shares = series.map((entry) => ({
+    ...entry,
+    values: Array.from({ length: catCount }, (_, ci) => {
+      const total = series.reduce((sum, s) => sum + Math.abs(s.values[ci] ?? 0), 0);
+      return total > 0 ? (entry.values[ci] ?? 0) / total * 100 : 0;
+    })
+  }));
+  const automatic = computeStackedValueRange(shares, catCount, plotSizePx);
+  if (automatic.min >= 0) {
+    return { min: 0, max: 100, span: 100 };
+  }
+  const min = Math.max(automatic.min, -100);
+  const unit = automatic.majorUnit;
+  return {
+    min,
+    max: 100,
+    span: 100 - min,
+    ...unit !== void 0 && 100 % unit === 0 && min % unit === 0 ? { majorUnit: unit } : {}
+  };
+}
+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;
@@ -3177,8 +3172,8 @@ function resolveMarkerLabelAnchor(position, point, offset = 7) {
       return { x: point.x, y: point.y - offset, textAnchor: "middle" };
   }
 }
-function resolveBarLabelPlacement(chartData, series, pointIndex, rect, value, orientation, frame) {
-  const point = findPointLabel(series, pointIndex), position = point?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position, anchor = resolveBarLabelAnchor(position, rect, value, orientation), shifted = applyLabelManualLayout(point?.layout, frame, anchor);
+function resolveBarLabelPlacement(chartData, series, pointIndex, rect, value, orientation, frame, defaultPosition) {
+  const point = findPointLabel(series, pointIndex), position = point?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position ?? defaultPosition, anchor = resolveBarLabelAnchor(position, rect, value, orientation), shifted = applyLabelManualLayout(point?.layout, frame, anchor);
   return { ...anchor, x: shifted.x, y: shifted.y };
 }
 function resolveMarkerLabelPlacement(chartData, series, pointIndex, point, frame, offset = 7, defaultPosition) {
@@ -3504,18 +3499,46 @@ function smoothLinePath(points) {
   }
   let d = `M${points[0].x.toFixed(2)},${points[0].y.toFixed(2)}`;
   for (let i = 0; i < points.length - 1; i++) {
-    const p0 = points[i - 1] ?? points[i];
-    const p1 = points[i];
-    const p2 = points[i + 1];
-    const p3 = points[i + 2] ?? p2;
-    const cp1x = p1.x + (p2.x - p0.x) / 6;
-    const cp1y = p1.y + (p2.y - p0.y) / 6;
-    const cp2x = p2.x - (p3.x - p1.x) / 6;
-    const cp2y = p2.y - (p3.y - p1.y) / 6;
-    d += ` C${cp1x.toFixed(2)},${cp1y.toFixed(2)} ${cp2x.toFixed(2)},${cp2y.toFixed(2)} ${p2.x.toFixed(2)},${p2.y.toFixed(2)}`;
+    const [cp1, cp2, end] = smoothSegment(points, i);
+    d += ` C${cp1.x.toFixed(2)},${cp1.y.toFixed(2)} ${cp2.x.toFixed(2)},${cp2.y.toFixed(2)} ${end.x.toFixed(2)},${end.y.toFixed(2)}`;
   }
   return d;
 }
+function smoothSegment(points, i) {
+  const p0 = points[i - 1] ?? points[i];
+  const p1 = points[i];
+  const p2 = points[i + 1];
+  const p3 = points[i + 2] ?? p2;
+  return [
+    { x: p1.x + (p2.x - p0.x) / 6, y: p1.y + (p2.y - p0.y) / 6 },
+    { x: p2.x - (p3.x - p1.x) / 6, y: p2.y - (p3.y - p1.y) / 6 },
+    p2
+  ];
+}
+function sampleSmoothLine(points, stepsPerSegment = 16) {
+  if (points.length < 3) {
+    return [...points];
+  }
+  const out = [points[0]];
+  for (let i = 0; i < points.length - 1; i++) {
+    const start = points[i], [cp1, cp2, end] = smoothSegment(points, i);
+    for (let step = 1; step <= stepsPerSegment; step++) {
+      const t = step / stepsPerSegment, u = 1 - t, a = u * u * u, b = 3 * u * u * t, c = 3 * u * t * t, d = t * t * t;
+      out.push(
+        step === stepsPerSegment ? end : {
+          x: a * start.x + b * cp1.x + c * cp2.x + d * end.x,
+          y: a * start.y + b * cp1.y + c * cp2.y + d * end.y
+        }
+      );
+    }
+  }
+  return out;
+}
+function polylineRunsPath(runs) {
+  return runs.map(
+    (run) => run.map((p, i) => `${i === 0 ? "M" : "L"}${p.x.toFixed(2)},${p.y.toFixed(2)}`).join(" ")
+  ).join(" ");
+}
 
 // src/pptx/render/chart-axis-style.ts
 var DEFAULT_COLOR = "#64748b";
@@ -3554,6 +3577,9 @@ function unitsLabelTextStyle(axis, baseStyle) {
     ...fontFamily ? { fontFamily } : {}
   };
 }
+function isNoLine(shape) {
+  return shape?.lineNoFill === true && shape.strokeColor === void 0;
+}
 function chartLineStyle(shape, fallbackColor = DEFAULT_COLOR, fallbackWidth = 1) {
   const strokeWidth = shape?.strokeWidth ?? fallbackWidth;
   return {
@@ -3565,7 +3591,7 @@ function chartLineStyle(shape, fallbackColor = DEFAULT_COLOR, fallbackWidth = 1)
 
 // src/pptx/render/chart-axis-primitives.ts
 function buildVerticalTickMark(axisX, y, placement, side, length, shape) {
-  if (!placement || placement === "none") {
+  if (!placement || placement === "none" || isNoLine(shape)) {
     return void 0;
   }
   const inward = side === "left" ? 1 : -1;
@@ -3581,7 +3607,7 @@ function buildVerticalTickMark(axisX, y, placement, side, length, shape) {
   };
 }
 function buildVerticalAxisLine(axis, axisX, layout) {
-  return axis?.spPr ? {
+  return axis?.spPr && !isNoLine(axis.spPr) ? {
     kind: "line",
     x1: axisX,
     y1: layout.plotTop,
@@ -3677,7 +3703,7 @@ function primaryCategoryAxis(axes) {
   return categoryAxes2?.find((axis) => axis.axPos !== "t") ?? categoryAxes2?.[0];
 }
 function tickLine(x, y, placement, topAxis, length, axis) {
-  if (!placement || placement === "none") {
+  if (!placement || placement === "none" || isNoLine(axis.spPr)) {
     return void 0;
   }
   const inward = topAxis ? length : -length;
@@ -3699,7 +3725,7 @@ function buildTickMarks(axis, sourceCount, layout, spacing, axisY) {
   const result = [];
   const topAxis = axis.axPos === "t";
   const y = axisY ?? (topAxis ? layout.plotTop : layout.plotBottom);
-  if (axis.spPr) {
+  if (axis.spPr && !isNoLine(axis.spPr)) {
     result.push({
       kind: "line",
       x1: layout.plotLeft,
@@ -3786,6 +3812,41 @@ function chartDataInCategoryOrder(chartData, sourceIndices2) {
   };
 }
 
+// src/pptx/render/chart-gridlines-toggle.ts
+function primaryValueAxis(axes) {
+  if (!axes) {
+    return void 0;
+  }
+  return axes.find((axis) => axis.axisType === "valAx" && axis.axPos === "l") ?? axes.find((axis) => axis.axisType === "valAx");
+}
+function chartGridlinesState(chartData) {
+  const axis = primaryValueAxis(chartData.axes);
+  if (axis) {
+    return axis.majorGridlines ?? false;
+  }
+  return chartData.style?.hasGridlines ?? true;
+}
+var shouldRenderMajorGridlines = chartGridlinesState;
+function axisShowsMajorGridlines(axis) {
+  return axis ? axis.majorGridlines === true : true;
+}
+function chartGridlinesPatch(chartData, show) {
+  const axes = chartData.axes ? [...chartData.axes] : [];
+  let index = axes.findIndex((axis) => axis.axisType === "valAx" && axis.axPos === "l");
+  if (index === -1) {
+    index = axes.findIndex((axis) => axis.axisType === "valAx");
+  }
+  if (index === -1) {
+    axes.push({ axisType: "valAx", majorGridlines: show });
+  } else {
+    axes[index] = { ...axes[index], majorGridlines: show };
+  }
+  return {
+    axes,
+    style: { ...chartData.style, hasGridlines: show }
+  };
+}
+
 // src/pptx/render/chart-scatter-x-axis.ts
 var GRIDLINE_COLOR = "#e2e8f0";
 var TICK_COUNT = 5;
@@ -3806,7 +3867,7 @@ function buildScatterXAxisPlan(chartData, layout) {
   }));
   const range = computeValueRangeForAxis(pseudoSeries, xAxis, layout.plotWidth);
   const toPixelX = (value) => valueToY2(value, range, layout.plotRight, layout.plotLeft);
-  const showGridlines = xAxis ? xAxis.majorGridlines === true : true;
+  const showGridlines = axisShowsMajorGridlines(xAxis) && !isNoLine(xAxis?.majorGridlinesSpPr);
   const gridlines = [];
   const labels = [];
   const textStyle = chartAxisTextStyle(xAxis, DEFAULT_CHART_TEXT_PX);
@@ -3956,9 +4017,113 @@ function buildScatter(chartData, layout, range) {
   return { primitives: [...primitives, ...labelBoxes], dataLabels };
 }
 
+// src/pptx/render/chart-plot-clip.ts
+var EPSILON = 1e-6;
+function plotBand(layout) {
+  return {
+    top: Math.min(layout.plotTop, layout.plotBottom),
+    bottom: Math.max(layout.plotTop, layout.plotBottom)
+  };
+}
+function insideBand(point, band) {
+  return point.y >= band.top - EPSILON && point.y <= band.bottom + EPSILON;
+}
+function clipSegment(a, b, band) {
+  const dy = b.y - a.y;
+  if (Math.abs(dy) < EPSILON) {
+    return insideBand(a, band) ? [a, b] : void 0;
+  }
+  const tTop = (band.top - a.y) / dy, tBottom = (band.bottom - a.y) / dy, low = Math.max(0, Math.min(tTop, tBottom)), high = Math.min(1, Math.max(tTop, tBottom));
+  if (high - low < EPSILON) {
+    return void 0;
+  }
+  const at = (t) => t <= 0 ? a : t >= 1 ? b : { x: a.x + (b.x - a.x) * t, y: a.y + dy * t };
+  return [insideBand(a, band) ? a : at(low), insideBand(b, band) ? b : at(high)];
+}
+function clipPolylineToBand(points, band) {
+  if (points.every((point) => insideBand(point, band))) {
+    return points.length >= 2 ? [[...points]] : [];
+  }
+  const runs = [];
+  let run = [];
+  const flush = () => {
+    if (run.length >= 2) {
+      runs.push(run);
+    }
+    run = [];
+  };
+  for (let i = 0; i + 1 < points.length; i++) {
+    const clipped = clipSegment(points[i], points[i + 1], band);
+    if (!clipped) {
+      flush();
+      continue;
+    }
+    const [start, end] = clipped;
+    if (run[run.length - 1] !== start) {
+      flush();
+      run.push(start);
+    }
+    run.push(end);
+    if (end !== points[i + 1]) {
+      flush();
+    }
+  }
+  flush();
+  return runs;
+}
+function crossAt(a, b, y) {
+  const t = (y - a.y) / (b.y - a.y);
+  return { x: a.x + (b.x - a.x) * t, y };
+}
+function clipPolygonEdge(polygon, keep, y) {
+  const out = [];
+  for (let i = 0; i < polygon.length; i++) {
+    const current = polygon[i], previous = polygon[(i + polygon.length - 1) % polygon.length];
+    if (keep(current)) {
+      if (!keep(previous)) {
+        out.push(crossAt(previous, current, y));
+      }
+      out.push(current);
+    } else if (keep(previous)) {
+      out.push(crossAt(previous, current, y));
+    }
+  }
+  return out;
+}
+function clipPolygonToBand(polygon, band) {
+  if (polygon.every((point) => insideBand(point, band))) {
+    return [...polygon];
+  }
+  const top = clipPolygonEdge(polygon, (point) => point.y >= band.top - EPSILON, band.top);
+  return clipPolygonEdge(top, (point) => point.y <= band.bottom + EPSILON, band.bottom);
+}
+function visibleSpanCentre(y1, y2, band) {
+  const low = Math.max(Math.min(y1, y2), band.top), high = Math.min(Math.max(y1, y2), band.bottom);
+  if (high < low - EPSILON) {
+    return void 0;
+  }
+  return (low + high) / 2;
+}
+function clippedSeriesLine(points, smooth, style, band) {
+  if (points.every((point) => insideBand(point, band))) {
+    return [
+      smooth ? { kind: "path", d: smoothLinePath(points), ...style } : { kind: "polyline", points: linePointsToSvgString(points), ...style }
+    ];
+  }
+  if (smooth) {
+    const runs = clipPolylineToBand(sampleSmoothLine(points), band);
+    return runs.length > 0 ? [{ kind: "path", d: polylineRunsPath(runs), ...style }] : [];
+  }
+  return clipPolylineToBand(points, band).map((run) => ({
+    kind: "polyline",
+    points: linePointsToSvgString(run),
+    ...style
+  }));
+}
+
 // src/pptx/render/chart-cartesian-area.ts
 function buildAreas(chartData, catCount, layout, range, sourceIndices2, xPositions, stacking = "clustered") {
-  const primitives = [], dataLabels = [], labelBoxes = [], showLabels = chartData.style?.hasDataLabels, isStackedMode = stacking !== "clustered", isPercent = stacking === "percentStacked", baselineY = valueToY2(0, range, layout.plotTop, layout.plotBottom), allDisplayValues = chartData.series.map(
+  const primitives = [], dataLabels = [], labelBoxes = [], showLabels = chartData.style?.hasDataLabels, isStackedMode = stacking !== "clustered", isPercent = stacking === "percentStacked", baselineY = valueToY2(0, range, layout.plotTop, layout.plotBottom), band = plotBand(layout), allDisplayValues = chartData.series.map(
     (series) => series.values.length === 0 ? void 0 : sourceIndices2.map((sourceIndex) => series.values[sourceIndex] ?? 0)
   ), stackedPlots = isStackedMode ? chart.computeStackedSeriesPlots(
     allDisplayValues.map((values) => values ?? []),
@@ -3973,44 +4138,33 @@ function buildAreas(chartData, catCount, layout, range, sourceIndices2, xPositio
     const plot = stackedPlots?.[si], topValues = plot ? plot.cumulative : displayValues, pts = computeLinePoints(topValues, catCount, layout, range).map((point, index) => ({
       ...point,
       x: xPositions?.[index] ?? point.x
-    })), c = seriesColor2(series, si, chartData.colorPalette), lineStr = linePointsToSvgString(pts), firstPt = pts[0], lastPt = pts[pts.length - 1];
-    if (plot) {
-      const baseStr = linePointsToSvgString(
-        [
-          ...computeLinePoints(plot.base, catCount, layout, range).map((point, index) => ({
-            ...point,
-            x: xPositions?.[index] ?? point.x
-          }))
-        ].reverse()
-      );
-      primitives.push({
-        kind: "polyline",
-        points: `${lineStr} ${baseStr}`,
-        stroke: "none",
-        strokeWidth: 0,
-        fill: c,
-        part: { role: "series", seriesIndex: si }
-      });
-    } else if (firstPt && lastPt) {
+    })), c = seriesColor2(series, si, chartData.colorPalette), firstPt = pts[0], lastPt = pts[pts.length - 1], fillPolygon = plot ? [
+      ...pts,
+      ...computeLinePoints(plot.base, catCount, layout, range).map((point, index) => ({ ...point, x: xPositions?.[index] ?? point.x })).reverse()
+    ] : firstPt && lastPt ? [{ x: firstPt.x, y: baselineY }, ...pts, { x: lastPt.x, y: baselineY }] : [], clippedFill = clipPolygonToBand(fillPolygon, band);
+    if (clippedFill.length > 0) {
       primitives.push({
         kind: "polyline",
-        points: `${firstPt.x.toFixed(2)},${baselineY.toFixed(2)} ${lineStr} ${lastPt.x.toFixed(2)},${baselineY.toFixed(2)}`,
+        points: linePointsToSvgString(clippedFill),
         stroke: "none",
         strokeWidth: 0,
         fill: c,
-        opacity: 0.25,
+        ...plot ? {} : { opacity: 0.25 },
         part: { role: "series", seriesIndex: si }
       });
     }
-    primitives.push({
-      kind: "polyline",
-      points: lineStr,
-      stroke: c,
-      strokeWidth: 2,
-      fill: "none",
-      part: { role: "series", seriesIndex: si }
-    });
+    primitives.push(
+      ...clippedSeriesLine(
+        pts,
+        false,
+        { stroke: c, strokeWidth: 2, fill: "none", part: { role: "series", seriesIndex: si } },
+        band
+      )
+    );
     pts.forEach((pt, displayIndex) => {
+      if (!insideBand(pt, band)) {
+        return;
+      }
       const idx = sourceIndices2[displayIndex] ?? displayIndex, part = { role: "dataPoint", seriesIndex: si, pointIndex: idx };
       pushMarker(
         primitives,
@@ -4041,11 +4195,18 @@ function buildAreas(chartData, catCount, layout, range, sourceIndices2, xPositio
           if (val === 0) {
             return;
           }
-          const baseVal = plot?.base[displayIndex] ?? 0, topVal = plot?.cumulative[displayIndex] ?? val, baseY = valueToY2(baseVal, range, layout.plotTop, layout.plotBottom), topY = valueToY2(topVal, range, layout.plotTop, layout.plotBottom);
+          const baseVal = plot?.base[displayIndex] ?? 0, topVal = plot?.cumulative[displayIndex] ?? val, centreY = visibleSpanCentre(
+            valueToY2(baseVal, range, layout.plotTop, layout.plotBottom),
+            valueToY2(topVal, range, layout.plotTop, layout.plotBottom),
+            band
+          );
+          if (centreY === void 0) {
+            return;
+          }
           dataLabels.push({
             kind: "text",
             x: pt.x,
-            y: (baseY + topY) / 2,
+            y: centreY,
             text: `${Math.round(val)}%`,
             fontSize: DEFAULT_CHART_DATA_LABEL_PX,
             fill: "#ffffff",
@@ -4066,7 +4227,11 @@ function buildAreas(chartData, catCount, layout, range, sourceIndices2, xPositio
         if (label === void 0) {
           return;
         }
-        const bandBase = plot ? valueToY2(plot.base[displayIndex] ?? 0, range, layout.plotTop, layout.plotBottom) : baselineY, mid = { x: pt.x, y: (pt.y + bandBase) / 2 }, anchor = resolveMarkerLabelPlacement(
+        const bandBase = plot ? valueToY2(plot.base[displayIndex] ?? 0, range, layout.plotTop, layout.plotBottom) : baselineY, midY = visibleSpanCentre(pt.y, bandBase, band);
+        if (midY === void 0) {
+          return;
+        }
+        const mid = { x: pt.x, y: midY }, anchor = resolveMarkerLabelPlacement(
           chartData,
           series,
           pointIndex,
@@ -4160,10 +4325,11 @@ function buildPrimaryAxis(range, layout, axis, axisX = layout.plotLeft, showMajo
   const tickVals = generateAxisTicks(range, axis, TICK_COUNT2);
   const minorTickVals = generateMinorAxisTicks(range, axis);
   const axisLine = buildVerticalAxisLine(axis, axisX, layout);
+  const drawMajorGridlines = showMajorGridlines && !isNoLine(axis?.majorGridlinesSpPr);
   if (axisLine) {
     gridlines.push(axisLine);
   }
-  if (axis?.minorGridlines) {
+  if (axis?.minorGridlines && !isNoLine(axis.minorGridlinesSpPr)) {
     for (const val of minorTickVals) {
       const y = valueToY2(val, range, layout.plotTop, layout.plotBottom);
       gridlines.push(
@@ -4187,7 +4353,7 @@ function buildPrimaryAxis(range, layout, axis, axisX = layout.plotLeft, showMajo
   }
   for (const val of tickVals) {
     const y = valueToY2(val, range, layout.plotTop, layout.plotBottom);
-    if (showMajorGridlines) {
+    if (drawMajorGridlines) {
       gridlines.push(
         buildStyledGridline(
           y,
@@ -4243,18 +4409,19 @@ function buildPrimaryAxis(range, layout, axis, axisX = layout.plotLeft, showMajo
   }
   return { gridlines, axisLabels };
 }
-function buildSecondaryAxis(range, layout, axis, axisX = layout.plotRight) {
+function buildSecondaryAxis(range, layout, axis, axisX = layout.plotRight, showMajorGridlines = true) {
   const gridlines = [];
   const axisLabels = [];
   const textStyle = chartAxisTextStyle(axis);
   const captionStyle = chartAxisTextStyle(axis);
   const axisLine = buildVerticalAxisLine(axis, axisX, layout);
+  const drawMajorGridlines = showMajorGridlines && !isNoLine(axis?.majorGridlinesSpPr);
   if (axisLine) {
     gridlines.push(axisLine);
   }
   const tickValues = generateAxisTicks(range, axis, TICK_COUNT2 - 1);
   const minorTickValues = generateMinorAxisTicks(range, axis);
-  if (axis?.minorGridlines) {
+  if (axis?.minorGridlines && !isNoLine(axis.minorGridlinesSpPr)) {
     for (const val of minorTickValues) {
       const y = valueToY2(val, range, layout.plotTop, layout.plotBottom);
       gridlines.push(
@@ -4286,17 +4453,19 @@ function buildSecondaryAxis(range, layout, axis, axisX = layout.plotRight) {
   }
   for (const val of tickValues) {
     const y = valueToY2(val, range, layout.plotTop, layout.plotBottom);
-    gridlines.push(
-      buildStyledGridline(
-        y,
-        layout,
-        axis?.majorGridlinesSpPr,
-        SECONDARY_GRID_COLOR,
-        0.5,
-        "2 3",
-        0.5
-      )
-    );
+    if (drawMajorGridlines) {
+      gridlines.push(
+        buildStyledGridline(
+          y,
+          layout,
+          axis?.majorGridlinesSpPr,
+          SECONDARY_GRID_COLOR,
+          0.5,
+          "2 3",
+          0.5
+        )
+      );
+    }
     const tick = buildVerticalTickMark(
       axisX,
       y,
@@ -4351,38 +4520,6 @@ function buildSecondaryAxis(range, layout, axis, axisX = layout.plotRight) {
   return { gridlines, axisLabels };
 }
 
-// src/pptx/render/chart-gridlines-toggle.ts
-function primaryValueAxis(axes) {
-  if (!axes) {
-    return void 0;
-  }
-  return axes.find((axis) => axis.axisType === "valAx" && axis.axPos === "l") ?? axes.find((axis) => axis.axisType === "valAx");
-}
-function chartGridlinesState(chartData) {
-  const axis = primaryValueAxis(chartData.axes);
-  if (axis) {
-    return axis.majorGridlines ?? false;
-  }
-  return chartData.style?.hasGridlines ?? true;
-}
-var shouldRenderMajorGridlines = chartGridlinesState;
-function chartGridlinesPatch(chartData, show) {
-  const axes = chartData.axes ? [...chartData.axes] : [];
-  let index = axes.findIndex((axis) => axis.axisType === "valAx" && axis.axPos === "l");
-  if (index === -1) {
-    index = axes.findIndex((axis) => axis.axisType === "valAx");
-  }
-  if (index === -1) {
-    axes.push({ axisType: "valAx", majorGridlines: show });
-  } else {
-    axes[index] = { ...axes[index], majorGridlines: show };
-  }
-  return {
-    axes,
-    style: { ...chartData.style, hasGridlines: show }
-  };
-}
-
 // src/pptx/render/chart-cartesian-axes.ts
 function hasRicherAxisFeatures(chartData) {
   return Boolean(
@@ -4434,7 +4571,8 @@ function buildCartesianAxes(chartData, layout, primaryRange, secondaryRange, cat
     secondaryRange,
     layout,
     secondaryAxis,
-    axisX(secondaryAxis?.crossAxisId, "right")
+    axisX(secondaryAxis?.crossAxisId, "right"),
+    axisShowsMajorGridlines(secondaryAxis)
   );
   return {
     ...primary,
@@ -4451,7 +4589,7 @@ function categoryTotals(series, catCount) {
   );
 }
 function buildPercentStackedBars(chartData, catCount, layout, primaryRange, sourceIndices2, invertNegativeFill2) {
-  const primitives = [], dataLabels = [], series = chartData.series, palette = chartData.colorPalette, showLabels = chartData.style?.hasDataLabels, barGroupWidth = layout.plotWidth / Math.max(catCount, 1), barW = barGroupWidth * 0.6, barOffset = (barGroupWidth - barW) / 2, displaySeries = series.map((entry) => ({
+  const primitives = [], dataLabels = [], series = chartData.series, palette = chartData.colorPalette, showLabels = chartData.style?.hasDataLabels, barGroupWidth = layout.plotWidth / Math.max(catCount, 1), barW = stackedBarWidth(barGroupWidth, chartData.barGapWidth), barOffset = (barGroupWidth - barW) / 2, displaySeries = series.map((entry) => ({
     ...entry,
     values: sourceIndices2.map((sourceIndex) => entry.values[sourceIndex] ?? 0)
   })), totals = categoryTotals(displaySeries, catCount);
@@ -4459,7 +4597,17 @@ function buildPercentStackedBars(chartData, catCount, layout, primaryRange, sour
     let posRunning = 0, negRunning = 0;
     const catTotal = totals[ci] || 1;
     for (let si = 0; si < series.length; si++) {
-      const sourceIndex = sourceIndices2[ci] ?? ci, rawVal = series[si].values[sourceIndex] ?? 0, val = catTotal > 0 ? rawVal / catTotal * 100 : 0, isNeg = val < 0, base = isNeg ? negRunning : posRunning, top = base + val, x = layout.plotLeft + barGroupWidth * ci + barOffset, baseY = valueToY2(base, primaryRange, layout.plotTop, layout.plotBottom), topY = valueToY2(top, primaryRange, layout.plotTop, layout.plotBottom), y = Math.min(baseY, topY), h = Math.max(Math.abs(baseY - topY), 0.5), pctBaseFill = resolveDataPointFill(series[si], sourceIndex, paletteColor2(si, palette)) ?? seriesColor2(series[si], si, palette);
+      const sourceIndex = sourceIndices2[ci] ?? ci, rawVal = series[si].values[sourceIndex] ?? 0, val = catTotal > 0 ? rawVal / catTotal * 100 : 0, base = val < 0 ? negRunning : posRunning;
+      if (val < 0) {
+        negRunning += val;
+      } else {
+        posRunning += val;
+      }
+      const segment = clipStackedSegment(base, val, primaryRange);
+      if (!segment) {
+        continue;
+      }
+      const x = layout.plotLeft + barGroupWidth * ci + barOffset, toY = (value) => valueToY2(value, primaryRange, layout.plotTop, layout.plotBottom), { start: y, size: h } = val < 0 ? stackedSegmentExtent(toY(segment.high), toY(segment.low), 0.5) : stackedSegmentExtent(toY(segment.low), toY(segment.high), 0.5), pctBaseFill = resolveDataPointFill(series[si], sourceIndex, paletteColor2(si, palette)) ?? seriesColor2(series[si], si, palette);
       primitives.push({
         kind: "rect",
         x,
@@ -4488,52 +4636,43 @@ function buildPercentStackedBars(chartData, catCount, layout, primaryRange, sour
           ...dataLabelFontOverride(resolveDataLabelTextStyle(chartData, series[si], sourceIndex))
         });
       }
-      if (isNeg) {
-        negRunning += val;
-      } else {
-        posRunning += val;
-      }
     }
   }
   return { primitives, dataLabels };
 }
 
 // src/pptx/render/chart-cartesian-stacked-labels.ts
-function pushClusteredStackedLabels(chartData, series, sourceIndices2, catCount, layout, range, dataLabels) {
-  const barGroupWidth = layout.plotWidth / catCount, seriesCount = Math.max(series.length, 1), singleBarWidth = barGroupWidth * 0.7 / seriesCount, groupOffset = (barGroupWidth - singleBarWidth * seriesCount) / 2;
-  for (let ci = 0; ci < catCount; ci++) {
-    const sourceIndex = sourceIndices2[ci] ?? ci;
-    for (let si = 0; si < series.length; si++) {
-      const val = series[si].values[sourceIndex] ?? 0, barX = layout.plotLeft + barGroupWidth * ci + groupOffset + singleBarWidth * si, zeroY = valueToY2(0, range, layout.plotTop, layout.plotBottom), valY = valueToY2(val, range, layout.plotTop, layout.plotBottom), barY = Math.min(zeroY, valY), barH = Math.max(Math.abs(zeroY - valY), 1), label = buildDataLabelText({
-        chartData,
-        series: series[si],
-        pointIndex: sourceIndex,
-        value: val
-      });
-      if (label === void 0) {
-        continue;
-      }
-      const anchor = resolveBarLabelPlacement(
-        chartData,
-        series[si],
-        sourceIndex,
-        { x: barX, y: barY, width: singleBarWidth, height: barH },
-        val,
-        "vertical",
-        { width: layout.svgWidth, height: layout.svgHeight }
-      );
-      dataLabels.push({
-        kind: "text",
-        x: anchor.x,
-        y: anchor.y,
-        text: label.text,
-        fontSize: DEFAULT_CHART_DATA_LABEL_PX,
-        fill: label.color ?? "#334155",
-        textAnchor: anchor.textAnchor,
-        ...anchor.dominantBaseline ? { dominantBaseline: anchor.dominantBaseline } : {},
-        ...dataLabelFontOverride(resolveDataLabelTextStyle(chartData, series[si], sourceIndex))
-      });
+function pushStackedBarLabels(chartData, series, sourceIndices2, rects, layout, dataLabels) {
+  for (const rect of rects) {
+    const entry = rect.seriesIndex === void 0 ? void 0 : series[rect.seriesIndex];
+    if (!entry || rect.pointIndex === void 0) {
+      continue;
+    }
+    const sourceIndex = sourceIndices2[rect.pointIndex] ?? rect.pointIndex, val = entry.values[sourceIndex] ?? 0, label = buildDataLabelText({ chartData, series: entry, pointIndex: sourceIndex, value: val });
+    if (label === void 0) {
+      continue;
     }
+    const anchor = resolveBarLabelPlacement(
+      chartData,
+      entry,
+      sourceIndex,
+      { x: rect.x, y: rect.y, width: rect.w, height: rect.h },
+      val,
+      "vertical",
+      { width: layout.svgWidth, height: layout.svgHeight },
+      "ctr"
+    );
+    dataLabels.push({
+      kind: "text",
+      x: anchor.x,
+      y: anchor.y,
+      text: label.text,
+      fontSize: DEFAULT_CHART_DATA_LABEL_PX,
+      fill: label.color ?? "#334155",
+      textAnchor: anchor.textAnchor,
+      ...anchor.dominantBaseline ? { dominantBaseline: anchor.dominantBaseline } : {},
+      ...dataLabelFontOverride(resolveDataLabelTextStyle(chartData, entry, sourceIndex))
+    });
   }
 }
 
@@ -4638,7 +4777,14 @@ function buildBars(chartData, catCount, layout, primaryRange, secondaryRange, se
     const displaySeries = series.map((entry) => ({
       ...entry,
       values: sourceIndices2.map((sourceIndex) => entry.values[sourceIndex] ?? 0)
-    })), rects = computeStackedBarRects(displaySeries, catCount, layout, primaryRange, palette);
+    })), rects = computeStackedBarRects(
+      displaySeries,
+      catCount,
+      layout,
+      primaryRange,
+      palette,
+      chartData.barGapWidth
+    );
     for (const r of rects) {
       let fill = r.fill, part, title;
       if (r.seriesIndex !== void 0 && r.pointIndex !== void 0) {
@@ -4657,15 +4803,7 @@ function buildBars(chartData, catCount, layout, primaryRange, secondaryRange, se
       primitives.push({ kind: "rect", x: r.x, y: r.y, w: r.w, h: r.h, fill, rx: 1, part, title });
     }
     if (showLabels) {
-      pushClusteredStackedLabels(
-        chartData,
-        series,
-        sourceIndices2,
-        catCount,
-        layout,
-        primaryRange,
-        dataLabels
-      );
+      pushStackedBarLabels(chartData, series, sourceIndices2, rects, layout, dataLabels);
     }
     return { primitives, dataLabels };
   }
@@ -4755,7 +4893,7 @@ function seriesLineStroke(chartData, series) {
 
 // src/pptx/render/chart-cartesian-line-area.ts
 function buildLines(chartData, catCount, layout, primaryRange, secondaryRange, secondaryIdx, sourceIndices2, xPositions, stacking = "clustered") {
-  const primitives = [], dataLabels = [], labelBoxes = [], showLabels = chartData.style?.hasDataLabels, isStackedMode = stacking !== "clustered", isPercent = stacking === "percentStacked", resolved = chartData.series.map((series) => {
+  const primitives = [], dataLabels = [], labelBoxes = [], showLabels = chartData.style?.hasDataLabels, isStackedMode = stacking !== "clustered", isPercent = stacking === "percentStacked", band = plotBand(layout), resolved = chartData.series.map((series) => {
     if (series.values.length === 0) {
       return void 0;
     }
@@ -4779,41 +4917,21 @@ function buildLines(chartData, catCount, layout, primaryRange, secondaryRange, s
       ...point,
       x: xPositions?.[index] ?? point.x
     })), c = seriesColor2(series, si, chartData.colorPalette), seriesPart = { role: "series", seriesIndex: si }, allVisible = visible.every(Boolean);
-    if (allVisible) {
+    for (const run of allVisible ? [pts] : chart.visibleRuns(visible).map((r) => r.map((i) => pts[i]))) {
+      if (!allVisible && run.length < 2) {
+        continue;
+      }
       primitives.push(
-        series.smooth ? {
-          kind: "path",
-          d: smoothLinePath(pts),
-          stroke: c,
-          ...lineStroke,
-          fill: "none",
-          part: seriesPart
-        } : {
-          kind: "polyline",
-          points: linePointsToSvgString(pts),
-          stroke: c,
-          ...lineStroke,
-          fill: "none",
-          part: seriesPart
-        }
+        ...clippedSeriesLine(
+          run,
+          allVisible && Boolean(series.smooth),
+          { stroke: c, ...lineStroke, fill: "none", part: seriesPart },
+          band
+        )
       );
-    } else {
-      for (const run of chart.visibleRuns(visible)) {
-        if (run.length < 2) {
-          continue;
-        }
-        primitives.push({
-          kind: "polyline",
-          points: linePointsToSvgString(run.map((i) => pts[i])),
-          stroke: c,
-          ...lineStroke,
-          fill: "none",
-          part: seriesPart
-        });
-      }
     }
     pts.forEach((pt, displayIndex) => {
-      if (!visible[displayIndex]) {
+      if (!visible[displayIndex] || !insideBand(pt, band)) {
         return;
       }
       const idx = sourceIndices2[displayIndex] ?? displayIndex, part = { role: "dataPoint", seriesIndex: si, pointIndex: idx };
@@ -4839,7 +4957,7 @@ function buildLines(chartData, catCount, layout, primaryRange, secondaryRange, s
       const labelValues = stackedPlots ? stackedPlots[si].own : displayValues;
       labelValues.forEach((val, displayIndex) => {
         const pt = pts[displayIndex];
-        if (!pt || !visible[displayIndex]) {
+        if (!pt || !visible[displayIndex] || !insideBand(pt, band)) {
           return;
         }
         if (isPercent) {
@@ -5328,7 +5446,7 @@ function addUnit(date, amount, unit) {
 }
 function tickLine2(x, y, axis, minor) {
   const placement = minor ? axis.minorTickMark : axis.majorTickMark;
-  if (!placement || placement === "none") {
+  if (!placement || placement === "none" || isNoLine(axis.spPr)) {
     return void 0;
   }
   const length = minor ? 2.5 : 4;
@@ -5421,7 +5539,7 @@ function buildDateAxisPlan(chartData, layout, selectedAxis, axisY) {
     const line2 = tickLine2(x, y, axis, false);
     return line2 ? [line2] : [];
   });
-  if (!axis.deleted && axis.spPr) {
+  if (!axis.deleted && axis.spPr && !isNoLine(axis.spPr)) {
     tickMarks.unshift({
       kind: "line",
       x1: layout.plotLeft,
@@ -5624,19 +5742,21 @@ function valueToX(val, range, leftX, rightX) {
   }
   return range.reverseOrder ? rightX - ratio * usable : leftX + ratio * usable;
 }
-function buildTransposedValueAxis(range, layout) {
-  const gridlines = [], axisLabels = [];
+function buildTransposedValueAxis(range, layout, axis, showMajorGridlines = true) {
+  const gridlines = [], axisLabels = [], drawGridlines = showMajorGridlines && !isNoLine(axis?.majorGridlinesSpPr);
   for (const val of axisTickValues(range)) {
     const x = valueToX(val, range, layout.plotLeft, layout.plotRight);
-    gridlines.push({
-      kind: "line",
-      x1: x,
-      y1: layout.plotTop,
-      x2: x,
-      y2: layout.plotBottom,
-      stroke: GRIDLINE_COLOR3,
-      strokeWidth: 1
-    });
+    if (drawGridlines) {
+      gridlines.push(
+        buildVerticalStyledGridline(
+          x,
+          layout,
+          axis?.majorGridlinesSpPr,
+          GRIDLINE_COLOR3,
+          1,
+          void 0)
+      );
+    }
     axisLabels.push({
       kind: "text",
       x,
@@ -5686,7 +5806,12 @@ function barFill(chartData, series, seriesIndex, pointIndex) {
 function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
   const layout = computePlotLayout(element.width, element.height, chartData, true, {
     leftCategoryLabelWidth: widestCategoryLabelWidth(categoryLabels, DEFAULT_CHART_TEXT_PX)
-  }), catCount = Math.max(categoryLabels.length, 1), series = chartData.series, grouping = chartData.grouping ?? "clustered", isStacked = grouping === "stacked" || grouping === "percentStacked", isPercent = grouping === "percentStacked", range = isPercent ? { min: 0, max: 100, span: 100 } : isStacked ? computeStackedValueRange(series, catCount, layout.plotWidth) : computeValueRangeForChart(series, chartData.axes, layout.plotWidth), { gridlines, axisLabels } = buildTransposedValueAxis(range, layout), zeroX = valueToX(0, range, layout.plotLeft, layout.plotRight), zeroLine = range.min < 0 && range.max > 0 ? {
+  }), catCount = Math.max(categoryLabels.length, 1), series = chartData.series, grouping = chartData.grouping ?? "clustered", isStacked = grouping === "stacked" || grouping === "percentStacked", isPercent = grouping === "percentStacked", valueAxis = primaryValueAxis(chartData.axes), range = isStacked ? computeStackedValueRangeForAxis(series, catCount, valueAxis, isPercent, layout.plotWidth) : computeValueRangeForChart(series, chartData.axes, layout.plotWidth), { gridlines, axisLabels } = buildTransposedValueAxis(
+    range,
+    layout,
+    valueAxis,
+    shouldRenderMajorGridlines(chartData)
+  ), zeroX = valueToX(0, range, layout.plotLeft, layout.plotRight), zeroLine = range.min < 0 && range.max > 0 ? {
     kind: "line",
     x1: zeroX,
     y1: layout.plotTop,
@@ -5745,7 +5870,7 @@ function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
       }
     }
   } else {
-    const totals = isPercent ? categoryTotals2(series, catCount) : [], barH = band * (isPercent ? 0.6 : 0.7), barOffset = (band - barH) / 2;
+    const totals = isPercent ? categoryTotals2(series, catCount) : [], barH = stackedBarWidth(band, chartData.barGapWidth), barOffset = (band - barH) / 2;
     for (let ci = 0; ci < catCount; ci++) {
       let posRunning = 0, negRunning = 0;
       const catTotal = isPercent ? totals[ci] || 1 : 1;
@@ -5754,7 +5879,21 @@ function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
         if (val === 0) {
           continue;
         }
-        const isNeg = val < 0, base = isNeg ? negRunning : posRunning, top = base + val, y = layout.plotTop + band * ci + barOffset, baseX = valueToX(base, range, layout.plotLeft, layout.plotRight), topX = valueToX(top, range, layout.plotLeft, layout.plotRight), x = Math.min(baseX, topX), w = Math.max(Math.abs(topX - baseX), 0.5);
+        const isNeg = val < 0, base = isNeg ? negRunning : posRunning;
+        if (isNeg) {
+          negRunning += val;
+        } else {
+          posRunning += val;
+        }
+        const segment = clipStackedSegment(base, val, range);
+        if (!segment) {
+          continue;
+        }
+        const y = layout.plotTop + band * ci + barOffset, { start: x, size: w } = stackedSegmentExtent(
+          valueToX(isNeg ? segment.high : segment.low, range, layout.plotLeft, layout.plotRight),
+          valueToX(isNeg ? segment.low : segment.high, range, layout.plotLeft, layout.plotRight),
+          0.5
+        );
         primitives.push({
           kind: "rect",
           x,
@@ -5793,7 +5932,9 @@ function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
               { x, y, width: w, height: barH },
               rawVal,
               "horizontal",
-              { width: layout.svgWidth, height: layout.svgHeight }
+              { width: layout.svgWidth, height: layout.svgHeight },
+              // A stacked segment's label is centred unless c:dLblPos says otherwise.
+              "ctr"
             );
             dataLabels.push({
               kind: "text",
@@ -5808,11 +5949,6 @@ function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
             });
           }
         }
-        if (isNeg) {
-          negRunning += val;
-        } else {
-          posRunning += val;
-        }
       }
     }
   }
@@ -5844,12 +5980,6 @@ function buildHorizontalBarViewModel(element, chartData, categoryLabels) {
 }
 
 // src/pptx/render/chart-cartesian.ts
-function stackedRange(chartData, catCount, isPercent, plotHeightPx) {
-  if (isPercent) {
-    return { min: 0, max: 100, span: 100 };
-  }
-  return computeStackedValueRange(chartData.series, catCount, plotHeightPx);
-}
 function buildCartesianViewModel(element, chartData, categoryLabels, kind) {
   if (kind === "bar" && chartData.barDirection === "bar") {
     return buildHorizontalBarViewModel(element, chartData, categoryLabels);
@@ -5865,13 +5995,13 @@ function buildCartesianViewModel(element, chartData, categoryLabels, kind) {
   const useSecondary = !isStacked && secondaryIdx.size > 0;
   const primaryPlotSeries = useSecondary ? chartData.series.filter((_s, i) => !secondaryIdx.has(i)) : chartData.series;
   const secondaryPlotSeries = useSecondary ? chartData.series.filter((_s, i) => secondaryIdx.has(i)) : [];
-  const primaryAxis = chartData.axes?.find(
-    (axis) => axis.axisType === "valAx" && axis.axPos !== "r"
-  );
-  const primaryRange = isStacked ? {
-    ...stackedRange(chartData, catCount, isPercent, layout.autoPlotHeight),
-    ...primaryAxis?.orientation === "maxMin" ? { reverseOrder: true } : {}
-  } : computeValueRangeForChart(
+  const primaryRange = isStacked ? computeStackedValueRangeForAxis(
+    chartData.series,
+    catCount,
+    primaryValueAxis(chartData.axes),
+    isPercent,
+    layout.autoPlotHeight
+  ) : computeValueRangeForChart(
     primaryPlotSeries.length > 0 ? primaryPlotSeries : chartData.series,
     chartData.axes,
     layout.autoPlotHeight
@@ -6432,7 +6562,8 @@ function buildComboViewModel(element, chartData, categoryLabels) {
       layout,
       "right",
       chartData.dateCategories?.values
-    )
+    ),
+    axisShowsMajorGridlines(secondaryAxisFormatting)
   ) : void 0;
   const zeroLine = primaryRange.logScale ? void 0 : buildZeroLine(primaryRange, layout);
   const horizontalAxis = buildCartesianHorizontalAxis(
@@ -10264,7 +10395,7 @@ function buildChartViewModelInner(element) {
   if (element.type !== "chart") {
     return buildFallbackViewModel(element.width, element.height, "Chart");
   }
-  const chartEl = element, chartData = chartEl.chartData ? withChartTextDefaults(withAutoTitle(chartEl.chartData)) : chartEl.chartData;
+  const chartEl = element, chartData = chartEl.chartData ? withResolvedPalette(withChartTextDefaults(withAutoTitle(chartEl.chartData))) : chartEl.chartData;
   if (!chartData || chartData.series.length === 0) {
     return buildFallbackViewModel(element.width, element.height, chartData?.title ?? "Chart");
   }
@@ -10763,6 +10894,10 @@ Object.defineProperty(exports, "buildRectPathGradientSvg", {
   enumerable: true,
   get: function () { return diagram.buildRectPathGradientSvg; }
 });
+Object.defineProperty(exports, "DEFAULT_BAR_GAP_WIDTH", {
+  enumerable: true,
+  get: function () { return chart.DEFAULT_BAR_GAP_WIDTH; }
+});
 Object.defineProperty(exports, "axisTargetIntervals", {
   enumerable: true,
   get: function () { return chart.axisTargetIntervals; }
@@ -10850,6 +10985,7 @@ exports.applyDataPointPictureFills = applyDataPointPictureFills;
 exports.applyLabelManualLayout = applyLabelManualLayout;
 exports.applyLegendEntryOverrides = applyLegendEntryOverrides;
 exports.applyParetoConversion = applyParetoConversion;
+exports.axisShowsMajorGridlines = axisShowsMajorGridlines;
 exports.axisTickValues = axisTickValues;
 exports.buildBoxWhiskerViewModel = buildBoxWhiskerViewModel;
 exports.buildCartesianViewModel = buildCartesianViewModel;
@@ -10904,6 +11040,7 @@ exports.chartTitleBandFor = chartTitleBandFor;
 exports.chartTitleFontPx = chartTitleFontPx;
 exports.chartTitleReservePx = chartTitleReservePx;
 exports.clampCropValue = clampCropValue;
+exports.clipStackedSegment = clipStackedSegment;
 exports.collapseChartTitleRunsForEdit = collapseChartTitleRunsForEdit;
 exports.computeAxisTitlePrimitives = computeAxisTitlePrimitives;
 exports.computeBarRects = computeBarRects;
@@ -10929,6 +11066,7 @@ exports.computeScatterDots = computeScatterDots;
 exports.computeScatterXDomain = computeScatterXDomain;
 exports.computeStackedBarRects = computeStackedBarRects;
 exports.computeStackedValueRange = computeStackedValueRange;
+exports.computeStackedValueRangeForAxis = computeStackedValueRangeForAxis;
 exports.computeSunburstArcs = computeSunburstArcs;
 exports.computeTrendlinePrimitives = computeTrendlinePrimitives;
 exports.computeValueRange = computeValueRange;
@@ -11002,6 +11140,7 @@ exports.paletteColor = paletteColor;
 exports.paletteColor2 = paletteColor2;
 exports.parseDrawingPercent = parseDrawingPercent;
 exports.plotAreaFill = plotAreaFill;
+exports.primaryValueAxis = primaryValueAxis;
 exports.reserveLegendSpace = reserveLegendSpace;
 exports.resetBarFacePicturePixelCacheForTests = resetBarFacePicturePixelCacheForTests;
 exports.resolveActiveDataPointPicture = resolveActiveDataPointPicture;
@@ -11011,6 +11150,7 @@ exports.resolveBarLabelAnchor = resolveBarLabelAnchor;
 exports.resolveBarLabelPlacement = resolveBarLabelPlacement;
 exports.resolveCategoryLabels = resolveCategoryLabels;
 exports.resolveChartKind = resolveChartKind;
+exports.resolveChartPalette = resolveChartPalette;
 exports.resolveChartStyleDefaults = resolveChartStyleDefaults;
 exports.resolveChartTitleRunSpans = resolveChartTitleRunSpans;
 exports.resolveChartTitleTextStyle = resolveChartTitleTextStyle;
@@ -11038,15 +11178,17 @@ exports.seriesColor = seriesColor;
 exports.seriesColor2 = seriesColor2;
 exports.seriesXValues = seriesXValues;
 exports.setChartTextMeasurer = setChartTextMeasurer;
-exports.shade = shade2;
+exports.shade = shade;
 exports.shouldRenderMajorGridlines = shouldRenderMajorGridlines;
 exports.shouldRenderRegionLabel = shouldRenderRegionLabel;
 exports.splitLabelLines = splitLabelLines;
 exports.splitSeriesByAxis = splitSeriesByAxis;
+exports.stackedBarWidth = stackedBarWidth;
+exports.stackedSegmentExtent = stackedSegmentExtent;
 exports.subscribeBarFacePicturePixelSamples = subscribeBarFacePicturePixelSamples;
 exports.suppressesCssFill = suppressesCssFill;
 exports.surfaceColor = surfaceColor;
-exports.tint = tint2;
+exports.tint = tint;
 exports.titleBaselineFor = titleBaselineFor;
 exports.toCssGradientStop = toCssGradientStop;
 exports.unitsCaptionOffset = unitsCaptionOffset;