@silurus/ooxml 0.81.0 → 0.82.1

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

@@ -1,9 +1,10 @@
-import { A as e, At as t, Bt as n, C as r, D as i, Dt as a, Ft as o, Gt as s, Ht as c, It as l, K as u, Lt as d, M as f, Mt as p, N as m, O as h, Ot as g, Pt as _, Rt as v, S as y, St as b, Tt as x, Ut as S, Vt as C, Wt as w, _ as T, _t as E, c as D, ct as O, d as k, f as A, g as j, gt as M, h as N, ht as P, i as F, j as I, m as L, mt as R, n as z, p as B, pt as V, qt as H, r as U, s as W, u as ee, vt as G, w as K, wt as q, xt as te, y as ne, yt as re, zt as ie } from "./line-metrics-Baz31mML.js";
-import { a as ae, c as oe, d as se, i as ce, l as le, n as ue, o as de, r as fe, s as pe, t as me, u as he } from "./line-distribute-BBGvvwLt.js";
-import { S as ge, _ as _e, h as ve, hn as ye, k as be, ln as xe, mn as Se, rn as J, sn as Ce, un as we, v as Te, w as Ee } from "./plot-area-frame-Dg1VIpUU.js";
-import { A as De, F as Oe, I as ke, L as Ae, M as je, N as Me, P as Ne, j as Pe } from "./three-d-BYiWCNlz.js";
-import { k as Fe } from "./renderer-DuopJE1K.js";
-import { i as Ie } from "./resource-measurement-DRLp4nFt.js";
+import { A as e, At as t, Bt as n, C as r, D as i, Dt as a, Ft as o, Gt as s, Ht as c, It as l, K as u, Lt as d, M as f, Mt as p, N as m, O as h, Ot as g, Pt as _, Rt as v, S as y, St as b, Tt as x, Ut as S, Vt as C, Wt as w, _ as T, _t as E, c as D, ct as O, d as k, f as A, g as j, gt as M, h as N, ht as P, i as F, j as I, m as L, mt as R, n as z, p as B, pt as V, qt as H, r as U, s as ee, u as W, vt as te, w as G, wt as K, xt as q, y as ne, yt as re, zt as ie } from "./line-metrics-B3syvDn2.js";
+import { a as ae, c as oe, d as se, i as ce, l as le, n as ue, o as de, r as fe, s as pe, t as me, u as he } from "./line-distribute-iXsUCIH-.js";
+import { S as ge, _ as _e, an as ve, h as ye, in as be, k as xe, ln as Se, nn as Ce, un as we, v as Te, w as Ee } from "./plot-area-frame-DHV02PJU.js";
+import { r as J } from "./units-BzZ0gAxs.js";
+import { A as De, F as Oe, I as ke, L as Ae, M as je, N as Me, P as Ne, j as Pe } from "./three-d-7MaVzQuZ.js";
+import { k as Fe } from "./renderer-CYr9YTXM.js";
+import { i as Ie } from "./resource-measurement-CsW4_eYt.js";
 //#region packages/pptx/src/types.ts
 function Le(e) {
 	return e;
@@ -3241,7 +3242,7 @@ function Xt(e, t, n, r, i) {
 	let o = me(e, a, {
 		firstContentSi: 0,
 		lastDrawnSi: e.length,
-		isGapChar: K,
+		isGapChar: G,
 		isWhitespace: Yt,
 		seaClusterGaps: r === "thaiDist"
 	});
@@ -3295,7 +3296,7 @@ function $t(e, t) {
 //#endregion
 //#region packages/pptx/src/smartart-fallback-contrast.ts
 function en(e) {
-	let t = te(e.length === 8 ? e.slice(0, 6) : e);
+	let t = q(e.length === 8 ? e.slice(0, 6) : e);
 	if (!t) return null;
 	let n = b(t[0], t[1], t[2]);
 	if (e.length !== 8) return n;
@@ -3378,7 +3379,7 @@ function cn(e, t) {
 function ln(e, t, n, r, i, a, o = "fill", s = on) {
 	let c = e.textAlign, l = e.textBaseline, u = o === "stroke" ? e.strokeText.bind(e) : e.fillText.bind(e), d = r - sn(e, t, i), f = 0;
 	for (let o of t) {
-		let t = o.codePointAt(0) ?? 0, l = A(t), p = e.measureText(o).width + a, m = l === "Tr" ? ee(t) : null, h = l === "Tr" && m === null && L(t), g = l === "U" || l === "Tu" || m !== null || h;
+		let t = o.codePointAt(0) ?? 0, l = A(t), p = e.measureText(o).width + a, m = l === "Tr" ? W(t) : null, h = l === "Tr" && m === null && L(t), g = l === "U" || l === "Tu" || m !== null || h;
 		if (B(t) && s(t)) {
 			let t = n + f + p / 2;
 			e.save(), e.translate(t, d), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", D(e, () => u(o, 0, 0)), e.restore();
@@ -3394,7 +3395,7 @@ function ln(e, t, n, r, i, a, o = "fill", s = on) {
 	e.textAlign = c, e.textBaseline = l;
 }
 function un(e, t, n, r, i, a, o = "fill") {
-	ln(e, t, n, r, i, a, o, (t) => W(e, t));
+	ln(e, t, n, r, i, a, o, (t) => ee(e, t));
 }
 //#endregion
 //#region packages/pptx/src/renderer.ts
@@ -3432,7 +3433,7 @@ async function gn(e, t) {
 	if (n.length !== 0) {
 		await t.loadMathJax();
 		for (let e of n) if (!pn.has(e.nodes)) try {
-			let n = await t.mathMLToSvg(G(e.nodes, e.display)), r = await M(n, "#000000");
+			let n = await t.mathMLToSvg(te(e.nodes, e.display)), r = await M(n, "#000000");
 			pn.set(e.nodes, {
 				raster: r,
 				widthEm: n.widthEm,
@@ -3493,12 +3494,12 @@ function En(e) {
 	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 Dn(e, t, n, r, i, a, o, s) {
-	let c = Math.max(0, r.blur * i), l = Math.ceil(c * 3) + 2, u = Math.max(0, Math.floor(n.x - l)), d = Math.max(0, Math.floor(n.y - l)), f = Math.min(o, Math.ceil(n.x + n.w + l)), p = Math.min(s, Math.ceil(n.y + n.h + l)), m = Math.max(1, f - u), h = Math.max(1, p - d), g = ye(m, h), _ = g?.getContext("2d");
+	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 = we(m, h), _ = g?.getContext("2d");
 	if (!g || !_) return;
 	_.save(), _.setTransform(a.a, a.b, a.c, a.d, a.e - u, a.f - d), t(_), _.restore();
 	let v = n.y - d, y = v + n.h, b = g, x = _;
 	if (c > 0) {
-		let e = ye(m, h), t = e?.getContext("2d");
+		let e = we(m, h), t = e?.getContext("2d");
 		e && t && (b = e, x = t);
 	}
 	b !== g && Vt(x, g, {
@@ -3538,35 +3539,38 @@ function On(e) {
 function kn(e, t) {
 	return e ? 0 : Math.max(0, t);
 }
-function An(e, t, n, r, i, a, o) {
+function An(e, t) {
+	return t != null && t !== 0 ? e * .65 : e;
+}
+function jn(e, t, n, r, i, a, o) {
 	let s = (t.defaultFontSize ?? 18) * J * a;
 	for (let c of t.paragraphs) {
 		let l = Y(c.marL, a), u = Y(c.marR, a), d = Y(c.indent, a), f = kn(On(c), d), p = n - r - i - l - u - f, m = 0;
 		for (let n of c.runs) {
 			if (n.type !== "text") continue;
 			let r = n.fontSize == null ? c.defFontSize == null ? s : c.defFontSize * J * a : n.fontSize * J * a, i = _n(n.fontFamily ?? c.defFontFamily ?? null, o);
-			e.font = Z(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, r, i, o);
+			e.font = Z(n.bold ?? c.defBold ?? t.defaultBold ?? !1, n.italic ?? c.defItalic ?? t.defaultItalic ?? !1, An(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;
 		}
 	}
 	return !1;
 }
-function jn(e) {
-	for (let t of e) if (K(t.codePointAt(0) ?? 0)) return !0;
+function Mn(e) {
+	for (let t of e) if (G(t.codePointAt(0) ?? 0)) return !0;
 	return !1;
 }
-function Mn(e) {
+function Nn(e) {
 	let t = 0;
 	for (let n of e) t++;
 	return t;
 }
-var Nn = /* @__PURE__ */ new WeakMap();
-function Pn(e) {
-	let t = Nn.get(e);
+var Pn = /* @__PURE__ */ new WeakMap();
+function Fn(e) {
+	let t = Pn.get(e);
 	if (t != null) return t;
 	let n = e, r = n.letterSpacing;
-	if (typeof r != "string") return Nn.set(e, !1), !1;
+	if (typeof r != "string") return Pn.set(e, !1), !1;
 	let i = !1;
 	try {
 		n.letterSpacing = "0px";
@@ -3581,11 +3585,11 @@ function Pn(e) {
 			n.letterSpacing = r;
 		} catch {}
 	}
-	return Nn.set(e, i), i;
+	return Pn.set(e, i), i;
 }
 function Q(e, t, n) {
 	let r = e, i = r.letterSpacing;
-	if (n !== 0 && Pn(e)) try {
+	if (n !== 0 && Fn(e)) try {
 		r.letterSpacing = `${n}px`;
 		let i = e.measureText(t).width;
 		if (Number.isFinite(i)) return t.length > 0 ? i - n : i;
@@ -3594,10 +3598,10 @@ function Q(e, t, n) {
 			r.letterSpacing = i;
 		} catch {}
 	}
-	let a = Math.max(0, Mn(t) - 1);
+	let a = Math.max(0, Nn(t) - 1);
 	return e.measureText(t).width + n * a;
 }
-function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
+function In(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
@@ -3643,18 +3647,19 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 	}, z = (t, n, r, i, a, o, s, c) => {
 		if (!t) return;
 		e.font = n;
-		let l = c?.letterSpacingPx ?? 0, u = c?.sourceRunId, d = c?.strikeDouble, f = c?.underlineStyle, p = c?.underlineColor, m = c?.shadow, h = c?.reflection, g = c?.outline, _ = c?.highlight, v = c?.fontFamily, y = c?.hyperlink, S = (e) => !e.math && !e.isTab && e.font === n && e.color === i && e.underline === a && (e.underlineStyle ?? "") === (f ?? "") && (e.underlineColor ?? "") === (p ?? "") && e.strikethrough === o && (e.strikeDouble ?? !1) === (d ?? !1) && (e.letterSpacingPx ?? 0) === l && e.baseline === s && e.shadow === m && e.reflection === h && e.outline === g && (e.highlight ?? "") === (_ ?? "") && (e.fontFamily ?? "") === (v ?? "") && Tn(e.hyperlink) === Tn(y) && (l === 0 || e.sourceRunId === u), C = b.segments.at(-1), w = Q(e, t, l);
-		if (C && S(C) ? w = Q(e, C.text + t, l) - Q(e, C.text, l) : C && !C.isTab && !C.math && u != null && C.sourceRunId === u && (w += l), x += w, k.push({
+		let l = c?.letterSpacingPx ?? 0, u = c?.sourceRunId, d = c?.strikeDouble, f = c?.underlineStyle, p = c?.underlineColor, m = c?.shadow, h = c?.reflection, g = c?.outline, _ = c?.highlight, v = c?.fontFamily, y = c?.hyperlink, S = 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 && Tn(e.hyperlink) === Tn(y) && (l === 0 || e.sourceRunId === u), w = b.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), x += T, k.push({
 			isTab: !1,
-			width: w
-		}), C && S(C)) C.text += t;
+			width: T
+		}), w && C(w)) w.text += t;
 		else {
-			let e = C && !C.isTab && !C.math && u != null && C.sourceRunId === u ? l : 0;
+			let e = w && !w.isTab && !w.math && u != null && w.sourceRunId === u ? l : 0;
 			b.segments.push({
 				text: t,
 				font: n,
 				fontFamily: v,
 				sizePx: r,
+				drawSizePx: S,
 				color: i,
 				underline: a,
 				underlineStyle: f,
@@ -3689,7 +3694,8 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 			outline: e.outline,
 			highlight: e.highlight,
 			fontFamily: e.fontFamily,
-			sourceRunId: e.sourceRunId
+			sourceRunId: e.sourceRunId,
+			drawSizePx: e.drawSizePx
 		}), !0;
 	};
 	for (let [n, s] of t.runs.entries()) {
@@ -3719,36 +3725,37 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 			}), x += n, s.display && L();
 			continue;
 		}
-		let p = s.fontSize == null ? i : s.fontSize * J * o * u, m = _n(s.fontFamily ?? t.defFontFamily ?? null, f), _ = s.fontFamilyEa ? _n(s.fontFamilyEa, f) : null, C = s.fontFamilySym ? _n(s.fontFamilySym, f) : null, w;
-		w = s.color ? X(s.color) : s.hyperlink && f.themeHlinkColor ? X(f.themeHlinkColor) : a;
-		let E = s.bold ?? t.defBold ?? c, D = s.italic ?? t.defItalic ?? l, M = Z(E, D, p, m, f), P = _ ? Z(E, D, p, _, f) : M;
-		e.font = M;
-		let V = s.caps, H = g.get(s) ?? s.text;
-		(V === "all" || V === "small") && (H = H.toUpperCase());
-		let U = s.fieldType === "slidenum" && d !== void 0 ? String(d) : H, W = s.underline || s.hyperlink !== void 0, ee = s.strikeDouble === !0, G = s.letterSpacing == null ? 0 : s.letterSpacing * J * o, q = {
-			strikeDouble: ee,
-			letterSpacingPx: G,
+		let p = s.fontSize == null ? i : s.fontSize * J * o * u, m = An(p, s.baseline ?? void 0), _ = _n(s.fontFamily ?? t.defFontFamily ?? null, f), C = s.fontFamilyEa ? _n(s.fontFamilyEa, f) : null, w = s.fontFamilySym ? _n(s.fontFamilySym, f) : null, E;
+		E = s.color ? X(s.color) : s.hyperlink && f.themeHlinkColor ? X(f.themeHlinkColor) : a;
+		let D = s.bold ?? t.defBold ?? c, M = s.italic ?? t.defItalic ?? l, P = Z(D, M, m, _, f), V = C ? Z(D, M, m, C, f) : P;
+		e.font = P;
+		let H = s.caps, U = g.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, K = s.letterSpacing == null ? 0 : s.letterSpacing * J * o, q = {
+			strikeDouble: te,
+			letterSpacingPx: K,
 			underlineStyle: s.underlineStyle,
 			underlineColor: s.underlineColor ? X(s.underlineColor) : void 0,
 			shadow: s.shadow,
 			reflection: s.reflection,
 			outline: s.outline,
-			fontFamily: m,
+			fontFamily: _,
 			highlight: s.highlight ? X(s.highlight) : void 0,
 			hyperlink: Ht(s.hyperlink),
-			sourceRunId: n
-		}, te = U.split(/(\s+)/);
-		for (let i of te) {
+			sourceRunId: n,
+			drawSizePx: m
+		}, re = ee.split(/(\s+)/);
+		for (let i of re) {
 			if (!i) continue;
 			if (/^\t+$/.test(i)) {
-				O || (e.font = M, A = e.measureText(" ").width);
+				O || (e.font = P, A = e.measureText(" ").width);
 				for (let e of i) b.segments.push({
 					text: "",
 					isTab: !0,
-					font: M,
-					fontFamily: m,
+					font: P,
+					fontFamily: _,
 					sizePx: p,
-					color: w,
+					color: E,
 					underline: !1,
 					strikethrough: !1
 				}), k.push({
@@ -3758,24 +3765,24 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				O = !0;
 				continue;
 			}
-			e.font = M;
-			let a = R(i, M, G, n), o = /^\s+$/.test(i), c = /[-]/;
-			if (c.test(i) && (C != null || he(m))) {
-				let t = C ?? m;
+			e.font = P;
+			let a = R(i, P, K, n), o = /^\s+$/.test(i), c = /[-]/;
+			if (c.test(i) && (w != null || he(_))) {
+				let t = w ?? _;
 				for (let r of i) {
-					let i = r, a = M;
+					let i = r, a = P;
 					if (c.test(r)) {
 						let e = se(r, t);
-						e === r ? a = Z(E, D, p, t, f) : (i = e, a = Z(E, D, p, "sans-serif", f));
+						e === r ? a = Z(D, M, m, t, f) : (i = e, a = Z(D, M, m, "sans-serif", f));
 					}
-					e.font = a, !F(R(i, a, G, n)) && x > 0 && L(), z(i, a, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+					e.font = a, !F(R(i, a, K, n)) && x > 0 && L(), z(i, a, p, E, W, s.strikethrough, s.baseline ?? void 0, q);
 				}
 				continue;
 			}
-			if (jn(i) && (!N(i) || t.eaLnBrk === !1)) {
+			if (Mn(i) && (!N(i) || t.eaLnBrk === !1)) {
 				let r = [];
 				for (let t of i) {
-					let n = K(t.codePointAt(0) ?? 0) && _ != null, i = n ? P : M, a = n ? _ : m;
+					let n = G(t.codePointAt(0) ?? 0) && C != null, i = n ? V : P, a = n ? C : _;
 					e.font = i, r.push({
 						ch: t,
 						w: Q(e, t, 0),
@@ -3784,9 +3791,9 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 					});
 				}
 				if (t.eaLnBrk === !1) {
-					let e = b.segments.at(-1), t = !!e && !e.isTab && !e.math && e.sourceRunId === n, i = r.reduce((e, t) => e + t.w, 0) + Math.max(0, r.length - 1) * G + (t && r.length > 0 ? G : 0);
+					let e = b.segments.at(-1), t = !!e && !e.isTab && !e.math && e.sourceRunId === n, i = r.reduce((e, t) => e + t.w, 0) + Math.max(0, r.length - 1) * K + (t && r.length > 0 ? K : 0);
 					x > 0 && !F(i) && L();
-					for (let e of r) z(e.ch, e.font, p, w, W, s.strikethrough, s.baseline ?? void 0, {
+					for (let e of r) z(e.ch, e.font, p, E, W, s.strikethrough, s.baseline ?? void 0, {
 						...q,
 						fontFamily: e.family
 					});
@@ -3794,7 +3801,7 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}
 				let a = r;
 				for (; a.length > 0;) {
-					let e = Number.isFinite(v()) ? v() - I() : x, t = b.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = Jt(a, e, v(), h, G, r);
+					let e = Number.isFinite(v()) ? v() - I() : x, t = b.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = Jt(a, e, v(), h, K, r);
 					if (i === 0) {
 						if (x > 0) {
 							L();
@@ -3804,7 +3811,7 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 					}
 					for (let e = 0; e < i; e++) {
 						let t = a[e];
-						z(t.ch, t.font, p, w, W, s.strikethrough, s.baseline ?? void 0, {
+						z(t.ch, t.font, p, E, W, s.strikethrough, s.baseline ?? void 0, {
 							...q,
 							fontFamily: t.family
 						});
@@ -3817,9 +3824,9 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				let t = y(i, {
 					cjk: !0,
 					kinsoku: h
-				}), r = _ != null && P !== M, a = (e) => r && K(e.codePointAt(0) ?? 0), o = (t) => {
+				}), r = C != null && V !== P, a = (e) => r && G(e.codePointAt(0) ?? 0), o = (t) => {
 					let r = 0, i = b.segments.at(-1), o = !!i && !i.isTab && !i.math && i.sourceRunId === n, s = "", c = null, l = () => {
-						s !== "" && (e.font = c ? P : M, r += Q(e, s, G), o && (r += G), o = !0, s = "");
+						s !== "" && (e.font = c ? V : P, r += Q(e, s, K), o && (r += K), o = !0, s = "");
 					};
 					for (let e of t) {
 						let t = a(e);
@@ -3829,8 +3836,8 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}, c = (e) => {
 					let t = "", n = null, r = () => {
 						if (t === "") return;
-						let e = n ? P : M, r = n ? _ : m;
-						z(t, e, p, w, W, s.strikethrough, s.baseline ?? void 0, {
+						let e = n ? V : P, r = n ? C : _;
+						z(t, e, p, E, W, s.strikethrough, s.baseline ?? void 0, {
 							...q,
 							fontFamily: r
 						}), t = "";
@@ -3855,21 +3862,21 @@ function Fn(e, t, n, i, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}
 				continue;
 			}
-			if (F(a)) z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q), o && (S = !0);
+			if (F(a)) z(i, P, p, E, W, s.strikethrough, s.baseline ?? void 0, q), o && (S = !0);
 			else if (o) x > 0 && L();
 			else if (a > v()) {
 				x > 0 && L();
-				for (let t of i) e.font = M, !F(R(t, M, G, n)) && x > 0 && L(), z(t, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
-			} else if (!S) z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+				for (let t of i) e.font = P, !F(R(t, P, K, n)) && x > 0 && L(), z(t, P, p, E, W, s.strikethrough, s.baseline ?? void 0, q);
+			} else if (!S) z(i, P, p, E, W, s.strikethrough, s.baseline ?? void 0, q);
 			else {
 				let e = b.segments.at(-1)?.text ?? "", t = i.codePointAt(0), n = [...e].at(-1)?.codePointAt(0), a = /\S$/u.test(e) && /^\S/u.test(i) && n !== 8203 && t !== 8203, o = t !== void 0 && h.lineStartForbidden.has(t) && a, c = n !== void 0 && t !== void 0 && a && !N(e) && !N(i) && r(n, t);
-				(o || c) && B() || L(), z(i, M, p, w, W, s.strikethrough, s.baseline ?? void 0, q);
+				(o || c) && B() || L(), z(i, P, p, E, W, s.strikethrough, s.baseline ?? void 0, q);
 			}
 		}
 	}
 	return m.push(b), m;
 }
-async function In(e, t, n, r, i, a, o) {
+async function Ln(e, t, n, r, i, a, o) {
 	if (t && t.fillType === "image") {
 		if (e.fillStyle = "#FFFFFF", e.fillRect(0, 0, n, r), !t.imagePath || !t.mimeType || !o) return;
 		try {
@@ -3878,7 +3885,7 @@ async function In(e, t, n, r, i, a, o) {
 				heightPt: r / i / J
 			});
 			if (a() || !s) return;
-			if (e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile) zn(e, s, t.tile, n, r, i);
+			if (e.save(), e.beginPath(), e.rect(0, 0, n, r), e.clip(), t.alpha != null && (e.globalAlpha = t.alpha), t.tile) Bn(e, s, t.tile, n, r, i);
 			else {
 				let i = t.fillRect ?? {}, a = i.l ?? 0, o = i.t ?? 0, c = i.r ?? 0, l = i.b ?? 0, u = a * n, d = o * r, f = n * (1 - a - c), p = r * (1 - o - l);
 				e.drawImage(s, u, d, f, p);
@@ -3891,8 +3898,8 @@ async function In(e, t, n, r, i, a, o) {
 	}
 	e.fillStyle = fn(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
 }
-var Ln = 9525;
-function Rn(e, t, n, r, i) {
+var Rn = 9525;
+function zn(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;
@@ -3901,10 +3908,10 @@ function Rn(e, t, n, r, i) {
 		ay: o
 	};
 }
-function zn(e, t, n, r, i, a) {
-	let o = t.width * Ln * (n.sx ?? 1) * a, s = t.height * Ln * (n.sy ?? 1) * a;
+function Bn(e, t, n, r, i, a) {
+	let o = t.width * Rn * (n.sx ?? 1) * a, s = t.height * Rn * (n.sy ?? 1) * a;
 	if (!(o > 0) || !(s > 0)) return;
-	let c = n.flip === "x" || n.flip === "xy", l = n.flip === "y" || n.flip === "xy", u = ye(o * (c ? 2 : 1), s * (l ? 2 : 1));
+	let c = n.flip === "x" || n.flip === "xy", l = n.flip === "y" || n.flip === "xy", u = we(o * (c ? 2 : 1), s * (l ? 2 : 1));
 	if (!u) return;
 	let d = u.getContext("2d");
 	if (!d) return;
@@ -3914,33 +3921,33 @@ function zn(e, t, n, r, i, a) {
 	f(0, 0, !1, !1), c && f(o, 0, !0, !1), l && f(0, s, !1, !0), c && l && f(o, s, !0, !0);
 	let p = e.createPattern(u, "repeat");
 	if (!p) return;
-	let { ax: m, ay: h } = Rn(n.algn ?? "tl", r, i, o, s), g = m + Y(n.tx ?? 0, a), _ = h + Y(n.ty ?? 0, a);
+	let { ax: m, ay: h } = zn(n.algn ?? "tl", r, i, o, s), g = m + Y(n.tx ?? 0, a), _ = h + Y(n.ty ?? 0, a);
 	typeof p.setTransform == "function" && typeof DOMMatrix < "u" ? (p.setTransform(new DOMMatrix().translateSelf(g, _)), e.fillStyle = p, e.fillRect(0, 0, r, i)) : (e.save(), e.translate(g, _), e.fillStyle = p, e.fillRect(-g, -_, r, i), e.restore());
 }
-function Bn(e, t, n) {
+function Vn(e, t, n) {
 	if (!t) return;
 	let r = t.dir * Math.PI / 180, i = Y(t.dist, n);
 	e.shadowColor = X(t.color, t.alpha), e.shadowBlur = 0, e.shadowOffsetX = Math.cos(r) * i, e.shadowOffsetY = Math.sin(r) * i;
 }
-function Vn(e, t, n) {
+function Hn(e, t, n) {
 	t && (e.shadowColor = X(t.color, t.alpha), e.shadowBlur = Y(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
 }
-function Hn(e) {
+function Un(e) {
 	e.shadowColor = "transparent", e.shadowBlur = 0, e.shadowOffsetX = 0, e.shadowOffsetY = 0;
 }
-var Un = 8, Wn = 1, Gn = 1, Kn = 256;
-function qn(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
+var Wn = 8, Gn = 1, Kn = 1, qn = 256;
+function Jn(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
 	if (r <= 0) return;
-	let h = e.measureText(t), g = h.actualBoundingBoxAscent > 0 ? h.actualBoundingBoxAscent : r, _ = h.actualBoundingBoxDescent > 0 ? h.actualBoundingBoxDescent : r * .25, v = h.actualBoundingBoxLeft > 0 ? h.actualBoundingBoxLeft : 0, y = h.actualBoundingBoxRight > 0 ? h.actualBoundingBoxRight : r, b = r * l * i, x = Math.min(Kn, Math.max(1, Math.round(b / Un))), S = (e) => Xn(e, a, r, o, s, c, u, d), C = S(x), w = Qn(C, a, o, s, c, u, d, l, i, -g, _);
-	for (; w > Gn && x < Kn;) {
-		let e = Math.min(Kn, x * 2), t = S(e), n = Qn(t, a, o, s, c, u, d, l, i, -g, _);
+	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(qn, Math.max(1, Math.round(b / Wn))), S = (e) => Zn(e, a, r, o, s, c, u, d), C = S(x), w = $n(C, a, o, s, c, u, d, l, i, -g, _);
+	for (; w > Kn && x < qn;) {
+		let e = Math.min(qn, x * 2), t = S(e), n = $n(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 = Wn / (l * i), D = C.length - 1, O = (e, t, n) => e === 0 ? -T : t - n - E, k = (e, t, n) => e === D ? T : t - n + E, A = (e, r) => {
+	let T = 1e4, E = Gn / (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;
@@ -3948,7 +3955,7 @@ function qn(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 = Jn(m), M = typeof e.globalAlpha == "number" ? e.globalAlpha : 1;
+	}, j = Yn(m), M = typeof e.globalAlpha == "number" ? e.globalAlpha : 1;
 	if (j >= 1 && M >= 1) {
 		A(e, m);
 		return;
@@ -3968,29 +3975,29 @@ function qn(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m) {
 			[s, _],
 			[c, _]
 		]) {
-			let n = Zn(i, l, e, t), r = f + n.x, a = p + n.y, o = N.a * r + N.c * a + N.e, s = N.b * r + N.d * a + N.f;
+			let n = Qn(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 = ye(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 = we(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, Yn(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, Xn(m)), e.save(), e.setTransform(1, 0, 0, 1, 0, 0), e.globalAlpha = M * j, e.drawImage(B, R, z), e.restore();
 }
-function Jn(e) {
+function Yn(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 Yn(e) {
+function Xn(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 Xn(e, t, n, r, i, a, o, s) {
+function Zn(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;
@@ -4002,33 +4009,33 @@ function Xn(e, t, n, r, i, a, o, s) {
 	}
 	return c;
 }
-function Zn(e, t, n, r) {
+function Qn(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 Qn(e, t, n, r, i, a, o, s, c, l, u) {
+function $n(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 = Ze(t, (n + p) / r * i, a, o);
 			for (let t of [l, u]) {
-				let n = Zn(m, s, 0, t), r = Zn(f.g, s, p - e, t), i = Math.hypot(r.x - n.x, r.y - n.y) * c;
+				let n = Qn(m, s, 0, t), r = Qn(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 $n(e, t, n, r, i, a, o, s, c, l, u) {
+function er(e, t, n, r, i, a, o, s, c, l, u) {
 	let d = i, f = a, p = Math.max(1, o), m = Math.max(1, s), h = qe(n, r, p, m);
 	if (!h) return;
 	let g = t.defaultBold ?? !1, _ = t.defaultItalic ?? !1, v = (t.defaultFontSize ?? 18) * J * c, y = [];
 	for (let n of t.paragraphs) {
-		let t = Fn(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * J * c, n.defColor ? X(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
+		let t = In(e, n, Infinity, n.defFontSize == null ? v : n.defFontSize * J * c, n.defColor ? X(n.defColor) : l, c, 0, g, _, 1, void 0, u, 0);
 		for (let e of t) y.push(e);
 	}
 	if (y.length === 0) return;
@@ -4047,7 +4054,7 @@ function $n(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 * Mn(t.text), o = Math.max(o, t.sizePx), r.actualBoundingBoxAscent > 0 && (s = Math.max(s, r.actualBoundingBoxAscent)), r.actualBoundingBoxDescent > 0 && (c = Math.max(c, r.actualBoundingBoxDescent));
+			a += r.width + n * Nn(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 = Xe(h, a), b = 0;
@@ -4061,7 +4068,7 @@ function $n(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) {
-					qn(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
+					Jn(e, s, n, o, x(), h, b, a, v, g, _, c, d, f, t.color), b += o;
 					continue;
 				}
 				let l = Ze(h, (b + o / 2) / a * v, _, c);
@@ -4071,7 +4078,7 @@ function $n(e, t, n, r, i, a, o, s, c, l, u) {
 	}
 	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":
@@ -4101,17 +4108,17 @@ function er(e, t, n, r, i, a, o) {
 		default: return null;
 	}
 }
-function tr(e, t) {
+function nr(e, t) {
 	return e.defaultTextColor ? X(e.defaultTextColor) : t.smartArtFallbackTextColor != null && nn(e) ? t.smartArtFallbackTextColor : null;
 }
-function nr(e, t, n) {
+function rr(e, t, n) {
 	return {
 		outerRotation: e,
 		localFlipH: t,
 		localFlipV: n
 	};
 }
-function rr(e, t, n, r, i) {
+function ir(e, t, n, r, i) {
 	let a = [
 		{
 			x: t,
@@ -4140,7 +4147,7 @@ function rr(e, t, n, r, i) {
 		h: l - s
 	};
 }
-var ir = {
+var ar = {
 	tl: [0, 0],
 	t: [.5, 0],
 	tr: [1, 0],
@@ -4151,15 +4158,15 @@ var ir = {
 	b: [.5, 1],
 	br: [1, 1]
 };
-function ar(e, t, n) {
+function or(e, t, n) {
 	return [e.a * t + e.c * n + e.e, e.b * t + e.d * n + e.f];
 }
-function or(e, t, n, r, i, a) {
-	let [o, s] = ir[a ?? "b"];
-	return ar(e, t + o * r, n + s * i);
+function sr(e, t, n, r, i, a) {
+	let [o, s] = ar[a ?? "b"];
+	return or(e, t + o * r, n + s * i);
 }
-function sr(e, t, n, r, i, a, o, s) {
-	let c = st(e, i, a).corners, l = (o > 0 ? Pe(c, o / i, o / a) ?? c : c).map((e) => ar(t, n + e.x, r + e.y)), u = l.map(([e]) => e), d = l.map(([, e]) => e), f = Math.min(...u), p = Math.min(...d), m = Math.max(...u), h = Math.max(...d), [g, _] = ir[s ?? "b"], v = je(c, g, _);
+function cr(e, t, n, r, i, a, o, s) {
+	let c = st(e, i, a).corners, l = (o > 0 ? Pe(c, o / i, o / a) ?? c : c).map((e) => or(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 = je(c, g, _);
 	return {
 		bbox: {
 			x: f,
@@ -4167,15 +4174,15 @@ function sr(e, t, n, r, i, a, o, s) {
 			w: m - f,
 			h: h - p
 		},
-		anchor: v ? ar(t, n + v.x, r + v.y) : or(t, n, r, i, a, s)
+		anchor: v ? or(t, n + v.x, r + v.y) : sr(t, n, r, i, a, s)
 	};
 }
-function cr(e, t, n, r) {
+function lr(e, t, n, r) {
 	let i = Math.floor(n.x) - 1, a = Math.floor(n.y) - 1, o = Math.max(1, Math.ceil(n.x + n.w) - i + 1), s = Math.max(1, Math.ceil(n.y + n.h) - a + 1);
 	if (r && (i + o <= 0 || a + s <= 0 || i >= r.w || a >= r.h) || Ae(o, s).clamped) return e;
 	let c = null;
 	try {
-		c = ye(o, s);
+		c = we(o, s);
 	} catch {
 		return e;
 	}
@@ -4194,7 +4201,7 @@ function cr(e, t, n, r) {
 		e.save(), e.setTransform(u), e.drawImage(c, i, a), e.restore();
 	};
 }
-function lr(e, t, n, r, i, a, o, s, c, l = !0, u = r) {
+function ur(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,
@@ -4209,9 +4216,9 @@ function lr(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 = !Ne(e, g, i, t.shadow, s, d, f, Math.atan2(c.b, c.a) * 180 / Math.PI, a), e.restore()) : t.shadow && (y = !0), t.reflection && p && (e.save(), e.setTransform(m), Oe(e, g, i, t.reflection, s, d, f), e.restore()), y ? Bn(e, t.shadow ?? null, o) : t.glow && Vn(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), ke(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && Hn(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), Me(e, v, i, t.innerShadow, s, d, f), e.restore());
+	t.shadow && p ? (e.save(), e.setTransform(m), y = !Ne(e, g, i, t.shadow, s, d, f, Math.atan2(c.b, c.a) * 180 / Math.PI, a), e.restore()) : t.shadow && (y = !0), t.reflection && p && (e.save(), e.setTransform(m), Oe(e, g, i, t.reflection, s, d, f), e.restore()), y ? Vn(e, t.shadow ?? null, o) : t.glow && Hn(e, t.glow, o), t.softEdge && p ? (e.save(), e.setTransform(m), ke(e, g, i, t.softEdge, s, d, f, _), e.restore()) : n(e), (y || t.glow) && Un(e), t.innerShadow && l && p && (e.save(), e.setTransform(m), Me(e, v, i, t.innerShadow, s, d, f), e.restore());
 }
-function ur(e, t, n, r = "#000000", i, a = {
+function dr(e, t, n, r = "#000000", i, a = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
@@ -4221,20 +4228,20 @@ function ur(e, t, n, r = "#000000", i, a = {
 		shapeId: t.id
 	}) : s;
 	if (m === 0 && t.textBody?.verticalAnchor === "b") {
-		if (t.stroke && (e.save(), Dr(e, t.stroke, n, {
+		if (t.stroke && (e.save(), Or(e, t.stroke, n, {
 			x: u,
 			y: f,
 			w: p,
 			h: 1
 		}, t.rotation), e.beginPath(), e.moveTo(u, f), e.lineTo(u + p, f), e.stroke(), e.restore()), t.textBody) {
-			let o = tr(t, a);
-			gr(e, t.textBody, u, f, p, m, n, o, t.rotation, t.flipH, t.flipV, r, i, a, h, !1, c);
+			let o = nr(t, a);
+			_r(e, t.textBody, u, f, p, m, n, o, t.rotation, t.flipH, t.flipV, r, i, a, h, !1, c);
 		}
 		return;
 	}
 	let g = t.scene3d && ct(t.scene3d.camera) ? t.scene3d : null;
 	if (g && p > 0 && m > 0) {
-		let o = e.getTransform(), s = Math.abs(o.a * o.d - o.b * o.c), c = s > 0 ? Math.sqrt(s) : 1, l = _r(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, c), d = vr(t.sp3d, g.camera, p, m, n, c), h = nr(t.rotation, t.flipH, t.flipV);
+		let o = e.getTransform(), s = Math.abs(o.a * o.d - o.b * o.c), c = s > 0 ? Math.sqrt(s) : 1, l = vr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, c), d = yr(t.sp3d, g.camera, p, m, n, c), h = rr(t.rotation, t.flipH, t.flipV);
 		e.save(), h.outerRotation !== 0 && (e.translate(u + p / 2, f + m / 2), e.rotate(h.outerRotation * Math.PI / 180), e.translate(-(u + p / 2), -(f + m / 2)));
 		let _ = {
 			...t,
@@ -4257,21 +4264,21 @@ function ur(e, t, n, r = "#000000", i, a = {
 			..._,
 			fill: null,
 			stroke: null
-		}, b = (t.stroke ? t.stroke.width * n / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * n : 0) + (d ? Math.hypot(d.offsetX, d.offsetY) / c : 0) + 2, x = (e, t, o) => yr(e, g.camera, u, f, p, m, (e) => {
-			ur(e, t, n, r, i, a, void 0);
+		}, b = (t.stroke ? t.stroke.width * n / 2 : 0) + (t.sp3d?.contourW ? t.sp3d.contourW * n : 0) + (d ? Math.hypot(d.offsetX, d.offsetY) / c : 0) + 2, x = (e, t, o) => br(e, g.camera, u, f, p, m, (e) => {
+			dr(e, t, n, r, i, a, void 0);
 		}, o ? {
 			bevels: l,
 			extrusion: d ?? void 0,
 			edgePadCss: b
 		} : {}), S = (e) => x(e, v, !0), C = (e) => !t.textBody || x(e, y, !1);
 		if (t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection) {
-			let r = e.getTransform(), i = Math.abs(r.a * r.d - r.b * r.c), a = i > 0 ? Math.sqrt(i) : 1, o = sr(g.camera, r, u, f, p, m, b, t.shadow?.algn), s = !1, c = cr((e) => {
+			let r = e.getTransform(), i = Math.abs(r.a * r.d - r.b * r.c), a = i > 0 ? Math.sqrt(i) : 1, o = cr(g.camera, r, u, f, p, m, b, t.shadow?.algn), s = !1, c = lr((e) => {
 				s = S(e) || s;
 			}, r, o.bbox, {
 				w: e.canvas.width || 0,
 				h: e.canvas.height || 0
 			});
-			if (lr(e, t, c, c, o.bbox, o.anchor, n, n * a, r, !!t.fill), s) {
+			if (ur(e, t, c, c, o.bbox, o.anchor, n, n * a, r, !!t.fill), s) {
 				C(e), e.restore();
 				return;
 			}
@@ -4283,7 +4290,7 @@ function ur(e, t, n, r = "#000000", i, a = {
 	}
 	e.save(), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(u + p / 2, f + m / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(u + p / 2), -(f + m / 2)));
 	let v = t.geometry.toLowerCase(), y = fn(t.fill, e, u, f, p, m, t.rotation);
-	t.shadow || Vn(e, t.glow ?? null, n);
+	t.shadow || Hn(e, t.glow ?? null, n);
 	let b = new Set([
 		"line",
 		"straightconnector1",
@@ -4315,13 +4322,13 @@ function ur(e, t, n, r = "#000000", i, a = {
 		h: m
 	}) => {
 		let { x: o, y: s, w: c, h: l } = a, h = i ?? (r === e && o === u && s === f && c === p && l === m ? y : fn(t.fill, r, o, s, c, l, t.rotation)), g = i ? null : t.stroke ? () => {
-			Dr(r, t.stroke, n, {
+			Or(r, t.stroke, n, {
 				x: o,
 				y: s,
 				w: c,
 				h: l
 			}, t.rotation), r.stroke();
-		} : null, _ = () => Hn(r);
+		} : null, _ = () => Un(r);
 		if (C && !i) {
 			d(r, v, o, s, c, l, [
 				t.adj,
@@ -4335,7 +4342,7 @@ function ur(e, t, n, r = "#000000", i, a = {
 			], h, g, _, S(v) ? { skipTrailingStroke: !0 } : void 0);
 			return;
 		}
-		r.beginPath(), t.custGeom && t.custGeom.length > 0 ? dr(r, t.custGeom, o, s, c, l) : de(r, v, o, s, c, l, t.adj, t.adj2, t.adj3, t.adj4), h && v !== "arc" && (r.fillStyle = h, v === "donut" || v === "smileyface" || v === "frame" ? r.fill("evenodd") : r.fill(), i || _()), g && g();
+		r.beginPath(), t.custGeom && t.custGeom.length > 0 ? fr(r, t.custGeom, o, s, c, l) : de(r, v, o, s, c, l, t.adj, t.adj2, t.adj3, t.adj4), h && v !== "arc" && (r.fillStyle = h, v === "donut" || v === "smileyface" || v === "frame" ? r.fill("evenodd") : r.fill(), i || _()), g && g();
 	}, T = e.getTransform(), E = Math.abs(T.a * T.d - T.b * T.c), D = E > 0 ? Math.sqrt(E) : 1, O = (t.shadow || t.reflection || t.softEdge || t.innerShadow ? C ? o(v, u, f, p, m, [
 		t.adj,
 		t.adj2,
@@ -4355,7 +4362,7 @@ function ur(e, t, n, r = "#000000", i, a = {
 		y: O.y - M,
 		w: O.w + M * 2,
 		h: O.h + M * 2
-	} : O, P = rr(T, N.x, N.y, N.w, N.h), F = n * D, I = g ? [] : _r(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, D), L = (t.stroke ? t.stroke.width * n / 2 : 0) + 2, R = (e) => {
+	} : O, P = ir(T, N.x, N.y, N.w, N.h), F = n * D, I = g ? [] : vr(t.sp3d, t.scene3d?.lightRig, t.sp3d?.prstMaterial, n, D), L = (t.stroke ? t.stroke.width * n / 2 : 0) + 2, R = (e) => {
 		let r = t.stroke?.fill ? fn(t.stroke.fill, e, u, f, p, m, t.rotation) ?? void 0 : void 0;
 		if (t.stroke && (b.has(v) || x.has(v))) {
 			let i = _(v, u, f, p, m, [
@@ -4383,7 +4390,7 @@ function ur(e, t, n, r = "#000000", i, a = {
 					let e = ce(t.stroke.headEnd, t.stroke, n);
 					r[0] = ae(r[0], r[1], e);
 				}
-				Dr(e, t.stroke, n, {
+				Or(e, t.stroke, n, {
 					x: u,
 					y: f,
 					w: p,
@@ -4392,26 +4399,26 @@ function ur(e, t, n, r = "#000000", i, a = {
 				for (let t = 1; t < r.length; t++) e.lineTo(r[t].x, r[t].y);
 				e.stroke();
 			}
-			a && o && Er(e, i.start, i.end, t.stroke, a, n, t.rotation), t.stroke.tailEnd && ue(e, i.end.x, i.end.y, i.end.angle, t.stroke.tailEnd, t.stroke, n, r), t.stroke.headEnd && ue(e, i.start.x, i.start.y, i.start.angle, t.stroke.headEnd, t.stroke, n, r);
+			a && o && Dr(e, i.start, i.end, t.stroke, a, n, t.rotation), t.stroke.tailEnd && ue(e, i.end.x, i.end.y, i.end.angle, t.stroke.tailEnd, t.stroke, n, r), t.stroke.headEnd && ue(e, i.start.x, i.start.y, i.start.angle, t.stroke.headEnd, t.stroke, n, r);
 			return;
 		}
 		if (!t.stroke || !t.custGeom || t.custGeom.length === 0 || (!t.stroke.headEnd || t.stroke.headEnd.type === "none") && (!t.stroke.tailEnd || t.stroke.tailEnd.type === "none")) return;
 		let { start: i, end: a } = pe(t.custGeom);
 		i && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && ue(e, u + i.x * p, f + i.y * m, Math.atan2(i.dy * m, i.dx * p), t.stroke.headEnd, t.stroke, n, r), a && t.stroke.tailEnd && t.stroke.tailEnd.type !== "none" && ue(e, u + a.x * p, f + a.y * m, Math.atan2(a.dy * m, a.dx * p), t.stroke.tailEnd, t.stroke, n, r);
 	}, z = (e) => {
-		if (I.length > 0 && br(e, u, f, p, m, I, (e, t, n, r, i) => w(e, void 0, {
+		if (I.length > 0 && xr(e, u, f, p, m, I, (e, t, n, r, i) => w(e, void 0, {
 			x: t,
 			y: n,
 			w: r,
 			h: i
 		}), void 0, L)) {
-			R(e), Hn(e);
+			R(e), Un(e);
 			return;
 		}
 		w(e), R(e);
 	};
-	if (lr(e, t, z, z, P, or(T, u, f, p, m, t.shadow?.algn), n, F, T, !!y, (e) => w(e, "#000")), t.textBody) {
-		let o = tr(t, a);
+	if (ur(e, t, z, z, P, sr(T, u, f, p, m, t.shadow?.algn), n, F, T, !!y, (e) => w(e, "#000")), t.textBody) {
+		let o = nr(t, a);
 		if (e.save(), t.flipH || t.flipV) {
 			let n = u + p / 2, r = f + m / 2;
 			e.translate(n, r), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-n, -r);
@@ -4422,16 +4429,16 @@ function ur(e, t, n, r = "#000000", i, a = {
 			let e = p * (1 - 1 / Math.SQRT2) / 2, t = m * (1 - 1 / Math.SQRT2) / 2;
 			s = u + e, l = f + t, d = p / Math.SQRT2, g = m / Math.SQRT2;
 		} else {
-			let e = er(v, u, f, p, m, t.adj, t.adj2);
+			let e = tr(v, u, f, p, m, t.adj, t.adj2);
 			e && (s = e.tx, l = e.ty, d = e.tw, g = e.th);
 		}
-		gr(e, t.textBody, s, l, d, g, n, o, t.rotation, !1, !1, r, i, a, h, !1, c), e.restore();
+		_r(e, t.textBody, s, l, d, g, n, o, t.rotation, !1, !1, r, i, a, h, !1, c), e.restore();
 	}
 	e.restore();
 }
-var dr = oe;
-function fr(e, t) {
-	let n = `${e}`, r = e >= 1 && e <= 26 ? String.fromCharCode(96 + e) : n, i = e >= 1 && e <= 26 ? String.fromCharCode(64 + e) : n, a = pr(e).toLowerCase(), o = pr(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
+var fr = oe;
+function pr(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 = mr(e).toLowerCase(), o = mr(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}.`;
@@ -4458,7 +4465,7 @@ function fr(e, t) {
 		default: return `${n}.`;
 	}
 }
-function pr(e) {
+function mr(e) {
 	let t = [
 		1e3,
 		900,
@@ -4491,21 +4498,21 @@ function pr(e) {
 	for (let i = 0; i < t.length; i++) for (; e >= t[i];) r += n[i], e -= t[i];
 	return r;
 }
-function mr(e) {
+function hr(e) {
 	for (let t of e.runs) if (t.type === "text" && t.text !== "" || t.type === "math") return !0;
 	return !1;
 }
-function hr(e, t) {
-	let n = mr(e);
+function gr(e, t) {
+	let n = hr(e);
 	if (e.bullet.type === "char") return t.clear(), n ? se(e.bullet.char, e.bullet.fontFamily ?? null) : "";
 	if (e.bullet.type === "autoNum") {
 		if (!n) return "";
 		let r = e.lvl;
-		return t.has(r) ? t.set(r, t.get(r) + 1) : t.set(r, e.bullet.startAt ?? 1), fr(t.get(r), e.bullet.numType);
+		return t.has(r) ? t.set(r, t.get(r) + 1) : t.set(r, e.bullet.startAt ?? 1), pr(t.get(r), e.bullet.numType);
 	}
 	return t.clear(), "";
 }
-function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000", p, m = {
+function _r(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000", p, m = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
@@ -4524,7 +4531,7 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 			textBodyRotation: d
 		}) : void 0;
 		if (g) return a;
-		e.save(), e.translate(t, u), e.rotate(x ? -Math.PI / 2 : Math.PI / 2), gr(e, {
+		e.save(), e.translate(t, u), e.rotate(x ? -Math.PI / 2 : Math.PI / 2), _r(e, {
 			...n,
 			vert: "horz"
 		}, -o / 2, -a / 2, o, a, s, c, 0, !1, !1, f, p, m, v, !1, _, n.vert === "eaVert"), e.restore();
@@ -4532,10 +4539,10 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 	}
 	let S = n.textWarp;
 	if (!g && S && He(S.preset)) {
-		$n(e, n, S.preset, S.adj ?? [], r, i, a, o, s, c ?? f, m);
+		er(e, n, S.preset, S.adj ?? [], r, i, a, o, s, c ?? f, m);
 		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 && An(e, n, a, C, w, s, m) : D, k = Math.max(1, n.numCol ?? 1), A = Y(n.spcCol ?? 0, s), j = n.defaultBold ?? !1, M = n.defaultItalic ?? !1, N = c ?? f, P = (t) => {
+	let 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 && jn(e, n, a, C, w, s, m) : D, k = Math.max(1, n.numCol ?? 1), A = Y(n.spcCol ?? 0, s), j = n.defaultBold ?? !1, M = n.defaultItalic ?? !1, N = c ?? f, P = (t) => {
 		let i = (n.defaultFontSize ?? 18) * J * s * t, o = [], c = 0, l = /* @__PURE__ */ new Map();
 		for (let u = 0; u < n.paragraphs.length; u++) {
 			let d = n.paragraphs[u], f = Y(d.marL, s), h = Y(d.marR, s), _ = Y(d.indent, s), v = d.defFontSize == null ? i : d.defFontSize * J * s * t, b = d.defColor ? X(d.defColor) : N, x = On(d), S = (() => {
@@ -4548,7 +4555,7 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				for (let e of d.runs) if (e.type === "text" && e.fontFamily) return e.fontFamily;
 				return d.defFontFamily ?? null;
 			})(), F = "", I = Z(!1, !1, T, "sans-serif", m), L = D, R = null;
-			F = hr(d, l);
+			F = gr(d, l);
 			let B = Le(d.bullet);
 			if (B.type === "char") {
 				let e = B;
@@ -4564,9 +4571,9 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 					sizePx: n
 				};
 			}
-			let V = k > 1 ? (a - C - w - (k - 1) * A) / k : a - C - w, H = r + C + f, U = r + C + f + _, W = V - f - h, ee = Fn(e, d, O ? W : Infinity, v, b, s, f, j, M, t, p, m, kn(x, _)), G = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * J * s * t, K = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * J * s * t;
-			for (let t = 0; t < ee.length; t++) {
-				let r = ee[t], i = t === 0, a = t === ee.length - 1, l = 0, f = 0;
+			let V = k > 1 ? (a - C - w - (k - 1) * A) / k : a - C - w, H = r + C + f, U = r + C + f + _, ee = V - f - h, W = In(e, d, O ? ee : Infinity, v, b, s, f, j, M, t, p, m, kn(x, _)), te = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * J * s * t, G = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * J * s * t;
+			for (let t = 0; t < W.length; t++) {
+				let r = W[t], i = t === 0, a = t === W.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) {
@@ -4582,7 +4589,7 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				i && R && R.sizePx > l && (l = R.sizePx);
 				let p = l * 1.2, m = Math.max(p, f), h;
 				h = d.spaceLine ? d.spaceLine.type === "pct" ? (g ? l : p) * (d.spaceLine.val / 1e5) : d.spaceLine.val * J * s : g ? y ? p : l : m, n.autoFit === "norm" && n.lnSpcReduction != null && d.spaceLine?.type !== "pts" && (h *= 1 - n.lnSpcReduction);
-				let b = h + (a ? K : 0), S = i && u > 0 ? G : 0, C = i ? kn(x, _) : 0, w = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), T = i && w ? R : null;
+				let b = h + (a ? G : 0), S = i && u > 0 ? te : 0, C = i ? kn(x, _) : 0, w = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), T = i && w ? R : null;
 				o.push({
 					line: r,
 					linePx: b,
@@ -4595,7 +4602,7 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 					bulletX: U,
 					bulletImage: T,
 					textX: H,
-					textMaxW: W,
+					textMaxW: ee,
 					alignment: d.alignment,
 					isLastLine: a,
 					para: d
@@ -4624,11 +4631,11 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 	o === 0 && L === "b" ? (B = T + I + E, R = i - B) : B = n.autoFit === "sp" ? Math.max(o, T + I + E) : o;
 	let H, U = Math.max(0, B - T - E);
 	H = L === "ctr" ? R + T + (U - I) / 2 : L === "b" ? R + B - E - I : R + T, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
-	let W = H, ee = k > 1 ? (a - C - w - (k - 1) * A) / k + A : 0, G = Math.max(0, B - T - E), K = F[F.length - 1], q = K ? Math.max(0, K.linePx - K.lineHeight) : 0, te = I - q, ne = o === 0 || te <= G + .5, re = k > 1 && !ne ? Math.ceil(F.length / k) : F.length, ie = 0, ae = 0;
+	let ee = H, W = k > 1 ? (a - C - w - (k - 1) * A) / k + A : 0, te = Math.max(0, B - T - E), G = F[F.length - 1], K = G ? Math.max(0, G.linePx - G.lineHeight) : 0, q = I - K, ne = o === 0 || q <= te + .5, re = k > 1 && !ne ? Math.ceil(F.length / k) : F.length, ie = 0, ae = 0;
 	for (let c of F) {
 		let { line: u, linePx: d, lineHeight: f, topGapPx: p, textXOffset: g, bulletLabel: y, bulletFont: b, bulletColor: x, bulletImage: S, alignment: C, isLastLine: w } = c;
-		k > 1 && ie < k - 1 && ae >= re && (ie++, ae = 0, H = W), H += p, ae++;
-		let T = (n.rtlCol ? k - 1 - ie : ie) * ee, E = c.textX + T, D = c.bulletX + T, O = c.textMaxW, A = c.para.rtl === !0, j = A || Kt(u.segments), M = u.segments.some((e) => e.isTab);
+		k > 1 && ie < k - 1 && ae >= re && (ie++, ae = 0, H = ee), H += p, ae++;
+		let T = (n.rtlCol ? k - 1 - ie : ie) * W, E = c.textX + T, D = c.bulletX + T, O = c.textMaxW, A = c.para.rtl === !0, j = A || Kt(u.segments), M = u.segments.some((e) => e.isTab);
 		if (M) {
 			let t = Y(c.para.marL, s), n = Y(c.para.marR, s), r = A ? n : t + g, i = O + t + n;
 			e.font = u.segments.find((e) => e.isTab).font;
@@ -4688,16 +4695,16 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 		}
 		let z = E + g, B;
 		B = M ? A ? E + O - L - N : z : C === "ctr" ? z + (O - g - N) / 2 : C === "r" ? E + O - L - N : z;
-		let U = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, G = w || (u.endsWithBreak ?? !1), K = (U && !j && !M ? Xt(u.segments, O - g, N, U, G) : null) ?? u.segments, q = j ? qt(u.segments, A) : null, te = (e, t) => {
+		let U = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, te = w || (u.endsWithBreak ?? !1), G = (U && !j && !M ? Xt(u.segments, O - g, N, U, te) : null) ?? u.segments, K = j ? qt(u.segments, A) : null, q = (e, t) => {
 			if (Math.abs(e - t) !== 1) return 0;
 			let n = u.segments[Math.min(e, t)], r = u.segments[Math.max(e, t)];
 			return n.isTab || n.math || r.isTab || r.math || n.sourceRunId == null || n.sourceRunId !== r.sourceRunId ? 0 : r.leadingLetterSpacingPx ?? 0;
-		}, ne = K.length;
+		}, ne = G.length;
 		for (let t = 0; t < ne; t++) {
-			let n = q ? q.order[t] : t, c = K[n], u = q ? q.rtl[n] : !1;
+			let n = K ? K.order[t] : t, c = G[n], u = K ? K.rtl[n] : !1;
 			if (j && (e.direction = u ? "rtl" : "ltr"), t > 0) {
-				let e = q ? q.order[t - 1] : t - 1;
-				B += te(e, n);
+				let e = K ? K.order[t - 1] : t - 1;
+				B += q(e, n);
 			}
 			if (c.isTab) {
 				B += c.tabWidthPx ?? 0;
@@ -4714,17 +4721,17 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				continue;
 			}
 			e.font = c.font, e.fillStyle = c.color;
-			let y = F + (c.baseline ? -(c.baseline / 1e5) * c.sizePx : 0), b = c.letterSpacingPx ?? 0;
+			let y = c.drawSizePx ?? c.sizePx, b = F + (c.baseline ? -(c.baseline / 1e5) * c.sizePx : 0), x = c.letterSpacingPx ?? 0;
 			if (c.highlight && c.text) {
-				let t = Q(e, c.text, b) + _ + d;
-				dn(e, B, y, t, c.sizePx, c.highlight, c.color);
+				let t = Q(e, c.text, x) + _ + d;
+				dn(e, B, b, t, y, c.highlight, c.color);
 			}
-			let x = c.shadow, S = (e, t, n, r) => {
+			let S = c.shadow, C = (e, t, n, r) => {
 				let i = r === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e);
-				if (b !== 0 && Mn(t) > 1) {
+				if (x !== 0 && Nn(t) > 1) {
 					let r = e, a = r.letterSpacing;
-					if (Pn(e)) {
-						r.letterSpacing = `${b}px`, i(t, n, y);
+					if (Fn(e)) {
+						r.letterSpacing = `${x}px`, i(t, n, b);
 						try {
 							r.letterSpacing = a;
 						} catch {}
@@ -4732,64 +4739,64 @@ function gr(e, 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, y), t < a.length - 1 && (r += e.measureText(n).width + b);
+							i(n, r, b), t < a.length - 1 && (r += e.measureText(n).width + x);
 						}
 					}
-				} else i(t, n, y);
-			}, C = (t) => Q(e, t, b), w = p && p.length > 0 ? Rt([...c.text], p, g, C) : null, T = [...c.text], E = !!p && p.length === T.length - 1 && T.length > 1, D = (e, t) => {
+				} else i(t, n, b);
+			}, w = (t) => Q(e, t, x), T = p && p.length > 0 ? Rt([...c.text], p, g, w) : null, E = [...c.text], D = !!p && p.length === E.length - 1 && E.length > 1, O = (e, t) => {
 				if (v) {
-					let n = E ? b + g : b;
-					un(e, c.text, B, y, c.sizePx, n, t);
+					let n = D ? x + g : x;
+					un(e, c.text, B, b, y, n, t);
 					return;
 				}
-				if (E) {
-					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = b + g;
-					if (Pn(e)) {
+				if (D) {
+					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = x + g;
+					if (Fn(e)) {
 						let t = e, i = t.letterSpacing;
-						t.letterSpacing = `${r}px`, n(c.text, B, y);
+						t.letterSpacing = `${r}px`, n(c.text, B, b);
 						try {
 							t.letterSpacing = i;
 						} catch {}
 					} else {
 						let t = B;
-						for (let i = 0; i < T.length; i++) {
-							let a = T[i];
-							n(a, t, y), i < T.length - 1 && (t += e.measureText(a).width + r);
+						for (let i = 0; i < E.length; i++) {
+							let a = E[i];
+							n(a, t, b), i < E.length - 1 && (t += e.measureText(a).width + r);
 						}
 					}
-				} else if (w) for (let { text: n, dx: r } of w) S(e, n, B + r, t);
-				else S(e, c.text, B, t);
-			}, O = c.reflection;
-			if (O && c.text) {
+				} else if (T) for (let { text: n, dx: r } of T) C(e, n, B + r, t);
+				else C(e, c.text, B, t);
+			}, k = c.reflection;
+			if (k && c.text) {
 				let t = e.canvas.width || 0, n = e.canvas.height || 0;
 				if (t > 0 && n > 0) {
 					e.font = c.font;
-					let r = e.measureText(c.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : c.sizePx * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : c.sizePx * .2, o = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, l = Number.isFinite(r.actualBoundingBoxRight) ? r.actualBoundingBoxRight : r.width, u = e.getTransform(), d = Math.abs(u.a * u.d - u.b * u.c), f = d > 0 ? Math.sqrt(d) : 1;
+					let r = e.measureText(c.text), i = Number.isFinite(r.actualBoundingBoxAscent) ? r.actualBoundingBoxAscent : y * .8, a = Number.isFinite(r.actualBoundingBoxDescent) ? r.actualBoundingBoxDescent : y * .2, o = Number.isFinite(r.actualBoundingBoxLeft) ? r.actualBoundingBoxLeft : 0, l = Number.isFinite(r.actualBoundingBoxRight) ? r.actualBoundingBoxRight : r.width, u = e.getTransform(), d = Math.abs(u.a * u.d - u.b * u.c), f = d > 0 ? Math.sqrt(d) : 1;
 					Dn(e, (e) => {
-						e.font = c.font, e.fillStyle = c.color, D(e, "fill");
+						e.font = c.font, e.fillStyle = c.color, O(e, "fill");
 					}, {
 						x: (B - o) * f,
-						y: (y - i) * f,
+						y: (b - i) * f,
 						w: Math.max(1, o + l) * f,
 						h: Math.max(1, i + a) * f
-					}, O, s * f, u, t, n), e.font = c.font, e.fillStyle = c.color;
+					}, k, s * f, u, t, n), e.font = c.font, e.fillStyle = c.color;
 				}
 			}
-			if (x) {
-				let t = x.dir * Math.PI / 180, n = Y(x.dist, s);
-				e.save(), e.shadowColor = X(x.color, x.alpha), e.shadowBlur = Y(x.blur, s), e.shadowOffsetX = Math.cos(t) * n, e.shadowOffsetY = Math.sin(t) * n;
+			if (S) {
+				let t = S.dir * Math.PI / 180, n = Y(S.dist, s);
+				e.save(), e.shadowColor = X(S.color, S.alpha), e.shadowBlur = Y(S.blur, s), e.shadowOffsetX = Math.cos(t) * n, e.shadowOffsetY = Math.sin(t) * n;
 			}
-			D(e, "fill"), x && e.restore();
-			let k = c.outline;
-			k && k.width > 0 && (e.save(), e.lineWidth = Math.max(.5, Y(k.width, s)), e.strokeStyle = k.color ? `#${k.color}` : c.color, e.lineJoin = "round", D(e, "stroke"), e.restore()), e.font = c.font;
-			let A = Q(e, c.text, b) + _;
+			O(e, "fill"), S && e.restore();
+			let A = c.outline;
+			A && A.width > 0 && (e.save(), e.lineWidth = Math.max(.5, Y(A.width, s)), e.strokeStyle = A.color ? `#${A.color}` : c.color, e.lineJoin = "round", O(e, "stroke"), e.restore()), e.font = c.font;
+			let M = Q(e, c.text, x) + _;
 			if (h && c.text && h({
 				text: c.text,
 				inShapeX: B - r,
 				inShapeY: H - i,
-				w: A + d,
+				w: M + d,
 				h: f,
-				fontSize: c.sizePx,
+				fontSize: y,
 				font: c.font,
 				shapeX: r,
 				shapeY: i,
@@ -4797,25 +4804,25 @@ function gr(e, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				shapeH: o,
 				rotation: l,
 				hyperlink: c.hyperlink
-			}), c.underline && It(e, B, y, A + d, c.sizePx, c.underlineColor ?? c.color, c.underlineStyle, m.dpr), c.strikethrough) {
-				let t = Math.max(1, c.sizePx * .05);
+			}), c.underline && It(e, B, b, M + d, y, c.underlineColor ?? c.color, c.underlineStyle, m.dpr), c.strikethrough) {
+				let t = Math.max(1, y * .05);
 				e.strokeStyle = c.color, e.lineWidth = t, e.setLineDash([]);
-				let n = y - c.sizePx * .32;
+				let n = b - y * .32;
 				if (c.strikeDouble) {
 					let r = t * .9, i = n - r, a = n + r;
-					e.beginPath(), e.moveTo(B, i + V(i, t, m.dpr)), e.lineTo(B + A + d, i + V(i, t, m.dpr)), e.moveTo(B, a + V(a, t, m.dpr)), e.lineTo(B + A + d, a + V(a, t, m.dpr)), e.stroke();
+					e.beginPath(), e.moveTo(B, i + V(i, t, m.dpr)), e.lineTo(B + M + d, i + V(i, t, m.dpr)), e.moveTo(B, a + V(a, t, m.dpr)), e.lineTo(B + M + d, a + V(a, t, m.dpr)), e.stroke();
 				} else {
 					let r = n + V(n, t, m.dpr);
-					e.beginPath(), e.moveTo(B, r), e.lineTo(B + A + d, r), e.stroke();
+					e.beginPath(), e.moveTo(B, r), e.lineTo(B + M + d, r), e.stroke();
 				}
 			}
-			B += A, B += d;
+			B += M, B += d;
 		}
 		j && (e.direction = "ltr"), H += d;
 	}
 	e.restore();
 }
-function _r(e, t, n, r, i) {
+function vr(e, t, n, r, i) {
 	if (!e) return [];
 	let a = wt(t?.rig ?? "threePt", t?.dir ?? "t", t?.rot), o = At(n), s = r * i, c = [];
 	return e.bevelT && e.bevelT.w > 0 && e.bevelT.h > 0 && c.push({
@@ -4833,7 +4840,7 @@ function _r(e, t, n, r, i) {
 		bottom: !0
 	}), c;
 }
-function vr(e, t, n, r, i, a) {
+function yr(e, t, n, r, i, a) {
 	if (!e || !e.extrusionH || e.extrusionH <= 0) return null;
 	let o = e.extrusionH * i * a, s = lt(t, n * a, r * a, o);
 	if (Math.hypot(s.x, s.y) < .75) return null;
@@ -4856,14 +4863,14 @@ function vr(e, t, n, r, i, a) {
 		rgb: c
 	};
 }
-function yr(e, t, n, r, i, a, o, s = {}) {
+function br(e, t, n, r, i, a, o, s = {}) {
 	if (i <= 0 || a <= 0) return !1;
 	let c = e.getTransform(), l = Math.abs(c.a * c.d - c.b * c.c), u = l > 0 ? Math.sqrt(l) : 1, d = Math.max(0, Math.ceil((s.edgePadCss ?? 0) * u)), f = st(t, i, a), p = f.corners;
 	if (d > 0) {
 		let e = d / u, t = Pe(f.corners, e / i, e / a);
 		t ? p = t : d = 0;
 	}
-	let m = d / u, h = Math.max(1, Math.ceil(i * u) + 2 * d), g = Math.max(1, Math.ceil(a * u) + 2 * d), _ = ye(h, g);
+	let m = d / u, h = Math.max(1, Math.ceil(i * u) + 2 * d), g = Math.max(1, Math.ceil(a * u) + 2 * d), _ = we(h, g);
 	if (!_) return !1;
 	let v = _.getContext("2d");
 	if (!v) return !1;
@@ -4884,9 +4891,9 @@ function yr(e, t, n, r, i, a, o, s = {}) {
 		y: r + e.y
 	}))), !0;
 }
-function br(e, t, n, r, i, a, o, s, c = 0) {
+function xr(e, t, n, r, i, a, o, s, c = 0) {
 	if (r <= 0 || i <= 0 || a.length === 0) return !1;
-	let l = e.getTransform(), u = Math.abs(l.a * l.d - l.b * l.c), d = u > 0 ? Math.sqrt(u) : 1, f = Math.max(0, Math.ceil(c * d)), p = f / d, m = Math.max(1, Math.ceil(r * d) + 2 * f), h = Math.max(1, Math.ceil(i * d) + 2 * f), g = ye(m, h);
+	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 = we(m, h);
 	if (!g) return !1;
 	let _ = g.getContext("2d");
 	if (!_) return !1;
@@ -4903,19 +4910,19 @@ function br(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 xr = /* @__PURE__ */ new WeakMap();
-function Sr(e) {
-	let t = xr.get(e);
+var Sr = /* @__PURE__ */ new WeakMap();
+function Cr(e) {
+	let t = Sr.get(e);
 	return t || (t = async (t, n) => {
 		let r = await e(t);
 		return r.type === n ? r : new Blob([r], { type: n });
-	}, xr.set(e, t)), t;
+	}, Sr.set(e, t)), t;
 }
-function Cr(e, t, n = Sr(t)) {
+function wr(e, t, n = Cr(t)) {
 	return g("base", e.posterPath, n, async () => {
 		let n = await t(e.posterPath), r = e.posterMimeType || n.type || "application/octet-stream";
 		return {
-			bitmap: await we(n.type === r ? n : new Blob([n], { type: r })),
+			bitmap: await ve(n.type === r ? n : new Blob([n], { type: r })),
 			owned: !0
 		};
 	}).then((e) => {
@@ -4923,20 +4930,20 @@ function Cr(e, t, n = Sr(t)) {
 		return e;
 	});
 }
-async function wr(e, t, n, r, i) {
+async function Tr(e, t, n, r, i) {
 	if (i) try {
-		let a = t.mimeType === "image/svg+xml", s = xe(t.mimeType, t.srcRect, t.width / J, t.height / J);
+		let a = t.mimeType === "image/svg+xml", s = be(t.mimeType, t.srcRect, t.width / J, t.height / J);
 		if (!s) return;
 		let { widthPt: c, heightPt: u } = s, d;
 		if (re(t)) try {
-			d = await q(t.svgImagePath, i);
+			d = await K(t.svgImagePath, i);
 		} catch {
-			d = a ? await q(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
+			d = a ? await K(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
 				widthPt: c,
 				heightPt: u
 			});
 		}
-		else d = a ? await q(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
+		else d = a ? await K(t.imagePath, i) : await Ie(t.imagePath, t.mimeType, t.duotone, i, {
 			widthPt: c,
 			heightPt: u
 		});
@@ -4945,13 +4952,13 @@ async function wr(e, t, n, r, i) {
 		let f = Y(t.x, n), m = Y(t.y, n), h = Y(t.width, n), g = Y(t.height, n);
 		(t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(f + h / 2, m + g / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(f + h / 2), -(m + g / 2)));
 		let _ = (e, n, r, i, a) => {
-			t.custGeom && t.custGeom.length > 0 ? dr(e, t.custGeom, n, r, i, a) : t.prstGeom && p(e, t.prstGeom, n, r, i, a, t.prstAdjust ?? []) || e.rect(n, r, i, a);
+			t.custGeom && t.custGeom.length > 0 ? fr(e, t.custGeom, n, r, i, a) : t.prstGeom && p(e, t.prstGeom, n, r, i, a, t.prstAdjust ?? []) || e.rect(n, r, i, a);
 		}, v = (e, t, n, r, i) => {
 			e.beginPath(), _(e, t, n, r, i);
 		}, y = (e, n, r, i, a) => {
 			(t.prstGeom || t.custGeom && t.custGeom.length > 0) && (v(e, n, r, i, a), e.clip());
 		}, b = (e, r, i, a, o) => {
-			t.stroke && (e.save(), Dr(e, t.stroke, n, {
+			t.stroke && (e.save(), Or(e, t.stroke, n, {
 				x: r,
 				y: i,
 				w: a,
@@ -4971,50 +4978,50 @@ async function wr(e, t, n, r, i) {
 			C(e, t, n, r, i), b(e, t, n, r, i), x(e, t, n, r, i);
 		}, T = (e, t, n, r, i) => {
 			C(e, t, n, r, i), b(e, t, n, r, i);
-		}, E = e.getTransform(), D = Math.abs(E.a * E.d - E.b * E.c), O = D > 0 ? Math.sqrt(D) : 1, k = _r(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, O), A = S ? vr(t.sp3d, S.camera, h, g, n, O) : null, j = t.stroke ? t.stroke.width * n / 2 : 0, M = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, N = A ? Math.hypot(A.offsetX, A.offsetY) / O : 0, P = j + M + N + 2, F = (e) => {
+		}, E = e.getTransform(), D = Math.abs(E.a * E.d - E.b * E.c), O = D > 0 ? Math.sqrt(D) : 1, k = vr(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, O), A = S ? yr(t.sp3d, S.camera, h, g, n, O) : null, j = t.stroke ? t.stroke.width * n / 2 : 0, M = t.sp3d?.contourW ? t.sp3d.contourW * n : 0, N = A ? Math.hypot(A.offsetX, A.offsetY) / O : 0, P = j + M + N + 2, F = (e) => {
 			if (S) {
-				if (yr(e, S.camera, f, m, h, g, T, {
+				if (br(e, S.camera, f, m, h, g, T, {
 					bevels: k,
 					extrusion: A ?? void 0,
 					paintEdges: x,
 					edgePadCss: P
 				})) return;
-			} else if (k.length > 0 && br(e, f, m, h, g, k, T, x, P)) return;
+			} else if (k.length > 0 && xr(e, f, m, h, g, k, T, x, P)) return;
 			w(e, f, m, h, g);
 		}, I = (e, t, n, r, i, a) => {
 			e.save(), y(e, n, r, i, a), e.fillStyle = t, e.fillRect(n, r, i, a), e.restore();
 		}, L = (e, t) => {
-			S && yr(e, S.camera, f, m, h, g, (e, n, r, i, a) => I(e, t, n, r, i, a)) || I(e, t, f, m, h, g);
+			S && br(e, S.camera, f, m, h, g, (e, n, r, i, a) => I(e, t, n, r, i, a)) || I(e, t, f, m, h, g);
 		}, R = e.getTransform(), z = Math.abs(R.a * R.d - R.b * R.c), B = z > 0 ? Math.sqrt(z) : 1, V = j + M, H = (t.custGeom && t.custGeom.length > 0 ? le(t.custGeom, f, m, h, g) : t.prstGeom && l(t.prstGeom.toLowerCase()) ? o(t.prstGeom.toLowerCase(), f, m, h, g, t.prstAdjust ?? []) : null) ?? {
 			x: f,
 			y: m,
 			w: h,
 			h: g
-		}, U = S ? sr(S.camera, R, f, m, h, g, P, t.shadow?.algn) : {
-			bbox: rr(R, H.x - V, H.y - V, H.w + V * 2, H.h + V * 2),
-			anchor: or(R, f, m, h, g, t.shadow?.algn)
-		}, W = n * B, ee = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), G = (e) => L(e, "#000");
-		lr(e, t, S && ee ? cr(F, R, U.bbox, {
+		}, U = S ? cr(S.camera, R, f, m, h, g, P, t.shadow?.algn) : {
+			bbox: ir(R, H.x - V, H.y - V, H.w + V * 2, H.h + V * 2),
+			anchor: sr(R, f, m, h, g, t.shadow?.algn)
+		}, ee = n * B, W = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), te = (e) => L(e, "#000");
+		ur(e, t, S && W ? lr(F, R, U.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : F, S && ee ? cr(G, R, U.bbox, {
+		}) : F, S && W ? lr(te, R, U.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : G, U.bbox, U.anchor, n, W, R), e.restore();
+		}) : te, U.bbox, U.anchor, n, ee, R), e.restore();
 	} catch (e) {
 		if (Se(e)) throw e;
 	}
 }
-async function Tr(e, t, n, r, i, a, o) {
+async function Er(e, t, n, r, i, a, o) {
 	let s = Y(t.x, n), c = Y(t.y, n), l = Y(t.width, n), u = Y(t.height, n), d;
 	if (t.posterPath && i) try {
-		d = await Cr(t, i, o);
+		d = await wr(t, i, o);
 	} catch (e) {
 		if (Se(e)) throw e;
 	}
-	r() || (e.save(), Or(e, t, n), d ? e.drawImage(d, s, c, l, u) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(s, c, l, u)), a || Ut(e, s + l / 2, c + u / 2, l, u, "paused"), e.restore());
+	r() || (e.save(), kr(e, t, n), d ? e.drawImage(d, s, c, l, u) : (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(s, c, l, u)), a || Ut(e, s + l / 2, c + u / 2, l, u, "paused"), e.restore());
 }
-function Er(e, t, n, r, i, a, o) {
+function Dr(e, t, n, r, i, a, o) {
 	let s = Math.max(.5, Y(r.width, a)), c = n.x - t.x, l = n.y - t.y, u = Math.hypot(c, l);
 	if (u === 0) return;
 	let d = -l / u, f = c / u, p;
@@ -5071,23 +5078,23 @@ function Er(e, t, n, r, i, a, o) {
 	}
 	e.restore();
 }
-function Dr(e, t, n, r, i = 0) {
-	if (ve(e, t, n), t?.fill && r) {
+function Or(e, t, n, r, i = 0) {
+	if (ye(e, t, n), t?.fill && r) {
 		let n = fn(t.fill, e, r.x, r.y, r.w, r.h, i);
 		n && (e.strokeStyle = n);
 	}
 }
-function Or(e, t, n) {
+function kr(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);
 	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 kr(e, t, n, r, i = {
+function Ar(e, t, n, r, i = {
 	themeMajorFont: null,
 	themeMinorFont: null,
 	dpr: 1
 }) {
-	e.save(), Or(e, t, n);
+	e.save(), kr(e, t, n);
 	let a = Y(t.x, n), o = Y(t.y, n), s = t.cols.map((e) => Y(e, n)), c = s.length, l = (e, t) => {
 		let n = 0;
 		for (let r = 0; r < t; r++) n += s[e + r] ?? 0;
@@ -5098,7 +5105,7 @@ function kr(e, t, n, r, i = {
 		for (let t = 0; t < o.cells.length; t++) {
 			let s = o.cells[t];
 			if (s.hMerge || s.vMerge || (s.rowSpan || 1) > 1 || !s.textBody) continue;
-			let c = l(t, s.gridSpan || 1), d = gr(e, s.textBody, 0, 0, c, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, o.height === 0) || 0;
+			let c = l(t, s.gridSpan || 1), d = _r(e, s.textBody, 0, 0, c, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, o.height === 0) || 0;
 			d > u[a] && (u[a] = d);
 		}
 	}
@@ -5109,7 +5116,7 @@ function kr(e, t, n, r, i = {
 			if (c.hMerge || c.vMerge) continue;
 			let d = c.rowSpan || 1;
 			if (d <= 1 || !c.textBody) continue;
-			let f = l(s, c.gridSpan || 1), p = t.rows.slice(a, Math.min(t.rows.length, a + d)).some((e) => e.height === 0), m = gr(e, c.textBody, 0, 0, f, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, p) || 0, h = 0;
+			let f = l(s, c.gridSpan || 1), p = t.rows.slice(a, Math.min(t.rows.length, a + d)).some((e) => e.height === 0), m = _r(e, c.textBody, 0, 0, f, 0, n, null, 0, !1, !1, "#000000", r, i, void 0, !0, void 0, !1, p) || 0, h = 0;
 			for (let e = 0; e < d && a + e < u.length; e++) h += u[a + e];
 			if (m > h) {
 				let e = (m - h) / d;
@@ -5157,7 +5164,7 @@ function kr(e, t, n, r, i = {
 		let u = fn(a.fill, e, o, s, c, l, t.rotation);
 		if (u && (e.fillStyle = u, e.fillRect(o, s, c, l)), a.textBody) {
 			let t = a.textColor ? X(a.textColor) : null;
-			gr(e, a.textBody, o, s, c, l, n, t, 0, !1, !1, "#000000", r, i);
+			_r(e, a.textBody, o, s, c, l, n, t, 0, !1, !1, "#000000", r, i);
 		}
 	}
 	let _ = i.dpr, v = (e, t) => {
@@ -5165,7 +5172,7 @@ function kr(e, t, n, r, i = {
 		let n = g[e][t];
 		return n < 0 ? null : h[n];
 	}, y = (r, i, a, o, s) => {
-		Dr(e, r, n, {
+		Or(e, r, n, {
 			x: Math.min(i, o),
 			y: Math.min(a, s),
 			w: Math.max(1, Math.abs(o - i)),
@@ -5206,12 +5213,12 @@ function kr(e, t, n, r, i = {
 				o && y(o, e, m[t], e, m[i] + u[i]), t = i + 1;
 			}
 		}
-		i.diagonalTL && (Dr(e, i.diagonalTL, n, {
+		i.diagonalTL && (Or(e, i.diagonalTL, n, {
 			x: a,
 			y: o,
 			w: s,
 			h: d
-		}, t.rotation), e.beginPath(), e.moveTo(a, o), e.lineTo(a + s, o + d), e.stroke()), i.diagonalTR && (Dr(e, i.diagonalTR, n, {
+		}, t.rotation), e.beginPath(), e.moveTo(a, o), e.lineTo(a + s, o + d), e.stroke()), i.diagonalTR && (Or(e, i.diagonalTR, n, {
 			x: a,
 			y: o,
 			w: s,
@@ -5220,14 +5227,14 @@ function kr(e, t, n, r, i = {
 	}
 	e.restore();
 }
-function Ar(e, t, n, r) {
+function jr(e, t, n, r) {
 	e.save(), e.globalAlpha = t.opacity, e.fillStyle = t.color, e.fillRect(0, 0, n, r), e.restore();
 }
-var jr = /* @__PURE__ */ new WeakMap();
-function Mr(e) {
-	jr.set(e, (jr.get(e) ?? 0) + 1);
+var Mr = /* @__PURE__ */ new WeakMap();
+function Nr(e) {
+	Mr.set(e, (Mr.get(e) ?? 0) + 1);
 }
-function Nr(e, t, n, r, i) {
+function Pr(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([]);
@@ -5247,22 +5254,22 @@ function Nr(e, t, n, r, i) {
 	for (let t of f.slice(0, 4)) e.fillText(t, o, h), h += m;
 	e.restore();
 }
-async function Pr(e, t, n, r, i = {}, a) {
-	let o = i.fetchImage ?? (i.fetchMedia ? Sr(i.fetchMedia) : void 0), s = o ? x(o) : void 0;
+async function Fr(e, t, n, r, i = {}, a) {
+	let o = i.fetchImage ?? (i.fetchMedia ? Cr(i.fetchMedia) : void 0), s = o ? x(o) : void 0;
 	try {
-		return await Fr(e, t, n, r, i, a, o);
+		return await Ir(e, t, n, r, i, a, o);
 	} finally {
 		s?.();
 	}
 }
-async function Fr(e, t, n, r, i = {}, o, s) {
-	let c = (jr.get(e) ?? 0) + 1;
-	jr.set(e, c);
-	let l = () => jr.get(e) !== c, u = i.width ?? ((P(e) ? e.offsetWidth : 0) || 960), d = u / n, f = Math.round(u), p = Math.round(r * d), m = i.dpr ?? R(), h = Ae(f * m, p * m), g = h.clamped ? m * h.scale : m;
+async function Ir(e, t, n, r, i = {}, o, s) {
+	let c = (Mr.get(e) ?? 0) + 1;
+	Mr.set(e, c);
+	let l = () => Mr.get(e) !== c, u = i.width ?? ((P(e) ? e.offsetWidth : 0) || 960), d = u / n, f = Math.round(u), p = Math.round(r * d), m = i.dpr ?? R(), h = Ae(f * m, p * m), g = h.clamped ? m * h.scale : m;
 	e.width = h.width, e.height = h.height, P(e) && (e.style.width = `${f}px`, e.style.display || (e.style.display = "block"));
 	let _ = e.getContext("2d");
 	if (!_) throw Error("Could not get 2D context");
-	if (_.scale(g, g), t.parseError) return Nr(_, f, p, t.slideNumber, t.parseError), e;
+	if (_.scale(g, g), t.parseError) return Pr(_, f, p, t.slideNumber, t.parseError), e;
 	let v = i.defaultTextColor ? `#${i.defaultTextColor}` : "#000000", y = {
 		themeMajorFont: i.majorFont ?? null,
 		themeMinorFont: i.minorFont ?? null,
@@ -5270,14 +5277,14 @@ async function Fr(e, t, n, r, i = {}, o, s) {
 		dpr: g,
 		smartArtFallbackTextColor: rn(t.background, v)
 	};
-	if (await In(_, t.background, f, p, d, l, i.fetchImage), l() || (i.math && await gn(t, i.math), l())) return e;
+	if (await Ln(_, t.background, f, p, d, l, i.fetchImage), l() || (i.math && await gn(t, i.math), l())) return e;
 	let b = t.slideNumber;
 	for (let e of t.elements) if (e.type === "picture" && i.fetchImage) {
 		let t = e, n = t.mimeType === "image/svg+xml";
-		if (re(t)) q(t.svgImagePath, i.fetchImage).catch(() => void 0);
-		else if (n) q(t.imagePath, i.fetchImage).catch(() => void 0);
+		if (re(t)) K(t.svgImagePath, i.fetchImage).catch(() => void 0);
+		else if (n) K(t.imagePath, i.fetchImage).catch(() => void 0);
 		else {
-			let e = xe(t.mimeType, t.srcRect, t.width / J, t.height / J);
+			let e = be(t.mimeType, t.srcRect, t.width / J, t.height / J);
 			if (!e) continue;
 			Ie(t.imagePath, t.mimeType, t.duotone, i.fetchImage, {
 				widthPt: e.widthPt,
@@ -5286,12 +5293,12 @@ async function Fr(e, t, n, r, i = {}, o, s) {
 		}
 	} else if (e.type === "media") {
 		let t = e;
-		t.posterPath && i.fetchMedia && Cr(t, i.fetchMedia, s).catch(() => void 0);
+		t.posterPath && i.fetchMedia && wr(t, i.fetchMedia, s).catch(() => void 0);
 	}
 	let x = /* @__PURE__ */ new Map();
 	if (i.fetchImage) {
 		let n = i.fetchImage, r = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Map();
-		for (let e of be(t.elements.filter((e) => e.type === "chart").map((e) => e.chart))) {
+		for (let e of xe(t.elements.filter((e) => e.type === "chart").map((e) => e.chart))) {
 			let t = Ee(e);
 			o.has(t) || o.set(t, e);
 		}
@@ -5307,18 +5314,18 @@ async function Fr(e, t, n, r, i = {}, o, s) {
 				});
 			}), i = [...o].map(async ([e, t]) => {
 				try {
-					let r = xe(t.mimeType, t.srcRect, 72, 72);
+					let r = be(t.mimeType, t.srcRect, 72, 72);
 					if (!r) {
 						x.set(e, null);
 						return;
 					}
-					let i = () => t.mimeType === "image/svg+xml" ? t.duotone ? Promise.resolve(null) : q(t.imagePath, n) : Ie(t.imagePath, t.mimeType, t.duotone, n, {
+					let i = () => t.mimeType === "image/svg+xml" ? t.duotone ? Promise.resolve(null) : K(t.imagePath, n) : Ie(t.imagePath, t.mimeType, t.duotone, n, {
 						widthPt: r.widthPt,
 						heightPt: r.heightPt,
 						failClosedOnDuotoneFailure: !0
 					}), a;
 					if (!t.duotone && re(t)) try {
-						a = await q(t.svgImagePath, n);
+						a = await K(t.svgImagePath, n);
 					} catch {
 						a = await i();
 					}
@@ -5334,17 +5341,17 @@ async function Fr(e, t, n, r, i = {}, o, s) {
 	}
 	for (let [n, r] of t.elements.entries()) {
 		if (l()) return e;
-		if (r.type === "shape") ur(_, r, d, v, b, y, o ? (e) => o({
+		if (r.type === "shape") dr(_, r, d, v, b, y, o ? (e) => o({
 			...e,
 			elementIndex: n,
 			origin: t.elementSources?.[n]?.origin ?? "slide"
 		}) : void 0, i.fetchImage);
-		else if (r.type === "picture") await wr(_, r, d, l, i.fetchImage);
-		else if (r.type === "table") kr(_, r, d, b, y);
-		else if (r.type === "media") await Tr(_, r, d, l, i.fetchMedia, i.skipMediaControls, i.fetchImage);
+		else if (r.type === "picture") await Tr(_, r, d, l, i.fetchImage);
+		else if (r.type === "table") Ar(_, r, d, b, y);
+		else if (r.type === "media") await Er(_, r, d, l, i.fetchMedia, i.skipMediaControls, i.fetchImage);
 		else if (r.type === "chart") {
 			let e = J * d;
-			_.save(), Or(_, r, d), Fe(_, r.chart, {
+			_.save(), kr(_, r, d), Fe(_, r.chart, {
 				x: Y(r.x, d),
 				y: Y(r.y, d),
 				w: Y(r.width, d),
@@ -5352,11 +5359,11 @@ async function Fr(e, t, n, r, i = {}, o, s) {
 			}, e, r.rotation, i.threeD, i.regionMap, (e) => x.get(Ee(e)), i.chartEx), _.restore();
 		}
 	}
-	return l() || i.dim && Ar(_, i.dim, f, p), e;
+	return l() || i.dim && jr(_, i.dim, f, p), e;
 }
 //#endregion
 //#region packages/pptx/src/google-fonts.ts
-var Ir = {
+var Lr = {
 	...H,
 	...c
 };
@@ -5369,7 +5376,7 @@ Object.freeze({
 function $(e, t) {
 	if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation bootstrap ${t}`);
 }
-function Lr(e, t) {
+function Rr(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation bootstrap slide at ${t}`);
 	let n = e;
 	if (n.index !== t) throw Error(`invalid PPTX presentation bootstrap slide index ${n.index}`);
@@ -5379,7 +5386,7 @@ function Lr(e, t) {
 		...n.partName === void 0 ? {} : { partName: n.partName }
 	});
 }
-function Rr(e) {
+function zr(e) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error("invalid PPTX presentation bootstrap payload");
 	let t = e;
 	if (!Number.isSafeInteger(t.slideCount) || (t.slideCount ?? -1) < 0 || !Number.isSafeInteger(t.slideWidth) || (t.slideWidth ?? 0) <= 0 || !Number.isSafeInteger(t.slideHeight) || (t.slideHeight ?? 0) <= 0 || !Array.isArray(t.slides) || t.slides.length !== t.slideCount) throw Error("invalid PPTX presentation bootstrap dimensions or slide count");
@@ -5392,10 +5399,10 @@ function Rr(e) {
 		minorFont: t.minorFont,
 		hlinkColor: t.hlinkColor,
 		folHlinkColor: t.folHlinkColor,
-		slides: Object.freeze(t.slides.map(Lr))
+		slides: Object.freeze(t.slides.map(Rr))
 	});
 }
-function zr(e) {
+function Br(e) {
 	return Object.freeze({
 		type: "media",
 		x: e.x,
@@ -5412,7 +5419,112 @@ function zr(e) {
 		mimeType: e.mimeType
 	});
 }
-function Br(e, t) {
+function Vr(e) {
+	return Object.freeze({
+		...e.id === void 0 ? {} : { id: e.id },
+		...e.authorId === void 0 ? {} : { authorId: e.authorId },
+		...e.author === void 0 ? {} : { author: e.author },
+		...e.date === void 0 ? {} : { date: e.date },
+		...e.status === void 0 ? {} : { status: e.status },
+		text: e.text
+	});
+}
+function Hr(e) {
+	return Object.freeze({ ...e });
+}
+function Ur(e) {
+	return Object.freeze({
+		...e.authorId === void 0 ? {} : { authorId: e.authorId },
+		...e.modernAuthorId === void 0 ? {} : { modernAuthorId: e.modernAuthorId },
+		...e.id === void 0 ? {} : { id: e.id },
+		...e.index === void 0 ? {} : { index: e.index },
+		...e.author === void 0 ? {} : { author: e.author },
+		...e.date === void 0 ? {} : { date: e.date },
+		...e.x === void 0 ? {} : { x: e.x },
+		...e.y === void 0 ? {} : { y: e.y },
+		...e.anchors?.length ? { anchors: Object.freeze(e.anchors.map(Hr)) } : {},
+		...e.status === void 0 ? {} : { status: e.status },
+		text: e.text,
+		...e.replies?.length ? { replies: Object.freeze(e.replies.map(Vr)) } : {}
+	});
+}
+function Wr(e, t, n) {
+	if (e !== void 0 && typeof e != "string") throw Error(`invalid PPTX presentation preflight comment ${t} at slide ${n}`);
+}
+function Gr(e, t) {
+	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight comment reply at slide ${t}`);
+	let n = e;
+	for (let e of [
+		"id",
+		"authorId",
+		"author",
+		"date",
+		"status"
+	]) Wr(n[e], e, t);
+	if (typeof n.text != "string") throw Error(`invalid PPTX presentation preflight comment reply text at slide ${t}`);
+	if (n.status !== void 0 && ![
+		"active",
+		"resolved",
+		"closed"
+	].includes(n.status)) throw Error(`invalid PPTX presentation preflight comment reply status at slide ${t}`);
+	return Vr(n);
+}
+function Kr(e, t) {
+	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight comment at slide ${t}`);
+	let n = e;
+	for (let e of [
+		"modernAuthorId",
+		"id",
+		"author",
+		"date",
+		"status"
+	]) Wr(n[e], e, t);
+	for (let e of [
+		"authorId",
+		"index",
+		"x",
+		"y"
+	]) {
+		let r = n[e];
+		if (r !== void 0 && (typeof r != "number" || !Number.isSafeInteger(r))) throw Error(`invalid PPTX presentation preflight comment ${e} at slide ${t}`);
+	}
+	if (typeof n.text != "string" || n.replies !== void 0 && !Array.isArray(n.replies) || n.anchors !== void 0 && !Array.isArray(n.anchors)) throw Error(`invalid PPTX presentation preflight comment fields at slide ${t}`);
+	if (n.status !== void 0 && ![
+		"active",
+		"resolved",
+		"closed"
+	].includes(n.status)) throw Error(`invalid PPTX presentation preflight comment status at slide ${t}`);
+	return Ur({
+		...n,
+		...n.anchors?.length ? { anchors: n.anchors.map((e) => qr(e, t)) } : {},
+		...n.replies?.length ? { replies: n.replies.map((e) => Gr(e, t)) } : {}
+	});
+}
+function qr(e, t) {
+	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight comment anchor at slide ${t}`);
+	let n = e;
+	if (n.type === "slide" || n.type === "unknown") return Object.freeze({ type: n.type });
+	if (n.type === "drawingElement") return Wr(n.elementId, "anchor.elementId", t), Wr(n.creationId, "anchor.creationId", t), Object.freeze({
+		type: "drawingElement",
+		...n.elementId === void 0 ? {} : { elementId: n.elementId },
+		...n.creationId === void 0 ? {} : { creationId: n.creationId }
+	});
+	if (n.type === "textRange") {
+		Wr(n.elementId, "anchor.elementId", t);
+		for (let e of ["start", "length"]) {
+			let r = n[e];
+			if (r !== void 0 && (typeof r != "number" || !Number.isSafeInteger(r))) throw Error(`invalid PPTX presentation preflight comment anchor.${e} at slide ${t}`);
+		}
+		return Object.freeze({
+			type: "textRange",
+			...n.elementId === void 0 ? {} : { elementId: n.elementId },
+			...n.start === void 0 ? {} : { start: n.start },
+			...n.length === void 0 ? {} : { length: n.length }
+		});
+	}
+	throw Error(`invalid PPTX presentation preflight comment anchor type at slide ${t}`);
+}
+function Jr(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight media at slide ${t}`);
 	let n = e;
 	for (let e of [
@@ -5423,9 +5535,9 @@ function Br(e, t) {
 		"rotation"
 	]) if (typeof n[e] != "number" || !Number.isFinite(n[e])) throw Error(`invalid PPTX presentation preflight media ${e} at slide ${t}`);
 	if (n.type !== "media" || typeof n.flipH != "boolean" || typeof n.flipV != "boolean" || n.mediaKind !== "audio" && n.mediaKind !== "video" || typeof n.posterPath != "string" || typeof n.posterMimeType != "string" || typeof n.mediaPath != "string" || typeof n.mimeType != "string") throw Error(`invalid PPTX presentation preflight media fields at slide ${t}`);
-	return zr(n);
+	return Br(n);
 }
-function Vr(e) {
+function Yr(e) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error("invalid PPTX presentation preflight payload");
 	let t = e;
 	if (!Number.isSafeInteger(t.slideCount) || (t.slideCount ?? -1) < 0 || !Number.isSafeInteger(t.slideWidth) || (t.slideWidth ?? 0) <= 0 || !Number.isSafeInteger(t.slideHeight) || (t.slideHeight ?? 0) <= 0 || !Array.isArray(t.slides) || t.slides.length !== t.slideCount || !Array.isArray(t.fontPreloadNames)) throw Error("invalid PPTX presentation preflight dimensions or slide count");
@@ -5433,13 +5545,14 @@ function Vr(e) {
 	let n = t.slides.map((e, t) => {
 		if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation preflight slide at ${t}`);
 		let n = e;
-		if (n.index !== t || n.partName !== void 0 && typeof n.partName != "string" || n.notes !== null && typeof n.notes != "string" || typeof n.hidden != "boolean" || !Array.isArray(n.mediaElements)) throw Error(`invalid PPTX presentation preflight slide fields at ${t}`);
+		if (n.index !== t || n.partName !== void 0 && typeof n.partName != "string" || n.notes !== null && typeof n.notes != "string" || typeof n.hidden != "boolean" || !Array.isArray(n.mediaElements) || n.comments !== void 0 && !Array.isArray(n.comments)) throw Error(`invalid PPTX presentation preflight slide fields at ${t}`);
 		return Object.freeze({
 			index: t,
 			...n.partName === void 0 ? {} : { partName: n.partName },
 			notes: n.notes,
 			hidden: n.hidden,
-			mediaElements: Object.freeze(n.mediaElements.map((e) => Br(e, t)))
+			mediaElements: Object.freeze(n.mediaElements.map((e) => Jr(e, t))),
+			...n.comments?.length ? { comments: Object.freeze(n.comments.map((e) => Kr(e, t))) } : {}
 		});
 	}), r = t.fontPreloadNames.map((e, t) => {
 		if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation preflight font at ${t}`);
@@ -5458,7 +5571,7 @@ function Vr(e) {
 		fontPreloadNames: Object.freeze(r)
 	});
 }
-function Hr(e, t) {
+function Xr(e, t) {
 	for (let n of e.slides) for (let e of n.mediaElements) {
 		if (e.mediaPath === t) return e.mimeType;
 		if (e.posterPath === t) return e.posterMimeType;
@@ -5467,7 +5580,7 @@ function Hr(e, t) {
 }
 //#endregion
 //#region packages/pptx/src/slide-pull-client.ts
-var Ur = 1024 * 1024, Wr = class {
+var Zr = 1024 * 1024, Qr = class {
 	active = /* @__PURE__ */ new Set();
 	nextSessionId = 1;
 	constructor(e) {
@@ -5488,7 +5601,7 @@ var Ur = 1024 * 1024, Wr = class {
 		this.active.add(a);
 		try {
 			await this.options.open(e, i, n);
-			let r = await Kr(a);
+			let r = await ei(a);
 			try {
 				let e = r.usage ?? a.usageCheckpoint;
 				e && this.options.onUsage?.(e);
@@ -5511,20 +5624,20 @@ var Ur = 1024 * 1024, Wr = class {
 		if (!Number.isSafeInteger(e) || e < 0 || e >= this.options.slideCount) throw RangeError(`Slide index ${e} out of range (count: ${this.options.slideCount})`);
 	}
 };
-function Gr(e) {
+function $r(e) {
 	return !!e && typeof e == "object" && e.protocol === "ooxml-pull-v1";
 }
-async function Kr(e) {
+async function ei(e) {
 	try {
-		return await e.pull(Ur);
+		return await e.pull(Zr);
 	} catch (t) {
-		let n = qr(t);
+		let n = ti(t);
 		if (n === void 0) throw t;
 		return e.pull(n);
 	}
 }
-function qr(e) {
-	return O(e, Ur, u);
+function ti(e) {
+	return O(e, Zr, u);
 }
 //#endregion
-export { Vr as a, Pr as c, Rr as i, Ut as l, Gr as n, Ir as o, Hr as r, Mr as s, Wr as t };
+export { Yr as a, Fr as c, zr as i, Ut as l, $r as n, Lr as o, Xr as r, Nr as s, Qr as t };