@silurus/ooxml 0.85.2 → 0.86.0

package/dist/{slide-pull-client-RTwQbJiy.js → slide-pull-client-DuEaUxPw.js}

@@ -1,17 +1,17 @@
-import { $ as e, A as t, At as n, Bt as r, C as i, Ct as a, D as o, Et as s, Ft as c, Ht as l, It as u, J as d, Lt as f, M as p, Mt as m, N as h, Nt as g, O as _, Ot as v, Pt as y, Rt as b, S as x, St as S, Tt as C, Vt as w, Wt as T, Xt as E, Yt as D, _ as O, _t as k, at as A, bt as j, c as M, cn as N, ct as P, d as F, dt as I, et as L, f as R, g as z, gt as B, h as V, i as H, it as U, j as ee, jt as W, lt as te, m as G, mt as K, n as q, nt as ne, p as re, r as ie, rt as ae, s as oe, tt as se, u as ce, w as le, wt as ue, xt as de, y as fe, zt as pe } from "./line-metrics-BGtFM-ec.js";
-import { a as me, c as he, d as ge, f as _e, i as ve, l as ye, o as be, p as xe, r as Se, s as Ce, t as we, u as Te } from "./line-distribute-BsV4MVZ2.js";
-import { A as Ee, D as De, S as Oe, _ as ke, h as Ae, hn as je, in as Me, j as Ne, on as Pe, sn as Fe, v as Ie, w as Le } from "./plot-area-frame-D5hEOgkJ.js";
-import { l as Re } from "./pixel-budget-Dgjw269h.js";
-import { r as J } from "./units-EJdC96r6.js";
-import { A as ze, F as Be, I as Ve, L as He, M as Ue, N as We, P as Ge, j as Ke } from "./three-d-YYghQndN.js";
-import { k as qe } from "./renderer-XFSCOT6m.js";
-import { s as Je } from "./raster-target-ojDdQizC.js";
-import { a as Ye, i as Xe, n as Ze, t as Qe } from "./resource-measurement-D41R-0Bl.js";
+import { $ as e, A as t, At as n, Bt as r, Ct as i, E as a, Et as o, Ft as s, It as c, Jt as l, K as u, Lt as d, Mt as f, Nt as p, O as m, Ot as h, Pt as g, Q as _, Rt as v, S as y, St as b, T as x, Ut as S, Vt as C, Yt as w, Z as T, _ as E, a as D, b as O, bt as k, c as A, d as j, et as M, f as N, ft as P, h as F, ht as I, j as L, jt as R, k as z, kt as B, l as V, lt as H, m as ee, mt as U, n as W, nt as te, o as G, ot as K, p as q, rt as J, sn as ne, st as re, t as ie, tt as ae, u as oe, vt as se, wt as ce, x as le, xt as ue, yt as de, zt as fe } from "./hyperlink-enyPbflR.js";
+import { a as pe, c as me, d as he, f as ge, i as _e, l as ve, o as ye, p as be, r as xe, s as Se, t as Ce, u as we } from "./line-distribute-BFB575d6.js";
+import { A as Te, D as Ee, S as De, _ as Oe, h as ke, hn as Ae, in as je, j as Me, on as Ne, sn as Pe, v as Fe, w as Ie } from "./plot-area-frame-D5hEOgkJ.js";
+import { l as Le } from "./pixel-budget-Dgjw269h.js";
+import { r as Y } from "./units-EJdC96r6.js";
+import { A as Re, F as ze, I as Be, L as Ve, M as He, N as Ue, P as We, j as Ge } from "./three-d-YYghQndN.js";
+import { k as Ke } from "./renderer-XFSCOT6m.js";
+import { s as qe } from "./raster-target-ojDdQizC.js";
+import { a as Je, i as Ye, n as Xe, t as Ze } from "./resource-measurement-Do07ZRcR.js";
 //#region packages/pptx/src/types.ts
-function $e(e) {
+function Qe(e) {
 	return e;
 }
-var et = {
+var $e = {
 	textarchdown: {
 		adj: [["adj", "val 0"]],
 		gd: [
@@ -2393,22 +2393,22 @@ var et = {
 			]
 		}]
 	}
-}, tt = Math.PI * 2 / 216e5, nt = et, rt = /* @__PURE__ */ new Map();
-function it(e) {
-	return e.toLowerCase() in nt;
+}, et = Math.PI * 2 / 216e5, tt = $e, nt = /* @__PURE__ */ new Map();
+function rt(e) {
+	return e.toLowerCase() in tt;
 }
-function at(e) {
-	let t = rt.get(e);
+function it(e) {
+	let t = nt.get(e);
 	if (t) return t;
-	let n = nt[e];
+	let n = tt[e];
 	return n ? (t = {
-		adj: n.adj.map(([e, t]) => [e, y(t)]),
-		gd: n.gd.map(([e, t]) => [e, y(t)]),
+		adj: n.adj.map(([e, t]) => [e, f(t)]),
+		gd: n.gd.map(([e, t]) => [e, f(t)]),
 		paths: n.paths
-	}, rt.set(e, t), t) : null;
+	}, nt.set(e, t), t) : null;
 }
