@silurus/ooxml 0.36.0 → 0.38.0

package/dist/index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./xlsx-B_G9RPNS.cjs`),t=require(`./pptx-gWByFXpk.cjs`),n=require(`./docx-BV9DuQ9z.cjs`);Object.defineProperty(exports,`docx`,{enumerable:!0,get:function(){return n.t}}),Object.defineProperty(exports,`pptx`,{enumerable:!0,get:function(){return t.t}}),Object.defineProperty(exports,`xlsx`,{enumerable:!0,get:function(){return e.t}});
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./xlsx-CU5kEVSN.cjs`),t=require(`./pptx-ilzpAQLV.cjs`),n=require(`./docx-BV9DuQ9z.cjs`);Object.defineProperty(exports,`docx`,{enumerable:!0,get:function(){return n.t}}),Object.defineProperty(exports,`pptx`,{enumerable:!0,get:function(){return t.t}}),Object.defineProperty(exports,`xlsx`,{enumerable:!0,get:function(){return e.t}});

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as e } from "./xlsx-g-Drk5UM.js";
-import { t } from "./pptx-CzgfHii0.js";
+import { t as e } from "./xlsx-DF_d5tXa.js";
+import { t } from "./pptx-D0gAnK18.js";
 import { t as n } from "./docx-DIFtUzAi.js";
 export { n as docx, t as pptx, e as xlsx };

package/dist/{pptx-CzgfHii0.js → pptx-D0gAnK18.js}

@@ -22267,15 +22267,15 @@ function P(e, t, n, r, i, a, o, s = !1, c = !1, l = 1, u, d = {
 		e.font = A;
 		let N = f.caps, P = f.text;
 		(N === "all" || N === "small") && (P = P.toUpperCase());
-		let F = f.fieldType === "slidenum" && u !== void 0 ? String(u) : P, I = f.underline || f.hyperlink !== void 0, L = {
+		let ee = f.fieldType === "slidenum" && u !== void 0 ? String(u) : P, F = f.underline || f.hyperlink !== void 0, I = {
 			strikeDouble: f.strikeDouble === !0,
 			letterSpacingPx: f.letterSpacing == null ? 0 : f.letterSpacing * x * a,
 			underlineStyle: f.underlineStyle,
 			underlineColor: f.underlineColor ? C(f.underlineColor) : void 0,
 			shadow: f.shadow,
 			outline: f.outline
-		}, R = F.split(/(\s+)/);
-		for (let r of R) {
+		}, L = ee.split(/(\s+)/);
+		for (let r of L) {
 			if (!r) continue;
 			if (/^\t+$/.test(r)) {
 				let e = o + m, n = (t.tabStops ?? []).find((t) => S(t.pos, a) > e);
@@ -22283,13 +22283,13 @@ function P(e, t, n, r, i, a, o, s = !1, c = !1, l = 1, u, d = {
 					px: _,
 					algn: n.algn,
 					segments: []
-				}) : m = _ - o) : y(" ", A, b, E, I, f.strikethrough, void 0, L);
+				}) : m = _ - o) : y(" ", A, b, E, F, f.strikethrough, void 0, I);
 				continue;
 			}
 			e.font = A;
 			let i = e.measureText(r).width, s = /^\s+$/.test(r);
 			if (g) {
-				y(r, A, b, E, I, f.strikethrough, f.baseline ?? void 0, L);
+				y(r, A, b, E, F, f.strikethrough, f.baseline ?? void 0, I);
 				continue;
 			}
 			let c = /[\u3000-\u9FFF\uAC00-\uD7FF\uF900-\uFAFF\uFF00-\uFFEF]/;
@@ -22298,53 +22298,53 @@ function P(e, t, n, r, i, a, o, s = !1, c = !1, l = 1, u, d = {
 					let r = c.test(t) ? j : A;
 					e.font = r;
 					let i = e.measureText(t).width;
-					m + i > n && m > 0 && v(), y(t, r, b, E, I, f.strikethrough, f.baseline ?? void 0, L);
+					m + i > n && m > 0 && v(), y(t, r, b, E, F, f.strikethrough, f.baseline ?? void 0, I);
 				}
 				continue;
 			}
