@silurus/ooxml 0.60.0 → 0.60.1

package/dist/{xlsx-BS4Rw1qg.js → xlsx-B8GnK1Ad.js}

@@ -1,4 +1,4 @@
-import { A as e, B as t, D as n, F as r, H as i, I as a, L as o, O as s, R as c, V as l, a as u, b as d, i as f, j as p, n as m, o as h, r as g, s as _, t as v, w as y, z as b } from "./src-BAZYl43H.js";
+import { B as e, H as t, I as n, L as r, M as i, O as a, R as o, U as s, V as c, a as l, b as u, i as d, j as f, k as p, n as m, o as h, r as g, s as _, t as v, w as y, z as b } from "./src-CWqt1QE0.js";
 import { t as x } from "./mathjax-CNh-4Cw1.js";
 //#region packages/xlsx/src/worker.ts?worker&inline
 var S = "function e(e,t,n,r){let i,o;try{let p=l(e,_.__wbindgen_malloc),m=g,h=u(n,_.__wbindgen_malloc,_.__wbindgen_realloc),v=g,y=_.parse_sheet(p,m,t,h,v,!c(r),c(r)?BigInt(0):r);var s=y[0],f=y[1];if(y[3])throw s=0,f=0,d(y[2]);return i=s,o=f,a(s,f)}finally{_.__wbindgen_free(i,o,1)}}function t(e,t){let n,r;try{let s=l(e,_.__wbindgen_malloc),u=g,f=_.parse_xlsx(s,u,!c(t),c(t)?BigInt(0):t);var i=f[0],o=f[1];if(f[3])throw i=0,o=0,d(f[2]);return n=i,r=o,a(i,o)}finally{_.__wbindgen_free(n,r,1)}}function n(){return{__proto__:null,\"./xlsx_parser_bg.js\":{__proto__:null,__wbg_error_a6fa202b58aa1cd3:function(e,t){let n,r;try{n=e,r=t,console.error(a(e,t))}finally{_.__wbindgen_free(n,r,1)}},__wbg_new_227d7c05414eb861:function(){return Error()},__wbg_stack_3b0d974bbf31e44f:function(e,t){let n=t.stack,r=u(n,_.__wbindgen_malloc,_.__wbindgen_realloc),a=g;i().setInt32(e+4,a,!0),i().setInt32(e+0,r,!0)},__wbindgen_cast_0000000000000001:function(e,t){return a(e,t)},__wbindgen_init_externref_table:function(){let e=_.__wbindgen_externrefs,t=e.grow(4);e.set(0,void 0),e.set(t+0,void 0),e.set(t+1,null),e.set(t+2,!0),e.set(t+3,!1)}}}}let r=null;function i(){return(r===null||r.buffer.detached===!0||r.buffer.detached===void 0&&r.buffer!==_.memory.buffer)&&(r=new DataView(_.memory.buffer)),r}function a(e,t){return e>>>=0,m(e,t)}let o=null;function s(){return(o===null||o.byteLength===0)&&(o=new Uint8Array(_.memory.buffer)),o}function c(e){return e==null}function l(e,t){let n=t(e.length*1,1)>>>0;return s().set(e,n/1),g=e.length,n}function u(e,t,n){if(n===void 0){let n=h.encode(e),r=t(n.length,1)>>>0;return s().subarray(r,r+n.length).set(n),g=n.length,r}let r=e.length,i=t(r,1)>>>0,a=s(),o=0;for(;o<r;o++){let t=e.charCodeAt(o);if(t>127)break;a[i+o]=t}if(o!==r){o!==0&&(e=e.slice(o)),i=n(i,r,r=o+e.length*3,1)>>>0;let t=s().subarray(i+o,i+r),a=h.encodeInto(e,t);o+=a.written,i=n(i,r,o,1)>>>0}return g=o,i}function d(e){let t=_.__wbindgen_externrefs.get(e);return _.__externref_table_dealloc(e),t}let f=new TextDecoder(`utf-8`,{ignoreBOM:!0,fatal:!0});f.decode();let p=0;function m(e,t){return p+=t,p>=2146435072&&(f=new TextDecoder(`utf-8`,{ignoreBOM:!0,fatal:!0}),f.decode(),p=t),f.decode(s().subarray(e,e+t))}const h=new TextEncoder;`encodeInto`in h||(h.encodeInto=function(e,t){let n=h.encode(e);return t.set(n),{read:e.length,written:n.length}});let g=0,_;function v(e,t){return _=e.exports,r=null,o=null,_.__wbindgen_start(),_}async function y(e,t){if(typeof Response==`function`&&e instanceof Response){if(typeof WebAssembly.instantiateStreaming==`function`)try{return await WebAssembly.instantiateStreaming(e,t)}catch(t){if(e.ok&&n(e.type)&&e.headers.get(`Content-Type`)!==`application/wasm`)console.warn(\"`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\\n\",t);else throw t}let r=await e.arrayBuffer();return await WebAssembly.instantiate(r,t)}else{let n=await WebAssembly.instantiate(e,t);return n instanceof WebAssembly.Instance?{instance:n,module:e}:n}function n(e){switch(e){case`basic`:case`cors`:case`default`:return!0}return!1}}async function b(e){if(_!==void 0)return _;e!==void 0&&(Object.getPrototypeOf(e)===Object.prototype?{module_or_path:e}=e:console.warn(`using deprecated parameters for the initialization function; pass a single object instead`));let t=n();(typeof e==`string`||typeof Request==`function`&&e instanceof Request||typeof URL==`function`&&e instanceof URL)&&(e=fetch(e));let{instance:r,module:i}=await y(await e,t);return v(r,i)}const x=e=>`https://fonts.googleapis.com/css2?family=${e}:wght@400;700&display=swap`;x(`Noto+Sans+KR`),x(`Noto+Sans+SC`),x(`Noto+Sans+TC`),x(`Noto+Sans+JP`),x(`Noto+Serif+KR`),x(`Noto+Serif+SC`),x(`Noto+Serif+TC`),x(`Noto+Serif+JP`),x(`Noto+Sans`),x(`Noto+Serif`),x(`Noto+Sans+Devanagari`),x(`Noto+Sans+Thai`),x(`Noto+Sans+Hebrew`),x(`Noto+Serif+Hebrew`),Math.PI*2/216e5,Math.PI*2/216e5,35*Math.PI/180,12*Math.PI/180;function S(e){if(!e.startsWith(`data:`))return null;let t=e.indexOf(`,`);if(t===-1)return null;let n=atob(e.slice(t+1)),r=new Uint8Array(n.length);for(let e=0;e<n.length;e++)r[e]=n.charCodeAt(e);return r.buffer}const C=[40,41,41,40,60,62,62,60,91,93,93,91,123,125,125,123,171,187,187,171,3898,3899,3899,3898,3900,3901,3901,3900,5787,5788,5788,5787,8249,8250,8250,8249,8261,8262,8262,8261,8317,8318,8318,8317,8333,8334,8334,8333,8712,8715,8713,8716,8714,8717,8715,8712,8716,8713,8717,8714,8725,10741,8735,11262,8736,10659,8737,10651,8738,10656,8740,10990,8764,8765,8765,8764,8771,8909,8773,8780,8780,8773,8786,8787,8787,8786,8788,8789,8789,8788,8804,8805,8805,8804,8806,8807,8807,8806,8808,8809,8809,8808,8810,8811,8811,8810,8814,8815,8815,8814,8816,8817,8817,8816,8818,8819,8819,8818,8820,8821,8821,8820,8822,8823,8823,8822,8824,8825,8825,8824,8826,8827,8827,8826,8828,8829,8829,8828,8830,8831,8831,8830,8832,8833,8833,8832,8834,8835,8835,8834,8836,8837,8837,8836,8838,8839,8839,8838,8840,8841,8841,8840,8842,8843,8843,8842,8847,8848,8848,8847,8849,8850,8850,8849,8856,10680,8866,8867,8867,8866,8870,10974,8872,10980,8873,10979,8875,10981,8880,8881,8881,8880,8882,8883,8883,8882,8884,8885,8885,8884,8886,8887,8887,8886,8888,10204,8905,8906,8906,8905,8907,8908,8908,8907,8909,8771,8912,8913,8913,8912,8918,8919,8919,8918,8920,8921,8921,8920,8922,8923,8923,8922,8924,8925,8925,8924,8926,8927,8927,8926,8928,8929,8929,8928,8930,8931,8931,8930,8932,8933,8933,8932,8934,8935,8935,8934,8936,8937,8937,8936,8938,8939,8939,8938,8940,8941,8941,8940,8944,8945,8945,8944,8946,8954,8947,8955,8948,8956,8950,8957,8951,8958,8954,8946,8955,8947,8956,8948,8957,8950,8958,8951,8968,8969,8969,8968,8970,8971,8971,8970,9001,9002,9002,9001,10088,10089,10089,10088,10090,10091,10091,10090,10092,10093,10093,10092,10094,10095,10095,10094,10096,10097,10097,10096,10098,10099,10099,10098,10100,10101,10101,10100,10179,10180,10180,10179,10181,10182,10182,10181,10184,10185,10185,10184,10187,10189,10189,10187,10197,10198,10198,10197,10204,8888,10205,10206,10206,10205,10210,10211,10211,10210,10212,10213,10213,10212,10214,10215,10215,10214,10216,10217,10217,10216,10218,10219,10219,10218,10220,10221,10221,10220,10222,10223,10223,10222,10627,10628,10628,10627,10629,10630,10630,10629,10631,10632,10632,10631,10633,10634,10634,10633,10635,10636,10636,10635,10637,10640,10638,10639,10639,10638,10640,10637,10641,10642,10642,10641,10643,10644,10644,10643,10645,10646,10646,10645,10647,10648,10648,10647,10651,8737,10656,8738,10659,8736,10660,10661,10661,10660,10664,10665,10665,10664,10666,10667,10667,10666,10668,10669,10669,10668,10670,10671,10671,10670,10680,8856,10688,10689,10689,10688,10692,10693,10693,10692,10703,10704,10704,10703,10705,10706,10706,10705,10708,10709,10709,10708,10712,10713,10713,10712,10714,10715,10715,10714,10728,10729,10729,10728,10741,8725,10744,10745,10745,10744,10748,10749,10749,10748,10795,10796,10796,10795,10797,10798,10798,10797,10804,10805,10805,10804,10812,10813,10813,10812,10852,10853,10853,10852,10873,10874,10874,10873,10875,10876,10876,10875,10877,10878,10878,10877,10879,10880,10880,10879,10881,10882,10882,10881,10883,10884,10884,10883,10885,10886,10886,10885,10887,10888,10888,10887,10889,10890,10890,10889,10891,10892,10892,10891,10893,10894,10894,10893,10895,10896,10896,10895,10897,10898,10898,10897,10899,10900,10900,10899,10901,10902,10902,10901,10903,10904,10904,10903,10905,10906,10906,10905,10907,10908,10908,10907,10909,10910,10910,10909,10911,10912,10912,10911,10913,10914,10914,10913,10918,10919,10919,10918,10920,10921,10921,10920,10922,10923,10923,10922,10924,10925,10925,10924,10927,10928,10928,10927,10929,10930,10930,10929,10931,10932,10932,10931,10933,10934,10934,10933,10935,10936,10936,10935,10937,10938,10938,10937,10939,10940,10940,10939,10941,10942,10942,10941,10943,10944,10944,10943,10945,10946,10946,10945,10947,10948,10948,10947,10949,10950,10950,10949,10951,10952,10952,10951,10953,10954,10954,10953,10955,10956,10956,10955,10957,10958,10958,10957,10959,10960,10960,10959,10961,10962,10962,10961,10963,10964,10964,10963,10965,10966,10966,10965,10974,8870,10979,8873,10980,8872,10981,8875,10988,10989,10989,10988,10990,8740,10999,11e3,11e3,10999,11001,11002,11002,11001,11262,8735,11778,11779,11779,11778,11780,11781,11781,11780,11785,11786,11786,11785,11788,11789,11789,11788,11804,11805,11805,11804,11808,11809,11809,11808,11810,11811,11811,11810,11812,11813,11813,11812,11814,11815,11815,11814,11816,11817,11817,11816,11861,11862,11862,11861,11863,11864,11864,11863,11865,11866,11866,11865,11867,11868,11868,11867,12296,12297,12297,12296,12298,12299,12299,12298,12300,12301,12301,12300,12302,12303,12303,12302,12304,12305,12305,12304,12308,12309,12309,12308,12310,12311,12311,12310,12312,12313,12313,12312,12314,12315,12315,12314,65113,65114,65114,65113,65115,65116,65116,65115,65117,65118,65118,65117,65124,65125,65125,65124,65288,65289,65289,65288,65308,65310,65310,65308,65339,65341,65341,65339,65371,65373,65373,65371,65375,65376,65376,65375,65378,65379,65379,65378],w=[40,41,0,41,40,1,91,93,0,93,91,1,123,125,0,125,123,1,3898,3899,0,3899,3898,1,3900,3901,0,3901,3900,1,5787,5788,0,5788,5787,1,8261,8262,0,8262,8261,1,8317,8318,0,8318,8317,1,8333,8334,0,8334,8333,1,8968,8969,0,8969,8968,1,8970,8971,0,8971,8970,1,9001,9002,0,9002,9001,1,10088,10089,0,10089,10088,1,10090,10091,0,10091,10090,1,10092,10093,0,10093,10092,1,10094,10095,0,10095,10094,1,10096,10097,0,10097,10096,1,10098,10099,0,10099,10098,1,10100,10101,0,10101,10100,1,10181,10182,0,10182,10181,1,10214,10215,0,10215,10214,1,10216,10217,0,10217,10216,1,10218,10219,0,10219,10218,1,10220,10221,0,10221,10220,1,10222,10223,0,10223,10222,1,10627,10628,0,10628,10627,1,10629,10630,0,10630,10629,1,10631,10632,0,10632,10631,1,10633,10634,0,10634,10633,1,10635,10636,0,10636,10635,1,10637,10640,0,10638,10639,1,10639,10638,0,10640,10637,1,10641,10642,0,10642,10641,1,10643,10644,0,10644,10643,1,10645,10646,0,10646,10645,1,10647,10648,0,10648,10647,1,10712,10713,0,10713,10712,1,10714,10715,0,10715,10714,1,10748,10749,0,10749,10748,1,11810,11811,0,11811,11810,1,11812,11813,0,11813,11812,1,11814,11815,0,11815,11814,1,11816,11817,0,11817,11816,1,11861,11862,0,11862,11861,1,11863,11864,0,11864,11863,1,11865,11866,0,11866,11865,1,11867,11868,0,11868,11867,1,12296,12297,0,12297,12296,1,12298,12299,0,12299,12298,1,12300,12301,0,12301,12300,1,12302,12303,0,12303,12302,1,12304,12305,0,12305,12304,1,12308,12309,0,12309,12308,1,12310,12311,0,12311,12310,1,12312,12313,0,12313,12312,1,12314,12315,0,12315,12314,1,65113,65114,0,65114,65113,1,65115,65116,0,65116,65115,1,65117,65118,0,65118,65117,1,65288,65289,0,65289,65288,1,65339,65341,0,65341,65339,1,65371,65373,0,65373,65371,1,65375,65376,0,65376,65375,1,65378,65379,0,65379,65378,1];(()=>{let e=new Map;for(let t=0;t<C.length;t+=2)e.set(C[t],C[t+1]);return e})(),(()=>{let e=new Map;for(let t=0;t<w.length;t+=3)e.set(w[t],{pair:w[t+1],type:w[t+2]===0?`o`:`c`});return e})();let T=null;self.onmessage=async n=>{let r=n.data;if(r.type===`init`){T=b(S(r.wasmUrl)??r.wasmUrl);return}let i=r.id;try{if(await T,r.type===`parse`){let e=typeof r.maxZipEntryBytes==`number`&&r.maxZipEntryBytes>0?BigInt(r.maxZipEntryBytes):void 0,n=t(new Uint8Array(r.data),e),a={type:`parsed`,id:i,workbook:JSON.parse(n)};self.postMessage(a)}else if(r.type===`parseSheet`){let t=typeof r.maxZipEntryBytes==`number`&&r.maxZipEntryBytes>0?BigInt(r.maxZipEntryBytes):void 0,n=e(new Uint8Array(r.data),r.sheetIndex,r.sheetName,t),a={type:`parsedSheet`,id:i,worksheet:JSON.parse(n)};self.postMessage(a)}}catch(e){let t={type:`error`,id:i,message:String(e)};self.postMessage(t)}};", C = typeof self < "u" && self.Blob && new Blob(["URL.revokeObjectURL(import.meta.url);", S], { type: "text/javascript;charset=utf-8" });
