@silurus/ooxml 0.16.1 → 0.18.0

package/dist/{renderer-rSBto6l5.js → renderer-Ctkyp4ee.js}

@@ -44,10 +44,88 @@ function s(e) {
 }
 function c(e, t) {
 	if (!t) return s(e);
-	let n = l(t), r;
-	return r = e > 0 ? n[0] ?? t : e < 0 ? n[1] ?? n[0] ?? t : n[2] ?? n[0] ?? t, r === "" ? "" : (e < 0 && n.length < 2 ? "-" : "") + u(Math.abs(e), r);
+	if (l(t)) return u(e, t);
+	let n = d(t), r;
+	return r = e > 0 ? n[0] ?? t : e < 0 ? n[1] ?? n[0] ?? t : n[2] ?? n[0] ?? t, r === "" ? "" : (e < 0 && n.length < 2 ? "-" : "") + f(Math.abs(e), r);
 }
 function l(e) {
+	let t = !1;
+	for (let n = 0; n < e.length; n++) {
+		let r = e[n];
+		if (r === "\"") {
+			t = !t;
+			continue;
+		}
+		if (!t) {
+			if (r === "\\") {
+				n++;
+				continue;
+			}
+			if (r === "[") {
+				for (; n < e.length && e[n] !== "]";) n++;
+				continue;
+			}
+			if (r === "y" || r === "Y" || r === "d" || r === "D" || r === "m" || r === "M" || r === "h" || r === "H" || r === "s" || r === "S") return !0;
+		}
+	}
+	return !1;
+}
+function u(e, t) {
+	let n = Date.UTC(1899, 11, 30), r = e < 60 ? e + 1 : e, i = n + Math.floor(r) * 864e5, a = new Date(i), o = a.getUTCFullYear(), s = a.getUTCMonth() + 1, c = a.getUTCDate(), l = (e - Math.floor(e)) * 86400, u = Math.floor(l / 3600), d = Math.floor(l % 3600 / 60), f = Math.floor(l % 60), p = "", m = !1, h = 0;
+	for (; h < t.length;) {
+		let e = t[h];
+		if (e === "\"") {
+			m = !m, h++;
+			continue;
+		}
+		if (m) {
+			p += e, h++;
+			continue;
+		}
+		if (e === "\\" && h + 1 < t.length) {
+			p += t[h + 1], h += 2;
+			continue;
+		}
+		if (e === "[") {
+			for (; h < t.length && t[h] !== "]";) h++;
+			h < t.length && h++;
+			continue;
+		}
+		if (e === "y" || e === "Y") {
+			let e = 0;
+			for (; h < t.length && (t[h] === "y" || t[h] === "Y");) e++, h++;
+			p += e >= 3 ? String(o) : String(o % 100).padStart(2, "0");
+			continue;
+		}
+		if (e === "m" || e === "M") {
+			let e = 0;
+			for (; h < t.length && (t[h] === "m" || t[h] === "M");) e++, h++;
+			p.match(/[Hh]+\W*$/) ? p += e >= 2 ? String(d).padStart(2, "0") : String(d) : p += e >= 2 ? String(s).padStart(2, "0") : String(s);
+			continue;
+		}
+		if (e === "d" || e === "D") {
+			let e = 0;
+			for (; h < t.length && (t[h] === "d" || t[h] === "D");) e++, h++;
+			p += e >= 2 ? String(c).padStart(2, "0") : String(c);
+			continue;
+		}
+		if (e === "h" || e === "H") {
+			let e = 0;
+			for (; h < t.length && (t[h] === "h" || t[h] === "H");) e++, h++;
+			p += e >= 2 ? String(u).padStart(2, "0") : String(u);
+			continue;
+		}
+		if (e === "s" || e === "S") {
+			let e = 0;
+			for (; h < t.length && (t[h] === "s" || t[h] === "S");) e++, h++;
+			p += e >= 2 ? String(f).padStart(2, "0") : String(f);
+			continue;
+		}
+		p += e, h++;
+	}
+	return p;
+}
+function d(e) {
 	let t = [], n = "";
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -73,7 +151,7 @@ function l(e) {
 	}
 	return t.push(n), t;
 }