-			if (m + i <= n) y(r, A, b, E, I, f.strikethrough, f.baseline ?? void 0, L), s && (h = !0);
+			if (m + i <= n) y(r, A, b, E, F, f.strikethrough, f.baseline ?? void 0, I), s && (h = !0);
 			else if (s) m > 0 && v();
 			else if (i > n) {
 				m > 0 && v();
 				for (let t of r) {
 					e.font = A;
 					let r = e.measureText(t).width;
-					m + r > n && m > 0 && v(), y(t, A, b, E, I, f.strikethrough, f.baseline ?? void 0, L);
+					m + r > n && m > 0 && v(), y(t, A, b, E, F, f.strikethrough, f.baseline ?? void 0, I);
 				}
-			} else h && v(), y(r, A, b, E, I, f.strikethrough, f.baseline ?? void 0, L);
+			} else h && v(), y(r, A, b, E, F, f.strikethrough, f.baseline ?? void 0, I);
 		}
 	}
 	return f.push(p), f;
 }
-function F(e, t, n, r) {
+function ee(e, t, n, r) {
 	e.fillStyle = T(t, e, 0, 0, n, r) ?? "#FFFFFF", e.fillRect(0, 0, n, r);
 }
-function I(e, t, n) {
+function F(e, t, n) {
 	if (!t) return;
 	let r = t.dir * Math.PI / 180, i = S(t.dist, n);
 	e.shadowColor = C(t.color, t.alpha), e.shadowBlur = S(t.blur, n), e.shadowOffsetX = Math.cos(r) * i, e.shadowOffsetY = Math.sin(r) * i;
 }
-function L(e, t, n) {
+function I(e, t, n) {
 	t && (e.shadowColor = C(t.color, t.alpha), e.shadowBlur = S(t.radius, n), e.shadowOffsetX = 0, e.shadowOffsetY = 0);
 }
-function R(e) {
+function L(e) {
 	e.shadowColor = "transparent", e.shadowBlur = 0, e.shadowOffsetX = 0, e.shadowOffsetY = 0;
 }
-function z(e, t, n, r = "#000000", i, a = {
+function R(e, t, n, r = "#000000", i, a = {
 	themeMajorFont: null,
 	themeMinorFont: null
 }, o) {
 	let s = S(t.x, n), l = S(t.y, n), u = S(t.width, n), d = S(t.height, n);
 	if (d === 0 && t.textBody?.verticalAnchor === "b") {
-		if (t.stroke && (e.save(), q(e, t.stroke, n), e.beginPath(), e.moveTo(s, l), e.lineTo(s + u, l), e.stroke(), e.restore()), t.textBody) {
+		if (t.stroke && (e.save(), K(e, t.stroke, n), e.beginPath(), e.moveTo(s, l), e.lineTo(s + u, l), e.stroke(), e.restore()), t.textBody) {
 			let c = t.defaultTextColor ? C(t.defaultTextColor) : null;
-			H(e, t.textBody, s, l, u, d, n, c, t.rotation, t.flipH, t.flipV, r, i, a, o);
+			V(e, t.textBody, s, l, u, d, n, c, t.rotation, t.flipH, t.flipV, r, i, a, o);
 		}
 		return;
 	}
 	e.save(), (t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(s + u / 2, l + d / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(s + u / 2), -(l + d / 2)));
 	let f = t.geometry.toLowerCase(), p = T(t.fill, e, s, l, u, d);
-	I(e, t.shadow ?? null, n), t.shadow || L(e, t.glow ?? null, n);
+	F(e, t.shadow ?? null, n), t.shadow || I(e, t.glow ?? null, n);
 	let m = new Set([
 		"line",
 		"straightconnector1",
@@ -22362,7 +22362,7 @@ function z(e, t, n, r = "#000000", i, a = {
 		"accentcallout1",
 		"accentbordercallout1"
 	]), g = t.stroke ? () => {
-		q(e, t.stroke, n), e.stroke();
+		K(e, t.stroke, n), e.stroke();
 	} : null;
 	if (!t.custGeom && f !== "arc" && _(f) ? v(e, f, s, l, u, d, [
 		t.adj,
@@ -22373,7 +22373,7 @@ function z(e, t, n, r = "#000000", i, a = {
 		t.adj6,
 		t.adj7,
 		t.adj8
-	], p, g, () => R(e)) : (e.beginPath(), t.custGeom && t.custGeom.length > 0 ? B(e, t.custGeom, s, l, u, d) : c(e, f, s, l, u, d, t.adj, t.adj2, t.adj3, t.adj4), p && f !== "arc" && (e.fillStyle = p, f === "donut" || f === "smileyface" || f === "frame" ? e.fill("evenodd") : e.fill(), R(e)), g && g()), t.stroke && m.has(f)) {
+	], p, g, () => L(e)) : (e.beginPath(), t.custGeom && t.custGeom.length > 0 ? z(e, t.custGeom, s, l, u, d) : c(e, f, s, l, u, d, t.adj, t.adj2, t.adj3, t.adj4), p && f !== "arc" && (e.fillStyle = p, f === "donut" || f === "smileyface" || f === "frame" ? e.fill("evenodd") : e.fill(), L(e)), g && g()), t.stroke && m.has(f)) {
 		let r = y(f, s, l, u, d, [
 			t.adj,
 			t.adj2,
@@ -22386,11 +22386,11 @@ function z(e, t, n, r = "#000000", i, a = {
 		]);
 		if (r) {
 			let i = t.stroke.cmpd;
-			i && (f === "line" || f === "straightconnector1") && G(e, r.start, r.end, t.stroke, i, n), t.stroke.tailEnd && K(e, r.end.x, r.end.y, r.end.angle, t.stroke.tailEnd, t.stroke, n), t.stroke.headEnd && K(e, r.start.x, r.start.y, r.start.angle, t.stroke.headEnd, t.stroke, n);
+			i && (f === "line" || f === "straightconnector1") && W(e, r.start, r.end, t.stroke, i, n), t.stroke.tailEnd && G(e, r.end.x, r.end.y, r.end.angle, t.stroke.tailEnd, t.stroke, n), t.stroke.headEnd && G(e, r.start.x, r.start.y, r.start.angle, t.stroke.headEnd, t.stroke, n);
 		}
 	} else if (t.stroke && h.has(f)) {
 		let r = (t.adj2 ?? -8333) / 1e5, i = (t.adj ?? 18750) / 1e5, a = (t.adj4 ?? -38333) / 1e5, o = (t.adj3 ?? 112500) / 1e5, c = s + r * u, f = l + i * d, p = s + a * u, m = l + o * d, h = Math.atan2(m - f, p - c), g = h + Math.PI;
-		t.stroke.tailEnd && K(e, p, m, h, t.stroke.tailEnd, t.stroke, n), t.stroke.headEnd && K(e, c, f, g, t.stroke.headEnd, t.stroke, n);
+		t.stroke.tailEnd && G(e, p, m, h, t.stroke.tailEnd, t.stroke, n), t.stroke.headEnd && G(e, c, f, g, t.stroke.headEnd, t.stroke, n);
 	}
 	if (t.textBody) {
 		let c = t.defaultTextColor ? C(t.defaultTextColor) : null;
@@ -22403,13 +22403,13 @@ function z(e, t, n, r = "#000000", i, a = {
 			let e = u * (1 - 1 / Math.SQRT2) / 2, t = d * (1 - 1 / Math.SQRT2) / 2;
 			p = s + e, m = l + t, h = u / Math.SQRT2, g = d / Math.SQRT2;
 		}
-		H(e, t.textBody, p, m, h, g, n, c, t.rotation, !1, !1, r, i, a, o), e.restore();
+		V(e, t.textBody, p, m, h, g, n, c, t.rotation, !1, !1, r, i, a, o), e.restore();
 	}
 	e.restore();
 }
-var B = i;
-function ee(e, t) {
-	let n = `${e}`, r = e >= 1 && e <= 26 ? String.fromCharCode(96 + e) : n, i = e >= 1 && e <= 26 ? String.fromCharCode(64 + e) : n, a = V(e).toLowerCase(), o = V(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
+var z = i;
+function te(e, t) {
+	let n = `${e}`, r = e >= 1 && e <= 26 ? String.fromCharCode(96 + e) : n, i = e >= 1 && e <= 26 ? String.fromCharCode(64 + e) : n, a = B(e).toLowerCase(), o = B(e), s = n.replace(/[0-9]/g, (e) => String.fromCharCode(65296 + (e.charCodeAt(0) - 48)));
 	switch (t) {
 		case "arabicPlain": return n;
 		case "arabicPeriod": return `${n}.`;
@@ -22436,7 +22436,7 @@ function ee(e, t) {
 		default: return `${n}.`;
 	}
 }
-function V(e) {
+function B(e) {
 	let t = [
 		1e3,
 		900,
@@ -22469,7 +22469,7 @@ function V(e) {
 	for (let i = 0; i < t.length; i++) for (; e >= t[i];) r += n[i], e -= t[i];
 	return r;
 }
-function H(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000", f, p = {
+function V(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000", f, p = {
 	themeMajorFont: null,
 	themeMinorFont: null
 }, m) {
@@ -22486,89 +22486,89 @@ function H(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000",
 			rotation: c,
 			textBodyRotation: _
 		}) : void 0;
-		e.save(), e.translate(l, u), e.rotate(g ? -Math.PI / 2 : Math.PI / 2), H(e, {
+		e.save(), e.translate(l, u), e.rotate(g ? -Math.PI / 2 : Math.PI / 2), V(e, {
 			...t,
 			vert: "horz"
 		}, -a / 2, -i / 2, a, i, o, s, 0, !1, !1, d, f, p, v), e.restore();
 		return;
 	}
-	let _ = S(t.lIns, o), v = S(t.rIns, o), y = S(t.tIns, o), b = S(t.bIns, o), w = t.wrap !== "none", T = t.autoFit === "sp" ? w && N(e, t, i, _, v, o, p) : w, D = Math.max(1, t.numCol ?? 1), A = S(t.spcCol ?? 0, o), j = t.defaultBold ?? !1, F = t.defaultItalic ?? !1, I = s ?? d, L = (r) => {
+	let _ = S(t.lIns, o), v = S(t.rIns, o), y = S(t.tIns, o), b = S(t.bIns, o), w = t.wrap !== "none", T = t.autoFit === "sp" ? w && N(e, t, i, _, v, o, p) : w, D = Math.max(1, t.numCol ?? 1), A = S(t.spcCol ?? 0, o), j = t.defaultBold ?? !1, ee = t.defaultItalic ?? !1, F = s ?? d, I = (r) => {
 		let a = (t.defaultFontSize ?? 18) * x * o * r, s = [], c = 0, l = /* @__PURE__ */ new Map();
-		for (let u of t.paragraphs) {
-			let t = S(u.marL, o), d = S(u.marR, o), m = S(u.indent, o), h = u.defFontSize == null ? a : u.defFontSize * x * o * r, g = u.defColor ? C(u.defColor) : I, y = u.bullet.type === "char" || u.bullet.type === "autoNum", b = (() => {
-				for (let e of u.runs) if (e.type === "text" && e.fontSize != null) return e.fontSize;
+		for (let u = 0; u < t.paragraphs.length; u++) {
+			let d = t.paragraphs[u], m = S(d.marL, o), h = S(d.marR, o), g = S(d.indent, o), y = d.defFontSize == null ? a : d.defFontSize * x * o * r, b = d.defColor ? C(d.defColor) : F, w = d.bullet.type === "char" || d.bullet.type === "autoNum", E = (() => {
+				for (let e of d.runs) if (e.type === "text" && e.fontSize != null) return e.fontSize;
 				return null;
-			})(), w = b == null ? h : b * x * o * r, E = (() => {
-				for (let e of u.runs) if (e.type === "text" && e.color) return e.color;
+			})(), N = E == null ? y : E * x * o * r, I = (() => {
+				for (let e of d.runs) if (e.type === "text" && e.color) return e.color;
 				return null;
-			})(), N = E ? C(E) : g, L = "", R = M(!1, !1, w, "sans-serif", p), z = N;
-			if (u.bullet.type === "char") {
-				let e = u.bullet, t = e.sizePct == null ? w : w * (e.sizePct / 100);
-				L = O(e.char, e.fontFamily ?? ""), R = M(!1, !1, t, L === e.char ? k(e.fontFamily ?? null, p) : "sans-serif", p), z = e.color ? C(e.color) : N, l.clear();
-			} else if (u.bullet.type === "autoNum") {
-				let e = u.bullet, t = u.lvl;
-				l.has(t) ? l.set(t, l.get(t) + 1) : l.set(t, e.startAt ?? 1), L = ee(l.get(t), e.numType), R = M(!1, !1, w, "sans-serif", p), z = N;
+			})(), L = I ? C(I) : b, R = "", z = M(!1, !1, N, "sans-serif", p), B = L;
+			if (d.bullet.type === "char") {
+				let e = d.bullet, t = e.sizePct == null ? N : N * (e.sizePct / 100);
+				R = O(e.char, e.fontFamily ?? ""), z = M(!1, !1, t, R === e.char ? k(e.fontFamily ?? null, p) : "sans-serif", p), B = e.color ? C(e.color) : L, l.clear();
+			} else if (d.bullet.type === "autoNum") {
+				let e = d.bullet, t = d.lvl;
+				l.has(t) ? l.set(t, l.get(t) + 1) : l.set(t, e.startAt ?? 1), R = te(l.get(t), e.numType), z = M(!1, !1, N, "sans-serif", p), B = L;
 			} else l.clear();
-			let B = D > 1 ? (i - _ - v - (D - 1) * A) / D : i - _ - v, V = n + _ + t, H = n + _ + t + m, U = B - t - d, W = P(e, u, T ? U : Infinity, h, g, o, t, j, F, r, f, p), G = u.spaceBefore == null ? 0 : u.spaceBefore / 100 * x * o * r, K = u.spaceAfter == null ? 0 : u.spaceAfter / 100 * x * o * r;
-			for (let t = 0; t < W.length; t++) {
-				let n = W[t], r = t === 0, i = t === W.length - 1, a = 0;
+			let V = D > 1 ? (i - _ - v - (D - 1) * A) / D : i - _ - v, H = n + _ + m, U = n + _ + m + g, W = V - m - h, G = P(e, d, T ? W : Infinity, y, b, o, m, j, ee, r, f, p), K = d.spaceBefore == null ? 0 : d.spaceBefore / 100 * x * o * r, q = d.spaceAfter == null ? 0 : d.spaceAfter / 100 * x * o * r;
+			for (let t = 0; t < G.length; t++) {
+				let n = G[t], r = t === 0, i = t === G.length - 1, a = 0;
 				for (let e of n.segments) e.sizePx > a && (a = e.sizePx);
-				if (a === 0 && (a = h), r && L) {
-					e.font = R;
+				if (a === 0 && (a = y), r && R) {
+					e.font = z;
 					let t = e.measureText("M"), n = t.actualBoundingBoxAscent + t.actualBoundingBoxDescent;
 					n > a && (a = n);
 				}
 				let l;
-				l = u.spaceLine ? u.spaceLine.type === "pct" ? a * 1.2 * (u.spaceLine.val / 1e5) : u.spaceLine.val * x * o : a * 1.2;
-				let d = l + (i ? K : 0), f = r ? G : 0, p = !y && r ? m : 0;
+				l = d.spaceLine ? d.spaceLine.type === "pct" ? a * 1.2 * (d.spaceLine.val / 1e5) : d.spaceLine.val * x * o : a * 1.2;
+				let f = l + (i ? q : 0), p = r && u > 0 ? K : 0, m = !w && r ? g : 0;
 				s.push({
 					line: n,
-					linePx: d,
+					linePx: f,
 					lineHeight: l,
-					topGapPx: f,
-					textXOffset: p,
-					bulletLabel: r ? L : "",
-					bulletFont: R,
-					bulletColor: z,
-					bulletX: H,
-					textX: V,
-					textMaxW: U,
-					alignment: u.alignment,
-					para: u
-				}), c += d + f;
+					topGapPx: p,
+					textXOffset: m,
+					bulletLabel: r ? R : "",
+					bulletFont: z,
+					bulletColor: B,
+					bulletX: U,
+					textX: H,
+					textMaxW: W,
+					alignment: d.alignment,
+					para: d
+				}), c += f + p;
 			}
 		}
 		return {
 			allLines: s,
 			totalHeight: c
 		};
-	}, { allLines: R, totalHeight: z } = L(1);
+	}, { allLines: L, totalHeight: R } = I(1);
 	if (t.autoFit === "norm") {
 		let e = a - y - b;
-		if (z > 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;
-				L(r).totalHeight <= e ? t = r : n = r;
+				I(r).totalHeight <= e ? t = r : n = r;
 			}
-			({allLines: R, totalHeight: z} = L(t));
+			({allLines: L, totalHeight: R} = I(t));
 		}
 	}
-	let B = t.verticalAnchor ?? "t", V = r, U;
-	a === 0 && B === "b" ? (U = y + z + b, V = r - U) : U = t.autoFit === "sp" ? Math.max(a, y + z + b) : a;
-	let W, G = Math.max(0, U - y - b);
-	W = B === "ctr" ? V + y + (G - z) / 2 : B === "b" ? V + U - b - z : V + y, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
-	let K = W, q = D > 1 ? (i - _ - v - (D - 1) * A) / D + A : 0, te = Math.max(0, U - y - b), J = a === 0 || z <= te + .5, Y = D > 1 && !J ? Math.ceil(R.length / D) : R.length, X = 0, Z = 0;
-	for (let t of R) {
+	let z = t.verticalAnchor ?? "t", B = r, H;
+	a === 0 && z === "b" ? (H = y + R + b, B = r - H) : H = t.autoFit === "sp" ? Math.max(a, y + R + b) : a;
+	let U, W = Math.max(0, H - y - b);
+	U = z === "ctr" ? B + y + (W - R) / 2 : z === "b" ? B + H - b - R : B + y, e.save(), e.textAlign = "left", e.textBaseline = "alphabetic";
+	let G = U, K = D > 1 ? (i - _ - v - (D - 1) * A) / D + A : 0, q = Math.max(0, H - y - b), J = a === 0 || R <= q + .5, Y = D > 1 && !J ? Math.ceil(L.length / D) : L.length, X = 0, Z = 0;
+	for (let t of L) {
 		let { line: s, linePx: l, lineHeight: u, topGapPx: d, textXOffset: f, bulletLabel: p, bulletFont: h, bulletColor: g, alignment: v } = t;
-		D > 1 && X < D - 1 && Z >= Y && (X++, Z = 0, W = K), W += d, Z++;
-		let y = X * q, b = t.textX + y, x = t.bulletX + y, w = t.textMaxW, T = 0, O = u * .8;
+		D > 1 && X < D - 1 && Z >= Y && (X++, Z = 0, U = G), U += d, Z++;
+		let y = X * K, b = t.textX + y, x = t.bulletX + y, w = t.textMaxW, T = 0, O = u * .8;
 		for (let t of s.segments) {
 			e.font = t.font;
 			let n = e.measureText(t.text || "M"), r = t.letterSpacingPx ?? 0;
 			T += t.text ? n.width + r * t.text.length : 0, n.actualBoundingBoxAscent > 0 && (O = Math.max(O, n.actualBoundingBoxAscent));
 		}
-		let k = W + O;
+		let k = U + O;
 		p && (e.font = h, e.fillStyle = g, e.fillText(p, x, k));
 		let A = b + f, j;
 		j = v === "ctr" ? A + (w - f - T) / 2 : v === "r" ? b + w - T : A;
@@ -22597,7 +22597,7 @@ function H(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000",
 			if (m && t.text && m({
 				text: t.text,
 				inShapeX: j - n,
-				inShapeY: W - r,
+				inShapeY: U - r,
 				w: p,
 				h: u,
 				fontSize: t.sizePx,
@@ -22637,7 +22637,7 @@ function H(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000",
 				m && t.text && m({
 					text: t.text,
 					inShapeX: l - n,
-					inShapeY: W - r,
+					inShapeY: U - r,
 					w: s,
 					h: u,
 					fontSize: t.sizePx,
@@ -22650,11 +22650,11 @@ function H(e, t, n, r, i, a, o, s = null, c = 0, l = !1, u = !1, d = "#000000",
 				}), l += s;
 			}
 		}
-		W += l;
+		U += l;
 	}
 	e.restore();
 }
-async function U(e, t, n) {
+async function H(e, t, n) {
 	try {
 		let r = await (await fetch(t.dataUrl)).blob(), i = await createImageBitmap(r);
 		e.save(), t.alpha != null && (e.globalAlpha *= t.alpha);
@@ -22662,7 +22662,7 @@ async function U(e, t, n) {
 		if ((t.rotation !== 0 || t.flipH || t.flipV) && (e.translate(a + s / 2, o + c / 2), e.rotate(t.rotation * Math.PI / 180), t.flipH && e.scale(-1, 1), t.flipV && e.scale(1, -1), e.translate(-(a + s / 2), -(o + c / 2))), t.clipAdjust != null) {
 			let n = Math.min(s, c), r = t.clipAdjust / 1e5 * n;
 			e.beginPath(), e.roundRect(a, o, s, c, r), e.clip();
-		} else t.custGeom && t.custGeom.length > 0 && (B(e, t.custGeom, a, o, s, c), e.clip());
+		} else t.custGeom && t.custGeom.length > 0 && (z(e, t.custGeom, a, o, s, c), e.clip());
 		let l = t.srcRect;
 		if (l && (l.l || l.t || l.r || l.b)) {
 			let t = i.width, n = i.height, r = Math.max(0, Math.min(1, l.l ?? 0)), u = Math.max(0, Math.min(1, l.t ?? 0)), d = Math.max(0, Math.min(1, l.r ?? 0)), f = Math.max(0, Math.min(1, l.b ?? 0)), p = r * t, m = u * n, h = Math.max(1, t - p - d * t), g = Math.max(1, n - m - f * n);
@@ -22671,7 +22671,7 @@ async function U(e, t, n) {
 		e.restore(), i.close();
 	} catch {}
 }
-async function W(e, t, n, r, i) {
+async function U(e, t, n, r, i) {
 	let a = S(t.x, n), o = S(t.y, n), s = S(t.width, n), c = S(t.height, n), u = !1;
 	if (t.posterPath && r) try {
 		let n = await r(t.posterPath), i = t.posterMimeType ? new Blob([n], { type: t.posterMimeType }) : n, l = await createImageBitmap(i);
@@ -22679,7 +22679,7 @@ async function W(e, t, n, r, i) {
 	} catch {}
 	u || (e.fillStyle = t.mediaKind === "video" ? "#111" : "#f0f0f0", e.fillRect(a, o, s, c)), !i && l(e, a + s / 2, o + c / 2, s, c, "paused");
 }
-function G(e, t, n, r, i, a) {
+function W(e, t, n, r, i, a) {
 	let o = Math.max(.5, S(r.width, a)), s = n.x - t.x, c = n.y - t.y, l = Math.hypot(s, c);
 	if (l === 0) return;
 	let u = -c / l, d = s / l, f;
@@ -22736,7 +22736,7 @@ function G(e, t, n, r, i, a) {
 	}
 	e.restore();
 }
-function K(e, t, n, r, i, a, o) {
+function G(e, t, n, r, i, a, o) {
 	if (i.type === "none") return;
 	let s = Math.max(.5, S(a.width, o)), c = i.w === "sm" ? 2 : i.w === "lg" ? 4 : 3, l = i.len === "sm" ? 2 : i.len === "lg" ? 4 : 3, u = s * c / 2, d = s * l, f = C(a.color);
 	switch (e.save(), e.translate(t, n), e.rotate(r), e.fillStyle = f, e.strokeStyle = f, e.lineWidth = s, e.setLineDash([]), e.beginPath(), i.type) {
@@ -22756,10 +22756,10 @@ function K(e, t, n, r, i, a, o) {
 	}
 	e.restore();
 }
-function q(e, t, n) {
+function K(e, t, n) {
 	o(e, t, n);
 }
-function te(e, t, n, r, i = {
+function q(e, t, n, r, i = {
 	themeMajorFont: null,
 	themeMinorFont: null
 }) {
@@ -22777,7 +22777,7 @@ function te(e, t, n, r, i = {
 			let p = 0;
 			for (let e = 0; e < (a.rowSpan || 1); e++) p += c[o + e] ?? 0;
 			let m = w(a.fill);
-			m && (e.fillStyle = m, e.fillRect(f, l, d, p)), a.textBody && H(e, a.textBody, f, l, d, p, n, null, 0, !1, !1, "#000000", r, i), e.save(), a.borderT && (q(e, a.borderT, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f + d, l), e.stroke()), a.borderB && (q(e, a.borderB, n), e.beginPath(), e.moveTo(f, l + p), e.lineTo(f + d, l + p), e.stroke()), a.borderL && (q(e, a.borderL, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f, l + p), e.stroke()), a.borderR && (q(e, a.borderR, n), e.beginPath(), e.moveTo(f + d, l), e.lineTo(f + d, l + p), e.stroke()), a.diagonalTL && (q(e, a.diagonalTL, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f + d, l + p), e.stroke()), a.diagonalTR && (q(e, a.diagonalTR, n), e.beginPath(), e.moveTo(f + d, l), e.lineTo(f, l + p), e.stroke()), e.restore(), f += s[t] ?? 0;
+			m && (e.fillStyle = m, e.fillRect(f, l, d, p)), a.textBody && V(e, a.textBody, f, l, d, p, n, null, 0, !1, !1, "#000000", r, i), e.save(), a.borderT && (K(e, a.borderT, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f + d, l), e.stroke()), a.borderB && (K(e, a.borderB, n), e.beginPath(), e.moveTo(f, l + p), e.lineTo(f + d, l + p), e.stroke()), a.borderL && (K(e, a.borderL, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f, l + p), e.stroke()), a.borderR && (K(e, a.borderR, n), e.beginPath(), e.moveTo(f + d, l), e.lineTo(f + d, l + p), e.stroke()), a.diagonalTL && (K(e, a.diagonalTL, n), e.beginPath(), e.moveTo(f, l), e.lineTo(f + d, l + p), e.stroke()), a.diagonalTR && (K(e, a.diagonalTR, n), e.beginPath(), e.moveTo(f + d, l), e.lineTo(f, l + p), e.stroke()), e.restore(), f += s[t] ?? 0;
 		}
 		l += d;
 	}
@@ -22793,12 +22793,12 @@ async function J(e, t, n, i, a = {}, o) {
 		themeMinorFont: a.minorFont ?? null,
 		themeHlinkColor: a.hlinkColor ?? null
 	};
-	F(f, t.background, l, u);
+	ee(f, t.background, l, u);
 	let m = a.defaultTextColor ? `#${a.defaultTextColor}` : "#000000", h = t.slideNumber;
-	for (let e of t.elements) if (e.type === "shape") z(f, e, c, m, h, p, o);
-	else if (e.type === "picture") await U(f, e, c);
-	else if (e.type === "table") te(f, e, c, h, p);
-	else if (e.type === "media") await W(f, e, c, a.fetchMedia, a.skipMediaControls);
+	for (let e of t.elements) if (e.type === "shape") R(f, e, c, m, h, p, o);
+	else if (e.type === "picture") await H(f, e, c);
+	else if (e.type === "table") q(f, e, c, h, p);
+	else if (e.type === "media") await U(f, e, c, a.fetchMedia, a.skipMediaControls);
 	else if (e.type === "chart") {
 		let t = 12700 * c;
 		r(f, {