@office-kit/pptx-preview 0.8.1 → 0.9.1

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-BMb2-vud.js";
+import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-C_bsFwWV.js";
 export { ARIAL, MONO, SANS, SERIF, TIMES, auditTextLayout, defaultMeasurer, renderSlideSvg as renderSlideToSvg, substituteFamily };

package/dist/node.js

@@ -1,4 +1,4 @@
-import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-BMb2-vud.js";
+import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-C_bsFwWV.js";
 import { getSlideSize } from "@office-kit/pptx";
 import { Resvg } from "@resvg/resvg-js";
 import * as fontkit from "fontkit";

package/dist/{src-BMb2-vud.js → src-C_bsFwWV.js}

@@ -32,6 +32,29 @@ const FALLBACK_DESCENT = .22;
 const FALLBACK_LINEGAP = .08;
 const BASELINE_LEADING_DROP = .036;
 const GRID_NUDGE_X = -.75;
+const EAST_ASIAN_CHAR = /[ᄀ-ᅟ⺀-〾ぁ-㏿㐀-䶿一-鿿ꀀ-꓏가-힣豈-﫿︰-﹏＀-｠￠-￦]/;
+const CLOSING_PUNCT = /^[、。，．・）」』】〉》”’！？：；ー〜…,.!?:;)\]}]+$/;
+const OPENING_PUNCT = /^[（「『【〈《“‘([{]+$/;
+const splitEastAsianBreakables = (word) => {
+	if (!EAST_ASIAN_CHAR.test(word)) return [word];
+	const parts = [];
+	let latin = "";
+	for (const ch of word) if (EAST_ASIAN_CHAR.test(ch)) {
+		if (latin !== "") {
+			parts.push(latin);
+			latin = "";
+		}
+		parts.push(ch);
+	} else latin += ch;
+	if (latin !== "") parts.push(latin);
+	const glued = [];
+	for (const part of parts) {
+		const prev = glued.at(-1);
+		if (prev !== void 0 && (CLOSING_PUNCT.test(part) || OPENING_PUNCT.test(prev))) glued[glued.length - 1] = prev + part;
+		else glued.push(part);
+	}
+	return glued;
+};
 const specOf = (piece) => ({
 	family: piece.family,
 	sizePx: piece.sizePx,
@@ -113,23 +136,25 @@ const layoutCore = (input, measure) => {
 					});
 					continue;
 				}
-				for (const seg of piece.text.match(/\s+|\S+/g) ?? []) {
-					const isSpace = /^\s+$/.test(seg);
-					const w = mWidth(seg, specOf(piece));
-					if (input.wrap && !isSpace && w > avail - bulletLead && [...seg].length > 1) for (const ch of seg) tokens.push({
-						text: ch,
-						piece,
-						isSpace: false,
-						isBreak: false,
-						width: mWidth(ch, specOf(piece))
-					});
-					else tokens.push({
-						text: seg,
-						piece,
-						isSpace,
-						isBreak: false,
-						width: w
-					});
+				for (const word of piece.text.match(/\s+|\S+/g) ?? []) {
+					const isSpace = /^\s+$/.test(word);
+					for (const seg of isSpace ? [word] : splitEastAsianBreakables(word)) {
+						const w = mWidth(seg, specOf(piece));
+						if (input.wrap && !isSpace && w > avail - bulletLead && [...seg].length > 1) for (const ch of seg) tokens.push({
+							text: ch,
+							piece,
+							isSpace: false,
+							isBreak: false,
+							width: mWidth(ch, specOf(piece))
+						});
+						else tokens.push({
+							text: seg,
+							piece,
+							isSpace,
+							isBreak: false,
+							width: w
+						});
+					}
 				}
 			}
 			const wrapped = wrapTokens(tokens, input.wrap, wrapRight - firstLeft - bulletLead, avail);
@@ -2628,16 +2653,20 @@ const renderValueAxis = (f, axis) => {
 	const tickLen = AXIS_TICK_LEN;
 	for (const t of ticks) if (axis.orientation === "vertical") {
 		const yp = f.plotY + f.plotH - (t - axis.min) / range * f.plotH;
+		const onRight = axis.side === "right";
+		const edgeX = onRight ? f.plotX + f.plotW : f.plotX;
 		if (showGrid) out.push(`<line x1="${px(f.plotX)}" y1="${px(yp)}" x2="${px(f.plotX + f.plotW)}" y2="${px(yp)}" stroke="${gridStroke}" stroke-width="0.5"/>`);
 		if (tickMark !== "none") {
-			const tx1 = tickMark === "in" ? f.plotX : f.plotX - tickLen;
-			const tx2 = tickMark === "out" ? f.plotX : tickMark === "cross" ? f.plotX + tickLen : f.plotX + tickLen;
+			const outward = onRight ? tickLen : -5;
+			const inward = onRight ? -5 : tickLen;
+			const tx1 = tickMark === "in" ? edgeX : edgeX + outward;
+			const tx2 = tickMark === "out" ? edgeX : edgeX + inward;
 			out.push(`<line x1="${px(tx1)}" y1="${px(yp)}" x2="${px(tx2)}" y2="${px(yp)}" stroke="${axisColor}" stroke-width="1"/>`);
 		}
-		const labelX = f.plotX - 4;
+		const labelX = onRight ? edgeX + 4 : edgeX - 4;
 		const rot = axis.labelRotationDeg ?? 0;
 		const transform = rot ? ` transform="rotate(${rot} ${px(labelX)} ${px(yp)})"` : "";
-		out.push(`<text x="${px(labelX)}" y="${px(yp)}" text-anchor="end" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transform}>${escapeXml(fmtTick(t))}</text>`);
+		out.push(`<text x="${px(labelX)}" y="${px(yp)}" text-anchor="${onRight ? "start" : "end"}" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transform}>${escapeXml(fmtTick(t))}</text>`);
 	} else {
 		const xp = f.plotX + (t - axis.min) / range * f.plotW;
 		if (showGrid) out.push(`<line x1="${px(xp)}" y1="${px(f.plotY)}" x2="${px(xp)}" y2="${px(f.plotY + f.plotH)}" stroke="${gridStroke}" stroke-width="0.5"/>`);
@@ -2768,6 +2797,12 @@ const renderChartTitle = (f, title, style) => {
 	const fontStyleAttr = style?.italic ? " font-style=\"italic\"" : "";
 	return `<text x="${px(f.x + f.w / 2)}" y="${px(f.titleY)}" text-anchor="middle" dominant-baseline="middle" font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}" font-weight="${weight}"${fontStyleAttr}>${escapeXml(title)}</text>`;
 };
+const FULLWIDTH_CHAR_PATTERN = /[\u1100-\u115F\u2E80-\u303E\u3041-\u33FF\u3400-\u4DBF\u4E00-\u9FFF\uA000-\uA4CF\uAC00-\uD7A3\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFF60\uFFE0-\uFFE6]/u;
+const approxLegendTextPx = (text, fontPx) => {
+	let units = 0;
+	for (const ch of text) units += FULLWIDTH_CHAR_PATTERN.test(ch) ? 1 : .55;
+	return units * fontPx;
+};
 const renderChartLegend = (f, names, colors, position = "b", textStyle, markerSymbols) => {
 	if (names.length === 0) return "";
 	const sz = textStyle?.sizePt ?? 11;
@@ -2785,33 +2820,27 @@ const renderChartLegend = (f, names, colors, position = "b", textStyle, markerSy
 		return `<rect x="${px(swatchX)}" y="${px(swatchY)}" width="9" height="9" fill="${color}"/>`;
 	};
 	const out = [];
-	if (position === "b") {
-		const itemPx = Math.min(140, f.w / names.length);
-		const totalW = itemPx * names.length;
-		const startX = f.x + (f.w - totalW) / 2;
-		for (let i = 0; i < names.length; i++) {
-			const swatchX = startX + i * itemPx + 4;
-			const swatchY = f.legendY - 4;
-			const labelX = swatchX + 14;
-			out.push(swatch(i, swatchX, swatchY), `<text x="${px(labelX)}" y="${px(f.legendY)}" dominant-baseline="middle" ${textAttrs}>${escapeXml(names[i] ?? `Series ${i + 1}`)}</text>`);
-		}
-		return out.join("");
-	}
-	if (position === "t") {
-		const itemPx = Math.min(140, f.w / names.length);
-		const totalW = itemPx * names.length;
-		const startX = f.x + (f.w - totalW) / 2;
-		const yTop = f.y + 4;
+	if (position === "b" || position === "t") {
+		const swatchGapPx = 14;
+		const itemGapPx = 12;
+		const labelWidths = names.map((name, i) => approxLegendTextPx(name ?? `Series ${i + 1}`, sz * PX_PER_PT));
+		const naturalTotal = labelWidths.reduce((sum, w) => sum + swatchGapPx + w, 0) + itemGapPx * (names.length - 1);
+		const scale = Math.min(1, f.w / Math.max(1, naturalTotal));
+		const effAttrs = scale < 1 ? `font-family="sans-serif" font-size="${chartFontPx(sz * scale)}" fill="${fill}"${weight}${italic}` : textAttrs;
+		const rowY = position === "b" ? f.legendY : f.y + 12;
+		let cursor = f.x + Math.max(0, (f.w - naturalTotal * scale) / 2);
 		for (let i = 0; i < names.length; i++) {
-			const cx = startX + i * itemPx;
-			out.push(swatch(i, cx + 4, yTop), `<text x="${px(cx + 18)}" y="${px(yTop + 8)}" dominant-baseline="middle" ${textAttrs}>${escapeXml(names[i] ?? `Series ${i + 1}`)}</text>`);
+			out.push(swatch(i, cursor, rowY - 4), `<text x="${px(cursor + swatchGapPx * scale)}" y="${px(rowY)}" dominant-baseline="middle" ${effAttrs}>${escapeXml(names[i] ?? `Series ${i + 1}`)}</text>`);
+			cursor += (swatchGapPx + (labelWidths[i] ?? 0) + itemGapPx) * scale;
 		}
 		return out.join("");
 	}
 	const lineH = 14;
 	const totalH = names.length * lineH;
 	const yStart = position === "tr" ? f.y + 12 : Math.max(f.y + 12, f.y + (f.h - totalH) / 2);
-	const xCol = position === "l" ? f.x + 6 : position === "tr" ? f.x + f.w - 100 : f.x + f.w - 100;
+	const maxLabelPx = Math.max(0, ...names.map((name, i) => approxLegendTextPx(name ?? `Series ${i + 1}`, sz * PX_PER_PT)));
+	const rightColW = Math.min(f.w * .45, 14 + maxLabelPx + 4);
+	const xCol = position === "l" ? f.x + 6 : f.x + f.w - rightColW;
 	for (let i = 0; i < names.length; i++) {
 		const yp = yStart + i * lineH;
 		out.push(swatch(i, xCol, yp - 4), `<text x="${px(xCol + 14)}" y="${px(yp + 4)}" dominant-baseline="middle" ${textAttrs}>${escapeXml(names[i] ?? `Series ${i + 1}`)}</text>`);
@@ -3614,7 +3643,72 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 	for (const s of spec.series) for (const v of s.values) if (v !== null && Number.isFinite(v)) finiteCount++;
 	let plot = "";
 	let axes = "";
-	if (isCartesian) {
+	const isCombo = isCartesian && spec.kind !== "bar" && spec.series.some((s) => s.chartKind !== void 0 && s.chartKind !== spec.kind || s.secondaryAxis === true);
+	if (isCombo) {
+		const baked = spec.series.map((s, i) => ({
+			...s,
+			color: s.color ?? colors[i % colors.length] ?? "#888"
+		}));
+		const primarySeries = baked.filter((s) => s.secondaryAxis !== true);
+		const secondarySeries = baked.filter((s) => s.secondaryAxis === true);
+		const primaryScale = seriesMinMax({
+			...spec,
+			series: primarySeries
+		});
+		const { valueAxis: _primaryOnlyAxis, ...specWithoutAxis } = spec;
+		const secondaryScale = secondarySeries.length > 0 ? seriesMinMax({
+			...specWithoutAxis,
+			series: secondarySeries
+		}) : null;
+		const N = pointCount(spec);
+		if (!spec.valueAxisHidden) axes = renderValueAxis(f, {
+			orientation: "vertical",
+			min: primaryScale.min,
+			max: primaryScale.max,
+			majorUnit: spec.valueAxis?.majorUnit ?? primaryScale.step,
+			...spec.valueAxis?.numberFormat !== void 0 ? { numberFormat: spec.valueAxis.numberFormat } : {},
+			...spec.valueAxisMajorGridlines !== void 0 ? { majorGridlines: spec.valueAxisMajorGridlines } : {},
+			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
+		});
+		if (secondaryScale) axes += renderValueAxis(f, {
+			orientation: "vertical",
+			side: "right",
+			min: secondaryScale.min,
+			max: secondaryScale.max,
+			majorUnit: secondaryScale.step,
+			majorGridlines: false,
+			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
+		});
+		if (N > 0 && !(spec.categoryAxisHidden || spec.categoryAxisTickLabelPos === "none")) axes += renderCategoryAxis(f, "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor);
+		const groups = /* @__PURE__ */ new Map();
+		for (const s of baked) {
+			const kind = s.chartKind ?? spec.kind;
+			const secondary = s.secondaryAxis === true;
+			const key = `${kind}|${secondary ? "1" : "0"}`;
+			const group = groups.get(key);
+			if (group) group.series.push(s);
+			else groups.set(key, {
+				kind,
+				secondary,
+				series: [s]
+			});
+		}
+		const paintOrder = (g) => (g.secondary ? 2 : 0) + (g.kind === "line" || g.kind === "area" ? 1 : 0);
+		for (const group of [...groups.values()].sort((a, b) => paintOrder(a) - paintOrder(b))) {
+			const scale = group.secondary && secondaryScale ? secondaryScale : primaryScale;
+			const groupSpec = {
+				...spec,
+				series: group.series,
+				valueAxis: {
+					min: scale.min,
+					max: scale.max
+				}
+			};
+			if (group.kind === "line" || group.kind === "area") plot += renderLineChart(f, groupSpec, colors, group.kind === "area");
+			else plot += renderColumnChart(f, groupSpec, colors);
+		}
+	}
+	if (!isCombo && isCartesian) {
 		const { min, max, step } = seriesMinMax(spec);
 		const N = pointCount(spec);
 		const majorUnit = spec.valueAxis?.majorUnit ?? step;
@@ -3648,7 +3742,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		const labelsHidden = spec.categoryAxisHidden || spec.categoryAxisTickLabelPos === "none";
 		if (N > 0 && !labelsHidden) axes += renderCategoryAxis(f, spec.kind === "bar" ? "vertical" : "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor);
 	}
-	switch (spec.kind) {
+	if (!isCombo) switch (spec.kind) {
 		case "column":
 		case "bar":
 			plot = spec.kind === "column" ? renderColumnChart(f, spec, colors) : renderBarChart(f, spec, colors);
@@ -4591,4 +4685,4 @@ const auditTextLayout = (pres, options = {}) => {
 //#endregion
 export { MONO as a, TIMES as c, substituteFamily as d, AVG_GLYPH_W_RATIO as i, defaultMeasurer as l, renderSlideSvg as n, SANS as o, ARIAL as r, SERIF as s, auditTextLayout as t, isCjk as u };
 
-//# sourceMappingURL=src-BMb2-vud.js.map
+//# sourceMappingURL=src-C_bsFwWV.js.map