-var ot = 48;
-function st(e, t, n, r) {
+var at = 48;
+function ot(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":
@@ -2425,8 +2425,8 @@ function st(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 <= ot; t++) {
-				let n = t / ot, 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 <= at; t++) {
+				let n = t / at, 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
@@ -2437,8 +2437,8 @@ function st(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 <= ot; t++) {
-				let n = t / ot, 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 <= at; t++) {
+				let n = t / at, 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
@@ -2448,9 +2448,9 @@ function st(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]) * tt, f = t.resolve(n[4]) * tt, 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]) * et, f = t.resolve(n[4]) * et, 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(ot, 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(at, Math.ceil(Math.abs(y) / m * 96));
 			for (let e = 1; e <= S; e++) {
 				let t = h + y * e / S;
 				c.push({
@@ -2465,7 +2465,7 @@ function st(e, t, n, r) {
 	}
 	return c;
 }
-function ct(e) {
+function st(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;
@@ -2473,23 +2473,23 @@ function ct(e) {
 	}
 	return t;
 }
-function lt(e, t, n, r) {
-	let i = at(e.toLowerCase());
+function ct(e, t, n, r) {
+	let i = it(e.toLowerCase());
 	if (!i || i.paths.length === 0) return null;
-	let a = c({
+	let a = p({
 		w: n,
 		h: r,
 		adj: t
-	}, i.adj, i.gd), o = i.paths.length === 1, s = st(i.paths[0], a, n, r), l = o ? s : st(i.paths[i.paths.length - 1], a, n, r);
+	}, i.adj, i.gd), o = i.paths.length === 1, s = ot(i.paths[0], a, n, r), c = o ? s : ot(i.paths[i.paths.length - 1], a, n, r);
 	return {
 		top: s,
-		bottom: l,
-		topLen: ct(s),
-		bottomLen: ct(l),
+		bottom: c,
+		topLen: st(s),
+		bottomLen: st(c),
 		singleEdge: o
 	};
 }
-function ut(e, t, n) {
+function lt(e, t, n) {
 	let r = t[t.length - 1];
 	if (e.length === 1 || r === 0) return {
 		x: e[0].x,
@@ -2510,17 +2510,17 @@ function ut(e, t, n) {
 		ty: f / p
 	};
 }
-function dt(e) {
+function ut(e) {
 	return e.topLen[e.topLen.length - 1] ?? 0;
 }
-function ft(e, t) {
+function dt(e, t) {
 	if (!e.singleEdge) return 1;
-	let n = dt(e);
+	let n = ut(e);
 	return n <= 0 ? 1 : Math.max(0, Math.min(1, t / n));
 }
-function pt(e, t, n, r) {
+function ft(e, t, n, r) {
 	if (e.singleEdge) {
-		let i = ut(e.top, e.topLen, t), a = Math.atan2(i.ty, i.tx), o = i.ty, s = -i.tx, c = n * (1 - r);
+		let i = lt(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,
@@ -2529,7 +2529,7 @@ function pt(e, t, n, r) {
 			shear: 0
 		};
 	}
-	let i = ut(e.top, e.topLen, t), a = ut(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 = lt(e.top, e.topLen, t), a = lt(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,
@@ -2540,7 +2540,7 @@ function pt(e, t, n, r) {
 }
 //#endregion
 //#region packages/core/src/shape/scene3d-camera.ts
-var mt = 26, ht = {
+var pt = 26, mt = {
 	orthographicFront: {
 		kind: "orthographic",
 		baseLat: 0,
@@ -2553,52 +2553,52 @@ var mt = 26, ht = {
 		baseLat: 0,
 		baseLon: 0,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveRelaxed: {
 		kind: "perspective",
 		baseLat: 0,
 		baseLon: 0,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveRelaxedModerately: {
 		kind: "perspective",
 		baseLat: 0,
 		baseLon: 0,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveAbove: {
 		kind: "perspective",
 		baseLat: -20,
 		baseLon: 0,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveBelow: {
 		kind: "perspective",
 		baseLat: 20,
 		baseLon: 0,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveLeft: {
 		kind: "perspective",
 		baseLat: 0,
 		baseLon: -20,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	},
 	perspectiveRight: {
 		kind: "perspective",
 		baseLat: 0,
 		baseLon: 20,
 		baseRev: 0,
-		fovDeg: mt
+		fovDeg: pt
 	}
 };
-function gt(e, t) {
+function ht(e, t) {
 	let n = Array(9).fill(0);
 	for (let r = 0; r < 3; r++) for (let i = 0; i < 3; i++) {
 		let a = 0;
@@ -2607,7 +2607,7 @@ function gt(e, t) {
 	}
 	return n;
 }
-function _t(e) {
+function gt(e) {
 	let t = e * Math.PI / 180, n = Math.cos(t), r = Math.sin(t);
 	return [
 		1,
@@ -2621,7 +2621,7 @@ function _t(e) {
 		n
 	];
 }
-function vt(e) {
+function _t(e) {
 	let t = e * Math.PI / 180, n = Math.cos(t), r = Math.sin(t);
 	return [
 		n,
@@ -2635,7 +2635,7 @@ function vt(e) {
 		n
 	];
 }
-function yt(e) {
+function vt(e) {
 	let t = e * Math.PI / 180, n = Math.cos(t), r = Math.sin(t);
 	return [
 		n,
@@ -2649,22 +2649,22 @@ function yt(e) {
 		1
 	];
 }
-function bt(e, t, n, r) {
+function yt(e, t, n, r) {
 	return [
 		e[0] * t + e[1] * n + e[2] * r,
 		e[3] * t + e[4] * n + e[5] * r,
 		e[6] * t + e[7] * n + e[8] * r
 	];
 }
-function xt(e, t) {
+function bt(e, t) {
 	let n = t ? t.lat : e.baseLat, r = t ? t.lon : e.baseLon;
-	return gt(yt(-(t ? t.rev : e.baseRev)), gt(_t(-n), vt(-r)));
+	return ht(vt(-(t ? t.rev : e.baseRev)), ht(gt(-n), _t(-r)));
 }
-function St(e) {
-	return ht[e] || (e.startsWith("perspective") ? ht.perspectiveFront : ht.orthographicFront);
+function xt(e) {
+	return mt[e] || (e.startsWith("perspective") ? mt.perspectiveFront : mt.orthographicFront);
 }
-function Ct(e, t, n) {
-	let r = St(e.prst), i = xt(r, e.rot);
+function St(e, t, n) {
+	let r = xt(e.prst), i = bt(r, e.rot);
 	if (t <= 0 || n <= 0) return {
 		corners: [
 			{
@@ -2696,11 +2696,11 @@ function Ct(e, t, n) {
 	if (r.kind === "perspective") {
 		let t = e.fov ?? r.fovDeg, n = Math.max(1, Math.min(179, t)) * Math.PI / 180, a = l / Math.tan(n / 2);
 		u = s.map(([e, t]) => {
-			let [n, r, o] = bt(i, e, t, 0), s = a - o, c = a / (Math.abs(s) < 1e-6 ? 1e-6 * Math.sign(s || 1) : s);
+			let [n, r, o] = yt(i, e, t, 0), s = a - o, c = a / (Math.abs(s) < 1e-6 ? 1e-6 * Math.sign(s || 1) : s);
 			return [n * c, r * c];
 		});
 	} else u = s.map(([e, t]) => {
-		let [n, r] = bt(i, e, t, 0);
+		let [n, r] = yt(i, e, t, 0);
 		return [n, r];
 	});
 	u = u.map(([e, t]) => [e * c, t * c]);
@@ -2723,18 +2723,18 @@ function Ct(e, t, n) {
 		isIdentity: _
 	};
 }
-function wt(e) {
-	let { isIdentity: t } = Ct(e, 1e3, 1e3);
+function Ct(e) {
+	let { isIdentity: t } = St(e, 1e3, 1e3);
 	return !t;
 }
-function Tt(e, t, n, r) {
-	let i = St(e.prst), a = xt(i, e.rot);
+function wt(e, t, n, r) {
+	let i = xt(e.prst), a = bt(i, e.rot);
 	if (t <= 0 || n <= 0 || r === 0) return {
 		x: 0,
 		y: 0
 	};
 	let o = t / 2, s = n / 2, c = Math.max(o, s), l = e.zoom ?? 1, u = (t) => {
-		let [n, r, o] = bt(a, 0, 0, t);
+		let [n, r, o] = yt(a, 0, 0, t);
 		if (i.kind === "perspective") {
 			let t = e.fov ?? i.fovDeg, a = Math.max(1, Math.min(179, t)) * Math.PI / 180, s = c / Math.tan(a / 2), u = s - o, d = s / (Math.abs(u) < 1e-6 ? 1e-6 * Math.sign(u || 1) : u);
 			return [n * d * l, r * d * l];
@@ -2748,12 +2748,12 @@ function Tt(e, t, n, r) {
 }
 //#endregion
 //#region packages/core/src/shape/bevel-shading.ts
-function Et(e, t) {
+function Tt(e, t) {
 	if (t <= 0) return () => 1;
 	let n = (e) => Math.max(0, Math.min(1, e / t));
 	switch (e) {
 		case "hardEdge": {
-			let e = Pt;
+			let e = Nt;
 			return (t) => {
 				let r = Math.min(1, n(t) / e);
 				return r * r * (3 - 2 * r);
@@ -2773,7 +2773,7 @@ function Et(e, t) {
 		};
 	}
 }
-function Dt(e) {
+function Et(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;
@@ -2791,7 +2791,7 @@ function Dt(e) {
 	}
 	return n;
 }
-function Ot(e, t = 3) {
+function Dt(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--;
@@ -2799,7 +2799,7 @@ function Ot(e, t = 3) {
 	for (let e = 0; e < t; e++) s.push(e < o ? r : i);
 	return s;
 }
-function kt(e, t, n, r, i, a) {
+function Ot(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;
@@ -2820,29 +2820,29 @@ function kt(e, t, n, r, i, a) {
 		}
 	}
 }
-function At(e, t, n, r) {
+function kt(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 Ot(r, 3)) {
+	for (let e of Dt(r, 3)) {
 		let r = Math.max(1, (e - 1) / 2);
-		kt(i, a, t, n, r, !0), kt(a, i, t, n, r, !1);
+		Ot(i, a, t, n, r, !0), Ot(a, i, t, n, r, !1);
 	}
 	return i;
 }
-function jt(e, t, n, r = 128) {
+function At(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 = Dt(a);
+		let r = Et(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 = Dt(o);
+		let n = Et(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++) {
@@ -2854,15 +2854,15 @@ function jt(e, t, n, r = 128) {
 	for (let e = 0; e < t * n; e++) i[e] = Math.sqrt(i[e]);
 	return i;
 }
-var Mt = .25, Nt = .35, Pt = .5;
-function Ft(e, t, n, r, i, a) {
+var jt = .25, Mt = .35, Nt = .5;
+function Pt(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 = jt(e, t, n), u = Et(i, r), d = (n, r) => (e[r * t + n] ?? 0) >= 128, f = (r > 0 ? a / r : 0) * r, p = At(l, t, n, Math.max(1, r * Mt)), m = (e) => {
+	let l = At(e, t, n), u = Tt(i, r), d = (n, r) => (e[r * t + n] ?? 0) >= 128, f = (r > 0 ? a / r : 0) * r, p = kt(l, t, n, Math.max(1, r * jt)), m = (e) => {
 		let t = u(Math.max(0, e - .5));
 		return u(e + .5) - t;
 	};
@@ -2877,9 +2877,9 @@ function Ft(e, t, n, r, i, a) {
 			o[a * 3 + 2] = 1;
 			continue;
 		}
-		let g = u / r, _ = 1 - Nt, v = 1;
+		let g = u / r, _ = 1 - Mt, v = 1;
 		if (g > _) {
-			let e = Math.min(1, (g - _) / Nt);
+			let e = Math.min(1, (g - _) / Mt);
 			v = 1 - e * e * (3 - 2 * e);
 		}
 		c[a] = v;
@@ -2894,7 +2894,7 @@ function Ft(e, t, n, r, i, a) {
 		bandWeight: c
 	};
 }
-var It = 35 * Math.PI / 180, Lt = 12 * Math.PI / 180, Rt = {
+var Ft = 35 * Math.PI / 180, It = 12 * Math.PI / 180, Lt = {
 	t: {
 		x: 0,
 		y: -1
@@ -2928,22 +2928,22 @@ var It = 35 * Math.PI / 180, Lt = 12 * Math.PI / 180, Rt = {
 		y: 1
 	}
 };
-function zt(e, t, n) {
+function Rt(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 Bt(e, t, n) {
-	let r = Rt[t] ?? Rt.t;
-	return n && n.rev && (r = zt(r.x, r.y, n.rev)), Ht(r.x, r.y, It);
+function zt(e, t, n) {
+	let r = Lt[t] ?? Lt.t;
+	return n && n.rev && (r = Rt(r.x, r.y, n.rev)), Vt(r.x, r.y, Ft);
 }
-function Vt(e) {
+function Bt(e) {
 	let t = Math.hypot(e.x, e.y) || 1;
-	return Ht(-e.x / t, -e.y / t, Lt);
+	return Vt(-e.x / t, -e.y / t, It);
 }
-function Ht(e, t, n) {
+function Vt(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,
@@ -2951,7 +2951,7 @@ function Ht(e, t, n) {
 		z: c / l
 	};
 }
-var Ut = 2, Wt = {
+var Ht = 2, Ut = {
 	matte: {
 		ambient: .62,
 		diffuse: .45,
@@ -2964,8 +2964,8 @@ var Ut = 2, Wt = {
 		specular: .35,
 		shininess: 22
 	}
-}, Gt = .8;
-function Kt(e) {
+}, Wt = .8;
+function Gt(e) {
 	switch (e) {
 		case "plastic":
 		case "metal":
@@ -2976,8 +2976,8 @@ function Kt(e) {
 		default: return "matte";
 	}
 }
-function qt(e, t, n = !0) {
-	let r = Wt[e], i = {
+function Kt(e, t, n = !0) {
+	let r = Ut[e], i = {
 		light: t,
 		material: e,
 		ambient: r.ambient,
@@ -2985,9 +2985,9 @@ function qt(e, t, n = !0) {
 		specular: r.specular,
 		shininess: r.shininess
 	};
-	return n && (i.fillLight = Vt(t), i.fillDiffuse = i.diffuse * Gt), i;
+	return n && (i.fillLight = Bt(t), i.fillDiffuse = i.diffuse * Wt), i;
 }
-function Jt(e, t) {
+function qt(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;
@@ -3000,7 +3000,7 @@ function Jt(e, t) {
 	}
 	return Math.max(0, t.ambient + r + i + a);
 }
-function Yt(e, t, n) {
+function Jt(e, t, n) {
 	if (!e) return {
 		x: 0,
 		y: 0,
@@ -3015,16 +3015,16 @@ function Yt(e, t, n) {
 		h: Math.max(0, o - i)
 	};
 }
-function Xt(e, t, n) {
+function Yt(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 } = Yt(n, r, i);
+	let { x: o, y: s, w: c, h: l } = Jt(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 } = Ft(f, c, l, a, t.prst, t.heightPx), g = qt(t.material, t.light), _ = Jt({
+	let { bandMask: p, bandWeight: m, normals: h } = Pt(f, c, l, a, t.prst, t.heightPx), g = Kt(t.material, t.light), _ = qt({
 		x: 0,
 		y: 0,
 		z: 1
@@ -3035,13 +3035,13 @@ function Xt(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 + (Jt({
+		let o = 1 + (qt({
 			x: r,
 			y: i,
 			z: a
 		}, g) / _ - 1) * n, s = e * 4;
 		if (o >= 1) {
-			let e = Math.min(1, (o - 1) * Ut);
+			let e = Math.min(1, (o - 1) * Ht);
 			for (let t = 0; t < 3; t++) {
 				let n = Math.min(255, d[s + t] * o);
 				d[s + t] = n + (255 - n) * e;
@@ -3050,12 +3050,12 @@ function Xt(e, t, n) {
 	}
 	e.putImageData(u, o, s);
 }
-function Zt(e, t, n) {
+function Xt(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 } = Yt(n, r, i);
+	let { x: c, y: l, w: u, h: d } = Jt(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];
@@ -3079,36 +3079,36 @@ function Zt(e, t, n) {
 }
 //#endregion
 //#region packages/core/src/text/underline.ts
-function Qt(t, n, r, i, a, o, s, c = 1) {
-	let l = Math.max(1, a * .05), u = s === "heavy" || (s?.endsWith("Heavy") ?? !1) ? l * 1.8 : l, d = r + Math.max(2, u), f = e(d, u, c);
-	if (t.strokeStyle = o, t.lineWidth = u, t.setLineDash([]), s && s.startsWith("wavy")) {
-		let e = u, r = u * 6;
-		t.beginPath(), t.moveTo(n, d);
-		let a = Math.max(1, u * .5);
-		for (let o = 0; o <= i; o += a) {
-			let i = d + Math.sin(o / r * Math.PI * 2) * e;
-			t.lineTo(n + o, i);
+function Zt(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 = T(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);
+		let a = Math.max(1, l * .5);
+		for (let o = 0; o <= r; o += a) {
+			let r = u + Math.sin(o / i * Math.PI * 2) * n;
+			e.lineTo(t + o, r);
 		}
-		if (t.stroke(), s === "wavyDbl") {
-			t.beginPath(), t.moveTo(n, d + e * 2.5);
-			for (let o = 0; o <= i; o += a) {
-				let i = d + e * 2.5 + Math.sin(o / r * Math.PI * 2) * e;
-				t.lineTo(n + o, i);
+		if (e.stroke(), o === "wavyDbl") {
+			e.beginPath(), e.moveTo(t, u + n * 2.5);
+			for (let o = 0; o <= r; o += a) {
+				let r = u + n * 2.5 + Math.sin(o / i * Math.PI * 2) * n;
+				e.lineTo(t + o, r);
 			}
-			t.stroke();
+			e.stroke();
 		}
 		return;
 	}
-	if (s === "dbl") {
-		let r = u * 1.4, a = d - r / 2, o = d + r / 2;
-		t.beginPath(), t.moveTo(n, a + e(a, u, c)), t.lineTo(n + i, a + e(a, u, c)), t.moveTo(n, o + e(o, u, c)), t.lineTo(n + i, o + e(o, u, c)), t.stroke();
+	if (o === "dbl") {
+		let n = l * 1.4, i = u - n / 2, a = u + n / 2;
+		e.beginPath(), e.moveTo(t, i + T(i, l, s)), e.lineTo(t + r, i + T(i, l, s)), e.moveTo(t, a + T(a, l, s)), e.lineTo(t + r, a + T(a, l, s)), e.stroke();
 		return;
 	}
-	t.setLineDash(Oe(s ?? "sng", u)), t.beginPath(), t.moveTo(n, d + f), t.lineTo(n + i, d + f), t.stroke(), t.setLineDash([]);
+	e.setLineDash(De(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 $t(e, t) {
+function Qt(e, t) {
 	return {
 		top: e - t * .85,
 		height: t * 1.1
@@ -3116,7 +3116,7 @@ function $t(e, t) {
 }
 //#endregion
 //#region packages/core/src/text/justify-positions.ts
-function en(e, t, n, r, i = 0) {
+function $t(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(""),
@@ -3129,14 +3129,14 @@ function en(e, t, n, r, i = 0) {
 }
 //#endregion
 //#region packages/pptx/src/reflection-blur.ts
-var tn = .5;
-function nn(e, t) {
+var en = .5;
+function tn(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 / tn) + 1)), r = e.y + e.h, i = [];
+	let n = Math.max(4, Math.min(24, Math.ceil(t / en) + 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({
@@ -3147,19 +3147,19 @@ function nn(e, t) {
 	}
 	return i;
 }
-function rn(e, t, n, r, i) {
-	for (let a of nn(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 nn(e, t, n, r, i) {
+	for (let a of tn(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 an(e, t) {
+function rn(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 = H(i);
+	let i = n, a = W(i);
 	return a !== null && ie.includes(a) ? {
 		kind: "external",
 		url: i
@@ -3170,7 +3170,7 @@ function an(e, t) {
 }
 //#endregion
 //#region packages/pptx/src/media-chrome.ts
-function on(e, t, n, r, i, a) {
+function an(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();
@@ -3184,18 +3184,18 @@ function on(e, t, n, r, i, a) {
 }
 //#endregion
 //#region packages/pptx/src/bidi-line.ts
-var sn = (e) => {
+var on = (e) => {
 	let t = e.text;
 	return typeof t == "string" ? t : void 0;
-}, cn = (e) => "isTab" in e;
-function ln(e) {
+}, sn = (e) => "isTab" in e;
+function cn(e) {
 	for (let t of e) {
-		let e = sn(t);
-		if (e !== void 0 && ee(e)) return !0;
+		let e = on(t);
+		if (e !== void 0 && z(e)) return !0;
 	}
 	return !1;
 }
-function un(e, n) {
+function ln(e, n) {
 	let r = e.length;
 	if (r === 0) return {
 		order: [],
@@ -3204,14 +3204,14 @@ function un(e, n) {
 	let i = "", a = Array(r), o;
 	for (let t = 0; t < r; t++) {
 		a[t] = i.length;
-		let n = sn(e[t]) ?? "";
-		if (i += n.length > 0 ? n : "", cn(e[t])) {
+		let n = on(e[t]) ?? "";
+		if (i += n.length > 0 ? n : "", sn(e[t])) {
 			for (o ??= []; o.length < i.length;) o.push(null);
 			o[a[t]] = "S";
 		}
 	}
 	if (o) for (; o.length < i.length;) o.push(null);
-	let { levels: s, paragraphLevel: c } = p().computeLevels(i, n ? "rtl" : "ltr", o), { order: l, segLevels: u } = t(s, c, a), d = Array(r);
+	let { levels: s, paragraphLevel: c } = t().computeLevels(i, n ? "rtl" : "ltr", o), { order: l, segLevels: u } = m(s, c, a), d = Array(r);
 	for (let e = 0; e < r; e++) d[e] = (u[e] & 1) == 1;
 	return {
 		order: l,
@@ -3220,32 +3220,32 @@ function un(e, n) {
 }
 //#endregion
 //#region packages/pptx/src/cjk-wrap.ts
-function dn(e, t, n, r, i = 0, a = !1) {
+function un(e, t, n, r, i = 0, a = !1) {
 	if (e.length === 0) return 0;
-	let s = t === 0, c = 0, l = t;
+	let o = t === 0, s = 0, c = t;
 	for (let t of e) {
-		let e = c > 0 || a ? i : 0;
-		if (l + e + t.w > n) {
-			if (c > 0 || !s) break;
-			l += e + t.w, c++;
+		let e = s > 0 || a ? i : 0;
+		if (c + e + t.w > n) {
+			if (s > 0 || !o) break;
+			c += e + t.w, s++;
 			break;
 		}
-		l += e + t.w, c++;
+		c += e + t.w, s++;
 	}
-	return c === 0 ? 0 : c >= e.length ? e.length : o(e.map((e) => e.ch), c, r, +!!s);
+	return s === 0 ? 0 : s >= e.length ? e.length : x(e.map((e) => e.ch), s, r, +!!o);
 }
 //#endregion
 //#region packages/pptx/src/text-justify.ts
-var fn = (e) => /\s/.test(String.fromCodePoint(e));
-function pn(e, t, n, r, i) {
+var dn = (e) => /\s/.test(String.fromCodePoint(e));
+function fn(e, t, n, r, i) {
 	if (r === "just" && i) return null;
 	let a = t - n;
 	if (a <= .5) return null;
-	let o = we(e, a, {
+	let o = Ce(e, a, {
 		firstContentSi: 0,
 		lastDrawnSi: e.length,
-		isGapChar: le,
-		isWhitespace: fn,
+		isGapChar: y,
+		isWhitespace: dn,
 		seaClusterGaps: r === "thaiDist"
 	});
 	if (!o) return null;
@@ -3266,7 +3266,7 @@ function pn(e, t, n, r, i) {
 }
 //#endregion
 //#region packages/pptx/src/table-border-conflict.ts
-function mn(e) {
+function pn(e) {
 	if (!e) return {
 		r: 0,
 		g: 0,
@@ -3283,37 +3283,37 @@ function mn(e) {
 		b: parseInt(t.slice(4, 6), 16)
 	};
 }
-function hn(e) {
-	let t = mn(e);
+function mn(e) {
+	let t = pn(e);
 	return .299 * t.r + .587 * t.g + .114 * t.b;
 }
-function gn(e, t) {
+function hn(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 = hn(e.color), r = hn(t.color);
+	let n = mn(e.color), r = mn(t.color);
 	return n === r || n < r ? e : t;
 }
 //#endregion
 //#region packages/pptx/src/smartart-fallback-contrast.ts
-function _n(e) {
-	let t = P(e.length === 8 ? e.slice(0, 6) : e);
+function gn(e) {
+	let t = K(e.length === 8 ? e.slice(0, 6) : e);
 	if (!t) return null;
-	let n = te(t[0], t[1], t[2]);
+	let n = re(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 vn(e) {
+function _n(e) {
 	if (!e) return null;
-	if (e.fillType === "solid") return _n(e.color);
+	if (e.fillType === "solid") return gn(e.color);
 	if (e.fillType === "gradient") {
 		let t = e.stops.map((e) => ({
 			p: Math.min(1, Math.max(0, e.position)),
-			l: _n(e.color)
+			l: gn(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);
@@ -3322,18 +3322,18 @@ function vn(e) {
 	}
 	return null;
 }
-function yn(e) {
+function vn(e) {
 	return e.name === "SmartArt" && e.id === void 0;
 }
-function bn(e, t) {
-	let n = vn(e);
+function yn(e, t) {
+	let n = _n(e);
 	if (n === null || n >= .5) return null;
-	let r = _n(t.replace(/^#/, ""));
+	let r = gn(t.replace(/^#/, ""));
 	return r !== null && r >= .5 ? null : "#FFFFFF";
 }
 //#endregion
 //#region packages/pptx/src/tab-layout.ts
-function xn(e, t, n, r, i, a = 0) {
+function bn(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];
@@ -3361,8 +3361,8 @@ function xn(e, t, n, r, i, a = 0) {
 }
 //#endregion
 //#region packages/pptx/src/vertical-text.ts
-var Sn = () => !1;
-function Cn(e, t, n) {
+var xn = () => !1;
+function Sn(e, t, n) {
 	let r = e.textBaseline;
 	e.textBaseline = "alphabetic";
 	let i = e.measureText(t);
@@ -3370,7 +3370,7 @@ function Cn(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 wn(e, t) {
+function Cn(e, t) {
 	let n = e.textAlign, r = e.textBaseline;
 	e.textAlign = "center", e.textBaseline = "middle";
 	let i = e.measureText(t);
@@ -3378,15 +3378,15 @@ function wn(e, t) {
 	let a = i.actualBoundingBoxAscent, o = i.actualBoundingBoxDescent;
 	return typeof a == "number" && typeof o == "number" ? (a - o) / 2 : 0;
 }
-function Tn(e, t, n, r, i, a, o = "fill", s = Sn) {
-	let c = e.textAlign, l = e.textBaseline, u = o === "stroke" ? e.strokeText.bind(e) : e.fillText.bind(e), d = r - Cn(e, t, i), f = 0;
+function wn(e, t, n, r, i, a, o = "fill", s = xn) {
+	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 = R(t), p = e.measureText(o).width + a, m = l === "Tr" ? ce(t) : null, h = l === "Tr" && m === null && G(t), g = l === "U" || l === "Tu" || m !== null || h;
-		if (re(t) && s(t)) {
+		let t = o.codePointAt(0) ?? 0, l = oe(t), p = e.measureText(o).width + a, m = l === "Tr" ? A(t) : null, h = l === "Tr" && m === null && N(t), g = l === "U" || l === "Tu" || m !== null || h;
+		if (j(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", M(e, () => u(o, 0, 0)), e.restore();
+			e.save(), e.translate(t, d), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", G(e, () => u(o, 0, 0)), e.restore();
 		} else if (g) {
-			let r = m === null && l === "Tu" ? F(t) : null, a = m === null ? r : m, s = a === null ? o : String.fromCodePoint(a), c = n + f + p / 2, h = r === null ? wn(e, s) / i : 0;
+			let r = m === null && l === "Tu" ? V(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;
@@ -3396,25 +3396,25 @@ function Tn(e, t, n, r, i, a, o = "fill", s = Sn) {
 	}
 	e.textAlign = c, e.textBaseline = l;
 }
-function En(e, t, n, r, i, a, o = "fill") {
-	Tn(e, t, n, r, i, a, o, (t) => oe(e, t));
+function Tn(e, t, n, r, i, a, o = "fill") {
+	wn(e, t, n, r, i, a, o, (t) => D(e, t));
 }
 //#endregion
 //#region packages/pptx/src/renderer.ts
-function Y(e, t) {
+function X(e, t) {
 	return e * t;
 }
-function Dn(e, t, n, r) {
-	let i = Fe(Math.abs(e * n), Math.abs(t * n), r);
+function En(e, t, n, r) {
+	let i = Pe(Math.abs(e * n), Math.abs(t * n), r);
 	return i ? {
 		targetWidthPx: i.width,
 		targetHeightPx: i.height
 	} : void 0;
 }
-function X(e, t) {
-	return Xe(e, t);
+function Z(e, t) {
+	return Ye(e, t);
 }
-function On(e, t) {
+function Dn(e, t) {
 	let n = e.targets.get(t);
 	return n ? {
 		targetWidthPx: n.width,
@@ -3422,11 +3422,11 @@ function On(e, t) {
 		maxRetainedPixels: n.maxRetainedPixels
 	} : void 0;
 }
-function kn(e) {
-	return A(e) ? e.svgImagePath : e.imagePath;
+function On(e) {
+	return J(e) ? e.svgImagePath : e.imagePath;
 }
-function An(e, t, n, r) {
-	let i = $e(t.bullet);
+function kn(e, t, n, r) {
+	let i = Qe(t.bullet);
 	if (i.type !== "blip") return;
 	let a;
 	for (let e of t.runs) if (e.type === "text" && e.fontSize != null) {
@@ -3434,86 +3434,86 @@ function An(e, t, n, r) {
 		break;
 	}
 	let o = a ?? t.defFontSize ?? e.defaultFontSize ?? 18, s = i.sizePts == null ? o * ((i.sizePct ?? 100) / 100) : i.sizePts;
-	return Math.max(1, s * J * n * r);
+	return Math.max(1, s * Y * n * r);
 }
-async function jn(e, t, n, r, i, a, o, c, l, u) {
-	let d = de(a), f = [], p = [], m = (e, t, n, r, i, a = 1, o = i) => {
-		if (!(!t || !i)) {
-			if (C(r) && (d.resolution === "display" || d.strategy === "adaptive")) {
+async function An(e, t, n, r, a, o, s, c, l, u) {
+	let d = de(o), f = [], p = [], m = (e, t, n, r, a, o = 1, s = a) => {
+		if (!(!t || !a)) {
+			if (i(r) && (d.resolution === "display" || d.strategy === "adaptive")) {
 				f.push({
 					key: e,
 					...t,
-					retainedSurfaceCount: a
+					retainedSurfaceCount: o
 				});
 				return;
 			}
-			p.push(B(n, r, i, o).then((n) => n.dimensions && s(n.format, u !== void 0) ? {
+			p.push(U(n, r, a, s).then((n) => n.dimensions && ce(n.format, u !== void 0) ? {
 				key: e,
 				...t,
 				sourceWidthPx: n.dimensions.width,
 				sourceHeightPx: n.dimensions.height,
-				retainedSurfaceCount: a
+				retainedSurfaceCount: o
 			} : null).catch(() => null));
 		}
 	}, h = e.background;
 	if (h?.fillType === "image" && h.imagePath && !h.tile && !h.duotone) {
-		let e = h.fillRect ?? {}, r = t * (1 - (e.l ?? 0) - (e.r ?? 0)), a = n * (1 - (e.t ?? 0) - (e.b ?? 0));
-		m(X(h.imagePath, h.duotone), Dn(r, a, i, h.srcRect), h.imagePath, h.mimeType, o, 1);
+		let e = h.fillRect ?? {}, r = t * (1 - (e.l ?? 0) - (e.r ?? 0)), i = n * (1 - (e.t ?? 0) - (e.b ?? 0));
+		m(Z(h.imagePath, h.duotone), En(r, i, a, h.srcRect), h.imagePath, h.mimeType, s, 1);
 	}
-	for (let t of e.elements) if (t.type === "picture") !(A(t) || t.mimeType === "image/svg+xml") && !t.duotone && m(X(t.imagePath, t.duotone), Dn(Y(t.width, r), Y(t.height, r), i, t.srcRect), t.imagePath, t.mimeType, o, 1);
+	for (let t of e.elements) if (t.type === "picture") !(J(t) || t.mimeType === "image/svg+xml") && !t.duotone && m(Z(t.imagePath, t.duotone), En(X(t.width, r), X(t.height, r), a, t.srcRect), t.imagePath, t.mimeType, s, 1);
 	else if (t.type === "media" && t.posterPath) {
-		let e = c ? Jr(c) : void 0;
-		m(X(t.posterPath), Dn(Y(t.width, r), Y(t.height, r), i), t.posterPath, t.posterMimeType || "application/octet-stream", e, 1, l ?? e);
+		let e = c ? qr(c) : void 0;
+		m(Z(t.posterPath), En(X(t.width, r), X(t.height, r), a), t.posterPath, t.posterMimeType || "application/octet-stream", e, 1, l ?? e);
 	} else if (t.type === "chart") {
 		let e = {
-			widthPt: t.width / J,
-			heightPt: t.height / J,
-			targetWidthPx: Y(t.width, r) * i,
-			targetHeightPx: Y(t.height, r) * i
+			widthPt: t.width / Y,
+			heightPt: t.height / Y,
+			targetWidthPx: X(t.width, r) * a,
+			targetHeightPx: X(t.height, r) * a
 		};
-		for (let n of Ee(t.chart)) {
-			let t = n.fill, r = De(n, e);
-			!(t.mimeType === "image/svg+xml" || A({
+		for (let n of Te(t.chart)) {
+			let t = n.fill, r = Ee(n, e);
+			!(t.mimeType === "image/svg+xml" || J({
 				svgImagePath: t.svgImagePath,
 				srcRect: n.hasSourceCrop ? !0 : null
-			})) && !t.duotone && !n.preserveNaturalSize && r?.targetWidthPx && r.targetHeightPx && m(X(t.imagePath, t.duotone), {
+			})) && !t.duotone && !n.preserveNaturalSize && r?.targetWidthPx && r.targetHeightPx && m(Z(t.imagePath, t.duotone), {
 				targetWidthPx: r.targetWidthPx,
 				targetHeightPx: r.targetHeightPx
-			}, t.imagePath, t.mimeType, o, 1);
+			}, t.imagePath, t.mimeType, s, 1);
 		}
 	} else if (t.type === "shape" && t.textBody) for (let e of t.textBody.paragraphs) {
-		let n = $e(e.bullet);
+		let n = Qe(e.bullet);
 		if (n.type !== "blip") continue;
-		let a = An(t.textBody, e, r, i);
-		!a || !o || p.push(B(n.imagePath, n.mimeType, o).then((e) => e.dimensions && e.dimensions.width > 0 && e.dimensions.height > 0 && s(e.format, u !== void 0) ? {
-			key: X(n.imagePath),
-			targetWidthPx: a * e.dimensions.width / e.dimensions.height,
-			targetHeightPx: a,
+		let i = kn(t.textBody, e, r, a);
+		!i || !s || p.push(U(n.imagePath, n.mimeType, s).then((e) => e.dimensions && e.dimensions.width > 0 && e.dimensions.height > 0 && ce(e.format, u !== void 0) ? {
+			key: Z(n.imagePath),
+			targetWidthPx: i * e.dimensions.width / e.dimensions.height,
+			targetHeightPx: i,
 			sourceWidthPx: e.dimensions.width,
 			sourceHeightPx: e.dimensions.height
 		} : null).catch(() => null));
 	}
-	return f.push(...(await Promise.all(p)).filter((e) => e !== null)), S(f, d);
+	return f.push(...(await Promise.all(p)).filter((e) => e !== null)), k(f, d);
 }
-function Mn(e) {
-	return e.background?.fillType === "image" ? !0 : e.elements.some((e) => e.type === "picture" ? !0 : e.type === "media" ? !!e.posterPath : e.type === "chart" ? Ee(e.chart).length > 0 : e.type === "shape" && !!e.textBody?.paragraphs.some((e) => $e(e.bullet).type === "blip"));
+function jn(e) {
+	return e.background?.fillType === "image" ? !0 : e.elements.some((e) => e.type === "picture" ? !0 : e.type === "media" ? !!e.posterPath : e.type === "chart" ? Te(e.chart).length > 0 : e.type === "shape" && !!e.textBody?.paragraphs.some((e) => Qe(e.bullet).type === "blip"));
 }
-var Z = ke;
-function Nn(e, t, n, r, i, a, o) {
-	let { top: s, height: c } = $t(n, i);
+var Q = Oe;
+function Mn(e, t, n, r, i, a, o) {
+	let { top: s, height: c } = Qt(n, i);
 	e.fillStyle = a, e.fillRect(t, s, r, c), e.fillStyle = o;
 }
-function Pn(e, t, n, r, i, a, o = 0) {
-	return Ie(e, t, n, r, i, a, o);
+function Nn(e, t, n, r, i, a, o = 0) {
+	return Fe(e, t, n, r, i, a, o);
 }
-var Fn = /* @__PURE__ */ new WeakMap();
-function In(e, t) {
+var Pn = /* @__PURE__ */ new WeakMap();
+function Fn(e, t) {
 	let n = e.tinted.get(t);
 	if (n) return n;
 	let r = ae(e.raster, t);
 	return e.tinted.set(t, r), r;
 }
-function Ln(e) {
+function In(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,
@@ -3524,13 +3524,13 @@ function Ln(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 Rn(e, t) {
-	let n = Ln(e);
+async function Ln(e, t) {
+	let n = In(e);
 	if (n.length !== 0) {
 		await t.loadMathJax();
-		for (let e of n) if (!Fn.has(e.nodes)) try {
-			let n = await t.mathMLToSvg(U(e.nodes, e.display)), r = await ne(n, "#000000");
-			Fn.set(e.nodes, {
+		for (let e of n) if (!Pn.has(e.nodes)) try {
+			let n = await t.mathMLToSvg(te(e.nodes, e.display)), r = await M(n, "#000000");
+			Pn.set(e.nodes, {
 				raster: r,
 				widthEm: n.widthEm,
 				ascentEm: n.ascentEm,
@@ -3540,14 +3540,14 @@ async function Rn(e, t) {
 		} catch {}
 	}
 }
-function zn(e, t) {
+function Rn(e, t) {
 	let n = (e) => t.embeddedFontAliases?.get(e.trim().toLowerCase()) ?? e;
 	if (!e) return n(t.themeMinorFont ?? "sans-serif");
 	if (e.startsWith("+")) return n(e === "+mj-lt" || e === "+mj-ea" || e === "+mj-cs" ? t.themeMajorFont ?? "sans-serif" : t.themeMinorFont ?? "sans-serif");
 	let r = e.split(",")[0].trim();
 	return r ? n(r) : t.themeMinorFont ?? "sans-serif";
 }
-var Bn = new Set([
+var zn = new Set([
 	"serif",
 	"sans-serif",
 	"monospace",
@@ -3555,11 +3555,11 @@ var Bn = new Set([
 	"fantasy",
 	"system-ui"
 ]);
-function Vn(e) {
-	let t = l(e);
+function Bn(e) {
+	let t = r(e);
 	return t === "mono" ? "monospace" : t === "serif" ? "serif" : "sans-serif";
 }
-var Hn = {
+var Vn = {
 	calibri: "Carlito",
 	"calibri light": "Carlito",
 	cambria: "Caladea",
@@ -3571,38 +3571,38 @@ var Hn = {
 	"simplified arabic": "Noto Naskh Arabic",
 	"arabic typesetting": "Noto Naskh Arabic",
 	"univers next arabic": "Noto Sans Arabic"
-}, Un = "\"Noto Naskh Arabic\", \"Noto Sans Arabic\"";
-function Wn(e) {
-	if (Hn[e.toLowerCase()]?.includes("Arabic")) return !0;
+}, Hn = "\"Noto Naskh Arabic\", \"Noto Sans Arabic\"";
+function Un(e) {
+	if (Vn[e.toLowerCase()]?.includes("Arabic")) return !0;
 	let t = e.toLowerCase();
 	return /arabic|naskh|kufi|nastaliq|amiri|scheherazade|lateef|aldhabi|urdu|farsi|العرب|[؀-ۿ]/.test(t);
 }
-function Gn(e) {
+function Wn(e) {
 	return e.map((e) => `"${e}"`).join(", ");
 }
-function Kn(e, t = e) {
-	let n = Vn(t), i = Hn[t.toLowerCase()], a = i ? `"${i}", ` : "";
-	if (Wn(t)) return `"${e}", ${a}${Un}, ${n}`;
-	let o = n === "serif" ? "serif" : "sans", s = w(t);
-	return `"${e}", ${a}${s ? `${Gn(r(s, o))}, ` : ""}${`${Gn(o === "serif" ? f : u)}, `}${n}`;
+function Gn(e, t = e) {
+	let n = Bn(t), r = Vn[t.toLowerCase()], i = r ? `"${r}", ` : "", a = C(t), o = a ? `"${a}", ` : "";
+	if (Un(t)) return `"${e}", ${i}${Hn}, ${n}`;
+	let c = n === "serif" ? "serif" : "sans", l = fe(t), u = l ? v(l, c).filter((e) => e !== a) : [];
+	return `"${e}", ${i}${o}${u.length > 0 ? `${Wn(u)}, ` : ""}${`${Wn(c === "serif" ? s : g)}, `}${n}`;
 }
-function qn(e) {
+function Kn(e) {
 	return e ? e.kind === "external" ? `e:${e.url}` : `i:${e.ref}` : "";
 }
-function Jn(e) {
+function qn(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 Yn(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 = je(m, h), _ = g?.getContext("2d");
+function Jn(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 = Ae(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 = je(m, h), t = e?.getContext("2d");
+		let e = Ae(m, h), t = e?.getContext("2d");
 		e && t && (b = e, x = t);
 	}
-	b !== g && rn(x, g, {
+	b !== g && nn(x, g, {
 		x: n.x - u,
 		y: v,
 		w: n.w,
@@ -3629,14 +3629,14 @@ function Yn(e, t, n, r, i, a, o, s) {
 	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 Xn(e, t, n, r, i) {
-	let a = t ? "italic " : "", o = zn(r, i), s = i.embeddedFontAuthoredFamilies?.get(o) ?? o, c = Jn(s), l = e ? "bold " : c ? `${c} ` : "";
-	return Bn.has(o) ? `${a}${l}${n}px ${o}` : `${a}${l}${n}px ${Kn(o, s)}`;
+function Yn(e, t, n, r, i) {
+	let a = t ? "italic " : "", o = Rn(r, i), s = i.embeddedFontAuthoredFamilies?.get(o) ?? o, c = qn(s), l = e ? "bold " : c ? `${c} ` : "";
+	return zn.has(o) ? `${a}${l}${n}px ${o}` : `${a}${l}${n}px ${Gn(o, s)}`;
 }
-function Zn(e) {
-	return e.bullet.type === "char" || e.bullet.type === "autoNum" || $e(e.bullet).type === "blip";
+function Xn(e) {
+	return e.bullet.type === "char" || e.bullet.type === "autoNum" || Qe(e.bullet).type === "blip";
 }
-function Qn(e, t, n) {
+function Zn(e, t, n) {
 	let r = null;
 	for (let e of t.runs) if (e.type === "text" && e.fontSize != null) {
 		r = e.fontSize;
@@ -3645,41 +3645,41 @@ function Qn(e, t, n) {
 	let i = r ?? t.defFontSize ?? e.defaultFontSize ?? 18;
 	return n.sizePts == null ? i * ((n.sizePct ?? 100) / 100) : n.sizePts;
 }
-function $n(e, t) {
+function Qn(e, t) {
 	return e ? 0 : Math.max(0, t);
 }
-function er(e, t) {
+function $n(e, t) {
 	return t != null && t !== 0 ? e * .65 : e;
 }
-function tr(e, t, n, r, i, a, o) {
-	let s = (t.defaultFontSize ?? 18) * J * a;
+function er(e, t, n, r, i, a, o) {
+	let s = (t.defaultFontSize ?? 18) * Y * a;
 	for (let c of t.paragraphs) {
-		let l = Y(c.marL, a), u = Y(c.marR, a), d = Y(c.indent, a), f = $n(Zn(c), d), p = n - r - i - l - u - f, m = 0;
+		let l = X(c.marL, a), u = X(c.marR, a), d = X(c.indent, a), f = Qn(Xn(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 * J * a : n.fontSize * J * a, i = zn(n.fontFamily ?? c.defFontFamily ?? null, o);
-			e.font = Xn(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, er(r, n.baseline ?? void 0), i, o);
-			let l = (n.letterSpacing ?? 0) * J * a;
-			if (m += Q(e, n.text, l), m > p) return !0;
+			let r = n.fontSize == null ? c.defFontSize == null ? s : c.defFontSize * Y * a : n.fontSize * Y * a, i = Rn(n.fontFamily ?? c.defFontFamily ?? null, o);
+			e.font = Yn(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, $n(r, n.baseline ?? void 0), i, o);
+			let l = (n.letterSpacing ?? 0) * Y * a;
+			if (m += $(e, n.text, l), m > p) return !0;
 		}
 	}
 	return !1;
 }
-function nr(e) {
-	for (let t of e) if (le(t.codePointAt(0) ?? 0)) return !0;
+function tr(e) {
+	for (let t of e) if (y(t.codePointAt(0) ?? 0)) return !0;
 	return !1;
 }
-function rr(e) {
+function nr(e) {
 	let t = 0;
 	for (let n of e) t++;
 	return t;
 }
-var ir = /* @__PURE__ */ new WeakMap();
-function ar(e) {
-	let t = ir.get(e);
+var rr = /* @__PURE__ */ new WeakMap();
+function ir(e) {
+	let t = rr.get(e);
 	if (t != null) return t;
 	let n = e, r = n.letterSpacing;
-	if (typeof r != "string") return ir.set(e, !1), !1;
+	if (typeof r != "string") return rr.set(e, !1), !1;
 	let i = !1;
 	try {
 		n.letterSpacing = "0px";
@@ -3694,11 +3694,11 @@ function ar(e) {
 			n.letterSpacing = r;
 		} catch {}
 	}
-	return ir.set(e, i), i;
+	return rr.set(e, i), i;
 }
-function Q(e, t, n) {
+function $(e, t, n) {
 	let r = e, i = r.letterSpacing;
-	if (n !== 0 && ar(e)) try {
+	if (n !== 0 && ir(e)) try {
 		r.letterSpacing = `${n}px`;
 		let i = e.measureText(t).width;
 		if (Number.isFinite(i)) return t.length > 0 ? i - n : i;
@@ -3707,10 +3707,10 @@ function Q(e, t, n) {
 			r.letterSpacing = i;
 		} catch {}
 	}
-	let a = Math.max(0, rr(t) - 1);
+	let a = Math.max(0, nr(t) - 1);
 	return e.measureText(t).width + n * a;
 }
-function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
+function ar(e, t, n, r, i, o, s, c = !1, l = !1, u = 1, d, f = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
@@ -3723,21 +3723,21 @@ function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 		let r = n.text.replace(/ +$/u, "");
 		r !== n.text && h.set(n, r), (r.length > 0 || n.fieldType != null) && (g = !1);
 	}
-	let v = () => n - (m.length === 0 ? p : 0), y = { segments: [] }, b = 0, S = !1, C = t.rtl === !0, w = Y(t.marR, o), T = (t.tabStops ?? []).map((e) => ({
-		pos: Y(e.pos, o),
+	let _ = () => n - (m.length === 0 ? p : 0), v = { segments: [] }, b = 0, x = !1, S = t.rtl === !0, C = X(t.marR, o), w = (t.tabStops ?? []).map((e) => ({
+		pos: X(e.pos, o),
 		algn: e.algn
-	})), E = Y(t.defTabSz ?? 914400, o), D = !1, k = [], A = 0, j = () => C ? w : s + (m.length === 0 ? p : 0), M = (e = 0) => {
-		let t = xn(e > 0 ? [...k, {
+	})), T = X(t.defTabSz ?? 914400, o), D = !1, k = [], A = 0, j = () => S ? C : s + (m.length === 0 ? p : 0), M = (e = 0) => {
+		let t = bn(e > 0 ? [...k, {
 			isTab: !1,
 			width: e
-		}] : k, T, j(), Infinity, A, E), n = 0;
+		}] : k, w, j(), Infinity, A, T), n = 0;
 		for (let e of t) n += e;
 		return n;
 	}, N = (e) => {
-		let t = v();
+		let t = _();
 		return Number.isFinite(t) ? D ? M(e) <= t : b + e <= t : !0;
 	}, P = () => {
-		let e = v();
+		let e = _();
 		if (!D) return e - b;
 		if (!Number.isFinite(e)) return Infinity;
 		if (M(0) >= e) return 0;
@@ -3747,28 +3747,27 @@ function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 			M(r) <= e ? t = r : n = r;
 		}
 		return t;
-	}, F = (e = !1) => {
-		e && (y.endsWithBreak = !0), m.push(y), y = { segments: [] }, b = 0, D = !1, k = [], S = !1;
-	}, I = (t, n, r, i) => {
+	}, I = (e = !1) => {
+		e && (v.endsWithBreak = !0), m.push(v), v = { segments: [] }, b = 0, D = !1, k = [], x = !1;
+	}, L = (t, n, r, i) => {
 		e.font = n;
-		let a = Q(e, t, r), o = y.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;
-	}, L = (t, n, r, i, a, o, s, c) => {
+		let a = $(e, t, r), o = v.segments.at(-1);
+		return !o || o.isTab || o.math || o.sourceRunId !== i ? a : o.font === n && (o.letterSpacingPx ?? 0) === r ? $(e, o.text + t, r) - $(e, o.text, r) : a + r;
+	}, R = (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, v = c?.fontFamily, x = c?.hyperlink, S = c?.drawSizePx ?? r, C = (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 ?? "") && (e.drawSizePx ?? e.sizePx) === S && qn(e.hyperlink) === qn(x) && (l === 0 || e.sourceRunId === u), w = y.segments.at(-1), T = Q(e, t, l);
-		if (w && C(w) ? T = Q(e, w.text + t, l) - Q(e, w.text, l) : w && !w.isTab && !w.math && u != null && w.sourceRunId === u && (T += l), b += T, 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, y = c?.hyperlink, x = c?.drawSizePx ?? r, 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.drawSizePx ?? e.sizePx) === x && Kn(e.hyperlink) === Kn(y) && (l === 0 || e.sourceRunId === u), C = v.segments.at(-1), w = $(e, t, l);
+		if (C && S(C) ? w = $(e, C.text + t, l) - $(e, C.text, l) : C && !C.isTab && !C.math && u != null && C.sourceRunId === u && (w += l), b += w, k.push({
 			isTab: !1,
-			width: T
-		}), w && C(w)) w.text += t;
+			width: w
+		}), C && S(C)) C.text += t;
 		else {
-			let e = w && !w.isTab && !w.math && u != null && w.sourceRunId === u ? l : 0;
-			y.segments.push({
+			let e = C && !C.isTab && !C.math && u != null && C.sourceRunId === u ? l : 0;
+			v.segments.push({
 				text: t,
 				font: n,
-				fontFamily: v,
 				sizePx: r,
-				drawSizePx: S,
+				drawSizePx: x,
 				color: i,
 				underline: a,
 				underlineStyle: f,
@@ -3783,17 +3782,17 @@ function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				reflection: h,
 				outline: g,
 				highlight: _,
-				hyperlink: x
+				hyperlink: y
 			});
 		}
-	}, R = () => {
-		let e = y.segments.at(-1);
+	}, z = () => {
+		let e = v.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 (y.segments.length > 1) y.segments.pop(), n = e.text;
+		else if (v.segments.length > 1) v.segments.pop(), n = e.text;
 		else return !1;
-		return F(), L(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
+		return I(), R(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
 			strikeDouble: e.strikeDouble,
 			letterSpacingPx: e.letterSpacingPx,
 			underlineStyle: e.underlineStyle,
@@ -3802,69 +3801,66 @@ function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 			reflection: e.reflection,
 			outline: e.outline,
 			highlight: e.highlight,
-			fontFamily: e.fontFamily,
 			sourceRunId: e.sourceRunId,
 			drawSizePx: e.drawSizePx
 		}), !0;
 	};
 	for (let [n, s] of t.runs.entries()) {
 		if (s.type === "break") {
-			F(!0);
+			I(!0);
 			continue;
 		}
 		if (s.type === "math") {
-			let e = Fn.get(s.nodes), t = s.fontSize == null ? r : s.fontSize * J * 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 ? r : s.fontSize * Y * o * u, n = e ? e.widthEm * t : 0, a = e ? e.ascentEm * t : 0, c = e ? e.descentEm * t : 0;
+			(s.display && b > 0 || !N(n) && b > 0) && I(), k.push({
 				isTab: !1,
 				width: n
-			}), y.segments.push({
+			}), v.segments.push({
 				text: "",
 				font: `${t}px sans-serif`,
 				sizePx: t,
-				color: s.color ? Z(s.color) : a,
+				color: s.color ? Q(s.color) : i,
 				underline: !1,
 				strikethrough: !1,
 				math: {
 					nodes: s.nodes,
 					display: s.display,
 					width: n,
-					ascent: i,
+					ascent: a,
 					descent: c
 				}
-			}), b += n, s.display && F();
+			}), b += n, s.display && I();
 			continue;
 		}
-		let p = s.fontSize == null ? r : s.fontSize * J * o * u, m = er(p, s.baseline ?? void 0), g = zn(s.fontFamily ?? t.defFontFamily ?? null, f), C = s.fontFamilyEa ? zn(s.fontFamilyEa, f) : null, w = s.fontFamilySym ? zn(s.fontFamilySym, f) : null, T;
-		T = s.color ? Z(s.color) : s.hyperlink && f.themeHlinkColor ? Z(f.themeHlinkColor) : a;
-		let E = s.bold ?? t.defBold ?? c, j = s.italic ?? t.defItalic ?? l, M = Xn(E, j, m, g, f), B = C ? Xn(E, j, m, C, f) : M;
+		let p = s.fontSize == null ? r : s.fontSize * Y * o * u, m = $n(p, s.baseline ?? void 0), g = Rn(s.fontFamily ?? t.defFontFamily ?? null, f), S = s.fontFamilyEa ? Rn(s.fontFamilyEa, f) : null, C = s.fontFamilySym ? Rn(s.fontFamilySym, f) : null, w;
+		w = s.color ? Q(s.color) : s.hyperlink && f.themeHlinkColor ? Q(f.themeHlinkColor) : i;
+		let T = s.bold ?? t.defBold ?? c, j = s.italic ?? t.defItalic ?? l, M = Yn(T, j, m, g, f), B = S ? Yn(T, j, m, S, f) : M;
 		e.font = M;
-		let H = s.caps, U = h.get(s) ?? s.text;
-		(H === "all" || H === "small") && (U = U.toUpperCase());
-		let ee = s.fieldType === "slidenum" && d !== void 0 ? String(d) : U, W = s.underline || s.hyperlink !== void 0, te = s.strikeDouble === !0, G = s.letterSpacing == null ? 0 : s.letterSpacing * J * o, K = {
+		let V = s.caps, H = h.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, te = s.strikeDouble === !0, G = s.letterSpacing == null ? 0 : s.letterSpacing * Y * o, K = {
 			strikeDouble: te,
 			letterSpacingPx: G,
 			underlineStyle: s.underlineStyle,
-			underlineColor: s.underlineColor ? Z(s.underlineColor) : void 0,
+			underlineColor: s.underlineColor ? Q(s.underlineColor) : void 0,
 			shadow: s.shadow,
 			reflection: s.reflection,
 			outline: s.outline,
-			fontFamily: g,
-			highlight: s.highlight ? Z(s.highlight) : void 0,
-			hyperlink: an(s.hyperlink),
+			highlight: s.highlight ? Q(s.highlight) : void 0,
+			hyperlink: rn(s.hyperlink),
 			sourceRunId: n,
 			drawSizePx: m
-		}, q = ee.split(/(\s+)/);
-		for (let r of q) {
+		}, J = U.split(/(\s+)/);
+		for (let r of J) {
 			if (!r) continue;
 			if (/^\t+$/.test(r)) {
 				D || (e.font = M, A = e.measureText(" ").width);
-				for (let e of r) y.segments.push({
+				for (let e of r) v.segments.push({
 					text: "",
 					isTab: !0,
 					font: M,
-					fontFamily: g,
 					sizePx: p,
-					color: T,
+					color: w,
 					underline: !1,
 					strikethrough: !1
 				}), k.push({
@@ -3875,132 +3871,133 @@ function or(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				continue;
 			}
 			e.font = M;
-			let a = I(r, M, G, n), o = /^\s+$/.test(r), c = /[-]/;
-			if (c.test(r) && (w != null || _e(g))) {
-				let t = w ?? g;
+			let i = L(r, M, G, n), o = /^\s+$/.test(r), c = /[-]/;
+			if (c.test(r) && (C != null || ge(g))) {
+				let t = C ?? g;
 				for (let i of r) {
 					let r = i, a = M;
 					if (c.test(i)) {
-						let e = xe(i, t);
-						e === i ? a = Xn(E, j, m, t, f) : (r = e, a = Xn(E, j, m, "sans-serif", f));
+						let e = be(i, t);
+						e === i ? a = Yn(T, j, m, t, f) : (r = e, a = Yn(T, j, m, "sans-serif", f));
 					}
-					e.font = a, !N(I(r, a, G, n)) && b > 0 && F(), L(r, a, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
+					e.font = a, !N(L(r, a, G, n)) && b > 0 && I(), R(r, a, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
 				}
 				continue;
 			}
-			if (nr(r) && (!V(r) || t.eaLnBrk === !1)) {
-				let i = [];
+			if (tr(r) && (!q(r) || t.eaLnBrk === !1)) {
+				let i = [], o = "", c = () => {
+					o !== "" && (e.font = M, i.push({
+						ch: o,
+						w: $(e, o, G),
+						font: M
+					}), o = "");
+				};
 				for (let t of r) {
-					let n = le(t.codePointAt(0) ?? 0) && C != null, r = n ? B : M, a = n ? C : g;
-					e.font = r, i.push({
+					if (!y(t.codePointAt(0) ?? 0)) {
+						o += t;
+						continue;
+					}
+					c();
+					let n = S == null ? M : B;
+					e.font = n, i.push({
 						ch: t,
-						w: Q(e, t, 0),
-						font: r,
-						family: a
+						w: $(e, t, 0),
+						font: n
 					});
 				}
-				if (t.eaLnBrk === !1) {
-					let e = y.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) * G + (t && i.length > 0 ? G : 0);
-					b > 0 && !N(r) && F();
-					for (let e of i) L(e.ch, e.font, p, T, W, s.strikethrough, s.baseline ?? void 0, {
-						...K,
-						fontFamily: e.family
-					});
+				if (c(), 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) * G + (t && i.length > 0 ? G : 0);
+					b > 0 && !N(r) && I();
+					for (let e of i) R(e.ch, e.font, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
 					continue;
 				}
-				let a = i;
-				for (; a.length > 0;) {
-					let e = Number.isFinite(v()) ? v() - P() : b, t = y.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = dn(a, e, v(), _, G, r);
+				let l = i;
+				for (; l.length > 0;) {
+					let e = Number.isFinite(_()) ? _() - P() : b, t = v.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = un(l, e, _(), a, G, r);
 					if (i === 0) {
 						if (b > 0) {
-							F();
+							I();
 							continue;
 						}
 						i = 1;
 					}
 					for (let e = 0; e < i; e++) {
-						let t = a[e];
-						L(t.ch, t.font, p, T, W, s.strikethrough, s.baseline ?? void 0, {
-							...K,
-							fontFamily: t.family
-						});
+						let t = l[e];
+						R(t.ch, t.font, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
 					}
-					a = a.slice(i), a.length > 0 && F();
+					l = l.slice(i), l.length > 0 && I();
 				}
 				continue;
 			}
-			if (V(r)) {
-				let t = x(r, {
+			if (q(r)) {
+				let t = O(r, {
 					cjk: !0,
-					kinsoku: _
-				}), i = C != null && B !== M, a = (e) => i && le(e.codePointAt(0) ?? 0), o = (t) => {
-					let r = 0, i = y.segments.at(-1), o = !!i && !i.isTab && !i.math && i.sourceRunId === n, s = "", c = null, l = () => {
-						s !== "" && (e.font = c ? B : M, r += Q(e, s, G), o && (r += G), o = !0, s = "");
+					kinsoku: a
+				}), i = S != null && B !== M, o = (e) => i && y(e.codePointAt(0) ?? 0), c = (t) => {
+					let r = 0, i = v.segments.at(-1), a = !!i && !i.isTab && !i.math && i.sourceRunId === n, s = "", c = null, l = () => {
+						s !== "" && (e.font = c ? B : M, r += $(e, s, G), a && (r += G), a = !0, s = "");
 					};
 					for (let e of t) {
-						let t = a(e);
+						let t = o(e);
 						c === null || t === c ? (s += e, c = t) : (l(), s = e, c = t);
 					}
 					return l(), r;
-				}, c = (e) => {
+				}, l = (e) => {
 					let t = "", n = null, r = () => {
-						if (t === "") return;
-						let e = n ? B : M, r = n ? C : g;
-						L(t, e, p, T, W, s.strikethrough, s.baseline ?? void 0, {
-							...K,
-							fontFamily: r
-						}), t = "";
+						t !== "" && (R(t, n ? B : M, p, w, W, s.strikethrough, s.baseline ?? void 0, K), t = "");
 					};
 					for (let i of e) {
-						let e = a(i);
+						let e = o(i);
 						n === null || e === n ? (t += i, n = e) : (r(), t = i, n = e);
 					}
 					r();
-				}, l = fe(r), u = r.length, d = 0;
-				for (; d < u;) {
-					let e = P(), n = z(r, t, d, e, o, l);
-					if (n <= d) {
+				}, u = E(r), d = r.length, f = 0;
+				for (; f < d;) {
+					let e = P(), n = ee(r, t, f, e, c, u);
+					if (n <= f) {
 						if (b > 0) {
-							F();
+							I();
 							continue;
 						}
-						let i = t.find((e) => e > d) ?? u, a = r.slice(d, i), s = O(a), c = z(a, s, 0, e, o, l);
-						c <= 0 && (c = s.length > 0 ? s[0] : a.length), n = d + c;
+						let i = t.find((e) => e > f) ?? d, a = r.slice(f, i), o = F(a), s = ee(a, o, 0, e, c, u);
+						s <= 0 && (s = o.length > 0 ? o[0] : a.length), n = f + s;
 					}
-					c(r.slice(d, n)), d = n, d < u && F();
+					l(r.slice(f, n)), f = n, f < d && I();
 				}
 				continue;
 			}
-			if (N(a)) L(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K), o && (S = !0);
-			else if (o) b > 0 && F();
-			else if (a > v()) {
-				b > 0 && F();
-				for (let t of r) e.font = M, !N(I(t, M, G, n)) && b > 0 && F(), L(t, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
-			} else if (!S) L(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
-			else {
-				let e = y.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 && _.lineStartForbidden.has(t) && a, c = n !== void 0 && t !== void 0 && a && !V(e) && !V(r) && i(n, t);
-				(o || c) && R() || F(), L(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
+			if (N(i)) R(r, M, p, w, W, s.strikethrough, s.baseline ?? void 0, K), o && (x = !0);
+			else if (o) b > 0 && I();
+			else if (i > _()) {
+				b > 0 && I();
+				for (let t of r) e.font = M, !N(L(t, M, G, n)) && b > 0 && I(), R(t, M, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
+			} else if (x) {
+				let e = v.segments.at(-1)?.text ?? "", t = r.codePointAt(0), n = [...e].at(-1)?.codePointAt(0), i = /\S$/u.test(e) && /^\S/u.test(r) && n !== 8203 && t !== 8203, o = t !== void 0 && a.lineStartForbidden.has(t) && i, c = n !== void 0 && t !== void 0 && i && !q(e) && !q(r) && le(n, t);
+				(o || c) && z() || I(), R(r, M, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
+			} else {
+				let e = [...v.segments.at(-1)?.text ?? ""].at(-1)?.codePointAt(0), t = r.codePointAt(0);
+				e !== void 0 && t !== void 0 && y(e) !== y(t) && !le(e, t) && b > 0 && I(), R(r, M, p, w, W, s.strikethrough, s.baseline ?? void 0, K);
 			}
 		}
 	}
-	return m.push(y), m;
+	return m.push(v), m;
 }
-async function sr(e, t, n, r, i, o, s, c, l, u) {
+async function or(e, t, n, r, i, a, o, s, c, l) {
 	if (t && t.fillType === "image") {
-		if (e.fillStyle = "#FFFFFF", e.fillRect(0, 0, n, r), !t.imagePath || !t.mimeType || !s) return;
+		if (e.fillStyle = "#FFFFFF", e.fillRect(0, 0, n, r), !t.imagePath || !t.mimeType || !o) return;
 		try {
-			let a = t.fillRect ?? {}, d = a.l ?? 0, f = a.t ?? 0, p = a.r ?? 0, m = a.b ?? 0, h = d * n, g = f * r, _ = n * (1 - d - p), v = r * (1 - f - m), y = u && !t.duotone ? On(u, X(t.imagePath, t.duotone)) : void 0, b = t.tile ? await B(t.imagePath, t.mimeType, s) : void 0, x = await Ye(t.imagePath, t.mimeType, t.duotone, s, {
-				widthPt: n / i / J,
-				heightPt: r / i / J,
+			let u = t.fillRect ?? {}, d = u.l ?? 0, f = u.t ?? 0, p = u.r ?? 0, m = u.b ?? 0, h = d * n, g = f * r, _ = n * (1 - d - p), v = r * (1 - f - m), y = l && !t.duotone ? Dn(l, Z(t.imagePath, t.duotone)) : void 0, b = t.tile ? await U(t.imagePath, t.mimeType, o) : void 0, x = await Je(t.imagePath, t.mimeType, t.duotone, o, {
+				widthPt: n / i / Y,
+				heightPt: r / i / Y,
 				...y ?? {},
-				tiff: c,
-				svgDecoder: l
+				tiff: s,
+				svgDecoder: c
 			});
-			if (o() || !x) return;
-			e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile ? dr(e, x, t.tile, n, r, i, t.srcRect, b?.dimensions ?? void 0) : Me(e, x, t.srcRect, h, g, _, v), e.restore();
+			if (a() || !x) return;
+			e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile ? ur(e, x, t.tile, n, r, i, t.srcRect, b?.dimensions ?? void 0) : je(e, x, t.srcRect, h, g, _, v), e.restore();
 		} catch (t) {
-			if (a(t, "tiff")) {
-				ue(e, "tiff", {
+			if (ue(t, "tiff")) {
+				b(e, "tiff", {
 					x: 0,
 					y: 0,
 					width: n,
@@ -4008,14 +4005,14 @@ async function sr(e, t, n, r, i, o, s, c, l, u) {
 				});
 				return;
 			}
-			if (Re(t) || Je(t)) throw t;
+			if (Le(t) || qe(t)) throw t;
 		}
 		return;
 	}
-	e.fillStyle = Pn(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
+	e.fillStyle = Nn(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
 }
-var cr = 9525;
-function lr(e, t, n, r, i) {
+var sr = 9525;
+function cr(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;
@@ -4024,52 +4021,52 @@ function lr(e, t, n, r, i) {
 		ay: o
 	};
 }
-function ur(e, t, n) {
+function lr(e, t, n) {
 	return {
 		width: e * (n ? 1 - n.l - n.r : 1),
 		height: t * (n ? 1 - n.t - n.b : 1)
 	};
 }
-function dr(e, t, n, r, i, a, o, s) {
-	let c = ur(s?.width ?? t.width, s?.height ?? t.height, o), l = c.width * cr * (n.sx ?? 1) * a, u = c.height * cr * (n.sy ?? 1) * a;
+function ur(e, t, n, r, i, a, o, s) {
+	let c = lr(s?.width ?? t.width, s?.height ?? t.height, o), l = c.width * sr * (n.sx ?? 1) * a, u = c.height * sr * (n.sy ?? 1) * a;
 	if (!(l > 0) || !(u > 0)) return;
-	let d = n.flip === "x" || n.flip === "xy", f = n.flip === "y" || n.flip === "xy", p = je(l * (d ? 2 : 1), u * (f ? 2 : 1));
+	let d = n.flip === "x" || n.flip === "xy", f = n.flip === "y" || n.flip === "xy", p = Ae(l * (d ? 2 : 1), u * (f ? 2 : 1));
 	if (!p) return;
 	let m = p.getContext("2d");
 	if (!m) return;
 	let h = (e, n, r, i) => {
-		m.save(), m.translate(e + (r ? l : 0), n + (i ? u : 0)), m.scale(r ? -1 : 1, i ? -1 : 1), Me(m, t, o, 0, 0, l, u), m.restore();
+		m.save(), m.translate(e + (r ? l : 0), n + (i ? u : 0)), m.scale(r ? -1 : 1, i ? -1 : 1), je(m, t, o, 0, 0, l, u), m.restore();
 	};
 	h(0, 0, !1, !1), d && h(l, 0, !0, !1), f && h(0, u, !1, !0), d && f && h(l, u, !0, !0);
 	let g = e.createPattern(p, "repeat");
 	if (!g) return;
-	let { ax: _, ay: v } = lr(n.algn ?? "tl", r, i, l, u), y = _ + Y(n.tx ?? 0, a), b = v + Y(n.ty ?? 0, a);
+	let { ax: _, ay: v } = cr(n.algn ?? "tl", r, i, l, u), y = _ + X(n.tx ?? 0, a), b = v + X(n.ty ?? 0, a);
 	typeof g.setTransform == "function" && typeof DOMMatrix < "u" ? (g.setTransform(new DOMMatrix().translateSelf(y, b)), e.fillStyle = g, e.fillRect(0, 0, r, i)) : (e.save(), e.translate(y, b), e.fillStyle = g, e.fillRect(-y, -b, r, i), e.restore());
 }
-function fr(e, t, n) {
+function dr(e, t, n) {
 	if (!t) return;
-	let r = t.dir * Math.PI / 180, i = Y(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 = X(t.dist, n);
+	e.shadowColor = Q(t.color, t.alpha), e.shadowBlur = 0, e.shadowOffsetX = Math.cos(r) * i, e.shadowOffsetY = Math.sin(r) * i;
 }
-function pr(e, t, n) {
-	t && (e.shadowColor = Z(t.color, t.alpha), e.shadowBlur = Y(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
+function fr(e, t, n) {
+	t && (e.shadowColor = Q(t.color, t.alpha), e.shadowBlur = X(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
 }
-function mr(e) {
+function pr(e) {
 	e.shadowColor = "transparent", e.shadowBlur = 0, e.shadowOffsetX = 0, e.shadowOffsetY = 0;
 }
-var hr = 8, gr = 1, _r = 1, vr = 256;
-function yr(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
+var mr = 8, hr = 1, gr = 1, _r = 256;
+function vr(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(vr, Math.max(1, Math.round(b / hr))), S = (e) => Sr(e, a, r, o, s, c, u, d), C = S(x), w = wr(C, a, o, s, c, u, d, l, i, -g, _);
-	for (; w > _r && x < vr;) {
-		let e = Math.min(vr, x * 2), t = S(e), n = wr(t, a, o, s, c, u, d, l, i, -g, _);
+	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(_r, Math.max(1, Math.round(b / mr))), S = (e) => xr(e, a, r, o, s, c, u, d), C = S(x), w = Cr(C, a, o, s, c, u, d, l, i, -g, _);
+	for (; w > gr && x < _r;) {
+		let e = Math.min(_r, x * 2), t = S(e), n = Cr(t, a, o, s, c, u, d, l, i, -g, _);
 		if (n >= w * .75) {
 			C = t;
 			break;
 		}
 		x = e, C = t, w = n;
 	}
-	let T = 1e4, E = gr / (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) => {
+	let T = 1e4, E = hr / (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;
@@ -4077,7 +4074,7 @@ function yr(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
 			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();
 		}
-	}, j = br(m), M = typeof e.globalAlpha == "number" ? e.globalAlpha : 1;
+	}, j = yr(m), M = typeof e.globalAlpha == "number" ? e.globalAlpha : 1;
 	if (j >= 1 && M >= 1) {
 		A(e, m);
 		return;
@@ -4097,67 +4094,67 @@ function yr(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
 			[s, _],
 			[c, _]
 		]) {
-			let n = Cr(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;
+			let n = Sr(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 (!(I > P && L > F)) return;
-	let R = Math.floor(P - 2), z = Math.floor(F - 2), B = je(Math.ceil(I + 2) - R, Math.ceil(L + 2) - z), V = B ? B.getContext("2d") : null;
+	let R = Math.floor(P - 2), z = Math.floor(F - 2), B = Ae(Math.ceil(I + 2) - R, Math.ceil(L + 2) - z), V = B ? B.getContext("2d") : null;
 	if (!B || !V) {
 		A(e, m);
 		return;
 	}
-	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, xr(m)), e.save(), e.setTransform(1, 0, 0, 1, 0, 0), e.globalAlpha = M * j, e.drawImage(B, R, z), e.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, br(m)), e.save(), e.setTransform(1, 0, 0, 1, 0, 0), e.globalAlpha = M * j, e.drawImage(B, R, z), e.restore();
 }
-function br(e) {
+function yr(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 xr(e) {
+function br(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 Sr(e, t, n, r, i, a, o, s) {
+function xr(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: pt(t, (r + (u + d) / 2) / i * a, o, s)
+			g: ft(t, (r + (u + d) / 2) / i * a, o, s)
 		};
 	}
 	return c;
 }
-function Cr(e, t, n, r) {
+function Sr(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 wr(e, t, n, r, i, a, o, s, c, l, u) {
+function Cr(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 = pt(t, (n + p) / r * i, a, o);
+			let m = ft(t, (n + p) / r * i, a, o);
 			for (let t of [l, u]) {
-				let n = Cr(m, s, 0, t), r = Cr(f.g, s, p - e, t), i = Math.hypot(r.x - n.x, r.y - n.y) * c;
+				let n = Sr(m, s, 0, t), r = Sr(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 Tr(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 = lt(n, r, p, m);
+function wr(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 = ct(n, r, p, m);
 	if (!h) return;
-	let g = t.defaultBold ?? !1, _ = t.defaultItalic ?? !1, v = (t.defaultFontSize ?? 18) * J * c, y = [];
+	let g = t.defaultBold ?? !1, _ = t.defaultItalic ?? !1, v = (t.defaultFontSize ?? 18) * Y * c, y = [];
 	for (let n of t.paragraphs) {
-		let t = or(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * J * c, n.defColor ? Z(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
+		let t = ar(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * Y * c, n.defColor ? Q(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
 		for (let e of t) y.push(e);
 	}
 	if (y.length === 0) return;
@@ -4176,10 +4173,10 @@ function Tr(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 * rr(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 * nr(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 = ft(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 = dt(h, a), b = 0;
 		for (let t of n.segments) {
 			if (t.math) {
 				b += t.math.width;
@@ -4190,17 +4187,17 @@ function Tr(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) {
-					yr(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
+					vr(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
 					continue;
 				}
-				let l = pt(h, (b + o / 2) / a * v, _, c);
+				let l = ft(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 Er(e, t, n, r, i, a, o) {
+function Tr(e, t, n, r, i, a, o) {
 	let s = Math.min(r, i);
 	switch (e) {
 		case "rightarrow":
@@ -4230,17 +4227,17 @@ function Er(e, t, n, r, i, a, o) {
 		default: return null;
 	}
 }
-function Dr(e, t) {
-	return e.defaultTextColor ? Z(e.defaultTextColor) : t.smartArtFallbackTextColor != null && yn(e) ? t.smartArtFallbackTextColor : null;
+function Er(e, t) {
+	return e.defaultTextColor ? Q(e.defaultTextColor) : t.smartArtFallbackTextColor != null && vn(e) ? t.smartArtFallbackTextColor : null;
 }
-function Or(e, t, n) {
+function Dr(e, t, n) {
 	return {
 		outerRotation: e,
 		localFlipH: t,
 		localFlipV: n
 	};
 }
-function kr(e, t, n, r, i) {
+function Or(e, t, n, r, i) {
 	let a = [
 		{
 			x: t,
@@ -4269,7 +4266,7 @@ function kr(e, t, n, r, i) {
 		h: l - s
 	};
 }
-var Ar = {
+var kr = {
 	tl: [0, 0],
 	t: [.5, 0],
 	tr: [1, 0],
@@ -4280,15 +4277,15 @@ var Ar = {
 	b: [.5, 1],
 	br: [1, 1]
 };
-function jr(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 Mr(e, t, n, r, i, a) {
-	let [o, s] = Ar[a ?? "b"];
-	return jr(e, t + o * r, n + s * i);
+function jr(e, t, n, r, i, a) {
+	let [o, s] = kr[a ?? "b"];
+	return Ar(e, t + o * r, n + s * i);
 }
-function Nr(e, t, n, r, i, a, o, s) {
-	let c = Ct(e, i, a).corners, l = (o > 0 ? Ke(c, o / i, o / a) ?? c : c).map((e) => jr(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, _] = Ar[s ?? "b"], v = Ue(c, g, _);
+function Mr(e, t, n, r, i, a, o, s) {
+	let c = St(e, i, a).corners, l = (o > 0 ? Ge(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, _] = kr[s ?? "b"], v = He(c, g, _);
 	return {
 		bbox: {
 			x: f,
@@ -4296,15 +4293,15 @@ function Nr(e, t, n, r, i, a, o, s) {
 			w: m - f,
 			h: h - p
 		},
-		anchor: v ? jr(t, n + v.x, r + v.y) : Mr(t, n, r, i, a, s)
+		anchor: v ? Ar(t, n + v.x, r + v.y) : jr(t, n, r, i, a, s)
 	};
 }
-function Pr(e, t, n, r) {
+function Nr(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) || He(o, s).clamped) return e;
+	if (r && (i + o <= 0 || a + s <= 0 || i >= r.w || a >= r.h) || Ve(o, s).clamped) return e;
 	let c = null;
 	try {
-		c = je(o, s);
+		c = Ae(o, s);
 	} catch {
 		return e;
 	}
@@ -4323,7 +4320,7 @@ function Pr(e, t, n, r) {
 		e.save(), e.setTransform(u), e.drawImage(c, i, a), e.restore();
 	};
 }
-function Fr(e, t, n, r, i, a, o, s, c, l = !0, u = r) {
+function Pr(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,
@@ -4338,32 +4335,32 @@ function Fr(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 = !Ge(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), Be(e, g, i, t.reflection, s, d, f), e.restore()), y ? fr(e, t.shadow ?? null, o) : t.glow && pr(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), Ve(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && mr(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), We(e, v, i, t.innerShadow, s, d, f), e.restore());
+	t.shadow && p ? (e.save(), e.setTransform(m), y = !We(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), ze(e, g, i, t.reflection, s, d, f), e.restore()), y ? dr(e, t.shadow ?? null, o) : t.glow && fr(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), Be(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && pr(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), Ue(e, v, i, t.innerShadow, s, d, f), e.restore());
 }
-function Ir(e, t, r, i = "#000000", a, o = {
+function Fr(e, t, r, i = "#000000", a, o = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
 }, s, c) {
-	let l = Y(t.x, r), u = Y(t.y, r), d = Y(t.width, r), f = Y(t.height, r), p = s && t.id !== void 0 ? (e) => s({
+	let l = X(t.x, r), u = X(t.y, r), d = X(t.width, r), f = X(t.height, r), p = s && t.id !== void 0 ? (e) => s({
 		...e,
 		shapeId: t.id
 	}) : s;
 	if (f === 0 && t.textBody?.verticalAnchor === "b") {
-		if (t.stroke && (e.save(), ei(e, t.stroke, r, {
+		if (t.stroke && (e.save(), $r(e, t.stroke, r, {
 			x: l,
 			y: u,
 			w: d,
 			h: 1
 		}, t.rotation), e.beginPath(), e.moveTo(l, u), e.lineTo(l + d, u), e.stroke(), e.restore()), t.textBody) {
-			let n = Dr(t, o);
-			Hr(e, t.textBody, l, u, d, f, r, n, t.rotation, t.flipH, t.flipV, i, a, o, p, !1, c);
+			let n = Er(t, o);
+			Vr(e, t.textBody, l, u, d, f, r, n, t.rotation, t.flipH, t.flipV, i, a, o, p, !1, c);
 		}
 		return;
 	}
-	let h = t.scene3d && wt(t.scene3d.camera) ? t.scene3d : null;
-	if (h && d > 0 && f > 0) {
-		let n = e.getTransform(), s = Math.abs(n.a * n.d - n.b * n.c), c = s > 0 ? Math.sqrt(s) : 1, p = Ur(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, r, c), m = Wr(t.sp3d, h.camera, d, f, r, c), g = Or(t.rotation, t.flipH, t.flipV);
+	let m = t.scene3d && Ct(t.scene3d.camera) ? t.scene3d : null;
+	if (m && d > 0 && f > 0) {
+		let n = e.getTransform(), s = Math.abs(n.a * n.d - n.b * n.c), c = s > 0 ? Math.sqrt(s) : 1, p = Hr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, r, c), h = Ur(t.sp3d, m.camera, d, f, r, c), g = Dr(t.rotation, t.flipH, t.flipV);
 		e.save(), g.outerRotation !== 0 && (e.translate(l + d / 2, u + f / 2), e.rotate(g.outerRotation * Math.PI / 180), e.translate(-(l + d / 2), -(u + f / 2)));
 		let _ = {
 			...t,
@@ -4386,21 +4383,21 @@ function Ir(e, t, r, i = "#000000", a, o = {
 			..._,
 			fill: null,
 			stroke: null
-		}, b = (t.stroke ? t.stroke.width * r / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * r : 0) + (m ? Math.hypot(m.offsetX, m.offsetY) / c : 0) + 2, x = (e, t, n) => Gr(e, h.camera, l, u, d, f, (e) => {
-			Ir(e, t, r, i, a, o, void 0);
+		}, b = (t.stroke ? t.stroke.width * r / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * r : 0) + (h ? Math.hypot(h.offsetX, h.offsetY) / c : 0) + 2, x = (e, t, n) => Wr(e, m.camera, l, u, d, f, (e) => {
+			Fr(e, t, r, i, a, o, void 0);
 		}, n ? {
 			bevels: p,
-			extrusion: m ?? void 0,
+			extrusion: h ?? 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 n = e.getTransform(), i = Math.abs(n.a * n.d - n.b * n.c), a = i > 0 ? Math.sqrt(i) : 1, o = Nr(h.camera, n, l, u, d, f, b, t.shadow?.algn), s = !1, c = Pr((e) => {
+			let n = e.getTransform(), i = Math.abs(n.a * n.d - n.b * n.c), a = i > 0 ? Math.sqrt(i) : 1, o = Mr(m.camera, n, l, u, d, f, b, t.shadow?.algn), s = !1, c = Nr((e) => {
 				s = S(e) || s;
 			}, n, o.bbox, {
 				w: e.canvas.width || 0,
 				h: e.canvas.height || 0
 			});
-			if (Fr(e, t, c, c, o.bbox, o.anchor, r, r * a, n, !!t.fill), s) {
+			if (Pr(e, t, c, c, o.bbox, o.anchor, r, r * a, n, !!t.fill), s) {
 				C(e), e.restore();
 				return;
 			}
@@ -4411,9 +4408,9 @@ function Ir(e, t, r, i = "#000000", a, o = {
 		e.restore();
 	}
 	e.save(), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(l + d / 2, u + f / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(l + d / 2), -(u + f / 2)));
-	let _ = t.geometry.toLowerCase(), v = Pn(t.fill, e, l, u, d, f, t.rotation);
-	t.shadow || pr(e, t.glow ?? null, r);
-	let y = new Set([
+	let g = t.geometry.toLowerCase(), _ = Nn(t.fill, e, l, u, d, f, t.rotation);
+	t.shadow || fr(e, t.glow ?? null, r);
+	let v = new Set([
 		"line",
 		"straightconnector1",
 		"bentconnector2",
@@ -4424,7 +4421,7 @@ function Ir(e, t, r, i = "#000000", a, o = {
 		"curvedconnector3",
 		"curvedconnector4",
 		"curvedconnector5"
-	]), b = new Set([
+	]), y = new Set([
 		"callout1",
 		"callout2",
 		"callout3",
@@ -4437,22 +4434,22 @@ function Ir(e, t, r, i = "#000000", a, o = {
 		"accentbordercallout1",
 		"accentbordercallout2",
 		"accentbordercallout3"
-	]), x = (e) => b.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), S = !t.custGeom && m(_), C = (n, i, a = {
+	]), b = (e) => y.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), x = !t.custGeom && n(g), S = (n, i, a = {
 		x: l,
 		y: u,
 		w: d,
 		h: f
 	}) => {
-		let { x: o, y: s, w: c, h: p } = a, m = i ?? (n === e && o === l && s === u && c === d && p === f ? v : Pn(t.fill, n, o, s, c, p, t.rotation)), h = i ? null : t.stroke ? () => {
-			ei(n, t.stroke, r, {
+		let { x: o, y: s, w: c, h: p } = a, m = i ?? (n === e && o === l && s === u && c === d && p === f ? _ : Nn(t.fill, n, o, s, c, p, t.rotation)), h = i ? null : t.stroke ? () => {
+			$r(n, t.stroke, r, {
 				x: o,
 				y: s,
 				w: c,
 				h: p
 			}, t.rotation), n.stroke();
-		} : null, y = () => mr(n);
-		if (S && !i) {
-			g(n, _, o, s, c, p, [
+		} : null, v = () => pr(n);
+		if (x && !i) {
+			R(n, g, o, s, c, p, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4461,11 +4458,11 @@ function Ir(e, t, r, i = "#000000", a, o = {
 				t.adj6,
 				t.adj7,
 				t.adj8
-			], m, h, y, x(_) ? { skipTrailingStroke: !0 } : void 0);
+			], m, h, v, b(g) ? { skipTrailingStroke: !0 } : void 0);
 			return;
 		}
-		n.beginPath(), t.custGeom && t.custGeom.length > 0 ? Lr(n, t.custGeom, o, s, c, p) : he(n, _, o, s, c, p, t.adj, t.adj2, t.adj3, t.adj4), m && _ !== "arc" && (n.fillStyle = m, _ === "donut" || _ === "smileyface" || _ === "frame" ? n.fill("evenodd") : n.fill(), i || y()), h && h();
-	}, w = e.getTransform(), T = Math.abs(w.a * w.d - w.b * w.c), E = T > 0 ? Math.sqrt(T) : 1, D = (t.shadow || t.reflection || t.softEdge || t.innerShadow ? S ? W(_, l, u, d, f, [
+		n.beginPath(), t.custGeom && t.custGeom.length > 0 ? Ir(n, t.custGeom, o, s, c, p) : me(n, g, o, s, c, p, t.adj, t.adj2, t.adj3, t.adj4), m && g !== "arc" && (n.fillStyle = m, g === "donut" || g === "smileyface" || g === "frame" ? n.fill("evenodd") : n.fill(), i || v()), h && h();
+	}, C = e.getTransform(), w = Math.abs(C.a * C.d - C.b * C.c), T = w > 0 ? Math.sqrt(w) : 1, E = (t.shadow || t.reflection || t.softEdge || t.innerShadow ? x ? B(g, l, u, d, f, [
 		t.adj,
 		t.adj2,
 		t.adj3,
@@ -4474,20 +4471,20 @@ function Ir(e, t, r, i = "#000000", a, o = {
 		t.adj6,
 		t.adj7,
 		t.adj8
-	]) : t.custGeom && t.custGeom.length > 0 ? ge(t.custGeom, l, u, d, f) : null : null) ?? {
+	]) : t.custGeom && t.custGeom.length > 0 ? he(t.custGeom, l, u, d, f) : null : null) ?? {
 		x: l,
 		y: u,
 		w: d,
 		h: f
-	}, O = t.stroke ? t.stroke.width * r / 2 : 0, k = t.stroke ? Math.max(t.stroke.headEnd ? me(t.stroke.headEnd, t.stroke, r) : 0, t.stroke.tailEnd ? me(t.stroke.tailEnd, t.stroke, r) : 0) : 0, A = t.sp3d?.contourW ? t.sp3d.contourW * r : 0, j = Math.max(O, k, A), M = j > 0 ? {
-		x: D.x - j,
-		y: D.y - j,
-		w: D.w + j * 2,
-		h: D.h + j * 2
-	} : D, N = kr(w, M.x, M.y, M.w, M.h), P = r * E, F = h ? [] : Ur(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, r, E), I = (t.stroke ? t.stroke.width * r / 2 : 0) + 2, L = (e) => {
-		let i = t.stroke?.fill ? Pn(t.stroke.fill, e, l, u, d, f, t.rotation) ?? void 0 : void 0;
-		if (t.stroke && (y.has(_) || b.has(_))) {
-			let a = n(_, l, u, d, f, [
+	}, D = t.stroke ? t.stroke.width * r / 2 : 0, O = t.stroke ? Math.max(t.stroke.headEnd ? pe(t.stroke.headEnd, t.stroke, r) : 0, t.stroke.tailEnd ? pe(t.stroke.tailEnd, t.stroke, r) : 0) : 0, k = t.sp3d?.contourW ? t.sp3d.contourW * r : 0, A = Math.max(D, O, k), j = A > 0 ? {
+		x: E.x - A,
+		y: E.y - A,
+		w: E.w + A * 2,
+		h: E.h + A * 2
+	} : E, M = Or(C, j.x, j.y, j.w, j.h), N = r * T, P = m ? [] : Hr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, r, T), F = (t.stroke ? t.stroke.width * r / 2 : 0) + 2, I = (e) => {
+		let n = t.stroke?.fill ? Nn(t.stroke.fill, e, l, u, d, f, t.rotation) ?? void 0 : void 0;
+		if (t.stroke && (v.has(g) || y.has(g))) {
+			let i = h(g, l, u, d, f, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4497,22 +4494,22 @@ function Ir(e, t, r, i = "#000000", a, o = {
 				t.adj7,
 				t.adj8
 			]);
-			if (!a) return;
-			let o = t.stroke.cmpd, s = _ === "line" || _ === "straightconnector1";
-			if (x(_) && a.vertices.length >= 2 && !(o && s)) {
-				let n = a.vertices.map((e) => ({
+			if (!i) return;
+			let a = t.stroke.cmpd, o = g === "line" || g === "straightconnector1";
+			if (b(g) && i.vertices.length >= 2 && !(a && o)) {
+				let n = i.vertices.map((e) => ({
 					x: e.x,
 					y: e.y
 				}));
 				if (t.stroke.tailEnd) {
-					let e = be(t.stroke.tailEnd, t.stroke, r);
-					n[n.length - 1] = Ce(n[n.length - 1], n[n.length - 2], e);
+					let e = ye(t.stroke.tailEnd, t.stroke, r);
+					n[n.length - 1] = Se(n[n.length - 1], n[n.length - 2], e);
 				}
 				if (t.stroke.headEnd) {
-					let e = be(t.stroke.headEnd, t.stroke, r);
-					n[0] = Ce(n[0], n[1], e);
+					let e = ye(t.stroke.headEnd, t.stroke, r);
+					n[0] = Se(n[0], n[1], e);
 				}
-				ei(e, t.stroke, r, {
+				$r(e, t.stroke, r, {
 					x: l,
 					y: u,
 					w: d,
@@ -4521,46 +4518,46 @@ function Ir(e, t, r, i = "#000000", a, o = {
 				for (let t = 1; t < n.length; t++) e.lineTo(n[t].x, n[t].y);
 				e.stroke();
 			}
-			o && s && $r(e, a.start, a.end, t.stroke, o, r, t.rotation), t.stroke.tailEnd && ve(e, a.end.x, a.end.y, a.end.angle, t.stroke.tailEnd, t.stroke, r, i), t.stroke.headEnd && ve(e, a.start.x, a.start.y, a.start.angle, t.stroke.headEnd, t.stroke, r, i);
+			a && o && Qr(e, i.start, i.end, t.stroke, a, r, t.rotation), t.stroke.tailEnd && _e(e, i.end.x, i.end.y, i.end.angle, t.stroke.tailEnd, t.stroke, r, n), t.stroke.headEnd && _e(e, i.start.x, i.start.y, i.start.angle, t.stroke.headEnd, t.stroke, r, n);
 			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: a, end: o } = ye(t.custGeom);
-		a && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && ve(e, l + a.x * d, u + a.y * f, Math.atan2(a.dy * f, a.dx * d), t.stroke.headEnd, t.stroke, r, i), o && t.stroke.tailEnd && t.stroke.tailEnd.type !== "none" && ve(e, l + o.x * d, u + o.y * f, Math.atan2(o.dy * f, o.dx * d), t.stroke.tailEnd, t.stroke, r, i);
-	}, R = (e) => {
-		if (F.length > 0 && Kr(e, l, u, d, f, F, (e, t, n, r, i) => C(e, void 0, {
+		let { start: i, end: a } = ve(t.custGeom);
+		i && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && _e(e, l + i.x * d, u + i.y * f, Math.atan2(i.dy * f, i.dx * d), t.stroke.headEnd, t.stroke, r, n), a && t.stroke.tailEnd && t.stroke.tailEnd.type !== "none" && _e(e, l + a.x * d, u + a.y * f, Math.atan2(a.dy * f, a.dx * d), t.stroke.tailEnd, t.stroke, r, n);
+	}, L = (e) => {
+		if (P.length > 0 && Gr(e, l, u, d, f, P, (e, t, n, r, i) => S(e, void 0, {
 			x: t,
 			y: n,
 			w: r,
 			h: i
-		}), void 0, I)) {
-			L(e), mr(e);
+		}), void 0, F)) {
+			I(e), pr(e);
 			return;
 		}
-		C(e), L(e);
+		S(e), I(e);
 	};
-	if (Fr(e, t, R, R, N, Mr(w, l, u, d, f, t.shadow?.algn), r, P, w, !!v, (e) => C(e, "#000")), t.textBody) {
-		let n = Dr(t, o);
+	if (Pr(e, t, L, L, M, jr(C, l, u, d, f, t.shadow?.algn), r, N, C, !!_, (e) => S(e, "#000")), t.textBody) {
+		let n = Er(t, o);
 		if (e.save(), t.flipH || t.flipV) {
 			let n = l + d / 2, r = u + f / 2;
 			e.translate(n, r), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-n, -r);
 		}
-		let s = l, m = u, h = d, g = f;
-		if (t.textRect) s = Y(t.textRect.x, r), m = Y(t.textRect.y, r), h = Y(t.textRect.width, r), g = Y(t.textRect.height, r);
-		else if (_ === "ellipse") {
+		let s = l, m = u, h = d, _ = f;
+		if (t.textRect) s = X(t.textRect.x, r), m = X(t.textRect.y, r), h = X(t.textRect.width, r), _ = X(t.textRect.height, r);
+		else if (g === "ellipse") {
 			let e = d * (1 - 1 / Math.SQRT2) / 2, t = f * (1 - 1 / Math.SQRT2) / 2;
-			s = l + e, m = u + t, h = d / Math.SQRT2, g = f / Math.SQRT2;
+			s = l + e, m = u + t, h = d / Math.SQRT2, _ = f / Math.SQRT2;
 		} else {
-			let e = Er(_, l, u, d, f, t.adj, t.adj2);
-			e && (s = e.tx, m = e.ty, h = e.tw, g = e.th);
+			let e = Tr(g, l, u, d, f, t.adj, t.adj2);
+			e && (s = e.tx, m = e.ty, h = e.tw, _ = e.th);
 		}
-		Hr(e, t.textBody, s, m, h, g, r, n, t.rotation, !1, !1, i, a, o, p, !1, c), e.restore();
+		Vr(e, t.textBody, s, m, h, _, r, n, t.rotation, !1, !1, i, a, o, p, !1, c), e.restore();
 	}
 	e.restore();
 }
-var Lr = Te;
-function Rr(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 = zr(e).toLowerCase(), o = zr(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
+var Ir = we;
+function Lr(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 = Rr(e).toLowerCase(), o = Rr(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}.`;
@@ -4587,7 +4584,7 @@ function Rr(e, t) {
 		default: return `${n}.`;
 	}
 }
-function zr(e) {
+function Rr(e) {
 	let t = [
 		1e3,
 		900,
@@ -4620,237 +4617,248 @@ function zr(e) {
 	for (let i = 0; i < t.length; i++) for (; e >= t[i];) r += n[i], e -= t[i];
 	return r;
 }
-function Br(e) {
+function zr(e) {
 	for (let t of e.runs) if (t.type === "text" && t.text !== "" || t.type === "math") return !0;
 	return !1;
 }
-function Vr(e, t) {
-	let n = Br(e);
-	if (e.bullet.type === "char") return t.clear(), n ? xe(e.bullet.char, e.bullet.fontFamily ?? null) : "";
+function Br(e, t) {
+	let n = zr(e);
+	if (e.bullet.type === "char") return t.clear(), n ? be(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), Rr(t.get(r), e.bullet.numType);
+		return t.has(r) ? t.set(r, t.get(r) + 1) : t.set(r, e.bullet.startAt ?? 1), Lr(t.get(r), e.bullet.numType);
 	}
 	return t.clear(), "";
 }
-function Hr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000", p, m = {
+function Vr(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000", f, p = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
-}, h, g = !1, _, v = !1, y = g) {
-	let b = n.vert === "vert" || n.vert === "eaVert", x = n.vert === "vert270";
-	if (b || x) {
-		let e = r + a / 2, u = i + o / 2, d = b ? 90 : -90, v = h ? (e) => h({
+}, m, h = !1, g, _ = !1, v = h) {
+	let y = t.vert === "vert" || t.vert === "eaVert", b = t.vert === "vert270";
+	if (y || b) {
+		let l = n + i / 2, u = r + a / 2, _ = y ? 90 : -90, v = m ? (e) => m({
 			...e,
-			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
+			inShapeX: e.inShapeX - a / 2 + i / 2,
+			inShapeY: e.inShapeY - i / 2 + a / 2,
+			shapeX: n,
+			shapeY: r,
+			shapeW: i,
+			shapeH: a,
+			rotation: c,
+			textBodyRotation: _
 		}) : void 0;
-		if (g) return a;
-		t.save(), t.translate(e, u), t.rotate(x ? -Math.PI / 2 : Math.PI / 2), Hr(t, {
-			...n,
+		if (h) return i;
+		e.save(), e.translate(l, u), e.rotate(b ? -Math.PI / 2 : Math.PI / 2), Vr(e, {
+			...t,
 			vert: "horz"
-		}, -o / 2, -a / 2, o, a, s, c, 0, !1, !1, f, p, m, v, !1, _, n.vert === "eaVert"), t.restore();
+		}, -a / 2, -i / 2, a, i, o, s, 0, !1, !1, d, f, p, v, !1, g, t.vert === "eaVert"), e.restore();
 		return;
 	}
-	let S = n.textWarp;
-	if (!g && S && it(S.preset)) {
-		Tr(t, n, S.preset, S.adj ?? [], r, i, a, o, s, c ?? f, m);
+	let x = t.textWarp;
+	if (!h && x && rt(x.preset)) {
+		wr(e, t, x.preset, x.adj ?? [], n, r, i, a, o, s ?? d, p);
 		return;
 	}
-	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 && tr(t, n, a, C, w, s, m) : D, A = Math.max(1, n.numCol ?? 1), j = Y(n.spcCol ?? 0, s), M = n.defaultBold ?? !1, N = n.defaultItalic ?? !1, P = c ?? f, F = (e) => {
-		let i = (n.defaultFontSize ?? 18) * J * s * e, 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 * e, b = d.defColor ? Z(d.defColor) : P, x = Zn(d), S = (() => {
-				for (let e of d.runs) if (e.type === "text" && e.fontSize != null) return e.fontSize;
-				return d.defFontSize ?? n.defaultFontSize ?? 18;
-			})() * J * s * e, T = (() => {
-				for (let e of d.runs) if (e.type === "text" && e.color) return e.color;
+	let S = X(t.lIns, o), C = X(t.rIns, o), w = X(t.tIns, o), E = X(t.bIns, o), D = t.wrap !== "none", O = t.autoFit === "sp", k = O ? D && er(e, t, i, S, C, o, p) : D, A = Math.max(1, t.numCol ?? 1), j = X(t.spcCol ?? 0, o), M = t.defaultBold ?? !1, N = t.defaultItalic ?? !1, P = s ?? d, F = (r) => {
+		let a = (t.defaultFontSize ?? 18) * Y * o * r, s = [], c = 0, l = 0, u = /* @__PURE__ */ new Map();
+		for (let d = 0; d < t.paragraphs.length; d++) {
+			let m = t.paragraphs[d], g = X(m.marL, o), _ = X(m.marR, o), y = X(m.indent, o), b = m.defFontSize == null ? a : m.defFontSize * Y * o * r, x = m.defColor ? Q(m.defColor) : P, w = Xn(m), T = (() => {
+				for (let e of m.runs) if (e.type === "text" && e.fontSize != null) return e.fontSize;
+				return m.defFontSize ?? t.defaultFontSize ?? 18;
+			})() * Y * o * r, E = (() => {
+				for (let e of m.runs) if (e.type === "text" && e.color) return e.color;
 				return null;
-			})(), E = T ? Z(T) : b, D = (() => {
-				for (let e of d.runs) if (e.type === "text" && e.fontFamily) return e.fontFamily;
-				return d.defFontFamily ?? null;
-			})(), k = "", F = Xn(!1, !1, S, "sans-serif", m), I = E, L = null;
-			k = Vr(d, l);
-			let R = $e(d.bullet);
-			if (R.type === "char") {
-				let t = R;
-				F = Xn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * J * s * e, k === t.char ? zn(t.fontFamily ?? null, m) : "sans-serif", m), I = t.color ? Z(t.color) : E;
-			} else if (R.type === "autoNum") {
-				let t = R;
-				F = Xn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * J * s * e, zn(t.fontFamily ?? D, m), m), I = R.color ? Z(R.color) : E;
-			} else if (R.type === "blip") {
-				let t = R, r = Qn(n, d, t) * J * s * e;
-				L = {
-					imagePath: t.imagePath,
-					mimeType: t.mimeType,
-					sizePx: r
+			})(), D = E ? Q(E) : x, F = (() => {
+				for (let e of m.runs) if (e.type === "text" && e.fontFamily) return e.fontFamily;
+				return m.defFontFamily ?? null;
+			})(), I = "", L = Yn(!1, !1, T, "sans-serif", p), R = D, z = null;
+			I = Br(m, u);
+			let B = Qe(m.bullet);
+			if (B.type === "char") {
+				let e = B;
+				L = Yn(!1, !1, e.sizePts == null ? e.sizePct == null ? T : T * (e.sizePct / 100) : e.sizePts * Y * o * r, I === e.char ? Rn(e.fontFamily ?? null, p) : "sans-serif", p), R = e.color ? Q(e.color) : D;
+			} else if (B.type === "autoNum") {
+				let e = B;
+				L = Yn(!1, !1, e.sizePts == null ? e.sizePct == null ? T : T * (e.sizePct / 100) : e.sizePts * Y * o * r, Rn(e.fontFamily ?? F, p), p), R = B.color ? Q(B.color) : D;
+			} else if (B.type === "blip") {
+				let e = B, n = Zn(t, m, e) * Y * o * r;
+				z = {
+					imagePath: e.imagePath,
+					mimeType: e.mimeType,
+					sizePx: n
 				};
 			}
-			let z = A > 1 ? (a - C - w - (A - 1) * j) / A : a - C - w, B = r + C + f, V = r + C + f + _, H = z - f - h, U = or(t, d, O ? H : Infinity, v, b, s, f, M, N, e, p, m, $n(x, _)), ee = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * J * s * e, W = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * J * s * e;
-			for (let e = 0; e < U.length; e++) {
-				let r = U[e], i = e === 0, a = e === U.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 = q(e.fontFamily, e.sizePx);
-						t > f && (f = t);
+			let V = A > 1 ? (i - S - C - (A - 1) * j) / A : i - S - C, H = n + S + g, ee = n + S + g + y, U = V - g - _, W = ar(e, m, k ? U : Infinity, b, x, o, g, M, N, r, f, p, Qn(w, y)), te = m.spaceBefore == null ? 0 : m.spaceBefore / 100 * Y * o * r, G = m.spaceAfter == null ? 0 : m.spaceAfter / 100 * Y * o * r;
+			for (let n = 0; n < W.length; n++) {
+				let r = W[n], i = n === 0, a = n === W.length - 1, u = 0, f = 0;
+				for (let t of r.segments) {
+					let n = t.math ? Math.max(t.sizePx, (t.math.ascent + t.math.descent) / 1.2) : t.sizePx;
+					if (n > u && (u = n), !t.math && O) {
+						e.font = t.font;
+						let n = e.measureText(t.text || "M"), r = (n.fontBoundingBoxAscent ?? 0) + (n.fontBoundingBoxDescent ?? 0);
+						r > f && (f = r);
 					}
 				}
-				if (l === 0 && (l = v), i && k) {
-					t.font = F;
-					let e = t.measureText("M"), n = e.actualBoundingBoxAscent + e.actualBoundingBoxDescent;
-					n > l && (l = n);
+				if (u === 0 && (u = b), i && I) {
+					e.font = L;
+					let t = e.measureText("M"), n = t.actualBoundingBoxAscent + t.actualBoundingBoxDescent;
+					n > u && (u = n);
 				}
-				i && L && L.sizePx > l && (l = L.sizePx);
-				let p = l * 1.2, m = Math.max(p, f), h;
-				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 ? W : 0), S = i && u > 0 ? ee : 0, C = i ? $n(x, _) : 0, w = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), T = i && w ? L : null;
-				o.push({
+				i && z && z.sizePx > u && (u = z.sizePx);
+				let p = u * 1.2, g = O && f > p, _ = p, x;
+				x = m.spaceLine ? m.spaceLine.type === "pct" ? (h ? u : p) * (m.spaceLine.val / 1e5) : m.spaceLine.val * Y * o : h && !O ? v ? p : u : _;
+				let S = m.spaceLine?.type === "pct" ? u * (m.spaceLine.val / 1e5) : x;
+				t.autoFit === "norm" && t.lnSpcReduction != null && m.spaceLine?.type !== "pts" && (x *= 1 - t.lnSpcReduction);
+				let C = x + (a ? G : 0), T = i && d > 0 ? te : 0, E = i ? Qn(w, y) : 0, D = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), k = i && D ? z : null;
+				s.push({
 					line: r,
-					linePx: b,
-					lineHeight: h,
-					topGapPx: S,
-					textXOffset: C,
-					bulletLabel: i ? k : "",
-					bulletFont: F,
-					bulletColor: I,
-					bulletX: V,
-					bulletImage: T,
-					textX: B,
-					textMaxW: H,
-					alignment: d.alignment,
+					linePx: C,
+					lineHeight: x,
+					baselineLineHeight: S,
+					topGapPx: T,
+					textXOffset: E,
+					bulletLabel: i ? I : "",
+					bulletFont: L,
+					bulletColor: R,
+					bulletX: ee,
+					bulletImage: k,
+					textX: H,
+					textMaxW: U,
+					alignment: m.alignment,
 					isLastLine: a,
-					para: d
-				}), c += b + S;
+					para: m,
+					useResolvedFontMetrics: g
+				});
+				let A = c + T;
+				c += C + T, l = Math.max(l, c, A + (g ? Math.max(x, f) : x) + (a ? G : 0));
 			}
 		}
 		return {
-			allLines: o,
-			totalHeight: c
+			allLines: s,
+			totalHeight: c,
+			requiredHeight: l
 		};
-	}, { allLines: I, totalHeight: L } = F(1);
-	if (n.autoFit === "norm") if (n.fontScale != null && n.fontScale > 0) n.fontScale < 1 && ({allLines: I, totalHeight: L} = F(n.fontScale));
+	}, { allLines: L, totalHeight: R, requiredHeight: z } = F(1);
+	if (t.autoFit === "norm") if (t.fontScale != null && t.fontScale > 0) t.fontScale < 1 && ({allLines: L, totalHeight: R, requiredHeight: z} = F(t.fontScale));
 	else {
-		let e = o - T - E;
-		if (L > e && e > 0) {
+		let e = a - w - E;
+		if (z > e && e > 0) {
 			let t = .1, n = 1;
 			for (let r = 0; r < 6; r++) {
 				let r = (t + n) / 2;
-				F(r).totalHeight <= e ? t = r : n = r;
+				F(r).requiredHeight <= e ? t = r : n = r;
 			}
-			({allLines: I, totalHeight: L} = F(t));
+			({allLines: L, totalHeight: R, requiredHeight: z} = F(t));
 		}
 	}
-	if (g) return T + L + E;
-	let R = n.verticalAnchor ?? "t", z = i, B;
-	o === 0 && R === "b" ? (B = T + L + E, z = i - B) : B = n.autoFit === "sp" ? Math.max(o, T + L + E) : o;
-	let V, H = Math.max(0, B - T - E);
-	V = R === "ctr" ? z + T + (H - L) / 2 : R === "b" ? z + B - E - L : z + T, t.save(), t.textAlign = "left", t.textBaseline = "alphabetic";
-	let U = V, ee = A > 1 ? (a - C - w - (A - 1) * j) / A + j : 0, W = Math.max(0, B - T - E), te = I[I.length - 1], G = te ? Math.max(0, te.linePx - te.lineHeight) : 0, K = L - G, ne = o === 0 || K <= W + .5, re = A > 1 && !ne ? Math.ceil(I.length / A) : I.length, ie = 0, ae = 0;
-	for (let c of I) {
-		let { line: u, linePx: d, lineHeight: f, topGapPx: p, textXOffset: g, bulletLabel: y, bulletFont: b, bulletColor: x, bulletImage: S, alignment: C, isLastLine: w } = c;
-		A > 1 && ie < A - 1 && ae >= re && (ie++, ae = 0, V = U), V += p, ae++;
-		let T = (n.rtlCol ? A - 1 - ie : ie) * ee, E = c.textX + T, D = c.bulletX + T, O = c.textMaxW, j = c.para.rtl === !0, M = j || ln(u.segments), N = u.segments.some((e) => e.isTab);
+	if (h) return w + z + E;
+	let B = t.verticalAnchor ?? "t", V = r, H;
+	a === 0 && B === "b" ? (H = w + z + E, V = r - H) : H = t.autoFit === "sp" ? Math.max(a, w + z + E) : a;
+	let ee, U = Math.max(0, H - w - E);
+	ee = B === "ctr" ? V + w + (U - z) / 2 : B === "b" ? V + H - E - z : V + w, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
+	let W = ee, te = A > 1 ? (i - S - C - (A - 1) * j) / A + j : 0, G = Math.max(0, H - w - E), K = L[L.length - 1], q = K ? Math.max(0, K.linePx - K.lineHeight) : 0, J = z - q, ne = a === 0 || J <= G + .5, re = A > 1 && !ne ? Math.ceil(L.length / A) : L.length, ie = 0, ae = 0;
+	for (let s of L) {
+		let { line: l, linePx: u, lineHeight: d, topGapPx: f, textXOffset: h, bulletLabel: v, bulletFont: y, bulletColor: b, bulletImage: x, alignment: S, isLastLine: C, useResolvedFontMetrics: w } = s;
+		A > 1 && ie < A - 1 && ae >= re && (ie++, ae = 0, ee = W), ee += f, ae++;
+		let E = (t.rtlCol ? A - 1 - ie : ie) * te, D = s.textX + E, O = s.bulletX + E, k = s.textMaxW, j = s.para.rtl === !0, M = j || cn(l.segments), N = l.segments.some((e) => e.isTab);
 		if (N) {
-			let e = Y(c.para.marL, s), n = Y(c.para.marR, s), r = j ? n : e + g, i = O + e + n;
-			t.font = u.segments.find((e) => e.isTab).font;
-			let a = t.measureText(" ").width, o = xn(u.segments.map((e) => {
-				if (e.isTab) return {
+			let t = X(s.para.marL, o), n = X(s.para.marR, o), r = j ? n : t + h, i = k + t + n;
+			e.font = l.segments.find((e) => e.isTab).font;
+			let a = e.measureText(" ").width, c = bn(l.segments.map((t) => {
+				if (t.isTab) return {
 					isTab: !0,
 					width: 0
 				};
-				if (e.math) return {
+				if (t.math) return {
 					isTab: !1,
-					width: e.math.width
+					width: t.math.width
 				};
-				t.font = e.font;
-				let n = e.letterSpacingPx ?? 0;
+				e.font = t.font;
+				let n = t.letterSpacingPx ?? 0;
 				return {
 					isTab: !1,
-					width: e.text ? (e.leadingLetterSpacingPx ?? 0) + Q(t, e.text, n) : 0
+					width: t.text ? (t.leadingLetterSpacingPx ?? 0) + $(e, t.text, n) : 0
 				};
-			}), (c.para.tabStops ?? []).map((e) => ({
-				pos: Y(e.pos, s),
+			}), (s.para.tabStops ?? []).map((e) => ({
+				pos: X(e.pos, o),
 				algn: e.algn
-			})), 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]);
+			})), r, i, a, X(s.para.defTabSz ?? 914400, o));
+			for (let e = 0; e < l.segments.length; e++) l.segments[e].isTab && (l.segments[e].tabWidthPx = c[e]);
 		}
-		let P = 0, F = f * .8;
-		for (let e of u.segments) {
-			if (e.isTab) {
-				P += e.tabWidthPx ?? 0;
+		let P = 0, F = 0, L = 0, R = 0;
+		for (let t of l.segments) {
+			if (t.isTab) {
+				P += t.tabWidthPx ?? 0;
 				continue;
 			}
-			if (e.math) {
-				P += e.math.width, F = Math.max(F, e.math.ascent);
+			if (t.math) {
+				P += t.math.width, F = Math.max(F, t.math.ascent);
 				continue;
 			}
-			t.font = e.font;
-			let n = t.measureText(e.text || "M"), r = e.letterSpacingPx ?? 0;
-			P += e.leadingLetterSpacingPx ?? 0, P += e.text ? Q(t, e.text, r) : 0, n.actualBoundingBoxAscent > 0 && (F = Math.max(F, n.actualBoundingBoxAscent));
+			e.font = t.font;
+			let n = e.measureText(t.text || "M"), r = t.letterSpacingPx ?? 0;
+			if (P += t.leadingLetterSpacingPx ?? 0, P += t.text ? $(e, t.text, r) : 0, n.actualBoundingBoxAscent > 0 && (F = Math.max(F, n.actualBoundingBoxAscent)), w) {
+				let e = n.fontBoundingBoxAscent ?? 0, t = e + (n.fontBoundingBoxDescent ?? 0);
+				t > R && (R = t, L = e);
+			}
 		}
-		let I = V + F, L = E + O, R = S && _ ? m.pictureBulletImages?.has(S.imagePath) ? m.pictureBulletImages.get(S.imagePath) : k(S.imagePath, _) : void 0, z = 0;
+		let z = w && R > 0 ? B === "t" && F > 0 ? s.para.spaceLine?.type === "pct" ? Math.max(F, L + (s.baselineLineHeight - R) / 2) : F : Math.max(F, L + Math.max(0, d - R) / 2) : Math.max(d * .8, F), V = ee + z, H = D + k, U = x && g ? p.pictureBulletImages?.has(x.imagePath) ? p.pictureBulletImages.get(x.imagePath) : I(x.imagePath, g) : void 0, G = 0;
 		if (M && j) {
-			if (y) t.font = b, z = t.measureText(y).width;
-			else if (S && R) {
-				let e = S.sizePx;
-				z = R.height > 0 ? e * (R.width / R.height) : e;
+			if (v) e.font = y, G = e.measureText(v).width;
+			else if (x && U) {
+				let e = x.sizePx;
+				G = U.height > 0 ? e * (U.width / U.height) : e;
 			}
 		}
-		if (y) if (t.font = b, t.fillStyle = x, M && j) {
-			let e = t.direction;
-			t.direction = "rtl", t.fillText(y, L - z, I), t.direction = e;
-		} else t.fillText(y, D, I);
-		if (S && _ && R) {
-			let e = S.sizePx, n = R.height > 0 ? e * (R.width / R.height) : e, r = I - e;
-			M && j ? t.drawImage(R, L - n, r, n, e) : t.drawImage(R, D, r, n, e);
+		if (v) if (e.font = y, e.fillStyle = b, M && j) {
+			let t = e.direction;
+			e.direction = "rtl", e.fillText(v, H - G, V), e.direction = t;
+		} else e.fillText(v, O, V);
+		if (x && g && U) {
+			let t = x.sizePx, n = U.height > 0 ? t * (U.width / U.height) : t, r = V - t;
+			M && j ? e.drawImage(U, H - n, r, n, t) : e.drawImage(U, O, r, n, t);
 		}
-		let B = E + g, H;
-		H = N ? j ? E + O - z - P : B : C === "ctr" ? B + (O - g - P) / 2 : C === "r" ? E + O - z - P : B;
-		let W = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, te = w || (u.endsWithBreak ?? !1), G = (W && !M && !N ? pn(u.segments, O - g, P, W, te) : null) ?? u.segments, K = M ? un(u.segments, j) : null, q = (e, t) => {
+		let K = D + h, q;
+		q = N ? j ? D + k - G - P : K : S === "ctr" ? K + (k - h - P) / 2 : S === "r" ? D + k - G - P : K;
+		let J = S === "just" || S === "justLow" ? "just" : S === "thaiDist" ? "thaiDist" : S === "dist" ? "dist" : null, ne = C || (l.endsWithBreak ?? !1), oe = (J && !M && !N ? fn(l.segments, k - h, P, J, ne) : null) ?? l.segments, se = M ? ln(l.segments, j) : null, ce = (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)];
+			let n = l.segments[Math.min(e, t)], r = l.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;
-		}, ne = G.length;
-		for (let n = 0; n < ne; n++) {
-			let c = K ? K.order[n] : n, u = G[c], d = K ? K.rtl[c] : !1;
-			if (M && (t.direction = d ? "rtl" : "ltr"), n > 0) {
-				let e = K ? K.order[n - 1] : n - 1;
-				H += q(e, c);
+		}, le = oe.length;
+		for (let t = 0; t < le; t++) {
+			let s = se ? se.order[t] : t, l = oe[s], u = se ? se.rtl[s] : !1;
+			if (M && (e.direction = u ? "rtl" : "ltr"), t > 0) {
+				let e = se ? se.order[t - 1] : t - 1;
+				q += ce(e, s);
 			}
-			if (u.isTab) {
-				H += u.tabWidthPx ?? 0;
+			if (l.isTab) {
+				q += l.tabWidthPx ?? 0;
 				continue;
 			}
-			let p = u.jext ?? 0, g = u.splitBefore, _ = u.perGap ?? 0, y = g && g.length > 0 ? g.length * _ : 0;
-			if (u.math) {
-				let e = Fn.get(u.math.nodes), n = u.math.width, r = u.math.ascent + u.math.descent;
-				if (e && n > 0 && r > 0) {
-					let i = I - u.math.ascent, a = In(e, u.color);
-					t.drawImage(a, H, i, n, r);
+			let f = l.jext ?? 0, h = l.splitBefore, g = l.perGap ?? 0, v = h && h.length > 0 ? h.length * g : 0;
+			if (l.math) {
+				let t = Pn.get(l.math.nodes), n = l.math.width, r = l.math.ascent + l.math.descent;
+				if (t && n > 0 && r > 0) {
+					let i = V - l.math.ascent, a = Fn(t, l.color);
+					e.drawImage(a, q, i, n, r);
 				}
-				H += n, H += p;
+				q += n, q += f;
 				continue;
 			}
-			t.font = u.font, t.fillStyle = u.color;
-			let b = u.drawSizePx ?? u.sizePx, x = I + (u.baseline ? -(u.baseline / 1e5) * u.sizePx : 0), S = u.letterSpacingPx ?? 0;
-			if (u.highlight && u.text) {
-				let e = Q(t, u.text, S) + y + p;
-				Nn(t, H, x, e, b, u.highlight, u.color);
+			e.font = l.font, e.fillStyle = l.color;
+			let y = l.drawSizePx ?? l.sizePx, b = V + (l.baseline ? -(l.baseline / 1e5) * l.sizePx : 0), x = l.letterSpacingPx ?? 0;
+			if (l.highlight && l.text) {
+				let t = $(e, l.text, x) + v + f;
+				Mn(e, q, b, t, y, l.highlight, l.color);
 			}
-			let C = u.shadow, w = (e, t, n, r) => {
+			let S = l.shadow, C = (e, t, n, r) => {
 				let i = r === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e);
-				if (S !== 0 && rr(t) > 1) {
+				if (x !== 0 && nr(t) > 1) {
 					let r = e, a = r.letterSpacing;
-					if (ar(e)) {
-						r.letterSpacing = `${S}px`, i(t, n, x);
+					if (ir(e)) {
+						r.letterSpacing = `${x}px`, i(t, n, b);
 						try {
 							r.letterSpacing = a;
 						} catch {}
@@ -4858,92 +4866,92 @@ function Hr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 						let r = n, a = [...t];
 						for (let t = 0; t < a.length; t++) {
 							let n = a[t];
-							i(n, r, x), t < a.length - 1 && (r += e.measureText(n).width + S);
+							i(n, r, b), t < a.length - 1 && (r += e.measureText(n).width + x);
 						}
 					}
-				} else i(t, n, x);
-			}, T = (e) => Q(t, e, S), E = g && g.length > 0 ? en([...u.text], g, _, T) : null, D = [...u.text], O = !!g && g.length === D.length - 1 && D.length > 1, k = (e, t) => {
-				if (v) {
-					let n = O ? S + _ : S;
-					En(e, u.text, H, x, b, n, t);
+				} else i(t, n, b);
+			}, w = (t) => $(e, t, x), E = h && h.length > 0 ? $t([...l.text], h, g, w) : null, D = [...l.text], O = !!h && h.length === D.length - 1 && D.length > 1, k = (e, t) => {
+				if (_) {
+					let n = O ? x + g : x;
+					Tn(e, l.text, q, b, y, n, t);
 					return;
 				}
 				if (O) {
-					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = S + _;
-					if (ar(e)) {
+					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = x + g;
+					if (ir(e)) {
 						let t = e, i = t.letterSpacing;
-						t.letterSpacing = `${r}px`, n(u.text, H, x);
+						t.letterSpacing = `${r}px`, n(l.text, q, b);
 						try {
 							t.letterSpacing = i;
 						} catch {}
 					} else {
-						let t = H;
+						let t = q;
 						for (let i = 0; i < D.length; i++) {
 							let a = D[i];
-							n(a, t, x), i < D.length - 1 && (t += e.measureText(a).width + r);
+							n(a, t, b), i < D.length - 1 && (t += e.measureText(a).width + r);
 						}
 					}
-				} else if (E) for (let { text: n, dx: r } of E) w(e, n, H + r, t);
-				else w(e, u.text, H, t);
-			}, A = u.reflection;
-			if (A && u.text) {
-				let e = t.canvas.width || 0, n = t.canvas.height || 0;
-				if (e > 0 && n > 0) {
-					t.font = u.font;
-					let r = t.measureText(u.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : b * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : b * .2, o = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, c = Number.isFinite(r.actualBoundingBoxRight) ? r.actualBoundingBoxRight : r.width, l = t.getTransform(), d = Math.abs(l.a * l.d - l.b * l.c), f = d > 0 ? Math.sqrt(d) : 1;
-					Yn(t, (e) => {
-						e.font = u.font, e.fillStyle = u.color, k(e, "fill");
+				} else if (E) for (let { text: n, dx: r } of E) C(e, n, q + r, t);
+				else C(e, l.text, q, t);
+			}, A = l.reflection;
+			if (A && l.text) {
+				let t = e.canvas.width || 0, n = e.canvas.height || 0;
+				if (t > 0 && n > 0) {
+					e.font = l.font;
+					let r = e.measureText(l.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : y * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : y * .2, s = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, c = 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;
+					Jn(e, (e) => {
+						e.font = l.font, e.fillStyle = l.color, k(e, "fill");
 					}, {
-						x: (H - o) * f,
-						y: (x - i) * f,
-						w: Math.max(1, o + c) * f,
+						x: (q - s) * f,
+						y: (b - i) * f,
+						w: Math.max(1, s + c) * f,
 						h: Math.max(1, i + a) * f
-					}, A, s * f, l, e, n), t.font = u.font, t.fillStyle = u.color;
+					}, A, o * f, u, t, n), e.font = l.font, e.fillStyle = l.color;
 				}
 			}
-			if (C) {
-				let e = C.dir * Math.PI / 180, n = Y(C.dist, s);
-				t.save(), t.shadowColor = Z(C.color, C.alpha), t.shadowBlur = Y(C.blur, s), t.shadowOffsetX = Math.cos(e) * n, t.shadowOffsetY = Math.sin(e) * n;
+			if (S) {
+				let t = S.dir * Math.PI / 180, n = X(S.dist, o);
+				e.save(), e.shadowColor = Q(S.color, S.alpha), e.shadowBlur = X(S.blur, o), e.shadowOffsetX = Math.cos(t) * n, e.shadowOffsetY = Math.sin(t) * n;
 			}
-			k(t, "fill"), C && t.restore();
-			let j = u.outline;
-			j && j.width > 0 && (t.save(), t.lineWidth = Math.max(.5, Y(j.width, s)), t.strokeStyle = j.color ? `#${j.color}` : u.color, t.lineJoin = "round", k(t, "stroke"), t.restore()), t.font = u.font;
-			let N = Q(t, u.text, S) + y;
-			if (h && u.text && h({
-				text: u.text,
-				inShapeX: H - r,
-				inShapeY: V - i,
-				w: N + p,
-				h: f,
-				fontSize: b,
-				font: u.font,
-				shapeX: r,
-				shapeY: i,
-				shapeW: a,
-				shapeH: o,
-				rotation: l,
-				hyperlink: u.hyperlink
-			}), u.underline && Qt(t, H, x, N + p, b, u.underlineColor ?? u.color, u.underlineStyle, m.dpr), u.strikethrough) {
-				let n = Math.max(1, b * .05);
-				t.strokeStyle = u.color, t.lineWidth = n, t.setLineDash([]);
-				let r = x - b * .32;
-				if (u.strikeDouble) {
-					let i = n * .9, a = r - i, o = r + i;
-					t.beginPath(), t.moveTo(H, a + e(a, n, m.dpr)), t.lineTo(H + N + p, a + e(a, n, m.dpr)), t.moveTo(H, o + e(o, n, m.dpr)), t.lineTo(H + N + p, o + e(o, n, m.dpr)), t.stroke();
+			k(e, "fill"), S && e.restore();
+			let j = l.outline;
+			j && j.width > 0 && (e.save(), e.lineWidth = Math.max(.5, X(j.width, o)), e.strokeStyle = j.color ? `#${j.color}` : l.color, e.lineJoin = "round", k(e, "stroke"), e.restore()), e.font = l.font;
+			let N = $(e, l.text, x) + v;
+			if (m && l.text && m({
+				text: l.text,
+				inShapeX: q - n,
+				inShapeY: ee - r,
+				w: N + f,
+				h: d,
+				fontSize: y,
+				font: l.font,
+				shapeX: n,
+				shapeY: r,
+				shapeW: i,
+				shapeH: a,
+				rotation: c,
+				hyperlink: l.hyperlink
+			}), l.underline && Zt(e, q, b, N + f, y, l.underlineColor ?? l.color, l.underlineStyle, p.dpr), l.strikethrough) {
+				let t = Math.max(1, y * .05);
+				e.strokeStyle = l.color, e.lineWidth = t, e.setLineDash([]);
+				let n = b - y * .32;
+				if (l.strikeDouble) {
+					let r = t * .9, i = n - r, a = n + r;
+					e.beginPath(), e.moveTo(q, i + T(i, t, p.dpr)), e.lineTo(q + N + f, i + T(i, t, p.dpr)), e.moveTo(q, a + T(a, t, p.dpr)), e.lineTo(q + N + f, a + T(a, t, p.dpr)), e.stroke();
 				} else {
-					let i = r + e(r, n, m.dpr);
-					t.beginPath(), t.moveTo(H, i), t.lineTo(H + N + p, i), t.stroke();
+					let r = n + T(n, t, p.dpr);
+					e.beginPath(), e.moveTo(q, r), e.lineTo(q + N + f, r), e.stroke();
 				}
 			}
-			H += N, H += p;
+			q += N, q += f;
 		}
-		M && (t.direction = "ltr"), V += d;
+		M && (e.direction = "ltr"), ee += u;
 	}
-	t.restore();
+	e.restore();
 }
-function Ur(e, t, n, r, i) {
+function Hr(e, t, n, r, i) {
 	if (!e) return [];
-	let a = Bt(t?.rig ?? "threePt", t?.dir ?? "t", t?.rot), o = Kt(n), s = r * i, c = [];
+	let a = zt(t?.rig ?? "threePt", t?.dir ?? "t", t?.rot), o = Gt(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,
@@ -4959,9 +4967,9 @@ function Ur(e, t, n, r, i) {
 		bottom: !0
 	}), c;
 }
-function Wr(e, t, n, r, i, a) {
+function Ur(e, t, n, r, i, a) {
 	if (!e || !e.extrusionH || e.extrusionH <= 0) return null;
-	let o = e.extrusionH * i * a, s = Tt(t, n * a, r * a, o);
+	let o = e.extrusionH * i * a, s = wt(t, n * a, r * a, o);
 	if (Math.hypot(s.x, s.y) < .75) return null;
 	let c = [
 		64,
@@ -4982,14 +4990,14 @@ function Wr(e, t, n, r, i, a) {
 		rgb: c
 	};
 }
-function Gr(e, t, n, r, i, a, o, s = {}) {
+function Wr(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 = Ct(t, i, a), p = f.corners;
+	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 = Ke(f.corners, e / i, e / a);
+		let e = d / u, t = Ge(f.corners, e / i, e / a);
 		t ? p = t : d = 0;
 	}
-	let m = d / u, h = Math.max(1, Math.ceil(i * u) + 2 * d), g = Math.max(1, Math.ceil(a * u) + 2 * d), _ = je(h, 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), _ = Ae(h, g);
 	if (!_) return !1;
 	let v = _.getContext("2d");
 	if (!v) return !1;
@@ -5002,17 +5010,17 @@ function Gr(e, t, n, r, i, a, o, s = {}) {
 	});
 	if (s.extrusion) {
 		let e = Math.ceil(Math.hypot(s.extrusion.offsetX, s.extrusion.offsetY)) + 2;
-		Zt(v, s.extrusion, x(e));
+		Xt(v, s.extrusion, x(e));
 	}
-	if (s.bevels && s.bevels.length > 0) for (let e of s.bevels) Xt(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()), ze(_, e, h, g, p.map((e) => ({
+	if (s.bevels && s.bevels.length > 0) for (let e of s.bevels) Yt(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()), Re(_, e, h, g, p.map((e) => ({
 		x: n + e.x,
 		y: r + e.y
 	}))), !0;
 }
-function Kr(e, t, n, r, i, a, o, s, c = 0) {
+function Gr(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 = je(m, h);
+	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 = Ae(m, h);
 	if (!g) return !1;
 	let _ = g.getContext("2d");
 	if (!_) return !1;
@@ -5020,7 +5028,7 @@ function Kr(e, t, n, r, i, a, o, s, c = 0) {
 	let v = Math.ceil(r * d), y = Math.ceil(i * d);
 	for (let e of a) {
 		let t = Math.ceil(e.widthPx) + 2;
-		Xt(_, e, {
+		Yt(_, e, {
 			x: f - t,
 			y: f - t,
 			w: v + 2 * t,
@@ -5029,17 +5037,17 @@ function Kr(e, t, n, r, i, a, o, s, c = 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 qr = /* @__PURE__ */ new WeakMap();
-function Jr(e) {
-	let t = qr.get(e);
+var Kr = /* @__PURE__ */ new WeakMap();
+function qr(e) {
+	let t = Kr.get(e);
 	return t || (t = async (t, n) => {
 		let r = await e(t);
 		return r.type === n ? r : new Blob([r], { type: n });
-	}, qr.set(e, t)), t;
+	}, Kr.set(e, t)), t;
 }
-function Yr(e, t, n = Jr(t), r, i, a) {
-	let o = Jr(t);
-	return K(e.posterPath, e.posterMimeType || "application/octet-stream", o, {
+function Jr(e, t, n = qr(t), r, i, a) {
+	let o = qr(t);
+	return P(e.posterPath, e.posterMimeType || "application/octet-stream", o, {
 		tiff: r,
 		svgDecoder: a,
 		...i ?? {}
@@ -5048,11 +5056,11 @@ function Yr(e, t, n = Jr(t), r, i, a) {
 		return e;
 	});
 }
-function Xr(e, t, n) {
-	let r = Y(t.x, n), i = Y(t.y, n), a = Y(t.width, n), o = Y(t.height, n);
+function Yr(e, t, n) {
+	let r = X(t.x, n), i = X(t.y, n), a = X(t.width, n), o = X(t.height, n);
 	e.save();
 	try {
-		t.alpha != null && (e.globalAlpha *= t.alpha), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(r + a / 2, i + o / 2), e.rotate(t.rotation * Math.PI / 180), e.scale(t.flipH ? -1 : 1, t.flipV ? -1 : 1), e.translate(-(r + a / 2), -(i + o / 2))), ue(e, "tiff", {
+		t.alpha != null && (e.globalAlpha *= t.alpha), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(r + a / 2, i + o / 2), e.rotate(t.rotation * Math.PI / 180), e.scale(t.flipH ? -1 : 1, t.flipV ? -1 : 1), e.translate(-(r + a / 2), -(i + o / 2))), b(e, "tiff", {
 			x: r,
 			y: i,
 			width: a,
@@ -5062,120 +5070,120 @@ function Xr(e, t, n) {
 		e.restore();
 	}
 }
-async function Zr(e, t, n, r, i, o, s = 1, c, l) {
-	if (i) try {
-		let a = t.mimeType === "image/svg+xml", u = Pe(t.mimeType, t.srcRect, t.width / J, t.height / J);
-		if (!u) return;
-		let { widthPt: d, heightPt: f } = u, p = Dn(Y(t.width, n), Y(t.height, n), s, t.srcRect), h = A(t) || a, g = h ? p : l && !t.duotone ? On(l, X(kn(t), h ? void 0 : t.duotone)) : void 0, _ = g && "maxRetainedPixels" in g ? g.maxRetainedPixels : void 0, y = {
-			...g ? {
-				targetWidthPx: g.targetWidthPx,
-				targetHeightPx: g.targetHeightPx,
-				..._ === void 0 ? {} : { maxRetainedPixels: _ }
+async function Xr(e, t, r, i, a, s, c = 1, l, u) {
+	if (a) try {
+		let d = t.mimeType === "image/svg+xml", f = Ne(t.mimeType, t.srcRect, t.width / Y, t.height / Y);
+		if (!f) return;
+		let { widthPt: p, heightPt: m } = f, h = En(X(t.width, r), X(t.height, r), c, t.srcRect), g = J(t) || d, _ = g ? h : u && !t.duotone ? Dn(u, Z(On(t), g ? void 0 : t.duotone)) : void 0, v = _ && "maxRetainedPixels" in _ ? _.maxRetainedPixels : void 0, y = {
+			..._ ? {
+				targetWidthPx: _.targetWidthPx,
+				targetHeightPx: _.targetHeightPx,
+				...v === void 0 ? {} : { maxRetainedPixels: v }
 			} : {},
-			workerDecoder: c
+			workerDecoder: l
 		}, b;
-		if (A(t)) try {
-			b = await I(t.svgImagePath, i, y);
+		if (J(t)) try {
+			b = await H(t.svgImagePath, a, y);
 		} catch {
-			b = a ? await I(t.imagePath, i, y) : await Ye(t.imagePath, t.mimeType, t.duotone, i, {
-				widthPt: d,
-				heightPt: f,
-				...g ?? {},
-				tiff: o
+			b = d ? await H(t.imagePath, a, y) : await Je(t.imagePath, t.mimeType, t.duotone, a, {
+				widthPt: p,
+				heightPt: m,
+				..._ ?? {},
+				tiff: s
 			});
 		}
-		else b = a ? await I(t.imagePath, i, y) : await Ye(t.imagePath, t.mimeType, t.duotone, i, {
-			widthPt: d,
-			heightPt: f,
-			...g ?? {},
-			tiff: o
+		else b = d ? await H(t.imagePath, a, y) : await Je(t.imagePath, t.mimeType, t.duotone, a, {
+			widthPt: p,
+			heightPt: m,
+			..._ ?? {},
+			tiff: s
 		});
-		if (!b || r()) return;
+		if (!b || i()) return;
 		e.save(), t.alpha != null && (e.globalAlpha *= t.alpha);
-		let x = Y(t.x, n), S = Y(t.y, n), C = Y(t.width, n), w = Y(t.height, n);
+		let x = X(t.x, r), S = X(t.y, r), C = X(t.width, r), w = X(t.height, r);
 		(t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(x + C / 2, S + w / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(x + C / 2), -(S + w / 2)));
 		let T = (e, n, r, i, a) => {
-			t.custGeom && t.custGeom.length > 0 ? Lr(e, t.custGeom, n, r, i, a) : t.prstGeom && v(e, t.prstGeom, n, r, i, a, t.prstAdjust ?? []) || e.rect(n, r, i, a);
+			t.custGeom && t.custGeom.length > 0 ? Ir(e, t.custGeom, n, r, i, a) : t.prstGeom && o(e, t.prstGeom, n, r, i, a, t.prstAdjust ?? []) || e.rect(n, r, i, a);
 		}, E = (e, t, n, r, i) => {
 			e.beginPath(), T(e, t, n, r, i);
 		}, D = (e, n, r, i, a) => {
 			(t.prstGeom || t.custGeom && t.custGeom.length > 0) && (E(e, n, r, i, a), e.clip());
-		}, O = (e, r, i, a, o) => {
-			t.stroke && (e.save(), ei(e, t.stroke, n, {
-				x: r,
+		}, O = (e, n, i, a, o) => {
+			t.stroke && (e.save(), $r(e, t.stroke, r, {
+				x: n,
 				y: i,
 				w: a,
 				h: o
-			}, t.rotation), E(e, r, i, a, o), e.stroke(), e.restore());
-		}, k = (e, r, i, a, o) => {
+			}, t.rotation), E(e, n, i, a, o), e.stroke(), e.restore());
+		}, k = (e, n, i, a, o) => {
 			let s = t.sp3d;
 			if (s && (s.contourW ?? 0) > 0 && s.contourClr) {
-				let t = Math.max(.5, s.contourW * n);
+				let t = Math.max(.5, s.contourW * r);
 				e.save(), e.beginPath();
 				let c = t * 2 + Math.max(a, o);
-				e.rect(r - c, i - c, a + 2 * c, o + 2 * c), T(e, r, i, a, o), e.clip("evenodd"), e.beginPath(), E(e, r, i, a, o), e.strokeStyle = Z(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
+				e.rect(n - c, i - c, a + 2 * c, o + 2 * c), T(e, n, i, a, o), e.clip("evenodd"), e.beginPath(), E(e, n, i, a, o), e.strokeStyle = Q(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
 			}
-		}, j = t.scene3d && wt(t.scene3d.camera) ? t.scene3d : null, M = (e, n, r, i, a) => {
-			e.save(), D(e, n, r, i, a), Me(e, b, t.srcRect, n, r, i, a), e.restore();
+		}, A = t.scene3d && Ct(t.scene3d.camera) ? t.scene3d : null, j = (e, n, r, i, a) => {
+			e.save(), D(e, n, r, i, a), je(e, b, t.srcRect, n, r, i, a), e.restore();
+		}, M = (e, t, n, r, i) => {
+			j(e, t, n, r, i), O(e, t, n, r, i), k(e, t, n, r, i);
 		}, N = (e, t, n, r, i) => {
-			M(e, t, n, r, i), O(e, t, n, r, i), k(e, t, n, r, i);
-		}, P = (e, t, n, r, i) => {
-			M(e, t, n, r, i), O(e, t, n, r, i);
-		}, F = e.getTransform(), L = Math.abs(F.a * F.d - F.b * F.c), R = L > 0 ? Math.sqrt(L) : 1, z = Ur(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, R), B = j ? Wr(t.sp3d, j.camera, C, w, n, R) : null, V = t.stroke ? t.stroke.width * n / 2 : 0, H = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, U = B ? Math.hypot(B.offsetX, B.offsetY) / R : 0, ee = V + H + U + 2, te = (e) => {
-			if (j) {
-				if (Gr(e, j.camera, x, S, C, w, P, {
-					bevels: z,
-					extrusion: B ?? void 0,
+			j(e, t, n, r, i), O(e, t, n, r, i);
+		}, P = e.getTransform(), F = Math.abs(P.a * P.d - P.b * P.c), I = F > 0 ? Math.sqrt(F) : 1, L = Hr(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, r, I), R = A ? Ur(t.sp3d, A.camera, C, w, r, I) : null, z = t.stroke ? t.stroke.width * r / 2 : 0, V = t.sp3d?.contourW ? t.sp3d.contourW * r : 0, ee = R ? Math.hypot(R.offsetX, R.offsetY) / I : 0, U = z + V + ee + 2, W = (e) => {
+			if (A) {
+				if (Wr(e, A.camera, x, S, C, w, N, {
+					bevels: L,
+					extrusion: R ?? void 0,
 					paintEdges: k,
-					edgePadCss: ee
+					edgePadCss: U
 				})) return;
-			} else if (z.length > 0 && Kr(e, x, S, C, w, z, P, k, ee)) return;
-			N(e, x, S, C, w);
-		}, G = (e, t, n, r, i, a) => {
+			} else if (L.length > 0 && Gr(e, x, S, C, w, L, N, k, U)) return;
+			M(e, x, S, C, w);
+		}, te = (e, t, n, r, i, a) => {
 			e.save(), D(e, n, r, i, a), e.fillStyle = t, e.fillRect(n, r, i, a), e.restore();
-		}, K = (e, t) => {
-			j && Gr(e, j.camera, x, S, C, w, (e, n, r, i, a) => G(e, t, n, r, i, a)) || G(e, t, x, S, C, w);
-		}, q = e.getTransform(), ne = Math.abs(q.a * q.d - q.b * q.c), re = ne > 0 ? Math.sqrt(ne) : 1, ie = V + H, ae = (t.custGeom && t.custGeom.length > 0 ? ge(t.custGeom, x, S, C, w) : t.prstGeom && m(t.prstGeom.toLowerCase()) ? W(t.prstGeom.toLowerCase(), x, S, C, w, t.prstAdjust ?? []) : null) ?? {
+		}, G = (e, t) => {
+			A && Wr(e, A.camera, x, S, C, w, (e, n, r, i, a) => te(e, t, n, r, i, a)) || te(e, t, x, S, C, w);
+		}, K = e.getTransform(), q = Math.abs(K.a * K.d - K.b * K.c), ne = q > 0 ? Math.sqrt(q) : 1, re = z + V, ie = (t.custGeom && t.custGeom.length > 0 ? he(t.custGeom, x, S, C, w) : t.prstGeom && n(t.prstGeom.toLowerCase()) ? B(t.prstGeom.toLowerCase(), x, S, C, w, t.prstAdjust ?? []) : null) ?? {
 			x,
 			y: S,
 			w: C,
 			h: w
-		}, oe = j ? Nr(j.camera, q, x, S, C, w, ee, t.shadow?.algn) : {
-			bbox: kr(q, ae.x - ie, ae.y - ie, ae.w + ie * 2, ae.h + ie * 2),
-			anchor: Mr(q, x, S, C, w, t.shadow?.algn)
-		}, se = n * re, ce = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), le = (e) => K(e, "#000");
-		Fr(e, t, j && ce ? Pr(te, q, oe.bbox, {
+		}, ae = A ? Mr(A.camera, K, x, S, C, w, U, t.shadow?.algn) : {
+			bbox: Or(K, ie.x - re, ie.y - re, ie.w + re * 2, ie.h + re * 2),
+			anchor: jr(K, x, S, C, w, t.shadow?.algn)
+		}, oe = r * ne, se = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), ce = (e) => G(e, "#000");
+		Pr(e, t, A && se ? Nr(W, K, ae.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : te, j && ce ? Pr(le, q, oe.bbox, {
+		}) : W, A && se ? Nr(ce, K, ae.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : le, oe.bbox, oe.anchor, n, se, q), e.restore();
-	} catch (i) {
-		if (a(i, "tiff")) {
-			r() || Xr(e, t, n);
+		}) : ce, ae.bbox, ae.anchor, r, oe, K), e.restore();
+	} catch (n) {
+		if (ue(n, "tiff")) {
+			i() || Yr(e, t, r);
 			return;
 		}
-		if (Re(i) || Je(i)) throw i;
+		if (Le(n) || qe(n)) throw n;
 	}
 }
-async function Qr(e, t, n, r, i, o, s, c, l = 1, u, d) {
-	let f = Y(t.x, n), p = Y(t.y, n), m = Y(t.width, n), h = Y(t.height, n), g, _ = !1;
+async function Zr(e, t, n, r, i, a, o, s, c = 1, l, u) {
+	let d = X(t.x, n), f = X(t.y, n), p = X(t.width, n), m = X(t.height, n), h, g = !1;
 	if (t.posterPath && i) try {
-		g = await Yr(t, i, s, c, t.posterMimeType === "image/svg+xml" ? Dn(m, h, l) : d ? On(d, X(t.posterPath)) : void 0, u);
+		h = await Jr(t, i, o, s, t.posterMimeType === "image/svg+xml" ? En(p, m, c) : u ? Dn(u, Z(t.posterPath)) : void 0, l);
 	} catch (e) {
-		if (a(e, "tiff")) _ = !0;
-		else if (Re(e) || Je(e)) throw e;
+		if (ue(e, "tiff")) g = !0;
+		else if (Le(e) || qe(e)) throw e;
 	}
-	r() || (e.save(), ti(e, t, n), g ? e.drawImage(g, f, p, m, h) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(f, p, m, h), _ && ue(e, "tiff", {
-		x: f,
-		y: p,
-		width: m,
-		height: h
-	})), o || on(e, f + m / 2, p + h / 2, m, h, "paused"), e.restore());
-}
-function $r(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);
+	r() || (e.save(), ei(e, t, n), h ? e.drawImage(h, d, f, p, m) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(d, f, p, m), g && b(e, "tiff", {
+		x: d,
+		y: f,
+		width: p,
+		height: m
+	})), a || an(e, d + p / 2, f + m / 2, p, m, "paused"), e.restore());
+}
+function Qr(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);
 	if (u === 0) return;
 	let d = -l / u, f = c / u, p;
 	switch (i) {
@@ -5224,199 +5232,199 @@ function $r(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 ? Pn(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 ? Nn(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) ?? Q(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 ei(e, t, n, r, i = 0) {
-	if (Ae(e, t, n), t?.fill && r) {
-		let n = Pn(t.fill, e, r.x, r.y, r.w, r.h, i);
+function $r(e, t, n, r, i = 0) {
+	if (ke(e, t, n), t?.fill && r) {
+		let n = Nn(t.fill, e, r.x, r.y, r.w, r.h, i);
 		n && (e.strokeStyle = n);
 	}
 }
-function ti(e, t, n) {
+function ei(e, t, n) {
 	if (t.rotation === 0 && !t.flipH && !t.flipV) return;
-	let r = Y(t.x, n), i = Y(t.y, n), a = Y(t.width, n), o = Y(t.height, n);
+	let r = X(t.x, n), i = X(t.y, n), a = X(t.width, n), o = X(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 ni(t, n, r, i, a = {
+function ti(e, t, n, r, i = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
-}, o) {
-	t.save(), ti(t, n, r);
-	let s = Y(n.x, r), c = Y(n.y, r), l = n.cols.map((e) => Y(e, r)), u = l.length, d = (e, t) => {
+}, a) {
+	e.save(), ei(e, t, n);
+	let o = X(t.x, n), s = X(t.y, n), c = t.cols.map((e) => X(e, n)), l = c.length, u = (e, t) => {
 		let n = 0;
-		for (let r = 0; r < t; r++) n += l[e + r] ?? 0;
+		for (let r = 0; r < t; r++) n += c[e + r] ?? 0;
 		return n;
-	}, f = n.rows.map((e) => Y(e.height, r));
-	for (let e = 0; e < n.rows.length; e++) {
-		let o = n.rows[e];
-		for (let n = 0; n < o.cells.length; n++) {
-			let s = o.cells[n];
+	}, d = t.rows.map((e) => X(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 = d(n, s.gridSpan || 1), l = Hr(t, s.textBody, 0, 0, c, 0, r, null, 0, !1, !1, "#000000", i, a, void 0, !0, void 0, !1, o.height === 0) || 0;
-			l > f[e] && (f[e] = l);
+			let c = u(t, s.gridSpan || 1), l = Vr(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;
+			l > d[a] && (d[a] = l);
 		}
 	}
-	for (let e = 0; e < n.rows.length; e++) {
-		let o = n.rows[e];
+	for (let a = 0; a < t.rows.length; a++) {
+		let o = t.rows[a];
 		for (let s = 0; s < o.cells.length; s++) {
 			let c = o.cells[s];
 			if (c.hMerge || c.vMerge) continue;
 			let l = c.rowSpan || 1;
 			if (l <= 1 || !c.textBody) continue;
-			let u = d(s, c.gridSpan || 1), p = n.rows.slice(e, Math.min(n.rows.length, e + l)).some((e) => e.height === 0), m = Hr(t, c.textBody, 0, 0, u, 0, r, null, 0, !1, !1, "#000000", i, a, void 0, !0, void 0, !1, p) || 0, h = 0;
-			for (let t = 0; t < l && e + t < f.length; t++) h += f[e + t];
+			let f = u(s, c.gridSpan || 1), p = t.rows.slice(a, Math.min(t.rows.length, a + l)).some((e) => e.height === 0), m = Vr(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 < l && a + e < d.length; e++) h += d[a + e];
 			if (m > h) {
-				let t = (m - h) / l;
-				for (let n = 0; n < l && e + n < f.length; n++) f[e + n] += t;
+				let e = (m - h) / l;
+				for (let t = 0; t < l && a + t < d.length; t++) d[a + t] += e;
 			}
 		}
 	}
-	let p = l.reduce((e, t) => e + t, 0), m = Array(u);
-	if (n.rtl) {
-		let e = s + p;
-		for (let t = 0; t < u; t++) e -= l[t], m[t] = e;
+	let f = c.reduce((e, t) => e + t, 0), p = Array(l);
+	if (t.rtl) {
+		let e = o + f;
+		for (let t = 0; t < l; t++) e -= c[t], p[t] = e;
 	} else {
-		let e = s;
-		for (let t = 0; t < u; t++) m[t] = e, e += l[t];
+		let e = o;
+		for (let t = 0; t < l; t++) p[t] = e, e += c[t];
 	}
-	let h = (e, t) => n.rtl ? m[e + t - 1] : m[e], g = Array(n.rows.length);
+	let m = (e, n) => t.rtl ? p[e + n - 1] : p[e], h = Array(t.rows.length);
 	{
-		let e = c;
-		for (let t = 0; t < n.rows.length; t++) g[t] = e, e += f[t];
+		let e = s;
+		for (let n = 0; n < t.rows.length; n++) h[n] = e, e += d[n];
 	}
-	let _, v = {
+	let g, _ = {
 		row: 0,
 		column: 0
 	};
-	if (o) {
-		let e = Y(n.width, r), t = Y(n.height, r), i = s + e / 2, a = c + t / 2, l = n.rotation * Math.PI / 180, u = Math.cos(l), d = Math.sin(l);
-		_ = (e) => {
-			let t = e.shapeX + e.shapeW / 2 - i, r = e.shapeY + e.shapeH / 2 - a;
-			n.flipH && (t = -t), n.flipV && (r = -r);
-			let s = i + u * t - d * r, c = a + d * t + u * r;
-			o({
+	if (a) {
+		let e = X(t.width, n), r = X(t.height, n), i = o + e / 2, c = s + r / 2, l = t.rotation * Math.PI / 180, u = Math.cos(l), d = Math.sin(l);
+		g = (e) => {
+			let n = e.shapeX + e.shapeW / 2 - i, r = e.shapeY + e.shapeH / 2 - c;
+			t.flipH && (n = -n), t.flipV && (r = -r);
+			let o = i + u * n - d * r, s = c + d * n + u * r;
+			a({
 				...e,
-				...n.id === void 0 ? {} : { shapeId: n.id },
-				shapeX: s - e.shapeW / 2,
-				shapeY: c - e.shapeH / 2,
-				rotation: n.rotation,
-				...n.flipH ? { shapeFlipH: !0 } : {},
-				...n.flipV ? { shapeFlipV: !0 } : {},
-				tableCell: v
+				...t.id === void 0 ? {} : { shapeId: t.id },
+				shapeX: o - e.shapeW / 2,
+				shapeY: s - e.shapeH / 2,
+				rotation: t.rotation,
+				...t.flipH ? { shapeFlipH: !0 } : {},
+				...t.flipV ? { shapeFlipV: !0 } : {},
+				tableCell: _
 			});
 		};
 	}
-	let y = [], b = n.rows.map(() => Array(u).fill(-1));
-	for (let e = 0; e < n.rows.length; e++) {
-		let t = n.rows[e], r = g[e];
-		for (let i = 0; i < t.cells.length; i++) {
-			let a = t.cells[i];
+	let v = [], y = t.rows.map(() => Array(l).fill(-1));
+	for (let e = 0; e < t.rows.length; e++) {
+		let n = t.rows[e], r = h[e];
+		for (let i = 0; i < n.cells.length; i++) {
+			let a = n.cells[i];
 			if (a.hMerge || a.vMerge) continue;
-			let o = a.gridSpan || 1, s = a.rowSpan || 1, c = d(i, o), l = 0;
-			for (let t = 0; t < s; t++) l += f[e + t] ?? 0;
-			let p = h(i, o), m = Math.min(e + s - 1, n.rows.length - 1), g = y.length;
-			y.push({
+			let o = a.gridSpan || 1, s = a.rowSpan || 1, c = u(i, o), f = 0;
+			for (let t = 0; t < s; t++) f += d[e + t] ?? 0;
+			let p = m(i, o), h = Math.min(e + s - 1, t.rows.length - 1), g = v.length;
+			v.push({
 				cell: a,
 				colX: p,
 				rowY: r,
 				cellW: c,
-				cellH: l,
+				cellH: f,
 				ci: i,
 				ri: e,
 				span: o,
-				lastRi: m
+				lastRi: h
 			});
-			for (let t = e; t <= m; t++) for (let e = i; e < i + o && e < u; e++) b[t][e] = g;
+			for (let t = e; t <= h; t++) for (let e = i; e < i + o && e < l; e++) y[t][e] = g;
 		}
 	}
-	for (let { cell: e, colX: o, rowY: s, cellW: c, cellH: l, ci: u, ri: d } of y) {
-		let f = Pn(e.fill, t, o, s, c, l, n.rotation);
-		if (f && (t.fillStyle = f, t.fillRect(o, s, c, l)), e.textBody) {
-			_ && (v = {
+	for (let { cell: a, colX: o, rowY: s, cellW: c, cellH: l, ci: u, ri: d } of v) {
+		let f = Nn(a.fill, e, o, s, c, l, t.rotation);
+		if (f && (e.fillStyle = f, e.fillRect(o, s, c, l)), a.textBody) {
+			g && (_ = {
 				row: d,
 				column: u
 			});
-			let n = e.textColor ? Z(e.textColor) : null;
-			Hr(t, e.textBody, o, s, c, l, r, n, 0, !1, !1, "#000000", i, a, _);
+			let t = a.textColor ? Q(a.textColor) : null;
+			Vr(e, a.textBody, o, s, c, l, n, t, 0, !1, !1, "#000000", r, i, g);
 		}
 	}
-	let x = a.dpr, S = (e, t) => {
-		if (e < 0 || e >= b.length || t < 0 || t >= u) return null;
-		let n = b[e][t];
-		return n < 0 ? null : y[n];
-	}, C = (i, a, o, s, c) => {
-		if (ei(t, i, r, {
-			x: Math.min(a, s),
-			y: Math.min(o, c),
-			w: Math.max(1, Math.abs(s - a)),
-			h: Math.max(1, Math.abs(c - o))
-		}, n.rotation), i.cmpd === "dbl" && !i.dashStyle && !i.customDash?.length && (a === s || o === c)) {
-			t.fillStyle = t.strokeStyle, Se(t, a, o, s, c, Math.max(.5, Y(i.width, r)), x);
+	let b = i.dpr, x = (e, t) => {
+		if (e < 0 || e >= y.length || t < 0 || t >= l) return null;
+		let n = y[e][t];
+		return n < 0 ? null : v[n];
+	}, S = (r, i, a, o, s) => {
+		if ($r(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), r.cmpd === "dbl" && !r.dashStyle && !r.customDash?.length && (i === o || a === s)) {
+			e.fillStyle = e.strokeStyle, xe(e, i, a, o, s, Math.max(.5, X(r.width, n)), b);
 			return;
 		}
-		let l = a === s ? e(a, t.lineWidth, x) : 0, u = o === c ? e(o, t.lineWidth, x) : 0;
-		t.beginPath(), t.moveTo(a + l, o + u), t.lineTo(s + l, c + u), t.stroke();
+		let c = i === o ? T(i, e.lineWidth, b) : 0, l = a === s ? T(a, e.lineWidth, b) : 0;
+		e.beginPath(), e.moveTo(i + c, a + l), e.lineTo(o + c, s + l), e.stroke();
 	};
-	for (let e of y) {
-		let { cell: i, colX: a, rowY: o, cellW: s, cellH: c } = e;
-		t.save();
-		let l = n.rtl ? i.borderR : i.borderL, p = n.rtl ? i.borderL : i.borderR, m = n.rtl ? e.ci + e.span === u : e.ci === 0, _ = n.rtl ? e.ci === 0 : e.ci + e.span === u, v = n.rtl ? e.ci - 1 : e.ci + e.span, y = (e) => n.rtl ? e.borderR : e.borderL;
-		if (e.ri === 0 && i.borderT && C(i.borderT, a, o, a + s, o), m && l && C(l, a, o, a, o + c), e.lastRi === n.rows.length - 1) {
+	for (let r of v) {
+		let { cell: i, colX: a, rowY: o, cellW: s, cellH: c } = r;
+		e.save();
+		let f = t.rtl ? i.borderR : i.borderL, p = t.rtl ? i.borderL : i.borderR, g = t.rtl ? r.ci + r.span === l : r.ci === 0, _ = t.rtl ? r.ci === 0 : r.ci + r.span === l, v = t.rtl ? r.ci - 1 : r.ci + r.span, b = (e) => t.rtl ? e.borderR : e.borderL;
+		if (r.ri === 0 && i.borderT && S(i.borderT, a, o, a + s, o), g && f && S(f, a, o, a, o + c), r.lastRi === t.rows.length - 1) {
 			let e = i.borderB;
-			e && C(e, a, o + c, a + s, o + c);
+			e && S(e, a, o + c, a + s, o + c);
 		} else {
-			let t = e.lastRi + 1, n = o + c, r = Math.min(e.ci + e.span, u), a = e.ci;
-			for (; a < r;) {
-				let e = b[t][a], o = a + 1;
-				for (; o < r && b[t][o] === e;) o++;
-				let s = S(t, a), c = gn(i.borderB, s ? s.cell.borderT : null);
+			let e = r.lastRi + 1, t = o + c, n = Math.min(r.ci + r.span, l), a = r.ci;
+			for (; a < n;) {
+				let r = y[e][a], o = a + 1;
+				for (; o < n && y[e][o] === r;) o++;
+				let s = x(e, a), c = hn(i.borderB, s ? s.cell.borderT : null);
 				if (c) {
-					let e = h(a, o - a);
-					C(c, e, n, e + d(a, o - a), n);
+					let e = m(a, o - a);
+					S(c, e, t, e + u(a, o - a), t);
 				}
 				a = o;
 			}
 		}
 		if (_) {
 			let e = p;
-			e && C(e, a + s, o, a + s, o + c);
+			e && S(e, a + s, o, a + s, o + c);
 		} else {
-			let t = a + s, n = e.ri;
-			for (; n <= e.lastRi;) {
-				let r = b[n][v], i = n;
-				for (; i + 1 <= e.lastRi && b[i + 1][v] === r;) i++;
-				let a = S(n, v), o = gn(p, a ? y(a.cell) : null);
-				o && C(o, t, g[n], t, g[i] + f[i]), n = i + 1;
+			let e = a + s, t = r.ri;
+			for (; t <= r.lastRi;) {
+				let n = y[t][v], i = t;
+				for (; i + 1 <= r.lastRi && y[i + 1][v] === n;) i++;
+				let a = x(t, v), o = hn(p, a ? b(a.cell) : null);
+				o && S(o, e, h[t], e, h[i] + d[i]), t = i + 1;
 			}
 		}
-		i.diagonalTL && (ei(t, i.diagonalTL, r, {
+		i.diagonalTL && ($r(e, i.diagonalTL, n, {
 			x: a,
 			y: o,
 			w: s,
 			h: c
-		}, n.rotation), t.beginPath(), t.moveTo(a, o), t.lineTo(a + s, o + c), t.stroke()), i.diagonalTR && (ei(t, i.diagonalTR, r, {
+		}, t.rotation), e.beginPath(), e.moveTo(a, o), e.lineTo(a + s, o + c), e.stroke()), i.diagonalTR && ($r(e, i.diagonalTR, n, {
 			x: a,
 			y: o,
 			w: s,
 			h: c
-		}, n.rotation), t.beginPath(), t.moveTo(a + s, o), t.lineTo(a, o + c), t.stroke()), t.restore();
+		}, t.rotation), e.beginPath(), e.moveTo(a + s, o), e.lineTo(a, o + c), e.stroke()), e.restore();
 	}
-	t.restore();
+	e.restore();
 }
-function ri(e, t, n, r) {
+function ni(e, t, n, r) {
 	e.save(), e.globalAlpha = t.opacity, e.fillStyle = t.color, e.fillRect(0, 0, n, r), e.restore();
 }
-var ii = /* @__PURE__ */ new WeakMap();
-function ai(e) {
-	ii.set(e, (ii.get(e) ?? 0) + 1);
+var ri = /* @__PURE__ */ new WeakMap();
+function ii(e) {
+	ri.set(e, (ri.get(e) ?? 0) + 1);
 }
-function oi(e, t, n, r, i) {
+function ai(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([]);
@@ -5436,72 +5444,72 @@ function oi(e, t, n, r, i) {
 	for (let t of f.slice(0, 4)) e.fillText(t, o, h), h += m;
 	e.restore();
 }
+async function oi(e, t, n, r, i = {}, a) {
+	return si(e, t, n, r, i, a);
+}
 async function si(e, t, n, r, i = {}, a) {
-	return ci(e, t, n, r, i, a);
-}
-async function ci(e, t, n, r, i = {}, a) {
-	let o = i.fetchImage ?? (i.fetchMedia ? Jr(i.fetchMedia) : void 0), s = (ii.get(e) ?? 0) + 1;
-	ii.set(e, s);
-	let c = () => ii.get(e) !== s, l = () => c() ? Promise.resolve(e) : li(e, t, n, r, i, a, o, c);
-	return o && Mn(t) ? j(o, i.imageResources, l) : l();
-}
-async function li(e, t, n, r, i = {}, o, s, c = () => !1) {
-	let l = i.width ?? ((se(e) ? e.offsetWidth : 0) || 960), u = l / n, d = Math.round(l), f = Math.round(r * u), p = i.dpr ?? L(), m = He(d * p, f * p), h = m.clamped ? p * m.scale : p, g = await jn(t, d, f, u, h, i.imageResources, i.fetchImage, i.fetchMedia, s, i.tiff);
-	e.width = m.width, e.height = m.height, se(e) && (e.style.width = `${d}px`, e.style.display || (e.style.display = "block"));
-	let _ = e.getContext("2d");
-	if (!_) throw Error("Could not get 2D context");
-	if (_.scale(h, h), t.parseError) return oi(_, d, f, t.slideNumber, t.parseError), e;
-	let v = i.defaultTextColor ? `#${i.defaultTextColor}` : "#000000", y = /* @__PURE__ */ new Map(), b = {
-		themeMajorFont: i.majorFont ?? null,
-		themeMinorFont: i.minorFont ?? null,
-		themeHlinkColor: i.hlinkColor ?? null,
-		embeddedFontAliases: i.embeddedFontAliases,
-		embeddedFontAuthoredFamilies: i.embeddedFontAuthoredFamilies,
+	let o = i.fetchImage ?? (i.fetchMedia ? qr(i.fetchMedia) : void 0), s = (ri.get(e) ?? 0) + 1;
+	ri.set(e, s);
+	let c = () => ri.get(e) !== s, l = () => c() ? Promise.resolve(e) : ci(e, t, n, r, i, a, o, c);
+	return o && jn(t) ? se(o, i.imageResources, l) : l();
+}
+async function ci(t, n, r, i, a = {}, o, s, c = () => !1) {
+	let l = a.width ?? ((e(t) ? t.offsetWidth : 0) || 960), u = l / r, d = Math.round(l), f = Math.round(i * u), p = a.dpr ?? _(), m = Ve(d * p, f * p), h = m.clamped ? p * m.scale : p, g = await An(n, d, f, u, h, a.imageResources, a.fetchImage, a.fetchMedia, s, a.tiff);
+	t.width = m.width, t.height = m.height, e(t) && (t.style.width = `${d}px`, t.style.display || (t.style.display = "block"));
+	let v = t.getContext("2d");
+	if (!v) throw Error("Could not get 2D context");
+	if (v.scale(h, h), n.parseError) return ai(v, d, f, n.slideNumber, n.parseError), t;
+	let y = a.defaultTextColor ? `#${a.defaultTextColor}` : "#000000", b = /* @__PURE__ */ new Map(), x = {
+		themeMajorFont: a.majorFont ?? null,
+		themeMinorFont: a.minorFont ?? null,
+		themeHlinkColor: a.hlinkColor ?? null,
+		embeddedFontAliases: a.embeddedFontAliases,
+		embeddedFontAuthoredFamilies: a.embeddedFontAuthoredFamilies,
 		dpr: h,
-		smartArtFallbackTextColor: bn(t.background, v),
-		pictureBulletImages: y
+		smartArtFallbackTextColor: yn(n.background, y),
+		pictureBulletImages: b
 	};
-	if (await sr(_, t.background, d, f, u, c, i.fetchImage, i.tiff, i.svgDecoder, g), c() || (i.math && await Rn(t, i.math), c())) return e;
-	let x = t.slideNumber;
-	for (let e of t.elements) if (e.type === "picture" && i.fetchImage) {
-		let t = e, n = t.mimeType === "image/svg+xml", r = A(t) || n, a = !r && !t.duotone ? On(g, X(kn(t), t.duotone)) : void 0, o = Dn(Y(t.width, u), Y(t.height, u), h, t.srcRect), s = r ? o : a, c = s && "maxRetainedPixels" in s ? s.maxRetainedPixels : void 0, l = {
+	if (await or(v, n.background, d, f, u, c, a.fetchImage, a.tiff, a.svgDecoder, g), c() || (a.math && await Ln(n, a.math), c())) return t;
+	let S = n.slideNumber;
+	for (let e of n.elements) if (e.type === "picture" && a.fetchImage) {
+		let t = e, n = t.mimeType === "image/svg+xml", r = J(t) || n, i = !r && !t.duotone ? Dn(g, Z(On(t), t.duotone)) : void 0, o = En(X(t.width, u), X(t.height, u), h, t.srcRect), s = r ? o : i, c = s && "maxRetainedPixels" in s ? s.maxRetainedPixels : void 0, l = {
 			...s ? {
 				targetWidthPx: s.targetWidthPx,
 				targetHeightPx: s.targetHeightPx,
 				...c === void 0 ? {} : { maxRetainedPixels: c }
 			} : {},
-			workerDecoder: i.svgDecoder
+			workerDecoder: a.svgDecoder
 		};
-		if (A(t)) I(t.svgImagePath, i.fetchImage, l).catch(() => void 0);
-		else if (n) I(t.imagePath, i.fetchImage, l).catch(() => void 0);
+		if (J(t)) H(t.svgImagePath, a.fetchImage, l).catch(() => void 0);
+		else if (n) H(t.imagePath, a.fetchImage, l).catch(() => void 0);
 		else {
-			let e = Pe(t.mimeType, t.srcRect, t.width / J, t.height / J);
+			let e = Ne(t.mimeType, t.srcRect, t.width / Y, t.height / Y);
 			if (!e) continue;
-			Ye(t.imagePath, t.mimeType, t.duotone, i.fetchImage, {
+			Je(t.imagePath, t.mimeType, t.duotone, a.fetchImage, {
 				widthPt: e.widthPt,
 				heightPt: e.heightPt,
 				...s ?? {},
-				tiff: i.tiff,
-				svgDecoder: i.svgDecoder
+				tiff: a.tiff,
+				svgDecoder: a.svgDecoder
 			}).catch(() => void 0);
 		}
 	} else if (e.type === "media") {
 		let t = e;
-		t.posterPath && i.fetchMedia && Yr(t, i.fetchMedia, s, i.tiff, t.posterMimeType === "image/svg+xml" ? Dn(Y(t.width, u), Y(t.height, u), h) : On(g, X(t.posterPath)), i.svgDecoder).catch(() => void 0);
+		t.posterPath && a.fetchMedia && Jr(t, a.fetchMedia, s, a.tiff, t.posterMimeType === "image/svg+xml" ? En(X(t.width, u), X(t.height, u), h) : Dn(g, Z(t.posterPath)), a.svgDecoder).catch(() => void 0);
 	}
-	let S = /* @__PURE__ */ new Map();
-	if (i.fetchImage) {
-		let n = i.fetchImage, r = /* @__PURE__ */ new Map(), o = [];
-		for (let e of t.elements) {
+	let C = /* @__PURE__ */ new Map();
+	if (a.fetchImage) {
+		let e = a.fetchImage, r = /* @__PURE__ */ new Map(), i = [];
+		for (let e of n.elements) {
 			if (e.type !== "chart" || !Number.isFinite(e.width) || e.width <= 0 || !Number.isFinite(e.height) || e.height <= 0) continue;
 			let t = {
-				widthPt: e.width / J,
-				heightPt: e.height / J,
-				targetWidthPx: Y(e.width, u) * h,
-				targetHeightPx: Y(e.height, u) * h
+				widthPt: e.width / Y,
+				heightPt: e.height / Y,
+				targetWidthPx: X(e.width, u) * h,
+				targetHeightPx: X(e.height, u) * h
 			}, n = [], r = !0;
-			for (let i of Ee(e.chart)) {
-				let e = De(i, t);
+			for (let i of Te(e.chart)) {
+				let e = Ee(i, t);
 				if (!e) {
 					r = !1;
 					break;
@@ -5511,16 +5519,16 @@ async function li(e, t, n, r, i = {}, o, s, c = () => !1) {
 					size: e
 				});
 			}
-			r && o.push({
+			r && i.push({
 				element: e,
 				frame: t,
 				usages: n
 			});
 		}
-		let s = /* @__PURE__ */ new Map();
-		for (let e of Ne(o.map(({ element: e }) => e.chart), (e, t) => De(e, o[t].frame) != null)) {
-			let { fill: t } = e, n = Le(t);
-			s.has(n) || s.set(n, {
+		let o = /* @__PURE__ */ new Map();
+		for (let e of Me(i.map(({ element: e }) => e.chart), (e, t) => Ee(e, i[t].frame) != null)) {
+			let { fill: t } = e, n = Ie(t);
+			o.has(n) || o.set(n, {
 				fill: t,
 				widthPt: 0,
 				heightPt: 0,
@@ -5528,14 +5536,14 @@ async function li(e, t, n, r, i = {}, o, s, c = () => !1) {
 				hasSourceCrop: e.hasSourceCrop
 			});
 		}
-		for (let { usages: e } of o) for (let { usage: t, size: n } of e) {
-			let { fill: e } = t, r = Le(e), i = s.get(r);
+		for (let { usages: e } of i) for (let { usage: t, size: n } of e) {
+			let { fill: e } = t, r = Ie(e), i = o.get(r);
 			if (!i) continue;
-			let a = i.preserveNaturalSize || t.preserveNaturalSize, o = i.hasSourceCrop || t.hasSourceCrop, c = a || e.duotone ? void 0 : On(g, X(e.imagePath, e.duotone)), l = !e.duotone && (e.mimeType === "image/svg+xml" || A({
+			let a = i.preserveNaturalSize || t.preserveNaturalSize, s = i.hasSourceCrop || t.hasSourceCrop, c = a || e.duotone ? void 0 : Dn(g, Z(e.imagePath, e.duotone)), l = !e.duotone && (e.mimeType === "image/svg+xml" || J({
 				svgImagePath: e.svgImagePath,
-				srcRect: o ? !0 : null
+				srcRect: s ? !0 : null
 			}));
-			s.set(r, {
+			o.set(r, {
 				...i,
 				widthPt: Math.max(i.widthPt, n.widthPt),
 				heightPt: Math.max(i.heightPt, n.heightPt),
@@ -5543,145 +5551,145 @@ async function li(e, t, n, r, i = {}, o, s, c = () => !1) {
 				targetHeightPx: a ? void 0 : c?.targetHeightPx ?? (l && Math.max(i.targetHeightPx ?? 0, n.targetHeightPx ?? 0) || void 0),
 				maxRetainedPixels: c?.maxRetainedPixels,
 				preserveNaturalSize: a,
-				hasSourceCrop: o
+				hasSourceCrop: s
 			});
 		}
-		for (let e of t.elements) if (!(e.type !== "shape" || !e.textBody)) for (let t of e.textBody.paragraphs) {
-			let n = $e(t.bullet);
+		for (let e of n.elements) if (!(e.type !== "shape" || !e.textBody)) for (let t of e.textBody.paragraphs) {
+			let n = Qe(t.bullet);
 			if (n.type === "blip") {
-				let i = Qn(e.textBody, t, n) * J * u * h, a = r.get(n.imagePath);
+				let i = Zn(e.textBody, t, n) * Y * u * h, a = r.get(n.imagePath);
 				a ? Number.isFinite(i) && i > 0 && (a.targetHeightPx = Math.max(a.targetHeightPx ?? 0, i)) : r.set(n.imagePath, {
 					mimeType: n.mimeType,
 					...Number.isFinite(i) && i > 0 ? { targetHeightPx: i } : {}
 				});
 			}
 		}
-		if (r.size > 0 || s.size > 0) {
-			let t = [...r].map(async ([e, { mimeType: t, targetHeightPx: r }]) => {
+		if (r.size > 0 || o.size > 0) {
+			let n = [...r].map(async ([t, { mimeType: n, targetHeightPx: r }]) => {
 				try {
-					let a = t === "image/svg+xml" ? r === void 0 ? {} : {
+					let i = n === "image/svg+xml" ? r === void 0 ? {} : {
 						targetWidthPx: 1,
 						targetHeightPx: r
-					} : On(g, X(e)) ?? {}, o = t === "image/svg+xml" ? await I(e, n, {
-						...a,
-						workerDecoder: i.svgDecoder
-					}) : await K(e, t, n, {
-						tiff: i.tiff,
-						...a
+					} : Dn(g, Z(t)) ?? {}, o = n === "image/svg+xml" ? await H(t, e, {
+						...i,
+						workerDecoder: a.svgDecoder
+					}) : await P(t, n, e, {
+						tiff: a.tiff,
+						...i
 					});
-					y.set(e, o);
-				} catch (t) {
-					if (a(t, "tiff")) {
-						y.set(e, null);
+					b.set(t, o);
+				} catch (e) {
+					if (ue(e, "tiff")) {
+						b.set(t, null);
 						return;
 					}
-					if (Re(t) || Je(t)) throw t;
-					y.set(e, null);
+					if (Le(e) || qe(e)) throw e;
+					b.set(t, null);
 				}
-			}), o = [...s].map(async ([e, t]) => {
-				let { fill: r, widthPt: o, heightPt: s, targetWidthPx: c, targetHeightPx: l, maxRetainedPixels: u, hasSourceCrop: d } = t, f = c && l ? {
-					targetWidthPx: c,
-					targetHeightPx: l,
-					...u === void 0 ? {} : { maxRetainedPixels: u }
+			}), i = [...o].map(async ([t, n]) => {
+				let { fill: r, widthPt: i, heightPt: o, targetWidthPx: s, targetHeightPx: c, maxRetainedPixels: l, hasSourceCrop: u } = n, d = s && c ? {
+					targetWidthPx: s,
+					targetHeightPx: c,
+					...l === void 0 ? {} : { maxRetainedPixels: l }
 				} : void 0;
 				try {
-					let t = () => r.mimeType === "image/svg+xml" ? r.duotone ? Promise.resolve(null) : I(r.imagePath, n, {
-						...f ?? {},
-						workerDecoder: i.svgDecoder
-					}) : Ye(r.imagePath, r.mimeType, r.duotone, n, {
-						widthPt: o,
-						heightPt: s,
-						...f ?? {},
+					let n = () => r.mimeType === "image/svg+xml" ? r.duotone ? Promise.resolve(null) : H(r.imagePath, e, {
+						...d ?? {},
+						workerDecoder: a.svgDecoder
+					}) : Je(r.imagePath, r.mimeType, r.duotone, e, {
+						widthPt: i,
+						heightPt: o,
+						...d ?? {},
 						failClosedOnDuotoneFailure: !0,
-						tiff: i.tiff
-					}), a, c = {
+						tiff: a.tiff
+					}), s, c = {
 						svgImagePath: r.svgImagePath,
-						srcRect: d ? !0 : null
+						srcRect: u ? !0 : null
 					};
-					if (!r.duotone && A(c)) try {
-						a = await I(c.svgImagePath, n, {
-							...f ?? {},
-							workerDecoder: i.svgDecoder
+					if (!r.duotone && J(c)) try {
+						s = await H(c.svgImagePath, e, {
+							...d ?? {},
+							workerDecoder: a.svgDecoder
 						});
 					} catch {
-						a = await t();
+						s = await n();
 					}
-					else a = await t();
-					S.set(e, a);
-				} catch (t) {
-					if (a(t, "tiff")) {
-						S.set(e, null);
+					else s = await n();
+					C.set(t, s);
+				} catch (e) {
+					if (ue(e, "tiff")) {
+						C.set(t, null);
 						return;
 					}
-					if (Re(t) || Je(t)) throw t;
-					S.set(e, null);
+					if (Le(e) || qe(e)) throw e;
+					C.set(t, null);
 				}
 			});
-			if (await Promise.all([...t, ...o]), c()) return e;
+			if (await Promise.all([...n, ...i]), c()) return t;
 		}
 	}
-	for (let [n, r] of t.elements.entries()) {
-		if (c()) return e;
-		if (r.type === "shape") Ir(_, r, u, v, x, b, o ? (e) => o({
-			...e,
-			elementIndex: n,
-			origin: t.elementSources?.[n]?.origin ?? "slide"
-		}) : void 0, i.fetchImage);
-		else if (r.type === "picture") await Zr(_, r, u, c, i.fetchImage, i.tiff, h, i.svgDecoder, g);
-		else if (r.type === "table") ni(_, r, u, x, b, o ? (e) => o({
-			...e,
-			elementIndex: n,
-			origin: t.elementSources?.[n]?.origin ?? "slide"
+	for (let [e, r] of n.elements.entries()) {
+		if (c()) return t;
+		if (r.type === "shape") Fr(v, r, u, y, S, x, o ? (t) => o({
+			...t,
+			elementIndex: e,
+			origin: n.elementSources?.[e]?.origin ?? "slide"
+		}) : void 0, a.fetchImage);
+		else if (r.type === "picture") await Xr(v, r, u, c, a.fetchImage, a.tiff, h, a.svgDecoder, g);
+		else if (r.type === "table") ti(v, r, u, S, x, o ? (t) => o({
+			...t,
+			elementIndex: e,
+			origin: n.elementSources?.[e]?.origin ?? "slide"
 		}) : void 0);
-		else if (r.type === "media") await Qr(_, r, u, c, i.fetchMedia, i.skipMediaControls, i.fetchImage, i.tiff, h, i.svgDecoder, g);
+		else if (r.type === "media") await Zr(v, r, u, c, a.fetchMedia, a.skipMediaControls, a.fetchImage, a.tiff, h, a.svgDecoder, g);
 		else if (r.type === "chart") {
-			let e = J * u;
-			_.save(), ti(_, r, u), qe(_, r.chart, {
-				x: Y(r.x, u),
-				y: Y(r.y, u),
-				w: Y(r.width, u),
-				h: Y(r.height, u)
-			}, e, r.rotation, i.threeD, i.regionMap, (e) => S.get(Le(e)), i.chartEx), _.restore();
+			let e = Y * u;
+			v.save(), ei(v, r, u), Ke(v, r.chart, {
+				x: X(r.x, u),
+				y: X(r.y, u),
+				w: X(r.width, u),
+				h: X(r.height, u)
+			}, e, r.rotation, a.threeD, a.regionMap, (e) => C.get(Ie(e)), a.chartEx), v.restore();
 		}
 	}
-	return c() || i.dim && ri(_, i.dim, d, f), e;
+	return c() || a.dim && ni(v, a.dim, d, f), t;
 }
 //#endregion
 //#region packages/pptx/src/google-fonts.ts
-var ui = {
-	...T,
-	...b
+var li = {
+	...S,
+	...c
 };
-function* di(e) {
+function* ui(e) {
 	for (let t of e?.paragraphs ?? []) for (let e of t.runs) e.type === "text" && (yield e.text);
 }
-function* fi(e) {
+function* di(e) {
 	for (let t of e?.paragraphs ?? []) {
 		t.defFontFamily && (yield t.defFontFamily);
 		for (let e of t.runs) e.type === "text" && (e.fontFamily && (yield e.fontFamily), e.fontFamilyEa && (yield e.fontFamilyEa), e.fontFamilySym && (yield e.fontFamilySym));
 	}
 }
-function* pi(e) {
-	for (let t of e.elements) if (t.type === "shape") yield* di(t.textBody);
-	else if (t.type === "table") for (let e of t.rows) for (let t of e.cells) yield* di(t.textBody);
+function* fi(e) {
+	for (let t of e.elements) if (t.type === "shape") yield* ui(t.textBody);
+	else if (t.type === "table") for (let e of t.rows) for (let t of e.cells) yield* ui(t.textBody);
 	else if (t.type === "chart") {
 		t.chart.title && (yield t.chart.title);
 		for (let e of t.chart.categories) yield e;
 		for (let e of t.chart.series) e.name && (yield e.name);
 	}
 }
-var mi = class e {
+var pi = class e {
 	scripts;
 	families;
 	constructor(e, t, n, r) {
 		this.majorFont = e, this.minorFont = t;
-		let i = w(e) ?? w(t) ?? null;
-		this.scripts = n ?? new pe(i), this.families = r ?? /* @__PURE__ */ new Set(), e && this.families.add(e), t && this.families.add(t);
+		let i = fe(e) ?? fe(t) ?? null;
+		this.scripts = n ?? new d(i), this.families = r ?? /* @__PURE__ */ new Set(), e && this.families.add(e), t && this.families.add(t);
 	}
 	addSlide(e) {
-		this.scripts.addText(pi(e));
-		for (let t of e.elements) if (t.type === "shape") for (let e of fi(t.textBody)) this.families.add(e);
-		else if (t.type === "table") for (let e of t.rows) for (let t of e.cells) for (let e of fi(t.textBody)) this.families.add(e);
+		this.scripts.addText(fi(e));
+		for (let t of e.elements) if (t.type === "shape") for (let e of di(t.textBody)) this.families.add(e);
+		else if (t.type === "table") for (let e of t.rows) for (let t of e.cells) for (let e of di(t.textBody)) this.families.add(e);
 	}
 	names() {
 		return [...this.families, ...this.scripts.names()];
@@ -5690,13 +5698,13 @@ var mi = class e {
 		let n = new e(this.majorFont, this.minorFont, this.scripts.clone(), new Set(this.families));
 		return n.addSlide(t), n;
 	}
-}, hi = Object.freeze({
+}, mi = Object.freeze({
 	archiveEntryCount: 0,
 	declaredInflatedBytes: 0,
 	distinctInflatedBytes: 0,
 	operationInflatedBytes: 0
-}), gi = D;
-function $(e, t) {
+}), hi = l;
+function gi(e, t) {
 	if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation bootstrap ${t}`);
 }
 function _i(e, t) {
@@ -5729,7 +5737,7 @@ function yi(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.embeddedFonts) || !Array.isArray(t.slides) || t.slides.length !== t.slideCount) throw Error("invalid PPTX presentation bootstrap dimensions or slide count");
-	return $(t.defaultTextColor, "defaultTextColor"), $(t.majorFont, "majorFont"), $(t.minorFont, "minorFont"), $(t.hlinkColor, "hlinkColor"), $(t.folHlinkColor, "folHlinkColor"), Object.freeze({
+	return gi(t.defaultTextColor, "defaultTextColor"), gi(t.majorFont, "majorFont"), gi(t.minorFont, "minorFont"), gi(t.hlinkColor, "hlinkColor"), gi(t.folHlinkColor, "folHlinkColor"), Object.freeze({
 		slideCount: t.slideCount,
 		slideWidth: t.slideWidth,
 		slideHeight: t.slideHeight,
@@ -5881,7 +5889,7 @@ function ki(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error("invalid PPTX presentation preflight payload");
 	let n = e;
 	if (!Number.isSafeInteger(n.slideCount) || (n.slideCount ?? -1) < 0 || !Number.isSafeInteger(n.slideWidth) || (n.slideWidth ?? 0) <= 0 || !Number.isSafeInteger(n.slideHeight) || (n.slideHeight ?? 0) <= 0 || !Array.isArray(n.embeddedFonts) || !Array.isArray(n.slides) || (t ? n.slides.length > (n.slideCount ?? -1) : n.slides.length !== n.slideCount) || !Array.isArray(n.fontPreloadNames)) throw Error("invalid PPTX presentation preflight dimensions or slide count");
-	$(n.defaultTextColor, "defaultTextColor"), $(n.majorFont, "majorFont"), $(n.minorFont, "minorFont"), $(n.hlinkColor, "hlinkColor"), $(n.folHlinkColor, "folHlinkColor");
+	gi(n.defaultTextColor, "defaultTextColor"), gi(n.majorFont, "majorFont"), gi(n.minorFont, "minorFont"), gi(n.hlinkColor, "hlinkColor"), gi(n.folHlinkColor, "folHlinkColor");
 	let r = n.slides.map((e, t) => {
 		if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight slide at ${t}`);
 		let n = e;
@@ -5937,7 +5945,7 @@ function Ni(e, t) {
 	});
 }
 function Pi(e, t, n) {
-	if (!(e <= t)) throw new N(`PPTX presentation preflight exceeded its hard limit of ${t} projected bytes`, {
+	if (!(e <= t)) throw new ne(`PPTX presentation preflight exceeded its hard limit of ${t} projected bytes`, {
 		stage: "parsing",
 		violation: {
 			format: "pptx",
@@ -5971,9 +5979,9 @@ var Fi = class {
 	pending = null;
 	finished = null;
 	constructor(e, t = {}) {
-		let n = yi(e), r = t.hardLimitForTesting ?? gi;
-		if (!Number.isSafeInteger(r) || r <= 0 || r > gi) throw Error("invalid PPTX presentation preflight test limit");
-		this.limit = r, this.slideCountValue = n.slideCount, this.slideWidthValue = n.slideWidth, this.slideHeightValue = n.slideHeight, this.defaultTextColorValue = n.defaultTextColor, this.majorFontValue = n.majorFont, this.minorFontValue = n.minorFont, this.hlinkColorValue = n.hlinkColor, this.folHlinkColorValue = n.folHlinkColor, this.embeddedFontsValue = n.embeddedFonts, this.descriptors = [...n.slides], this.fonts = new mi(this.majorFontValue, this.minorFontValue), this.fontPreloadNames = Object.freeze(this.fonts.names()), this.fontProjectionBytes = Ze(this.fontPreloadNames, this.limit).jsonBytes, this.projectionBytesValue = Ze({
+		let n = yi(e), r = t.hardLimitForTesting ?? hi;
+		if (!Number.isSafeInteger(r) || r <= 0 || r > hi) throw Error("invalid PPTX presentation preflight test limit");
+		this.limit = r, this.slideCountValue = n.slideCount, this.slideWidthValue = n.slideWidth, this.slideHeightValue = n.slideHeight, this.defaultTextColorValue = n.defaultTextColor, this.majorFontValue = n.majorFont, this.minorFontValue = n.minorFont, this.hlinkColorValue = n.hlinkColor, this.folHlinkColorValue = n.folHlinkColor, this.embeddedFontsValue = n.embeddedFonts, this.descriptors = [...n.slides], this.fonts = new pi(this.majorFontValue, this.minorFontValue), this.fontPreloadNames = Object.freeze(this.fonts.names()), this.fontProjectionBytes = Xe(this.fontPreloadNames, this.limit).jsonBytes, this.projectionBytesValue = Xe({
 			slideCount: this.slideCountValue,
 			slideWidth: this.slideWidthValue,
 			slideHeight: this.slideHeightValue,
@@ -5986,7 +5994,7 @@ var Fi = class {
 			remainingSlides: this.descriptors,
 			slides: [],
 			fontPreloadNames: this.fontPreloadNames
-		}, this.limit).jsonBytes, Pi(this.projectionBytesValue, this.limit, hi);
+		}, this.limit).jsonBytes, Pi(this.projectionBytesValue, this.limit, mi);
 	}
 	get acceptedSlideCount() {
 		return this.finished?.slideCount ?? this.slides.length;
@@ -6020,20 +6028,20 @@ var Fi = class {
 			fontPreloadNames: this.fontPreloadNames
 		});
 	}
-	addSlide(e, t = hi) {
+	addSlide(e, t = mi) {
 		this.prepareSlide(e, t).commit();
 	}
-	prepareSlide(e, t = hi) {
+	prepareSlide(e, t = mi) {
 		if (this.finished) throw Error("PPTX presentation preflight is already finished");
 		if (this.pending) throw Error("PPTX presentation preflight already has a prepared slide");
 		let n = this.slides.length, r = this.descriptors[n];
 		if (!r) throw Error("PPTX presentation preflight received an extra slide");
-		let i = Ni(e, r), a = this.fonts.withSlide(e), o = Object.freeze(a.names()), s = Ze(o, this.limit).jsonBytes, c = Ze(i, this.limit).jsonBytes, l = this.projectionBytesValue - this.fontProjectionBytes - Ze(r, this.limit).jsonBytes + 4;
-		l = Qe(l, s, this.limit), l = Qe(l, c, this.limit), this.slides.length !== 0 && (l = Qe(l, 1, this.limit));
-		let u = Ze({
+		let i = Ni(e, r), a = this.fonts.withSlide(e), o = Object.freeze(a.names()), s = Xe(o, this.limit).jsonBytes, c = Xe(i, this.limit).jsonBytes, l = this.projectionBytesValue - this.fontProjectionBytes - Xe(r, this.limit).jsonBytes + 4;
+		l = Ze(l, s, this.limit), l = Ze(l, c, this.limit), this.slides.length !== 0 && (l = Ze(l, 1, this.limit));
+		let u = Xe({
 			slide: i,
 			fontPreloadNames: o
-		}, this.limit).jsonBytes, d = Qe(this.projectionBytesValue, u, this.limit);
+		}, this.limit).jsonBytes, d = Ze(this.projectionBytesValue, u, this.limit);
 		Pi(Math.max(d, l), this.limit, t);
 		let f = {
 			state: "prepared",
@@ -6077,7 +6085,7 @@ var Fi = class {
 			embeddedFonts: this.embeddedFontsValue,
 			slides: Object.freeze([...this.slides]),
 			fontPreloadNames: this.fontPreloadNames
-		}), this.descriptors = [], this.slides = [], this.projectionBytesValue = Ze(this.finished, this.limit).jsonBytes, this.finished;
+		}), this.descriptors = [], this.slides = [], this.projectionBytesValue = Xe(this.finished, this.limit).jsonBytes, this.finished;
 	}
 }, Ii = 1024 * 1024, Li = class {
 	active = /* @__PURE__ */ new Set();
@@ -6092,9 +6100,9 @@ var Fi = class {
 			sessionId: r,
 			operationId: r,
 			generation: this.options.generation ?? 1
-		}, a = new h(this.options.transport, {
+		}, a = new L(this.options.transport, {
 			...i,
-			maxByteCredit: E,
+			maxByteCredit: w,
 			timeoutMs: n
 		});
 		this.active.add(a);
@@ -6136,7 +6144,7 @@ async function zi(e) {
 	}
 }
 function Bi(e) {
-	return d(e, Ii, E);
+	return u(e, Ii, w);
 }
 //#endregion
-export { yi as a, ui as c, ci as d, on as f, Mi as i, ai as l, Ri as n, Ai as o, Fi as r, ji as s, Li as t, si as u };
+export { yi as a, li as c, si as d, an as f, Mi as i, ii as l, Ri as n, Ai as o, Fi as r, ji as s, Li as t, oi as u };