@silurus/ooxml 0.4.0 → 0.5.0

package/dist/{docx-CPf_N42P.js → docx-DUycjjDQ.js}

@@ -110,26 +110,30 @@ async function m(e, t, n, r = {}) {
 	});
 }
 function h(e, t, n) {
-	let r = t.pageHeight - t.marginTop - t.marginBottom, i = t.pageWidth - t.marginLeft - t.marginRight, a = g(n, t), o = [[]], s = 0, c = null, l = () => {
-		o[o.length - 1].length > 0 && (o.push([]), s = 0, c = null);
+	let r = t.pageHeight - t.marginTop - t.marginBottom, i = t.pageWidth - t.marginLeft - t.marginRight, a = g(n, t), o = [[]], s = 0, c = null;
+	a.y = t.marginTop, a.floats = [];
+	let l = () => {
+		o[o.length - 1].length > 0 && (o.push([]), s = 0, c = null, a.y = t.marginTop, a.floats = []);
 	}, u = (t) => {
 		let n = e[t];
 		return n ? n.type === "paragraph" ? _(a, n, i, !1) : n.type === "table" ? v(a, n, i) : 0 : 0;
 	};
-	for (let t = 0; t < e.length; t++) {
-		let n = e[t];
-		if (n.type === "pageBreak") {
+	for (let n = 0; n < e.length; n++) {
+		let d = e[n];
+		if (d.type === "pageBreak") {
 			o.push([]), s = 0, c = null;
 			continue;
 		}
-		if (n.type === "paragraph") {
-			let e = n;
+		if (d.type === "paragraph") {
+			let e = d;
 			e.pageBreakBefore && l();
-			let d = _(a, e, i, S(c, e)), f = d + (e.keepNext ? u(t + 1) : 0);
-			s > 0 && s + f > r && l(), o[o.length - 1].push(n), s += d, c = e;
-		} else if (n.type === "table") {
-			let e = v(a, n, i);
-			s + e > r && l(), o[o.length - 1].push(n), s += e, c = null;
+			let f = S(c, e);
+			I(e, a, a.y + (f ? 0 : e.spaceBefore));
+			let p = _(a, e, i, f, t.marginLeft), m = p + (e.keepNext ? u(n + 1) : 0);
+			s > 0 && s + m > r && l(), o[o.length - 1].push(d), s += p, a.y += p, c = e;
+		} else if (d.type === "table") {
+			let e = v(a, d, i);
+			s + e > r && l(), o[o.length - 1].push(d), s += e, a.y += e, c = null;
 		}
 	}
 	return o;
@@ -151,13 +155,22 @@ function g(e, t) {
 		floats: []
 	};
 }
-function _(e, t, n, r = !1) {
-	let i = t.indentLeft, a = t.indentRight, o = Math.max(1, n - i - a), s = E(t.runs, e), c;
-	if (s.length === 0) {
-		let e = X(t);
-		c = e * Z(t.lineSpacing, e);
-	} else c = j(e.ctx, s, o, t.indentFirst, 1, t.tabStops).reduce((e, n) => e + n.height * Z(t.lineSpacing, n.height), 0);
-	return c + (r ? 0 : t.spaceBefore) + t.spaceAfter;
+function _(e, t, n, r = !1, i = 0) {
+	let a = t.indentLeft, o = t.indentRight, s = Math.max(1, n - a - o), c = E(t.runs, e), l;
+	if (c.length === 0) {
+		let { asc: e, desc: n } = Z(Y(t), 1);
+		l = X(t.lineSpacing, e, n, 1);
+	} else {
+		let n = e.floats.length > 0 ? {
+			startPageY: e.y,
+			paraX: i,
+			floats: e.floats,
+			lineBoxH: (e, n) => X(t.lineSpacing, e, n, 1),
+			pageH: e.pageH
+		} : void 0;
+		l = A(e.ctx, c, s, t.indentFirst, 1, t.tabStops, n).reduce((e, n) => e + X(t.lineSpacing, n.ascent, n.descent, 1), 0);
+	}
+	return l + (r ? 0 : t.spaceBefore) + t.spaceAfter;
 }
 function v(e, t, n) {
 	let r = t.colWidths.reduce((e, t) => e + t, 0), i = r > n ? n / r : 1, a = t.colWidths.map((e) => e * i), o = 0;
@@ -203,7 +216,7 @@ function C(e, t) {
 	for (let r of e) if (r.type === "paragraph") {
 		let e = r;
 		T(e, t, S(n, e)), n = e;
-	} else r.type === "table" && (z(r, t), n = null);
+	} else r.type === "table" && (R(r, t), n = null);
 }
 function w(e, t) {
 	let n = null;
@@ -211,24 +224,24 @@ function w(e, t) {
 }
 function T(e, t, n = !1) {
 	let { ctx: r, scale: i, contentX: a, contentW: o, defaultColor: s, dryRun: l } = t, u = t.y;
-	n || (t.y += e.spaceBefore * i), L(e, t, t.y), N(e, t, u, "behind"), t.y = R(t.y, t.floats);
+	n || (t.y += e.spaceBefore * i), I(e, t, t.y), M(e, t, u, "behind"), t.y = L(t.y, t.floats);
 	let d = t.y, f = e.indentLeft * i, p = e.indentRight * i, m = e.indentFirst * i, h = "", g = 0;
 	e.numbering && (h = e.numbering.text + "	", g = e.numbering.tab * i);
 	let _ = a + f, v = _ + m, y = o - f - p, b = E(e.runs, t);
 	if (b.length === 0) {
-		let n = X(e) * i * Z(e.lineSpacing);
-		e.shading && !l && (r.fillStyle = `#${e.shading}`, r.fillRect(a + f, d, y, n)), t.y += n, e.borders && !l && K(r, a + f, d, y, n, e.borders, i), t.y += e.spaceAfter * i, N(e, t, u);
+		let { asc: n, desc: o } = Z(Y(e), i), s = X(e.lineSpacing, n, o, i);
+		e.shading && !l && (r.fillStyle = `#${e.shading}`, r.fillRect(a + f, d, y, s)), t.y += s, e.borders && !l && G(r, a + f, d, y, s, e.borders, i), t.y += e.spaceAfter * i, M(e, t, u);
 		return;
 	}
 	let x = t.floats.length > 0 ? {
 		startPageY: t.y,
 		paraX: _,
 		floats: t.floats,
-		lineSpacingMult: (t) => Z(e.lineSpacing, t),
+		lineBoxH: (t, n) => X(e.lineSpacing, t, n, i),
 		pageH: t.pageH
-	} : void 0, S = j(r, b, y, v - _, i, e.tabStops, x);
+	} : void 0, S = A(r, b, y, v - _, i, e.tabStops, x);
 	if (e.shading && !l) {
-		let t = S.reduce((t, n) => t + n.height * i * Z(e.lineSpacing, n.height), 0);
+		let t = S.reduce((t, n) => t + X(e.lineSpacing, n.ascent, n.descent, i), 0);
 		r.fillStyle = `#${e.shading}`, r.fillRect(a + f, d, y, t);
 	}
 	let C = e.alignment === "justify" || e.alignment === "both" || e.alignment === "distribute", w = e.alignment === "distribute", T = (e) => {
@@ -239,11 +252,11 @@ function T(e, t, n = !1) {
 	for (let n = 0; n < S.length; n++) {
 		let a = S[n], o = n === 0, u = n === S.length - 1;
 		a.topY !== void 0 && a.topY > t.y && (t.y = a.topY);
-		let d = a.height * i * Z(e.lineSpacing, a.height), f = t.y + a.ascent, p = _ + a.xOffset, v = a.availWidth, y = o ? p + m : p;
-		o && h && !l && (r.font = `${X(e) * i}px sans-serif`, r.fillStyle = s, r.fillText(e.numbering.text, y - g, f));
-		let b = a.segments.reduce((e, t) => e + t.measuredWidth, 0), x = 0;
-		e.alignment === "right" || e.alignment === "end" ? x = v - (y - p) - b : e.alignment === "center" && (x = (v - (y - p) - b) / 2), y += x;
-		let E = 0;
+		let d = X(e.lineSpacing, a.ascent, a.descent, i), f = a.ascent + a.descent, p = t.y + (d - f) / 2 + a.ascent, v = _ + a.xOffset, y = a.availWidth, b = o ? v + m : v;
+		o && h && !l && (r.font = `${Y(e) * i}px sans-serif`, r.fillStyle = s, r.fillText(e.numbering.text, b - g, p));
+		let x = a.segments.reduce((e, t) => e + t.measuredWidth, 0), E = 0;
+		e.alignment === "right" || e.alignment === "end" ? E = y - (b - v) - x : e.alignment === "center" && (E = (y - (b - v) - x) / 2), b += E;
+		let D = 0;
 		if (C && (!u || w)) {
 			let e = 0;
 			for (let t = 0; t < a.segments.length; t++) {
@@ -251,57 +264,57 @@ function T(e, t, n = !1) {
 				if (t === a.segments.length - 1) break;
 				"text" in n && (e += T(n.text));
 			}
-			let t = v - (y - p) - b;
-			e > 0 && t > 0 && (E = t / e);
+			let t = y - (b - v) - x;
+			e > 0 && t > 0 && (D = t / e);
 		}
 		for (let e = 0; e < a.segments.length; e++) {
 			let n = a.segments[e], o = e === a.segments.length - 1;
 			if ("isTab" in n) {
-				y += n.measuredWidth;
+				b += n.measuredWidth;
 				continue;
 			}
 			if ("dataUrl" in n) {
-				l || M(r, n, y, f, i, t.images), y += n.measuredWidth;
+				l || j(r, n, b, p, i, t.images), b += n.measuredWidth;
 				continue;
 			}
 			let u = n;
 			if (!l) {
-				let e = q(u, i), t = u.vertAlign === "super" ? -u.fontSize * i * .35 : u.vertAlign === "sub" ? u.fontSize * i * .15 : 0;
-				r.font = J(u.bold, u.italic, e, u.fontFamily), u.highlight && (r.fillStyle = c[u.highlight] ?? "#FFFF00", r.fillRect(y, f + t - e * .85, u.measuredWidth, e * 1.1)), r.fillStyle = u.color ? `#${u.color}` : s, r.fillText(u.text, y, f + t);
+				let e = K(u, i), t = u.vertAlign === "super" ? -u.fontSize * i * .35 : u.vertAlign === "sub" ? u.fontSize * i * .15 : 0;
+				r.font = q(u.bold, u.italic, e, u.fontFamily), u.highlight && (r.fillStyle = c[u.highlight] ?? "#FFFF00", r.fillRect(b, p + t - e * .85, u.measuredWidth, e * 1.1)), r.fillStyle = u.color ? `#${u.color}` : s, r.fillText(u.text, b, p + t);
 				let n = u.color ? `#${u.color}` : s, a = Math.max(.5, e * .05), o = r.measureText(u.text).width;
 				if (u.underline) {
 					r.strokeStyle = n, r.lineWidth = a;
-					let i = f + t + e * .12;
-					r.beginPath(), r.moveTo(y, i), r.lineTo(y + o, i), r.stroke();
+					let i = p + t + e * .12;
+					r.beginPath(), r.moveTo(b, i), r.lineTo(b + o, i), r.stroke();
 				}
 				if (u.strikethrough) {
 					r.strokeStyle = n, r.lineWidth = a;
-					let i = f + t - e * .3;
-					r.beginPath(), r.moveTo(y, i), r.lineTo(y + o, i), r.stroke();
+					let i = p + t - e * .3;
+					r.beginPath(), r.moveTo(b, i), r.lineTo(b + o, i), r.stroke();
 				}
 				if (u.doubleStrikethrough) {
 					r.strokeStyle = n, r.lineWidth = a;
-					let i = f + t - e * .35, s = f + t - e * .22;
-					r.beginPath(), r.moveTo(y, i), r.lineTo(y + o, i), r.stroke(), r.beginPath(), r.moveTo(y, s), r.lineTo(y + o, s), r.stroke();
+					let i = p + t - e * .35, s = p + t - e * .22;
+					r.beginPath(), r.moveTo(b, i), r.lineTo(b + o, i), r.stroke(), r.beginPath(), r.moveTo(b, s), r.lineTo(b + o, s), r.stroke();
 				}
 			}
-			if (y += u.measuredWidth, E > 0 && !o) {
+			if (b += u.measuredWidth, D > 0 && !o) {
 				let e = T(u.text);
-				e > 0 && (y += e * E);
+				e > 0 && (b += e * D);
 			}
 		}
 		t.y += d;
 	}
 	if (e.borders && !l) {
 		let n = t.y - d;
-		K(r, a + f, d, y, n, e.borders, i);
+		G(r, a + f, d, y, n, e.borders, i);
 	}
-	t.y += e.spaceAfter * i, N(e, t, u);
+	t.y += e.spaceAfter * i, M(e, t, u);
 }
 function E(e, t) {
 	let n = [], r = (e, t, r) => {
 		let i = t.allCaps || t.smallCaps ? e.toUpperCase() : e;
-		for (let e of A(i)) n.push({
+		for (let e of k(i)) n.push({
 			text: e,
 			bold: t.bold,
 			italic: t.italic,
@@ -375,7 +388,7 @@ function ee(e) {
 	}
 	return !1;
 }
-function k(e, t, n) {
+function te(e, t, n) {
 	let r = [...t], i = 0, a = r.length;
 	for (; i < a;) {
 		let t = i + a + 1 >> 1;
@@ -383,7 +396,7 @@ function k(e, t, n) {
 	}
 	return r.slice(0, i).join("");
 }
-function A(e) {
+function k(e) {
 	let t = [], n = 0;
 	for (; n < e.length;) {
 		let r = n;
@@ -393,19 +406,19 @@ function A(e) {
 	}
 	return t.length ? t : [e];
 }
-function j(e, t, n, r, i, a = [], o) {
-	let s = [], c = [], l = 0, u = 0, d = 0, f = !0, p = n, m = 0, h = o?.startPageY ?? 0, g = () => {
-		if (m = 0, p = n, !o) return;
+function A(e, t, n, r, i, a = [], o) {
+	let s = [], c = [], l = 0, u = 0, d = 0, f = 0, p = !0, m = n, h = 0, g = o?.startPageY ?? 0, _ = () => {
+		if (h = 0, m = n, !o) return;
 		let e = 10 * i;
 		for (let t = 0; t < 16; t++) {
-			let t = h + e, n = null;
-			for (let e of o.floats) e.mode === "topAndBottom" && t > e.yTop && h < e.yBottom && (n = n === null ? e.yBottom : Math.max(n, e.yBottom));
+			let t = g + e, n = null;
+			for (let e of o.floats) e.mode === "topAndBottom" && t > e.yTop && g < e.yBottom && (n = n === null ? e.yBottom : Math.max(n, e.yBottom));
 			if (n === null) break;
-			h = n;
+			g = n;
 		}
-		let t = o.paraX, r = o.paraX + n, a = t, s = r, c = h + e;
+		let t = o.paraX, r = o.paraX + n, a = t, s = r, c = g + e;
 		for (let e of o.floats) {
-			if (e.mode !== "square" || c <= e.yTop || h >= e.yBottom) continue;
+			if (e.mode !== "square" || c <= e.yTop || g >= e.yBottom) continue;
 			let n = e.xLeft - t, i = r - e.xRight, o;
 			switch (e.side) {
 				case "left":
@@ -421,39 +434,40 @@ function j(e, t, n, r, i, a = [], o) {
 			o ? e.xLeft < s && (s = Math.max(a, e.xLeft)) : e.xRight > a && (a = Math.min(s, e.xRight));
 		}
 		let l = Math.max(0, s - a);
-		m = Math.max(0, a - t), p = Math.min(n - m, l), p < 0 && (p = 0);
+		h = Math.max(0, a - t), m = Math.min(n - h, l), m < 0 && (m = 0);
 	};
-	g();
-	let _ = () => p - (f ? r : 0), v = (e) => {
-		let t = e === void 0 ? u || 10 : e;
+	_();
+	let v = () => m - (p ? r : 0), y = (e) => {
+		let t = e === void 0 ? u || 10 : e, n = d > 0 || f > 0, r = n ? d : t * i * .8, a = n ? f : t * i * .2;
 		s.push({
 			segments: c,
 			height: t,
-			ascent: d,
-			xOffset: m,
-			availWidth: p,
-			topY: o ? h : void 0
-		}), o && (h += t * i * o.lineSpacingMult(t)), c = [], l = 0, u = 0, d = 0, f = !1, g();
-	}, y = (e, t, n, r) => {
-		c.push(e), l += t, n > u && (u = n), r > d && (d = r);
-	}, b = (e) => q(e, i), x = (t) => (e.font = J(t.bold, t.italic, b(t), t.fontFamily), e.measureText(t.text)), S = [...t];
-	for (; S.length > 0;) {
-		let t = S.shift();
+			ascent: r,
+			descent: a,
+			xOffset: h,
+			availWidth: m,
+			topY: o ? g : void 0
+		}), o && (g += o.lineBoxH(r, a)), c = [], l = 0, u = 0, d = 0, f = 0, p = !1, _();
+	}, b = (e, t, n, r, i) => {
+		c.push(e), l += t, n > u && (u = n), r > d && (d = r), i > f && (f = i);
+	}, x = (e) => K(e, i), S = (t) => (e.font = q(t.bold, t.italic, x(t), t.fontFamily), e.measureText(t.text)), C = [...t];
+	for (; C.length > 0;) {
+		let t = C.shift();
 		if ("lineBreak" in t) {
-			v(t.fontSize);
+			y(t.fontSize);
 			continue;
 		}
 		if ("isTab" in t) {
-			let e = l + (f ? r : 0), n = a.find((t) => t.pos * i > e), o;
+			let e = l + (p ? r : 0), n = a.find((t) => t.pos * i > e), o;
 			if (o = n ? n.pos * i - e : Math.ceil((e + .01) / (36 * i)) * (36 * i) - e, o <= 0) {
-				v(), S.unshift(t);
+				y(), C.unshift(t);
 				continue;
 			}
-			if (l + o > _() && c.length > 0) {
-				v(), S.unshift(t);
+			if (l + o > v() && c.length > 0) {
+				y(), C.unshift(t);
 				continue;
 			}
-			t.measuredWidth = o, y(t, o, t.fontSize, t.fontSize * i * .75);
+			t.measuredWidth = o, b(t, o, t.fontSize, t.fontSize * i * .8, t.fontSize * i * .2);
 			continue;
 		}
 		if ("dataUrl" in t) {
@@ -462,74 +476,74 @@ function j(e, t, n, r, i, a = [], o) {
 				continue;
 			}
 			let e = t.widthPt * i, n = t.heightPt, r = t.heightPt * i;
-			t.measuredWidth = e, c.length > 0 && l + e > _() && v(), y(t, e, n, r);
+			t.measuredWidth = e, c.length > 0 && l + e > v() && y(), b(t, e, n, r, 0);
 			continue;
 		}
-		let n = t, o = x(n), s = o.width, u = n.fontSize, d = o.actualBoundingBoxAscent ?? n.fontSize * i * .75;
-		if (l + s <= _()) n.measuredWidth = s, y(n, s, u, d);
+		let n = t, o = S(n), s = o.width, u = n.fontSize, d = o.fontBoundingBoxAscent ?? o.actualBoundingBoxAscent ?? n.fontSize * i * .8, f = o.fontBoundingBoxDescent ?? o.actualBoundingBoxDescent ?? n.fontSize * i * .2;
+		if (l + s <= v()) n.measuredWidth = s, b(n, s, u, d, f);
 		else if (ee(n.text)) {
-			let t = _() - l;
-			e.font = J(n.bold, n.italic, b(n), n.fontFamily);
-			let r = t > 0 ? k(e, n.text, t) : "";
+			let t = v() - l;
+			e.font = q(n.bold, n.italic, x(n), n.fontFamily);
+			let r = t > 0 ? te(e, n.text, t) : "";
 			if (r.length > 0) {
 				let t = e.measureText(r);
-				y({
+				b({
 					...n,
 					text: r,
 					measuredWidth: t.width
-				}, t.width, u, t.actualBoundingBoxAscent ?? d);
+				}, t.width, u, d, f);
 				let i = n.text.slice(r.length);
-				i && S.unshift({
+				i && C.unshift({
 					...n,
 					text: i,
 					measuredWidth: 0
 				});
-			} else if (c.length > 0) v(), S.unshift(n);
+			} else if (c.length > 0) y(), C.unshift(n);
 			else {
 				let t = [...n.text][0] ?? "";
 				if (t) {
 					let r = e.measureText(t);
-					y({
+					b({
 						...n,
 						text: t,
 						measuredWidth: r.width
-					}, r.width, u, r.actualBoundingBoxAscent ?? d);
+					}, r.width, u, d, f);
 					let i = n.text.slice(t.length);
-					i && S.unshift({
+					i && C.unshift({
 						...n,
 						text: i,
 						measuredWidth: 0
 					});
 				}
 			}
-		} else c.length === 0 ? (n.measuredWidth = s, y(n, s, u, d)) : (v(), n.measuredWidth = s, y(n, s, u, d));
+		} else c.length === 0 ? (n.measuredWidth = s, b(n, s, u, d, f)) : (y(), n.measuredWidth = s, b(n, s, u, d, f));
 	}
-	return c.length > 0 && v(), s;
+	return c.length > 0 && y(), s;
 }
-function M(e, t, n, r, i, a) {
+function j(e, t, n, r, i, a) {
 	if (t.anchor) return;
 	let o = a.get(u(t.dataUrl, t.colorReplaceFrom));
 	if (!o) return;
 	let s = t.widthPt * i, c = t.heightPt * i;
 	e.drawImage(o, n, r - c, s, c);
 }
-function N(e, t, n, r = "front") {
+function M(e, t, n, r = "front") {
 	if (!t.dryRun) {
 		if (r === "behind") {
 			let r = e.runs.filter((e) => e.type === "shape" && !!e.behindDoc).slice().sort((e, t) => (e.zOrder ?? 0) - (t.zOrder ?? 0));
-			for (let e of r) P(e, t, n);
+			for (let e of r) N(e, t, n);
 			return;
 		}
 		for (let r of e.runs) {
 			if (r.type === "shape") {
 				let e = r;
 				if (e.behindDoc) continue;
-				P(e, t, n);
+				N(e, t, n);
 				continue;
 			}
 			if (r.type !== "image") continue;
 			let e = r;
-			if (!e.anchor || I(e.wrapMode)) continue;
+			if (!e.anchor || F(e.wrapMode)) continue;
 			let i = t.images.get(u(e.dataUrl, e.colorReplaceFrom));
 			if (!i) continue;
 			let a = e.widthPt * t.scale, o = e.heightPt * t.scale, s = e.anchorXFromMargin ? (t.marginLeft + (e.anchorXPt ?? 0)) * t.scale : (e.anchorXPt ?? 0) * t.scale, c = e.anchorYFromPara ? n + (e.anchorYPt ?? 0) * t.scale : (e.anchorYPt ?? 0) * t.scale;
@@ -537,15 +551,15 @@ function N(e, t, n, r = "front") {
 		}
 	}
 }
-function P(e, t, i) {
+function N(e, t, i) {
 	let { ctx: a, scale: o } = t, s = e.widthPt * o, c = e.heightPt * o;
 	if (s <= 0 || c <= 0) return;
 	let l = e.anchorXFromMargin ? (t.marginLeft + e.anchorXPt) * o : e.anchorXPt * o, u = e.anchorYFromPara ? i + e.anchorYPt * o : e.anchorYPt * o, d = e.rotation ?? 0;
 	a.save(), d !== 0 && (a.translate(l + s / 2, u + c / 2), a.rotate(d * Math.PI / 180), a.translate(-(l + s / 2), -(u + c / 2))), a.beginPath(), n(a, e.subpaths, l, u, s, c);
-	let f = F(e.fill, a, l, u, s, c);
+	let f = P(e.fill, a, l, u, s, c);
 	f && (a.fillStyle = f, a.fill()), e.stroke && (e.strokeWidth ?? 0) > 0 && (a.strokeStyle = r(e.stroke), a.lineWidth = Math.max(.5, (e.strokeWidth ?? 0) * o), a.stroke()), a.restore();
 }
-function F(e, t, n, i, a, o) {
+function P(e, t, n, i, a, o) {
 	if (!e) return null;
 	if (e.fillType === "solid") return r(e.color);
 	if (e.fillType === "gradient") {
@@ -564,14 +578,14 @@ function F(e, t, n, i, a, o) {
 	}
 	return null;
 }
-function I(e) {
+function F(e) {
 	return e === "square" || e === "topAndBottom" || e === "tight" || e === "through";
 }
-function L(e, t, n) {
+function I(e, t, n) {
 	for (let r of e.runs) {
 		if (r.type !== "image") continue;
 		let e = r;
-		if (!e.anchor || !I(e.wrapMode)) continue;
+		if (!e.anchor || !F(e.wrapMode)) continue;
 		let i = e.wrapMode === "topAndBottom" ? "topAndBottom" : "square", a = t.scale, o = e.widthPt * a, s = e.heightPt * a, c = e.anchorXFromMargin ? (t.marginLeft + (e.anchorXPt ?? 0)) * a : (e.anchorXPt ?? 0) * a, l = e.anchorYFromPara ? n + (e.anchorYPt ?? 0) * a : (e.anchorYPt ?? 0) * a, d = (e.distTop ?? 0) * a, f = (e.distBottom ?? 0) * a, p = (e.distLeft ?? 0) * a, m = (e.distRight ?? 0) * a, h = u(e.dataUrl, e.colorReplaceFrom), g = {
 			mode: i,
 			imageKey: h,
@@ -592,7 +606,7 @@ function L(e, t, n) {
 		}
 	}
 }
-function R(e, t) {
+function L(e, t) {
 	for (let n = 0; n < 16; n++) {
 		let n = e;
 		for (let r of t) r.mode === "topAndBottom" && e >= r.yTop && e < r.yBottom && (n = Math.max(n, r.yBottom));
@@ -601,10 +615,10 @@ function R(e, t) {
 	}
 	return e;
 }
-function z(e, t) {
+function R(e, t) {
 	let { ctx: n, scale: r, contentX: i, contentW: a, dryRun: o } = t, s = e.colWidths.reduce((e, t) => e + t, 0) * r, c = s > a ? a / s : 1, l = e.colWidths.map((e) => e * r * c), u = i, d = [];
 	for (let n of e.rows) {
-		let i = B(n, e, l, r, t);
+		let i = z(n, e, l, r, t);
 		d.push(i);
 	}
 	let f = t.y;
@@ -612,33 +626,37 @@ function z(e, t) {
 		let i = e.rows[n], a = d[n], s = u, c = 0;
 		for (let n of i.cells) {
 			let i = Math.min(n.colSpan, l.length - c), u = l.slice(c, c + i).reduce((e, t) => e + t, 0);
-			n.vMerge !== !1 && (o ? H(n, e, u, r, t) : U(n, e, s, f, u, a, t)), s += u, c += i;
+			n.vMerge !== !1 && (o ? V(n, e, u, r, t) : H(n, e, s, f, u, a, t)), s += u, c += i;
 		}
 		f += a;
 	}
 	t.y = f;
 }
-function B(e, t, n, r, i) {
+function z(e, t, n, r, i) {
 	if (e.rowHeight != null) return e.rowHeight * r;
 	let a = 10 * r, o = 0;
 	for (let s of e.cells) {
 		let e = Math.min(s.colSpan, n.length - o), c = n.slice(o, o + e).reduce((e, t) => e + t, 0) - (t.cellMarginLeft + t.cellMarginRight) * r, l = (t.cellMarginTop + t.cellMarginBottom) * r;
-		for (let e of s.content) l += V(i, e, c, r), l += (e.spaceBefore + e.spaceAfter) * r;
+		for (let e of s.content) l += B(i, e, c, r), l += (e.spaceBefore + e.spaceAfter) * r;
 		l > a && (a = l), o += e;
 	}
 	return a;
 }
-function V(e, t, n, r) {
+function B(e, t, n, r) {
 	let i = E(t.runs, e);
-	return i.length === 0 ? X(t) * r : j(e.ctx, i, n, 0, r, t.tabStops).reduce((e, n) => e + n.height * r * Z(t.lineSpacing, n.height), 0);
+	if (i.length === 0) {
+		let { asc: e, desc: n } = Z(Y(t), r);
+		return X(t.lineSpacing, e, n, r);
+	}
+	return A(e.ctx, i, n, 0, r, t.tabStops).reduce((e, n) => e + X(t.lineSpacing, n.ascent, n.descent, r), 0);
 }
-function H(e, t, n, r, i) {
+function V(e, t, n, r, i) {
 	let a = t.cellMarginLeft * r, o = t.cellMarginRight * r, s = n - a - o;
-	for (let t of e.content) V(i, t, s, r);
+	for (let t of e.content) B(i, t, s, r);
 }
-function U(e, t, n, r, i, a, o) {
+function H(e, t, n, r, i, a, o) {
 	let { ctx: s, scale: c } = o;
-	e.background && (s.fillStyle = `#${e.background}`, s.fillRect(n, r, i, a)), W(s, n, r, i, a, e.borders, t.borders, c);
+	e.background && (s.fillStyle = `#${e.background}`, s.fillRect(n, r, i, a)), U(s, n, r, i, a, e.borders, t.borders, c);
 	let l = t.cellMarginTop * c, u = t.cellMarginBottom * c, d = t.cellMarginLeft * c, f = t.cellMarginRight * c, p = {
 		...o,
 		contentX: n + d,
@@ -646,21 +664,21 @@ function U(e, t, n, r, i, a, o) {
 		y: r + l
 	};
 	if (e.vAlign === "center" || e.vAlign === "bottom") {
-		let t = e.content.reduce((e, t) => e + V(o, t, i - d - f, c) + (t.spaceBefore + t.spaceAfter) * c, 0);
+		let t = e.content.reduce((e, t) => e + B(o, t, i - d - f, c) + (t.spaceBefore + t.spaceAfter) * c, 0);
 		e.vAlign === "center" ? p.y = r + (a - t) / 2 : p.y = r + a - t - u;
 	}
 	w(e.content, p);
 }
-function W(e, t, n, r, i, a, o, s) {
+function U(e, t, n, r, i, a, o, s) {
 	let c = a.top ?? o.top, l = a.bottom ?? o.bottom, u = a.left ?? o.left, d = a.right ?? o.right;
-	c && c.style !== "none" && G(e, t, n, t + r, n, c, s), l && l.style !== "none" && G(e, t, n + i, t + r, n + i, l, s), u && u.style !== "none" && G(e, t, n, t, n + i, u, s), d && d.style !== "none" && G(e, t + r, n, t + r, n + i, d, s);
+	c && c.style !== "none" && W(e, t, n, t + r, n, c, s), l && l.style !== "none" && W(e, t, n + i, t + r, n + i, l, s), u && u.style !== "none" && W(e, t, n, t, n + i, u, s), d && d.style !== "none" && W(e, t + r, n, t + r, n + i, d, s);
 }
-function G(e, t, n, r, i, a, o) {
+function W(e, t, n, r, i, a, o) {
 	e.save(), e.strokeStyle = a.color ? `#${a.color}` : "#000000", e.lineWidth = Math.max(.5, a.width * o), e.beginPath(), e.moveTo(t, n), e.lineTo(r, i), e.stroke(), e.restore();
 }
-function K(e, t, n, r, i, a, o) {
+function G(e, t, n, r, i, a, o) {
 	let s = (t, n, r, i, a) => {
-		!t || t.style === "none" || G(e, n, r, i, a, {
+		!t || t.style === "none" || W(e, n, r, i, a, {
 			width: t.width,
 			color: t.color,
 			style: t.style
@@ -668,24 +686,31 @@ function K(e, t, n, r, i, a, o) {
 	}, c = (e) => (e?.space ?? 0) * o;
 	s(a.top, t, n - c(a.top), t + r, n - c(a.top)), s(a.bottom, t, n + i + c(a.bottom), t + r, n + i + c(a.bottom)), s(a.left, t - c(a.left), n, t - c(a.left), n + i), s(a.right, t + r + c(a.right), n, t + r + c(a.right), n + i);
 }
-function q(e, t) {
+function K(e, t) {
 	let n = e.fontSize * t;
 	return e.smallCaps && (n *= .8), e.vertAlign && (n *= .65), n;
 }
-function J(e, t, n, r) {
-	return `${t ? "italic" : "normal"} ${e ? "bold" : "normal"} ${n}px ${Y(r)}`;
+function q(e, t, n, r) {
+	return `${t ? "italic" : "normal"} ${e ? "bold" : "normal"} ${n}px ${J(r)}`;
 }
-function Y(e) {
+function J(e) {
 	if (!e) return "\"Noto Sans JP\", \"Hiragino Sans\", \"Meiryo\", sans-serif";
 	let t = e.toLowerCase();
 	return t.includes("meiryo") || t.includes("メイリオ") ? "\"Meiryo UI\", \"Meiryo\", \"Noto Sans JP\", sans-serif" : t.includes("游") || t.includes("yu ") ? "\"Yu Gothic\", \"YuGothic\", \"Noto Sans JP\", sans-serif" : t.includes("ipa") ? "\"IPAexGothic\", \"Noto Sans JP\", sans-serif" : t.includes("segoe") ? "\"Segoe UI\", sans-serif" : `"${e}", sans-serif`;
 }
-function X(e) {
+function Y(e) {
 	for (let t of e.runs) if (t.type === "text" || t.type === "field") return t.fontSize;
 	return typeof e.defaultFontSize == "number" ? e.defaultFontSize : 10;
 }
-function Z(e, t = 1) {
-	return e ? e.rule === "auto" ? e.value * 1.2 : t <= 0 ? 1.2 : e.rule === "exact" ? e.value / t : e.rule === "atLeast" ? Math.max(1.2, e.value / t) : 1.2 : 1.2;
+function X(e, t, n, r) {
+	let i = t + n;
+	return e ? e.rule === "auto" ? i * e.value : e.rule === "exact" ? e.value * r : e.rule === "atLeast" ? Math.max(i, e.value * r) : i : i;
+}
+function Z(e, t) {
+	return {
+		asc: e * t * .8,
+		desc: e * t * .2
+	};
 }
 //#endregion
 //#region packages/docx/src/document.ts
@@ -775,10 +800,10 @@ var Q = class e {
 	_render() {
 		this._doc && this._doc.renderPage(this._canvas, this._currentPage, this._opts);
 	}
-}, te = /* @__PURE__ */ e({
+}, ne = /* @__PURE__ */ e({
 	DocxDocument: () => Q,
 	DocxViewer: () => $,
 	autoResize: () => t
 });
 //#endregion
-export { $ as n, Q as r, te as t };
+export { $ as n, Q as r, ne as t };

package/dist/docx.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./autoResize-ggn4hzd8.cjs`),t=require(`./docx-B96_4Bp5.cjs`);exports.DocxDocument=t.r,exports.DocxViewer=t.n,exports.autoResize=e.t;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./autoResize-ggn4hzd8.cjs`),t=require(`./docx-CGvCIxpo.cjs`);exports.DocxDocument=t.r,exports.DocxViewer=t.n,exports.autoResize=e.t;

package/dist/docx.mjs

@@ -1,3 +1,3 @@
 import { t as e } from "./autoResize-U2-IRmNE.js";
-import { n as t, r as n } from "./docx-CPf_N42P.js";
+import { n as t, r as n } from "./docx-DUycjjDQ.js";
 export { n as DocxDocument, t as DocxViewer, e as autoResize };

package/dist/index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./pptx-CYYMOWs4.cjs`),t=require(`./xlsx-C2jK_dYK.cjs`),n=require(`./docx-B96_4Bp5.cjs`);Object.defineProperty(exports,`docx`,{enumerable:!0,get:function(){return n.t}}),Object.defineProperty(exports,`pptx`,{enumerable:!0,get:function(){return e.t}}),Object.defineProperty(exports,`xlsx`,{enumerable:!0,get:function(){return t.t}});
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./pptx-CYYMOWs4.cjs`),t=require(`./xlsx-Cz9qI8c9.cjs`),n=require(`./docx-CGvCIxpo.cjs`);Object.defineProperty(exports,`docx`,{enumerable:!0,get:function(){return n.t}}),Object.defineProperty(exports,`pptx`,{enumerable:!0,get:function(){return e.t}}),Object.defineProperty(exports,`xlsx`,{enumerable:!0,get:function(){return t.t}});

package/dist/index.mjs

@@ -1,4 +1,4 @@
 import { t as e } from "./pptx-BHGTs5zW.js";
-import { t } from "./xlsx--fOMyOGC.js";
-import { t as n } from "./docx-CPf_N42P.js";
+import { t } from "./xlsx-BAksLJGU.js";
+import { t as n } from "./docx-DUycjjDQ.js";
 export { n as docx, e as pptx, t as xlsx };

package/dist/types/index.d.ts

@@ -454,6 +454,8 @@ declare interface Fill_2 {
     patternType: string;
     fgColor: string | null;
     bgColor: string | null;
+    /** Set when the style's `<fill>` was a `<gradientFill>`; patternType stays "none". */
+    gradient?: GradientFillSpec | null;
 }
 
 declare interface Font {
@@ -475,6 +477,22 @@ declare interface GradientFill {
     gradType: string;
 }
 
+declare interface GradientFillSpec {
+    /** "linear" (default) or "path". */
+    gradientType: string;
+    /** Rotation in degrees for linear gradients (0 = left→right). */
+    degree: number;
+    /** Path-gradient bounding box (0..1) — unused for linear. */
+    left: number;
+    right: number;
+    top: number;
+    bottom: number;
+    stops: {
+        position: number;
+        color: string;
+    }[];
+}
+
 declare interface GradientStop {
     position: number;
     color: string;
@@ -1284,6 +1302,9 @@ declare interface Worksheet {
     autoFilter?: CellRange | null;
     /** Hyperlinks in this worksheet (ECMA-376 §18.3.1.47). */
     hyperlinks?: Hyperlink[];
+    /** A1-style cell refs of commented cells (ECMA-376 §18.7.3). Rendered as a
+     *  small red triangle in each cell's top-right corner. */
+    commentRefs?: string[];
 }
 
 export declare namespace xlsx {