@silurus/ooxml 0.66.1 → 0.66.2

package/dist/{docx-BfmPyKWJ.js → docx-DW_bVXxg.js}

@@ -1253,15 +1253,16 @@ function bt(e, t, n) {
 		}
 		return e;
 	}
-	if (i.reduce((e, t) => e + t, 0) > 0) return o(i.map((e, t) => Math.max(e, a[t])));
-	let s = Array(r).fill(0), c = Array(r).fill(!1), l = (e) => e.widthPt == null ? e.widthPct == null ? null : e.widthPct / 5e3 * t : e.widthPt;
+	let s = e.widthPt != null || e.widthPct != null;
+	if (i.reduce((e, t) => e + t, 0) > 0 && s) return o(i.map((e, t) => Math.max(e, a[t])));
+	let c = Array(r).fill(0), l = Array(r).fill(!1), u = (e) => e.widthPt == null ? e.widthPct == null ? null : e.widthPct / 5e3 * t : e.widthPt;
 	for (let t of e.rows) {
 		let e = 0;
 		for (let n of t.cells) {
 			let t = Math.min(Math.max(n.colSpan, 1), r - e);
 			if (t === 1) {
-				let t = l(n);
-				t != null && (t > s[e] && (s[e] = t), c[e] = !0);
+				let t = u(n);
+				t != null && (t > c[e] && (c[e] = t), l[e] = !0);
 			}
 			e += t;
 		}
@@ -1271,14 +1272,14 @@ function bt(e, t, n) {
 		for (let n of t.cells) {
 			let t = Math.min(Math.max(n.colSpan, 1), r - e);
 			if (t > 1) {
-				let r = l(n);
+				let r = u(n);
 				if (r != null) {
-					let n = i.slice(e, e + t), a = n.reduce((e, t) => e + t, 0), o = n.reduce((t, n, r) => t + (c[e + r] ? s[e + r] : n), 0);
+					let n = i.slice(e, e + t), a = n.reduce((e, t) => e + t, 0), o = n.reduce((t, n, r) => t + (l[e + r] ? c[e + r] : n), 0);
 					if (r > o) {
-						let l = r - o;
+						let s = r - o;
 						for (let r = 0; r < t; r++) {
-							let o = a > 0 ? n[r] / a : 1 / t, u = c[e + r] ? s[e + r] : i[e + r];
-							s[e + r] = u + l * o, c[e + r] = !0;
+							let o = a > 0 ? n[r] / a : 1 / t, u = l[e + r] ? c[e + r] : i[e + r];
+							c[e + r] = u + s * o, l[e + r] = !0;
 						}
 					}
 				}
@@ -1286,7 +1287,7 @@ function bt(e, t, n) {
 			e += t;
 		}
 	}
-	return o(s.map((e, t) => Math.max(c[t] ? e : i[t], a[t])));
+	return o(c.map((e, t) => Math.max(l[t] ? e : i[t], a[t])));
 }
 function xt(e, t) {
 	return t <= 0 ? !0 : !e.rows[t].cells.some((e) => e.vMerge === !1);
@@ -1830,12 +1831,12 @@ function Gt(e) {
 	}), t;
 }
 function Kt(e) {
-	let t = [], n = "", r = null;
-	for (let i of e) {
-		let e = i.charCodeAt(0), a = e >= 48 && e <= 57;
-		r === null || a === r ? n += i : (t.push(n), n = i), r = a;
+	let t = (e) => e >= 48 && e <= 57, n = (e) => e === "." || e === "," || e === ":" || e === "/" || e === "\xA0", r = [], i = "", a = null;
+	for (let o = 0; o < e.length; o++) {
+		let s = e[o], c = t(s.charCodeAt(0));
+		!c && a === !0 && n(s) && t(e.charCodeAt(o + 1)) && (c = !0), a === null || c === a ? i += s : (r.push(i), i = s), a = c;
 	}
-	return n.length > 0 && t.push(n), t.length ? t : [e];
+	return i.length > 0 && r.push(i), r.length ? r : [e];
 }
 function qt(e) {
 	let t = [], n = 0;
@@ -2228,14 +2229,14 @@ function cn(e, t, n, r, i, a, o, s = {}, c = /* @__PURE__ */ new Map()) {
 			let e = (e) => t.alignment === "distribute" ? "center" : _e(t.alignment, e);
 			a.textAlign = "left";
 			for (let t = 0; t < n.lines.length; t++) {
-				let r = n.lines[t], i = n.lineHeights[t], c = r.reduce((e, t) => e + t.width, 0), l = w(void 0, r.map((e) => e.text).join("")) === "rtl";
-				a.direction = l ? "rtl" : "ltr";
-				let u = e(l), d = m;
+				let r = n.lines[t], i = n.lineHeights[t], c = r.reduce((e, t) => e + t.width, 0), l = w(void 0, r.map((e) => e.text).join("")) === "rtl", u = e(l), d = m;
 				u === "center" ? d = m + Math.max(0, (h - c) / 2) : u === "right" && (d = m + Math.max(0, h - c));
-				let f = i / 1.2, p = S + f * .85;
-				for (let e of r) {
-					let t = e.run.fontSizePt * o;
-					a.font = X(e.run.bold ?? !1, e.run.italic ?? !1, t, nn(e.text, e.run), s), a.fillStyle = e.run.color ? `#${e.run.color}` : "#000000", a.fillText(e.text, d, p), d += e.width;
+				let f = i / 1.2, p = S + f * .85, g = ge(r, l);
+				for (let e = 0; e < r.length; e++) {
+					let t = g.order[e], n = r[t];
+					a.direction = g.rtl[t] ? "rtl" : "ltr";
+					let i = n.run.fontSizePt * o;
+					a.font = X(n.run.bold ?? !1, n.run.italic ?? !1, i, nn(n.text, n.run), s), a.fillStyle = n.run.color ? `#${n.run.color}` : "#000000", a.fillText(n.text, d, p), d += n.width;
 				}
 				S += i;
 			}
@@ -2808,7 +2809,7 @@ var dr = class e {
 	static async load(t, n = {}) {
 		let r = n.mode ?? "main";
 		if (r === "worker" && (typeof Worker > "u" || typeof OffscreenCanvas > "u")) throw Error("mode: 'worker' requires Worker and OffscreenCanvas support");
-		let i = new e(r === "worker" ? (await import("./render-worker-host-DQ6bkQ0n.js")).createRenderWorker() : new ie(), r), a;
+		let i = new e(r === "worker" ? (await import("./render-worker-host-D0ovEZj9.js")).createRenderWorker() : new ie(), r), a;
 		if (typeof t == "string") {
 			let e = await fetch(t);
 			if (!e.ok) throw Error(`Failed to fetch: ${e.status} ${e.statusText}`);

package/dist/docx.mjs

@@ -1,3 +1,3 @@
 import { G as e } from "./src-LzMutzSd.js";
-import { i as t, n, r } from "./docx-BfmPyKWJ.js";
+import { i as t, n, r } from "./docx-DW_bVXxg.js";
 export { t as DocxDocument, r as DocxViewer, e as autoResize, n as noteText };

package/dist/index.mjs

@@ -1,4 +1,4 @@
 import { t as e } from "./pptx-GygKVlSS.js";
 import { t } from "./xlsx-CO8NBW79.js";
-import { t as n } from "./docx-BfmPyKWJ.js";
+import { t as n } from "./docx-DW_bVXxg.js";
 export { n as docx, e as pptx, t as xlsx };