@genome-spy/app 1.2.0 → 1.3.0

package/dist/{order-BVvkjDRT.js → order-BnKzKjt4.js}

@@ -1,16 +1,18 @@
-import { Pt as e, Sn as t, bt as n, dn as r, qt as i, xt as a } from "./clipOptions-D_wBNhzs.js";
-import { t as o } from "./scalePosition-0aeqp_kz.js";
-import { c as s, s as c } from "./markUtils-CvLDz744.js";
-import { t as l } from "./rectangle-DZTR6NFQ.js";
+import { An as e, Et as t, It as n, P as r, Tt as i, Wn as a } from "./clipOptions-SrrxeAEU.js";
+import { X as o } from "./arrayUtils-Bm7QnzhN.js";
+import { t as s } from "./scalePosition-CRXa0rCC.js";
+import { c, l } from "./markUtils-RaatLEa-.js";
+import { t as u } from "./rectangle-DZTR6NFQ.js";
+import { t as d } from "./color-jETn8xK_.js";
 //#region ../core/src/rendering/immediate/markData.js
-var u = [], d = ["x", "y"], f = class {
+var f = [], p = ["x", "y"], m = class {
 	#e = {
 		x: 0,
 		y: 0,
 		width: 0,
 		height: 0
 	};
-	#t = new l(() => this.#e.x, () => this.#e.y, () => this.#e.width, () => this.#e.height);
+	#t = new u(() => this.#e.x, () => this.#e.y, () => this.#e.width, () => this.#e.height);
 	#n;
 	#r = 0;
 	#i = 0;
@@ -34,26 +36,26 @@ var u = [], d = ["x", "y"], f = class {
 		this.#e.y = this.#r + e * n * this.#i, this.#e.height = t * n * this.#i;
 	}
 };
