@silurus/ooxml 0.87.0 → 0.88.0

package/dist/three-d.mjs

@@ -1,8 +1,27 @@
-import { B as e, Bt as t, Ct as n, E as r, Et as i, Ft as a, Gt as o, H as s, Ht as c, Jt as l, Kt as u, M as d, Mt as f, Nt as p, Ot as m, Pt as h, Qt as g, Rt as _, St as v, Tt as y, W as b, Wt as x, X as S, Xt as C, Z as w, Zt as T, _t as E, a as D, b as O, bt as k, ct as ee, gt as A, jt as j, kt as M, lt as N, mt as P, n as F, ot as te, r as ne, st as I, t as L, ut as R, v as z, wt as re, x as B, xt as ie, yt as ae, zt as V } from "./plot-area-frame-D5hEOgkJ.js";
-import { a as H, r as U } from "./units-EJdC96r6.js";
-import { D as W, E as G, O as oe, _ as K, a as q, c as se, d as J, g as ce, h as le, i as ue, k as de, m as fe, n as pe, o as me, r as he, s as ge, t as _e, x as ve } from "./three-d-YYghQndN.js";
-import { t as ye } from "./renderer-module-contract-D91rkYHH.js";
-function be(e) {
+import { $ as e, $n as t, $t as n, An as r, B as i, Bn as a, Cn as o, D as s, Dn as c, En as l, Gt as u, H as d, Hn as f, In as p, Kt as m, Ln as h, Mn as g, O as _, Pn as v, Qn as y, Rn as b, Tn as x, Un as S, V as C, W as w, Wn as T, Xn as E, Yt as D, Zn as O, _n as k, ar as A, bn as j, dn as M, dr as N, er as P, et as F, fn as I, gn as L, gt as R, hn as z, i as B, ir as V, jn as H, m as ee, mn as U, pn as te, pr as W, qt as G, rr as K, sr as q, t as J, tt as ne, u as Y, ur as re, vn as ie, vt as ae, wn as oe, xn as se, yt as ce, z as le } from "./plot-area-frame-DLTYKHNP.js";
+import { a as ue, r as X } from "./units-BzZ0gAxs.js";
+import { T as de, a as fe, c as pe, h as me, i as he, m as ge, n as _e, o as ve, p as ye, r as be, s as xe, t as Se, u as Ce, w as we, y as Te } from "./three-d-DJBl8g8M.js";
+import { t as Ee } from "./renderer-module-contract-D91rkYHH.js";
+//#region packages/core/src/chart/three-d-datum-style.ts
+function De(e, t, n, r) {
+	return re(e, r) ? n : t.chartexFormatIdx ?? r;
+}
+function Oe(e, t, n, r, i) {
+	let a = De(e, t, r, i), o = q(e, "dataPoint3D", i), s = W(e, "dataPoint3D"), c = E(n?.chartexStyle, s, r);
+	if (c !== void 0) return c;
+	if (n?.fillHidden === !0) {
+		let e = y(s);
+		if (e !== void 0) return e;
+	}
+	if (n?.color === "00000000") return null;
+	if (n?.color) return {
+		fillType: "solid",
+		color: n.color
+	};
+	let l = E(t.chartexStyle, s, a);
+	return l === void 0 ? P(o, s, a, n?.chartexStyle, t.chartexStyle) : l;
+}
+function ke(e) {
 	switch (e) {
 		case "cylinder":
 		case "cone":
@@ -12,8 +31,8 @@ function be(e) {
 		default: return "box";
 	}
 }
-var xe = (e) => Math.max(0, Math.min(1, e));
-function Se(e, t) {
+var Ae = (e) => Math.max(0, Math.min(1, e));
+function je(e, t) {
 	if (t.length < 3) return null;
 	let n = e[t[0]];
 	for (let r = 1; r + 1 < t.length; r++) for (let i = r + 1; i < t.length; i++) {
@@ -38,7 +57,7 @@ function Se(e, t) {
 	}
 	return null;
 }
-function Ce(e, t) {
+function Me(e, t) {
 	let n = e.reduce((t, n) => ({
 		x: t.x + n.x / e.length,
 		y: t.y + n.y / e.length,
@@ -49,7 +68,7 @@ function Ce(e, t) {
 		depth: 0
 	});
 	return t.map((t) => {
-		let r = Se(e, t.indices);
+		let r = je(e, t.indices);
 		if (!r) return t;
 		let i = t.indices.reduce((n, r) => ({
 			x: n.x + e[r].x / t.indices.length,
@@ -70,7 +89,7 @@ function Ce(e, t) {
 		};
 	});
 }
-function we(e) {
+function Ne(e) {
 	let { horizontal: t, crossStart: n, crossSize: r, baseCoord: i, endCoord: a, nearDepth: o, farDepth: s } = e;
 	if (![
 		n,
@@ -80,7 +99,7 @@ function we(e) {
 		o,
 		s
 	].every(Number.isFinite) || r <= 0 || i === a || o === s) return null;
-	let c = be(e.shape), l = c === "cylinder" || c === "cone" || c === "coneToMax", u = c !== "box" && c !== "cylinder", d = c === "coneToMax" || c === "pyramidToMax", f = l ? Math.max(8, Math.min(64, Math.trunc(e.roundSegments ?? 32))) : 4, p = xe(e.baseScale ?? (d ? e.toMaxBaseScale ?? 1 : 1)), m = xe(e.endScale ?? (u ? d ? e.toMaxEndScale ?? 0 : 0 : 1));
+	let c = ke(e.shape), l = c === "cylinder" || c === "cone" || c === "coneToMax", u = c !== "box" && c !== "cylinder", d = c === "coneToMax" || c === "pyramidToMax", f = l ? Math.max(8, Math.min(64, Math.trunc(e.roundSegments ?? 32))) : 4, p = Ae(e.baseScale ?? (d ? e.toMaxBaseScale ?? 1 : 1)), m = Ae(e.endScale ?? (u ? d ? e.toMaxEndScale ?? 0 : 0 : 1));
 	if (p === 0 && m === 0) return null;
 	let h = n + r / 2, g = r / 2, _ = (o + s) / 2, v = Math.abs(s - o) / 2, y = [], b = (e, n) => {
 		if (n === 0) {
@@ -147,11 +166,11 @@ function we(e) {
 	return {
 		shape: c,
 		vertices: y,
-		faces: Ce(y, w),
+		faces: Me(y, w),
 		silhouetteEdges: T
 	};
 }
-function Te(e) {
+function Pe(e) {
 	let { x0: t, x1: n, lower0: r, lower1: i, upper0: a, upper1: o, nearDepth: s, farDepth: c, capStart: l, capEnd: u } = e;
 	if (![
 		t,
@@ -211,7 +230,7 @@ function Te(e) {
 	return {
 		shape: "areaStrip",
 		vertices: _,
-		faces: Ce(_, [
+		faces: Me(_, [
 			{
 				indices: [
 					0,
@@ -276,17 +295,17 @@ function Te(e) {
 		silhouetteEdges: []
 	};
 }
-function Ee(e) {
+function Fe(e) {
 	let t = e.upper0 - e.lower0, n = e.upper1 - e.lower1;
 	if (Number.isFinite(t) && Number.isFinite(n) && t * n < 0) {
 		let r = t / (t - n), i = e.x0 + (e.x1 - e.x0) * r, a = e.lower0 + (e.lower1 - e.lower0) * r;
-		return [Te({
+		return [Pe({
 			...e,
 			x1: i,
 			lower1: a,
 			upper1: a,
 			capEnd: !1
-		}), Te({
+		}), Pe({
 			...e,
 			x0: i,
 			lower0: a,
@@ -294,10 +313,10 @@ function Ee(e) {
 			capStart: !1
 		})].filter((e) => e != null);
 	}
-	let r = Te(e);
+	let r = Pe(e);
 	return r ? [r] : [];
 }
-function De(e) {
+function Ie(e) {
 	let t = e.outline;
 	if (t.length < 3 || t.length > 64 || ![e.nearDepth, e.farDepth].every(Number.isFinite) || Math.abs(e.nearDepth - e.farDepth) < 1e-9 || !t.every((e) => Number.isFinite(e.x) && Number.isFinite(e.y))) return null;
 	let n = Math.min(e.nearDepth, e.farDepth), r = Math.max(e.nearDepth, e.farDepth), i = t.length, a = [...t.map((e) => ({
@@ -310,7 +329,7 @@ function De(e) {
 	return {
 		shape: "lineRibbon",
 		vertices: a,
-		faces: Ce(a, [
+		faces: Me(a, [
 			{
 				indices: o,
 				role: "side",
@@ -338,7 +357,7 @@ function De(e) {
 		silhouetteEdges: []
 	};
 }
-function Oe(e) {
+function Le(e) {
 	let { centerX: t, centerY: n, centerDepth: r, radius: i, modelDepth: a, thickness: o, startAngle: s, endAngle: c } = e;
 	if (![
 		t,
@@ -430,13 +449,13 @@ function Oe(e) {
 	return {
 		shape: "pieSector",
 		vertices: m,
-		faces: Ce(m, v),
+		faces: Me(m, v),
 		silhouetteEdges: h.slice(0, u ? void 0 : -1).map((e, t) => [e, g[t]])
 	};
 }
 //#endregion
 //#region packages/core/src/chart/three-d-scene.ts
-function ke(e, t) {
+function Re(e, t) {
 	if (![e, t].every(Number.isFinite)) return null;
 	let n = t - e;
 	if (n === 0) return e >= 0 && e <= 1 ? {
@@ -449,7 +468,7 @@ function ke(e, t) {
 		endT: o
 	} : null;
 }
-function Ae(e, t, n, r) {
+function ze(e, t, n, r) {
 	if (![
 		e,
 		t,
@@ -478,12 +497,12 @@ function Ae(e, t, n, r) {
 	}
 	return l;
 }
-var je = (e) => ({
+var Be = (e) => ({
 	minX: Math.min(...e.map((e) => e.x)),
 	maxX: Math.max(...e.map((e) => e.x)),
 	minY: Math.min(...e.map((e) => e.y)),
 	maxY: Math.max(...e.map((e) => e.y))
-}), Me = (e, t) => {
+}), Ve = (e, t) => {
 	let n = !1;
 	for (let r = 0, i = e.length - 1; r < e.length; i = r++) {
 		let a = e[r], o = e[i], s = (a.x - t.x) * (o.y - t.y) - (a.y - t.y) * (o.x - t.x), c = Math.max(1, Math.abs(a.x), Math.abs(a.y), Math.abs(o.x), Math.abs(o.y));
@@ -491,7 +510,7 @@ var je = (e) => ({
 		a.y > t.y != o.y > t.y && t.x < (o.x - a.x) * (t.y - a.y) / (o.y - a.y) + a.x && (n = !n);
 	}
 	return n;
-}, Ne = (e, t, n, r) => {
+}, He = (e, t, n, r) => {
 	let i = {
 		x: t.x - e.x,
 		y: t.y - e.y
@@ -509,23 +528,23 @@ var je = (e) => ({
 		y: e.y + i.y * c
 	};
 };
-function Pe(e, t, n, r) {
+function Ue(e, t, n, r) {
 	let i = [], a = (e) => {
 		i.length >= 12 || i.some((t) => Math.hypot(t.x - e.x, t.y - e.y) < 1e-7) || i.push(e);
 	}, o = {
 		x: (Math.max(n.minX, r.minX) + Math.min(n.maxX, r.maxX)) / 2,
 		y: (Math.max(n.minY, r.minY) + Math.min(n.maxY, r.maxY)) / 2
 	};
-	Me(e, o) && Me(t, o) && a(o);
-	for (let n of e) Me(t, n) && a(n);
-	for (let n of t) Me(e, n) && a(n);
+	Ve(e, o) && Ve(t, o) && a(o);
+	for (let n of e) Ve(t, n) && a(n);
+	for (let n of t) Ve(e, n) && a(n);
 	for (let n = 0; n < e.length && i.length < 12; n++) for (let r = 0; r < t.length && i.length < 12; r++) {
-		let i = Ne(e[n], e[(n + 1) % e.length], t[r], t[(r + 1) % t.length]);
+		let i = He(e[n], e[(n + 1) % e.length], t[r], t[(r + 1) % t.length]);
 		i && a(i);
 	}
 	return i;
 }
-function Fe(e, t) {
+function We(e, t) {
 	let n = e.cameraDepths;
 	if (!n || n.length !== e.points.length || e.points.length < 3) return e.cameraDepth;
 	let r = e.cameraWeights?.length === e.points.length ? e.cameraWeights : e.points.map(() => 1), i = e.points[0];
@@ -539,17 +558,17 @@ function Fe(e, t) {
 	}
 	return e.cameraDepth;
 }
-function Ie(e) {
+function Ge(e) {
 	if (e.length < 2) return [...e];
-	let t = [...e.keys()].sort((t, n) => e[t].cameraDepth - e[n].cameraDepth || t - n), n = e.map((e) => je(e.points)), r = [...e.keys()].sort((e, t) => n[e].minX - n[t].minX || e - t), i = e.map(() => /* @__PURE__ */ new Set()), a = e.map(() => 0), o = [], s = 0;
+	let t = [...e.keys()].sort((t, n) => e[t].cameraDepth - e[n].cameraDepth || t - n), n = e.map((e) => Be(e.points)), r = [...e.keys()].sort((e, t) => n[e].minX - n[t].minX || e - t), i = e.map(() => /* @__PURE__ */ new Set()), a = e.map(() => 0), o = [], s = 0;
 	for (let c of r) {
 		for (let e = o.length - 1; e >= 0; e--) n[o[e]].maxX < n[c].minX - 1e-9 && o.splice(e, 1);
 		for (let r of o) {
 			if (++s > 2e5) return t.map((t) => e[t]);
 			if (n[r].maxY < n[c].minY - 1e-9 || n[c].maxY < n[r].minY - 1e-9) continue;
-			let o = Pe(e[r].points, e[c].points, n[r], n[c]), l = 0;
+			let o = Ue(e[r].points, e[c].points, n[r], n[c]), l = 0;
 			for (let t of o) {
-				let n = Fe(e[r], t) - Fe(e[c], t), i = 1e-8 * Math.max(1, Math.abs(e[r].cameraDepth), Math.abs(e[c].cameraDepth));
+				let n = We(e[r], t) - We(e[c], t), i = 1e-8 * Math.max(1, Math.abs(e[r].cameraDepth), Math.abs(e[c].cameraDepth));
 				if (Math.abs(n) <= i) continue;
 				let a = n < 0 ? -1 : 1;
 				if (l !== 0 && l !== a) {
@@ -575,29 +594,29 @@ function Ie(e) {
 }
 //#endregion
 //#region packages/core/src/chart/three-d-stroke.ts
-var Y = 1e-9, Le = 1e4, Re = (e, t, n) => ({
+var Z = 1e-9, Ke = 1e4, qe = (e, t, n) => ({
 	x: e.x + (t.x - e.x) * n,
 	y: e.y + (t.y - e.y) * n,
 	cameraDepth: e.cameraDepth + (t.cameraDepth - e.cameraDepth) * n,
 	cameraWeight: (e.cameraWeight ?? 1) + ((t.cameraWeight ?? 1) - (e.cameraWeight ?? 1)) * n
-}), ze = (e, t) => Math.hypot(e.x - t.x, e.y - t.y) <= Y;
-function Be(e, t, n = 0) {
-	let r = t.filter((e) => Number.isFinite(e) && e > Y);
+}), Je = (e, t) => Math.hypot(e.x - t.x, e.y - t.y) <= Z;
+function Ye(e, t, n = 0) {
+	let r = t.filter((e) => Number.isFinite(e) && e > Z);
 	if (r.length === 0) return e.length >= 2 ? [[...e]] : [];
 	r.length % 2 == 1 && r.push(...r);
-	let i = [], a = 0, o = r[0], s = !0, c = r.reduce((e, t) => e + t, 0), l = c > Y && Number.isFinite(n) ? (n % c + c) % c : 0;
-	for (; l > Y;) {
+	let i = [], a = 0, o = r[0], s = !0, c = r.reduce((e, t) => e + t, 0), l = c > Z && Number.isFinite(n) ? (n % c + c) % c : 0;
+	for (; l > Z;) {
 		let e = Math.min(l, o);
-		l -= e, o -= e, o <= Y && (a = (a + 1) % r.length, o = r[a], s = a % 2 == 0);
+		l -= e, o -= e, o <= Z && (a = (a + 1) % r.length, o = r[a], s = a % 2 == 0);
 	}
 	let u = null;
 	for (let t = 0; t + 1 < e.length; t++) {
 		let n = e[t], c = e[t + 1], l = Math.hypot(c.x - n.x, c.y - n.y);
-		if (!(l > Y)) continue;
+		if (!(l > Z)) continue;
 		let d = 0;
-		for (; d < l - Y;) {
-			let e = Math.min(o, l - d), t = Re(n, c, d / l), f = Re(n, c, (d + e) / l);
-			if (s && (u ??= [], (u.length === 0 || !ze(u.at(-1), t)) && u.push(t), u.push(f)), d += e, o -= e, o <= Y) {
+		for (; d < l - Z;) {
+			let e = Math.min(o, l - d), t = qe(n, c, d / l), f = qe(n, c, (d + e) / l);
+			if (s && (u ??= [], (u.length === 0 || !Je(u.at(-1), t)) && u.push(t), u.push(f)), d += e, o -= e, o <= Z) {
 				if (s && u && u.length >= 2) {
 					if (i.length >= 1e4) return null;
 					i.push(u);
@@ -610,13 +629,13 @@ function Be(e, t, n = 0) {
 		if (i.length >= 1e4) return null;
 		i.push(u);
 	}
-	if (i.length > 1 && ze(e[0], e.at(-1)) && ze(i[0][0], e[0]) && ze(i.at(-1).at(-1), e.at(-1))) {
+	if (i.length > 1 && Je(e[0], e.at(-1)) && Je(i[0][0], e[0]) && Je(i.at(-1).at(-1), e.at(-1))) {
 		let e = i.shift(), t = i.pop();
 		i.unshift([...t, ...e.slice(1)]);
 	}
 	return i;
 }
-var Ve = (e, t) => ({
+var Xe = (e, t) => ({
 	kind: e,
 	points: t.map(({ x: e, y: t }) => ({
 		x: e,
@@ -625,7 +644,7 @@ var Ve = (e, t) => ({
 	cameraDepths: t.map((e) => e.cameraDepth),
 	cameraWeights: t.map((e) => e.cameraWeight ?? 1),
 	cameraDepth: t.reduce((e, t) => e + t.cameraDepth, 0) / t.length
-}), He = (e, t, n) => {
+}), Ze = (e, t, n) => {
 	let r = [];
 	for (let n = 0; n < 12; n++) {
 		let i = Math.PI * 2 * n / 12;
@@ -635,17 +654,17 @@ var Ve = (e, t) => ({
 			y: e.y + Math.sin(i) * t
 		});
 	}
-	return Ve(n, r);
+	return Xe(n, r);
 };
-function Ue(e, t, n) {
+function Qe(e, t, n) {
 	let r = Number.isFinite(n.width) ? Math.max(0, n.width) : 0;
-	if (!(r > Y) || t.length < 3) return null;
+	if (!(r > Z) || t.length < 3) return null;
 	let i = r / 2;
-	if ((n.lineJoin ?? "miter") === "round") return He(e, i, "join");
+	if ((n.lineJoin ?? "miter") === "round") return Ze(e, i, "join");
 	let a = [];
 	for (let n of t) {
 		let t = n.x - e.x, r = n.y - e.y, o = Math.hypot(t, r);
-		if (!(o > Y)) continue;
+		if (!(o > Z)) continue;
 		let s = -r / o * i, c = t / o * i;
 		a.push({
 			...e,
@@ -661,20 +680,20 @@ function Ue(e, t, n) {
 	a.sort((e, t) => e.x - t.x || e.y - t.y);
 	let o = (e, t, n) => (t.x - e.x) * (n.y - e.y) - (t.y - e.y) * (n.x - e.x), s = [];
 	for (let e of a) {
-		for (; s.length >= 2 && o(s.at(-2), s.at(-1), e) <= Y;) s.pop();
+		for (; s.length >= 2 && o(s.at(-2), s.at(-1), e) <= Z;) s.pop();
 		s.push(e);
 	}
 	let c = [];
 	for (let e of [...a].reverse()) {
-		for (; c.length >= 2 && o(c.at(-2), c.at(-1), e) <= Y;) c.pop();
+		for (; c.length >= 2 && o(c.at(-2), c.at(-1), e) <= Z;) c.pop();
 		c.push(e);
 	}
 	let l = [...s.slice(0, -1), ...c.slice(0, -1)];
-	return l.length >= 3 ? Ve("join", l) : null;
+	return l.length >= 3 ? Xe("join", l) : null;
 }
-var We = (e, t, n, r) => {
+var $e = (e, t, n, r) => {
 	let i = t.x * r.y - t.y * r.x;
-	if (Math.abs(i) <= Y) return null;
+	if (Math.abs(i) <= Z) return null;
 	let a = {
 		x: n.x - e.x,
 		y: n.y - e.y
@@ -684,17 +703,17 @@ var We = (e, t, n, r) => {
 		y: e.y + t.y * o
 	};
 };
-function Ge(e, t) {
+function et(e, t) {
 	let n = Number.isFinite(t.width) ? Math.max(0, t.width) : 0;
-	if (!(n > Y) || e.length < 2) return [];
-	let r = n / 2, i = t.lineCap ?? "butt", a = t.lineJoin ?? "miter", o = Math.max(1, t.miterLimit ?? 10), s = [], c = Be(e, t.dash ?? [], t.dashOffset);
+	if (!(n > Z) || e.length < 2) return [];
+	let r = n / 2, i = t.lineCap ?? "butt", a = t.lineJoin ?? "miter", o = Math.max(1, t.miterLimit ?? 10), s = [], c = Ye(e, t.dash ?? [], t.dashOffset);
 	if (c == null) return null;
 	let l = (e) => s.length >= 1e4 ? !1 : (s.push(e), !0);
 	for (let n = 0; n < c.length; n++) {
-		let s = c[n], u = s.length > 2 && ze(s[0], s.at(-1)), d = n === 0 && ze(s[0], e[0]) ? t.startCap ?? i : i, f = n + 1 === c.length && ze(s.at(-1), e.at(-1)) ? t.endCap ?? i : i, p = [];
+		let s = c[n], u = s.length > 2 && Je(s[0], s.at(-1)), d = n === 0 && Je(s[0], e[0]) ? t.startCap ?? i : i, f = n + 1 === c.length && Je(s.at(-1), e.at(-1)) ? t.endCap ?? i : i, p = [];
 		for (let e = 0; e + 1 < s.length; e++) {
 			let t = s[e], n = s[e + 1], r = Math.hypot(n.x - t.x, n.y - t.y);
-			p.push(r > Y ? {
+			p.push(r > Z ? {
 				x: (n.x - t.x) / r,
 				y: (n.y - t.y) / r
 			} : null);
@@ -714,7 +733,7 @@ function Ge(e, t) {
 				x: s[e + 1].x + n.x * _,
 				y: s[e + 1].y + n.y * _
 			};
-			if (!l(Ve("segment", [
+			if (!l(Xe("segment", [
 				{
 					...v,
 					x: v.x + i.x,
@@ -737,12 +756,12 @@ function Ge(e, t) {
 				}
 			]))) return null;
 		}
-		if (!u && d === "round" && !l(He(s[0], r, "cap")) || !u && f === "round" && !l(He(s.at(-1), r, "cap"))) return null;
+		if (!u && d === "round" && !l(Ze(s[0], r, "cap")) || !u && f === "round" && !l(Ze(s.at(-1), r, "cap"))) return null;
 		let m = (e, t, n) => {
 			if (!t || !n) return !0;
 			let i = t.x * n.y - t.y * n.x;
-			if (Math.abs(i) <= Y) return !0;
-			if (a === "round") return l(He(e, r, "join"));
+			if (Math.abs(i) <= Z) return !0;
+			if (a === "round") return l(Ze(e, r, "join"));
 			let s = i > 0 ? -1 : 1, c = {
 				...e,
 				x: e.x + -t.y * r * s,
@@ -753,8 +772,8 @@ function Ge(e, t) {
 				y: e.y + n.x * r * s
 			};
 			if (a === "miter") {
-				let i = We(c, t, u, n);
-				if (i && Math.hypot(i.x - e.x, i.y - e.y) <= r * o) return !!l(Ve("join", [
+				let i = $e(c, t, u, n);
+				if (i && Math.hypot(i.x - e.x, i.y - e.y) <= r * o) return !!l(Xe("join", [
 					c,
 					{
 						...e,
@@ -763,7 +782,7 @@ function Ge(e, t) {
 					u
 				]));
 			}
-			return l(Ve("join", [
+			return l(Xe("join", [
 				c,
 				e,
 				u
@@ -776,30 +795,30 @@ function Ge(e, t) {
 }
 //#endregion
 //#region packages/core/src/chart/three-d-outline.ts
-var Ke = 1e-9, qe = (e, t) => Math.hypot(e.x - t.x, e.y - t.y, e.depth - t.depth) <= Ke, Je = (e, t) => e.x - t.x || e.y - t.y || e.depth - t.depth, Ye = (e, t) => {
+var tt = 1e-9, nt = (e, t) => Math.hypot(e.x - t.x, e.y - t.y, e.depth - t.depth) <= tt, rt = (e, t) => e.x - t.x || e.y - t.y || e.depth - t.depth, it = (e, t) => {
 	let n = Math.min(e.length, t.length);
 	for (let r = 0; r < n; r++) {
-		let n = Je(e[r], t[r]);
+		let n = rt(e[r], t[r]);
 		if (n !== 0) return n;
 	}
 	return e.length - t.length;
 };
-function Xe(e) {
+function at(e) {
 	let t = [...e].reverse();
-	return Ye(e, t) <= 0 ? e : t;
+	return it(e, t) <= 0 ? e : t;
 }
-function Ze(e) {
-	let t = qe(e[0], e.at(-1)) ? e.slice(0, -1) : [...e];
+function ot(e) {
+	let t = nt(e[0], e.at(-1)) ? e.slice(0, -1) : [...e];
 	if (t.length === 0) return [];
 	let n = 0;
-	for (let e = 1; e < t.length; e++) Je(t[e], t[n]) < 0 && (n = e);
-	let r = t.map((e, r) => t[(n + r) % t.length]), i = t.map((e, r) => t[(n - r + t.length) % t.length]), a = Ye(r, i) <= 0 ? r : i;
+	for (let e = 1; e < t.length; e++) rt(t[e], t[n]) < 0 && (n = e);
+	let r = t.map((e, r) => t[(n + r) % t.length]), i = t.map((e, r) => t[(n - r + t.length) % t.length]), a = it(r, i) <= 0 ? r : i;
 	return [...a, a[0]];
 }
-function Qe(e) {
+function st(e) {
 	let t = [], n = (e) => {
-		let n = t.find((t) => qe(t.point, e));
-		if (n) return Je(e, n.point) < 0 && (n.point = e), n;
+		let n = t.find((t) => nt(t.point, e));
+		if (n) return rt(e, n.point) < 0 && (n.point = e), n;
 		let r = {
 			point: e,
 			edges: [],
@@ -808,11 +827,11 @@ function Qe(e) {
 		return t.push(r), r;
 	}, r = [];
 	for (let [t, i] of e) {
-		if (qe(t, i)) continue;
+		if (nt(t, i)) continue;
 		let e = n(t), a = n(i);
 		e !== a && r.push([e, a]);
 	}
-	t.sort((e, t) => Je(e.point, t.point)), t.forEach((e, t) => {
+	t.sort((e, t) => rt(e.point, t.point)), t.forEach((e, t) => {
 		e.order = t;
 	});
 	let i = [], a = /* @__PURE__ */ new Set();
@@ -840,47 +859,47 @@ function Qe(e) {
 		}
 		return n;
 	}, c = [];
-	for (let e of t) if (e.edges.length !== 2) for (let t of e.edges) o.has(t) || c.push(Xe(s(e, t)));
+	for (let e of t) if (e.edges.length !== 2) for (let t of e.edges) o.has(t) || c.push(at(s(e, t)));
 	for (let e = 0; e < i.length; e++) {
 		if (o.has(e)) continue;
 		let t = i[e], n = t.first.order <= t.second.order ? t.first : t.second;
-		c.push(Ze(s(n, e)));
+		c.push(ot(s(n, e)));
 	}
 	let l = t.filter((e) => e.edges.length > 2).map((e) => ({
 		point: e.point,
 		neighbours: e.edges.map((t) => {
 			let n = i[t];
 			return n.first === e ? n.second.point : n.first.point;
-		}).sort(Je)
+		}).sort(rt)
 	}));
 	return {
-		paths: c.sort(Ye),
+		paths: c.sort(it),
 		junctions: l
 	};
 }
 //#endregion
 //#region packages/core/src/chart/three-d-renderer.ts
-function $e(e) {
+function ct(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e.legendEntries ?? []) t.set(n.idx, n);
 	return t;
 }
-function et(e, t, n) {
-	let r = c(t?.fontSizeHpt ?? e.legendFontSizeHpt, n) ?? 9 * n, i = t?.fontFace ?? e.legendFontFace;
+function lt(e, t, n) {
+	let r = v(t?.fontSizeHpt ?? e.legendFontSizeHpt, n) ?? 9 * n, i = t?.fontFace ?? e.legendFontFace, a = t?.fontBold ?? e.legendFontBold ?? !1;
 	return {
 		fontPx: r,
-		font: `${t?.fontBold ?? e.legendFontBold ?? !1 ? "bold " : ""}${r}px ${ht(i)}`,
+		font: `${t?.fontItalic ?? e.legendFontItalic ?? !1 ? "italic " : ""}${a ? "bold " : ""}${r}px ${Tt(i)}`,
 		color: t?.fontColor ? `#${t.fontColor}` : e.legendFontColor ? `#${e.legendFontColor}` : "#595959"
 	};
 }
-var tt = [
+var ut = [
 	"4472C4",
 	"ED7D31",
 	"70AD47",
 	"A5A5A5",
 	"FFC000",
 	"5B9BD5"
-], nt = w, rt = S, it = new Set([
+], dt = _, ft = s, pt = new Set([
 	"line",
 	"stackedLine",
 	"stackedLinePct",
@@ -894,11 +913,11 @@ var tt = [
 	"stackedBarPct",
 	"stackedBarHPct"
 ]);
-function at(e, t) {
-	let n = Number.isFinite(t) && t > 0 ? t / H : 1, r = Number.isFinite(e) && e >= 0 ? e / U : 0;
+function mt(e, t) {
+	let n = Number.isFinite(t) && t > 0 ? t / ue : 1, r = Number.isFinite(e) && e >= 0 ? e / X : 0;
 	return Math.max(.25, r) * n;
 }
-function ot(e, t) {
+function ht(e, t) {
 	let n = Number.isSafeInteger(t) && t > 0 ? t : 0, r = Array.from({ length: n }, () => []);
 	for (let t of e) {
 		let e = t.categoryIndex;
@@ -906,18 +925,18 @@ function ot(e, t) {
 	}
 	return r;
 }
-var st = (e, t) => `#${t?.color ?? tt[e % tt.length]}`;
-function ct(e, t, n) {
+var gt = (e, t) => `#${t?.color ?? ut[e % ut.length]}`;
+function _t(e, t, n) {
 	let r = 0;
 	for (let i of e) for (let e of [t(i), n(i)]) {
 		if (e == null) continue;
-		let t = R(e);
-		if (e.fillType === "gradient" && t > nt || t > rt - r) return !1;
+		let t = D(e);
+		if (e.fillType === "gradient" && t > dt || t > ft - r) return !1;
 		r += t;
 	}
 	return !0;
 }
-function lt(e, t) {
+function vt(e, t) {
 	let n = Array.from({ length: t }, () => ({
 		maxMagnitude: 0,
 		scaledTotal: 0
@@ -932,7 +951,7 @@ function lt(e, t) {
 	}
 	return n;
 }
-function ut(e, t, n, r) {
+function yt(e, t, n, r) {
 	let i = e.series[t]?.values[n] ?? 0;
 	if (!Number.isFinite(i)) return 0;
 	if (!r) return i;
@@ -942,18 +961,18 @@ function ut(e, t, n, r) {
 	};
 	return a > 0 && o > 0 ? i / a / o * 100 : 0;
 }
-function X(e, t) {
+function bt(e, t) {
 	let n = e + t;
 	return Number.isFinite(n) ? n : t < 0 ? -Number.MAX_VALUE : Number.MAX_VALUE;
 }
-function dt(e) {
+function xt(e) {
 	let t = [];
 	for (let [n, r] of [
 		[e.threeD?.floor, "floor"],
 		[e.threeD?.sideWall, "wall"],
 		[e.threeD?.backWall, "wall"]
 	]) {
-		let i = b(e, n, r);
+		let i = A(e, n, r);
 		t.push({
 			fill: i.fill,
 			line: i.line
@@ -966,7 +985,7 @@ function dt(e) {
 			for (let i = 0; i < n.values.length; i++) {
 				let a = n.values[i];
 				if (a == null || !Number.isFinite(a) || Math.abs(a) <= 0) continue;
-				let o = Z(e, n, r.get(i), i, 0);
+				let o = Q(e, n, r.get(i), i, 0);
 				t.push({
 					fill: o.fill,
 					line: o.lineFill
@@ -974,7 +993,7 @@ function dt(e) {
 			}
 		}
 	} else if (e.chartType === "clusteredBar" || e.chartType === "clusteredBarH" || e.chartType.startsWith("stackedBar")) {
-		let n = e.chartType.startsWith("stacked"), r = e.chartType.endsWith("Pct"), i = n || e.dispBlanksAs === "zero", a = e.valAxisLogBase != null && Number.isFinite(e.valAxisLogBase) && e.valAxisLogBase >= 2, o = Math.max(1, e.categories.length, ...e.series.map((e) => Math.max(e.values.length, e.categories?.length ?? 0))), s = r ? lt(e, o) : void 0, c = (t, n) => {
+		let n = e.chartType.startsWith("stacked"), r = e.chartType.endsWith("Pct"), i = n || e.dispBlanksAs === "zero", a = e.valAxisLogBase != null && Number.isFinite(e.valAxisLogBase) && e.valAxisLogBase >= 2, o = Math.max(1, e.categories.length, ...e.series.map((e) => Math.max(e.values.length, e.categories?.length ?? 0))), s = r ? vt(e, o) : void 0, c = (t, n) => {
 			if (t === n) return !1;
 			let r = Math.min(t, n), i = Math.max(t, n), o = e.valMin, s = e.valMax;
 			return o != null && Number.isFinite(o) && i <= o || s != null && Number.isFinite(s) && r >= s ? !1 : !a || i > 0;
@@ -984,9 +1003,9 @@ function dt(e) {
 			for (let p = 0; p < o; p++) {
 				let o = d.values[p];
 				if (!(o != null && Number.isFinite(o) && (!a || o > 0) || o == null && i)) continue;
-				let m = ut(e, r, p, s), h = n ? m >= 0 ? l[p] : u[p] : 0, g = X(h, m);
+				let m = yt(e, r, p, s), h = n ? m >= 0 ? l[p] : u[p] : 0, g = bt(h, m);
 				if (n && (m >= 0 ? l[p] = g : u[p] = g), !c(h, g)) continue;
-				let _ = Z(e, d, f.get(p), p, r);
+				let _ = Q(e, d, f.get(p), p, r);
 				t.push({
 					fill: _.fill,
 					line: _.lineFill
@@ -994,11 +1013,11 @@ function dt(e) {
 			}
 		}
 	} else {
-		let n = e.chartType.toLowerCase().includes("area"), r = e.chartType.startsWith("stacked"), i = e.chartType.endsWith("Pct"), a = r || e.dispBlanksAs === "zero", o = e.valAxisLogBase != null && Number.isFinite(e.valAxisLogBase) && e.valAxisLogBase >= 2, s = Math.max(e.categories.length, ...e.series.map((e) => Math.max(e.categories?.length ?? 0, e.values.length))), c = i ? lt(e, s) : void 0, l = e.series.map(() => Array(s).fill(0));
+		let n = e.chartType.toLowerCase().includes("area"), r = e.chartType.startsWith("stacked"), i = e.chartType.endsWith("Pct"), a = r || e.dispBlanksAs === "zero", o = e.valAxisLogBase != null && Number.isFinite(e.valAxisLogBase) && e.valAxisLogBase >= 2, s = Math.max(e.categories.length, ...e.series.map((e) => Math.max(e.categories?.length ?? 0, e.values.length))), c = i ? vt(e, s) : void 0, l = e.series.map(() => Array(s).fill(0));
 		if (r) {
 			let t = Array(s).fill(0), n = Array(s).fill(0);
 			for (let r = 0; r < e.series.length; r++) for (let i = 0; i < s; i++) {
-				let a = ut(e, r, i, c), o = X(a >= 0 ? t[i] : n[i], a);
+				let a = yt(e, r, i, c), o = bt(a >= 0 ? t[i] : n[i], a);
 				l[r][i] = o, a >= 0 ? t[i] = o : n[i] = o;
 			}
 		}
@@ -1008,12 +1027,12 @@ function dt(e) {
 				let f = u.values[s];
 				if (f != null && Number.isFinite(f) && (!o || f > 0) || f == null && a) {
 					p++;
-					let a = r ? l[i][s] : ut(e, i, s, c), o = m == null ? a : Math.min(m, a), f = m == null ? a : Math.max(m, a), _ = e.valMin != null && Number.isFinite(e.valMin) && f <= e.valMin || e.valMax != null && Number.isFinite(e.valMax) && o >= e.valMax;
+					let a = r ? l[i][s] : yt(e, i, s, c), o = m == null ? a : Math.min(m, a), f = m == null ? a : Math.max(m, a), _ = e.valMin != null && Number.isFinite(e.valMin) && f <= e.valMin || e.valMax != null && Number.isFinite(e.valMax) && o >= e.valMax;
 					if (p >= 2 && (n || u.smooth === !0 || !_)) {
 						if (h = !0, n) break;
 						let r = d.get(s);
-						if (pt(r)) {
-							let n = Z(e, u, r, s, i);
+						if (Ct(r)) {
+							let n = Q(e, u, r, s, i);
 							t.push({
 								fill: void 0,
 								line: n.lineFill
@@ -1024,7 +1043,7 @@ function dt(e) {
 				} else (e.dispBlanksAs ?? "gap") === "gap" && (p = 0, m = null);
 			}
 			if (!h) continue;
-			let _ = Z(e, u, void 0, i, i);
+			let _ = Q(e, u, void 0, i, i);
 			n ? t.push({
 				fill: _.fill,
 				line: _.lineFill
@@ -1034,9 +1053,9 @@ function dt(e) {
 			});
 		}
 	}
-	return ct(t, (e) => e.fill, (e) => e.line);
+	return _t(t, (e) => e.fill, (e) => e.line);
 }
-function ft(e, t) {
+function St(e, t) {
 	return e?.fillType === "solid" ? {
 		color: `#${e.color}`,
 		fill: void 0
@@ -1045,52 +1064,44 @@ function ft(e, t) {
 		fill: e
 	};
 }
-function Z(t, n, r, i, a) {
-	let o = n.dataPointColors?.[i] ? `#${n.dataPointColors[i]}` : st(a, n), c = t.chartType === "pie" || t.varyColors === !0 && t.series.length === 1 && t.chartType.includes("Bar") ? i : a, l, u = o, d = e(r?.chartexStyle, i);
-	if (d !== void 0) ({color: u, fill: l} = ft(d, u));
-	else if (r?.fillHidden === !0 || r?.color === "00000000") l = null;
-	else if (r?.color) u = `#${r.color}`;
+function Q(e, n, r, i, a, o = !0) {
+	let s = o && n.dataPointColors?.[i] ? `#${n.dataPointColors[i]}` : gt(a, n), c = re(e, a) ? i : n.chartexFormatIdx ?? a, l = n.seriesType ?? e.chartType, u = l === "line" || l === "stackedLine" || l === "stackedLinePct", d = q(e, "dataPoint3D", a), f = W(e, "dataPoint3D"), p, m = s, h = Oe(e, n, r, i, a);
+	h !== void 0 && ({color: m, fill: p} = St(h, m));
+	let g, _ = null, v = O(r?.chartexStyle, f, i);
+	if (v === void 0 && r?.lineHidden === !0 && (v = t(f)), v !== void 0) v?.fillType === "solid" ? _ = `#${v.color}` : g = v;
+	else if (r?.lineColor) _ = `#${r.lineColor}`;
 	else {
-		let r = e(n.chartexStyle, c);
-		if (r !== void 0) ({color: u, fill: l} = ft(r, u));
+		let e = O(n.chartexStyle, f, c);
+		if (e === void 0 && n.lineHidden === !0 && (e = t(f)), e !== void 0) e?.fillType === "solid" ? _ = `#${e.color}` : g = e;
+		else if (n.lineColor) _ = `#${n.lineColor}`;
+		else if (u) g = p === null ? null : p;
 		else {
-			let n = e(t.chartStyleRoles?.dataPoint3D, c);
-			n !== void 0 && ({color: u, fill: l} = ft(n, u));
+			let e = K(d, f, c, r?.chartexStyle, n.chartexStyle);
+			e !== void 0 && (e?.fillType === "solid" ? _ = `#${e.color}` : g = e);
 		}
 	}
-	let f, p = null, m = s(r?.chartexStyle, i);
-	if (m !== void 0) m?.fillType === "solid" ? p = `#${m.color}` : f = m;
-	else if (r?.lineHidden === !0) f = null;
-	else if (r?.lineColor) p = `#${r.lineColor}`;
-	else {
-		let e = s(n.chartexStyle, c);
-		if (e !== void 0) e?.fillType === "solid" ? p = `#${e.color}` : f = e;
-		else if (n.lineHidden === !0) f = null;
-		else if (n.lineColor) p = `#${n.lineColor}`;
-		else {
-			let e = s(t.chartStyleRoles?.dataPoint3D, c);
-			e !== void 0 && (e?.fillType === "solid" ? p = `#${e.color}` : f = e);
-		}
-	}
-	let h = t.chartStyleRoles?.dataPoint3D?.lineNoStyle === !0 ? void 0 : t.chartStyleRoles?.dataPoint3D, g = r?.chartexStyle?.lineCap ?? n.chartexStyle?.lineCap ?? h?.lineCap, _ = r?.chartexStyle?.lineJoin ?? n.chartexStyle?.lineJoin ?? h?.lineJoin;
+	let y = u ? void 0 : d, b = r?.chartexStyle?.lineCap ?? n.chartexStyle?.lineCap ?? y?.lineCap, x = r?.chartexStyle?.lineJoin ?? n.chartexStyle?.lineJoin ?? y?.lineJoin, S = N(r?.lineDash == null ? r?.chartexStyle : {
+		lineDash: r.lineDash,
+		lineDashAuthored: !0
+	}, n.chartexStyle, y);
 	return {
-		color: u,
-		fill: l,
-		lineColor: p,
-		lineFill: f,
-		lineWidthEmu: r?.lineWidthEmu ?? r?.chartexStyle?.lineWidthEmu ?? n.lineWidthEmu ?? n.chartexStyle?.lineWidthEmu ?? h?.lineWidthEmu,
-		lineDash: r?.lineDash ?? r?.chartexStyle?.lineDash ?? n.chartexStyle?.lineDash ?? h?.lineDash,
-		lineCustomDash: r?.chartexStyle?.lineCustomDash ?? n.chartexStyle?.lineCustomDash ?? h?.lineCustomDash,
-		lineCap: g === "rnd" ? "round" : g === "sq" ? "square" : "butt",
-		lineJoin: _ === "round" || _ === "bevel" ? _ : "miter"
+		color: m,
+		fill: p,
+		lineColor: _,
+		lineFill: g,
+		lineWidthEmu: r?.lineWidthEmu ?? r?.chartexStyle?.lineWidthEmu ?? n.lineWidthEmu ?? n.chartexStyle?.lineWidthEmu ?? y?.lineWidthEmu,
+		lineDash: S?.lineDash,
+		lineCustomDash: S?.lineCustomDash,
+		lineCap: b === "rnd" ? "round" : b === "sq" ? "square" : "butt",
+		lineJoin: x === "round" || x === "bevel" ? x : "miter"
 	};
 }
-function pt(e) {
+function Ct(e) {
 	if (!e) return !1;
 	let t = e.chartexStyle;
 	return e.lineHidden != null || e.lineColor != null || e.lineWidthEmu != null || e.lineDash != null || t?.linePaintAuthored === !0 || t?.lineHidden != null || t?.lineNoStyle === !0 || t?.lineColors?.some((e) => e != null) === !0 || t?.linePaints?.some((e) => e != null) === !0 || t?.lineWidthEmu != null || t?.lineDash != null || t?.lineCustomDash != null || t?.lineCap != null || t?.lineJoin != null;
 }
-function mt(e, t) {
+function wt(e, t) {
 	let n = e.cameraNormal(t);
 	if (!n) return 1;
 	let r = {
@@ -1100,20 +1111,20 @@ function mt(e, t) {
 	}, i = Math.hypot(r.x, r.y, r.z), a = Math.max(0, (n.x * r.x + n.y * r.y + n.z * r.z) / i);
 	return Math.max(.78, Math.min(1, .78 + .24 * a));
 }
-var ht = (e) => `"${e && !e.startsWith("+") ? e.replace(/["\\]/g, "") : "Arial"}"`, Q = (e, t, n = "minor") => ht((t?.startsWith("+mj-") ? e.themeMajorFontLatin : t?.startsWith("+mn-") ? e.themeMinorFontLatin : t) ?? (n === "major" ? e.themeMajorFontLatin : e.themeMinorFontLatin));
-function gt(e, t) {
+var Tt = (e) => `"${e && !e.startsWith("+") ? e.replace(/["\\]/g, "") : "Arial"}"`, $ = (e, t, n = "minor") => Tt((t?.startsWith("+mj-") ? e.themeMajorFontLatin : t?.startsWith("+mn-") ? e.themeMinorFontLatin : t) ?? (n === "major" ? e.themeMajorFontLatin : e.themeMinorFontLatin));
+function Et(e, t) {
 	if (t.length) {
 		e.beginPath(), e.moveTo(t[0].x, t[0].y);
 		for (let n = 1; n < t.length; n++) e.lineTo(t[n].x, t[n].y);
 		e.closePath();
 	}
 }
-var _t = (e) => e === "transparent" || e === "#00000000" || e === "rgba(0,0,0,0)";
-function vt(e, t, n, r) {
-	_t(n) || (gt(e, t), e.fillStyle = n, e.fill(), r > 0 && (gt(e, t), e.fillStyle = `rgba(0,0,0,${r})`, e.fill()));
+var Dt = (e) => e === "transparent" || e === "#00000000" || e === "rgba(0,0,0,0)";
+function Ot(e, t, n, r) {
+	Dt(n) || (Et(e, t), e.fillStyle = n, e.fill(), r > 0 && (Et(e, t), e.fillStyle = `rgba(0,0,0,${r})`, e.fill()));
 }
-function yt(e, t, n, r, i, a, o, s, c, l, u, d) {
-	return Ee({
+function kt(e, t, n, r, i, a, o, s, c, l, u, d) {
+	return Fe({
 		x0: t,
 		x1: n,
 		lower0: r,
@@ -1124,13 +1135,13 @@ function yt(e, t, n, r, i, a, o, s, c, l, u, d) {
 		farDepth: c,
 		capStart: u,
 		capEnd: d
-	}).flatMap((t) => xt(e, t, l).map((e) => ({
+	}).flatMap((t) => jt(e, t, l).map((e) => ({
 		...e,
 		outline: !1,
 		outlineSegments: void 0
 	})));
 }
-function bt(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m = !1, h = !1, g, _) {
+function At(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m = !1, h = !1, g, _) {
 	if (![
 		r,
 		i,
@@ -1141,7 +1152,7 @@ function bt(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m = !1, h = !1, g, _) {
 		l,
 		u
 	].every(Number.isFinite) || a <= 0 || o <= 0 || s === c) return [];
-	let v = we({
+	let v = Ne({
 		shape: t,
 		horizontal: n,
 		crossStart: n ? i : r,
@@ -1155,9 +1166,9 @@ function bt(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m = !1, h = !1, g, _) {
 		omitBaseCap: m,
 		omitEndCap: h
 	});
-	return v ? xt(e, v, d, g, _) : [];
+	return v ? jt(e, v, d, g, _) : [];
 }
-function xt(e, t, n, r, i, a = !1) {
+function jt(e, t, n, r, i, a = !1) {
 	if (i?.exceeded) return [];
 	let o = t.faces.map((r) => {
 		let i = r.indices.map((e) => t.vertices[e]), a = e.cameraFacing(i);
@@ -1179,7 +1190,7 @@ function xt(e, t, n, r, i, a = !1) {
 			facing: a,
 			face: {
 				points: o,
-				color: J(n, mt(e, i)),
+				color: Ce(n, wt(e, i)),
 				paintRole: "fill",
 				shade: 0,
 				cameraDepth: i.reduce((t, n) => t + e.cameraDepth(n.x, n.y, n.depth), 0) / i.length,
@@ -1216,11 +1227,11 @@ function xt(e, t, n, r, i, a = !1) {
 		let t = [d ? void 0 : e.meshFace.baseRimEdge, f ? void 0 : e.meshFace.endRimEdge].filter((e) => e != null);
 		for (let [e, n] of t) l(e, n);
 	}
-	let p = Qe([...c.values()].map(([e, n]) => [t.vertices[e], t.vertices[n]]));
+	let p = st([...c.values()].map(([e, n]) => [t.vertices[e], t.vertices[n]]));
 	if (!r) return s;
 	let m = (e, t) => Math.hypot(e.x - t.x, e.y - t.y, e.depth - t.depth) <= 1e-9, h = (e) => p.junctions.some((t) => m(t.point, e));
 	for (let t of p.paths) {
-		let n = t.map((t) => e.project(t.x, t.y, t.depth)), a = t.map((t) => e.cameraDepth(t.x, t.y, t.depth)), o = t.map((t) => e.cameraProjectionWeight(t.x, t.y, t.depth)), c = Ge(n.map((e, t) => ({
+		let n = t.map((t) => e.project(t.x, t.y, t.depth)), a = t.map((t) => e.cameraDepth(t.x, t.y, t.depth)), o = t.map((t) => e.cameraProjectionWeight(t.x, t.y, t.depth)), c = et(n.map((e, t) => ({
 			...e,
 			cameraDepth: a[t],
 			cameraWeight: o[t]
@@ -1250,7 +1261,7 @@ function xt(e, t, n, r, i, a = !1) {
 		}));
 	}
 	for (let t of p.junctions) {
-		let n = Ue({
+		let n = Qe({
 			...e.project(t.point.x, t.point.y, t.point.depth),
 			cameraDepth: e.cameraDepth(t.point.x, t.point.y, t.point.depth),
 			cameraWeight: e.cameraProjectionWeight(t.point.x, t.point.y, t.point.depth)
@@ -1279,7 +1290,7 @@ function xt(e, t, n, r, i, a = !1) {
 	}
 	return s;
 }
-function St(e, t, n, r, i, a, o) {
+function Mt(e, t, n, r, i, a, o) {
 	if (!t.length || o.exceeded) return [];
 	let s = [...t].sort((e, t) => e.start - t.start), c = n - i / 2, l = n + i / 2, u = s[0], d = e.cameraDepth(u.centerX, c, u.centerDepth) >= e.cameraDepth(u.centerX, l, u.centerDepth) ? c : l, f = d === c ? l : c, p = (t, n, i) => ({
 		x: t.centerX + Math.cos(n) * r,
@@ -1291,7 +1302,7 @@ function St(e, t, n, r, i, a, o) {
 		depth: e.centerDepth
 	}), h = [], g = (t, n = !1) => {
 		if (t.length < 2 || o.exceeded) return;
-		let r = t[0], i = t.at(-1), s = Math.hypot(r.x - i.x, r.y - i.y, r.depth - i.depth) <= 1e-9, c = Ge((n && !s ? [...t, r] : [...t]).map((t) => ({
+		let r = t[0], i = t.at(-1), s = Math.hypot(r.x - i.x, r.y - i.y, r.depth - i.depth) <= 1e-9, c = et((n && !s ? [...t, r] : [...t]).map((t) => ({
 			...e.project(t.x, t.y, t.depth),
 			cameraDepth: e.cameraDepth(t.x, t.y, t.depth),
 			cameraWeight: e.cameraProjectionWeight(t.x, t.y, t.depth)
@@ -1371,10 +1382,22 @@ function St(e, t, n, r, i, a, o) {
 	for (let { slice: e, angle: t } of C.values()) g([p(e, t, d), p(e, t, f)]);
 	return h;
 }
-function Ct(e, t) {
-	t.paint !== null && (t.paint === void 0 ? vt(e, t.points, t.color, t.shade) : (gt(e, t.points), e.fillStyle = t.paint, e.fill()), t.outline && (e.strokeStyle = t.outlineColor ?? "rgba(0,0,0,0.42)", e.lineWidth = t.outlineWidth ?? .75, e.setLineDash(B(t.outlineDash ?? "solid", e.lineWidth)), e.lineCap = t.outlineCap ?? "butt", e.lineJoin = t.outlineJoin ?? "miter", t.outline && (gt(e, t.points), e.stroke()), e.setLineDash([])));
+function Nt(e, t) {
+	t.paint !== null && (t.paint === void 0 ? Ot(e, t.points, t.color, t.shade) : (Et(e, t.points), e.fillStyle = t.paint, e.fill()), t.outline && (e.strokeStyle = t.outlineColor ?? "rgba(0,0,0,0.42)", e.lineWidth = t.outlineWidth ?? .75, e.setLineDash(ce(t.outlineDash ?? "solid", e.lineWidth)), e.lineCap = t.outlineCap ?? "butt", e.lineJoin = t.outlineJoin ?? "miter", t.outline && (Et(e, t.points), e.stroke()), e.setLineDash([])));
+}
+function Pt(e, t) {
+	let n = t.filter((e) => e.paint !== null && e.points.length >= 3);
+	if (n.length) {
+		e.beginPath();
+		for (let t of n) {
+			e.moveTo(t.points[0].x, t.points[0].y);
+			for (let n = 1; n < t.points.length; n++) e.lineTo(t.points[n].x, t.points[n].y);
+			e.closePath();
+		}
+		e.fillStyle = "#000000", e.fill();
+	}
 }
-function wt(e, t, n, r, i) {
+function Ft(e, t, n, r, i) {
 	if (r === void 0) return;
 	let a = t.filter((e) => e.paintRole === n);
 	if (!a.length) return;
@@ -1382,48 +1405,59 @@ function wt(e, t, n, r, i) {
 		for (let e of a) e.paint = null;
 		return;
 	}
-	let o = a.flatMap((e) => e.points), s = Math.min(...o.map((e) => e.x)), c = Math.max(...o.map((e) => e.x)), l = Math.min(...o.map((e) => e.y)), u = Math.max(...o.map((e) => e.y)), d = z(r, e, s, l, c - s, u - l, i);
+	let o = a.flatMap((e) => e.points), s = Math.min(...o.map((e) => e.x)), c = Math.max(...o.map((e) => e.x)), l = Math.min(...o.map((e) => e.y)), u = Math.max(...o.map((e) => e.y)), d = R(r, e, s, l, c - s, u - l, i);
 	for (let e of a) e.paint = d;
 }
-function Tt(e, t) {
+function It(e, t) {
 	e.fillStyle = "#888", e.font = "12px sans-serif", e.textAlign = "center", e.textBaseline = "middle", e.fillText("(too many data points)", t.x + t.w / 2, t.y + t.h / 2);
 }
-function Et(e) {
+function Lt(e) {
 	let t = e.catAxisLabelRotation;
 	return t == null ? null : !Number.isFinite(t) || Math.abs(t) > 54e5 ? 0 : t / 6e4 * Math.PI / 180;
 }
-function Dt(e, t, n, r, i, a = 1, o = 6) {
+function Rt(e, t, n, r, i, a = 1, o = 6) {
 	if (i || r === 0) {
 		e.textAlign = i ? "right" : "center", e.textBaseline = i ? "middle" : a < 0 ? "bottom" : "top", e.fillText(t, n.x + (i ? -o : 0), n.y + (i ? 0 : a * o));
 		return;
 	}
 	e.save(), e.translate(n.x, n.y + a * o), e.rotate(r), e.textAlign = a < 0 ? "left" : "right", e.textBaseline = "middle", e.fillText(t, 0, 0), e.restore();
 }
-function Ot(e, t, n, r, i, a, o, s = void 0, c = 0, l = H) {
+function zt(e, t, n, r, i, a, o, s = void 0, c = 0, l = ue, u = void 0, d = void 0, f = 0, p = f, m = void 0, h = void 0, g = void 0, _ = void 0, v = void 0) {
 	if (!(r > 0) || !Number.isFinite(t.x) || !Number.isFinite(t.y)) return;
-	let u = r / 2;
-	switch (e.beginPath(), n) {
+	let y = r / 2;
+	if (u !== void 0 || d !== void 0) {
+		F(e, u, d, f, {
+			x: t.x - y,
+			y: t.y - y,
+			w: r,
+			h: r
+		}, l, (e) => zt(e, t, n, r, i, a, o, s, c, l, void 0, void 0, 0, 0, m, h, g, _, v), p);
+		return;
+	}
+	e.beginPath();
+	let b = m === void 0 ? a : m == null ? null : m.fillType === "solid" ? `#${m.color}` : R(m, e, t.x - y, t.y - y, r, r, c);
+	switch (b && (e.strokeStyle = b, e.lineWidth = o, e.setLineDash(ae(g, h, o)), e.lineCap = _ === "rnd" ? "round" : _ === "sq" ? "square" : "butt", e.lineJoin = v === "round" || v === "bevel" ? v : "miter"), n) {
 		case "square":
-			e.rect(t.x - u, t.y - u, r, r);
+			e.rect(t.x - y, t.y - y, r, r);
 			break;
 		case "diamond":
-			e.moveTo(t.x, t.y - u), e.lineTo(t.x + u, t.y), e.lineTo(t.x, t.y + u), e.lineTo(t.x - u, t.y), e.closePath();
+			e.moveTo(t.x, t.y - y), e.lineTo(t.x + y, t.y), e.lineTo(t.x, t.y + y), e.lineTo(t.x - y, t.y), e.closePath();
 			break;
 		case "triangle":
-			e.moveTo(t.x, t.y - u), e.lineTo(t.x + u, t.y + u), e.lineTo(t.x - u, t.y + u), e.closePath();
+			e.moveTo(t.x, t.y - y), e.lineTo(t.x + y, t.y + y), e.lineTo(t.x - y, t.y + y), e.closePath();
 			break;
 		case "x":
 		case "plus": {
 			let r = n === "x";
-			e.moveTo(t.x - u, t.y + (r ? -u : 0)), e.lineTo(t.x + u, t.y + (r ? u : 0)), e.moveTo(t.x + (r ? -u : 0), t.y + u), e.lineTo(t.x + (r ? u : 0), t.y - u), e.strokeStyle = a, e.lineWidth = o, e.stroke();
+			e.moveTo(t.x - y, t.y + (r ? -y : 0)), e.lineTo(t.x + y, t.y + (r ? y : 0)), e.moveTo(t.x + (r ? -y : 0), t.y + y), e.lineTo(t.x + (r ? y : 0), t.y - y), b && e.stroke();
 			return;
 		}
 		case "dash":
-			e.rect(t.x - u, t.y - r * .1, r, r * .2);
+			e.rect(t.x - y, t.y - r * .1, r, r * .2);
 			break;
 		case "star":
 			for (let n = 0; n < 10; n++) {
-				let r = -Math.PI / 2 + n * Math.PI / 5, i = n % 2 == 0 ? u : u * .4, a = t.x + Math.cos(r) * i, o = t.y + Math.sin(r) * i;
+				let r = -Math.PI / 2 + n * Math.PI / 5, i = n % 2 == 0 ? y : y * .4, a = t.x + Math.cos(r) * i, o = t.y + Math.sin(r) * i;
 				n ? e.lineTo(a, o) : e.moveTo(a, o);
 			}
 			e.closePath();
@@ -1432,327 +1466,369 @@ function Ot(e, t, n, r, i, a, o, s = void 0, c = 0, l = H) {
 			e.ellipse(t.x, t.y, r * .25, r * .1, 0, 0, Math.PI * 2);
 			break;
 		case "picture":
-			s?.fillType === "image" && d(e, s, t.x - u, t.y - u, r, r, l, c), e.strokeStyle = a, e.lineWidth = o, e.strokeRect(t.x - u, t.y - u, r, r);
+			s?.fillType === "image" && Y(e, s, t.x - y, t.y - y, r, r, l, c), b && e.strokeRect(t.x - y, t.y - y, r, r);
 			return;
 		default:
-			e.arc(t.x, t.y, u, 0, Math.PI * 2);
+			e.arc(t.x, t.y, y, 0, Math.PI * 2);
 			break;
 	}
-	let f = s?.fillType === "image" ? s : void 0, p = f ? null : s === void 0 ? i === "transparent" ? null : i : s == null ? null : z(s, e, t.x - u, t.y - u, r, r, c);
-	p == null ? f && (e.save(), e.clip(), d(e, f, t.x - u, t.y - u, r, r, l, c), e.restore()) : (e.fillStyle = p, e.fill()), e.strokeStyle = a, e.lineWidth = o, e.stroke();
-}
-function kt(e, t, r, a, o, s, l, u, d, f = 0, p, m, h = "t", g = l, _ = !0, b, x, S = s, C = 0) {
-	let w = m, T = r.seriesDataLabels;
-	if (v(T, w) || t.showDataLabelsOverMax !== !0 && x != null && Number.isFinite(x) && S > x) return;
-	let E = w?.showVal ?? T?.showVal ?? t.showDataLabels, D = w?.showCatName ?? T?.showCatName ?? !1, O = w?.showSerName ?? T?.showSerName ?? !1, ee = w?.showPercent ?? T?.showPercent ?? !1, A = w?.text, j = fe({
-		customText: A,
-		showCategory: D,
-		showSeries: O,
-		showValue: E,
-		showPercent: ee,
-		category: r.categories?.[o] ?? t.categories[o] ?? `${o + 1}`,
-		seriesName: r.name || `Series ${a + 1}`,
-		sourceValue: s,
-		valueDivisor: b?.divisor,
-		percentRatio: p != null && Number.isFinite(p) ? p : void 0,
-		formatCode: w?.formatCode ?? T?.formatCode ?? t.dataLabelFormatCode ?? r.valFormatCode,
-		percentFormatCode: w?.formatCode ?? T?.formatCode ?? t.dataLabelFormatCode ?? "0%",
+	let x = s?.fillType === "image" ? s : void 0, S = x ? null : s === void 0 ? i === "transparent" ? null : i : s == null ? null : R(s, e, t.x - y, t.y - y, r, r, c);
+	S == null ? x && (e.save(), e.clip(), Y(e, x, t.x - y, t.y - y, r, r, l, c), e.restore()) : (e.fillStyle = S, e.fill()), b && e.stroke();
+}
+function Bt(e, t, n, r, a, o, s, c, l, u = 0, d, f, p = "t", m = s, h = !0, g, _, y = o, b = 0) {
+	let x = f, S = n.seriesDataLabels;
+	if (U(S, x) || t.showDataLabelsOverMax !== !0 && _ != null && Number.isFinite(_) && y > _) return;
+	let w = x?.showVal ?? S?.showVal ?? t.showDataLabels, T = x?.showCatName ?? S?.showCatName ?? !1, E = x?.showSerName ?? S?.showSerName ?? !1, D = x?.showPercent ?? S?.showPercent ?? !1, O = x?.text, A = C({
+		customText: O,
+		showCategory: T,
+		showSeries: E,
+		showValue: w,
+		showPercent: D,
+		category: n.categories?.[a] ?? t.categories[a] ?? `${a + 1}`,
+		seriesName: n.name || `Series ${r + 1}`,
+		sourceValue: o,
+		valueDivisor: g?.divisor,
+		percentRatio: d != null && Number.isFinite(d) ? d : void 0,
+		formatCode: x?.formatCode ?? S?.formatCode ?? t.dataLabelFormatCode ?? n.valFormatCode,
+		percentFormatCode: x?.formatCode ?? S?.formatCode ?? t.dataLabelFormatCode ?? "0%",
 		date1904: t.date1904,
-		separator: w?.separator ?? T?.separator
+		separator: x?.separator ?? S?.separator
 	});
-	if (!j) return;
-	let N = c(w?.fontSizeHpt ?? T?.fontSizeHpt ?? t.dataLabelFontSizeHpt, d) ?? 9 * d, P = w?.fontBold ?? T?.fontBold ?? t.dataLabelFontBold ?? !1, F = n(w, T), te = Q(t, w?.fontFace ?? T?.fontFace ?? t.dataLabelFontFace);
-	e.font = `${F.fontItalic ? "italic " : ""}${P ? "bold " : ""}${N}px ${te}`;
-	let ne = `#${w?.fontColor ?? T?.fontColor ?? r.labelColor ?? t.dataLabelFontColor ?? "111111"}`, I = A && w?.richRuns?.length ? ce(e, {
-		runs: w.richRuns,
-		ptToPx: d,
-		fontFamily: te,
-		fallbackBold: P,
-		fallbackItalic: F.fontItalic,
-		fallbackBaseline: F.fontBaseline,
-		fallbackColorHidden: F.fontPaintAuthored === !0 && (F.fontHidden === !0 || F.fontColor == null),
-		fontFamilyForFace: (e) => Q(t, e)
-	}, N, ne) : null, L = I ? [] : re(j, Math.max(N, u.w * .45), Math.max(N * 1.2, u.h * .35), N * 1.2, (t) => e.measureText(t).width, F);
-	if (!I && !L.length) return;
-	let R = I?.width ?? Math.max(...L.map((t) => e.measureText(t).width)), z = I?.height ?? L.length * N * 1.2, V = ie(F, d), H = y(R + V.left + V.right, z + V.top + V.bottom, F.textRotation, F.textVerticalMode), G = M({
+	if (!A) return;
+	let j = v(x?.fontSizeHpt ?? S?.fontSizeHpt ?? t.dataLabelFontSizeHpt, l) ?? 9 * l, N = x?.fontBold ?? S?.fontBold ?? t.dataLabelFontBold ?? !1, P = z(x, S), F = $(t, x?.fontFace ?? S?.fontFace ?? t.dataLabelFontFace);
+	e.font = `${P.fontItalic ? "italic " : ""}${N ? "bold " : ""}${j}px ${F}`;
+	let R = `#${x?.fontColor ?? S?.fontColor ?? n.labelColor ?? t.dataLabelFontColor ?? "111111"}`, B = O && x?.richRuns?.length ? ge(e, {
+		runs: x.richRuns,
+		ptToPx: l,
+		fontFamily: F,
+		fallbackBold: N,
+		fallbackItalic: P.fontItalic,
+		fallbackBaseline: P.fontBaseline,
+		fallbackColorHidden: P.fontPaintAuthored === !0 && (P.fontHidden === !0 || P.fontColor == null),
+		fontFamilyForFace: (e) => $(t, e)
+	}, j, R) : null, V = B ? [] : L(A, Math.max(j, c.w * .45), Math.max(j * 1.2, c.h * .35), j * 1.2, (t) => e.measureText(t).width, P);
+	if (!B && !V.length) return;
+	let H = B?.width ?? Math.max(...V.map((t) => e.measureText(t).width)), ee = B?.height ?? V.length * j * 1.2, W = te(P, l), G = k(H + W.left + W.right, ee + W.top + W.bottom, P.textRotation, P.textVerticalMode), K = se({
 		kind: "point",
-		x: l.x,
-		y: l.y,
-		position: w?.position ?? T?.position ?? t.dataLabelPosition ?? h,
-		markerGap: f
-	}, u, {
-		w: H.w,
-		h: H.h
-	}, N, w?.manualLayout, u);
-	if (!G) return;
-	let K = W(w?.labelBox, T?.labelBox);
-	T?.showLeaderLines && T.leaderLineHidden !== !0 && _ && (e.beginPath(), e.moveTo(g.x, g.y), e.lineTo(Math.max(G.rect.x, Math.min(g.x, G.rect.x + G.rect.w)), Math.max(G.rect.y, Math.min(g.y, G.rect.y + G.rect.h))), e.strokeStyle = `#${T.leaderLineColor ?? "808080"}`, e.lineWidth = T.leaderLineWidthEmu == null ? .75 * d : Math.max(.25, T.leaderLineWidthEmu / U * d), e.setLineDash(B(T.leaderLineDash ?? "solid", e.lineWidth)), e.stroke()), oe(e, K, G.rect, d, C), e.save(), e.beginPath(), e.rect(G.clip.x, G.clip.y, G.clip.w, G.clip.h), e.clip();
-	let q = k(F, G.textAlign), se = ae(G.x, G.y, G.rect, z + V.top + V.bottom, F, w?.manualLayout != null, q, G.textAlign, R + V.left + V.right, H.radians), J = i(e, se.x, se.y, H.radians, q, G.textBaseline, V);
-	if (I) {
-		le(e, I, J.x, J.y, q, G.textBaseline, w?.manualLayout ? Math.max(0, G.rect.w - V.left - V.right) : I.width), e.restore();
+		x: s.x,
+		y: s.y,
+		position: x?.position ?? S?.position ?? t.dataLabelPosition ?? p,
+		markerGap: u
+	}, c, {
+		w: G.w,
+		h: G.h
+	}, j, x?.manualLayout, c);
+	if (!K) return;
+	let q = le(x?.labelBox, S?.labelBox);
+	S?.showLeaderLines && S.leaderLineHidden !== !0 && h && (e.beginPath(), e.moveTo(m.x, m.y), e.lineTo(Math.max(K.rect.x, Math.min(m.x, K.rect.x + K.rect.w)), Math.max(K.rect.y, Math.min(m.y, K.rect.y + K.rect.h))), e.strokeStyle = `#${S.leaderLineColor ?? "808080"}`, e.lineWidth = S.leaderLineWidthEmu == null ? .75 * l : Math.max(.25, S.leaderLineWidthEmu / X * l), e.setLineDash(ce(S.leaderLineDash ?? "solid", e.lineWidth)), e.stroke()), i(e, q, K.rect, l, b), e.save(), e.beginPath(), e.rect(K.clip.x, K.clip.y, K.clip.w, K.clip.h), e.clip();
+	let J = I(P, K.textAlign), ne = M(K.x, K.y, K.rect, ee + W.top + W.bottom, P, x?.manualLayout != null, J, K.textAlign, H + W.left + W.right, G.radians), Y = ie(e, ne.x, ne.y, G.radians, J, K.textBaseline, W);
+	if (B) {
+		ye(e, B, Y.x, Y.y, J, K.textBaseline, x?.manualLayout ? Math.max(0, K.rect.w - W.left - W.right) : B.width), e.restore();
 		return;
 	}
-	if (!(F.fontPaintAuthored === !0 && (F.fontHidden === !0 || F.fontColor == null))) {
-		e.fillStyle = ne, e.textAlign = q, e.textBaseline = "middle";
-		let t = N * 1.2, n = (F.fontBaseline ?? 0) * N, r = J.y - (L.length - 1) * t / 2 - n;
-		L.forEach((n, i) => e.fillText(n, J.x, r + i * t));
+	if (!(P.fontPaintAuthored === !0 && (P.fontHidden === !0 || P.fontColor == null))) {
+		e.fillStyle = R, e.textAlign = J, e.textBaseline = "middle";
+		let t = j * 1.2, n = (P.fontBaseline ?? 0) * j, r = Y.y - (V.length - 1) * t / 2 - n;
+		V.forEach((n, i) => e.fillText(n, Y.x, r + i * t));
 	}
 	e.restore();
 }
-function At(e, t, n) {
+function Vt(e, t, n) {
 	let r = t.seriesDataLabels;
-	return v(r, n) ? !1 : n?.text ? !0 : (n?.showVal ?? r?.showVal ?? e.showDataLabels) || (n?.showCatName ?? r?.showCatName ?? !1) || (n?.showSerName ?? r?.showSerName ?? !1) || (n?.showPercent ?? r?.showPercent ?? !1);
-}
-function jt(e, n, r, i, o, s) {
-	let c = a(n, r.h, i);
-	if (n.title) {
-		e.font = `${n.titleFontBold === !1 ? "" : "bold "}${c.fontPx}px ${ht(n.titleFontFace)}`, e.fillStyle = n.titleFontColor ? `#${n.titleFontColor}` : "#111111", e.textAlign = "center", e.textBaseline = "top";
-		let t = e.measureText(n.title).width, i = {
-			x: r.x + (r.w - t) / 2,
-			y: r.y + c.topPad,
-			w: t,
-			h: Math.max(1, c.fontPx)
-		}, a = n.titleManualLayout ? u({
-			...n.titleManualLayout,
+	return U(r, n) ? !1 : n?.text ? !0 : (n?.showVal ?? r?.showVal ?? e.showDataLabels) || (n?.showCatName ?? r?.showCatName ?? !1) || (n?.showSerName ?? r?.showSerName ?? !1) || (n?.showPercent ?? r?.showPercent ?? !1);
+}
+function Ht(e, t, n, i, a, o) {
+	let s = c(t, n.h, i);
+	if (t.title) {
+		e.font = `${t.titleFontBold === !1 ? "" : "bold "}${s.fontPx}px ${Tt(t.titleFontFace)}`, e.fillStyle = t.titleFontColor ? `#${t.titleFontColor}` : "#111111", e.textAlign = "center", e.textBaseline = "top";
+		let r = e.measureText(t.title).width, i = {
+			x: n.x + (n.w - r) / 2,
+			y: n.y + s.topPad,
+			w: r,
+			h: Math.max(1, s.fontPx)
+		}, a = t.titleManualLayout ? b({
+			...t.titleManualLayout,
 			w: void 0,
 			h: void 0
-		}, r, i) : null;
-		e.fillText(n.title, a ? a.x + a.w / 2 : r.x + r.w / 2, a?.y ?? i.y);
+		}, n, i) : null;
+		e.fillText(t.title, a ? a.x + a.w / 2 : n.x + n.w / 2, a?.y ?? i.y);
 	}
-	let l = $e(n);
+	let u = ct(t);
 	e.save();
-	let d = (n.chartType === "pie" ? n.series[0]?.categories?.length ? n.series[0].categories : n.categories : n.series.map((e, t) => e.name || `Series ${t + 1}`)).flatMap((e, t) => l.get(t)?.deleted === !0 ? [] : [{
+	let d = (t.chartType === "pie" ? t.series[0]?.categories?.length ? t.series[0].categories : t.categories : t.series.map((e, t) => e.name || `Series ${t + 1}`)).flatMap((e, t) => u.get(t)?.deleted === !0 ? [] : [{
 		label: e,
 		index: t
-	}]), p = d.map((e) => et(n, l.get(e.index), i)), m = Math.max(0, ...p.map((e) => e.fontPx)), g = d.map((t, n) => (e.font = p[n].font, 7 * i + 4 + e.measureText(t.label).width)), v = t(n, r.w, r.h, .23, {
-		itemWidths: g,
+	}]), f = d.map((e) => lt(t, u.get(e.index), i)), m = Math.max(0, ...f.map((e) => e.fontPx)), h = d.map((t, n) => (e.font = f[n].font, 7 * i + 4 + e.measureText(t.label).width)), _ = g(t, n.w, n.h, .23, {
+		itemWidths: h,
 		rowHeight: Math.max(m * 1.45, 12),
 		itemGap: 12,
 		horizontalPadding: 8,
 		verticalPadding: 4
 	});
 	e.restore();
-	let y = V(v, n.legendOverlay === !0), b = _(n, r.w, r.h, i), S = h(n.catAxisTitleTextVerticalInsetEmu, i), C = h(n.valAxisTitleTextVerticalInsetEmu, i), w = o === "horizontal" ? n.catAxisTitle ? b.catFontPx + S + f(r.w) + 4 : 0 : o === "vertical" ? b.valBandW : 0, T = o === "horizontal" ? n.valAxisTitle ? b.valFontPx + C + f(r.h) + 4 : 0 : o === "vertical" ? b.catBandH : 0, E = x(n, r.x, r.y, r.w, r.h, i, {
-		titleBand: c,
+	let v = H(_, t.legendOverlay === !0), y = r(t, n.w, n.h, i), x = l(t.catAxisTitleTextVerticalInsetEmu, i), S = l(t.valAxisTitleTextVerticalInsetEmu, i), C = a === "horizontal" ? t.catAxisTitle ? y.catFontPx + x + oe(n.w) + 4 : 0 : a === "vertical" ? y.valBandW : 0, w = a === "horizontal" ? t.valAxisTitle ? y.valFontPx + S + oe(n.h) + 4 : 0 : a === "vertical" ? y.catBandH : 0, T = p(t, n.x, n.y, n.w, n.h, i, {
+		titleBand: s,
 		legendSideReserveFrac: .23,
-		legendReserve: v,
+		legendReserve: _,
 		pad: {
-			t: c.bandH + y.legTopH + r.h * .04,
-			r: y.legRightW + r.w * .05,
-			b: y.legBottomH + r.h * .19 + T,
-			l: y.legLeftW + r.w * .13 + w
+			t: s.bandH + v.legTopH + n.h * .04,
+			r: v.legRightW + n.w * .05,
+			b: v.legBottomH + n.h * .19 + w,
+			l: v.legLeftW + n.w * .13 + C
 		},
 		honorPlotAreaManualLayout: !0,
 		manualOuterInsets: {
-			t: c.bandH,
-			r: y.legRightW,
-			b: y.legBottomH + T,
-			l: y.legLeftW + w
+			t: s.bandH,
+			r: v.legRightW,
+			b: v.legBottomH + w,
+			l: v.legLeftW + C
 		}
-	}), D = {
-		x: E.plotRect.px0,
-		y: E.plotRect.py0,
-		w: Math.max(1, E.plotRect.pw),
-		h: Math.max(1, E.plotRect.ph)
+	}), E = {
+		x: T.plotRect.px0,
+		y: T.plotRect.py0,
+		w: Math.max(1, T.plotRect.pw),
+		h: Math.max(1, T.plotRect.ph)
 	};
-	L(e, n, D.x, D.y, D.w, D.h, i, s);
-	let O = v ? v.side === "r" ? {
-		x: r.x + r.w - v.reserveW,
-		y: D.y,
-		w: v.reserveW,
-		h: D.h
-	} : v.side === "l" ? {
-		x: r.x,
-		y: D.y,
-		w: v.reserveW,
-		h: D.h
-	} : v.side === "t" ? {
-		x: r.x + 4,
-		y: r.y + c.bandH,
-		w: Math.max(1, r.w - 8),
-		h: v.reserveH
+	J(e, t, E.x, E.y, E.w, E.h, i, o);
+	let D = _ ? _.side === "r" ? {
+		x: n.x + n.w - _.reserveW,
+		y: E.y,
+		w: _.reserveW,
+		h: E.h
+	} : _.side === "l" ? {
+		x: n.x,
+		y: E.y,
+		w: _.reserveW,
+		h: E.h
+	} : _.side === "t" ? {
+		x: n.x + 4,
+		y: n.y + s.bandH,
+		w: Math.max(1, n.w - 8),
+		h: _.reserveH
 	} : {
-		x: r.x + 4,
-		y: r.y + r.h - v.reserveH,
-		w: Math.max(1, r.w - 8),
-		h: v.reserveH
+		x: n.x + 4,
+		y: n.y + n.h - _.reserveH,
+		w: Math.max(1, n.w - 8),
+		h: _.reserveH
 	} : null;
 	return {
-		plot: D,
-		legend: (O && n.legendManualLayout ? u(n.legendManualLayout, r, O) : null) ?? O,
+		plot: E,
+		legend: (D && t.legendManualLayout ? b(t.legendManualLayout, n, D) : null) ?? D,
 		legendMeasure: {
 			labels: d.map((e) => e.label),
-			styles: p,
-			itemWidths: g
+			styles: f,
+			itemWidths: h
 		}
 	};
 }
-function Mt(e, t, n, r, i, a, o, s, c, l, d, f, m, h) {
+function Ut(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 	e.save(), e.font = `${l ? "italic " : ""}${c ? "bold " : ""}${a}px ${o}`, e.fillStyle = s ? `#${s}` : "#555";
-	let g = m ? t : K(e, t, h), _ = p(i, d, f), v = r;
-	if (m) {
-		let t = e.measureText(g).width, i = Math.abs(Math.cos(_)), o = Math.abs(Math.sin(_)), s = {
+	let m = f ? t : me(e, t, p), h = x(i, u, d), g = r;
+	if (f) {
+		let t = e.measureText(m).width, i = Math.abs(Math.cos(h)), o = Math.abs(Math.sin(h)), s = {
 			x: r.x - (t * i + a * o) / 2,
 			y: r.y - (t * o + a * i) / 2,
 			w: t * i + a * o,
 			h: t * o + a * i
-		}, c = u({
-			...m,
+		}, c = b({
+			...f,
 			w: void 0,
 			h: void 0
 		}, n, s);
-		c && (v = {
+		c && (g = {
 			x: c.x + c.w / 2,
 			y: c.y + c.h / 2
 		});
 	}
-	e.translate(v.x, v.y), _ && e.rotate(_), e.textAlign = "center", e.textBaseline = "middle", e.fillText(g, 0, 0), e.restore();
+	e.translate(g.x, g.y), h && e.rotate(h), e.textAlign = "center", e.textBaseline = "middle", e.fillText(m, 0, 0), e.restore();
 }
-function Nt(e, t, n, r, i, a) {
+function Wt(e, t, n, r, i, a) {
 	if (t.valAxisTitle) {
-		let o = j(t.valAxisTitleFontSizeHpt, a), s = i ? "horizontal" : "left";
-		Mt(e, t.valAxisTitle, n, i ? {
+		let s = o(t.valAxisTitleFontSizeHpt, a), c = i ? "horizontal" : "left";
+		Ut(e, t.valAxisTitle, n, i ? {
 			x: r.x + r.w / 2,
-			y: r.y + r.h + f(n.h) + o / 2
+			y: r.y + r.h + oe(n.h) + s / 2
 		} : {
-			x: r.x - f(n.w) - o / 2,
+			x: r.x - oe(n.w) - s / 2,
 			y: r.y + r.h / 2
-		}, s, o, Q(t, t.valAxisTitleFontFace, "major"), t.valAxisTitleFontColor, t.valAxisTitleFontBold ?? !0, t.valAxisTitleFontItalic ?? !1, t.valAxisTitleRotation, t.valAxisTitleVerticalMode, t.valAxisTitleManualLayout, i ? r.w : r.h);
+		}, c, s, $(t, t.valAxisTitleFontFace, "major"), t.valAxisTitleFontColor, t.valAxisTitleFontBold ?? !0, t.valAxisTitleFontItalic ?? !1, t.valAxisTitleRotation, t.valAxisTitleVerticalMode, t.valAxisTitleManualLayout, i ? r.w : r.h);
 	}
 	if (t.catAxisTitle) {
-		let o = j(t.catAxisTitleFontSizeHpt, a), s = i ? "left" : "horizontal";
-		Mt(e, t.catAxisTitle, n, i ? {
-			x: r.x - f(n.w) - o / 2,
+		let s = o(t.catAxisTitleFontSizeHpt, a), c = i ? "left" : "horizontal";
+		Ut(e, t.catAxisTitle, n, i ? {
+			x: r.x - oe(n.w) - s / 2,
 			y: r.y + r.h / 2
 		} : {
 			x: r.x + r.w / 2,
-			y: r.y + r.h + f(n.h) + o / 2
-		}, s, o, Q(t, t.catAxisTitleFontFace, "major"), t.catAxisTitleFontColor, t.catAxisTitleFontBold ?? !0, t.catAxisTitleFontItalic ?? !1, t.catAxisTitleRotation, t.catAxisTitleVerticalMode, t.catAxisTitleManualLayout, i ? r.h : r.w);
+			y: r.y + r.h + oe(n.h) + s / 2
+		}, c, s, $(t, t.catAxisTitleFontFace, "major"), t.catAxisTitleFontColor, t.catAxisTitleFontBold ?? !0, t.catAxisTitleFontItalic ?? !1, t.catAxisTitleRotation, t.catAxisTitleVerticalMode, t.catAxisTitleManualLayout, i ? r.h : r.w);
 	}
 }
-function Pt(e, t, n, r, i, a, o, s, l, u, d) {
+function Gt(e, t, n, r, i, a, s, c, l, u, d) {
 	let f = t.threeD?.seriesAxis;
 	if (!f || f.hidden || t.threeD?.barGrouping !== "standard" || t.series.length === 0) return;
-	let p = Xt(t, r, i, a, o, s, l), m = zt(r), h = l === "vertical" ? m.seriesAxisX : p.axisX, g = l === "horizontal" ? m.floorY === r.front.y ? r.front.y + r.front.h : r.front.y : m.floorY, _ = r.project(h, g, r.topology.nearDepth), v = r.project(h, g, r.topology.farDepth), y = Math.hypot(v.x - _.x, v.y - _.y);
-	if (!(y > 1e-6)) return;
-	let b = {
-		x: (v.x - _.x) / y,
-		y: (v.y - _.y) / y
-	}, x = {
-		x: -b.y,
-		y: b.x
-	}, S = r.project(r.front.x + r.front.w / 2, r.front.y + r.front.h / 2, .5), C = {
-		x: (_.x + v.x) / 2,
-		y: (_.y + v.y) / 2
+	let p = dn(t, r, i, a, s, c, l), m = Qt(r), h = l === "vertical" ? m.seriesAxisX : p.axisX, g = l === "horizontal" ? m.floorY === r.front.y ? r.front.y + r.front.h : r.front.y : m.floorY, _ = r.project(h, g, r.topology.nearDepth), y = r.project(h, g, r.topology.farDepth), b = Math.hypot(y.x - _.x, y.y - _.y);
+	if (!(b > 1e-6)) return;
+	let x = {
+		x: (y.x - _.x) / b,
+		y: (y.y - _.y) / b
+	}, S = {
+		x: -x.y,
+		y: x.x
+	}, C = r.project(r.front.x + r.front.w / 2, r.front.y + r.front.h / 2, .5), w = {
+		x: (_.x + y.x) / 2,
+		y: (_.y + y.y) / 2
 	};
-	(C.x - S.x) * x.x + (C.y - S.y) * x.y < 0 && (x = {
-		x: -x.x,
-		y: -x.y
-	}), (f.tickLabelPos === "low" && x.y < 0 || f.tickLabelPos === "high" && x.y > 0) && (x = {
-		x: -x.x,
-		y: -x.y
-	}), f.lineHidden || ($(e, Vt(f.lineColor, f.lineWidthEmu, f.lineDash, d)), e.beginPath(), e.moveTo(_.x, _.y), e.lineTo(v.x, v.y), e.stroke());
-	let w = Math.max(1, Math.floor(f.tickMarkSkip ?? 1)), T = Math.max(1, Math.floor(f.tickLabelSkip ?? 1)), E = f.majorTickMark ?? "out", D = c(f.fontSizeHpt, d) ?? 9 * d;
-	if (e.font = `${f.fontItalic ? "italic " : ""}${f.fontBold ? "bold " : ""}${D}px ${Q(t, f.fontFace)}`, e.fillStyle = f.fontColor ? `#${f.fontColor}` : "#595959", e.textAlign = Math.abs(x.x) < .2 ? "center" : x.x < 0 ? "right" : "left", e.textBaseline = Math.abs(x.y) < .2 ? "middle" : x.y < 0 ? "bottom" : "top", u && !f.lineHidden && E !== "none") {
-		$(e, Ht(f.lineColor, f.lineWidthEmu, f.lineDash, d));
+	(w.x - C.x) * S.x + (w.y - C.y) * S.y < 0 && (S = {
+		x: -S.x,
+		y: -S.y
+	}), (f.tickLabelPos === "low" && S.y < 0 || f.tickLabelPos === "high" && S.y > 0) && (S = {
+		x: -S.x,
+		y: -S.y
+	}), f.lineHidden || (nn(e, en(f.lineColor, f.lineWidthEmu, f.lineDash, d)), e.beginPath(), e.moveTo(_.x, _.y), e.lineTo(y.x, y.y), e.stroke());
+	let T = Math.max(1, Math.floor(f.tickMarkSkip ?? 1)), E = Math.max(1, Math.floor(f.tickLabelSkip ?? 1)), D = f.majorTickMark ?? "out", O = v(f.fontSizeHpt, d) ?? 9 * d;
+	if (e.font = `${f.fontItalic ? "italic " : ""}${f.fontBold ? "bold " : ""}${O}px ${$(t, f.fontFace)}`, e.fillStyle = f.fontColor ? `#${f.fontColor}` : "#595959", e.textAlign = Math.abs(S.x) < .2 ? "center" : S.x < 0 ? "right" : "left", e.textBaseline = Math.abs(S.y) < .2 ? "middle" : S.y < 0 ? "bottom" : "top", u && !f.lineHidden && D !== "none") {
+		nn(e, tn(f.lineColor, f.lineWidthEmu, f.lineDash, d));
 		let n = t.series.length;
-		for (let t = 0; t <= n; t += w) {
-			let i = t / n, a = f.orientation === "maxMin" ? 1 - i : i, o = r.project(h, g, a), s = 6 * d, c = E === "cross" ? s / 2 : E === "out" ? s : 0, l = E === "cross" ? s / 2 : E === "in" ? s : 0;
-			e.beginPath(), e.moveTo(o.x + x.x * c, o.y + x.y * c), e.lineTo(o.x - x.x * l, o.y - x.y * l), e.stroke();
+		for (let t = 0; t <= n; t += T) {
+			let i = t / n, a = f.orientation === "maxMin" ? 1 - i : i, o = r.project(h, g, a), s = 6 * d, c = D === "cross" ? s / 2 : D === "out" ? s : 0, l = D === "cross" ? s / 2 : D === "in" ? s : 0;
+			e.beginPath(), e.moveTo(o.x + S.x * c, o.y + S.y * c), e.lineTo(o.x - S.x * l, o.y - S.y * l), e.stroke();
 		}
 	}
 	for (let n = 0; n < t.series.length; n++) {
 		let i = r.seriesDepth(n, t.series.length, !1), a = f.orientation === "maxMin" ? 1 - i : i, o = r.project(h, g, a);
-		if (!u && !f.lineHidden && n % w === 0 && E !== "none") {
-			let t = 6 * d, n = E === "cross" ? t / 2 : E === "out" ? t : 0, r = E === "cross" ? t / 2 : E === "in" ? t : 0;
-			e.beginPath(), e.moveTo(o.x + x.x * n, o.y + x.y * n), e.lineTo(o.x - x.x * r, o.y - x.y * r), e.stroke();
+		if (!u && !f.lineHidden && n % T === 0 && D !== "none") {
+			let t = 6 * d, n = D === "cross" ? t / 2 : D === "out" ? t : 0, r = D === "cross" ? t / 2 : D === "in" ? t : 0;
+			e.beginPath(), e.moveTo(o.x + S.x * n, o.y + S.y * n), e.lineTo(o.x - S.x * r, o.y - S.y * r), e.stroke();
 		}
-		f.tickLabelPos !== "none" && n % T === 0 && e.fillText(t.series[n].name || `Series ${n + 1}`, o.x + x.x * (6 * d + 3), o.y + x.y * (6 * d + 3));
+		f.tickLabelPos !== "none" && n % E === 0 && e.fillText(t.series[n].name || `Series ${n + 1}`, o.x + S.x * (6 * d + 3), o.y + S.y * (6 * d + 3));
 	}
 	if (e.setLineDash([]), f.title) {
-		let i = j(f.titleFontSizeHpt, d);
-		Mt(e, f.title, n, {
-			x: C.x + x.x * (D + i + 12),
-			y: C.y + x.y * (D + i + 12)
-		}, "horizontal", i, Q(t, f.titleFontFace, "major"), f.titleFontColor, f.titleFontBold ?? !0, f.titleFontItalic ?? !1, f.titleRotation, f.titleVerticalMode, f.titleManualLayout, Math.max(r.front.w, r.front.h));
-	}
-}
-function Ft(e, t, n, r, i, a, o, s) {
-	if (t.lineHidden !== !0) {
-		let s = t.lineWidthEmu == null ? Math.max(1, 2 * o) : Math.max(.5, t.lineWidthEmu / U * o);
-		e.beginPath(), e.moveTo(r, i), e.lineTo(r + a, i), e.strokeStyle = t.lineColor ? `#${t.lineColor}` : J(n, .7), e.lineWidth = s, e.setLineDash(B(t.chartexStyle?.lineDash ?? "solid", s)), e.stroke(), e.setLineDash([]);
-	}
-	if (t.showMarker !== !0 || t.markerSymbol === "none") return;
-	let c = t.markerSymbol ?? "circle", l = A(t, n.replace(/^#/, "")), u = l === "00000000" ? "transparent" : l.startsWith("#") ? l : `#${l}`, d = t.markerLine ?? t.lineColor ?? n.replace(/^#/, ""), f = d === "00000000" ? "rgba(0,0,0,0)" : d.startsWith("#") ? d : `#${d}`, p = t.markerLineWidthEmu == null ? Math.max(.75, o) : Math.max(.25, t.markerLineWidthEmu / U * o);
-	Ot(e, {
-		x: r + a / 2,
-		y: i
-	}, c, Math.min(a, Math.max(2, (t.markerSize ?? 5) * o)), u, f, p, E(t), s, o);
-}
-function It(e, t, n, r, i = !1, a, s = 0) {
+		let i = o(f.titleFontSizeHpt, d);
+		Ut(e, f.title, n, {
+			x: w.x + S.x * (O + i + 12),
+			y: w.y + S.y * (O + i + 12)
+		}, "horizontal", i, $(t, f.titleFontFace, "major"), f.titleFontColor, f.titleFontBold ?? !0, f.titleFontItalic ?? !1, f.titleRotation, f.titleVerticalMode, f.titleManualLayout, Math.max(r.front.w, r.front.h));
+	}
+}
+function Kt(t, n, r, i, a, o, s) {
+	let c = q(t, "dataPointMarker", a), l = W(t, "dataPointMarker"), u = n.chartexFormatIdx ?? a, d = E(r?.markerStyle, l, i), f = E(n.markerStyle, l, u), p = d !== void 0 || r?.markerFillPaint !== void 0 || r?.markerFill != null || r?.color != null || r?.markerFillPaintAuthored === !0 && r.markerStyle?.fillHidden !== !0, m = f !== void 0 || n.markerFillPaint !== void 0 || n.markerFill != null || n.markerFillPaintAuthored === !0 && n.markerStyle?.fillHidden !== !0, h = P(c, l, u), g = p ? d ?? r?.markerFillPaint : m ? f ?? n.markerFillPaint : h, _ = G(n, r, i, o), v = g;
+	g?.fillType === "solid" ? (_ = g.color, v = void 0) : g === null && (_ = "00000000");
+	let y = O(r?.markerStyle, l, i), b = O(n.markerStyle, l, u), x = y !== void 0 || r?.markerLine != null || r?.markerLinePaintAuthored === !0 && r.markerStyle?.lineHidden !== !0, S = b !== void 0 || n.markerLine != null || n.markerLinePaintAuthored === !0 && n.markerStyle?.lineHidden !== !0, C = V(c, u), w = x ? y ?? (r?.markerLinePaintAuthored === !0 ? null : void 0) : S ? b ?? (n.markerLinePaintAuthored === !0 ? null : void 0) : C, T = r?.markerLine ?? n.markerLine ?? n.lineColor ?? o, D = w;
+	w?.fillType === "solid" ? (T = w.color, D = void 0) : w === null && (T = "00000000");
+	let k = r?.markerStyle ?? n.markerStyle ?? c, A = N(r?.markerStyle, n.markerStyle, c);
+	return {
+		fill: _,
+		fillPaint: v,
+		line: T,
+		linePaint: D,
+		lineWidth: (r?.markerLineWidthEmu ?? n.markerLineWidthEmu ?? k?.lineWidthEmu) == null ? Math.max(.75, s) : Math.max(.25, (r?.markerLineWidthEmu ?? n.markerLineWidthEmu ?? k?.lineWidthEmu ?? 0) / X * s),
+		lineDash: A?.lineDash,
+		lineCustomDash: A?.lineCustomDash,
+		lineCap: k?.lineCap,
+		lineJoin: k?.lineJoin,
+		effectDirect: e(r?.markerStyle, r?.chartexStyle, n.markerStyle),
+		effectFallback: c,
+		effectIndex: r?.markerStyle || r?.chartexStyle ? i : u,
+		effectFallbackIndex: u
+	};
+}
+function qt(t, n, r, i, a, o, s, c, l, u, d, f) {
+	let p = Q(n, r, i, a, o, f), m = De(n, r, a, o), h = {
+		x: s,
+		y: c - l / 2,
+		w: l,
+		h: l
+	}, g = (e) => {
+		if (p.fill !== null) {
+			let t = p.fill === void 0 ? p.color : p.fill.fillType === "image" ? null : R(p.fill, e, h.x, h.y, h.w, h.h, d);
+			t && (e.fillStyle = t, e.fillRect(h.x, h.y, h.w, h.h));
+		}
+		let t = p.lineFill === void 0 ? p.lineColor : p.lineFill == null || p.lineFill.fillType === "image" ? null : R(p.lineFill, e, h.x, h.y, h.w, h.h, d);
+		t && (e.strokeStyle = t, e.lineWidth = p.lineWidthEmu == null ? .75 * u : Math.max(.25, p.lineWidthEmu / X * u), e.setLineDash(ae(p.lineCustomDash, p.lineDash, e.lineWidth)), e.lineCap = p.lineCap, e.lineJoin = p.lineJoin, e.strokeRect(h.x, h.y, h.w, h.h), e.setLineDash([]));
+	}, _ = e(i?.chartexStyle, r.chartexStyle);
+	F(t, _, q(n, "dataPoint3D", o), _ === i?.chartexStyle ? a : m, h, u, g, m);
+}
+function Jt(t, n, r, i, a, o, s, c, l, u) {
+	let d = Q(n, r, void 0, i, i, !1), f = d.lineFill === void 0 ? d.lineColor == null ? d.fill : {
+		fillType: "solid",
+		color: d.lineColor.replace(/^#/, "")
+	} : d.lineFill;
+	if (f !== null) {
+		let a = d.lineWidthEmu == null ? Math.max(1, 2 * l) : Math.max(.5, d.lineWidthEmu / X * l), p = {
+			x: o,
+			y: s - a / 2,
+			w: c,
+			h: a
+		}, m = f === void 0 ? d.color : f.fillType === "image" ? null : f.fillType === "solid" ? `#${f.color}` : R(f, t, o, s - a / 2, c, a, u);
+		if (m) {
+			let h = (e) => {
+				e.beginPath(), e.moveTo(o, s), e.lineTo(o + c, s), e.strokeStyle = e === t ? m : f === void 0 ? d.color : f.fillType === "image" ? "rgba(0,0,0,0)" : f.fillType === "solid" ? `#${f.color}` : R(f, e, o, s - a / 2, c, a, u) ?? "rgba(0,0,0,0)", e.lineWidth = a, e.setLineDash(ae(d.lineCustomDash, d.lineDash, a)), e.stroke(), e.setLineDash([]);
+			}, g = De(n, r, i, i);
+			F(t, e(r.chartexStyle), q(n, "dataPoint3D", i), g, p, l, h, g);
+		}
+	}
+	if (r.showMarker !== !0 || r.markerSymbol === "none") return;
+	let p = r.markerSymbol ?? "circle", m = Kt(n, r, void 0, i, i, a.replace(/^#/, ""), l);
+	zt(t, {
+		x: o + c / 2,
+		y: s
+	}, p, Math.min(c, Math.max(2, (r.markerSize ?? 5) * l)), m.fill === "00000000" ? "transparent" : `#${m.fill.replace(/^#/, "")}`, m.line === "00000000" ? "rgba(0,0,0,0)" : `#${m.line.replace(/^#/, "")}`, m.lineWidth, m.fillPaint, u, l, m.effectDirect, m.effectFallback, m.effectIndex, m.effectFallbackIndex, m.linePaint, m.lineDash, m.lineCustomDash, m.lineCap, m.lineJoin);
+}
+function Yt(e, t, n, r, i = !1, a, o = 0) {
 	if (!n) return;
-	F(e, t, n, r, s);
-	let c = new Map(t.series[0]?.dataPointOverrides?.map((e) => [e.idx, e]) ?? []), l = i ? (t.series[0]?.categories?.length ? t.series[0].categories : t.categories).map((e, n) => {
+	ee(e, t, n, r, o);
+	let s = new Map(t.series[0]?.dataPointOverrides?.map((e) => [e.idx, e]) ?? []), c = i ? (t.series[0]?.categories?.length ? t.series[0].categories : t.categories).map((e, n) => {
 		let r = t.series[0]?.dataPointColors?.[n];
 		return {
 			label: e,
-			color: r === "00000000" ? "transparent" : r ? `#${r}` : st(n),
+			color: r === "00000000" ? "transparent" : r ? `#${r}` : gt(n),
 			series: t.series[0],
-			point: c.get(n),
-			sourceIndex: n
+			point: s.get(n),
+			sourceIndex: n,
+			seriesIndex: 0
 		};
 	}) : t.series.map((e, t) => ({
 		label: e.name || `Series ${t + 1}`,
-		color: st(t, e),
+		color: gt(t, e),
 		series: e,
 		point: void 0,
-		sourceIndex: t
-	})), u = $e(t), d = l.filter((e) => u.get(e.sourceIndex)?.deleted !== !0), f = a != null && a.labels.length === d.length && a.labels.every((e, t) => e === d[t].label), p = f ? a.styles : d.map((e) => et(t, u.get(e.sourceIndex), r));
+		sourceIndex: t,
+		seriesIndex: t
+	})), l = ct(t), u = c.filter((e) => l.get(e.sourceIndex)?.deleted !== !0), d = a != null && a.labels.length === u.length && a.labels.every((e, t) => e === u[t].label), f = d ? a.styles : u.map((e) => lt(t, l.get(e.sourceIndex), r));
 	e.textAlign = "left", e.textBaseline = "middle";
-	let h = Math.max(Math.max(0, ...p.map((e) => e.fontPx)) * 1.45, 12), g = Math.min(7 * r, h * .7);
+	let p = Math.max(Math.max(0, ...f.map((e) => e.fontPx)) * 1.45, 12), m = Math.min(7 * r, p * .7);
 	if (t.legendPos === "t" || t.legendPos === "b" || t.legendManualLayout != null && n.w >= n.h) {
-		let c = f ? a.itemWidths : d.map((t, n) => (e.font = p[n].font, g + 4 + e.measureText(t.label).width)), l = o(c, Math.max(1, n.w - 8), 12).slice(0, Math.max(0, Math.floor((n.h - 4 + 1e-6) / h))), u = n.y + 2 + h / 2;
-		for (let a of l) {
-			let o = a.map((e) => Math.min(n.w, c[e])), l = o.reduce((e, t) => e + t, 0) + Math.max(0, a.length - 1) * 12, f = n.x + Math.max(4, (n.w - l) / 2);
+		let s = d ? a.itemWidths : u.map((t, n) => (e.font = f[n].font, m + 4 + e.measureText(t.label).width)), c = h(s, Math.max(1, n.w - 8), 12).slice(0, Math.max(0, Math.floor((n.h - 4 + 1e-6) / p))), l = n.y + 2 + p / 2;
+		for (let a of c) {
+			let c = a.map((e) => Math.min(n.w, s[e])), d = c.reduce((e, t) => e + t, 0) + Math.max(0, a.length - 1) * 12, h = n.x + Math.max(4, (n.w - d) / 2);
 			for (let n = 0; n < a.length; n++) {
-				let c = a[n], l = d[c], m = p[c];
-				e.font = m.font;
-				let h = Math.max(0, o[n] - g - 4);
-				if (!i && t.chartType.toLowerCase().includes("line") && l.series) Ft(e, l.series, l.color, f, u, g, r, s);
-				else {
-					l.color !== "transparent" && (e.fillStyle = l.color, e.fillRect(f, u - g / 2, g, g));
-					let t = l.point?.lineHidden ?? l.series?.lineHidden, n = l.point?.lineColor ?? l.series?.lineColor;
-					t !== !0 && n && (e.strokeStyle = `#${n}`, e.lineWidth = (l.point?.lineWidthEmu ?? l.series?.lineWidthEmu) == null ? .75 * r : Math.max(.25, (l.point?.lineWidthEmu ?? l.series?.lineWidthEmu ?? 0) / U * r), e.setLineDash(B(l.point?.lineDash ?? l.series?.chartexStyle?.lineDash ?? "solid", e.lineWidth)), e.strokeRect(f, u - g / 2, g, g), e.setLineDash([]));
-				}
-				e.fillStyle = m.color, e.fillText(K(e, l.label, h), f + g + 4, u), f += o[n] + 12;
+				let s = a[n], d = u[s], p = f[s];
+				e.font = p.font;
+				let g = Math.max(0, c[n] - m - 4);
+				!i && t.chartType.toLowerCase().includes("line") && d.series ? Jt(e, t, d.series, d.seriesIndex, d.color, h, l, m, r, o) : d.series && qt(e, t, d.series, d.point, d.sourceIndex, d.seriesIndex, h, l, m, r, o, i), e.fillStyle = p.color, e.fillText(me(e, d.label, g), h + m + 4, l), h += c[n] + 12;
 			}
-			u += h;
+			l += p;
 		}
 		return;
 	}
-	let _ = n.y;
-	for (let a = 0; a < d.length; a++) {
-		let o = d[a], c = p[a];
+	let g = n.y;
+	for (let a = 0; a < u.length; a++) {
+		let s = u[a], c = f[a];
 		e.font = c.font;
-		let l = n.x + 8 + g, u = Math.max(0, n.x + n.w - 4 - l), f = Math.max(c.fontPx * 1.2, 10), v = m(o.label, u, f * (i ? 1 : 2), f, (t) => e.measureText(t).width);
-		if (v.length === 0) continue;
-		let y = Math.max(h, v.length * f + 2);
-		if (_ + y > n.y + n.h + 1e-6) break;
-		let b = _ + y / 2;
-		if (!i && t.chartType.toLowerCase().includes("line") && o.series) Ft(e, o.series, o.color, n.x + 4, b, g, r, s);
-		else {
-			o.color !== "transparent" && (e.fillStyle = o.color, e.fillRect(n.x + 4, b - g / 2, g, g));
-			let t = o.point?.lineHidden ?? o.series?.lineHidden, i = o.point?.lineColor ?? o.series?.lineColor;
-			t !== !0 && i && (e.strokeStyle = `#${i}`, e.lineWidth = (o.point?.lineWidthEmu ?? o.series?.lineWidthEmu) == null ? .75 * r : Math.max(.25, (o.point?.lineWidthEmu ?? o.series?.lineWidthEmu ?? 0) / U * r), e.setLineDash(B(o.point?.lineDash ?? o.series?.chartexStyle?.lineDash ?? "solid", e.lineWidth)), e.strokeRect(n.x + 4, b - g / 2, g, g), e.setLineDash([]));
-		}
-		e.fillStyle = c.color;
-		let x = b - (v.length - 1) * f / 2;
-		v.forEach((t, n) => e.fillText(t, l, x + n * f)), _ += y;
+		let l = n.x + 8 + m, d = Math.max(0, n.x + n.w - 4 - l), h = Math.max(c.fontPx * 1.2, 10), _ = j(s.label, d, h * (i ? 1 : 2), h, (t) => e.measureText(t).width);
+		if (_.length === 0) continue;
+		let v = Math.max(p, _.length * h + 2);
+		if (g + v > n.y + n.h + 1e-6) break;
+		let y = g + v / 2;
+		!i && t.chartType.toLowerCase().includes("line") && s.series ? Jt(e, t, s.series, s.seriesIndex, s.color, n.x + 4, y, m, r, o) : s.series && qt(e, t, s.series, s.point, s.sourceIndex, s.seriesIndex, n.x + 4, y, m, r, o, i), e.fillStyle = c.color;
+		let b = y - (_.length - 1) * h / 2;
+		_.forEach((t, n) => e.fillText(t, l, b + n * h)), g += v;
 	}
 }
-function Lt(e, t, n, r, i, a) {
+function Xt(e, t, n, r, i, a) {
 	let o = i ? 100 : 1, s = e.valAxisMinorTickMark ?? "none";
-	return G({
+	return we({
 		dataMin: t,
 		dataMax: n,
 		explicitMin: e.valMin == null ? i ? t : null : e.valMin * o,
@@ -1766,7 +1842,7 @@ function Lt(e, t, n, r, i, a) {
 		needMinor: e.valAxisMinorGridlines === !0 || s !== "none"
 	});
 }
-function Rt(e, t, n) {
+function Zt(e, t, n) {
 	let r = e != null && Number.isFinite(e) ? (e % 360 + 360) % 360 : 0, i = Number.isFinite(t) ? Math.max(0, Math.min(1, t)) : 0, a = Number.isFinite(n) ? Math.max(0, Math.min(1 - i, n)) : 0, o = Math.PI / 2 - (r * Math.PI / 180 + i * Math.PI * 2), s = o - a * Math.PI * 2;
 	return {
 		start: Math.min(o, s),
@@ -1775,7 +1851,7 @@ function Rt(e, t, n) {
 		leading: o
 	};
 }
-function zt(e) {
+function Qt(e) {
 	let { front: t } = e, n = t.x, r = t.x + t.w, i = e.topology.farX === "min" ? n : r, a = i === n ? r : n, o = e.topology.axisY === "min" ? t.y : t.y + t.h, s = o === t.y ? t.y + t.h : t.y, { nearDepth: c, farDepth: l } = e.topology, u = e.project(n, o, c), d = e.project(r, o, c), f = e.project(r, o, l), p = e.project(n, o, l), m = e.project(n, s, l), h = e.project(r, s, l), g = e.project(i, o, c), _ = e.project(i, o, l), v = e.project(i, s, l), y = e.project(i, s, c);
 	return {
 		floor: [
@@ -1804,42 +1880,42 @@ function zt(e) {
 		farDepth: l
 	};
 }
-function Bt(e, t, n, r, i = "A6A6A6", a = .75) {
-	let o = t != null && Number.isFinite(t) && t >= 0 ? Math.max(.25, t / U * r) : a * r;
+function $t(e, t, n, r, i = "A6A6A6", a = .75) {
+	let o = t != null && Number.isFinite(t) && t >= 0 ? Math.max(.25, t / X * r) : a * r;
 	return {
 		color: `#${e ?? i}`,
 		width: o,
-		dash: B(n ?? "solid", o)
+		dash: ce(n ?? "solid", o)
 	};
 }
-function Vt(e, t, n, r) {
-	let i = Bt(e, t, n, r, "898989", 1);
+function en(e, t, n, r) {
+	let i = $t(e, t, n, r, "898989", 1);
 	if (t == null || !Number.isFinite(t) || t < 0) return i;
-	let a = t / U * r;
+	let a = t / X * r;
 	if (!(a > 0)) return i;
 	let o = a;
 	return {
 		...i,
 		width: o,
-		dash: B(n ?? "solid", o)
+		dash: ce(n ?? "solid", o)
 	};
 }
-function Ht(e, t, n, r) {
-	return Vt(e, t, n, r);
+function tn(e, t, n, r) {
+	return en(e, t, n, r);
 }
-function $(e, t) {
+function nn(e, t) {
 	e.strokeStyle = t.color, e.lineWidth = t.width, e.setLineDash(t.dash);
 }
-function Ut(e, t, n, i, a, o, s, c, u) {
-	let { front: d } = n, f = d.x, p = d.x + d.w, m = zt(n), { sideX: h, floorY: g, oppositeFloorY: _, nearDepth: v, farDepth: y } = m, x = Xt(t, n, i, o, s, c, a), S = [], C = t.catAxisLinePaintAuthored === !0, w = t.valAxisLinePaintAuthored === !0, E = a === "vertical" ? C && !t.catAxisHidden && !t.catAxisLineHidden : w && !t.valAxisHidden && !t.valAxisLineHidden, D = a === "vertical" ? w && !t.valAxisHidden && !t.valAxisLineHidden : C && !t.catAxisHidden && !t.catAxisLineHidden;
-	E && S.push([x.horizontalStart, x.horizontalEnd]), D && S.push([x.verticalStart, x.verticalEnd]);
-	let k = t.threeD?.seriesAxis, ee = k?.linePaintAuthored === !0;
-	if (k && !k.hidden && !k.lineHidden && ee && t.threeD?.barGrouping === "standard" && t.series.length > 0) {
-		let e = a === "vertical" ? m.seriesAxisX : x.axisX, t = a === "horizontal" ? g === n.front.y ? n.front.y + n.front.h : n.front.y : g;
-		S.push([n.project(e, t, v), n.project(e, t, y)]);
+function rn(e, t, n, r, i, o, s, c, l) {
+	let { front: u } = n, d = u.x, f = u.x + u.w, p = Qt(n), { sideX: m, floorY: h, oppositeFloorY: g, nearDepth: _, farDepth: v } = p, y = dn(t, n, r, o, s, c, i), b = [], x = t.catAxisLinePaintAuthored === !0, C = t.valAxisLinePaintAuthored === !0, w = i === "vertical" ? x && !t.catAxisHidden && !t.catAxisLineHidden : C && !t.valAxisHidden && !t.valAxisLineHidden, T = i === "vertical" ? C && !t.valAxisHidden && !t.valAxisLineHidden : x && !t.catAxisHidden && !t.catAxisLineHidden;
+	w && b.push([y.horizontalStart, y.horizontalEnd]), T && b.push([y.verticalStart, y.verticalEnd]);
+	let E = t.threeD?.seriesAxis, D = E?.linePaintAuthored === !0;
+	if (E && !E.hidden && !E.lineHidden && D && t.threeD?.barGrouping === "standard" && t.series.length > 0) {
+		let e = i === "vertical" ? p.seriesAxisX : y.axisX, t = i === "horizontal" ? h === n.front.y ? n.front.y + n.front.h : n.front.y : h;
+		b.push([n.project(e, t, _), n.project(e, t, v)]);
 	}
-	let A = (e, t) => Math.hypot(e.x - t.x, e.y - t.y) <= 1e-6, j = (e, t) => S.some(([n, r]) => A(e, n) && A(t, r) || A(e, r) && A(t, n)), M = (e, t) => {
-		let r = q(n, e, t?.thicknessPercent), i = r.faces.map((e, t) => ({
+	let O = (e, t) => Math.hypot(e.x - t.x, e.y - t.y) <= 1e-6, k = (e, t) => b.some(([n, r]) => O(e, n) && O(t, r) || O(e, r) && O(t, n)), j = (e, t) => {
+		let r = fe(n, e, t?.thicknessPercent), i = r.faces.map((e, t) => ({
 			scenePoints: e,
 			faceIndex: t
 		})).filter(({ scenePoints: e }) => r.thickness === 0 || n.cameraFacing(e)).map(({ scenePoints: e, faceIndex: t }) => ({
@@ -1853,67 +1929,67 @@ function Ut(e, t, n, i, a, o, s, c, u) {
 			faces: i,
 			visibleFaceIndices: new Set(i.map((e) => e.faceIndex))
 		};
-	}, N = M("floor", t.threeD?.floor), P = M("sideWall", t.threeD?.sideWall), F = M("backWall", t.threeD?.backWall), te = N.faces, ne = P.faces, I = F.faces, L = (a, o, s, c) => {
-		let l = b(t, o, s), u = a.faces;
-		if (!l.fill || !u.length) return;
-		if (l.fill.fillType === "image") {
-			let t = r(l.fill);
+	}, M = j("floor", t.threeD?.floor), N = j("sideWall", t.threeD?.sideWall), P = j("backWall", t.threeD?.backWall), F = M.faces, I = N.faces, L = P.faces, z = (i, a, o, s) => {
+		let c = A(t, a, o), l = i.faces;
+		if (!c.fill || !l.length) return;
+		if (c.fill.fillType === "image") {
+			let t = B(c.fill);
 			if (!t) return;
-			de(e, l.fill, t, o, c, a.slab, a.faces.map((e) => e.faceIndex), (e) => n.projectUnbounded(e.x, e.y, e.depth), i.max - i.min);
+			de(e, c.fill, t, a, s, i.slab, i.faces.map((e) => e.faceIndex), (e) => n.projectUnbounded(e.x, e.y, e.depth), r.max - r.min);
 			return;
 		}
-		let d = u.flatMap((e) => e.points), f = Math.min(...d.map((e) => e.x)), p = Math.max(...d.map((e) => e.x)), m = Math.min(...d.map((e) => e.y)), h = Math.max(...d.map((e) => e.y)), g = l.fill.fillType === "solid" ? `#${l.fill.color}` : z(l.fill, e, f, m, p - f, h - m);
-		if (g) for (let t of u) t.points.length < 3 || (gt(e, t.points), e.fillStyle = g, e.fill());
+		let u = l.flatMap((e) => e.points), d = Math.min(...u.map((e) => e.x)), f = Math.max(...u.map((e) => e.x)), p = Math.min(...u.map((e) => e.y)), m = Math.max(...u.map((e) => e.y)), h = c.fill.fillType === "solid" ? `#${c.fill.color}` : R(c.fill, e, d, p, f - d, m - p);
+		if (h) for (let t of l) t.points.length < 3 || (Et(e, t.points), e.fillStyle = h, e.fill());
 	};
-	L(N, t.threeD?.floor, "floor", "floor"), L(P, t.threeD?.sideWall, "wall", "sideWall"), L(F, t.threeD?.backWall, "wall", "backWall");
-	let R = (t, r, i, a, o = !0) => {
-		for (let s of me(t.slab, r, i, a)) {
+	z(M, t.threeD?.floor, "floor", "floor"), z(N, t.threeD?.sideWall, "wall", "sideWall"), z(P, t.threeD?.backWall, "wall", "backWall");
+	let V = (t, r, i, a, o = !0) => {
+		for (let s of ve(t.slab, r, i, a)) {
 			if (!o && s.faceIndex !== 0 || !t.visibleFaceIndices.has(s.faceIndex)) continue;
 			let [r, i] = s.scenePoints.map((e) => n.projectUnbounded(e.x, e.y, e.depth));
 			e.beginPath(), e.moveTo(r.x, r.y), e.lineTo(i.x, i.y), e.stroke();
 		}
-	}, re = (t, r, o) => {
-		$(e, r);
-		for (let r of t) {
-			let t = i.fraction(r);
+	}, H = (t, a, o) => {
+		nn(e, a);
+		for (let a of t) {
+			let t = r.fraction(a);
 			if (o) {
-				a === "horizontal" ? (R(N, "floor", "x", t), R(F, "backWall", "x", t)) : (R(P, "sideWall", "y", t), R(F, "backWall", "y", t));
+				i === "horizontal" ? (V(M, "floor", "x", t), V(P, "backWall", "x", t)) : (V(N, "sideWall", "y", t), V(P, "backWall", "y", t));
 				continue;
 			}
-			if (a === "horizontal") {
-				let r = d.x + t * d.w, i = n.project(r, g, y), a = n.project(r, _, y);
+			if (i === "horizontal") {
+				let r = u.x + t * u.w, i = n.project(r, h, v), a = n.project(r, g, v);
 				e.beginPath(), e.moveTo(i.x, i.y), e.lineTo(a.x, a.y), e.stroke();
 			} else {
-				let r = d.y + d.h - t * d.h, i = n.project(h, r, v), a = n.project(h, r, y), o = n.project(h === f ? p : f, r, y);
+				let r = u.y + u.h - t * u.h, i = n.project(m, r, _), a = n.project(m, r, v), o = n.project(m === d ? f : d, r, v);
 				e.beginPath(), e.moveTo(i.x, i.y), e.lineTo(a.x, a.y), e.stroke(), e.beginPath(), e.moveTo(a.x, a.y), e.lineTo(o.x, o.y), e.stroke();
 			}
 		}
 	};
-	t.valAxisMinorGridlines === !0 && re(i.minorTicks, Bt(t.valAxisMinorGridlineColor, t.valAxisMinorGridlineWidthEmu, t.valAxisMinorGridlineDash, u, "D9D9D9", .5), !0), t.valAxisMajorGridlines === !0 && re(i.majorTicks, Bt(t.valAxisGridlineColor, t.valAxisGridlineWidthEmu, t.valAxisGridlineDash, u, "898989", 1), !0);
-	let B = (t, n) => {
-		$(e, n);
-		for (let e of t) a === "vertical" ? (R(N, "floor", "x", e), R(F, "backWall", "x", e)) : (R(P, "sideWall", "y", e), R(F, "backWall", "y", e));
+	t.valAxisMinorGridlines === !0 && H(r.minorTicks, $t(t.valAxisMinorGridlineColor, t.valAxisMinorGridlineWidthEmu, t.valAxisMinorGridlineDash, l, "D9D9D9", .5), !0), t.valAxisMajorGridlines === !0 && H(r.majorTicks, $t(t.valAxisGridlineColor, t.valAxisGridlineWidthEmu, t.valAxisGridlineDash, l, "898989", 1), !0);
+	let ee = (t, n) => {
+		nn(e, n);
+		for (let e of t) i === "vertical" ? (V(M, "floor", "x", e), V(P, "backWall", "x", e)) : (V(N, "sideWall", "y", e), V(P, "backWall", "y", e));
 	};
-	t.catAxisMinorGridlines === !0 && B(T(o, s), Bt(t.catAxisMinorGridlineColor, t.catAxisMinorGridlineWidthEmu, t.catAxisMinorGridlineDash, u, "E0E0E0", .5)), t.catAxisMajorGridlines === !0 && B(l(o, s), Bt(t.catAxisGridlineColor, t.catAxisGridlineWidthEmu, t.catAxisGridlineDash, u, "E0E0E0", .5));
-	let ie = (n, r, i) => {
+	t.catAxisMinorGridlines === !0 && ee(S(o, s), $t(t.catAxisMinorGridlineColor, t.catAxisMinorGridlineWidthEmu, t.catAxisMinorGridlineDash, l, "E0E0E0", .5)), t.catAxisMajorGridlines === !0 && ee(a(o, s), $t(t.catAxisGridlineColor, t.catAxisGridlineWidthEmu, t.catAxisGridlineDash, l, "E0E0E0", .5));
+	let U = (n, r, i) => {
 		if (!n.length) return;
-		let a = b(t, r, i);
+		let a = A(t, r, i);
 		if (a.line === null) return;
 		let o = a.line ?? {
 			fillType: "solid",
 			color: "898989"
-		}, s = n.flatMap((e) => e.points), c = Math.min(...s.map((e) => e.x)), l = Math.max(...s.map((e) => e.x)), d = Math.min(...s.map((e) => e.y)), f = Math.max(...s.map((e) => e.y)), p = o.fillType === "solid" ? `#${o.color}` : z(o, e, c, d, l - c, f - d);
+		}, s = n.flatMap((e) => e.points), c = Math.min(...s.map((e) => e.x)), u = Math.max(...s.map((e) => e.x)), d = Math.min(...s.map((e) => e.y)), f = Math.max(...s.map((e) => e.y)), p = o.fillType === "solid" ? `#${o.color}` : R(o, e, c, d, u - c, f - d);
 		if (!p) return;
-		let m = a.lineWidthEmu == null ? u : Math.max(.25, a.lineWidthEmu / U * u);
-		e.strokeStyle = p, e.lineWidth = m, e.setLineDash(O(a.lineCustomDash, a.lineDash, m)), e.lineCap = a.lineCap === "rnd" ? "round" : a.lineCap === "sq" ? "square" : "butt", e.lineJoin = a.lineJoin === "round" || a.lineJoin === "bevel" ? a.lineJoin : "miter";
+		let m = a.lineWidthEmu == null ? l : Math.max(.25, a.lineWidthEmu / X * l);
+		e.strokeStyle = p, e.lineWidth = m, e.setLineDash(ae(a.lineCustomDash, a.lineDash, m)), e.lineCap = a.lineCap === "rnd" ? "round" : a.lineCap === "sq" ? "square" : "butt", e.lineJoin = a.lineJoin === "round" || a.lineJoin === "bevel" ? a.lineJoin : "miter";
 		for (let t of n) {
 			if (t.points.length < 2) continue;
 			let n = t.points.map((e, n) => ({
 				start: e,
 				end: t.points[(n + 1) % t.points.length]
 			}));
-			if (n.some((e) => j(e.start, e.end))) {
-				for (let t of n) j(t.start, t.end) || (e.beginPath(), e.moveTo(t.start.x, t.start.y), e.lineTo(t.end.x, t.end.y), e.stroke());
+			if (n.some((e) => k(e.start, e.end))) {
+				for (let t of n) k(t.start, t.end) || (e.beginPath(), e.moveTo(t.start.x, t.start.y), e.lineTo(t.end.x, t.end.y), e.stroke());
 				continue;
 			}
 			e.beginPath(), e.moveTo(t.points[0].x, t.points[0].y);
@@ -1921,13 +1997,13 @@ function Ut(e, t, n, i, a, o, s, c, u) {
 			e.lineTo(t.points[0].x, t.points[0].y), e.closePath(), e.stroke();
 		}
 	};
-	ie(te, t.threeD?.floor, "floor"), ie(ne, t.threeD?.sideWall, "wall"), ie(I, t.threeD?.backWall, "wall"), e.setLineDash([]);
+	U(F, t.threeD?.floor, "floor"), U(I, t.threeD?.sideWall, "wall"), U(L, t.threeD?.backWall, "wall"), e.setLineDash([]);
 }
-function Wt(e, t, n, r, i, a, o, s, c) {
-	let l = Xt(t, n, r, i, a, o, c), u = c === "vertical" ? !t.catAxisHidden && !t.catAxisLineHidden : !t.valAxisHidden && !t.valAxisLineHidden, d = c === "vertical" ? !t.valAxisHidden && !t.valAxisLineHidden : !t.catAxisHidden && !t.catAxisLineHidden;
-	u && ($(e, Vt(c === "vertical" ? t.catAxisLineColor : t.valAxisLineColor, c === "vertical" ? t.catAxisLineWidthEmu : t.valAxisLineWidthEmu, c === "vertical" ? t.catAxisLineDash : t.valAxisLineDash, s)), e.beginPath(), e.moveTo(l.horizontalStart.x, l.horizontalStart.y), e.lineTo(l.horizontalEnd.x, l.horizontalEnd.y), e.stroke()), d && ($(e, Vt(c === "vertical" ? t.valAxisLineColor : t.catAxisLineColor, c === "vertical" ? t.valAxisLineWidthEmu : t.catAxisLineWidthEmu, c === "vertical" ? t.valAxisLineDash : t.catAxisLineDash, s)), e.beginPath(), e.moveTo(l.verticalStart.x, l.verticalStart.y), e.lineTo(l.verticalEnd.x, l.verticalEnd.y), e.stroke()), e.setLineDash([]);
+function an(e, t, n, r, i, a, o, s, c) {
+	let l = dn(t, n, r, i, a, o, c), u = c === "vertical" ? !t.catAxisHidden && !t.catAxisLineHidden : !t.valAxisHidden && !t.valAxisLineHidden, d = c === "vertical" ? !t.valAxisHidden && !t.valAxisLineHidden : !t.catAxisHidden && !t.catAxisLineHidden;
+	u && (nn(e, en(c === "vertical" ? t.catAxisLineColor : t.valAxisLineColor, c === "vertical" ? t.catAxisLineWidthEmu : t.valAxisLineWidthEmu, c === "vertical" ? t.catAxisLineDash : t.valAxisLineDash, s)), e.beginPath(), e.moveTo(l.horizontalStart.x, l.horizontalStart.y), e.lineTo(l.horizontalEnd.x, l.horizontalEnd.y), e.stroke()), d && (nn(e, en(c === "vertical" ? t.valAxisLineColor : t.catAxisLineColor, c === "vertical" ? t.valAxisLineWidthEmu : t.catAxisLineWidthEmu, c === "vertical" ? t.valAxisLineDash : t.catAxisLineDash, s)), e.beginPath(), e.moveTo(l.verticalStart.x, l.verticalStart.y), e.lineTo(l.verticalEnd.x, l.verticalEnd.y), e.stroke()), e.setLineDash([]);
 }
-function Gt(e, t, n, r) {
+function on(e, t, n, r) {
 	let i = {
 		x: (e.x + t.x) / 2,
 		y: (e.y + t.y) / 2
@@ -1940,25 +2016,25 @@ function Gt(e, t, n, r) {
 		y: i.y <= n.y ? -1 : 1
 	};
 }
-function Kt(e, t, n, r, i, a, o, s, c) {
+function sn(e, t, n, r, i, a, o, s, c) {
 	if (!t || t === "none") return;
-	let l = Gt(r, i, a, o), u = qt(s, c), d = t === "cross" ? u / 2 : u, f = t === "out" || t === "cross" ? d : 0, p = t === "in" || t === "cross" ? d : 0;
+	let l = on(r, i, a, o), u = cn(s, c), d = t === "cross" ? u / 2 : u, f = t === "out" || t === "cross" ? d : 0, p = t === "in" || t === "cross" ? d : 0;
 	e.beginPath(), e.moveTo(n.x + l.x * f, n.y + l.y * f), e.lineTo(n.x - l.x * p, n.y - l.y * p), e.stroke();
 }
-function qt(e, t) {
+function cn(e, t) {
 	return (e === "minor" ? 4 : 6) * t;
 }
-function Jt(e, t, n) {
+function ln(e, t, n) {
 	if (e !== "out" && e !== "cross") return 0;
-	let r = qt(t, n);
+	let r = cn(t, n);
 	return e === "cross" ? r / 2 : r;
 }
-function Yt(e, t, n, r) {
+function un(e, t, n, r) {
 	if (t) return r;
-	let i = Jt(e, "major", n);
+	let i = ln(e, "major", n);
 	return Math.max(r, i + 3 * n);
 }
-function Xt(e, t, n, r, i, a, o) {
+function dn(e, t, n, r, i, a, o) {
 	let { front: s } = t, c = (e) => Math.max(0, Math.min(1, e)), l = t.topology.axisX === "min" ? s.x : s.x + s.w, u = t.topology.axisY === "min" ? s.y : s.y + s.h, d = () => {
 		if (e.catAxisCrossesAt != null && Number.isFinite(e.catAxisCrossesAt)) {
 			let t = e.chartType.endsWith("Pct") ? e.catAxisCrossesAt * 100 : e.catAxisCrossesAt;
@@ -1968,251 +2044,258 @@ function Xt(e, t, n, r, i, a, o) {
 		return c(t === "min" ? n.fraction(n.min) : t === "max" ? n.fraction(n.max) : n.fraction(0));
 	}, f = () => {
 		let t = e.valAxisCrossesAt;
-		if (t != null && Number.isFinite(t)) return g(t - 1, r, i, a);
+		if (t != null && Number.isFinite(t)) return T(t - 1, r, i, a);
 		let n = e.valAxisCrosses;
 		if (n !== "min" && n !== "max") return null;
 		let o = +(n === "max");
 		return a ? 1 - o : o;
-	}, p = d(), m = f(), h = o === "horizontal" ? s.x + p * s.w : m == null ? l : s.x + m * s.w, _ = o === "vertical" ? s.y + s.h - p * s.h : m == null ? u : s.y + m * s.h, v = t.topology.nearDepth;
+	}, p = d(), m = f(), h = o === "horizontal" ? s.x + p * s.w : m == null ? l : s.x + m * s.w, g = o === "vertical" ? s.y + s.h - p * s.h : m == null ? u : s.y + m * s.h, _ = t.topology.nearDepth;
 	return {
 		axisX: h,
-		axisY: _,
-		depth: v,
-		horizontalStart: t.project(s.x, _, v),
-		horizontalEnd: t.project(s.x + s.w, _, v),
-		verticalStart: t.project(h, s.y + s.h, v),
-		verticalEnd: t.project(h, s.y, v)
+		axisY: g,
+		depth: _,
+		horizontalStart: t.project(s.x, g, _),
+		horizontalEnd: t.project(s.x + s.w, g, _),
+		verticalStart: t.project(h, s.y + s.h, _),
+		verticalEnd: t.project(h, s.y, _)
 	};
 }
-function Zt(e, t, n, r, i, a, o, s, c, u) {
-	let { front: d } = n, f = Xt(t, n, r, i, a, o, s), { axisX: p, axisY: m, depth: h } = f, _ = n.project(d.x + d.w / 2, d.y + d.h / 2, h), v = t.valAxisMinorTickMark ?? "none", y = c ? Ht : Vt;
+function fn(e, t, n, r, i, o, s, c, l, u) {
+	let { front: d } = n, f = dn(t, n, r, i, o, s, c), { axisX: p, axisY: m, depth: h } = f, g = n.project(d.x + d.w / 2, d.y + d.h / 2, h), _ = t.valAxisMinorTickMark ?? "none", v = l ? tn : en;
 	if (!t.valAxisHidden && !t.valAxisLineHidden) {
-		$(e, y(t.valAxisLineColor, t.valAxisLineWidthEmu, t.valAxisLineDash, u));
-		let i = (e) => s === "horizontal" ? n.project(d.x + r.fraction(e) * d.w, m, h) : n.project(p, d.y + d.h - r.fraction(e) * d.h, h), a = s === "horizontal" ? f.horizontalStart : f.verticalStart, o = s === "horizontal" ? f.horizontalEnd : f.verticalEnd;
-		for (let n of r.majorTicks) Kt(e, t.valAxisMajorTickMark, i(n), a, o, _, s === "vertical" ? "horizontal" : "vertical", "major", u);
-		for (let t of r.minorTicks) Kt(e, v, i(t), a, o, _, s === "vertical" ? "horizontal" : "vertical", "minor", u);
+		nn(e, v(t.valAxisLineColor, t.valAxisLineWidthEmu, t.valAxisLineDash, u));
+		let i = (e) => c === "horizontal" ? n.project(d.x + r.fraction(e) * d.w, m, h) : n.project(p, d.y + d.h - r.fraction(e) * d.h, h), a = c === "horizontal" ? f.horizontalStart : f.verticalStart, o = c === "horizontal" ? f.horizontalEnd : f.verticalEnd;
+		for (let n of r.majorTicks) sn(e, t.valAxisMajorTickMark, i(n), a, o, g, c === "vertical" ? "horizontal" : "vertical", "major", u);
+		for (let t of r.minorTicks) sn(e, _, i(t), a, o, g, c === "vertical" ? "horizontal" : "vertical", "minor", u);
 	}
 	if (!t.catAxisHidden && !t.catAxisLineHidden) {
-		$(e, y(t.catAxisLineColor, t.catAxisLineWidthEmu, t.catAxisLineDash, u));
-		let r = s === "vertical" ? f.horizontalStart : f.verticalStart, v = s === "vertical" ? f.horizontalEnd : f.verticalEnd, b = Math.max(1, Math.floor(t.catAxisTickMarkSkip ?? 1)), x = (i) => {
-			let a = s === "vertical" ? n.project(d.x + i * d.w, m, h) : n.project(p, d.y + i * d.h, h);
-			Kt(e, t.catAxisMajorTickMark, a, r, v, _, s === "vertical" ? "vertical" : "horizontal", "major", u);
+		nn(e, v(t.catAxisLineColor, t.catAxisLineWidthEmu, t.catAxisLineDash, u));
+		let r = c === "vertical" ? f.horizontalStart : f.verticalStart, _ = c === "vertical" ? f.horizontalEnd : f.verticalEnd, y = Math.max(1, Math.floor(t.catAxisTickMarkSkip ?? 1)), b = (i) => {
+			let a = c === "vertical" ? n.project(d.x + i * d.w, m, h) : n.project(p, d.y + i * d.h, h);
+			sn(e, t.catAxisMajorTickMark, a, r, _, g, c === "vertical" ? "vertical" : "horizontal", "major", u);
 		};
-		if (c) {
-			let e = l(i, a);
-			for (let t = 0; t < e.length; t += b) x(o ? 1 - e[t] : e[t]);
-		} else for (let e = 0; e < i; e += b) x(g(e, i, a, o));
-		let S = t.catAxisMinorUnit;
-		if (t.catAxisMinorTickMark && t.catAxisMinorTickMark !== "none" && S != null && Number.isFinite(S) && S > 0) {
-			let c = t.catAxisMajorUnit != null && Number.isFinite(t.catAxisMajorUnit) && t.catAxisMajorUnit > 0 ? t.catAxisMajorUnit : b, l = Math.min(512, Math.ceil(i / S));
+		if (l) {
+			let e = a(i, o);
+			for (let t = 0; t < e.length; t += y) b(s ? 1 - e[t] : e[t]);
+		} else for (let e = 0; e < i; e += y) b(T(e, i, o, s));
+		let x = t.catAxisMinorUnit;
+		if (t.catAxisMinorTickMark && t.catAxisMinorTickMark !== "none" && x != null && Number.isFinite(x) && x > 0) {
+			let a = t.catAxisMajorUnit != null && Number.isFinite(t.catAxisMajorUnit) && t.catAxisMajorUnit > 0 ? t.catAxisMajorUnit : y, l = Math.min(512, Math.ceil(i / x));
 			for (let f = 1; f < l; f++) {
-				let l = f * S;
+				let l = f * x;
 				if (!(l < i)) break;
-				if (Math.abs(l / c - Math.round(l / c)) < 1e-9) continue;
-				let y = g(l, i, a, o), b = s === "vertical" ? n.project(d.x + y * d.w, m, h) : n.project(p, d.y + y * d.h, h);
-				Kt(e, t.catAxisMinorTickMark, b, r, v, _, s === "vertical" ? "vertical" : "horizontal", "minor", u);
+				if (Math.abs(l / a - Math.round(l / a)) < 1e-9) continue;
+				let v = T(l, i, o, s), y = c === "vertical" ? n.project(d.x + v * d.w, m, h) : n.project(p, d.y + v * d.h, h);
+				sn(e, t.catAxisMinorTickMark, y, r, _, g, c === "vertical" ? "vertical" : "horizontal", "minor", u);
 			}
 		}
 	}
 	e.setLineDash([]);
 }
-function Qt(e, t, n, r, i) {
-	if (!t.threeD) return !1;
-	let a = t.chartType === "clusteredBar" || t.chartType === "clusteredBarH" || t.chartType.startsWith("stackedBar"), o = t.chartType.endsWith("H") || t.chartType.includes("BarH"), s = t.chartType.startsWith("stacked"), l = a && !s && t.threeD.barGrouping === "standard", { plot: u, legend: d, legendMeasure: f } = jt(e, t, n, r, o ? "horizontal" : "vertical", i), p = ue(t.threeD, u, {
-		sceneDepthScale: a ? l ? .65 : .1 : .4,
-		perspectiveTangentGain: l ? 1 : 2,
-		sceneHeightScale: !a && !(t.threeD.heightPercentAuthored ?? t.threeD.heightPercent != null) ? 1 / 3 : void 0
+function pn(t, r, i, a, o) {
+	if (!r.threeD) return !1;
+	let s = r.chartType === "clusteredBar" || r.chartType === "clusteredBarH" || r.chartType.startsWith("stackedBar"), c = r.chartType.endsWith("H") || r.chartType.includes("BarH"), l = r.chartType.startsWith("stacked"), p = s && !l && r.threeD.barGrouping === "standard", { plot: h, legend: g, legendMeasure: _ } = Ht(t, r, i, a, c ? "horizontal" : "vertical", o), y = he(r.threeD, h, {
+		sceneDepthScale: s ? p ? .65 : .1 : .4,
+		perspectiveTangentGain: p ? 1 : 2,
+		sceneHeightScale: !s && !(r.threeD.heightPercentAuthored ?? r.threeD.heightPercent != null) ? 1 / 3 : void 0
 	});
-	if (!p) return !0;
-	p = pe(p, t.threeD, u);
-	let m = t.chartType.endsWith("Pct"), h = t.series.find((e) => (e.categories?.length ?? 0) > 0)?.categories ?? t.categories, _ = Math.max(1, h.length, ...t.series.map((e) => e.values.length)), v = m ? lt(t, _) : void 0, y = t.catAxisOrientation === "maxMin", b = t.catAxisCrossBetween === "between", x = t.dispBlanksAs ?? "gap", S = t.valAxisLogBase != null && Number.isFinite(t.valAxisLogBase) && t.valAxisLogBase >= 2, w = (e, n) => {
-		let r = t.series[e]?.values[n];
-		return r != null && Number.isFinite(r) && (!S || r > 0) || r == null && (s || x === "zero");
-	}, T = (e, n) => ut(t, e, n, v), E = 0, k = 0;
-	if (s) {
-		for (let e = 0; e < _; e++) {
-			let n = 0, r = 0;
-			for (let i = 0; i < t.series.length; i++) {
-				let t = T(i, e);
-				t >= 0 ? n = X(n, t) : r = X(r, t);
+	if (!y) return !0;
+	y = _e(y, r.threeD, h);
+	let b = r.chartType.endsWith("Pct"), x = r.series.find((e) => (e.categories?.length ?? 0) > 0)?.categories ?? r.categories, S = Math.max(1, x.length, ...r.series.map((e) => e.values.length)), C = b ? vt(r, S) : void 0, E = r.catAxisOrientation === "maxMin", D = r.catAxisCrossBetween === "between", O = r.dispBlanksAs ?? "gap", k = r.valAxisLogBase != null && Number.isFinite(r.valAxisLogBase) && r.valAxisLogBase >= 2, A = (e, t) => {
+		let n = r.series[e]?.values[t];
+		return n != null && Number.isFinite(n) && (!k || n > 0) || n == null && (l || O === "zero");
+	}, j = (e, t) => yt(r, e, t, C), M = 0, N = 0;
+	if (l) {
+		for (let e = 0; e < S; e++) {
+			let t = 0, n = 0;
+			for (let i = 0; i < r.series.length; i++) {
+				let r = j(i, e);
+				r >= 0 ? t = bt(t, r) : n = bt(n, r);
 			}
-			E = Math.min(E, r), k = Math.max(k, n);
+			M = Math.min(M, n), N = Math.max(N, t);
 		}
-		m && (E = E < 0 ? -100 : 0, k = k > 0 ? 100 : 0, E === 0 && k === 0 && (k = 1));
+		b && (M = M < 0 ? -100 : 0, N = N > 0 ? 100 : 0, M === 0 && N === 0 && (N = 1));
 	} else {
-		let e = ve(t.series.flatMap((e) => e.values).filter((e) => e != null && Number.isFinite(e) && (!S || e > 0)), S ? {
+		let e = Te(r.series.flatMap((e) => e.values).filter((e) => e != null && Number.isFinite(e) && (!k || e > 0)), k ? {
 			min: 1,
 			max: 10
 		} : {
 			min: 0,
 			max: 1
 		});
-		E = S ? e.min : Math.min(0, e.min), k = S ? e.max : Math.max(0, e.max);
-	}
-	let A = o ? p.project(p.front.x, p.topology.axisY === "min" ? p.front.y : p.front.y + p.front.h, p.topology.nearDepth) : p.project(p.topology.axisX === "min" ? p.front.x : p.front.x + p.front.w, p.front.y, p.topology.nearDepth), j = o ? p.project(p.front.x + p.front.w, p.topology.axisY === "min" ? p.front.y : p.front.y + p.front.h, p.topology.nearDepth) : p.project(p.topology.axisX === "min" ? p.front.x : p.front.x + p.front.w, p.front.y + p.front.h, p.topology.nearDepth), M = Math.hypot(j.x - A.x, j.y - A.y) / r, F = Lt(t, E, k, M, m, o ? "horizontal" : "vertical"), L = (e) => Number.isFinite(e) ? Math.max(F.min, Math.min(F.max, e)) : F.min;
-	a || Ut(e, t, p, F, o ? "horizontal" : "vertical", _, b, y, r);
-	let { front: R } = p, z = Math.max(1, t.series.length), re = [], B = t.series.map((e) => new Map(e.dataPointOverrides?.map((e) => [e.idx, e]) ?? [])), ie = t.series.map((e) => new Map(e.dataLabelOverrides?.map((e) => [e.idx, e]) ?? []));
-	if (a) {
-		let a = p.prismInterval(0, 1, !0), c = [], u = Array(_).fill(0), d = Array(_).fill(0), f = (o ? R.h : R.w) / _, h = t.barGapWidth != null && Number.isFinite(t.barGapWidth) && t.barGapWidth >= 0 ? t.barGapWidth : 150;
-		for (let e = 0; e < t.series.length; e++) {
-			let n = t.series[e], i = l ? p.prismInterval(e, z, !1) : a, g = ge(f, h, l ? 0 : e, l ? 1 : z, s || l);
-			for (let a = 0; a < _; a++) {
-				if (!w(e, a)) continue;
-				let l = T(e, a), p = Z(t, n, B[e].get(a), a, e), h = p.fill === null ? "transparent" : p.color, v = p.lineFill !== null && (p.lineColor != null || p.lineFill !== void 0), b = s ? l >= 0 ? u[a] : d[a] : 0, x = X(b, l);
-				s && (l >= 0 ? u[a] = x : d[a] = x);
-				let C = L(b), E = L(x), D = n.threeDShape ?? t.threeD.shape ?? "box", O = D === "cone" || D === "pyramid", k = D === "coneToMax" || D === "pyramidToMax", ee = (e) => {
-					if (!O) return 1;
-					let t = S && !(b > 0) ? F.min : b, n = F.fraction(t), r = F.fraction(x), i = F.fraction(e), a = r - n;
+		M = k ? e.min : Math.min(0, e.min), N = k ? e.max : Math.max(0, e.max);
+	}
+	let P = c ? y.project(y.front.x, y.topology.axisY === "min" ? y.front.y : y.front.y + y.front.h, y.topology.nearDepth) : y.project(y.topology.axisX === "min" ? y.front.x : y.front.x + y.front.w, y.front.y, y.topology.nearDepth), F = c ? y.project(y.front.x + y.front.w, y.topology.axisY === "min" ? y.front.y : y.front.y + y.front.h, y.topology.nearDepth) : y.project(y.topology.axisX === "min" ? y.front.x : y.front.x + y.front.w, y.front.y + y.front.h, y.topology.nearDepth), I = Math.hypot(F.x - P.x, F.y - P.y) / a, L = Xt(r, M, N, I, b, c ? "horizontal" : "vertical"), R = (e) => Number.isFinite(e) ? Math.max(L.min, Math.min(L.max, e)) : L.min;
+	s || rn(t, r, y, L, c ? "horizontal" : "vertical", S, D, E, a);
+	let { front: z } = y, B = Math.max(1, r.series.length), V = [], H = r.series.map((e) => new Map(e.dataPointOverrides?.map((e) => [e.idx, e]) ?? [])), ee = r.series.map((e) => new Map(e.dataLabelOverrides?.map((e) => [e.idx, e]) ?? []));
+	if (s) {
+		let n = y.prismInterval(0, 1, !0), s = [], u = Array(S).fill(0), d = Array(S).fill(0), f = (c ? z.h : z.w) / S, m = r.barGapWidth != null && Number.isFinite(r.barGapWidth) && r.barGapWidth >= 0 ? r.barGapWidth : 150;
+		for (let e = 0; e < r.series.length; e++) {
+			let t = r.series[e], i = p ? y.prismInterval(e, B, !1) : n, o = xe(f, m, p ? 0 : e, p ? 1 : B, l || p);
+			for (let n = 0; n < S; n++) {
+				if (!A(e, n)) continue;
+				let p = j(e, n), m = Q(r, t, H[e].get(n), n, e), h = m.fill === null ? "transparent" : m.color, g = m.lineFill !== null && (m.lineColor != null || m.lineFill !== void 0), _ = l ? p >= 0 ? u[n] : d[n] : 0, v = bt(_, p);
+				l && (p >= 0 ? u[n] = v : d[n] = v);
+				let y = R(_), x = R(v), C = t.threeDShape ?? r.threeD.shape ?? "box", w = C === "cone" || C === "pyramid", T = C === "coneToMax" || C === "pyramidToMax", D = (e) => {
+					if (!w) return 1;
+					let t = k && !(_ > 0) ? L.min : _, n = L.fraction(t), r = L.fraction(v), i = L.fraction(e), a = r - n;
 					return a === 0 || !Number.isFinite(a) || !Number.isFinite(i - n) ? +(e === t) : Math.max(0, Math.min(1, 1 - (i - n) / a));
-				}, A = (e) => {
-					if (!k) return 1;
-					let t = x >= b ? F.max : F.min, n = S ? F.min : 0, r = F.fraction(t), i = F.fraction(n), a = F.fraction(e), o = Math.abs(r - i);
+				}, O = (e) => {
+					if (!T) return 1;
+					let t = v >= _ ? L.max : L.min, n = k ? L.min : 0, r = L.fraction(t), i = L.fraction(n), a = L.fraction(e), o = Math.abs(r - i);
 					return !(o > 0) || ![
 						r,
 						i,
 						a
-					].every(Number.isFinite) ? se(e, F.min, F.max) : Math.max(0, Math.min(1, Math.abs(r - a) / o));
-				}, j = k ? A(C) : ee(C), M = k ? A(E) : ee(E);
-				if (o) {
-					let t = R.x + F.fraction(C) * R.w, n = R.x + F.fraction(E) * R.w, o = y ? _ - 1 - a : a, s = R.y + o * f + g.offset;
-					c.push({
-						x: Math.min(t, n),
-						y: s,
-						width: Math.abs(n - t),
-						height: g.size,
+					].every(Number.isFinite) ? pe(e, L.min, L.max) : Math.max(0, Math.min(1, Math.abs(r - a) / o));
+				}, M = T ? O(y) : D(y), N = T ? O(x) : D(x);
+				if (c) {
+					let t = z.x + L.fraction(y) * z.w, r = z.x + L.fraction(x) * z.w, c = E ? S - 1 - n : n, l = z.y + c * f + o.offset;
+					s.push({
+						x: Math.min(t, r),
+						y: l,
+						width: Math.abs(r - t),
+						height: o.size,
 						nearDepth: i.near,
 						farDepth: i.far,
-						categoryIndex: a,
+						categoryIndex: n,
 						seriesIndex: e,
 						color: h,
-						fillPaint: p.fill,
-						lineFill: p.lineFill,
-						shape: D,
+						fillPaint: m.fill,
+						lineFill: m.lineFill,
+						shape: C,
 						baseCoord: t,
-						endCoord: n,
-						baseScale: j,
-						endScale: M,
+						endCoord: r,
+						baseScale: M,
+						endScale: N,
 						omitBaseCap: !1,
 						omitEndCap: !1,
-						outline: v,
-						outlineColor: p.lineColor ?? "rgba(0,0,0,0.42)",
-						outlineWidth: p.lineWidthEmu == null ? .75 * r / H : at(p.lineWidthEmu, r),
-						outlineDash: p.lineDash ?? "solid",
-						outlineCustomDash: p.lineCustomDash,
-						outlineCap: p.lineCap,
-						outlineJoin: p.lineJoin,
-						labelValue: m ? l / 100 : l,
-						plottedLabelValue: x
+						outline: g,
+						outlineColor: m.lineColor ?? "rgba(0,0,0,0.42)",
+						outlineWidth: m.lineWidthEmu == null ? .75 * a / ue : mt(m.lineWidthEmu, a),
+						outlineDash: m.lineDash ?? "solid",
+						outlineCustomDash: m.lineCustomDash,
+						outlineCap: m.lineCap,
+						outlineJoin: m.lineJoin,
+						labelValue: b ? p / 100 : p,
+						plottedLabelValue: v
 					});
 				} else {
-					let t = R.y + R.h - F.fraction(C) * R.h, n = R.y + R.h - F.fraction(E) * R.h, o = y ? _ - 1 - a : a, s = R.x + o * f + g.offset;
-					c.push({
-						x: s,
-						y: Math.min(t, n),
-						width: g.size,
-						height: Math.abs(n - t),
+					let t = z.y + z.h - L.fraction(y) * z.h, r = z.y + z.h - L.fraction(x) * z.h, c = E ? S - 1 - n : n, l = z.x + c * f + o.offset;
+					s.push({
+						x: l,
+						y: Math.min(t, r),
+						width: o.size,
+						height: Math.abs(r - t),
 						nearDepth: i.near,
 						farDepth: i.far,
-						categoryIndex: a,
+						categoryIndex: n,
 						seriesIndex: e,
 						color: h,
-						fillPaint: p.fill,
-						lineFill: p.lineFill,
-						shape: D,
+						fillPaint: m.fill,
+						lineFill: m.lineFill,
+						shape: C,
 						baseCoord: t,
-						endCoord: n,
-						baseScale: j,
-						endScale: M,
+						endCoord: r,
+						baseScale: M,
+						endScale: N,
 						omitBaseCap: !1,
 						omitEndCap: !1,
-						outline: v,
-						outlineColor: p.lineColor ?? "rgba(0,0,0,0.42)",
-						outlineWidth: p.lineWidthEmu == null ? .75 * r / H : at(p.lineWidthEmu, r),
-						outlineDash: p.lineDash ?? "solid",
-						outlineCustomDash: p.lineCustomDash,
-						outlineCap: p.lineCap,
-						outlineJoin: p.lineJoin,
-						labelValue: m ? l / 100 : l,
-						plottedLabelValue: x
+						outline: g,
+						outlineColor: m.lineColor ?? "rgba(0,0,0,0.42)",
+						outlineWidth: m.lineWidthEmu == null ? .75 * a / ue : mt(m.lineWidthEmu, a),
+						outlineDash: m.lineDash ?? "solid",
+						outlineCustomDash: m.lineCustomDash,
+						outlineCap: m.lineCap,
+						outlineJoin: m.lineJoin,
+						labelValue: b ? p / 100 : p,
+						plottedLabelValue: v
 					});
 				}
 			}
 		}
-		if (s) {
-			let e = ot(c, _);
-			for (let t = 0; t < _; t++) {
+		if (l) {
+			let e = ht(s, S);
+			for (let t = 0; t < S; t++) {
 				let n = e[t];
 				for (let e of [-1, 1]) {
-					let t = n.filter((t) => Math.sign(t.labelValue) === e && !_t(t.color) && Math.abs(t.endCoord - t.baseCoord) > 1e-9).sort((e, t) => e.seriesIndex - t.seriesIndex);
+					let t = n.filter((t) => Math.sign(t.labelValue) === e && !Dt(t.color) && Math.abs(t.endCoord - t.baseCoord) > 1e-9).sort((e, t) => e.seriesIndex - t.seriesIndex);
 					for (let e = 0; e + 1 < t.length; e++) {
 						let n = t[e], r = t[e + 1], i = 1e-8 * Math.max(1, Math.abs(n.endCoord), Math.abs(r.baseCoord));
 						n.shape !== r.shape || Math.abs(n.endCoord - r.baseCoord) > i || Math.abs(n.endScale - r.baseScale) > 1e-9 || n.nearDepth !== r.nearDepth || n.farDepth !== r.farDepth || (n.omitEndCap = !0, r.omitBaseCap = !0);
 					}
 				}
-				let r = n.find((e) => e.labelValue > 0 && !_t(e.color)), i = n.find((e) => e.labelValue < 0 && !_t(e.color));
+				let r = n.find((e) => e.labelValue > 0 && !Dt(e.color)), i = n.find((e) => e.labelValue < 0 && !Dt(e.color));
 				if (r && i) {
 					let e = 1e-8 * Math.max(1, Math.abs(r.baseCoord), Math.abs(i.baseCoord));
 					r.shape === i.shape && Math.abs(r.baseCoord - i.baseCoord) <= e && Math.abs(r.baseScale - i.baseScale) <= 1e-9 && r.nearDepth === i.nearDepth && r.farDepth === i.farDepth && (r.omitBaseCap = !0, i.omitBaseCap = !0);
 				}
 			}
 		}
-		Ut(e, t, p, F, o ? "horizontal" : "vertical", _, b, y, r);
-		let g = {
-			remaining: Le,
+		rn(t, r, y, L, c ? "horizontal" : "vertical", S, D, E, a);
+		let h = {
+			remaining: Ke,
 			exceeded: !1
-		}, v = c.flatMap((t) => {
-			let n = bt(p, t.shape, o, t.x, t.y, t.width, t.height, t.baseCoord, t.endCoord, t.nearDepth, t.farDepth, t.color, t.baseScale, t.endScale, t.omitBaseCap, t.omitEndCap, t.outline && t.outlineColor ? {
-				color: t.outlineColor,
-				width: t.outlineWidth,
-				dash: O(t.outlineCustomDash, t.outlineDash, t.outlineWidth),
-				cap: t.outlineCap,
-				join: t.outlineJoin
-			} : void 0, g);
-			return wt(e, n, "fill", t.fillPaint, i), wt(e, n, "outline", t.lineFill, i), n;
-		});
-		if (g.exceeded) return Tt(e, n), !0;
-		for (let t of Ie(v)) Ct(e, t);
-		for (let a of c) {
-			let s = t.series[a.seriesIndex], c = o ? p.project(a.endCoord, a.y + a.height / 2, (a.nearDepth + a.farDepth) / 2) : p.project(a.x + a.width / 2, a.endCoord, (a.nearDepth + a.farDepth) / 2), l = ie[a.seriesIndex].get(a.categoryIndex);
-			At(t, s, l) && re.push(() => kt(e, t, s, a.seriesIndex, a.categoryIndex, a.labelValue, c, n, r, 0, void 0, l, "t", c, !0, t.valAxisDisplayUnits, F.max, a.plottedLabelValue, i));
+		}, g = s.map((e) => {
+			let n = At(y, e.shape, c, e.x, e.y, e.width, e.height, e.baseCoord, e.endCoord, e.nearDepth, e.farDepth, e.color, e.baseScale, e.endScale, e.omitBaseCap, e.omitEndCap, e.outline && e.outlineColor ? {
+				color: e.outlineColor,
+				width: e.outlineWidth,
+				dash: ae(e.outlineCustomDash, e.outlineDash, e.outlineWidth),
+				cap: e.outlineCap,
+				join: e.outlineJoin
+			} : void 0, h);
+			return Ft(t, n, "fill", e.fillPaint, o), Ft(t, n, "outline", e.lineFill, o), {
+				item: e,
+				faces: n
+			};
+		}), _ = g.flatMap((e) => e.faces);
+		if (h.exceeded) return It(t, i), !0;
+		for (let e of Ge(_)) Nt(t, e);
+		for (let { item: n, faces: i } of g) {
+			let o = r.series[n.seriesIndex], s = H[n.seriesIndex].get(n.categoryIndex), c = De(r, o, n.categoryIndex, n.seriesIndex), l = e(s?.chartexStyle), u = e(o.chartexStyle);
+			ne(t, l ?? u, q(r, "dataPoint3D", n.seriesIndex), l ? n.categoryIndex : c, a, (e) => Pt(e, i), c);
+		}
+		for (let e of s) {
+			let n = r.series[e.seriesIndex], s = c ? y.project(e.endCoord, e.y + e.height / 2, (e.nearDepth + e.farDepth) / 2) : y.project(e.x + e.width / 2, e.endCoord, (e.nearDepth + e.farDepth) / 2), l = ee[e.seriesIndex].get(e.categoryIndex);
+			Vt(r, n, l) && V.push(() => Bt(t, r, n, e.seriesIndex, e.categoryIndex, e.labelValue, s, i, a, 0, void 0, l, "t", s, !0, r.valAxisDisplayUnits, L.max, e.plottedLabelValue, o));
 		}
 	} else {
-		let a = t.series.map(() => Array(_).fill(0)), o = t.series.map(() => Array(_).fill(0));
-		if (s) {
-			let e = Array(_).fill(0), n = Array(_).fill(0);
-			for (let r = 0; r < t.series.length; r++) for (let t = 0; t < _; t++) {
-				let i = T(r, t), s = i >= 0 ? e[t] : n[t];
-				a[r][t] = s, o[r][t] = X(s, i), i >= 0 ? e[t] = X(e[t], i) : n[t] = X(n[t], i);
+		let e = r.series.map(() => Array(S).fill(0)), s = r.series.map(() => Array(S).fill(0));
+		if (l) {
+			let t = Array(S).fill(0), n = Array(S).fill(0);
+			for (let i = 0; i < r.series.length; i++) for (let r = 0; r < S; r++) {
+				let a = j(i, r), o = a >= 0 ? t[r] : n[r];
+				e[i][r] = o, s[i][r] = bt(o, a), a >= 0 ? t[r] = bt(t[r], a) : n[r] = bt(n[r], a);
 			}
 		}
 		let c = (e) => {
-			let t = p.seriesDepth(e, z, s), n = 0, r = 0;
-			for (let i = 0; i < _; i++) {
-				if (!w(e, i)) continue;
-				let a = s ? o[e][i] : T(e, i), c = R.x + g(i, _, b, y) * R.w, l = R.y + R.h - F.fraction(L(a)) * R.h;
-				n += p.cameraDepth(c, l, t), r++;
+			let t = y.seriesDepth(e, B, l), n = 0, r = 0;
+			for (let i = 0; i < S; i++) {
+				if (!A(e, i)) continue;
+				let a = l ? s[e][i] : j(e, i), o = z.x + T(i, S, D, E) * z.w, c = z.y + z.h - L.fraction(R(a)) * z.h;
+				n += y.cameraDepth(o, c, t), r++;
 			}
 			return r > 0 ? n / r : -Infinity;
-		}, l = t.series.map((e, t) => t).sort((e, t) => c(e) - c(t) || t - e), u = t.series.map((e, n) => Z(t, e, void 0, n, n)), d = [], f = [], h = !1;
-		for (let c of l) {
-			if (h) break;
-			let l = t.series[c], v = u[c], S = v.fill === null ? "transparent" : v.color, C = s ? p.prismInterval(0, 1, !0) : p.prismInterval(c, z, !1), E = R.x + R.w / 2, D = R.y + R.h / 2, k = p.cameraDepth(E, D, C.near) >= p.cameraDepth(E, D, C.far) ? C.near : C.far, A = [], j = [], M = [], ne = [], L = [], ae = [], V = [], H = [], W = [], G = [];
-			for (let e = 0; e < _; e++) {
-				if (!w(c, e)) {
-					A.push(null), j.push(null), M.push(null), ne.push(null), L.push(null), ae.push(null), V.push(null), H.push(null), W.push(null), G.push(null);
+		}, d = r.series.map((e, t) => t).sort((e, t) => c(e) - c(t) || t - e), f = r.series.map((e, t) => Q(r, e, void 0, t, t)), p = [], h = [], g = !1;
+		for (let c of d) {
+			if (g) break;
+			let d = r.series[c], _ = f[c], v = _.fill === null ? "transparent" : _.color, x = l ? y.prismInterval(0, 1, !0) : y.prismInterval(c, B, !1), C = z.x + z.w / 2, w = z.y + z.h / 2, k = y.cameraDepth(C, w, x.near) >= y.cameraDepth(C, w, x.far) ? x.near : x.far, M = [], N = [], P = [], F = [], I = [], R = [], U = [], te = [], W = [], G = [];
+			for (let t = 0; t < S; t++) {
+				if (!A(c, t)) {
+					M.push(null), N.push(null), P.push(null), F.push(null), I.push(null), R.push(null), U.push(null), te.push(null), W.push(null), G.push(null);
 					continue;
 				}
-				let n = s ? o[c][e] : T(c, e), r = s ? a[c][e] : 0, i = R.x + g(e, _, b, y) * R.w, l = F.fraction(n), u = F.fraction(r), d = Number.isFinite(u) ? u : r <= F.min ? 0 : 1, f = Number.isFinite(l) && l >= 0 && l <= 1, m = Number.isFinite(l) ? Math.max(0, Math.min(1, l)) : n <= F.min ? 0 : 1, h = R.y + R.h - m * R.h, v = R.y + R.h - Math.max(0, Math.min(1, d)) * R.h;
-				A.push(t.chartType.toLowerCase().includes("area") || f ? p.project(i, h, k) : null), j.push(p.project(i, v, k)), M.push(f ? p.cameraDepth(i, h, k) : null), ne.push(p.cameraDepth(i, v, k)), L.push(n), ae.push(i), V.push(h), H.push(v), W.push(l), G.push(d);
+				let n = l ? s[c][t] : j(c, t), i = l ? e[c][t] : 0, a = z.x + T(t, S, D, E) * z.w, o = L.fraction(n), u = L.fraction(i), d = Number.isFinite(u) ? u : i <= L.min ? 0 : 1, f = Number.isFinite(o) && o >= 0 && o <= 1, p = Number.isFinite(o) ? Math.max(0, Math.min(1, o)) : n <= L.min ? 0 : 1, m = z.y + z.h - p * z.h, h = z.y + z.h - Math.max(0, Math.min(1, d)) * z.h;
+				M.push(r.chartType.toLowerCase().includes("area") || f ? y.project(a, m, k) : null), N.push(y.project(a, h, k)), P.push(f ? y.cameraDepth(a, m, k) : null), F.push(y.cameraDepth(a, h, k)), I.push(n), R.push(a), U.push(m), te.push(h), W.push(o), G.push(d);
 			}
-			let oe = [], K = null;
-			for (let e = 0; e < A.length; e++) {
-				let t = A[e], n = j[e];
+			let K = [], q = null;
+			for (let e = 0; e < M.length; e++) {
+				let t = M[e], n = N[e];
 				if (!t || !n) {
-					x === "gap" && (K && oe.push(K), K = null);
+					O === "gap" && (q && K.push(q), q = null);
 					continue;
 				}
-				K ??= {
+				q ??= {
 					upper: [],
 					lower: [],
 					upperDepths: [],
@@ -2223,81 +2306,81 @@ function Qt(e, t, n, r, i) {
 					lowerYs: [],
 					upperFractions: [],
 					lowerFractions: []
-				}, K.upper.push(t), K.lower.push(n), K.upperDepths.push(M[e] ?? 0), K.lowerDepths.push(ne[e] ?? 0), K.indices.push(e), K.sceneXs.push(ae[e] ?? 0), K.upperYs.push(V[e] ?? 0), K.lowerYs.push(H[e] ?? 0), K.upperFractions.push(W[e] ?? 0), K.lowerFractions.push(G[e] ?? 0);
+				}, q.upper.push(t), q.lower.push(n), q.upperDepths.push(P[e] ?? 0), q.lowerDepths.push(F[e] ?? 0), q.indices.push(e), q.sceneXs.push(R[e] ?? 0), q.upperYs.push(U[e] ?? 0), q.lowerYs.push(te[e] ?? 0), q.upperFractions.push(W[e] ?? 0), q.lowerFractions.push(G[e] ?? 0);
 			}
-			K && oe.push(K);
-			let q = [], se = [];
-			if (t.chartType.toLowerCase().includes("area")) {
-				for (let t of oe) {
+			q && K.push(q);
+			let J = [], ne = [];
+			if (r.chartType.toLowerCase().includes("area")) {
+				for (let e of K) {
 					let n = null;
-					for (let r = 0; r + 1 < t.upper.length; r++) {
-						let i = Ae(t.lowerFractions[r], t.lowerFractions[r + 1], t.upperFractions[r], t.upperFractions[r + 1]);
+					for (let r = 0; r + 1 < e.upper.length; r++) {
+						let i = ze(e.lowerFractions[r], e.lowerFractions[r + 1], e.upperFractions[r], e.upperFractions[r + 1]);
 						for (let a = 0; a < i.length; a++) {
-							let o = i[a], s = t.sceneXs[r] + (t.sceneXs[r + 1] - t.sceneXs[r]) * o.startT, c = t.sceneXs[r] + (t.sceneXs[r + 1] - t.sceneXs[r]) * o.endT, l = R.y + R.h - o.lowerStart * R.h, u = R.y + R.h - o.lowerEnd * R.h, f = R.y + R.h - o.upperStart * R.h, m = R.y + R.h - o.upperEnd * R.h, g = {
-								...p.project(s, f, k),
-								cameraDepth: p.cameraDepth(s, f, k),
-								cameraWeight: p.cameraProjectionWeight(s, f, k)
-							}, _ = {
-								...p.project(c, m, k),
-								cameraDepth: p.cameraDepth(c, m, k),
-								cameraWeight: p.cameraProjectionWeight(c, m, k)
+							let o = i[a], s = e.sceneXs[r] + (e.sceneXs[r + 1] - e.sceneXs[r]) * o.startT, c = e.sceneXs[r] + (e.sceneXs[r + 1] - e.sceneXs[r]) * o.endT, l = z.y + z.h - o.lowerStart * z.h, u = z.y + z.h - o.lowerEnd * z.h, d = z.y + z.h - o.upperStart * z.h, f = z.y + z.h - o.upperEnd * z.h, m = {
+								...y.project(s, d, k),
+								cameraDepth: y.cameraDepth(s, d, k),
+								cameraWeight: y.cameraProjectionWeight(s, d, k)
+							}, h = {
+								...y.project(c, f, k),
+								cameraDepth: y.cameraDepth(c, f, k),
+								cameraWeight: y.cameraProjectionWeight(c, f, k)
 							};
-							n != null && Math.hypot(n.at(-1).x - g.x, n.at(-1).y - g.y) <= 1e-8 ? n.push(_) : (n && n.length >= 2 && q.push(n), n = [g, _]);
-							let v = yt(p, s, c, l, u, f, m, C.near, C.far, S, r === 0 && a === 0 && o.startT === 0, r + 2 === t.upper.length && a + 1 === i.length && o.endT === 1);
-							for (let t of v) {
-								if (d.length >= 1e4) {
-									h = !0;
+							n != null && Math.hypot(n.at(-1).x - m.x, n.at(-1).y - m.y) <= 1e-8 ? n.push(h) : (n && n.length >= 2 && J.push(n), n = [m, h]);
+							let _ = kt(y, s, c, l, u, d, f, x.near, x.far, v, r === 0 && a === 0 && o.startT === 0, r + 2 === e.upper.length && a + 1 === i.length && o.endT === 1);
+							for (let e of _) {
+								if (p.length >= 1e4) {
+									g = !0;
 									break;
 								}
-								d.push({
-									points: t.points,
-									cameraDepth: t.cameraDepth,
-									cameraDepths: t.cameraDepths,
-									cameraWeights: t.cameraWeights,
+								p.push({
+									points: e.points,
+									cameraDepth: e.cameraDepth,
+									cameraDepths: e.cameraDepths,
+									cameraWeights: e.cameraWeights,
 									layer: 0,
-									paint: () => Ct(e, t)
-								}), se.push(t);
+									paint: () => Nt(t, e)
+								}), ne.push(e);
 							}
-							if (h) break;
+							if (g) break;
 						}
-						if (h) break;
+						if (g) break;
 					}
-					if (n && n.length >= 2 && q.push(n), h) break;
+					if (n && n.length >= 2 && J.push(n), g) break;
 				}
-				wt(e, se, "fill", v.fill, i);
+				Ft(t, ne, "fill", _.fill, o);
 			}
-			let ce = [];
-			if (!t.chartType.toLowerCase().includes("area")) {
+			let Y = [];
+			if (!r.chartType.toLowerCase().includes("area")) {
 				let e = [], t = null;
-				for (let n = 0; n < _; n++) {
-					let r = L[n], i = r == null ? NaN : F.fraction(r);
+				for (let n = 0; n < S; n++) {
+					let r = I[n], i = r == null ? NaN : L.fraction(r);
 					if (r == null || !Number.isFinite(i)) {
-						x === "gap" && t && (e.push(t), t = null);
+						O === "gap" && t && (e.push(t), t = null);
 						continue;
 					}
 					t ??= [], t.push({
-						x: R.x + g(n, _, b, y) * R.w,
+						x: z.x + T(n, S, D, E) * z.w,
 						fraction: i,
 						ownerIndex: n
 					});
 				}
 				t && e.push(t);
 				let n = (e) => {
-					let t = Math.max(0, Math.min(1, e.fraction)), n = R.y + R.h - t * R.h;
+					let t = Math.max(0, Math.min(1, e.fraction)), n = z.y + z.h - t * z.h;
 					return {
-						...p.project(e.x, n, k),
-						cameraDepth: p.cameraDepth(e.x, n, k),
-						cameraWeight: p.cameraProjectionWeight(e.x, n, k)
+						...y.project(e.x, n, k),
+						cameraDepth: y.cameraDepth(e.x, n, k),
+						cameraWeight: y.cameraProjectionWeight(e.x, n, k)
 					};
 				}, r = (e) => {
-					e && e.path.length >= 2 && ce.push(e);
+					e && e.path.length >= 2 && Y.push(e);
 				};
 				for (let t of e) {
 					if (t.length < 2) continue;
 					let e = [t[0]];
 					for (let n = 0; n + 1 < t.length; n++) {
 						let r = t[n - 1] ?? t[n], i = t[n], a = t[n + 1], o = t[n + 2] ?? a;
-						if (l.smooth !== !0 || t.length < 3) {
+						if (d.smooth !== !0 || t.length < 3) {
 							e.push(a);
 							continue;
 						}
@@ -2319,220 +2402,220 @@ function Qt(e, t, n, r, i) {
 					}
 					let i = null, a = 0;
 					for (let t = 0; t + 1 < e.length; t++) {
-						let o = e[t], s = e[t + 1], c = (e) => p.project(e.x, R.y + R.h - e.fraction * R.h, k), l = c(o), u = c(s), d = Math.hypot(u.x - l.x, u.y - l.y), f = Number.isFinite(d) ? d : Math.hypot(s.x - o.x, (s.fraction - o.fraction) * R.h), m = ke(o.fraction, s.fraction);
-						if (!m || m.endT - m.startT <= 1e-12) {
+						let o = e[t], s = e[t + 1], c = (e) => y.project(e.x, z.y + z.h - e.fraction * z.h, k), l = c(o), u = c(s), d = Math.hypot(u.x - l.x, u.y - l.y), f = Number.isFinite(d) ? d : Math.hypot(s.x - o.x, (s.fraction - o.fraction) * z.h), p = Re(o.fraction, s.fraction);
+						if (!p || p.endT - p.startT <= 1e-12) {
 							r(i), i = null, a += f;
 							continue;
 						}
-						let h = (e) => ({
+						let m = (e) => ({
 							x: o.x + (s.x - o.x) * e,
 							fraction: o.fraction + (s.fraction - o.fraction) * e,
 							ownerIndex: s.ownerIndex
-						}), g = c(h(m.startT)), _ = Math.hypot(g.x - l.x, g.y - l.y), v = n(h(m.startT)), y = n(h(m.endT)), b = h(m.startT), x = h(m.endT), S = (e) => ({
+						}), h = c(m(p.startT)), g = Math.hypot(h.x - l.x, h.y - l.y), _ = n(m(p.startT)), v = n(m(p.endT)), b = m(p.startT), x = m(p.endT), S = (e) => ({
 							x: e.x,
-							y: R.y + R.h - Math.max(0, Math.min(1, e.fraction)) * R.h
+							y: z.y + z.h - Math.max(0, Math.min(1, e.fraction)) * z.h
 						});
-						i != null && Math.hypot(i.path.at(-1).x - v.x, i.path.at(-1).y - v.y) <= 1e-8 && i.ownerIndex === s.ownerIndex ? (i.path.push(y), i.modelPath.push(S(x)), i.endClipped = t + 1 < e.length - 1 || m.endT < 1) : (r(i), i = {
-							path: [v, y],
+						i != null && Math.hypot(i.path.at(-1).x - _.x, i.path.at(-1).y - _.y) <= 1e-8 && i.ownerIndex === s.ownerIndex ? (i.path.push(v), i.modelPath.push(S(x)), i.endClipped = t + 1 < e.length - 1 || p.endT < 1) : (r(i), i = {
+							path: [_, v],
 							modelPath: [S(b), S(x)],
 							ownerIndex: s.ownerIndex,
-							startClipped: t > 0 || m.startT > 0,
-							endClipped: t + 1 < e.length - 1 || m.endT < 1,
-							dashOffset: a + (Number.isFinite(_) ? _ : f * m.startT)
+							startClipped: t > 0 || p.startT > 0,
+							endClipped: t + 1 < e.length - 1 || p.endT < 1,
+							dashOffset: a + (Number.isFinite(g) ? g : f * p.startT)
 						}), a += f;
 					}
 					r(i);
 				}
 			}
-			let le = t.chartType.toLowerCase().includes("area"), ue = l.lineHidden != null || l.lineColor != null || l.lineWidthEmu != null || l.chartexStyle?.lineHidden != null || l.chartexStyle?.lineColors?.some(Boolean) || l.chartexStyle?.lineWidthEmu != null || l.chartexStyle?.lineDash != null || l.chartexStyle?.lineCap != null || l.chartexStyle?.lineJoin != null || v.lineColor != null || v.lineFill !== void 0;
-			if (!le || v.lineFill !== null && ue) {
-				let n = /* @__PURE__ */ new Map(), a = (e) => {
-					let r = B[c].get(e);
-					if (!pt(r)) return v;
-					let i = n.get(e);
-					return i || (i = Z(t, l, r, e, c), n.set(e, i)), i;
-				}, o = /* @__PURE__ */ new Map(), s = {
-					remaining: Le,
+			let re = r.chartType.toLowerCase().includes("area"), ie = d.lineHidden != null || d.lineColor != null || d.lineWidthEmu != null || d.chartexStyle?.lineHidden != null || d.chartexStyle?.lineColors?.some(Boolean) || d.chartexStyle?.lineWidthEmu != null || d.chartexStyle?.lineDash != null || d.chartexStyle?.lineCap != null || d.chartexStyle?.lineJoin != null || _.lineColor != null || _.lineFill !== void 0;
+			if (!re || _.lineFill !== null && ie) {
+				let e = /* @__PURE__ */ new Map(), n = (t) => {
+					let n = H[c].get(t);
+					if (!Ct(n)) return _;
+					let i = e.get(t);
+					return i || (i = Q(r, d, n, t, c), e.set(t, i)), i;
+				}, i = /* @__PURE__ */ new Map(), s = {
+					remaining: Ke,
 					exceeded: !1
-				}, u = (t, n, i, a = i, c = 0, l) => {
+				}, l = (e, n, r, o = r, c = 0, l) => {
 					if (n.lineFill === null) return;
-					let u = n === v ? S : n.color, f = n.lineColor ?? J(u, .7), m = n.lineWidthEmu ? Math.max(.5, n.lineWidthEmu / U) * r : le ? .75 * r : Math.max(1, 2 * r), g = {
-						width: m,
-						dash: O(n.lineCustomDash, n.lineDash, m),
+					let u = n === _ ? v : n.color, d = n.lineColor ?? Ce(u, .7), f = n.lineWidthEmu ? Math.max(.5, n.lineWidthEmu / X) * a : re ? .75 * a : Math.max(1, 2 * a), m = {
+						width: f,
+						dash: ae(n.lineCustomDash, n.lineDash, f),
 						dashOffset: c,
 						lineCap: n.lineCap,
-						startCap: i,
-						endCap: a,
+						startCap: r,
+						endCap: o,
 						lineJoin: n.lineJoin
 					};
-					if (!le && l && l.length >= 2) {
-						let t = Ge(l.map((e) => ({
+					if (!re && l && l.length >= 2) {
+						let e = et(l.map((e) => ({
 							...e,
 							cameraDepth: 0,
 							cameraWeight: 1
-						})), g);
-						if (t == null) {
-							h = !0;
+						})), m);
+						if (e == null) {
+							g = !0;
 							return;
 						}
-						let r = o.get(n) ?? [];
-						for (let n of t) {
-							let t = De({
+						let r = i.get(n) ?? [];
+						for (let n of e) {
+							let e = Ie({
 								outline: n.points,
-								nearDepth: C.near,
-								farDepth: C.far
+								nearDepth: x.near,
+								farDepth: x.far
 							});
-							if (!t) continue;
-							let i = xt(p, t, f, void 0, s).map((e) => ({
+							if (!e) continue;
+							let i = jt(y, e, d, void 0, s).map((e) => ({
 								...e,
 								paintRole: "outline"
 							}));
 							if (s.exceeded) {
-								h = !0;
+								g = !0;
 								return;
 							}
 							r.push(...i);
-							for (let t of i) d.push({
-								points: t.points,
-								cameraDepth: t.cameraDepth,
-								cameraDepths: t.cameraDepths,
-								cameraWeights: t.cameraWeights,
+							for (let e of i) p.push({
+								points: e.points,
+								cameraDepth: e.cameraDepth,
+								cameraDepths: e.cameraDepths,
+								cameraWeights: e.cameraWeights,
 								layer: 1,
-								paint: () => Ct(e, t)
+								paint: () => Nt(t, e)
 							});
 						}
-						o.set(n, r);
+						i.set(n, r);
 						return;
 					}
-					let _ = Ge(t, g);
-					if (_ == null) {
-						h = !0;
+					let h = et(e, m);
+					if (h == null) {
+						g = !0;
 						return;
 					}
-					if (d.length + _.length > 1e4) {
-						h = !0;
+					if (p.length + h.length > 1e4) {
+						g = !0;
 						return;
 					}
-					for (let t of _) {
+					for (let e of h) {
 						let r = {
-							points: t.points,
-							color: f,
+							points: e.points,
+							color: d,
 							paintRole: "outline",
 							shade: 0,
-							cameraDepth: t.cameraDepth,
-							cameraDepths: t.cameraDepths,
-							cameraWeights: t.cameraWeights,
+							cameraDepth: e.cameraDepth,
+							cameraDepths: e.cameraDepths,
+							cameraWeights: e.cameraWeights,
 							outline: !1
-						}, i = o.get(n) ?? [];
-						i.push(r), o.set(n, i), d.push({
-							points: t.points,
-							cameraDepth: t.cameraDepth,
-							cameraDepths: t.cameraDepths,
-							cameraWeights: t.cameraWeights,
+						}, a = i.get(n) ?? [];
+						a.push(r), i.set(n, a), p.push({
+							points: e.points,
+							cameraDepth: e.cameraDepth,
+							cameraDepths: e.cameraDepths,
+							cameraWeights: e.cameraWeights,
 							layer: 1,
-							paint: () => Ct(e, r)
+							paint: () => Nt(t, r)
 						});
 					}
 				};
-				if (le) for (let e of q) u(e, v, v.lineCap);
-				else for (let e of ce) {
-					let t = a(e.ownerIndex);
-					u(e.path, t, e.startClipped ? "butt" : t.lineCap, e.endClipped ? "butt" : t.lineCap, e.dashOffset, e.modelPath);
+				if (re) for (let e of J) l(e, _, _.lineCap);
+				else for (let e of Y) {
+					let t = n(e.ownerIndex);
+					l(e.path, t, e.startClipped ? "butt" : t.lineCap, e.endClipped ? "butt" : t.lineCap, e.dashOffset, e.modelPath);
 				}
-				for (let [t, n] of o) wt(e, n, "outline", t.lineFill, i);
+				for (let [e, n] of i) Ft(t, n, "outline", e.lineFill, o);
 			}
-			let de = (le ? l.showMarker === !0 || P(l) : l.showMarker === !0) && l.markerSymbol !== "none";
-			if ((t.chartType.toLowerCase().includes("line") || le) && (de || I(l))) for (let t = 0; t < A.length; t++) {
-				let n = A[t];
+			let oe = (re ? d.showMarker === !0 || n(d) : d.showMarker === !0) && d.markerSymbol !== "none";
+			if ((r.chartType.toLowerCase().includes("line") || re) && (oe || m(d))) for (let e = 0; e < M.length; e++) {
+				let n = M[e];
 				if (!n) continue;
-				let a = B[c].get(t), o = te(l, a, "circle", de);
-				if (o === "none") continue;
-				let s = a?.markerSize ?? l.markerSize ?? 5, u = ee(l, a, t, l.color ?? tt[c % tt.length]), d = N(l, a, t), p = a?.markerLine ?? l.markerLine ?? l.lineColor ?? l.color ?? tt[c % tt.length], m = (a?.markerLineWidthEmu ?? l.markerLineWidthEmu) == null ? Math.max(.75, l.lineWidthEmu == null ? r : l.lineWidthEmu / U * r) : Math.max(.25, (a?.markerLineWidthEmu ?? l.markerLineWidthEmu ?? 0) / U * r);
-				f.push(() => Ot(e, n, o, Math.max(2, s) * r, u === "00000000" ? "transparent" : `#${u}`, `#${p}`, m, d, i, r));
+				let i = H[c].get(e), s = u(d, i, "circle", oe);
+				if (s === "none") continue;
+				let l = i?.markerSize ?? d.markerSize ?? 5, f = Kt(r, d, i, e, c, d.color ?? ut[c % ut.length], a);
+				h.push(() => zt(t, n, s, Math.max(2, l) * a, f.fill === "00000000" ? "transparent" : `#${f.fill.replace(/^#/, "")}`, f.line === "00000000" ? "rgba(0,0,0,0)" : `#${f.line.replace(/^#/, "")}`, f.lineWidth, f.fillPaint, o, a, f.effectDirect, f.effectFallback, f.effectIndex, f.effectFallbackIndex, f.linePaint, f.lineDash, f.lineCustomDash, f.lineCap, f.lineJoin));
 			}
-			for (let a = 0; a < A.length; a++) {
-				let u = A[a];
-				if (!u) continue;
-				let d = T(c, a), f = B[c].get(a), p = f?.markerSize ?? l.markerSize ?? 5, h = ie[c].get(a);
-				At(t, l, h) && re.push(() => kt(e, t, l, c, a, m ? d / 100 : d, u, n, r, l.showMarker === !0 || f?.markerSymbol != null ? p * r / 2 : 0, void 0, h, "t", u, !0, t.valAxisDisplayUnits, F.max, s ? o[c][a] : d, i));
+			for (let e = 0; e < M.length; e++) {
+				let n = M[e];
+				if (!n) continue;
+				let u = j(c, e), f = H[c].get(e), p = f?.markerSize ?? d.markerSize ?? 5, m = ee[c].get(e);
+				Vt(r, d, m) && V.push(() => Bt(t, r, d, c, e, b ? u / 100 : u, n, i, a, d.showMarker === !0 || f?.markerSymbol != null ? p * a / 2 : 0, void 0, m, "t", n, !0, r.valAxisDisplayUnits, L.max, l ? s[c][e] : u, o));
 			}
 		}
-		if (h) return Tt(e, n), !0;
-		for (let e of Ie(d)) e.paint();
-		for (let e of f) e();
-	}
-	Wt(e, t, p, F, _, b, y, r, o ? "horizontal" : "vertical"), Zt(e, t, p, F, _, b, y, o ? "horizontal" : "vertical", a, r), Pt(e, t, n, p, F, _, b, y, o ? "horizontal" : "vertical", a, r);
-	let ae = Xt(t, p, F, _, b, y, o ? "horizontal" : "vertical"), V = (e, t) => {
-		if (t !== "low" && t !== "high") return ae;
-		let n = p.topology.nearDepth, r = ae.axisX, i = ae.axisY;
-		if (e === "value" === o) {
-			let e = R.y, r = R.y + R.h, a = p.project(R.x + R.w / 2, e, n), o = p.project(R.x + R.w / 2, r, n), s = a.y >= o.y ? e : r;
+		if (g) return It(t, i), !0;
+		for (let e of Ge(p)) e.paint();
+		for (let e of h) e();
+	}
+	an(t, r, y, L, S, D, E, a, c ? "horizontal" : "vertical"), fn(t, r, y, L, S, D, E, c ? "horizontal" : "vertical", s, a), Gt(t, r, i, y, L, S, D, E, c ? "horizontal" : "vertical", s, a);
+	let U = dn(r, y, L, S, D, E, c ? "horizontal" : "vertical"), te = (e, t) => {
+		if (t !== "low" && t !== "high") return U;
+		let n = y.topology.nearDepth, r = U.axisX, i = U.axisY;
+		if (e === "value" === c) {
+			let e = z.y, r = z.y + z.h, a = y.project(z.x + z.w / 2, e, n), o = y.project(z.x + z.w / 2, r, n), s = a.y >= o.y ? e : r;
 			i = t === "low" ? s : s === e ? r : e;
 		} else {
-			let e = R.x, i = R.x + R.w, a = p.project(e, R.y + R.h / 2, n), o = p.project(i, R.y + R.h / 2, n), s = a.x <= o.x ? e : i;
+			let e = z.x, i = z.x + z.w, a = y.project(e, z.y + z.h / 2, n), o = y.project(i, z.y + z.h / 2, n), s = a.x <= o.x ? e : i;
 			r = t === "low" ? s : s === e ? i : e;
 		}
 		return {
 			axisX: r,
 			axisY: i,
 			depth: n,
-			horizontalStart: p.project(R.x, i, n),
-			horizontalEnd: p.project(R.x + R.w, i, n),
-			verticalStart: p.project(r, R.y + R.h, n),
-			verticalEnd: p.project(r, R.y, n)
+			horizontalStart: y.project(z.x, i, n),
+			horizontalEnd: y.project(z.x + z.w, i, n),
+			verticalStart: y.project(r, z.y + z.h, n),
+			verticalEnd: y.project(r, z.y, n)
 		};
-	}, W = V("value", t.valAxisTickLabelPos), G = V("category", t.catAxisTickLabelPos), oe = c(t.valAxisFontSizeHpt, r) ?? 9 * r;
-	if (e.font = `${t.valAxisFontItalic ? "italic " : ""}${t.valAxisFontBold ? "bold " : ""}${oe}px ${ht(t.valAxisFontFace)}`, e.fillStyle = t.valAxisFontColor ? `#${t.valAxisFontColor}` : "#595959", e.textAlign = o ? "center" : "right", e.textBaseline = o ? "top" : "middle", !t.valAxisHidden && t.valAxisTickLabelPos !== "none") {
-		let { axisX: n, axisY: i, depth: a } = W, s = p.project(R.x + R.w / 2, R.y + R.h / 2, a), c = Gt(o ? W.horizontalStart : W.verticalStart, o ? W.horizontalEnd : W.verticalEnd, s, o ? "vertical" : "horizontal");
-		e.textAlign = Math.abs(c.x) < .2 ? "center" : c.x < 0 ? "right" : "left", e.textBaseline = Math.abs(c.y) < .2 ? "middle" : c.y < 0 ? "bottom" : "top";
-		let l = Yt(t.valAxisMajorTickMark, t.valAxisLineHidden, r, 5), u = t.valAxisDisplayUnits?.divisor;
-		for (let r of F.majorTicks) {
-			let s = o ? p.project(R.x + F.fraction(r) * R.w, i, a) : p.project(n, R.y + R.h - F.fraction(r) * R.h, a);
-			e.fillText(D(m ? r / 100 : u != null && Number.isFinite(u) && u > 0 ? r / u : r, m ? t.valAxisFormatCode ?? "0%" : t.valAxisFormatCode, t.date1904), s.x + c.x * l, s.y + c.y * l);
+	}, W = te("value", r.valAxisTickLabelPos), G = te("category", r.catAxisTickLabelPos), K = v(r.valAxisFontSizeHpt, a) ?? 9 * a;
+	if (t.font = `${r.valAxisFontItalic ? "italic " : ""}${r.valAxisFontBold ? "bold " : ""}${K}px ${Tt(r.valAxisFontFace)}`, t.fillStyle = r.valAxisFontColor ? `#${r.valAxisFontColor}` : "#595959", t.textAlign = c ? "center" : "right", t.textBaseline = c ? "top" : "middle", !r.valAxisHidden && r.valAxisTickLabelPos !== "none") {
+		let { axisX: e, axisY: n, depth: i } = W, o = y.project(z.x + z.w / 2, z.y + z.h / 2, i), s = on(c ? W.horizontalStart : W.verticalStart, c ? W.horizontalEnd : W.verticalEnd, o, c ? "vertical" : "horizontal");
+		t.textAlign = Math.abs(s.x) < .2 ? "center" : s.x < 0 ? "right" : "left", t.textBaseline = Math.abs(s.y) < .2 ? "middle" : s.y < 0 ? "bottom" : "top";
+		let l = un(r.valAxisMajorTickMark, r.valAxisLineHidden, a, 5), u = r.valAxisDisplayUnits?.divisor;
+		for (let a of L.majorTicks) {
+			let o = c ? y.project(z.x + L.fraction(a) * z.w, n, i) : y.project(e, z.y + z.h - L.fraction(a) * z.h, i);
+			t.fillText(w(b ? a / 100 : u != null && Number.isFinite(u) && u > 0 ? a / u : a, b ? r.valAxisFormatCode ?? "0%" : r.valAxisFormatCode, r.date1904), o.x + s.x * l, o.y + s.y * l);
 		}
 	}
-	let K = c(t.catAxisFontSizeHpt, r) ?? 9 * r;
-	if (e.font = `${t.catAxisFontItalic ? "italic " : ""}${t.catAxisFontBold ? "bold " : ""}${K}px ${ht(t.catAxisFontFace)}`, e.fillStyle = t.catAxisFontColor ? `#${t.catAxisFontColor}` : "#595959", !t.catAxisHidden && t.catAxisTickLabelPos !== "none") {
-		let n = C(Yt(t.catAxisMajorTickMark, t.catAxisLineHidden, r, 6), t.catAxisLabelOffsetPercent), i = Array.from({ length: _ }, (e, n) => ne(String(h[n] ?? n + 1), t.catAxisFormatCode, t.date1904)), a = Et(t);
-		if (a == null && (a = 0, !o && _ > 1)) {
-			let t = Infinity, n = null, r = G.axisY;
-			for (let e = 0; e < _; e++) {
-				let i = g(e, _, b, y), a = p.project(R.x + i * R.w, r, p.topology.nearDepth);
-				n && (t = Math.min(t, Math.hypot(a.x - n.x, a.y - n.y))), n = a;
+	let J = v(r.catAxisFontSizeHpt, a) ?? 9 * a;
+	if (t.font = `${r.catAxisFontItalic ? "italic " : ""}${r.catAxisFontBold ? "bold " : ""}${J}px ${Tt(r.catAxisFontFace)}`, t.fillStyle = r.catAxisFontColor ? `#${r.catAxisFontColor}` : "#595959", !r.catAxisHidden && r.catAxisTickLabelPos !== "none") {
+		let e = f(un(r.catAxisMajorTickMark, r.catAxisLineHidden, a, 6), r.catAxisLabelOffsetPercent), n = Array.from({ length: S }, (e, t) => d(String(x[t] ?? t + 1), r.catAxisFormatCode, r.date1904)), i = Lt(r);
+		if (i == null && (i = 0, !c && S > 1)) {
+			let e = Infinity, r = null, a = G.axisY;
+			for (let t = 0; t < S; t++) {
+				let n = T(t, S, D, E), i = y.project(z.x + n * z.w, a, y.topology.nearDepth);
+				r && (e = Math.min(e, Math.hypot(i.x - r.x, i.y - r.y))), r = i;
 			}
-			Math.max(0, ...i.map((t) => e.measureText(t).width)) > t * .9 && (a = -Math.PI / 4);
+			Math.max(0, ...n.map((e) => t.measureText(e).width)) > e * .9 && (i = -Math.PI / 4);
 		}
-		let s = Math.max(1, Math.floor(t.catAxisTickLabelSkip ?? 1));
-		for (let t = 0; t < _; t += s) {
-			let r = g(t, _, b, y), { axisX: s, axisY: c, depth: l } = G, u = o ? p.project(s, R.y + g(t, _, b, y) * R.h, l) : p.project(R.x + r * R.w, c, l);
-			if (o) {
-				let r = p.project(s, R.y + R.h / 2, l), a = p.project(R.x + R.w / 2, R.y + R.h / 2, l), o = r.x <= a.x;
-				e.textAlign = o ? "right" : "left", e.textBaseline = "middle", e.fillText(i[t], u.x + (o ? -n : n), u.y);
+		let o = Math.max(1, Math.floor(r.catAxisTickLabelSkip ?? 1));
+		for (let r = 0; r < S; r += o) {
+			let a = T(r, S, D, E), { axisX: o, axisY: s, depth: l } = G, u = c ? y.project(o, z.y + T(r, S, D, E) * z.h, l) : y.project(z.x + a * z.w, s, l);
+			if (c) {
+				let i = y.project(o, z.y + z.h / 2, l), a = y.project(z.x + z.w / 2, z.y + z.h / 2, l), s = i.x <= a.x;
+				t.textAlign = s ? "right" : "left", t.textBaseline = "middle", t.fillText(n[r], u.x + (s ? -e : e), u.y);
 			} else {
-				let r = p.project(R.x + R.w / 2, R.y + R.h / 2, l), s = Gt(G.horizontalStart, G.horizontalEnd, r, "vertical");
-				Dt(e, i[t], u, a, o, s.y < 0 ? -1 : 1, n);
+				let a = y.project(z.x + z.w / 2, z.y + z.h / 2, l), o = on(G.horizontalStart, G.horizontalEnd, a, "vertical");
+				Rt(t, n[r], u, i, c, o.y < 0 ? -1 : 1, e);
 			}
 		}
 	}
-	Nt(e, t, n, u, o, r);
-	for (let e of re) e();
-	return It(e, t, d, r, !1, f, i), !0;
+	Wt(t, r, i, h, c, a);
+	for (let e of V) e();
+	return Yt(t, r, g, a, !1, _, o), !0;
 }
-function $t(e, t, n, r, i) {
-	if (!t.threeD || t.chartType !== "pie") return !1;
-	let a = t.series[0];
-	if (!a) return !0;
-	let o = a.values.flatMap((e, t) => e != null && Number.isFinite(e) ? [{
+function mn(t, n, r, i, a) {
+	if (!n.threeD || n.chartType !== "pie") return !1;
+	let o = n.series[0];
+	if (!o) return !0;
+	let s = o.values.flatMap((e, t) => e != null && Number.isFinite(e) ? [{
 		index: t,
 		value: Math.abs(e)
-	}] : []), s = 0;
-	for (let e of o) s = Math.max(s, e.value);
-	if (!(s > 0)) return !0;
-	let l = o.reduce((e, t) => e + t.value / s, 0);
+	}] : []), c = 0;
+	for (let e of s) c = Math.max(c, e.value);
+	if (!(c > 0)) return !0;
+	let l = s.reduce((e, t) => e + t.value / c, 0);
 	if (!(l > 0) || !Number.isFinite(l)) return !0;
-	let { plot: u, legend: d, legendMeasure: f } = jt(e, t, n, r, "radial", i), p = ue({
-		...t.threeD,
-		rotationY: t.threeD.rotationY ?? 0,
+	let { plot: u, legend: d, legendMeasure: f } = Ht(t, n, r, i, "radial", a), p = he({
+		...n.threeD,
+		rotationY: n.threeD.rotationY ?? 0,
 		heightPercent: void 0,
 		depthPercent: 100
 	}, u, {
@@ -2540,136 +2623,145 @@ function $t(e, t, n, r, i) {
 		sceneHeightScale: .15
 	});
 	if (!p) return !0;
-	let m = new Map(a.dataPointOverrides?.map((e) => [e.idx, e]) ?? []), h = 0;
+	let m = new Map(o.dataPointOverrides?.map((e) => [e.idx, e]) ?? []), h = 0;
 	for (let e of m.values()) e.explosion != null && Number.isFinite(e.explosion) && (h = Math.max(h, Math.max(0, Math.min(100, e.explosion)) / 100));
 	let { scene: g } = p, _ = Math.min(g.w * .45 / (1 + h), p.modelDepth * .45 / (1 + h), g.h / .45);
 	if (!(_ > 0)) return !0;
-	let v = g.x + g.w / 2, y = g.y + g.h / 2, b = .5, x = _ * .3 * he(t.threeD), S = 0, C = [], w = new Map(a.dataLabelOverrides?.map((e) => [e.idx, e]) ?? []), T = Math.max(48, Math.min(128, Math.ceil(Math.PI * 2 * _ / 4)));
-	for (let e of o) {
-		let n = e.value / s / l, r = Rt(t.firstSliceAngle, S, n), i = m.get(e.index), o = Z(t, a, i, e.index, 0), c = r.middle, u = i?.explosion != null && Number.isFinite(i.explosion) ? Math.max(0, Math.min(100, i.explosion)) / 100 : 0, d = v + Math.cos(c) * _ * u, f = b + Math.sin(c) * _ * u / p.modelDepth, h = Math.max(2, Math.ceil(T * n)), g = Oe({
+	let y = g.x + g.w / 2, b = g.y + g.h / 2, x = .5, S = _ * .3 * be(n.threeD), w = 0, T = [], E = new Map(o.dataLabelOverrides?.map((e) => [e.idx, e]) ?? []), D = Math.max(48, Math.min(128, Math.ceil(Math.PI * 2 * _ / 4)));
+	for (let e of s) {
+		let t = e.value / c / l, r = Zt(n.firstSliceAngle, w, t), i = m.get(e.index), a = Q(n, o, i, e.index, 0), s = r.middle, u = i?.explosion != null && Number.isFinite(i.explosion) ? Math.max(0, Math.min(100, i.explosion)) / 100 : 0, d = y + Math.cos(s) * _ * u, f = x + Math.sin(s) * _ * u / p.modelDepth, h = Math.max(2, Math.ceil(D * t)), g = Le({
 			centerX: d,
-			centerY: y,
+			centerY: b,
 			centerDepth: f,
 			radius: _,
 			modelDepth: p.modelDepth,
-			thickness: x,
+			thickness: S,
 			startAngle: r.start,
 			endAngle: r.end,
 			segments: h
 		});
 		if (!g) {
-			S += n;
+			w += t;
 			continue;
 		}
-		C.push({
+		T.push({
 			index: e.index,
 			start: r.start,
 			end: r.end,
-			color: o.fill === null ? "transparent" : o.color,
-			fillPaint: o.fill,
+			color: a.fill === null ? "transparent" : a.color,
+			fillPaint: a.fill,
 			value: e.value,
-			percentValue: n,
+			percentValue: t,
 			centerX: d,
 			centerDepth: f,
 			segments: h,
 			mesh: g,
-			lineColor: o.lineColor,
-			lineFill: o.lineFill,
-			lineWidthEmu: o.lineWidthEmu ?? null,
-			lineDash: o.lineDash ?? "solid",
-			lineCustomDash: o.lineCustomDash,
-			lineCap: o.lineCap,
-			lineJoin: o.lineJoin
-		}), S += n;
-	}
-	p = _e(p, C.flatMap((e) => e.mesh.vertices), u, .08);
-	let E = [], D = {
-		remaining: Le,
+			lineColor: a.lineColor,
+			lineFill: a.lineFill,
+			lineWidthEmu: a.lineWidthEmu ?? null,
+			lineDash: a.lineDash ?? "solid",
+			lineCustomDash: a.lineCustomDash,
+			lineCap: a.lineCap,
+			lineJoin: a.lineJoin
+		}), w += t;
+	}
+	p = Se(p, T.flatMap((e) => e.mesh.vertices), u, .08);
+	let O = [], k = {
+		remaining: Ke,
 		exceeded: !1
-	}, k = (e) => {
-		let t = e.lineWidthEmu == null ? .75 * r : Math.max(.25, e.lineWidthEmu / U * r);
+	}, A = (e) => {
+		let t = e.lineWidthEmu == null ? .75 * i : Math.max(.25, e.lineWidthEmu / X * i);
 		return e.lineFill !== null && (e.lineColor != null || e.lineFill !== void 0) ? {
 			color: e.lineColor ?? "rgba(0,0,0,0.42)",
 			width: t,
-			dash: O(e.lineCustomDash, e.lineDash, t),
+			dash: ae(e.lineCustomDash, e.lineDash, t),
 			cap: e.lineCap,
 			join: e.lineJoin
 		} : void 0;
-	}, ee = C.flatMap((t) => {
-		let n = xt(p, t.mesh, t.color, void 0, D);
-		return wt(e, n, "fill", t.fillPaint, i), n;
-	}), A = [], j = C.map(k), M = j[0], N = (e) => e == null ? null : [
+	}, j = T.map((e) => {
+		let n = jt(p, e.mesh, e.color, void 0, k);
+		return Ft(t, n, "fill", e.fillPaint, a), {
+			slice: e,
+			faces: n
+		};
+	}), M = j.flatMap((e) => e.faces), N = [], P = T.map(A), F = P[0], I = (e) => e == null ? null : [
 		e.color,
 		e.width,
 		e.dash.join(","),
 		e.cap,
 		e.join
-	].join("|"), P = M != null && C.every((e) => e.lineFill === void 0) && j.every((e) => N(e) === N(M)) && C.every((e) => Math.abs(e.centerX - v) < 1e-9 && Math.abs(e.centerDepth - b) < 1e-9);
-	if (P) A.push(...St(p, C, y, _, x, M, D));
-	else for (let t = 0; t < C.length; t++) {
-		let n = j[t];
+	].join("|"), L = F != null && T.every((e) => e.lineFill === void 0) && P.every((e) => I(e) === I(F)) && T.every((e) => Math.abs(e.centerX - y) < 1e-9 && Math.abs(e.centerDepth - x) < 1e-9);
+	if (L) N.push(...Mt(p, T, b, _, S, F, k));
+	else for (let e = 0; e < T.length; e++) {
+		let n = P[e];
 		if (!n) continue;
-		let r = xt(p, C[t].mesh, "transparent", n, D, !0);
-		wt(e, r, "outline", C[t].lineFill, i), A.push(...r);
-	}
-	if (D.exceeded) return Tt(e, n), !0;
-	if (P) {
-		for (let t of Ie(ee)) Ct(e, t);
-		for (let t of Ie(A)) Ct(e, t);
-	} else for (let t of Ie([...ee, ...A])) Ct(e, t);
-	for (let n of C) {
-		let o = (n.start + n.end) / 2, s = w.get(n.index);
-		if (At(t, a, s)) {
-			let l = a.seriesDataLabels, d = c(s?.fontSizeHpt ?? l?.fontSizeHpt ?? t.dataLabelFontSizeHpt, r) ?? 9 * r;
-			e.font = `${s?.fontBold ?? l?.fontBold ?? t.dataLabelFontBold ? "bold " : ""}${d}px ${Q(t, s?.fontFace ?? l?.fontFace ?? t.dataLabelFontFace)}`;
-			let f = fe({
+		let r = jt(p, T[e].mesh, "transparent", n, k, !0);
+		Ft(t, r, "outline", T[e].lineFill, a), N.push(...r);
+	}
+	if (k.exceeded) return It(t, r), !0;
+	if (L) {
+		for (let e of Ge(M)) Nt(t, e);
+		for (let e of Ge(N)) Nt(t, e);
+	} else for (let e of Ge([...M, ...N])) Nt(t, e);
+	for (let { slice: r, faces: a } of j) {
+		let s = m.get(r.index), c = De(n, o, r.index, 0), l = e(s?.chartexStyle);
+		ne(t, l ?? e(o.chartexStyle), q(n, "dataPoint3D", 0), l ? r.index : c, i, (e) => Pt(e, a), c);
+	}
+	for (let e of T) {
+		let r = (e.start + e.end) / 2, s = E.get(e.index);
+		if (Vt(n, o, s)) {
+			let c = o.seriesDataLabels, l = v(s?.fontSizeHpt ?? c?.fontSizeHpt ?? n.dataLabelFontSizeHpt, i) ?? 9 * i;
+			t.font = `${s?.fontBold ?? c?.fontBold ?? n.dataLabelFontBold ? "bold " : ""}${l}px ${$(n, s?.fontFace ?? c?.fontFace ?? n.dataLabelFontFace)}`;
+			let d = C({
 				customText: s?.text,
-				showCategory: s?.showCatName ?? l?.showCatName ?? !1,
-				showSeries: s?.showSerName ?? l?.showSerName ?? !1,
-				showValue: s?.showVal ?? l?.showVal ?? t.showDataLabels,
-				showPercent: s?.showPercent ?? l?.showPercent ?? !1,
-				category: a.categories?.[n.index] ?? t.categories[n.index] ?? `${n.index + 1}`,
-				seriesName: a.name || "Series 1",
-				sourceValue: n.value,
-				percentRatio: n.percentValue,
-				formatCode: s?.formatCode ?? l?.formatCode ?? t.dataLabelFormatCode ?? a.valFormatCode,
-				separator: s?.separator ?? l?.separator,
-				date1904: t.date1904
-			}), m = Q(t, s?.fontFace ?? l?.fontFace ?? t.dataLabelFontFace), h = s?.text && s.richRuns?.length ? ce(e, {
+				showCategory: s?.showCatName ?? c?.showCatName ?? !1,
+				showSeries: s?.showSerName ?? c?.showSerName ?? !1,
+				showValue: s?.showVal ?? c?.showVal ?? n.showDataLabels,
+				showPercent: s?.showPercent ?? c?.showPercent ?? !1,
+				category: o.categories?.[e.index] ?? n.categories[e.index] ?? `${e.index + 1}`,
+				seriesName: o.name || "Series 1",
+				sourceValue: e.value,
+				percentRatio: e.percentValue,
+				formatCode: s?.formatCode ?? c?.formatCode ?? n.dataLabelFormatCode ?? o.valFormatCode,
+				separator: s?.separator ?? c?.separator,
+				date1904: n.date1904
+			}), f = $(n, s?.fontFace ?? c?.fontFace ?? n.dataLabelFontFace), m = s?.text && s.richRuns?.length ? ge(t, {
 				runs: s.richRuns,
-				ptToPx: r,
-				fontFamily: m,
-				fallbackBold: s.fontBold ?? l?.fontBold ?? t.dataLabelFontBold ?? !1,
-				fontFamilyForFace: (e) => Q(t, e)
-			}, d, `#${s.fontColor ?? l?.fontColor ?? a.labelColor ?? t.dataLabelFontColor ?? "111111"}`) : null, g = s?.position ?? l?.position ?? t.dataLabelPosition, v = y - x / 2, b = y + x / 2, S = p.cameraDepth(n.centerX, v, n.centerDepth) >= p.cameraDepth(n.centerX, b, n.centerDepth) ? v : b, C = 0, w = null;
-			for (let e = 0; e <= 12; e++) {
-				let t = n.start + (n.end - n.start) * e / 12, r = p.project(n.centerX + Math.cos(t) * _ * .64, S, n.centerDepth + Math.sin(t) * _ * .64 / p.modelDepth);
-				w && (C += Math.hypot(r.x - w.x, r.y - w.y)), w = r;
+				ptToPx: i,
+				fontFamily: f,
+				fallbackBold: s.fontBold ?? c?.fontBold ?? n.dataLabelFontBold ?? !1,
+				fontFamilyForFace: (e) => $(n, e)
+			}, l, `#${s.fontColor ?? c?.fontColor ?? o.labelColor ?? n.dataLabelFontColor ?? "111111"}`) : null, h = s?.position ?? c?.position ?? n.dataLabelPosition, g = b - S / 2, y = b + S / 2, x = p.cameraDepth(e.centerX, g, e.centerDepth) >= p.cameraDepth(e.centerX, y, e.centerDepth) ? g : y, w = 0, T = null;
+			for (let t = 0; t <= 12; t++) {
+				let n = e.start + (e.end - e.start) * t / 12, r = p.project(e.centerX + Math.cos(n) * _ * .64, x, e.centerDepth + Math.sin(n) * _ * .64 / p.modelDepth);
+				T && (w += Math.hypot(r.x - T.x, r.y - T.y)), T = r;
 			}
-			let T = (g == null || g === "bestFit") && (n.percentValue === 0 || C < (h?.width ?? e.measureText(f).width)) || g === "outEnd", D = _ * (T ? 1.12 : .64), O = p.project(n.centerX + Math.cos(o) * D, S, n.centerDepth + Math.sin(o) * D / p.modelDepth), k = p.project(n.centerX + Math.cos(o) * _, S, n.centerDepth + Math.sin(o) * _ / p.modelDepth);
-			E.push(() => kt(e, t, a, 0, n.index, n.value, O, u, r, 0, n.percentValue, s, "ctr", k, T, void 0, void 0, void 0, i));
+			let E = (h == null || h === "bestFit") && (e.percentValue === 0 || w < (m?.width ?? t.measureText(d).width)) || h === "outEnd", D = _ * (E ? 1.12 : .64), k = p.project(e.centerX + Math.cos(r) * D, x, e.centerDepth + Math.sin(r) * D / p.modelDepth), A = p.project(e.centerX + Math.cos(r) * _, x, e.centerDepth + Math.sin(r) * _ / p.modelDepth);
+			O.push(() => Bt(t, n, o, 0, e.index, e.value, k, u, i, 0, e.percentValue, s, "ctr", A, E, void 0, void 0, void 0, a));
 		}
 	}
-	for (let e of E) e();
-	let F = a.categories?.length ? a.categories : t.categories, te = Array.from({ length: F.length }, (e, t) => {
-		let n = m.get(t), r = n?.fillHidden === !0 ? "00000000" : n?.color ?? a.dataPointColors?.[t] ?? a.color;
-		return r === "00000000" ? "00000000" : J(r ? `#${r}` : st(t), .8).replace(/^#/, "");
+	for (let e of O) e();
+	let R = o.categories?.length ? o.categories : n.categories, z = Array.from({ length: R.length }, (e, t) => {
+		let r = m.get(t), i = Oe(n, o, r, t, 0);
+		if (i === null) return "00000000";
+		let a = i?.fillType === "solid" ? i.color : r?.color ?? o.dataPointColors?.[t] ?? o.color;
+		return a === "00000000" ? "00000000" : Ce(a ? `#${a}` : gt(t), .8).replace(/^#/, "");
 	});
-	return It(e, {
-		...t,
-		categories: F,
+	return Yt(t, {
+		...n,
+		categories: R,
 		series: [{
-			...a,
-			categories: F,
-			dataPointColors: te
+			...o,
+			categories: R,
+			dataPointColors: z
 		}]
-	}, d, r, !0, f, i), !0;
+	}, d, i, !0, f, a), !0;
 }
-function en(e, t, n, r, i = 0) {
-	return !t.threeD || !(t.chartType === "pie" || it.has(t.chartType)) ? !1 : dt(t) ? $t(e, t, n, r, i) ? !0 : Qt(e, t, n, r, i) : (Tt(e, n), !0);
+function hn(e, t, n, r, i = 0) {
+	return !t.threeD || !(t.chartType === "pie" || pt.has(t.chartType)) ? !1 : xt(t) ? mn(e, t, n, r, i) ? !0 : pn(e, t, n, r, i) : (It(e, n), !0);
 }
 //#endregion
 //#region src/three-d.ts
-var tn = ye({ render: en }, "threeD");
+var gn = Ee({ render: hn }, "threeD");
 //#endregion
-export { tn as threeD };
+export { gn as threeD };