@silurus/ooxml 0.21.0 → 0.21.2

package/dist/{xlsx-C5GMzRNJ.js → xlsx-B7AEM-Ke.js}

@@ -311,7 +311,7 @@ function j(e, t) {
 function te(e) {
 	if (!e) return null;
 	let t = e.trim().replace(/^=/, "").toUpperCase().replace(/\s+/g, "");
-	return t === "TODAY()" ? Xe() : t === "NOW()" ? Ze() : null;
+	return t === "TODAY()" ? Ye() : t === "NOW()" ? Xe() : null;
 }
 var ne = {
 	14: "m/d/yyyy",
@@ -350,7 +350,7 @@ var ne = {
 	"October",
 	"November",
 	"December"
-], re = [
+], N = [
 	"Sunday",
 	"Monday",
 	"Tuesday",
@@ -358,7 +358,7 @@ var ne = {
 	"Thursday",
 	"Friday",
 	"Saturday"
-], N = [
+], P = [
 	"日",
 	"月",
 	"火",
@@ -366,7 +366,7 @@ var ne = {
 	"木",
 	"金",
 	"土"
-], P = [
+], re = [
 	"日曜日",
 	"月曜日",
 	"火曜日",
@@ -457,7 +457,7 @@ function R(e, t) {
 		} else if (t === "d" || t === "D") {
 			let e = 0;
 			for (; h < u.length && u[h].toLowerCase() === "d";) e++, h++;
-			e === 1 ? m += String(a) : e === 2 ? m += String(a).padStart(2, "0") : e === 3 ? m += re[o].slice(0, 3) : m += re[o], g = !1;
+			e === 1 ? m += String(a) : e === 2 ? m += String(a).padStart(2, "0") : e === 3 ? m += N[o].slice(0, 3) : m += N[o], g = !1;
 		} else if (t === "h" || t === "H") {
 			let e = 0;
 			for (; h < u.length && u[h].toLowerCase() === "h";) e++, h++;
@@ -484,7 +484,7 @@ function R(e, t) {
 			m += e >= 2 ? String(t).padStart(2, "0") : String(t), g = !1;
 		} else if (t === "A" || t === "a") {
 			let e = u.slice(h).toUpperCase();
-			e.startsWith("AAAA") ? (m += P[o], h += 4) : e.startsWith("AAA") ? (m += N[o], h += 3) : e.startsWith("AM/PM") ? (m += s < 12 ? "AM" : "PM", h += 5) : e.startsWith("A/P") ? (m += s < 12 ? "A" : "P", h += 3) : (m += t, h++), g = !1;
+			e.startsWith("AAAA") ? (m += re[o], h += 4) : e.startsWith("AAA") ? (m += P[o], h += 3) : e.startsWith("AM/PM") ? (m += s < 12 ? "AM" : "PM", h += 5) : e.startsWith("A/P") ? (m += s < 12 ? "A" : "P", h += 3) : (m += t, h++), g = !1;
 		} else m += t, h++, t !== ":" && t !== "/" && t !== "-" && t !== "." && t !== " " && (g = !1);
 	}
 	return m;
@@ -497,35 +497,35 @@ function z(e) {
 function ie(e, t, n) {
 	let r = ne[t];
 	if (r) return R(e, r);
-	if (n) return z(n) ? R(e, n) : U(e, n);
+	if (n) return z(n) ? R(e, n) : H(e, n);
 	switch (t) {
 		case 0: return String(e);
 		case 1: return Math.round(e).toString();
 		case 2: return e.toFixed(2);
-		case 3: return ae(e, 0);
-		case 4: return ae(e, 2);
+		case 3: return B(e, 0);
+		case 4: return B(e, 2);
 		case 9: return Math.round(e * 100) + "%";
 		case 10: return (e * 100).toFixed(2) + "%";
 		case 11: return e.toExponential(2);
 		case 37:
-		case 38: return ae(e, 0);
+		case 38: return B(e, 0);
 		case 39:
-		case 40: return ae(e, 2);
+		case 40: return B(e, 2);
 		case 49: return String(e);
 		default: return String(e);
 	}
 }
-function ae(e, t) {
+function B(e, t) {
 	return e.toLocaleString("en-US", {
 		minimumFractionDigits: t,
 		maximumFractionDigits: t
 	});
 }
-function B(e) {
+function ae(e) {
 	let t = e.match(/\.([0#]+)/);
 	return t ? t[1].length : 0;
 }
-function V(e) {
+function oe(e) {
 	let t = [], n = "", r = !1, i = !1, a = (e) => {
 		if (!e) return;
 		let n = t[t.length - 1];
@@ -562,39 +562,39 @@ function V(e) {
 		numSpec: n
 	};
 }
-function H(e, t) {
-	let n = t.includes(",") && /[#0]/.test(t), r = B(t);
-	return n ? ae(e, r) : t.includes(".") ? e.toFixed(r) : /[#0?]/.test(t) ? Math.round(e).toString() : String(e);
+function V(e, t) {
+	let n = t.includes(",") && /[#0]/.test(t), r = ae(t);
+	return n ? B(e, r) : t.includes(".") ? e.toFixed(r) : /[#0?]/.test(t) ? Math.round(e).toString() : String(e);
 }
-function U(e, t) {
+function H(e, t) {
 	let n = t.split(";"), r;
 	r = e > 0 ? n[0] : e < 0 ? n.length > 1 ? n[1] : n[0] : n.length > 2 ? n[2] : n[0];
-	let { tokens: i, numSpec: a } = V(r), o = i.some((e) => e.kind === "percent"), s = i.find((e) => e.kind === "sci"), c = e;
+	let { tokens: i, numSpec: a } = oe(r), o = i.some((e) => e.kind === "percent"), s = i.find((e) => e.kind === "sci"), c = e;
 	o && (c *= 100);
 	let l, u = "";
 	if (s) {
-		let e = B(a), [t, n] = c.toExponential(e).split("e");
+		let e = ae(a), [t, n] = c.toExponential(e).split("e");
 		l = t;
 		let r = parseInt(n, 10);
 		u = (r < 0 ? "-" : s.expSign ? "+" : "") + String(Math.abs(r)).padStart(2, "0");
-	} else l = H(c, a);
+	} else l = V(c, a);
 	let d = "", f = !1;
 	for (let e of i) e.kind === "lit" ? d += e.text : e.kind === "percent" ? d += "%" : e.kind === "num" ? (d += l, f = !0) : e.kind === "sci" && (d += "E" + u);
 	return !f && (a.length > 0 || s) && (d += l), d;
 }
-function oe(e, t, n) {
+function se(e, t, n) {
 	let r = [];
-	for (let i of t.split("\n")) r.push(...se(e, i, n));
+	for (let i of t.split("\n")) r.push(...W(e, i, n));
 	return r;
 }
-function W(e) {
+function U(e) {
 	return e >= 12288 && e <= 40959 || e >= 63744 && e <= 64255 || e >= 44032 && e <= 55215 || e >= 65280 && e <= 65519;
 }
-function se(e, t, n) {
+function W(e, t, n) {
 	let r = [], i = [], a = 0;
 	for (; a < t.length;) {
 		let e = t[a], n = e.codePointAt(0) ?? 0;
-		if (W(n)) i.push(e), a += n > 65535 ? 2 : 1;
+		if (U(n)) i.push(e), a += n > 65535 ? 2 : 1;
 		else if (e === " ") {
 			let e = a;
 			for (; e < t.length && t[e] === " ";) e++;
@@ -603,7 +603,7 @@ function se(e, t, n) {
 			let e = a;
 			for (; e < t.length;) {
 				let n = t[e], r = n.codePointAt(0) ?? 0;
-				if (n === " " || W(r)) break;
+				if (n === " " || U(r)) break;
 				e += r > 65535 ? 2 : 1;
 			}
 			i.push(t.slice(a, e)), a = e;
@@ -668,22 +668,22 @@ function le(e) {
 	}
 	return t;
 }
-function G(e, t, n) {
+function ue(e, t, n) {
 	for (let r of e) if (t >= r.top && t <= r.bottom && n >= r.left && n <= r.right) return !0;
 	return !1;
 }
-function ue(e) {
+function de(e) {
 	return e && e.value.type === "number" ? e.value.number : null;
 }
-function de(e) {
+function G(e) {
 	return e && e.value.type === "text" ? e.value.text : null;
 }
-function fe(e, t) {
+function K(e, t) {
 	let n = [];
-	for (let r of e.rows) for (let e of r.cells) e.value.type === "number" && G(t, e.row, e.col) && n.push(e.value.number);
+	for (let r of e.rows) for (let e of r.cells) e.value.type === "number" && ue(t, e.row, e.col) && n.push(e.value.number);
 	return n;
 }
-function pe(e, t) {
+function fe(e, t) {
 	let n = t.length ? Math.min(...t) : 0, r = t.length ? Math.max(...t) : 0, i = e.value == null ? NaN : parseFloat(e.value);
 	switch (e.kind) {
 		case "min": return n;
@@ -701,20 +701,20 @@ function pe(e, t) {
 		default: return isNaN(i) ? 0 : i;
 	}
 }
-function me(e) {
+function pe(e) {
 	let t = [], n = /* @__PURE__ */ new Map();
 	for (let t of e.rows) for (let e of t.cells) n.set(`${e.row}:${e.col}`, e);
 	let r = /* @__PURE__ */ new Map();
 	for (let t of e.definedNames ?? []) r.set(t.name, t);
 	for (let n of e.conditionalFormats ?? []) {
-		let r = fe(e, n.sqref);
+		let r = K(e, n.sqref);
 		for (let e of n.rules) {
 			let i = {
 				rule: e,
 				sqref: n.sqref
 			};
-			if (e.type === "colorScale") i.scaleStops = e.stops.map((e) => pe(e, r));
-			else if (e.type === "dataBar") i.barMin = pe(e.min, r), i.barMax = pe(e.max, r);
+			if (e.type === "colorScale") i.scaleStops = e.stops.map((e) => fe(e, r));
+			else if (e.type === "dataBar") i.barMin = fe(e.min, r), i.barMax = fe(e.max, r);
 			else if (e.type === "top10") {
 				let t = [...r].sort((e, t) => e - t), n = t.length;
 				if (n > 0) {
@@ -725,7 +725,7 @@ function me(e) {
 					} else i.top10Threshold = e.top ? t[Math.max(0, n - r)] : t[Math.min(n - 1, r - 1)];
 					i.top10IsTop = e.top;
 				}
-			} else e.type === "aboveAverage" ? r.length > 0 && (i.avgValue = r.reduce((e, t) => e + t, 0) / r.length, i.avgIsAbove = e.aboveAverage) : e.type === "iconSet" && (i.iconThresholds = e.cfvos.map((e) => pe(e, r)));
+			} else e.type === "aboveAverage" ? r.length > 0 && (i.avgValue = r.reduce((e, t) => e + t, 0) / r.length, i.avgIsAbove = e.aboveAverage) : e.type === "iconSet" && (i.iconThresholds = e.cfvos.map((e) => fe(e, r)));
 			t.push(i);
 		}
 	}
@@ -736,7 +736,7 @@ function me(e) {
 		definedNames: r
 	};
 }
-function he(e, t, n) {
+function me(e, t, n) {
 	switch (t) {
 		case "greaterThan": return e > (n[0] ?? 0);
 		case "greaterThanOrEqual": return e >= (n[0] ?? 0);
@@ -749,13 +749,13 @@ function he(e, t, n) {
 		default: return !1;
 	}
 }
-function ge(e) {
+function he(e) {
 	let t = e.trim();
 	if (t.length >= 2 && t.startsWith("\"") && t.endsWith("\"")) return { text: t.slice(1, -1).replace(/""/g, "\"") };
 	let n = parseFloat(t);
 	return isNaN(n) ? { text: t } : { num: n };
 }
-function _e(e, t, n) {
+function ge(e, t, n) {
 	let r = n[0] ?? "", i = n[1] ?? "", a = (e) => e.toLowerCase();
 	switch (t) {
 		case "equal": return a(e) === a(r);
@@ -769,21 +769,21 @@ function _e(e, t, n) {
 		default: return !1;
 	}
 }
-function ve(e, t, n) {
+function _e(e, t, n) {
 	let r = e.replace("#", ""), i = t.replace("#", ""), a = parseInt(r.slice(0, 2), 16), o = parseInt(r.slice(2, 4), 16), s = parseInt(r.slice(4, 6), 16), c = parseInt(i.slice(0, 2), 16), l = parseInt(i.slice(2, 4), 16), u = parseInt(i.slice(4, 6), 16), d = Math.round(a + (c - a) * n), f = Math.round(o + (l - o) * n), p = Math.round(s + (u - s) * n);
 	return `#${d.toString(16).padStart(2, "0").toUpperCase()}${f.toString(16).padStart(2, "0").toUpperCase()}${p.toString(16).padStart(2, "0").toUpperCase()}`;
 }
-function ye(e, t, n) {
+function ve(e, t, n) {
 	if (!t.length) return "#FFFFFF";
 	if (e <= n[0]) return t[0].color;
 	if (e >= n[n.length - 1]) return t[t.length - 1].color;
 	for (let r = 1; r < n.length; r++) if (e <= n[r]) {
 		let i = n[r - 1], a = n[r], o = a === i ? 0 : (e - i) / (a - i);
-		return ve(t[r - 1].color, t[r].color, o);
+		return _e(t[r - 1].color, t[r].color, o);
 	}
 	return t[t.length - 1].color;
 }
-function be(e, t) {
+function ye(e, t) {
 	if (t && (t.fill && !e.fill && (e.fill = t.fill), t.font?.color && e.fontColor == null && (e.fontColor = t.font.color), t.font?.bold && e.fontBold == null && (e.fontBold = !0), t.font?.italic && e.fontItalic == null && (e.fontItalic = !0), t.font?.underline && e.fontUnderline == null && (e.fontUnderline = !0), t.font?.strike && e.fontStrike == null && (e.fontStrike = !0), t.numFmt && e.numFmt == null && (e.numFmt = {
 		numFmtId: t.numFmt.numFmtId,
 		formatCode: t.numFmt.formatCode || null
@@ -799,16 +799,16 @@ function be(e, t) {
 		};
 	}
 }
-function xe(e, t, n, r, i) {
+function be(e, t, n, r, i) {
 	let a = {};
 	if (!r.compiled.length) return a;
 	for (let o of r.compiled) {
-		if (!G(o.sqref, t, n)) continue;
-		let s = o.rule, c = ue(e);
+		if (!ue(o.sqref, t, n)) continue;
+		let s = o.rule, c = de(e);
 		if (s.type === "expression") {
 			let e = o.sqref[0];
 			if (!e) continue;
-			if (Ce(s.formula, {
+			if (Se(s.formula, {
 				row: t,
 				col: n,
 				anchorRow: e.top,
@@ -816,18 +816,18 @@ function xe(e, t, n, r, i) {
 				cellIndex: r.cellIndex,
 				definedNames: r.definedNames,
 				depth: 0
-			}) && (be(a, s.dxfId == null ? null : i[s.dxfId]), s.stopIfTrue)) break;
+			}) && (ye(a, s.dxfId == null ? null : i[s.dxfId]), s.stopIfTrue)) break;
 			continue;
 		}
 		if (s.type === "cellIs") {
-			let t = s.formulas.map(ge), n = de(e), r = !1;
-			c != null && t.every((e) => e.num != null) ? r = he(c, s.operator, t.map((e) => e.num)) : n != null && t.every((e) => e.text != null) && (r = _e(n, s.operator, t.map((e) => e.text))), r && be(a, s.dxfId == null ? null : i[s.dxfId]);
+			let t = s.formulas.map(he), n = G(e), r = !1;
+			c != null && t.every((e) => e.num != null) ? r = me(c, s.operator, t.map((e) => e.num)) : n != null && t.every((e) => e.text != null) && (r = ge(n, s.operator, t.map((e) => e.text))), r && ye(a, s.dxfId == null ? null : i[s.dxfId]);
 		} else if (s.type === "top10") {
 			if (c == null || o.top10Threshold == null) continue;
-			(o.top10IsTop ? c >= o.top10Threshold : c <= o.top10Threshold) && be(a, s.dxfId == null ? null : i[s.dxfId]);
+			(o.top10IsTop ? c >= o.top10Threshold : c <= o.top10Threshold) && ye(a, s.dxfId == null ? null : i[s.dxfId]);
 		} else if (s.type === "aboveAverage") {
 			if (c == null || o.avgValue == null) continue;
-			(o.avgIsAbove ? c > o.avgValue : c < o.avgValue) && be(a, s.dxfId == null ? null : i[s.dxfId]);
+			(o.avgIsAbove ? c > o.avgValue : c < o.avgValue) && ye(a, s.dxfId == null ? null : i[s.dxfId]);
 		} else if (s.type === "iconSet") {
 			if (c == null || !o.iconThresholds?.length) continue;
 			let e = o.iconThresholds, t = e.length, n = 0;
@@ -844,7 +844,7 @@ function xe(e, t, n, r, i) {
 			};
 		} else if (s.type === "colorScale") {
 			if (c == null || !o.scaleStops || a.fill) continue;
-			let e = ye(c, s.stops, o.scaleStops);
+			let e = ve(c, s.stops, o.scaleStops);
 			a.fill = {
 				patternType: "solid",
 				fgColor: e,
@@ -862,37 +862,37 @@ function xe(e, t, n, r, i) {
 	}
 	return a;
 }
-function K(e) {
+function q(e) {
 	return Array.isArray(e) ? e : [e];
 }
-function q(e) {
+function J(e) {
 	return Array.isArray(e) ? e[0] ?? 0 : e;
 }
-var Se = 8;
-function Ce(e, t) {
+var xe = 8;
+function Se(e, t) {
 	try {
-		return we(Ae(e, t));
+		return Ce(ke(e, t));
 	} catch {
 		return !1;
 	}
 }
-function we(e) {
-	let t = q(e);
+function Ce(e) {
+	let t = J(e);
 	return typeof t == "boolean" ? t : typeof t == "number" ? t !== 0 : typeof t == "string" ? t.length > 0 && t.toUpperCase() !== "FALSE" : !1;
 }
-function J(e) {
-	let t = q(e);
+function Y(e) {
+	let t = J(e);
 	if (typeof t == "number") return t;
 	if (typeof t == "boolean") return +!!t;
 	if (t == null) return 0;
 	let n = parseFloat(String(t));
 	return isNaN(n) ? 0 : n;
 }
-function Y(e) {
-	let t = q(e);
+function X(e) {
+	let t = J(e);
 	return t == null ? "" : typeof t == "boolean" ? t ? "TRUE" : "FALSE" : String(t);
 }
-var Te = new Set([
+var we = new Set([
 	"<",
 	">",
 	"=",
@@ -904,7 +904,7 @@ var Te = new Set([
 	"^",
 	"%"
 ]);
-function Ee(e) {
+function Te(e) {
 	let t = [], n = 0, r = e;
 	for (; n < r.length;) {
 		let e = r[n];
@@ -965,7 +965,7 @@ function Ee(e) {
 			}), n = e;
 			continue;
 		}
-		if (Te.has(e)) {
+		if (we.has(e)) {
 			(e === "<" || e === ">") && (r[n + 1] === "=" || e === "<" && r[n + 1] === ">") ? (t.push({
 				kind: "op",
 				text: r.slice(n, n + 2)
@@ -975,12 +975,12 @@ function Ee(e) {
 			}), n++);
 			continue;
 		}
-		if (e === "$" || De(e)) {
+		if (e === "$" || Ee(e)) {
 			let e = n;
-			for (; e < r.length && (r[e] === "$" || Oe(r[e]));) e++;
+			for (; e < r.length && (r[e] === "$" || De(r[e]));) e++;
 			let i = r.slice(n, e);
 			n = e;
-			let a = ke(i);
+			let a = Oe(i);
 			if (a) t.push({
 				kind: "ref",
 				text: i,
@@ -1002,13 +1002,13 @@ function Ee(e) {
 	}
 	return t;
 }
-function De(e) {
+function Ee(e) {
 	return e >= "A" && e <= "Z" || e >= "a" && e <= "z" || e === "_";
 }
-function Oe(e) {
-	return De(e) || e >= "0" && e <= "9" || e === ".";
+function De(e) {
+	return Ee(e) || e >= "0" && e <= "9" || e === ".";
 }
-function ke(e) {
+function Oe(e) {
 	let t = 0, n = !1, r = !1;
 	e[t] === "$" && (n = !0, t++);
 	let i = t;
@@ -1028,43 +1028,43 @@ function ke(e) {
 		row: s
 	};
 }
-function Ae(e, t) {
-	return Me({
-		toks: Ee(e),
+function ke(e, t) {
+	return je({
+		toks: Te(e),
 		pos: 0
 	}, t);
 }
-function je(e) {
+function Ae(e) {
 	return e.toks[e.pos];
 }
-function X(e) {
+function Z(e) {
 	return e.toks[e.pos++];
 }
-function Me(e, t) {
-	return Ne(e, t);
+function je(e, t) {
+	return Me(e, t);
 }
-function Ne(e, t) {
-	let n = Pe(e, t), r = je(e);
+function Me(e, t) {
+	let n = Ne(e, t), r = Ae(e);
 	if (r && r.kind === "op" && (r.text === "<" || r.text === ">" || r.text === "<=" || r.text === ">=" || r.text === "=" || r.text === "<>")) {
-		X(e);
-		let i = Pe(e, t);
-		return Fe(r.text, n, i);
+		Z(e);
+		let i = Ne(e, t);
+		return Pe(r.text, n, i);
 	}
 	return n;
 }
-function Pe(e, t) {
-	let n = Ie(e, t);
+function Ne(e, t) {
+	let n = Fe(e, t);
 	for (;;) {
-		let r = je(e);
+		let r = Ae(e);
 		if (!r || r.kind !== "op" || r.text !== "&") break;
-		X(e);
-		let i = Ie(e, t);
-		n = Y(n) + Y(i);
+		Z(e);
+		let i = Fe(e, t);
+		n = X(n) + X(i);
 	}
 	return n;
 }
-function Fe(e, t, n) {
-	let r = typeof t == "string" && isNaN(parseFloat(t)) ? null : J(t), i = typeof n == "string" && isNaN(parseFloat(n)) ? null : J(n);
+function Pe(e, t, n) {
+	let r = typeof t == "string" && isNaN(parseFloat(t)) ? null : Y(t), i = typeof n == "string" && isNaN(parseFloat(n)) ? null : Y(n);
 	if (r !== null && i !== null) switch (e) {
 		case "<": return r < i;
 		case ">": return r > i;
@@ -1084,67 +1084,67 @@ function Fe(e, t, n) {
 	}
 	return !1;
 }
-function Ie(e, t) {
-	let n = Le(e, t);
+function Fe(e, t) {
+	let n = Ie(e, t);
 	for (;;) {
-		let r = je(e);
+		let r = Ae(e);
 		if (!r || r.kind !== "op" || r.text !== "+" && r.text !== "-") break;
-		X(e);
-		let i = Le(e, t);
-		n = r.text === "+" ? J(n) + J(i) : J(n) - J(i);
+		Z(e);
+		let i = Ie(e, t);
+		n = r.text === "+" ? Y(n) + Y(i) : Y(n) - Y(i);
 	}
 	return n;
 }
-function Le(e, t) {
-	let n = Re(e, t);
+function Ie(e, t) {
+	let n = Le(e, t);
 	for (;;) {
-		let r = je(e);
+		let r = Ae(e);
 		if (!r || r.kind !== "op" || r.text !== "*" && r.text !== "/") break;
-		X(e);
-		let i = Re(e, t);
-		if (r.text === "*") n = J(n) * J(i);
+		Z(e);
+		let i = Le(e, t);
+		if (r.text === "*") n = Y(n) * Y(i);
 		else {
-			let e = J(i);
-			n = e === 0 ? 0 : J(n) / e;
+			let e = Y(i);
+			n = e === 0 ? 0 : Y(n) / e;
 		}
 	}
 	return n;
 }
-function Re(e, t) {
-	let n = je(e);
-	return n && n.kind === "op" && n.text === "-" ? (X(e), -J(Re(e, t))) : n && n.kind === "op" && n.text === "+" ? (X(e), J(Re(e, t))) : ze(e, t);
+function Le(e, t) {
+	let n = Ae(e);
+	return n && n.kind === "op" && n.text === "-" ? (Z(e), -Y(Le(e, t))) : n && n.kind === "op" && n.text === "+" ? (Z(e), Y(Le(e, t))) : Re(e, t);
 }
-function ze(e, t) {
-	let n = X(e);
+function Re(e, t) {
+	let n = Z(e);
 	if (!n) return 0;
 	if (n.kind === "num") return parseFloat(n.text);
 	if (n.kind === "str") return n.text;
 	if (n.kind === "bool") return n.text === "TRUE";
 	if (n.kind === "lparen") {
-		let n = Me(e, t), r = X(e);
+		let n = je(e, t), r = Z(e);
 		if (!r || r.kind !== "rparen") throw Error("missing )");
 		return n;
 	}
 	if (n.kind === "ref") {
-		if (je(e)?.kind === "colon") {
-			X(e);
-			let r = X(e);
+		if (Ae(e)?.kind === "colon") {
+			Z(e);
+			let r = Z(e);
 			if (r?.kind !== "ref" || !r.ref) throw Error("range: expected ref after :");
-			return He(n.ref, r.ref, t);
+			return Ve(n.ref, r.ref, t);
 		}
-		return Ve(n.ref, t);
+		return Be(n.ref, t);
 	}
 	if (n.kind === "name") {
-		if (je(e)?.kind === "lparen") {
-			X(e);
+		if (Ae(e)?.kind === "lparen") {
+			Z(e);
 			let r = [];
-			if (je(e)?.kind !== "rparen") for (r.push(Me(e, t)); je(e)?.kind === "comma";) X(e), r.push(Me(e, t));
-			let i = X(e);
+			if (Ae(e)?.kind !== "rparen") for (r.push(je(e, t)); Ae(e)?.kind === "comma";) Z(e), r.push(je(e, t));
+			let i = Z(e);
 			if (!i || i.kind !== "rparen") throw Error("missing )");
-			return We(n.text, r, t);
+			return Ue(n.text, r, t);
 		}
 		let r = t.definedNames.get(n.text);
-		return r && t.depth < Se ? Ae(Be(r.formula), {
+		return r && t.depth < xe ? ke(ze(r.formula), {
 			...t,
 			anchorRow: 1,
 			anchorCol: 1,
@@ -1153,20 +1153,20 @@ function ze(e, t) {
 	}
 	return 0;
 }
-function Be(e) {
+function ze(e) {
 	let t = e.match(/^(?:'[^']*'|[A-Za-z_][A-Za-z0-9_.]*)!(.*)$/);
 	return t ? t[1] : e;
 }
-function Ve(e, t) {
+function Be(e, t) {
 	let n = e.colAbs ? e.col : e.col + (t.col - t.anchorCol), r = e.rowAbs ? e.row : e.row + (t.row - t.anchorRow);
-	return Ue(t.cellIndex.get(`${r}:${n}`));
+	return He(t.cellIndex.get(`${r}:${n}`));
 }
-function He(e, t, n) {
+function Ve(e, t, n) {
 	let r = e.colAbs ? e.col : e.col + (n.col - n.anchorCol), i = e.rowAbs ? e.row : e.row + (n.row - n.anchorRow), a = t.colAbs ? t.col : t.col + (n.col - n.anchorCol), o = t.rowAbs ? t.row : t.row + (n.row - n.anchorRow), s = Math.min(r, a), c = Math.max(r, a), l = Math.min(i, o), u = Math.max(i, o), d = [], f = 4096;
-	for (let e = l; e <= u && d.length < f; e++) for (let t = s; t <= c && d.length < f; t++) d.push(Ue(n.cellIndex.get(`${e}:${t}`)));
+	for (let e = l; e <= u && d.length < f; e++) for (let t = s; t <= c && d.length < f; t++) d.push(He(n.cellIndex.get(`${e}:${t}`)));
 	return d;
 }
-function Ue(e) {
+function He(e) {
 	if (!e) return null;
 	switch (e.value.type) {
 		case "number": return e.value.number;
@@ -1176,162 +1176,162 @@ function Ue(e) {
 		default: return null;
 	}
 }
-function We(e, t, n) {
+function Ue(e, t, n) {
 	switch (e.toUpperCase()) {
-		case "AND": return t.flatMap(K).every((e) => we(e));
-		case "OR": return t.flatMap(K).some((e) => we(e));
-		case "NOT": return !we(t[0]);
-		case "IF": return we(t[0]) ? t[1] ?? !0 : t[2] ?? !1;
+		case "AND": return t.flatMap(q).every((e) => Ce(e));
+		case "OR": return t.flatMap(q).some((e) => Ce(e));
+		case "NOT": return !Ce(t[0]);
+		case "IF": return Ce(t[0]) ? t[1] ?? !0 : t[2] ?? !1;
 		case "IFERROR": return t[0] == null ? t[1] ?? 0 : t[0];
 		case "IFS":
-			for (let e = 0; e + 1 < t.length; e += 2) if (we(t[e])) return t[e + 1];
+			for (let e = 0; e + 1 < t.length; e += 2) if (Ce(t[e])) return t[e + 1];
 			return null;
 		case "TRUE": return !0;
 		case "FALSE": return !1;
 		case "ISBLANK": {
-			let e = q(t[0]);
+			let e = J(t[0]);
 			return e == null || e === "";
 		}
-		case "ISNUMBER": return typeof q(t[0]) == "number";
-		case "ISTEXT": return typeof q(t[0]) == "string";
-		case "ISNONTEXT": return typeof q(t[0]) != "string";
+		case "ISNUMBER": return typeof J(t[0]) == "number";
+		case "ISTEXT": return typeof J(t[0]) == "string";
+		case "ISNONTEXT": return typeof J(t[0]) != "string";
 		case "ISERROR":
 		case "ISERR":
-		case "ISNA": return q(t[0]) == null;
-		case "ISLOGICAL": return typeof q(t[0]) == "boolean";
+		case "ISNA": return J(t[0]) == null;
+		case "ISLOGICAL": return typeof J(t[0]) == "boolean";
 		case "ROUNDDOWN": {
-			let e = J(t[0]), n = 10 ** J(t[1]);
+			let e = Y(t[0]), n = 10 ** Y(t[1]);
 			return (e >= 0 ? Math.floor(e * n) : Math.ceil(e * n)) / n;
 		}
 		case "ROUNDUP": {
-			let e = J(t[0]), n = 10 ** J(t[1]);
+			let e = Y(t[0]), n = 10 ** Y(t[1]);
 			return (e >= 0 ? Math.ceil(e * n) : Math.floor(e * n)) / n;
 		}
 		case "ROUND": {
-			let e = J(t[0]), n = 10 ** J(t[1]);
+			let e = Y(t[0]), n = 10 ** Y(t[1]);
 			return Math.round(e * n) / n;
 		}
-		case "INT": return Math.floor(J(t[0]));
+		case "INT": return Math.floor(Y(t[0]));
 		case "TRUNC": {
-			let e = J(t[0]), n = 10 ** J(t[1] ?? 0);
+			let e = Y(t[0]), n = 10 ** Y(t[1] ?? 0);
 			return (e >= 0 ? Math.floor(e * n) : Math.ceil(e * n)) / n;
 		}
 		case "CEILING": {
-			let e = J(t[0]), n = J(t[1] ?? 1);
+			let e = Y(t[0]), n = Y(t[1] ?? 1);
 			return n === 0 ? 0 : Math.ceil(e / n) * n;
 		}
 		case "FLOOR": {
-			let e = J(t[0]), n = J(t[1] ?? 1);
+			let e = Y(t[0]), n = Y(t[1] ?? 1);
 			return n === 0 ? 0 : Math.floor(e / n) * n;
 		}
 		case "MOD": {
-			let e = J(t[0]), n = J(t[1]);
+			let e = Y(t[0]), n = Y(t[1]);
 			return n === 0 ? null : e - Math.floor(e / n) * n;
 		}
-		case "POWER": return J(t[0]) ** +J(t[1]);
+		case "POWER": return Y(t[0]) ** +Y(t[1]);
 		case "SQRT": {
-			let e = J(t[0]);
+			let e = Y(t[0]);
 			return e < 0 ? null : Math.sqrt(e);
 		}
-		case "ABS": return Math.abs(J(t[0]));
+		case "ABS": return Math.abs(Y(t[0]));
 		case "SIGN": {
-			let e = J(t[0]);
+			let e = Y(t[0]);
 			return e > 0 ? 1 : e < 0 ? -1 : 0;
 		}
-		case "EXP": return Math.exp(J(t[0]));
+		case "EXP": return Math.exp(Y(t[0]));
 		case "LN": {
-			let e = J(t[0]);
+			let e = Y(t[0]);
 			return e <= 0 ? null : Math.log(e);
 		}
 		case "LOG10": {
-			let e = J(t[0]);
+			let e = Y(t[0]);
 			return e <= 0 ? null : Math.log10(e);
 		}
 		case "MIN": {
-			let e = t.flatMap(K).filter((e) => typeof e == "number");
+			let e = t.flatMap(q).filter((e) => typeof e == "number");
 			return e.length ? Math.min(...e) : 0;
 		}
 		case "MAX": {
-			let e = t.flatMap(K).filter((e) => typeof e == "number");
+			let e = t.flatMap(q).filter((e) => typeof e == "number");
 			return e.length ? Math.max(...e) : 0;
 		}
-		case "SUM": return t.flatMap(K).reduce((e, t) => e + (typeof t == "number" ? t : 0), 0);
+		case "SUM": return t.flatMap(q).reduce((e, t) => e + (typeof t == "number" ? t : 0), 0);
 		case "AVERAGE": {
-			let e = t.flatMap(K).filter((e) => typeof e == "number");
+			let e = t.flatMap(q).filter((e) => typeof e == "number");
 			return e.length ? e.reduce((e, t) => e + t, 0) / e.length : null;
 		}
-		case "COUNT": return t.flatMap(K).filter((e) => typeof e == "number").length;
-		case "COUNTA": return t.flatMap(K).filter((e) => e != null && e !== "").length;
-		case "COUNTBLANK": return t.flatMap(K).filter((e) => e == null || e === "").length;
-		case "COUNTIF": return Ge(K(t[0]), t[1]);
-		case "SUMIF": return Ke(K(t[0]), t[1], t[2] === void 0 ? null : K(t[2]));
+		case "COUNT": return t.flatMap(q).filter((e) => typeof e == "number").length;
+		case "COUNTA": return t.flatMap(q).filter((e) => e != null && e !== "").length;
+		case "COUNTBLANK": return t.flatMap(q).filter((e) => e == null || e === "").length;
+		case "COUNTIF": return We(q(t[0]), t[1]);
+		case "SUMIF": return Ge(q(t[0]), t[1], t[2] === void 0 ? null : q(t[2]));
 		case "AVERAGEIF": {
-			let e = K(t[0]), n = Ke(e, t[1], t[2] === void 0 ? null : K(t[2])), r = Ge(e, t[1]);
-			return r === 0 ? null : J(n) / r;
+			let e = q(t[0]), n = Ge(e, t[1], t[2] === void 0 ? null : q(t[2])), r = We(e, t[1]);
+			return r === 0 ? null : Y(n) / r;
 		}
-		case "LEN": return Y(t[0]).length;
-		case "LEFT": return Y(t[0]).slice(0, Math.max(0, J(t[1] ?? 1)));
+		case "LEN": return X(t[0]).length;
+		case "LEFT": return X(t[0]).slice(0, Math.max(0, Y(t[1] ?? 1)));
 		case "RIGHT": {
-			let e = Y(t[0]), n = Math.max(0, J(t[1] ?? 1));
+			let e = X(t[0]), n = Math.max(0, Y(t[1] ?? 1));
 			return n >= e.length ? e : e.slice(e.length - n);
 		}
 		case "MID": {
-			let e = Y(t[0]), n = Math.max(1, J(t[1])) - 1, r = Math.max(0, J(t[2]));
+			let e = X(t[0]), n = Math.max(1, Y(t[1])) - 1, r = Math.max(0, Y(t[2]));
 			return e.slice(n, n + r);
 		}
-		case "UPPER": return Y(t[0]).toUpperCase();
-		case "LOWER": return Y(t[0]).toLowerCase();
-		case "TRIM": return Y(t[0]).replace(/\s+/g, " ").trim();
-		case "EXACT": return Y(t[0]) === Y(t[1]);
+		case "UPPER": return X(t[0]).toUpperCase();
+		case "LOWER": return X(t[0]).toLowerCase();
+		case "TRIM": return X(t[0]).replace(/\s+/g, " ").trim();
+		case "EXACT": return X(t[0]) === X(t[1]);
 		case "FIND": {
-			let e = Y(t[0]), n = Y(t[1]), r = Math.max(1, J(t[2] ?? 1)) - 1, i = n.indexOf(e, r);
+			let e = X(t[0]), n = X(t[1]), r = Math.max(1, Y(t[2] ?? 1)) - 1, i = n.indexOf(e, r);
 			return i < 0 ? null : i + 1;
 		}
 		case "SEARCH": {
-			let e = Y(t[0]).toLowerCase(), n = Y(t[1]).toLowerCase(), r = Math.max(1, J(t[2] ?? 1)) - 1, i = n.indexOf(e, r);
+			let e = X(t[0]).toLowerCase(), n = X(t[1]).toLowerCase(), r = Math.max(1, Y(t[2] ?? 1)) - 1, i = n.indexOf(e, r);
 			return i < 0 ? null : i + 1;
 		}
 		case "CONCATENATE":
-		case "CONCAT": return t.flatMap(K).map((e) => e == null ? "" : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : String(e)).join("");
+		case "CONCAT": return t.flatMap(q).map((e) => e == null ? "" : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : String(e)).join("");
 		case "T": {
-			let e = q(t[0]);
+			let e = J(t[0]);
 			return typeof e == "string" ? e : "";
 		}
 		case "N": {
-			let e = q(t[0]);
+			let e = J(t[0]);
 			return typeof e == "number" ? e : typeof e == "boolean" ? +!!e : 0;
 		}
-		case "VALUE": return J(t[0]);
+		case "VALUE": return Y(t[0]);
 		case "ROW": return n.row;
 		case "COLUMN": return n.col;
-		case "TODAY": return Xe();
-		case "NOW": return Ze();
-		case "DATE": return Qe(J(t[0]), J(t[1]), J(t[2]));
-		case "YEAR": return et(J(t[0])).y;
-		case "MONTH": return et(J(t[0])).m;
-		case "DAY": return et(J(t[0])).d;
+		case "TODAY": return Ye();
+		case "NOW": return Xe();
+		case "DATE": return Ze(Y(t[0]), Y(t[1]), Y(t[2]));
+		case "YEAR": return $e(Y(t[0])).y;
+		case "MONTH": return $e(Y(t[0])).m;
+		case "DAY": return $e(Y(t[0])).d;
 		case "WEEKDAY": {
-			let e = $e(J(t[0])).getUTCDay(), n = J(t[1] ?? 1);
+			let e = Qe(Y(t[0])).getUTCDay(), n = Y(t[1] ?? 1);
 			return n === 2 ? e === 0 ? 7 : e : n === 3 ? e === 0 ? 6 : e - 1 : e + 1;
 		}
 		default: return 0;
 	}
 }
-function Ge(e, t) {
-	let n = qe(t), r = 0;
+function We(e, t) {
+	let n = Ke(t), r = 0;
 	for (let t of e) n(t) && r++;
 	return r;
 }
-function Ke(e, t, n) {
-	let r = qe(t), i = n ?? e, a = 0;
+function Ge(e, t, n) {
+	let r = Ke(t), i = n ?? e, a = 0;
 	for (let t = 0; t < e.length; t++) if (r(e[t])) {
 		let e = i[t];
 		typeof e == "number" && (a += e);
 	}
 	return a;
 }
-function qe(e) {
-	let t = q(e);
+function Ke(e) {
+	let t = J(e);
 	if (typeof t != "string") {
 		let e = typeof t == "number" ? t : null;
 		return (n) => e !== null && typeof n == "number" ? n === e : n === t;
@@ -1357,62 +1357,62 @@ function qe(e) {
 		}
 	};
 }
-var Je = 25569, Ye = 864e5;
-function Xe() {
+var qe = 25569, Je = 864e5;
+function Ye() {
 	let e = /* @__PURE__ */ new Date(), t = Date.UTC(e.getFullYear(), e.getMonth(), e.getDate());
-	return Math.floor(t / Ye) + Je;
+	return Math.floor(t / Je) + qe;
 }
-function Ze() {
-	return Date.now() / Ye + Je;
+function Xe() {
+	return Date.now() / Je + qe;
 }
-function Qe(e, t, n) {
+function Ze(e, t, n) {
 	let r = Date.UTC(e, t - 1, n);
-	return Math.floor(r / Ye) + Je;
+	return Math.floor(r / Je) + qe;
 }
-function $e(e) {
-	let t = (Math.floor(e) - Je) * Ye;
+function Qe(e) {
+	let t = (Math.floor(e) - qe) * Je;
 	return new Date(t);
 }
-function et(e) {
-	let t = $e(e);
+function $e(e) {
+	let t = Qe(e);
 	return {
 		y: t.getUTCFullYear(),
 		m: t.getUTCMonth() + 1,
 		d: t.getUTCDate()
 	};
 }
-var tt = [
+var et = [
 	"#FF0000",
 	"#FFFF00",
 	"#00B050"
-], nt = [
+], tt = [
 	"#FF0000",
 	"#FF6600",
 	"#FFFF00",
 	"#00B050"
-], rt = [
+], nt = [
 	"#FF0000",
 	"#FF6600",
 	"#FFFF00",
 	"#92D050",
 	"#00B050"
 ];
-function it(e, t, n, r, i, a) {
+function rt(e, t, n, r, i, a) {
 	if (t === "NoIcons") return;
-	let o = t || "3TrafficLights1", s = parseInt(o[0]) || 3, c = s === 5 ? rt : s === 4 ? nt : tt, l = c[Math.max(0, Math.min(n, c.length - 1))];
+	let o = t || "3TrafficLights1", s = parseInt(o[0]) || 3, c = s === 5 ? nt : s === 4 ? tt : et, l = c[Math.max(0, Math.min(n, c.length - 1))];
 	if (e.save(), e.fillStyle = l, o.includes("Arrow")) {
 		let t = a / 2;
 		e.beginPath(), n === s - 1 ? (e.moveTo(r + t, i), e.lineTo(r + a, i + a), e.lineTo(r, i + a)) : n === 0 ? (e.moveTo(r, i), e.lineTo(r + a, i), e.lineTo(r + t, i + a)) : (e.moveTo(r, i + a * .3), e.lineTo(r + a, i + t), e.lineTo(r, i + a * .7)), e.closePath(), e.fill();
 	} else o.includes("Flag") ? (e.beginPath(), e.moveTo(r, i), e.lineTo(r + a, i), e.lineTo(r, i + a), e.closePath(), e.fill()) : (e.beginPath(), e.arc(r + a / 2, i + a / 2, a / 2, 0, Math.PI * 2), e.fill());
 	e.restore();
 }
-function at(e, t, n, r, i) {
+function it(e, t, n, r, i) {
 	let a = Math.max(6, Math.round(Math.min(r, i) * .45)), o = t + r - a - 1, s = n + i - a - 1;
 	e.save(), e.fillStyle = "#D0D0D0", e.fillRect(o, s, a, a), e.fillStyle = "#444444";
 	let c = a * .55, l = o + (a - c) / 2, u = s + (a - c * .5) / 2;
 	e.beginPath(), e.moveTo(l, u), e.lineTo(l + c, u), e.lineTo(l + c / 2, u + c * .5), e.closePath(), e.fill(), e.restore();
 }
-function ot(e) {
+function at(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e.tables ?? []) {
 		let e = n.accentColor || "#808080", r = Math.max(0, n.headerRowCount ?? 1), i = Math.max(0, n.totalsRowCount ?? 0), { top: a, bottom: o, left: s, right: c } = n.range, l = a + r - 1, u = o - i + 1;
@@ -1434,7 +1434,7 @@ function ot(e) {
 	}
 	return t;
 }
-function st(e) {
+function ot(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e.sparklineGroups ?? []) {
 		let e = Infinity, r = -Infinity;
@@ -1471,27 +1471,27 @@ function st(e) {
 	}
 	return t;
 }
-function ct(e) {
+function st(e) {
 	let t = e.replace("#", "");
 	if (t.length < 6) return "#F2F2F2";
 	let n = parseInt(t.slice(0, 2), 16), r = parseInt(t.slice(2, 4), 16), i = parseInt(t.slice(4, 6), 16), a = (e) => Math.round(e * .2 + 255 * .8), o = (e) => e.toString(16).padStart(2, "0").toUpperCase();
 	return `#${o(a(n))}${o(a(r))}${o(a(i))}`;
 }
-function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
+function ct(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 	if (p <= 0 || h <= 0) return;
-	let { styles: x, cellMap: w, mergeAnchorMap: A, mergeSkipSet: j, cfContext: te, cs: ne, dpr: M } = t, re = a.length, N = o.length, P = [], F = -s;
-	for (let e = 0; e < re; e++) P.push(F), F += a[e];
+	let { styles: x, cellMap: w, mergeAnchorMap: A, mergeSkipSet: j, cfContext: te, cs: ne, dpr: M } = t, N = a.length, P = o.length, re = [], F = -s;
+	for (let e = 0; e < N; e++) re.push(F), F += a[e];
 	let I = [], L = -c;
-	for (let e = 0; e < N; e++) I.push(L), L += o[e];
+	for (let e = 0; e < P; e++) I.push(L), L += o[e];
 	e.save(), e.beginPath(), e.rect(d, f, p, h), e.clip();
 	let R = [];
 	for (let r of t.worksheet.mergeCells ?? []) {
 		let a = r.top, o = r.left;
-		if (a >= n && a < n + N && o >= i && o < i + re || r.bottom < n || r.top >= n + N || r.right < i || r.left >= i + re) continue;
+		if (a >= n && a < n + P && o >= i && o < i + N || r.bottom < n || r.top >= n + P || r.right < i || r.left >= i + N) continue;
 		let d = t.mergeAnchorMap.get(`${a}:${o}`);
 		if (!d) continue;
 		let f;
-		if (o >= i) f = l + P[o - i];
+		if (o >= i) f = l + re[o - i];
 		else {
 			let e = 0;
 			for (let n = o; n < i; n++) e += Math.round(g(t.worksheet.colWidths[n] ?? t.worksheet.defaultColWidth) * ne);
@@ -1504,7 +1504,7 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 			for (let r = a; r < n; r++) e += Math.round(_(t.worksheet.rowHeights[r] ?? t.worksheet.defaultRowHeight) * ne);
 			p = u - c - e;
 		}
-		let h = d.totalW, b = d.totalH, S = `${a}:${o}`, C = t.cellMap.get(S), { font: w, fill: T, border: E, xf: O } = k(x, C?.styleIndex ?? 0), A = xe(C, a, o, te, x.dxfs ?? []), j = A.fill ?? T;
+		let h = d.totalW, b = d.totalH, S = `${a}:${o}`, C = t.cellMap.get(S), { font: w, fill: T, border: E, xf: O } = k(x, C?.styleIndex ?? 0), A = be(C, a, o, te, x.dxfs ?? []), j = A.fill ?? T;
 		if (j.patternType !== "none" && j.patternType !== "" && j.fgColor && (e.fillStyle = v(j.fgColor), e.fillRect(f, p, h, b)), A.dataBar && A.dataBar.ratio > 0) {
 			let t = Math.max(0, (h - 4) * A.dataBar.ratio);
 			y(e, A.dataBar.color, f + 2, p + 2, t, b - 4, A.dataBar.gradient);
@@ -1522,47 +1522,69 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 		} : w, ne);
 		let ie = t.hyperlinkMap.get(S) ? "#0563C1" : A.fontColor ?? w.color;
 		e.fillStyle = ie ? v(ie) : "#000000";
-		let ae = C.value.type === "number", B = O.alignH ?? (ae ? "right" : "left"), V = O.alignV ?? "bottom", H = O.indent ? Math.round(O.indent * w.size * m * .5) : 0, U = 3 + (B === "left" || !O.alignH ? H : 0);
+		let B = C.value.type === "number", ae = O.alignH ?? (B ? "right" : "left"), oe = O.alignV ?? "bottom", V = O.indent ? Math.round(O.indent * w.size * m * .5) : 0, H = 3 + (ae === "left" || !O.alignH ? V : 0);
 		e.save(), e.beginPath(), e.rect(f, p, h, b), e.clip();
-		let oe;
-		B === "right" ? (oe = f + h - 3, e.textAlign = "right") : B === "center" ? (oe = f + h / 2, e.textAlign = "center") : (oe = f + U, e.textAlign = "left");
-		let W;
-		V === "top" ? (e.textBaseline = "top", W = p + 2) : V === "center" ? (e.textBaseline = "middle", W = p + b / 2) : (e.textBaseline = "bottom", W = p + b - 2), e.fillText(M, oe, W), e.restore();
+		let se;
+		ae === "right" ? (se = f + h - 3, e.textAlign = "right") : ae === "center" ? (se = f + h / 2, e.textAlign = "center") : (se = f + H, e.textAlign = "left");
+		let U;
+		oe === "top" ? (e.textBaseline = "top", U = p + 2) : oe === "center" ? (e.textBaseline = "middle", U = p + b / 2) : (e.textBaseline = "bottom", U = p + b - 2), e.fillText(M, se, U), e.restore();
 	}
-	for (let s = 0; s < N; s++) {
+	for (let s = 0; s < P; s++) {
 		let c = n + s, g = u + I[s], _ = o[s];
-		if (!(g + _ <= f || g >= f + h)) for (let n = 0; n < re; n++) {
-			let o = i + n, u = l + P[n], f = a[n];
+		if (g + _ <= f || g >= f + h) continue;
+		let P = /* @__PURE__ */ new Set(), F = /* @__PURE__ */ new Set(), L = -1;
+		for (let e = 0; e <= N; e++) {
+			let t = !1;
+			if (e < N) {
+				let n = `${c}:${i + e}`;
+				!j.has(n) && !A.has(n) && (t = k(x, w.get(n)?.styleIndex ?? 0).xf.alignH === "centerContinuous");
+			}
+			if (t) L < 0 && (L = e);
+			else {
+				if (L >= 0 && e - L >= 2) {
+					for (let t = L; t < e - 1; t++) P.add(t);
+					for (let t = L + 1; t < e; t++) F.add(t);
+				}
+				L = -1;
+			}
+		}
+		for (let n = 0; n < N; n++) {
+			let o = i + n, u = l + re[n], f = a[n];
 			if (u + f <= d || u >= d + p) continue;
 			let h = `${c}:${o}`;
 			if (j.has(h)) continue;
-			let N = A.get(h), F = N ? N.totalW : f, I = N ? N.totalH : _, L = w.get(h), { font: z, fill: ie, border: ae, xf: B } = k(x, L?.styleIndex ?? 0), V = xe(L, c, o, te, x.dxfs ?? []), H = V.fill ?? ie, U = t.tableStyleMap.get(h), W = U?.wholeTableDxf == null ? void 0 : (x.dxfs ?? [])[U.wholeTableDxf], se = U?.headerRowDxf == null ? void 0 : (x.dxfs ?? [])[U.headerRowDxf];
-			if (H.gradient && H.gradient.stops.length > 0) e.fillStyle = C(e, H.gradient, u, g, F, I), e.fillRect(u, g, F, I);
-			else if (H.patternType && H.patternType !== "none" && H.fgColor) {
-				let t = H.patternType, n = H.bgColor ?? "FFFFFF", r = S(e, t, H.fgColor, n);
+			let I = A.get(h), L = I ? I.totalW : f, z = I ? I.totalH : _, ie = w.get(h), { font: B, fill: ae, border: oe, xf: V } = k(x, ie?.styleIndex ?? 0), H = be(ie, c, o, te, x.dxfs ?? []), U = H.fill ?? ae, W = t.tableStyleMap.get(h), le = W?.wholeTableDxf == null ? void 0 : (x.dxfs ?? [])[W.wholeTableDxf], ue = W?.headerRowDxf == null ? void 0 : (x.dxfs ?? [])[W.headerRowDxf];
+			if (U.gradient && U.gradient.stops.length > 0) e.fillStyle = C(e, U.gradient, u, g, L, z), e.fillRect(u, g, L, z);
+			else if (U.patternType && U.patternType !== "none" && U.fgColor) {
+				let t = U.patternType, n = U.bgColor ?? "FFFFFF", r = S(e, t, U.fgColor, n);
 				if (r) e.fillStyle = r;
 				else {
 					let r = b(t);
-					e.fillStyle = r >= 1 ? v(H.fgColor) : E(H.fgColor, n, r);
+					e.fillStyle = r >= 1 ? v(U.fgColor) : E(U.fgColor, n, r);
 				}
-				e.fillRect(u, g, F, I);
-			} else U && U.isHeader && se?.fill?.fgColor ? (e.fillStyle = v(se.fill.fgColor), e.fillRect(u, g, F, I)) : U && !U.isHeader && !U.isTotals && W?.fill?.fgColor ? (e.fillStyle = v(W.fill.fgColor), e.fillRect(u, g, F, I)) : U && U.isBanded && (e.fillStyle = ct(U.accent), e.fillRect(u, g, F, I));
-			if (t.commentCells.has(h) && T(e, u, g, F, I), V.dataBar && V.dataBar.ratio > 0) {
-				let t = Math.max(0, (F - 4) * V.dataBar.ratio);
-				y(e, V.dataBar.color, u + 2, g + 2, t, I - 4, V.dataBar.gradient);
+				e.fillRect(u, g, L, z);
+			} else W && W.isHeader && ue?.fill?.fgColor ? (e.fillStyle = v(ue.fill.fgColor), e.fillRect(u, g, L, z)) : W && !W.isHeader && !W.isTotals && le?.fill?.fgColor ? (e.fillStyle = v(le.fill.fgColor), e.fillRect(u, g, L, z)) : W && W.isBanded && (e.fillStyle = st(W.accent), e.fillRect(u, g, L, z));
+			if (t.commentCells.has(h) && T(e, u, g, L, z), H.dataBar && H.dataBar.ratio > 0) {
+				let t = Math.max(0, (L - 4) * H.dataBar.ratio);
+				y(e, H.dataBar.color, u + 2, g + 2, t, z - 4, H.dataBar.gradient);
 			}
-			let le = t.sparklineMap.get(h);
-			if (le && r(e, {
+			let de = t.sparklineMap.get(h);
+			if (de && r(e, {
 				x: u,
 				y: g,
-				w: F,
-				h: I
-			}, le), t.worksheet.showGridlines !== !1) {
+				w: L,
+				h: z
+			}, de), t.worksheet.showGridlines !== !1) {
 				let t = .5 / M;
-				e.strokeStyle = "#d0d0d0", e.lineWidth = .5, e.beginPath(), e.moveTo(u + F + t, g), e.lineTo(u + F + t, g + I), e.moveTo(u, g + I + t), e.lineTo(u + F, g + I + t), s === 0 && (e.moveTo(u, g + t), e.lineTo(u + F, g + t)), n === 0 && (e.moveTo(u + t, g), e.lineTo(u + t, g + I)), e.stroke();
+				e.strokeStyle = "#d0d0d0", e.lineWidth = .5, e.beginPath(), P.has(n) || (e.moveTo(u + L + t, g), e.lineTo(u + L + t, g + z)), e.moveTo(u, g + z + t), e.lineTo(u + L, g + z + t), s === 0 && (e.moveTo(u, g + t), e.lineTo(u + L, g + t)), n === 0 && (e.moveTo(u + t, g), e.lineTo(u + t, g + z)), e.stroke();
 			}
-			if (vt(e, _t(N ? gt(ae, c, o, N.right, N.bottom, w, x) : ae, V.border), u, g, F, I), U) {
-				let t = W?.border?.horizontal, n = W?.border?.vertical, r = W?.border?.top, i = W?.border?.bottom, a = W?.border?.left, s = W?.border?.right, c = se?.border?.bottom, l = se?.border?.top;
+			let G = _t(I ? gt(oe, c, o, I.right, I.bottom, w, x) : oe, H.border);
+			if ((P.has(n) || F.has(n)) && (G = {
+				...G,
+				left: F.has(n) ? null : G.left,
+				right: P.has(n) ? null : G.right
+			}), vt(e, G, u, g, L, z), W) {
+				let t = le?.border?.horizontal, n = le?.border?.vertical, r = le?.border?.top, i = le?.border?.bottom, a = le?.border?.left, s = le?.border?.right, c = ue?.border?.bottom, l = ue?.border?.top;
 				if (t || n || r || i || a || s || c || l) {
 					let n = {
 						left: null,
@@ -1570,46 +1592,46 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 						top: null,
 						bottom: null
 					};
-					U.isTopEdge ? n.top = r ?? null : t && (n.top = t), U.isHeader && c ? n.bottom = c : U.isBottomEdge ? n.bottom = i ?? null : t && (n.bottom = t), (U.isFirstCol || o === 0) && (n.left = a ?? null), U.isLastCol && (n.right = s ?? null), vt(e, n, u, g, F, I);
+					W.isTopEdge ? n.top = r ?? null : t && (n.top = t), W.isHeader && c ? n.bottom = c : W.isBottomEdge ? n.bottom = i ?? null : t && (n.bottom = t), (W.isFirstCol || o === 0) && (n.left = a ?? null), W.isLastCol && (n.right = s ?? null), vt(e, n, u, g, L, z);
 				} else {
 					let t = .5 / M;
-					e.strokeStyle = U.accent, e.lineWidth = U.isHeader ? 1.5 : 1, e.beginPath(), e.moveTo(u, g + I - t), e.lineTo(u + F, g + I - t), U.isTopEdge && (e.moveTo(u, g + t), e.lineTo(u + F, g + t)), e.stroke();
+					e.strokeStyle = W.accent, e.lineWidth = W.isHeader ? 1.5 : 1, e.beginPath(), e.moveTo(u, g + z - t), e.lineTo(u + L, g + z - t), W.isTopEdge && (e.moveTo(u, g + t), e.lineTo(u + L, g + t)), e.stroke();
 				}
 			}
-			if (t.autoFilterCells.has(h) && at(e, u, g, f, I), !L) continue;
-			let G = ee(L, x, V.numFmt);
-			!G || G === "0" && t.worksheet.showZeros === !1 || R.push(() => {
-				let r = !!(U && (U.isHeader || U.isTotals)), s = z.bold || !!V.fontBold || r, l = z.italic || !!V.fontItalic, d = z.underline || !!V.fontUnderline, f = z.strike || !!V.fontStrike, p = s !== z.bold || l !== z.italic || d !== z.underline || f !== z.strike ? {
-					...z,
+			if (t.autoFilterCells.has(h) && it(e, u, g, f, z), !ie) continue;
+			let K = ee(ie, x, H.numFmt);
+			!K || K === "0" && t.worksheet.showZeros === !1 || R.push(() => {
+				let r = !!(W && (W.isHeader || W.isTotals)), s = B.bold || !!H.fontBold || r, l = B.italic || !!H.fontItalic, d = B.underline || !!H.fontUnderline, f = B.strike || !!H.fontStrike, p = s !== B.bold || l !== B.italic || d !== B.underline || f !== B.strike ? {
+					...B,
 					bold: s,
 					italic: l,
 					underline: d,
 					strike: f
-				} : z;
+				} : B;
 				e.font = D(p, ne);
-				let _ = t.hyperlinkMap.get(h), y = U?.isHeader && se?.font?.color ? se.font.color : U && !U.isHeader && !U.isTotals && W?.font?.color ? W.font.color : null, b = _ ? "#0563C1" : V.fontColor ?? y ?? z.color;
+				let _ = t.hyperlinkMap.get(h), y = W?.isHeader && ue?.font?.color ? ue.font.color : W && !W.isHeader && !W.isTotals && le?.font?.color ? le.font.color : null, b = _ ? "#0563C1" : H.fontColor ?? y ?? B.color;
 				e.fillStyle = b ? v(b) : "#000000";
-				let S = L.value.type === "number", C = B.alignH ?? (S ? "right" : "left"), T = B.alignV ?? "bottom", E = B.indent ? Math.round(B.indent * z.size * m * .5) : 0, ee = V.iconSet ? Math.max(8, Math.round(Math.min(F, I) * .55)) : 0, te = ee > 0 ? ee + 4 : 0, M = 3 + (C === "left" || !B.alignH ? E : 0) + te, P = F, R = u, ie = n;
-				if (C === "centerContinuous" && !N) for (let e = n + 1; e < re; e++) {
+				let S = ie.value.type === "number", C = V.alignH ?? (S ? "right" : "left"), T = V.alignV ?? "bottom", E = V.indent ? Math.round(V.indent * B.size * m * .5) : 0, ee = H.iconSet ? Math.max(8, Math.round(Math.min(L, z) * .55)) : 0, te = ee > 0 ? ee + 4 : 0, M = 3 + (C === "left" || !V.alignH ? E : 0) + te, P = L, re = u, F = n;
+				if (C === "centerContinuous" && !I) for (let e = n + 1; e < N; e++) {
 					let t = `${c}:${i + e}`;
 					if (j.has(t) || A.has(t)) break;
 					let n = w.get(t);
 					if (n && n.value.type !== "empty" || k(x, n?.styleIndex ?? 0).xf.alignH !== "centerContinuous") break;
-					P += a[e], ie = e;
+					P += a[e], F = e;
 				}
-				let ae = C === "centerContinuous" ? R : u, H = C === "centerContinuous" ? P : F, le = G.includes("\n");
-				if (!N && !B.wrapText && !B.textRotation && !S && !le) {
-					let t = e.measureText(G).width, r = C === "centerContinuous", o = r ? t + 6 : t + M + 3, s = r ? P : F;
+				let R = C === "centerContinuous" ? re : u, ae = C === "centerContinuous" ? P : L, oe = K.includes("\n");
+				if (!I && !V.wrapText && !V.textRotation && !S && !oe) {
+					let t = e.measureText(K).width, r = C === "centerContinuous", o = r ? t + 6 : t + M + 3, s = r ? P : L;
 					if (o > s) {
 						let e = o - s, t = 0, l = 0;
 						if (C === "right" ? l = e : C === "center" || r ? (l = e / 2, t = e / 2) : t = e, t > 0) {
-							let e = t, o = r ? ie + 1 : n + 1;
-							for (let t = o; t < re && e > 0; t++) {
+							let e = t, o = r ? F + 1 : n + 1;
+							for (let t = o; t < N && e > 0; t++) {
 								let n = `${c}:${i + t}`;
 								if (j.has(n) || A.has(n)) break;
 								let r = w.get(n);
 								if (r && r.value.type !== "empty") break;
-								H += a[t], e -= a[t];
+								ae += a[t], e -= a[t];
 							}
 						}
 						if (l > 0) {
@@ -1619,64 +1641,64 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 								if (j.has(n) || A.has(n)) break;
 								let r = w.get(n);
 								if (r && r.value.type !== "empty") break;
-								ae -= a[t], H += a[t], e -= a[t];
+								R -= a[t], ae += a[t], e -= a[t];
 							}
 						}
 					}
 				}
-				let ue = G, de = 0;
-				if (C === "fill" && !S && G.length > 0) {
-					let t = Math.max(1, F - 6), n = e.measureText(G).width;
+				let U = K, de = 0;
+				if (C === "fill" && !S && K.length > 0) {
+					let t = Math.max(1, L - 6), n = e.measureText(K).width;
 					if (n > 0 && n < t) {
 						let e = Math.max(1, Math.floor(t / n));
-						ue = G.repeat(e);
+						U = K.repeat(e);
 					}
 				}
-				if (C === "distributed" || C === "justify" && !B.wrapText && !le) {
-					let t = Math.max(1, F - 6), n = e.measureText(ue).width, r = Math.max(1, [...ue].length - 1);
+				if (C === "distributed" || C === "justify" && !V.wrapText && !oe) {
+					let t = Math.max(1, L - 6), n = e.measureText(U).width, r = Math.max(1, [...U].length - 1);
 					n < t && (de = Math.max(0, (t - n) / r));
 				}
-				let fe, pe;
-				C === "right" ? (fe = u + F - 3, pe = "right") : C === "center" ? (fe = u + F / 2, pe = "center") : C === "centerContinuous" ? (fe = R + P / 2, pe = "center") : C === "distributed" || C === "justify" && !B.wrapText && !le ? (fe = u + 3, pe = "left") : (fe = u + M, pe = "left");
-				let me = B.textRotation ?? 0, he = me === 255, ge = me > 0 && me !== 255;
-				if (V.iconSet && ee > 0 && (e.save(), e.beginPath(), e.rect(u, g, F, I), e.clip(), it(e, V.iconSet.name, V.iconSet.index, u + 2, g + (I - ee) / 2, ee), e.restore()), e.save(), e.beginPath(), e.rect(ae, g, H, I), e.clip(), he) {
-					let t = Math.round(z.size * m * 1.1), n = G.length * t, r = T === "top" ? g + 2 : T === "center" ? g + (I - n) / 2 : g + I - n - 2;
+				let G, fe;
+				C === "right" ? (G = u + L - 3, fe = "right") : C === "center" ? (G = u + L / 2, fe = "center") : C === "centerContinuous" ? (G = re + P / 2, fe = "center") : C === "distributed" || C === "justify" && !V.wrapText && !oe ? (G = u + 3, fe = "left") : (G = u + M, fe = "left");
+				let pe = V.textRotation ?? 0, me = pe === 255, he = pe > 0 && pe !== 255;
+				if (H.iconSet && ee > 0 && (e.save(), e.beginPath(), e.rect(u, g, L, z), e.clip(), rt(e, H.iconSet.name, H.iconSet.index, u + 2, g + (z - ee) / 2, ee), e.restore()), e.save(), e.beginPath(), e.rect(R, g, ae, z), e.clip(), me) {
+					let t = Math.round(B.size * m * 1.1), n = K.length * t, r = T === "top" ? g + 2 : T === "center" ? g + (z - n) / 2 : g + z - n - 2;
 					e.textAlign = "center", e.textBaseline = "top";
-					for (let n of G) e.fillText(n, u + F / 2, r), r += t;
+					for (let n of K) e.fillText(n, u + L / 2, r), r += t;
 					e.restore();
 					return;
 				}
-				if (ge) {
-					let t = me <= 90 ? -(me * Math.PI / 180) : (me - 90) * Math.PI / 180;
-					e.translate(u + F / 2, g + I / 2), e.rotate(t), e.textAlign = "center", e.textBaseline = "middle", e.fillText(G, 0, 0), e.restore();
+				if (he) {
+					let t = pe <= 90 ? -(pe * Math.PI / 180) : (pe - 90) * Math.PI / 180;
+					e.translate(u + L / 2, g + z / 2), e.rotate(t), e.textAlign = "center", e.textBaseline = "middle", e.fillText(K, 0, 0), e.restore();
 					return;
 				}
-				if (B.shrinkToFit) {
-					let t = e.measureText(G).width, n = F - M - 3;
+				if (V.shrinkToFit) {
+					let t = e.measureText(K).width, n = L - M - 3;
 					if (t > n && t > 0) {
-						let r = n / t, i = C === "right" ? u + F - 3 : C === "center" ? u + F / 2 : u + M;
+						let r = n / t, i = C === "right" ? u + L - 3 : C === "center" ? u + L / 2 : u + M;
 						e.transform(r, 0, 0, 1, i * (1 - r), 0);
 					}
 				}
-				if (e.textAlign = pe, de > 0) try {
+				if (e.textAlign = fe, de > 0) try {
 					e.letterSpacing = `${de}px`;
 				} catch {}
-				if (B.readingOrder === 2) try {
+				if (V.readingOrder === 2) try {
 					e.direction = "rtl";
 				} catch {}
-				else if (B.readingOrder === 1) try {
+				else if (V.readingOrder === 1) try {
 					e.direction = "ltr";
 				} catch {}
-				let _e = L.value.type === "text" ? L.value.runs : void 0, ve = _e && _e.length > 0;
-				if (B.wrapText && ve) {
-					let t = ce(e, _e, p, ne, F - M - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * m * 1.2), 0), r;
-					r = T === "top" ? g + 2 : T === "center" ? g + (I - n) / 2 : g + I - n - 2, e.textAlign = "left", e.textBaseline = "top";
+				let ge = ie.value.type === "text" ? ie.value.runs : void 0, _e = ge && ge.length > 0;
+				if (V.wrapText && _e) {
+					let t = ce(e, ge, p, ne, L - M - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * m * 1.2), 0), r;
+					r = T === "top" ? g + 2 : T === "center" ? g + (z - n) / 2 : g + z - n - 2, e.textAlign = "left", e.textBaseline = "top";
 					for (let n of t) {
 						let t = Math.round(n.maxFontSize * m * 1.2), i = n.segments.reduce((e, t) => e + t.width, 0), a;
-						a = C === "right" ? u + F - 3 - i : C === "center" ? u + F / 2 - i / 2 : u + M;
+						a = C === "right" ? u + L - 3 - i : C === "center" ? u + L / 2 - i / 2 : u + M;
 						for (let t of n.segments) {
 							e.font = D(t.font, ne);
-							let n = V.fontColor ?? t.font.color;
+							let n = H.fontColor ?? t.font.color;
 							e.fillStyle = n ? v(n) : "#000000", e.fillText(t.text, a, r);
 							let i = Math.round(t.font.size * m);
 							if (t.font.underline && (e.save(), e.strokeStyle = n ? v(n) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(a, r + i + 1), e.lineTo(a + t.width, r + i + 1), e.stroke(), e.restore()), t.font.strike) {
@@ -1688,63 +1710,63 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 						}
 						r += t;
 					}
-				} else if (B.wrapText) {
-					let t = oe(e, G, F - M - 3), n = Math.round(z.size * m * 1.2), r = t.length * n, i;
-					T === "top" ? (i = g + 2, e.textBaseline = "top") : T === "center" ? (i = g + (I - r) / 2, e.textBaseline = "top") : (i = g + I - r - 2, e.textBaseline = "top");
-					for (let r = 0; r < t.length; r++) e.fillText(t[r], fe, i + r * n);
-				} else if (ve) {
-					let t = _e.map((e) => O(p, e)), n = _e.map((n, r) => (e.font = D(t[r], ne), e.measureText(n.text).width)), r = n.reduce((e, t) => e + t, 0), i;
-					i = C === "right" ? u + F - 3 - r : C === "center" ? u + F / 2 - r / 2 : u + M, e.textAlign = "left";
+				} else if (V.wrapText) {
+					let t = se(e, K, L - M - 3), n = Math.round(B.size * m * 1.2), r = t.length * n, i;
+					T === "top" ? (i = g + 2, e.textBaseline = "top") : T === "center" ? (i = g + (z - r) / 2, e.textBaseline = "top") : (i = g + z - r - 2, e.textBaseline = "top");
+					for (let r = 0; r < t.length; r++) e.fillText(t[r], G, i + r * n);
+				} else if (_e) {
+					let t = ge.map((e) => O(p, e)), n = ge.map((n, r) => (e.font = D(t[r], ne), e.measureText(n.text).width)), r = n.reduce((e, t) => e + t, 0), i;
+					i = C === "right" ? u + L - 3 - r : C === "center" ? u + L / 2 - r / 2 : u + M, e.textAlign = "left";
 					let a;
-					T === "top" ? (e.textBaseline = "top", a = g + 2) : T === "center" ? (e.textBaseline = "middle", a = g + I / 2) : (e.textBaseline = "bottom", a = g + I - 2);
+					T === "top" ? (e.textBaseline = "top", a = g + 2) : T === "center" ? (e.textBaseline = "middle", a = g + z / 2) : (e.textBaseline = "bottom", a = g + z - 2);
 					let o = i;
-					for (let r = 0; r < _e.length; r++) {
+					for (let r = 0; r < ge.length; r++) {
 						let i = t[r];
 						e.font = D(i, ne);
-						let s = V.fontColor ?? i.color;
-						e.fillStyle = s ? v(s) : "#000000", e.fillText(_e[r].text, o, a);
+						let s = H.fontColor ?? i.color;
+						e.fillStyle = s ? v(s) : "#000000", e.fillText(ge[r].text, o, a);
 						let c = Math.round(i.size * m);
 						if (i.underline) {
-							let t = T === "top" ? g + 2 + c + 1 : T === "center" ? g + I / 2 + Math.round(c * .55) : g + I - 2 + 1;
+							let t = T === "top" ? g + 2 + c + 1 : T === "center" ? g + z / 2 + Math.round(c * .55) : g + z - 2 + 1;
 							e.save(), e.strokeStyle = s ? v(s) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(o, t), e.lineTo(o + n[r], t), e.stroke(), e.restore();
 						}
 						if (i.strike) {
-							let t = T === "top" ? g + 2 + Math.round(c * .5) : T === "center" ? g + I / 2 : g + I - 2 - Math.round(c * .35);
+							let t = T === "top" ? g + 2 + Math.round(c * .5) : T === "center" ? g + z / 2 : g + z - 2 - Math.round(c * .35);
 							e.save(), e.strokeStyle = s ? v(s) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(o, t), e.lineTo(o + n[r], t), e.stroke(), e.restore();
 						}
 						o += n[r];
 					}
 				} else {
-					let t = null, n = () => t ??= e.measureText(G), r = () => {
-						let e = Math.min(n().width, H - M - 3);
+					let t = null, n = () => t ??= e.measureText(K), r = () => {
+						let e = Math.min(n().width, ae - M - 3);
 						return {
-							x: C === "right" ? u + F - 3 - e : C === "center" ? u + F / 2 - e / 2 : u + M,
+							x: C === "right" ? u + L - 3 - e : C === "center" ? u + L / 2 - e / 2 : u + M,
 							width: e
 						};
-					}, i = Math.round(z.size * m);
+					}, i = Math.round(B.size * m);
 					if (p.underline || _) {
-						let { x: t, width: n } = r(), a = T === "top" ? g + 2 + i + 1 : T === "center" ? g + I / 2 + Math.round(i * .55) : g + I - 2 + 1;
+						let { x: t, width: n } = r(), a = T === "top" ? g + 2 + i + 1 : T === "center" ? g + z / 2 + Math.round(i * .55) : g + z - 2 + 1;
 						e.save(), e.strokeStyle = _ ? "#0563C1" : b ? v(b) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(t, a), e.lineTo(t + n, a), e.stroke(), e.restore();
 					}
 					if (p.strike) {
-						let { x: t, width: n } = r(), a = T === "top" ? g + 2 + Math.round(i * .5) : T === "center" ? g + I / 2 : g + I - 2 - Math.round(i * .35);
+						let { x: t, width: n } = r(), a = T === "top" ? g + 2 + Math.round(i * .5) : T === "center" ? g + z / 2 : g + z - 2 - Math.round(i * .35);
 						e.save(), e.strokeStyle = b ? v(b) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(t, a), e.lineTo(t + n, a), e.stroke(), e.restore();
 					}
-					if (G.includes("\n")) {
-						let t = G.split("\n"), n = Math.round(z.size * m * 1.2), r = t.length * n, i;
-						T === "top" ? (i = g + 2, e.textBaseline = "top") : T === "center" ? (i = g + (I - r) / 2, e.textBaseline = "top") : (i = g + I - r - 2, e.textBaseline = "top");
-						for (let r = 0; r < t.length; r++) e.fillText(t[r], fe, i + r * n);
+					if (K.includes("\n")) {
+						let t = K.split("\n"), n = Math.round(B.size * m * 1.2), r = t.length * n, i;
+						T === "top" ? (i = g + 2, e.textBaseline = "top") : T === "center" ? (i = g + (z - r) / 2, e.textBaseline = "top") : (i = g + z - r - 2, e.textBaseline = "top");
+						for (let r = 0; r < t.length; r++) e.fillText(t[r], G, i + r * n);
 					} else {
 						let t;
-						T === "top" ? (e.textBaseline = "top", t = g + 2) : T === "center" ? (e.textBaseline = "middle", t = g + I / 2) : (e.textBaseline = "bottom", t = g + I - 2), e.fillText(ue, fe, t);
+						T === "top" ? (e.textBaseline = "top", t = g + 2) : T === "center" ? (e.textBaseline = "middle", t = g + z / 2) : (e.textBaseline = "bottom", t = g + z - 2), e.fillText(U, G, t);
 					}
 				}
-				e.restore(), G && t.onTextRun && t.onTextRun({
-					text: G,
+				e.restore(), K && t.onTextRun && t.onTextRun({
+					text: K,
 					x: u,
 					y: g,
-					width: F,
-					height: I,
+					width: L,
+					height: z,
 					row: c,
 					col: o
 				});
@@ -1754,7 +1776,7 @@ function lt(e, t, n, i, a, o, s, c, l, u, d, f, p, h) {
 	for (let e of R) e();
 	e.restore();
 }
-function ut(e, t, n, r, i = {}) {
+function lt(e, t, n, r, i = {}) {
 	let a = i.dpr ?? 1, o = i.cellScale ?? 1, s = e.canvas.width / a, c = e.canvas.height / a;
 	e.clearRect(0, 0, s, c), e.fillStyle = "#ffffff", e.fillRect(0, 0, s, c);
 	let l = (e) => Math.round(e * o), u = l(50), d = l(22), { row: f, col: p, rows: m, cols: v } = r, y = (i.scrollOffsetX ?? 0) * o, b = (i.scrollOffsetY ?? 0) * o, x = i.freezeRows ?? 0, S = i.freezeCols ?? 0, C = [];
@@ -1781,19 +1803,19 @@ function ut(e, t, n, r, i = {}) {
 		});
 		for (let t = e.top; t <= e.bottom; t++) for (let n = e.left; n <= e.right; n++) t === e.top && n === e.left || j.add(`${t}:${n}`);
 	}
-	let te = me(t), ne = /* @__PURE__ */ new Set();
+	let te = pe(t), ne = /* @__PURE__ */ new Set();
 	if (t.autoFilter) {
 		let e = t.autoFilter;
 		for (let t = e.left; t <= e.right; t++) ne.add(`${e.top}:${t}`);
 	}
 	let M = /* @__PURE__ */ new Map();
 	for (let e of t.hyperlinks ?? []) e.url && M.set(`${e.row}:${e.col}`, e.url);
-	let re = /* @__PURE__ */ new Set();
+	let N = /* @__PURE__ */ new Set();
 	for (let e of t.commentRefs ?? []) {
 		let t = w(e);
-		t && re.add(`${t.row}:${t.col}`);
+		t && N.add(`${t.row}:${t.col}`);
 	}
-	let N = {
+	let P = {
 		worksheet: t,
 		styles: n,
 		cellMap: A,
@@ -1812,14 +1834,14 @@ function ut(e, t, n, r, i = {}) {
 		dpr: a,
 		autoFilterCells: ne,
 		hyperlinkMap: M,
-		commentCells: re,
-		tableStyleMap: ot(t),
-		sparklineMap: st(t),
+		commentCells: N,
+		tableStyleMap: at(t),
+		sparklineMap: ot(t),
 		onTextRun: i.onTextRun
-	}, P = u, F = d, I = P + E, L = F + D, R = Math.max(0, s - I), z = Math.max(0, c - L);
-	x > 0 && S > 0 && lt(e, N, 1, 1, C, T, 0, 0, P, F, P, F, E, D), x > 0 && lt(e, N, 1, p, O, T, y, 0, I, F, I, F, R, D), S > 0 && lt(e, N, f, 1, C, k, 0, b, P, L, P, L, E, z), lt(e, N, f, p, O, k, y, b, I, L, I, L, R, z), t.images && t.images.length > 0 && i.loadedImages && ft(e, t, i.loadedImages, o, f, p, y, b, I, L, R, z), t.shapeGroups && t.shapeGroups.length > 0 && pt(e, t, o, f, p, y, b, I, L, R, z, i.loadedImages), t.charts && t.charts.length > 0 && Ct(e, t, o, f, p, y, b, I, L, R, z), t.slicers && t.slicers.length > 0 && It(e, t, o, f, p, y, b, I, L, R, z), dt(e, s, c, f, p, m, v, O, k, y, b, C, T, E, D, u, d, o, a), x > 0 && (e.save(), e.strokeStyle = h, e.lineWidth = .5, e.beginPath(), e.moveTo(u, L + .5), e.lineTo(s, L + .5), e.stroke(), e.restore()), S > 0 && (e.save(), e.strokeStyle = h, e.lineWidth = .5, e.beginPath(), e.moveTo(I + .5, d), e.lineTo(I + .5, c), e.stroke(), e.restore());
+	}, re = u, F = d, I = re + E, L = F + D, R = Math.max(0, s - I), z = Math.max(0, c - L);
+	x > 0 && S > 0 && ct(e, P, 1, 1, C, T, 0, 0, re, F, re, F, E, D), x > 0 && ct(e, P, 1, p, O, T, y, 0, I, F, I, F, R, D), S > 0 && ct(e, P, f, 1, C, k, 0, b, re, L, re, L, E, z), ct(e, P, f, p, O, k, y, b, I, L, I, L, R, z), t.images && t.images.length > 0 && i.loadedImages && ft(e, t, i.loadedImages, o, f, p, y, b, I, L, R, z), t.shapeGroups && t.shapeGroups.length > 0 && pt(e, t, o, f, p, y, b, I, L, R, z, i.loadedImages), t.charts && t.charts.length > 0 && Ct(e, t, o, f, p, y, b, I, L, R, z), t.slicers && t.slicers.length > 0 && It(e, t, o, f, p, y, b, I, L, R, z), ut(e, s, c, f, p, m, v, O, k, y, b, C, T, E, D, u, d, o, a), x > 0 && (e.save(), e.strokeStyle = h, e.lineWidth = .5, e.beginPath(), e.moveTo(u, L + .5), e.lineTo(s, L + .5), e.stroke(), e.restore()), S > 0 && (e.save(), e.strokeStyle = h, e.lineWidth = .5, e.beginPath(), e.moveTo(I + .5, d), e.lineTo(I + .5, c), e.stroke(), e.restore());
 }
-function dt(e, t, n, r, i, a, o, s, c, l, u, f, p, m, h, g, _, v, y) {
+function ut(e, t, n, r, i, a, o, s, c, l, u, f, p, m, h, g, _, v, y) {
 	let b = "#f8f9fa", x = "#c8ccd0", S = "#444", C = `${Math.max(1, Math.round(11 * v))}px ${d}`, w = g + m, T = _ + h, E = .5 / y;
 	e.fillStyle = b, e.fillRect(0, 0, g, _), e.strokeStyle = x, e.lineWidth = .5, e.beginPath(), e.moveTo(E, 0), e.lineTo(E, _), e.moveTo(0, E), e.lineTo(g, E), e.moveTo(g - E, 0), e.lineTo(g - E, _), e.moveTo(0, _ - E), e.lineTo(g, _ - E), e.stroke(), e.font = C, e.fillStyle = S;
 	let D = (t, n, r) => {
@@ -1853,25 +1875,25 @@ function dt(e, t, n, r, i, a, o, s, c, l, u, f, p, m, h, g, _, v, y) {
 	}
 	e.restore();
 }
-var Z = 9525;
-function Q(e, t, n) {
+var Q = 9525;
+function $(e, t, n) {
 	let r = 0;
 	for (let i = 1; i < t; i++) r += Math.round(g(e.colWidths[i] ?? e.defaultColWidth) * n);
 	return r;
 }
-function $(e, t, n) {
+function dt(e, t, n) {
 	let r = 0;
 	for (let i = 1; i < t; i++) r += Math.round(_(e.rowHeights[i] ?? e.defaultRowHeight) * n);
 	return r;
 }
 function ft(e, t, n, r, i, a, o, s, c, l, u, d) {
 	if (u <= 0 || d <= 0) return;
-	let f = Q(t, a, r), p = $(t, i, r);
+	let f = $(t, a, r), p = dt(t, i, r);
 	e.save(), e.beginPath(), e.rect(c, l, u, d), e.clip();
 	for (let i of t.images) {
 		let a = n.get(i.dataUrl);
 		if (!a) continue;
-		let m = i.fromCol + 1, h = i.fromRow + 1, g = i.toCol + 1, _ = i.toRow + 1, v = Q(t, m, r) + i.fromColOff * r / Z, y = $(t, h, r) + i.fromRowOff * r / Z, b = Q(t, g, r) + i.toColOff * r / Z, x = $(t, _, r) + i.toRowOff * r / Z, S = b - v, C = x - y;
+		let m = i.fromCol + 1, h = i.fromRow + 1, g = i.toCol + 1, _ = i.toRow + 1, v = $(t, m, r) + i.fromColOff * r / Q, y = dt(t, h, r) + i.fromRowOff * r / Q, b = $(t, g, r) + i.toColOff * r / Q, x = dt(t, _, r) + i.toRowOff * r / Q, S = b - v, C = x - y;
 		if (S <= 0 || C <= 0) continue;
 		let w = c + (v - f) - o, T = l + (y - p) - s;
 		w + S < c || w > c + u || T + C < l || T > l + d || e.drawImage(a, w, T, S, C);
@@ -1882,10 +1904,10 @@ function pt(e, t, n, r, i, a, o, s, c, l, u, d) {
 	if (l <= 0 || u <= 0) return;
 	let f = t.shapeGroups;
 	if (!f || f.length === 0) return;
-	let p = Q(t, i, n), m = $(t, r, n);
+	let p = $(t, i, n), m = dt(t, r, n);
 	e.save(), e.beginPath(), e.rect(s, c, l, u), e.clip();
 	for (let r of f) {
-		let i = r.fromCol + 1, f = r.fromRow + 1, h = r.toCol + 1, g = r.toRow + 1, _ = Q(t, i, n) + r.fromColOff * n / Z, v = $(t, f, n) + r.fromRowOff * n / Z, y = Q(t, h, n) + r.toColOff * n / Z, b = $(t, g, n) + r.toRowOff * n / Z, x = y - _, S = b - v;
+		let i = r.fromCol + 1, f = r.fromRow + 1, h = r.toCol + 1, g = r.toRow + 1, _ = $(t, i, n) + r.fromColOff * n / Q, v = dt(t, f, n) + r.fromRowOff * n / Q, y = $(t, h, n) + r.toColOff * n / Q, b = dt(t, g, n) + r.toRowOff * n / Q, x = y - _, S = b - v;
 		if (x <= 0 || S <= 0) continue;
 		let C = s + (_ - p) - a, w = c + (v - m) - o;
 		if (!(C + x < s || C > s + l) && !(w + S < c || w > c + u)) for (let t of r.shapes) {
@@ -1953,7 +1975,7 @@ function mt(e, t, n, r, i, a, o) {
 	e.restore();
 }
 function ht(e, t) {
-	t.fillColor && (e.fillStyle = t.fillColor, e.fill()), t.strokeColor && t.strokeWidth > 0 && (e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / Z), e.stroke());
+	t.fillColor && (e.fillStyle = t.fillColor, e.fill()), t.strokeColor && t.strokeWidth > 0 && (e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / Q), e.stroke());
 }
 function gt(e, t, n, r, i, a, o) {
 	if (r === n && i === t) return e;
@@ -2161,9 +2183,9 @@ function St(e) {
 }
 function Ct(e, t, r, i, a, o, s, c, l, u, d) {
 	if (u <= 0 || d <= 0) return;
-	let f = Q(t, a, r), p = $(t, i, r);
+	let f = $(t, a, r), p = dt(t, i, r);
 	for (let i of t.charts) {
-		let a = i.fromCol + 1, m = i.fromRow + 1, h = i.toCol + 1, g = i.toRow + 1, _ = Q(t, a, r) + i.fromColOff * r / Z, v = $(t, m, r) + i.fromRowOff * r / Z, y = Q(t, h, r) + i.toColOff * r / Z, b = $(t, g, r) + i.toRowOff * r / Z, x = y - _, S = b - v;
+		let a = i.fromCol + 1, m = i.fromRow + 1, h = i.toCol + 1, g = i.toRow + 1, _ = $(t, a, r) + i.fromColOff * r / Q, v = dt(t, m, r) + i.fromRowOff * r / Q, y = $(t, h, r) + i.toColOff * r / Q, b = dt(t, g, r) + i.toRowOff * r / Q, x = y - _, S = b - v;
 		if (x <= 0 || S <= 0) continue;
 		let C = c + (_ - f) - o, w = l + (v - p) - s;
 		if (C + x < c || C > c + u || w + S < l || w > l + d) continue;
@@ -2182,9 +2204,9 @@ function It(e, t, n, r, i, a, o, s, c, l, u) {
 	if (l <= 0 || u <= 0) return;
 	let d = t.slicers;
 	if (!d) return;
-	let f = Q(t, i, n), p = $(t, r, n);
+	let f = $(t, i, n), p = dt(t, r, n);
 	for (let r of d) {
-		let i = r.fromCol + 1, d = r.fromRow + 1, m = r.toCol + 1, h = r.toRow + 1, g = Q(t, i, n) + r.fromColOff * n / Z, _ = $(t, d, n) + r.fromRowOff * n / Z, v = Q(t, m, n) + r.toColOff * n / Z, y = $(t, h, n) + r.toRowOff * n / Z, b = v - g, x = y - _;
+		let i = r.fromCol + 1, d = r.fromRow + 1, m = r.toCol + 1, h = r.toRow + 1, g = $(t, i, n) + r.fromColOff * n / Q, _ = dt(t, d, n) + r.fromRowOff * n / Q, v = $(t, m, n) + r.toColOff * n / Q, y = dt(t, h, n) + r.toRowOff * n / Q, b = v - g, x = y - _;
 		if (b <= 0 || x <= 0) continue;
 		let S = s + (g - f) - a, C = c + (_ - p) - o;
 		S + b < s || S > s + l || C + x < c || C > c + u || (e.save(), e.beginPath(), e.rect(s, c, l, u), e.clip(), Lt(e, r.caption, r.items, S, C, b, x, n), e.restore());
@@ -2304,7 +2326,7 @@ var Ht = class {
 		let s = r.dpr ?? (typeof window < "u" ? window.devicePixelRatio : 1), c = e instanceof HTMLCanvasElement ? e.clientWidth || 800 : e.width, l = e instanceof HTMLCanvasElement ? e.clientHeight || 600 : e.height, u = r.width ?? c, d = r.height ?? l;
 		e.width = Math.round(u * s), e.height = Math.round(d * s), e instanceof HTMLCanvasElement && (e.style.width = `${u}px`, e.style.height = `${d}px`);
 		let f = e.getContext("2d");
-		f.scale(s, s), ut(f, i, a, n, {
+		f.scale(s, s), lt(f, i, a, n, {
 			...r,
 			dpr: s,
 			loadedImages: this.imageCache