@silurus/ooxml 0.80.2 → 0.81.0

package/dist/{slide-pull-client-m2blvngt.js → slide-pull-client-CzutXnGc.js}

@@ -1,12 +1,14 @@
-import { $t as e, A as t, At as n, Bt as r, C as i, Ct as a, D as o, Dt as s, Ft as c, Gt as l, Ht as u, Jt as d, K as f, Kt as p, Lt as m, M as h, Mt as g, N as _, Nt as v, O as y, Qt as b, S as x, St as S, Ut as C, Wt as w, Yt as T, Zt as E, _ as D, _t as O, an as k, bt as A, c as j, ct as M, d as N, en as P, f as F, g as I, gt as L, h as R, ht as z, i as B, in as V, j as H, kt as U, m as W, mt as G, n as K, nn as q, p as ee, pt as J, qt as te, r as ne, rn as re, s as ie, sn as ae, tn as oe, u as se, vt as ce, w as le, wt as ue, y as de, yt as fe, zt as pe } from "./line-metrics-DdEJYxjx.js";
-import { a as me, c as he, d as ge, i as _e, l as ve, n as ye, o as be, r as xe, s as Se, t as Ce, u as we } from "./line-distribute-Bvtp0Gt6.js";
-import { f as Te, j as Y } from "./three-d-C28kqDym.js";
-import { i as Ee } from "./resource-measurement-CgMubiAI.js";
+import { A as e, At as t, Bt as n, C as r, D as i, Dt as a, Ft as o, Gt as s, Ht as c, It as l, K as u, Lt as d, M as f, Mt as p, N as m, O as h, Ot as g, Pt as _, Rt as v, S as y, St as b, Tt as x, Ut as S, Vt as C, Wt as w, _ as T, _t as E, c as D, ct as O, d as k, f as A, g as j, gt as M, h as N, ht as P, i as F, j as I, m as L, mt as R, n as z, p as B, pt as V, qt as H, r as U, s as W, u as ee, vt as G, w as K, wt as q, xt as te, y as ne, yt as re, zt as ie } from "./line-metrics-Baz31mML.js";
+import { a as ae, c as oe, d as se, i as ce, l as le, n as ue, o as de, r as fe, s as pe, t as me, u as he } from "./line-distribute-BBGvvwLt.js";
+import { S as ge, _ as _e, h as ve, hn as ye, k as be, ln as xe, mn as Se, rn as J, sn as Ce, un as we, v as Te, w as Ee } from "./plot-area-frame-Dg1VIpUU.js";
+import { A as De, F as Oe, I as ke, L as Ae, M as je, N as Me, P as Ne, j as Pe } from "./three-d-BYiWCNlz.js";
+import { k as Fe } from "./renderer-DuopJE1K.js";
+import { i as Ie } from "./resource-measurement-DRLp4nFt.js";
 //#region packages/pptx/src/types.ts
-function De(e) {
+function Le(e) {
 	return e;
 }
-var Oe = {
+var Re = {
 	textarchdown: {
 		adj: [["adj", "val 0"]],
 		gd: [
@@ -2388,22 +2390,22 @@ var Oe = {
 			]
 		}]
 	}
-}, ke = Math.PI * 2 / 216e5, Ae = Oe, je = /* @__PURE__ */ new Map();
-function Me(e) {
-	return e.toLowerCase() in Ae;
+}, ze = Math.PI * 2 / 216e5, Be = Re, Ve = /* @__PURE__ */ new Map();
+function He(e) {
+	return e.toLowerCase() in Be;
 }
-function Ne(e) {
-	let t = je.get(e);
+function Ue(e) {
+	let t = Ve.get(e);
 	if (t) return t;
-	let n = Ae[e];
+	let n = Be[e];
 	return n ? (t = {
-		adj: n.adj.map(([e, t]) => [e, p(t)]),
-		gd: n.gd.map(([e, t]) => [e, p(t)]),
+		adj: n.adj.map(([e, t]) => [e, v(t)]),
+		gd: n.gd.map(([e, t]) => [e, v(t)]),
 		paths: n.paths
-	}, je.set(e, t), t) : null;
+	}, Ve.set(e, t), t) : null;
 }
