@silurus/ooxml 0.85.1 → 0.85.3

package/dist/{slide-pull-client-8i8C4VyD.js → slide-pull-client-Dwek7xW8.js}

@@ -1,12 +1,12 @@
-import { $ as e, A as t, At as n, Bt as r, C as i, Ct as a, D as o, Dt as s, Ft as c, It as l, J as u, Jt as d, Lt as f, M as p, Mt as m, N as h, Nt as g, O as _, Pt as v, Rt as y, S as b, St as x, Tt as S, Ut as C, Vt as w, Yt as T, _ as E, _t as D, at as O, bt as k, c as A, ct as j, d as M, dt as N, et as P, f as F, g as I, gt as L, h as R, i as z, it as B, j as V, jt as H, kt as U, lt as ee, m as W, mt as te, n as G, nt as K, p as q, r as ne, rt as re, s as ie, sn as ae, tt as oe, u as se, w as ce, wt as le, xt as ue, y as de, zt as fe } from "./line-metrics-u87yCAfV.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-CiKeWjBF.js";
+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 G, m as K, mt as q, n as J, nt as te, p as ne, r as re, rt as ie, s as ae, tt as oe, u as se, w as ce, wt as le, xt as ue, y as de, zt as fe } from "./line-metrics-BGtFM-ec.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-BsV4MVZ2.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 J } from "./units-EJdC96r6.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-whZhvVMt.js";
-import { a as Je, i as Ye, n as Xe, t as Ze } from "./resource-measurement-6uR3Huao.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-D41R-0Bl.js";
 //#region packages/pptx/src/types.ts
 function Qe(e) {
 	return e;
@@ -2402,8 +2402,8 @@ function it(e) {
 	if (t) return t;
 	let n = tt[e];
 	return n ? (t = {
-		adj: n.adj.map(([e, t]) => [e, g(t)]),
-		gd: n.gd.map(([e, t]) => [e, g(t)]),
+		adj: n.adj.map(([e, t]) => [e, y(t)]),
+		gd: n.gd.map(([e, t]) => [e, y(t)]),
 		paths: n.paths
 	}, nt.set(e, t), t) : null;
 }
@@ -2476,16 +2476,16 @@ function st(e) {
 function ct(e, t, n, r) {
 	let i = it(e.toLowerCase());
 	if (!i || i.paths.length === 0) return null;
-	let a = v({
+	let a = c({
 		w: n,
 		h: r,
 		adj: t
-	}, 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);
+	}, i.adj, i.gd), o = i.paths.length === 1, s = ot(i.paths[0], a, n, r), l = o ? s : ot(i.paths[i.paths.length - 1], a, n, r);
 	return {
 		top: s,
-		bottom: c,
+		bottom: l,
 		topLen: st(s),
-		bottomLen: st(c),
+		bottomLen: st(l),
 		singleEdge: o
 	};
 }
@@ -3159,8 +3159,8 @@ function rn(e, t) {
 		kind: "internal",
 		ref: n ?? r
 	};
-	let i = n, a = z(i);
-	return a !== null && ne.includes(a) ? {
+	let i = n, a = H(i);
+	return a !== null && re.includes(a) ? {
 		kind: "external",
 		url: i
 	} : {
@@ -3191,7 +3191,7 @@ var on = (e) => {
 function cn(e) {
 	for (let t of e) {
 		let e = on(t);
-		if (e !== void 0 && V(e)) return !0;
+		if (e !== void 0 && ee(e)) return !0;
 	}
 	return !1;
 }
@@ -3298,9 +3298,9 @@ function hn(e, t) {
 //#endregion
 //#region packages/pptx/src/smartart-fallback-contrast.ts
 function gn(e) {
-	let t = j(e.length === 8 ? e.slice(0, 6) : e);
+	let t = P(e.length === 8 ? e.slice(0, 6) : e);
 	if (!t) return null;
-	let n = ee(t[0], t[1], t[2]);
+	let n = G(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;
@@ -3381,12 +3381,12 @@ function Cn(e, t) {
 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 = F(t), p = e.measureText(o).width + a, m = l === "Tr" ? se(t) : null, h = l === "Tr" && m === null && W(t), g = l === "U" || l === "Tu" || m !== null || h;
-		if (q(t) && s(t)) {
+		let t = o.codePointAt(0) ?? 0, l = R(t), p = e.measureText(o).width + a, m = l === "Tr" ? se(t) : null, h = l === "Tr" && m === null && K(t), g = l === "U" || l === "Tu" || m !== null || h;
+		if (ne(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", A(e, () => u(o, 0, 0)), e.restore();
+			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();
 		} else if (g) {
-			let r = m === null && l === "Tu" ? M(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;
+			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 ? 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;
@@ -3397,11 +3397,11 @@ function wn(e, t, n, r, i, a, o = "fill", s = xn) {
 	e.textAlign = c, e.textBaseline = l;
 }
 function Tn(e, t, n, r, i, a, o = "fill") {
-	wn(e, t, n, r, i, a, o, (t) => ie(e, t));
+	wn(e, t, n, r, i, a, o, (t) => ae(e, t));
 }
 //#endregion
 //#region packages/pptx/src/renderer.ts
-function Y(e, t) {
+function X(e, t) {
 	return e * t;
 }
 function En(e, t, n, r) {
@@ -3411,7 +3411,7 @@ function En(e, t, n, r) {
 		targetHeightPx: i.height
 	} : void 0;
 }
-function X(e, t) {
+function Z(e, t) {
 	return Ye(e, t);
 }
 function Dn(e, t) {
@@ -3419,11 +3419,11 @@ function Dn(e, t) {
 	return n ? {
 		targetWidthPx: n.width,
 		targetHeightPx: n.height,
-		maxRetainedPixels: n.retainedPixels
+		maxRetainedPixels: n.maxRetainedPixels
 	} : void 0;
 }
 function On(e) {
-	return O(e) ? e.svgImagePath : e.imagePath;
+	return A(e) ? e.svgImagePath : e.imagePath;
 }
 function kn(e, t, n, r) {
 	let i = Qe(t.bullet);
@@ -3434,39 +3434,49 @@ function kn(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);
-}
-async function An(e, t, n, r, i, a, o, s, c, l) {
-	let u = [], d = (e, t, n, r, i, a = 1, o = i) => {
-		!t || !i || u.push(L(n, r, i, o).then((n) => n.dimensions && S(n.format, l !== void 0) ? {
-			key: e,
-			...t,
-			sourceWidthPx: n.dimensions.width,
-			sourceHeightPx: n.dimensions.height,
-			retainedSurfaceCount: a
-		} : null).catch(() => null));
-	}, f = e.background;
-	if (f?.fillType === "image" && f.imagePath && !f.tile && !f.duotone) {
-		let e = f.fillRect ?? {}, r = t * (1 - (e.l ?? 0) - (e.r ?? 0)), a = n * (1 - (e.t ?? 0) - (e.b ?? 0));
-		d(X(f.imagePath, f.duotone), En(r, a, i, f.srcRect), f.imagePath, f.mimeType, o, 1);
+	return Math.max(1, s * Y * n * r);
+}
+async function An(e, t, n, r, i, a, o, c, l, u) {
+	let d = ue(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")) {
+				f.push({
+					key: e,
+					...t,
+					retainedSurfaceCount: a
+				});
+				return;
+			}
+			p.push(B(n, r, i, o).then((n) => n.dimensions && s(n.format, u !== void 0) ? {
+				key: e,
+				...t,
+				sourceWidthPx: n.dimensions.width,
+				sourceHeightPx: n.dimensions.height,
+				retainedSurfaceCount: a
+			} : 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(Z(h.imagePath, h.duotone), En(r, a, i, h.srcRect), h.imagePath, h.mimeType, o, 1);
 	}
-	for (let t of e.elements) if (t.type === "picture") !(O(t) || t.mimeType === "image/svg+xml") && !t.duotone && d(X(t.imagePath, t.duotone), En(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") !(A(t) || t.mimeType === "image/svg+xml") && !t.duotone && m(Z(t.imagePath, t.duotone), En(X(t.width, r), X(t.height, r), i, t.srcRect), t.imagePath, t.mimeType, o, 1);
 	else if (t.type === "media" && t.posterPath) {
-		let e = s ? qr(s) : void 0;
-		d(X(t.posterPath), En(Y(t.width, r), Y(t.height, r), i), t.posterPath, t.posterMimeType || "application/octet-stream", e, 1, c ?? e);
+		let e = c ? qr(c) : void 0;
+		m(Z(t.posterPath), En(X(t.width, r), X(t.height, r), i), 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) * i,
+			targetHeightPx: X(t.height, r) * i
 		};
 		for (let n of Te(t.chart)) {
 			let t = n.fill, r = Ee(n, e);
-			!(t.mimeType === "image/svg+xml" || O({
+			!(t.mimeType === "image/svg+xml" || A({
 				svgImagePath: t.svgImagePath,
 				srcRect: n.hasSourceCrop ? !0 : null
-			})) && !t.duotone && !n.preserveNaturalSize && r?.targetWidthPx && r.targetHeightPx && d(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);
@@ -3475,20 +3485,20 @@ async function An(e, t, n, r, i, a, o, s, c, l) {
 		let n = Qe(e.bullet);
 		if (n.type !== "blip") continue;
 		let a = kn(t.textBody, e, r, i);
-		!a || !o || u.push(L(n.imagePath, n.mimeType, o).then((e) => e.dimensions && e.dimensions.width > 0 && e.dimensions.height > 0 && S(e.format, l !== void 0) ? {
-			key: X(n.imagePath),
+		!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: Z(n.imagePath),
 			targetWidthPx: a * e.dimensions.width / e.dimensions.height,
 			targetHeightPx: a,
 			sourceWidthPx: e.dimensions.width,
 			sourceHeightPx: e.dimensions.height
 		} : null).catch(() => null));
 	}
-	return x((await Promise.all(u)).filter((e) => e !== null), ue(a));
+	return f.push(...(await Promise.all(p)).filter((e) => e !== null)), S(f, d);
 }
 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 = Oe;
+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;
@@ -3500,7 +3510,7 @@ var Pn = /* @__PURE__ */ new WeakMap();
 function Fn(e, t) {
 	let n = e.tinted.get(t);
 	if (n) return n;
-	let r = re(e.raster, t);
+	let r = ie(e.raster, t);
 	return e.tinted.set(t, r), r;
 }
 function In(e) {
@@ -3519,7 +3529,7 @@ async function Ln(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(B(e.nodes, e.display)), r = await K(n, "#000000");
+			let n = await t.mathMLToSvg(U(e.nodes, e.display)), r = await te(n, "#000000");
 			Pn.set(e.nodes, {
 				raster: r,
 				widthEm: n.widthEm,
@@ -3546,7 +3556,7 @@ var zn = new Set([
 	"system-ui"
 ]);
 function Bn(e) {
-	let t = w(e);
+	let t = l(e);
 	return t === "mono" ? "monospace" : t === "serif" ? "serif" : "sans-serif";
 }
 var Vn = {
@@ -3573,8 +3583,8 @@ function Wn(e) {
 function Gn(e, t = e) {
 	let n = Bn(t), i = Vn[t.toLowerCase()], a = i ? `"${i}", ` : "";
 	if (Un(t)) return `"${e}", ${a}${Hn}, ${n}`;
-	let o = n === "serif" ? "serif" : "sans", s = r(t);
-	return `"${e}", ${a}${s ? `${Wn(fe(s, o))}, ` : ""}${`${Wn(o === "serif" ? l : c)}, `}${n}`;
+	let o = n === "serif" ? "serif" : "sans", s = w(t);
+	return `"${e}", ${a}${s ? `${Wn(r(s, o))}, ` : ""}${`${Wn(o === "serif" ? f : u)}, `}${n}`;
 }
 function Kn(e) {
 	return e ? e.kind === "external" ? `e:${e.url}` : `i:${e.ref}` : "";
@@ -3642,15 +3652,15 @@ function $n(e, t) {
 	return t != null && t !== 0 ? e * .65 : e;
 }
 function er(e, t, n, r, i, a, o) {
-	let s = (t.defaultFontSize ?? 18) * J * a;
+	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 = Qn(Xn(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 = Rn(n.fontFamily ?? c.defFontFamily ?? null, o);
+			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) * J * a;
-			if (m += Q(e, n.text, l), m > p) return !0;
+			let l = (n.letterSpacing ?? 0) * Y * a;
+			if (m += $(e, n.text, l), m > p) return !0;
 		}
 	}
 	return !1;
@@ -3686,7 +3696,7 @@ function ir(e) {
 	}
 	return rr.set(e, i), i;
 }
-function Q(e, t, n) {
+function $(e, t, n) {
 	let r = e, i = r.letterSpacing;
 	if (n !== 0 && ir(e)) try {
 		r.letterSpacing = `${n}px`;
@@ -3713,22 +3723,22 @@ function ar(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: [] }, x = 0, S = !1, C = t.rtl === !0, w = Y(t.marR, o), T = (t.tabStops ?? []).map((e) => ({
-		pos: Y(e.pos, o),
+	let v = () => n - (m.length === 0 ? p : 0), y = { segments: [] }, b = 0, S = !1, C = t.rtl === !0, w = X(t.marR, o), T = (t.tabStops ?? []).map((e) => ({
+		pos: X(e.pos, o),
 		algn: e.algn
-	})), D = Y(t.defTabSz ?? 914400, o), O = !1, k = [], A = 0, j = () => C ? w : s + (m.length === 0 ? p : 0), M = (e = 0) => {
+	})), E = X(t.defTabSz ?? 914400, o), D = !1, k = [], A = 0, j = () => C ? w : s + (m.length === 0 ? p : 0), M = (e = 0) => {
 		let t = bn(e > 0 ? [...k, {
 			isTab: !1,
 			width: e
-		}] : k, T, j(), Infinity, A, D), n = 0;
+		}] : k, T, j(), Infinity, A, E), n = 0;
 		for (let e of t) n += e;
 		return n;
 	}, N = (e) => {
 		let t = v();
-		return Number.isFinite(t) ? O ? M(e) <= t : x + e <= t : !0;
+		return Number.isFinite(t) ? D ? M(e) <= t : b + e <= t : !0;
 	}, P = () => {
 		let e = v();
-		if (!O) return e - x;
+		if (!D) return e - b;
 		if (!Number.isFinite(e)) return Infinity;
 		if (M(0) >= e) return 0;
 		let t = 0, n = e;
@@ -3738,16 +3748,16 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 		}
 		return t;
 	}, F = (e = !1) => {
-		e && (y.endsWithBreak = !0), m.push(y), y = { segments: [] }, x = 0, O = !1, k = [], S = !1;
-	}, L = (t, n, r, i) => {
+		e && (y.endsWithBreak = !0), m.push(y), y = { segments: [] }, b = 0, D = !1, k = [], S = !1;
+	}, I = (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;
-	}, z = (t, n, r, i, a, o, s, c) => {
+		let a = $(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 ? $(e, o.text + t, r) - $(e, o.text, r) : a + r;
+	}, L = (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, b = 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 && Kn(e.hyperlink) === Kn(b) && (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), x += 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, 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 && Kn(e.hyperlink) === Kn(x) && (l === 0 || e.sourceRunId === u), w = y.segments.at(-1), T = $(e, t, l);
+		if (w && C(w) ? T = $(e, w.text + t, l) - $(e, w.text, l) : w && !w.isTab && !w.math && u != null && w.sourceRunId === u && (T += l), b += T, k.push({
 			isTab: !1,
 			width: T
 		}), w && C(w)) w.text += t;
@@ -3773,17 +3783,17 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				reflection: h,
 				outline: g,
 				highlight: _,
-				hyperlink: b
+				hyperlink: x
 			});
 		}
-	}, B = () => {
+	}, R = () => {
 		let e = y.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 return !1;
-		return F(), z(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
+		return F(), L(n, e.font, e.sizePx, e.color, e.underline, e.strikethrough, e.baseline, {
 			strikeDouble: e.strikeDouble,
 			letterSpacingPx: e.letterSpacingPx,
 			underlineStyle: e.underlineStyle,
@@ -3803,15 +3813,15 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 			continue;
 		}
 		if (s.type === "math") {
-			let e = Pn.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 && x > 0 || !N(n) && x > 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, i = e ? e.ascentEm * t : 0, c = e ? e.descentEm * t : 0;
+			(s.display && b > 0 || !N(n) && b > 0) && F(), k.push({
 				isTab: !1,
 				width: n
 			}), y.segments.push({
 				text: "",
 				font: `${t}px sans-serif`,
 				sizePx: t,
-				color: s.color ? Z(s.color) : a,
+				color: s.color ? Q(s.color) : a,
 				underline: !1,
 				strikethrough: !1,
 				math: {
@@ -3821,33 +3831,33 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 					ascent: i,
 					descent: c
 				}
-			}), x += n, s.display && F();
+			}), b += n, s.display && F();
 			continue;
 		}
-		let p = s.fontSize == null ? r : s.fontSize * J * o * u, m = $n(p, s.baseline ?? void 0), g = Rn(s.fontFamily ?? t.defFontFamily ?? null, f), C = s.fontFamilyEa ? Rn(s.fontFamilyEa, f) : null, w = s.fontFamilySym ? Rn(s.fontFamilySym, f) : null, T;
-		T = s.color ? Z(s.color) : s.hyperlink && f.themeHlinkColor ? Z(f.themeHlinkColor) : a;
-		let D = s.bold ?? t.defBold ?? c, j = s.italic ?? t.defItalic ?? l, M = Yn(D, j, m, g, f), V = C ? Yn(D, 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), C = s.fontFamilyEa ? Rn(s.fontFamilyEa, f) : null, w = s.fontFamilySym ? Rn(s.fontFamilySym, f) : null, T;
+		T = s.color ? Q(s.color) : s.hyperlink && f.themeHlinkColor ? Q(f.themeHlinkColor) : a;
+		let E = s.bold ?? t.defBold ?? c, j = s.italic ?? t.defItalic ?? l, M = Yn(E, j, m, g, f), B = C ? Yn(E, j, m, C, 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 = {
-			strikeDouble: te,
-			letterSpacingPx: G,
+		let ee = s.fieldType === "slidenum" && d !== void 0 ? String(d) : U, W = s.underline || s.hyperlink !== void 0, G = s.strikeDouble === !0, K = s.letterSpacing == null ? 0 : s.letterSpacing * Y * o, q = {
+			strikeDouble: G,
+			letterSpacingPx: K,
 			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,
+			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 = ee.split(/(\s+)/);
+		for (let r of J) {
 			if (!r) continue;
 			if (/^\t+$/.test(r)) {
-				O || (e.font = M, A = e.measureText(" ").width);
+				D || (e.font = M, A = e.measureText(" ").width);
 				for (let e of r) y.segments.push({
 					text: "",
 					isTab: !0,
@@ -3861,48 +3871,48 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 					isTab: !0,
 					width: 0
 				});
-				O = !0;
+				D = !0;
 				continue;
 			}
 			e.font = M;
-			let a = L(r, M, G, n), o = /^\s+$/.test(r), c = /[-]/;
+			let a = I(r, M, K, n), o = /^\s+$/.test(r), c = /[-]/;
 			if (c.test(r) && (w != null || ge(g))) {
 				let t = w ?? g;
 				for (let i of r) {
 					let r = i, a = M;
 					if (c.test(i)) {
 						let e = be(i, t);
-						e === i ? a = Yn(D, j, m, t, f) : (r = e, a = Yn(D, j, m, "sans-serif", f));
+						e === i ? a = Yn(E, j, m, t, f) : (r = e, a = Yn(E, j, m, "sans-serif", f));
 					}
-					e.font = a, !N(L(r, a, G, n)) && x > 0 && F(), z(r, a, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
+					e.font = a, !N(I(r, a, K, n)) && b > 0 && F(), L(r, a, p, T, W, s.strikethrough, s.baseline ?? void 0, q);
 				}
 				continue;
 			}
-			if (tr(r) && (!R(r) || t.eaLnBrk === !1)) {
+			if (tr(r) && (!V(r) || t.eaLnBrk === !1)) {
 				let i = [];
 				for (let t of r) {
-					let n = ce(t.codePointAt(0) ?? 0) && C != null, r = n ? V : M, a = n ? C : g;
+					let n = ce(t.codePointAt(0) ?? 0) && C != null, r = n ? B : M, a = n ? C : g;
 					e.font = r, i.push({
 						ch: t,
-						w: Q(e, t, 0),
+						w: $(e, t, 0),
 						font: r,
 						family: a
 					});
 				}
 				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);
-					x > 0 && !N(r) && F();
-					for (let e of i) z(e.ch, e.font, p, T, W, s.strikethrough, s.baseline ?? void 0, {
-						...K,
+					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) * K + (t && i.length > 0 ? K : 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, {
+						...q,
 						fontFamily: e.family
 					});
 					continue;
 				}
 				let a = i;
 				for (; a.length > 0;) {
-					let e = Number.isFinite(v()) ? v() - P() : x, t = y.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = un(a, e, v(), _, G, r);
+					let e = Number.isFinite(v()) ? v() - P() : b, t = y.segments.at(-1), r = !!t && !t.isTab && !t.math && t.sourceRunId === n, i = un(a, e, v(), _, K, r);
 					if (i === 0) {
-						if (x > 0) {
+						if (b > 0) {
 							F();
 							continue;
 						}
@@ -3910,8 +3920,8 @@ function ar(e, t, n, r, 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, T, W, s.strikethrough, s.baseline ?? void 0, {
-							...K,
+						L(t.ch, t.font, p, T, W, s.strikethrough, s.baseline ?? void 0, {
+							...q,
 							fontFamily: t.family
 						});
 					}
@@ -3919,13 +3929,13 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}
 				continue;
 			}
-			if (R(r)) {
-				let t = b(r, {
+			if (V(r)) {
+				let t = x(r, {
 					cjk: !0,
 					kinsoku: _
-				}), i = C != null && V !== M, a = (e) => i && ce(e.codePointAt(0) ?? 0), o = (t) => {
+				}), i = C != null && B !== M, a = (e) => i && ce(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 ? V : M, r += Q(e, s, G), o && (r += G), o = !0, s = "");
+						s !== "" && (e.font = c ? B : M, r += $(e, s, K), o && (r += K), o = !0, s = "");
 					};
 					for (let e of t) {
 						let t = a(e);
@@ -3935,9 +3945,9 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 				}, c = (e) => {
 					let t = "", n = null, r = () => {
 						if (t === "") return;
-						let e = n ? V : M, r = n ? C : g;
-						z(t, e, p, T, W, s.strikethrough, s.baseline ?? void 0, {
-							...K,
+						let e = n ? B : M, r = n ? C : g;
+						L(t, e, p, T, W, s.strikethrough, s.baseline ?? void 0, {
+							...q,
 							fontFamily: r
 						}), t = "";
 					};
@@ -3948,28 +3958,28 @@ function ar(e, t, n, r, a, o, s, c = !1, l = !1, u = 1, d, f = {
 					r();
 				}, l = de(r), u = r.length, d = 0;
 				for (; d < u;) {
-					let e = P(), n = I(r, t, d, e, o, l);
+					let e = P(), n = z(r, t, d, e, o, l);
 					if (n <= d) {
-						if (x > 0) {
+						if (b > 0) {
 							F();
 							continue;
 						}
-						let i = t.find((e) => e > d) ?? u, a = r.slice(d, i), s = E(a), c = I(a, s, 0, e, o, l);
+						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;
 					}
 					c(r.slice(d, n)), d = n, d < u && F();
 				}
 				continue;
 			}
-			if (N(a)) z(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K), o && (S = !0);
-			else if (o) x > 0 && F();
+			if (N(a)) L(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, q), o && (S = !0);
+			else if (o) b > 0 && F();
 			else if (a > v()) {
-				x > 0 && F();
-				for (let t of r) e.font = M, !N(L(t, M, G, n)) && x > 0 && F(), z(t, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
-			} else if (!S) z(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
+				b > 0 && F();
+				for (let t of r) e.font = M, !N(I(t, M, K, n)) && b > 0 && F(), L(t, M, p, T, W, s.strikethrough, s.baseline ?? void 0, q);
+			} else if (!S) L(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, q);
 			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 && !R(e) && !R(r) && i(n, t);
-				(o || c) && B() || F(), z(r, M, p, T, W, s.strikethrough, s.baseline ?? void 0, K);
+				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, q);
 			}
 		}
 	}
@@ -3979,9 +3989,9 @@ async function or(e, t, n, r, i, o, s, c, l, u) {
 	if (t && t.fillType === "image") {
 		if (e.fillStyle = "#FFFFFF", e.fillRect(0, 0, n, r), !t.imagePath || !t.mimeType || !s) 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 ? Dn(u, X(t.imagePath, t.duotone)) : void 0, b = t.tile ? await L(t.imagePath, t.mimeType, s) : void 0, x = await Je(t.imagePath, t.mimeType, t.duotone, s, {
-				widthPt: n / i / J,
-				heightPt: r / i / J,
+			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 ? Dn(u, Z(t.imagePath, t.duotone)) : void 0, b = t.tile ? await B(t.imagePath, t.mimeType, s) : void 0, x = await Je(t.imagePath, t.mimeType, t.duotone, s, {
+				widthPt: n / i / Y,
+				heightPt: r / i / Y,
 				...y ?? {},
 				tiff: c,
 				svgDecoder: l
@@ -4033,16 +4043,16 @@ function ur(e, t, n, r, i, a, o, s) {
 	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 } = cr(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 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 fr(e, t, n) {
-	t && (e.shadowColor = Z(t.color, t.alpha), e.shadowBlur = Y(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
+	t && (e.shadowColor = Q(t.color, t.alpha), e.shadowBlur = X(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
 }
 function pr(e) {
 	e.shadowColor = "transparent", e.shadowBlur = 0, e.shadowOffsetX = 0, e.shadowOffsetY = 0;
@@ -4145,9 +4155,9 @@ function Cr(e, t, n, r, i, a, o, s, c, l, u) {
 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 = ar(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;
@@ -4221,7 +4231,7 @@ function Tr(e, t, n, r, i, a, o) {
 	}
 }
 function Er(e, t) {
-	return e.defaultTextColor ? Z(e.defaultTextColor) : t.smartArtFallbackTextColor != null && vn(e) ? t.smartArtFallbackTextColor : null;
+	return e.defaultTextColor ? Q(e.defaultTextColor) : t.smartArtFallbackTextColor != null && vn(e) ? t.smartArtFallbackTextColor : null;
 }
 function Dr(e, t, n) {
 	return {
@@ -4335,7 +4345,7 @@ function Fr(e, t, r, i = "#000000", a, o = {
 	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;
@@ -4401,9 +4411,9 @@ function Fr(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 g = t.geometry.toLowerCase(), _ = Nn(t.fill, e, l, u, d, f, t.rotation);
+	let _ = t.geometry.toLowerCase(), v = Nn(t.fill, e, l, u, d, f, t.rotation);
 	t.shadow || fr(e, t.glow ?? null, r);
-	let v = new Set([
+	let y = new Set([
 		"line",
 		"straightconnector1",
 		"bentconnector2",
@@ -4414,7 +4424,7 @@ function Fr(e, t, r, i = "#000000", a, o = {
 		"curvedconnector3",
 		"curvedconnector4",
 		"curvedconnector5"
-	]), y = new Set([
+	]), b = new Set([
 		"callout1",
 		"callout2",
 		"callout3",
@@ -4427,13 +4437,13 @@ function Fr(e, t, r, i = "#000000", a, o = {
 		"accentbordercallout1",
 		"accentbordercallout2",
 		"accentbordercallout3"
-	]), b = (e) => y.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), x = !t.custGeom && H(g), S = (n, i, a = {
+	]), x = (e) => b.has(e) || e === "line" || e === "straightconnector1" || e.startsWith("bentconnector"), S = !t.custGeom && m(_), C = (n, i, a = {
 		x: l,
 		y: u,
 		w: d,
 		h: f
 	}) => {
-		let { x: o, y: s, w: c, h: p } = a, h = i ?? (n === e && o === l && s === u && c === d && p === f ? _ : Nn(t.fill, n, o, s, c, p, t.rotation)), v = i ? null : t.stroke ? () => {
+		let { x: o, y: s, w: c, h: p } = a, m = i ?? (n === e && o === l && s === u && c === d && p === f ? v : Nn(t.fill, n, o, s, c, p, t.rotation)), h = i ? null : t.stroke ? () => {
 			$r(n, t.stroke, r, {
 				x: o,
 				y: s,
@@ -4441,8 +4451,8 @@ function Fr(e, t, r, i = "#000000", a, o = {
 				h: p
 			}, t.rotation), n.stroke();
 		} : null, y = () => pr(n);
-		if (x && !i) {
-			m(n, g, o, s, c, p, [
+		if (S && !i) {
+			g(n, _, o, s, c, p, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4451,11 +4461,11 @@ function Fr(e, t, r, i = "#000000", a, o = {
 				t.adj6,
 				t.adj7,
 				t.adj8
-			], h, v, y, b(g) ? { skipTrailingStroke: !0 } : void 0);
+			], m, h, y, x(_) ? { skipTrailingStroke: !0 } : void 0);
 			return;
 		}
-		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), h && g !== "arc" && (n.fillStyle = h, g === "donut" || g === "smileyface" || g === "frame" ? n.fill("evenodd") : n.fill(), i || y()), v && v();
-	}, 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 ? n(g, l, u, d, f, [
+		n.beginPath(), t.custGeom && t.custGeom.length > 0 ? Ir(n, t.custGeom, o, s, c, p) : me(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, [
 		t.adj,
 		t.adj2,
 		t.adj3,
@@ -4469,15 +4479,15 @@ function Fr(e, t, r, i = "#000000", a, o = {
 		y: u,
 		w: d,
 		h: 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 = h ? [] : 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 = U(g, l, u, d, f, [
+	}, O = t.stroke ? t.stroke.width * r / 2 : 0, k = 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, 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 = Or(w, M.x, M.y, M.w, M.h), P = r * E, F = h ? [] : Hr(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 ? Nn(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, [
 				t.adj,
 				t.adj2,
 				t.adj3,
@@ -4487,10 +4497,10 @@ function Fr(e, t, r, i = "#000000", a, o = {
 				t.adj7,
 				t.adj8
 			]);
-			if (!i) return;
-			let a = t.stroke.cmpd, o = g === "line" || g === "straightconnector1";
-			if (b(g) && i.vertices.length >= 2 && !(a && o)) {
-				let n = i.vertices.map((e) => ({
+			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) => ({
 					x: e.x,
 					y: e.y
 				}));
@@ -4511,40 +4521,40 @@ function Fr(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();
 			}
-			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);
+			o && s && Qr(e, a.start, a.end, t.stroke, o, r, t.rotation), t.stroke.tailEnd && _e(e, a.end.x, a.end.y, a.end.angle, t.stroke.tailEnd, t.stroke, r, i), t.stroke.headEnd && _e(e, a.start.x, a.start.y, a.start.angle, t.stroke.headEnd, t.stroke, r, i);
 			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 } = 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, {
+		let { start: a, end: o } = ve(t.custGeom);
+		a && t.stroke.headEnd && t.stroke.headEnd.type !== "none" && _e(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" && _e(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 && Gr(e, l, u, d, f, F, (e, t, n, r, i) => C(e, void 0, {
 			x: t,
 			y: n,
 			w: r,
 			h: i
-		}), void 0, F)) {
-			I(e), pr(e);
+		}), void 0, I)) {
+			L(e), pr(e);
 			return;
 		}
-		S(e), I(e);
+		C(e), L(e);
 	};
-	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) {
+	if (Pr(e, t, R, R, N, jr(w, l, u, d, f, t.shadow?.algn), r, P, w, !!v, (e) => C(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, _ = f;
-		if (t.textRect) s = Y(t.textRect.x, r), m = Y(t.textRect.y, r), h = Y(t.textRect.width, r), _ = Y(t.textRect.height, r);
-		else if (g === "ellipse") {
+		let s = l, m = u, h = d, g = f;
+		if (t.textRect) s = X(t.textRect.x, r), m = X(t.textRect.y, r), h = X(t.textRect.width, r), g = X(t.textRect.height, r);
+		else if (_ === "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, _ = f / Math.SQRT2;
+			s = l + e, m = u + t, h = d / Math.SQRT2, g = f / Math.SQRT2;
 		} else {
-			let e = Tr(g, l, u, d, f, t.adj, t.adj2);
-			e && (s = e.tx, m = e.ty, h = e.tw, _ = e.th);
+			let e = Tr(_, l, u, d, f, t.adj, t.adj2);
+			e && (s = e.tx, m = e.ty, h = e.tw, g = e.th);
 		}
-		Vr(e, t.textBody, s, m, h, _, r, n, t.rotation, !1, !1, i, a, o, p, !1, c), e.restore();
+		Vr(e, t.textBody, s, m, h, g, r, n, t.rotation, !1, !1, i, a, o, p, !1, c), e.restore();
 	}
 	e.restore();
 }
@@ -4654,102 +4664,107 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 		wr(t, 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), O = n.wrap !== "none", k = n.autoFit === "sp" ? O && er(t, n, a, C, w, s, m) : O, 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();
+	let C = X(n.lIns, s), w = X(n.rIns, s), T = X(n.tIns, s), E = X(n.bIns, s), D = n.wrap !== "none", O = n.autoFit === "sp", A = O ? D && er(t, n, a, C, w, s, m) : D, j = Math.max(1, n.numCol ?? 1), M = X(n.spcCol ?? 0, s), N = n.defaultBold ?? !1, P = n.defaultItalic ?? !1, F = c ?? f, I = (e) => {
+		let i = (n.defaultFontSize ?? 18) * Y * 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 = Xn(d), S = (() => {
+			let d = n.paragraphs[u], f = X(d.marL, s), h = X(d.marR, s), _ = X(d.indent, s), v = d.defFontSize == null ? i : d.defFontSize * Y * s * e, b = d.defColor ? Q(d.defColor) : F, x = Xn(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 = (() => {
+			})() * Y * s * e, T = (() => {
 				for (let e of d.runs) if (e.type === "text" && e.color) return e.color;
 				return null;
-			})(), E = T ? Z(T) : b, D = (() => {
+			})(), E = T ? Q(T) : b, D = (() => {
 				for (let e of d.runs) if (e.type === "text" && e.fontFamily) return e.fontFamily;
 				return d.defFontFamily ?? null;
-			})(), O = "", F = Yn(!1, !1, S, "sans-serif", m), I = E, L = null;
-			O = Br(d, l);
-			let R = Qe(d.bullet);
-			if (R.type === "char") {
-				let t = R;
-				F = Yn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * J * s * e, O === t.char ? Rn(t.fontFamily ?? null, m) : "sans-serif", m), I = t.color ? Z(t.color) : E;
-			} else if (R.type === "autoNum") {
-				let t = R;
-				F = Yn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * J * s * e, Rn(t.fontFamily ?? D, m), m), I = R.color ? Z(R.color) : E;
-			} else if (R.type === "blip") {
-				let t = R, r = Zn(n, d, t) * J * s * e;
-				L = {
+			})(), k = "", I = Yn(!1, !1, S, "sans-serif", m), L = E, R = null;
+			k = Br(d, l);
+			let z = Qe(d.bullet);
+			if (z.type === "char") {
+				let t = z;
+				I = Yn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * Y * s * e, k === t.char ? Rn(t.fontFamily ?? null, m) : "sans-serif", m), L = t.color ? Q(t.color) : E;
+			} else if (z.type === "autoNum") {
+				let t = z;
+				I = Yn(!1, !1, t.sizePts == null ? t.sizePct == null ? S : S * (t.sizePct / 100) : t.sizePts * Y * s * e, Rn(t.fontFamily ?? D, m), m), L = z.color ? Q(z.color) : E;
+			} else if (z.type === "blip") {
+				let t = z, r = Zn(n, d, t) * Y * s * e;
+				R = {
 					imagePath: t.imagePath,
 					mimeType: t.mimeType,
 					sizePx: r
 				};
 			}
-			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 = ar(t, d, k ? H : Infinity, v, b, s, f, M, N, e, p, m, Qn(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;
+			let B = j > 1 ? (a - C - w - (j - 1) * M) / j : a - C - w, V = r + C + f, H = r + C + f + _, U = B - f - h, ee = ar(t, d, A ? U : Infinity, v, b, s, f, N, P, e, p, m, Qn(x, _)), W = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * Y * s * e, G = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * Y * s * e;
+			for (let e = 0; e < ee.length; e++) {
+				let r = ee[e], i = e === 0, a = e === ee.length - 1, l = 0, f = 0, p = 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 = G(e.fontFamily, e.sizePx);
-						t > f && (f = t);
+					let n = e.math ? Math.max(e.sizePx, (e.math.ascent + e.math.descent) / 1.2) : e.sizePx;
+					if (n > l && (l = n), !e.math) {
+						let n = J(e.fontFamily, e.sizePx);
+						if (n > f && (f = n), O) {
+							t.font = e.font;
+							let n = t.measureText(e.text || "M"), r = (n.fontBoundingBoxAscent ?? 0) + (n.fontBoundingBoxDescent ?? 0);
+							r > p && (p = r);
+						}
 					}
 				}
-				if (l === 0 && (l = v), i && O) {
-					t.font = F;
+				if (l === 0 && (l = v), i && k) {
+					t.font = I;
 					let e = t.measureText("M"), n = e.actualBoundingBoxAscent + e.actualBoundingBoxDescent;
 					n > l && (l = 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 ? Qn(x, _) : 0, w = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), T = i && w ? L : null;
+				i && R && R.sizePx > l && (l = R.sizePx);
+				let m = l * 1.2, h = O && f > m && p > 0, b = h ? Math.max(m, p) : Math.max(m, f), S;
+				S = d.spaceLine ? d.spaceLine.type === "pct" ? (g ? l : m) * (d.spaceLine.val / 1e5) : d.spaceLine.val * Y * s : g && !O ? y ? m : l : b, n.autoFit === "norm" && n.lnSpcReduction != null && d.spaceLine?.type !== "pts" && (S *= 1 - n.lnSpcReduction);
+				let C = S + (a ? G : 0), w = i && u > 0 ? W : 0, T = i ? Qn(x, _) : 0, E = r.segments.some((e) => e.text && e.text.length > 0 || e.math != null), D = i && E ? R : null;
 				o.push({
 					line: r,
-					linePx: b,
-					lineHeight: h,
-					topGapPx: S,
-					textXOffset: C,
-					bulletLabel: i ? O : "",
-					bulletFont: F,
-					bulletColor: I,
-					bulletX: V,
-					bulletImage: T,
-					textX: B,
-					textMaxW: H,
+					linePx: C,
+					lineHeight: S,
+					topGapPx: w,
+					textXOffset: T,
+					bulletLabel: i ? k : "",
+					bulletFont: I,
+					bulletColor: L,
+					bulletX: H,
+					bulletImage: D,
+					textX: V,
+					textMaxW: U,
 					alignment: d.alignment,
 					isLastLine: a,
-					para: d
-				}), c += b + S;
+					para: d,
+					useResolvedFontMetrics: h
+				}), c += C + w;
 			}
 		}
 		return {
 			allLines: o,
 			totalHeight: c
 		};
-	}, { 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 } = I(1);
+	if (n.autoFit === "norm") if (n.fontScale != null && n.fontScale > 0) n.fontScale < 1 && ({allLines: L, totalHeight: R} = I(n.fontScale));
 	else {
 		let e = o - T - E;
-		if (L > e && e > 0) {
+		if (R > 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;
+				I(r).totalHeight <= e ? t = r : n = r;
 			}
-			({allLines: I, totalHeight: L} = F(t));
+			({allLines: L, totalHeight: R} = I(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], K = te ? Math.max(0, te.linePx - te.lineHeight) : 0, q = L - K, ne = o === 0 || q <= 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, O = c.bulletX + T, k = c.textMaxW, j = c.para.rtl === !0, M = j || cn(u.segments), N = u.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 = k + e + n;
+	if (g) return T + R + E;
+	let z = n.verticalAnchor ?? "t", B = i, V;
+	o === 0 && z === "b" ? (V = T + R + E, B = i - V) : V = n.autoFit === "sp" ? Math.max(o, T + R + E) : o;
+	let H, U = Math.max(0, V - T - E);
+	H = z === "ctr" ? B + T + (U - R) / 2 : z === "b" ? B + V - E - R : B + T, t.save(), t.textAlign = "left", t.textBaseline = "alphabetic";
+	let ee = H, W = j > 1 ? (a - C - w - (j - 1) * M) / j + M : 0, G = Math.max(0, V - T - E), K = L[L.length - 1], q = K ? Math.max(0, K.linePx - K.lineHeight) : 0, te = R - q, ne = o === 0 || te <= G + .5, re = j > 1 && !ne ? Math.ceil(L.length / j) : L.length, ie = 0, ae = 0;
+	for (let c of L) {
+		let { line: u, linePx: d, lineHeight: f, topGapPx: p, textXOffset: g, bulletLabel: y, bulletFont: b, bulletColor: x, bulletImage: S, alignment: C, isLastLine: w, useResolvedFontMetrics: T } = c;
+		j > 1 && ie < j - 1 && ae >= re && (ie++, ae = 0, H = ee), H += p, ae++;
+		let E = (n.rtlCol ? j - 1 - ie : ie) * W, D = c.textX + E, O = c.bulletX + E, A = c.textMaxW, M = c.para.rtl === !0, N = M || cn(u.segments), P = u.segments.some((e) => e.isTab);
+		if (P) {
+			let e = X(c.para.marL, s), n = X(c.para.marR, s), r = M ? n : e + g, i = A + e + n;
 			t.font = u.segments.find((e) => e.isTab).font;
 			let a = t.measureText(" ").width, o = bn(u.segments.map((e) => {
 				if (e.isTab) return {
@@ -4764,76 +4779,79 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				let n = e.letterSpacingPx ?? 0;
 				return {
 					isTab: !1,
-					width: e.text ? (e.leadingLetterSpacingPx ?? 0) + Q(t, e.text, n) : 0
+					width: e.text ? (e.leadingLetterSpacingPx ?? 0) + $(t, e.text, n) : 0
 				};
 			}), (c.para.tabStops ?? []).map((e) => ({
-				pos: Y(e.pos, s),
+				pos: X(e.pos, s),
 				algn: e.algn
-			})), r, i, a, Y(c.para.defTabSz ?? 914400, s));
+			})), r, i, a, X(c.para.defTabSz ?? 914400, s));
 			for (let e = 0; e < u.segments.length; e++) u.segments[e].isTab && (u.segments[e].tabWidthPx = o[e]);
 		}
-		let P = 0, F = f * .8;
+		let F = 0, I = 0, L = 0, R = 0;
 		for (let e of u.segments) {
 			if (e.isTab) {
-				P += e.tabWidthPx ?? 0;
+				F += e.tabWidthPx ?? 0;
 				continue;
 			}
 			if (e.math) {
-				P += e.math.width, F = Math.max(F, e.math.ascent);
+				F += e.math.width, I = Math.max(I, e.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));
+			if (F += e.leadingLetterSpacingPx ?? 0, F += e.text ? $(t, e.text, r) : 0, n.actualBoundingBoxAscent > 0 && (I = Math.max(I, n.actualBoundingBoxAscent)), T) {
+				let e = n.fontBoundingBoxAscent ?? 0, t = e + (n.fontBoundingBoxDescent ?? 0);
+				t > R && (R = t, L = e);
+			}
 		}
-		let I = V + F, L = E + k, R = S && _ ? m.pictureBulletImages?.has(S.imagePath) ? m.pictureBulletImages.get(S.imagePath) : D(S.imagePath, _) : void 0, z = 0;
-		if (M && j) {
-			if (y) t.font = b, z = t.measureText(y).width;
-			else if (S && R) {
+		let B = T && R > 0 ? z === "t" && I > 0 ? I : Math.max(I, L + Math.max(0, f - R) / 2) : Math.max(f * .8, I), V = H + B, U = D + A, G = S && _ ? m.pictureBulletImages?.has(S.imagePath) ? m.pictureBulletImages.get(S.imagePath) : k(S.imagePath, _) : void 0, K = 0;
+		if (N && M) {
+			if (y) t.font = b, K = t.measureText(y).width;
+			else if (S && G) {
 				let e = S.sizePx;
-				z = R.height > 0 ? e * (R.width / R.height) : e;
+				K = G.height > 0 ? e * (G.width / G.height) : e;
 			}
 		}
-		if (y) if (t.font = b, t.fillStyle = x, M && j) {
+		if (y) if (t.font = b, t.fillStyle = x, N && M) {
 			let e = t.direction;
-			t.direction = "rtl", t.fillText(y, L - z, I), t.direction = e;
-		} else t.fillText(y, O, 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, O, r, n, e);
+			t.direction = "rtl", t.fillText(y, U - K, V), t.direction = e;
+		} else t.fillText(y, O, V);
+		if (S && _ && G) {
+			let e = S.sizePx, n = G.height > 0 ? e * (G.width / G.height) : e, r = V - e;
+			N && M ? t.drawImage(G, U - n, r, n, e) : t.drawImage(G, O, r, n, e);
 		}
-		let B = E + g, H;
-		H = N ? j ? E + k - z - P : B : C === "ctr" ? B + (k - g - P) / 2 : C === "r" ? E + k - 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 ? fn(u.segments, k - g, P, W, te) : null) ?? u.segments, K = M ? ln(u.segments, j) : null, q = (e, t) => {
+		let q = D + g, J;
+		J = P ? M ? D + A - K - F : q : C === "ctr" ? q + (A - g - F) / 2 : C === "r" ? D + A - K - F : q;
+		let te = C === "just" || C === "justLow" ? "just" : C === "thaiDist" ? "thaiDist" : C === "dist" ? "dist" : null, ne = w || (u.endsWithBreak ?? !1), oe = (te && !N && !P ? fn(u.segments, A - g, F, te, ne) : null) ?? u.segments, se = N ? ln(u.segments, M) : 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)];
 			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 n = 0; n < le; n++) {
+			let c = se ? se.order[n] : n, u = oe[c], d = se ? se.rtl[c] : !1;
+			if (N && (t.direction = d ? "rtl" : "ltr"), n > 0) {
+				let e = se ? se.order[n - 1] : n - 1;
+				J += ce(e, c);
 			}
 			if (u.isTab) {
-				H += u.tabWidthPx ?? 0;
+				J += u.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 = Pn.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 = Fn(e, u.color);
-					t.drawImage(a, H, i, n, r);
+					let i = V - u.math.ascent, a = Fn(e, u.color);
+					t.drawImage(a, J, i, n, r);
 				}
-				H += n, H += p;
+				J += n, J += p;
 				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;
+			let b = u.drawSizePx ?? u.sizePx, x = V + (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;
-				Mn(t, H, x, e, b, u.highlight, u.color);
+				let e = $(t, u.text, S) + y + p;
+				Mn(t, J, x, e, b, u.highlight, u.color);
 			}
 			let C = u.shadow, w = (e, t, n, r) => {
 				let i = r === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e);
@@ -4852,29 +4870,29 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 						}
 					}
 				} else i(t, n, x);
-			}, T = (e) => Q(t, e, S), E = g && g.length > 0 ? $t([...u.text], g, _, T) : null, D = [...u.text], O = !!g && g.length === D.length - 1 && D.length > 1, k = (e, t) => {
+			}, T = (e) => $(t, e, S), E = g && g.length > 0 ? $t([...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;
-					Tn(e, u.text, H, x, b, n, t);
+					Tn(e, u.text, J, x, b, n, t);
 					return;
 				}
 				if (O) {
 					let n = t === "fill" ? e.fillText.bind(e) : e.strokeText.bind(e), r = S + _;
 					if (ir(e)) {
 						let t = e, i = t.letterSpacing;
-						t.letterSpacing = `${r}px`, n(u.text, H, x);
+						t.letterSpacing = `${r}px`, n(u.text, J, x);
 						try {
 							t.letterSpacing = i;
 						} catch {}
 					} else {
-						let t = H;
+						let t = J;
 						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);
 						}
 					}
-				} else if (E) for (let { text: n, dx: r } of E) w(e, n, H + r, t);
-				else w(e, u.text, H, t);
+				} else if (E) for (let { text: n, dx: r } of E) w(e, n, J + r, t);
+				else w(e, u.text, J, t);
 			}, A = u.reflection;
 			if (A && u.text) {
 				let e = t.canvas.width || 0, n = t.canvas.height || 0;
@@ -4884,7 +4902,7 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 					Jn(t, (e) => {
 						e.font = u.font, e.fillStyle = u.color, k(e, "fill");
 					}, {
-						x: (H - o) * f,
+						x: (J - o) * f,
 						y: (x - i) * f,
 						w: Math.max(1, o + c) * f,
 						h: Math.max(1, i + a) * f
@@ -4892,18 +4910,18 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				}
 			}
 			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;
+				let e = C.dir * Math.PI / 180, n = X(C.dist, s);
+				t.save(), t.shadowColor = Q(C.color, C.alpha), t.shadowBlur = X(C.blur, s), t.shadowOffsetX = Math.cos(e) * n, t.shadowOffsetY = Math.sin(e) * 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;
+			j && j.width > 0 && (t.save(), t.lineWidth = Math.max(.5, X(j.width, s)), t.strokeStyle = j.color ? `#${j.color}` : u.color, t.lineJoin = "round", k(t, "stroke"), t.restore()), t.font = u.font;
+			let M = $(t, u.text, S) + y;
 			if (h && u.text && h({
 				text: u.text,
-				inShapeX: H - r,
-				inShapeY: V - i,
-				w: N + p,
+				inShapeX: J - r,
+				inShapeY: H - i,
+				w: M + p,
 				h: f,
 				fontSize: b,
 				font: u.font,
@@ -4913,21 +4931,21 @@ function Vr(t, n, r, i, a, o, s, c = null, l = 0, u = !1, d = !1, f = "#000000",
 				shapeH: o,
 				rotation: l,
 				hyperlink: u.hyperlink
-			}), u.underline && Zt(t, H, x, N + p, b, u.underlineColor ?? u.color, u.underlineStyle, m.dpr), u.strikethrough) {
+			}), u.underline && Zt(t, J, x, M + 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();
+					t.beginPath(), t.moveTo(J, a + e(a, n, m.dpr)), t.lineTo(J + M + p, a + e(a, n, m.dpr)), t.moveTo(J, o + e(o, n, m.dpr)), t.lineTo(J + M + p, o + e(o, n, m.dpr)), t.stroke();
 				} else {
 					let i = r + e(r, n, m.dpr);
-					t.beginPath(), t.moveTo(H, i), t.lineTo(H + N + p, i), t.stroke();
+					t.beginPath(), t.moveTo(J, i), t.lineTo(J + M + p, i), t.stroke();
 				}
 			}
-			H += N, H += p;
+			J += M, J += p;
 		}
-		M && (t.direction = "ltr"), V += d;
+		N && (t.direction = "ltr"), H += d;
 	}
 	t.restore();
 }
@@ -5029,7 +5047,7 @@ function qr(e) {
 }
 function Jr(e, t, n = qr(t), r, i, a) {
 	let o = qr(t);
-	return te(e.posterPath, e.posterMimeType || "application/octet-stream", o, {
+	return q(e.posterPath, e.posterMimeType || "application/octet-stream", o, {
 		tiff: r,
 		svgDecoder: a,
 		...i ?? {}
@@ -5039,7 +5057,7 @@ function Jr(e, t, n = qr(t), r, i, a) {
 	});
 }
 function Yr(e, t, n) {
-	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.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))), le(e, "tiff", {
@@ -5052,107 +5070,107 @@ function Yr(e, t, n) {
 		e.restore();
 	}
 }
-async function Xr(e, t, r, i, o, c, l = 1, u, d) {
-	if (o) try {
-		let a = t.mimeType === "image/svg+xml", f = Ne(t.mimeType, t.srcRect, t.width / J, t.height / J);
-		if (!f) return;
-		let { widthPt: p, heightPt: m } = f, h = En(Y(t.width, r), Y(t.height, r), l, t.srcRect), g = O(t) || a, _ = g ? h : d && !t.duotone ? Dn(d, X(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 }
+async function Xr(e, t, n, r, i, o, s = 1, c, l) {
+	if (i) try {
+		let a = t.mimeType === "image/svg+xml", u = Ne(t.mimeType, t.srcRect, t.width / Y, t.height / Y);
+		if (!u) return;
+		let { widthPt: d, heightPt: f } = u, p = En(X(t.width, n), X(t.height, n), s, t.srcRect), h = A(t) || a, g = h ? p : l && !t.duotone ? Dn(l, Z(On(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: _ }
 			} : {},
-			workerDecoder: u
+			workerDecoder: c
 		}, b;
-		if (O(t)) try {
-			b = await N(t.svgImagePath, o, y);
+		if (A(t)) try {
+			b = await I(t.svgImagePath, i, y);
 		} catch {
-			b = a ? await N(t.imagePath, o, y) : await Je(t.imagePath, t.mimeType, t.duotone, o, {
-				widthPt: p,
-				heightPt: m,
-				..._ ?? {},
-				tiff: c
+			b = a ? await I(t.imagePath, i, y) : await Je(t.imagePath, t.mimeType, t.duotone, i, {
+				widthPt: d,
+				heightPt: f,
+				...g ?? {},
+				tiff: o
 			});
 		}
-		else b = a ? await N(t.imagePath, o, y) : await Je(t.imagePath, t.mimeType, t.duotone, o, {
-			widthPt: p,
-			heightPt: m,
-			..._ ?? {},
-			tiff: c
+		else b = a ? await I(t.imagePath, i, y) : await Je(t.imagePath, t.mimeType, t.duotone, i, {
+			widthPt: d,
+			heightPt: f,
+			...g ?? {},
+			tiff: o
 		});
-		if (!b || i()) return;
+		if (!b || r()) return;
 		e.save(), t.alpha != null && (e.globalAlpha *= t.alpha);
-		let x = Y(t.x, r), S = Y(t.y, r), C = Y(t.width, r), w = Y(t.height, r);
+		let x = X(t.x, n), S = X(t.y, n), C = X(t.width, n), w = X(t.height, n);
 		(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 ? Ir(e, t.custGeom, n, r, i, a) : t.prstGeom && s(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 && v(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());
-		}, k = (e, n, i, a, o) => {
-			t.stroke && (e.save(), $r(e, t.stroke, r, {
-				x: n,
+		}, O = (e, r, i, a, o) => {
+			t.stroke && (e.save(), $r(e, t.stroke, n, {
+				x: r,
 				y: i,
 				w: a,
 				h: o
-			}, t.rotation), E(e, n, i, a, o), e.stroke(), e.restore());
-		}, A = (e, n, i, a, o) => {
+			}, t.rotation), E(e, r, i, a, o), e.stroke(), e.restore());
+		}, k = (e, r, i, a, o) => {
 			let s = t.sp3d;
 			if (s && (s.contourW ?? 0) > 0 && s.contourClr) {
-				let t = Math.max(.5, s.contourW * r);
+				let t = Math.max(.5, s.contourW * n);
 				e.save(), e.beginPath();
 				let c = t * 2 + Math.max(a, o);
-				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 = Z(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
+				e.rect(r - c, i - c, a + 2 * c, o + 2 * c), T(e, r, i, a, o), e.clip("evenodd"), e.beginPath(), E(e, r, i, a, o), e.strokeStyle = Q(s.contourClr), e.lineWidth = t * 2, e.setLineDash([]), e.stroke(), e.restore();
 			}
 		}, j = t.scene3d && Ct(t.scene3d.camera) ? t.scene3d : null, M = (e, n, r, i, a) => {
 			e.save(), D(e, n, r, i, a), je(e, b, t.srcRect, n, r, i, a), e.restore();
+		}, 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), k(e, t, n, r, i), A(e, t, n, r, i);
-		}, F = (e, t, n, r, i) => {
-			M(e, t, n, r, i), k(e, t, n, r, i);
-		}, I = e.getTransform(), L = Math.abs(I.a * I.d - I.b * I.c), R = L > 0 ? Math.sqrt(L) : 1, z = Hr(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, r, R), B = j ? Ur(t.sp3d, j.camera, C, w, r, R) : null, V = t.stroke ? t.stroke.width * r / 2 : 0, U = t.sp3d?.contourW ? t.sp3d.contourW * r : 0, ee = B ? Math.hypot(B.offsetX, B.offsetY) / R : 0, W = V + U + ee + 2, te = (e) => {
+			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 = Hr(t.sp3d, t.scene3d?.lightRig, t.sp3d ? t.sp3d.prstMaterial : void 0, n, R), B = j ? Ur(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, G = (e) => {
 			if (j) {
-				if (Wr(e, j.camera, x, S, C, w, F, {
+				if (Wr(e, j.camera, x, S, C, w, P, {
 					bevels: z,
 					extrusion: B ?? void 0,
-					paintEdges: A,
-					edgePadCss: W
+					paintEdges: k,
+					edgePadCss: ee
 				})) return;
-			} else if (z.length > 0 && Gr(e, x, S, C, w, z, F, A, W)) return;
-			P(e, x, S, C, w);
-		}, G = (e, t, n, r, i, a) => {
+			} else if (z.length > 0 && Gr(e, x, S, C, w, z, P, k, ee)) return;
+			N(e, x, S, C, w);
+		}, K = (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 && Wr(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 + U, ae = (t.custGeom && t.custGeom.length > 0 ? he(t.custGeom, x, S, C, w) : t.prstGeom && H(t.prstGeom.toLowerCase()) ? n(t.prstGeom.toLowerCase(), x, S, C, w, t.prstAdjust ?? []) : null) ?? {
+		}, q = (e, t) => {
+			j && Wr(e, j.camera, x, S, C, w, (e, n, r, i, a) => K(e, t, n, r, i, a)) || K(e, t, x, S, C, w);
+		}, J = e.getTransform(), te = Math.abs(J.a * J.d - J.b * J.c), ne = te > 0 ? Math.sqrt(te) : 1, re = V + H, ie = (t.custGeom && t.custGeom.length > 0 ? he(t.custGeom, x, S, C, w) : t.prstGeom && m(t.prstGeom.toLowerCase()) ? W(t.prstGeom.toLowerCase(), x, S, C, w, t.prstAdjust ?? []) : null) ?? {
 			x,
 			y: S,
 			w: C,
 			h: w
-		}, oe = j ? Mr(j.camera, q, x, S, C, w, W, t.shadow?.algn) : {
-			bbox: Or(q, ae.x - ie, ae.y - ie, ae.w + ie * 2, ae.h + ie * 2),
-			anchor: jr(q, x, S, C, w, t.shadow?.algn)
-		}, se = r * re, ce = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), le = (e) => K(e, "#000");
-		Pr(e, t, j && ce ? Nr(te, q, oe.bbox, {
+		}, ae = j ? Mr(j.camera, J, x, S, C, w, ee, t.shadow?.algn) : {
+			bbox: Or(J, ie.x - re, ie.y - re, ie.w + re * 2, ie.h + re * 2),
+			anchor: jr(J, x, S, C, w, t.shadow?.algn)
+		}, oe = n * ne, se = !!(t.shadow || t.innerShadow || t.glow || t.softEdge || t.reflection), ce = (e) => q(e, "#000");
+		Pr(e, t, j && se ? Nr(G, J, ae.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : te, j && ce ? Nr(le, q, oe.bbox, {
+		}) : G, j && se ? Nr(ce, J, ae.bbox, {
 			w: e.canvas.width || 0,
 			h: e.canvas.height || 0
-		}) : le, oe.bbox, oe.anchor, r, se, q), e.restore();
-	} catch (n) {
-		if (a(n, "tiff")) {
-			i() || Yr(e, t, r);
+		}) : ce, ae.bbox, ae.anchor, n, oe, J), e.restore();
+	} catch (i) {
+		if (a(i, "tiff")) {
+			r() || Yr(e, t, n);
 			return;
 		}
-		if (Le(n) || qe(n)) throw n;
+		if (Le(i) || qe(i)) throw i;
 	}
 }
 async function Zr(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;
+	let f = X(t.x, n), p = X(t.y, n), m = X(t.width, n), h = X(t.height, n), g, _ = !1;
 	if (t.posterPath && i) try {
-		g = await Jr(t, i, s, c, t.posterMimeType === "image/svg+xml" ? En(m, h, l) : d ? Dn(d, X(t.posterPath)) : void 0, u);
+		g = await Jr(t, i, s, c, t.posterMimeType === "image/svg+xml" ? En(m, h, l) : d ? Dn(d, Z(t.posterPath)) : void 0, u);
 	} catch (e) {
 		if (a(e, "tiff")) _ = !0;
 		else if (Le(e) || qe(e)) throw e;
@@ -5165,7 +5183,7 @@ async function Zr(e, t, n, r, i, o, s, c, l = 1, u, d) {
 	})), o || an(e, f + m / 2, p + h / 2, m, h, "paused"), e.restore());
 }
 function Qr(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);
+	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) {
@@ -5214,7 +5232,7 @@ function Qr(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 ? 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) ?? 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();
@@ -5229,7 +5247,7 @@ function $r(e, t, n, r, i = 0) {
 }
 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 ti(t, n, r, i, a = {
@@ -5238,11 +5256,11 @@ function ti(t, n, r, i, a = {
 	dpr: 1
 }, o) {
 	t.save(), ei(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) => {
+	let s = X(n.x, r), c = X(n.y, r), l = n.cols.map((e) => X(e, r)), u = l.length, d = (e, t) => {
 		let n = 0;
 		for (let r = 0; r < t; r++) n += l[e + r] ?? 0;
 		return n;
-	}, f = n.rows.map((e) => Y(e.height, r));
+	}, f = n.rows.map((e) => X(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++) {
@@ -5285,7 +5303,7 @@ function ti(t, n, r, i, a = {
 		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);
+		let e = X(n.width, r), t = X(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);
@@ -5332,7 +5350,7 @@ function ti(t, n, r, i, a = {
 				row: d,
 				column: u
 			});
-			let n = e.textColor ? Z(e.textColor) : null;
+			let n = e.textColor ? Q(e.textColor) : null;
 			Vr(t, e.textBody, o, s, c, l, r, n, 0, !1, !1, "#000000", i, a, _);
 		}
 	}
@@ -5347,7 +5365,7 @@ function ti(t, n, r, i, a = {
 			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, xe(t, a, o, s, c, Math.max(.5, Y(i.width, r)), x);
+			t.fillStyle = t.strokeStyle, xe(t, a, o, s, c, Math.max(.5, X(i.width, r)), x);
 			return;
 		}
 		let l = a === s ? e(a, t.lineWidth, x) : 0, u = o === c ? e(o, t.lineWidth, x) : 0;
@@ -5433,10 +5451,10 @@ async function si(e, t, n, r, i = {}, a) {
 	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) ? k(o, i.imageResources, l) : l();
+	return o && jn(t) ? j(o, i.imageResources, l) : l();
 }
 async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
-	let l = i.width ?? ((oe(e) ? e.offsetWidth : 0) || 960), u = l / n, d = Math.round(l), f = Math.round(r * u), p = i.dpr ?? P(), m = Ve(d * p, f * p), h = m.clamped ? p * m.scale : p, g = await An(t, d, f, u, h, i.imageResources, i.fetchImage, i.fetchMedia, s, i.tiff);
+	let l = i.width ?? ((oe(e) ? e.offsetWidth : 0) || 960), u = l / n, d = Math.round(l), f = Math.round(r * u), p = i.dpr ?? L(), m = Ve(d * p, f * p), h = m.clamped ? p * m.scale : p, g = await An(t, d, f, u, h, i.imageResources, i.fetchImage, i.fetchMedia, s, i.tiff);
 	e.width = m.width, e.height = m.height, oe(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");
@@ -5454,7 +5472,7 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 	if (await or(_, t.background, d, f, u, c, i.fetchImage, i.tiff, i.svgDecoder, g), c() || (i.math && await Ln(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 = O(t) || n, a = !r && !t.duotone ? Dn(g, X(On(t), t.duotone)) : void 0, o = En(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 = {
+		let t = e, n = t.mimeType === "image/svg+xml", r = A(t) || n, a = !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 : a, c = s && "maxRetainedPixels" in s ? s.maxRetainedPixels : void 0, l = {
 			...s ? {
 				targetWidthPx: s.targetWidthPx,
 				targetHeightPx: s.targetHeightPx,
@@ -5462,10 +5480,10 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 			} : {},
 			workerDecoder: i.svgDecoder
 		};
-		if (O(t)) N(t.svgImagePath, i.fetchImage, l).catch(() => void 0);
-		else if (n) N(t.imagePath, i.fetchImage, l).catch(() => void 0);
+		if (A(t)) I(t.svgImagePath, i.fetchImage, l).catch(() => void 0);
+		else if (n) I(t.imagePath, i.fetchImage, l).catch(() => void 0);
 		else {
-			let e = Ne(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;
 			Je(t.imagePath, t.mimeType, t.duotone, i.fetchImage, {
 				widthPt: e.widthPt,
@@ -5477,7 +5495,7 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 		}
 	} else if (e.type === "media") {
 		let t = e;
-		t.posterPath && i.fetchMedia && Jr(t, i.fetchMedia, s, i.tiff, t.posterMimeType === "image/svg+xml" ? En(Y(t.width, u), Y(t.height, u), h) : Dn(g, X(t.posterPath)), i.svgDecoder).catch(() => void 0);
+		t.posterPath && i.fetchMedia && Jr(t, i.fetchMedia, s, i.tiff, t.posterMimeType === "image/svg+xml" ? En(X(t.width, u), X(t.height, u), h) : Dn(g, Z(t.posterPath)), i.svgDecoder).catch(() => void 0);
 	}
 	let S = /* @__PURE__ */ new Map();
 	if (i.fetchImage) {
@@ -5485,10 +5503,10 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 		for (let e of t.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 Te(e.chart)) {
 				let e = Ee(i, t);
@@ -5521,7 +5539,7 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 		for (let { usages: e } of o) for (let { usage: t, size: n } of e) {
 			let { fill: e } = t, r = Ie(e), i = s.get(r);
 			if (!i) continue;
-			let a = i.preserveNaturalSize || t.preserveNaturalSize, o = i.hasSourceCrop || t.hasSourceCrop, c = a || e.duotone ? void 0 : Dn(g, X(e.imagePath, e.duotone)), l = !e.duotone && (e.mimeType === "image/svg+xml" || O({
+			let a = i.preserveNaturalSize || t.preserveNaturalSize, o = 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" || A({
 				svgImagePath: e.svgImagePath,
 				srcRect: o ? !0 : null
 			}));
@@ -5539,7 +5557,7 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 		for (let e of t.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 = Zn(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 } : {}
@@ -5552,10 +5570,10 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 					let a = t === "image/svg+xml" ? r === void 0 ? {} : {
 						targetWidthPx: 1,
 						targetHeightPx: r
-					} : Dn(g, X(e)) ?? {}, o = t === "image/svg+xml" ? await N(e, n, {
+					} : Dn(g, Z(e)) ?? {}, o = t === "image/svg+xml" ? await I(e, n, {
 						...a,
 						workerDecoder: i.svgDecoder
-					}) : await te(e, t, n, {
+					}) : await q(e, t, n, {
 						tiff: i.tiff,
 						...a
 					});
@@ -5575,7 +5593,7 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 					...u === void 0 ? {} : { maxRetainedPixels: u }
 				} : void 0;
 				try {
-					let t = () => r.mimeType === "image/svg+xml" ? r.duotone ? Promise.resolve(null) : N(r.imagePath, n, {
+					let t = () => r.mimeType === "image/svg+xml" ? r.duotone ? Promise.resolve(null) : I(r.imagePath, n, {
 						...f ?? {},
 						workerDecoder: i.svgDecoder
 					}) : Je(r.imagePath, r.mimeType, r.duotone, n, {
@@ -5588,8 +5606,8 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 						svgImagePath: r.svgImagePath,
 						srcRect: d ? !0 : null
 					};
-					if (!r.duotone && O(c)) try {
-						a = await N(c.svgImagePath, n, {
+					if (!r.duotone && A(c)) try {
+						a = await I(c.svgImagePath, n, {
 							...f ?? {},
 							workerDecoder: i.svgDecoder
 						});
@@ -5625,12 +5643,12 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 		}) : void 0);
 		else if (r.type === "media") await Zr(_, r, u, c, i.fetchMedia, i.skipMediaControls, i.fetchImage, i.tiff, h, i.svgDecoder, g);
 		else if (r.type === "chart") {
-			let e = J * u;
+			let e = Y * u;
 			_.save(), ei(_, r, u), Ke(_, r.chart, {
-				x: Y(r.x, u),
-				y: Y(r.y, u),
-				w: Y(r.width, u),
-				h: Y(r.height, u)
+				x: X(r.x, u),
+				y: X(r.y, u),
+				w: X(r.width, u),
+				h: X(r.height, u)
 			}, e, r.rotation, i.threeD, i.regionMap, (e) => S.get(Ie(e)), i.chartEx), _.restore();
 		}
 	}
@@ -5639,8 +5657,8 @@ async function ci(e, t, n, r, i = {}, o, s, c = () => !1) {
 //#endregion
 //#region packages/pptx/src/google-fonts.ts
 var li = {
-	...C,
-	...f
+	...T,
+	...b
 };
 function* ui(e) {
 	for (let t of e?.paragraphs ?? []) for (let e of t.runs) e.type === "text" && (yield e.text);
@@ -5663,10 +5681,10 @@ function* fi(e) {
 var pi = class e {
 	scripts;
 	families;
-	constructor(e, t, n, i) {
+	constructor(e, t, n, r) {
 		this.majorFont = e, this.minorFont = t;
-		let a = r(e) ?? r(t) ?? null;
-		this.scripts = n ?? new y(a), this.families = i ?? /* @__PURE__ */ new Set(), e && this.families.add(e), t && this.families.add(t);
+		let i = w(e) ?? w(t) ?? null;
+		this.scripts = n ?? new fe(i), this.families = r ?? /* @__PURE__ */ new Set(), e && this.families.add(e), t && this.families.add(t);
 	}
 	addSlide(e) {
 		this.scripts.addText(fi(e));
@@ -5685,11 +5703,11 @@ var pi = class e {
 	declaredInflatedBytes: 0,
 	distinctInflatedBytes: 0,
 	operationInflatedBytes: 0
-}), hi = d;
-function $(e, t) {
+}), hi = D;
+function gi(e, t) {
 	if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation bootstrap ${t}`);
 }
-function gi(e, t) {
+function _i(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}`);
@@ -5699,7 +5717,7 @@ function gi(e, t) {
 		...n.partName === void 0 ? {} : { partName: n.partName }
 	});
 }
-function _i(e, t) {
+function vi(e, t) {
 	if (!e || typeof e != "object" || Array.isArray(e)) throw Error(`invalid PPTX presentation bootstrap embedded font at ${t}`);
 	let n = e;
 	if (typeof n.fontName != "string" || n.fontName.length === 0 || ![
@@ -5715,11 +5733,11 @@ function _i(e, t) {
 		contentType: n.contentType
 	});
 }
-function vi(e) {
+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,
@@ -5728,11 +5746,11 @@ function vi(e) {
 		minorFont: t.minorFont,
 		hlinkColor: t.hlinkColor,
 		folHlinkColor: t.folHlinkColor,
-		embeddedFonts: Object.freeze(t.embeddedFonts.map(_i)),
-		slides: Object.freeze(t.slides.map(gi))
+		embeddedFonts: Object.freeze(t.embeddedFonts.map(vi)),
+		slides: Object.freeze(t.slides.map(_i))
 	});
 }
-function yi(e) {
+function bi(e) {
 	return Object.freeze({
 		type: "media",
 		x: e.x,
@@ -5749,7 +5767,7 @@ function yi(e) {
 		mimeType: e.mimeType
 	});
 }
-function bi(e) {
+function xi(e) {
 	return Object.freeze({
 		...e.id === void 0 ? {} : { id: e.id },
 		...e.authorId === void 0 ? {} : { authorId: e.authorId },
@@ -5759,10 +5777,10 @@ function bi(e) {
 		text: e.text
 	});
 }
-function xi(e) {
+function Si(e) {
 	return Object.freeze({ ...e });
 }
-function Si(e) {
+function Ci(e) {
 	return Object.freeze({
 		...e.authorId === void 0 ? {} : { authorId: e.authorId },
 		...e.modernAuthorId === void 0 ? {} : { modernAuthorId: e.modernAuthorId },
@@ -5772,16 +5790,16 @@ function Si(e) {
 		...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(xi)) } : {},
+		...e.anchors?.length ? { anchors: Object.freeze(e.anchors.map(Si)) } : {},
 		...e.status === void 0 ? {} : { status: e.status },
 		text: e.text,
-		...e.replies?.length ? { replies: Object.freeze(e.replies.map(bi)) } : {}
+		...e.replies?.length ? { replies: Object.freeze(e.replies.map(xi)) } : {}
 	});
 }
-function Ci(e, t, n) {
+function wi(e, t, n) {
 	if (e !== void 0 && typeof e != "string") throw Error(`invalid PPTX presentation preflight comment ${t} at slide ${n}`);
 }
-function wi(e, t) {
+function Ti(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 [
@@ -5790,16 +5808,16 @@ function wi(e, t) {
 		"author",
 		"date",
 		"status"
-	]) Ci(n[e], e, t);
+	]) wi(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 bi(n);
+	return xi(n);
 }
-function Ti(e, t) {
+function Ei(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 [
@@ -5808,7 +5826,7 @@ function Ti(e, t) {
 		"author",
 		"date",
 		"status"
-	]) Ci(n[e], e, t);
+	]) wi(n[e], e, t);
 	for (let e of [
 		"authorId",
 		"index",
@@ -5824,23 +5842,23 @@ function Ti(e, t) {
 		"resolved",
 		"closed"
 	].includes(n.status)) throw Error(`invalid PPTX presentation preflight comment status at slide ${t}`);
-	return Si({
+	return Ci({
 		...n,
-		...n.anchors?.length ? { anchors: n.anchors.map((e) => Ei(e, t)) } : {},
-		...n.replies?.length ? { replies: n.replies.map((e) => wi(e, t)) } : {}
+		...n.anchors?.length ? { anchors: n.anchors.map((e) => Di(e, t)) } : {},
+		...n.replies?.length ? { replies: n.replies.map((e) => Ti(e, t)) } : {}
 	});
 }
-function Ei(e, t) {
+function Di(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 Ci(n.elementId, "anchor.elementId", t), Ci(n.creationId, "anchor.creationId", t), Object.freeze({
+	if (n.type === "drawingElement") return wi(n.elementId, "anchor.elementId", t), wi(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") {
-		Ci(n.elementId, "anchor.elementId", t);
+		wi(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}`);
@@ -5854,7 +5872,7 @@ function Ei(e, t) {
 	}
 	throw Error(`invalid PPTX presentation preflight comment anchor type at slide ${t}`);
 }
-function Di(e, t) {
+function Oi(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 [
@@ -5865,13 +5883,13 @@ function Di(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 yi(n);
+	return bi(n);
 }
-function Oi(e, t) {
+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;
@@ -5881,8 +5899,8 @@ function Oi(e, t) {
 			...n.partName === void 0 ? {} : { partName: n.partName },
 			notes: n.notes,
 			hidden: n.hidden,
-			mediaElements: Object.freeze(n.mediaElements.map((e) => Di(e, t))),
-			...n.comments?.length ? { comments: Object.freeze(n.comments.map((e) => Ti(e, t))) } : {}
+			mediaElements: Object.freeze(n.mediaElements.map((e) => Oi(e, t))),
+			...n.comments?.length ? { comments: Object.freeze(n.comments.map((e) => Ei(e, t))) } : {}
 		});
 	}), i = n.fontPreloadNames.map((e, t) => {
 		if (e !== null && typeof e != "string") throw Error(`invalid PPTX presentation preflight font at ${t}`);
@@ -5897,37 +5915,37 @@ function Oi(e, t) {
 		minorFont: n.minorFont,
 		hlinkColor: n.hlinkColor,
 		folHlinkColor: n.folHlinkColor,
-		embeddedFonts: Object.freeze(n.embeddedFonts.map(_i)),
+		embeddedFonts: Object.freeze(n.embeddedFonts.map(vi)),
 		slides: Object.freeze(r),
 		fontPreloadNames: Object.freeze(i)
 	});
 }
-function ki(e) {
-	return Oi(e, !1);
-}
 function Ai(e) {
-	return Oi(e, !0);
+	return ki(e, !1);
+}
+function ji(e) {
+	return ki(e, !0);
 }
-function ji(e, t) {
+function Mi(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;
 	}
 	return "";
 }
-function Mi(e, t) {
+function Ni(e, t) {
 	if (e.index !== t.index || e.partName !== t.partName) throw Error(`PPTX pulled slide identity does not match bootstrap index ${t.index}`);
 	return Object.freeze({
 		index: t.index,
 		...t.partName === void 0 ? {} : { partName: t.partName },
 		notes: e.notes ?? null,
 		hidden: e.hidden ?? !1,
-		mediaElements: Object.freeze(e.elements.filter((e) => e.type === "media").map(yi)),
-		...e.comments?.length ? { comments: Object.freeze(e.comments.map(Si)) } : {}
+		mediaElements: Object.freeze(e.elements.filter((e) => e.type === "media").map(bi)),
+		...e.comments?.length ? { comments: Object.freeze(e.comments.map(Ci)) } : {}
 	});
 }
-function Ni(e, t, n) {
-	if (!(e <= t)) throw new ae(`PPTX presentation preflight exceeded its hard limit of ${t} projected bytes`, {
+function Pi(e, t, n) {
+	if (!(e <= t)) throw new N(`PPTX presentation preflight exceeded its hard limit of ${t} projected bytes`, {
 		stage: "parsing",
 		violation: {
 			format: "pptx",
@@ -5941,7 +5959,7 @@ function Ni(e, t, n) {
 		}
 	});
 }
-var Pi = class {
+var Fi = class {
 	slideCountValue;
 	slideWidthValue;
 	slideHeightValue;
@@ -5961,7 +5979,7 @@ var Pi = class {
 	pending = null;
 	finished = null;
 	constructor(e, t = {}) {
-		let n = vi(e), r = t.hardLimitForTesting ?? hi;
+		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,
@@ -5976,7 +5994,7 @@ var Pi = class {
 			remainingSlides: this.descriptors,
 			slides: [],
 			fontPreloadNames: this.fontPreloadNames
-		}, this.limit).jsonBytes, Ni(this.projectionBytesValue, this.limit, mi);
+		}, this.limit).jsonBytes, Pi(this.projectionBytesValue, this.limit, mi);
 	}
 	get acceptedSlideCount() {
 		return this.finished?.slideCount ?? this.slides.length;
@@ -6018,13 +6036,13 @@ var Pi = class {
 		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 = Mi(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;
+		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 = Ze(this.projectionBytesValue, u, this.limit);
-		Ni(Math.max(d, l), this.limit, t);
+		Pi(Math.max(d, l), this.limit, t);
 		let f = {
 			state: "prepared",
 			fact: i,
@@ -6069,7 +6087,7 @@ var Pi = class {
 			fontPreloadNames: this.fontPreloadNames
 		}), this.descriptors = [], this.slides = [], this.projectionBytesValue = Xe(this.finished, this.limit).jsonBytes, this.finished;
 	}
-}, Fi = 1024 * 1024, Ii = class {
+}, Ii = 1024 * 1024, Li = class {
 	active = /* @__PURE__ */ new Set();
 	nextSessionId = 1;
 	constructor(e) {
@@ -6084,13 +6102,13 @@ var Pi = class {
 			generation: this.options.generation ?? 1
 		}, a = new h(this.options.transport, {
 			...i,
-			maxByteCredit: T,
+			maxByteCredit: E,
 			timeoutMs: n
 		});
 		this.active.add(a);
 		try {
 			await this.options.open(e, i, n);
-			let r = await Ri(a);
+			let r = await zi(a);
 			try {
 				let e = r.usage ?? a.usageCheckpoint;
 				e && this.options.onUsage?.(e);
@@ -6113,20 +6131,20 @@ var Pi = class {
 		if (!Number.isSafeInteger(e) || e < 0 || e >= this.options.slideCount) throw RangeError(`Slide index ${e} out of range (count: ${this.options.slideCount})`);
 	}
 };
-function Li(e) {
+function Ri(e) {
 	return !!e && typeof e == "object" && e.protocol === "ooxml-pull-v1";
 }
-async function Ri(e) {
+async function zi(e) {
 	try {
-		return await e.pull(Fi);
+		return await e.pull(Ii);
 	} catch (t) {
-		let n = zi(t);
+		let n = Bi(t);
 		if (n === void 0) throw t;
 		return e.pull(n);
 	}
 }
-function zi(e) {
-	return u(e, Fi, T);
+function Bi(e) {
+	return d(e, Ii, E);
 }
 //#endregion
-export { vi as a, li as c, si as d, an as f, ji as i, ii as l, Li as n, ki as o, Pi as r, Ai as s, Ii as t, oi 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 };