@sheetxl/studio-vanilla 0.8.0-beta.10 → 0.8.0-beta.11

package/cdn/assets/{C6INLvBy8kdzFpsX.js → CdW0mis0FyG90paw.js}

@@ -1,17 +1,17 @@
 /**
-* @license @sheetxl/studio-vanilla - SheetXL Studio - Vanilla entry point for integrating SheetXL UI. - v0.8.0-beta.10
+* @license @sheetxl/studio-vanilla - SheetXL Studio - Vanilla entry point for integrating SheetXL UI. - v0.8.0-beta.11
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: The license can be found at https://www.sheetxl.com/license.
 */
-import { P as e } from "./CMxbiQ5J79M3n1tk.js";
-import { E as t, M as n, W as r, bt as i, ct as a } from "./BoFx07POTorOb5g-.js";
-import { i as o, l as s } from "./BAH_cWcQEIBKWnl6.js";
-import { $ as c, _ as l, it as u, q as d, s as f } from "./DuAbY54w5gJpQgss.js";
-import { a as p, i as m } from "./PzWqv-oXxEuzKdaT.js";
-import { Ct as h, Et as g, Ht as _, L as ee, M as v, T as y, Tt as b, an as x, c as te, ct as ne, gt as S, h as re, jt as C, l as w, lt as ie, mt as T, pt as E, q as D, tt as O, v as k, w as A, y as j, zt as M } from "./BuYS_ZjSlcvWZ1JC.js";
-import { i as N, r as P } from "./W1d6GQyySAHrtjEu.js";
-var F = class {
+import { W as e } from "./PD_ckP5IyZurtALu.js";
+import { A as t, Pt as n, U as r, bt as i, c as a, d as o, g as s } from "./u8iMUyjw60ayROFo.js";
+import { i as c, l } from "./Cl1bVTUk0rQUQT9p.js";
+import { Rt as u, lt as d, tn as f, tr as p, w as m } from "./D97AuczhOIBnqMXI.js";
+import { At as h, B as g, Bn as ee, Bt as te, Et as ne, G as _, Gn as v, Hn as y, In as b, Ln as x, Mn as S, N as re, Nn as ie, Ot as C, P as ae, Q as w, Qt as oe, S as se, Tt as T, Wn as ce, Wt as le, Y as E, Z as D, _ as ue, an as de, b as fe, bn as O, bt as k, c as A, d as j, dt as M, fn as pe, gt as me, i as he, j as ge, tt as _e, un as N, xt as P, zn as F } from "./D2H92O2Ji36qebTp.js";
+import "./D_d2cK3aSl0eMBpj.js";
+import { a as I, n as ve, o as ye } from "./CkgK3CrVsGp5FE2i.js";
+var L = class {
 	constructor(e) {
 		this.list = e;
 	}
@@ -37,13 +37,13 @@ var F = class {
 	[Symbol.iterator]() {
 		return this.list.values();
 	}
-}, I = (e) => !0 === e || e === "1" || e === "on" || e === "true" || !1 !== e && e !== "0" && e !== "off" && e !== "false" && null, ae = (e) => {
+}, be = (e) => !0 === e || e === "1" || e === "on" || e === "true" || !1 !== e && e !== "0" && e !== "off" && e !== "false" && null, xe = (e) => {
 	let t = parseInt(e);
 	return isNaN(t) ? null : t;
-}, oe = (e) => {
+}, Se = (e) => {
 	let t = parseFloat(e);
 	return isNaN(t) ? null : t;
-}, se = /* @__PURE__ */ new Map(), L = class {
+}, Ce = /* @__PURE__ */ new Map(), R = class {
 	constructor(t, n, r, i, a, o = null, s = e.EmptyObject) {
 		this._fileLocation = "", this._parent = t, this.sharedShared = n, this.currentPath = r, this.elemRoot = i, this.jsonRoot = a, t ? (this._fileLocation = t._fileLocation, this._getRef = t._getRef, this._getRefs = t._getRefs, this._serializeElement = t._serializeElement, this._readEmbeddedPart = t._readEmbeddedPart) : (o && (this._fileLocation = o), s?.getRef && (this._getRef = (e, t, n) => s?.getRef?.(e, t, n, s?.parsedRefs)), s?.getRefs && (this._getRefs = (e) => s?.getRefs?.(e, s?.parsedRefs)), this._onWarning = s?.onWarning, this._addPerson = s?.addPerson, this._serializeElement = s?.serializeElement, this._readEmbeddedPart = s?.readEmbeddedPart);
 	}
@@ -54,7 +54,7 @@ var F = class {
 		return this._readEmbeddedPart?.(e, this._fileLocation) ?? null;
 	}
 	getRelationships() {
-		return this._getRefs?.(this._fileLocation) ?? se;
+		return this._getRefs?.(this._fileLocation) ?? Ce;
 	}
 	getPath() {
 		return this.currentPath;
@@ -114,7 +114,7 @@ var F = class {
 			}
 			if (n = a, n.length === 0) return null;
 		}
-		return n.length === 1 ? n[0] : n.length === 0 ? null : new F(n);
+		return n.length === 1 ? n[0] : n.length === 0 ? null : new L(n);
 	}
 	_matchesElementName(e, t) {
 		return t.includes(":") ? (e.tagName || e.nodeName) === t : e.localName === t;
@@ -154,13 +154,13 @@ var F = class {
 		return n && n.hasAttribute("val") ? parseFloat(n.getAttribute("val")) ?? null : null;
 	}
 	get BOOLEAN_COPY() {
-		return I;
+		return be;
 	}
 	get INT_COPY() {
-		return ae;
+		return xe;
 	}
 	get FLOAT_COPY() {
-		return oe;
+		return Se;
 	}
 	copyFromAttribute(e, t, n, r = t, i = null) {
 		if (!e || !n || !e.hasAttribute(t)) return;
@@ -173,67 +173,123 @@ var F = class {
 		}
 		this.setToPath(n, r, a);
 	}
-}, R = class {
-	constructor(e) {
-		this.jsonKey = e;
+}, z = (e, t) => {
+	let n = [], r = e.childNodes, i = r.length;
+	for (let e = 0; e < i; e++) {
+		let i = r.item(e);
+		i.nodeType === 1 && i.localName === t && n.push(i);
 	}
-	visit(e, t, n) {
-		let r = {};
-		return n[this.jsonKey] = r, r;
+	return n;
+}, we = [
+	["fillRef", "fill"],
+	["lnRef", "stroke"],
+	["effectRef", "effect"]
+], B = (e, t) => {
+	let n = new E(), r = {};
+	for (let [i, a] of we) {
+		let o = e.evaluate(i, t);
+		if (!o) continue;
+		let s = { index: parseInt(o.getAttribute("idx") ?? "0", 10) || 0 }, c = n.processAdjColor(e, o);
+		c && (s.color = c), r[a] = s;
+	}
+	let i = e.evaluate("fontRef", t);
+	if (i) {
+		let t = { index: i.getAttribute("idx") ?? "none" }, a = n.processAdjColor(e, i);
+		a && (t.color = a), r.font = t;
 	}
-}, z = class {
+	return r;
+}, V = class {
 	visit(e, t, n) {
-		let r = {};
-		if (M(e, t, r, "grouping", "grouping"), E(e, t, r, "varyColors", "varyColors"), _(e, t, r, "gapWidth", "gapWidth", .01), _(e, t, r, "overlap", "overlap", .01), this.parseType(e, t, r), g(e, t, r, "bubbleScale", "bubbleScale"), E(e, t, r, "showNegBubbles", "showNegativeBubbleValues"), E(e, t, r, "sizeRepresents", "bubbleSizeRepresentsWidth"), g(e, t, r, "firstSliceAng", "startAngle"), g(e, t, r, "holeSize", "holeSize"), M(e, t, r, "scatterStyle", "scatterStyle"), this.parseAxisIds(e, t, r), Object.keys(r).length > 0) {
-			let t = e.getVisitorParamsState().get("types");
-			t || (e.warn("A chart type was read outside a chart; its types were started fresh.", { onceKey: "xlsx.chart.typesState" }), t = [], e.getVisitorParamsState().set("types", t)), t.push(r);
-		}
-		return r;
+		if (!t) return;
+		let r = e.evaluate("*/cNvPr", t);
+		return r.item && (r = r.item(0)), r && (e.copyFromAttribute(r, "name", n), e.copyFromAttribute(r, "descr", n, "description"), e.copyFromAttribute(r, "hidden", n, "hidden", e.BOOLEAN_COPY), this.readNonVisualDetails(e, r, n), e.copyFromAttribute(r, "id", n)), n;
 	}
-	parseType(e, t, n) {
-		switch (t.localName) {
-			case "areaChart":
-				n.type = "area";
-				break;
-			case "bubbleChart":
-				n.type = "bubble";
-				break;
-			case "doughnutChart":
-			case "ofPieType":
-			case "pieChart":
-				n.type = "pie";
-				break;
-			case "lineChart":
-				n.type = "line";
-				break;
-			case "scatterChart": n.type = "scatter";
-		}
+	readNonVisualDetails(e, t, n) {
+		t.hasAttribute("title") && (n.title = t.getAttribute("title"));
+		let r = e.evaluate("hlinkClick", t);
+		r && (n.hyperlink = M(e, r));
+		let i = e.evaluate("hlinkHover", t);
+		i && (n.hoverHyperlink = M(e, i));
+		let a = e.evaluate("extLst", t), o = a ? e.serializeElement(a) : null;
+		o && (n.extLst = {
+			...n.extLst,
+			nonVisual: o
+		});
 	}
-	parseAxisIds(e, t, n) {
-		let r = e.evaluate("axId", t);
-		r && r.length !== 0 && (n.xAxisId = r.item(0).getAttribute("val"), n.yAxisId = r.item(1).getAttribute("val"));
+	setContent(e, t) {
+		let n = e;
+		n.name !== void 0 && (t.name = n.name, delete n.name), n.description !== void 0 && (t.description = n.description, delete n.description);
+		for (let e of [
+			"title",
+			"hyperlink",
+			"hoverHyperlink",
+			"extLst"
+		]) n[e] !== void 0 && (t.json && (t.json[e] = n[e]), delete n[e]);
+		e.content = t;
+	}
+	isGroupContent(e) {
+		return Array.isArray(e?.members);
 	}
-}, B = (e, t, n) => {
-	if (!0 === e.getValAttrAsBoolean("invertIfNegative", t)) {
-		if (e.evaluate("extLst/ext/invertSolidFillFmt", t)) {
-			if (n.fill && n.fillNegative) {
-				let t = e.getFromPath(n, "fill.solid.adjs");
-				t && e.setToPath(n, "fillNegative.solid.adjs", t);
+	readMemberHeader(e, t, n) {
+		let r = {}, i = {
+			anchor: void 0,
+			content: {
+				type: n,
+				json: r
 			}
-		} else {
-			let e = { val: "FFFFFF" }, t = {};
-			t.solid = e, n.fillNegative = t;
-			let r = { val: "000000" }, i = {};
-			i.solid = r;
-			let a = {};
-			a.fill = i, n.strokeNegative = a;
+		}, a = e.evaluate("*/cNvPr", t);
+		if (a?.item && (a = a.item(0)), a) {
+			let n = a.getAttribute("name");
+			n !== null && (i.content.name = n);
+			let o = a.getAttribute("descr");
+			o && (i.content.description = o), e.copyFromAttribute(a, "hidden", i, "hidden", e.BOOLEAN_COPY), this.readNonVisualDetails(e, a, r);
+			let s = this.readSourceId(e, t);
+			s !== void 0 && (r.sourceId = s);
+		}
+		return {
+			movable: i,
+			content: r
+		};
+	}
+	readStyleRefs(e, n, r) {
+		let i = e.evaluate("style", n);
+		if (!i) return void (r.style = null);
+		let a = B(e, i), o = t.withoutDefaultStyleRefs({
+			...r,
+			style: a
+		});
+		o && (r.style = o);
+	}
+	readLocks(e) {
+		let t = e?.attributes;
+		if (!t || t.length === 0) return;
+		let n = {};
+		for (let e = 0; e < t.length; e++) {
+			let r = t.item(e);
+			r.name.startsWith("xmlns") || (n[r.localName ?? r.name] = P(r.value));
 		}
+		return Object.keys(n).length > 0 ? n : void 0;
 	}
-}, V = class {
+	readSourceId(e, t) {
+		let n = e.evaluate("*/cNvPr", t);
+		n?.item && (n = n.item(0));
+		let r = n?.getAttribute?.("id"), i = r ? parseInt(r, 10) : void 0;
+		return i === void 0 || isNaN(i) ? void 0 : i;
+	}
+}, Te = [
+	["spDef", "shape"],
+	["lnDef", "line"],
+	["txDef", "text"]
+], H = (e, t) => {
+	let n = t.getAttribute("dxfId");
+	if (n === null) return;
+	let r = parseInt(n);
+	return e.getVisitorParamsState().get("dxfs")?.get(r) || (e.warn(`A color filter or sort names a format that does not exist (dxfId '${n}').`), {});
+}, U = (e) => e === "1" || e === "true", W = class {
 	visit(e, t, n) {}
 	processDataBarColor(e, t, n, r, i = "auto") {
 		if (!t) return;
-		let a = P((e) => t.getAttribute(e), i);
+		let a = k((e) => t.getAttribute(e), i);
 		return a && (n[r] = a), n;
 	}
 	processFonts(e, t, n) {
@@ -249,14 +305,19 @@ var F = class {
 		return n;
 	}
 	processFont(e, t, n) {
-		e.getValAttrAsBoolean("b", t, !0) && (n.weight = 700), e.getValAttrAsBoolean("i", t, !0) && (n.style = i.Style.Italic), e.getValAttrAsBoolean("strike", t, !0) && (n.strike = !0);
+		e.getValAttrAsBoolean("b", t, !0) && (n.weight = 700), e.getValAttrAsBoolean("i", t, !0) && (n.style = o.Style.Italic), e.getValAttrAsBoolean("strike", t, !0) && (n.strike = x(!0));
 		let r = e.evaluate("u", t);
-		r && (n.underline = r.getAttribute("val") || i.UnderlineStyle.Single), M(e, t, n, "vertAlign", "verticalAlign"), n.verticalAlign === "superscript" ? n.verticalAlign = i.VerticalAlignment.Super : n.verticalAlign === "subscript" && (n.verticalAlign = i.VerticalAlignment.Sub), _(e, t, n, "sz", "size");
+		if (r) {
+			let e = r.getAttribute("val");
+			n.underline = g(e);
+		}
+		let i = D(e.evaluate("vertAlign", t)?.getAttribute("val"));
+		i !== void 0 && (n.baseline = i), _e(e, t, n, "sz", "size");
 		let a = e.evaluate("color", t);
-		this.processDataBarColor(e, a, n, "color"), n.color ||= "auto", M(e, t, n, "name", "family"), M(e, t, n, "rFont", "family");
-		let o = e.evaluate("family", t);
-		if (o) {
-			let e = o.getAttribute("val");
+		this.processDataBarColor(e, a, n, "color"), n.color ||= "auto", w(e, t, n, "name", "family"), w(e, t, n, "rFont", "family");
+		let s = e.evaluate("family", t);
+		if (s) {
+			let e = s.getAttribute("val");
 			if (e) switch (e) {
 				case "1":
 					n.fallbacks = ["serif"];
@@ -273,7 +334,12 @@ var F = class {
 				case "5": n.fallbacks = ["fantasy"];
 			}
 		}
-		return M(e, t, n, "scheme", "scheme"), n.family !== void 0 && n.scheme === void 0 && (n.scheme = i.Scheme.None), E(e, t, n, "shadow", "shadow", !0), E(e, t, n, "outline", "outline", !0), e.getValAttrAsBoolean("condense", t, !0) && (n.letterSpacing = -1), e.getValAttrAsBoolean("extend", t, !0) && (n.letterSpacing = 1), g(e, t, n, "charset", "charset"), n;
+		T(n, e.evaluate("scheme", t)?.getAttribute("val")), A(e, t, n, "shadow", "shadow", !0), A(e, t, n, "outline", "outline", !0);
+		for (let r of ["condense", "extend"]) {
+			let i = j(r, !!e.getValAttrAsBoolean(r, t, !0));
+			i !== void 0 && (n.letterSpacing = i);
+		}
+		return F(e, t, n, "charset", "charset"), n;
 	}
 	processFills(e, t, n) {
 		if (!t) return;
@@ -284,29 +350,29 @@ var F = class {
 		}
 		return n;
 	}
-	processFill(e, n, r, i) {
-		let a = { type: t.Type.None }, o = n.childNodes, s = !1, c = o.length;
+	processFill(e, t, n, i) {
+		let a = { type: r.Type.None }, o = t.childNodes, s = !1, c = o.length;
 		for (let t = 0; !s && t < c; t++) {
 			let n = o.item(t);
 			n.nodeType === 1 && (n.localName === "gradientFill" ? (this.processGradientFill(e, n, a), s = !0) : n.localName === "patternFill" && (this.processPatternFill(e, n, a), s = !0));
 		}
-		return r[i] = a, r;
+		return n[i] = a, n;
 	}
-	processGradientFill(e, n, r) {
-		if (!n) return;
-		r.type = t.Type.Gradient;
+	processGradientFill(e, t, n) {
+		if (!t) return;
+		n.type = r.Type.Gradient;
 		let i = [];
-		r.stops = i;
-		let a = n.getAttribute("type");
-		a && (r.gradientType = a);
-		let o = n.hasAttribute("degree") ? parseFloat(n.getAttribute("degree")) : 0;
-		(o + 90) % 360 != 0 && (r.angle = (o + 90) % 360), (n.hasAttribute("left") || n.hasAttribute("top") || n.hasAttribute("right") || n.hasAttribute("bottom")) && (r.focus = {
-			left: H(n.getAttribute("left")),
-			top: H(n.getAttribute("top")),
-			right: H(n.getAttribute("right")),
-			bottom: H(n.getAttribute("bottom"))
+		n.stops = i;
+		let a = t.getAttribute("type");
+		a && (n.gradientType = a);
+		let o = t.hasAttribute("degree") ? parseFloat(t.getAttribute("degree")) : 0;
+		(o + 90) % 360 != 0 && (n.angle = (o + 90) % 360), (t.hasAttribute("left") || t.hasAttribute("top") || t.hasAttribute("right") || t.hasAttribute("bottom")) && (n.focus = {
+			left: G(t.getAttribute("left")),
+			top: G(t.getAttribute("top")),
+			right: G(t.getAttribute("right")),
+			bottom: G(t.getAttribute("bottom"))
 		});
-		let s = n.childNodes, c = s.length;
+		let s = t.childNodes, c = s.length;
 		for (let t = 0; t < c; t++) {
 			let n = s.item(t);
 			if (n.nodeType === 1 && n.localName === "stop") {
@@ -316,22 +382,22 @@ var F = class {
 				this.processDataBarColor(e, r, t, "color");
 			}
 		}
-		return r;
+		return n;
 	}
-	processPatternFill(e, n, r) {
-		if (!n) return;
-		let i = e.getVisitorParamsState().get("processingDXFs"), a = n.getAttribute("patternType") || (i ? t.BuiltInSheetPattern.Solid : t.BuiltInSheetPattern.None);
-		if (a === t.BuiltInSheetPattern.None) return { none: !0 };
-		r.type = t.Type.Pattern, a && (r.patternType = a);
-		let o = "foreground", s = "background", c = r.patternType === t.BuiltInSheetPattern.Solid && i, l = c ? "dk1" : "lt1", u = c ? "lt1" : "dk1";
+	processPatternFill(e, t, n) {
+		if (!t) return;
+		let i = e.getVisitorParamsState().get("processingDXFs"), a = t.getAttribute("patternType") || (i ? r.BuiltInSheetPattern.Solid : r.BuiltInSheetPattern.None);
+		if (a === r.BuiltInSheetPattern.None) return { none: !0 };
+		n.type = r.Type.Pattern, a && (n.patternType = a);
+		let o = "foreground", s = "background", c = n.patternType === r.BuiltInSheetPattern.Solid && i, l = c ? "dk1" : "lt1", u = c ? "lt1" : "dk1";
 		if (c) {
 			let e = o;
 			o = s, s = e;
 		}
-		let d = e.evaluate("fgColor", n);
-		this.processDataBarColor(e, d, r, o, l);
-		let f = e.evaluate("bgColor", n);
-		return this.processDataBarColor(e, f, r, s, u), c && (r.foreground ||= "lt1", r.background ||= "dk1"), r;
+		let d = e.evaluate("fgColor", t);
+		this.processDataBarColor(e, d, n, o, l);
+		let f = e.evaluate("bgColor", t);
+		return this.processDataBarColor(e, f, n, s, u), c && (n.foreground ||= "lt1", n.background ||= "dk1"), n;
 	}
 	processBorders(e, t, n, r) {
 		if (!t) return;
@@ -342,29 +408,31 @@ var F = class {
 		}
 		return n;
 	}
-	processBorder(e, t, r, i, a) {
+	processBorder(e, t, n, r, a) {
 		if (!t) return;
 		let o = {};
-		return this.processBorderStroke(e, t, o, n.Edge.Left), this.processBorderStroke(e, t, o, n.Edge.Right), a ? (o.right || o.left) && (o.vertical = o.right ? { ...o.right } : { ...o.left }) : this.processBorderStroke(e, t, o, n.Edge.Vertical), this.processBorderStroke(e, t, o, n.Edge.Top), this.processBorderStroke(e, t, o, n.Edge.Bottom), a ? (o.bottom || o.top) && (o.horizontal = o.bottom ? { ...o.bottom } : { ...o.top }) : this.processBorderStroke(e, t, o, n.Edge.Horizontal), r[i] = o, r;
+		this.processBorderStroke(e, t, o, i.Edge.Left), this.processBorderStroke(e, t, o, i.Edge.Right), a ? (o.right || o.left) && (o.vertical = o.right ? { ...o.right } : { ...o.left }) : this.processBorderStroke(e, t, o, i.Edge.Vertical), this.processBorderStroke(e, t, o, i.Edge.Top), this.processBorderStroke(e, t, o, i.Edge.Bottom), a ? (o.bottom || o.top) && (o.horizontal = o.bottom ? { ...o.bottom } : { ...o.top }) : this.processBorderStroke(e, t, o, i.Edge.Horizontal);
+		let s = this.processBorderStroke(e, t, {}, "diagonal");
+		return s && (U(t.getAttribute("diagonalUp")) && (o.diagonalUp = { ...s }), U(t.getAttribute("diagonalDown")) && (o.diagonalDown = { ...s })), n[r] = o, n;
 	}
-	processBorderStroke(e, t, r, i) {
+	processBorderStroke(e, t, n, r) {
 		if (!t) return;
-		let a = e.evaluate(i, t);
+		let a = e.evaluate(r, t);
 		if (!a) return;
 		let o = {};
-		a.hasAttribute("style") ? o.style = a.getAttribute("style") : e.getVisitorParamsState().get("processingDXFs") && (o.style = n.StrokeStyle.None);
+		a.hasAttribute("style") ? o.style = a.getAttribute("style") : e.getVisitorParamsState().get("processingDXFs") && (o.style = i.StrokeStyle.None);
 		let s = e.evaluate("color", a);
-		return s && this.processDataBarColor(e, s, o, "color"), Object.keys(o).length > 0 ? r[i] = o : null;
+		return s && this.processDataBarColor(e, s, o, "color"), Object.keys(o).length > 0 ? n[r] = o : null;
 	}
-}, H = (e) => {
+}, G = (e) => {
 	if (!e) return 0;
 	let t = parseFloat(e);
 	return isNaN(t) ? 0 : t;
-}, U = new Set(Object.values(d.ElementType).filter((e) => e !== d.ElementType.WholeTable && e !== d.ElementType.HeaderRow)), W = {
+}, Ee = new Set(Object.values(u.ElementType).filter((e) => e !== u.ElementType.WholeTable && e !== u.ElementType.HeaderRow)), De = {
 	auto: "auto",
 	autoNoTable: "automaticExceptTables",
 	manual: "manual"
-}, G = [
+}, K = [
 	"tableId",
 	"columnId",
 	"cacheName",
@@ -373,10 +441,10 @@ var F = class {
 	"sortOrder",
 	"customListSort",
 	"crossFilter"
-], K = (e, t) => {
+], q = (e, t) => {
 	let n = e.content, r = n?.json;
 	if (r) {
-		if (n.type === "shape" || t && n.type === "picture") {
+		if (n.type === "shape" || n.type === "picture") {
 			let { rotation: n, flipH: i, flipV: a, bounds: o } = r;
 			delete r.rotation, delete r.flipH, delete r.flipV, delete r.bounds, n !== void 0 && n !== 0 && (e.rotation = n), i && (e.flipH = !0), a && (e.flipV = !0), t && o && (e.anchor = {
 				tl: {
@@ -389,135 +457,41 @@ var F = class {
 				}
 			});
 		}
-		if (n.type === "group") for (let e of r.members ?? []) K(e, !0);
+		if (n.type === "group") for (let e of r.members ?? []) q(e, !0);
 	}
-}, ce = [
-	["fillRef", "fill"],
-	["lnRef", "stroke"],
-	["effectRef", "effect"]
-], q = class {
-	visit(e, t, n) {
-		if (!t) return;
-		let r = e.evaluate("*/cNvPr", t);
-		return r.item && (r = r.item(0)), r && (e.copyFromAttribute(r, "name", n), e.copyFromAttribute(r, "descr", n, "description"), e.copyFromAttribute(r, "hidden", n, "hidden", e.BOOLEAN_COPY), this.readNonVisualDetails(e, r, n), e.copyFromAttribute(r, "id", n)), n;
-	}
-	readNonVisualDetails(e, t, n) {
-		t.hasAttribute("title") && (n.title = t.getAttribute("title"));
-		let r = e.evaluate("hlinkClick", t);
-		r && (n.hyperlink = j(e, r));
-		let i = e.evaluate("hlinkHover", t);
-		i && (n.hoverHyperlink = j(e, i));
-		let a = e.evaluate("extLst", t), o = a ? e.serializeElement(a) : null;
-		o && (n.extLst = {
-			...n.extLst,
-			nonVisual: o
-		});
-	}
-	setContent(e, t) {
-		let n = e;
-		n.name !== void 0 && (t.name = n.name, delete n.name), n.description !== void 0 && (t.description = n.description, delete n.description);
-		for (let e of [
-			"title",
-			"hyperlink",
-			"hoverHyperlink",
-			"extLst"
-		]) n[e] !== void 0 && (t.json && (t.json[e] = n[e]), delete n[e]);
-		e.content = t;
-	}
-	isGroupContent(e) {
-		return Array.isArray(e?.members);
-	}
-	readMemberHeader(e, t, n) {
-		let r = {}, i = {
-			anchor: void 0,
-			content: {
-				type: n,
-				json: r
-			}
-		}, a = e.evaluate("*/cNvPr", t);
-		if (a?.item && (a = a.item(0)), a) {
-			let n = a.getAttribute("name");
-			n !== null && (i.content.name = n);
-			let o = a.getAttribute("descr");
-			o && (i.content.description = o), e.copyFromAttribute(a, "hidden", i, "hidden", e.BOOLEAN_COPY), this.readNonVisualDetails(e, a, r);
-			let s = this.readSourceId(e, t);
-			s !== void 0 && (r.sourceId = s);
-		}
-		return {
-			movable: i,
-			content: r
-		};
-	}
-	readStyleRefs(e, t, n) {
-		let r = e.evaluate("style", t);
-		if (!r) return void (n.style = null);
-		let i = new w(), a = {};
-		for (let [t, n] of ce) {
-			let o = e.evaluate(t, r);
-			if (!o) continue;
-			let s = { index: parseInt(o.getAttribute("idx") ?? "0", 10) || 0 }, c = i.processAdjColor(e, o);
-			c && (s.color = c), a[n] = s;
-		}
-		let o = e.evaluate("fontRef", r);
-		if (o) {
-			let t = { index: o.getAttribute("idx") ?? "none" }, n = i.processAdjColor(e, o);
-			n && (t.color = n), a.font = t;
-		}
-		let s = p.withoutDefaultStyleRefs({
-			...n,
-			style: a
-		});
-		s && (n.style = s);
-	}
-	readLocks(e) {
-		let t = e?.attributes;
-		if (!t || t.length === 0) return;
-		let n = {};
-		for (let e = 0; e < t.length; e++) {
-			let r = t.item(e);
-			r.name.startsWith("xmlns") || (n[r.localName ?? r.name] = S(r.value));
-		}
-		return Object.keys(n).length > 0 ? n : void 0;
-	}
-	readSourceId(e, t) {
-		let n = e.evaluate("*/cNvPr", t);
-		n?.item && (n = n.item(0));
-		let r = n?.getAttribute?.("id"), i = r ? parseInt(r, 10) : void 0;
-		return i === void 0 || isNaN(i) ? void 0 : i;
-	}
-}, J = class extends q {
+}, J = class extends V {
 	visit(e, t, n) {
 		if (t) return this.visitShape(e, t, n, "sp", "nvSpPr/cNvSpPr/spLocks");
 	}
 	visitShape(e, t, n, r, i) {
-		let a = y[r];
+		let o = ie[r];
 		if (this.isGroupContent(n)) {
 			if (e.getPath().includes("Fallback")) return {};
-			let { movable: o, content: s } = this.readMemberHeader(e, t, "shape");
-			a !== m.Type.Shape && (s.type = a), this.readStyleRefs(e, t, s), this.readShapeDetails(e, t, r, i, s);
-			let c = e.evaluate(i, t);
-			c?.hasAttribute?.("noChangeAspect") && (o.lockAspect = c.getAttribute("noChangeAspect") === "1");
-			let l = this.readTwinOf(e, t);
-			return l !== void 0 && Object.assign(s, { twinOf: l }), n.members.push(o), s;
+			let { movable: s, content: c } = this.readMemberHeader(e, t, "shape");
+			o !== a.Type.Shape && (c.type = o), this.readShapeDetails(e, t, r, i, c), this.readStyleRefs(e, t, c);
+			let l = e.evaluate(i, t);
+			l?.hasAttribute?.("noChangeAspect") && (s.lockAspect = l.getAttribute("noChangeAspect") === "1");
+			let u = this.readTwinOf(e, t);
+			return u !== void 0 && Object.assign(c, { twinOf: u }), n.members.push(s), c;
 		}
 		if (e.getPath().includes("Fallback") && n.content) {
 			let r = n.content.json;
-			if (n.content.type === "shape" && r && (r.type ?? m.Type.Shape) === a) {
-				let n = e.evaluate("txBody", t), i = n ? new O().readTextBody(e, n) : null;
-				i && D(i) !== "" && (r.text = i);
+			if (n.content.type === "shape" && r && (r.type ?? a.Type.Shape) === o) {
+				let n = e.evaluate("txBody", t), i = n ? new S().readTextBody(e, n) : null;
+				i && pe(i) !== "" && (r.text = i);
 			}
 			return {};
 		}
 		n = super.visit(e, t, n);
-		let o = e.evaluate(i, t);
-		o?.hasAttribute?.("noChangeAspect") && (n.lockAspect = o.getAttribute("noChangeAspect") === "1");
-		let s = a === m.Type.Shape ? {} : { type: a }, c = this.readSourceId(e, t);
-		c !== void 0 && (s.sourceId = c), this.readStyleRefs(e, t, s), this.readShapeDetails(e, t, r, i, s);
-		let l = this.readTwinOf(e, t);
-		return l !== void 0 && Object.assign(s, { twinOf: l }), this.setContent(n, {
+		let s = e.evaluate(i, t);
+		s?.hasAttribute?.("noChangeAspect") && (n.lockAspect = s.getAttribute("noChangeAspect") === "1");
+		let c = o === a.Type.Shape ? {} : { type: o }, l = this.readSourceId(e, t);
+		l !== void 0 && (c.sourceId = l), this.readShapeDetails(e, t, r, i, c), this.readStyleRefs(e, t, c);
+		let u = this.readTwinOf(e, t);
+		return u !== void 0 && Object.assign(c, { twinOf: u }), this.setContent(n, {
 			type: "shape",
-			json: s
-		}), s;
+			json: c
+		}), c;
 	}
 	readTwinOf(e, t) {
 		let n = e.evaluate("*/cNvPr/extLst/ext/compatExt", t);
@@ -529,7 +503,7 @@ var F = class {
 		let a = t.getAttribute("macro");
 		a && (i.macro = a);
 		let o = t.getAttribute("textlink");
-		o && (i.textLink = o), t.hasAttribute("fLocksText") && (i.locksText = S(t.getAttribute("fLocksText"))), t.hasAttribute("fPublished") && (i.published = S(t.getAttribute("fPublished")));
+		o && (i.textLink = o), t.hasAttribute("fLocksText") && (i.locksText = P(t.getAttribute("fLocksText"))), t.hasAttribute("fPublished") && (i.published = P(t.getAttribute("fPublished")));
 		let s = r.slice(0, r.lastIndexOf("/")), c = e.evaluate(s, t);
 		c?.getAttribute?.("txBox") === "1" && (i.textBox = !0);
 		let l = this.readLocks(e.evaluate(r, t));
@@ -544,25 +518,25 @@ var F = class {
 			(n || r) && (i.connectorEnds = {}, n && (i.connectorEnds.start = n), r && (i.connectorEnds.end = r));
 		}
 	}
-}, Y = (e, t, n, r) => {
+}, Oe = /^<a:extLst(?:\s+xmlns:a="[^"]*")?><a:ext uri="\{28A0092B-C50C-407E-A947-70E740481C1C\}"><a14:useLocalDpi(?:\s+xmlns:a14="[^"]*")?\s+val="0"\s*\/><\/a:ext><\/a:extLst>$/, Y = (e, t, n, r) => {
 	let i = e.evaluate(n, t), a = e.evaluate(r, t);
 	return i || a ? {
-		x: T(i?.getAttribute("x") ?? null) ?? 0,
-		y: T(i?.getAttribute("y") ?? null) ?? 0,
-		width: T(a?.getAttribute("cx") ?? null) ?? 0,
-		height: T(a?.getAttribute("cy") ?? null) ?? 0
+		x: N(i?.getAttribute("x") ?? null) ?? 0,
+		y: N(i?.getAttribute("y") ?? null) ?? 0,
+		width: N(a?.getAttribute("cx") ?? null) ?? 0,
+		height: N(a?.getAttribute("cy") ?? null) ?? 0
 	} : null;
 }, X = "richTypes", Z = "richData", Q = (e) => {
 	let t = e.getAttribute("val");
 	return t !== "0" && t !== "false";
-}, le = {
+}, ke = {
 	1: "serif",
 	2: "sans-serif",
 	3: "monospace",
 	4: "cursive",
 	5: "fantasy"
 };
-function ue(e) {
+function Ae(e) {
 	let t = {}, n = e.childNodes;
 	for (let e = 0; e < n.length; e++) {
 		let r = n.item(e);
@@ -571,10 +545,10 @@ function ue(e) {
 				t.weight = Q(r) ? 700 : 400;
 				break;
 			case "i":
-				t.style = Q(r) ? i.Style.Italic : i.Style.Normal;
+				t.style = Q(r) ? o.Style.Italic : o.Style.Normal;
 				break;
 			case "strike":
-				t.strike = Q(r);
+				t.strike = x(Q(r));
 				break;
 			case "outline":
 				t.outline = Q(r);
@@ -582,15 +556,18 @@ function ue(e) {
 			case "shadow":
 				t.shadow = Q(r);
 				break;
-			case "extend":
-				t.extend = Q(r);
+			case "condense":
+			case "extend": {
+				let e = j(r.localName, Q(r));
+				e !== void 0 && (t.letterSpacing = e);
 				break;
+			}
 			case "u":
-				t.underline = r.getAttribute("val") || i.UnderlineStyle.Single;
+				t.underline = g(r.getAttribute("val"));
 				break;
 			case "vertAlign": {
-				let e = r.getAttribute("val");
-				e === "superscript" ? t.verticalAlign = i.VerticalAlignment.Super : e === "subscript" ? t.verticalAlign = i.VerticalAlignment.Sub : e === "baseline" && (t.verticalAlign = i.VerticalAlignment.Baseline);
+				let e = D(r.getAttribute("val"));
+				e !== void 0 && (t.baseline = e);
 				break;
 			}
 			case "sz": {
@@ -604,7 +581,7 @@ function ue(e) {
 				break;
 			}
 			case "family": {
-				let e = le[r.getAttribute("val") ?? ""];
+				let e = ke[r.getAttribute("val") ?? ""];
 				e && (t.fallbacks = [e]);
 				break;
 			}
@@ -613,18 +590,16 @@ function ue(e) {
 				isNaN(e) || (t.charset = e);
 				break;
 			}
-			case "scheme": {
-				let e = r.getAttribute("val");
-				e && (t.scheme = e);
+			case "scheme":
+				T(t, r.getAttribute("val"));
 				break;
-			}
 			case "color": {
 				let e = r.getAttribute("rgb");
 				if (e && !r.hasAttribute("theme")) {
 					t.color = "#" + (e.length === 8 ? e.substring(2) : e).toUpperCase();
 					break;
 				}
-				let n = P((e) => r.getAttribute(e));
+				let n = k((e) => r.getAttribute(e));
 				n && (t.color = n);
 				break;
 			}
@@ -668,14 +643,37 @@ var $ = {
 	},
 	AppPropertiesVisitor: class {
 		visit(e, t, n) {
-			let r = [], i = t.childNodes, a = i.length;
-			for (let t = 0; t < a; t++) {
-				let n = i.item(t);
+			let r = t.childNodes, i = r.length;
+			for (let e = 0; e < i; e++) if (r.item(e).localName === "property") return this.visitCustom(t, n);
+			let a = [];
+			for (let t = 0; t < i; t++) {
+				let n = r.item(t);
 				if (n.nodeType !== 1) continue;
-				let a = this.processProperty(e, n);
-				a && r.push(a);
+				let i = this.processProperty(e, n);
+				i && a.push(i);
 			}
-			return r.length > 0 && (n.properties = r), r;
+			return a.length > 0 && (n.properties = a), a;
+		}
+		visitCustom(e, t) {
+			let n = [], r = e.childNodes, i = r.length;
+			for (let e = 0; e < i; e++) {
+				let t = r.item(e);
+				if (t.nodeType !== 1 || t.localName !== "property") continue;
+				let i = t.getAttribute("name");
+				if (!i) continue;
+				let a = null;
+				for (let e = 0; e < t.childNodes.length && !a; e++) {
+					let n = t.childNodes.item(e);
+					n.nodeType === 1 && (a = n);
+				}
+				let o = {
+					key: i,
+					kind: a?.localName ?? null,
+					value: a?.textContent ?? ""
+				}, s = t.getAttribute("linkTarget");
+				s && (o.linkTarget = s), n.push(o);
+			}
+			return n.length > 0 && (t.custom = n), n;
 		}
 		processProperty(e, t) {
 			if (t) return {
@@ -684,272 +682,37 @@ var $ = {
 			};
 		}
 	},
-	ChartSpaceVisitor: class {
-		visit(e, t, n) {
-			return E(e, t, n, "roundedCorners", "roundedCorners"), g(e, t, n, ".//AlternateContent/Fallback/style", "styleId"), e.getVisitorParamsState().set("types", []), e.getVisitorParamsState().set("axes", /* @__PURE__ */ new Map()), n.range = null, n;
-		}
-		afterVisit(e, t, n) {
-			let r = {};
-			n.types = r;
-			let i = {}, a = 0, o = {}, s = 0, c = e.getVisitorParamsState().get("axes"), l = e.getVisitorParamsState().get("types"), u = l.length;
-			for (let e = 0; e < u; e++) {
-				let t = l[e];
-				if (t.xAxisId) {
-					let r = t.xAxisId, o = c.get(r);
-					i[e + ""] = o, t.offsetXAxis = e, delete t.xAxisId, n.xAxes = i, i.length = ++a;
-				}
-				if (t.yAxisId) {
-					let r = t.yAxisId, i = c.get(r);
-					o[e + ""] = i, t.offsetYAxis = e, delete t.yAxisId, n.yAxes = o, o.length = ++s;
-				}
-				r[e + ""] = t;
-			}
-			r.length = l.length;
-			let d = e.getVisitorParamsState().get("series");
-			if (!d || d.length === 0) return;
-			let f = {};
-			n.series = f;
-			let p = d.length;
-			for (let e = 0; e < p; e++) f[e + ""] = d[e];
-			f.length = p, e.getVisitorParamsState().delete("types"), e.getVisitorParamsState().delete("axes"), e.getVisitorParamsState().delete("series");
-		}
-	},
-	ChartVisitor: class {
-		visit(e, t, n) {
-			return e.getVisitorParamsState().set("types", []), e.getVisitorParamsState().set("axes", /* @__PURE__ */ new Map()), E(e, t, n, "plotVisOnly", "plotVisOnly"), M(e, t, n, "dispBlanksAs", "dispBlanksAs"), E(e, t, n, ".//extLst/ext/dataDisplayOptions16/dispNaAsBlank", "dispNaAsBlank"), E(e, t, n, "showDLblsOverMax", "showDLblsOverMax"), n;
-		}
-		afterVisit(e, t, n) {
-			try {
-				let r = e.getValAttrAsBoolean("autoTitleDeleted", t), i = e.evaluate("title", t);
-				e.setToPath(n, "title.shown", !(!0 === r || !i));
-				let a = e.evaluate("legend", t);
-				e.setToPath(n, "legend.shown", a !== null);
-			} catch (e) {
-				throw Error("Unexpected Error parsing Chart: " + e);
-			}
-		}
-	},
-	PlotAreaVisitor: class {
-		visit(e, t, n) {
-			let r = {};
-			return n.plotArea = r, r;
-		}
-	},
-	ShapePropertiesVisitor: v,
-	BarChartTypeVisitor: class extends z {
-		parseType(e, t, n) {
-			let r = e.getValAttrAsString("barDir", t);
-			r && (n.type = r === "col" ? "column" : "bar");
-		}
-	},
-	ChartTypeVisitor: z,
-	DataLabelsVisitor: class {
-		constructor(e) {
-			this.jsonKey = e;
-		}
-		visit(e, t, n) {
-			let r = {}, i = r, a = e.getValAttrAsString("idx", t);
-			a !== null && (i = {}, i[a] = r);
-			let o = e.getValAttrAsBoolean("delete", t);
-			this.parseNumFormat(e, t, r), !0 === o ? (r.showBubbleSize = !1, r.showCatName = !1, r.showLeaderLines = !1, r.showPercentage = !1, r.showSerName = !1, r.showVal = !1, r.showLegendKey = !1) : (E(e, t, r, "showBubbleSize", "showBubbleSize"), E(e, t, r, "showCatName", "showCatName"), E(e, t, r, "showLeaderLines", "showLeaderLines"), E(e, t, r, "showPercent", "showPercentage"), E(e, t, r, "showSerName", "showSerName"), E(e, t, r, "showVal", "showVal"), E(e, t, r, "showLegendKey", "showLegendKey"));
-			let s = e.evaluate("separator", t);
-			return s !== null && (r.separator = s.textContent), M(e, t, r, "dLblPos", "position"), n[this.jsonKey] = i, r;
-		}
-		parseNumFormat(e, t, n) {
-			let r = e.evaluate("numFmt", t);
-			r && (n.formatCode = r.getAttribute("formatCode"), r.hasAttribute("sourceLinked") && (n.sourceLinked = r.getAttribute("sourceLinked") === "1"));
-		}
-	},
-	SeriesVisitor: class {
+	ShapePropertiesVisitor: O,
+	TextPropertiesVisitor: me,
+	ShapeTextVisitor: S,
+	ThemeVisitor: class {
 		visit(e, t, n) {
-			let r = {};
-			g(e, t, r, "explosion", "explosion");
-			let i = e.evaluate("cat/*/f", t);
-			i ||= e.evaluate("xVal/*/f", t);
-			let a = null;
-			i !== null && i.firstChild !== null && (a = i.firstChild.nodeValue), i || (i = e.evaluate("cat/strLit", t), i ||= e.evaluate("cat/numLit", t), i && (a = this.parsePointsAsString(e, i))), a !== null && (r.xRange = a);
-			let o = e.evaluate("val/*/f", t);
-			o ||= e.evaluate("yVal/*/f", t);
-			let s = null;
-			o && o.firstChild && (s = o.firstChild.nodeValue), o || (o = e.evaluate("val/numLit", t), o !== null && (s = this.parsePointsAsString(e, o))), s !== null && (r.valRange = s), this.parseTitleRangeOrValue(e, t, r), g(e, t, r, "idx", "idx"), E(e, t, r, "smooth", "smooth"), r.offsetChart = e.getVisitorParamsState().get("types").length - 1;
-			let c = e.getVisitorParamsState().get("series");
-			return c || (c = [], e.getVisitorParamsState().set("series", c)), c.push(r), r;
-		}
-		parseTitleRangeOrValue(e, t, n) {
-			let r = e.evaluate("tx/strRef/f", t);
-			if (r !== null) {
-				let t = r.firstChild.nodeValue;
-				e.setToPath(n, "title.range", t);
-			} else {
-				let r = e.evaluate("tx/v", t);
-				r !== null && e.setToPath(n, "title.text.simpleRun", r.firstChild.nodeValue);
-			}
-		}
-		parsePointsAsString(e, t) {
-			let n = "{", r = e.getValAttrAsInteger("ptCount", t), i = e.evaluate("pt", t), a = [];
-			for (let n = 0; i && r && n < r; n++) {
-				let r = null, i = e.evaluate("pt[@idx='" + n + "']/v", t);
-				i && (r = i.textContent), a[n] = r;
-			}
-			for (let e = 0; e < a.length; e++) e > 0 && (n += ","), a[e] !== void 0 && (n += a[e]);
-			return n += "}", n;
-		}
-		afterVisit(e, t, n) {
-			B(e, t, n);
-			let r = e.getFromPath(n, "points");
+			n.name = t.getAttribute("name"), n.objectDefaults = {};
+			let r = z(t, "custClrLst")[0];
 			if (r) {
-				let t = Object.keys(r);
-				for (let i = 0; i < t.length; i++) {
-					let a = t[i], o = e.getFromPath(r, a);
-					if (!o) continue;
-					let s = e.getFromPath(o, "markers");
-					s && (e.setToPath(n, "markers.points." + a, s), delete o.markers);
+				let t = new E(), i = [];
+				for (let n of z(r, "custClr")) {
+					let r = t.processAdjColor(e, n);
+					if (!r) continue;
+					let a = { color: r }, o = n.getAttribute("name");
+					o && (a.name = o), i.push(a);
 				}
+				i.length && (n.customColors = i);
 			}
-		}
-	},
-	DataPointVisitor: class {
-		DataPointVisitor() {}
-		visit(e, t, n) {
-			let r = e.getFromPath(n, "points"), i = null;
-			r ? i = r : (i = {}, e.setToPath(n, "points", i));
-			let a = {}, o = e.getValAttrAsString("idx", t);
-			return o !== null && (i[o] = a), E(e, t, a, "bubble3D", "bubble3D"), g(e, t, a, "explosion", "explosion"), B(e, t, a), a;
-		}
-	},
-	MarkerVisitor: class {
-		visit(e, t, n) {
-			let r = t.parentNode.localName;
-			if (r === "ser" || r === "dPt") {
-				let r = {}, i = e.getValAttrAsString("size", t);
-				i !== null && (r.size = i);
-				let a = e.getValAttrAsString("symbol", t);
-				return a && (r.type = a), n.markers = r, r;
-			}
-			return null;
-		}
-	},
-	AxisVisitor: class {
-		visit(e, t, n) {
-			let r = {};
-			this.parseScaling(e, t, r), _(e, t, r, "majorUnit", "majorUnits"), _(e, t, r, "minorUnit", "minorUnits"), E(e, t, r, "delete", "shown"), this.parseOrientation(e, t, r), this.parseNumFormat(e, t, r), M(e, t, r, "majorTickMark", "majorTickMarks"), M(e, t, r, "minorTickMark", "minorTickMarks"), M(e, t, r, "crosses", "crosses"), _(e, t, r, "crossesAt", "crosses"), M(e, t, r, "crossBetween", "crossBetween"), this.parseLabelAlign(e, t, r), g(e, t, r, "lblOffset", "labelOffset"), M(e, t, r, "tickLblPos", "labelPosition");
-			let i = e.getValAttrAsInteger("noMultiLvlLbl", t);
-			r.labelMultiLevel = i !== null && i === 0, g(e, t, r, "tickMarkSkip", "tickMarkSkip"), g(e, t, r, "tickLblSkip", "labelInterval"), this.parseDisplayCustOrBuiltInUnit(t, e, r), this.parseTimeUnits(e, t, r, "majorUnitDates", "majorTimeUnit", "majorUnit"), this.parseTimeUnits(e, t, r, "minorUnitDates", "minorTimeUnit", "minorUnit"), M(e, t, r, "baseTimeUnit", "baseUnitDates"), e.getVisitorParamsState().get("axes") || (e.warn("An axis was read outside a chart; its axes were started fresh.", { onceKey: "xlsx.chart.axesState" }), e.getVisitorParamsState().set("axes", /* @__PURE__ */ new Map()));
-			let a = e.getValAttrAsString("axId", t);
-			return e.getVisitorParamsState().get("axes").set(a, r), r;
-		}
-		parseTimeUnits(e, t, n, r, i, a) {
-			let o = {}, s = e.getValAttrAsString(i, t);
-			s !== null && (o.dem = s, o.amt = e.getValAttrAsString(a, t)), Object.keys(o).length > 0 && (n[r] = o);
-		}
-		parseDisplayCustOrBuiltInUnit(e, t, n) {
-			let r = t.getValAttrAsString("dispUnits/builtInUnit", e);
-			r ||= t.getValAttrAsString("dispUnits/custUnit", e), r && (n.displayUnits = r);
-		}
-		parseLabelAlign(e, t, n) {
-			let r = e.getValAttrAsString("lblAlgn", t);
-			r !== null && (r === "ctr" ? n.labelAlign = "center" : r === "l" ? n.labelAlign = "left" : r === "r" && (n.labelAlign = "right"));
-		}
-		parseOrientation(e, t, n) {
-			let r = e.getValAttrAsString("AxPos", t);
-			r !== null && (r === "b" ? n.orientation = "bottom" : r === "l" ? n.orientation = "left" : r === "r" ? n.orientation = "right" : r === "t" && (n.orientation = "top"));
-		}
-		parseNumFormat(e, t, n) {
-			let r = {}, i = e.evaluate("numFmt", t);
-			i !== null && (i.hasAttribute("formatCode") && (r.formatCode = i.getAttribute("formatCode")), i.hasAttribute("sourceLinked") && (r.sourceLinked = i.getAttribute("sourceLinked") === "1")), Object.keys(r).length > 0 && (n.labels = r);
-		}
-		parseScaling(e, t, n) {
-			let r = e.getValAttrAsString("scaling/orientation", t);
-			r !== null && (n.inverted = r !== "minMax");
-			let i = e.getValAttrAsFloat("scaling/logBase", t);
-			i !== null && (n.logBase = i, n.scaleType = "log"), _(e, t, n, "scaling/max", "max"), _(e, t, n, "scaling/min", "min");
-		}
-		afterVisit(e, t, n) {
-			n.fill && n.labels && (n.labels.fill = n.fill, delete n.fill);
-			let r = e.getValAttrAsBoolean("delete", t);
-			r !== null && (e.setToPath(n, "labels.shown", !0 !== r), e.setToPath(n, "shown", !0 !== r));
-			let i = e.getFromPath(n, "dispUnits.displayUnitsLabel");
-			i && (e.setToPath(n, "displayUnitsLabel", i), delete n.dispUnits);
-			let a = e.evaluate("title", t);
-			e.setToPath(n, "title.shown", a !== null);
-			let o = e.evaluate("minorGridlines", t);
-			e.setToPath(n, "gridLinesMinor.shown", o !== null);
-			let s = e.evaluate("majorGridlines", t);
-			e.setToPath(n, "gridLinesMajor.shown", s !== null);
-		}
-	},
-	TextPropertiesVisitor: A,
-	ShapeTextVisitor: O,
-	LegendEntryVisitor: class {
-		visit(e, t, n) {
-			let r = e.getVisitorParamsState().get("series"), i = e.getValAttrAsInteger("idx", t), a = i === null ? void 0 : r[i];
-			if (a) {
-				let n = e.getFromPath(a, "title");
-				n || (n = {}, e.setToPath(a, "title", n));
-				let r = n, i = e.getValAttrAsBoolean("delete", t);
-				return i !== null && (r.shown = !i), r;
-			}
-			return n;
-		}
-	},
-	LegendVisitor: class {
-		visit(e, t, n) {
-			let r = {};
-			return E(e, t, r, "overlay", "overlay"), M(e, t, r, "legendPos", "position"), n.legend = r, r;
-		}
-	},
-	NegativeShapeVisitor: class extends v {
-		visit(e, t, n) {
-			let r = this.getFill(e, t);
-			Object.keys(r).length > 0 && (n.fillNegative = r);
-			let i = this.getStroke(e, t);
-			return Object.keys(i).length > 0 && (n.strokeNegative = i), n;
-		}
-	},
-	TitleVisitor: class extends A {
-		constructor(e = "title") {
-			super(e);
-		}
-		parseTitleRangeOrValue(e, t, n) {
-			let r = e.evaluate("tx/strRef/f", t) ?? null;
-			if (r) {
-				let t = r.firstElementChild.nodeValue;
-				e.setToPath(n, "range", t);
-			}
-		}
-		visit(e, t, n) {
-			let r = {};
-			E(e, t, r, "overlay", "overlay"), n[this._jsonKey] = r;
-			let i = e.getFromPath(r, this.getTextPath());
-			i ||= {}, this.parseTitleRangeOrValue(e, t, r);
-			let a = e.evaluate("txPr", t);
-			a && this.parseTextElement(e, a, i, !1);
-			let o = e.evaluate("tx/rich", t);
-			return o && this.parseTextElement(e, o, i, !0), Object.keys(i).length > 0 && e.setToPath(r, "text", i), r;
-		}
-		afterVisit(e, t, n) {
-			if (n?.text) {
-				let e = n.text?.rotation ?? null;
-				e !== null && (n.rotation = parseInt(e), delete n.title.rotation);
-			}
-		}
-	},
-	LayoutVisitor: class {
-		visit(e, t, n) {
-			let r = e.evaluate("manualLayout", t);
-			if (r) {
-				let t = {};
-				_(e, r, t, "x", "x"), _(e, r, t, "y", "y"), _(e, r, t, "w", "w"), _(e, r, t, "h", "h"), M(e, r, t, "xMode", "xMode"), M(e, r, t, "yMode", "yMode"), M(e, r, t, "wMode", "wMode"), M(e, r, t, "hMode", "hMode"), Object.keys(t).length > 0 && (n.manualLayout = t);
+			for (let e of z(t, "extLst")) for (let t of z(e, "ext")) {
+				if (t.getAttribute("uri") !== "{05A4C25C-085E-4340-85A3-A5531E510DB2}") continue;
+				let e = z(t, "themeFamily")[0], r = e?.getAttribute("id");
+				if (!r) continue;
+				let i = {
+					name: e.getAttribute("name") ?? "",
+					id: r
+				}, a = e.getAttribute("vid");
+				a && (i.vid = a), n.family = i;
 			}
 			return n;
 		}
 	},
-	ThemeVisitor: class {
-		visit(e, t, n) {
-			return n.name = t.getAttribute("name"), n;
-		}
-	},
-	ClrSchemeVisitor: class extends w {
+	ClrSchemeVisitor: class extends E {
 		visit(e, t, n) {
 			let r = {};
 			r.name = t.getAttribute("name");
@@ -968,22 +731,50 @@ var $ = {
 		visit(e, t, n) {
 			let r = {};
 			r.name = t.getAttribute("name");
-			let i = e.evaluate("majorFont", t), a = this.processFontElement(e, i, {});
-			a && (r.majorFont = a.family, a.fallbacks && (r.majorFallbacks = a.fallbacks));
-			let o = e.evaluate("minorFont", t), s = this.processFontElement(e, o, {});
-			return s && (r.minorFont = s.family, s.fallbacks && (r.minorFallbacks = s.fallbacks)), n.fonts = r, r;
+			let i = this.processFontCollection(e, e.evaluate("majorFont", t));
+			i && (r.major = i);
+			let a = this.processFontCollection(e, e.evaluate("minorFont", t));
+			return a && (r.minor = a), n.fonts = r, r;
 		}
-		processFontElement(e, t, n) {
+		processFontCollection(e, t) {
 			if (!t) return;
-			let r = e.evaluate("latin", t);
-			if (!r) return;
-			let a = r.getAttribute("typeface");
-			a && (n.family = a);
-			let o = r.getAttribute("panose");
-			return o && (n.fallbacks = [i.getPanoseFallback(o)]), n;
+			let n = {}, r = e.evaluate("latin", t), i = r?.getAttribute("typeface");
+			i && (n.latin = i);
+			let a = r?.getAttribute("panose");
+			a && (n.panose = a);
+			let o = e.evaluate("ea", t)?.getAttribute("typeface");
+			o && (n.eastAsian = o);
+			let s, c = e.evaluate("cs", t)?.getAttribute("typeface");
+			c && (n.complexScript = c);
+			let l = t.childNodes, u = l.length;
+			for (let e = 0; e < u; e++) {
+				let t = l.item(e);
+				if (t.nodeType !== 1 || t.localName !== "font") continue;
+				let n = t.getAttribute("script");
+				n && ((s ??= {})[n] = t.getAttribute("typeface") ?? "");
+			}
+			return s && (n.scripts = s), n;
 		}
 	},
-	FmtSchemeVisitor: class extends w {
+	ObjectDefaultsVisitor: class {
+		visit(e, t, n) {
+			let r = {};
+			for (let [n, i] of Te) {
+				let a = e.evaluate(n, t);
+				a && (r[i] = this.processDefault(e, a));
+			}
+			return n.objectDefaults = r, {};
+		}
+		processDefault(e, t) {
+			let n = {}, r = e.evaluate("spPr", t);
+			r && new O().visit(e, r, n);
+			let i = new S().readTextBody(e, t);
+			(i.body || i.listStyle) && (n.text = i);
+			let a = e.evaluate("style", t);
+			return a && (n.style = B(e, a)), n;
+		}
+	},
+	FmtSchemeVisitor: class extends E {
 		visit(e, t, n) {
 			let r = this.parseFillList(e, t, "fillStyleLst"), i = this.parseLnList(e, t, "lnStyleLst"), a = this.parseEffectStyleList(e, t, "effectStyleLst"), o = this.parseFillList(e, t, "bgFillStyleLst");
 			if (r && (n.fillStyleLst = r), i && (n.lnStyleLst = i), a && (n.effectStyleLst = a), o && (n.bgFillStyleLst = o), r && i && a && o) return;
@@ -1003,18 +794,18 @@ var $ = {
 			}
 			return i;
 		}
-		parseFillListItem(e, n) {
-			switch (n.localName) {
-				case "noFill": return { type: t.Type.None };
+		parseFillListItem(e, t) {
+			switch (t.localName) {
+				case "noFill": return { type: r.Type.None };
 				case "solidFill": {
-					let r = this.processAdjColor(e, n);
-					return r ? {
-						type: t.Type.Solid,
-						color: r
+					let n = this.processAdjColor(e, t);
+					return n ? {
+						type: r.Type.Solid,
+						color: n
 					} : void 0;
 				}
-				case "gradFill": return this.processGradFill(e, n);
-				case "pattFill": return this.processPatternFill(e, n);
+				case "gradFill": return this.processGradFill(e, t);
+				case "pattFill": return this.processPatternFill(e, t);
 				default: return;
 			}
 		}
@@ -1047,17 +838,19 @@ var $ = {
 		visit(e, t, n) {
 			if (!t) return;
 			let r = {}, i = [];
-			return this.processFilterColumns(e, t, i, n), i.length > 0 && (r.conditions = i), Object.keys(r).length > 0 && (n.filter = r), r;
+			return this.processFilterColumns(e, t, i, n), i.length > 0 && (r.conditions = i), Object.keys(r).length > 0 && (n.filter = r), n;
 		}
 		processColorFilter(e, t) {
 			let n = {}, r = {
-				operator: c.BuiltInOperatorNames.Color,
+				operator: f.BuiltInOperatorNames.Color,
 				param: n
 			};
-			return e.copyFromAttribute(t, "cellColor", n, "cellColor", e.BOOLEAN_COPY), e.copyFromAttribute(t, "dxfId", n, "styleId", e.INT_COPY), r;
+			e.copyFromAttribute(t, "cellColor", n, "cellColor", e.BOOLEAN_COPY);
+			let i = H(e, t);
+			return i && (n.style = i), r;
 		}
 		processCustomFilter(e, t) {
-			return ee({
+			return se({
 				operator: t.getAttribute("operator"),
 				val: t.getAttribute("val")
 			}, (t) => e.warn(t));
@@ -1066,7 +859,7 @@ var $ = {
 			let n = t.getAttribute("and"), r = n === "and" || n === "1";
 			t.getAttribute("val");
 			let i = [], a = {
-				operator: r ? c.BuiltInOperatorNames.And : c.BuiltInOperatorNames.Or,
+				operator: r ? f.BuiltInOperatorNames.And : f.BuiltInOperatorNames.Or,
 				param: i
 			}, o = t.childNodes, s = o.length;
 			for (let t = 0; t < s; t++) {
@@ -1075,10 +868,10 @@ var $ = {
 				let r = null;
 				n.localName === "customFilter" && (r = this.processCustomFilter(e, n)), r && i.push(r);
 			}
-			return i.length === 1 ? i[0] : te(a);
+			return i.length === 1 ? i[0] : ge(a);
 		}
 		processDynamicFilter(e, t) {
-			return ne(t.getAttribute("type"));
+			return v(t.getAttribute("type"));
 		}
 		processDateGroupItem(e, t) {
 			let n = {};
@@ -1089,10 +882,10 @@ var $ = {
 		}
 		processFilters(e, t) {
 			let n = {}, r = {
-				operator: c.BuiltInOperatorNames.InSet,
+				operator: f.BuiltInOperatorNames.InSet,
 				param: n
 			};
-			r.selector = c.BuiltInSelectorNames.Display, e.copyFromAttribute(t, "blank", n, "blank", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calendarType", n, "calendarType");
+			r.selector = f.BuiltInSelectorNames.Display, e.copyFromAttribute(t, "blank", n, "blank", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calendarType", n, "calendarType");
 			let i = [], a = [], o = t.childNodes, s = o.length;
 			for (let t = 0; t < s; t++) {
 				let n = o.item(t);
@@ -1110,14 +903,14 @@ var $ = {
 		}
 		processIcon(e, t) {
 			let n = {}, r = {
-				operator: c.BuiltInOperatorNames.Icon,
+				operator: f.BuiltInOperatorNames.Icon,
 				param: n
 			};
 			return e.copyFromAttribute(t, "iconId", n, "iconId", e.INT_COPY), e.copyFromAttribute(t, "iconSet", n), r;
 		}
 		processTop10(e, t) {
 			let n = {}, r = {
-				operator: c.BuiltInOperatorNames.TopN,
+				operator: f.BuiltInOperatorNames.TopN,
 				param: n
 			};
 			return e.copyFromAttribute(t, "filterVal", n, "filterVal", e.FLOAT_COPY), e.copyFromAttribute(t, "percent", n, "percent", e.BOOLEAN_COPY), e.copyFromAttribute(t, "top", n, "top", e.BOOLEAN_COPY), e.copyFromAttribute(t, "val", n, "limit", e.FLOAT_COPY), r;
@@ -1126,7 +919,7 @@ var $ = {
 			let n = t.childNodes;
 			for (let t = 0; t < n.length; t++) {
 				let r = n.item(t);
-				if (r.nodeType !== 1 || r.localName !== "ext" || b(r.getAttribute("uri")) !== b("{1AD28BCE-077C-4C59-8B6E-1921CE8616D4}")) continue;
+				if (r.nodeType !== 1 || r.localName !== "ext" || C(r.getAttribute("uri")) !== C("{1AD28BCE-077C-4C59-8B6E-1921CE8616D4}")) continue;
 				let i = r.childNodes;
 				for (let t = 0; t < i.length; t++) {
 					let n = i.item(t);
@@ -1152,12 +945,12 @@ var $ = {
 			if (!t) return null;
 			if (!t.hasAttribute("colId")) return;
 			let r = parseInt(t.getAttribute("colId")), i = !1;
-			if (t.hasAttribute("hiddenButton") && (i = S(t.getAttribute("hiddenButton"))), i && n) {
+			if (t.hasAttribute("hiddenButton") && (i = P(t.getAttribute("hiddenButton"))), i && n) {
 				let e = n.hiddenButtons;
 				e || (e = [], n.hiddenButtons = e), e.push(r);
 			}
 			let a = !1;
-			if (t.hasAttribute("showButton") && (a = S(t.getAttribute("showButton"))), a && n) {
+			if (t.hasAttribute("showButton") && (a = P(t.getAttribute("showButton"))), a && n) {
 				let e = n.showButtons;
 				!0 !== e && (e || (e = [], n.showButtons = e), e[r] = !0);
 			}
@@ -1181,7 +974,7 @@ var $ = {
 		visit(e, t, n) {
 			if (!t) return;
 			let r = t.getAttribute("ref"), i = {};
-			t.hasAttribute("caseSensitive") && (i.collatorOptions = S(t.getAttribute("caseSensitive")) ? l.CaseSensitiveOptions : l.CaseInsensitiveOptions);
+			t.hasAttribute("caseSensitive") && (i.collatorOptions = P(t.getAttribute("caseSensitive")) ? m.CaseSensitiveOptions : m.CaseInsensitiveOptions);
 			let a = t.getAttribute("sortMethod");
 			a != null && a !== "none" && (a === "stroke" ? i.collatorOptions = {
 				...i.collatorOptions,
@@ -1191,63 +984,101 @@ var $ = {
 				collation: "pinyin"
 			}));
 			let o = {};
-			t.hasAttribute("columnSort") && S(t.getAttribute("columnSort")) && (o.axis = s.Axis.Column);
-			let c = f.fastStringToRange(r), u = [];
-			return this.processSortConditions(e, t, u, c, i), u.length > 0 && (o.sorts = u), Object.keys(u).length > 0 && (n.sort = o), o;
+			t.hasAttribute("columnSort") && P(t.getAttribute("columnSort")) && (o.axis = l.Axis.Column);
+			let s = d.fastStringToRange(r), c = [], u = [];
+			this.processSortConditions(e, t, c, s, i, u), c.length > 0 && (o.sorts = c);
+			let f = e.getVisitorParamsState().get("ref");
+			if (f && r) {
+				let e = d.fastStringToRange(f);
+				o.extent = {
+					range: de(e, s),
+					sorts: u.map((t) => te(e, s, t))
+				};
+			}
+			return Object.keys(c).length > 0 && (n.sort = o), o;
 		}
-		processSortCondition(e, t, n, r) {
+		processSortCondition(e, t, n, r, i) {
 			if (!t) return null;
-			let i = {};
+			let a = {};
 			if (!t.hasAttribute("ref")) return void e.warn("A sort condition has no ref; it was dropped.", { onceKey: "xlsx.sheet.sort.noRef" });
 			if (t.hasAttribute("ref")) {
-				let e = t.getAttribute("ref"), r = f.fastStringToRange(e);
-				i.index = n ? r.colStart - n.colStart : r.colStart;
+				let e = t.getAttribute("ref"), r = d.fastStringToRange(e);
+				a.index = n ? r.colStart - n.colStart : r.colStart, i?.push(r);
 			}
-			let a = { ...r };
-			return i.criteria = a, a.reverse = !1, t.hasAttribute("descending") && (a.reverse = S(t.getAttribute("descending"))), e.copyFromAttribute(t, "sortBy", a, "sortOn"), e.copyFromAttribute(t, "dxfId", a), e.copyFromAttribute(t, "iconSet", a), e.copyFromAttribute(t, "customList", a), i;
+			let o = { ...r };
+			a.criteria = o, o.reverse = !1, t.hasAttribute("descending") && (o.reverse = P(t.getAttribute("descending")));
+			let s = ue(t.getAttribute("sortBy"));
+			s && (o.sortOn = s);
+			let c = H(e, t);
+			return c && (o.style = c), e.copyFromAttribute(t, "iconSet", o), e.copyFromAttribute(t, "customList", o), a;
 		}
-		processSortConditions(e, t, n, r, i) {
+		processSortConditions(e, t, n, r, i, a) {
 			if (!t) return;
-			let a = t.childNodes, o = a.length;
-			for (let t = 0; t < o; t++) {
-				let o = a.item(t);
-				if (o.nodeType === 1 && o.localName === "sortCondition") {
-					let t = this.processSortCondition(e, o, r, i);
+			let o = t.childNodes, s = o.length;
+			for (let t = 0; t < s; t++) {
+				let s = o.item(t);
+				if (s.nodeType === 1 && s.localName === "sortCondition") {
+					let t = this.processSortCondition(e, s, r, i, a);
 					t && n.push(t);
 				}
 			}
 		}
 	},
-	SheetStyleVisitor: class extends V {
-		visit(e, r, i) {
-			this.processNumFmts(e, e.evaluate("numFmts", r), null), e.getVisitorParamsState().set("colorsToProcess", /* @__PURE__ */ new Set());
+	SheetStyleVisitor: class extends W {
+		visit(e, t, n) {
+			this.processNumFmts(e, e.evaluate("numFmts", t), null), e.getVisitorParamsState().set("colorsToProcess", /* @__PURE__ */ new Set());
 			let a = {
 				fills: {},
 				fonts: {},
 				borders: {}
+			}, o = e.evaluate("fonts", t);
+			this.processFonts(e, o, a.fonts);
+			let s = a.fonts[this.normalFontId(e, t)], c = {
+				declared: ["1", "true"].includes(o?.getAttribute("x14ac:knownFonts") ?? ""),
+				normalIsThemeFont: ce(s?.family),
+				faces: le(Object.values(a.fonts).map((e) => ({
+					...e,
+					family: ee(e?.family, e?.fallbacks, null, !1).name
+				})))
 			};
-			this.processFonts(e, e.evaluate("fonts", r), a.fonts), this.processFills(e, e.evaluate("fills", r), a.fills), this.processBorders(e, e.evaluate("borders", r), a.borders, !0), a.fills[0] = { type: t.Type.None }, a.fills[1] = {
-				type: t.Type.Pattern,
-				patternType: t.BuiltInSheetPattern.Gray125
+			e.getVisitorParamsState().set(h, c), s && e.getVisitorParamsState().set("defaultFont", s), this.processFills(e, e.evaluate("fills", t), a.fills), this.processBorders(e, e.evaluate("borders", t), a.borders, !0), a.fills[0] = { type: r.Type.None }, a.fills[1] = {
+				type: r.Type.Pattern,
+				patternType: r.BuiltInSheetPattern.Gray125
 			}, a.borders[0] = {
-				bottom: { style: n.StrokeStyle.None },
-				left: { style: n.StrokeStyle.None },
-				right: { style: n.StrokeStyle.None },
-				top: { style: n.StrokeStyle.None }
+				bottom: { style: i.StrokeStyle.None },
+				left: { style: i.StrokeStyle.None },
+				right: { style: i.StrokeStyle.None },
+				top: { style: i.StrokeStyle.None }
 			};
-			let o = [];
-			this.processXFs(e, e.evaluate("cellStyleXfs", r), o, a, null, !1);
-			let s = /* @__PURE__ */ new Map();
-			if (o.length > 0) {
-				let t = [];
-				this.processCellStyles(e, e.evaluate("cellStyles", r), t, o, s), i.named = t;
-			}
-			let c = [];
-			this.processXFs(e, e.evaluate("cellXfs", r), c, a, s), Object.keys(c).length > 0 && (i.direct = c);
-			let l = this.collectHiddenXfs(e.evaluate("cellXfs", r));
-			l.size > 0 && e.getVisitorParamsState().set("hiddenXfs", l);
-			let u = [];
-			return this.processDXFs(e, e.evaluate("dxfs", r), u), this.processTableStyles(e, e.evaluate("tableStyles", r), i, u), this.processSlicerStyles(e, e.evaluate("extLst", r), i), this.processIndexColors(e, e.evaluate("colors/indexedColors", r), i), this.processMruColors(e, e.evaluate("colors/mruColors", r), i), i;
+			let l = [];
+			this.processXFs(e, e.evaluate("cellStyleXfs", t), l, a, null, !1);
+			let u = /* @__PURE__ */ new Map();
+			if (l.length > 0) {
+				let r = [];
+				this.processCellStyles(e, e.evaluate("cellStyles", t), r, l, u), n.named = r;
+			}
+			let d = [];
+			this.processXFs(e, e.evaluate("cellXfs", t), d, a, u), Object.keys(d).length > 0 && (n.direct = d);
+			let f = this.collectHiddenXfs(e.evaluate("cellXfs", t));
+			f.size > 0 && e.getVisitorParamsState().set("hiddenXfs", f);
+			let p = [];
+			return this.processDXFs(e, e.evaluate("dxfs", t), p), this.processTableStyles(e, e.evaluate("tableStyles", t), n, p), this.processSlicerStyles(e, e.evaluate("extLst", t), n), this.processIndexColors(e, e.evaluate("colors/indexedColors", t), n), this.processMruColors(e, e.evaluate("colors/mruColors", t), n), n;
+		}
+		normalFontId(e, t) {
+			let n = e.evaluate("cellStyles", t)?.childNodes, r = 0;
+			for (let e = 0; e < (n?.length ?? 0); e++) {
+				let t = n.item(e);
+				if (t.nodeType === 1 && t.getAttribute("builtinId") === "0") {
+					r = parseInt(t.getAttribute("xfId") ?? "0", 10) || 0;
+					break;
+				}
+			}
+			let i = e.evaluate("cellStyleXfs", t)?.childNodes, a = 0;
+			for (let e = 0; e < (i?.length ?? 0); e++) {
+				let t = i.item(e);
+				if (t.nodeType === 1 && a++ === r) return parseInt(t.getAttribute("fontId") ?? "0", 10) || 0;
+			}
+			return 0;
 		}
 		processIndexColors(e, t, n) {
 			if (!t) return;
@@ -1300,32 +1131,32 @@ var $ = {
 				}
 			}
 		}
-		processXF(e, t, n, i, a, o) {
+		processXF(e, t, n, r, i, a) {
 			if (!t) return;
-			let s = t.getAttribute("xfId");
-			if (s && a) {
-				let e = a.get(parseInt(s));
-				e && e !== r.BuiltInName.Normal && (n.named = e);
+			let o = t.getAttribute("xfId");
+			if (o && i) {
+				let e = i.get(parseInt(o));
+				e && e !== s.BuiltInName.Normal && (n.named = e);
 			}
-			let c = (e) => !(!o && t.hasAttribute(e)) || S(t.getAttribute(e)), l = (e) => !o || t.hasAttribute(e) && S(t.getAttribute(e)), u = o ? "0" : void 0;
+			let c = (e) => !(!a && t.hasAttribute(e)) || P(t.getAttribute(e)), l = (e) => !a || t.hasAttribute(e) && P(t.getAttribute(e)), u = a ? "0" : void 0;
 			if (c("applyFont")) {
 				let e = t.getAttribute("fontId") ?? u;
 				if (e !== void 0 && (e !== "0" || l("applyFont"))) {
-					let t = i.fonts[e];
+					let t = r.fonts[e];
 					t !== void 0 && (n.font = t);
 				}
 			}
 			if (c("applyFill")) {
 				let e = t.getAttribute("fillId") ?? u;
 				if (e !== void 0 && (e !== "0" || l("applyFill"))) {
-					let t = i.fills[e];
+					let t = r.fills[e];
 					t !== void 0 && Object.keys(t).length > 0 && (n.fill = t);
 				}
 			}
 			if (c("applyBorder")) {
 				let e = t.getAttribute("borderId") ?? u;
 				if (e !== void 0 && (e !== "0" || l("applyBorder"))) {
-					let t = i.borders[e];
+					let t = r.borders[e];
 					t !== void 0 && (n.borders = t);
 				}
 			}
@@ -1347,18 +1178,18 @@ var $ = {
 				let r = e.evaluate("protection", t);
 				(r || l("applyProtection")) && this.processProtection(e, r, n);
 			}
-			let d = S(t.getAttribute("quotePrefix") ?? "");
+			let d = P(t.getAttribute("quotePrefix") ?? "");
 			d && (n.quotePrefix = d);
 		}
-		processAlignment(e, t, n) {
-			let r = {};
-			if (r.horizontal = t?.hasAttribute("horizontal") ? t.getAttribute("horizontal") : a.HorizontalAlignment.General, r.vertical = t?.hasAttribute("vertical") ? t.getAttribute("vertical") : a.VerticalAlignment.Bottom, r.indent = t?.hasAttribute("indent") ? parseInt(t.getAttribute("indent")) : 0, r.relativeIndent = t?.hasAttribute("relativeIndent") ? parseInt(t.getAttribute("relativeIndent")) : 0, r.overflow = S(t?.getAttribute("wrapText") ?? "") ? a.Overflow.Wrap : a.Overflow.Visible, S(t?.getAttribute("shrinkToFit") ?? "") && (r.overflow = a.Overflow.Shrink), t?.hasAttribute("textRotation")) {
+		processAlignment(e, t, r) {
+			let i = {};
+			if (i.horizontal = t?.hasAttribute("horizontal") ? t.getAttribute("horizontal") : n.HorizontalAlignment.General, i.vertical = t?.hasAttribute("vertical") ? t.getAttribute("vertical") : n.VerticalAlignment.Bottom, i.indent = t?.hasAttribute("indent") ? parseInt(t.getAttribute("indent")) : 0, i.relativeIndent = t?.hasAttribute("relativeIndent") ? parseInt(t.getAttribute("relativeIndent")) : 0, i.overflow = P(t?.getAttribute("wrapText") ?? "") ? n.Overflow.Wrap : n.Overflow.Visible, P(t?.getAttribute("shrinkToFit") ?? "") && (i.overflow = n.Overflow.Shrink), t?.hasAttribute("textRotation")) {
 				let e = parseFloat(t.getAttribute("textRotation"));
-				e > 0 && e <= 90 ? e = 360 - e : e > 90 && e <= 180 ? e -= 90 : e === 255 && (e = 0, r.stacked = !0), r.rotation = e;
-			} else r.rotation = 0;
-			t?.hasAttribute("justifyLastLine") && (r.justifyLastLine = S(t.getAttribute("justifyLastLine")));
-			let i = t?.getAttribute("readingOrder");
-			return i && (i === "0" ? r.readingDirection = a.ReadingDirection.Auto : i === "1" ? r.readingDirection = a.ReadingDirection.LeftToRight : i === "2" ? r.readingDirection = a.ReadingDirection.RightToLeft : e.warn(`Invalid readingOrder '${i}'; the direction was left automatic.`, { onceKey: "xlsx.style.readingOrder" })), Object.keys(r).length > 0 && (n.alignment = r), n;
+				e > 0 && e <= 90 ? e = 360 - e : e > 90 && e <= 180 ? e -= 90 : e === 255 && (e = 0, i.stacked = !0), i.rotation = e;
+			} else i.rotation = 0;
+			t?.hasAttribute("justifyLastLine") && (i.justifyLastLine = P(t.getAttribute("justifyLastLine")));
+			let a = t?.getAttribute("readingOrder");
+			return a && (a === "0" ? i.readingDirection = n.ReadingDirection.Auto : a === "1" ? i.readingDirection = n.ReadingDirection.LeftToRight : a === "2" ? i.readingDirection = n.ReadingDirection.RightToLeft : e.warn(`Invalid readingOrder '${a}'; the direction was left automatic.`, { onceKey: "xlsx.style.readingOrder" })), Object.keys(i).length > 0 && (r.alignment = i), r;
 		}
 		collectHiddenXfs(e) {
 			let t = /* @__PURE__ */ new Set();
@@ -1370,7 +1201,7 @@ var $ = {
 				let a = i.childNodes;
 				for (let e = 0; e < a.length; e++) {
 					let n = a.item(e);
-					n.nodeType === 1 && n.localName === "protection" && S(n.getAttribute("hidden") ?? "") && t.add(r);
+					n.nodeType === 1 && n.localName === "protection" && P(n.getAttribute("hidden") ?? "") && t.add(r);
 				}
 				r++;
 			}
@@ -1379,7 +1210,7 @@ var $ = {
 		processProtection(e, t, n) {
 			if (!t) return;
 			let r = t.getAttribute("locked");
-			return n.protection = { alwaysUnlocked: !!r && !S(r) }, n;
+			return n.protection = { alwaysUnlocked: !!r && !P(r) }, n;
 		}
 		processDXF(e, t, n) {
 			if (!t) return;
@@ -1462,7 +1293,7 @@ var $ = {
 					let n = c.item(t);
 					if (n.nodeType !== 1 || n.localName !== "slicerStyleElement") continue;
 					let r = n.getAttribute("type");
-					if (!r || !U.has(r)) continue;
+					if (!r || !Ee.has(r)) continue;
 					let a = n.getAttribute("dxfId"), s = a == null ? void 0 : o[parseInt(a)];
 					s ? i[r] = s : e.warn(`A slicer style names a format that does not exist (dxfId '${a}').`, { onceKey: "xlsx.style.slicerStyle.dxf" });
 				}
@@ -1472,7 +1303,7 @@ var $ = {
 		}
 		processTableStyle(e, t, n, r, i = !1) {
 			let a = t.getAttribute("name"), o = { name: a };
-			t.hasAttribute("table") && (o.table = S(t.getAttribute("table"))), t.hasAttribute("pivot") && (o.pivot = S(t.getAttribute("pivot"))), i && !o.pivot && r.unshift(null);
+			t.hasAttribute("table") && (o.table = P(t.getAttribute("table"))), t.hasAttribute("pivot") && (o.pivot = P(t.getAttribute("pivot"))), i && !o.pivot && r.unshift(null);
 			let s = t.childNodes, c = s.length;
 			for (let t = 0; t < c; t++) {
 				let n = s.item(t);
@@ -1498,48 +1329,48 @@ var $ = {
 			}
 			return Object.keys(l).length > 0 && (a.styles = l), Object.keys(a).length > 0 && (n.tables = a), n;
 		}
-		processCellStyles(e, t, n, i, a) {
+		processCellStyles(e, t, n, r, i) {
 			if (!t) return;
-			let o = t.childNodes, s = o.length;
-			for (let e = 0; e < s; e++) {
-				let t = o.item(e);
+			let a = t.childNodes, o = a.length;
+			for (let e = 0; e < o; e++) {
+				let t = a.item(e);
 				if (t.nodeType === 1 && t.localName === "cellStyle") {
-					let e = parseInt(t.getAttribute("xfId") ?? ""), o = t.getAttribute("name"), s = t.getAttribute("builtinId"), c = o;
-					if (s !== null) {
-						let e = r.builtInNameFromId(parseInt(s));
+					let e = parseInt(t.getAttribute("xfId") ?? ""), a = t.getAttribute("name"), o = t.getAttribute("builtinId"), c = a;
+					if (o !== null) {
+						let e = s.builtInNameFromId(parseInt(o));
 						e !== void 0 && (c = e);
 					}
-					if (a.set(e, c), !i[e]) continue;
+					if (i.set(e, c), !r[e]) continue;
 					let l = {
 						name: c,
-						style: i[e]
+						style: r[e]
 					};
-					t.getAttribute("hidden") && (l.hidden = S(t.getAttribute("hidden"))), t.getAttribute("iLevel") && (l.iLevel = parseInt(t.getAttribute("iLevel"))), n.push(l);
+					t.getAttribute("hidden") && (l.hidden = P(t.getAttribute("hidden"))), t.getAttribute("iLevel") && (l.iLevel = parseInt(t.getAttribute("iLevel"))), o !== null && P(t.getAttribute("customBuiltin") ?? "0") && (l.customized = !0), n.push(l);
 				}
 			}
 		}
 		afterVisit(e, t, n) {}
 	},
-	WorkbookVisitor: class extends V {
+	WorkbookVisitor: class extends W {
 		visit(e, t, n) {
 			return this.processSheetRefs(e, e.evaluate("sheets", t), n), this.processExternalReferences(e, e.evaluate("externalReferences", t), n), this.processBookViews(e, e.evaluate("bookViews", t), n), this.processDefinedNames(e, e.evaluate("definedNames", t), n), this.processCalcPr(e, e.evaluate("calcPr", t), n), this.processPivotCaches(e, e.evaluate("pivotCaches", t), n), this.processWorkbookProtection(e, e.evaluate("workbookProtection", t), n), this.processWorkbookPr(e, e.evaluate("workbookPr", t), n), n;
 		}
 		processPassword(e, t, n, r = "workbook", i = "password") {
 			if (!t) return;
 			let a = {};
-			e.copyFromAttribute(t, `${r}AlgorithmName`, a, "algorithm"), e.copyFromAttribute(t, `${r}HashValue`, a, "hash"), e.copyFromAttribute(t, `${r}SaltValue`, a, "salt"), e.copyFromAttribute(t, `${r}SpinCount`, a, "spinCount", e.INT_COPY), Object.keys(a).length > 0 && (n[i] = a);
+			e.copyFromAttribute(t, `${r}AlgorithmName`, a, "algorithm"), e.copyFromAttribute(t, `${r}HashValue`, a, "hash"), e.copyFromAttribute(t, `${r}SaltValue`, a, "salt"), e.copyFromAttribute(t, `${r}SpinCount`, a, "spinCount", e.INT_COPY), e.copyFromAttribute(t, `${r}Password`, a, "legacyHash"), Object.keys(a).length > 0 && (n[i] = a);
 		}
 		processWorkbookProtection(e, t, n) {
 			if (!t) return;
 			let r = {};
 			this.processPassword(e, t, r, "workbook", "password"), this.processPassword(e, t, r, "revisions", "revisionsPassword");
-			for (let e of k) r[e.key] = re(e, t.getAttribute(e.attribute));
+			for (let e of oe) r[e.key] = ae(e, t.getAttribute(e.attribute));
 			return n.protection = r, n;
 		}
 		processCalcPr(e, t, n) {
 			if (!t) return;
 			let r = {};
-			e.copyFromAttribute(t, "calcMode", r, "calcMode", (e) => W[e] ?? null), e.copyFromAttribute(t, "fullCalcOnLoad", r, "fullCalcOnLoad", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calcOnSave", r, "calcOnSave", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calcCompleted", r, "calcCompleted", e.BOOLEAN_COPY), e.copyFromAttribute(t, "fullPrecision", r, "fullPrecision", e.BOOLEAN_COPY), e.copyFromAttribute(t, "forceFullCalc", r, "forceFullCalc", e.BOOLEAN_COPY), e.copyFromAttribute(t, "concurrentCalc", r, "concurrentCalc", e.BOOLEAN_COPY), e.copyFromAttribute(t, "refMode", r, "refMode"), e.copyFromAttribute(t, "iterate", r, "iterate", e.BOOLEAN_COPY), e.copyFromAttribute(t, "iterateCount", r, "maxIteration", e.INT_COPY), e.copyFromAttribute(t, "iterateDelta", r, "maxIterateChange", e.FLOAT_COPY);
+			e.copyFromAttribute(t, "calcMode", r, "calcMode", (e) => De[e] ?? null), e.copyFromAttribute(t, "fullCalcOnLoad", r, "fullCalcOnLoad", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calcOnSave", r, "calcOnSave", e.BOOLEAN_COPY), e.copyFromAttribute(t, "calcCompleted", r, "calcCompleted", e.BOOLEAN_COPY), e.copyFromAttribute(t, "fullPrecision", r, "fullPrecision", e.BOOLEAN_COPY), e.copyFromAttribute(t, "forceFullCalc", r, "forceFullCalc", e.BOOLEAN_COPY), e.copyFromAttribute(t, "concurrentCalc", r, "concurrentCalc", e.BOOLEAN_COPY), e.copyFromAttribute(t, "concurrentManualCount", r, "concurrentManualCount", e.INT_COPY), e.copyFromAttribute(t, "refMode", r, "refMode"), e.copyFromAttribute(t, "iterate", r, "iterate", e.BOOLEAN_COPY), e.copyFromAttribute(t, "iterateCount", r, "maxIteration", e.INT_COPY), e.copyFromAttribute(t, "iterateDelta", r, "maxIterateChange", e.FLOAT_COPY);
 			let i = t.getAttribute("calcId");
 			i !== null && e.getVisitorParamsState().set("calcId", i), n.calc = r;
 		}
@@ -1555,8 +1386,19 @@ var $ = {
 		processSheetRef(e, t, n) {
 			let r = {};
 			e.copyFromAttribute(t, "name", r, "name"), e.copyFromAttribute(t, "state", r, "visibility"), e.copyFromAttribute(t, "sheetId", r, "sheetId", e.INT_COPY);
-			let i = t.getAttribute("r:id"), a = e.getRef(i);
-			a && (r.sheet = a), n.push(r);
+			let i = t.getAttribute("r:id"), a = i ? re(e.getRelationships().get(i)?.type) : null;
+			if (a) {
+				let t = e.readEmbeddedPart(i);
+				if (t?.xml) {
+					let e = { part: t }, i = fe(t.xml), o = i ? k((e) => i.get(e)) : void 0;
+					o && (e.tabColor = o), r.kind = a, r.sheet = e, n.push(r);
+					return;
+				}
+				e.warn(`The ${a} sheet '${r.name}' could not be read and was loaded as an empty worksheet.`), n.push(r);
+				return;
+			}
+			let o = i ? e.getRef(i) : null;
+			o && (r.sheet = o), n.push(r);
 		}
 		processExternalReferences(e, t, n) {
 			if (!t) return;
@@ -1596,8 +1438,24 @@ var $ = {
 		}
 		processWorkbookView(e, t, n) {
 			if (!t) return;
-			let r = {};
-			e.copyFromAttribute(t, "activeTab", r, "activeSheetId", [e.INT_COPY, (e) => e]), t.hasAttribute("activeTab") || (r.activeSheetId = 0), e.copyFromAttribute(t, "showHorizontalScroll", r, "showHorizontalScrollbar", e.BOOLEAN_COPY), e.copyFromAttribute(t, "showVerticalScroll", r, "showVerticalScrollbar", e.BOOLEAN_COPY), e.copyFromAttribute(t, "showSheetTabs", r, "showTabs", e.BOOLEAN_COPY), e.copyFromAttribute(t, "tabRatio", r, "tabRatio", [e.FLOAT_COPY, (e) => e]), Object.keys(r).length > 0 && (n.view = r);
+			let r = {}, i = [
+				"xWindow",
+				"yWindow",
+				"windowWidth",
+				"windowHeight"
+			].map((e) => parseInt(t.getAttribute(e) ?? "", 10));
+			if (i.some((e) => Number.isFinite(e))) {
+				let [e, t, n, a] = i.map((e) => Number.isFinite(e) ? e : 0);
+				r.windowBounds = {
+					left: e,
+					top: t,
+					width: n,
+					height: a
+				};
+			}
+			e.copyFromAttribute(t, "activeTab", r, "activeSheetId", [e.INT_COPY, (e) => e]), t.hasAttribute("activeTab") || (r.activeSheetId = 0), e.copyFromAttribute(t, "showHorizontalScroll", r, "showHorizontalScrollbar", e.BOOLEAN_COPY), e.copyFromAttribute(t, "showVerticalScroll", r, "showVerticalScrollbar", e.BOOLEAN_COPY), e.copyFromAttribute(t, "showSheetTabs", r, "showTabs", e.BOOLEAN_COPY), e.copyFromAttribute(t, "tabRatio", r, "tabRatio", [e.FLOAT_COPY, (e) => e]), e.copyFromAttribute(t, "firstSheet", r, "firstTab", [e.INT_COPY, (e) => e]), e.copyFromAttribute(t, "minimized", r, "minimized", e.BOOLEAN_COPY), e.copyFromAttribute(t, "autoFilterDateGrouping", r, "autoFilterDateGrouping", e.BOOLEAN_COPY);
+			let a = t.getAttribute("visibility");
+			a !== "hidden" && a !== "veryHidden" || (r.visibility = a), Object.keys(r).length > 0 && (n.view = r);
 		}
 		processDefineName(e, t, n, r) {
 			if (!t) return;
@@ -1607,7 +1465,13 @@ var $ = {
 				if (!r[n]?.name) return void e.warn(`Defined name '${t.getAttribute("name")}' references a sheet with localSheetId '${n}' which does not exist.`);
 				i.scope = r[n].name;
 			}
-			e.copyFromAttribute(t, "customMenu", i), e.copyFromAttribute(t, "description", i), e.copyFromAttribute(t, "statusBar", i), e.copyFromAttribute(t, "help", i), e.copyFromAttribute(t, "shortcutKey", i), e.copyFromAttribute(t, "function", i, "function", e.BOOLEAN_COPY), e.copyFromAttribute(t, "functionGroupId", i, "functionGroupId", e.INT_COPY), e.copyFromAttribute(t, "publishToServer", i, "publishToServer", e.BOOLEAN_COPY), e.copyFromAttribute(t, "vbProcedure", i, "vbProcedure", e.BOOLEAN_COPY), e.copyFromAttribute(t, "xlm", i, "xlm", e.BOOLEAN_COPY), Object.keys(i).length > 0 && n.push(i);
+			let o = {};
+			for (let n of ye) e.copyFromAttribute(t, n, o);
+			for (let e of ve) {
+				let n = t.getAttribute(e);
+				n !== "1" && n !== "true" || (o[e] = !0);
+			}
+			e.copyFromAttribute(t, "functionGroupId", o, "functionGroupId", e.INT_COPY), Object.keys(o).length > 0 && (i.fileAttributes = o), Object.keys(i).length > 0 && n.push(i);
 		}
 		processDefinedNames(e, t, n) {
 			if (!t) return;
@@ -1626,7 +1490,7 @@ var $ = {
 	TableVisitor: class {
 		visit(e, t, n) {
 			let r = {};
-			return e.copyFromAttribute(t, "ref", n, "r"), e.getVisitorParamsState().set("ref", n.r), n.v = r, e.copyFromAttribute(t, "name", r), e.copyFromAttribute(t, "displayName", r), e.copyFromAttribute(t, "headerRowCount", r, "headerRowCount", e.INT_COPY), e.copyFromAttribute(t, "totalsRowCount", r, "totalsRowCount", e.INT_COPY), this.processTableColumns(e, t, r), this.processTableStyleInfo(e, t, r), e.copyFromAttribute(t, "id", r), e.copyFromAttribute(t, "comment", r, "description"), e.copyFromAttribute(t, "connectionId", r, "connectionId", e.INT_COPY), e.copyFromAttribute(t, "tableType", r), e.copyFromAttribute(t, "published", r, "published", e.BOOLEAN_COPY), e.copyFromAttribute(t, "insertRow", r, "insertRow", e.BOOLEAN_COPY), e.copyFromAttribute(t, "insertRowShift", r, "insertRowShift", e.BOOLEAN_COPY), r.totalsRowShown = t.getAttribute("totalsRowShown") !== "0", r;
+			return e.copyFromAttribute(t, "ref", n, "r"), e.getVisitorParamsState().set("ref", n.r), n.v = r, e.copyFromAttribute(t, "name", r), e.copyFromAttribute(t, "displayName", r, "name"), e.copyFromAttribute(t, "headerRowCount", r, "headerRowCount", e.INT_COPY), e.copyFromAttribute(t, "totalsRowCount", r, "totalsRowCount", e.INT_COPY), this.processTableColumns(e, t, r), this.processTableStyleInfo(e, t, r), e.copyFromAttribute(t, "id", r), e.copyFromAttribute(t, "comment", r, "description"), e.copyFromAttribute(t, "connectionId", r, "connectionId", e.INT_COPY), e.copyFromAttribute(t, "tableType", r), e.copyFromAttribute(t, "published", r, "published", e.BOOLEAN_COPY), e.copyFromAttribute(t, "insertRow", r, "insertRow", e.BOOLEAN_COPY), e.copyFromAttribute(t, "insertRowShift", r, "insertRowShift", e.BOOLEAN_COPY), r.totalsRowShown = t.getAttribute("totalsRowShown") !== "0", r;
 		}
 		afterVisit(e, t, n) {
 			let r = n.v;
@@ -1746,7 +1610,7 @@ var $ = {
 			i.length > 0 && (n.sheetDataSet = i);
 		}
 		processSheetData(e, t) {
-			let n = new u.Builder(), r = t.childNodes, i = r.length;
+			let n = new p.Builder(), r = t.childNodes, i = r.length;
 			for (let e = 0; e < i; e++) {
 				let t = r.item(e);
 				if (t.nodeType !== 1 || t.localName !== "row") continue;
@@ -1756,7 +1620,7 @@ var $ = {
 					if (t.nodeType !== 1 || t.localName !== "cell") continue;
 					let r = t.getAttribute("r");
 					if (!r) continue;
-					let a = f.fastStringToCell(r);
+					let a = d.fastStringToCell(r);
 					if (a?.rowIndex === void 0 || a?.colIndex === void 0) continue;
 					let o = this._readCellValue(t);
 					o !== void 0 && n.pushAt(a.rowIndex, a.colIndex, o);
@@ -1776,7 +1640,7 @@ var $ = {
 				case "str":
 				default: return t;
 				case "e": {
-					let e = o.getBuiltInByLabel(t);
+					let e = c.getBuiltInByLabel(t);
 					return e ? {
 						t: "e",
 						v: e.getCode()
@@ -1820,8 +1684,8 @@ var $ = {
 			let r = {};
 			n[t.getAttribute("name")] = r, e.copyFromAttribute(t, "xr10:uid", r, "uid");
 			let i = t.getAttribute("cache"), a = e.getVisitorParamsState().get("slicerCaches"), o = i ? a?.get(i) : void 0;
-			if (o) for (let e = 0; e < G.length; e++) {
-				let t = G[e];
+			if (o) for (let e = 0; e < K.length; e++) {
+				let t = K[e];
 				o[t] !== void 0 && (r[t] = o[t]);
 			}
 			e.copyFromAttribute(t, "caption", r), e.copyFromAttribute(t, "startItem", r, "startItem", e.INT_COPY), e.copyFromAttribute(t, "columnCount", r, "columnCount", e.INT_COPY), e.copyFromAttribute(t, "showCaption", r, "showCaption", e.BOOLEAN_COPY), e.copyFromAttribute(t, "level", r, "level", e.INT_COPY), e.copyFromAttribute(t, "style", r), e.copyFromAttribute(t, "lockedPosition", r, "lockedPosition", e.BOOLEAN_COPY), e.copyFromAttribute(t, "rowHeight", r, "rowHeight", e.INT_COPY);
@@ -1847,7 +1711,7 @@ var $ = {
 					} else n.localName === "extLst" && (a = e.serializeElement(n) ?? void 0);
 				}
 			}
-			let c = x(r, o, a);
+			let c = he(r, o, a);
 			return n.formControl = c, c;
 		}
 	},
@@ -1856,14 +1720,19 @@ var $ = {
 			return n;
 		}
 		afterVisit(e, t, n) {
-			for (let e of n?.movables ?? []) K(e, !1);
+			for (let e of n?.movables ?? []) q(e, !1);
 		}
 	},
 	DrawingAnchorVisitor: class {
 		visit(e, t, n) {
 			if (!t) return;
 			let r = {};
-			return e.copyFromAttribute(t, "editAs", r, "anchorType"), r.anchor = {}, t.localName === "absoluteAnchor" ? (r.anchorType = "absolute", this.processAbsoluteCoord(e, e.evaluate("xdr:pos", t), r.anchor, "from", "x", "y"), this.processAbsoluteCoord(e, e.evaluate("xdr:ext", t), r.anchor, "to", "cx", "cy")) : t.localName === "oneCellAnchor" ? (this.processOffsetCoord(e, e.evaluate("from", t), r.anchor, "from"), this.processAbsoluteCoord(e, e.evaluate("xdr:ext", t), r.anchor, "to", "cx", "cy")) : (this.processOffsetCoord(e, e.evaluate("from", t), r.anchor, "from"), this.processOffsetCoord(e, e.evaluate("to", t), r.anchor, "to")), n.movables ||= [], n.movables.push(r), r;
+			e.copyFromAttribute(t, "editAs", r, "anchorType"), r.anchor = {}, t.localName === "absoluteAnchor" ? (r.anchorType = "absolute", this.processAbsoluteCoord(e, e.evaluate("pos", t), r.anchor, "from", "x", "y"), this.processAbsoluteCoord(e, e.evaluate("ext", t), r.anchor, "to", "cx", "cy")) : t.localName === "oneCellAnchor" ? (this.processOffsetCoord(e, e.evaluate("from", t), r.anchor, "from"), this.processAbsoluteCoord(e, e.evaluate("ext", t), r.anchor, "to", "cx", "cy")) : (this.processOffsetCoord(e, e.evaluate("from", t), r.anchor, "from"), this.processOffsetCoord(e, e.evaluate("to", t), r.anchor, "to"));
+			let i = e.evaluate("clientData", t), a = (e) => {
+				let t = i?.getAttribute(e);
+				return t === "0" || t === "false";
+			};
+			return a("fPrintsWithSheet") && (r.noPrint = !0), a("fLocksWithSheet") && (r.unlocked = !0), n.movables ||= [], n.movables.push(r), r;
 		}
 		processAbsoluteCoord(e, t, n, r, i, a) {
 			if (!t) return;
@@ -1871,7 +1740,7 @@ var $ = {
 				x: 0,
 				y: 0
 			};
-			return o.x = T(t.getAttribute(i)), o.y = T(t.getAttribute(a)), r === "from" ? n.tl = o : n.br = o, n;
+			return o.x = N(t.getAttribute(i)), o.y = N(t.getAttribute(a)), r === "from" ? n.tl = o : n.br = o, n;
 		}
 		processOffsetCoord(e, t, n, r) {
 			if (!t) return;
@@ -1881,34 +1750,37 @@ var $ = {
 				x: 0,
 				y: 0
 			};
-			return e.evaluate("col", t) && (i.c = parseInt(e.evaluate("col", t).textContent)), e.evaluate("row", t) && (i.r = parseInt(e.evaluate("row", t).textContent)), e.evaluate("colOff", t) && (i.x = T(e.evaluate("colOff", t).textContent)), e.evaluate("rowOff", t) && (i.y = T(e.evaluate("rowOff", t).textContent)), r === "from" ? n.tl = i : n.br = i, n;
+			return e.evaluate("col", t) && (i.c = parseInt(e.evaluate("col", t).textContent)), e.evaluate("row", t) && (i.r = parseInt(e.evaluate("row", t).textContent)), e.evaluate("colOff", t) && (i.x = N(e.evaluate("colOff", t).textContent)), e.evaluate("rowOff", t) && (i.y = N(e.evaluate("rowOff", t).textContent)), r === "from" ? n.tl = i : n.br = i, n;
 		}
 	},
-	DrawingGraphicFrameVisitor: class extends q {
+	DrawingGraphicFrameVisitor: class extends V {
 		visit(e, t, n) {
 			if (!t) return;
 			if (this.isGroupContent(n)) {
 				if (e.getPath().includes("Fallback")) return {};
 				let { movable: r } = this.readMemberHeader(e, t, "graphicFrame"), i = e.evaluate("xfrm", t);
 				if (i) {
-					C(i, r);
+					y(i, r);
 					let t = e.evaluate("off", i), n = e.evaluate("ext", i);
 					r.anchor = {
 						tl: {
-							x: T(t?.getAttribute("x") ?? null) ?? 0,
-							y: T(t?.getAttribute("y") ?? null) ?? 0
+							x: N(t?.getAttribute("x") ?? null) ?? 0,
+							y: N(t?.getAttribute("y") ?? null) ?? 0
 						},
 						br: {
-							x: T(n?.getAttribute("cx") ?? null) ?? 0,
-							y: T(n?.getAttribute("cy") ?? null) ?? 0
+							x: N(n?.getAttribute("cx") ?? null) ?? 0,
+							y: N(n?.getAttribute("cy") ?? null) ?? 0
 						}
 					};
 				}
-				let a = this.readGraphic(e, t);
+				let a = this.readGraphic(e, t), o = a.type === "chart" ? {
+					...r.content.json,
+					...a.json
+				} : a.json;
 				return r.content = {
 					...r.content,
 					type: a.type,
-					json: a.json
+					json: o
 				}, n.members.push(r), a.json;
 			}
 			n = super.visit(e, t, n);
@@ -1934,11 +1806,17 @@ var $ = {
 					n === "chart" ? n = "chart" : n === "slicer" && (n = "slicer"), r.type = n;
 					let i = a.getAttribute("r:id");
 					if (n === "chart" && i) {
-						let n = this.readSourceId(e, t);
+						let n, a = this.readSourceId(e, t), o = e.readEmbeddedPart(i) ?? void 0;
+						try {
+							let t = o?.xml ? I(o.xml) : null;
+							n = t?.model, t?.lossy && e.warn("A chart states something its model does not; it is saved as it was until it is changed.", { onceKey: "xlsx.chart.lossy" });
+						} catch (t) {
+							e.warn(`A chart could not be read into the chart model; it is kept as its markup: ${t?.message ?? t}`, { onceKey: "xlsx.chart.model" });
+						}
 						r.json = {
-							xml: e.serializeElement(t) ?? void 0,
-							sourceId: n,
-							part: e.readEmbeddedPart(i) ?? void 0
+							sourceId: a,
+							part: o,
+							model: n
 						};
 					} else if (n === "slicer") {
 						let n = this.readSourceId(e, t);
@@ -1952,45 +1830,47 @@ var $ = {
 		}
 	},
 	DrawingSpVisitor: J,
-	DrawingPicVisitor: class extends q {
+	DrawingPicVisitor: class extends V {
 		visit(e, t, n) {
 			if (!t) return;
 			if (this.isGroupContent(n)) {
 				if (e.getPath().includes("Fallback")) return {};
-				let { movable: r, content: i } = this.readMemberHeader(e, t, "picture"), a = this.readImageResource(e, t);
-				if (a == null) return {};
-				i.resId = a;
-				let o = this.readLocks(e.evaluate("nvPicPr/cNvPicPr/picLocks", t));
-				return o && (o.noChangeAspect !== void 0 && (r.lockAspect = o.noChangeAspect), r.locks = o), n.members.push(r), i;
-			}
-			let r = super.visit(e, t, n), i = e.evaluate("nvPicPr/cNvPicPr", t);
-			if (i) {
-				e.copyFromAttribute(t, "preferRelativeResize", r, "preferRelativeResize", e.BOOLEAN_COPY);
-				let n = e.evaluate("picLocks", i);
-				if (n) {
-					n.hasAttribute("noChangeAspect") && (r.lockAspect = n.getAttribute("noChangeAspect") === "1");
-					let t = {};
-					e.copyFromAttribute(n, "noChangeArrowheads", r, "noChangeArrowheads", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noChangeShapeType", r, "noChangeShapeType", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noEditPoints", r, "noEditPoints", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noAdjustHandles", r, "noAdjustHandles", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noCrop", r, "noCrop", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noGrp", r, "noGrp", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noMove", r, "noMove", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noResize", r, "noResize", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noRot", r, "noRot", e.BOOLEAN_COPY), e.copyFromAttribute(n, "noSelect", r, "noSelect", e.BOOLEAN_COPY), Object.keys(t).length > 0 && (r.locks = t);
-				}
+				let { movable: r, content: i } = this.readMemberHeader(e, t, "picture"), a = this.readImage(e, t);
+				return a ? (this.readPictureDetails(e, t, a, r, i), n.members.push(r), i) : {};
 			}
-			let a = this.readImageResource(e, t);
-			if (a === null) return;
-			let o = { resId: a }, s = this.readSourceId(e, t);
-			return s !== void 0 && (o.sourceId = s), this.setContent(n, {
+			let r = super.visit(e, t, n), i = this.readImage(e, t);
+			if (i === null) return;
+			let a = {}, o = this.readSourceId(e, t);
+			return o !== void 0 && (a.sourceId = o), this.readPictureDetails(e, t, i, r, a), this.setContent(r, {
 				type: "picture",
-				json: o
-			}), r;
-		}
-		readImageResource(e, t) {
-			let n = e.evaluate("blipFill/blip", t);
-			if (!n) return;
-			let r = n.getAttribute("r:embed") ?? n.getAttribute("embed");
-			return r ||= n.getAttribute("r:link") ?? n.getAttribute("link"), r ? e.getRef(r, !0) : (e.warn("A picture names no image; it was not imported.", { onceKey: "xlsx.drawing.picture.noRel" }), null);
+				json: a
+			}), a;
+		}
+		readPictureDetails(e, t, n, r, i) {
+			n?.resId !== void 0 && (i.resId = n.resId), n?.image && (i.image = n.image);
+			let a = t.getAttribute("macro");
+			a && (i.macro = a), t.hasAttribute("fPublished") && (i.published = P(t.getAttribute("fPublished")));
+			let o = e.evaluate("nvPicPr/cNvPicPr", t);
+			if (o?.getAttribute) {
+				o.getAttribute("preferRelativeResize") === "0" && (i.noRelativeResize = !0);
+				let t = this.readLocks(e.evaluate("picLocks", o));
+				t && (i.locks = t), r.lockAspect = t?.noChangeAspect ?? !1;
+			}
+		}
+		readImage(e, t) {
+			let n = e.evaluate("blipFill", t), r = n ? e.evaluate("blip", n) : null;
+			if (!r) return;
+			if (!(r.getAttribute("r:embed") ?? r.getAttribute("embed") ?? r.getAttribute("r:link") ?? r.getAttribute("link"))) return e.warn("A picture names no image; it was not imported.", { onceKey: "xlsx.drawing.picture.noRel" }), null;
+			let { type: i, resId: a, ...o } = new E().processImageFill(e, n);
+			return !o.tile && o.stretch && Object.keys(o.stretch).length === 0 && delete o.stretch, o.extLst && Oe.test(o.extLst) && delete o.extLst, {
+				resId: a,
+				image: Object.keys(o).length > 0 ? o : void 0
+			};
 		}
 	},
-	DrawingGrpSpVisitor: class extends q {
+	DrawingGrpSpVisitor: class extends V {
 		constructor(...e) {
-			super(...e), this._fills = new w();
+			super(...e), this._fills = new E();
 		}
 		visit(e, t, n) {
 			if (!t) return;
@@ -2017,7 +1897,7 @@ var $ = {
 			if (c) {
 				let t = e.evaluate("xfrm", c);
 				if (t) {
-					C(t, r), t.getAttribute("flipH") === "1" && (r.flipH = !0), t.getAttribute("flipV") === "1" && (r.flipV = !0);
+					y(t, r), t.getAttribute("flipH") === "1" && (r.flipH = !0), t.getAttribute("flipV") === "1" && (r.flipV = !0);
 					let n = Y(e, t, "off", "ext"), o = Y(e, t, "chOff", "chExt") ?? n;
 					o && (i.childBounds = o), a && n && (r.anchor = {
 						tl: {
@@ -2208,7 +2088,7 @@ var $ = {
 			if (t.type === "_error") {
 				let e = t.errorType;
 				if (e) try {
-					t = o.getBuiltInByCode(e + 1) ?? o.BuiltIn.Unknown;
+					t = c.getBuiltInByCode(e + 1) ?? c.BuiltIn.Unknown;
 				} catch {}
 			}
 			return t;
@@ -2272,7 +2152,7 @@ var $ = {
 								if (n.nodeType === 1) {
 									if (n.localName === "t") e.text += n.textContent ?? "";
 									else if (n.localName === "rPr") {
-										let t = ue(n);
+										let t = Ae(n);
 										t && (e.font = t);
 									}
 								}
@@ -2299,16 +2179,16 @@ var $ = {
 		visit(e, t, n) {
 			if (!t) return;
 			let r = {};
-			e.copyFromAttribute(t, "id", r, "id", N);
+			e.copyFromAttribute(t, "id", r, "id", b);
 			let i = t.getAttribute("ref");
-			e.copyFromAttribute(t, "personId", r, "personId", N), e.copyFromAttribute(t, "parentId", r, "parentId", N);
+			e.copyFromAttribute(t, "personId", r, "personId", b), e.copyFromAttribute(t, "parentId", r, "parentId", b);
 			let a = t.getAttribute("dT");
 			a && (r.dt = function(e) {
 				let t = /^(.*T\d{2}:\d{2}:\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:?\d{2})?$/i.exec(e.trim());
 				if (!t) return e;
 				let [, n, r, i] = t;
 				return `${n}${r ? `.${(r + "00").substring(0, 3)}` : ""}${i ?? "Z"}`;
-			}(a)), t.hasAttribute("done") && (r.done = S(t.getAttribute("done")));
+			}(a)), t.hasAttribute("done") && (r.done = P(t.getAttribute("done")));
 			let o = function(e) {
 				let t, n = e.childNodes;
 				for (let e = 0; e < n.length; e++) {
@@ -2321,8 +2201,8 @@ var $ = {
 						let r = n.getAttribute("mentionId"), a = n.getAttribute("mentionpersonId");
 						if (!r || !a) continue;
 						let o = {
-							id: N(r),
-							personId: N(a)
+							id: b(r),
+							personId: b(a)
 						}, s = parseInt(n.getAttribute("startIndex") ?? "", 10);
 						isNaN(s) || (o.startIndex = s);
 						let c = parseInt(n.getAttribute("length") ?? "", 10);
@@ -2344,33 +2224,33 @@ var $ = {
 				let n = i.item(t);
 				if (n.nodeType === 1 && n.localName === "person") {
 					let t = {};
-					e.copyFromAttribute(n, "id", t, "id", N), e.copyFromAttribute(n, "displayName", t), e.copyFromAttribute(n, "userId", t, "userId", N), e.copyFromAttribute(n, "providerId", t), r.push(t);
+					e.copyFromAttribute(n, "id", t, "id", b), e.copyFromAttribute(n, "displayName", t), e.copyFromAttribute(n, "userId", t, "userId", b), e.copyFromAttribute(n, "providerId", t), r.push(t);
 				}
 			}
 			return r.length > 0 && (n.persons = r), r;
 		}
 	}
-}, de = class {
+}, je = class {
 	constructor(e, t) {
 		this.path = e, this.visitor = t;
 	}
-}, fe = class {
+}, Me = class {
 	constructor() {
-		this.visitorsByXmlTagName = /* @__PURE__ */ new Map(), this.scopedVisitorsByXmlTagName = /* @__PURE__ */ new Map(), this.visitorParamsState = null, this.registerVisitor("Relationships", new $.RelsVisitor()), this.registerVisitor("cp:coreProperties", new $.CorePropertiesVisitor()), this.registerVisitor("Properties", new $.AppPropertiesVisitor()), this.registerVisitor("spPr", new $.ShapePropertiesVisitor()), this.registerVisitor("txBody", new $.ShapeTextVisitor()), this.registerVisitor("txPr", new $.TextPropertiesVisitor()), this.registerVisitor("c:chartSpace", new $.ChartSpaceVisitor()), this.registerVisitor("c:plotArea", new $.PlotAreaVisitor()), this.registerVisitor("c:barChart", new $.BarChartTypeVisitor()), this.registerVisitor("c:doughnutChart", new $.ChartTypeVisitor()), this.registerVisitor("c:lineChart", new $.ChartTypeVisitor()), this.registerVisitor("c:ofPieType", new $.ChartTypeVisitor()), this.registerVisitor("c:pieChart", new $.ChartTypeVisitor()), this.registerVisitor("c:scatterChart", new $.ChartTypeVisitor()), this.registerVisitor("c:barChart", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:doughnutChart", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:lineChart", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:ofPieType", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:pieChart", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:scatterChart", new $.DataLabelsVisitor("dataLabels"), "dLbls"), this.registerVisitor("c:ser", new $.SeriesVisitor()), this.registerVisitor("c:dPt", new $.DataPointVisitor()), this.registerVisitor("c:marker", new $.MarkerVisitor()), this.registerVisitor("c:catAx", new $.AxisVisitor()), this.registerVisitor("c:valAx", new $.AxisVisitor()), this.registerVisitor("c:dateAx", new $.AxisVisitor()), this.registerVisitor("c:majorGridlines", new R("gridLinesMajor")), this.registerVisitor("c:minorGridlines", new R("gridLinesMinor")), this.registerVisitor("c:chartSpace", null, "txPr"), this.registerVisitor("c:catAx", new $.TextPropertiesVisitor("labels.text"), "txPr"), this.registerVisitor("c:valAx", new $.TextPropertiesVisitor("labels.text"), "txPr"), this.registerVisitor("c:dateAx", new $.TextPropertiesVisitor("labels.text"), "txPr"), this.registerVisitor("c:legend", new $.LegendVisitor()), this.registerVisitor("c:legend", new $.TextPropertiesVisitor("labels.text"), "txPr"), this.registerVisitor("c:legendEntry", new $.LegendEntryVisitor()), this.registerVisitor("c:ser", new $.NegativeShapeVisitor(), "extLst/ext/invertSolidFillFmt/spPr"), this.registerVisitor("c:ser", new $.DataLabelsVisitor("labels"), "dLbls"), this.registerVisitor("c:dLbl", new $.DataLabelsVisitor("points")), this.registerVisitor("c:title", new $.TitleVisitor()), this.registerVisitor("c:title", null, "tx/rich"), this.registerVisitor("c:title", null, "txPr"), this.registerVisitor("c:layout", new $.LayoutVisitor()), this.registerVisitor("c:dispUnits", new R("dispUnits")), this.registerVisitor("c:dispUnitsLbl", new $.TitleVisitor("displayUnitsLabel")), this.registerVisitor("c:dispUnitsLbl", new $.TextPropertiesVisitor(), "tx/rich"), this.registerVisitor("a:theme", new $.ThemeVisitor()), this.registerVisitor("a:theme", new $.ClrSchemeVisitor(), "themeElements/clrScheme"), this.registerVisitor("a:theme", new $.FontSchemeVisitor(), "themeElements/fontScheme"), this.registerVisitor("a:theme", new $.FmtSchemeVisitor(), "themeElements/fmtScheme"), this.registerVisitor("autoFilter", new $.AutoFilterVisitor()), this.registerVisitor("sortState", new $.SortStateVisitor()), this.registerVisitor("s:workbook", new $.WorkbookVisitor()), this.registerVisitor("styleSheet", new $.SheetStyleVisitor()), this.registerVisitor("x14:table", new $.TableX14Visitor()), this.registerVisitor("table", new $.TableVisitor()), this.registerVisitor("externalLink", new $.ExternalLinkVisitor()), this.registerVisitor("wsDr", new $.DrawingVisitor()), this.registerVisitor("twoCellAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("oneCellAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("absoluteAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("graphicFrame", new $.DrawingGraphicFrameVisitor()), this.registerVisitor("sp", new $.DrawingSpVisitor()), this.registerVisitor("grpSp", new $.DrawingGrpSpVisitor()), this.registerVisitor("cxnSp", new $.DrawingCxnSpVisitor()), this.registerVisitor("pic", new $.DrawingPicVisitor()), this.registerVisitor("metadata", new $.MetadataVisitor()), this.registerVisitor("rvStructures", new $.RichValueStructureVisitor()), this.registerVisitor("rvData", new $.RichValueDataVisitor()), this.registerVisitor("comments", new $.CommentsVisitor()), this.registerVisitor("comment", new $.CommentVisitor()), this.registerVisitor("ThreadedComments", new $.ThreadedCommentsVisitor()), this.registerVisitor("threadedComment", new $.ThreadedCommentVisitor()), this.registerVisitor("threadedComment", new $.TextPropertiesVisitor("content"), "text"), this.registerVisitor("personList", new $.PersonListVisitor()), this.registerVisitor("slicerCacheDefinition", new $.SlicerCacheDefinitionVisitor()), this.registerVisitor("slicers", new $.SlicersVisitor()), this.registerVisitor("formControlPr", new $.FormControlPrVisitor());
+		this.visitorsByXmlTagName = /* @__PURE__ */ new Map(), this.scopedVisitorsByXmlTagName = /* @__PURE__ */ new Map(), this.visitorParamsState = null, this.registerVisitor("Relationships", new $.RelsVisitor()), this.registerVisitor("cp:coreProperties", new $.CorePropertiesVisitor()), this.registerVisitor("Properties", new $.AppPropertiesVisitor()), this.registerVisitor("spPr", new $.ShapePropertiesVisitor()), this.registerVisitor("txBody", new $.ShapeTextVisitor()), this.registerVisitor("txPr", new $.TextPropertiesVisitor()), this.registerVisitor("a:theme", new $.ThemeVisitor()), this.registerVisitor("a:theme", new $.ClrSchemeVisitor(), "themeElements/clrScheme"), this.registerVisitor("a:theme", new $.FontSchemeVisitor(), "themeElements/fontScheme"), this.registerVisitor("a:theme", new $.FmtSchemeVisitor(), "themeElements/fmtScheme"), this.registerVisitor("a:theme", new $.ObjectDefaultsVisitor(), "objectDefaults"), this.registerVisitor("autoFilter", new $.AutoFilterVisitor()), this.registerVisitor("sortState", new $.SortStateVisitor()), this.registerVisitor("s:workbook", new $.WorkbookVisitor()), this.registerVisitor("styleSheet", new $.SheetStyleVisitor()), this.registerVisitor("x14:table", new $.TableX14Visitor()), this.registerVisitor("table", new $.TableVisitor()), this.registerVisitor("externalLink", new $.ExternalLinkVisitor()), this.registerVisitor("wsDr", new $.DrawingVisitor()), this.registerVisitor("twoCellAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("oneCellAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("absoluteAnchor", new $.DrawingAnchorVisitor()), this.registerVisitor("graphicFrame", new $.DrawingGraphicFrameVisitor()), this.registerVisitor("sp", new $.DrawingSpVisitor()), this.registerVisitor("grpSp", new $.DrawingGrpSpVisitor()), this.registerVisitor("cxnSp", new $.DrawingCxnSpVisitor()), this.registerVisitor("pic", new $.DrawingPicVisitor()), this.registerVisitor("metadata", new $.MetadataVisitor()), this.registerVisitor("rvStructures", new $.RichValueStructureVisitor()), this.registerVisitor("rvData", new $.RichValueDataVisitor()), this.registerVisitor("comments", new $.CommentsVisitor()), this.registerVisitor("comment", new $.CommentVisitor()), this.registerVisitor("ThreadedComments", new $.ThreadedCommentsVisitor()), this.registerVisitor("threadedComment", new $.ThreadedCommentVisitor()), this.registerVisitor("threadedComment", new $.TextPropertiesVisitor("content"), "text"), this.registerVisitor("personList", new $.PersonListVisitor()), this.registerVisitor("slicerCacheDefinition", new $.SlicerCacheDefinitionVisitor()), this.registerVisitor("slicers", new $.SlicersVisitor()), this.registerVisitor("formControlPr", new $.FormControlPrVisitor());
 	}
 	registerVisitor(e, t, n = null) {
 		e.indexOf(":") === -1 && (e = "*:" + e);
 		let r = e.split(":"), i = r.length > 1 ? r[1] : r[0];
 		if (!n) return this.visitorsByXmlTagName.set(i, t), void this.visitorsByXmlTagName.set(e, t);
 		let a = this.scopedVisitorsByXmlTagName.get(i);
-		a || (a = [], this.scopedVisitorsByXmlTagName.set(i, a), this.scopedVisitorsByXmlTagName.set(e, a)), a.push(new de(n, t));
+		a || (a = [], this.scopedVisitorsByXmlTagName.set(i, a), this.scopedVisitorsByXmlTagName.set(e, a)), a.push(new je(n, t));
 	}
 	parseDxf(t, n = "", r = e.EmptyObject) {
 		this.visitorParamsState ||= /* @__PURE__ */ new Map();
 		let i = this.visitorParamsState, a = i.get("processingDXFs");
 		i.set("processingDXFs", !0);
 		try {
-			let e = new L(null, this, "/dxf", t, {}, n, r), i = {};
+			let e = new R(null, this, "/dxf", t, {}, n, r), i = {};
 			return new $.SheetStyleVisitor().processDXF(e, t, i), i;
 		} finally {
 			a === void 0 ? i.delete("processingDXFs") : i.set("processingDXFs", a);
@@ -2384,7 +2264,7 @@ var $ = {
 		this.visitorParamsState && !r?.paramMap || (this.visitorParamsState = r?.paramMap ?? /* @__PURE__ */ new Map());
 		let a = {}, o = this.visitorsByXmlTagName.get(i.nodeName);
 		if (o ||= this.visitorsByXmlTagName.get(i.localName), !o) throw Error(`A visitor for the root element: '${i.nodeName}' or '${i.localName}' must be registered.`);
-		let s = "/" + i.localName, c = new L(null, this, s, i, a, n, r), l = [];
+		let s = "/" + i.localName, c = new R(null, this, s, i, a, n, r), l = [];
 		this._doWalk(o, c, l, i, a, n, r);
 		let u = l.length;
 		for (let e = 0; e < u; e++) {
@@ -2412,7 +2292,7 @@ var $ = {
 				for (; l && l !== r;) s = l.localName + "/" + s, l = l.parentNode;
 				let u = t.getPath() + "/" + s;
 				if (c.visitor) {
-					let r = new L(t, this, u, t.getElemRoot(), t.getJsonRoot(), a, o);
+					let r = new R(t, this, u, t.getElemRoot(), t.getJsonRoot(), a, o);
 					this._doWalk(c.visitor, r, n, e, i, a, o);
 				}
 			};
@@ -2438,10 +2318,10 @@ var $ = {
 			if (r.nodeType !== 1) continue;
 			let c = r, p = c.nodeName, m = l.get(p);
 			m ||= (p = c.localName, l.get(p));
-			let h = t.getPath() + "/" + p, g = new L(t, this, h, u, d, a, o);
+			let h = t.getPath() + "/" + p, g = new R(t, this, h, u, d, a, o);
 			this._doWalk(m, g, n, c, s ?? i, a, o);
 		}
 		return s;
 	}
 };
-export { fe as DOMTransformer, L as ExecutionContext, h as NumberUtils, ie as VisitorUtils };
+export { Me as DOMTransformer, R as ExecutionContext, _ as NumberUtils, ne as VisitorUtils };