@silurus/ooxml 0.75.3 → 0.75.5

package/dist/{xlsx-Ca8qcow5.js → xlsx-BaH9irS0.js}

@@ -3,8 +3,8 @@ import { E as t, M as n, N as r, _ as i, c as a, d as o, j as s, l as c, r as l,
 import { c as p, d as m, f as h, h as g, i as _, l as v, m as y, n as b, o as x, p as S, r as C, s as w, t as T, u as E } from "./find-cursor-Dc5iM6s7.js";
 import { n as D, r as O } from "./preload-BEouWnlI.js";
 import { _ as k, b as ee, f as A, g as j, h as M, i as N, m as P, n as F, p as I, r as L, t as R, v as z, x as B, y as V } from "./svg-image-by-path-C1M3N2pT.js";
-import { A as te, B as H, D as ne, F as re, H as ie, K as ae, M as oe, N as se, O as ce, P as le, Q as U, S as W, T as ue, Y as de, a as G, at as fe, b as pe, c as me, ct as K, d as he, f as ge, g as _e, i as ve, it as ye, j as q, k as be, l as xe, m as Se, n as Ce, nt as we, ot as Te, p as Ee, rt as De, s as Oe, st as J, u as ke, w as Ae, x as je, y as Me } from "./line-metrics-EFT-W2Au.js";
-import { t as Ne } from "./duotone-bitmap-by-path-D4mAC2FR.js";
+import { $ as H, A as te, B as U, D as ne, F as re, H as ie, M as ae, N as oe, O as se, P as ce, S as le, T as W, X as ue, a as de, at as G, b as fe, c as pe, ct as K, d as q, f as me, g as he, i as ge, it as _e, j as J, k as ve, l as ye, lt as be, m as xe, n as Se, ot as Ce, p as we, q as Te, rt as Ee, s as De, st as Oe, u as ke, w as Ae, x as je, y as Me } from "./line-metrics-D9gqQWHl.js";
+import { t as Ne } from "./duotone-bitmap-by-path-CWsSJkJu.js";
 import { t as Pe } from "./mathjax-Dqo857oC.js";
 import { n as Fe, r as Ie, t as Le } from "./visible-index-CKvgpUrf.js";
 import { r as Re } from "./hyperlink-D85FexTa.js";
@@ -32,7 +32,7 @@ function Ye(e, t, n) {
 		e.moveTo(s, t), e.lineTo(s + l, t), e.stroke(), e.restore();
 	}
 	let v = r.length, y = (e) => v === 1 ? s + l / 2 : s + e / (v - 1) * l;
-	e.save(), e.strokeStyle = i, e.lineCap = "round", e.lineJoin = "round", e.lineWidth = (n.lineWeight ?? .75) * K, e.beginPath();
+	e.save(), e.strokeStyle = i, e.lineCap = "round", e.lineJoin = "round", e.lineWidth = (n.lineWeight ?? .75) * be, e.beginPath();
 	let b = !1, x = n.displayEmptyCellsAs ?? "gap";
 	for (let t = 0; t < v; t++) {
 		let n = r[t];
@@ -95,7 +95,7 @@ function Qe(e, t, n, r, i, a) {
 //#endregion
 //#region packages/core/src/text/bidi/segments.ts
 function $e(e, t) {
-	return e === !0 ? "rtl" : e === !1 ? "ltr" : be().computeLevels(t, "auto").paragraphLevel === 1 ? "rtl" : "ltr";
+	return e === !0 ? "rtl" : e === !1 ? "ltr" : ve().computeLevels(t, "auto").paragraphLevel === 1 ? "rtl" : "ltr";
 }
 //#endregion
 //#region packages/xlsx/src/worker.ts?worker&inline
@@ -645,16 +645,16 @@ function Ft(e) {
 }
 function It() {
 	let e = /* @__PURE__ */ new Date();
-	return fe(new Date(Date.UTC(e.getFullYear(), e.getMonth(), e.getDate())), !1);
+	return Ce(new Date(Date.UTC(e.getFullYear(), e.getMonth(), e.getDate())), !1);
 }
 function Lt() {
-	return fe(new Date(Date.now()), !1);
+	return Ce(new Date(Date.now()), !1);
 }
 function Rt(e, t, n) {
-	return Math.floor(fe(new Date(Date.UTC(e, t - 1, n)), !1));
+	return Math.floor(Ce(new Date(Date.UTC(e, t - 1, n)), !1));
 }
 function zt(e) {
-	return ye(Math.floor(e), !1);
+	return G(Math.floor(e), !1);
 }
 function Bt(e) {
 	let t = zt(e);
@@ -825,7 +825,7 @@ function Qt(e) {
 	};
 }
 function $t(e, t, n = !1) {
-	let r = ye(e, n), i = r.getUTCFullYear(), a = r.getUTCMonth() + 1, o = r.getUTCDate(), s = r.getUTCDay(), c = r.getUTCHours(), l = r.getUTCMinutes(), u = r.getUTCSeconds(), d = t.split(";")[0], f = /am\/pm|a\/p/i.test(d), p = null, m = () => p ??= Qt(r), h = "", g = 0, _ = !1;
+	let r = G(e, n), i = r.getUTCFullYear(), a = r.getUTCMonth() + 1, o = r.getUTCDate(), s = r.getUTCDay(), c = r.getUTCHours(), l = r.getUTCMinutes(), u = r.getUTCSeconds(), d = t.split(";")[0], f = /am\/pm|a\/p/i.test(d), p = null, m = () => p ??= Qt(r), h = "", g = 0, _ = !1;
 	for (; g < d.length;) {
 		let t = d[g];
 		if (t === "\"") {
@@ -1144,11 +1144,11 @@ function yn(e, t, n) {
 	}
 	if (r.exp) {
 		let e = Math.max(r.intSpec.length, 1), t = r.fracSpec.length, n = 0, i = 0;
-		o !== 0 && (i = Math.floor(Math.log10(o)), i = Math.floor(i / e) * e, n = o / 10 ** i, parseFloat(De(n, t)) >= 10 ** e && (i += e, n = o / 10 ** i));
-		let [s, c = ""] = De(n, t).split(".");
+		o !== 0 && (i = Math.floor(Math.log10(o)), i = Math.floor(i / e) * e, n = o / 10 ** i, parseFloat(_e(n, t)) >= 10 ** e && (i += e, n = o / 10 ** i));
+		let [s, c = ""] = _e(n, t).split(".");
 		return a + bn(r, gn(s, r.intSpec, !1), _n(c, r.fracSpec), "E" + (i < 0 ? "-" : r.exp.plus ? "+" : "") + String(Math.abs(i)).padStart(r.exp.width, "0"));
 	}
-	let s = r.fracSpec.length, [c, l = ""] = De(o, s).split("."), u = c.replace(/^0+/, ""), d = /[0]/.test(r.intSpec) || r.intSpec === "" && !1;
+	let s = r.fracSpec.length, [c, l = ""] = _e(o, s).split("."), u = c.replace(/^0+/, ""), d = /[0]/.test(r.intSpec) || r.intSpec === "" && !1;
 	return u === "" && d && (u = "0"), a + bn(r, gn(u, r.intSpec, r.grouping), _n(l, r.fracSpec), "");
 }
 function bn(e, t, n, r) {
@@ -1465,7 +1465,7 @@ var Un = (e) => {
 	return typeof t == "string" ? t : void 0;
 };
 function Wn(e, t) {
-	let n = e === 2 || ce(t);
+	let n = e === 2 || se(t);
 	return {
 		needBidi: n,
 		baseRtl: n && Hn(e, t)
@@ -1483,7 +1483,7 @@ function Gn(e, t) {
 		let n = Un(e[t]) ?? "";
 		r += n.length > 0 ? n : "";
 	}
-	let { levels: a, paragraphLevel: o } = be().computeLevels(r, t ? "rtl" : "ltr"), { order: s, segLevels: c } = ne(a, o, i), l = Array(n);
+	let { levels: a, paragraphLevel: o } = ve().computeLevels(r, t ? "rtl" : "ltr"), { order: s, segLevels: c } = ne(a, o, i), l = Array(n);
 	for (let e = 0; e < n; e++) l[e] = (c[e] & 1) == 1;
 	return {
 		order: s,
@@ -1513,25 +1513,25 @@ function qn(e, t) {
 //#endregion
 //#region packages/xlsx/src/vertical-text.ts
 function Jn(e, t, n, r, i, a = !1) {
-	let o = t.codePointAt(0) ?? 0, s = xe(o);
+	let o = t.codePointAt(0) ?? 0, s = ye(o);
 	if (a && ke(o)) {
-		e.save(), e.translate(n, r + i / 2), e.textAlign = "center", e.textBaseline = "middle", G(e, () => e.fillText(t, 0, 0)), e.restore();
+		e.save(), e.translate(n, r + i / 2), e.textAlign = "center", e.textBaseline = "middle", de(e, () => e.fillText(t, 0, 0)), e.restore();
 		return;
 	}
 	if (s === "Tr") {
-		let a = Oe(o);
+		let a = De(o);
 		if (a !== null) {
 			e.fillText(String.fromCodePoint(a), n, r);
 			return;
 		}
-		if (he(o)) {
+		if (q(o)) {
 			e.fillText(t, n, r);
 			return;
 		}
 		e.save(), e.translate(n, r + i / 2), e.rotate(Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", e.fillText(t, 0, 0), e.restore();
 		return;
 	}
-	let c = s === "Tu" ? me(o) : null;
+	let c = s === "Tu" ? pe(o) : null;
 	e.fillText(c === null ? t : String.fromCodePoint(c), n, r);
 }
 //#endregion
@@ -1571,7 +1571,7 @@ function ur(e, t) {
 	if (r !== void 0) return r;
 	let i = lr[e.toLowerCase()]?.[Math.round(t)];
 	if (i !== void 0) return cr.set(n, i), i;
-	let a = t * K, o = typeof OffscreenCanvas < "u" ? new OffscreenCanvas(1, 1) : typeof document < "u" ? document.createElement("canvas") : null;
+	let a = t * be, o = typeof OffscreenCanvas < "u" ? new OffscreenCanvas(1, 1) : typeof document < "u" ? document.createElement("canvas") : null;
 	if (!o) return ir;
 	let s = o.getContext("2d");
 	if (!s) return ir;
@@ -1594,17 +1594,17 @@ function dr(e, t = ir) {
 	return e / t;
 }
 function $(e) {
-	return Math.round(e * K);
+	return Math.round(e * be);
 }
 function fr(e) {
-	return e / K;
+	return e / be;
 }
 function pr(e, t, n, r, i, a, o) {
 	if (!(i <= 0 || a <= 0)) {
 		if (o) {
 			let a = e.createLinearGradient(n, r, n + i, r);
-			a.addColorStop(0, U(t, .85)), a.addColorStop(1, U(t, .15)), e.fillStyle = a;
-		} else e.fillStyle = U(t);
+			a.addColorStop(0, H(t, .85)), a.addColorStop(1, H(t, .15)), e.fillStyle = a;
+		} else e.fillStyle = H(t);
 		e.fillRect(n, r, i, a);
 	}
 }
@@ -1802,7 +1802,7 @@ function _r(e, t, n, r) {
 	if (!u) return hr.set(s, null), null;
 	let d = u.getContext("2d");
 	if (!d) return hr.set(s, null), null;
-	d.fillStyle = U(r), d.fillRect(0, 0, l, l), d.fillStyle = U(n);
+	d.fillStyle = H(r), d.fillRect(0, 0, l, l), d.fillStyle = H(n);
 	for (let e = 0; e < l; e++) {
 		let t = c[e];
 		for (let n = 0; n < l; n++) t & 1 << l - 1 - n && d.fillRect(n, e, 1, 1);
@@ -1819,12 +1819,12 @@ function vr(e, t, n, r, i, a) {
 	let o = t.patternType;
 	if (!o || o === "none") return !1;
 	let s = t.fgColor ?? "000000", c = t.bgColor ?? "FFFFFF";
-	if (o === "solid") return e.fillStyle = U(s), e.fillRect(n, r, i, a), !0;
+	if (o === "solid") return e.fillStyle = H(s), e.fillRect(n, r, i, a), !0;
 	let l = _r(e, o, s, c);
 	if (l) e.fillStyle = l;
 	else {
 		let t = mr(o);
-		e.fillStyle = t >= 1 ? U(s) : Sr(s, c, t);
+		e.fillStyle = t >= 1 ? H(s) : Sr(s, c, t);
 	}
 	return e.fillRect(n, r, i, a), !0;
 }
@@ -1839,7 +1839,7 @@ function yr(e, t, n, r, i, a) {
 	}
 	for (let e of t.stops) {
 		let t = Math.min(1, Math.max(0, e.position));
-		o.addColorStop(t, U(e.color));
+		o.addColorStop(t, H(e.color));
 	}
 	return o;
 }
@@ -1853,11 +1853,11 @@ function Sr(e, t, n) {
 	return `rgb(${Math.round(a * d + c * (1 - d))},${Math.round(o * d + l * (1 - d))},${Math.round(s * d + u * (1 - d))})`;
 }
 function Cr(e, t, n = 1, r) {
-	let i = Math.round(e * K * n * t);
-	return r ? Math.max(i, Math.round(Ce(r, e * K * t))) : i;
+	let i = Math.round(e * be * n * t);
+	return r ? Math.max(i, Math.round(Se(r, e * be * t))) : i;
 }
 function wr(e, t = 1) {
-	return `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${Math.max(1, Math.round(e.size * K * t))}px ${nr(e.name)}`;
+	return `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${Math.max(1, Math.round(e.size * be * t))}px ${nr(e.name)}`;
 }
 function Tr(e, t, n, r, i, a, o, s, c, l) {
 	if (t.length === 0) return;
@@ -1896,10 +1896,10 @@ function Er(e, t, n) {
 }
 function Dr(e, t, n, r, i, a, o = 1) {
 	if (e.save(), e.strokeStyle = i, e.lineWidth = .5, e.beginPath(), a) {
-		let i = r - 1, a = r + 1, s = i + q(i, .5, o), c = a + q(a, .5, o);
+		let i = r - 1, a = r + 1, s = i + J(i, .5, o), c = a + J(a, .5, o);
 		e.moveTo(t, s), e.lineTo(n, s), e.moveTo(t, c), e.lineTo(n, c);
 	} else {
-		let i = r + q(r, .5, o);
+		let i = r + J(r, .5, o);
 		e.moveTo(t, i), e.lineTo(n, i);
 	}
 	e.stroke(), e.restore();
@@ -1960,13 +1960,13 @@ function Ar(e, t, n) {
 function jr(e, t) {
 	if (e.length === 0 || t.length === 0) return 0;
 	let n = [...e, ...t], r = e.length;
-	return r - Ae(n, r, ue, 1);
+	return r - Ae(n, r, W, 1);
 }
 function Mr(e, t) {
 	let n = t;
 	for (; n < e.length;) {
 		let t = e[e.length - n - 1], r = e[e.length - n], i = t?.codePointAt(0), a = r?.codePointAt(0);
-		if (i !== void 0 && a !== void 0 && W(i) && W(a)) n++;
+		if (i !== void 0 && a !== void 0 && le(i) && le(a)) n++;
 		else break;
 	}
 	return n >= e.length ? t : n;
@@ -1974,10 +1974,10 @@ function Mr(e, t) {
 function Nr(e, t) {
 	if (e.length === 0 || t.length === 0) return 0;
 	let n = t[0].codePointAt(0), r = e.length - 1, i = e[r].codePointAt(0);
-	if (i === void 0 || n === void 0 || i === 8203 || n === 8203 || !pe(i, n)) return 0;
+	if (i === void 0 || n === void 0 || i === 8203 || n === 8203 || !fe(i, n)) return 0;
 	for (; r > 0;) {
 		let t = e[r - 1].codePointAt(0), n = e[r].codePointAt(0);
-		if (t === void 0 || n === void 0 || !pe(t, n)) break;
+		if (t === void 0 || n === void 0 || !fe(t, n)) break;
 		r--;
 	}
 	return r === 0 ? 0 : e.length - r;
@@ -1998,7 +1998,7 @@ function Pr(e, t, n) {
 				if (n === " " || je(r)) break;
 				e += r > 65535 ? 2 : 1;
 			}
-			let n = t.slice(a, e), r = ge(n) ? Me(n) : null;
+			let n = t.slice(a, e), r = me(n) ? Me(n) : null;
 			if (r && r.length > 0) {
 				let e = 0;
 				for (let t of r) i.push(n.slice(e, t)), e = t;
@@ -2052,7 +2052,7 @@ function Fr(e, t, n, r, i) {
 		let a = e.measureText(t).width;
 		if (o.length > 0 && s + a > i) {
 			let i = o.flatMap((e) => [...e.text]), a = jr(i, [...t]);
-			a > 0 ? a = Mr(i, a) : !ge(t) && !ge(o[o.length - 1]?.text ?? "") && !/^\s/u.test(t) && !/\s$/u.test(i.at(-1) ?? "") && (a = Nr(i, [...t]));
+			a > 0 ? a = Mr(i, a) : !me(t) && !me(o[o.length - 1]?.text ?? "") && !/^\s/u.test(t) && !/\s$/u.test(i.at(-1) ?? "") && (a = Nr(i, [...t]));
 			let u = o[o.length - 1], d = [...u.text];
 			a > d.length && (a = d.length);
 			let f = null;
@@ -2084,15 +2084,15 @@ function Fr(e, t, n, r, i) {
 			return;
 		}
 		e.font = wr(Lr(n), r);
-		let o = (t) => e.measureText(t).width, c = _e(t), l = t.length, u = 0;
+		let o = (t) => e.measureText(t).width, c = he(t), l = t.length, u = 0;
 		for (; u < l;) {
-			let e = i - s, r = Ee(t, a, u, e, o, c);
+			let e = i - s, r = we(t, a, u, e, o, c);
 			if (r <= u) {
 				if (s > 0) {
 					p();
 					continue;
 				}
-				let n = a.find((e) => e > u) ?? l, i = t.slice(u, n), d = Se(i), f = Ee(i, d, 0, e, o, c);
+				let n = a.find((e) => e > u) ?? l, i = t.slice(u, n), d = xe(i), f = we(i, d, 0, e, o, c);
 				f <= 0 && (f = d.length > 0 ? d[0] : i.length), r = u + f;
 			}
 			h(t.slice(u, r), n), u = r, u < l && p();
@@ -2118,7 +2118,7 @@ function Fr(e, t, n, r, i) {
 				r.push(e.text.slice(i, t)), i = t;
 			}
 		}
-		for (let e of r) e === "\n" ? (m(), f++) : ge(e) ? g(e, t) : h(e, t);
+		for (let e of r) e === "\n" ? (m(), f++) : me(e) ? g(e, t) : h(e, t);
 	}
 	return (o.length > 0 || a.length > 0) && m(), a;
 }
@@ -2151,19 +2151,19 @@ function Rr(e, t, n, r, i, a, o, s) {
 		let f = t[d], p = Lr(f.font);
 		e.font = wr(p, a);
 		let m = s.fontColor ?? f.font.color;
-		e.fillStyle = m ? U(m) : "#000000";
+		e.fillStyle = m ? H(m) : "#000000";
 		let h = Cr(f.font.size, a), g = 0;
 		f.font.vertAlign === "superscript" ? g = -Math.round(h * .35) : f.font.vertAlign === "subscript" && (g = Math.round(h * .1)), e.fillText(f.text, u, r + g);
 		let _ = Cr(p.size, a);
 		if (f.font.underline || f.font.strike) {
 			let t = Ir(i, r, _);
 			if (f.font.underline) {
-				let n = m ? U(m) : "#000000", r = f.font.underlineStyle === "double" || f.font.underlineStyle === "doubleAccounting";
+				let n = m ? H(m) : "#000000", r = f.font.underlineStyle === "double" || f.font.underlineStyle === "doubleAccounting";
 				Dr(e, u, u + f.width, t.underline + g, n, r, o);
 			}
 			if (f.font.strike) {
-				let n = t.strike + g, r = n + q(n, .5, o);
-				e.save(), e.strokeStyle = m ? U(m) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(u, r), e.lineTo(u + f.width, r), e.stroke(), e.restore();
+				let n = t.strike + g, r = n + J(n, .5, o);
+				e.save(), e.strokeStyle = m ? H(m) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(u, r), e.lineTo(u + f.width, r), e.stroke(), e.restore();
 			}
 		}
 		u += f.width;
@@ -2421,15 +2421,15 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 		} : D;
 		e.font = wr(z, y);
 		let B = t.hyperlinkMap.get(_) ? "#0563C1" : j.fontColor ?? N.color ?? D.color;
-		e.fillStyle = B ? U(B) : "#000000";
-		let V = T.value.type === "number", te = A.alignH ?? (V ? "right" : "left"), H = A.alignV ?? "bottom", ne = A.indent ? Math.round(A.indent * 3 * t.mdw) : 0, re = 3 + (te === "left" || !A.alignH ? ne : 0);
+		e.fillStyle = B ? H(B) : "#000000";
+		let V = T.value.type === "number", te = A.alignH ?? (V ? "right" : "left"), U = A.alignV ?? "bottom", ne = A.indent ? Math.round(A.indent * 3 * t.mdw) : 0, re = 3 + (te === "left" || !A.alignH ? ne : 0);
 		e.save(), e.beginPath(), e.rect(f, p, h, g), e.clip();
 		let ie;
 		te === "right" ? (ie = f + h - 3, e.textAlign = "right") : te === "center" ? (ie = f + h / 2, e.textAlign = "center") : (ie = f + re, e.textAlign = "left");
 		let ae = T.value.type === "text" ? T.value.runs : void 0, oe = ae && ae.length > 0;
 		if (A.wrapText && oe) Ur(e, ae, z, {
 			alignH: te,
-			alignV: H,
+			alignV: U,
 			cx: f,
 			cy: p,
 			cellW: h,
@@ -2443,11 +2443,11 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 		});
 		else if (A.wrapText) {
 			let t = Ar(e, P, h - re - 3), n = Cr(D.size, y, 1.2, D.name ?? void 0), r = t.length * n, i;
-			i = H === "top" ? p + 2 : H === "center" ? p + (g - r) / 2 : p + g - r - 2, e.textBaseline = "top";
+			i = U === "top" ? p + 2 : U === "center" ? p + (g - r) / 2 : p + g - r - 2, e.textBaseline = "top";
 			for (let r = 0; r < t.length; r++) e.fillText(t[r], ie, i + r * n);
 		} else if (oe) Hr(e, ae, z, {
 			alignH: te,
-			alignV: H,
+			alignV: U,
 			cx: f,
 			cy: p,
 			cellW: h,
@@ -2461,7 +2461,7 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 		});
 		else {
 			let t;
-			H === "top" ? (e.textBaseline = "top", t = p + 2) : H === "center" ? (e.textBaseline = "middle", t = p + g / 2) : (e.textBaseline = "bottom", t = p + g - 2), e.fillText(P, ie, t);
+			U === "top" ? (e.textBaseline = "top", t = p + 2) : U === "center" ? (e.textBaseline = "middle", t = p + g / 2) : (e.textBaseline = "bottom", t = p + g - 2), e.fillText(P, ie, t);
 		}
 		e.restore();
 	}
@@ -2491,8 +2491,8 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 			if (l + d <= u || l >= u + f) continue;
 			let p = `${s}:${a}`;
 			if (_.has(p)) continue;
-			let E = g.get(p), j = E ? E.totalW : d, M = E ? E.totalH : T, N = C(l, j), P = h.get(p), { font: F, fill: I, border: L, xf: R } = kr(m, P?.styleIndex ?? 0), z = Vn(P, s, a, v, m.dxfs ?? []), B = z.fill ?? I, V = t.tableStyleMap.get(p), te = m.dxfs ?? [], H = (e) => e == null ? void 0 : te[e], ne = H(V?.wholeTableDxf), re = H(V?.headerRowDxf), ie = H(V?.totalRowDxf), ae = H(V?.firstColumnDxf), oe = H(V?.lastColumnDxf), se = H(V?.stripeDxf), ce = V?.isHeader && re?.fill?.fgColor ? re : V?.isTotals && ie?.fill?.fgColor ? ie : V?.isLastCol && oe?.fill?.fgColor ? oe : V?.isFirstCol && ae?.fill?.fgColor ? ae : se?.fill?.fgColor ? se : !V?.isHeader && !V?.isTotals && ne?.fill?.fgColor ? ne : void 0;
-			if (vr(e, B, N, S, j, M) || (V && ce?.fill?.fgColor ? (e.fillStyle = U(ce.fill.fgColor), e.fillRect(N, S, j, M)) : V && !V.isCustom && V.isBanded && (e.fillStyle = $r(V.accent), e.fillRect(N, S, j, M))), t.commentCells.has(p) && xr(e, N, S, j, M), z.dataBar && z.dataBar.ratio > 0) {
+			let E = g.get(p), j = E ? E.totalW : d, M = E ? E.totalH : T, N = C(l, j), P = h.get(p), { font: F, fill: I, border: L, xf: R } = kr(m, P?.styleIndex ?? 0), z = Vn(P, s, a, v, m.dxfs ?? []), B = z.fill ?? I, V = t.tableStyleMap.get(p), te = m.dxfs ?? [], U = (e) => e == null ? void 0 : te[e], ne = U(V?.wholeTableDxf), re = U(V?.headerRowDxf), ie = U(V?.totalRowDxf), ae = U(V?.firstColumnDxf), oe = U(V?.lastColumnDxf), se = U(V?.stripeDxf), ce = V?.isHeader && re?.fill?.fgColor ? re : V?.isTotals && ie?.fill?.fgColor ? ie : V?.isLastCol && oe?.fill?.fgColor ? oe : V?.isFirstCol && ae?.fill?.fgColor ? ae : se?.fill?.fgColor ? se : !V?.isHeader && !V?.isTotals && ne?.fill?.fgColor ? ne : void 0;
+			if (vr(e, B, N, S, j, M) || (V && ce?.fill?.fgColor ? (e.fillStyle = H(ce.fill.fgColor), e.fillRect(N, S, j, M)) : V && !V.isCustom && V.isBanded && (e.fillStyle = $r(V.accent), e.fillRect(N, S, j, M))), t.commentCells.has(p) && xr(e, N, S, j, M), z.dataBar && z.dataBar.ratio > 0) {
 				let t = Math.max(0, (j - 4) * z.dataBar.ratio);
 				pr(e, z.dataBar.color, N + 2, S + 2, t, M - 4, z.dataBar.gradient);
 			}
@@ -2504,16 +2504,16 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 				h: M
 			}, le), t.worksheet.showGridlines !== !1) {
 				if (e.strokeStyle = "#d0d0d0", e.lineWidth = .5, e.beginPath(), !D.has(n)) {
-					let t = N + j + q(N + j, .5, b);
+					let t = N + j + J(N + j, .5, b);
 					e.moveTo(t, S), e.lineTo(t, S + M);
 				}
-				let t = S + M + q(S + M, .5, b);
+				let t = S + M + J(S + M, .5, b);
 				if (e.moveTo(N, t), e.lineTo(N + j, t), o === 0) {
-					let t = S + q(S, .5, b);
+					let t = S + J(S, .5, b);
 					e.moveTo(N, t), e.lineTo(N + j, t);
 				}
 				if (n === 0) {
-					let t = N + q(N, .5, b);
+					let t = N + J(N, .5, b);
 					e.moveTo(t, S), e.lineTo(t, S + M);
 				}
 				e.stroke();
@@ -2541,7 +2541,7 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 					else if (G.kind === "accent") {
 						let t = .5 / b;
 						if (e.strokeStyle = G.color, e.lineWidth = G.lineWidth, e.beginPath(), e.moveTo(N, S + M - t), e.lineTo(N + j, S + M - t), G.topEdge) {
-							let t = S + q(S, G.lineWidth, b);
+							let t = S + J(S, G.lineWidth, b);
 							e.moveTo(N, t), e.lineTo(N + j, t);
 						}
 						e.stroke();
@@ -2559,8 +2559,8 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 				});
 			}
 			if (!P) continue;
-			let me = Ut(P, m, z.numFmt, t.worksheet.date1904), K = me.text;
-			!K || K === "0" && t.worksheet.showZeros === !1 || O.push(() => {
+			let K = Ut(P, m, z.numFmt, t.worksheet.date1904), q = K.text;
+			!q || q === "0" && t.worksheet.showZeros === !1 || O.push(() => {
 				let o = V?.isHeader ? re : V?.isTotals ? ie : V?.isLastCol && oe ? oe : V?.isFirstCol && ae ? ae : se || (V ? ne : void 0), c = V ? V.isCustom ? !!o?.font?.bold : V.isHeader || V.isTotals : !1, l = F.bold || !!z.fontBold || c, u = F.italic || !!z.fontItalic, d = F.underline || !!z.fontUnderline, f = F.strike || !!z.fontStrike, v = l !== F.bold || u !== F.italic || d !== F.underline || f !== F.strike ? {
 					...F,
 					bold: l,
@@ -2569,23 +2569,23 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 					strike: f
 				} : F;
 				e.font = wr(v, y);
-				let C = t.hyperlinkMap.get(p), w = o?.font?.color ?? null, T = C ? "#0563C1" : z.fontColor ?? me.color ?? w ?? F.color;
-				e.fillStyle = T ? U(T) : "#000000";
-				let D = P.value.type === "number", O = R.alignH ?? (D ? "right" : "left"), k = R.alignV ?? "bottom", ee = R.indent ? Math.round(R.indent * 3 * t.mdw) : 0, A = z.iconSet ? Math.max(8, Math.round(Math.min(j, M) * .55)) : 0, I = A > 0 ? A + 4 : 0, L = 3 + (O === "left" || !R.alignH ? ee : 0) + I, B = j, te = N, H = n;
+				let C = t.hyperlinkMap.get(p), w = o?.font?.color ?? null, T = C ? "#0563C1" : z.fontColor ?? K.color ?? w ?? F.color;
+				e.fillStyle = T ? H(T) : "#000000";
+				let D = P.value.type === "number", O = R.alignH ?? (D ? "right" : "left"), k = R.alignV ?? "bottom", ee = R.indent ? Math.round(R.indent * 3 * t.mdw) : 0, A = z.iconSet ? Math.max(8, Math.round(Math.min(j, M) * .55)) : 0, I = A > 0 ? A + 4 : 0, L = 3 + (O === "left" || !R.alignH ? ee : 0) + I, B = j, te = N, U = n;
 				if (O === "centerContinuous" && !E) for (let e = n + 1; e < x; e++) {
 					let t = `${s}:${r + e}`;
 					if (_.has(t) || g.has(t)) break;
 					let n = h.get(t);
 					if (n && n.value.type !== "empty" || kr(m, n?.styleIndex ?? 0).xf.alignH !== "centerContinuous") break;
-					B += i[e], H = e;
+					B += i[e], U = e;
 				}
-				let ce = O === "centerContinuous" ? te : N, le = O === "centerContinuous" ? B : j, W = K.includes("\n");
+				let ce = O === "centerContinuous" ? te : N, le = O === "centerContinuous" ? B : j, W = q.includes("\n");
 				if (!E && !R.wrapText && !R.textRotation && !D && !W) {
-					let t = e.measureText(K).width, a = O === "centerContinuous", o = a ? t + 6 : t + L + 3, c = a ? B : j;
+					let t = e.measureText(q).width, a = O === "centerContinuous", o = a ? t + 6 : t + L + 3, c = a ? B : j;
 					if (o > c) {
 						let e = o - c, t = 0, l = 0;
 						if (O === "right" ? l = e : O === "center" || a ? (l = e / 2, t = e / 2) : t = e, t > 0) {
-							let e = t, o = a ? H + 1 : n + 1;
+							let e = t, o = a ? U + 1 : n + 1;
 							for (let t = o; t < x && e > 0; t++) {
 								let n = `${s}:${r + t}`;
 								if (_.has(n) || g.has(n)) break;
@@ -2606,12 +2606,12 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 						}
 					}
 				}
-				let ue = K, de = 0;
-				if (O === "fill" && !D && K.length > 0) {
-					let t = Math.max(1, j - 6), n = e.measureText(K).width;
+				let ue = q, de = 0;
+				if (O === "fill" && !D && q.length > 0) {
+					let t = Math.max(1, j - 6), n = e.measureText(q).width;
 					if (n > 0 && n < t) {
 						let e = Math.max(1, Math.floor(t / n));
-						ue = K.repeat(e);
+						ue = q.repeat(e);
 					}
 				}
 				if (O === "distributed" || O === "justify" && !R.wrapText && !W) {
@@ -2620,24 +2620,24 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 				}
 				let G, fe;
 				O === "right" ? (G = N + j - 3, fe = "right") : O === "center" ? (G = N + j / 2, fe = "center") : O === "centerContinuous" ? (G = te + B / 2, fe = "center") : O === "distributed" || O === "justify" && !R.wrapText && !W ? (G = N + 3, fe = "left") : (G = N + L, fe = "left");
-				let pe = R.textRotation ?? 0, he = pe === 255, ge = pe > 0 && pe !== 255;
-				if (z.iconSet && A > 0 && (e.save(), e.beginPath(), e.rect(N, S, j, M), e.clip(), Jr(e, z.iconSet.name, z.iconSet.index, N + 2, S + (M - A) / 2, A), e.restore()), e.save(), e.beginPath(), e.rect(ce, S, le, M), e.clip(), he) {
-					let t = Cr(F.size, y, 1.1), n = [...K].length * t, r = k === "top" ? S + 2 : k === "center" ? S + (M - n) / 2 : S + M - n - 2;
+				let pe = R.textRotation ?? 0, me = pe === 255, he = pe > 0 && pe !== 255;
+				if (z.iconSet && A > 0 && (e.save(), e.beginPath(), e.rect(N, S, j, M), e.clip(), Jr(e, z.iconSet.name, z.iconSet.index, N + 2, S + (M - A) / 2, A), e.restore()), e.save(), e.beginPath(), e.rect(ce, S, le, M), e.clip(), me) {
+					let t = Cr(F.size, y, 1.1), n = [...q].length * t, r = k === "top" ? S + 2 : k === "center" ? S + (M - n) / 2 : S + M - n - 2;
 					e.textAlign = "center", e.textBaseline = "top";
-					for (let n of K) {
-						let i = n.codePointAt(0) ?? 0, a = ke(i) && ve(e, i);
+					for (let n of q) {
+						let i = n.codePointAt(0) ?? 0, a = ke(i) && ge(e, i);
 						Jn(e, n, N + j / 2, r, t, a), r += t;
 					}
 					e.restore();
 					return;
 				}
-				if (ge) {
+				if (he) {
 					let t = pe <= 90 ? -(pe * Math.PI / 180) : (pe - 90) * Math.PI / 180;
-					e.translate(N + j / 2, S + M / 2), e.rotate(t), e.textAlign = "center", e.textBaseline = "middle", e.fillText(K, 0, 0), e.restore();
+					e.translate(N + j / 2, S + M / 2), e.rotate(t), e.textAlign = "center", e.textBaseline = "middle", e.fillText(q, 0, 0), e.restore();
 					return;
 				}
 				if (R.shrinkToFit) {
-					let t = e.measureText(K).width, n = j - L - 3;
+					let t = e.measureText(q).width, n = j - L - 3;
 					if (t > n && t > 0) {
 						let r = n / t, i = O === "right" ? N + j - 3 : O === "center" ? N + j / 2 : N + L;
 						e.transform(r, 0, 0, 1, i * (1 - r), 0);
@@ -2647,10 +2647,10 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 					e.letterSpacing = `${de}px`;
 				} catch {}
 				try {
-					e.direction = Hn(R.readingOrder, K) ? "rtl" : "ltr";
+					e.direction = Hn(R.readingOrder, q) ? "rtl" : "ltr";
 				} catch {}
-				let _e = P.value.type === "text" ? P.value.runs : void 0, ye = _e && _e.length > 0;
-				if (R.wrapText && ye) Ur(e, _e, v, {
+				let _e = P.value.type === "text" ? P.value.runs : void 0, ve = _e && _e.length > 0;
+				if (R.wrapText && ve) Ur(e, _e, v, {
 					alignH: O,
 					alignV: k,
 					cx: N,
@@ -2665,10 +2665,10 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 					readingOrder: R.readingOrder
 				});
 				else if (R.wrapText) {
-					let t = Ar(e, K, j - L - 3), n = Cr(F.size, y, 1.2, F.name ?? void 0), r = t.length * n, i;
+					let t = Ar(e, q, j - L - 3), n = Cr(F.size, y, 1.2, F.name ?? void 0), r = t.length * n, i;
 					k === "top" ? (i = S + 2, e.textBaseline = "top") : k === "center" ? (i = S + (M - r) / 2, e.textBaseline = "top") : (i = S + M - r - 2, e.textBaseline = "top");
 					for (let r = 0; r < t.length; r++) e.fillText(t[r], G, i + r * n);
-				} else if (ye) Hr(e, _e, v, {
+				} else if (ve) Hr(e, _e, v, {
 					alignH: O,
 					alignV: k,
 					cx: N,
@@ -2690,7 +2690,7 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 						size: v.size * .65
 					} : v;
 					t && (e.font = wr(i, y));
-					let a = null, o = () => a ??= e.measureText(K), s = () => {
+					let a = null, o = () => a ??= e.measureText(q), s = () => {
 						let e = Math.min(o().width, le - L - 3);
 						return {
 							x: O === "right" ? N + j - 3 - e : O === "center" ? N + j / 2 - e / 2 : N + L,
@@ -2698,15 +2698,15 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 						};
 					}, c = Cr(i.size, y);
 					if (v.underline || C) {
-						let { x: t, width: n } = s(), i = (k === "top" ? S + 2 + c + 1 : k === "center" ? S + M / 2 + Math.round(c * .55) : S + M - 2 + 1) + r, a = C ? "#0563C1" : T ? U(T) : "#000000", o = v.underlineStyle === "double" || v.underlineStyle === "doubleAccounting";
+						let { x: t, width: n } = s(), i = (k === "top" ? S + 2 + c + 1 : k === "center" ? S + M / 2 + Math.round(c * .55) : S + M - 2 + 1) + r, a = C ? "#0563C1" : T ? H(T) : "#000000", o = v.underlineStyle === "double" || v.underlineStyle === "doubleAccounting";
 						Dr(e, t, t + n, i, a, o, b);
 					}
 					if (v.strike) {
-						let { x: t, width: n } = s(), i = (k === "top" ? S + 2 + Math.round(c * .5) : k === "center" ? S + M / 2 : S + M - 2 - Math.round(c * .35)) + r, a = i + q(i, .5, b);
-						e.save(), e.strokeStyle = T ? U(T) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(t, a), e.lineTo(t + n, a), e.stroke(), e.restore();
+						let { x: t, width: n } = s(), i = (k === "top" ? S + 2 + Math.round(c * .5) : k === "center" ? S + M / 2 : S + M - 2 - Math.round(c * .35)) + r, a = i + J(i, .5, b);
+						e.save(), e.strokeStyle = T ? H(T) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(t, a), e.lineTo(t + n, a), e.stroke(), e.restore();
 					}
-					if (K.includes("\n")) {
-						let t = K.split("\n"), n = Cr(F.size, y, 1.2, F.name ?? void 0), i = t.length * n, a;
+					if (q.includes("\n")) {
+						let t = q.split("\n"), n = Cr(F.size, y, 1.2, F.name ?? void 0), i = t.length * n, a;
 						k === "top" ? (a = S + 2, e.textBaseline = "top") : k === "center" ? (a = S + (M - i) / 2, e.textBaseline = "top") : (a = S + M - i - 2, e.textBaseline = "top");
 						for (let i = 0; i < t.length; i++) e.fillText(t[i], G, a + i * n + r);
 					} else {
@@ -2714,17 +2714,17 @@ function ei(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 						k === "top" ? (e.textBaseline = "top", t = S + 2) : k === "center" ? (e.textBaseline = "middle", t = S + M / 2) : (e.textBaseline = "bottom", t = S + M - 2), e.fillText(ue, G, t + r);
 					}
 				}
-				let be = P.value.type === "text" ? P.value.phoneticRuns : void 0;
-				if (P.showPhonetic && be && be.length > 0 && !K.includes("\n")) {
-					let t = wr(v, y), n = Er(e, K, t), r;
+				let ye = P.value.type === "text" ? P.value.phoneticRuns : void 0;
+				if (P.showPhonetic && ye && ye.length > 0 && !q.includes("\n")) {
+					let t = wr(v, y), n = Er(e, q, t), r;
 					r = O === "right" ? N + j - 3 - n : O === "center" ? N + j / 2 - n / 2 : N + L;
-					let i = T ? U(T) : "#000000";
-					Tr(e, be, P.value.type === "text" ? P.value.phoneticPr : void 0, K, t, m, r, S, y, i);
+					let i = T ? H(T) : "#000000";
+					Tr(e, ye, P.value.type === "text" ? P.value.phoneticPr : void 0, q, t, m, r, S, y, i);
 				}
-				e.restore(), K && t.onTextRun && t.onTextRun({
+				e.restore(), q && t.onTextRun && t.onTextRun({
 					sheetName: t.worksheet.name,
 					cellRef: qn(s, a),
-					text: K,
+					text: q,
 					x: N,
 					y: S,
 					width: j,
@@ -2835,34 +2835,34 @@ function ii(e, t, n, r, i = {}) {
 		onTextRun: i.onTextRun,
 		rtl: t.rightToLeft === !0,
 		canvasW: c
-	}, L = d, R = f, z = L + C, B = R + w, V = Math.max(0, c - z), te = Math.max(0, l - B);
-	y > 0 && b > 0 && ei(e, I, 1, 1, x, S, 0, 0, L, R, L, R, C, w), y > 0 && ei(e, I, 1, m, T, S, _, 0, z, R, z, R, V, w), b > 0 && ei(e, I, p, 1, x, E, 0, v, L, B, L, B, C, te), ei(e, I, p, m, T, E, _, v, z, B, z, B, V, te), t.images && t.images.length > 0 && i.loadedImages && ci(e, t, i.loadedImages, o, p, m, _, v, z, B, V, te, t.rightToLeft === !0, c), t.shapeGroups && t.shapeGroups.length > 0 && li(e, t, o, p, m, _, v, z, B, V, te, i.loadedImages, t.rightToLeft === !0, c), t.charts && t.charts.length > 0 && Oi(e, t, o, p, m, _, v, z, B, V, te, t.rightToLeft === !0, c), t.slicers && t.slicers.length > 0 && Vi(e, t, o, p, m, _, v, z, B, V, te, t.rightToLeft === !0, c), ai(e, c, l, p, m, h, g, T, E, _, v, x, S, C, w, d, f, o, a, i.selectedRowRange ?? null, i.selectedColRange ?? null, t.rightToLeft === !0);
-	let H = t.rightToLeft === !0;
+	}, L = d, R = f, z = L + C, B = R + w, V = Math.max(0, c - z), H = Math.max(0, l - B);
+	y > 0 && b > 0 && ei(e, I, 1, 1, x, S, 0, 0, L, R, L, R, C, w), y > 0 && ei(e, I, 1, m, T, S, _, 0, z, R, z, R, V, w), b > 0 && ei(e, I, p, 1, x, E, 0, v, L, B, L, B, C, H), ei(e, I, p, m, T, E, _, v, z, B, z, B, V, H), t.images && t.images.length > 0 && i.loadedImages && ci(e, t, i.loadedImages, o, p, m, _, v, z, B, V, H, t.rightToLeft === !0, c), t.shapeGroups && t.shapeGroups.length > 0 && li(e, t, o, p, m, _, v, z, B, V, H, i.loadedImages, t.rightToLeft === !0, c), t.charts && t.charts.length > 0 && Oi(e, t, o, p, m, _, v, z, B, V, H, t.rightToLeft === !0, c), t.slicers && t.slicers.length > 0 && Vi(e, t, o, p, m, _, v, z, B, V, H, t.rightToLeft === !0, c), ai(e, c, l, p, m, h, g, T, E, _, v, x, S, C, w, d, f, o, a, i.selectedRowRange ?? null, i.selectedColRange ?? null, t.rightToLeft === !0);
+	let te = t.rightToLeft === !0;
 	if (y > 0) {
 		e.save(), e.strokeStyle = sr, e.lineWidth = .5, e.beginPath();
-		let t = B + q(B, .5, a);
-		H ? (e.moveTo(0, t), e.lineTo(c - d, t)) : (e.moveTo(d, t), e.lineTo(c, t)), e.stroke(), e.restore();
+		let t = B + J(B, .5, a);
+		te ? (e.moveTo(0, t), e.lineTo(c - d, t)) : (e.moveTo(d, t), e.lineTo(c, t)), e.stroke(), e.restore();
 	}
 	if (b > 0) {
 		e.save(), e.strokeStyle = sr, e.lineWidth = .5, e.beginPath();
-		let t = H ? c - z : z, n = t + q(t, .5, a);
+		let t = te ? c - z : z, n = t + J(t, .5, a);
 		e.moveTo(n, f), e.lineTo(n, l), e.stroke(), e.restore();
 	}
 }
 function ai(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _, v, y, b, x) {
 	let S = "#f8f9fa", C = "#e8eaed", w = "#caddf6", T = "#c8ccd0", E = "#5b9bd5", D = "#444", O = (e) => !b || e < b.start || e > b.end ? S : b.strong ? w : C, k = (e) => !b || e < b.start || e > b.end ? T : b.strong ? E : T, ee = (e) => !y || e < y.start || e > y.end ? S : y.strong ? w : C, A = (e) => !y || e < y.start || e > y.end ? T : y.strong ? E : T, j = `${Math.max(1, Math.round(11 * _))}px ${Qn}`, M = h + p, N = g + m, P = .5 / v, F = (e, n) => x ? ar(e, n, t) : e, I = x ? t - h : 0;
 	e.fillStyle = S, e.fillRect(I, 0, h, g), e.strokeStyle = T, e.lineWidth = .5, e.beginPath();
-	let L = x ? I + q(I, .5, v) : I + h - P;
+	let L = x ? I + J(I, .5, v) : I + h - P;
 	e.moveTo(L, 0), e.lineTo(L, g), e.moveTo(I, g - P), e.lineTo(I + h, g - P), e.stroke(), e.font = j, e.fillStyle = D;
 	let R = (t, n, r) => {
 		let i = F(n, r);
 		e.fillStyle = O(t), e.fillRect(i, 0, r, g), e.strokeStyle = k(t), e.lineWidth = .5, e.beginPath();
-		let a = i + q(i, .5, v);
+		let a = i + J(i, .5, v);
 		e.moveTo(a, 0), e.lineTo(a, g), e.moveTo(i, g - P), e.lineTo(i + r, g - P), e.stroke(), e.fillStyle = D, e.textAlign = "center", e.textBaseline = "middle", e.fillText(Wr(t), i + r / 2, g / 2);
 	}, z = (t, n, r) => {
 		let i = I;
 		e.fillStyle = ee(t), e.fillRect(i, n, h, r), e.strokeStyle = A(t), e.lineWidth = .5, e.beginPath();
-		let a = n + q(n, .5, v), o = x ? i + q(i, .5, v) : i + h - P;
+		let a = n + J(n, .5, v), o = x ? i + J(i, .5, v) : i + h - P;
 		e.moveTo(o, n), e.lineTo(o, n + r), e.moveTo(i, a), e.lineTo(i + h, a), e.stroke(), e.fillStyle = D, e.textBaseline = "middle";
 		let s = Math.max(2, Math.round(4 * _));
 		x ? (e.textAlign = "left", e.fillText(String(t), i + s, n + r / 2)) : (e.textAlign = "right", e.fillText(String(t), i + h - s, n + r / 2));
@@ -2912,15 +2912,15 @@ function ci(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 	for (let i of t.images) {
 		let a = n.get(Yn(i.imagePath, i.duotone));
 		if (!a) continue;
-		let _ = i.fromCol + 1, v = i.fromRow + 1, y = oi(t, _, r) + i.fromColOff * r / J, b = si(t, v, r) + i.fromRowOff * r / J, x, S;
-		if (i.editAs === "oneCell" && i.nativeExtCx > 0 && i.nativeExtCy > 0) x = i.nativeExtCx * r / J, S = i.nativeExtCy * r / J;
+		let _ = i.fromCol + 1, v = i.fromRow + 1, y = oi(t, _, r) + i.fromColOff * r / K, b = si(t, v, r) + i.fromRowOff * r / K, x, S;
+		if (i.editAs === "oneCell" && i.nativeExtCx > 0 && i.nativeExtCy > 0) x = i.nativeExtCx * r / K, S = i.nativeExtCy * r / K;
 		else {
-			let e = i.toCol + 1, n = i.toRow + 1, a = oi(t, e, r) + i.toColOff * r / J, o = si(t, n, r) + i.toRowOff * r / J;
+			let e = i.toCol + 1, n = i.toRow + 1, a = oi(t, e, r) + i.toColOff * r / K, o = si(t, n, r) + i.toRowOff * r / K;
 			x = a - y, S = o - b;
 		}
 		if (x <= 0 || S <= 0) continue;
 		let C = or(c + (y - m) - o, x, p, f), w = l + (b - h) - s;
-		C + x < g || C > g + u || w + S < l || w > l + d || (i.alpha != null && i.alpha < 1 ? (e.save(), e.globalAlpha = i.alpha, H(e, a, i.srcRect, C, w, x, S), e.restore()) : H(e, a, i.srcRect, C, w, x, S));
+		C + x < g || C > g + u || w + S < l || w > l + d || (i.alpha != null && i.alpha < 1 ? (e.save(), e.globalAlpha = i.alpha, U(e, a, i.srcRect, C, w, x, S), e.restore()) : U(e, a, i.srcRect, C, w, x, S));
 	}
 	e.restore();
 }
@@ -2933,10 +2933,10 @@ function li(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
 	let _ = or(s, l, p, f);
 	e.rect(_, c, l, u), e.clip();
 	for (let r of m) {
-		let i = r.fromCol + 1, m = r.fromRow + 1, v = oi(t, i, n) + r.fromColOff * n / J, y = si(t, m, n) + r.fromRowOff * n / J, b, x;
-		if (r.editAs === "oneCell" && r.nativeExtCx > 0 && r.nativeExtCy > 0) b = r.nativeExtCx * n / J, x = r.nativeExtCy * n / J;
+		let i = r.fromCol + 1, m = r.fromRow + 1, v = oi(t, i, n) + r.fromColOff * n / K, y = si(t, m, n) + r.fromRowOff * n / K, b, x;
+		if (r.editAs === "oneCell" && r.nativeExtCx > 0 && r.nativeExtCy > 0) b = r.nativeExtCx * n / K, x = r.nativeExtCy * n / K;
 		else {
-			let e = r.toCol + 1, i = r.toRow + 1, a = oi(t, e, n) + r.toColOff * n / J, o = si(t, i, n) + r.toRowOff * n / J;
+			let e = r.toCol + 1, i = r.toRow + 1, a = oi(t, e, n) + r.toColOff * n / K, o = si(t, i, n) + r.toRowOff * n / K;
 			b = a - v, x = o - y;
 		}
 		if (b <= 0 || x <= 0) continue;
@@ -2990,14 +2990,14 @@ function ui(e, t, n, r, i, a, o, s) {
 	}
 	else if (t.geom.type === "preset") {
 		let n = t.fillColor ?? null, r = t.strokeColor && t.strokeWidth > 0 ? () => {
-			e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / J), e.stroke();
+			e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / K), e.stroke();
 		} : null;
-		ae(e, t.geom.name, 0, 0, i, a, t.geom.adj ?? [], n, r, () => {}) || (e.beginPath(), e.rect(0, 0, i, a), bi(e, t));
+		Te(e, t.geom.name, 0, 0, i, a, t.geom.adj ?? [], n, r, () => {}) || (e.beginPath(), e.rect(0, 0, i, a), bi(e, t));
 	} else if (t.geom.type === "image") {
 		let n = s?.get(Yn(t.geom.imagePath, t.geom.duotone));
 		if (n) {
 			let r = t.geom.alpha;
-			r != null && r < 1 ? (e.save(), e.globalAlpha = r, H(e, n, t.geom.srcRect, 0, 0, i, a), e.restore()) : H(e, n, t.geom.srcRect, 0, 0, i, a);
+			r != null && r < 1 ? (e.save(), e.globalAlpha = r, U(e, n, t.geom.srcRect, 0, 0, i, a), e.restore()) : U(e, n, t.geom.srcRect, 0, 0, i, a);
 		}
 	}
 	t.text && yi(e, t.text, i, a, o), e.restore();
@@ -3039,7 +3039,7 @@ async function vi(e, t) {
 	if (n.length !== 0) {
 		await t.loadMathJax();
 		for (let e of n) if (!di.has(e.nodes)) try {
-			let n = await t.mathMLToSvg(le(e.nodes, e.display)), r = await pi(hi(Pe(n.svg, "#000000"), n.widthEm, n.ascentEm + n.descentEm));
+			let n = await t.mathMLToSvg(ce(e.nodes, e.display)), r = await pi(hi(Pe(n.svg, "#000000"), n.widthEm, n.ascentEm + n.descentEm));
 			di.set(e.nodes, {
 				img: r,
 				widthEm: n.widthEm,
@@ -3052,10 +3052,10 @@ async function vi(e, t) {
 }
 function yi(e, t, n, r, i) {
 	if (n <= 0 || r <= 0 || t.paragraphs.length === 0) return;
-	let a = t.lIns / J * i, o = t.rIns / J * i, s = t.tIns / J * i, c = t.bIns / J * i, l = Math.max(0, n - a - o), u = Math.max(0, r - s - c);
+	let a = t.lIns / K * i, o = t.rIns / K * i, s = t.tIns / K * i, c = t.bIns / K * i, l = Math.max(0, n - a - o), u = Math.max(0, r - s - c);
 	if (l <= 0 || u <= 0) return;
 	let d = (e) => {
-		let t = (e.size > 0 ? e.size : rr) * K * i, n = nr(e.fontFace);
+		let t = (e.size > 0 ? e.size : rr) * be * i, n = nr(e.fontFace);
 		return {
 			font: `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${t}px ${n}`,
 			px: t
@@ -3067,12 +3067,12 @@ function yi(e, t, n, r, i) {
 		return e.font = r, i > 0 ? i : n * .85;
 	}, p = t.wrap !== "none", m = [];
 	for (let n of t.paragraphs) {
-		let r = n.align || "l", a = (n.marL ?? 0) / J * i, o = (n.marR ?? 0) / J * i, s = (n.indent ?? 0) / J * i, c = Math.max(0, s), u = Math.max(0, l - a - o), h = !1, g = () => h ? a : a + c, _ = () => h ? u : u - c, v = [], y = 0, b = 0, x = 0, S = !1, C = n.spaceLine?.type === "pct", w = (e) => {
+		let r = n.align || "l", a = (n.marL ?? 0) / K * i, o = (n.marR ?? 0) / K * i, s = (n.indent ?? 0) / K * i, c = Math.max(0, s), u = Math.max(0, l - a - o), h = !1, g = () => h ? a : a + c, _ = () => h ? u : u - c, v = [], y = 0, b = 0, x = 0, S = !1, C = n.spaceLine?.type === "pct", w = (e) => {
 			let r = e;
-			return n.spaceLine && (n.spaceLine.type === "pct" ? r *= n.spaceLine.val / 1e5 : r = n.spaceLine.val * K * i), t.autoFit === "norm" && t.lnSpcReduction != null && n.spaceLine?.type !== "pts" && (r *= 1 - t.lnSpcReduction), r;
+			return n.spaceLine && (n.spaceLine.type === "pct" ? r *= n.spaceLine.val / 1e5 : r = n.spaceLine.val * be * i), t.autoFit === "norm" && t.lnSpcReduction != null && n.spaceLine?.type !== "pts" && (r *= 1 - t.lnSpcReduction), r;
 		}, T = () => {
 			if (b === 0) {
-				let e = (E || rr) * K * i, t = Math.max(Ce(D, e), Ce(O, e)), n = e * 1.2;
+				let e = (E || rr) * be * i, t = Math.max(Se(D, e), Se(O, e)), n = e * 1.2;
 				b = C ? n : Math.max(n, t), x = f(`${e}px ${nr(D)}`, e);
 			}
 			b = w(b), m.push({
@@ -3093,7 +3093,7 @@ function yi(e, t, n, r, i) {
 			if (t.type === "math") {
 				let e = di.get(t.nodes);
 				if (!e) continue;
-				let n = (t.fontSize ?? (E || rr)) * K * i, o = e.widthEm * n, s = e.ascentEm * n, c = e.descentEm * n, l = t.color ?? "#000000";
+				let n = (t.fontSize ?? (E || rr)) * be * i, o = e.widthEm * n, s = e.ascentEm * n, c = e.descentEm * n, l = t.color ?? "#000000";
 				if (t.display) {
 					T(), m.push({
 						segs: [{
@@ -3124,7 +3124,7 @@ function yi(e, t, n, r, i) {
 				continue;
 			}
 			E = t.size > 0 ? t.size : rr, D = t.fontFace, O = t.fontFaceEa;
-			let { font: n, px: o } = d(t), s = t.color ?? "#000000", c = Math.max(Ce(t.fontFace, o), Ce(t.fontFaceEa, o)), l = o * 1.2, g = C ? l : Math.max(l, c);
+			let { font: n, px: o } = d(t), s = t.color ?? "#000000", c = Math.max(Se(t.fontFace, o), Se(t.fontFaceEa, o)), l = o * 1.2, g = C ? l : Math.max(l, c);
 			b = Math.max(b, g), x = Math.max(x, f(n, o)), e.font = n;
 			let k = t.text.split("\n");
 			for (let t = 0; t < k.length; t++) {
@@ -3198,7 +3198,7 @@ function yi(e, t, n, r, i) {
 	}
 }
 function bi(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 / J), 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 / K), e.stroke());
 }
 function xi(e, t, n, r, i, a, o) {
 	if (r === n && i === t) return e;
@@ -3285,7 +3285,7 @@ function Ci(e, t, n, r, i, a, o = 1) {
 	];
 	for (let { edge: t, x1: c, y1: l, x2: u, y2: d, kind: f } of s) {
 		if (!t || !t.style || t.style === "none") continue;
-		let s = t.color ? U(t.color) : "#000000";
+		let s = t.color ? H(t.color) : "#000000";
 		if (t.style === "double" && f === "d") {
 			e.strokeStyle = s, e.lineWidth = 1, e.setLineDash([]);
 			let t = u - c, n = d - l, r = Math.hypot(t, n), i = -n / r * 1, a = t / r * 1;
@@ -3308,7 +3308,7 @@ function Ci(e, t, n, r, i, a, o = 1) {
 		e.lineWidth = p;
 		let m = Ti(t.style);
 		e.setLineDash(m);
-		let h = f === "v" ? q(c, p, o) : 0, g = f === "h" ? q(l, p, o) : 0;
+		let h = f === "v" ? J(c, p, o) : 0, g = f === "h" ? J(l, p, o) : 0;
 		e.moveTo(c + h, l + g), e.lineTo(u + h, d + g), e.stroke(), e.setLineDash([]);
 	}
 }
@@ -3325,7 +3325,7 @@ function wi(e) {
 	}
 }
 function Ti(e) {
-	return we(e);
+	return Ee(e);
 }
 function Ei(e) {
 	switch (e) {
@@ -3353,13 +3353,13 @@ function Oi(e, t, n, r, i, a, o, s, c, l, u, d, f) {
 	if (l <= 0 || u <= 0) return;
 	let p = oi(t, i, n), m = si(t, r, n), h = or(s, l, f, d);
 	for (let r of t.charts) {
-		let i = r.fromCol + 1, g = r.fromRow + 1, _ = r.toCol + 1, v = r.toRow + 1, y = oi(t, i, n) + r.fromColOff * n / J, b = si(t, g, n) + r.fromRowOff * n / J, x = oi(t, _, n) + r.toColOff * n / J, S = si(t, v, n) + r.toRowOff * n / J, C = x - y, w = S - b;
+		let i = r.fromCol + 1, g = r.fromRow + 1, _ = r.toCol + 1, v = r.toRow + 1, y = oi(t, i, n) + r.fromColOff * n / K, b = si(t, g, n) + r.fromRowOff * n / K, x = oi(t, _, n) + r.toColOff * n / K, S = si(t, v, n) + r.toRowOff * n / K, C = x - y, w = S - b;
 		if (C <= 0 || w <= 0) continue;
 		let T = or(s + (y - p) - a, C, f, d), E = c + (b - m) - o;
 		if (T + C < h || T > h + l || E + w < c || E > c + u) continue;
 		e.save(), e.beginPath(), e.rect(h, c, l, u), e.clip();
-		let D = K * n;
-		de(e, r.chart, {
+		let D = be * n;
+		ue(e, r.chart, {
 			x: T,
 			y: E,
 			w: C,
@@ -3374,7 +3374,7 @@ function Vi(e, t, n, r, i, a, o, s, c, l, u, d, f) {
 	if (!p) return;
 	let m = oi(t, i, n), h = si(t, r, n), g = or(s, l, f, d);
 	for (let r of p) {
-		let i = r.fromCol + 1, p = r.fromRow + 1, _ = r.toCol + 1, v = r.toRow + 1, y = oi(t, i, n) + r.fromColOff * n / J, b = si(t, p, n) + r.fromRowOff * n / J, x = oi(t, _, n) + r.toColOff * n / J, S = si(t, v, n) + r.toRowOff * n / J, C = x - y, w = S - b;
+		let i = r.fromCol + 1, p = r.fromRow + 1, _ = r.toCol + 1, v = r.toRow + 1, y = oi(t, i, n) + r.fromColOff * n / K, b = si(t, p, n) + r.fromRowOff * n / K, x = oi(t, _, n) + r.toColOff * n / K, S = si(t, v, n) + r.toRowOff * n / K, C = x - y, w = S - b;
 		if (C <= 0 || w <= 0) continue;
 		let T = or(s + (y - m) - a, C, f, d), E = c + (b - h) - o;
 		T + C < g || T > g + l || E + w < c || E > c + u || (e.save(), e.beginPath(), e.rect(g, c, l, u), e.clip(), Hi(e, r.caption, r.items, T, E, C, w, n, r.style), e.restore());
@@ -3446,8 +3446,8 @@ async function Ji(e, t, n, r) {
 		imagePath: t.imagePath,
 		mimeType: t.mimeType,
 		svgImagePath: t.svgImagePath,
-		widthPt: t.nativeExtCx > 0 ? t.nativeExtCx / Te : 0,
-		heightPt: t.nativeExtCy > 0 ? t.nativeExtCy / Te : 0,
+		widthPt: t.nativeExtCx > 0 ? t.nativeExtCx / Oe : 0,
+		heightPt: t.nativeExtCy > 0 ? t.nativeExtCy / Oe : 0,
 		srcRect: t.srcRect ?? null,
 		duotone: t.duotone ?? null
 	});
@@ -3455,8 +3455,8 @@ async function Ji(e, t, n, r) {
 		imagePath: e.geom.imagePath,
 		mimeType: e.geom.mimeType,
 		svgImagePath: e.geom.svgImagePath,
-		widthPt: t.nativeExtCx > 0 ? t.nativeExtCx * e.w / Te : 0,
-		heightPt: t.nativeExtCy > 0 ? t.nativeExtCy * e.h / Te : 0,
+		widthPt: t.nativeExtCx > 0 ? t.nativeExtCx * e.w / Oe : 0,
+		heightPt: t.nativeExtCy > 0 ? t.nativeExtCy * e.h / Oe : 0,
 		srcRect: e.geom.srcRect ?? null,
 		duotone: e.geom.duotone ?? null
 	});
@@ -3481,8 +3481,8 @@ async function Yi(e, t, n, r = {}) {
 async function Xi(e, t, n, r = {}) {
 	let { ws: i, styles: a } = e, o = /* @__PURE__ */ new Map();
 	await Ji(i, o, r.fetchImage), e.math && _i(i) && await vi(i, e.math);
-	let s = r.dpr ?? oe(), c = se(t) ? t.clientWidth || 800 : t.width, l = se(t) ? t.clientHeight || 600 : t.height, u = r.width ?? c, d = r.height ?? l, f = te(u * s, d * s), p = f.clamped ? s * f.scale : s, m = f.width, h = f.height;
-	if (t.width !== m && (t.width = m), t.height !== h && (t.height = h), se(t)) {
+	let s = r.dpr ?? ae(), c = oe(t) ? t.clientWidth || 800 : t.width, l = oe(t) ? t.clientHeight || 600 : t.height, u = r.width ?? c, d = r.height ?? l, f = te(u * s, d * s), p = f.clamped ? s * f.scale : s, m = f.width, h = f.height;
+	if (t.width !== m && (t.width = m), t.height !== h && (t.height = h), oe(t)) {
 		let e = `${u}px`, n = `${d}px`;
 		t.style.width !== e && (t.style.width = e), t.style.height !== n && (t.style.height = n);
 	}
@@ -3872,7 +3872,7 @@ var aa = class e {
 		this.assertResourceHealthy();
 		let r = {
 			...n,
-			dpr: n.dpr ?? oe()
+			dpr: n.dpr ?? ae()
 		};
 		if (this._mode === "worker") {
 			if (!Number.isInteger(e) || e < 0 || e >= this.sheetCount) throw Error(`Sheet index ${e} out of range (count: ${this.sheetCount})`);