-function p(e, t) {
+function h(e, t) {
 	let n = e.unitView.getCollector();
 	if (!n) throw Error(`Cannot render an uninitialized mark. View: ${e.unitView.getPathString()}`);
 	let r = n.facetBatches.get(void 0);
-	return r?.length ? r : n.facetBatches.get(t.facetId) ?? u;
+	return r?.length ? r : n.facetBatches.get(t.facetId) ?? f;
 }
-function m(e, t, n, r, i, a) {
-	let o = p(e, t);
+function g(e, t, n, r, i, a) {
+	let o = h(e, t);
 	if (t.sampleFacetRenderingOptions) {
 		let a = r.resolveFacet(n, t.sampleFacetRenderingOptions);
-		h(e, a) && i(a, o);
-	} else if (e.encoders.facetIndex) for (let [s, c] of g(e.encoders.facetIndex, o)) {
+		_(e, a) && i(a, o);
+	} else if (e.encoders.facetIndex) for (let [s, c] of v(e.encoders.facetIndex, o)) {
 		let o = r.resolvePlacement(n, t.placement?.source, s);
-		o ? h(e, o) && i(o, c) : a(s);
+		o ? _(e, o) && i(o, c) : a(s);
 	}
-	else h(e, n) && i(n, o);
+	else _(e, n) && i(n, o);
 }
-function h(e, t) {
+function _(e, t) {
 	if (e.properties.clamp && t.height <= 0) return !1;
-	for (let n of d) {
+	for (let n of p) {
 		let r = e.encoders[n]?.scale;
 		if (r && "gapMapping" in r) {
 			let e = n === "x" ? t.width : t.height;
@@ -62,7 +64,7 @@ function h(e, t) {
 	}
 	return !0;
 }
-function g(e, t) {
+function v(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let r of t) {
 		let t = +e(r), i = n.get(t);
@@ -72,7 +74,7 @@ function g(e, t) {
 }
 //#endregion
 //#region ../core/src/rendering/immediate/bounds.js
-function _(e, t, n) {
+function y(e, t, n) {
 	return {
 		x1: n?.clipX ? Math.max(0, n.rect.x) : 0,
 		y1: n?.clipY ? Math.max(0, n.rect.y) : 0,
@@ -80,7 +82,7 @@ function _(e, t, n) {
 		y2: n?.clipY ? Math.min(t, n.rect.y2) : t
 	};
 }
-function v(e, t, n) {
+function b(e, t, n) {
 	let r = n === !0 || n === "x", i = n === !0 || n === "y";
 	return {
 		x1: r ? t?.clipX ? t.rect.x : e.x : -Infinity,
@@ -89,19 +91,19 @@ function v(e, t, n) {
 		y2: i ? t?.clipY ? t.rect.y2 : e.y2 : Infinity
 	};
 }
-function y(e) {
+function x(e) {
 	return e.x1 <= e.x2 && e.y1 <= e.y2;
 }
-function b(e, t, n) {
+function S(e, t, n) {
 	return t < e.x1 || t > e.x2 || n < e.y1 || n > e.y2;
 }
-function x(e, t, n, r, i, a = 0) {
+function C(e, t, n, r, i, a = 0) {
 	return !(Math.max(t, r) + a < e.x1 || Math.min(t, r) - a > e.x2 || Math.max(n, i) + a < e.y1 || Math.min(n, i) - a > e.y2);
 }
 //#endregion
 //#region ../core/src/rendering/immediate/geometry/polygonUnion.js
-var S = 1e-8;
-function C(e) {
+var w = 1e-8;
+function T(e) {
 	let t = e.flatMap((e, t) => e.map((n, r) => ({
 		a: n,
 		b: e[(r + 1) % e.length],
@@ -109,55 +111,55 @@ function C(e) {
 	}))), n = [];
 	for (let r of t) {
 		let i = [0, 1];
-		for (let e of t) r.polygonIndex != e.polygonIndex && w(r, e, i);
+		for (let e of t) r.polygonIndex != e.polygonIndex && E(r, e, i);
 		i.sort((e, t) => e - t);
 		for (let t = 0; t < i.length - 1; t++) {
 			let a = i[t], o = i[t + 1];
-			if (o - a <= S) continue;
-			let s = A(r.a, r.b, a), c = A(r.a, r.b, o), l = A(s, c, .5);
-			e.some((e, t) => t != r.polygonIndex && O(l, e)) || n.push({
+			if (o - a <= w) continue;
+			let s = M(r.a, r.b, a), c = M(r.a, r.b, o), l = M(s, c, .5);
+			e.some((e, t) => t != r.polygonIndex && A(l, e)) || n.push({
 				a: s,
 				b: c,
 				polygonIndex: r.polygonIndex
 			});
 		}
 	}
-	return D(E(n));
+	return k(O(n));
 }
-function w(e, t, n) {
-	let r = M(e.b, e.a), i = M(t.b, t.a), a = M(t.a, e.a), o = P(r, i);
-	if (Math.abs(o) > S) {
-		let e = P(a, i) / o, t = P(a, r) / o;
-		e > S && e < .99999999 && t >= -1e-8 && t <= 1.00000001 && n.push(e);
-	} else Math.abs(P(a, r)) <= S && (T(e, t.a, n), T(e, t.b, n));
+function E(e, t, n) {
+	let r = P(e.b, e.a), i = P(t.b, t.a), a = P(t.a, e.a), o = I(r, i);
+	if (Math.abs(o) > w) {
+		let e = I(a, i) / o, t = I(a, r) / o;
+		e > w && e < .99999999 && t >= -1e-8 && t <= 1.00000001 && n.push(e);
+	} else Math.abs(I(a, r)) <= w && (D(e, t.a, n), D(e, t.b, n));
 }
-function T(e, t, n) {
-	let r = M(e.b, e.a), i = N(r, r), a = N(M(t, e.a), r) / i;
-	a > S && a < .99999999 && n.push(a);
+function D(e, t, n) {
+	let r = P(e.b, e.a), i = F(r, r), a = F(P(t, e.a), r) / i;
+	a > w && a < .99999999 && n.push(a);
 }
-function E(e) {
+function O(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e) {
-		let e = j(n.a) + ":" + j(n.b), r = j(n.b) + ":" + j(n.a);
+		let e = N(n.a) + ":" + N(n.b), r = N(n.b) + ":" + N(n.a);
 		t.has(r) ? t.delete(r) : t.has(e) || t.set(e, n);
 	}
 	return Array.from(t.values());
 }
-function D(e) {
+function k(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e) {
-		let e = j(n.a), r = t.get(e) ?? [];
+		let e = N(n.a), r = t.get(e) ?? [];
 		r.push(n), t.set(e, r);
 	}
 	let n = new Set(e), r = [];
 	for (; n.size;) {
 		let e = n.values().next().value, i = [e.a], a = e;
 		for (;;) {
-			if (n.delete(a), i.push(a.b), j(a.b) == j(i[0])) {
+			if (n.delete(a), i.push(a.b), N(a.b) == N(i[0])) {
 				i.pop();
 				break;
 			}
-			let e = (t.get(j(a.b)) ?? []).find((e) => n.has(e));
+			let e = (t.get(N(a.b)) ?? []).find((e) => n.has(e));
 			if (!e) throw Error("Cannot chain SVG polygon union boundary.");
 			a = e;
 		}
@@ -165,133 +167,155 @@ function D(e) {
 	}
 	return r;
 }
-function O(e, t) {
+function A(e, t) {
 	let n = !1;
 	for (let r = 0, i = t.length - 1; r < t.length; i = r++) {
 		let a = t[i], o = t[r];
-		if (k(e, a, o)) return !1;
+		if (j(e, a, o)) return !1;
 		a.y > e.y != o.y > e.y && e.x < (o.x - a.x) * (e.y - a.y) / (o.y - a.y) + a.x && (n = !n);
 	}
 	return n;
 }
-function k(e, t, n) {
-	return Math.abs(P(M(e, t), M(n, t))) <= S && N(M(e, t), M(e, n)) <= S;
+function j(e, t, n) {
+	return Math.abs(I(P(e, t), P(n, t))) <= w && F(P(e, t), P(e, n)) <= w;
 }
-function A(e, t, n) {
+function M(e, t, n) {
 	return {
 		x: e.x + (t.x - e.x) * n,
 		y: e.y + (t.y - e.y) * n
 	};
 }
-function j(e) {
-	return `${Math.round(e.x / S)},${Math.round(e.y / S)}`;
+function N(e) {
+	return `${Math.round(e.x / w)},${Math.round(e.y / w)}`;
 }
-function M(e, t) {
+function P(e, t) {
 	return {
 		x: e.x - t.x,
 		y: e.y - t.y
 	};
 }
-function N(e, t) {
+function F(e, t) {
 	return e.x * t.x + e.y * t.y;
 }
-function P(e, t) {
+function I(e, t) {
 	return e.x * t.y - e.y * t.x;
 }
 //#endregion
 //#region ../core/src/rendering/immediate/markEncoding.js
-function F(e, t, n, r, i = !1) {
-	let o = t[n], s = t[n + "2"], c = t[n + "Offset"], l = t[n + "2Offset"], u = n == "x" ? e.width : e.height, d = n == "x" ? e.x : e.y + u, f = n == "x" ? u : -u, p = n == "x" ? e.x : e.y, m = p + u, h = R(o), g = s ? R(s) : 0, _ = R(c), v = l ? R(l) : 0, y = L(o, u, s), b = s && L(s, u, o), x = o.constant && !y ? I(o, r) + h : 0, S = s?.constant && !b ? I(s, r) + g : 0, C = c.constant ? I(c, r) + _ : 0, w = s && l?.constant ? I(l, r) + v : 0;
-	return (e, t) => {
-		let n = c.constant ? C : I(c, e) + _, r = y ? y(e) : o.constant ? x : I(o, e) + h, u = d + r * f + n, T = u;
+var L = /* @__PURE__ */ new WeakMap();
+function R(e) {
+	let t = L.get(e);
+	if (!t) {
+		let n = /* @__PURE__ */ new Map([["none", 0]]), r = "none", i = 0;
+		t = (e) => {
+			if (e !== r) {
+				let t = n.get(e);
+				t === void 0 && (t = d(e)[3], n.set(e, t)), r = e, i = t;
+			}
+			return i;
+		}, L.set(e, t);
+	}
+	return t;
+}
+function z(e, n, r, i, a = !1) {
+	let o = n[r], s = n[r + "2"], c = n[r + "Offset"], l = n[r + "2Offset"], u = r == "x" ? e.width : e.height, d = r == "x" ? e.x : e.y + u, f = r == "x" ? u : -u, p = r == "x" ? e.x : e.y, m = p + u, h = H(o), g = s ? H(s) : 0, _ = H(c), v = l ? H(l) : 0, y = V(o, u, s), b = s && V(s, u, o), x = o.constant && !y ? B(o, i) + h : 0, S = s?.constant && !b ? B(s, i) + g : 0, C = c.constant ? B(c, i) + _ : 0, w = s && l?.constant ? B(l, i) + v : 0;
+	return (e, n) => {
+		let r = c.constant ? C : B(c, e) + _, i = y ? y(e) : o.constant ? x : B(o, e) + h, u = d + i * f + r, T = u;
 		if (s) {
-			let t = b ? b(e) : s.constant ? S : I(s, e) + g, r = l ? l.constant ? w : I(l, e) + v : n;
-			T = d + t * f + r;
+			let t = b ? b(e) : s.constant ? S : B(s, e) + g, n = l ? l.constant ? w : B(l, e) + v : r;
+			T = d + t * f + n;
 		}
-		return t[0] = i ? a(u, p, m) : u, t[1] = i ? a(T, p, m) : T, t;
+		return n[0] = a ? t(u, p, m) : u, n[1] = a ? t(T, p, m) : T, n;
 	};
 }
-function I(e, t) {
+function B(e, t) {
 	return e(t);
 }
-function L(e, t, n) {
-	let r = e.scale;
-	if (!r || !("gapMapping" in r)) return;
-	let i = r.gapMapping(t);
-	if (!i) return;
-	let a = e.branches[0].accessor, o = a.channelDef, s = n && c(e.channelDef) && n.branches[0].accessor, l = s ? 0 : .5, u = "band" in o ? o.band ?? l : l;
-	return (e) => {
-		let t = Number(a(e)), n = !!s && t > Number(s(e));
-		return i.position(t, u, n);
+function V(e, t, n) {
+	let i = e.scale;
+	if (!i || !("gapMapping" in i)) return;
+	let a = i.gapMapping(t);
+	if (!a) return;
+	let o = n && (i.type === "index" || i.type === "locus") && c(e.channelDef) && n.branches[0].accessor, s = o ? 0 : .5, l = e.branches.map(({ accessor: e }) => {
+		let t = e.channelDef;
+		if (r(t)) return e.asNumberAccessor();
+		let n = "band" in t ? t.band ?? s : s;
+		return (t) => {
+			let r = e(t), i = !!o && Number(r) > Number(o(t));
+			return a.position(r, n, i);
+		};
+	});
+	return (t) => {
+		for (let n = 0; n < l.length; n++) if (e.branches[n].predicate(t)) return l[n](t);
 	};
 }
-function R(e) {
+function H(e) {
 	let t = e.scale;
 	if (!t) return 0;
 	let n = e.channelDef, r = n && "band" in n ? n.band ?? .5 : .5;
-	return o(t, r);
+	return s(t, r);
 }
-function z(e, t) {
-	return H(e(t));
+function U(e, t) {
+	return K(e(t));
 }
-function B(t, n) {
-	let r = n.start ?? 0;
-	if (!t.constant || r === (n.end ?? n.data.length)) return;
-	let i = t.branches[0].accessor, a = i.channelDef, o = "value" in a ? a.value : "datum" in a ? a.datum : a;
-	if (e(o)) {
+function W(e, t) {
+	let r = t.start ?? 0;
+	if (!e.constant || r === (t.end ?? t.data.length)) return;
+	let i = e.branches[0].accessor, a = i.channelDef, o = "value" in a ? a.value : "datum" in a ? a.datum : a;
+	if (n(o)) {
 		let e = i;
 		if (!/^[$A-Z_a-z][$\w]*(?:\s*\.\s*[$A-Z_a-z][$\w]*)*(?:\s*\|\|\s*(?:"(?:[^"\\]|\\.)*"|null))?$/.test(o.expr.trim()) || !e.dependencies?.every((e) => e.batchStable)) return;
 	}
-	return H(t(n.data[r]));
+	return K(e(t.data[r]));
 }
-function V(t, n) {
-	return e(n) ? t.unitView.paramRuntime.evaluateAndGet(n) : n;
+function G(e, t) {
+	return n(t) ? e.unitView.paramRuntime.evaluateAndGet(t) : t;
 }
-function H(e) {
+function K(e) {
 	return e == null ? "none" : "" + e;
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/arrow.js
 function ee(e) {
-	let t = e.properties, n = V(e, t.headSpacing);
+	let t = e.properties, n = G(e, t.headSpacing);
 	return {
-		configuredRHeadSlope: le(V(e, t.headAngle)),
-		configuredRHeadNotchSlope: le(V(e, t.headNotchAngle)),
-		headShape: V(e, t.headShape),
-		headWidth: V(e, t.headWidth),
-		minSize: V(e, t.minSize),
-		stem: V(e, t.stem),
-		startNotch: V(e, t.startNotch),
-		minStemLength: V(e, t.minStemLength),
+		configuredRHeadSlope: de(G(e, t.headAngle)),
+		configuredRHeadNotchSlope: de(G(e, t.headNotchAngle)),
+		headShape: G(e, t.headShape),
+		headWidth: G(e, t.headWidth),
+		minSize: G(e, t.minSize),
+		stem: G(e, t.stem),
+		startNotch: G(e, t.startNotch),
+		minStemLength: G(e, t.minStemLength),
 		headSpacing: n,
 		repeatHeads: n != null && n >= 0,
-		headPlacement: V(e, t.headPlacement)
+		headPlacement: G(e, t.headPlacement)
 	};
 }
-function U(e, t, n, r, i) {
-	let { viewOpacity: a } = n, o = e.encoders;
-	return W(e, t, n, (e) => {
-		let n = t.stem ? ie(e.tail, e.tip, e.tangent, e.normal, e.stemHalfWidth, e.rHeadSlope, t.startNotch && !e.bidirectional, e.bidirectional) : null, s = n ? [n] : [];
-		ne(e, (t, n, r, i) => {
+function te(e, t, n, r, i) {
+	let { viewOpacity: a } = n, o = e.encoders, s = R(o.stroke);
+	return ne(e, t, n, (e) => {
+		let n = t.stem ? oe(e.tail, e.tip, e.tangent, e.normal, e.stemHalfWidth, e.rHeadSlope, t.startNotch && !e.bidirectional, e.bidirectional) : null, c = n ? [n] : [];
+		ie(e, (t, n, r, i) => {
 			let a = {
 				x: t,
 				y: n
 			};
-			s.push(e.renderedHeadShape == "open" ? ae(a, r, i, e.headHalfWidth, e.rHeadSlope, e.rHeadNotchSlope, e.size) : re(a, r, i, e.headHalfWidth, e.rHeadSlope, e.rHeadNotchSlope));
+			c.push(e.renderedHeadShape == "open" ? se(a, r, i, e.headHalfWidth, e.rHeadSlope, e.rHeadNotchSlope, e.size) : ae(a, r, i, e.headHalfWidth, e.rHeadSlope, e.rHeadNotchSlope));
 		});
-		let c = (i ?? H(o.stroke(e.datum))) != "none" && I(o.strokeOpacity, e.datum) * a > 0 && e.strokeWidth > 0;
+		let l = i ?? K(o.stroke(e.datum)), u = B(o.strokeOpacity, e.datum) * s(l) * a > 0 && e.strokeWidth > 0;
 		r({
 			datum: e.datum,
-			boundaryLoops: s.length == 1 || !c ? s : C(s),
+			boundaryLoops: c.length == 1 || !u ? c : T(c),
 			strokeWidth: e.strokeWidth,
 			headShapeFallback: e.headShapeFallback
 		});
 	});
 }
-function W(e, t, n, r) {
-	let { coords: i, data: a, visibleBounds: o, countOnly: c } = n, l = e.encoders;
+function ne(e, t, n, r) {
+	let { coords: i, data: a, visibleBounds: o, countOnly: s } = n, c = e.encoders;
 	if (a.length == 0) return 0;
-	let u = F(i, l, "x", a[0], s(e, "x")), d = F(i, l, "y", a[0], s(e, "y")), f = [0, 0], p = [0, 0], m = {
+	let u = z(i, c, "x", a[0], l(e, "x")), d = z(i, c, "y", a[0], l(e, "y")), f = [0, 0], p = [0, 0], m = {
 		datum: {},
 		tail: {
 			x: 0,
@@ -334,10 +358,10 @@ function W(e, t, n, r) {
 	}, h = 0;
 	for (let e of a) {
 		u(e, f), d(e, p);
-		let n = te(l.direction, e), i = n == "reverse", a = n == "both", s = i ? f[1] : f[0], g = i ? p[1] : p[0], _ = i ? f[0] : f[1], v = i ? p[0] : p[1], y = _ - s, b = v - g, S = Math.hypot(y, b);
-		if (S == 0) continue;
-		let C = y / S, w = b / S, T = Math.max(I(l.size, e), t.minSize), E = T / 2, D = Math.max(t.headWidth * T, 0) / 2, O = oe({
-			segmentLength: S,
+		let n = re(c.direction, e), i = n == "reverse", a = n == "both", l = i ? f[1] : f[0], g = i ? p[1] : p[0], _ = i ? f[0] : f[1], v = i ? p[0] : p[1], y = _ - l, b = v - g, x = Math.hypot(y, b);
+		if (x == 0) continue;
+		let S = y / x, w = b / x, T = Math.max(B(c.size, e), t.minSize), E = T / 2, D = Math.max(t.headWidth * T, 0) / 2, O = ce({
+			segmentLength: x,
 			headHalfWidth: D,
 			stemHalfWidth: t.stem ? E : -E,
 			configuredRHeadSlope: t.configuredRHeadSlope,
@@ -348,17 +372,17 @@ function W(e, t, n, r) {
 			minStemLength: t.minStemLength,
 			headShape: t.headShape,
 			bidirectional: a
-		}), k = t.headShape == "open" ? O : Math.min(t.configuredRHeadNotchSlope, O), A = t.headShape == "open" ? T : 0, j = t.headPlacement == "outside" ? ce(D, O, k, A) : 0, M = _ + C * j, N = v + w * j;
-		a && (s -= C * j, g -= w * j);
-		let P = D * O, F = Math.hypot(D, P), L = t.headShape == "open" && F > 0 ? T * D / F : 0, R = M - C * (P + L), z = N - w * (P + L), B = a ? s + C * (P + L) : s, V = a ? g + w * (P + L) : g, H = I(l.strokeWidth, e), ee = Math.max(t.stem ? E : 0, D) + H * 2;
-		if (!x(o, Math.min(s, M, R, B), Math.min(g, N, z, V), Math.max(s, M, R, B), Math.max(g, N, z, V), ee) || (h++, c)) continue;
-		let U = t.headShape == "triangle" || t.headShape == "open" ? t.headShape : "triangle", W = P + A / Math.hypot(O, 1) + H, ne = !t.repeatHeads || a ? Infinity : Math.max((t.headSpacing ?? 0) * T, W);
-		m.datum = e, q(m.tail, s, g), q(m.tip, M, N), q(m.tangent, C, w), q(m.normal, -w, C), q(m.reverseTangent, -C, -w), q(m.reverseNormal, w, -C), m.size = T, m.stemHalfWidth = E, m.headHalfWidth = D, m.headAxisLength = P, m.rHeadSlope = O, m.rHeadNotchSlope = k, m.strokeWidth = H, m.repeatSpacing = ne, m.headRepeatFootprint = W, m.geometryLength = Math.hypot(M - s, N - g), m.bidirectional = a, m.stemContainsHead = t.stem && U == "triangle" && (!t.repeatHeads || a) && D <= E, m.renderedHeadShape = U, m.headShapeFallback = U != t.headShape, r(m);
+		}), k = t.headShape == "open" ? O : Math.min(t.configuredRHeadNotchSlope, O), A = t.headShape == "open" ? T : 0, j = t.headPlacement == "outside" ? ue(D, O, k, A) : 0, M = _ + S * j, N = v + w * j;
+		a && (l -= S * j, g -= w * j);
+		let P = D * O, F = Math.hypot(D, P), I = t.headShape == "open" && F > 0 ? T * D / F : 0, L = M - S * (P + I), R = N - w * (P + I), z = a ? l + S * (P + I) : l, V = a ? g + w * (P + I) : g, H = B(c.strokeWidth, e), U = Math.max(t.stem ? E : 0, D) + H * 2;
+		if (!C(o, Math.min(l, M, L, z), Math.min(g, N, R, V), Math.max(l, M, L, z), Math.max(g, N, R, V), U) || (h++, s)) continue;
+		let W = t.headShape == "triangle" || t.headShape == "open" ? t.headShape : "triangle", G = P + A / Math.hypot(O, 1) + H, K = !t.repeatHeads || a ? Infinity : Math.max((t.headSpacing ?? 0) * T, G);
+		m.datum = e, Y(m.tail, l, g), Y(m.tip, M, N), Y(m.tangent, S, w), Y(m.normal, -w, S), Y(m.reverseTangent, -S, -w), Y(m.reverseNormal, w, -S), m.size = T, m.stemHalfWidth = E, m.headHalfWidth = D, m.headAxisLength = P, m.rHeadSlope = O, m.rHeadNotchSlope = k, m.strokeWidth = H, m.repeatSpacing = K, m.headRepeatFootprint = G, m.geometryLength = Math.hypot(M - l, N - g), m.bidirectional = a, m.stemContainsHead = t.stem && W == "triangle" && (!t.repeatHeads || a) && D <= E, m.renderedHeadShape = W, m.headShapeFallback = W != t.headShape, r(m);
 	}
 	return h;
 }
-function te(e, t) {
-	let n = z(e, t);
+function re(e, t) {
+	let n = U(e, t);
 	switch (n) {
 		case "forward":
 		case "reverse":
@@ -366,99 +390,99 @@ function te(e, t) {
 		default: throw Error(`Invalid value for "direction" channel: ${n}`);
 	}
 }
-function ne(e, t) {
+function ie(e, t) {
 	e.bidirectional && !e.stemContainsHead && t(e.tail.x, e.tail.y, e.reverseTangent, e.reverseNormal);
 	for (let n = 0; !e.stemContainsHead && !(n > 0 && n + e.headRepeatFootprint - e.strokeWidth / 2 > e.geometryLength || (t(e.tip.x - e.tangent.x * n, e.tip.y - e.tangent.y * n, e.tangent, e.normal), !(e.repeatSpacing > 0) || !Number.isFinite(e.repeatSpacing))); n += e.repeatSpacing);
 }
-function re(e, t, n, r, i, a) {
-	let o = r * i, s = o - r * a, c = G(G(e, K(t, -o)), K(n, r)), l = G(G(e, K(t, -o)), K(n, -r));
+function ae(e, t, n, r, i, a) {
+	let o = r * i, s = o - r * a, c = q(q(e, J(t, -o)), J(n, r)), l = q(q(e, J(t, -o)), J(n, -r));
 	return [
 		e,
 		c,
-		G(e, K(t, -s)),
+		q(e, J(t, -s)),
 		l
 	];
 }
-function ie(e, t, n, r, i, a, o, s) {
-	let c = i * a, l = G(G(t, K(n, -c)), K(r, i)), u = G(G(t, K(n, -c)), K(r, -i)), d = G(e, K(r, i)), f = G(e, K(r, -i));
+function oe(e, t, n, r, i, a, o, s) {
+	let c = i * a, l = q(q(t, J(n, -c)), J(r, i)), u = q(q(t, J(n, -c)), J(r, -i)), d = q(e, J(r, i)), f = q(e, J(r, -i));
 	return s ? [
 		t,
 		l,
-		G(G(e, K(n, c)), K(r, i)),
+		q(q(e, J(n, c)), J(r, i)),
 		e,
-		G(G(e, K(n, c)), K(r, -i)),
+		q(q(e, J(n, c)), J(r, -i)),
 		u
 	] : [
 		t,
 		l,
 		d,
-		...o ? [G(e, K(n, i * a))] : [],
+		...o ? [q(e, J(n, i * a))] : [],
 		f,
 		u
 	];
 }
-function ae(e, t, n, r, i, a, o) {
-	let s = r * i, c = G(G(e, K(t, -s)), K(n, r)), l = G(G(e, K(t, -s)), K(n, -r)), u = Math.hypot(r, s), d = u > 0 ? o * r / u : 0, f = u > 0 ? o * s / u : 0, p = G(G(c, K(t, -d)), K(n, -f)), m = G(G(l, K(t, -d)), K(n, f));
+function se(e, t, n, r, i, a, o) {
+	let s = r * i, c = q(q(e, J(t, -s)), J(n, r)), l = q(q(e, J(t, -s)), J(n, -r)), u = Math.hypot(r, s), d = u > 0 ? o * r / u : 0, f = u > 0 ? o * s / u : 0, p = q(q(c, J(t, -d)), J(n, -f)), m = q(q(l, J(t, -d)), J(n, f));
 	return [
 		e,
 		c,
 		p,
-		G(e, K(t, -(s + d - (r - f) * a))),
+		q(e, J(t, -(s + d - (r - f) * a))),
 		m,
 		l
 	];
 }
-function oe({ segmentLength: e, headHalfWidth: t, stemHalfWidth: n, configuredRHeadSlope: r, configuredRHeadNotchSlope: i, headRepeat: a, headPlacement: o, startNotch: s, minStemLength: c, headShape: l, bidirectional: u }) {
+function ce({ segmentLength: e, headHalfWidth: t, stemHalfWidth: n, configuredRHeadSlope: r, configuredRHeadNotchSlope: i, headRepeat: a, headPlacement: o, startNotch: s, minStemLength: c, headShape: l, bidirectional: u }) {
 	if (a || n < 0) return r;
 	if (o == "outside") return !s || n <= 0 ? r : Math.min(r, Math.max(e - c, 0) / n);
 	if (l != "triangle") return r;
 	let d = Math.max(e - c, 0) / (u ? 2 : 1);
-	return se(n, t, r, i) <= d ? r : d < n * i ? n > 0 ? ue(d / n, 0, r) : 0 : ue((d + (t - n) * i) / t, 0, r);
+	return le(n, t, r, i) <= d ? r : d < n * i ? n > 0 ? fe(d / n, 0, r) : 0 : fe((d + (t - n) * i) / t, 0, r);
 }
-function se(e, t, n, r) {
+function le(e, t, n, r) {
 	return t * n - (t - e) * Math.min(r, n);
 }
-function ce(e, t, n, r) {
+function ue(e, t, n, r) {
 	if (e <= 0) return 0;
 	let i = e * t, a = Math.hypot(e, i);
 	return i + r * e / a - (e - r * i / a) * n;
 }
-function le(e) {
-	let t = ue(e, 1, 90) * Math.PI / 180;
+function de(e) {
+	let t = fe(e, 1, 90) * Math.PI / 180;
 	return 1 / Math.max(Math.tan(t), 1e-6);
 }
-function G(e, t) {
+function q(e, t) {
 	return {
 		x: e.x + t.x,
 		y: e.y + t.y
 	};
 }
-function K(e, t) {
+function J(e, t) {
 	return {
 		x: e.x * t,
 		y: e.y * t
 	};
 }
-function q(e, t, n) {
+function Y(e, t, n) {
 	e.x = t, e.y = n;
 }
-function ue(e, t, n) {
+function fe(e, t, n) {
 	return Math.min(Math.max(e, t), n);
 }
 //#endregion
 //#region ../core/src/rendering/immediate/linkFading.js
-var de = 4;
-function fe(e, t, n) {
+var pe = 4;
+function me(e, t, n) {
 	let r = t[0] - e[0], i = t[1] - e[1], a = Math.hypot(r, i);
 	if (a == 0) return;
 	let o = -i / a, s = r / a;
 	(o < 0 || o == 0 && s < 0) && (o = -o, s = -s);
 	let c = o * e[0] + s * e[1], [l, u] = n, d = JSON.stringify([
-		J(o, 6),
-		J(s, 6),
-		J(c, 1),
-		J(l, 1),
-		J(u, 1)
+		X(o, 6),
+		X(s, 6),
+		X(c, 1),
+		X(l, 1),
+		X(u, 1)
 	]);
 	return {
 		normalX: o,
@@ -469,33 +493,33 @@ function fe(e, t, n) {
 		key: d
 	};
 }
-function pe(e, t, n = !1) {
-	let r = V(e, e.properties.arcFadingDistance);
-	return t != "arc" && t != "dome" || r === !1 || r[0] <= 0 || r[1] <= 0 || n && V(e, e.properties.noFadingOnSecondPass) ? !1 : r;
+function he(e, t, n = !1) {
+	let r = G(e, e.properties.arcFadingDistance);
+	return t != "arc" && t != "dome" || r === !1 || r[0] <= 0 || r[1] <= 0 || n && G(e, e.properties.noFadingOnSecondPass) ? !1 : r;
 }
-function me(e, t) {
+function ge(e, t) {
 	let n = [], r = (r) => {
-		for (let i = 0; i <= de; i++) {
-			let a = i / de, o = r ? t + (e - t) * a : e + (t - e) * a, s = r ? (t - o) / (2 * t) : (t + o) / (2 * t), c = (o - e) / (t - e);
+		for (let i = 0; i <= pe; i++) {
+			let a = i / pe, o = r ? t + (e - t) * a : e + (t - e) * a, s = r ? (t - o) / (2 * t) : (t + o) / (2 * t), c = (o - e) / (t - e);
 			n.push({
 				offset: s,
-				opacity: 1 - he(c)
+				opacity: 1 - _e(c)
 			});
 		}
 	};
 	return r(!0), r(!1), n;
 }
-function he(e) {
+function _e(e) {
 	let t = Math.max(0, Math.min(1, e));
 	return t * t * (3 - 2 * t);
 }
-function J(e, t) {
+function X(e, t) {
 	let n = 10 ** t;
 	return Math.round(e * n) / n;
 }
 //#endregion
 //#region ../core/src/rendering/immediate/geometry/linkGeometry.js
-function ge(e, t, n, r) {
+function ve(e, t, n, r) {
 	return r.shape == "orthogonal" ? {
 		type: "orthogonal",
 		points: [
@@ -505,38 +529,38 @@ function ge(e, t, n, r) {
 		]
 	} : {
 		type: "cubic",
-		points: _e(e, t, n, r)
+		points: ye(e, t, n, r)
 	};
 }
-function _e(e, t, n, r) {
+function ye(e, t, n, r) {
 	if (r.shape == "arc") {
-		let i = [...e], a = [...t], o = X(a, i), s = xe(o);
+		let i = [...e], a = [...t], o = Ce(a, i), s = we(o);
 		if (s == 0) return [
 			i,
 			i,
 			a,
 			a
 		];
-		let c = Z(o, 1 / s), l = [-c[1], c[0]];
-		s = ve(i, a, s, r.maxChordLength, n);
-		let u = Z(l, Math.max(s / 2 * r.arcHeightFactor, r.minArcHeight) / .75);
+		let c = Q(o, 1 / s), l = [-c[1], c[0]];
+		s = be(i, a, s, r.maxChordLength, n);
+		let u = Q(l, Math.max(s / 2 * r.arcHeightFactor, r.minArcHeight) / .75);
 		return [
 			i,
-			Y(i, u),
-			Y(a, u),
+			Z(i, u),
+			Z(a, u),
 			a
 		];
 	}
 	if (r.shape == "dome") {
 		let i, a, o;
 		r.orient == "vertical" ? (i = [Math.min(e[0], t[0]), t[1]], a = [Math.max(e[0], t[0]), t[1]], o = [0, e[1] - t[1]]) : (i = [t[0], Math.min(e[1], t[1])], a = [t[0], Math.max(e[1], t[1])], o = [e[0] - t[0], 0]);
-		let s = xe(X(a, i));
-		ve(i, a, s, r.maxChordLength, n), r.clampApex && ye(i, a, r.orient, n);
-		let c = Z(o, 1 / .75);
+		let s = we(Ce(a, i));
+		be(i, a, s, r.maxChordLength, n), r.clampApex && xe(i, a, r.orient, n);
+		let c = Q(o, 1 / .75);
 		return [
 			i,
-			Y(i, c),
-			Y(a, c),
+			Z(i, c),
+			Z(a, c),
 			a
 		];
 	}
@@ -561,7 +585,7 @@ function _e(e, t, n, r) {
 		}
 	}
 	if (r.shape == "line") {
-		let n = Z(Y(e, t), .5);
+		let n = Q(Z(e, t), .5);
 		return [
 			e,
 			n,
@@ -571,58 +595,58 @@ function _e(e, t, n, r) {
 	}
 	throw Error(`Unsupported link shape: ${r.shape}`);
 }
-function ve(e, t, n, r, i) {
+function be(e, t, n, r, i) {
 	if (n <= r) return n;
-	let a = Z(X(t, e), 1 / n);
-	return be(e, i, 2) ? (Se(t, Y(e, Z(a, r))), r) : be(t, i, 2) ? (Se(e, X(t, Z(a, r))), r) : n;
+	let a = Q(Ce(t, e), 1 / n);
+	return Se(e, i, 2) ? (Te(t, Z(e, Q(a, r))), r) : Se(t, i, 2) ? (Te(e, Ce(t, Q(a, r))), r) : n;
 }
-function ye(e, t, n, r) {
+function xe(e, t, n, r) {
 	n == "vertical" ? (t[0] > 0 && (e[0] = Math.max(e[0], -t[0])), e[0] < r.width && (t[0] = Math.min(t[0], 2 * r.width - e[0]))) : (t[1] > 0 && (e[1] = Math.max(e[1], -t[1])), e[1] < r.height && (t[1] = Math.min(t[1], 2 * r.height - e[1])));
 }
-function be(e, t, n) {
+function Se(e, t, n) {
 	return e[0] >= -t.width * n && e[0] <= t.width * (1 + n) && e[1] >= -t.height * n && e[1] <= t.height * (1 + n);
 }
-function Y(e, t) {
+function Z(e, t) {
 	return [e[0] + t[0], e[1] + t[1]];
 }
-function X(e, t) {
+function Ce(e, t) {
 	return [e[0] - t[0], e[1] - t[1]];
 }
-function Z(e, t) {
+function Q(e, t) {
 	return [e[0] * t, e[1] * t];
 }
-function xe(e) {
+function we(e) {
 	return Math.hypot(e[0], e[1]);
 }
-function Se(e, t) {
+function Te(e, t) {
 	e[0] = t[0], e[1] = t[1];
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/link.js
-function Ce(e) {
+function Ee(e) {
 	let t = e.properties;
 	return {
-		shape: V(e, t.linkShape),
-		orient: V(e, t.orient),
-		arcHeightFactor: V(e, t.arcHeightFactor),
-		minArcHeight: V(e, t.minArcHeight),
-		maxChordLength: V(e, t.maxChordLength),
-		clampApex: V(e, t.clampApex)
+		shape: G(e, t.linkShape),
+		orient: G(e, t.orient),
+		arcHeightFactor: G(e, t.arcHeightFactor),
+		minArcHeight: G(e, t.minArcHeight),
+		maxChordLength: G(e, t.maxChordLength),
+		clampApex: G(e, t.clampApex)
 	};
 }
-function we(e, t, n, r) {
-	let { coords: i, data: a, visibleBounds: o } = n, c = e.encoders;
+function De(e, t, n, r) {
+	let { coords: i, data: a, visibleBounds: o } = n, s = e.encoders;
 	if (a.length == 0) return 0;
-	let l = F(i, c, "x", a[0], s(e, "x")), u = F(i, c, "y", a[0], s(e, "y")), d = [0, 0], f = [0, 0], p = i.x, m = i.y, h = {
+	let c = z(i, s, "x", a[0], l(e, "x")), u = z(i, s, "y", a[0], l(e, "y")), d = [0, 0], f = [0, 0], p = i.x, m = i.y, h = {
 		width: i.width,
 		height: i.height
-	}, g = m + h.height, _ = s(e, "x") || s(e, "y"), v = 0;
+	}, g = m + h.height, _ = l(e, "x") || l(e, "y"), v = 0;
 	for (let e of a) {
-		if (l(e, d), u(e, f), (_ || t.shape == "orthogonal") && d[0] === d[1] && f[0] === f[1]) continue;
-		let [i, a] = d, [s, m] = f, y = ge([i - p, g - s], [a - p, g - m], h, t), b = Infinity, S = Infinity, C = -Infinity, w = -Infinity;
-		for (let e of y.points) e[0] += p, e[1] = g - e[1], b = Math.min(b, e[0]), S = Math.min(S, e[1]), C = Math.max(C, e[0]), w = Math.max(w, e[1]);
-		let T = I(c.size, e);
-		x(o, b, S, C, w, Math.max(T, n.minPickingSize ?? 0) / 2) && (v++, r({
+		if (c(e, d), u(e, f), (_ || t.shape == "orthogonal") && d[0] === d[1] && f[0] === f[1]) continue;
+		let [i, a] = d, [l, m] = f, y = ve([i - p, g - l], [a - p, g - m], h, t), b = Infinity, x = Infinity, S = -Infinity, w = -Infinity;
+		for (let e of y.points) e[0] += p, e[1] = g - e[1], b = Math.min(b, e[0]), x = Math.min(x, e[1]), S = Math.max(S, e[0]), w = Math.max(w, e[1]);
+		let T = B(s.size, e);
+		C(o, b, x, S, w, Math.max(T, n.minPickingSize ?? 0) / 2) && (v++, r({
 			datum: e,
 			geometry: y,
 			strokeWidth: T
@@ -632,39 +656,40 @@ function we(e, t, n, r) {
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/point.js
-function Te(e) {
-	return { inwardStroke: V(e, e.properties.inwardStroke) };
+function Oe(e) {
+	return { inwardStroke: G(e, e.properties.inwardStroke) };
 }
-function Ee(e, t, n, r) {
-	let { coords: i, data: o, visibleBounds: c, anchorCullBounds: l } = n, u = n.start ?? 0, d = n.end ?? o.length, f = e.encoders;
+function ke(e, n, r, i) {
+	let { coords: a, data: o, visibleBounds: s, anchorCullBounds: c } = r, u = r.start ?? 0, d = r.end ?? o.length, f = e.encoders;
 	if (u === d) return 0;
-	let p = F(i, f, "x", o[u]), m = F(i, f, "y", o[u]), h = [0, 0], g = [0, 0], _ = e.getSemanticThreshold(), v = {
+	let p = z(a, f, "x", o[u]), m = z(a, f, "y", o[u]), h = [0, 0], g = [0, 0], _ = e.getSemanticThreshold(), v = {
 		datum: {},
 		shape: "circle",
 		x: 0,
 		y: 0,
+		radius: 0,
 		geometryRadius: 0,
 		boundsRadius: 0,
 		angle: 0,
 		strokeWidth: 0,
 		lineShape: !1
-	}, y = s(e, "x"), S = s(e, "y"), C = 0;
-	for (let e = u; e < d; e++) {
-		let n = o[e];
-		if (I(f.semanticScore, n) < _) continue;
-		p(n, h), m(n, g);
-		let s = h[0] + I(f.dx, n), u = g[0] - I(f.dy, n);
-		if (y && (s = a(s, i.x, i.x2)), S && (u = a(u, i.y, i.y2)), b(l, s, u)) continue;
-		let d = Math.sqrt(I(f.size, n)) / 2;
-		if (t.inwardStroke && d <= 0) continue;
-		let w = z(f.shape, n), T = I(f.strokeWidth, n), E = w == "x" || w == "+", D = t.inwardStroke && !E ? Math.min(T, d) : T, O = t.inwardStroke && !E ? d - D / 2 : d, k = t.inwardStroke ? 0 : T / 2, A = d * Math.SQRT2 + k;
-		x(c, s - A, u - A, s + A, u + A) && (C++, v.datum = n, v.shape = w, v.x = s, v.y = u, v.geometryRadius = O, v.boundsRadius = A, v.angle = I(f.angle, n), v.strokeWidth = D, v.lineShape = E, r(v));
+	}, y = l(e, "x"), b = l(e, "y"), x = 0;
+	for (let r = u; r < d; r++) {
+		let l = o[r];
+		if (B(f.semanticScore, l) < _ && !e.isPreservedBySelection(l)) continue;
+		p(l, h), m(l, g);
+		let u = h[0] + B(f.dx, l), d = g[0] - B(f.dy, l);
+		if (y && (u = t(u, a.x, a.x2)), b && (d = t(d, a.y, a.y2)), S(c, u, d)) continue;
+		let w = Math.sqrt(B(f.size, l)) / 2;
+		if (n.inwardStroke && w <= 0) continue;
+		let T = U(f.shape, l), E = B(f.strokeWidth, l), D = T == "x" || T == "+", O = n.inwardStroke && !D ? Math.min(E, w) : E, k = n.inwardStroke && !D ? w - O / 2 : w, A = n.inwardStroke ? 0 : E / 2, j = w * Math.SQRT2 + A;
+		C(s, u - j, d - j, u + j, d + j) && (x++, v.datum = l, v.shape = T, v.x = u, v.y = d, v.radius = w, v.geometryRadius = k, v.boundsRadius = j, v.angle = B(f.angle, l), v.strokeWidth = O, v.lineShape = D, i(v));
 	}
-	return C;
+	return x;
 }
 //#endregion
 //#region ../core/src/rendering/immediate/geometry/pointPath.js
-function De(e, t, n, r, i) {
+function Ae(e, t, n, r, i) {
 	let a = r * .4, o = r * .15, s = Math.sqrt(3) * r / 2;
 	switch (e) {
 		case "diamond": return i.moveTo(t, n - r), i.lineTo(t + r, n), i.lineTo(t, n + r), i.lineTo(t - r, n), i.closePath(), !0;
@@ -673,49 +698,49 @@ function De(e, t, n, r, i) {
 		case "triangle-right": return i.moveTo(t + s, n), i.lineTo(t - s, n + r), i.lineTo(t - s, n - r), i.closePath(), !0;
 		case "triangle-down": return i.moveTo(t, n + s), i.lineTo(t - r, n - s), i.lineTo(t + r, n - s), i.closePath(), !0;
 		case "triangle-left": return i.moveTo(t - s, n), i.lineTo(t + s, n - r), i.lineTo(t + s, n + r), i.closePath(), !0;
-		case "tick-up": return Q(i, t - o, n - r, t + o, n), !0;
-		case "tick-right": return Q(i, t, n - o, t + r, n + o), !0;
-		case "tick-down": return Q(i, t - o, n, t + o, n + r), !0;
-		case "tick-left": return Q(i, t - r, n - o, t, n + o), !0;
+		case "tick-up": return je(i, t - o, n - r, t + o, n), !0;
+		case "tick-right": return je(i, t, n - o, t + r, n + o), !0;
+		case "tick-down": return je(i, t - o, n, t + o, n + r), !0;
+		case "tick-left": return je(i, t - r, n - o, t, n + o), !0;
 		case "+": return i.moveTo(t - r, n), i.lineTo(t + r, n), i.moveTo(t, n - r), i.lineTo(t, n + r), !0;
 		case "x": return i.moveTo(t - r, n - r), i.lineTo(t + r, n + r), i.moveTo(t + r, n - r), i.lineTo(t - r, n + r), !0;
 		default: return !1;
 	}
 }
-function Q(e, t, n, r, i) {
+function je(e, t, n, r, i) {
 	e.moveTo(t, n), e.lineTo(r, n), e.lineTo(r, i), e.lineTo(t, i), e.closePath();
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/rect.js
-var Oe = .1;
-function ke(e) {
-	let t = e.properties, n = V(e, t.cornerRadius), r = {
-		topLeft: V(e, t.cornerRadiusTopLeft ?? n),
-		topRight: V(e, t.cornerRadiusTopRight ?? n),
-		bottomRight: V(e, t.cornerRadiusBottomRight ?? n),
-		bottomLeft: V(e, t.cornerRadiusBottomLeft ?? n)
+var Me = .1;
+function Ne(e) {
+	let t = e.properties, n = G(e, t.cornerRadius), r = {
+		topLeft: G(e, t.cornerRadiusTopLeft ?? n),
+		topRight: G(e, t.cornerRadiusTopRight ?? n),
+		bottomRight: G(e, t.cornerRadiusBottomRight ?? n),
+		bottomLeft: G(e, t.cornerRadiusBottomLeft ?? n)
 	}, i = {
-		blur: V(e, t.shadowBlur ?? 0),
-		color: V(e, t.shadowColor ?? "black"),
-		offsetX: V(e, t.shadowOffsetX ?? 0),
-		offsetY: V(e, t.shadowOffsetY ?? 0),
-		opacity: V(e, t.shadowOpacity ?? 0)
-	}, a = V(e, t.hatch ?? "none"), o = !Ne(r);
+		blur: G(e, t.shadowBlur ?? 0),
+		color: G(e, t.shadowColor ?? "black"),
+		offsetX: G(e, t.shadowOffsetX ?? 0),
+		offsetY: G(e, t.shadowOffsetY ?? 0),
+		opacity: G(e, t.shadowOpacity ?? 0)
+	}, a = G(e, t.hatch ?? "none"), o = !Le(r);
 	return {
 		cornerRadii: r,
-		minWidth: V(e, t.minWidth),
-		minHeight: V(e, t.minHeight),
-		minOpacity: V(e, t.minOpacity),
+		minWidth: G(e, t.minWidth),
+		minHeight: G(e, t.minHeight),
+		minOpacity: G(e, t.minOpacity),
 		shadow: i,
 		hatch: a,
 		hasCornerRadii: o,
 		canPadSeams: a == "none" && i.opacity == 0 && !o
 	};
 }
-function Ae(e, t, n, r) {
-	let { coords: i, data: a, visibleBounds: o, viewOpacity: c } = n, l = n.start ?? 0, u = n.end ?? a.length, d = e.encoders;
-	if (l === u) return 0;
-	let f = d.strokeWidth.constant, p = d.fillOpacity.constant, m = f ? I(d.strokeWidth, a[l]) : 0, h = p ? I(d.fillOpacity, a[l]) : 0, g = B(d.fill, n), _ = t.shadow.opacity > 0 ? t.shadow.blur + Math.max(Math.abs(t.shadow.offsetX), Math.abs(t.shadow.offsetY)) : 0, v = F(i, d, "x", a[l], s(e, "x")), y = F(i, d, "y", a[l], s(e, "y")), b = [0, 0], S = [0, 0], C = s(e, "x"), w = s(e, "y"), T = {
+function Pe(e, t, n, r) {
+	let { coords: i, data: a, visibleBounds: o, viewOpacity: s } = n, c = n.start ?? 0, u = n.end ?? a.length, d = e.encoders;
+	if (c === u) return 0;
+	let f = R(d.fill), p = d.strokeWidth.constant, m = d.fillOpacity.constant, h = p ? B(d.strokeWidth, a[c]) : 0, g = m ? B(d.fillOpacity, a[c]) : 0, _ = W(d.fill, n), v = t.shadow.opacity > 0 ? t.shadow.blur + Math.max(Math.abs(t.shadow.offsetX), Math.abs(t.shadow.offsetY)) : 0, y = z(i, d, "x", a[c], l(e, "x")), b = z(i, d, "y", a[c], l(e, "y")), x = [0, 0], S = [0, 0], w = l(e, "x"), T = l(e, "y"), E = {
 		datum: {},
 		x: 0,
 		y: 0,
@@ -731,30 +756,30 @@ function Ae(e, t, n, r) {
 		strokeWidth: 0,
 		fill: "none",
 		fillOpacity: 0
-	}, E = 0;
-	for (let e = l; e < u; e++) {
+	}, D = 0;
+	for (let e = c; e < u; e++) {
 		let n = a[e];
-		if (v(n, b), y(n, S), C && b[0] === b[1] || w && S[0] === S[1]) continue;
-		let i = Math.min(b[0], b[1]), s = Math.min(S[0], S[1]), l = Math.abs(b[1] - b[0]), u = Math.abs(S[1] - S[0]), D = je(l, t.minWidth), O = je(u, t.minHeight), k = Math.max(t.minOpacity, D * O);
-		l < t.minWidth && (i -= (t.minWidth - l) / 2, l = t.minWidth), u < t.minHeight && (s -= (t.minHeight - u) / 2, u = t.minHeight);
-		let A = f ? m : I(d.strokeWidth, n), j = g ?? H(d.fill(n)), M = (p ? h : I(d.fillOpacity, n)) * c, N = A == 0 && M == 1 && k == 1 && t.canPadSeams && j != "none" ? Oe : 0;
-		N && (i -= N, s -= N, l += N * 2, u += N * 2), x(o, i, s, i + l, s + u, A / 2 + _) && (E++, T.datum = n, T.x = i, T.y = s, T.width = l, T.height = u, T.opacityFactor = k, T.strokeWidth = A, T.fill = j, T.fillOpacity = M, t.hasCornerRadii && Me(t.cornerRadii, l, u, T.radii), r(T));
+		if (y(n, x), b(n, S), w && x[0] === x[1] || T && S[0] === S[1]) continue;
+		let i = Math.min(x[0], x[1]), c = Math.min(S[0], S[1]), l = Math.abs(x[1] - x[0]), u = Math.abs(S[1] - S[0]), O = Fe(l, t.minWidth), k = Fe(u, t.minHeight), A = Math.max(t.minOpacity, O * k);
+		l < t.minWidth && (i -= (t.minWidth - l) / 2, l = t.minWidth), u < t.minHeight && (c -= (t.minHeight - u) / 2, u = t.minHeight);
+		let j = p ? h : B(d.strokeWidth, n), M = _ ?? K(d.fill(n)), N = (m ? g : B(d.fillOpacity, n)) * s, P = j == 0 && N * f(M) == 1 && A == 1 && t.canPadSeams && M != "none" ? Me : 0;
+		P && (i -= P, c -= P, l += P * 2, u += P * 2), C(o, i, c, i + l, c + u, j / 2 + v) && (D++, E.datum = n, E.x = i, E.y = c, E.width = l, E.height = u, E.opacityFactor = A, E.strokeWidth = j, E.fill = M, E.fillOpacity = N, t.hasCornerRadii && Ie(t.cornerRadii, l, u, E.radii), r(E));
 	}
-	return E;
+	return D;
 }
-function je(e, t) {
+function Fe(e, t) {
 	return t > 0 && e < t ? e / t : 1;
 }
-function Me(e, t, n, r) {
+function Ie(e, t, n, r) {
 	let i = Math.min(t, n) / 2;
 	r.topLeft = Math.max(0, Math.min(e.topLeft, i)), r.topRight = Math.max(0, Math.min(e.topRight, i)), r.bottomRight = Math.max(0, Math.min(e.bottomRight, i)), r.bottomLeft = Math.max(0, Math.min(e.bottomLeft, i));
 }
-function Ne(e) {
+function Le(e) {
 	return e.topLeft == 0 && e.topRight == 0 && e.bottomRight == 0 && e.bottomLeft == 0;
 }
 //#endregion
 //#region ../core/src/utils/clipSegment.js
-function Pe(e, t, n, r, i, a, o, s, c) {
+function Re(e, t, n, r, i, a, o, s, c) {
 	if (!Number.isFinite(e) || !Number.isFinite(t) || !Number.isFinite(n) || !Number.isFinite(r)) return !1;
 	let l = n - e, u = r - t, d = 0, f = 1;
 	if (l == 0) {
@@ -773,59 +798,70 @@ function Pe(e, t, n, r, i, a, o, s, c) {
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/rule.js
-function Fe(e) {
-	return { minLength: V(e, e.properties.minLength) };
+function ze(e) {
+	let t = "strokeAlign" in e.properties ? G(e, e.properties.strokeAlign) : "outside";
+	return {
+		strokeAlign: t === "inside" || t === "center" ? t : "outside",
+		minLength: G(e, e.properties.minLength),
+		strokeCap: G(e, e.properties.strokeCap)
+	};
 }
-function Ie(e, t, n, r) {
-	let { coords: i, data: a, visibleBounds: o } = n, c = e.encoders;
-	if (a.length == 0) return 0;
-	let l = F(i, c, "x", a[0]), u = F(i, c, "y", a[0]), d = [0, 0], f = [0, 0], p = {
+function Be(e, t, n, r) {
+	let { coords: i, data: a, visibleBounds: o } = n, s = e.encoders, c = n.start ?? 0, u = n.end ?? a.length;
+	if (c === u) return 0;
+	let d = z(i, s, "x", a[c]), f = z(i, s, "y", a[c]), p = [0, 0], m = [0, 0], h = {
 		datum: {},
 		x1: 0,
 		y1: 0,
 		x2: 0,
 		y2: 0,
-		strokeWidth: 0
-	}, m = s(e, "x"), h = s(e, "y"), g = [
+		size: 0,
+		strokeWidth: 0,
+		stroke: "none",
+		strokeOpacity: 0
+	}, g = l(e, "x"), _ = l(e, "y"), v = [
 		0,
 		0,
 		0,
 		0
-	], _ = 0;
-	for (let e of a) {
-		l(e, d), u(e, f);
-		let [n, a] = d, [s, v] = f, y = I(c.size, e), b = y + t.minLength + 1, S = Math.max(o.x2 - o.x1, b), C = Math.max(o.y2 - o.y1, b);
-		if (!Pe(n, s, a, v, m ? i.x : o.x1 - S, h ? i.y : o.y1 - C, m ? i.x2 : o.x2 + S, h ? i.y2 : o.y2 + C, g) || ([n, s, a, v] = g, n === a && s === v)) continue;
-		let w = a - n, T = v - s, E = Math.hypot(w, T);
-		if (E > 0 && E < t.minLength) {
-			let e = (t.minLength - E) / 2, r = w / E, i = T / E;
-			n -= r * e, s -= i * e, a += r * e, v += i * e;
+	], y = 0, b = e.getType() === "rule", x = b ? W(s.stroke, n) : "none", S = b ? R(s.stroke) : () => 0;
+	for (let e = c; e < u; e++) {
+		let n = a[e];
+		d(n, p), f(n, m);
+		let [c, l] = p, [u, w] = m, T = B(s.size, n);
+		if (T <= 0) continue;
+		let E = x ?? K(s.stroke(n)), D = b ? B(s.strokeOpacity, n) : 0, O = b && D * S(E) > 0 ? Math.max(0, B(s.strokeWidth, n)) : 0, k = T + 2 * O + t.minLength + 1, A = Math.max(o.x2 - o.x1, k), j = Math.max(o.y2 - o.y1, k);
+		if (!Re(c, u, l, w, g ? i.x : o.x1 - A, _ ? i.y : o.y1 - j, g ? i.x2 : o.x2 + A, _ ? i.y2 : o.y2 + j, v) || ([c, u, l, w] = v, c === l && u === w)) continue;
+		let M = l - c, N = w - u, P = Math.hypot(M, N);
+		if (P > 0 && P < t.minLength) {
+			let e = (t.minLength - P) / 2, n = M / P, r = N / P;
+			c -= n * e, u -= r * e, l += n * e, w += r * e;
 		}
-		x(o, n, s, a, v, y / 2) && (_++, p.datum = e, p.x1 = n, p.y1 = s, p.x2 = a, p.y2 = v, p.strokeWidth = y, r(p));
+		C(o, c, u, l, w, (T / 2 + O) * (t.strokeCap === "square" ? Math.SQRT2 : 1)) && (y++, h.datum = n, h.x1 = c, h.y1 = u, h.x2 = l, h.y2 = w, h.size = T, h.strokeWidth = O, h.stroke = E, h.strokeOpacity = D, r(h));
 	}
-	return _;
+	return y;
 }
 //#endregion
 //#region ../core/src/rendering/immediate/marks/text.js
-function Le(e) {
+function Ve(e) {
 	let t = e.properties;
 	return {
-		align: V(e, t.align),
-		baseline: V(e, t.baseline),
-		logoLetters: V(e, t.logoLetters),
-		paddingX: V(e, t.paddingX),
-		paddingY: V(e, t.paddingY),
-		flushX: V(e, t.flushX),
-		flushY: V(e, t.flushY),
-		squeeze: V(e, t.squeeze),
-		dx: V(e, t.dx),
-		dy: V(e, t.dy)
+		align: G(e, t.align),
+		baseline: G(e, t.baseline),
+		logoLetters: G(e, t.logoLetters),
+		paddingX: G(e, t.paddingX),
+		paddingY: G(e, t.paddingY),
+		flushX: G(e, t.flushX),
+		flushY: G(e, t.flushY),
+		squeeze: G(e, t.squeeze),
+		dx: G(e, t.dx),
+		dy: G(e, t.dy)
 	};
 }
-function Re(e, r, a, o) {
-	let { coords: c, data: l, visibleBounds: u, anchorCullBounds: d } = a, { align: f, baseline: p } = r, m = e.encoders;
-	if (l.length == 0) return 0;
-	let h = m.size.constant ? I(m.size, l[0]) : 0, g = m.angle.constant ? I(m.angle, l[0]) : 0, _ = F(c, m, "x", l[0], s(e, "x")), v = F(c, m, "y", l[0], s(e, "y")), y = e.encoding.text, x = "format" in y ? i(y.format) : (e) => e, S = [0, 0], C = [0, 0], w = {
+function He(e, t, n, r) {
+	let { coords: s, data: c, visibleBounds: u, anchorCullBounds: d } = n, { align: f, baseline: p } = t, m = e.encoders;
+	if (c.length == 0) return 0;
+	let h = m.size.constant ? B(m.size, c[0]) : 0, g = m.angle.constant ? B(m.angle, c[0]) : 0, _ = z(s, m, "x", c[0], l(e, "x")), v = z(s, m, "y", c[0], l(e, "y")), y = e.encoding.text, b = "format" in y ? o(y.format) : (e) => e, x = [0, 0], C = [0, 0], w = {
 		width: 0,
 		height: 0
 	}, T = {
@@ -847,55 +883,55 @@ function Re(e, r, a, o) {
 		size: 0,
 		width: 0,
 		angle: 0,
-		dx: r.dx,
-		dy: r.dy,
+		dx: t.dx,
+		dy: t.dy,
 		fadeOpacity: 1,
 		scale: 1,
 		logoTransform: void 0,
 		multiCharacterLogo: !1,
 		boundsQuad: O
-	}, A = !!m.x2, j = !!m.y2, M = A && s(e, "x"), N = j && s(e, "y"), P = 0;
-	for (let e of l) {
-		let i = x(m.text(e)), s = t(i) ? i : i === null ? "" : "" + i;
-		if (!s || (_(e, S), v(e, C), M && S[0] === S[1] || N && C[0] === C[1])) continue;
-		let [l, y] = S, [F, L] = C, R = m.size.constant ? h : I(m.size, e), z = m.angle.constant ? g : I(m.angle, e);
-		if (r.logoLetters) {
-			let t = R, n = R;
-			if (A && (t = y - l, l = (l + y) / 2), j && (n = F - L, F = (F + L) / 2), ze(O, l, F, Math.abs(t), Math.abs(n), "center", "middle", z, r.dx, r.dy), !t || !n || b(d, l, F) || !Be(u, O)) continue;
-			let i = a.measureLogoInkBounds(s);
-			if (!i) continue;
-			P++, k.datum = e, k.text = s, k.x = l, k.y = F, k.size = 100, k.width = i.xMax - i.xMin, k.angle = z, k.fadeOpacity = 1, k.scale = 1, D.scaleX = t / k.width, D.scaleY = n / (i.yMax - i.yMin), D.originX = (i.xMin + i.xMax) / 2, D.originY = (i.yMin + i.yMax) / 2, k.logoTransform = D, k.multiCharacterLogo = s.length > 1, o(k);
+	}, A = !!m.x2, j = !!m.y2, M = A && l(e, "x"), N = j && l(e, "y"), P = 0;
+	for (let e of c) {
+		let o = b(m.text(e)), c = a(o) ? o : o === null ? "" : "" + o;
+		if (!c || (_(e, x), v(e, C), M && x[0] === x[1] || N && C[0] === C[1])) continue;
+		let [l, y] = x, [F, I] = C, L = m.size.constant ? h : B(m.size, e), R = m.angle.constant ? g : B(m.angle, e);
+		if (t.logoLetters) {
+			let i = L, a = L;
+			if (A && (i = y - l, l = (l + y) / 2), j && (a = F - I, F = (F + I) / 2), Ue(O, l, F, Math.abs(i), Math.abs(a), "center", "middle", R, t.dx, t.dy), !i || !a || S(d, l, F) || !We(u, O)) continue;
+			let o = n.measureLogoInkBounds(c);
+			if (!o) continue;
+			P++, k.datum = e, k.text = c, k.x = l, k.y = F, k.size = 100, k.width = o.xMax - o.xMin, k.angle = R, k.fadeOpacity = 1, k.scale = 1, D.scaleX = i / k.width, D.scaleY = a / (o.yMax - o.yMin), D.originX = (o.xMin + o.xMax) / 2, D.originY = (o.yMin + o.yMax) / 2, k.logoTransform = D, k.multiCharacterLogo = c.length > 1, r(k);
 			continue;
 		}
-		let B = a.fontMeasurement.measureWidth(s, R);
-		Ve(B, R, z, w), A || j ? Ue(f, p, z, T) : (T.x = We[f], T.y = Ge[p]);
+		let z = n.fontMeasurement.measureWidth(c, L);
+		Ge(z, L, R, w), A || j ? qe(f, p, R, T) : (T.x = Je[f], T.y = Ye[p]);
 		let V = 1;
-		if (A && (He(Math.min(l, y), Math.max(l, y), w.width, r.paddingX, T.x, r.flushX, c.x, c.x2, E), l = E.position, V *= E.scale), j && (He(Math.min(F, L), Math.max(F, L), w.height * V, r.paddingY, T.y, r.flushY, c.y, c.y2, E), F = E.position, V *= E.scale), b(d, l, F)) continue;
+		if (A && (Ke(Math.min(l, y), Math.max(l, y), w.width, t.paddingX, T.x, t.flushX, s.x, s.x2, E), l = E.position, V *= E.scale), j && (Ke(Math.min(F, I), Math.max(F, I), w.height * V, t.paddingY, T.y, t.flushY, s.y, s.y2, E), F = E.position, V *= E.scale), S(d, l, F)) continue;
 		let H = 1;
 		if (V < 1) {
-			if (!r.squeeze || V < 3 / R) continue;
-			H = n(3 / R, 6 / R, V);
+			if (!t.squeeze || V < 3 / L) continue;
+			H = i(3 / L, 6 / L, V);
 		}
-		let ee = R * V, U = B * V;
-		ze(O, l, F, U, ee, f, p, z, r.dx, r.dy), Be(u, O) && (P++, k.datum = e, k.text = s, k.x = l, k.y = F, k.size = R, k.width = U, k.angle = z, k.fadeOpacity = H, k.scale = V, k.logoTransform = void 0, k.multiCharacterLogo = !1, o(k));
+		let U = L * V, W = z * V;
+		Ue(O, l, F, W, U, f, p, R, t.dx, t.dy), We(u, O) && (P++, k.datum = e, k.text = c, k.x = l, k.y = F, k.size = L, k.width = W, k.angle = R, k.fadeOpacity = H, k.scale = V, k.logoTransform = void 0, k.multiCharacterLogo = !1, r(k));
 	}
 	return P;
 }
-function ze(e, t, n, r, i, a, o, s, c, l) {
-	let u = t + c - (We[a] + 1) / 2 * r, d = n + l - (Ge[o] + 1) / 2 * i, f = u + r, p = d + i, m = s * Math.PI / 180, h = Math.sin(m), g = Math.cos(m);
+function Ue(e, t, n, r, i, a, o, s, c, l) {
+	let u = t + c - (Je[a] + 1) / 2 * r, d = n + l - (Ye[o] + 1) / 2 * i, f = u + r, p = d + i, m = s * Math.PI / 180, h = Math.sin(m), g = Math.cos(m);
 	return $(e, 0, t, n, u, d, h, g), $(e, 2, t, n, f, d, h, g), $(e, 4, t, n, f, p, h, g), $(e, 6, t, n, u, p, h, g), e;
 }
-function Be(e, t) {
-	return x(e, Math.min(t[0], t[2], t[4], t[6]), Math.min(t[1], t[3], t[5], t[7]), Math.max(t[0], t[2], t[4], t[6]), Math.max(t[1], t[3], t[5], t[7]), 1);
+function We(e, t) {
+	return C(e, Math.min(t[0], t[2], t[4], t[6]), Math.min(t[1], t[3], t[5], t[7]), Math.max(t[0], t[2], t[4], t[6]), Math.max(t[1], t[3], t[5], t[7]), 1);
 }
 function $(e, t, n, r, i, a, o, s) {
 	e[t] = n + (i - n) * s - (a - r) * o, e[t + 1] = r + (i - n) * o + (a - r) * s;
 }
-function Ve(e, t, n, r) {
+function Ge(e, t, n, r) {
 	let i = n * Math.PI / 180, a = Math.abs(Math.sin(i)), o = Math.abs(Math.cos(i));
 	r.width = e * o + t * a, r.height = e * a + t * o;
 }
-function He(e, t, n, r, i, a, o, s, c) {
+function Ke(e, t, n, r, i, a, o, s, c) {
 	let l = t - e, u = n + 2 * r;
 	if (e > s || t < o) {
 		c.position = 0, c.scale = 0;
@@ -920,21 +956,21 @@ function He(e, t, n, r, i, a, o, s, c) {
 	}
 	c.position = f, c.scale = Math.max(0, Math.min(1, (l - r) / u));
 }
-function Ue(e, t, n, r) {
-	let i = We[e], a = -Ge[t], o = ((n + 45) % 360 + 360) % 360, s, c;
+function qe(e, t, n, r) {
+	let i = Je[e], a = -Ye[t], o = ((n + 45) % 360 + 360) % 360, s, c;
 	o < 90 ? (s = i, c = a) : o < 180 ? (s = a, c = -i) : o < 270 ? (s = -i, c = a) : (s = -a, c = i), r.x = s, r.y = -c;
 }
-var We = {
+var Je = {
 	left: -1,
 	center: 0,
 	right: 1
-}, Ge = {
+}, Ye = {
 	top: -1,
 	middle: 0,
 	bottom: 1,
 	alphabetic: 1,
 	baseline: 1
-}, Ke = [
+}, Xe = [
 	"Lato",
 	"Avenir Next",
 	"Avenir",
@@ -945,7 +981,7 @@ var We = {
 	"Helvetica",
 	"Arial",
 	"sans-serif"
-], qe = /* @__PURE__ */ new Set([
+], Ze = /* @__PURE__ */ new Set([
 	"serif",
 	"sans-serif",
 	"monospace",
@@ -959,7 +995,7 @@ var We = {
 	"emoji",
 	"math",
 	"fangsong"
-]), Je = {
+]), Qe = {
 	thin: 100,
 	light: 300,
 	regular: 400,
@@ -968,24 +1004,24 @@ var We = {
 	bold: 700,
 	black: 900
 };
-function Ye(e) {
+function $e(e) {
 	let t = e ?? "Lato";
-	return [t, ...Ke.filter((e) => e.toLowerCase() != t.toLowerCase())].map($e).join(", ");
+	return [t, ...Xe.filter((e) => e.toLowerCase() != t.toLowerCase())].map(rt).join(", ");
 }
-function Xe(e) {
+function et(e) {
 	if (typeof e == "number") return e;
-	let t = Je[e];
+	let t = Qe[e];
 	if (t === void 0) throw Error("Unknown font weight: " + e);
 	return t;
 }
-function Ze(e) {
+function tt(e) {
 	return {
 		style: e.fontStyle ?? "normal",
-		weight: Xe(e.fontWeight ?? "normal"),
-		family: Ye(e.font)
+		weight: et(e.fontWeight ?? "normal"),
+		family: $e(e.font)
 	};
 }
-function Qe(e, t) {
+function nt(e, t) {
 	switch (e) {
 		case "top": return .79 * t;
 		case "middle": return .35 * t;
@@ -995,26 +1031,26 @@ function Qe(e, t) {
 		default: throw Error(`Unknown text baseline: ${e}`);
 	}
 }
-function $e(e) {
+function rt(e) {
 	let t = e.toLowerCase();
-	return qe.has(t) ? t : `'${e.replaceAll("\\", "\\\\").replaceAll("'", "\\'")}'`;
+	return Ze.has(t) ? t : `'${e.replaceAll("\\", "\\\\").replaceAll("'", "\\'")}'`;
 }
 //#endregion
 //#region ../core/src/rendering/nativeTextMetrics.js
-var et = "Mg", tt = 100, nt = class {
+var it = "Mg", at = 100, ot = class {
 	#e;
 	#t;
-	#n = new r([], JSON.stringify);
+	#n = new e([], JSON.stringify);
 	#r = [];
 	#i;
 	constructor(e, t) {
 		this.#e = e, this.#t = t, e.fontKerning = "normal", e.direction = "ltr", e.textAlign = "left", e.textBaseline = "alphabetic";
 	}
 	requestFont(e) {
-		let t = Ze(e), n = this.#n.get(t);
+		let t = tt(e), n = this.#n.get(t);
 		if (!n) {
-			n = new rt((e, n) => this.#a(t, e, n)), this.#n.set(t, n);
-			let e = this.#t?.load(ot(t, 16));
+			n = new st((e, n) => this.#a(t, e, n)), this.#n.set(t, n);
+			let e = this.#t?.load(ut(t, 16));
 			e && this.#r.push(e.then(() => n.invalidateCache()));
 		}
 		return n;
@@ -1023,10 +1059,10 @@ var et = "Mg", tt = 100, nt = class {
 		await Promise.all(this.#r);
 	}
 	#a(e, t, n) {
-		let r = ot(e, n);
+		let r = ut(e, n);
 		return r != this.#i && (this.#e.font = r, this.#i = r), this.#e.measureText(t);
 	}
-}, rt = class {
+}, st = class {
 	#e;
 	#t = NaN;
 	#n = /* @__PURE__ */ new Float64Array(128);
@@ -1048,7 +1084,7 @@ var et = "Mg", tt = 100, nt = class {
 	}
 	getHeight(e) {
 		if (this.#a(e), Number.isNaN(this.#r)) {
-			let t = this.#e(et, e);
+			let t = this.#e(it, e);
 			this.#r = t.actualBoundingBoxAscent + t.actualBoundingBoxDescent;
 		}
 		return this.#r;
@@ -1056,7 +1092,7 @@ var et = "Mg", tt = 100, nt = class {
 	measureInkBounds(e) {
 		let t = e.length == 1 ? e.charCodeAt(0) : 128;
 		if (t < 128 && this.#i[t] !== void 0) return this.#i[t];
-		let n = it(this.#e(e, tt));
+		let n = ct(this.#e(e, at));
 		return t < 128 && (this.#i[t] = n), n;
 	}
 	invalidateCache() {
@@ -1066,7 +1102,7 @@ var et = "Mg", tt = 100, nt = class {
 		e != this.#t && (this.#t = e, this.#n.fill(NaN), this.#r = NaN);
 	}
 };
-function it(e) {
+function ct(e) {
 	let t = {
 		xMin: -e.actualBoundingBoxLeft,
 		xMax: e.actualBoundingBoxRight,
@@ -1075,10 +1111,10 @@ function it(e) {
 	};
 	return t.xMax > t.xMin && t.yMax > t.yMin ? t : null;
 }
-function at(e, t) {
+function lt(e, t) {
 	let n = e.requestFont(t);
-	return n instanceof rt ? (e) => n.measureInkBounds(e) : (e) => {
-		let t = n.measureWidth(e, tt), r = n.getHeight(tt);
+	return n instanceof st ? (e) => n.measureInkBounds(e) : (e) => {
+		let t = n.measureWidth(e, at), r = n.getHeight(at);
 		return t > 0 && r > 0 ? {
 			xMin: 0,
 			xMax: t,
@@ -1087,15 +1123,15 @@ function at(e, t) {
 		} : null;
 	};
 }
-function ot(e, t) {
+function ut(e, t) {
 	return `${e.style} ${e.weight} ${t}px ${e.family}`;
 }
-function st(e) {
+function dt(e) {
 	let t = e.createElement("canvas").getContext("2d");
 	if (!t) throw Error("Canvas2D text measurement is unavailable.");
-	return new nt(t, e.fonts);
+	return new ot(t, e.fonts);
 }
-async function ct(e, t) {
+async function ft(e, t) {
 	t.visit((t) => {
 		let n = t.mark;
 		n?.getType() == "text" && e.requestFont(n.properties);
@@ -1103,7 +1139,7 @@ async function ct(e, t) {
 }
 //#endregion
 //#region ../core/src/rendering/immediate/order.js
-function lt(e, t, n, r, i) {
+function pt(e, t, n, r, i) {
 	let a = [], o = [];
 	for (let i = t; i < n; i++) {
 		let t = e[i];
@@ -1112,4 +1148,4 @@ function lt(e, t, n, r, i) {
 	return i.map((e) => e === "matching" ? a : o);
 }
 //#endregion
-export { V as A, ee as C, I as D, W as E, x as F, f as I, m as L, v as M, _ as N, B as O, y as P, pe as S, U as T, Ee as _, Ye as a, me as b, Le as c, Ie as d, Pe as f, Te as g, De as h, at as i, H as j, F as k, Re as l, Ae as m, st as n, Qe as o, ke as p, ct as r, Xe as s, lt as t, Fe as u, Ce as v, ne as w, fe as x, we as y };
+export { z as A, ee as C, B as D, ne as E, x as F, C as I, m as L, K as M, b as N, W as O, y as P, g as R, he as S, te as T, ke as _, $e as a, ge as b, Ve as c, Be as d, Re as f, Oe as g, Ae as h, lt as i, G as j, R as k, He as l, Pe as m, dt as n, nt as o, Ne as p, ft as r, et as s, pt as t, ze as u, Ee as v, ie as w, me as x, De as y };