@@ -1117,15 +1117,15 @@ function $e(e) {
 }
 //#endregion
 //#region packages/xlsx/src/renderer.ts
-var et = r.map((e) => `"${e}"`).join(", "), tt = a.map((e) => `"${e}"`).join(", "), nt = `"Calibri", "Carlito", "Cambria", "Caladea", Arial, "Noto Naskh Arabic", "Noto Sans Arabic", ${et}, sans-serif`;
+var et = n.map((e) => `"${e}"`).join(", "), tt = r.map((e) => `"${e}"`).join(", "), nt = `"Calibri", "Carlito", "Cambria", "Caladea", Arial, "Noto Naskh Arabic", "Noto Sans Arabic", ${et}, sans-serif`;
 function rt(e) {
 	return /song|sung|simsun|nsimsun|batang|gungsuh|mincho|mingliu|pmingliu|fangsong|kaiti|simkai|simfang|stsong|stkaiti|新細明|細明|宋体|明朝|楷体|楷體|仿宋|標楷|游明朝/.test(e);
 }
-function it(e) {
-	let t = e ? b(e) : null;
-	if (!t) return nt;
-	let n = rt((e ?? "").toLowerCase());
-	return `${c(t, n ? "serif" : "sans").map((e) => `"${e}"`).join(", ")}, "Calibri", "Carlito", "Cambria", "Caladea", Arial, "Noto Naskh Arabic", "Noto Sans Arabic", ${n ? tt : et}, ${n ? "serif" : "sans-serif"}`;
+function it(t) {
+	let n = t ? e(t) : null;
+	if (!n) return nt;
+	let r = rt((t ?? "").toLowerCase());
+	return `${b(n, r ? "serif" : "sans").map((e) => `"${e}"`).join(", ")}, "Calibri", "Carlito", "Cambria", "Caladea", Arial, "Noto Naskh Arabic", "Noto Sans Arabic", ${r ? tt : et}, ${r ? "serif" : "sans-serif"}`;
 }
 function at(e) {
 	return e ? `"${e}", ${it(e)}` : nt;
@@ -1147,20 +1147,20 @@ var lt = "#7a7a7a", ut = /* @__PURE__ */ new Map(), dt = {
 function ft(e, t) {
 	let n = `${e}:${t}`, r = ut.get(n);
 	if (r !== void 0) return r;
-	let i = dt[e.toLowerCase()]?.[Math.round(t)];
-	if (i !== void 0) return ut.set(n, i), i;
-	let a = t * p, o = typeof OffscreenCanvas < "u" ? new OffscreenCanvas(1, 1) : typeof document < "u" ? document.createElement("canvas") : null;
-	if (!o) return st;
-	let s = o.getContext("2d");
+	let a = dt[e.toLowerCase()]?.[Math.round(t)];
+	if (a !== void 0) return ut.set(n, a), a;
+	let o = t * i, s = typeof OffscreenCanvas < "u" ? new OffscreenCanvas(1, 1) : typeof document < "u" ? document.createElement("canvas") : null;
 	if (!s) return st;
-	s.font = `${a}px ${at(e)}`;
-	let c = 0;
+	let c = s.getContext("2d");
+	if (!c) return st;
+	c.font = `${o}px ${at(e)}`;
+	let l = 0;
 	for (let e of "0123456789") {
-		let t = s.measureText(e).width;
-		t > c && (c = t);
+		let t = c.measureText(e).width;
+		t > l && (l = t);
 	}
-	let l = Math.round(c) || st;
-	return ut.set(n, l), l;
+	let u = Math.round(l) || st;
+	return ut.set(n, u), u;
 }
 function pt(e) {
 	return !e.defaultFontFamily || !e.defaultFontSize ? st : ft(e.defaultFontFamily, e.defaultFontSize);
@@ -1169,7 +1169,7 @@ function X(e, t = st) {
 	return Math.trunc((256 * e + 128 / t) / 256 * t);
 }
 function Z(e) {
-	return Math.round(e * p);
+	return Math.round(e * i);
 }
 function Q(e, t = 1) {
 	let n = e.replace("#", ""), r = parseInt(n.slice(0, 2), 16), i = parseInt(n.slice(2, 4), 16), a = parseInt(n.slice(4, 6), 16);
@@ -1374,16 +1374,16 @@ function vt(e, t, n, r) {
 	if (gt.has(s)) return gt.get(s);
 	let c = _t[t];
 	if (!c) return gt.set(s, null), null;
-	let l = c.length, u = d(l, l);
-	if (!u) return gt.set(s, null), null;
-	let f = u.getContext("2d");
+	let l = c.length, d = u(l, l);
+	if (!d) return gt.set(s, null), null;
+	let f = d.getContext("2d");
 	if (!f) return gt.set(s, null), null;
 	f.fillStyle = Q(r), f.fillRect(0, 0, l, l), f.fillStyle = Q(n);
 	for (let e = 0; e < l; e++) {
 		let t = c[e];
 		for (let n = 0; n < l; n++) t & 1 << l - 1 - n && f.fillRect(n, e, 1, 1);
 	}
-	let p = e.createPattern(u, "repeat");
+	let p = e.createPattern(d, "repeat");
 	if (p && typeof DOMMatrix < "u" && (a >= 2 || o >= 2)) {
 		let e = new DOMMatrix();
 		e.scaleSelf(1 / a, 1 / o), p.setTransform(e);
@@ -1429,7 +1429,7 @@ function Ct(e, t, n) {
 	return `rgb(${Math.round(a * d + c * (1 - d))},${Math.round(o * d + l * (1 - d))},${Math.round(s * d + u * (1 - d))})`;
 }
 function wt(e, t = 1) {
-	return `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${Math.max(1, Math.round(e.size * p * t))}px ${at(e.name)}`;
+	return `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${Math.max(1, Math.round(e.size * i * t))}px ${at(e.name)}`;
 }
 function Tt(e, t, n, r, i, a) {
 	e.save(), e.strokeStyle = i, e.lineWidth = .5, e.beginPath(), a ? (e.moveTo(t, r - 1), e.lineTo(n, r - 1), e.moveTo(t, r + 1), e.lineTo(n, r + 1)) : (e.moveTo(t, r), e.lineTo(n, r)), e.stroke(), e.restore();
@@ -1691,41 +1691,41 @@ function Vt(e) {
 	let n = parseInt(t.slice(0, 2), 16), r = parseInt(t.slice(2, 4), 16), i = parseInt(t.slice(4, 6), 16), a = (e) => Math.round(e * .2 + 255 * .8), o = (e) => e.toString(16).padStart(2, "0").toUpperCase();
 	return `#${o(a(n))}${o(a(r))}${o(a(i))}`;
 }
-function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
-	if (f <= 0 || m <= 0) return;
-	let { styles: h, cellMap: g, mergeAnchorMap: v, mergeSkipSet: y, cfContext: b, cs: x, dpr: S } = t, C = i.length, w = a.length, T = (e, n) => t.rtl ? ct(e, n, t.canvasW) : e, E = [], D = -o;
-	for (let e = 0; e < C; e++) E.push(D), D += i[e];
-	let O = [], k = -s;
-	for (let e = 0; e < w; e++) O.push(k), k += a[e];
-	e.save(), e.beginPath(), e.rect(T(u, f), d, f, m), e.clip();
+function Ht(e, t, n, r, a, o, s, c, l, u, d, f, p, m) {
+	if (p <= 0 || m <= 0) return;
+	let { styles: h, cellMap: g, mergeAnchorMap: v, mergeSkipSet: y, cfContext: b, cs: x, dpr: S } = t, C = a.length, w = o.length, T = (e, n) => t.rtl ? ct(e, n, t.canvasW) : e, E = [], D = -s;
+	for (let e = 0; e < C; e++) E.push(D), D += a[e];
+	let O = [], k = -c;
+	for (let e = 0; e < w; e++) O.push(k), k += o[e];
+	e.save(), e.beginPath(), e.rect(T(d, p), f, p, m), e.clip();
 	let A = [];
-	for (let i of t.worksheet.mergeCells ?? []) {
-		let a = i.top, u = i.left;
-		if (a >= n && a < n + w && u >= r && u < r + C || i.bottom < n || i.top >= n + w || i.right < r || i.left >= r + C) continue;
-		let d = t.mergeAnchorMap.get(`${a}:${u}`);
-		if (!d) continue;
-		let f;
-		if (u >= r) f = c + E[u - r];
+	for (let a of t.worksheet.mergeCells ?? []) {
+		let o = a.top, d = a.left;
+		if (o >= n && o < n + w && d >= r && d < r + C || a.bottom < n || a.top >= n + w || a.right < r || a.left >= r + C) continue;
+		let f = t.mergeAnchorMap.get(`${o}:${d}`);
+		if (!f) continue;
+		let p;
+		if (d >= r) p = l + E[d - r];
 		else {
 			let e = 0;
-			for (let n = u; n < r; n++) e += Math.round(X(t.worksheet.colWidths[n] ?? t.worksheet.defaultColWidth, t.mdw) * x);
-			f = c - o - e;
+			for (let n = d; n < r; n++) e += Math.round(X(t.worksheet.colWidths[n] ?? t.worksheet.defaultColWidth, t.mdw) * x);
+			p = l - s - e;
 		}
 		let m;
-		if (a >= n) m = l + O[a - n];
+		if (o >= n) m = u + O[o - n];
 		else {
 			let e = 0;
-			for (let r = a; r < n; r++) e += Math.round(Z(t.worksheet.rowHeights[r] ?? t.worksheet.defaultRowHeight) * x);
-			m = l - s - e;
+			for (let r = o; r < n; r++) e += Math.round(Z(t.worksheet.rowHeights[r] ?? t.worksheet.defaultRowHeight) * x);
+			m = u - c - e;
 		}
-		let g = d.totalW, _ = d.totalH;
-		f = T(f, g);
-		let v = `${a}:${u}`, y = t.cellMap.get(v), { font: S, fill: D, border: k, xf: A } = Dt(h, y?.styleIndex ?? 0), j = Ke(y, a, u, b, h.dxfs ?? []);
-		if (yt(e, j.fill ?? D, f, m, g, _), j.dataBar && j.dataBar.ratio > 0) {
+		let g = f.totalW, _ = f.totalH;
+		p = T(p, g);
+		let v = `${o}:${d}`, y = t.cellMap.get(v), { font: S, fill: D, border: k, xf: A } = Dt(h, y?.styleIndex ?? 0), j = Ke(y, o, d, b, h.dxfs ?? []);
+		if (yt(e, j.fill ?? D, p, m, g, _), j.dataBar && j.dataBar.ratio > 0) {
 			let t = Math.max(0, (g - 4) * j.dataBar.ratio);
-			mt(e, j.dataBar.color, f + 2, m + 2, t, _ - 4, j.dataBar.gradient);
+			mt(e, j.dataBar.color, p + 2, m + 2, t, _ - 4, j.dataBar.gradient);
 		}
-		if (un(e, ln(cn(k, a, u, d.right, d.bottom, t.cellMap, h), j.border), f, m, g, _), !y) continue;
+		if (un(e, ln(cn(k, o, d, f.right, f.bottom, t.cellMap, h), j.border), p, m, g, _), !y) continue;
 		let M = he(y, h, j.numFmt);
 		if (!M || M === "0" && t.worksheet.showZeros === !1) continue;
 		let N = S.bold || !!j.fontBold, P = S.italic || !!j.fontItalic, F = S.underline || !!j.fontUnderline, I = S.strike || !!j.fontStrike, L = N !== S.bold || P !== S.italic || F !== S.underline || I !== S.strike ? {
@@ -1739,36 +1739,36 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 		let R = t.hyperlinkMap.get(v) ? "#0563C1" : j.fontColor ?? S.color;
 		e.fillStyle = R ? Q(R) : "#000000";
 		let z = y.value.type === "number", B = A.alignH ?? (z ? "right" : "left"), V = A.alignV ?? "bottom", H = A.indent ? Math.round(A.indent * 3 * t.mdw) : 0, ee = 3 + (B === "left" || !A.alignH ? H : 0);
-		e.save(), e.beginPath(), e.rect(f, m, g, _), e.clip();
+		e.save(), e.beginPath(), e.rect(p, m, g, _), e.clip();
 		let U;
-		B === "right" ? (U = f + g - 3, e.textAlign = "right") : B === "center" ? (U = f + g / 2, e.textAlign = "center") : (U = f + ee, e.textAlign = "left");
+		B === "right" ? (U = p + g - 3, e.textAlign = "right") : B === "center" ? (U = p + g / 2, e.textAlign = "center") : (U = p + ee, e.textAlign = "left");
 		let te = y.value.type === "text" ? y.value.runs : void 0, ne = te && te.length > 0;
 		if (A.wrapText && ne) {
-			let t = jt(e, te, L, x, g - ee - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * p * 1.2), 0), r;
+			let t = jt(e, te, L, x, g - ee - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * i * 1.2), 0), r;
 			r = V === "top" ? m + 2 : V === "center" ? m + (_ - n) / 2 : m + _ - n - 2, e.textAlign = "left", e.textBaseline = "top";
 			for (let n of t) {
-				let t = Math.round(n.maxFontSize * p * 1.2), i = n.segments.reduce((e, t) => e + t.width, 0), a;
-				a = B === "right" ? f + g - 3 - i : B === "center" ? f + g / 2 - i / 2 : f + ee;
+				let t = Math.round(n.maxFontSize * i * 1.2), a = n.segments.reduce((e, t) => e + t.width, 0), o;
+				o = B === "right" ? p + g - 3 - a : B === "center" ? p + g / 2 - a / 2 : p + ee;
 				for (let t of n.segments) {
 					e.font = wt(t.font, x);
 					let n = j.fontColor ?? t.font.color;
-					e.fillStyle = n ? Q(n) : "#000000", e.fillText(t.text, a, r), a += t.width;
+					e.fillStyle = n ? Q(n) : "#000000", e.fillText(t.text, o, r), o += t.width;
 				}
 				r += t;
 			}
 		} else if (A.wrapText) {
-			let t = Ot(e, M, g - ee - 3), n = Math.round(S.size * p * 1.2), r = t.length * n, i;
-			i = V === "top" ? m + 2 : V === "center" ? m + (_ - r) / 2 : m + _ - r - 2, e.textBaseline = "top";
-			for (let r = 0; r < t.length; r++) e.fillText(t[r], U, i + r * n);
+			let t = Ot(e, M, g - ee - 3), n = Math.round(S.size * i * 1.2), r = t.length * n, a;
+			a = V === "top" ? m + 2 : V === "center" ? m + (_ - r) / 2 : m + _ - r - 2, e.textBaseline = "top";
+			for (let r = 0; r < t.length; r++) e.fillText(t[r], U, a + r * n);
 		} else {
 			let t;
 			V === "top" ? (e.textBaseline = "top", t = m + 2) : V === "center" ? (e.textBaseline = "middle", t = m + _ / 2) : (e.textBaseline = "bottom", t = m + _ - 2), e.fillText(M, U, t);
 		}
 		e.restore();
 	}
-	for (let o = 0; o < w; o++) {
-		let s = n + o, w = l + O[o], D = a[o];
-		if (w + D <= d || w >= d + m) continue;
+	for (let s = 0; s < w; s++) {
+		let c = n + s, w = u + O[s], D = o[s];
+		if (w + D <= f || w >= f + m) continue;
 		let k = /* @__PURE__ */ new Set(), j = /* @__PURE__ */ new Set(), M = -1, N = (e) => {
 			if (M >= 0 && e - M >= 2) {
 				for (let t = M; t < e - 1; t++) k.add(t);
@@ -1779,7 +1779,7 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 		for (let e = 0; e <= C; e++) {
 			let t = !1, n = !1;
 			if (e < C) {
-				let i = `${s}:${r + e}`;
+				let i = `${c}:${r + e}`;
 				if (!y.has(i) && !v.has(i)) {
 					let e = g.get(i);
 					t = Dt(h, e?.styleIndex ?? 0).xf.alignH === "centerContinuous", n = !!(e && e.value && e.value.type !== "empty");
@@ -1788,11 +1788,11 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 			t ? n && M >= 0 && e > M ? (N(e), M = e) : M < 0 && (M = e) : N(e);
 		}
 		for (let n = 0; n < C; n++) {
-			let a = r + n, l = c + E[n], d = i[n];
-			if (l + d <= u || l >= u + f) continue;
-			let m = `${s}:${a}`;
+			let o = r + n, u = l + E[n], f = a[n];
+			if (u + f <= d || u >= d + p) continue;
+			let m = `${c}:${o}`;
 			if (y.has(m)) continue;
-			let O = v.get(m), M = O ? O.totalW : d, N = O ? O.totalH : D, P = T(l, M), F = g.get(m), { font: I, fill: L, border: R, xf: z } = Dt(h, F?.styleIndex ?? 0), B = Ke(F, s, a, b, h.dxfs ?? []), V = B.fill ?? L, H = t.tableStyleMap.get(m), ee = h.dxfs ?? [], U = (e) => e == null ? void 0 : ee[e], te = U(H?.wholeTableDxf), ne = U(H?.headerRowDxf), re = U(H?.totalRowDxf), ie = U(H?.firstColumnDxf), ae = U(H?.lastColumnDxf), oe = U(H?.stripeDxf), se = H?.isHeader && ne?.fill?.fgColor ? ne : H?.isTotals && re?.fill?.fgColor ? re : H?.isLastCol && ae?.fill?.fgColor ? ae : H?.isFirstCol && ie?.fill?.fgColor ? ie : oe?.fill?.fgColor ? oe : !H?.isHeader && !H?.isTotals && te?.fill?.fgColor ? te : void 0, ce = !1;
+			let O = v.get(m), M = O ? O.totalW : f, N = O ? O.totalH : D, P = T(u, M), F = g.get(m), { font: I, fill: L, border: R, xf: z } = Dt(h, F?.styleIndex ?? 0), B = Ke(F, c, o, b, h.dxfs ?? []), V = B.fill ?? L, H = t.tableStyleMap.get(m), ee = h.dxfs ?? [], U = (e) => e == null ? void 0 : ee[e], te = U(H?.wholeTableDxf), ne = U(H?.headerRowDxf), re = U(H?.totalRowDxf), ie = U(H?.firstColumnDxf), ae = U(H?.lastColumnDxf), oe = U(H?.stripeDxf), se = H?.isHeader && ne?.fill?.fgColor ? ne : H?.isTotals && re?.fill?.fgColor ? re : H?.isLastCol && ae?.fill?.fgColor ? ae : H?.isFirstCol && ie?.fill?.fgColor ? ie : oe?.fill?.fgColor ? oe : !H?.isHeader && !H?.isTotals && te?.fill?.fgColor ? te : void 0, ce = !1;
 			if (yt(e, V, P, w, M, N) ? ce = !0 : H && se?.fill?.fgColor ? (e.fillStyle = Q(se.fill.fgColor), e.fillRect(P, w, M, N), ce = !0) : H && !H.isCustom && H.isBanded && (e.fillStyle = Vt(H.accent), e.fillRect(P, w, M, N), ce = !0), t.commentCells.has(m) && St(e, P, w, M, N), B.dataBar && B.dataBar.ratio > 0) {
 				let t = Math.max(0, (M - 4) * B.dataBar.ratio);
 				mt(e, B.dataBar.color, P + 2, w + 2, t, N - 4, B.dataBar.gradient);
@@ -1805,15 +1805,15 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 				h: N
 			}, le), t.worksheet.showGridlines !== !1) {
 				let t = .5 / S;
-				e.strokeStyle = "#d0d0d0", e.lineWidth = .5, e.beginPath(), k.has(n) || (e.moveTo(P + M + t, w), e.lineTo(P + M + t, w + N)), e.moveTo(P, w + N + t), e.lineTo(P + M, w + N + t), o === 0 && (e.moveTo(P, w + t), e.lineTo(P + M, w + t)), n === 0 && (e.moveTo(P + t, w), e.lineTo(P + t, w + N)), e.stroke();
+				e.strokeStyle = "#d0d0d0", e.lineWidth = .5, e.beginPath(), k.has(n) || (e.moveTo(P + M + t, w), e.lineTo(P + M + t, w + N)), e.moveTo(P, w + N + t), e.lineTo(P + M, w + N + t), s === 0 && (e.moveTo(P, w + t), e.lineTo(P + M, w + t)), n === 0 && (e.moveTo(P + t, w), e.lineTo(P + t, w + N)), e.stroke();
 			}
-			let W = ln(O ? cn(R, s, a, O.right, O.bottom, g, h) : R, B.border);
+			let W = ln(O ? cn(R, c, o, O.right, O.bottom, g, h) : R, B.border);
 			(k.has(n) || j.has(n)) && (W = {
 				...W,
 				left: j.has(n) ? null : W.left,
 				right: k.has(n) ? null : W.right
 			});
-			let ue = g.get(`${s - 1}:${a}`), G = ce && ue ? Dt(h, ue.styleIndex).border.bottom : null, K = !1;
+			let ue = g.get(`${c - 1}:${o}`), G = ce && ue ? Dt(h, ue.styleIndex).border.bottom : null, K = !1;
 			if (G?.style) {
 				let e = W.top, t = mn(e, G);
 				W = {
@@ -1823,7 +1823,7 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 			}
 			let q = !1;
 			if (ce && !j.has(n)) {
-				let e = g.get(`${s}:${a - 1}`), t = e ? Dt(h, e.styleIndex).border.right : null;
+				let e = g.get(`${c}:${o - 1}`), t = e ? Dt(h, e.styleIndex).border.right : null;
 				if (t?.style) {
 					let e = W.left, n = mn(e, t);
 					W = {
@@ -1833,57 +1833,57 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 				}
 			}
 			if (un(e, W, P, w, M, N, K, q), H) {
-				let t = zt(H, te, ne, a);
+				let t = zt(H, te, ne, o);
 				if (t.kind === "dxf") un(e, t.border, P, w, M, N);
 				else if (t.kind === "accent") {
 					let n = .5 / S;
 					e.strokeStyle = t.color, e.lineWidth = t.lineWidth, e.beginPath(), e.moveTo(P, w + N - n), e.lineTo(P + M, w + N - n), t.topEdge && (e.moveTo(P, w + n), e.lineTo(P + M, w + n)), e.stroke();
 				}
 			}
-			if (t.autoFilterCells.has(m) && Lt(e, P, w, d, N), !F) continue;
+			if (t.autoFilterCells.has(m) && Lt(e, P, w, f, N), !F) continue;
 			let J = he(F, h, B.numFmt);
 			!J || J === "0" && t.worksheet.showZeros === !1 || A.push(() => {
-				let o = H?.isHeader ? ne : H?.isTotals ? re : H?.isLastCol && ae ? ae : H?.isFirstCol && ie ? ie : oe || (H ? te : void 0), c = H ? H.isCustom ? !!o?.font?.bold : H.isHeader || H.isTotals : !1, l = I.bold || !!B.fontBold || c, u = I.italic || !!B.fontItalic, d = I.underline || !!B.fontUnderline, f = I.strike || !!B.fontStrike, _ = l !== I.bold || u !== I.italic || d !== I.underline || f !== I.strike ? {
+				let s = H?.isHeader ? ne : H?.isTotals ? re : H?.isLastCol && ae ? ae : H?.isFirstCol && ie ? ie : oe || (H ? te : void 0), l = H ? H.isCustom ? !!s?.font?.bold : H.isHeader || H.isTotals : !1, u = I.bold || !!B.fontBold || l, d = I.italic || !!B.fontItalic, f = I.underline || !!B.fontUnderline, p = I.strike || !!B.fontStrike, _ = u !== I.bold || d !== I.italic || f !== I.underline || p !== I.strike ? {
 					...I,
-					bold: l,
-					italic: u,
-					underline: d,
-					strike: f
+					bold: u,
+					italic: d,
+					underline: f,
+					strike: p
 				} : I;
 				e.font = wt(_, x);
-				let b = t.hyperlinkMap.get(m), S = o?.font?.color ?? null, T = b ? "#0563C1" : B.fontColor ?? S ?? I.color;
+				let b = t.hyperlinkMap.get(m), S = s?.font?.color ?? null, T = b ? "#0563C1" : B.fontColor ?? S ?? I.color;
 				e.fillStyle = T ? Q(T) : "#000000";
 				let E = F.value.type === "number", D = z.alignH ?? (E ? "right" : "left"), k = z.alignV ?? "bottom", A = z.indent ? Math.round(z.indent * 3 * t.mdw) : 0, j = B.iconSet ? Math.max(8, Math.round(Math.min(M, N) * .55)) : 0, L = j > 0 ? j + 4 : 0, R = 3 + (D === "left" || !z.alignH ? A : 0) + L, V = M, ee = P, U = n;
 				if (D === "centerContinuous" && !O) for (let e = n + 1; e < C; e++) {
-					let t = `${s}:${r + e}`;
+					let t = `${c}:${r + e}`;
 					if (y.has(t) || v.has(t)) break;
 					let n = g.get(t);
 					if (n && n.value.type !== "empty" || Dt(h, n?.styleIndex ?? 0).xf.alignH !== "centerContinuous") break;
-					V += i[e], U = e;
+					V += a[e], U = e;
 				}
 				let se = D === "centerContinuous" ? ee : P, ce = D === "centerContinuous" ? V : M, le = J.includes("\n");
 				if (!O && !z.wrapText && !z.textRotation && !E && !le) {
-					let t = e.measureText(J).width, a = D === "centerContinuous", o = a ? t + 6 : t + R + 3, c = a ? V : M;
-					if (o > c) {
-						let e = o - c, t = 0, l = 0;
-						if (D === "right" ? l = e : D === "center" || a ? (l = e / 2, t = e / 2) : t = e, t > 0) {
-							let e = t, o = a ? U + 1 : n + 1;
+					let t = e.measureText(J).width, i = D === "centerContinuous", o = i ? t + 6 : t + R + 3, s = i ? V : M;
+					if (o > s) {
+						let e = o - s, t = 0, l = 0;
+						if (D === "right" ? l = e : D === "center" || i ? (l = e / 2, t = e / 2) : t = e, t > 0) {
+							let e = t, o = i ? U + 1 : n + 1;
 							for (let t = o; t < C && e > 0; t++) {
-								let n = `${s}:${r + t}`;
+								let n = `${c}:${r + t}`;
 								if (y.has(n) || v.has(n)) break;
-								let a = g.get(n);
-								if (a && a.value.type !== "empty") break;
-								ce += i[t], e -= i[t];
+								let i = g.get(n);
+								if (i && i.value.type !== "empty") break;
+								ce += a[t], e -= a[t];
 							}
 						}
 						if (l > 0) {
 							let e = l;
 							for (let t = n - 1; t >= 0 && e > 0; t--) {
-								let n = `${s}:${r + t}`;
+								let n = `${c}:${r + t}`;
 								if (y.has(n) || v.has(n)) break;
-								let a = g.get(n);
-								if (a && a.value.type !== "empty") break;
-								se -= i[t], ce += i[t], e -= i[t];
+								let i = g.get(n);
+								if (i && i.value.type !== "empty") break;
+								se -= a[t], ce += a[t], e -= a[t];
 							}
 						}
 					}
@@ -1904,7 +1904,7 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 				D === "right" ? (G = P + M - 3, K = "right") : D === "center" ? (G = P + M / 2, K = "center") : D === "centerContinuous" ? (G = ee + V / 2, K = "center") : D === "distributed" || D === "justify" && !z.wrapText && !le ? (G = P + 3, K = "left") : (G = P + R, K = "left");
 				let q = z.textRotation ?? 0, de = q === 255, fe = q > 0 && q !== 255;
 				if (B.iconSet && j > 0 && (e.save(), e.beginPath(), e.rect(P, w, M, N), e.clip(), It(e, B.iconSet.name, B.iconSet.index, P + 2, w + (N - j) / 2, j), e.restore()), e.save(), e.beginPath(), e.rect(se, w, ce, N), e.clip(), de) {
-					let t = Math.round(I.size * p * 1.1), n = J.length * t, r = k === "top" ? w + 2 : k === "center" ? w + (N - n) / 2 : w + N - n - 2;
+					let t = Math.round(I.size * i * 1.1), n = J.length * t, r = k === "top" ? w + 2 : k === "center" ? w + (N - n) / 2 : w + N - n - 2;
 					e.textAlign = "center", e.textBaseline = "top";
 					for (let n of J) e.fillText(n, P + M / 2, r), r += t;
 					e.restore();
@@ -1930,103 +1930,103 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 				} catch {}
 				let Y = F.value.type === "text" ? F.value.runs : void 0, pe = Y && Y.length > 0;
 				if (z.wrapText && pe) {
-					let t = jt(e, Y, _, x, M - R - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * p * 1.2), 0), r;
+					let t = jt(e, Y, _, x, M - R - 3), n = t.reduce((e, t) => e + Math.round(t.maxFontSize * i * 1.2), 0), r;
 					r = k === "top" ? w + 2 : k === "center" ? w + (N - n) / 2 : w + N - n - 2, e.textAlign = "left", e.textBaseline = "top";
-					let i = z.readingOrder === 2 || Xe(Y), a = i && qe(z.readingOrder, Y.map((e) => e.text).join("")), o = e;
+					let a = z.readingOrder === 2 || Xe(Y), o = a && qe(z.readingOrder, Y.map((e) => e.text).join("")), s = e;
 					for (let n of t) {
-						let t = Math.round(n.maxFontSize * p * 1.2), s = n.segments.reduce((e, t) => e + t.width, 0), c;
-						c = D === "right" ? P + M - 3 - s : D === "center" ? P + M / 2 - s / 2 : P + R;
-						let l = i ? Qe(n.segments, a) : null;
+						let t = Math.round(n.maxFontSize * i * 1.2), c = n.segments.reduce((e, t) => e + t.width, 0), l;
+						l = D === "right" ? P + M - 3 - c : D === "center" ? P + M / 2 - c / 2 : P + R;
+						let u = a ? Qe(n.segments, o) : null;
 						for (let t = 0; t < n.segments.length; t++) {
-							let i = l ? l.order[t] : t, a = n.segments[i];
-							if (l) try {
-								o.direction = l.rtl[i] ? "rtl" : "ltr";
+							let a = u ? u.order[t] : t, o = n.segments[a];
+							if (u) try {
+								s.direction = u.rtl[a] ? "rtl" : "ltr";
 							} catch {}
-							e.font = wt(a.font, x);
-							let s = B.fontColor ?? a.font.color;
-							e.fillStyle = s ? Q(s) : "#000000", e.fillText(a.text, c, r);
-							let u = Math.round(a.font.size * p);
-							if (a.font.underline) {
-								let t = s ? Q(s) : "#000000", n = a.font.underlineStyle === "double" || a.font.underlineStyle === "doubleAccounting";
-								Tt(e, c, c + a.width, r + u + 1, t, n);
+							e.font = wt(o.font, x);
+							let c = B.fontColor ?? o.font.color;
+							e.fillStyle = c ? Q(c) : "#000000", e.fillText(o.text, l, r);
+							let d = Math.round(o.font.size * i);
+							if (o.font.underline) {
+								let t = c ? Q(c) : "#000000", n = o.font.underlineStyle === "double" || o.font.underlineStyle === "doubleAccounting";
+								Tt(e, l, l + o.width, r + d + 1, t, n);
 							}
-							if (a.font.strike) {
-								e.save(), e.strokeStyle = s ? Q(s) : "#000000", e.lineWidth = .5;
-								let t = r + Math.round(u * .5);
-								e.beginPath(), e.moveTo(c, t), e.lineTo(c + a.width, t), e.stroke(), e.restore();
+							if (o.font.strike) {
+								e.save(), e.strokeStyle = c ? Q(c) : "#000000", e.lineWidth = .5;
+								let t = r + Math.round(d * .5);
+								e.beginPath(), e.moveTo(l, t), e.lineTo(l + o.width, t), e.stroke(), e.restore();
 							}
-							c += a.width;
+							l += o.width;
 						}
 						r += t;
 					}
-					if (i) try {
-						o.direction = "ltr";
+					if (a) try {
+						s.direction = "ltr";
 					} catch {}
 				} else if (z.wrapText) {
-					let t = Ot(e, J, M - R - 3), n = Math.round(I.size * p * 1.2), r = t.length * n, i;
-					k === "top" ? (i = w + 2, e.textBaseline = "top") : k === "center" ? (i = w + (N - r) / 2, e.textBaseline = "top") : (i = w + N - r - 2, e.textBaseline = "top");
-					for (let r = 0; r < t.length; r++) e.fillText(t[r], G, i + r * n);
+					let t = Ot(e, J, M - R - 3), n = Math.round(I.size * i * 1.2), r = t.length * n, a;
+					k === "top" ? (a = w + 2, e.textBaseline = "top") : k === "center" ? (a = w + (N - r) / 2, e.textBaseline = "top") : (a = w + N - r - 2, e.textBaseline = "top");
+					for (let r = 0; r < t.length; r++) e.fillText(t[r], G, a + r * n);
 				} else if (pe) {
 					let t = Y.map((e) => Et(_, e)), n = Y.map((e) => e.font?.vertAlign), r = t.map((e, t) => n[t] === "superscript" || n[t] === "subscript" ? {
 						...e,
 						size: e.size * .65
-					} : e), i = Y.map((t, n) => (e.font = wt(r[n], x), e.measureText(t.text).width)), a = i.reduce((e, t) => e + t, 0), o;
-					o = D === "right" ? P + M - 3 - a : D === "center" ? P + M / 2 - a / 2 : P + R, e.textAlign = "left";
-					let s;
-					k === "top" ? (e.textBaseline = "top", s = w + 2) : k === "center" ? (e.textBaseline = "middle", s = w + N / 2) : (e.textBaseline = "bottom", s = w + N - 2);
-					let c = z.readingOrder === 2 || Xe(Y) ? Qe(Y, qe(z.readingOrder, Y.map((e) => e.text).join(""))) : null, l = e, u = o;
-					for (let a = 0; a < Y.length; a++) {
-						let o = c ? c.order[a] : a;
-						if (c) try {
-							l.direction = c.rtl[o] ? "rtl" : "ltr";
+					} : e), a = Y.map((t, n) => (e.font = wt(r[n], x), e.measureText(t.text).width)), o = a.reduce((e, t) => e + t, 0), s;
+					s = D === "right" ? P + M - 3 - o : D === "center" ? P + M / 2 - o / 2 : P + R, e.textAlign = "left";
+					let c;
+					k === "top" ? (e.textBaseline = "top", c = w + 2) : k === "center" ? (e.textBaseline = "middle", c = w + N / 2) : (e.textBaseline = "bottom", c = w + N - 2);
+					let l = z.readingOrder === 2 || Xe(Y) ? Qe(Y, qe(z.readingOrder, Y.map((e) => e.text).join(""))) : null, u = e, d = s;
+					for (let o = 0; o < Y.length; o++) {
+						let s = l ? l.order[o] : o;
+						if (l) try {
+							u.direction = l.rtl[s] ? "rtl" : "ltr";
 						} catch {}
-						let d = r[o], f = t[o];
-						e.font = wt(d, x);
-						let m = B.fontColor ?? d.color;
+						let f = r[s], p = t[s];
+						e.font = wt(f, x);
+						let m = B.fontColor ?? f.color;
 						e.fillStyle = m ? Q(m) : "#000000";
-						let h = Math.round(f.size * p), g = 0;
-						n[o] === "superscript" ? g = -Math.round(h * .35) : n[o] === "subscript" && (g = Math.round(h * .1)), e.fillText(Y[o].text, u, s + g);
-						let _ = Math.round(d.size * p);
-						if (d.underline) {
+						let h = Math.round(p.size * i), g = 0;
+						n[s] === "superscript" ? g = -Math.round(h * .35) : n[s] === "subscript" && (g = Math.round(h * .1)), e.fillText(Y[s].text, d, c + g);
+						let _ = Math.round(f.size * i);
+						if (f.underline) {
 							let t = (k === "top" ? w + 2 + _ + 1 : k === "center" ? w + N / 2 + Math.round(_ * .55) : w + N - 2 + 1) + g, n = m ? Q(m) : "#000000";
-							Tt(e, u, u + i[o], t, n, d.underlineStyle === "double" || d.underlineStyle === "doubleAccounting");
+							Tt(e, d, d + a[s], t, n, f.underlineStyle === "double" || f.underlineStyle === "doubleAccounting");
 						}
-						if (d.strike) {
+						if (f.strike) {
 							let t = (k === "top" ? w + 2 + Math.round(_ * .5) : k === "center" ? w + N / 2 : w + N - 2 - Math.round(_ * .35)) + g;
-							e.save(), e.strokeStyle = m ? Q(m) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(u, t), e.lineTo(u + i[o], t), e.stroke(), e.restore();
+							e.save(), e.strokeStyle = m ? Q(m) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(d, t), e.lineTo(d + a[s], t), e.stroke(), e.restore();
 						}
-						u += i[o];
+						d += a[s];
 					}
-					if (c) try {
-						l.direction = "ltr";
+					if (l) try {
+						u.direction = "ltr";
 					} catch {}
 				} else {
-					let t = _.vertAlign, n = Math.round(I.size * p), r = 0;
+					let t = _.vertAlign, n = Math.round(I.size * i), r = 0;
 					t === "superscript" ? r = -Math.round(n * .35) : t === "subscript" && (r = Math.round(n * .1));
-					let i = t ? {
+					let a = t ? {
 						..._,
 						size: _.size * .65
 					} : _;
-					t && (e.font = wt(i, x));
-					let a = null, o = () => a ??= e.measureText(J), s = () => {
-						let e = Math.min(o().width, ce - R - 3);
+					t && (e.font = wt(a, x));
+					let o = null, s = () => o ??= e.measureText(J), c = () => {
+						let e = Math.min(s().width, ce - R - 3);
 						return {
 							x: D === "right" ? P + M - 3 - e : D === "center" ? P + M / 2 - e / 2 : P + R,
 							width: e
 						};
-					}, c = Math.round(i.size * p);
+					}, l = Math.round(a.size * i);
 					if (_.underline || b) {
-						let { x: t, width: n } = s(), i = (k === "top" ? w + 2 + c + 1 : k === "center" ? w + N / 2 + Math.round(c * .55) : w + N - 2 + 1) + r, a = b ? "#0563C1" : T ? Q(T) : "#000000", o = _.underlineStyle === "double" || _.underlineStyle === "doubleAccounting";
+						let { x: t, width: n } = c(), i = (k === "top" ? w + 2 + l + 1 : k === "center" ? w + N / 2 + Math.round(l * .55) : w + N - 2 + 1) + r, a = b ? "#0563C1" : T ? Q(T) : "#000000", o = _.underlineStyle === "double" || _.underlineStyle === "doubleAccounting";
 						Tt(e, t, t + n, i, a, o);
 					}
 					if (_.strike) {
-						let { x: t, width: n } = s(), i = (k === "top" ? w + 2 + Math.round(c * .5) : k === "center" ? w + N / 2 : w + N - 2 - Math.round(c * .35)) + r;
+						let { x: t, width: n } = c(), i = (k === "top" ? w + 2 + Math.round(l * .5) : k === "center" ? w + N / 2 : w + N - 2 - Math.round(l * .35)) + r;
 						e.save(), e.strokeStyle = T ? Q(T) : "#000000", e.lineWidth = .5, e.beginPath(), e.moveTo(t, i), e.lineTo(t + n, i), e.stroke(), e.restore();
 					}
 					if (J.includes("\n")) {
-						let t = J.split("\n"), n = Math.round(I.size * p * 1.2), i = t.length * n, a;
-						k === "top" ? (a = w + 2, e.textBaseline = "top") : k === "center" ? (a = w + (N - i) / 2, e.textBaseline = "top") : (a = w + N - i - 2, e.textBaseline = "top");
-						for (let i = 0; i < t.length; i++) e.fillText(t[i], G, a + i * n + r);
+						let t = J.split("\n"), n = Math.round(I.size * i * 1.2), a = t.length * n, o;
+						k === "top" ? (o = w + 2, e.textBaseline = "top") : k === "center" ? (o = w + (N - a) / 2, e.textBaseline = "top") : (o = w + N - a - 2, e.textBaseline = "top");
+						for (let i = 0; i < t.length; i++) e.fillText(t[i], G, o + i * n + r);
 					} else {
 						let t;
 						k === "top" ? (e.textBaseline = "top", t = w + 2) : k === "center" ? (e.textBaseline = "middle", t = w + N / 2) : (e.textBaseline = "bottom", t = w + N - 2), e.fillText(W, G, t + r);
@@ -2038,8 +2038,8 @@ function Ht(e, t, n, r, i, a, o, s, c, l, u, d, f, m) {
 					y: w,
 					width: M,
 					height: N,
-					row: s,
-					col: a
+					row: c,
+					col: o
 				});
 			});
 		}
@@ -2186,97 +2186,97 @@ function qt(e, t, n) {
 	for (let i = 1; i < t; i++) r += Math.round(Z(e.rowHeights[i] ?? e.defaultRowHeight) * n);
 	return r;
 }
-function Jt(t, n, r, i, a, o, s, c, l, u, d, f) {
-	if (d <= 0 || f <= 0) return;
-	let p = $(n, o, i), m = qt(n, a, i);
-	t.save(), t.beginPath(), t.rect(l, u, d, f), t.clip();
-	for (let a of n.images) {
-		let o = r.get(a.dataUrl);
-		if (!o) continue;
-		let h = a.fromCol + 1, g = a.fromRow + 1, _ = $(n, h, i) + a.fromColOff * i / e, v = qt(n, g, i) + a.fromRowOff * i / e, y, b;
-		if (a.editAs === "oneCell" && a.nativeExtCx > 0 && a.nativeExtCy > 0) y = a.nativeExtCx * i / e, b = a.nativeExtCy * i / e;
+function Jt(e, t, n, r, i, a, o, s, c, l, u, d) {
+	if (u <= 0 || d <= 0) return;
+	let p = $(t, a, r), m = qt(t, i, r);
+	e.save(), e.beginPath(), e.rect(c, l, u, d), e.clip();
+	for (let i of t.images) {
+		let a = n.get(i.dataUrl);
+		if (!a) continue;
+		let h = i.fromCol + 1, g = i.fromRow + 1, _ = $(t, h, r) + i.fromColOff * r / f, v = qt(t, g, r) + i.fromRowOff * r / f, y, b;
+		if (i.editAs === "oneCell" && i.nativeExtCx > 0 && i.nativeExtCy > 0) y = i.nativeExtCx * r / f, b = i.nativeExtCy * r / f;
 		else {
-			let t = a.toCol + 1, r = a.toRow + 1, o = $(n, t, i) + a.toColOff * i / e, s = qt(n, r, i) + a.toRowOff * i / e;
-			y = o - _, b = s - v;
+			let e = i.toCol + 1, n = i.toRow + 1, a = $(t, e, r) + i.toColOff * r / f, o = qt(t, n, r) + i.toRowOff * r / f;
+			y = a - _, b = o - v;
 		}
 		if (y <= 0 || b <= 0) continue;
-		let x = l + (_ - p) - s, S = u + (v - m) - c;
-		x + y < l || x > l + d || S + b < u || S > u + f || t.drawImage(o, x, S, y, b);
+		let x = c + (_ - p) - o, S = l + (v - m) - s;
+		x + y < c || x > c + u || S + b < l || S > l + d || e.drawImage(a, x, S, y, b);
 	}
-	t.restore();
+	e.restore();
 }
-function Yt(t, n, r, i, a, o, s, c, l, u, d, f) {
-	if (u <= 0 || d <= 0) return;
-	let p = n.shapeGroups;
+function Yt(e, t, n, r, i, a, o, s, c, l, u, d) {
+	if (l <= 0 || u <= 0) return;
+	let p = t.shapeGroups;
 	if (!p || p.length === 0) return;
-	let m = $(n, a, r), h = qt(n, i, r);
-	t.save(), t.beginPath(), t.rect(c, l, u, d), t.clip();
-	for (let i of p) {
-		let a = i.fromCol + 1, p = i.fromRow + 1, g = $(n, a, r) + i.fromColOff * r / e, _ = qt(n, p, r) + i.fromRowOff * r / e, v, y;
-		if (i.editAs === "oneCell" && i.nativeExtCx > 0 && i.nativeExtCy > 0) v = i.nativeExtCx * r / e, y = i.nativeExtCy * r / e;
+	let m = $(t, i, n), h = qt(t, r, n);
+	e.save(), e.beginPath(), e.rect(s, c, l, u), e.clip();
+	for (let r of p) {
+		let i = r.fromCol + 1, p = r.fromRow + 1, g = $(t, i, n) + r.fromColOff * n / f, _ = qt(t, p, n) + r.fromRowOff * n / f, v, y;
+		if (r.editAs === "oneCell" && r.nativeExtCx > 0 && r.nativeExtCy > 0) v = r.nativeExtCx * n / f, y = r.nativeExtCy * n / f;
 		else {
-			let t = i.toCol + 1, a = i.toRow + 1, o = $(n, t, r) + i.toColOff * r / e, s = qt(n, a, r) + i.toRowOff * r / e;
-			v = o - g, y = s - _;
+			let e = r.toCol + 1, i = r.toRow + 1, a = $(t, e, n) + r.toColOff * n / f, o = qt(t, i, n) + r.toRowOff * n / f;
+			v = a - g, y = o - _;
 		}
 		if (v <= 0 || y <= 0) continue;
-		let b = c + (g - m) - o, x = l + (_ - h) - s;
-		if (!(b + v < c || b > c + u) && !(x + y < l || x > l + d)) for (let e of i.shapes) {
-			let n = b + e.x * v, i = x + e.y * y, a = e.w * v, o = e.h * y;
-			a <= 0 || o <= 0 || Xt(t, e, n, i, a, o, r, f);
+		let b = s + (g - m) - a, x = c + (_ - h) - o;
+		if (!(b + v < s || b > s + l) && !(x + y < c || x > c + u)) for (let t of r.shapes) {
+			let r = b + t.x * v, i = x + t.y * y, a = t.w * v, o = t.h * y;
+			a <= 0 || o <= 0 || Xt(e, t, r, i, a, o, n, d);
 		}
 	}
-	t.restore();
+	e.restore();
 }
-function Xt(t, n, r, i, a, o, s, c) {
-	if (t.save(), n.rot === 0 ? t.translate(r, i) : (t.translate(r + a / 2, i + o / 2), t.rotate(n.rot * Math.PI / 180), t.translate(-a / 2, -o / 2)), n.geom.type === "custom") for (let e of n.geom.paths) {
-		if (e.w <= 0 || e.h <= 0) continue;
-		let r = a / e.w, i = o / e.h;
-		t.beginPath();
+function Xt(e, t, n, r, i, a, o, s) {
+	if (e.save(), t.rot === 0 ? e.translate(n, r) : (e.translate(n + i / 2, r + a / 2), e.rotate(t.rot * Math.PI / 180), e.translate(-i / 2, -a / 2)), t.geom.type === "custom") for (let n of t.geom.paths) {
+		if (n.w <= 0 || n.h <= 0) continue;
+		let r = i / n.w, o = a / n.h;
+		e.beginPath();
 		let s = 0, c = 0, l = 0, u = 0;
-		for (let n of e.commands) switch (n.op) {
+		for (let t of n.commands) switch (t.op) {
 			case "moveTo": {
-				let e = n.x * r, a = n.y * i;
-				t.moveTo(e, a), s = l = e, c = u = a;
+				let n = t.x * r, i = t.y * o;
+				e.moveTo(n, i), s = l = n, c = u = i;
 				break;
 			}
 			case "lineTo": {
-				let e = n.x * r, a = n.y * i;
-				t.lineTo(e, a), s = e, c = a;
+				let n = t.x * r, i = t.y * o;
+				e.lineTo(n, i), s = n, c = i;
 				break;
 			}
 			case "cubicBezTo": {
-				let e = n.x3 * r, a = n.y3 * i;
-				t.bezierCurveTo(n.x1 * r, n.y1 * i, n.x2 * r, n.y2 * i, e, a), s = e, c = a;
+				let n = t.x3 * r, i = t.y3 * o;
+				e.bezierCurveTo(t.x1 * r, t.y1 * o, t.x2 * r, t.y2 * o, n, i), s = n, c = i;
 				break;
 			}
 			case "quadBezTo": {
-				let e = n.x2 * r, a = n.y2 * i;
-				t.quadraticCurveTo(n.x1 * r, n.y1 * i, e, a), s = e, c = a;
+				let n = t.x2 * r, i = t.y2 * o;
+				e.quadraticCurveTo(t.x1 * r, t.y1 * o, n, i), s = n, c = i;
 				break;
 			}
 			case "arcTo": {
-				let e = n.wr * r, a = n.hr * i;
-				if (e <= 0 || a <= 0) break;
-				let o = n.stAng / 6e4 * (Math.PI / 180), l = n.swAng / 6e4 * (Math.PI / 180), u = s - Math.cos(o) * e, d = c - Math.sin(o) * a, f = o + l;
-				t.ellipse(u, d, e, a, 0, o, f, l < 0), s = u + Math.cos(f) * e, c = d + Math.sin(f) * a;
+				let n = t.wr * r, i = t.hr * o;
+				if (n <= 0 || i <= 0) break;
+				let a = t.stAng / 6e4 * (Math.PI / 180), l = t.swAng / 6e4 * (Math.PI / 180), u = s - Math.cos(a) * n, d = c - Math.sin(a) * i, f = a + l;
+				e.ellipse(u, d, n, i, 0, a, f, l < 0), s = u + Math.cos(f) * n, c = d + Math.sin(f) * i;
 				break;
 			}
 			case "close":
-				t.closePath(), s = l, c = u;
+				e.closePath(), s = l, c = u;
 				break;
 		}
-		sn(t, n);
+		sn(e, t);
 	}
-	else if (n.geom.type === "preset") {
-		let r = n.fillColor ?? null, i = n.strokeColor && n.strokeWidth > 0 ? () => {
-			t.strokeStyle = n.strokeColor, t.lineWidth = Math.max(.5, n.strokeWidth / e), t.stroke();
+	else if (t.geom.type === "preset") {
+		let n = t.fillColor ?? null, r = t.strokeColor && t.strokeWidth > 0 ? () => {
+			e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / f), e.stroke();
 		} : null;
-		y(t, n.geom.name, 0, 0, a, o, n.geom.adj ?? [], r, i, () => {}) || (t.beginPath(), t.rect(0, 0, a, o), sn(t, n));
-	} else if (n.geom.type === "image") {
-		let e = c?.get(n.geom.dataUrl);
-		e && t.drawImage(e, 0, 0, a, o);
+		y(e, t.geom.name, 0, 0, i, a, t.geom.adj ?? [], n, r, () => {}) || (e.beginPath(), e.rect(0, 0, i, a), sn(e, t));
+	} else if (t.geom.type === "image") {
+		let n = s?.get(t.geom.dataUrl);
+		n && e.drawImage(n, 0, 0, i, a);
 	}
-	n.text && on(t, n.text, a, o, s), t.restore();
+	t.text && on(e, t.text, i, a, o), e.restore();
 }
 var Zt = /* @__PURE__ */ new WeakMap();
 function Qt(e, t) {
@@ -2326,26 +2326,26 @@ async function an(e, t) {
 		} catch {}
 	}
 }
-function on(e, t, n, r, i) {
+function on(e, t, n, r, a) {
 	if (n <= 0 || r <= 0 || t.paragraphs.length === 0) return;
-	let a = 7 * i, o = 4 * i, s = Math.max(0, n - a * 2), c = Math.max(0, r - o * 2);
-	if (s <= 0 || c <= 0) return;
-	let l = (e) => {
-		let t = (e.size > 0 ? e.size : ot) * p * i, n = at(e.fontFace);
+	let o = 7 * a, s = 4 * a, c = Math.max(0, n - o * 2), l = Math.max(0, r - s * 2);
+	if (c <= 0 || l <= 0) return;
+	let u = (e) => {
+		let t = (e.size > 0 ? e.size : ot) * i * a, n = at(e.fontFace);
 		return {
 			font: `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${t}px ${n}`,
 			px: t
 		};
-	}, u = t.wrap !== "none", d = [];
+	}, d = t.wrap !== "none", f = [];
 	for (let n of t.paragraphs) {
-		let t = n.align || "l", r = [], a = 0, o = 0, c = 0, f = !1, m = () => {
-			d.push({
+		let t = n.align || "l", r = [], o = 0, s = 0, l = 0, p = !1, m = () => {
+			f.push({
 				segs: r,
 				align: t,
-				height: o,
-				ascent: c,
-				hasMath: f
-			}), r = [], a = 0, o = 0, c = 0, f = !1;
+				height: s,
+				ascent: l,
+				hasMath: p
+			}), r = [], o = 0, s = 0, l = 0, p = !1;
 		}, h = 0;
 		for (let g of n.runs) {
 			if (g.type === "break") {
@@ -2355,14 +2355,14 @@ function on(e, t, n, r, i) {
 			if (g.type === "math") {
 				let e = Zt.get(g.nodes);
 				if (!e) continue;
-				let n = (g.fontSize ?? (h || ot)) * p * i, l = e.widthEm * n, _ = e.ascentEm * n, v = e.descentEm * n, y = g.color ?? "#000000";
+				let n = (g.fontSize ?? (h || ot)) * i * a, u = e.widthEm * n, _ = e.ascentEm * n, v = e.descentEm * n, y = g.color ?? "#000000";
 				if (g.display) {
-					m(), d.push({
+					m(), f.push({
 						segs: [{
 							kind: "math",
 							render: e,
 							color: y,
-							w: l,
+							w: u,
 							ascent: _,
 							descent: v
 						}],
@@ -2373,25 +2373,25 @@ function on(e, t, n, r, i) {
 					});
 					continue;
 				}
-				u && a + l > s && r.length > 0 && m(), r.push({
+				d && o + u > c && r.length > 0 && m(), r.push({
 					kind: "math",
 					render: e,
 					color: y,
-					w: l,
+					w: u,
 					ascent: _,
 					descent: v
-				}), a += l, o = Math.max(o, _ + v), c = Math.max(c, _), f = !0;
+				}), o += u, s = Math.max(s, _ + v), l = Math.max(l, _), p = !0;
 				continue;
 			}
 			h = g.size > 0 ? g.size : ot;
-			let { font: n, px: _ } = l(g), v = g.color ?? "#000000";
-			o = Math.max(o, _ * 1.2), c = Math.max(c, _ * .85), e.font = n;
+			let { font: n, px: _ } = u(g), v = g.color ?? "#000000";
+			s = Math.max(s, _ * 1.2), l = Math.max(l, _ * .85), e.font = n;
 			let y = g.text.split("\n");
 			for (let t = 0; t < y.length; t++) {
 				t > 0 && m();
 				let i = y[t];
 				if (!i) continue;
-				if (!u) {
+				if (!d) {
 					let t = e.measureText(i).width;
 					r.push({
 						kind: "text",
@@ -2399,46 +2399,46 @@ function on(e, t, n, r, i) {
 						font: n,
 						color: v,
 						w: t
-					}), a += t;
+					}), o += t;
 					continue;
 				}
-				let l = "";
+				let a = "";
 				for (let t of i) {
-					let i = l + t, u = e.measureText(i).width;
-					if (a + u > s && (l.length > 0 || r.length > 0)) {
-						if (l) {
-							let t = e.measureText(l).width;
+					let i = a + t, u = e.measureText(i).width;
+					if (o + u > c && (a.length > 0 || r.length > 0)) {
+						if (a) {
+							let t = e.measureText(a).width;
 							r.push({
 								kind: "text",
-								text: l,
+								text: a,
 								font: n,
 								color: v,
 								w: t
-							}), a += t;
+							}), o += t;
 						}
-						m(), l = t, e.font = n, o = Math.max(o, _ * 1.2), c = Math.max(c, _ * .85);
-					} else l = i;
+						m(), a = t, e.font = n, s = Math.max(s, _ * 1.2), l = Math.max(l, _ * .85);
+					} else a = i;
 				}
-				if (l) {
-					let t = e.measureText(l).width;
+				if (a) {
+					let t = e.measureText(a).width;
 					r.push({
 						kind: "text",
-						text: l,
+						text: a,
 						font: n,
 						color: v,
 						w: t
-					}), a += t;
+					}), o += t;
 				}
 			}
 		}
 		m();
 	}
-	let f = d.reduce((e, t) => e + t.height, 0), m = o;
-	t.anchor === "ctr" ? m = o + (c - f) / 2 : t.anchor === "b" && (m = o + Math.max(0, c - f));
+	let p = f.reduce((e, t) => e + t.height, 0), m = s;
+	t.anchor === "ctr" ? m = s + (l - p) / 2 : t.anchor === "b" && (m = s + Math.max(0, l - p));
 	let h = m;
-	for (let t of d) {
-		let n = t.segs.reduce((e, t) => e + t.w, 0), r = a;
-		if (t.align === "ctr" ? r = a + Math.max(0, (s - n) / 2) : t.align === "r" && (r = a + Math.max(0, s - n)), t.hasMath) {
+	for (let t of f) {
+		let n = t.segs.reduce((e, t) => e + t.w, 0), r = o;
+		if (t.align === "ctr" ? r = o + Math.max(0, (c - n) / 2) : t.align === "r" && (r = o + Math.max(0, c - n)), t.hasMath) {
 			e.textBaseline = "alphabetic";
 			let n = h + t.ascent;
 			for (let i of t.segs) {
@@ -2457,8 +2457,8 @@ function on(e, t, n, r, i) {
 		h += t.height;
 	}
 }
-function sn(t, n) {
-	n.fillColor && (t.fillStyle = n.fillColor, t.fill()), n.strokeColor && n.strokeWidth > 0 && (t.strokeStyle = n.strokeColor, t.lineWidth = Math.max(.5, n.strokeWidth / e), t.stroke());
+function sn(e, t) {
+	t.fillColor && (e.fillStyle = t.fillColor, e.fill()), t.strokeColor && t.strokeWidth > 0 && (e.strokeStyle = t.strokeColor, e.lineWidth = Math.max(.5, t.strokeWidth / f), e.stroke());
 }
 function cn(e, t, n, r, i, a, o) {
 	if (r === n && i === t) return e;
@@ -2715,35 +2715,35 @@ function gn(e) {
 		radarStyle: e.radarStyle ?? null
 	};
 }
-function _n(t, n, r, i, a, o, c, l, u, d, f) {
-	if (d <= 0 || f <= 0) return;
-	let m = $(n, a, r), h = qt(n, i, r);
-	for (let i of n.charts) {
-		let a = i.fromCol + 1, g = i.fromRow + 1, _ = i.toCol + 1, v = i.toRow + 1, y = $(n, a, r) + i.fromColOff * r / e, b = qt(n, g, r) + i.fromRowOff * r / e, x = $(n, _, r) + i.toColOff * r / e, S = qt(n, v, r) + i.toRowOff * r / e, C = x - y, w = S - b;
+function _n(e, t, n, r, a, o, s, c, l, u, d) {
+	if (u <= 0 || d <= 0) return;
+	let m = $(t, a, n), h = qt(t, r, n);
+	for (let r of t.charts) {
+		let a = r.fromCol + 1, g = r.fromRow + 1, _ = r.toCol + 1, v = r.toRow + 1, y = $(t, a, n) + r.fromColOff * n / f, b = qt(t, g, n) + r.fromRowOff * n / f, x = $(t, _, n) + r.toColOff * n / f, S = qt(t, v, n) + r.toRowOff * n / f, C = x - y, w = S - b;
 		if (C <= 0 || w <= 0) continue;
-		let T = l + (y - m) - o, E = u + (b - h) - c;
-		if (T + C < l || T > l + d || E + w < u || E > u + f) continue;
-		t.save(), t.beginPath(), t.rect(l, u, d, f), t.clip();
-		let D = p * r;
-		s(t, gn(i.chart), {
+		let T = c + (y - m) - o, E = l + (b - h) - s;
+		if (T + C < c || T > c + u || E + w < l || E > l + d) continue;
+		e.save(), e.beginPath(), e.rect(c, l, u, d), e.clip();
+		let D = i * n;
+		p(e, gn(r.chart), {
 			x: T,
 			y: E,
 			w: C,
 			h: w
-		}, D), t.restore();
+		}, D), e.restore();
 	}
 }
 var vn = "600 12px \"Meiryo UI\", \"Segoe UI\", sans-serif", yn = "11px \"Meiryo UI\", \"Segoe UI\", sans-serif", bn = "#FFFFFF", xn = "#BFBFBF", Sn = "#F2F2F2", Cn = "#404040", wn = "#FFFFFF", Tn = "#000000", En = "#A5A5A5", Dn = "#E7E6E6", On = "#A6A6A6", kn = "#C6C6C6";
-function An(t, n, r, i, a, o, s, c, l, u, d) {
-	if (u <= 0 || d <= 0) return;
-	let f = n.slicers;
-	if (!f) return;
-	let p = $(n, a, r), m = qt(n, i, r);
-	for (let i of f) {
-		let a = i.fromCol + 1, f = i.fromRow + 1, h = i.toCol + 1, g = i.toRow + 1, _ = $(n, a, r) + i.fromColOff * r / e, v = qt(n, f, r) + i.fromRowOff * r / e, y = $(n, h, r) + i.toColOff * r / e, b = qt(n, g, r) + i.toRowOff * r / e, x = y - _, S = b - v;
+function An(e, t, n, r, i, a, o, s, c, l, u) {
+	if (l <= 0 || u <= 0) return;
+	let d = t.slicers;
+	if (!d) return;
+	let p = $(t, i, n), m = qt(t, r, n);
+	for (let r of d) {
+		let i = r.fromCol + 1, d = r.fromRow + 1, h = r.toCol + 1, g = r.toRow + 1, _ = $(t, i, n) + r.fromColOff * n / f, v = qt(t, d, n) + r.fromRowOff * n / f, y = $(t, h, n) + r.toColOff * n / f, b = qt(t, g, n) + r.toRowOff * n / f, x = y - _, S = b - v;
 		if (x <= 0 || S <= 0) continue;
-		let C = c + (_ - p) - o, w = l + (v - m) - s;
-		C + x < c || C > c + u || w + S < l || w > l + d || (t.save(), t.beginPath(), t.rect(c, l, u, d), t.clip(), jn(t, i.caption, i.items, C, w, x, S, r), t.restore());
+		let C = s + (_ - p) - a, w = c + (v - m) - o;
+		C + x < s || C > s + l || w + S < c || w > c + u || (e.save(), e.beginPath(), e.rect(s, c, l, u), e.clip(), jn(e, r.caption, r.items, C, w, x, S, n), e.restore());
 	}
 }
 function jn(e, t, n, r, i, a, o, s) {
@@ -2785,8 +2785,8 @@ async function Pn(e, t, n, r = {}) {
 		let t = await (await fetch(e)).blob(), n = await createImageBitmap(t);
 		o.set(e, n);
 	})).catch(() => {}), e.math && rn(i) && await an(i, e.math);
-	let c = r.dpr ?? f(), l = u(t) ? t.clientWidth || 800 : t.width, d = u(t) ? t.clientHeight || 600 : t.height, p = r.width ?? l, m = r.height ?? d;
-	t.width = Math.round(p * c), t.height = Math.round(m * c), u(t) && (t.style.width = `${p}px`, t.style.height = `${m}px`);
+	let c = r.dpr ?? d(), u = l(t) ? t.clientWidth || 800 : t.width, f = l(t) ? t.clientHeight || 600 : t.height, p = r.width ?? u, m = r.height ?? f;
+	t.width = Math.round(p * c), t.height = Math.round(m * c), l(t) && (t.style.width = `${p}px`, t.style.height = `${m}px`);
 	let h = t.getContext("2d");
 	h.scale(c, c), Gt(h, i, a, n, {
 		...r,
@@ -2839,10 +2839,10 @@ function* Rn(e) {
 	for (let t of e?.sharedStrings ?? []) if (t.runs && t.runs.length > 0) for (let e of t.runs) yield e.text;
 	else yield t.text;
 }
-function zn(e) {
+function zn(t) {
 	let n = /* @__PURE__ */ new Set(), r = null;
-	for (let t of e?.styles?.fonts ?? []) t.name && (n.add(t.name), r ??= b(t.name));
-	for (let i of t(Rn(e), r)) n.add(i);
+	for (let i of t?.styles?.fonts ?? []) i.name && (n.add(i.name), r ??= e(i.name));
+	for (let e of c(Rn(t), r)) n.add(e);
 	return n;
 }
 function Bn(e) {
@@ -2941,25 +2941,25 @@ var Un = class e {
 		let i = new e(r === "worker" ? (await import("./render-worker-host-CI4BVZcT.js")).createRenderWorker() : new w(), r);
 		return await i._load(t, n), i;
 	}
-	async _load(e, t = {}) {
-		let n;
+	async _load(e, n = {}) {
+		let r;
 		if (typeof e == "string") {
 			let t = await fetch(e);
 			if (!t.ok) throw Error(`Failed to fetch: ${t.status} ${t.statusText}`);
-			n = await t.arrayBuffer();
-		} else n = e;
-		this.rawData = n, this.maxZipEntryBytes = t.maxZipEntryBytes, this.math = t.math, t.math && this._mode === "worker" && console.warn("[ooxml] the math engine is unavailable in mode: 'worker'; equations will be skipped. Use mode: 'main' for workbooks with equations."), this.parsedWorkbook = (await this.bridge.request((e) => this._mode === "worker" ? {
+			r = await t.arrayBuffer();
+		} else r = e;
+		this.rawData = r, this.maxZipEntryBytes = n.maxZipEntryBytes, this.math = n.math, n.math && this._mode === "worker" && console.warn("[ooxml] the math engine is unavailable in mode: 'worker'; equations will be skipped. Use mode: 'main' for workbooks with equations."), this.parsedWorkbook = (await this.bridge.request((e) => this._mode === "worker" ? {
 			type: "parse",
 			id: e,
-			data: n.slice(0),
+			data: r.slice(0),
 			maxZipEntryBytes: this.maxZipEntryBytes,
-			useGoogleFonts: !!t.useGoogleFonts
+			useGoogleFonts: !!n.useGoogleFonts
 		} : {
 			type: "parse",
 			id: e,
-			data: n.slice(0),
+			data: r.slice(0),
 			maxZipEntryBytes: this.maxZipEntryBytes
-		})).workbook, this._mode === "main" && t.useGoogleFonts && await l(zn(this.parsedWorkbook), Ln);
+		})).workbook, this._mode === "main" && n.useGoogleFonts && await t(zn(this.parsedWorkbook), Ln);
 	}
 	get sheetNames() {
 		return this.parsedWorkbook?.workbook.sheets.map((e) => e.name) ?? [];
@@ -3019,7 +3019,7 @@ var Un = class e {
 	async renderViewportToBitmap(e, t, n) {
 		let r = {
 			...n,
-			dpr: n.dpr ?? f()
+			dpr: n.dpr ?? d()
 		};
 		if (this._mode === "worker") {
 			if (!Number.isInteger(e) || e < 0 || e >= this.sheetCount) throw Error(`Sheet index ${e} out of range (count: ${this.sheetCount})`);
@@ -3895,10 +3895,10 @@ var rr = class {
 	destroy() {
 		this.resizeObserver?.disconnect(), this.hideCommentPopup(), this.hideValidationPanel(), this.keydownHandler && document.removeEventListener("keydown", this.keydownHandler), this.wb?.destroy();
 	}
-}, ir = /* @__PURE__ */ i({
+}, ir = /* @__PURE__ */ s({
 	XlsxViewer: () => rr,
 	XlsxWorkbook: () => Un,
-	autoResize: () => n
+	autoResize: () => a
 });
 //#endregion
 export { rr as n, Un as r, ir as t };