-var Pe = 48;
-function Fe(e, t, n, r) {
+var We = 48;
+function Ge(e, t, n, r) {
 	let i = e.w == null ? 1 : n / e.w, a = e.h == null ? 1 : r / e.h, o = (e) => e * i, s = (e) => e * a, c = [], l = 0, u = 0;
 	for (let n of e.cmds) switch (n[0]) {
 		case "m":
@@ -2420,8 +2422,8 @@ function Fe(e, t, n, r) {
 			break;
 		case "C": {
 			let e = o(t.resolve(n[1])), r = s(t.resolve(n[2])), i = o(t.resolve(n[3])), a = s(t.resolve(n[4])), d = o(t.resolve(n[5])), f = s(t.resolve(n[6]));
-			for (let t = 1; t <= Pe; t++) {
-				let n = t / Pe, o = 1 - n, s = o * o * o * l + 3 * o * o * n * e + 3 * o * n * n * i + n * n * n * d, p = o * o * o * u + 3 * o * o * n * r + 3 * o * n * n * a + n * n * n * f;
+			for (let t = 1; t <= We; t++) {
+				let n = t / We, o = 1 - n, s = o * o * o * l + 3 * o * o * n * e + 3 * o * n * n * i + n * n * n * d, p = o * o * o * u + 3 * o * o * n * r + 3 * o * n * n * a + n * n * n * f;
 				c.push({
 					x: s,
 					y: p
@@ -2432,8 +2434,8 @@ function Fe(e, t, n, r) {
 		}
 		case "Q": {
 			let e = o(t.resolve(n[1])), r = s(t.resolve(n[2])), i = o(t.resolve(n[3])), a = s(t.resolve(n[4]));
-			for (let t = 1; t <= Pe; t++) {
-				let n = t / Pe, o = 1 - n, s = o * o * l + 2 * o * n * e + n * n * i, d = o * o * u + 2 * o * n * r + n * n * a;
+			for (let t = 1; t <= We; t++) {
+				let n = t / We, o = 1 - n, s = o * o * l + 2 * o * n * e + n * n * i, d = o * o * u + 2 * o * n * r + n * n * a;
 				c.push({
 					x: s,
 					y: d
@@ -2443,9 +2445,9 @@ function Fe(e, t, n, r) {
 			break;
 		}
 		case "a": {
-			let e = t.resolve(n[1]), r = t.resolve(n[2]), o = e * i, s = r * a, d = t.resolve(n[3]) * ke, f = t.resolve(n[4]) * ke, p = (t) => Math.atan2(e * Math.sin(t), r * Math.cos(t)), m = Math.PI * 2, h = p(d), g = Math.trunc(f / m), _ = f - g * m, v = p(d + _) - h;
+			let e = t.resolve(n[1]), r = t.resolve(n[2]), o = e * i, s = r * a, d = t.resolve(n[3]) * ze, f = t.resolve(n[4]) * ze, p = (t) => Math.atan2(e * Math.sin(t), r * Math.cos(t)), m = Math.PI * 2, h = p(d), g = Math.trunc(f / m), _ = f - g * m, v = p(d + _) - h;
 			_ > 0 && v < 0 ? v += m : _ < 0 && v > 0 && (v -= m);
-			let y = v + g * m, b = l - o * Math.cos(h), x = u - s * Math.sin(h), S = Math.max(Pe, Math.ceil(Math.abs(y) / m * 96));
+			let y = v + g * m, b = l - o * Math.cos(h), x = u - s * Math.sin(h), S = Math.max(We, Math.ceil(Math.abs(y) / m * 96));
 			for (let e = 1; e <= S; e++) {
 				let t = h + y * e / S;
 				c.push({
@@ -2460,7 +2462,7 @@ function Fe(e, t, n, r) {
 	}
 	return c;
 }
-function Ie(e) {
+function Ke(e) {
 	let t = [0];
 	for (let n = 1; n < e.length; n++) {
 		let r = e[n].x - e[n - 1].x, i = e[n].y - e[n - 1].y;
@@ -2468,23 +2470,23 @@ function Ie(e) {
 	}
 	return t;
 }
-function Le(e, t, n, r) {
-	let i = Ne(e.toLowerCase());
+function qe(e, t, n, r) {
+	let i = Ue(e.toLowerCase());
 	if (!i || i.paths.length === 0) return null;
-	let a = te({
+	let a = ie({
 		w: n,
 		h: r,
 		adj: t
-	}, i.adj, i.gd), o = i.paths.length === 1, s = Fe(i.paths[0], a, n, r), c = o ? s : Fe(i.paths[i.paths.length - 1], a, n, r);
+	}, i.adj, i.gd), o = i.paths.length === 1, s = Ge(i.paths[0], a, n, r), c = o ? s : Ge(i.paths[i.paths.length - 1], a, n, r);
 	return {
 		top: s,
 		bottom: c,
-		topLen: Ie(s),
-		bottomLen: Ie(c),
+		topLen: Ke(s),
+		bottomLen: Ke(c),
 		singleEdge: o
 	};
 }
-function Re(e, t, n) {
+function Je(e, t, n) {
 	let r = t[t.length - 1];
 	if (e.length === 1 || r === 0) return {
 		x: e[0].x,
@@ -2505,17 +2507,17 @@ function Re(e, t, n) {
 		ty: f / p
 	};
 }
-function ze(e) {
+function Ye(e) {
 	return e.topLen[e.topLen.length - 1] ?? 0;
 }
-function Be(e, t) {
+function Xe(e, t) {
 	if (!e.singleEdge) return 1;
-	let n = ze(e);
+	let n = Ye(e);
 	return n <= 0 ? 1 : Math.max(0, Math.min(1, t / n));
 }
-function Ve(e, t, n, r) {
+function Ze(e, t, n, r) {
 	if (e.singleEdge) {
-		let i = Re(e.top, e.topLen, t), a = Math.atan2(i.ty, i.tx), o = i.ty, s = -i.tx, c = n * (1 - r);
+		let i = Je(e.top, e.topLen, t), a = Math.atan2(i.ty, i.tx), o = i.ty, s = -i.tx, c = n * (1 - r);
 		return {
 			x: i.x - o * c,
 			y: i.y - s * c,
@@ -2524,7 +2526,7 @@ function Ve(e, t, n, r) {
 			shear: 0
 		};
 	}
-	let i = Re(e.top, e.topLen, t), a = Re(e.bottom, e.bottomLen, t), o = a.x - i.x, s = a.y - i.y, c = i.x + o * r, l = i.y + s * r, u = i.tx + a.tx, d = i.ty + a.ty, f = Math.atan2(d, u), p = Math.cos(f), m = Math.sin(f), h = (p * o + m * s) / (n > 0 ? n : 1), g = (-m * o + p * s) / (n > 0 ? n : 1);
+	let i = Je(e.top, e.topLen, t), a = Je(e.bottom, e.bottomLen, t), o = a.x - i.x, s = a.y - i.y, c = i.x + o * r, l = i.y + s * r, u = i.tx + a.tx, d = i.ty + a.ty, f = Math.atan2(d, u), p = Math.cos(f), m = Math.sin(f), h = (p * o + m * s) / (n > 0 ? n : 1), g = (-m * o + p * s) / (n > 0 ? n : 1);
 	return {
 		x: c,
 		y: l,
@@ -2534,100 +2536,6 @@ function Ve(e, t, n, r) {
 	};
 }
 //#endregion
-//#region packages/core/src/shape/effects.ts
-function He(e, t) {
-	return [t === "tl" || t === "l" || t === "bl" ? e.x : t === "tr" || t === "r" || t === "br" ? e.x + e.w : e.x + e.w / 2, t === "tl" || t === "t" || t === "tr" ? e.y : t === "l" || t === "ctr" || t === "r" ? e.y + e.h / 2 : e.y + e.h];
-}
-function Ue(e, t) {
-	return e * t;
-}
-function We(e) {
-	return e.getContext("2d") ?? null;
-}
-function Ge(e, t, n, r) {
-	let i = Math.max(0, Math.floor(e.x - t)), a = Math.max(0, Math.floor(e.y - t)), o = Math.min(n, Math.ceil(e.x + e.w + t)), s = Math.min(r, Math.ceil(e.y + e.h + t));
-	return {
-		x: i,
-		y: a,
-		w: Math.max(1, o - i),
-		h: Math.max(1, s - a)
-	};
-}
-function Ke(e, t) {
-	if (t.x === 0 && t.y === 0) return e;
-	let n = t.x, r = t.y;
-	return new Proxy(e, {
-		get(e, t) {
-			if (t === "setTransform") return (t) => {
-				e.setTransform(t.a, t.b, t.c, t.d, t.e - n, t.f - r);
-			};
-			let i = Reflect.get(e, t);
-			return typeof i == "function" ? i.bind(e) : i;
-		},
-		set(e, t, n) {
-			return e[t] = n, !0;
-		}
-	});
-}
-function qe(t, n, r, i, a, o, s, c = 0, l) {
-	let u = Math.max(0, Ue(i.blur, a)), d = Ue(i.dist, a), f = i.rotWithShape === !1 ? 0 : c, p = (i.dir + f) * Math.PI / 180, m = Math.cos(p) * d, h = Math.sin(p) * d, g = Ge(r, Math.ceil(u * 3 + Math.max(Math.abs(m), Math.abs(h))) + 2, o, s), _ = e(g.w, g.h);
-	if (!_) return !1;
-	let v = We(_);
-	if (!v) return !1;
-	n(Ke(v, g)), v.save(), v.setTransform(1, 0, 0, 1, 0, 0), v.globalCompositeOperation = "source-in", v.fillStyle = E(i.color, i.alpha), v.fillRect(0, 0, g.w, g.h), v.restore(), t.save(), u > 0 && (t.filter = `blur(${u}px)`);
-	let [y, b] = l ?? He(r, i.algn ?? "b"), x = i.sx ?? 1, S = i.sy ?? 1, C = Math.tan((i.kx ?? 0) * Math.PI / 180), w = Math.tan((i.ky ?? 0) * Math.PI / 180);
-	return t.translate(m, h), t.translate(y, b), f !== 0 && t.rotate(f * Math.PI / 180), t.transform(x, w, C, S, 0, 0), f !== 0 && t.rotate(-f * Math.PI / 180), t.translate(-y, -b), t.drawImage(_, g.x, g.y), t.restore(), !0;
-}
-function Je(t, n, r, i, a, o, s) {
-	let c = Ue(i.blur, a), l = Ue(i.dist, a), u = i.dir * Math.PI / 180, d = Math.cos(u) * l, f = Math.sin(u) * l, p = Ge(r, Math.ceil(3 * c + Math.abs(l)) + 2, o, s), m = e(p.w, p.h);
-	if (!m) return;
-	let h = We(m);
-	if (!h) return;
-	let g = Ke(h, p);
-	g.save(), g.fillStyle = E(i.color, i.alpha), n(g), g.restore(), g.save(), g.globalCompositeOperation = "destination-out", g.filter = c > 0 ? `blur(${c}px)` : "none", g.translate(d, f), g.fillStyle = "#000", n(g), g.restore(), g.save(), g.globalCompositeOperation = "destination-in", g.filter = "none", g.fillStyle = "#000", n(g), g.restore(), t.save(), t.drawImage(m, p.x, p.y), t.restore();
-}
-function Ye(t, n, r, i, a, o, s, c) {
-	let l = Ue(i.radius, a);
-	if (l <= 0) {
-		n(t);
-		return;
-	}
-	let u = Ge(r, Math.ceil(l) + 2, o, s), d = r.x - u.x, f = r.y - u.y, p = e(u.w, u.h);
-	if (!p) {
-		n(t);
-		return;
-	}
-	let m = We(p);
-	if (!m) {
-		n(t);
-		return;
-	}
-	let h = Ke(m, u), g = c ?? n;
-	n(h);
-	let _ = e(u.w, u.h), v = e(u.w, u.h), y = _ ? We(_) : null, b = v ? We(v) : null;
-	if (_ && y && v && b) {
-		let e = Ke(y, u);
-		e.fillStyle = "#000", g(e), b.drawImage(p, d, f, r.w, r.h, d - l, f - l, r.w + l * 2, r.h + l * 2), b.drawImage(p, 0, 0), b.globalCompositeOperation = "destination-in", b.filter = `blur(${l / 3}px)`, b.drawImage(_, 0, 0), b.filter = "none", b.globalCompositeOperation = "source-over", t.save(), t.drawImage(v, u.x, u.y), t.restore();
-		return;
-	}
-	t.save(), t.drawImage(p, 0, 0), t.restore();
-}
-function Xe(t, n, r, i, a, o, s) {
-	let c = e(o, s);
-	if (!c) return;
-	let l = We(c);
-	if (!l) return;
-	let u = Ue(i.blur, a);
-	l.save(), u > 0 && (l.filter = `blur(${u}px)`), n(l), l.restore(), l.save(), l.globalCompositeOperation = "destination-in";
-	let d = r.y, f = r.y + r.h, p = l.createLinearGradient(0, f, 0, d), m = Ze(i.stPos), h = Ze(i.endPos);
-	p.addColorStop(0, `rgba(0,0,0,${i.stA})`), m > 0 && p.addColorStop(m, `rgba(0,0,0,${i.stA})`), h < 1 && h > m && p.addColorStop(h, `rgba(0,0,0,${i.endA})`), p.addColorStop(1, `rgba(0,0,0,${i.endA})`), l.fillStyle = p, l.fillRect(0, 0, o, s), l.restore();
-	let g = Ue(i.dist, a), _ = i.dir * Math.PI / 180, v = Math.cos(_) * g, y = Math.sin(_) * g;
-	t.save(), t.translate(r.x + v, f + y), t.scale(i.sx, i.sy), t.translate(-r.x, -f), t.drawImage(c, 0, 0), t.restore();
-}
-function Ze(e) {
-	return e < 0 ? 0 : e > 1 ? 1 : e;
-}
-//#endregion
 //#region packages/core/src/shape/scene3d-camera.ts
 var Qe = 26, $e = {
 	orthographicFront: {
@@ -2836,149 +2744,13 @@ function lt(e, t, n, r) {
 	};
 }
 //#endregion
-//#region packages/core/src/shape/scene3d-draw.ts
-function ut(e, t, n, r) {
-	let i = e.x, a = e.y, o = t.x, s = t.y, c = n.x, l = n.y, u = r.x, d = r.y, f = o - c, p = u - c, m = i - o + c - u, h = s - l, g = d - l, _ = a - s + l - d, v, y;
-	if (Math.abs(m) < 1e-12 && Math.abs(_) < 1e-12) v = 0, y = 0;
-	else {
-		let e = f * g - p * h;
-		if (Math.abs(e) < 1e-12) return null;
-		v = (m * g - p * _) / e, y = (f * _ - m * h) / e;
-	}
-	return [
-		o - i + v * o,
-		u - i + y * u,
-		i,
-		s - a + v * s,
-		d - a + y * d,
-		a,
-		v,
-		y,
-		1
-	];
-}
-function dt(e, t, n) {
-	let r = e[6] * t + e[7] * n + e[8];
-	return {
-		x: (e[0] * t + e[1] * n + e[2]) / r,
-		y: (e[3] * t + e[4] * n + e[5]) / r
-	};
-}
-var ft = 1;
-function pt(e, t) {
-	let [n, r, i, a, o, s] = e, [c, l, u, d, f, p] = t;
-	return [
-		n * c + i * l,
-		r * c + a * l,
-		n * u + i * d,
-		r * u + a * d,
-		n * f + i * p + o,
-		r * f + a * p + s
-	];
-}
-function mt(e, t, n, r, i, a, o, s, c, l, u, d, f) {
-	let p = c - o, m = l - s;
-	if (p <= 0 || m <= 0) return;
-	let h = (d.x - u.x) / p, g = (d.y - u.y) / p, _ = (f.x - u.x) / m, v = (f.y - u.y) / m, y = (Math.hypot(d.x - u.x, d.y - u.y) || 1) * a, b = (Math.hypot(f.x - u.x, f.y - u.y) || 1) * a, x = ft * p / y, S = ft * m / b, C = Math.max(0, o - x), w = Math.max(0, s - S), T = Math.min(n, c + x), E = Math.min(r, l + S), D = T - C, O = E - w;
-	if (D <= 0 || O <= 0) return;
-	e.save();
-	let [k, A, j, M, N, P] = pt(i, [
-		h,
-		g,
-		_,
-		v,
-		u.x - o * h - s * _,
-		u.y - o * g - s * v
-	]);
-	e.setTransform(k, A, j, M, N, P), e.drawImage(t, C, w, D, O, C, w, D, O), e.restore();
-}
-function ht(e, t, n, r, i, a, o, s, c, l, u, d, f) {
-	let p = dt(o, s, c), m = dt(o, l, c), h = dt(o, s, u), g = dt(o, l, u), _ = (s + l) / 2, v = (c + u) / 2, y = dt(o, _, v), b = {
-		x: (p.x + m.x + h.x + g.x) / 4,
-		y: (p.y + m.y + h.y + g.y) / 4
-	}, x = _t(i), S = Math.hypot(y.x - b.x, y.y - b.y) * x;
-	if (f <= 0 || S <= d) {
-		mt(e, t, n, r, i, a, s * n, c * r, l * n, u * r, p, m, h);
-		return;
-	}
-	l - s >= u - c ? (ht(e, t, n, r, i, a, o, s, c, _, u, d, f - 1), ht(e, t, n, r, i, a, o, _, c, l, u, d, f - 1)) : (ht(e, t, n, r, i, a, o, s, c, l, v, d, f - 1), ht(e, t, n, r, i, a, o, s, v, l, u, d, f - 1));
-}
-function gt(e, t, n, r, i, a = .5) {
-	if (n <= 0 || r <= 0) return;
-	let [o, s, c, l] = i;
-	if (Math.abs(o.x * s.y - s.x * o.y + s.x * c.y - c.x * s.y + c.x * l.y - l.x * c.y + l.x * o.y - o.x * l.y) / 2 < 1e-6) return;
-	let u = ut(i[0], i[1], i[2], i[3]);
-	if (!u) return;
-	let d = t.getTransform(), f = [
-		d.a,
-		d.b,
-		d.c,
-		d.d,
-		d.e,
-		d.f
-	], p = _t(f);
-	Ct(e, t, n, r, i, f, p, u, a, 14) || (xt(), t.save(), t.beginPath(), t.moveTo(i[0].x, i[0].y), t.lineTo(i[1].x, i[1].y), t.lineTo(i[2].x, i[2].y), t.lineTo(i[3].x, i[3].y), t.closePath(), t.clip(), ht(t, e, n, r, f, p, u, 0, 0, 1, 1, a, 14), t.restore());
-}
-function _t(e) {
-	return Math.sqrt(Math.abs(e[0] * e[3] - e[1] * e[2])) || 1;
-}
-function vt(e, t, n) {
-	let r = ut(e[0], e[1], e[2], e[3]);
-	if (!r) return null;
-	let i = [
-		[-t, -n],
-		[1 + t, -n],
-		[1 + t, 1 + n],
-		[-t, 1 + n]
-	], a = [];
-	for (let [e, t] of i) {
-		if (!(r[6] * e + r[7] * t + r[8] > 1e-9)) return null;
-		a.push(dt(r, e, t));
-	}
-	return a;
-}
-function yt(e, t, n) {
-	let r = ut(e[0], e[1], e[2], e[3]);
-	return r && r[6] * t + r[7] * n + r[8] > 1e-9 ? dt(r, t, n) : null;
-}
-var bt = !1;
-function xt() {
-	bt || (bt = !0, typeof console < "u" && typeof console.warn == "function" && console.warn("[ooxml] scene3d: no offscreen canvas available — using the direct warp fallback (per-cell bleed only, no supersample). Textured-source seams may be faintly visible; the silhouette and geometry are unaffected."));
-}
-var St = 2;
-function Ct(t, n, r, i, a, o, s, c, l, u) {
-	let d = a.map((e) => ({
-		x: o[0] * e.x + o[2] * e.y + o[4],
-		y: o[1] * e.x + o[3] * e.y + o[5]
-	})), f = Infinity, p = Infinity, m = -Infinity, h = -Infinity;
-	for (let e of d) e.x < f && (f = e.x), e.y < p && (p = e.y), e.x > m && (m = e.x), e.y > h && (h = e.y);
-	f = Math.floor(f) - 1, p = Math.floor(p) - 1, m = Math.ceil(m) + 1, h = Math.ceil(h) + 1;
-	let g = m - f, _ = h - p;
-	if (g <= 0 || _ <= 0) return !1;
-	let v = Math.max(1, Math.ceil(g * St)), y = Math.max(1, Math.ceil(_ * St)), b = e(v, y);
-	if (!b || b.width !== v || b.height !== y) return !1;
-	let x = b.getContext("2d") ?? null;
-	if (!x) return !1;
-	let S = St, C = [
-		o[0] * S,
-		o[1] * S,
-		o[2] * S,
-		o[3] * S,
-		(o[4] - f) * S,
-		(o[5] - p) * S
-	];
-	x.save(), x.setTransform(C[0], C[1], C[2], C[3], C[4], C[5]), x.beginPath(), x.moveTo(a[0].x, a[0].y), x.lineTo(a[1].x, a[1].y), x.lineTo(a[2].x, a[2].y), x.lineTo(a[3].x, a[3].y), x.closePath(), x.clip(), ht(x, t, r, i, C, s, c, 0, 0, 1, 1, l * S, u), x.restore(), n.save(), n.setTransform(1, 0, 0, 1, 0, 0);
-	let w = n.imageSmoothingEnabled, T = n.imageSmoothingQuality;
-	return n.imageSmoothingEnabled = !0, n.imageSmoothingQuality = "high", n.drawImage(b, 0, 0, g * S, _ * S, f, p, g, _), n.imageSmoothingEnabled = w, n.imageSmoothingQuality = T, n.restore(), !0;
-}
-//#endregion
 //#region packages/core/src/shape/bevel-shading.ts
-function wt(e, t) {
+function ut(e, t) {
 	if (t <= 0) return () => 1;
 	let n = (e) => Math.max(0, Math.min(1, e / t));
 	switch (e) {
 		case "hardEdge": {
-			let e = Mt;
+			let e = vt;
 			return (t) => {
 				let r = Math.min(1, n(t) / e);
 				return r * r * (3 - 2 * r);
@@ -2998,7 +2770,7 @@ function wt(e, t) {
 		};
 	}
 }
-function Tt(e) {
+function dt(e) {
 	let t = e.length, n = new Float64Array(t);
 	if (t === 0) return n;
 	let r = new Int32Array(t), i = new Float64Array(t + 1), a = 0;
@@ -3016,7 +2788,7 @@ function Tt(e) {
 	}
 	return n;
 }
-function Et(e, t = 3) {
+function ft(e, t = 3) {
 	if (e <= 0) return Array(t).fill(1);
 	let n = Math.sqrt(12 * e * e / t + 1), r = Math.floor(n);
 	r % 2 == 0 && r--;
@@ -3024,7 +2796,7 @@ function Et(e, t = 3) {
 	for (let e = 0; e < t; e++) s.push(e < o ? r : i);
 	return s;
 }
-function Dt(e, t, n, r, i, a) {
+function pt(e, t, n, r, i, a) {
 	let o = 1 / (2 * i + 1);
 	if (a) for (let a = 0; a < r; a++) {
 		let r = a * n, s = 0;
@@ -3045,29 +2817,29 @@ function Dt(e, t, n, r, i, a) {
 		}
 	}
 }
-function Ot(e, t, n, r) {
+function mt(e, t, n, r) {
 	let i = Float64Array.from(e);
 	if (r <= 0 || t <= 0 || n <= 0) return i;
 	let a = new Float64Array(t * n);
-	for (let e of Et(r, 3)) {
+	for (let e of ft(r, 3)) {
 		let r = Math.max(1, (e - 1) / 2);
-		Dt(i, a, t, n, r, !0), Dt(a, i, t, n, r, !1);
+		pt(i, a, t, n, r, !0), pt(a, i, t, n, r, !1);
 	}
 	return i;
 }
-function kt(e, t, n, r = 128) {
+function ht(e, t, n, r = 128) {
 	let i = new Float64Array(t * n);
 	for (let a = 0; a < t * n; a++) i[a] = (e[a] ?? 0) >= r ? 0x56bc75e2d63100000 : 0;
 	let a = new Float64Array(n);
 	for (let e = 0; e < t; e++) {
 		for (let r = 0; r < n; r++) a[r] = i[r * t + e];
-		let r = Tt(a);
+		let r = dt(a);
 		for (let a = 0; a < n; a++) i[a * t + e] = r[a];
 	}
 	let o = new Float64Array(t);
 	for (let e = 0; e < n; e++) {
 		for (let n = 0; n < t; n++) o[n] = i[e * t + n];
-		let n = Tt(o);
+		let n = dt(o);
 		for (let r = 0; r < t; r++) i[e * t + r] = n[r];
 	}
 	for (let e = 0; e < n; e++) for (let r = 0; r < t; r++) {
@@ -3079,15 +2851,15 @@ function kt(e, t, n, r = 128) {
 	for (let e = 0; e < t * n; e++) i[e] = Math.sqrt(i[e]);
 	return i;
 }
-var At = .25, jt = .35, Mt = .5;
-function Nt(e, t, n, r, i, a) {
+var gt = .25, _t = .35, vt = .5;
+function yt(e, t, n, r, i, a) {
 	let o = new Float32Array(t * n * 3), s = new Uint8Array(t * n), c = new Float32Array(t * n);
 	if (t <= 0 || n <= 0) return {
 		normals: o,
 		bandMask: s,
 		bandWeight: c
 	};
-	let l = kt(e, t, n), u = wt(i, r), d = (n, r) => (e[r * t + n] ?? 0) >= 128, f = (r > 0 ? a / r : 0) * r, p = Ot(l, t, n, Math.max(1, r * At)), m = (e) => {
+	let l = ht(e, t, n), u = ut(i, r), d = (n, r) => (e[r * t + n] ?? 0) >= 128, f = (r > 0 ? a / r : 0) * r, p = mt(l, t, n, Math.max(1, r * gt)), m = (e) => {
 		let t = u(Math.max(0, e - .5));
 		return u(e + .5) - t;
 	};
@@ -3102,9 +2874,9 @@ function Nt(e, t, n, r, i, a) {
 			o[a * 3 + 2] = 1;
 			continue;
 		}
-		let g = u / r, _ = 1 - jt, v = 1;
+		let g = u / r, _ = 1 - _t, v = 1;
 		if (g > _) {
-			let e = Math.min(1, (g - _) / jt);
+			let e = Math.min(1, (g - _) / _t);
 			v = 1 - e * e * (3 - 2 * e);
 		}
 		c[a] = v;
@@ -3119,7 +2891,7 @@ function Nt(e, t, n, r, i, a) {
 		bandWeight: c
 	};
 }
-var Pt = 35 * Math.PI / 180, Ft = 12 * Math.PI / 180, It = {
+var bt = 35 * Math.PI / 180, xt = 12 * Math.PI / 180, St = {
 	t: {
 		x: 0,
 		y: -1
@@ -3153,22 +2925,22 @@ var Pt = 35 * Math.PI / 180, Ft = 12 * Math.PI / 180, It = {
 		y: 1
 	}
 };
-function Lt(e, t, n) {
+function Ct(e, t, n) {
 	let r = n * Math.PI / 180, i = Math.cos(r), a = Math.sin(r);
 	return {
 		x: e * i - t * a,
 		y: e * a + t * i
 	};
 }
-function Rt(e, t, n) {
-	let r = It[t] ?? It.t;
-	return n && n.rev && (r = Lt(r.x, r.y, n.rev)), Bt(r.x, r.y, Pt);
+function wt(e, t, n) {
+	let r = St[t] ?? St.t;
+	return n && n.rev && (r = Ct(r.x, r.y, n.rev)), Et(r.x, r.y, bt);
 }
-function zt(e) {
+function Tt(e) {
 	let t = Math.hypot(e.x, e.y) || 1;
-	return Bt(-e.x / t, -e.y / t, Ft);
+	return Et(-e.x / t, -e.y / t, xt);
 }
-function Bt(e, t, n) {
+function Et(e, t, n) {
 	let r = Math.hypot(e, t) || 1, i = Math.cos(n), a = Math.sin(n), o = e / r * i, s = t / r * i, c = a, l = Math.hypot(o, s, c) || 1;
 	return {
 		x: o / l,
@@ -3176,7 +2948,7 @@ function Bt(e, t, n) {
 		z: c / l
 	};
 }
-var Vt = 2, Ht = {
+var Dt = 2, Ot = {
 	matte: {
 		ambient: .62,
 		diffuse: .45,
@@ -3189,8 +2961,8 @@ var Vt = 2, Ht = {
 		specular: .35,
 		shininess: 22
 	}
-}, Ut = .8;
-function Wt(e) {
+}, kt = .8;
+function At(e) {
 	switch (e) {
 		case "plastic":
 		case "metal":
@@ -3201,8 +2973,8 @@ function Wt(e) {
 		default: return "matte";
 	}
 }
-function Gt(e, t, n = !0) {
-	let r = Ht[e], i = {
+function jt(e, t, n = !0) {
+	let r = Ot[e], i = {
 		light: t,
 		material: e,
 		ambient: r.ambient,
@@ -3210,9 +2982,9 @@ function Gt(e, t, n = !0) {
 		specular: r.specular,
 		shininess: r.shininess
 	};
-	return n && (i.fillLight = zt(t), i.fillDiffuse = i.diffuse * Ut), i;
+	return n && (i.fillLight = Tt(t), i.fillDiffuse = i.diffuse * kt), i;
 }
-function Kt(e, t) {
+function Mt(e, t) {
 	let n = e.x * t.light.x + e.y * t.light.y + e.z * t.light.z, r = t.diffuse * Math.max(0, n), i = 0;
 	if (t.fillLight && t.fillDiffuse) {
 		let n = e.x * t.fillLight.x + e.y * t.fillLight.y + e.z * t.fillLight.z;
@@ -3225,7 +2997,7 @@ function Kt(e, t) {
 	}
 	return Math.max(0, t.ambient + r + i + a);
 }
-function qt(e, t, n) {
+function Nt(e, t, n) {
 	if (!e) return {
 		x: 0,
 		y: 0,
@@ -3240,16 +3012,16 @@ function qt(e, t, n) {
 		h: Math.max(0, o - i)
 	};
 }
-function Jt(e, t, n) {
+function Pt(e, t, n) {
 	let r = e.canvas.width, i = e.canvas.height;
 	if (r <= 0 || i <= 0) return;
 	let a = t.widthPx;
 	if (a < .75) return;
-	let { x: o, y: s, w: c, h: l } = qt(n, r, i);
+	let { x: o, y: s, w: c, h: l } = Nt(n, r, i);
 	if (c <= 0 || l <= 0) return;
 	let u = e.getImageData(o, s, c, l), d = u.data, f = new Uint8ClampedArray(c * l);
 	for (let e = 0; e < c * l; e++) f[e] = d[e * 4 + 3];
-	let { bandMask: p, bandWeight: m, normals: h } = Nt(f, c, l, a, t.prst, t.heightPx), g = Gt(t.material, t.light), _ = Kt({
+	let { bandMask: p, bandWeight: m, normals: h } = yt(f, c, l, a, t.prst, t.heightPx), g = jt(t.material, t.light), _ = Mt({
 		x: 0,
 		y: 0,
 		z: 1
@@ -3260,13 +3032,13 @@ function Jt(e, t, n) {
 		if (n <= 0) continue;
 		let r = h[e * 3], i = h[e * 3 + 1], a = h[e * 3 + 2];
 		t.bottom && (r = -r, i = -i);
-		let o = 1 + (Kt({
+		let o = 1 + (Mt({
 			x: r,
 			y: i,
 			z: a
 		}, g) / _ - 1) * n, s = e * 4;
 		if (o >= 1) {
-			let e = Math.min(1, (o - 1) * Vt);
+			let e = Math.min(1, (o - 1) * Dt);
 			for (let t = 0; t < 3; t++) {
 				let n = Math.min(255, d[s + t] * o);
 				d[s + t] = n + (255 - n) * e;
@@ -3275,12 +3047,12 @@ function Jt(e, t, n) {
 	}
 	e.putImageData(u, o, s);
 }
-function Yt(e, t, n) {
+function Ft(e, t, n) {
 	let r = e.canvas.width, i = e.canvas.height;
 	if (r <= 0 || i <= 0) return;
 	let a = t.offsetX, o = t.offsetY, s = Math.hypot(a, o);
 	if (s < .75) return;
-	let { x: c, y: l, w: u, h: d } = qt(n, r, i);
+	let { x: c, y: l, w: u, h: d } = Nt(n, r, i);
 	if (u <= 0 || d <= 0) return;
 	let f = e.getImageData(c, l, u, d), p = f.data, m = new Uint8ClampedArray(u * d);
 	for (let e = 0; e < u * d; e++) m[e] = p[e * 4 + 3];
@@ -3304,8 +3076,8 @@ function Yt(e, t, n) {
 }
 //#endregion
 //#region packages/core/src/text/underline.ts
-function Xt(e, t, n, r, i, a, o, s = 1) {
-	let c = Math.max(1, i * .05), l = o === "heavy" || (o?.endsWith("Heavy") ?? !1) ? c * 1.8 : c, u = n + Math.max(2, l), d = J(u, l, s);
+function It(e, t, n, r, i, a, o, s = 1) {
+	let c = Math.max(1, i * .05), l = o === "heavy" || (o?.endsWith("Heavy") ?? !1) ? c * 1.8 : c, u = n + Math.max(2, l), d = V(u, l, s);
 	if (e.strokeStyle = a, e.lineWidth = l, e.setLineDash([]), o && o.startsWith("wavy")) {
 		let n = l, i = l * 6;
 		e.beginPath(), e.moveTo(t, u);
@@ -3326,14 +3098,14 @@ function Xt(e, t, n, r, i, a, o, s = 1) {
 	}
 	if (o === "dbl") {
 		let n = l * 1.4, i = u - n / 2, a = u + n / 2;
-		e.beginPath(), e.moveTo(t, i + J(i, l, s)), e.lineTo(t + r, i + J(i, l, s)), e.moveTo(t, a + J(a, l, s)), e.lineTo(t + r, a + J(a, l, s)), e.stroke();
+		e.beginPath(), e.moveTo(t, i + V(i, l, s)), e.lineTo(t + r, i + V(i, l, s)), e.moveTo(t, a + V(a, l, s)), e.lineTo(t + r, a + V(a, l, s)), e.stroke();
 		return;
 	}
-	e.setLineDash(Te(o ?? "sng", l)), e.beginPath(), e.moveTo(t, u + d), e.lineTo(t + r, u + d), e.stroke(), e.setLineDash([]);
+	e.setLineDash(ge(o ?? "sng", l)), e.beginPath(), e.moveTo(t, u + d), e.lineTo(t + r, u + d), e.stroke(), e.setLineDash([]);
 }
 //#endregion
 //#region packages/core/src/text/highlight-box.ts
-function Zt(e, t) {
+function Lt(e, t) {
 	return {
 		top: e - t * .85,
 		height: t * 1.1
@@ -3341,7 +3113,7 @@ function Zt(e, t) {
 }
 //#endregion
 //#region packages/core/src/text/justify-positions.ts
-function Qt(e, t, n, r, i = 0) {
+function Rt(e, t, n, r, i = 0) {
 	let a = [], o = 0, s = 0;
 	for (let c of t) a.push({
 		text: e.slice(o, c).join(""),
@@ -3354,14 +3126,14 @@ function Qt(e, t, n, r, i = 0) {
 }
 //#endregion
 //#region packages/pptx/src/reflection-blur.ts
-var $t = .5;
-function en(e, t) {
+var zt = .5;
+function Bt(e, t) {
 	if (!(t > 0) || !(e.h > 0)) return [{
 		y: e.y,
 		h: Math.max(0, e.h),
 		radius: 0
 	}];
-	let n = Math.max(4, Math.min(24, Math.ceil(t / $t) + 1)), r = e.y + e.h, i = [];
+	let n = Math.max(4, Math.min(24, Math.ceil(t / zt) + 1)), r = e.y + e.h, i = [];
 	for (let a = 0; a < n; a++) {
 		let o = Math.sqrt(a / (n - 1)), s = a === 0 ? 0 : Math.sqrt((a - 1) / (n - 1)), c = a === n - 1 ? 1 : Math.sqrt((a + 1) / (n - 1)), l = a === 0 ? 0 : (s + o) / 2, u = a === n - 1 ? 1 : (o + c) / 2, d = r - u * e.h;
 		i.push({
@@ -3372,20 +3144,20 @@ function en(e, t) {
 	}
 	return i;
 }
-function tn(e, t, n, r, i) {
-	for (let a of en(n, r)) e.save(), e.beginPath(), e.rect(0, a.y, i, a.h), e.clip(), e.filter = a.radius > 0 ? `blur(${a.radius}px)` : "none", e.drawImage(t, 0, 0), e.restore();
+function Vt(e, t, n, r, i) {
+	for (let a of Bt(n, r)) e.save(), e.beginPath(), e.rect(0, a.y, i, a.h), e.clip(), e.filter = a.radius > 0 ? `blur(${a.radius}px)` : "none", e.drawImage(t, 0, 0), e.restore();
 }
 //#endregion
 //#region packages/pptx/src/hyperlink.ts
-function nn(e, t) {
+function Ht(e, t) {
 	let n = e !== void 0 && e !== "" ? e : void 0, r = t !== void 0 && t !== "" ? t : void 0;
 	if (n === void 0 && r === void 0) return;
 	if (r !== void 0) return {
 		kind: "internal",
 		ref: n ?? r
 	};
-	let i = n, a = B(i);
-	return a !== null && ne.includes(a) ? {
+	let i = n, a = F(i);
+	return a !== null && U.includes(a) ? {
 		kind: "external",
 		url: i
 	} : {
@@ -3395,7 +3167,7 @@ function nn(e, t) {
 }
 //#endregion
 //#region packages/pptx/src/media-chrome.ts
-function rn(e, t, n, r, i, a) {
+function Ut(e, t, n, r, i, a) {
 	let o = Math.max(18, Math.min(32, Math.min(r, i) * .25));
 	if (e.save(), e.shadowColor = "rgba(0, 0, 0, 0.3)", e.shadowBlur = o * .35, e.fillStyle = "rgba(20, 20, 20, 0.7)", e.beginPath(), e.arc(t, n, o, 0, Math.PI * 2), e.fill(), e.shadowColor = "transparent", e.shadowBlur = 0, e.fillStyle = "#fff", a === "paused") {
 		e.beginPath();
@@ -3409,34 +3181,34 @@ function rn(e, t, n, r, i, a) {
 }
 //#endregion
 //#region packages/pptx/src/bidi-line.ts
-var an = (e) => {
+var Wt = (e) => {
 	let t = e.text;
 	return typeof t == "string" ? t : void 0;
-}, on = (e) => "isTab" in e;
-function sn(e) {
+}, Gt = (e) => "isTab" in e;
+function Kt(e) {
 	for (let t of e) {
-		let e = an(t);
-		if (e !== void 0 && H(e)) return !0;
+		let e = Wt(t);
+		if (e !== void 0 && I(e)) return !0;
 	}
 	return !1;
 }
-function cn(e, n) {
-	let r = e.length;
+function qt(t, n) {
+	let r = t.length;
 	if (r === 0) return {
 		order: [],
 		rtl: []
 	};
 	let i = "", a = Array(r), o;
-	for (let t = 0; t < r; t++) {
-		a[t] = i.length;
-		let n = an(e[t]) ?? "";
-		if (i += n.length > 0 ? n : "", on(e[t])) {
+	for (let e = 0; e < r; e++) {
+		a[e] = i.length;
+		let n = Wt(t[e]) ?? "";
+		if (i += n.length > 0 ? n : "", Gt(t[e])) {
 			for (o ??= []; o.length < i.length;) o.push(null);
-			o[a[t]] = "S";
+			o[a[e]] = "S";
 		}
 	}
 	if (o) for (; o.length < i.length;) o.push(null);
-	let { levels: s, paragraphLevel: c } = h().computeLevels(i, n ? "rtl" : "ltr", o), { order: l, segLevels: u } = t(s, c, a), d = Array(r);
+	let { levels: s, paragraphLevel: c } = f().computeLevels(i, n ? "rtl" : "ltr", o), { order: l, segLevels: u } = e(s, c, a), d = Array(r);
 	for (let e = 0; e < r; e++) d[e] = (u[e] & 1) == 1;
 	return {
 		order: l,
@@ -3445,11 +3217,11 @@ function cn(e, n) {
 }
 //#endregion
 //#region packages/pptx/src/cjk-wrap.ts
-function ln(e, t, n, r, i = 0, a = !1) {
+function Jt(e, t, n, r, a = 0, o = !1) {
 	if (e.length === 0) return 0;
 	let s = t === 0, c = 0, l = t;
 	for (let t of e) {
-		let e = c > 0 || a ? i : 0;
+		let e = c > 0 || o ? a : 0;
 		if (l + e + t.w > n) {
 			if (c > 0 || !s) break;
 			l += e + t.w, c++;
@@ -3457,20 +3229,20 @@ function ln(e, t, n, r, i = 0, a = !1) {
 		}
 		l += e + t.w, c++;
 	}
-	return c === 0 ? 0 : c >= e.length ? e.length : o(e.map((e) => e.ch), c, r, +!!s);
+	return c === 0 ? 0 : c >= e.length ? e.length : i(e.map((e) => e.ch), c, r, +!!s);
 }
 //#endregion
 //#region packages/pptx/src/text-justify.ts
-var un = (e) => /\s/.test(String.fromCodePoint(e));
-function dn(e, t, n, r, i) {
+var Yt = (e) => /\s/.test(String.fromCodePoint(e));
+function Xt(e, t, n, r, i) {
 	if (r === "just" && i) return null;
 	let a = t - n;
 	if (a <= .5) return null;
-	let o = Ce(e, a, {
+	let o = me(e, a, {
 		firstContentSi: 0,
 		lastDrawnSi: e.length,
-		isGapChar: le,
-		isWhitespace: un,
+		isGapChar: K,
+		isWhitespace: Yt,
 		seaClusterGaps: r === "thaiDist"
 	});
 	if (!o) return null;
@@ -3491,7 +3263,7 @@ function dn(e, t, n, r, i) {
 }
 //#endregion
 //#region packages/pptx/src/table-border-conflict.ts
-function fn(e) {
+function Zt(e) {
 	if (!e) return {
 		r: 0,
 		g: 0,
@@ -3508,37 +3280,37 @@ function fn(e) {
 		b: parseInt(t.slice(4, 6), 16)
 	};
 }
-function pn(e) {
-	let t = fn(e);
+function Qt(e) {
+	let t = Zt(e);
 	return .299 * t.r + .587 * t.g + .114 * t.b;
 }
-function mn(e, t) {
+function $t(e, t) {
 	if (!e && !t) return null;
 	if (!e) return t;
 	if (!t) return e;
 	if (e.width !== t.width) return e.width > t.width ? e : t;
-	let n = pn(e.color), r = pn(t.color);
+	let n = Qt(e.color), r = Qt(t.color);
 	return n === r || n < r ? e : t;
 }
 //#endregion
 //#region packages/pptx/src/smartart-fallback-contrast.ts
-function hn(e) {
-	let t = S(e.length === 8 ? e.slice(0, 6) : e);
+function en(e) {
+	let t = te(e.length === 8 ? e.slice(0, 6) : e);
 	if (!t) return null;
-	let n = a(t[0], t[1], t[2]);
+	let n = b(t[0], t[1], t[2]);
 	if (e.length !== 8) return n;
 	let r = Number.parseInt(e.slice(6, 8), 16);
 	if (Number.isNaN(r)) return null;
 	let i = r / 255;
 	return i * n + (1 - i);
 }
-function gn(e) {
+function tn(e) {
 	if (!e) return null;
-	if (e.fillType === "solid") return hn(e.color);
+	if (e.fillType === "solid") return en(e.color);
 	if (e.fillType === "gradient") {
 		let t = e.stops.map((e) => ({
 			p: Math.min(1, Math.max(0, e.position)),
-			l: hn(e.color)
+			l: en(e.color)
 		})).filter((e) => e.l !== null).sort((e, t) => e.p - t.p);
 		if (t.length === 0) return null;
 		let n = t[0], r = t[t.length - 1], i = n.l * n.p + r.l * (1 - r.p);
@@ -3547,18 +3319,18 @@ function gn(e) {
 	}
 	return null;
 }
-function _n(e) {
+function nn(e) {
 	return e.name === "SmartArt" && e.id === void 0;
 }
-function vn(e, t) {
-	let n = gn(e);
+function rn(e, t) {
+	let n = tn(e);
 	if (n === null || n >= .5) return null;
-	let r = hn(t.replace(/^#/, ""));
+	let r = en(t.replace(/^#/, ""));
 	return r !== null && r >= .5 ? null : "#FFFFFF";
 }
 //#endregion
 //#region packages/pptx/src/tab-layout.ts
-function yn(e, t, n, r, i, a = 0) {
+function an(e, t, n, r, i, a = 0) {
 	let o = e.map((e) => e.width), s = (t) => {
 		let n = 0;
 		for (let r = t; r < e.length && !e[r].isTab; r++) n += o[r];
@@ -3586,8 +3358,8 @@ function yn(e, t, n, r, i, a = 0) {
 }
 //#endregion
 //#region packages/pptx/src/vertical-text.ts
-var bn = () => !1;
-function xn(e, t, n) {
+var on = () => !1;
+function sn(e, t, n) {
 	let r = e.textBaseline;
 	e.textBaseline = "alphabetic";
 	let i = e.measureText(t);
@@ -3595,7 +3367,7 @@ function xn(e, t, n) {
 	let a = i.fontBoundingBoxAscent, o = i.fontBoundingBoxDescent;
 	return typeof a == "number" && typeof o == "number" && (a !== 0 || o !== 0) ? (a - o) / 2 : .38 * n;
 }
-function Sn(e, t) {
+function cn(e, t) {
 	let n = e.textAlign, r = e.textBaseline;
 	e.textAlign = "center", e.textBaseline = "middle";
 	let i = e.measureText(t);
@@ -3603,15 +3375,15 @@ function Sn(e, t) {
 	let a = i.actualBoundingBoxAscent, o = i.actualBoundingBoxDescent;
 	return typeof a == "number" && typeof o == "number" ? (a - o) / 2 : 0;
 }
-function Cn(e, t, n, r, i, a, o = "fill", s = bn) {
-	let c = e.textAlign, l = e.textBaseline, u = o === "stroke" ? e.strokeText.bind(e) : e.fillText.bind(e), d = r - xn(e, t, i), f = 0;
+function ln(e, t, n, r, i, a, o = "fill", s = on) {
+	let c = e.textAlign, l = e.textBaseline, u = o === "stroke" ? e.strokeText.bind(e) : e.fillText.bind(e), d = r - sn(e, t, i), f = 0;
 	for (let o of t) {
-		let t = o.codePointAt(0) ?? 0, l = F(t), p = e.measureText(o).width + a, m = l === "Tr" ? se(t) : null, h = l === "Tr" && m === null && W(t), g = l === "U" || l === "Tu" || m !== null || h;
-		if (ee(t) && s(t)) {
+		let t = o.codePointAt(0) ?? 0, l = A(t), p = e.measureText(o).width + a, m = l === "Tr" ? ee(t) : null, h = l === "Tr" && m === null && L(t), g = l === "U" || l === "Tu" || m !== null || h;
+		if (B(t) && s(t)) {
 			let t = n + f + p / 2;
-			e.save(), e.translate(t, d), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", j(e, () => u(o, 0, 0)), e.restore();
+			e.save(), e.translate(t, d), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", D(e, () => u(o, 0, 0)), e.restore();
 		} else if (g) {
-			let r = m === null && l === "Tu" ? N(t) : null, a = m === null ? r : m, s = a === null ? o : String.fromCodePoint(a), c = n + f + p / 2, h = r === null ? Sn(e, s) / i : 0;
+			let r = m === null && l === "Tu" ? k(t) : null, a = m === null ? r : m, s = a === null ? o : String.fromCodePoint(a), c = n + f + p / 2, h = r === null ? cn(e, s) / i : 0;
 			e.save(), e.translate(c, d), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", u(s, 0, h * i), e.restore();
 		} else if (l === "Tr") {
 			let t = n + f + p / 2;
@@ -3621,30 +3393,30 @@ function Cn(e, t, n, r, i, a, o = "fill", s = bn) {
 	}
 	e.textAlign = c, e.textBaseline = l;
 }
-function wn(e, t, n, r, i, a, o = "fill") {
-	Cn(e, t, n, r, i, a, o, (t) => ie(e, t));
+function un(e, t, n, r, i, a, o = "fill") {
+	ln(e, t, n, r, i, a, o, (t) => W(e, t));
 }
 //#endregion
 //#region packages/pptx/src/renderer.ts
-function X(e, t) {
+function Y(e, t) {
 	return e * t;
 }
-var Z = E;
-function Tn(e, t, n, r, i, a, o) {
-	let { top: s, height: c } = Zt(n, i);
+var X = _e;
+function dn(e, t, n, r, i, a, o) {
+	let { top: s, height: c } = Lt(n, i);
 	e.fillStyle = a, e.fillRect(t, s, r, c), e.fillStyle = o;
 }
-function En(e, t, n, r, i, a, o = 0) {
-	return b(e, t, n, r, i, a, o);
+function fn(e, t, n, r, i, a, o = 0) {
+	return Te(e, t, n, r, i, a, o);
 }
-var Dn = /* @__PURE__ */ new WeakMap();
-function On(e, t) {
+var pn = /* @__PURE__ */ new WeakMap();
+function mn(e, t) {
 	let n = e.tinted.get(t);
 	if (n) return n;
-	let r = O(e.raster, t);
+	let r = E(e.raster, t);
 	return e.tinted.set(t, r), r;
 }
-function kn(e) {
+function hn(e) {
 	let t = [], n = (e) => {
 		if (e) for (let n of e.paragraphs) for (let e of n.runs) e.type === "math" && t.push({
 			nodes: e.nodes,
@@ -3655,13 +3427,13 @@ function kn(e) {
 	else if (t.type === "table") for (let e of t.rows) for (let t of e.cells) n(t.textBody);
 	return t;
 }
-async function An(e, t) {
-	let n = kn(e);
+async function gn(e, t) {
+	let n = hn(e);
 	if (n.length !== 0) {
 		await t.loadMathJax();
-		for (let e of n) if (!Dn.has(e.nodes)) try {
-			let n = await t.mathMLToSvg(fe(e.nodes, e.display)), r = await L(n, "#000000");
-			Dn.set(e.nodes, {
+		for (let e of n) if (!pn.has(e.nodes)) try {
+			let n = await t.mathMLToSvg(G(e.nodes, e.display)), r = await M(n, "#000000");
+			pn.set(e.nodes, {
 				raster: r,
 				widthEm: n.widthEm,
 				ascentEm: n.ascentEm,
@@ -3671,10 +3443,10 @@ async function An(e, t) {
 		} catch {}
 	}
 }
-function jn(e, t) {
+function _n(e, t) {
 	return e ? e.startsWith("+") ? e === "+mj-lt" || e === "+mj-ea" || e === "+mj-cs" ? t.themeMajorFont ?? "sans-serif" : t.themeMinorFont ?? "sans-serif" : e.split(",")[0].trim() || (t.themeMinorFont ?? "sans-serif") : t.themeMinorFont ?? "sans-serif";
 }
-var Mn = new Set([
+var vn = new Set([
 	"serif",
 	"sans-serif",
 	"monospace",
@@ -3682,11 +3454,11 @@ var Mn = new Set([
 	"fantasy",
 	"system-ui"
 ]);
-function Nn(e) {
-	let t = k(e);
+function yn(e) {
+	let t = s(e);
 	return t === "mono" ? "monospace" : t === "serif" ? "serif" : "sans-serif";
 }
-var Pn = {
+var bn = {
 	calibri: "Carlito",
 	"calibri light": "Carlito",
 	cambria: "Caladea",
@@ -3698,103 +3470,103 @@ var Pn = {
 	"simplified arabic": "Noto Naskh Arabic",
 	"arabic typesetting": "Noto Naskh Arabic",
 	"univers next arabic": "Noto Sans Arabic"
-}, Fn = "\"Noto Naskh Arabic\", \"Noto Sans Arabic\"";
-function In(e) {
-	if (Pn[e.toLowerCase()]?.includes("Arabic")) return !0;
+}, xn = "\"Noto Naskh Arabic\", \"Noto Sans Arabic\"";
+function Sn(e) {
+	if (bn[e.toLowerCase()]?.includes("Arabic")) return !0;
 	let t = e.toLowerCase();
 	return /arabic|naskh|kufi|nastaliq|amiri|scheherazade|lateef|aldhabi|urdu|farsi|العرب|[؀-ۿ]/.test(t);
 }
-function Ln(e) {
+function Cn(e) {
 	return e.map((e) => `"${e}"`).join(", ");
 }
-function Rn(e) {
-	let t = Nn(e), n = Pn[e.toLowerCase()], r = n ? `"${n}", ` : "";
-	if (In(e)) return `"${e}", ${r}${Fn}, ${t}`;
-	let i = t === "serif" ? "serif" : "sans", a = V(e);
-	return `"${e}", ${r}${a ? `${Ln(re(a, i))}, ` : ""}${`${Ln(i === "serif" ? oe : P)}, `}${t}`;
+function wn(e) {
+	let t = yn(e), r = bn[e.toLowerCase()], i = r ? `"${r}", ` : "";
+	if (Sn(e)) return `"${e}", ${i}${xn}, ${t}`;
+	let a = t === "serif" ? "serif" : "sans", o = w(e);
+	return `"${e}", ${i}${o ? `${Cn(S(o, a))}, ` : ""}${`${Cn(a === "serif" ? C : n)}, `}${t}`;
 }
-function zn(e) {
+function Tn(e) {
 	return e ? e.kind === "external" ? `e:${e.url}` : `i:${e.ref}` : "";
 }
-function Bn(e) {
+function En(e) {
 	let t = e.toLowerCase();
 	return /\b(thin|hairline)\b/.test(t) ? 100 : /\b(extra[- ]?light|ultra[- ]?light)\b/.test(t) ? 200 : /\blight\b/.test(t) ? 300 : /\b(black|heavy)\b/.test(t) ? 900 : /\b(extra[- ]?bold|ultra[- ]?bold)\b/.test(t) ? 800 : /\b(semi[- ]?bold|demi[- ]?bold)\b/.test(t) ? 600 : /\bbold\b/.test(t) ? 700 : /\bmedium\b/.test(t) ? 600 : null;
 }
-function Vn(t, n, r, i, a, o, s, c) {
-	let l = Math.max(0, i.blur * a), u = Math.ceil(l * 3) + 2, d = Math.max(0, Math.floor(r.x - u)), f = Math.max(0, Math.floor(r.y - u)), p = Math.min(s, Math.ceil(r.x + r.w + u)), m = Math.min(c, Math.ceil(r.y + r.h + u)), h = Math.max(1, p - d), g = Math.max(1, m - f), _ = e(h, g), v = _?.getContext("2d");
-	if (!_ || !v) return;
-	v.save(), v.setTransform(o.a, o.b, o.c, o.d, o.e - d, o.f - f), n(v), v.restore();
-	let y = r.y - f, b = y + r.h, x = _, S = v;
-	if (l > 0) {
-		let t = e(h, g), n = t?.getContext("2d");
-		t && n && (x = t, S = n);
+function Dn(e, t, n, r, i, a, o, s) {
+	let c = Math.max(0, r.blur * i), l = Math.ceil(c * 3) + 2, u = Math.max(0, Math.floor(n.x - l)), d = Math.max(0, Math.floor(n.y - l)), f = Math.min(o, Math.ceil(n.x + n.w + l)), p = Math.min(s, Math.ceil(n.y + n.h + l)), m = Math.max(1, f - u), h = Math.max(1, p - d), g = ye(m, h), _ = g?.getContext("2d");
+	if (!g || !_) return;
+	_.save(), _.setTransform(a.a, a.b, a.c, a.d, a.e - u, a.f - d), t(_), _.restore();
+	let v = n.y - d, y = v + n.h, b = g, x = _;
+	if (c > 0) {
+		let e = ye(m, h), t = e?.getContext("2d");
+		e && t && (b = e, x = t);
 	}
-	x !== _ && tn(S, _, {
-		x: r.x - d,
-		y,
-		w: r.w,
-		h: r.h
-	}, l, h);
-	let C = Math.max(0, Math.min(1, i.stPos)), w = Math.max(0, Math.min(1, i.endPos)), T = Math.max(1, b - y);
+	b !== g && Vt(x, g, {
+		x: n.x - u,
+		y: v,
+		w: n.w,
+		h: n.h
+	}, c, m);
+	let S = Math.max(0, Math.min(1, r.stPos)), C = Math.max(0, Math.min(1, r.endPos)), w = Math.max(1, y - v);
 	try {
-		let e = S.getImageData(0, 0, h, g);
-		for (let t = 0; t < g; t++) {
-			let n = Math.max(0, Math.min(1, (b - (t + .5)) / T)), r;
-			if (n <= C) r = i.stA;
-			else if (n >= w || w <= C) r = i.endA;
+		let e = x.getImageData(0, 0, m, h);
+		for (let t = 0; t < h; t++) {
+			let n = Math.max(0, Math.min(1, (y - (t + .5)) / w)), i;
+			if (n <= S) i = r.stA;
+			else if (n >= C || C <= S) i = r.endA;
 			else {
-				let e = (n - C) / (w - C);
-				r = i.stA + (i.endA - i.stA) * e;
+				let e = (n - S) / (C - S);
+				i = r.stA + (r.endA - r.stA) * e;
 			}
-			let a = Math.max(0, Math.min(1, r));
-			for (let n = t * h * 4 + 3; n < (t + 1) * h * 4; n += 4) e.data[n] = Math.round(e.data[n] * a);
+			let a = Math.max(0, Math.min(1, i));
+			for (let n = t * m * 4 + 3; n < (t + 1) * m * 4; n += 4) e.data[n] = Math.round(e.data[n] * a);
 		}
-		S.putImageData(e, 0, 0);
+		x.putImageData(e, 0, 0);
 	} catch {
-		S.save(), S.globalCompositeOperation = "destination-in", S.fillStyle = `rgba(0,0,0,${Math.max(0, Math.min(1, i.stA))})`, S.fillRect(0, 0, h, g), S.restore();
+		x.save(), x.globalCompositeOperation = "destination-in", x.fillStyle = `rgba(0,0,0,${Math.max(0, Math.min(1, r.stA))})`, x.fillRect(0, 0, m, h), x.restore();
 	}
-	let E = i.dist * a, D = i.dir * Math.PI / 180, O = r.y + r.h;
-	t.save(), t.setTransform(1, 0, 0, 1, 0, 0), t.translate(r.x + Math.cos(D) * E, O + Math.sin(D) * E), t.scale(i.sx, i.sy), t.translate(-r.x, -O), t.drawImage(x, d, f), t.restore();
+	let T = r.dist * i, E = r.dir * Math.PI / 180, D = n.y + n.h;
+	e.save(), e.setTransform(1, 0, 0, 1, 0, 0), e.translate(n.x + Math.cos(E) * T, D + Math.sin(E) * T), e.scale(r.sx, r.sy), e.translate(-n.x, -D), e.drawImage(b, u, d), e.restore();
 }
-function Hn(e, t, n, r, i) {
-	let a = t ? "italic " : "", o = jn(r, i), s = Bn(o), c = e ? "bold " : s ? `${s} ` : "";
-	return Mn.has(o) ? `${a}${c}${n}px ${o}` : `${a}${c}${n}px ${Rn(o)}`;
+function Z(e, t, n, r, i) {
+	let a = t ? "italic " : "", o = _n(r, i), s = En(o), c = e ? "bold " : s ? `${s} ` : "";
+	return vn.has(o) ? `${a}${c}${n}px ${o}` : `${a}${c}${n}px ${wn(o)}`;
 }
-function Un(e) {
-	return e.bullet.type === "char" || e.bullet.type === "autoNum" || De(e.bullet).type === "blip";
+function On(e) {
+	return e.bullet.type === "char" || e.bullet.type === "autoNum" || Le(e.bullet).type === "blip";
 }
-function Wn(e, t) {
+function kn(e, t) {
 	return e ? 0 : Math.max(0, t);
 }
-function Gn(e, t, n, r, i, a, o) {
-	let s = (t.defaultFontSize ?? 18) * Y * a;
+function An(e, t, n, r, i, a, o) {
+	let s = (t.defaultFontSize ?? 18) * J * a;
 	for (let c of t.paragraphs) {
-		let l = X(c.marL, a), u = X(c.marR, a), d = X(c.indent, a), f = Wn(Un(c), d), p = n - r - i - l - u - f, m = 0;
+		let l = Y(c.marL, a), u = Y(c.marR, a), d = Y(c.indent, a), f = kn(On(c), d), p = n - r - i - l - u - f, m = 0;
 		for (let n of c.runs) {
 			if (n.type !== "text") continue;
-			let r = n.fontSize == null ? c.defFontSize == null ? s : c.defFontSize * Y * a : n.fontSize * Y * a, i = jn(n.fontFamily ?? c.defFontFamily ?? null, o);
-			e.font = Hn(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, r, i, o);
-			let l = (n.letterSpacing ?? 0) * Y * a;
+			let r = n.fontSize == null ? c.defFontSize == null ? s : c.defFontSize * J * a : n.fontSize * J * a, i = _n(n.fontFamily ?? c.defFontFamily ?? null, o);
+			e.font = Z(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, r, i, o);
+			let l = (n.letterSpacing ?? 0) * J * a;
 			if (m += Q(e, n.text, l), m > p) return !0;
 		}
 	}
 	return !1;
 }
-function Kn(e) {
-	for (let t of e) if (le(t.codePointAt(0) ?? 0)) return !0;
+function jn(e) {
+	for (let t of e) if (K(t.codePointAt(0) ?? 0)) return !0;
 	return !1;
 }
-function qn(e) {
+function Mn(e) {
 	let t = 0;
 	for (let n of e) t++;
 	return t;
 }
-var Jn = /* @__PURE__ */ new WeakMap();
-function Yn(e) {
-	let t = Jn.get(e);
+var Nn = /* @__PURE__ */ new WeakMap();
+function Pn(e) {
+	let t = Nn.get(e);
 	if (t != null) return t;
 	let n = e, r = n.letterSpacing;
-	if (typeof r != "string") return Jn.set(e, !1), !1;
+	if (typeof r != "string") return Nn.set(e, !1), !1;
 	let i = !1;
 	try {
 		n.letterSpacing = "0px";
@@ -3809,11 +3581,11 @@ function Yn(e) {
 			n.letterSpacing = r;
 		} catch {}
 	}
-	return Jn.set(e, i), i;
+	return Nn.set(e, i), i;
 }
 function Q(e, t, n) {
 	let r = e, i = r.letterSpacing;
-	if (n !== 0 && Yn(e)) try {
+	if (n !== 0 && Pn(e)) try {
 		r.letterSpacing = `${n}px`;
 		let i = e.measureText(t).width;
 		if (Number.isFinite(i)) return t.length > 0 ? i - n : i;
@@ -3822,66 +3594,66 @@ function Q(e, t, n) {
 			r.letterSpacing = i;
 		} catch {}
 	}
-	let a = Math.max(0, qn(t) - 1);
+	let a = Math.max(0, Mn(t) - 1);
 	return e.measureText(t).width + n * a;
 }
-function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
+function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
 }, p = 0) {
-	let m = [], h = /* @__PURE__ */ new Map(), g = !0;
-	for (let e = t.runs.length - 1; e >= 0 && g; e--) {
+	let m = [], g = /* @__PURE__ */ new Map(), _ = !0;
+	for (let e = t.runs.length - 1; e >= 0 && _; e--) {
 		let n = t.runs[e];
 		if (n.type === "break") continue;
 		if (n.type === "math") break;
 		let r = n.text.replace(/ +$/u, "");
-		r !== n.text && h.set(n, r), (r.length > 0 || n.fieldType != null) && (g = !1);
+		r !== n.text && g.set(n, r), (r.length > 0 || n.fieldType != null) && (_ = !1);
 	}
-	let _ = () => n - (m.length === 0 ? p : 0), v = { segments: [] }, b = 0, S = !1, C = t.rtl === !0, w = X(t.marR, o), T = (t.tabStops ?? []).map((e) => ({
-		pos: X(e.pos, o),
+	let v = () => n - (m.length === 0 ? p : 0), b = { segments: [] }, x = 0, S = !1, C = t.rtl === !0, w = Y(t.marR, o), E = (t.tabStops ?? []).map((e) => ({
+		pos: Y(e.pos, o),
 		algn: e.algn
-	})), E = X(t.defTabSz ?? 914400, o), O = !1, k = [], A = 0, j = () => C ? w : s + (m.length === 0 ? p : 0), M = (e = 0) => {
-		let t = yn(e > 0 ? [...k, {
+	})), D = Y(t.defTabSz ?? 914400, o), O = !1, k = [], A = 0, M = () => C ? w : s + (m.length === 0 ? p : 0), P = (e = 0) => {
+		let t = an(e > 0 ? [...k, {
 			isTab: !1,
 			width: e
-		}] : k, T, j(), Infinity, A, E), n = 0;
+		}] : k, E, M(), Infinity, A, D), n = 0;
 		for (let e of t) n += e;
 		return n;
-	}, N = (e) => {
-		let t = _();
-		return Number.isFinite(t) ? O ? M(e) <= t : b + e <= t : !0;
-	}, P = () => {
-		let e = _();
-		if (!O) return e - b;
+	}, F = (e) => {
+		let t = v();
+		return Number.isFinite(t) ? O ? P(e) <= t : x + e <= t : !0;
+	}, I = () => {
+		let e = v();
+		if (!O) return e - x;
 		if (!Number.isFinite(e)) return Infinity;
-		if (M(0) >= e) return 0;
+		if (P(0) >= e) return 0;
 		let t = 0, n = e;
 		for (let r = 0; r < 40; r++) {
 			let r = (t + n) / 2;
-			M(r) <= e ? t = r : n = r;
+			P(r) <= e ? t = r : n = r;
 		}
 		return t;
-	}, F = (e = !1) => {
-		e && (v.endsWithBreak = !0), m.push(v), v = { segments: [] }, b = 0, O = !1, k = [], S = !1;
-	}, L = (t, n, r, i) => {
+	}, L = (e = !1) => {
+		e && (b.endsWithBreak = !0), m.push(b), b = { segments: [] }, x = 0, O = !1, k = [], S = !1;
+	}, R = (t, n, r, i) => {
 		e.font = n;
-		let a = Q(e, t, r), o = v.segments.at(-1);
+		let a = Q(e, t, r), o = b.segments.at(-1);
 		return !o || o.isTab || o.math || o.sourceRunId !== i ? a : o.font === n && (o.letterSpacingPx ?? 0) === r ? Q(e, o.text + t, r) - Q(e, o.text, r) : a + r;
 	}, z = (t, n, r, i, a, o, s, c) => {
 		if (!t) return;
 		e.font = n;
-		let l = c?.letterSpacingPx ?? 0, u = c?.sourceRunId, d = c?.strikeDouble, f = c?.underlineStyle, p = c?.underlineColor, m = c?.shadow, h = c?.reflection, g = c?.outline, _ = c?.highlight, y = c?.fontFamily, x = c?.hyperlink, S = (e) => !e.math && !e.isTab && e.font === n && e.color === i && e.underline === a && (e.underlineStyle ?? "") === (f ?? "") && (e.underlineColor ?? "") === (p ?? "") && e.strikethrough === o && (e.strikeDouble ?? !1) === (d ?? !1) && (e.letterSpacingPx ?? 0) === l && e.baseline === s && e.shadow === m && e.reflection === h && e.outline === g && (e.highlight ?? "") === (_ ?? "") && (e.fontFamily ?? "") === (y ?? "") && zn(e.hyperlink) === zn(x) && (l === 0 || e.sourceRunId === u), C = v.segments.at(-1), w = Q(e, t, l);
-		if (C && S(C) ? w = Q(e, C.text + t, l) - Q(e, C.text, l) : C && !C.isTab && !C.math && u != null && C.sourceRunId === u && (w += l), b += w, k.push({
+		let l = c?.letterSpacingPx ?? 0, u = c?.sourceRunId, d = c?.strikeDouble, f = c?.underlineStyle, p = c?.underlineColor, m = c?.shadow, h = c?.reflection, g = c?.outline, _ = c?.highlight, v = c?.fontFamily, y = c?.hyperlink, S = (e) => !e.math && !e.isTab && e.font === n && e.color === i && e.underline === a && (e.underlineStyle ?? "") === (f ?? "") && (e.underlineColor ?? "") === (p ?? "") && e.strikethrough === o && (e.strikeDouble ?? !1) === (d ?? !1) && (e.letterSpacingPx ?? 0) === l && e.baseline === s && e.shadow === m && e.reflection === h && e.outline === g && (e.highlight ?? "") === (_ ?? "") && (e.fontFamily ?? "") === (v ?? "") && Tn(e.hyperlink) === Tn(y) && (l === 0 || e.sourceRunId === u), C = b.segments.at(-1), w = Q(e, t, l);
+		if (C && S(C) ? w = Q(e, C.text + t, l) - Q(e, C.text, l) : C && !C.isTab && !C.math && u != null && C.sourceRunId === u && (w += l), x += w, k.push({
 			isTab: !1,
 			width: w
 		}), C && S(C)) C.text += t;
 		else {
 			let e = C && !C.isTab && !C.math && u != null && C.sourceRunId === u ? l : 0;
-			v.segments.push({
+			b.segments.push({
 				text: t,
 				font: n,
-				fontFamily: y,
+				fontFamily: v,
 				sizePx: r,
 				color: i,
 				underline: a,
@@ -3897,17 +3669,17 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				reflection: h,
 				outline: g,
 				highlight: _,
-				hyperlink: x
+				hyperlink: y
 			});
 		}
 	}, B = () => {
-		let e = v.segments.at(-1);
+		let e = b.segments.at(-1);
 		if (!e || e.math) return !1;
 		let t = /^(.*\s)(\S+)$/s.exec(e.text), n;
 		if (t) e.text = t[1], n = t[2];
-		else if (v.segments.length > 1) v.segments.pop(), n = e.text;
+		else if (b.segments.length > 1) b.segments.pop(), n = e.text;
 		else return !1;
-		return F(), z(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
+		return L(), z(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
 			strikeDouble: e.strikeDouble,
 			letterSpacingPx: e.letterSpacingPx,
 			underlineStyle: e.underlineStyle,
@@ -3922,58 +3694,58 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 	};
 	for (let [n, s] of t.runs.entries()) {
 		if (s.type === "break") {
-			F(!0);
+			L(!0);
 			continue;
 		}
 		if (s.type === "math") {
-			let e = Dn.get(s.nodes), t = s.fontSize == null ? r : s.fontSize * Y * o * u, n = e ? e.widthEm * t : 0, i = e ? e.ascentEm * t : 0, c = e ? e.descentEm * t : 0;
-			(s.display && b > 0 || !N(n) && b > 0) && F(), k.push({
+			let e = pn.get(s.nodes), t = s.fontSize == null ? i : s.fontSize * J * o * u, n = e ? e.widthEm * t : 0, r = e ? e.ascentEm * t : 0, c = e ? e.descentEm * t : 0;
+			(s.display && x > 0 || !F(n) && x > 0) && L(), k.push({
 				isTab: !1,
 				width: n
-			}), v.segments.push({
+			}), b.segments.push({
 				text: "",
 				font: `${t}px sans-serif`,
 				sizePx: t,
-				color: s.color ? Z(s.color) : a,
+				color: s.color ? X(s.color) : a,
 				underline: !1,
 				strikethrough: !1,
 				math: {
 					nodes: s.nodes,
 					display: s.display,
 					width: n,
-					ascent: i,
+					ascent: r,
 					descent: c
 				}
-			}), b += n, s.display && F();
+			}), x += n, s.display && L();
 			continue;
 		}
-		let p = s.fontSize == null ? r : s.fontSize * Y * o * u, m = jn(s.fontFamily ?? t.defFontFamily ?? null, f), g = s.fontFamilyEa ? jn(s.fontFamilyEa, f) : null, C = s.fontFamilySym ? jn(s.fontFamilySym, f) : null, w;
-		w = s.color ? Z(s.color) : s.hyperlink && f.themeHlinkColor ? Z(f.themeHlinkColor) : a;
-		let T = s.bold ?? t.defBold ?? c, E = s.italic ?? t.defItalic ?? l, j = Hn(T, E, p, m, f), M = g ? Hn(T, E, p, g, f) : j;
-		e.font = j;
-		let V = s.caps, H = h.get(s) ?? s.text;
+		let p = s.fontSize == null ? i : s.fontSize * J * o * u, m = _n(s.fontFamily ?? t.defFontFamily ?? null, f), _ = s.fontFamilyEa ? _n(s.fontFamilyEa, f) : null, C = s.fontFamilySym ? _n(s.fontFamilySym, f) : null, w;
+		w = s.color ? X(s.color) : s.hyperlink && f.themeHlinkColor ? X(f.themeHlinkColor) : a;
+		let E = s.bold ?? t.defBold ?? c, D = s.italic ?? t.defItalic ?? l, M = Z(E, D, p, m, f), P = _ ? Z(E, D, p, _, f) : M;
+		e.font = M;
+		let V = s.caps, H = g.get(s) ?? s.text;
 		(V === "all" || V === "small") && (H = H.toUpperCase());
-		let U = s.fieldType === "slidenum" && d !== void 0 ? String(d) : H, W = s.underline || s.hyperlink !== void 0, G = s.strikeDouble === !0, K = s.letterSpacing == null ? 0 : s.letterSpacing * Y * o, q = {
-			strikeDouble: G,
-			letterSpacingPx: K,
+		let U = s.fieldType === "slidenum" && d !== void 0 ? String(d) : H, W = s.underline || s.hyperlink !== void 0, ee = s.strikeDouble === !0, G = s.letterSpacing == null ? 0 : s.letterSpacing * J * o, q = {
+			strikeDouble: ee,
+			letterSpacingPx: G,
 			underlineStyle: s.underlineStyle,
-			underlineColor: s.underlineColor ? Z(s.underlineColor) : void 0,
+			underlineColor: s.underlineColor ? X(s.underlineColor) : void 0,
 			shadow: s.shadow,
 			reflection: s.reflection,
 			outline: s.outline,
 			fontFamily: m,
-			highlight: s.highlight ? Z(s.highlight) : void 0,
-			hyperlink: nn(s.hyperlink),
+			highlight: s.highlight ? X(s.highlight) : void 0,
+			hyperlink: Ht(s.hyperlink),
 			sourceRunId: n
-		}, ee = U.split(/(\s+)/);
-		for (let r of ee) {
-			if (!r) continue;
-			if (/^\t+$/.test(r)) {
-				O || (e.font = j, A = e.measureText(" ").width);
-				for (let e of r) v.segments.push({
+		}, te = U.split(/(\s+)/);
+		for (let i of te) {
+			if (!i) continue;
+			if (/^\t+$/.test(i)) {
+				O || (e.font = M, A = e.measureText(" ").width);
+				for (let e of i) b.segments.push({
 					text: "",
 					isTab: !0,
-					font: j,
+					font: M,
 					fontFamily: m,
 					sizePx: p,
 					color: w,
@@ -3986,46 +3758,46 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				O = !0;
 				continue;
 			}
-			e.font = j;
-			let a = L(r, j, K, n), o = /^\s+$/.test(r), c = /[-]/;
-			if (c.test(r) && (C != null || we(m))) {
+			e.font = M;
+			let a = R(i, M, G, n), o = /^\s+$/.test(i), c = /[-]/;
+			if (c.test(i) && (C != null || he(m))) {
 				let t = C ?? m;
-				for (let i of r) {
-					let r = i, a = j;
-					if (c.test(i)) {
-						let e = ge(i, t);
-						e === i ? a = Hn(T, E, p, t, f) : (r = e, a = Hn(T, E, p, "sans-serif", f));
+				for (let r of i) {
+					let i = r, a = M;
+					if (c.test(r)) {
+						let e = se(r, t);
+						e === r ? a = Z(E, D, p, t, f) : (i = e, a = Z(E, D, p, "sans-serif", f));
 					}
-					e.font = a, !N(L(r, a, K, n)) && b > 0 && F(), z(r, a, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+					e.font = a, !F(R(i, a, G, n)) && x > 0 && L(), z(i, a, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
 				}
 				continue;
 			}
-			if (Kn(r) && (!R(r) || t.eaLnBrk === !1)) {
-				let i = [];
-				for (let t of r) {
-					let n = le(t.codePointAt(0) ?? 0) && g != null, r = n ? M : j, a = n ? g : m;
-					e.font = r, i.push({
+			if (jn(i) && (!N(i) || t.eaLnBrk === !1)) {
+				let r = [];
+				for (let t of i) {
+					let n = K(t.codePointAt(0) ?? 0) && _ != null, i = n ? P : M, a = n ? _ : m;
+					e.font = i, r.push({
 						ch: t,
 						w: Q(e, t, 0),
-						font: r,
+						font: i,
 						family: a
 					});
 				}
 				if (t.eaLnBrk === !1) {
-					let e = v.segments.at(-1), t = !!e && !e.isTab && !e.math && e.sourceRunId === n, r = i.reduce((e, t) => e + t.w, 0) + Math.max(0, i.length - 1) * K + (t && i.length > 0 ? K : 0);
-					b > 0 && !N(r) && F();
-					for (let e of i) z(e.ch, e.font, p, w, W, s.strikethrough, s.baseline ?? void 0, {
+					let e = b.segments.at(-1), t = !!e && !e.isTab && !e.math && e.sourceRunId === n, i = r.reduce((e, t) => e + t.w, 0) + Math.max(0, r.length - 1) * G + (t && r.length > 0 ? G : 0);
+					x > 0 && !F(i) && L();
+					for (let e of r) z(e.ch, e.font, p, w, W, s.strikethrough, s.baseline ?? void 0, {
 						...q,
 						fontFamily: e.family
 					});
 					continue;
 				}
-				let a = i;
+				let a = r;
 				for (; a.length > 0;) {
-					let e = Number.isFinite(_()) ? _() - P() : b, t = v.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = ln(a, e, _(), y, K, r);
+					let e = Number.isFinite(v()) ? v() - I() : x, t = b.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = Jt(a, e, v(), h, G, r);
 					if (i === 0) {
-						if (b > 0) {
-							F();
+						if (x > 0) {
+							L();
 							continue;
 						}
 						i = 1;
@@ -4037,17 +3809,17 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 							fontFamily: t.family
 						});
 					}
-					a = a.slice(i), a.length > 0 && F();
+					a = a.slice(i), a.length > 0 && L();
 				}
 				continue;
 			}
-			if (R(r)) {
-				let t = x(r, {
+			if (N(i)) {
+				let t = y(i, {
 					cjk: !0,
-					kinsoku: y
-				}), i = g != null && M !== j, a = (e) => i && le(e.codePointAt(0) ?? 0), o = (t) => {
-					let r = 0, i = v.segments.at(-1), o = !!i && !i.isTab && !i.math && i.sourceRunId === n, s = "", c = null, l = () => {
-						s !== "" && (e.font = c ? M : j, r += Q(e, s, K), o && (r += K), o = !0, s = "");
+					kinsoku: h
+				}), r = _ != null && P !== M, a = (e) => r && K(e.codePointAt(0) ?? 0), o = (t) => {
+					let r = 0, i = b.segments.at(-1), o = !!i && !i.isTab && !i.math && i.sourceRunId === n, s = "", c = null, l = () => {
+						s !== "" && (e.font = c ? P : M, r += Q(e, s, G), o && (r += G), o = !0, s = "");
 					};
 					for (let e of t) {
 						let t = a(e);
@@ -4057,7 +3829,7 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}, c = (e) => {
 					let t = "", n = null, r = () => {
 						if (t === "") return;
-						let e = n ? M : j, r = n ? g : m;
+						let e = n ? P : M, r = n ? _ : m;
 						z(t, e, p, w, W, s.strikethrough, s.baseline ?? void 0, {
 							...q,
 							fontFamily: r
@@ -4068,59 +3840,59 @@ function Xn(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 						n === null || e === n ? (t += i, n = e) : (r(), t = i, n = e);
 					}
 					r();
-				}, l = de(r), u = r.length, d = 0;
+				}, l = ne(i), u = i.length, d = 0;
 				for (; d < u;) {
-					let e = P(), n = I(r, t, d, e, o, l);
+					let e = I(), n = j(i, t, d, e, o, l);
 					if (n <= d) {
-						if (b > 0) {
-							F();
+						if (x > 0) {
+							L();
 							continue;
 						}
-						let i = t.find((e) => e > d) ?? u, a = r.slice(d, i), s = D(a), c = I(a, s, 0, e, o, l);
+						let r = t.find((e) => e > d) ?? u, a = i.slice(d, r), s = T(a), c = j(a, s, 0, e, o, l);
 						c <= 0 && (c = s.length > 0 ? s[0] : a.length), n = d + c;
 					}
-					c(r.slice(d, n)), d = n, d < u && F();
+					c(i.slice(d, n)), d = n, d < u && L();
 				}
 				continue;
 			}
-			if (N(a)) z(r, j, p, w, W, s.strikethrough, s.baseline ?? void 0, q), o && (S = !0);
-			else if (o) b > 0 && F();
-			else if (a > _()) {
-				b > 0 && F();
-				for (let t of r) e.font = j, !N(L(t, j, K, n)) && b > 0 && F(), z(t, j, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
-			} else if (!S) z(r, j, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+			if (F(a)) z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q), o && (S = !0);
+			else if (o) x > 0 && L();
+			else if (a > v()) {
+				x > 0 && L();
+				for (let t of i) e.font = M, !F(R(t, M, G, n)) && x > 0 && L(), z(t, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+			} else if (!S) z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
 			else {
-				let e = v.segments.at(-1)?.text ?? "", t = r.codePointAt(0), n = [...e].at(-1)?.codePointAt(0), a = /\S$/u.test(e) && /^\S/u.test(r) && n !== 8203 && t !== 8203, o = t !== void 0 && y.lineStartForbidden.has(t) && a, c = n !== void 0 && t !== void 0 && a && !R(e) && !R(r) && i(n, t);
-				(o || c) && B() || F(), z(r, j, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+				let e = b.segments.at(-1)?.text ?? "", t = i.codePointAt(0), n = [...e].at(-1)?.codePointAt(0), a = /\S$/u.test(e) && /^\S/u.test(i) && n !== 8203 && t !== 8203, o = t !== void 0 && h.lineStartForbidden.has(t) && a, c = n !== void 0 && t !== void 0 && a && !N(e) && !N(i) && r(n, t);
+				(o || c) && B() || L(), z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
 			}
 		}
 	}
-	return m.push(v), m;
+	return m.push(b), m;
 }
-async function Zn(e, t, n, r, i, a, o) {
+async function In(e, t, n, r, i, a, o) {
 	if (t && t.fillType === "image") {
 		if (e.fillStyle = "#FFFFFF", e.fillRect(0, 0, n, r), !t.imagePath || !t.mimeType || !o) return;
 		try {
-			let s = await Ee(t.imagePath, t.mimeType, t.duotone, o, {
-				widthPt: n / i / Y,
-				heightPt: r / i / Y
+			let s = await Ie(t.imagePath, t.mimeType, t.duotone, o, {
+				widthPt: n / i / J,
+				heightPt: r / i / J
 			});
 			if (a() || !s) return;
-			if (e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile) er(e, s, t.tile, n, r, i);
+			if (e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile) zn(e, s, t.tile, n, r, i);
 			else {
 				let i = t.fillRect ?? {}, a = i.l ?? 0, o = i.t ?? 0, c = i.r ?? 0, l = i.b ?? 0, u = a * n, d = o * r, f = n * (1 - a - c), p = r * (1 - o - l);
 				e.drawImage(s, u, d, f, p);
 			}
 			e.restore();
 		} catch (e) {
-			if (pe(e)) throw e;
+			if (Se(e)) throw e;
 		}
 		return;
 	}
-	e.fillStyle = En(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
+	e.fillStyle = fn(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
 }
-var Qn = 9525;
-function $n(e, t, n, r, i) {
+var Ln = 9525;
+function Rn(e, t, n, r, i) {
 	let a;
 	a = e === "t" || e === "ctr" || e === "b" ? (t - r) / 2 : e === "tr" || e === "r" || e === "br" ? t - r : 0;
 	let o;
@@ -4129,134 +3901,134 @@ function $n(e, t, n, r, i) {
 		ay: o
 	};
 }
-function er(t, n, r, i, a, o) {
-	let s = n.width * Qn * r.sx * o, c = n.height * Qn * r.sy * o;
-	if (!(s > 0) || !(c > 0)) return;
-	let l = r.flip === "x" || r.flip === "xy", u = r.flip === "y" || r.flip === "xy", d = e(s * (l ? 2 : 1), c * (u ? 2 : 1));
+function zn(e, t, n, r, i, a) {
+	let o = t.width * Ln * (n.sx ?? 1) * a, s = t.height * Ln * (n.sy ?? 1) * a;
+	if (!(o > 0) || !(s > 0)) return;
+	let c = n.flip === "x" || n.flip === "xy", l = n.flip === "y" || n.flip === "xy", u = ye(o * (c ? 2 : 1), s * (l ? 2 : 1));
+	if (!u) return;
+	let d = u.getContext("2d");
 	if (!d) return;
-	let f = d.getContext("2d");
-	if (!f) return;
-	let p = (e, t, r, i) => {
-		f.save(), f.translate(e + (r ? s : 0), t + (i ? c : 0)), f.scale(r ? -1 : 1, i ? -1 : 1), f.drawImage(n, 0, 0, s, c), f.restore();
+	let f = (e, n, r, i) => {
+		d.save(), d.translate(e + (r ? o : 0), n + (i ? s : 0)), d.scale(r ? -1 : 1, i ? -1 : 1), d.drawImage(t, 0, 0, o, s), d.restore();
 	};
-	p(0, 0, !1, !1), l && p(s, 0, !0, !1), u && p(0, c, !1, !0), l && u && p(s, c, !0, !0);
-	let m = t.createPattern(d, "repeat");
-	if (!m) return;
-	let { ax: h, ay: g } = $n(r.algn ?? "tl", i, a, s, c), _ = h + X(r.tx, o), v = g + X(r.ty, o);
-	typeof m.setTransform == "function" && typeof DOMMatrix < "u" ? (m.setTransform(new DOMMatrix().translateSelf(_, v)), t.fillStyle = m, t.fillRect(0, 0, i, a)) : (t.save(), t.translate(_, v), t.fillStyle = m, t.fillRect(-_, -v, i, a), t.restore());
+	f(0, 0, !1, !1), c && f(o, 0, !0, !1), l && f(0, s, !1, !0), c && l && f(o, s, !0, !0);
+	let p = e.createPattern(u, "repeat");
+	if (!p) return;
+	let { ax: m, ay: h } = Rn(n.algn ?? "tl", r, i, o, s), g = m + Y(n.tx ?? 0, a), _ = h + Y(n.ty ?? 0, a);
+	typeof p.setTransform == "function" && typeof DOMMatrix < "u" ? (p.setTransform(new DOMMatrix().translateSelf(g, _)), e.fillStyle = p, e.fillRect(0, 0, r, i)) : (e.save(), e.translate(g, _), e.fillStyle = p, e.fillRect(-g, -_, r, i), e.restore());
 }
-function tr(e, t, n) {
+function Bn(e, t, n) {
 	if (!t) return;
-	let r = t.dir * Math.PI / 180, i = X(t.dist, n);
-	e.shadowColor = Z(t.color, t.alpha), e.shadowBlur = 0, e.shadowOffsetX = Math.cos(r) * i, e.shadowOffsetY = Math.sin(r) * i;
+	let r = t.dir * Math.PI / 180, i = Y(t.dist, n);
+	e.shadowColor = X(t.color, t.alpha), e.shadowBlur = 0, e.shadowOffsetX = Math.cos(r) * i, e.shadowOffsetY = Math.sin(r) * i;
 }
-function nr(e, t, n) {
-	t && (e.shadowColor = Z(t.color, t.alpha), e.shadowBlur = X(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
+function Vn(e, t, n) {
+	t && (e.shadowColor = X(t.color, t.alpha), e.shadowBlur = Y(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
 }
-function rr(e) {
+function Hn(e) {
 	e.shadowColor = "transparent", e.shadowBlur = 0, e.shadowOffsetX = 0, e.shadowOffsetY = 0;
 }
-var ir = 8, ar = 1, or = 1, sr = 256;
-function cr(t, n, r, i, a, o, s, c, l, u, d, f, p, m, h) {
-	if (i <= 0) return;
-	let g = t.measureText(n), _ = g.actualBoundingBoxAscent > 0 ? g.actualBoundingBoxAscent : i, v = g.actualBoundingBoxDescent > 0 ? g.actualBoundingBoxDescent : i * .25, y = g.actualBoundingBoxLeft > 0 ? g.actualBoundingBoxLeft : 0, b = g.actualBoundingBoxRight > 0 ? g.actualBoundingBoxRight : i, x = i * u * a, S = Math.min(sr, Math.max(1, Math.round(x / ir))), C = (e) => dr(e, o, i, s, c, l, d, f), w = C(S), T = pr(w, o, s, c, l, d, f, u, a, -_, v);
-	for (; T > or && S < sr;) {
-		let e = Math.min(sr, S * 2), t = C(e), n = pr(t, o, s, c, l, d, f, u, a, -_, v);
-		if (n >= T * .75) {
-			w = t;
+var Un = 8, Wn = 1, Gn = 1, Kn = 256;
+function qn(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
+	if (r <= 0) return;
+	let h = e.measureText(t), g = h.actualBoundingBoxAscent > 0 ? h.actualBoundingBoxAscent : r, _ = h.actualBoundingBoxDescent > 0 ? h.actualBoundingBoxDescent : r * .25, v = h.actualBoundingBoxLeft > 0 ? h.actualBoundingBoxLeft : 0, y = h.actualBoundingBoxRight > 0 ? h.actualBoundingBoxRight : r, b = r * l * i, x = Math.min(Kn, Math.max(1, Math.round(b / Un))), S = (e) => Xn(e, a, r, o, s, c, u, d), C = S(x), w = Qn(C, a, o, s, c, u, d, l, i, -g, _);
+	for (; w > Gn && x < Kn;) {
+		let e = Math.min(Kn, x * 2), t = S(e), n = Qn(t, a, o, s, c, u, d, l, i, -g, _);
+		if (n >= w * .75) {
+			C = t;
 			break;
 		}
-		S = e, w = t, T = n;
+		x = e, C = t, w = n;
 	}
-	let E = 1e4, D = ar / (u * a), O = w.length - 1, k = (e, t, n) => e === 0 ? -E : t - n - D, A = (e, t, n) => e === O ? E : t - n + D, j = (e, t) => {
-		e.fillStyle = t;
-		for (let t = 0; t <= O; t++) {
-			let { s0: i, s1: a, g: o } = w[t], s = (i + a) / 2;
-			e.save(), e.translate(p + o.x, m + o.y), e.rotate(o.angle), o.shear !== 0 && e.transform(1, 0, o.shear, 1, 0, 0), (u !== 1 || o.vScale !== 1) && e.scale(u, o.vScale), e.beginPath();
-			let c = k(t, i, s), l = A(t, a, s);
-			e.rect(c, -E, l - c, 2 * E), e.clip(), e.fillText(n, -s + r / 2, 0), e.restore();
+	let T = 1e4, E = Wn / (l * i), D = C.length - 1, O = (e, t, n) => e === 0 ? -T : t - n - E, k = (e, t, n) => e === D ? T : t - n + E, A = (e, r) => {
+		e.fillStyle = r;
+		for (let r = 0; r <= D; r++) {
+			let { s0: i, s1: a, g: o } = C[r], s = (i + a) / 2;
+			e.save(), e.translate(f + o.x, p + o.y), e.rotate(o.angle), o.shear !== 0 && e.transform(1, 0, o.shear, 1, 0, 0), (l !== 1 || o.vScale !== 1) && e.scale(l, o.vScale), e.beginPath();
+			let c = O(r, i, s), u = k(r, a, s);
+			e.rect(c, -T, u - c, 2 * T), e.clip(), e.fillText(t, -s + n / 2, 0), e.restore();
 		}
-	}, M = lr(h), N = typeof t.globalAlpha == "number" ? t.globalAlpha : 1;
-	if (M >= 1 && N >= 1) {
-		j(t, h);
+	}, j = Jn(m), M = typeof e.globalAlpha == "number" ? e.globalAlpha : 1;
+	if (j >= 1 && M >= 1) {
+		A(e, m);
 		return;
 	}
-	if (M <= 0 || N <= 0) return;
-	let P = typeof t.getTransform == "function" ? t.getTransform() : null;
-	if (!P) {
-		j(t, h);
+	if (j <= 0 || M <= 0) return;
+	let N = typeof e.getTransform == "function" ? e.getTransform() : null;
+	if (!N) {
+		A(e, m);
 		return;
 	}
-	let F = Infinity, I = Infinity, L = -Infinity, R = -Infinity;
-	for (let e = 0; e <= O; e++) {
-		let { s0: t, s1: n, g: i } = w[e], a = (t + n) / 2, o = -a + r / 2, s = Math.max(k(e, t, a), o - y), c = Math.min(A(e, n, a), o + b);
+	let P = Infinity, F = Infinity, I = -Infinity, L = -Infinity;
+	for (let e = 0; e <= D; e++) {
+		let { s0: t, s1: r, g: i } = C[e], a = (t + r) / 2, o = -a + n / 2, s = Math.max(O(e, t, a), o - v), c = Math.min(k(e, r, a), o + y);
 		if (!(c <= s)) for (let [e, t] of [
-			[s, -_],
-			[c, -_],
-			[s, v],
-			[c, v]
+			[s, -g],
+			[c, -g],
+			[s, _],
+			[c, _]
 		]) {
-			let n = fr(i, u, e, t), r = p + n.x, a = m + n.y, o = P.a * r + P.c * a + P.e, s = P.b * r + P.d * a + P.f;
-			o < F && (F = o), o > L && (L = o), s < I && (I = s), s > R && (R = s);
+			let n = Zn(i, l, e, t), r = f + n.x, a = p + n.y, o = N.a * r + N.c * a + N.e, s = N.b * r + N.d * a + N.f;
+			o < P && (P = o), o > I && (I = o), s < F && (F = s), s > L && (L = s);
 		}
 	}
-	if (!(L > F && R > I)) return;
-	let z = Math.floor(F - 2), B = Math.floor(I - 2), V = e(Math.ceil(L + 2) - z, Math.ceil(R + 2) - B), H = V ? V.getContext("2d") : null;
-	if (!V || !H) {
-		j(t, h);
+	if (!(I > P && L > F)) return;
+	let R = Math.floor(P - 2), z = Math.floor(F - 2), B = ye(Math.ceil(I + 2) - R, Math.ceil(L + 2) - z), V = B ? B.getContext("2d") : null;
+	if (!B || !V) {
+		A(e, m);
 		return;
 	}
-	H.font = t.font, H.textAlign = "left", H.textBaseline = "alphabetic", H.setTransform(P.a, P.b, P.c, P.d, P.e - z, P.f - B), j(H, ur(h)), t.save(), t.setTransform(1, 0, 0, 1, 0, 0), t.globalAlpha = N * M, t.drawImage(V, z, B), t.restore();
+	V.font = e.font, V.textAlign = "left", V.textBaseline = "alphabetic", V.setTransform(N.a, N.b, N.c, N.d, N.e - R, N.f - z), A(V, Yn(m)), e.save(), e.setTransform(1, 0, 0, 1, 0, 0), e.globalAlpha = M * j, e.drawImage(B, R, z), e.restore();
 }
-function lr(e) {
+function Jn(e) {
 	let t = /^rgba?\(\s*[\d.]+\s*,\s*[\d.]+\s*,\s*[\d.]+\s*,\s*([\d.]+)\s*\)$/i.exec(e);
 	if (!t) return 1;
 	let n = parseFloat(t[1]);
 	return Number.isFinite(n) ? Math.min(1, Math.max(0, n)) : 1;
 }
-function ur(e) {
+function Yn(e) {
 	let t = /^rgba?\(\s*([\d.]+)\s*,\s*([\d.]+)\s*,\s*([\d.]+)/i.exec(e);
 	return t ? `rgb(${t[1]}, ${t[2]}, ${t[3]})` : e;
 }
-function dr(e, t, n, r, i, a, o, s) {
+function Xn(e, t, n, r, i, a, o, s) {
 	let c = Array(e);
 	for (let l = 0; l < e; l++) {
 		let u = l / e * n, d = (l + 1) / e * n;
 		c[l] = {
 			s0: u,
 			s1: d,
-			g: Ve(t, (r + (u + d) / 2) / i * a, o, s)
+			g: Ze(t, (r + (u + d) / 2) / i * a, o, s)
 		};
 	}
 	return c;
 }
-function fr(e, t, n, r) {
+function Zn(e, t, n, r) {
 	let i = n * t, a = r * e.vScale, o = i + e.shear * a, s = Math.cos(e.angle), c = Math.sin(e.angle);
 	return {
 		x: e.x + s * o - c * a,
 		y: e.y + c * o + s * a
 	};
 }
-function pr(e, t, n, r, i, a, o, s, c, l, u) {
+function Qn(e, t, n, r, i, a, o, s, c, l, u) {
 	let d = 0;
 	for (let f of e) {
 		let e = (f.s0 + f.s1) / 2;
 		for (let p of [f.s0, f.s1]) {
-			let m = Ve(t, (n + p) / r * i, a, o);
+			let m = Ze(t, (n + p) / r * i, a, o);
 			for (let t of [l, u]) {
-				let n = fr(m, s, 0, t), r = fr(f.g, s, p - e, t), i = Math.hypot(r.x - n.x, r.y - n.y) * c;
+				let n = Zn(m, s, 0, t), r = Zn(f.g, s, p - e, t), i = Math.hypot(r.x - n.x, r.y - n.y) * c;
 				i > d && (d = i);
 			}
 		}
 	}
 	return d;
 }
-function mr(e, t, n, r, i, a, o, s, c, l, u) {
-	let d = i, f = a, p = Math.max(1, o), m = Math.max(1, s), h = Le(n, r, p, m);
+function $n(e, t, n, r, i, a, o, s, c, l, u) {
+	let d = i, f = a, p = Math.max(1, o), m = Math.max(1, s), h = qe(n, r, p, m);
 	if (!h) return;
-	let g = t.defaultBold ?? !1, _ = t.defaultItalic ?? !1, v = (t.defaultFontSize ?? 18) * Y * c, y = [];
+	let g = t.defaultBold ?? !1, _ = t.defaultItalic ?? !1, v = (t.defaultFontSize ?? 18) * J * c, y = [];
 	for (let n of t.paragraphs) {
-		let t = Xn(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * Y * c, n.defColor ? Z(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
+		let t = Fn(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * J * c, n.defColor ? X(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
 		for (let e of t) y.push(e);
 	}
 	if (y.length === 0) return;
@@ -4275,10 +4047,10 @@ function mr(e, t, n, r, i, a, o, s, c, l, u) {
 			}
 			e.font = t.font;
 			let n = t.letterSpacingPx ?? 0, r = e.measureText(t.text);
-			a += r.width + n * qn(t.text), o = Math.max(o, t.sizePx), r.actualBoundingBoxAscent > 0 && (s = Math.max(s, r.actualBoundingBoxAscent)), r.actualBoundingBoxDescent > 0 && (c = Math.max(c, r.actualBoundingBoxDescent));
+			a += r.width + n * Mn(t.text), o = Math.max(o, t.sizePx), r.actualBoundingBoxAscent > 0 && (s = Math.max(s, r.actualBoundingBoxAscent)), r.actualBoundingBoxDescent > 0 && (c = Math.max(c, r.actualBoundingBoxDescent));
 		}
 		if (a <= 0) continue;
-		let l = s + c > 0 ? s + c : o, u = h.singleEdge ? .8 : l > 0 ? s / l : .8, g = h.singleEdge ? 1 : p / a, _ = h.singleEdge ? m : l / (i - r), v = Be(h, a), b = 0;
+		let l = s + c > 0 ? s + c : o, u = h.singleEdge ? .8 : l > 0 ? s / l : .8, g = h.singleEdge ? 1 : p / a, _ = h.singleEdge ? m : l / (i - r), v = Xe(h, a), b = 0;
 		for (let t of n.segments) {
 			if (t.math) {
 				b += t.math.width;
@@ -4289,17 +4061,17 @@ function mr(e, t, n, r, i, a, o, s, c, l, u) {
 			for (let s of o) {
 				let o = e.measureText(s).width + n, c = r + u * (i - r);
 				if (!h.singleEdge && o > 0) {
-					cr(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
+					qn(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
 					continue;
 				}
-				let l = Ve(h, (b + o / 2) / a * v, _, c);
+				let l = Ze(h, (b + o / 2) / a * v, _, c);
 				e.save(), e.translate(d + l.x, f + l.y), e.rotate(l.angle), l.shear !== 0 && e.transform(1, 0, l.shear, 1, 0, 0), (g !== 1 || l.vScale !== 1) && e.scale(g, l.vScale), e.fillText(s, -o / 2 + n / 2, 0), e.restore(), b += o;
 			}
 		}
 	}
 	e.restore();
 }
-function hr(e, t, n, r, i, a, o) {
+function er(e, t, n, r, i, a, o) {
 	let s = Math.min(r, i);
 	switch (e) {
 		case "rightarrow":
@@ -4329,17 +4101,17 @@ function hr(e, t, n, r, i, a, o) {
 		default: return null;
 	}
 }
-function gr(e, t) {
-	return e.defaultTextColor ? Z(e.defaultTextColor) : t.smartArtFallbackTextColor != null && _n(e) ? t.smartArtFallbackTextColor : null;
+function tr(e, t) {
+	return e.defaultTextColor ? X(e.defaultTextColor) : t.smartArtFallbackTextColor != null && nn(e) ? t.smartArtFallbackTextColor : null;
 }
-function _r(e, t, n) {
+function nr(e, t, n) {
 	return {
 		outerRotation: e,
 		localFlipH: t,
 		localFlipV: n
 	};
 }
-function vr(e, t, n, r, i) {
+function rr(e, t, n, r, i) {
 	let a = [
 		{
 			x: t,
@@ -4368,7 +4140,7 @@ function vr(e, t, n, r, i) {
 		h: l - s
 	};
 }
-var yr = {
+var ir = {
 	tl: [0, 0],
 	t: [.5, 0],
 	tr: [1, 0],
@@ -4379,15 +4151,15 @@ var yr = {
 	b: [.5, 1],
 	br: [1, 1]
 };
-function br(e, t, n) {
+function ar(e, t, n) {
 	return [e.a * t + e.c * n + e.e, e.b * t + e.d * n + e.f];
 }
-function xr(e, t, n, r, i, a) {
-	let [o, s] = yr[a ?? "b"];
-	return br(e, t + o * r, n + s * i);
+function or(e, t, n, r, i, a) {
+	let [o, s] = ir[a ?? "b"];
+	return ar(e, t + o * r, n + s * i);
 }
-function Sr(e, t, n, r, i, a, o, s) {
-	let c = st(e, i, a).corners, l = (o > 0 ? vt(c, o / i, o / a) ?? c : c).map((e) => br(t, n + e.x, r + e.y)), u = l.map(([e]) => e), d = l.map(([, e]) => e), f = Math.min(...u), p = Math.min(...d), m = Math.max(...u), h = Math.max(...d), [g, _] = yr[s ?? "b"], v = yt(c, g, _);
+function sr(e, t, n, r, i, a, o, s) {
+	let c = st(e, i, a).corners, l = (o > 0 ? Pe(c, o / i, o / a) ?? c : c).map((e) => ar(t, n + e.x, r + e.y)), u = l.map(([e]) => e), d = l.map(([, e]) => e), f = Math.min(...u), p = Math.min(...d), m = Math.max(...u), h = Math.max(...d), [g, _] = ir[s ?? "b"], v = je(c, g, _);
 	return {
 		bbox: {
 			x: f,
@@ -4395,22 +4167,22 @@ function Sr(e, t, n, r, i, a, o, s) {
 			w: m - f,
 			h: h - p
 		},
-		anchor: v ? br(t, n + v.x, r + v.y) : xr(t, n, r, i, a, s)
+		anchor: v ? ar(t, n + v.x, r + v.y) : or(t, n, r, i, a, s)
 	};
 }
-function Cr(t, n, r, i) {
-	let a = Math.floor(r.x) - 1, o = Math.floor(r.y) - 1, s = Math.max(1, Math.ceil(r.x + r.w) - a + 1), c = Math.max(1, Math.ceil(r.y + r.h) - o + 1);
-	if (i && (a + s <= 0 || o + c <= 0 || a >= i.w || o >= i.h) || ce(s, c).clamped) return t;
-	let l = null;
+function cr(e, t, n, r) {
+	let i = Math.floor(n.x) - 1, a = Math.floor(n.y) - 1, o = Math.max(1, Math.ceil(n.x + n.w) - i + 1), s = Math.max(1, Math.ceil(n.y + n.h) - a + 1);
+	if (r && (i + o <= 0 || a + s <= 0 || i >= r.w || a >= r.h) || Ae(o, s).clamped) return e;
+	let c = null;
 	try {
-		l = e(s, c);
+		c = ye(o, s);
 	} catch {
-		return t;
+		return e;
 	}
-	let u = l?.getContext("2d");
-	if (!l || !u) return t;
-	u.setTransform(n.a, n.b, n.c, n.d, n.e - a, n.f - o), t(u);
-	let d = {
+	let l = c?.getContext("2d");
+	if (!c || !l) return e;
+	l.setTransform(t.a, t.b, t.c, t.d, t.e - i, t.f - a), e(l);
+	let u = {
 		a: 1,
 		b: 0,
 		c: 0,
@@ -4419,10 +4191,10 @@ function Cr(t, n, r, i) {
 		f: 0
 	};
 	return (e) => {
-		e.save(), e.setTransform(d), e.drawImage(l, a, o), e.restore();
+		e.save(), e.setTransform(u), e.drawImage(c, i, a), e.restore();
 	};
 }
-function wr(e, t, n, r, i, a, o, s, c, l = !0, u = r) {
+function lr(e, t, n, r, i, a, o, s, c, l = !0, u = r) {
 	let d = e.canvas.width || 0, f = e.canvas.height || 0, p = d > 0 && f > 0, m = {
 		a: 1,
 		b: 0,
@@ -4437,40 +4209,40 @@ function wr(e, t, n, r, i, a, o, s, c, l = !0, u = r) {
 	}, v = (e) => {
 		h(e), u(e);
 	}, y = !1;
-	t.shadow && p ? (e.save(), e.setTransform(m), y = !qe(e, g, i, t.shadow, s, d, f, Math.atan2(c.b, c.a) * 180 / Math.PI, a), e.restore()) : t.shadow && (y = !0), t.reflection && p && (e.save(), e.setTransform(m), Xe(e, g, i, t.reflection, s, d, f), e.restore()), y ? tr(e, t.shadow ?? null, o) : t.glow && nr(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), Ye(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && rr(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), Je(e, v, i, t.innerShadow, s, d, f), e.restore());
+	t.shadow && p ? (e.save(), e.setTransform(m), y = !Ne(e, g, i, t.shadow, s, d, f, Math.atan2(c.b, c.a) * 180 / Math.PI, a), e.restore()) : t.shadow && (y = !0), t.reflection && p && (e.save(), e.setTransform(m), Oe(e, g, i, t.reflection, s, d, f), e.restore()), y ? Bn(e, t.shadow ?? null, o) : t.glow && Vn(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), ke(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && Hn(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), Me(e, v, i, t.innerShadow, s, d, f), e.restore());
 }
-function Tr(e, t, n, r = "#000000", i, a = {
+function ur(e, t, n, r = "#000000", i, a = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
-}, o, s) {
-	let c = X(t.x, n), d = X(t.y, n), f = X(t.width, n), p = X(t.height, n), m = o && t.id !== void 0 ? (e) => o({
+}, s, c) {
+	let u = Y(t.x, n), f = Y(t.y, n), p = Y(t.width, n), m = Y(t.height, n), h = s && t.id !== void 0 ? (e) => s({
 		...e,
 		shapeId: t.id
-	}) : o;
-	if (p === 0 && t.textBody?.verticalAnchor === "b") {
-		if (t.stroke && (e.save(), Hr(e, t.stroke, n, {
-			x: c,
-			y: d,
-			w: f,
+	}) : s;
+	if (m === 0 && t.textBody?.verticalAnchor === "b") {
+		if (t.stroke && (e.save(), Dr(e, t.stroke, n, {
+			x: u,
+			y: f,
+			w: p,
 			h: 1
-		}, t.rotation), e.beginPath(), e.moveTo(c, d), e.lineTo(c + f, d), e.stroke(), e.restore()), t.textBody) {
-			let o = gr(t, a);
-			jr(e, t.textBody, c, d, f, p, n, o, t.rotation, t.flipH, t.flipV, r, i, a, m, !1, s);
+		}, t.rotation), e.beginPath(), e.moveTo(u, f), e.lineTo(u + p, f), e.stroke(), e.restore()), t.textBody) {
+			let o = tr(t, a);
+			gr(e, t.textBody, u, f, p, m, n, o, t.rotation, t.flipH, t.flipV, r, i, a, h, !1, c);
 		}
 		return;
 	}
-	let h = t.scene3d && ct(t.scene3d.camera) ? t.scene3d : null;
-	if (h && f > 0 && p > 0) {
-		let o = e.getTransform(), s = Math.abs(o.a * o.d - o.b * o.c), l = s > 0 ? Math.sqrt(s) : 1, u = Mr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, l), m = Nr(t.sp3d, h.camera, f, p, n, l), g = _r(t.rotation, t.flipH, t.flipV);
-		e.save(), g.outerRotation !== 0 && (e.translate(c + f / 2, d + p / 2), e.rotate(g.outerRotation * Math.PI / 180), e.translate(-(c + f / 2), -(d + p / 2)));
+	let g = t.scene3d && ct(t.scene3d.camera) ? t.scene3d : null;
+	if (g && p > 0 && m > 0) {
+		let o = e.getTransform(), s = Math.abs(o.a * o.d - o.b * o.c), c = s > 0 ? Math.sqrt(s) : 1, l = _r(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, c), d = vr(t.sp3d, g.camera, p, m, n, c), h = nr(t.rotation, t.flipH, t.flipV);
+		e.save(), h.outerRotation !== 0 && (e.translate(u + p / 2, f + m / 2), e.rotate(h.outerRotation * Math.PI / 180), e.translate(-(u + p / 2), -(f + m / 2)));
 		let _ = {
 			...t,
 			x: 0,
 			y: 0,
 			rotation: 0,
-			flipH: g.localFlipH,
-			flipV: g.localFlipV,
+			flipH: h.localFlipH,
+			flipV: h.localFlipV,
 			scene3d: void 0,
 			sp3d: void 0,
 			shadow: null,
@@ -4485,21 +4257,21 @@ function Tr(e, t, n, r = "#000000", i, a = {
 			..._,
 			fill: null,
 			stroke: null
-		}, b = (t.stroke ? t.stroke.width * n / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * n : 0) + (m ? Math.hypot(m.offsetX, m.offsetY) / l : 0) + 2, x = (e, t, o) => Pr(e, h.camera, c, d, f, p, (e) => {
-			Tr(e, t, n, r, i, a, void 0);
+		}, b = (t.stroke ? t.stroke.width * n / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * n : 0) + (d ? Math.hypot(d.offsetX, d.offsetY) / c : 0) + 2, x = (e, t, o) => yr(e, g.camera, u, f, p, m, (e) => {
+			ur(e, t, n, r, i, a, void 0);
 		}, o ? {
-			bevels: u,
-			extrusion: m ?? void 0,
+			bevels: l,
+			extrusion: d ?? void 0,
 			edgePadCss: b
 		} : {}), S = (e) => x(e, v, !0), C = (e) => !t.textBody || x(e, y, !1);
 		if (t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection) {
-			let r = e.getTransform(), i = Math.abs(r.a * r.d - r.b * r.c), a = i > 0 ? Math.sqrt(i) : 1, o = Sr(h.camera, r, c, d, f, p, b, t.shadow?.algn), s = !1, l = Cr((e) => {
+			let r = e.getTransform(), i = Math.abs(r.a * r.d - r.b * r.c), a = i > 0 ? Math.sqrt(i) : 1, o = sr(g.camera, r, u, f, p, m, b, t.shadow?.algn), s = !1, c = cr((e) => {
 				s = S(e) || s;
 			}, r, o.bbox, {
 				w: e.canvas.width || 0,
 				h: e.canvas.height || 0
 			});
-			if (wr(e, t, l, l, o.bbox, o.anchor, n, n * a, r, !!t.fill), s) {
+			if (lr(e, t, c, c, o.bbox, o.anchor, n, n * a, r, !!t.fill), s) {
 				C(e), e.restore();
 				return;
 			}
@@ -4509,10 +4281,10 @@ function Tr(e, t, n, r = "#000000", i, a = {
 		}
 		e.restore();
 	}
-	e.save(), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(c + f / 2, d + p / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(c + f / 2), -(d + p / 2)));
-	let g = t.geometry.toLowerCase(), _ = En(t.fill, e, c, d, f, p, t.rotation);
-	t.shadow || nr(e, t.glow ?? null, n);
-	let v = new Set([
+	e.save(), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(u + p / 2, f + m / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(u + p / 2), -(f + m / 2)));
+	let v = t.geometry.toLowerCase(), y = fn(t.fill, e, u, f, p, m, t.rotation);
+	t.shadow || Vn(e, t.glow ?? null, n);
+	let b = new Set([
 		"line",
 		"straightconnector1",
 		"bentconnector2",
@@ -4523,7 +4295,7 @@ function Tr(e, t, n, r = "#000000", i, a = {
 		"curvedconnector3",
 		"curvedconnector4",
 		"curvedconnector5"
-	]), y = new Set([
+	]), x = new Set([
 		"callout1",
 		"callout2",
 		"callout3",
@@ -4536,22 +4308,22 @@ function Tr(e, t, n, r = "#000000", i, a = {
 		"accentbordercallout1",
 		"accentbordercallout2",
 		"accentbordercallout3"
-	]), b = (e) => y.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), x = !t.custGeom && w(g), S = (r, i, a = {
-		x: c,
-		y: d,
-		w: f,
-		h: p
+	]), S = (e) => x.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), C = !t.custGeom && l(v), w = (r, i, a = {
+		x: u,
+		y: f,
+		w: p,
+		h: m
 	}) => {
-		let { x: o, y: s, w: u, h: m } = a, h = i ?? (r === e && o === c && s === d && u === f && m === p ? _ : En(t.fill, r, o, s, u, m, t.rotation)), v = i ? null : t.stroke ? () => {
-			Hr(r, t.stroke, n, {
+		let { x: o, y: s, w: c, h: l } = a, h = i ?? (r === e && o === u && s === f && c === p && l === m ? y : fn(t.fill, r, o, s, c, l, t.rotation)), g = i ? null : t.stroke ? () => {
+			Dr(r, t.stroke, n, {
 				x: o,
 				y: s,
-				w: u,
-				h: m
+				w: c,
+				h: l
 			}, t.rotation), r.stroke();
-		} : null, y = () => rr(r);
-		if (x && !i) {
-			l(r, g, o, s, u, m, [
+		} : null, _ = () => Hn(r);
+		if (C && !i) {
+			d(r, v, o, s, c, l, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4560,11 +4332,11 @@ function Tr(e, t, n, r = "#000000", i, a = {
 				t.adj6,
 				t.adj7,
 				t.adj8
-			], h, v, y, b(g) ? { skipTrailingStroke: !0 } : void 0);
+			], h, g, _, S(v) ? { skipTrailingStroke: !0 } : void 0);
 			return;
 		}
-		r.beginPath(), t.custGeom && t.custGeom.length > 0 ? Er(r, t.custGeom, o, s, u, m) : be(r, g, o, s, u, m, t.adj, t.adj2, t.adj3, t.adj4), h && g !== "arc" && (r.fillStyle = h, g === "donut" || g === "smileyface" || g === "frame" ? r.fill("evenodd") : r.fill(), i || y()), v && v();
-	}, T = e.getTransform(), E = Math.abs(T.a * T.d - T.b * T.c), D = E > 0 ? Math.sqrt(E) : 1, O = (t.shadow || t.reflection || t.softEdge || t.innerShadow ? x ? C(g, c, d, f, p, [
+		r.beginPath(), t.custGeom && t.custGeom.length > 0 ? dr(r, t.custGeom, o, s, c, l) : de(r, v, o, s, c, l, t.adj, t.adj2, t.adj3, t.adj4), h && v !== "arc" && (r.fillStyle = h, v === "donut" || v === "smileyface" || v === "frame" ? r.fill("evenodd") : r.fill(), i || _()), g && g();
+	}, T = e.getTransform(), E = Math.abs(T.a * T.d - T.b * T.c), D = E > 0 ? Math.sqrt(E) : 1, O = (t.shadow || t.reflection || t.softEdge || t.innerShadow ? C ? o(v, u, f, p, m, [
 		t.adj,
 		t.adj2,
 		t.adj3,
@@ -4573,20 +4345,20 @@ function Tr(e, t, n, r = "#000000", i, a = {
 		t.adj6,
 		t.adj7,
 		t.adj8
-	]) : t.custGeom && t.custGeom.length > 0 ? ve(t.custGeom, c, d, f, p) : null : null) ?? {
-		x: c,
-		y: d,
-		w: f,
-		h: p
-	}, k = t.stroke ? t.stroke.width * n / 2 : 0, A = t.stroke ? Math.max(t.stroke.headEnd ? xe(t.stroke.headEnd, t.stroke, n) : 0, t.stroke.tailEnd ? xe(t.stroke.tailEnd, t.stroke, n) : 0) : 0, j = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, M = Math.max(k, A, j), N = M > 0 ? {
+	]) : t.custGeom && t.custGeom.length > 0 ? le(t.custGeom, u, f, p, m) : null : null) ?? {
+		x: u,
+		y: f,
+		w: p,
+		h: m
+	}, k = t.stroke ? t.stroke.width * n / 2 : 0, A = t.stroke ? Math.max(t.stroke.headEnd ? fe(t.stroke.headEnd, t.stroke, n) : 0, t.stroke.tailEnd ? fe(t.stroke.tailEnd, t.stroke, n) : 0) : 0, j = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, M = Math.max(k, A, j), N = M > 0 ? {
 		x: O.x - M,
 		y: O.y - M,
 		w: O.w + M * 2,
 		h: O.h + M * 2
-	} : O, P = vr(T, N.x, N.y, N.w, N.h), F = n * D, I = h ? [] : Mr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, D), L = (t.stroke ? t.stroke.width * n / 2 : 0) + 2, R = (e) => {
-		let r = t.stroke?.fill ? En(t.stroke.fill, e, c, d, f, p, t.rotation) ?? void 0 : void 0;
-		if (t.stroke && (v.has(g) || y.has(g))) {
-			let i = u(g, c, d, f, p, [
+	} : O, P = rr(T, N.x, N.y, N.w, N.h), F = n * D, I = g ? [] : _r(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, D), L = (t.stroke ? t.stroke.width * n / 2 : 0) + 2, R = (e) => {
+		let r = t.stroke?.fill ? fn(t.stroke.fill, e, u, f, p, m, t.rotation) ?? void 0 : void 0;
+		if (t.stroke && (b.has(v) || x.has(v))) {
+			let i = _(v, u, f, p, m, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4597,69 +4369,69 @@ function Tr(e, t, n, r = "#000000", i, a = {
 				t.adj8
 			]);
 			if (!i) return;
-			let a = t.stroke.cmpd, o = g === "line" || g === "straightconnector1";
-			if (b(g) && i.vertices.length >= 2 && !(a && o)) {
+			let a = t.stroke.cmpd, o = v === "line" || v === "straightconnector1";
+			if (S(v) && i.vertices.length >= 2 && !(a && o)) {
 				let r = i.vertices.map((e) => ({
 					x: e.x,
 					y: e.y
 				}));
 				if (t.stroke.tailEnd) {
-					let e = _e(t.stroke.tailEnd, t.stroke, n);
-					r[r.length - 1] = me(r[r.length - 1], r[r.length - 2], e);
+					let e = ce(t.stroke.tailEnd, t.stroke, n);
+					r[r.length - 1] = ae(r[r.length - 1], r[r.length - 2], e);
 				}
 				if (t.stroke.headEnd) {
-					let e = _e(t.stroke.headEnd, t.stroke, n);
-					r[0] = me(r[0], r[1], e);
+					let e = ce(t.stroke.headEnd, t.stroke, n);
+					r[0] = ae(r[0], r[1], e);
 				}
-				Hr(e, t.stroke, n, {
-					x: c,
-					y: d,
-					w: f,
-					h: p
+				Dr(e, t.stroke, n, {
+					x: u,
+					y: f,
+					w: p,
+					h: m
 				}, t.rotation), e.beginPath(), e.moveTo(r[0].x, r[0].y);
 				for (let t = 1; t < r.length; t++) e.lineTo(r[t].x, r[t].y);
 				e.stroke();
 			}
-			a && o && Vr(e, i.start, i.end, t.stroke, a, n, t.rotation), t.stroke.tailEnd && ye(e, i.end.x, i.end.y, i.end.angle, t.stroke.tailEnd, t.stroke, n, r), t.stroke.headEnd && ye(e, i.start.x, i.start.y, i.start.angle, t.stroke.headEnd, t.stroke, n, r);
+			a && o && Er(e, i.start, i.end, t.stroke, a, n, t.rotation), t.stroke.tailEnd && ue(e, i.end.x, i.end.y, i.end.angle, t.stroke.tailEnd, t.stroke, n, r), t.stroke.headEnd && ue(e, i.start.x, i.start.y, i.start.angle, t.stroke.headEnd, t.stroke, n, r);
 			return;
 		}
 		if (!t.stroke || !t.custGeom || t.custGeom.length === 0 || (!t.stroke.headEnd || t.stroke.headEnd.type === "none") && (!t.stroke.tailEnd || t.stroke.tailEnd.type === "none")) return;
-		let { start: i, end: a } = Se(t.custGeom);
-		i && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && ye(e, c + i.x * f, d + i.y * p, Math.atan2(i.dy * p, i.dx * f), t.stroke.headEnd, t.stroke, n, r), a && t.stroke.tailEnd && t.stroke.tailEnd.type !== "none" && ye(e, c + a.x * f, d + a.y * p, Math.atan2(a.dy * p, a.dx * f), t.stroke.tailEnd, t.stroke, n, r);
+		let { start: i, end: a } = pe(t.custGeom);
+		i && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && ue(e, u + i.x * p, f + i.y * m, Math.atan2(i.dy * m, i.dx * p), t.stroke.headEnd, t.stroke, n, r), a && t.stroke.tailEnd && t.stroke.tailEnd.type !== "none" && ue(e, u + a.x * p, f + a.y * m, Math.atan2(a.dy * m, a.dx * p), t.stroke.tailEnd, t.stroke, n, r);
 	}, z = (e) => {
-		if (I.length > 0 && Fr(e, c, d, f, p, I, (e, t, n, r, i) => S(e, void 0, {
+		if (I.length > 0 && br(e, u, f, p, m, I, (e, t, n, r, i) => w(e, void 0, {
 			x: t,
 			y: n,
 			w: r,
 			h: i
 		}), void 0, L)) {
-			R(e), rr(e);
+			R(e), Hn(e);
 			return;
 		}
-		S(e), R(e);
+		w(e), R(e);
 	};
-	if (wr(e, t, z, z, P, xr(T, c, d, f, p, t.shadow?.algn), n, F, T, !!_, (e) => S(e, "#000")), t.textBody) {
-		let o = gr(t, a);
+	if (lr(e, t, z, z, P, or(T, u, f, p, m, t.shadow?.algn), n, F, T, !!y, (e) => w(e, "#000")), t.textBody) {
+		let o = tr(t, a);
 		if (e.save(), t.flipH || t.flipV) {
-			let n = c + f / 2, r = d + p / 2;
+			let n = u + p / 2, r = f + m / 2;
 			e.translate(n, r), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-n, -r);
 		}
-		let l = c, u = d, h = f, _ = p;
-		if (t.textRect) l = X(t.textRect.x, n), u = X(t.textRect.y, n), h = X(t.textRect.width, n), _ = X(t.textRect.height, n);
-		else if (g === "ellipse") {
-			let e = f * (1 - 1 / Math.SQRT2) / 2, t = p * (1 - 1 / Math.SQRT2) / 2;
-			l = c + e, u = d + t, h = f / Math.SQRT2, _ = p / Math.SQRT2;
+		let s = u, l = f, d = p, g = m;
+		if (t.textRect) s = Y(t.textRect.x, n), l = Y(t.textRect.y, n), d = Y(t.textRect.width, n), g = Y(t.textRect.height, n);
+		else if (v === "ellipse") {
+			let e = p * (1 - 1 / Math.SQRT2) / 2, t = m * (1 - 1 / Math.SQRT2) / 2;
+			s = u + e, l = f + t, d = p / Math.SQRT2, g = m / Math.SQRT2;
 		} else {
-			let e = hr(g, c, d, f, p, t.adj, t.adj2);
-			e && (l = e.tx, u = e.ty, h = e.tw, _ = e.th);
+			let e = er(v, u, f, p, m, t.adj, t.adj2);
+			e && (s = e.tx, l = e.ty, d = e.tw, g = e.th);
 		}
-		jr(e, t.textBody, l, u, h, _, n, o, t.rotation, !1, !1, r, i, a, m, !1, s), e.restore();
+		gr(e, t.textBody, s, l, d, g, n, o, t.rotation, !1, !1, r, i, a, h, !1, c), e.restore();
 	}
 	e.restore();
 }
-var Er = he;
-function Dr(e, t) {
-	let n = `${e}`, r = e >= 1 && e <= 26 ? String.fromCharCode(96 + e) : n, i = e >= 1 && e <= 26 ? String.fromCharCode(64 + e) : n, a = Or(e).toLowerCase(), o = Or(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
+var dr = oe;
+function fr(e, t) {
+	let n = `${e}`, r = e >= 1 && e <= 26 ? String.fromCharCode(96 + e) : n, i = e >= 1 && e <= 26 ? String.fromCharCode(64 + e) : n, a = pr(e).toLowerCase(), o = pr(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
 	switch (t) {
 		case "arabicPlain": return n;
 		case "arabicPeriod": return `${n}.`;
@@ -4686,7 +4458,7 @@ function Dr(e, t) {
 		default: return `${n}.`;
 	}
 }
-function Or(e) {
+function pr(e) {
 	let t = [
 		1e3,
 		900,
@@ -4719,148 +4491,148 @@ function Or(e) {
 	for (let i = 0; i < t.length; i++) for (; e >= t[i];) r += n[i], e -= t[i];
 	return r;
 }
-function kr(e) {
+function mr(e) {
 	for (let t of e.runs) if (t.type === "text" && t.text !== "" || t.type === "math") return !0;
 	return !1;
 }
-function Ar(e, t) {
-	let n = kr(e);
-	if (e.bullet.type === "char") return t.clear(), n ? ge(e.bullet.char, e.bullet.fontFamily ?? null) : "";
+function hr(e, t) {
+	let n = mr(e);
+	if (e.bullet.type === "char") return t.clear(), n ? se(e.bullet.char, e.bullet.fontFamily ?? null) : "";
 	if (e.bullet.type === "autoNum") {
 		if (!n) return "";
 		let r = e.lvl;
-		return t.has(r) ? t.set(r, t.get(r) + 1) : t.set(r, e.bullet.startAt ?? 1), Dr(t.get(r), e.bullet.numType);
+		return t.has(r) ? t.set(r, t.get(r) + 1) : t.set(r, e.bullet.startAt ?? 1), fr(t.get(r), e.bullet.numType);
 	}
 	return t.clear(), "";
 }
-function jr(e, t, n, r, i, a, o, s = null, l = 0, u = !1, d = !1, f = "#000000", p, m = {
+function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000", p, m = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
-}, h, g = !1, _, v = !1) {
-	let y = t.vert === "vert" || t.vert === "eaVert", b = t.vert === "vert270";
-	if (y || b) {
-		let c = n + i / 2, u = r + a / 2, d = y ? 90 : -90, v = h ? (e) => h({
+}, h, g = !1, _, v = !1, y = g) {
+	let b = n.vert === "vert" || n.vert === "eaVert", x = n.vert === "vert270";
+	if (b || x) {
+		let t = r + a / 2, u = i + o / 2, d = b ? 90 : -90, v = h ? (e) => h({
 			...e,
-			inShapeX: e.inShapeX - a / 2 + i / 2,
-			inShapeY: e.inShapeY - i / 2 + a / 2,
-			shapeX: n,
-			shapeY: r,
-			shapeW: i,
-			shapeH: a,
+			inShapeX: e.inShapeX - o / 2 + a / 2,
+			inShapeY: e.inShapeY - a / 2 + o / 2,
+			shapeX: r,
+			shapeY: i,
+			shapeW: a,
+			shapeH: o,
 			rotation: l,
 			textBodyRotation: d
 		}) : void 0;
-		if (g) return i;
-		e.save(), e.translate(c, u), e.rotate(b ? -Math.PI / 2 : Math.PI / 2), jr(e, {
-			...t,
+		if (g) return a;
+		e.save(), e.translate(t, u), e.rotate(x ? -Math.PI / 2 : Math.PI / 2), gr(e, {
+			...n,
 			vert: "horz"
-		}, -a / 2, -i / 2, a, i, o, s, 0, !1, !1, f, p, m, v, !1, _, t.vert === "eaVert"), e.restore();
+		}, -o / 2, -a / 2, o, a, s, c, 0, !1, !1, f, p, m, v, !1, _, n.vert === "eaVert"), e.restore();
 		return;
 	}
-	let x = t.textWarp;
-	if (!g && x && Me(x.preset)) {
-		mr(e, t, x.preset, x.adj ?? [], n, r, i, a, o, s ?? f, m);
+	let S = n.textWarp;
+	if (!g && S && He(S.preset)) {
+		$n(e, n, S.preset, S.adj ?? [], r, i, a, o, s, c ?? f, m);
 		return;
 	}
-	let S = X(t.lIns, o), C = X(t.rIns, o), w = X(t.tIns, o), T = X(t.bIns, o), E = t.wrap !== "none", D = t.autoFit === "sp" ? E && Gn(e, t, i, S, C, o, m) : E, O = Math.max(1, t.numCol ?? 1), k = X(t.spcCol ?? 0, o), A = t.defaultBold ?? !1, j = t.defaultItalic ?? !1, M = s ?? f, N = (r) => {
-		let a = (t.defaultFontSize ?? 18) * Y * o * r, s = [], c = 0, l = /* @__PURE__ */ new Map();
-		for (let u = 0; u < t.paragraphs.length; u++) {
-			let d = t.paragraphs[u], f = X(d.marL, o), h = X(d.marR, o), g = X(d.indent, o), _ = d.defFontSize == null ? a : d.defFontSize * Y * o * r, v = d.defColor ? Z(d.defColor) : M, y = Un(d), b = (() => {
+	let C = Y(n.lIns, s), w = Y(n.rIns, s), T = Y(n.tIns, s), E = Y(n.bIns, s), D = n.wrap !== "none", O = n.autoFit === "sp" ? D && An(e, n, a, C, w, s, m) : D, k = Math.max(1, n.numCol ?? 1), A = Y(n.spcCol ?? 0, s), j = n.defaultBold ?? !1, M = n.defaultItalic ?? !1, N = c ?? f, P = (t) => {
+		let i = (n.defaultFontSize ?? 18) * J * s * t, o = [], c = 0, l = /* @__PURE__ */ new Map();
+		for (let u = 0; u < n.paragraphs.length; u++) {
+			let d = n.paragraphs[u], f = Y(d.marL, s), h = Y(d.marR, s), _ = Y(d.indent, s), v = d.defFontSize == null ? i : d.defFontSize * J * s * t, b = d.defColor ? X(d.defColor) : N, x = On(d), S = (() => {
 				for (let e of d.runs) if (e.type === "text" && e.fontSize != null) return e.fontSize;
 				return null;
-			})(), x = b == null ? _ : b * Y * o * r, w = (() => {
+			})(), T = S == null ? v : S * J * s * t, E = (() => {
 				for (let e of d.runs) if (e.type === "text" && e.color) return e.color;
 				return null;
-			})(), T = w ? Z(w) : v, E = (() => {
+			})(), D = E ? X(E) : b, P = (() => {
 				for (let e of d.runs) if (e.type === "text" && e.fontFamily) return e.fontFamily;
 				return d.defFontFamily ?? null;
-			})(), N = "", P = Hn(!1, !1, x, "sans-serif", m), F = T, I = null;
-			N = Ar(d, l);
-			let L = De(d.bullet);
-			if (L.type === "char") {
-				let e = L;
-				P = Hn(!1, !1, e.sizePts == null ? e.sizePct == null ? x : x * (e.sizePct / 100) : e.sizePts * Y * o * r, N === e.char ? jn(e.fontFamily ?? null, m) : "sans-serif", m), F = e.color ? Z(e.color) : T;
-			} else if (L.type === "autoNum") {
-				let e = L;
-				P = Hn(!1, !1, e.sizePts == null ? e.sizePct == null ? x : x * (e.sizePct / 100) : e.sizePts * Y * o * r, jn(e.fontFamily ?? E, m), m), F = L.color ? Z(L.color) : T;
-			} else if (L.type === "blip") {
-				let e = L, t = e.sizePts == null ? e.sizePct == null ? x : x * (e.sizePct / 100) : e.sizePts * Y * o * r;
-				I = {
+			})(), F = "", I = Z(!1, !1, T, "sans-serif", m), L = D, R = null;
+			F = hr(d, l);
+			let B = Le(d.bullet);
+			if (B.type === "char") {
+				let e = B;
+				I = Z(!1, !1, e.sizePts == null ? e.sizePct == null ? T : T * (e.sizePct / 100) : e.sizePts * J * s * t, F === e.char ? _n(e.fontFamily ?? null, m) : "sans-serif", m), L = e.color ? X(e.color) : D;
+			} else if (B.type === "autoNum") {
+				let e = B;
+				I = Z(!1, !1, e.sizePts == null ? e.sizePct == null ? T : T * (e.sizePct / 100) : e.sizePts * J * s * t, _n(e.fontFamily ?? P, m), m), L = B.color ? X(B.color) : D;
+			} else if (B.type === "blip") {
+				let e = B, n = e.sizePts == null ? e.sizePct == null ? T : T * (e.sizePct / 100) : e.sizePts * J * s * t;
+				R = {
 					imagePath: e.imagePath,
 					mimeType: e.mimeType,
-					sizePx: t
+					sizePx: n
 				};
 			}
-			let R = O > 1 ? (i - S - C - (O - 1) * k) / O : i - S - C, z = n + S + f, B = n + S + f + g, V = R - f - h, H = Xn(e, d, D ? V : Infinity, _, v, o, f, A, j, r, p, m, Wn(y, g)), U = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * Y * o * r, W = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * Y * o * r;
-			for (let n = 0; n < H.length; n++) {
-				let r = H[n], i = n === 0, a = n === H.length - 1, l = 0, f = 0;
+			let V = k > 1 ? (a - C - w - (k - 1) * A) / k : a - C - w, H = r + C + f, U = r + C + f + _, W = V - f - h, ee = Fn(e, d, O ? W : Infinity, v, b, s, f, j, M, t, p, m, kn(x, _)), G = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * J * s * t, K = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * J * s * t;
+			for (let t = 0; t < ee.length; t++) {
+				let r = ee[t], i = t === 0, a = t === ee.length - 1, l = 0, f = 0;
 				for (let e of r.segments) {
 					let t = e.math ? Math.max(e.sizePx, (e.math.ascent + e.math.descent) / 1.2) : e.sizePx;
 					if (t > l && (l = t), !e.math) {
-						let t = K(e.fontFamily, e.sizePx);
+						let t = z(e.fontFamily, e.sizePx);
 						t > f && (f = t);
 					}
 				}
-				if (l === 0 && (l = _), i && N) {
-					e.font = P;
+				if (l === 0 && (l = v), i && F) {
+					e.font = I;
 					let t = e.measureText("M"), n = t.actualBoundingBoxAscent + t.actualBoundingBoxDescent;
 					n > l && (l = n);
 				}
-				i && I && I.sizePx > l && (l = I.sizePx);
+				i && R && R.sizePx > l && (l = R.sizePx);
 				let p = l * 1.2, m = Math.max(p, f), h;
-				h = d.spaceLine ? d.spaceLine.type === "pct" ? p * (d.spaceLine.val / 1e5) : d.spaceLine.val * Y * o : m, t.autoFit === "norm" && t.lnSpcReduction != null && d.spaceLine?.type !== "pts" && (h *= 1 - t.lnSpcReduction);
-				let v = h + (a ? W : 0), b = i && u > 0 ? U : 0, x = i ? Wn(y, g) : 0, S = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), C = i && S ? I : null;
-				s.push({
+				h = d.spaceLine ? d.spaceLine.type === "pct" ? (g ? l : p) * (d.spaceLine.val / 1e5) : d.spaceLine.val * J * s : g ? y ? p : l : m, n.autoFit === "norm" && n.lnSpcReduction != null && d.spaceLine?.type !== "pts" && (h *= 1 - n.lnSpcReduction);
+				let b = h + (a ? K : 0), S = i && u > 0 ? G : 0, C = i ? kn(x, _) : 0, w = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), T = i && w ? R : null;
+				o.push({
 					line: r,
-					linePx: v,
+					linePx: b,
 					lineHeight: h,
-					topGapPx: b,
-					textXOffset: x,
-					bulletLabel: i ? N : "",
-					bulletFont: P,
-					bulletColor: F,
-					bulletX: B,
-					bulletImage: C,
-					textX: z,
-					textMaxW: V,
+					topGapPx: S,
+					textXOffset: C,
+					bulletLabel: i ? F : "",
+					bulletFont: I,
+					bulletColor: L,
+					bulletX: U,
+					bulletImage: T,
+					textX: H,
+					textMaxW: W,
 					alignment: d.alignment,
 					isLastLine: a,
 					para: d
-				}), c += v + b;
+				}), c += b + S;
 			}
 		}
 		return {
-			allLines: s,
+			allLines: o,
 			totalHeight: c
 		};
-	}, { allLines: P, totalHeight: F } = N(1);
-	if (t.autoFit === "norm") if (t.fontScale != null && t.fontScale > 0) t.fontScale < 1 && ({allLines: P, totalHeight: F} = N(t.fontScale));
+	}, { allLines: F, totalHeight: I } = P(1);
+	if (n.autoFit === "norm") if (n.fontScale != null && n.fontScale > 0) n.fontScale < 1 && ({allLines: F, totalHeight: I} = P(n.fontScale));
 	else {
-		let e = a - w - T;
-		if (F > e && e > 0) {
+		let e = o - T - E;
+		if (I > e && e > 0) {
 			let t = .1, n = 1;
 			for (let r = 0; r < 6; r++) {
 				let r = (t + n) / 2;
-				N(r).totalHeight <= e ? t = r : n = r;
+				P(r).totalHeight <= e ? t = r : n = r;
 			}
-			({allLines: P, totalHeight: F} = N(t));
+			({allLines: F, totalHeight: I} = P(t));
 		}
 	}
-	if (g) return w + F + T;
-	let I = t.verticalAnchor ?? "t", L = r, R;
-	a === 0 && I === "b" ? (R = w + F + T, L = r - R) : R = t.autoFit === "sp" ? Math.max(a, w + F + T) : a;
-	let z, B = Math.max(0, R - w - T);
-	z = I === "ctr" ? L + w + (B - F) / 2 : I === "b" ? L + R - T - F : L + w, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
-	let V = z, H = O > 1 ? (i - S - C - (O - 1) * k) / O + k : 0, U = Math.max(0, R - w - T), W = P[P.length - 1], G = W ? Math.max(0, W.linePx - W.lineHeight) : 0, q = F - G, ee = a === 0 || q <= U + .5, te = O > 1 && !ee ? Math.ceil(P.length / O) : P.length, ne = 0, re = 0;
-	for (let s of P) {
-		let { line: u, linePx: d, lineHeight: f, topGapPx: p, textXOffset: g, bulletLabel: y, bulletFont: b, bulletColor: x, bulletImage: S, alignment: C, isLastLine: w } = s;
-		O > 1 && ne < O - 1 && re >= te && (ne++, re = 0, z = V), z += p, re++;
-		let T = (t.rtlCol ? O - 1 - ne : ne) * H, E = s.textX + T, D = s.bulletX + T, k = s.textMaxW, A = s.para.rtl === !0, j = A || sn(u.segments), M = u.segments.some((e) => e.isTab);
+	if (g) return T + I + E;
+	let L = n.verticalAnchor ?? "t", R = i, B;
+	o === 0 && L === "b" ? (B = T + I + E, R = i - B) : B = n.autoFit === "sp" ? Math.max(o, T + I + E) : o;
+	let H, U = Math.max(0, B - T - E);
+	H = L === "ctr" ? R + T + (U - I) / 2 : L === "b" ? R + B - E - I : R + T, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
+	let W = H, ee = k > 1 ? (a - C - w - (k - 1) * A) / k + A : 0, G = Math.max(0, B - T - E), K = F[F.length - 1], q = K ? Math.max(0, K.linePx - K.lineHeight) : 0, te = I - q, ne = o === 0 || te <= G + .5, re = k > 1 && !ne ? Math.ceil(F.length / k) : F.length, ie = 0, ae = 0;
+	for (let c of F) {
+		let { line: u, linePx: d, lineHeight: f, topGapPx: p, textXOffset: g, bulletLabel: y, bulletFont: b, bulletColor: x, bulletImage: S, alignment: C, isLastLine: w } = c;
+		k > 1 && ie < k - 1 && ae >= re && (ie++, ae = 0, H = W), H += p, ae++;
+		let T = (n.rtlCol ? k - 1 - ie : ie) * ee, E = c.textX + T, D = c.bulletX + T, O = c.textMaxW, A = c.para.rtl === !0, j = A || Kt(u.segments), M = u.segments.some((e) => e.isTab);
 		if (M) {
-			let t = X(s.para.marL, o), n = X(s.para.marR, o), r = A ? n : t + g, i = k + t + n;
+			let t = Y(c.para.marL, s), n = Y(c.para.marR, s), r = A ? n : t + g, i = O + t + n;
 			e.font = u.segments.find((e) => e.isTab).font;
-			let a = e.measureText(" ").width, c = yn(u.segments.map((t) => {
+			let a = e.measureText(" ").width, o = an(u.segments.map((t) => {
 				if (t.isTab) return {
 					isTab: !0,
 					width: 0
@@ -4875,11 +4647,11 @@ function jr(e, t, n, r, i, a, o, s = null, l = 0, u = !1, d = !1, f = "#000000",
 					isTab: !1,
 					width: t.text ? (t.leadingLetterSpacingPx ?? 0) + Q(e, t.text, n) : 0
 				};
-			}), (s.para.tabStops ?? []).map((e) => ({
-				pos: X(e.pos, o),
+			}), (c.para.tabStops ?? []).map((e) => ({
+				pos: Y(e.pos, s),
 				algn: e.algn
-			})), r, i, a, X(s.para.defTabSz ?? 914400, o));
-			for (let e = 0; e < u.segments.length; e++) u.segments[e].isTab && (u.segments[e].tabWidthPx = c[e]);
+			})), r, i, a, Y(c.para.defTabSz ?? 914400, s));
+			for (let e = 0; e < u.segments.length; e++) u.segments[e].isTab && (u.segments[e].tabWidthPx = o[e]);
 		}
 		let N = 0, P = f * .8;
 		for (let t of u.segments) {
@@ -4895,10 +4667,10 @@ function jr(e, t, n, r, i, a, o, s = null, l = 0, u = !1, d = !1, f = "#000000",
 			let n = e.measureText(t.text || "M"), r = t.letterSpacingPx ?? 0;
 			N += t.leadingLetterSpacingPx ?? 0, N += t.text ? Q(e, t.text, r) : 0, n.actualBoundingBoxAscent > 0 && (P = Math.max(P, n.actualBoundingBoxAscent));
 		}
-		let F = z + P, I = E + k, L = 0, R = null;
+		let F = H + P, I = E + O, L = 0, R = null;
 		if (j && A) {
 			if (y) e.font = b, L = e.measureText(y).width;
-			else if (S && _ && (R = c(S.imagePath, _), R)) {
+			else if (S && _ && (R = t(S.imagePath, _), R)) {
 				let e = S.sizePx;
 				L = R.height > 0 ? e * (R.width / R.height) : e;
 			}
@@ -4908,50 +4680,50 @@ function jr(e, t, n, r, i, a, o, s = null, l = 0, u = !1, d = !1, f = "#000000",
 			e.direction = "rtl", e.fillText(y, I - L, F), e.direction = t;
 		} else e.fillText(y, D, F);
 		if (S && _) {
-			let t = c(S.imagePath, _);
-			if (t) {
-				let n = S.sizePx, r = t.height > 0 ? n * (t.width / t.height) : n, i = F - n;
-				j && A ? e.drawImage(t, I - r, i, r, n) : e.drawImage(t, D, i, r, n);
+			let n = t(S.imagePath, _);
+			if (n) {
+				let t = S.sizePx, r = n.height > 0 ? t * (n.width / n.height) : t, i = F - t;
+				j && A ? e.drawImage(n, I - r, i, r, t) : e.drawImage(n, D, i, r, t);
 			}
 		}
-		let B = E + g, U;
-		U = M ? A ? E + k - L - N : B : C === "ctr" ? B + (k - g - N) / 2 : C === "r" ? E + k - L - N : B;
-		let W = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, G = w || (u.endsWithBreak ?? !1), K = (W && !j && !M ? dn(u.segments, k - g, N, W, G) : null) ?? u.segments, q = j ? cn(u.segments, A) : null, ee = (e, t) => {
+		let z = E + g, B;
+		B = M ? A ? E + O - L - N : z : C === "ctr" ? z + (O - g - N) / 2 : C === "r" ? E + O - L - N : z;
+		let U = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, G = w || (u.endsWithBreak ?? !1), K = (U && !j && !M ? Xt(u.segments, O - g, N, U, G) : null) ?? u.segments, q = j ? qt(u.segments, A) : null, te = (e, t) => {
 			if (Math.abs(e - t) !== 1) return 0;
 			let n = u.segments[Math.min(e, t)], r = u.segments[Math.max(e, t)];
 			return n.isTab || n.math || r.isTab || r.math || n.sourceRunId == null || n.sourceRunId !== r.sourceRunId ? 0 : r.leadingLetterSpacingPx ?? 0;
-		}, ie = K.length;
-		for (let t = 0; t < ie; t++) {
-			let s = q ? q.order[t] : t, c = K[s], u = q ? q.rtl[s] : !1;
+		}, ne = K.length;
+		for (let t = 0; t < ne; t++) {
+			let n = q ? q.order[t] : t, c = K[n], u = q ? q.rtl[n] : !1;
 			if (j && (e.direction = u ? "rtl" : "ltr"), t > 0) {
 				let e = q ? q.order[t - 1] : t - 1;
-				U += ee(e, s);
+				B += te(e, n);
 			}
 			if (c.isTab) {
-				U += c.tabWidthPx ?? 0;
+				B += c.tabWidthPx ?? 0;
 				continue;
 			}
 			let d = c.jext ?? 0, p = c.splitBefore, g = c.perGap ?? 0, _ = p && p.length > 0 ? p.length * g : 0;
 			if (c.math) {
-				let t = Dn.get(c.math.nodes), n = c.math.width, r = c.math.ascent + c.math.descent;
+				let t = pn.get(c.math.nodes), n = c.math.width, r = c.math.ascent + c.math.descent;
 				if (t && n > 0 && r > 0) {
-					let i = F - c.math.ascent, a = On(t, c.color);
-					e.drawImage(a, U, i, n, r);
+					let i = F - c.math.ascent, a = mn(t, c.color);
+					e.drawImage(a, B, i, n, r);
 				}
-				U += n, U += d;
+				B += n, B += d;
 				continue;
 			}
 			e.font = c.font, e.fillStyle = c.color;
 			let y = F + (c.baseline ? -(c.baseline / 1e5) * c.sizePx : 0), b = c.letterSpacingPx ?? 0;
 			if (c.highlight && c.text) {
 				let t = Q(e, c.text, b) + _ + d;
-				Tn(e, U, y, t, c.sizePx, c.highlight, c.color);
+				dn(e, B, y, t, c.sizePx, c.highlight, c.color);
 			}
 			let x = c.shadow, S = (e, t, n, r) => {
 				let i = r === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e);
-				if (b !== 0 && qn(t) > 1) {
+				if (b !== 0 && Mn(t) > 1) {
 					let r = e, a = r.letterSpacing;
-					if (Yn(e)) {
+					if (Pn(e)) {
 						r.letterSpacing = `${b}px`, i(t, n, y);
 						try {
 							r.letterSpacing = a;
@@ -4964,88 +4736,88 @@ function jr(e, t, n, r, i, a, o, s = null, l = 0, u = !1, d = !1, f = "#000000",
 						}
 					}
 				} else i(t, n, y);
-			}, C = (t) => Q(e, t, b), w = p && p.length > 0 ? Qt([...c.text], p, g, C) : null, T = [...c.text], E = !!p && p.length === T.length - 1 && T.length > 1, D = (e, t) => {
+			}, C = (t) => Q(e, t, b), w = p && p.length > 0 ? Rt([...c.text], p, g, C) : null, T = [...c.text], E = !!p && p.length === T.length - 1 && T.length > 1, D = (e, t) => {
 				if (v) {
 					let n = E ? b + g : b;
-					wn(e, c.text, U, y, c.sizePx, n, t);
+					un(e, c.text, B, y, c.sizePx, n, t);
 					return;
 				}
 				if (E) {
 					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = b + g;
-					if (Yn(e)) {
+					if (Pn(e)) {
 						let t = e, i = t.letterSpacing;
-						t.letterSpacing = `${r}px`, n(c.text, U, y);
+						t.letterSpacing = `${r}px`, n(c.text, B, y);
 						try {
 							t.letterSpacing = i;
 						} catch {}
 					} else {
-						let t = U;
+						let t = B;
 						for (let i = 0; i < T.length; i++) {
 							let a = T[i];
 							n(a, t, y), i < T.length - 1 && (t += e.measureText(a).width + r);
 						}
 					}
-				} else if (w) for (let { text: n, dx: r } of w) S(e, n, U + r, t);
-				else S(e, c.text, U, t);
+				} else if (w) for (let { text: n, dx: r } of w) S(e, n, B + r, t);
+				else S(e, c.text, B, t);
 			}, O = c.reflection;
 			if (O && c.text) {
 				let t = e.canvas.width || 0, n = e.canvas.height || 0;
 				if (t > 0 && n > 0) {
 					e.font = c.font;
-					let r = e.measureText(c.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : c.sizePx * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : c.sizePx * .2, s = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, l = Number.isFinite(r.actualBoundingBoxRight) ? r.actualBoundingBoxRight : r.width, u = e.getTransform(), d = Math.abs(u.a * u.d - u.b * u.c), f = d > 0 ? Math.sqrt(d) : 1;
-					Vn(e, (e) => {
+					let r = e.measureText(c.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : c.sizePx * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : c.sizePx * .2, o = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, l = Number.isFinite(r.actualBoundingBoxRight) ? r.actualBoundingBoxRight : r.width, u = e.getTransform(), d = Math.abs(u.a * u.d - u.b * u.c), f = d > 0 ? Math.sqrt(d) : 1;
+					Dn(e, (e) => {
 						e.font = c.font, e.fillStyle = c.color, D(e, "fill");
 					}, {
-						x: (U - s) * f,
+						x: (B - o) * f,
 						y: (y - i) * f,
-						w: Math.max(1, s + l) * f,
+						w: Math.max(1, o + l) * f,
 						h: Math.max(1, i + a) * f
-					}, O, o * f, u, t, n), e.font = c.font, e.fillStyle = c.color;
+					}, O, s * f, u, t, n), e.font = c.font, e.fillStyle = c.color;
 				}
 			}
 			if (x) {
-				let t = x.dir * Math.PI / 180, n = X(x.dist, o);
-				e.save(), e.shadowColor = Z(x.color, x.alpha), e.shadowBlur = X(x.blur, o), e.shadowOffsetX = Math.cos(t) * n, e.shadowOffsetY = Math.sin(t) * n;
+				let t = x.dir * Math.PI / 180, n = Y(x.dist, s);
+				e.save(), e.shadowColor = X(x.color, x.alpha), e.shadowBlur = Y(x.blur, s), e.shadowOffsetX = Math.cos(t) * n, e.shadowOffsetY = Math.sin(t) * n;
 			}
 			D(e, "fill"), x && e.restore();
 			let k = c.outline;
-			k && k.width > 0 && (e.save(), e.lineWidth = Math.max(.5, X(k.width, o)), e.strokeStyle = k.color ? `#${k.color}` : c.color, e.lineJoin = "round", D(e, "stroke"), e.restore()), e.font = c.font;
+			k && k.width > 0 && (e.save(), e.lineWidth = Math.max(.5, Y(k.width, s)), e.strokeStyle = k.color ? `#${k.color}` : c.color, e.lineJoin = "round", D(e, "stroke"), e.restore()), e.font = c.font;
 			let A = Q(e, c.text, b) + _;
 			if (h && c.text && h({
 				text: c.text,
-				inShapeX: U - n,
-				inShapeY: z - r,
+				inShapeX: B - r,
+				inShapeY: H - i,
 				w: A + d,
 				h: f,
 				fontSize: c.sizePx,
 				font: c.font,
-				shapeX: n,
-				shapeY: r,
-				shapeW: i,
-				shapeH: a,
+				shapeX: r,
+				shapeY: i,
+				shapeW: a,
+				shapeH: o,
 				rotation: l,
 				hyperlink: c.hyperlink
-			}), c.underline && Xt(e, U, y, A + d, c.sizePx, c.underlineColor ?? c.color, c.underlineStyle, m.dpr), c.strikethrough) {
+			}), c.underline && It(e, B, y, A + d, c.sizePx, c.underlineColor ?? c.color, c.underlineStyle, m.dpr), c.strikethrough) {
 				let t = Math.max(1, c.sizePx * .05);
 				e.strokeStyle = c.color, e.lineWidth = t, e.setLineDash([]);
 				let n = y - c.sizePx * .32;
 				if (c.strikeDouble) {
 					let r = t * .9, i = n - r, a = n + r;
-					e.beginPath(), e.moveTo(U, i + J(i, t, m.dpr)), e.lineTo(U + A + d, i + J(i, t, m.dpr)), e.moveTo(U, a + J(a, t, m.dpr)), e.lineTo(U + A + d, a + J(a, t, m.dpr)), e.stroke();
+					e.beginPath(), e.moveTo(B, i + V(i, t, m.dpr)), e.lineTo(B + A + d, i + V(i, t, m.dpr)), e.moveTo(B, a + V(a, t, m.dpr)), e.lineTo(B + A + d, a + V(a, t, m.dpr)), e.stroke();
 				} else {
-					let r = n + J(n, t, m.dpr);
-					e.beginPath(), e.moveTo(U, r), e.lineTo(U + A + d, r), e.stroke();
+					let r = n + V(n, t, m.dpr);
+					e.beginPath(), e.moveTo(B, r), e.lineTo(B + A + d, r), e.stroke();
 				}
 			}
-			U += A, U += d;
+			B += A, B += d;
 		}
-		j && (e.direction = "ltr"), z += d;
+		j && (e.direction = "ltr"), H += d;
 	}
 	e.restore();
 }
-function Mr(e, t, n, r, i) {
+function _r(e, t, n, r, i) {
 	if (!e) return [];
-	let a = Rt(t?.rig ?? "threePt", t?.dir ?? "t", t?.rot), o = Wt(n), s = r * i, c = [];
+	let a = wt(t?.rig ?? "threePt", t?.dir ?? "t", t?.rot), o = At(n), s = r * i, c = [];
 	return e.bevelT && e.bevelT.w > 0 && e.bevelT.h > 0 && c.push({
 		widthPx: e.bevelT.w * s,
 		heightPx: e.bevelT.h * s,
@@ -5061,7 +4833,7 @@ function Mr(e, t, n, r, i) {
 		bottom: !0
 	}), c;
 }
-function Nr(e, t, n, r, i, a) {
+function vr(e, t, n, r, i, a) {
 	if (!e || !e.extrusionH || e.extrusionH <= 0) return null;
 	let o = e.extrusionH * i * a, s = lt(t, n * a, r * a, o);
 	if (Math.hypot(s.x, s.y) < .75) return null;
@@ -5084,66 +4856,66 @@ function Nr(e, t, n, r, i, a) {
 		rgb: c
 	};
 }
-function Pr(t, n, r, i, a, o, s, c = {}) {
-	if (a <= 0 || o <= 0) return !1;
-	let l = t.getTransform(), u = Math.abs(l.a * l.d - l.b * l.c), d = u > 0 ? Math.sqrt(u) : 1, f = Math.max(0, Math.ceil((c.edgePadCss ?? 0) * d)), p = st(n, a, o), m = p.corners;
-	if (f > 0) {
-		let e = f / d, t = vt(p.corners, e / a, e / o);
-		t ? m = t : f = 0;
+function yr(e, t, n, r, i, a, o, s = {}) {
+	if (i <= 0 || a <= 0) return !1;
+	let c = e.getTransform(), l = Math.abs(c.a * c.d - c.b * c.c), u = l > 0 ? Math.sqrt(l) : 1, d = Math.max(0, Math.ceil((s.edgePadCss ?? 0) * u)), f = st(t, i, a), p = f.corners;
+	if (d > 0) {
+		let e = d / u, t = Pe(f.corners, e / i, e / a);
+		t ? p = t : d = 0;
 	}
-	let h = f / d, g = Math.max(1, Math.ceil(a * d) + 2 * f), _ = Math.max(1, Math.ceil(o * d) + 2 * f), v = e(g, _);
+	let m = d / u, h = Math.max(1, Math.ceil(i * u) + 2 * d), g = Math.max(1, Math.ceil(a * u) + 2 * d), _ = ye(h, g);
+	if (!_) return !1;
+	let v = _.getContext("2d");
 	if (!v) return !1;
-	let y = v.getContext("2d");
-	if (!y) return !1;
-	y.save(), y.scale(d, d), y.translate(h, h), s(y, 0, 0, a, o), y.restore();
-	let b = Math.ceil(a * d), x = Math.ceil(o * d), S = (e) => ({
-		x: f - e,
-		y: f - e,
-		w: b + 2 * e,
-		h: x + 2 * e
+	v.save(), v.scale(u, u), v.translate(m, m), o(v, 0, 0, i, a), v.restore();
+	let y = Math.ceil(i * u), b = Math.ceil(a * u), x = (e) => ({
+		x: d - e,
+		y: d - e,
+		w: y + 2 * e,
+		h: b + 2 * e
 	});
-	if (c.extrusion) {
-		let e = Math.ceil(Math.hypot(c.extrusion.offsetX, c.extrusion.offsetY)) + 2;
-		Yt(y, c.extrusion, S(e));
+	if (s.extrusion) {
+		let e = Math.ceil(Math.hypot(s.extrusion.offsetX, s.extrusion.offsetY)) + 2;
+		Ft(v, s.extrusion, x(e));
 	}
-	if (c.bevels && c.bevels.length > 0) for (let e of c.bevels) Jt(y, e, S(Math.ceil(e.widthPx) + 2));
-	return c.paintEdges && (y.save(), y.scale(d, d), y.translate(h, h), c.paintEdges(y, 0, 0, a, o), y.restore()), gt(v, t, g, _, m.map((e) => ({
-		x: r + e.x,
-		y: i + e.y
+	if (s.bevels && s.bevels.length > 0) for (let e of s.bevels) Pt(v, e, x(Math.ceil(e.widthPx) + 2));
+	return s.paintEdges && (v.save(), v.scale(u, u), v.translate(m, m), s.paintEdges(v, 0, 0, i, a), v.restore()), De(_, e, h, g, p.map((e) => ({
+		x: n + e.x,
+		y: r + e.y
 	}))), !0;
 }
-function Fr(t, n, r, i, a, o, s, c, l = 0) {
-	if (i <= 0 || a <= 0 || o.length === 0) return !1;
-	let u = t.getTransform(), d = Math.abs(u.a * u.d - u.b * u.c), f = d > 0 ? Math.sqrt(d) : 1, p = Math.max(0, Math.ceil(l * f)), m = p / f, h = Math.max(1, Math.ceil(i * f) + 2 * p), g = Math.max(1, Math.ceil(a * f) + 2 * p), _ = e(h, g);
+function br(e, t, n, r, i, a, o, s, c = 0) {
+	if (r <= 0 || i <= 0 || a.length === 0) return !1;
+	let l = e.getTransform(), u = Math.abs(l.a * l.d - l.b * l.c), d = u > 0 ? Math.sqrt(u) : 1, f = Math.max(0, Math.ceil(c * d)), p = f / d, m = Math.max(1, Math.ceil(r * d) + 2 * f), h = Math.max(1, Math.ceil(i * d) + 2 * f), g = ye(m, h);
+	if (!g) return !1;
+	let _ = g.getContext("2d");
 	if (!_) return !1;
-	let v = _.getContext("2d");
-	if (!v) return !1;
-	v.save(), v.scale(f, f), v.translate(m, m), s(v, 0, 0, i, a), v.restore();
-	let y = Math.ceil(i * f), b = Math.ceil(a * f);
-	for (let e of o) {
+	_.save(), _.scale(d, d), _.translate(p, p), o(_, 0, 0, r, i), _.restore();
+	let v = Math.ceil(r * d), y = Math.ceil(i * d);
+	for (let e of a) {
 		let t = Math.ceil(e.widthPx) + 2;
-		Jt(v, e, {
-			x: p - t,
-			y: p - t,
-			w: y + 2 * t,
-			h: b + 2 * t
+		Pt(_, e, {
+			x: f - t,
+			y: f - t,
+			w: v + 2 * t,
+			h: y + 2 * t
 		});
 	}
-	return c && (v.save(), v.scale(f, f), v.translate(m, m), c(v, 0, 0, i, a), v.restore()), t.drawImage(_, n - m, r - m, h / f, g / f), !0;
+	return s && (_.save(), _.scale(d, d), _.translate(p, p), s(_, 0, 0, r, i), _.restore()), e.drawImage(g, t - p, n - p, m / d, h / d), !0;
 }
-var Ir = /* @__PURE__ */ new WeakMap();
-function Lr(e) {
-	let t = Ir.get(e);
+var xr = /* @__PURE__ */ new WeakMap();
+function Sr(e) {
+	let t = xr.get(e);
 	return t || (t = async (t, n) => {
 		let r = await e(t);
 		return r.type === n ? r : new Blob([r], { type: n });
-	}, Ir.set(e, t)), t;
+	}, xr.set(e, t)), t;
 }
-function Rr(e, t, n = Lr(t)) {
-	return v("base", e.posterPath, n, async () => {
+function Cr(e, t, n = Sr(t)) {
+	return g("base", e.posterPath, n, async () => {
 		let n = await t(e.posterPath), r = e.posterMimeType || n.type || "application/octet-stream";
 		return {
-			bitmap: await m(n.type === r ? n : new Blob([n], { type: r })),
+			bitmap: await we(n.type === r ? n : new Blob([n], { type: r })),
 			owned: !0
 		};
 	}).then((e) => {
@@ -5151,97 +4923,99 @@ function Rr(e, t, n = Lr(t)) {
 		return e;
 	});
 }
-async function zr(e, t, n, i, a) {
-	if (a) try {
-		let o = t.mimeType === "image/svg+xml", { widthPt: c, heightPt: l } = s(t.mimeType, t.srcRect, t.width / Y, t.height / Y), u;
-		if (A(t)) try {
-			u = await U(t.svgImagePath, a);
+async function wr(e, t, n, r, i) {
+	if (i) try {
+		let a = t.mimeType === "image/svg+xml", s = xe(t.mimeType, t.srcRect, t.width / J, t.height / J);
+		if (!s) return;
+		let { widthPt: c, heightPt: u } = s, d;
+		if (re(t)) try {
+			d = await q(t.svgImagePath, i);
 		} catch {
-			u = o ? await U(t.imagePath, a) : await Ee(t.imagePath, t.mimeType, t.duotone, a, {
+			d = a ? await q(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
 				widthPt: c,
-				heightPt: l
+				heightPt: u
 			});
 		}
-		else u = o ? await U(t.imagePath, a) : await Ee(t.imagePath, t.mimeType, t.duotone, a, {
+		else d = a ? await q(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
 			widthPt: c,
-			heightPt: l
+			heightPt: u
 		});
-		if (!u || i()) return;
+		if (!d || r()) return;
 		e.save(), t.alpha != null && (e.globalAlpha *= t.alpha);
-		let d = X(t.x, n), f = X(t.y, n), p = X(t.width, n), m = X(t.height, n);
-		(t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(d + p / 2, f + m / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(d + p / 2), -(f + m / 2)));
-		let h = ue(u, t.srcRect), g = (e, n, i, a, o) => {
-			t.custGeom && t.custGeom.length > 0 ? Er(e, t.custGeom, n, i, a, o) : t.prstGeom && r(e, t.prstGeom, n, i, a, o, t.prstAdjust ?? []) || e.rect(n, i, a, o);
-		}, _ = (e, t, n, r, i) => {
-			e.beginPath(), g(e, t, n, r, i);
-		}, v = (e, n, r, i, a) => {
-			(t.prstGeom || t.custGeom && t.custGeom.length > 0) && (_(e, n, r, i, a), e.clip());
-		}, y = (e, r, i, a, o) => {
-			t.stroke && (e.save(), Hr(e, t.stroke, n, {
+		let f = Y(t.x, n), m = Y(t.y, n), h = Y(t.width, n), g = Y(t.height, n);
+		(t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(f + h / 2, m + g / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(f + h / 2), -(m + g / 2)));
+		let _ = (e, n, r, i, a) => {
+			t.custGeom && t.custGeom.length > 0 ? dr(e, t.custGeom, n, r, i, a) : t.prstGeom && p(e, t.prstGeom, n, r, i, a, t.prstAdjust ?? []) || e.rect(n, r, i, a);
+		}, v = (e, t, n, r, i) => {
+			e.beginPath(), _(e, t, n, r, i);
+		}, y = (e, n, r, i, a) => {
+			(t.prstGeom || t.custGeom && t.custGeom.length > 0) && (v(e, n, r, i, a), e.clip());
+		}, b = (e, r, i, a, o) => {
+			t.stroke && (e.save(), Dr(e, t.stroke, n, {
 				x: r,
 				y: i,
 				w: a,
 				h: o
-			}, t.rotation), _(e, r, i, a, o), e.stroke(), e.restore());
-		}, b = (e, r, i, a, o) => {
+			}, t.rotation), v(e, r, i, a, o), e.stroke(), e.restore());
+		}, x = (e, r, i, a, o) => {
 			let s = t.sp3d;
 			if (s && (s.contourW ?? 0) > 0 && s.contourClr) {
 				let t = Math.max(.5, s.contourW * n);
 				e.save(), e.beginPath();
 				let c = t * 2 + Math.max(a, o);
-				e.rect(r - c, i - c, a + 2 * c, o + 2 * c), g(e, r, i, a, o), e.clip("evenodd"), e.beginPath(), _(e, r, i, a, o), e.strokeStyle = Z(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
+				e.rect(r - c, i - c, a + 2 * c, o + 2 * c), _(e, r, i, a, o), e.clip("evenodd"), e.beginPath(), v(e, r, i, a, o), e.strokeStyle = X(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
 			}
-		}, x = t.scene3d && ct(t.scene3d.camera) ? t.scene3d : null, S = (e, t, n, r, i) => {
-			e.save(), v(e, t, n, r, i), h ? e.drawImage(u, h.sx, h.sy, h.sw, h.sh, t, n, r, i) : e.drawImage(u, t, n, r, i), e.restore();
+		}, S = t.scene3d && ct(t.scene3d.camera) ? t.scene3d : null, C = (e, n, r, i, a) => {
+			e.save(), y(e, n, r, i, a), Ce(e, d, t.srcRect, n, r, i, a), e.restore();
+		}, w = (e, t, n, r, i) => {
+			C(e, t, n, r, i), b(e, t, n, r, i), x(e, t, n, r, i);
 		}, T = (e, t, n, r, i) => {
-			S(e, t, n, r, i), y(e, t, n, r, i), b(e, t, n, r, i);
-		}, E = (e, t, n, r, i) => {
-			S(e, t, n, r, i), y(e, t, n, r, i);
-		}, D = e.getTransform(), O = Math.abs(D.a * D.d - D.b * D.c), k = O > 0 ? Math.sqrt(O) : 1, j = Mr(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, k), M = x ? Nr(t.sp3d, x.camera, p, m, n, k) : null, N = t.stroke ? t.stroke.width * n / 2 : 0, P = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, F = M ? Math.hypot(M.offsetX, M.offsetY) / k : 0, I = N + P + F + 2, L = (e) => {
-			if (x) {
-				if (Pr(e, x.camera, d, f, p, m, E, {
-					bevels: j,
-					extrusion: M ?? void 0,
-					paintEdges: b,
-					edgePadCss: I
+			C(e, t, n, r, i), b(e, t, n, r, i);
+		}, E = e.getTransform(), D = Math.abs(E.a * E.d - E.b * E.c), O = D > 0 ? Math.sqrt(D) : 1, k = _r(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, O), A = S ? vr(t.sp3d, S.camera, h, g, n, O) : null, j = t.stroke ? t.stroke.width * n / 2 : 0, M = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, N = A ? Math.hypot(A.offsetX, A.offsetY) / O : 0, P = j + M + N + 2, F = (e) => {
+			if (S) {
+				if (yr(e, S.camera, f, m, h, g, T, {
+					bevels: k,
+					extrusion: A ?? void 0,
+					paintEdges: x,
+					edgePadCss: P
 				})) return;
-			} else if (j.length > 0 && Fr(e, d, f, p, m, j, E, b, I)) return;
-			T(e, d, f, p, m);
-		}, R = (e, t, n, r, i, a) => {
-			e.save(), v(e, n, r, i, a), e.fillStyle = t, e.fillRect(n, r, i, a), e.restore();
-		}, z = (e, t) => {
-			x && Pr(e, x.camera, d, f, p, m, (e, n, r, i, a) => R(e, t, n, r, i, a)) || R(e, t, d, f, p, m);
-		}, B = e.getTransform(), V = Math.abs(B.a * B.d - B.b * B.c), H = V > 0 ? Math.sqrt(V) : 1, W = N + P, G = (t.custGeom && t.custGeom.length > 0 ? ve(t.custGeom, d, f, p, m) : t.prstGeom && w(t.prstGeom.toLowerCase()) ? C(t.prstGeom.toLowerCase(), d, f, p, m, t.prstAdjust ?? []) : null) ?? {
-			x: d,
-			y: f,
-			w: p,
-			h: m
-		}, K = x ? Sr(x.camera, B, d, f, p, m, I, t.shadow?.algn) : {
-			bbox: vr(B, G.x - W, G.y - W, G.w + W * 2, G.h + W * 2),
-			anchor: xr(B, d, f, p, m, t.shadow?.algn)
-		}, q = n * H, ee = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), J = (e) => z(e, "#000");
-		wr(e, t, x && ee ? Cr(L, B, K.bbox, {
+			} else if (k.length > 0 && br(e, f, m, h, g, k, T, x, P)) return;
+			w(e, f, m, h, g);
+		}, I = (e, t, n, r, i, a) => {
+			e.save(), y(e, n, r, i, a), e.fillStyle = t, e.fillRect(n, r, i, a), e.restore();
+		}, L = (e, t) => {
+			S && yr(e, S.camera, f, m, h, g, (e, n, r, i, a) => I(e, t, n, r, i, a)) || I(e, t, f, m, h, g);
+		}, R = e.getTransform(), z = Math.abs(R.a * R.d - R.b * R.c), B = z > 0 ? Math.sqrt(z) : 1, V = j + M, H = (t.custGeom && t.custGeom.length > 0 ? le(t.custGeom, f, m, h, g) : t.prstGeom && l(t.prstGeom.toLowerCase()) ? o(t.prstGeom.toLowerCase(), f, m, h, g, t.prstAdjust ?? []) : null) ?? {
+			x: f,
+			y: m,
+			w: h,
+			h: g
+		}, U = S ? sr(S.camera, R, f, m, h, g, P, t.shadow?.algn) : {
+			bbox: rr(R, H.x - V, H.y - V, H.w + V * 2, H.h + V * 2),
+			anchor: or(R, f, m, h, g, t.shadow?.algn)
+		}, W = n * B, ee = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), G = (e) => L(e, "#000");
+		lr(e, t, S && ee ? cr(F, R, U.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : L, x && ee ? Cr(J, B, K.bbox, {
+		}) : F, S && ee ? cr(G, R, U.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : J, K.bbox, K.anchor, n, q, B), e.restore();
+		}) : G, U.bbox, U.anchor, n, W, R), e.restore();
 	} catch (e) {
-		if (pe(e)) throw e;
+		if (Se(e)) throw e;
 	}
 }
-async function Br(e, t, n, r, i, a, o) {
-	let s = X(t.x, n), c = X(t.y, n), l = X(t.width, n), u = X(t.height, n), d;
+async function Tr(e, t, n, r, i, a, o) {
+	let s = Y(t.x, n), c = Y(t.y, n), l = Y(t.width, n), u = Y(t.height, n), d;
 	if (t.posterPath && i) try {
-		d = await Rr(t, i, o);
+		d = await Cr(t, i, o);
 	} catch (e) {
-		if (pe(e)) throw e;
+		if (Se(e)) throw e;
 	}
-	r() || (e.save(), Ur(e, t, n), d ? e.drawImage(d, s, c, l, u) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(s, c, l, u)), a || rn(e, s + l / 2, c + u / 2, l, u, "paused"), e.restore());
+	r() || (e.save(), Or(e, t, n), d ? e.drawImage(d, s, c, l, u) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(s, c, l, u)), a || Ut(e, s + l / 2, c + u / 2, l, u, "paused"), e.restore());
 }
-function Vr(e, t, n, r, i, a, o) {
-	let s = Math.max(.5, X(r.width, a)), c = n.x - t.x, l = n.y - t.y, u = Math.hypot(c, l);
+function Er(e, t, n, r, i, a, o) {
+	let s = Math.max(.5, Y(r.width, a)), c = n.x - t.x, l = n.y - t.y, u = Math.hypot(c, l);
 	if (u === 0) return;
 	let d = -l / u, f = c / u, p;
 	switch (i) {
@@ -5290,56 +5064,56 @@ function Vr(e, t, n, r, i, a, o) {
 			break;
 		default: return;
 	}
-	e.save(), e.globalCompositeOperation = "destination-out", e.strokeStyle = "#000", e.lineWidth = s + .5, e.setLineDash([]), e.beginPath(), e.moveTo(t.x, t.y), e.lineTo(n.x, n.y), e.stroke(), e.globalCompositeOperation = "source-over", e.strokeStyle = (r.fill ? En(r.fill, e, Math.min(t.x, n.x), Math.min(t.y, n.y), Math.max(1, Math.abs(n.x - t.x)), Math.max(1, Math.abs(n.y - t.y)), o) : null) ?? Z(r.color);
+	e.save(), e.globalCompositeOperation = "destination-out", e.strokeStyle = "#000", e.lineWidth = s + .5, e.setLineDash([]), e.beginPath(), e.moveTo(t.x, t.y), e.lineTo(n.x, n.y), e.stroke(), e.globalCompositeOperation = "source-over", e.strokeStyle = (r.fill ? fn(r.fill, e, Math.min(t.x, n.x), Math.min(t.y, n.y), Math.max(1, Math.abs(n.x - t.x)), Math.max(1, Math.abs(n.y - t.y)), o) : null) ?? X(r.color);
 	for (let r of p) {
 		let i = d * (s * r.offset), a = f * (s * r.offset);
 		e.lineWidth = Math.max(.5, s * r.widthFrac), e.beginPath(), e.moveTo(t.x + i, t.y + a), e.lineTo(n.x + i, n.y + a), e.stroke();
 	}
 	e.restore();
 }
-function Hr(e, t, n, r, i = 0) {
-	if (T(e, t, n), t?.fill && r) {
-		let n = En(t.fill, e, r.x, r.y, r.w, r.h, i);
+function Dr(e, t, n, r, i = 0) {
+	if (ve(e, t, n), t?.fill && r) {
+		let n = fn(t.fill, e, r.x, r.y, r.w, r.h, i);
 		n && (e.strokeStyle = n);
 	}
 }
-function Ur(e, t, n) {
+function Or(e, t, n) {
 	if (t.rotation === 0 && !t.flipH && !t.flipV) return;
-	let r = X(t.x, n), i = X(t.y, n), a = X(t.width, n), o = X(t.height, n);
+	let r = Y(t.x, n), i = Y(t.y, n), a = Y(t.width, n), o = Y(t.height, n);
 	e.translate(r + a / 2, i + o / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(r + a / 2), -(i + o / 2));
 }
-function Wr(e, t, n, r, i = {
+function kr(e, t, n, r, i = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
 }) {
-	e.save(), Ur(e, t, n);
-	let a = X(t.x, n), o = X(t.y, n), s = t.cols.map((e) => X(e, n)), c = s.length, l = (e, t) => {
+	e.save(), Or(e, t, n);
+	let a = Y(t.x, n), o = Y(t.y, n), s = t.cols.map((e) => Y(e, n)), c = s.length, l = (e, t) => {
 		let n = 0;
 		for (let r = 0; r < t; r++) n += s[e + r] ?? 0;
 		return n;
-	}, u = t.rows.map((e) => X(e.height, n));
+	}, u = t.rows.map((e) => Y(e.height, n));
 	for (let a = 0; a < t.rows.length; a++) {
 		let o = t.rows[a];
 		for (let t = 0; t < o.cells.length; t++) {
 			let s = o.cells[t];
 			if (s.hMerge || s.vMerge || (s.rowSpan || 1) > 1 || !s.textBody) continue;
-			let c = l(t, s.gridSpan || 1), d = jr(e, s.textBody, 0, 0, c, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0) || 0;
+			let c = l(t, s.gridSpan || 1), d = gr(e, s.textBody, 0, 0, c, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, o.height === 0) || 0;
 			d > u[a] && (u[a] = d);
 		}
 	}
 	for (let a = 0; a < t.rows.length; a++) {
 		let o = t.rows[a];
-		for (let t = 0; t < o.cells.length; t++) {
-			let s = o.cells[t];
-			if (s.hMerge || s.vMerge) continue;
-			let c = s.rowSpan || 1;
-			if (c <= 1 || !s.textBody) continue;
-			let d = l(t, s.gridSpan || 1), f = jr(e, s.textBody, 0, 0, d, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0) || 0, p = 0;
-			for (let e = 0; e < c && a + e < u.length; e++) p += u[a + e];
-			if (f > p) {
-				let e = (f - p) / c;
-				for (let t = 0; t < c && a + t < u.length; t++) u[a + t] += e;
+		for (let s = 0; s < o.cells.length; s++) {
+			let c = o.cells[s];
+			if (c.hMerge || c.vMerge) continue;
+			let d = c.rowSpan || 1;
+			if (d <= 1 || !c.textBody) continue;
+			let f = l(s, c.gridSpan || 1), p = t.rows.slice(a, Math.min(t.rows.length, a + d)).some((e) => e.height === 0), m = gr(e, c.textBody, 0, 0, f, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, p) || 0, h = 0;
+			for (let e = 0; e < d && a + e < u.length; e++) h += u[a + e];
+			if (m > h) {
+				let e = (m - h) / d;
+				for (let t = 0; t < d && a + t < u.length; t++) u[a + t] += e;
 			}
 		}
 	}
@@ -5380,10 +5154,10 @@ function Wr(e, t, n, r, i = {
 		}
 	}
 	for (let { cell: a, colX: o, rowY: s, cellW: c, cellH: l } of h) {
-		let u = En(a.fill, e, o, s, c, l, t.rotation);
+		let u = fn(a.fill, e, o, s, c, l, t.rotation);
 		if (u && (e.fillStyle = u, e.fillRect(o, s, c, l)), a.textBody) {
-			let t = a.textColor ? Z(a.textColor) : null;
-			jr(e, a.textBody, o, s, c, l, n, t, 0, !1, !1, "#000000", r, i);
+			let t = a.textColor ? X(a.textColor) : null;
+			gr(e, a.textBody, o, s, c, l, n, t, 0, !1, !1, "#000000", r, i);
 		}
 	}
 	let _ = i.dpr, v = (e, t) => {
@@ -5391,13 +5165,13 @@ function Wr(e, t, n, r, i = {
 		let n = g[e][t];
 		return n < 0 ? null : h[n];
 	}, y = (r, i, a, o, s) => {
-		Hr(e, r, n, {
+		Dr(e, r, n, {
 			x: Math.min(i, o),
 			y: Math.min(a, s),
 			w: Math.max(1, Math.abs(o - i)),
 			h: Math.max(1, Math.abs(s - a))
 		}, t.rotation);
-		let c = i === o ? J(i, e.lineWidth, _) : 0, l = a === s ? J(a, e.lineWidth, _) : 0;
+		let c = i === o ? V(i, e.lineWidth, _) : 0, l = a === s ? V(a, e.lineWidth, _) : 0;
 		e.beginPath(), e.moveTo(i + c, a + l), e.lineTo(o + c, s + l), e.stroke();
 	};
 	for (let r of h) {
@@ -5412,7 +5186,7 @@ function Wr(e, t, n, r, i = {
 			for (; a < n;) {
 				let r = g[e][a], o = a + 1;
 				for (; o < n && g[e][o] === r;) o++;
-				let s = v(e, a), c = mn(i.borderB, s ? s.cell.borderT : null);
+				let s = v(e, a), c = $t(i.borderB, s ? s.cell.borderT : null);
 				if (c) {
 					let e = p(a, o - a);
 					y(c, e, t, e + l(a, o - a), t);
@@ -5428,16 +5202,16 @@ function Wr(e, t, n, r, i = {
 			for (; t <= r.lastRi;) {
 				let n = g[t][x], i = t;
 				for (; i + 1 <= r.lastRi && g[i + 1][x] === n;) i++;
-				let a = v(t, x), o = mn(h, a ? S(a.cell) : null);
+				let a = v(t, x), o = $t(h, a ? S(a.cell) : null);
 				o && y(o, e, m[t], e, m[i] + u[i]), t = i + 1;
 			}
 		}
-		i.diagonalTL && (Hr(e, i.diagonalTL, n, {
+		i.diagonalTL && (Dr(e, i.diagonalTL, n, {
 			x: a,
 			y: o,
 			w: s,
 			h: d
-		}, t.rotation), e.beginPath(), e.moveTo(a, o), e.lineTo(a + s, o + d), e.stroke()), i.diagonalTR && (Hr(e, i.diagonalTR, n, {
+		}, t.rotation), e.beginPath(), e.moveTo(a, o), e.lineTo(a + s, o + d), e.stroke()), i.diagonalTR && (Dr(e, i.diagonalTR, n, {
 			x: a,
 			y: o,
 			w: s,
@@ -5446,14 +5220,14 @@ function Wr(e, t, n, r, i = {
 	}
 	e.restore();
 }
-function Gr(e, t, n, r) {
+function Ar(e, t, n, r) {
 	e.save(), e.globalAlpha = t.opacity, e.fillStyle = t.color, e.fillRect(0, 0, n, r), e.restore();
 }
-var Kr = /* @__PURE__ */ new WeakMap();
-function qr(e) {
-	Kr.set(e, (Kr.get(e) ?? 0) + 1);
+var jr = /* @__PURE__ */ new WeakMap();
+function Mr(e) {
+	jr.set(e, (jr.get(e) ?? 0) + 1);
 }
-function Jr(e, t, n, r, i) {
+function Nr(e, t, n, r, i) {
 	e.save(), e.fillStyle = "#f7f7f8", e.fillRect(0, 0, t, n);
 	let a = Math.max(12, Math.min(t, n) * .04);
 	e.strokeStyle = "#c8ccd2", e.lineWidth = Math.max(1, Math.min(t, n) * .004), e.setLineDash([e.lineWidth * 6, e.lineWidth * 5]), e.strokeRect(a, a, t - a * 2, n - a * 2), e.setLineDash([]);
@@ -5473,86 +5247,118 @@ function Jr(e, t, n, r, i) {
 	for (let t of f.slice(0, 4)) e.fillText(t, o, h), h += m;
 	e.restore();
 }
-async function Yr(e, t, r, i, a = {}, o) {
-	let s = a.fetchImage ?? (a.fetchMedia ? Lr(a.fetchMedia) : void 0), c = s ? n(s) : void 0;
+async function Pr(e, t, n, r, i = {}, a) {
+	let o = i.fetchImage ?? (i.fetchMedia ? Sr(i.fetchMedia) : void 0), s = o ? x(o) : void 0;
 	try {
-		return await Xr(e, t, r, i, a, o, s);
+		return await Fr(e, t, n, r, i, a, o);
 	} finally {
-		c?.();
+		s?.();
 	}
 }
-async function Xr(e, t, n, r, i = {}, a, o) {
-	let c = (Kr.get(e) ?? 0) + 1;
-	Kr.set(e, c);
-	let l = () => Kr.get(e) !== c, u = i.width ?? ((z(e) ? e.offsetWidth : 0) || 960), f = u / n, p = Math.round(u), m = Math.round(r * f), h = i.dpr ?? G(), _ = ce(p * h, m * h), v = _.clamped ? h * _.scale : h;
-	e.width = _.width, e.height = _.height, z(e) && (e.style.width = `${p}px`, e.style.display || (e.style.display = "block"));
-	let y = e.getContext("2d");
-	if (!y) throw Error("Could not get 2D context");
-	if (y.scale(v, v), t.parseError) return Jr(y, p, m, t.slideNumber, t.parseError), e;
-	let b = i.defaultTextColor ? `#${i.defaultTextColor}` : "#000000", x = {
+async function Fr(e, t, n, r, i = {}, o, s) {
+	let c = (jr.get(e) ?? 0) + 1;
+	jr.set(e, c);
+	let l = () => jr.get(e) !== c, u = i.width ?? ((P(e) ? e.offsetWidth : 0) || 960), d = u / n, f = Math.round(u), p = Math.round(r * d), m = i.dpr ?? R(), h = Ae(f * m, p * m), g = h.clamped ? m * h.scale : m;
+	e.width = h.width, e.height = h.height, P(e) && (e.style.width = `${f}px`, e.style.display || (e.style.display = "block"));
+	let _ = e.getContext("2d");
+	if (!_) throw Error("Could not get 2D context");
+	if (_.scale(g, g), t.parseError) return Nr(_, f, p, t.slideNumber, t.parseError), e;
+	let v = i.defaultTextColor ? `#${i.defaultTextColor}` : "#000000", y = {
 		themeMajorFont: i.majorFont ?? null,
 		themeMinorFont: i.minorFont ?? null,
 		themeHlinkColor: i.hlinkColor ?? null,
-		dpr: v,
-		smartArtFallbackTextColor: vn(t.background, b)
+		dpr: g,
+		smartArtFallbackTextColor: rn(t.background, v)
 	};
-	if (await Zn(y, t.background, p, m, f, l, i.fetchImage), l() || (i.math && await An(t, i.math), l())) return e;
-	let S = t.slideNumber;
+	if (await In(_, t.background, f, p, d, l, i.fetchImage), l() || (i.math && await gn(t, i.math), l())) return e;
+	let b = t.slideNumber;
 	for (let e of t.elements) if (e.type === "picture" && i.fetchImage) {
 		let t = e, n = t.mimeType === "image/svg+xml";
-		if (A(t)) U(t.svgImagePath, i.fetchImage).catch(() => void 0);
-		else if (n) U(t.imagePath, i.fetchImage).catch(() => void 0);
+		if (re(t)) q(t.svgImagePath, i.fetchImage).catch(() => void 0);
+		else if (n) q(t.imagePath, i.fetchImage).catch(() => void 0);
 		else {
-			let e = s(t.mimeType, t.srcRect, t.width / Y, t.height / Y);
-			Ee(t.imagePath, t.mimeType, t.duotone, i.fetchImage, {
+			let e = xe(t.mimeType, t.srcRect, t.width / J, t.height / J);
+			if (!e) continue;
+			Ie(t.imagePath, t.mimeType, t.duotone, i.fetchImage, {
 				widthPt: e.widthPt,
 				heightPt: e.heightPt
 			}).catch(() => void 0);
 		}
 	} else if (e.type === "media") {
 		let t = e;
-		t.posterPath && i.fetchMedia && Rr(t, i.fetchMedia, o).catch(() => void 0);
+		t.posterPath && i.fetchMedia && Cr(t, i.fetchMedia, s).catch(() => void 0);
 	}
+	let x = /* @__PURE__ */ new Map();
 	if (i.fetchImage) {
-		let n = i.fetchImage, r = /* @__PURE__ */ new Set();
+		let n = i.fetchImage, r = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Map();
+		for (let e of be(t.elements.filter((e) => e.type === "chart").map((e) => e.chart))) {
+			let t = Ee(e);
+			o.has(t) || o.set(t, e);
+		}
 		for (let e of t.elements) if (!(e.type !== "shape" || !e.textBody)) for (let t of e.textBody.paragraphs) {
-			let e = De(t.bullet);
+			let e = Le(t.bullet);
 			e.type === "blip" && r.add(`${e.imagePath} ${e.mimeType}`);
 		}
-		if (r.size > 0 && (await Promise.all([...r].map((e) => {
-			let [t, r] = e.split(" ");
-			return g(t, r, n).catch((e) => {
-				if (pe(e)) throw e;
+		if (r.size > 0 || o.size > 0) {
+			let t = [...r].map((e) => {
+				let [t, r] = e.split(" ");
+				return a(t, r, n).catch((e) => {
+					if (Se(e)) throw e;
+				});
+			}), i = [...o].map(async ([e, t]) => {
+				try {
+					let r = xe(t.mimeType, t.srcRect, 72, 72);
+					if (!r) {
+						x.set(e, null);
+						return;
+					}
+					let i = () => t.mimeType === "image/svg+xml" ? t.duotone ? Promise.resolve(null) : q(t.imagePath, n) : Ie(t.imagePath, t.mimeType, t.duotone, n, {
+						widthPt: r.widthPt,
+						heightPt: r.heightPt,
+						failClosedOnDuotoneFailure: !0
+					}), a;
+					if (!t.duotone && re(t)) try {
+						a = await q(t.svgImagePath, n);
+					} catch {
+						a = await i();
+					}
+					else a = await i();
+					x.set(e, a);
+				} catch (t) {
+					if (Se(t)) throw t;
+					x.set(e, null);
+				}
 			});
-		})), l())) return e;
+			if (await Promise.all([...t, ...i]), l()) return e;
+		}
 	}
 	for (let [n, r] of t.elements.entries()) {
 		if (l()) return e;
-		if (r.type === "shape") Tr(y, r, f, b, S, x, a ? (e) => a({
+		if (r.type === "shape") ur(_, r, d, v, b, y, o ? (e) => o({
 			...e,
 			elementIndex: n,
 			origin: t.elementSources?.[n]?.origin ?? "slide"
 		}) : void 0, i.fetchImage);
-		else if (r.type === "picture") await zr(y, r, f, l, i.fetchImage);
-		else if (r.type === "table") Wr(y, r, f, S, x);
-		else if (r.type === "media") await Br(y, r, f, l, i.fetchMedia, i.skipMediaControls, i.fetchImage);
+		else if (r.type === "picture") await wr(_, r, d, l, i.fetchImage);
+		else if (r.type === "table") kr(_, r, d, b, y);
+		else if (r.type === "media") await Tr(_, r, d, l, i.fetchMedia, i.skipMediaControls, i.fetchImage);
 		else if (r.type === "chart") {
-			let e = Y * f;
-			y.save(), Ur(y, r, f), d(y, r.chart, {
-				x: X(r.x, f),
-				y: X(r.y, f),
-				w: X(r.width, f),
-				h: X(r.height, f)
-			}, e, r.rotation, i.threeD, i.regionMap), y.restore();
+			let e = J * d;
+			_.save(), Or(_, r, d), Fe(_, r.chart, {
+				x: Y(r.x, d),
+				y: Y(r.y, d),
+				w: Y(r.width, d),
+				h: Y(r.height, d)
+			}, e, r.rotation, i.threeD, i.regionMap, (e) => x.get(Ee(e)), i.chartEx), _.restore();
 		}
 	}
-	return l() || i.dim && Gr(y, i.dim, p, m), e;
+	return l() || i.dim && Ar(_, i.dim, f, p), e;
 }
 //#endregion
 //#region packages/pptx/src/google-fonts.ts
-var Zr = {
-	...ae,
-	...q
+var Ir = {
+	...H,
+	...c
 };
 Object.freeze({
 	archiveEntryCount: 0,
@@ -5563,7 +5369,7 @@ Object.freeze({
 function $(e, t) {
 	if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation bootstrap ${t}`);
 }
-function Qr(e, t) {
+function Lr(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation bootstrap slide at ${t}`);
 	let n = e;
 	if (n.index !== t) throw Error(`invalid PPTX presentation bootstrap slide index ${n.index}`);
@@ -5573,7 +5379,7 @@ function Qr(e, t) {
 		...n.partName === void 0 ? {} : { partName: n.partName }
 	});
 }
-function $r(e) {
+function Rr(e) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error("invalid PPTX presentation bootstrap payload");
 	let t = e;
 	if (!Number.isSafeInteger(t.slideCount) || (t.slideCount ?? -1) < 0 || !Number.isSafeInteger(t.slideWidth) || (t.slideWidth ?? 0) <= 0 || !Number.isSafeInteger(t.slideHeight) || (t.slideHeight ?? 0) <= 0 || !Array.isArray(t.slides) || t.slides.length !== t.slideCount) throw Error("invalid PPTX presentation bootstrap dimensions or slide count");
@@ -5586,10 +5392,10 @@ function $r(e) {
 		minorFont: t.minorFont,
 		hlinkColor: t.hlinkColor,
 		folHlinkColor: t.folHlinkColor,
-		slides: Object.freeze(t.slides.map(Qr))
+		slides: Object.freeze(t.slides.map(Lr))
 	});
 }
-function ei(e) {
+function zr(e) {
 	return Object.freeze({
 		type: "media",
 		x: e.x,
@@ -5606,7 +5412,7 @@ function ei(e) {
 		mimeType: e.mimeType
 	});
 }
-function ti(e, t) {
+function Br(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight media at slide ${t}`);
 	let n = e;
 	for (let e of [
@@ -5617,9 +5423,9 @@ function ti(e, t) {
 		"rotation"
 	]) if (typeof n[e] != "number" || !Number.isFinite(n[e])) throw Error(`invalid PPTX presentation preflight media ${e} at slide ${t}`);
 	if (n.type !== "media" || typeof n.flipH != "boolean" || typeof n.flipV != "boolean" || n.mediaKind !== "audio" && n.mediaKind !== "video" || typeof n.posterPath != "string" || typeof n.posterMimeType != "string" || typeof n.mediaPath != "string" || typeof n.mimeType != "string") throw Error(`invalid PPTX presentation preflight media fields at slide ${t}`);
-	return ei(n);
+	return zr(n);
 }
-function ni(e) {
+function Vr(e) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error("invalid PPTX presentation preflight payload");
 	let t = e;
 	if (!Number.isSafeInteger(t.slideCount) || (t.slideCount ?? -1) < 0 || !Number.isSafeInteger(t.slideWidth) || (t.slideWidth ?? 0) <= 0 || !Number.isSafeInteger(t.slideHeight) || (t.slideHeight ?? 0) <= 0 || !Array.isArray(t.slides) || t.slides.length !== t.slideCount || !Array.isArray(t.fontPreloadNames)) throw Error("invalid PPTX presentation preflight dimensions or slide count");
@@ -5633,7 +5439,7 @@ function ni(e) {
 			...n.partName === void 0 ? {} : { partName: n.partName },
 			notes: n.notes,
 			hidden: n.hidden,
-			mediaElements: Object.freeze(n.mediaElements.map((e) => ti(e, t)))
+			mediaElements: Object.freeze(n.mediaElements.map((e) => Br(e, t)))
 		});
 	}), r = t.fontPreloadNames.map((e, t) => {
 		if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation preflight font at ${t}`);
@@ -5652,7 +5458,7 @@ function ni(e) {
 		fontPreloadNames: Object.freeze(r)
 	});
 }
-function ri(e, t) {
+function Hr(e, t) {
 	for (let n of e.slides) for (let e of n.mediaElements) {
 		if (e.mediaPath === t) return e.mimeType;
 		if (e.posterPath === t) return e.posterMimeType;
@@ -5661,7 +5467,7 @@ function ri(e, t) {
 }
 //#endregion
 //#region packages/pptx/src/slide-pull-client.ts
-var ii = 1024 * 1024, ai = class {
+var Ur = 1024 * 1024, Wr = class {
 	active = /* @__PURE__ */ new Set();
 	nextSessionId = 1;
 	constructor(e) {
@@ -5674,15 +5480,15 @@ var ii = 1024 * 1024, ai = class {
 			sessionId: r,
 			operationId: r,
 			generation: this.options.generation ?? 1
-		}, a = new _(this.options.transport, {
+		}, a = new m(this.options.transport, {
 			...i,
-			maxByteCredit: f,
+			maxByteCredit: u,
 			timeoutMs: n
 		});
 		this.active.add(a);
 		try {
 			await this.options.open(e, i, n);
-			let r = await si(a);
+			let r = await Kr(a);
 			try {
 				let e = r.usage ?? a.usageCheckpoint;
 				e && this.options.onUsage?.(e);
@@ -5705,20 +5511,20 @@ var ii = 1024 * 1024, ai = class {
 		if (!Number.isSafeInteger(e) || e < 0 || e >= this.options.slideCount) throw RangeError(`Slide index ${e} out of range (count: ${this.options.slideCount})`);
 	}
 };
-function oi(e) {
+function Gr(e) {
 	return !!e && typeof e == "object" && e.protocol === "ooxml-pull-v1";
 }
-async function si(e) {
+async function Kr(e) {
 	try {
-		return await e.pull(ii);
+		return await e.pull(Ur);
 	} catch (t) {
-		let n = ci(t);
+		let n = qr(t);
 		if (n === void 0) throw t;
 		return e.pull(n);
 	}
 }
-function ci(e) {
-	return M(e, ii, f);
+function qr(e) {
+	return O(e, Ur, u);
 }
 //#endregion
-export { ni as a, Yr as c, $r as i, rn as l, oi as n, Zr as o, ri as r, qr as s, ai as t };
+export { Vr as a, Pr as c, Rr as i, Ut as l, Gr as n, Ir as o, Hr as r, Mr as s, Wr as t };