-function u(e, t) {
+function f(e, t) {
 	let n = [], r = 0, i = !1, a = !1;
 	for (; r < t.length;) {
 		let e = t[r];
@@ -134,17 +212,17 @@ function u(e, t) {
 	if (!i) return n.map((e) => e.text).join("");
 	let o = a ? e * 100 : e, s = "";
 	for (let e of n) e.kind === "num" && (s += e.text);
-	let c = d(o, s), l = !1;
+	let c = p(o, s), l = !1;
 	return n.map((e) => e.kind === "lit" ? e.text : l ? "" : (l = !0, c)).join("");
 }
-function d(e, t) {
+function p(e, t) {
 	let n = t.indexOf("."), r = n >= 0 ? t.slice(0, n) : t, i = n >= 0 ? t.slice(n + 1) : "", a = /,/.test(r), o = (i.match(/[#0?]/g) ?? []).length, s = (r.replace(/,/g, "").match(/0/g) ?? []).length, [c, l = ""] = e.toFixed(o).split("."), u = c.padStart(s, "0"), d = a ? u.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : u;
 	return o === 0 ? d : `${d}.${l.padEnd(o, "0")}`;
 }
-function f(e, t, n, r, i, a, o, s) {
+function m(e, t, n, r, i, a, o, s) {
 	e.save(), e.font = `${s}px sans-serif`, e.fillStyle = "#555", o === "cat" ? (e.textAlign = "center", e.textBaseline = "bottom", e.fillText(t.slice(0, 30), n + i / 2, r + a + s + 2)) : (e.translate(n - s - 4, r + a / 2), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", e.fillText(t.slice(0, 30), 0, 0)), e.restore();
 }
-function p(e, n, r, i, a, o, s = "vertical") {
+function h(e, n, r, i, a, o, s = "vertical") {
 	if (s === "horizontal") {
 		let s = Math.max(9, Math.min(12, o * .7));
 		e.font = `${s}px sans-serif`, e.textBaseline = "middle";
@@ -161,7 +239,7 @@ function p(e, n, r, i, a, o, s = "vertical") {
 		e.fillText(a.slice(0, 20), r + 10 + 4, u + c / 2), u += l;
 	}
 }
-function m(e, t, n) {
+function g(e, t, n) {
 	if (!e.showLegend) return null;
 	let r = e.legendPos ?? "r", i = r === "l" ? "l" : r === "t" ? "t" : r === "b" ? "b" : "r";
 	return i === "r" || i === "l" ? {
@@ -174,30 +252,30 @@ function m(e, t, n) {
 		reserveH: Math.max(18, n * .08)
 	};
 }
-function h(e, t, n, r, i, a, o, s, c, l, u, d) {
+function _(e, t, n, r, i, a, o, s, c, l, u, d) {
 	if (!n) return;
 	let f = t.legendManualLayout;
 	if (f && f.xMode === "edge" && f.yMode === "edge" && f.w > 0 && f.h > 0) {
 		let n = r + f.x * a, s = i + f.y * o, c = f.w * a, l = f.h * o, u = c >= l ? "horizontal" : "vertical";
-		p(e, t.series, n, s, c, l, u);
+		h(e, t.series, n, s, c, l, u);
 		return;
 	}
 	switch (n.side) {
 		case "r":
-			p(e, t.series, r + a - n.reserveW + 4, c, n.reserveW - 8, u);
+			h(e, t.series, r + a - n.reserveW + 4, c, n.reserveW - 8, u);
 			break;
 		case "l":
-			p(e, t.series, r + 4, c, n.reserveW - 8, u);
+			h(e, t.series, r + 4, c, n.reserveW - 8, u);
 			break;
 		case "t":
-			p(e, t.series, s, i + d, l, n.reserveH, "horizontal");
+			h(e, t.series, s, i + d, l, n.reserveH, "horizontal");
 			break;
 		case "b":
-			p(e, t.series, s, i + o - n.reserveH, l, n.reserveH, "horizontal");
+			h(e, t.series, s, i + o - n.reserveH, l, n.reserveH, "horizontal");
 			break;
 	}
 }
-function g(e, t, n, r, i) {
+function v(e, t, n, r, i) {
 	if (t === "none" || !t) return;
 	let a = e.strokeStyle;
 	if (e.strokeStyle = "#888", e.lineWidth = 1, e.beginPath(), n === "val") {
@@ -209,16 +287,16 @@ function g(e, t, n, r, i) {
 	}
 	e.stroke(), e.strokeStyle = a;
 }
-function _(e, t, n) {
+function y(e, t, n) {
 	return e.titleFontSizeHpt ? e.titleFontSizeHpt / 100 * n : Math.max(10, t * .085);
 }
-function v(e, t, n) {
+function b(e, t, n) {
 	return e ? e / 100 * n : Math.max(8, t * .045);
 }
-function y(e, t, n, r, i, a) {
+function x(e, t, n, r, i, a) {
 	t.title && (e.font = `bold ${a}px ${t.titleFontFace ? `"${t.titleFontFace}", Calibri, Arial, sans-serif` : "Calibri, Arial, sans-serif"}`, e.fillStyle = t.titleFontColor ? `#${t.titleFontColor}` : "#333", e.textAlign = "center", e.textBaseline = "top", e.fillText(t.title, n + i / 2, r));
 }
-function b(e) {
+function S(e) {
 	if (e.categories.length > 0) return e.categories;
 	let t = e.series[0];
 	if (t?.categories && t.categories.length > 0) return t.categories;
@@ -226,7 +304,7 @@ function b(e) {
 	for (let t of e.series) t.values.length > n && (n = t.values.length);
 	return n > 0 ? Array.from({ length: n }, (e, t) => String(t + 1)) : [];
 }
-function x(e, t, n, r, i, a, o, s, c) {
+function C(e, t, n, r, i, a, o, s, c) {
 	let l = s ?? "outEnd";
 	if (e.fillStyle = c ? `#${c}` : "#333", o === "vertical") {
 		let o = n + a / 2;
@@ -236,33 +314,33 @@ function x(e, t, n, r, i, a, o, s, c) {
 		l === "inBase" ? (e.textAlign = "left", e.textBaseline = "middle", e.fillText(t, n + 4, o)) : l === "inEnd" ? (e.textAlign = "right", e.textBaseline = "middle", e.fillText(t, n + i - 4, o)) : l === "ctr" ? (e.textAlign = "center", e.textBaseline = "middle", e.fillText(t, n + i / 2, o)) : (e.textAlign = "left", e.textBaseline = "middle", e.fillText(t, n + i + 2, o));
 	}
 }
-function S(e, n, r, o) {
-	let { x: s, y: l, w: u, h: d } = r, p = n.chartType === "clusteredBarH" || n.chartType === "stackedBarH" || n.chartType === "stackedBarHPct", g = n.chartType.startsWith("stacked"), v = n.chartType === "stackedBarPct" || n.chartType === "stackedBarHPct", S = n.series.filter((e) => e.seriesType !== "line"), C = n.series.filter((e) => e.seriesType === "line"), w = b(n), T = w.length;
+function w(e, n, r, o) {
+	let { x: s, y: l, w: u, h: d } = r, f = n.chartType === "clusteredBarH" || n.chartType === "stackedBarH" || n.chartType === "stackedBarHPct", p = n.chartType.startsWith("stacked"), h = n.chartType === "stackedBarPct" || n.chartType === "stackedBarHPct", v = n.series.filter((e) => e.seriesType !== "line"), b = n.series.filter((e) => e.seriesType === "line"), w = S(n), T = w.length;
 	if (T === 0) return;
-	let E = n.title ? _(n, d, o) : 0, D = n.title ? d * .02 : 0, O = n.title ? d * .025 : 0, k = n.title ? E + D + O : 0, A = m(n, u, d), j = A?.side === "r" ? A.reserveW : 0, M = A?.side === "l" ? A.reserveW : 0, N = A?.side === "t" ? A.reserveH : 0, P = A?.side === "b" ? A.reserveH : 0, F = Math.max(8, Math.min(10, d * .045)), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
+	let E = n.title ? y(n, d, o) : 0, D = n.title ? d * .02 : 0, O = n.title ? d * .025 : 0, k = n.title ? E + D + O : 0, A = g(n, u, d), j = A?.side === "r" ? A.reserveW : 0, M = A?.side === "l" ? A.reserveW : 0, N = A?.side === "t" ? A.reserveH : 0, P = A?.side === "b" ? A.reserveH : 0, F = Math.max(8, Math.min(10, d * .045)), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
 		t: k + N + d * .02,
 		r: j + u * .03,
 		b: d * .14 + I + P,
 		l: u * .12 + L + M
 	};
-	p && (R.l = (n.catAxisHidden ? u * .03 : u * .22) + L + M, R.b = (n.valAxisHidden ? d * .02 : d * .08) + I + P), y(e, n, s, l + D, u, E);
+	f && (R.l = (n.catAxisHidden ? u * .03 : u * .22) + L + M, R.b = (n.valAxisHidden ? d * .02 : d * .08) + I + P), x(e, n, s, l + D, u, E);
 	let z = s + R.l, B = l + R.t, V = u - R.l - R.r, H = d - R.t - R.b;
 	if (V <= 0 || H <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(z, B, V, H));
 	let U = 0;
 	for (let e = 0; e < T; e++) {
 		let t = 0;
-		for (let n of S) {
+		for (let n of v) {
 			let r = n.values[e] ?? 0;
-			g ? t += Math.abs(r) : U = Math.max(U, Math.abs(r));
+			p ? t += Math.abs(r) : U = Math.max(U, Math.abs(r));
 		}
-		g && (U = Math.max(U, t));
+		p && (U = Math.max(U, t));
 	}
-	v && (U = 100), n.valMax != null && (U = n.valMax), U === 0 && (U = 1);
+	h && (U = 100), n.valMax != null && (U = n.valMax), U === 0 && (U = 1);
 	let W = i(U), G = n.valMax ?? a(U, W), K = "#e0e0e0", q = Math.round(G / W);
 	if (e.textBaseline = "middle", e.font = `${Math.max(8, Math.min(11, H / 20))}px sans-serif`, e.fillStyle = "#555", !n.valAxisHidden) for (let t = 0; t <= q; t++) {
-		let r = t * W, i = v ? `${Math.round(r)}%` : c(r, n.valAxisFormatCode);
-		if (p) {
+		let r = t * W, i = h ? `${Math.round(r)}%` : c(r, n.valAxisFormatCode);
+		if (f) {
 			let n = z + r / G * V;
 			e.strokeStyle = t === 0 ? "#aaa" : K, e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(n, B), e.lineTo(n, B + H), e.stroke(), e.textAlign = "center", e.fillText(i, n, B + H + 10);
 		} else {
@@ -270,31 +348,31 @@ function S(e, n, r, o) {
 			e.strokeStyle = t === 0 ? "#aaa" : K, e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(z, n), e.lineTo(z + V, n), e.stroke(), e.textAlign = "right", e.fillText(i, z - 4, n);
 		}
 	}
-	e.strokeStyle = "#aaa", e.lineWidth = 1, p ? (e.beginPath(), e.moveTo(z, B), e.lineTo(z, B + H), e.stroke()) : (e.beginPath(), e.moveTo(z, B + H), e.lineTo(z + V, B + H), e.stroke());
-	let J = p ? H / T : V / T, Y = g ? 1 : Math.max(1, S.length), X = g ? 0 : n.barOverlap ?? 0, ee = n.barGapWidth ?? 150, Z = J / (1 + (Y - 1) * (1 - X / 100) + ee / 100), Q = g ? 0 : Z * (1 - X / 100), $ = (J - (Z + (Y - 1) * Q)) / 2;
+	e.strokeStyle = "#aaa", e.lineWidth = 1, f ? (e.beginPath(), e.moveTo(z, B), e.lineTo(z, B + H), e.stroke()) : (e.beginPath(), e.moveTo(z, B + H), e.lineTo(z + V, B + H), e.stroke());
+	let J = f ? H / T : V / T, Y = p ? 1 : Math.max(1, v.length), X = p ? 0 : n.barOverlap ?? 0, ee = n.barGapWidth ?? 150, Z = J / (1 + (Y - 1) * (1 - X / 100) + ee / 100), Q = p ? 0 : Z * (1 - X / 100), $ = (J - (Z + (Y - 1) * Q)) / 2;
 	for (let r = 0; r < T; r++) {
 		let i = 0, a = 0;
-		if (v) {
-			for (let e of S) a += Math.abs(e.values[r] ?? 0);
+		if (h) {
+			for (let e of v) a += Math.abs(e.values[r] ?? 0);
 			a === 0 && (a = 1);
 		}
-		for (let o = 0; o < S.length; o++) {
-			let s = S[o], l = s.values[r] ?? 0, u = v ? Math.abs(l) / a * 100 : Math.abs(l), d = t(o, s);
-			if (p) {
-				let t = g ? o : S.length - 1 - o, a = g ? B + (T - 1 - r) * J + $ : B + (T - 1 - r) * J + $ + t * Q, l = u / G * V, f = g ? z + i / G * V : z;
-				e.fillStyle = d, e.fillRect(f, a, l, Z), n.showDataLabels && u > 0 && (e.font = `bold ${Math.max(7, Math.min(11, Z * .6))}px sans-serif`, x(e, v ? `${Math.round(u)}%` : c(u, n.dataLabelFormatCode ?? s.valFormatCode ?? null), f, a, l, Z, "horizontal", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
+		for (let o = 0; o < v.length; o++) {
+			let s = v[o], l = s.values[r] ?? 0, u = h ? Math.abs(l) / a * 100 : Math.abs(l), d = t(o, s);
+			if (f) {
+				let t = p ? o : v.length - 1 - o, a = p ? B + (T - 1 - r) * J + $ : B + (T - 1 - r) * J + $ + t * Q, l = u / G * V, f = p ? z + i / G * V : z;
+				e.fillStyle = d, e.fillRect(f, a, l, Z), n.showDataLabels && u > 0 && (e.font = `bold ${Math.max(7, Math.min(11, Z * .6))}px sans-serif`, C(e, h ? `${Math.round(u)}%` : c(u, n.dataLabelFormatCode ?? s.valFormatCode ?? null), f, a, l, Z, "horizontal", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
 			} else {
-				let t = g ? z + r * J + $ : z + r * J + $ + o * Q, a = u / G * H, l = B + H - (g ? i + u : u) / G * H;
-				e.fillStyle = d, e.fillRect(t, l, Z, a), n.showDataLabels && u > 0 && (e.font = `bold ${Math.max(7, Math.min(11, Z * .6))}px sans-serif`, x(e, v ? `${Math.round(u)}%` : c(u, n.dataLabelFormatCode ?? s.valFormatCode ?? null), t, l, Z, a, "vertical", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
+				let t = p ? z + r * J + $ : z + r * J + $ + o * Q, a = u / G * H, l = B + H - (p ? i + u : u) / G * H;
+				e.fillStyle = d, e.fillRect(t, l, Z, a), n.showDataLabels && u > 0 && (e.font = `bold ${Math.max(7, Math.min(11, Z * .6))}px sans-serif`, C(e, h ? `${Math.round(u)}%` : c(u, n.dataLabelFormatCode ?? s.valFormatCode ?? null), t, l, Z, a, "vertical", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
 			}
-			g && (i += u);
+			p && (i += u);
 		}
 	}
 	if (!n.catAxisHidden) {
 		e.fillStyle = "#555", e.font = `${Math.max(8, Math.min(11, J * .5))}px sans-serif`;
 		for (let t = 0; t < T; t++) {
 			let n = (w[t] ?? "").toString().slice(0, 12);
-			if (p) {
+			if (f) {
 				let r = B + (T - 1 - t) * J + J / 2;
 				e.textAlign = "right", e.textBaseline = "middle", e.fillText(n, z - 4, r);
 			} else {
@@ -303,8 +381,8 @@ function S(e, n, r, o) {
 			}
 		}
 	}
-	if (C.length > 0 && !p) for (let n = 0; n < C.length; n++) {
-		let r = C[n], i = t(S.length + n, r);
+	if (b.length > 0 && !f) for (let n = 0; n < b.length; n++) {
+		let r = b[n], i = t(v.length + n, r);
 		e.strokeStyle = i, e.lineWidth = 2, e.setLineDash([]), e.beginPath();
 		let a = !1;
 		for (let t = 0; t < T; t++) {
@@ -323,22 +401,22 @@ function S(e, n, r, o) {
 			e.fillStyle = i, e.beginPath(), e.arc(a, o, 3, 0, Math.PI * 2), e.fill();
 		}
 	}
-	h(e, p && !g ? {
+	_(e, f && !p ? {
 		...n,
 		series: [...n.series].reverse()
-	} : n, A, s, l, u, d, z, B, V, H, k + 2), n.catAxisTitle && f(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && f(e, n.valAxisTitle, z, B, V, H, "val", F);
+	} : n, A, s, l, u, d, z, B, V, H, k + 2), n.catAxisTitle && m(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && m(e, n.valAxisTitle, z, B, V, H, "val", F);
 }
-function C(e, n, r, l) {
-	let { x: u, y: d, w: p, h: x } = r, S = b(n), C = S.length;
+function T(e, n, r, l) {
+	let { x: u, y: d, w: f, h: p } = r, h = S(n), C = h.length;
 	if (C === 0) return;
-	let w = n.title ? _(n, x, l) : 0, T = n.title ? x * .045 : 0, E = n.title ? x * .035 : 0, D = n.title ? w + T + E : 0, O = m(n, p, x), k = O?.side === "r" ? O.reserveW : 0, A = O?.side === "l" ? O.reserveW : 0, j = O?.side === "t" ? O.reserveH : 0, M = O?.side === "b" ? O.reserveH : 0, N = v(n.catAxisFontSizeHpt, x, l), P = v(n.valAxisFontSizeHpt, x, l), F = Math.max(N, P), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
+	let w = n.title ? y(n, p, l) : 0, T = n.title ? p * .045 : 0, E = n.title ? p * .035 : 0, D = n.title ? w + T + E : 0, O = g(n, f, p), k = O?.side === "r" ? O.reserveW : 0, A = O?.side === "l" ? O.reserveW : 0, j = O?.side === "t" ? O.reserveH : 0, M = O?.side === "b" ? O.reserveH : 0, N = b(n.catAxisFontSizeHpt, p, l), P = b(n.valAxisFontSizeHpt, p, l), F = Math.max(N, P), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
 		t: D + j + P / 2 + 2,
-		r: k + p * .05,
+		r: k + f * .05,
 		b: N + 12 + I + M,
 		l: P * 2.2 + 10 + L + A
 	};
-	y(e, n, u, d + T, p, w);
-	let z = u + R.l, B = d + R.t, V = p - R.l - R.r, H = x - R.t - R.b;
+	x(e, n, u, d + T, f, w);
+	let z = u + R.l, B = d + R.t, V = f - R.l - R.r, H = p - R.t - R.b;
 	if (V <= 0 || H <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(z, B, V, H));
 	let U = Infinity, W = -Infinity;
@@ -352,11 +430,11 @@ function C(e, n, r, l) {
 		e.font = `${P}px sans-serif`, e.textBaseline = "middle";
 		for (let r = 0; r <= t; r++) {
 			let t = K + r * G, i = Y(t);
-			e.strokeStyle = t === 0 ? "#aaa" : "#e0e0e0", e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(z, i), e.lineTo(z + V, i), e.stroke(), g(e, n.valAxisMajorTickMark, "val", z, i), e.fillStyle = "#555", e.textAlign = "right", e.fillText(c(t, n.valAxisFormatCode), z - 6, i);
+			e.strokeStyle = t === 0 ? "#aaa" : "#e0e0e0", e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(z, i), e.lineTo(z + V, i), e.stroke(), v(e, n.valAxisMajorTickMark, "val", z, i), e.fillStyle = "#555", e.textAlign = "right", e.fillText(c(t, n.valAxisFormatCode), z - 6, i);
 		}
 	}
 	e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(z, B + H), e.lineTo(z + V, B + H), e.stroke(), n.valAxisHidden || (e.beginPath(), e.moveTo(z, B), e.lineTo(z, B + H), e.stroke());
-	let ee = Math.max(1, 2.25 * l), Z = Math.max(2, 2.5 * l), Q = v(n.dataLabelFontSizeHpt, x, l);
+	let ee = Math.max(1, 2.25 * l), Z = Math.max(2, 2.5 * l), Q = b(n.dataLabelFontSizeHpt, p, l);
 	for (let r = 0; r < n.series.length; r++) {
 		let i = n.series[r], a = t(r, i);
 		e.strokeStyle = a, e.lineWidth = ee, e.setLineDash([]), e.beginPath();
@@ -386,32 +464,32 @@ function C(e, n, r, l) {
 		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top", e.font = `${N}px sans-serif`;
 		for (let r = 0; r < C; r += t) {
 			let t = X(r);
-			g(e, n.catAxisMajorTickMark, "cat", B + H, t), e.fillStyle = "#555", e.fillText((S[r] ?? "").toString().slice(0, 10), t, B + H + 5);
+			v(e, n.catAxisMajorTickMark, "cat", B + H, t), e.fillStyle = "#555", e.fillText((h[r] ?? "").toString().slice(0, 10), t, B + H + 5);
 		}
 	}
-	h(e, n, O, u, d, p, x, z, B, V, H, D + 2), n.catAxisTitle && f(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && f(e, n.valAxisTitle, z, B, V, H, "val", F);
+	_(e, n, O, u, d, f, p, z, B, V, H, D + 2), n.catAxisTitle && m(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && m(e, n.valAxisTitle, z, B, V, H, "val", F);
 }
-function w(e, n, o, s) {
-	let { x: l, y: u, w: d, h: p } = o, g = b(n), v = g.length;
-	if (v === 0) return;
-	let x = n.chartType === "stackedArea" || n.chartType === "stackedAreaPct", S = n.title ? _(n, p, s) : 0, C = n.title ? p * .035 : 0, w = n.title ? p * .035 : 0, T = n.title ? S + C + w : 0, E = m(n, d, p), D = E?.side === "r" ? E.reserveW : 0, O = E?.side === "l" ? E.reserveW : 0, k = E?.side === "t" ? E.reserveH : 0, A = E?.side === "b" ? E.reserveH : 0, j = Math.max(8, Math.min(10, p * .045)), M = n.catAxisTitle ? j + 4 : 0, N = n.valAxisTitle ? j + 4 : 0, P = {
-		t: T + k + p * .02,
+function E(e, n, o, s) {
+	let { x: l, y: u, w: d, h: f } = o, p = S(n), h = p.length;
+	if (h === 0) return;
+	let v = n.chartType === "stackedArea" || n.chartType === "stackedAreaPct", b = n.title ? y(n, f, s) : 0, C = n.title ? f * .035 : 0, w = n.title ? f * .035 : 0, T = n.title ? b + C + w : 0, E = g(n, d, f), D = E?.side === "r" ? E.reserveW : 0, O = E?.side === "l" ? E.reserveW : 0, k = E?.side === "t" ? E.reserveH : 0, A = E?.side === "b" ? E.reserveH : 0, j = Math.max(8, Math.min(10, f * .045)), M = n.catAxisTitle ? j + 4 : 0, N = n.valAxisTitle ? j + 4 : 0, P = {
+		t: T + k + f * .02,
 		r: D + d * .05,
-		b: p * .14 + M + A,
+		b: f * .14 + M + A,
 		l: d * .12 + N + O
 	};
-	y(e, n, l, u + C, d, S);
-	let F = l + P.l, I = u + P.t, L = d - P.l - P.r, R = p - P.t - P.b;
+	x(e, n, l, u + C, d, b);
+	let F = l + P.l, I = u + P.t, L = d - P.l - P.r, R = f - P.t - P.b;
 	if (L <= 0 || R <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(F, I, L, R));
 	let z = 0;
-	for (let e = 0; e < v; e++) if (x) {
+	for (let e = 0; e < h; e++) if (v) {
 		let t = 0;
 		for (let r of n.series) t += r.values[e] ?? 0;
 		z = Math.max(z, t);
 	} else for (let t of n.series) z = Math.max(z, t.values[e] ?? 0);
 	n.valMax != null && (z = n.valMax), z === 0 && (z = 1);
-	let B = i(z), V = n.valMax ?? a(z, B), H = (e) => F + (v === 1 ? L / 2 : e / (v - 1) * L), U = (e) => I + R - e / V * R;
+	let B = i(z), V = n.valMax ?? a(z, B), H = (e) => F + (h === 1 ? L / 2 : e / (h - 1) * L), U = (e) => I + R - e / V * R;
 	if (!n.valAxisHidden) {
 		e.font = `${Math.max(8, Math.min(11, R / 20))}px sans-serif`, e.textBaseline = "middle";
 		let t = Math.round(V / B);
@@ -421,37 +499,37 @@ function w(e, n, o, s) {
 		}
 	}
 	e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(F, I + R), e.lineTo(F + L, I + R), e.stroke();
-	let W = x ? Array(v).fill(0) : null;
+	let W = v ? Array(h).fill(0) : null;
 	for (let i = n.series.length - 1; i >= 0; i--) {
 		let a = n.series[i], o = t(i, a), s = I + R;
-		if (e.beginPath(), x && W) {
-			for (let t = 0; t < v; t++) {
+		if (e.beginPath(), v && W) {
+			for (let t = 0; t < h; t++) {
 				let n = (a.values[t] ?? 0) + W[t], r = H(t), i = U(n);
 				t === 0 ? e.moveTo(r, i) : e.lineTo(r, i);
 			}
-			for (let t = v - 1; t >= 0; t--) e.lineTo(H(t), U(W[t]));
-			for (let e = 0; e < v; e++) W[e] += a.values[e] ?? 0;
+			for (let t = h - 1; t >= 0; t--) e.lineTo(H(t), U(W[t]));
+			for (let e = 0; e < h; e++) W[e] += a.values[e] ?? 0;
 		} else {
 			e.moveTo(H(0), s);
-			for (let t = 0; t < v; t++) e.lineTo(H(t), U(a.values[t] ?? 0));
-			e.lineTo(H(v - 1), s);
+			for (let t = 0; t < h; t++) e.lineTo(H(t), U(a.values[t] ?? 0));
+			e.lineTo(H(h - 1), s);
 		}
 		e.closePath(), e.fillStyle = r(o, .6), e.fill(), e.strokeStyle = o, e.lineWidth = 1.5, e.setLineDash([]), e.stroke();
 	}
 	if (!n.catAxisHidden) {
-		let t = Math.max(1, Math.ceil(v / 8));
-		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top", e.font = `${Math.max(8, Math.min(11, L / v * .8))}px sans-serif`;
-		for (let n = 0; n < v; n += t) e.fillText((g[n] ?? "").toString().slice(0, 10), H(n), I + R + 3);
+		let t = Math.max(1, Math.ceil(h / 8));
+		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top", e.font = `${Math.max(8, Math.min(11, L / h * .8))}px sans-serif`;
+		for (let n = 0; n < h; n += t) e.fillText((p[n] ?? "").toString().slice(0, 10), H(n), I + R + 3);
 	}
-	h(e, n, E, l, u, d, p, F, I, L, R, T + 2), n.catAxisTitle && f(e, n.catAxisTitle, F, I, L, R, "cat", j), n.valAxisTitle && f(e, n.valAxisTitle, F, I, L, R, "val", j);
+	_(e, n, E, l, u, d, f, F, I, L, R, T + 2), n.catAxisTitle && m(e, n.catAxisTitle, F, I, L, R, "cat", j), n.valAxisTitle && m(e, n.valAxisTitle, F, I, L, R, "val", j);
 }
-function T(t, r, i, a, o) {
+function D(t, r, i, a, o) {
 	let { x: s, y: c, w: l, h: u } = i, d = r.series[0];
 	if (!d) return;
 	let f = d.categories && d.categories.length > 0 ? d.categories : r.categories, p = d.values.map((e) => Math.abs(e ?? 0)), m = p.reduce((e, t) => e + t, 0);
 	if (m === 0) return;
-	let g = r.title ? _(r, u, o) : 0, v = r.title ? u * .035 : 0, b = r.title ? u * .035 : 0, x = r.title ? g + v + b : 0;
-	y(t, r, s, c + v, l, g);
+	let h = r.title ? y(r, u, o) : 0, g = r.title ? u * .035 : 0, v = r.title ? u * .035 : 0, b = r.title ? h + g + v : 0;
+	x(t, r, s, c + g, l, h);
 	let S = r.showLegend ? (() => {
 		let e = r.legendPos ?? "r", t = e === "l" ? "l" : e === "t" ? "t" : e === "b" ? "b" : "r";
 		return t === "r" || t === "l" ? {
@@ -463,7 +541,7 @@ function T(t, r, i, a, o) {
 			reserveW: 0,
 			reserveH: Math.max(18, u * .08)
 		};
-	})() : null, C = S?.side === "r" ? S.reserveW : 0, w = S?.side === "l" ? S.reserveW : 0, T = S?.side === "t" ? S.reserveH : 0, E = S?.side === "b" ? S.reserveH : 0, D = l - C - w, O = u - x - T - E - u * .02, k = s + w + D / 2, A = c + x + T + u * .02 + O / 2, j = Math.min(D, O) * .42, M = a ? j * .5 : 0, N = -Math.PI / 2;
+	})() : null, C = S?.side === "r" ? S.reserveW : 0, w = S?.side === "l" ? S.reserveW : 0, T = S?.side === "t" ? S.reserveH : 0, E = S?.side === "b" ? S.reserveH : 0, D = l - C - w, O = u - b - T - E - u * .02, k = s + w + D / 2, A = c + b + T + u * .02 + O / 2, j = Math.min(D, O) * .42, M = a ? j * .5 : 0, N = -Math.PI / 2;
 	for (let e = 0; e < p.length; e++) {
 		let i = p[e] / m * Math.PI * 2, o = n(e, d);
 		if (t.beginPath(), t.moveTo(k, A), t.arc(k, A, j, N, N + i), t.closePath(), t.fillStyle = o, t.fill(), t.strokeStyle = "#fff", t.lineWidth = 1, t.stroke(), r.showDataLabels && i > .15) {
@@ -478,114 +556,279 @@ function T(t, r, i, a, o) {
 			color: d.dataPointColors?.[n] ?? d.color ?? e[n % e.length],
 			values: []
 		})), i = k - D / 2;
-		h(t, {
+		_(t, {
 			...r,
 			series: n
-		}, S, s, c, l, u, i, A - O / 2, D, O, x + 2);
+		}, S, s, c, l, u, i, A - O / 2, D, O, b + 2);
 	}
 }
-function E(e, n, o, c) {
-	let { x: l, y: u, w: d, h: f } = o, p = b(n), g = p.length;
-	if (g < 3) return;
-	let x = n.title ? _(n, f, c) : 0, S = n.title ? f * .035 : 0, C = n.title ? f * .035 : 0, w = n.title ? x + S + C : 0, T = m(n, d, f), E = T?.side === "r" ? T.reserveW : 0, D = T?.side === "l" ? T.reserveW : 0, O = T?.side === "t" ? T.reserveH : 0, k = T?.side === "b" ? T.reserveH : 0;
-	y(e, n, l, u + S, d, x);
+function O(e, n, o, c) {
+	let { x: l, y: u, w: d, h: f } = o, p = S(n), m = p.length;
+	if (m < 3) return;
+	let h = n.title ? y(n, f, c) : 0, v = n.title ? f * .035 : 0, C = n.title ? f * .035 : 0, w = n.title ? h + v + C : 0, T = g(n, d, f), E = T?.side === "r" ? T.reserveW : 0, D = T?.side === "l" ? T.reserveW : 0, O = T?.side === "t" ? T.reserveH : 0, k = T?.side === "b" ? T.reserveH : 0;
+	x(e, n, l, u + v, d, h);
 	let A = d - E - D, j = f - w - O - k - f * .02, M = l + D + A / 2, N = u + w + O + f * .02 + j / 2, P = Math.min(A, j) * .38, F = 0;
 	for (let e of n.series) for (let t of e.values) F = Math.max(F, t ?? 0);
 	n.valMax != null && (F = n.valMax), F === 0 && (F = 1);
-	let I = i(F), L = n.valMax ?? a(F, I), R = -Math.PI / 2, z = (e) => R + e / g * Math.PI * 2, B = Math.round(L / I);
+	let I = i(F), L = n.valMax ?? a(F, I), R = -Math.PI / 2, z = (e) => R + e / m * Math.PI * 2, B = Math.round(L / I);
 	e.strokeStyle = "#ddd", e.lineWidth = .5;
 	for (let t = 1; t <= B; t++) {
 		let n = t / B * P;
 		e.beginPath();
-		for (let t = 0; t < g; t++) {
+		for (let t = 0; t < m; t++) {
 			let r = z(t), i = M + Math.cos(r) * n, a = N + Math.sin(r) * n;
 			t === 0 ? e.moveTo(i, a) : e.lineTo(i, a);
 		}
 		e.closePath(), e.stroke();
 	}
 	e.strokeStyle = "#bbb", e.lineWidth = .5;
-	for (let t = 0; t < g; t++) {
+	for (let t = 0; t < m; t++) {
 		let n = z(t);
 		e.beginPath(), e.moveTo(M, N), e.lineTo(M + Math.cos(n) * P, N + Math.sin(n) * P), e.stroke();
 	}
 	if (!n.valAxisHidden) {
-		e.font = `${v(n.valAxisFontSizeHpt, f, c)}px sans-serif`, e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle";
+		e.font = `${b(n.valAxisFontSizeHpt, f, c)}px sans-serif`, e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle";
 		for (let t = 1; t <= B; t++) {
 			let n = t / B * L, r = t / B * P;
 			e.fillText(s(n), M - 3, N - r);
 		}
 	}
 	e.font = `${Math.max(8, Math.min(11, P * .2))}px sans-serif`, e.fillStyle = "#444", e.textBaseline = "middle";
-	for (let t = 0; t < g; t++) {
+	for (let t = 0; t < m; t++) {
 		let n = z(t), r = M + Math.cos(n) * (P + 12), i = N + Math.sin(n) * (P + 12);
 		e.textAlign = Math.cos(n) < -.1 ? "right" : Math.cos(n) > .1 ? "left" : "center", e.fillText((p[t] ?? "").toString().slice(0, 12), r, i);
 	}
 	for (let i = 0; i < n.series.length; i++) {
 		let a = n.series[i], o = t(i, a);
 		e.beginPath();
-		for (let t = 0; t < g; t++) {
+		for (let t = 0; t < m; t++) {
 			let n = (a.values[t] ?? 0) / L, r = z(t), i = M + Math.cos(r) * P * n, o = N + Math.sin(r) * P * n;
 			t === 0 ? e.moveTo(i, o) : e.lineTo(i, o);
 		}
 		e.closePath(), e.fillStyle = r(o, .25), e.fill(), e.strokeStyle = o, e.lineWidth = 2, e.stroke();
 	}
-	h(e, n, T, l, u, d, f, M - A / 2, N - j / 2, A, j, w + 2);
+	_(e, n, T, l, u, d, f, M - A / 2, N - j / 2, A, j, w + 2);
 }
-function D(e, n, r, a) {
-	let { x: o, y: s, w: l, h: u } = r, d = n.title ? _(n, u, a) : 0, p = n.title ? u * .035 : 0, g = n.title ? u * .035 : 0, v = n.title ? d + p + g : 0, b = m(n, l, u), x = b?.side === "r" ? b.reserveW : 0, S = b?.side === "l" ? b.reserveW : 0, C = b?.side === "t" ? b.reserveH : 0, w = b?.side === "b" ? b.reserveH : 0, T = Math.max(8, Math.min(10, u * .045)), E = n.catAxisTitle ? T + 4 : 0, D = n.valAxisTitle ? T + 4 : 0, O = {
-		t: v + C + u * .02,
-		r: x + l * .05,
-		b: u * .12 + E + w,
-		l: l * .12 + D + S
-	};
-	y(e, n, o, s + p, l, d);
-	let k = o + O.l, A = s + O.t, j = l - O.l - O.r, M = u - O.t - O.b;
-	if (j <= 0 || M <= 0) return;
-	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(k, A, j, M));
-	let N = [], P = [];
+function k(e, n, r, a) {
+	let { x: o, y: s, w: l, h: u } = r, d = n.title ? y(n, u, a) : 0, f = n.title ? u * .035 : 0, p = n.title ? u * .035 : 0, h = n.title ? d + f + p : 0, v = g(n, l, u), b = v?.side === "r" ? v.reserveW : 0, S = v?.side === "l" ? v.reserveW : 0, C = v?.side === "t" ? v.reserveH : 0, w = v?.side === "b" ? v.reserveH : 0, T = Math.max(8, Math.min(10, u * .045)), E = n.catAxisTitle ? T + 4 : 0, D = n.valAxisTitle ? T + 4 : 0;
+	if (n.title) {
+		let t = n.titleManualLayout;
+		t && (t.x !== void 0 || t.y !== void 0) ? x(e, n, o + t.x * l, s + t.y * u, (t.w ?? .5) * l, d) : x(e, n, o, s + f, l, d);
+	}
+	let O = n.plotAreaManualLayout, k, N, P, F;
+	if (O && O.w != null && O.h != null) k = o + O.x * l, N = s + O.y * u, P = O.w * l, F = O.h * u;
+	else {
+		let e = {
+			t: h + C + u * .02,
+			r: b + l * .05,
+			b: (n.catAxisHidden ? u * .04 : u * .12) + E + w,
+			l: (n.valAxisHidden ? l * .04 : l * .12) + D + S
+		};
+		k = o + e.l, N = s + e.t, P = l - e.l - e.r, F = u - e.t - e.b;
+	}
+	if (P <= 0 || F <= 0) return;
+	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(k, N, P, F));
+	let I = [], L = [];
 	for (let e of n.series) {
 		let t = e.categories ?? [];
 		for (let e of t) {
 			let t = parseFloat(e);
-			isNaN(t) || N.push(t);
+			isNaN(t) || I.push(t);
 		}
-		for (let t of e.values) t != null && P.push(t);
+		for (let t of e.values) t != null && L.push(t);
 	}
-	let F = N.length === 0;
-	if (F) {
+	let R = I.length === 0;
+	if (R) {
 		let e = Math.max(...n.series.map((e) => e.values.length));
-		for (let t = 0; t < e; t++) N.push(t);
+		for (let t = 0; t < e; t++) I.push(t);
 	}
-	let I = Math.min(...N), L = Math.max(...N), R = Math.min(...P), z = Math.max(...P);
-	I === L && (--I, L += 1), R === z && (--R, z += 1), n.valMin == null ? R > 0 && (R = 0) : R = n.valMin, n.valMax != null && (z = n.valMax);
-	let B = (e) => k + (e - I) / (L - I) * j, V = (e) => A + M - (e - R) / (z - R) * M;
+	let z = Math.min(...I), B = Math.max(...I), V = Math.min(...L), H = Math.max(...L);
+	z === B && (--z, B += 1), V === H && (--V, H += 1), n.valMin == null ? V > 0 && (V = 0) : V = n.valMin, n.valMax != null && (H = n.valMax), n.catAxisMin != null && (z = n.catAxisMin), n.catAxisMax != null && (B = n.catAxisMax);
+	let U = (e) => k + (e - z) / (B - z) * P, W = (e) => N + F - (e - V) / (H - V) * F;
 	if (!n.valAxisHidden) {
-		e.font = `${Math.max(8, Math.min(11, M / 20))}px sans-serif`;
-		let t = i(z - R), r = Math.round((z - R) / t) + 1;
+		e.font = `${Math.max(8, Math.min(11, F / 20))}px sans-serif`;
+		let t = i(H - V), r = Math.round((H - V) / t) + 1;
 		for (let i = 0; i < r; i++) {
-			let r = R + i * t;
-			if (r > z + t * .01) break;
-			let a = V(r);
-			e.strokeStyle = "#e0e0e0", e.lineWidth = .5, e.beginPath(), e.moveTo(k, a), e.lineTo(k + j, a), e.stroke(), e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle", e.fillText(c(r, n.valAxisFormatCode), k - 4, a);
+			let r = V + i * t;
+			if (r > H + t * .01) break;
+			let a = W(r);
+			e.strokeStyle = "#e0e0e0", e.lineWidth = .5, e.beginPath(), e.moveTo(k, a), e.lineTo(k + P, a), e.stroke(), e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle", e.fillText(c(r, n.valAxisFormatCode), k - 4, a);
+		}
+	}
+	if (e.strokeStyle = "#888", e.lineWidth = 1, e.beginPath(), e.moveTo(k, N + F), e.lineTo(k + P, N + F), e.stroke(), n.valAxisHidden || (e.beginPath(), e.moveTo(k, N), e.lineTo(k, N + F), e.stroke()), !n.catAxisHidden) {
+		e.font = `${Math.max(8, Math.min(11, F / 20))}px sans-serif`;
+		let t = i(B - z), r = Math.round((B - z) / t) + 1;
+		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top";
+		for (let i = 0; i < r; i++) {
+			let r = z + i * t;
+			if (r > B + t * .01) break;
+			let a = U(r);
+			e.fillText(c(r, n.catAxisFormatCode), a, N + F + 4);
 		}
 	}
-	e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(k, A + M), e.lineTo(k + j, A + M), e.stroke(), e.beginPath(), e.moveTo(k, A), e.lineTo(k, A + M), e.stroke();
-	let H = Math.max(3, M * .015);
 	for (let r = 0; r < n.series.length; r++) {
-		let i = n.series[r];
-		if (i.showMarker === !1) continue;
-		e.fillStyle = t(r, i);
-		let a = i.categories ?? [];
-		for (let t = 0; t < i.values.length; t++) {
+		let i = n.series[r], o = t(r, i), s = i.categories ?? [];
+		for (let t of i.errBars ?? []) j(e, i, t, s, R, U, W, o);
+		if (!(i.showMarker === !1 || typeof i.markerSymbol == "string" && i.markerSymbol === "none")) for (let t = 0; t < i.values.length; t++) {
 			let n = i.values[t];
 			if (n == null) continue;
-			let r = F ? t : parseFloat(a[t] ?? "0");
-			isNaN(r) || (e.beginPath(), e.arc(B(r), V(n), H, 0, Math.PI * 2), e.fill());
+			let r = R ? t : parseFloat(s[t] ?? "0");
+			if (isNaN(r)) continue;
+			let c = (i.dataPointOverrides ?? []).find((e) => e.idx === t), l = c?.markerSymbol ?? i.markerSymbol ?? "circle", u = c?.markerSize ?? i.markerSize ?? 5, d = c?.markerFill ?? c?.color ?? i.markerFill ?? o, f = c?.markerLine ?? i.markerLine ?? null;
+			A(e, U(r), W(n), l, u, d, f, a);
 		}
+		M(e, i, s, R, U, W, F, a);
 	}
-	h(e, n, b, o, s, l, u, k, A, j, M, v + 2), n.catAxisTitle && f(e, n.catAxisTitle, k, A, j, M, "cat", T), n.valAxisTitle && f(e, n.valAxisTitle, k, A, j, M, "val", T);
+	_(e, n, v, o, s, l, u, k, N, P, F, h + 2), n.catAxisTitle && m(e, n.catAxisTitle, k, N, P, F, "cat", T), n.valAxisTitle && m(e, n.valAxisTitle, k, N, P, F, "val", T);
 }
-function O(e, t, n) {
+function A(e, t, n, r, i, a, o, s) {
+	let c = Math.max(2, i * s), l = c / 2;
+	switch (e.save(), e.fillStyle = `#${a}`, o && (e.strokeStyle = `#${o}`, e.lineWidth = 1), r) {
+		case "square":
+			e.fillRect(t - l, n - l, c, c), o && e.strokeRect(t - l, n - l, c, c);
+			break;
+		case "diamond":
+			e.beginPath(), e.moveTo(t, n - l), e.lineTo(t + l, n), e.lineTo(t, n + l), e.lineTo(t - l, n), e.closePath(), e.fill(), o && e.stroke();
+			break;
+		case "triangle":
+			e.beginPath(), e.moveTo(t, n - l), e.lineTo(t + l, n + l), e.lineTo(t - l, n + l), e.closePath(), e.fill(), o && e.stroke();
+			break;
+		case "x":
+			e.strokeStyle = `#${a}`, e.lineWidth = Math.max(1, c * .18), e.beginPath(), e.moveTo(t - l, n - l), e.lineTo(t + l, n + l), e.moveTo(t - l, n + l), e.lineTo(t + l, n - l), e.stroke();
+			break;
+		case "plus":
+			e.strokeStyle = `#${a}`, e.lineWidth = Math.max(1, c * .18), e.beginPath(), e.moveTo(t - l, n), e.lineTo(t + l, n), e.moveTo(t, n - l), e.lineTo(t, n + l), e.stroke();
+			break;
+		case "star":
+			e.beginPath();
+			for (let r = 0; r < 10; r++) {
+				let i = r % 2 == 0 ? l : l * .45, a = -Math.PI / 2 + r * Math.PI / 5, o = t + Math.cos(a) * i, s = n + Math.sin(a) * i;
+				r === 0 ? e.moveTo(o, s) : e.lineTo(o, s);
+			}
+			e.closePath(), e.fill(), o && e.stroke();
+			break;
+		case "dot":
+			e.beginPath(), e.arc(t, n, Math.max(1, c * .25), 0, Math.PI * 2), e.fill();
+			break;
+		case "dash": {
+			let r = Math.max(1, c * .25);
+			e.fillRect(t - l, n - r / 2, c, r);
+			break;
+		}
+		default:
+			e.beginPath(), e.arc(t, n, l, 0, Math.PI * 2), e.fill(), o && e.stroke();
+			break;
+	}
+	e.restore();
+}
+function j(e, t, n, r, i, a, o, s) {
+	e.save(), e.strokeStyle = n.color ? `#${n.color}` : s, e.lineWidth = n.lineWidthEmu ? Math.max(.5, n.lineWidthEmu / 12700) : 1, e.setLineDash(P(n.dash));
+	let c = n.barType === "plus" || n.barType === "both", l = n.barType === "minus" || n.barType === "both", u = n.dir === "x", d = e.lineWidth * 1.5;
+	for (let s = 0; s < t.values.length; s++) {
+		let f = t.values[s];
+		if (f == null) continue;
+		let p = i ? s : parseFloat(r[s] ?? "0");
+		if (isNaN(p)) continue;
+		let m = a(p), h = o(f), g = (t) => {
+			let r = m, i = h;
+			u ? r = a(p + t) : i = o(f + t), e.beginPath(), e.moveTo(m, h), e.lineTo(r, i), e.stroke(), n.noEndCap || (e.save(), e.setLineDash([]), e.beginPath(), u ? (e.moveTo(r, i - d), e.lineTo(r, i + d)) : (e.moveTo(r - d, i), e.lineTo(r + d, i)), e.stroke(), e.restore());
+		};
+		if (c) {
+			let e = n.plus[s];
+			e != null && g(e);
+		}
+		if (l) {
+			let e = n.minus[s];
+			e != null && g(-e);
+		}
+	}
+	e.restore();
+}
+function M(e, t, n, r, i, a, o, s) {
+	let l = t.dataLabelOverrides ?? [];
+	if (l.length === 0 && !t.seriesDataLabels) return;
+	let u = t.seriesDataLabels;
+	for (let d = 0; d < t.values.length; d++) {
+		let f = t.values[d];
+		if (f == null) continue;
+		let p = r ? d : parseFloat(n[d] ?? "0");
+		if (isNaN(p)) continue;
+		let m = l.find((e) => e.idx === d), h;
+		if (m) {
+			if (m.text === "") continue;
+			h = m.text;
+		} else if (u && (u.showVal || u.showSerName || u.showCatName)) {
+			let e = [];
+			if (u.showCatName && !r && e.push(n[d] ?? ""), u.showSerName && e.push(t.name), u.showVal && e.push(c(f, u.formatCode ?? null)), h = e.filter(Boolean).join(" "), !h) continue;
+		} else continue;
+		let g = m?.position ?? u?.position ?? "r", _ = m?.fontSizeHpt ? m.fontSizeHpt / 100 * s : Math.max(9, Math.min(11, o / 25)), v = m?.fontColor ?? u?.fontColor;
+		N(e, i(p), a(f), h, g, _, v);
+	}
+}
+function N(e, t, n, r, i, a, o) {
+	e.save(), e.font = `${a}px sans-serif`, e.fillStyle = o ? `#${o}` : "#333";
+	let s = a * .6, c = t, l = n;
+	switch (i) {
+		case "l":
+			e.textAlign = "right", e.textBaseline = "middle", c = t - s;
+			break;
+		case "r":
+			e.textAlign = "left", e.textBaseline = "middle", c = t + s;
+			break;
+		case "t":
+			e.textAlign = "center", e.textBaseline = "bottom", l = n - s;
+			break;
+		case "b":
+			e.textAlign = "center", e.textBaseline = "top", l = n + s;
+			break;
+		case "ctr":
+			e.textAlign = "center", e.textBaseline = "middle";
+			break;
+		default:
+			e.textAlign = "left", e.textBaseline = "middle", c = t + s;
+			break;
+	}
+	let u = r.split(/\r?\n/), d = a * 1.15, f = d * u.length, p = l;
+	e.textBaseline === "middle" ? p = l - (f - d) / 2 : e.textBaseline === "bottom" && (p = l - (f - d));
+	for (let t of u) e.fillText(t, c, p), p += d;
+	e.restore();
+}
+function P(e) {
+	if (!e) return [];
+	switch (e) {
+		case "solid": return [];
+		case "dot":
+		case "sysDot": return [1, 2];
+		case "dash":
+		case "sysDash": return [4, 2];
+		case "lgDash": return [8, 3];
+		case "dashDot":
+		case "sysDashDot": return [
+			4,
+			2,
+			1,
+			2
+		];
+		case "lgDashDot": return [
+			8,
+			3,
+			1,
+			3
+		];
+		case "dashDotDot":
+		case "sysDashDotDot":
+		case "lgDashDotDot": return [
+			4,
+			2,
+			1,
+			2,
+			1,
+			2
+		];
+		default: return [];
+	}
+}
+function F(e, t, n) {
 	let { x: r, y: a, w: o, h: s } = n, c = o * .11, l = o * .04, u = s * .08, d = s * .18, f = r + c, p = a + u, m = o - c - l, h = s - u - d, g = t.series[0]?.values ?? [], _ = t.categories, v = _.length;
 	if (v === 0) return;
 	let y = new Set(t.subtotalIndices), b = 0, x = [];
@@ -635,7 +878,7 @@ function O(e, t, n) {
 	}
 	e.restore();
 }
-function k(e, t, n, r = 1.333) {
+function I(e, t, n, r = 1.333) {
 	let { x: i, y: a, w: o, h: s } = n;
 	if (t.chartBg && (e.fillStyle = `#${t.chartBg}`, e.fillRect(i, a, o, s)), t.series.length === 0) {
 		e.fillStyle = "#888", e.font = "12px sans-serif", e.textAlign = "center", e.textBaseline = "middle", e.fillText("(no data)", i + o / 2, a + s / 2);
@@ -648,36 +891,36 @@ function k(e, t, n, r = 1.333) {
 		case "stackedBarH":
 		case "stackedBarPct":
 		case "stackedBarHPct":
-			S(e, t, n, r);
+			w(e, t, n, r);
 			break;
 		case "line":
 		case "stackedLine":
 		case "stackedLinePct":
-			C(e, t, n, r);
+			T(e, t, n, r);
 			break;
 		case "area":
 		case "stackedArea":
 		case "stackedAreaPct":
-			w(e, t, n, r);
+			E(e, t, n, r);
 			break;
 		case "pie":
-			T(e, t, n, !1, r);
+			D(e, t, n, !1, r);
 			break;
 		case "doughnut":
-			T(e, t, n, !0, r);
+			D(e, t, n, !0, r);
 			break;
 		case "radar":
-			E(e, t, n, r);
+			O(e, t, n, r);
 			break;
 		case "scatter":
 		case "bubble":
-			D(e, t, n, r);
+			k(e, t, n, r);
 			break;
 		case "waterfall":
-			O(e, t, n);
+			F(e, t, n);
 			break;
 		default: e.fillStyle = "#888", e.font = "11px sans-serif", e.textAlign = "center", e.textBaseline = "middle", e.fillText(`Chart: ${t.chartType}`, i + o / 2, a + s / 2);
 	}
 }
 //#endregion
-export { k as t };
+export { I as t };