pptx-kit-preview 0.5.0 → 0.6.1

package/dist/{src-CDTTqUfI.js → src-Q2z_XgT6.js}

@@ -30,7 +30,7 @@ const defaultMeasurer = (text, spec) => {
 const FALLBACK_ASCENT = .9;
 const FALLBACK_DESCENT = .22;
 const FALLBACK_LINEGAP = .08;
-const CENTER_ANCHOR_DROP = .036;
+const BASELINE_LEADING_DROP = .036;
 const GRID_NUDGE_X = -.75;
 const specOf = (piece) => ({
 	family: piece.family,
@@ -56,7 +56,7 @@ const fmt = (n) => {
 	const r = Math.round(n * 100) / 100;
 	return Object.is(r, -0) ? "0" : String(r);
 };
-const layoutTextSvg = (input, measure) => {
+const layoutCore = (input, measure) => {
 	const widthCache = /* @__PURE__ */ new Map();
 	const metricCache = /* @__PURE__ */ new Map();
 	const key = (text, s) => `${s.family}|${s.sizePx}|${s.bold}|${s.italic}|${s.letterSpacingPx}|${text}`;
@@ -170,11 +170,21 @@ const layoutTextSvg = (input, measure) => {
 					line.textAnchor = "end";
 					line.anchorX = wrapRight;
 				}
-				if (isFirst && bullet) line.bullet = {
-					x: firstLeft,
-					baselineDy: 0,
-					b: bullet
-				};
+				if (isFirst && bullet) {
+					let bulletX = firstLeft;
+					if (para.align === "center" || para.align === "right") {
+						let end = toks.length;
+						while (end > 0 && (toks[end - 1].isSpace || toks[end - 1].isBreak)) end--;
+						let lineW = 0;
+						for (let ti = 0; ti < end; ti++) if (!toks[ti].isBreak) lineW += toks[ti].width;
+						bulletX = (para.align === "right" ? wrapRight - lineW : (lineLeft + wrapRight) / 2 - lineW / 2) - (lineLeft - firstLeft);
+					}
+					line.bullet = {
+						x: bulletX,
+						baselineDy: 0,
+						b: bullet
+					};
+				}
 				line.advance = lineAdvance(line, para);
 				cursorY += line.advance;
 				lines.push(line);
@@ -189,7 +199,7 @@ const layoutTextSvg = (input, measure) => {
 	const vert = input.vert ?? "none";
 	const cx = input.boxXpx + input.boxWpx / 2;
 	const cy = input.boxYpx + input.boxHpx / 2;
-	const frame = vert === "none" ? {
+	const frame = vert === "none" || vert === "upright" ? {
 		x: input.boxXpx,
 		y: input.boxYpx,
 		w: input.boxWpx,
@@ -201,25 +211,43 @@ const layoutTextSvg = (input, measure) => {
 		h: input.boxWpx
 	};
 	const columns = vert === "none" ? input.columns ?? null : null;
-	const body = emitPlacements(columns && columns.count >= 2 ? placeColumns(frame, columns, input.anchor, buildLines) : placeSingle(frame, input.anchor, buildLines));
-	if (vert === "none") return body;
+	const { placements, requiredH } = columns && columns.count >= 2 ? placeColumns(frame, columns, input.anchor, buildLines) : placeSingle(frame, input.anchor, buildLines);
+	return {
+		placements,
+		requiredH,
+		vert,
+		cx,
+		cy
+	};
+};
+const layoutTextSvg = (input, measure) => {
+	const { placements, vert, cx, cy } = layoutCore(input, measure);
+	const body = emitPlacements(placements);
+	if (vert === "none" || vert === "upright") return body;
 	return `<g transform="rotate(${vert === "cw90" ? 90 : 270} ${fmt(cx)} ${fmt(cy)})">${body}</g>`;
 };
+/** Content height (px) the body would occupy at the given input's font sizes —
+*  for a single column the block height, for multi-column the tallest filled
+*  column. The SVG normAutofit path uses this to pick a shrink scale. */
+const measureTextBodyHeight = (input, measure) => layoutCore(input, measure).requiredH;
 const anchorOffsetY = (frameY, frameH, blockH, anchor, firstLine) => {
 	let offsetY = frameY;
 	if (anchor === "center") offsetY = frameY + (frameH - blockH) / 2;
 	else if (anchor === "bottom") offsetY = frameY + (frameH - blockH);
-	if ((anchor === "center" || anchor === "bottom") && firstLine) offsetY += CENTER_ANCHOR_DROP * (firstLine.ascent + firstLine.descent);
+	if (firstLine) offsetY += BASELINE_LEADING_DROP * (firstLine.ascent + firstLine.descent);
 	return offsetY;
 };
 const placeSingle = (frame, anchor, buildLines) => {
 	const { lines, blockH } = buildLines(frame.x, frame.x + frame.w);
 	const offsetY = anchorOffsetY(frame.y, frame.h, blockH, anchor, lines[0]);
-	return lines.map((line) => ({
-		line,
-		baselineY: offsetY + line.topY + topPad(line) + line.ascent,
-		dx: 0
-	}));
+	return {
+		placements: lines.map((line) => ({
+			line,
+			baselineY: offsetY + line.topY + topPad(line) + line.ascent,
+			dx: 0
+		})),
+		requiredH: blockH
+	};
 };
 const placeColumns = (frame, columns, anchor, buildLines) => {
 	const gap = columns.gapPx;
@@ -227,30 +255,38 @@ const placeColumns = (frame, columns, anchor, buildLines) => {
 	const { lines } = buildLines(frame.x, frame.x + colW);
 	let col = 0;
 	let colStartTopY = 0;
-	const colHasLine = [];
+	let rowTopY = 0;
+	let curColHasLine = false;
 	let tallest = 0;
 	const placed = [];
 	for (const line of lines) {
-		const localBottom = line.topY - colStartTopY + line.advance;
-		if (col < columns.count - 1 && localBottom > frame.h && colHasLine[col]) {
-			col += 1;
+		if (line.topY - colStartTopY + line.ascent + line.descent > frame.h && curColHasLine) {
+			if (col + 1 < columns.count) col += 1;
+			else {
+				col = 0;
+				rowTopY += frame.h;
+			}
 			colStartTopY = line.topY;
+			curColHasLine = false;
 		}
-		const localTopY = line.topY - colStartTopY;
+		const localTopY = rowTopY + (line.topY - colStartTopY);
 		placed.push({
 			line,
 			localTopY,
 			col
 		});
-		colHasLine[col] = true;
+		curColHasLine = true;
 		if (localTopY + line.advance > tallest) tallest = localTopY + line.advance;
 	}
 	const offsetY = anchorOffsetY(frame.y, frame.h, tallest, anchor, lines[0]);
-	return placed.map(({ line, localTopY, col: c }) => ({
-		line,
-		baselineY: offsetY + localTopY + topPad(line) + line.ascent,
-		dx: c * (colW + gap)
-	}));
+	return {
+		placements: placed.map(({ line, localTopY, col: c }) => ({
+			line,
+			baselineY: offsetY + localTopY + topPad(line) + line.ascent,
+			dx: c * (colW + gap)
+		})),
+		requiredH: tallest
+	};
 };
 const emitPlacements = (placements) => {
 	const parts = [];
@@ -281,27 +317,76 @@ const emitLine = (line, baselineY, dx) => {
 	while (toks.length > 0 && (toks[toks.length - 1].isSpace || toks[toks.length - 1].isBreak)) toks.pop();
 	const content = toks.filter((t) => !t.isBreak);
 	if (content.length === 0) return "";
-	const tspans = groupTokens(content).map((g) => tspan(g)).join("");
+	const groups = groupTokens(content);
+	const tspans = groups.map((g) => tspan(g)).join("");
 	if (tspans === "") return "";
-	return `<text x="${fmt(line.anchorX + dx + GRID_NUDGE_X)}" y="${fmt(baselineY)}" text-anchor="${line.textAnchor}" xml:space="preserve">${tspans}</text>`;
+	const x0 = line.anchorX + dx + GRID_NUDGE_X;
+	return `<text x="${fmt(x0)}" y="${fmt(baselineY)}" text-anchor="${line.textAnchor}" xml:space="preserve">${tspans}</text>` + emitWavyUnderlines(groups, line.textAnchor, x0, baselineY);
 };
 const groupTokens = (toks) => {
 	const groups = [];
 	for (const t of toks) {
 		if (t.isBreak) continue;
 		const last = groups[groups.length - 1];
-		if (last && samePiece(last.piece, t.piece)) last.text += t.text;
-		else groups.push({
+		if (last && samePiece(last.piece, t.piece)) {
+			last.text += t.text;
+			last.width += t.width;
+		} else groups.push({
 			text: t.text,
-			piece: t.piece
+			piece: t.piece,
+			width: t.width
 		});
 	}
 	return groups;
 };
+const SUPERSCRIPT_SHIFT_RATIO = .33;
+const SUBSCRIPT_SHIFT_RATIO = .16;
+const baselineShiftPxOf = (p) => p.superSub === 1 ? p.sizePx * SUPERSCRIPT_SHIFT_RATIO : p.superSub === -1 ? -p.sizePx * SUBSCRIPT_SHIFT_RATIO : 0;
+const SUPER_SUB_SIZE_RATIO = .65;
+const renderedSizePxOf = (p) => p.superSub !== 0 ? p.sizePx * SUPER_SUB_SIZE_RATIO : p.sizePx;
+const emitWavyUnderlines = (groups, textAnchor, x0, baselineY) => {
+	if (!groups.some((g) => g.piece.underline === "wavy")) return "";
+	const totalWidth = groups.reduce((sum, g) => sum + g.width, 0);
+	let cursor = textAnchor === "middle" ? x0 - totalWidth / 2 : textAnchor === "end" ? x0 - totalWidth : x0;
+	const parts = [];
+	for (const g of groups) {
+		if (g.piece.underline === "wavy" && g.width > 0) {
+			const y = baselineY - baselineShiftPxOf(g.piece);
+			parts.push(wavyPath(cursor, cursor + g.width, y, g.piece));
+		}
+		cursor += g.width;
+	}
+	return parts.join("");
+};
+const WAVY_AMPLITUDE_RATIO = .045;
+const WAVY_AMPLITUDE_MIN_PX = .6;
+const WAVY_PERIOD_RATIO = .18;
+const WAVY_PERIOD_MIN_PX = 2;
+const WAVY_BASELINE_OFFSET_RATIO = .12;
+const WAVY_STROKE_WIDTH_RATIO = .06;
+const WAVY_STROKE_WIDTH_MIN_PX = .6;
+const wavyPath = (x1, x2, baselineY, piece) => {
+	const size = renderedSizePxOf(piece);
+	const amp = Math.max(WAVY_AMPLITUDE_MIN_PX, size * WAVY_AMPLITUDE_RATIO);
+	const period = Math.max(WAVY_PERIOD_MIN_PX, size * WAVY_PERIOD_RATIO);
+	const y = baselineY + size * WAVY_BASELINE_OFFSET_RATIO;
+	let d = `M${fmt(x1)} ${fmt(y)}`;
+	let cx = x1;
+	let up = true;
+	while (cx < x2 - .01) {
+		const half = Math.min(period / 2, x2 - cx);
+		const midX = cx + half;
+		d += ` Q${fmt(cx + half / 2)} ${fmt(y + (up ? -amp : amp))} ${fmt(midX)} ${fmt(y)}`;
+		cx = midX;
+		up = !up;
+	}
+	const strokeWidth = Math.max(WAVY_STROKE_WIDTH_MIN_PX, size * WAVY_STROKE_WIDTH_RATIO);
+	return `<path d="${d}" stroke="${piece.fillHex}" stroke-width="${fmt(strokeWidth)}" fill="none"/>`;
+};
 const samePiece = (a, b) => a.family === b.family && a.sizePx === b.sizePx && a.bold === b.bold && a.italic === b.italic && a.letterSpacingPx === b.letterSpacingPx && a.fillHex === b.fillHex && a.underline === b.underline && a.strike === b.strike && a.superSub === b.superSub && a.href === b.href;
 const tspan = (g) => {
 	const p = g.piece;
-	const sizePx = p.superSub !== 0 ? p.sizePx * .65 : p.sizePx;
+	const sizePx = renderedSizePxOf(p);
 	const attrs = [
 		`font-family="${escapeXml$1(p.family)}"`,
 		`font-size="${fmt(sizePx)}"`,
@@ -310,12 +395,11 @@ const tspan = (g) => {
 	if (p.bold) attrs.push("font-weight=\"700\"");
 	if (p.italic) attrs.push("font-style=\"italic\"");
 	const deco = [];
-	if (p.underline) deco.push("underline");
+	if (p.underline === "single") deco.push("underline");
 	if (p.strike) deco.push("line-through");
 	if (deco.length) attrs.push(`text-decoration="${deco.join(" ")}"`);
 	if (p.letterSpacingPx !== 0) attrs.push(`letter-spacing="${fmt(p.letterSpacingPx)}"`);
-	if (p.superSub === 1) attrs.push(`baseline-shift="${fmt(p.sizePx * .33)}"`);
-	else if (p.superSub === -1) attrs.push(`baseline-shift="${fmt(-p.sizePx * .16)}"`);
+	if (p.superSub !== 0) attrs.push(`baseline-shift="${fmt(baselineShiftPxOf(p))}"`);
 	return `<tspan ${attrs.join(" ")}>${escapeXml$1(g.text)}</tspan>`;
 };
 const wrapTokens = (tokens, wrap, firstAvail, avail) => {
@@ -348,8 +432,8 @@ const wrapTokens = (tokens, wrap, firstAvail, avail) => {
 			continue;
 		}
 		const limit = first ? firstAvail : avail;
-		const contentW = lineW - trailingSpaceW;
-		if (wrap && contentW > 0 && contentW + tok.width > limit + .5) {
+		const hasContent = lineW - trailingSpaceW > 0;
+		if (wrap && hasContent && lineW + tok.width > limit + .5) {
 			close();
 			cur.push(tok);
 			lineW = tok.width;
@@ -374,6 +458,7 @@ const PX_PER_PT = 96 / 72;
 const DEFAULT_BODY_PT = 18;
 const DEFAULT_TITLE_PT = 44;
 const DEFAULT_FONT = "Calibri, 'Helvetica Neue', Arial, sans-serif";
+const DEFAULT_BULLET_FONT = "Arial";
 const DEFAULT_INSET_X = 91440;
 const DEFAULT_INSET_Y = 45720;
 const u8ToBase64 = (data) => {
@@ -585,59 +670,65 @@ const gradientDef = (grad, theme) => {
 		fillAttr: `url(#${id})`
 	};
 };
+const ORTHO_TILE = 4;
+const ORTHO_WIDE_TILE = 16;
+const DIAG_TILE = 16;
+const MOTIF_TILE = 8;
+const PATTERN_TILE_SIZE = {
+	horz: ORTHO_TILE,
+	ltHorz: ORTHO_TILE,
+	narHorz: ORTHO_TILE,
+	dashHorz: ORTHO_TILE,
+	horzBrick: ORTHO_TILE,
+	dkHorz: ORTHO_TILE,
+	vert: ORTHO_TILE,
+	ltVert: ORTHO_TILE,
+	narVert: ORTHO_TILE,
+	dashVert: ORTHO_TILE,
+	dkVert: ORTHO_TILE,
+	ltHorzCross: ORTHO_TILE,
+	cross: ORTHO_TILE,
+	dotGrid: ORTHO_TILE,
+	smGrid: ORTHO_TILE,
+	dkHorzCross: ORTHO_WIDE_TILE,
+	lgGrid: ORTHO_WIDE_TILE,
+	plaid: ORTHO_WIDE_TILE,
+	wave: MOTIF_TILE,
+	zigZag: MOTIF_TILE,
+	weave: MOTIF_TILE,
+	divot: MOTIF_TILE,
+	sphere: MOTIF_TILE,
+	solidDmnd: MOTIF_TILE,
+	openDmnd: MOTIF_TILE
+};
 const patternDef = (pat) => {
 	const id = mintId();
 	const fg = pat.foreground;
 	const bg = pat.background;
 	const preset = pat.preset;
 	let body = "";
-	const W = 8;
-	const H = 8;
+	const PCT_DENSITY_FLOOR = .05;
+	const PCT_TILE_MIN = 6;
+	const pctMatch = /^pct(\d+)$/.exec(preset);
+	const pctDensity = pctMatch ? Math.min(100, Math.max(0, Number.parseInt(pctMatch[1], 10))) / 100 : null;
+	const W = pctDensity !== null ? Math.max(PCT_TILE_MIN, DIAG_TILE * 2 * Math.sqrt(PCT_DENSITY_FLOOR / Math.max(pctDensity, PCT_DENSITY_FLOOR))) : PATTERN_TILE_SIZE[preset] ?? DIAG_TILE;
+	const H = W;
 	const stripe = (orientation, width = 1) => {
 		if (orientation === "h") return `<path d="M0 ${H / 2}H${W}" stroke="${fg}" stroke-width="${width}"/>`;
 		if (orientation === "v") return `<path d="M${W / 2} 0V${H}" stroke="${fg}" stroke-width="${width}"/>`;
 		if (orientation === "d") return `<path d="M0 0L${W} ${H}" stroke="${fg}" stroke-width="${width}"/>`;
 		return `<path d="M${W} 0L0 ${H}" stroke="${fg}" stroke-width="${width}"/>`;
 	};
-	const BAYER4 = [
-		0,
-		8,
-		2,
-		10,
-		12,
-		4,
-		14,
-		6,
-		3,
-		11,
-		1,
-		9,
-		15,
-		7,
-		13,
-		5
-	];
-	const screen = (density) => {
-		const threshold = density * 16;
-		const out = [];
-		for (let i = 0; i < 16; i++) if (BAYER4[i] < threshold) {
-			const cx = i % 4 * 2;
-			const cy = Math.floor(i / 4) * 2;
-			out.push(`<rect x="${cx}" y="${cy}" width="2" height="2" fill="${fg}"/>`);
-		}
-		return out.join("");
-	};
-	const pctMatch = /^pct(\d+)$/.exec(preset);
-	if (pctMatch) body = screen(Math.min(100, Math.max(0, Number.parseInt(pctMatch[1], 10))) / 100);
-	else if (preset === "horzBrick" || preset === "ltHorizontal" || preset === "narHorz") body = stripe("h", .8);
-	else if (preset === "dkHorizontal") body = stripe("h", 2);
-	else if (preset === "ltVertical" || preset === "narVert") body = stripe("v", .8);
-	else if (preset === "dkVertical") body = stripe("v", 2);
+	if (pctDensity !== null) body = pctDensity >= .3 ? stripe("d", .8) + stripe("a", .8) : stripe("d", .8);
+	else if (preset === "horz" || preset === "ltHorz" || preset === "narHorz" || preset === "dashHorz" || preset === "horzBrick") body = stripe("h", .8);
+	else if (preset === "dkHorz") body = stripe("h", 2);
+	else if (preset === "vert" || preset === "ltVert" || preset === "narVert" || preset === "dashVert") body = stripe("v", .8);
+	else if (preset === "dkVert") body = stripe("v", 2);
 	else if (preset === "ltUpDiag" || preset === "wdUpDiag") body = stripe("d", .8);
 	else if (preset === "dkUpDiag") body = stripe("d", 2);
 	else if (preset === "ltDnDiag" || preset === "wdDnDiag") body = stripe("a", .8);
 	else if (preset === "dkDnDiag") body = stripe("a", 2);
-	else if (preset === "ltHorzCross" || preset === "smGrid" || preset === "cross") body = stripe("h", .8) + stripe("v", .8);
+	else if (preset === "ltHorzCross" || preset === "smGrid" || preset === "cross" || preset === "dotGrid") body = stripe("h", .8) + stripe("v", .8);
 	else if (preset === "dkHorzCross" || preset === "lgGrid" || preset === "plaid") body = stripe("h", 2) + stripe("v", 2);
 	else if (preset === "diagCross" || preset === "trellis" || preset === "shingle" || preset === "dashUpDiag" || preset === "dashDnDiag") body = stripe("d", .8) + stripe("a", .8);
 	else if (preset === "dkUpDiagStripe" || preset === "dkDnDiagStripe") body = stripe(preset === "dkUpDiagStripe" ? "d" : "a", 2);
@@ -645,7 +736,7 @@ const patternDef = (pat) => {
 	else if (preset === "weave" || preset === "divot") body = `<path d="M0 0L4 4 0 8M4 0L8 4 4 8" stroke="${fg}" stroke-width="0.8" fill="none"/>`;
 	else if (preset === "sphere") body = `<circle cx="4" cy="4" r="3" fill="${fg}" fill-opacity="0.7"/>`;
 	else if (preset === "solidDmnd" || preset === "openDmnd") body = `<path d="M4 1L7 4 4 7 1 4Z" fill="${preset === "solidDmnd" ? fg : "none"}" stroke="${fg}" stroke-width="0.6"/>`;
-	else body = screen(.5);
+	else body = stripe("d", .8) + stripe("a", .8);
 	return {
 		defs: `<defs><pattern id="${id}" patternUnits="userSpaceOnUse" width="${W}" height="${H}"><rect width="${W}" height="${H}" fill="${bg}"/>${body}</pattern></defs>`,
 		fillAttr: `url(#${id})`
@@ -829,42 +920,54 @@ const PRESET_POINTS = {
 	star16: () => star(16),
 	star24: () => star(24),
 	star32: () => star(32),
-	rightArrow: () => [
-		[0, .3],
-		[.65, .3],
-		[.65, 0],
-		[1, .5],
-		[.65, 1],
-		[.65, .7],
-		[0, .7]
-	],
-	leftArrow: () => [
-		[1, .3],
-		[.35, .3],
-		[.35, 0],
-		[0, .5],
-		[.35, 1],
-		[.35, .7],
-		[1, .7]
-	],
-	upArrow: () => [
-		[.3, 1],
-		[.3, .35],
-		[0, .35],
-		[.5, 0],
-		[1, .35],
-		[.7, .35],
-		[.7, 1]
-	],
-	downArrow: () => [
-		[.3, 0],
-		[.3, .65],
-		[0, .65],
-		[.5, 1],
-		[1, .65],
-		[.7, .65],
-		[.7, 0]
-	],
+	rightArrow: (w, h) => {
+		const bx = 1 - Math.min(1, .5 * Math.min(w, h) / w);
+		return [
+			[0, .25],
+			[bx, .25],
+			[bx, 0],
+			[1, .5],
+			[bx, 1],
+			[bx, .75],
+			[0, .75]
+		];
+	},
+	leftArrow: (w, h) => {
+		const bx = Math.min(1, .5 * Math.min(w, h) / w);
+		return [
+			[1, .25],
+			[bx, .25],
+			[bx, 0],
+			[0, .5],
+			[bx, 1],
+			[bx, .75],
+			[1, .75]
+		];
+	},
+	upArrow: (w, h) => {
+		const by = Math.min(1, .5 * Math.min(w, h) / h);
+		return [
+			[.25, 1],
+			[.25, by],
+			[0, by],
+			[.5, 0],
+			[1, by],
+			[.75, by],
+			[.75, 1]
+		];
+	},
+	downArrow: (w, h) => {
+		const by = 1 - Math.min(1, .5 * Math.min(w, h) / h);
+		return [
+			[.25, 0],
+			[.25, by],
+			[0, by],
+			[.5, 1],
+			[1, by],
+			[.75, by],
+			[.75, 0]
+		];
+	},
 	leftRightArrow: () => [
 		[0, .5],
 		[.18, .2],
@@ -1745,9 +1848,14 @@ const renderRun = (text, format, theme, effectivePt, _wasDefault = false) => {
 	const strike = format?.strike;
 	const hasUnderline = underline !== void 0 && underline !== false && underline !== "none";
 	const hasStrike = strike !== void 0 && strike !== false && strike !== "noStrike";
-	if (hasUnderline && hasStrike) styles.push("text-decoration:underline line-through");
-	else if (hasUnderline) styles.push("text-decoration:underline");
-	else if (hasStrike) styles.push("text-decoration:line-through");
+	const isWavyUnderline = typeof underline === "string" && underline.startsWith("wavy");
+	const nestedWavyUnderline = hasUnderline && hasStrike && isWavyUnderline;
+	if (nestedWavyUnderline) styles.push("text-decoration:line-through");
+	else if (hasUnderline && hasStrike) styles.push("text-decoration:underline line-through");
+	else if (hasUnderline) {
+		styles.push("text-decoration:underline");
+		if (isWavyUnderline) styles.push("text-decoration-style:wavy");
+	} else if (hasStrike) styles.push("text-decoration:line-through");
 	if (format?.color !== void 0 && format.color !== null) styles.push(`color:${resolveColor(format.color, theme, "#000000")}`);
 	if (format?.spc !== void 0 && format.spc !== 0) {
 		const trackingPx = format.spc / 100 * PX_PER_PT;
@@ -1762,13 +1870,18 @@ const renderRun = (text, format, theme, effectivePt, _wasDefault = false) => {
 	else if (format?.cap === "small") styles.push("font-variant:small-caps");
 	if (format?.highlight !== void 0 && format.highlight !== null) styles.push(`background-color:${resolveColor(format.highlight, theme, "#FFFF00")}`);
 	const html = text.split("\n").map((part) => escapeXml(part)).join("<br/>");
-	return `<span style="${styles.join(";")}">${html}</span>`;
+	const content = nestedWavyUnderline ? `<span style="text-decoration:underline;text-decoration-style:wavy">${html}</span>` : html;
+	return `<span style="${styles.join(";")}">${content}</span>`;
 };
 const LINE_HEIGHT = 1.05;
 const AVG_GLYPH_W_RATIO = .55;
-const hasUnderlineFmt = (fmt) => {
+const AUTOFIT_FLOOR = .25;
+const AUTOFIT_STEP = .05;
+const underlineStyleOf = (fmt) => {
 	const u = fmt?.underline;
-	return u !== void 0 && u !== false && u !== "none";
+	if (u === void 0 || u === false || u === "none") return "none";
+	if (typeof u === "string" && u.startsWith("wavy")) return "wavy";
+	return "single";
 };
 const hasStrikeFmt = (fmt) => {
 	const s = fmt?.strike;
@@ -1778,15 +1891,15 @@ const alignOf = (a) => a === "center" || a === "right" || a === "justify" ? a :
 const verticalLayoutOf = (vert) => {
 	switch (vert) {
 		case "vert":
-		case "eaVert":
+		case "eaVert": return "cw90";
 		case "wordArtVert":
-		case "wordArtVertRtl": return "cw90";
+		case "wordArtVertRtl": return "upright";
 		case "vert270":
 		case "mongolianVert": return "cw270";
 		case null: return "none";
 	}
 };
-const buildAndLayoutSvgText = (a) => {
+const buildSvgTextInput = (a) => {
 	const scale = a.autoFitScale;
 	const paragraphs = a.paraData.map((para, pi) => {
 		const pieces = [];
@@ -1800,7 +1913,7 @@ const buildAndLayoutSvgText = (a) => {
 				const hlinkColor = a.theme ? normalizeHex(a.theme.hyperlink) : "#0563C1";
 				fmt = {
 					...fmt,
-					color: fmt?.color ?? hlinkColor,
+					color: hlinkColor,
 					underline: fmt?.underline ?? true
 				};
 			}
@@ -1817,16 +1930,26 @@ const buildAndLayoutSvgText = (a) => {
 				italic: fmt?.italic ?? false,
 				letterSpacingPx,
 				fillHex,
-				underline: hasUnderlineFmt(fmt),
+				underline: underlineStyleOf(fmt),
 				strike: hasStrikeFmt(fmt),
 				superSub,
 				href: run.href ?? null
 			};
 			const segs = run.text.split("\n");
 			segs.forEach((seg, i) => {
-				pieces.push({
+				const segText = caps ? seg.toUpperCase() : seg;
+				if (a.vert === "upright") for (const g of Array.from(segText)) {
+					const last = pieces[pieces.length - 1];
+					if (last !== void 0 && !last.isBreak) pieces.push(breakPiece());
+					pieces.push({
+						...base,
+						text: g,
+						isBreak: false
+					});
+				}
+				else pieces.push({
 					...base,
-					text: caps ? seg.toUpperCase() : seg,
+					text: segText,
 					isBreak: false
 				});
 				if (i < segs.length - 1) pieces.push(breakPiece());
@@ -1858,7 +1981,7 @@ const buildAndLayoutSvgText = (a) => {
 			fallbackSizePx: a.defaultPt * scale * PX_PER_PT
 		};
 	});
-	return layoutTextSvg({
+	return {
 		boxXpx: a.innerX / EMU_PER_PX,
 		boxYpx: a.innerY / EMU_PER_PX,
 		boxWpx: a.innerW / EMU_PER_PX,
@@ -1868,8 +1991,9 @@ const buildAndLayoutSvgText = (a) => {
 		paragraphs,
 		vert: a.vert,
 		columns: a.columns
-	}, a.measure);
+	};
 };
+const buildAndLayoutSvgText = (a) => layoutTextSvg(buildSvgTextInput(a), a.measure);
 const breakPiece = () => ({
 	text: "",
 	family: "",
@@ -1878,7 +2002,7 @@ const breakPiece = () => ({
 	italic: false,
 	letterSpacingPx: 0,
 	fillHex: "#000000",
-	underline: false,
+	underline: "none",
 	strike: false,
 	superSub: 0,
 	href: null,
@@ -1889,17 +2013,52 @@ const buildBullet = (a, para, pi) => {
 	const numberLabel = a.numberLabels[pi] ?? null;
 	if (!(para.bulletStyle === "bullet" || explicitChar !== null || numberLabel !== null || para.bulletIsPicture || para.bulletStyle !== "none" && para.level > 0)) return null;
 	const char = para.bulletIsPicture ? "■" : numberLabel ?? explicitChar ?? bulletChar(para.level);
-	const baseSizePx = a.defaultPt * PX_PER_PT * a.autoFitScale;
+	const baseSizePx = (para.runs.find((r) => r.text !== "\n" && r.text !== "")?.sizePt ?? a.defaultPt) * PX_PER_PT * a.autoFitScale;
 	const sizePx = para.bulletDetail.sizePct !== null ? baseSizePx * para.bulletDetail.sizePct : para.bulletDetail.sizePts !== null ? para.bulletDetail.sizePts * PX_PER_PT * a.autoFitScale : baseSizePx;
 	const fillHex = para.bulletDetail.color ? resolveColor(para.bulletDetail.color, a.theme, "#000000") : a.defaultColor;
 	return {
 		text: char,
-		family: substituteFamily(para.bulletDetail.font ?? a.themeFace),
+		family: substituteFamily(para.bulletDetail.font ?? DEFAULT_BULLET_FONT),
 		sizePx,
 		fillHex,
 		...para.bulletImageHref ? { imageHref: para.bulletImageHref } : {}
 	};
 };
+const presetTextRect = (preset) => {
+	switch (preset) {
+		case "triangle": return {
+			l: .25,
+			t: .5,
+			r: .75,
+			b: 1
+		};
+		case "diamond": return {
+			l: .25,
+			t: .25,
+			r: .75,
+			b: .75
+		};
+		case "pentagon": return {
+			l: .191,
+			t: .236,
+			r: .809,
+			b: 1
+		};
+		case "star5": return {
+			l: .309,
+			t: .382,
+			r: .691,
+			b: .764
+		};
+		case "leftRightArrow": return {
+			l: .18,
+			t: .35,
+			r: .82,
+			b: .65
+		};
+		default: return null;
+	}
+};
 const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 	let paragraphCount;
 	try {
@@ -1937,11 +2096,33 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 	const tIns = margins.top ?? DEFAULT_INSET_Y;
 	const rIns = margins.right ?? DEFAULT_INSET_X;
 	const bIns = margins.bottom ?? DEFAULT_INSET_Y;
-	const innerX = bounds.x + lIns;
-	const innerY = bounds.y + tIns;
-	const innerW = Math.max(0, bounds.w - lIns - rIns);
-	const innerH = Math.max(0, bounds.h - tIns - bIns);
+	const pRect = presetTextRect(getShapePreset(shape));
+	const rectX = pRect ? bounds.x + pRect.l * bounds.w : bounds.x;
+	const rectY = pRect ? bounds.y + pRect.t * bounds.h : bounds.y;
+	const rectW = pRect ? (pRect.r - pRect.l) * bounds.w : bounds.w;
+	const rectH = pRect ? (pRect.b - pRect.t) * bounds.h : bounds.h;
+	let innerX = rectX + lIns;
+	let innerY = rectY + tIns;
+	let innerW = rectW - lIns - rIns;
+	let innerH = rectH - tIns - bIns;
+	if (pRect && (innerW <= 0 || innerH <= 0)) {
+		innerX = rectX;
+		innerY = rectY;
+		innerW = rectW;
+		innerH = rectH;
+	}
 	if (innerW <= 0 || innerH <= 0) return "";
+	const svgTextRect = (v) => v === "none" || v === "upright" ? {
+		x: innerX,
+		y: innerY,
+		w: innerW,
+		h: innerH
+	} : {
+		x: bounds.x + tIns,
+		y: bounds.y + lIns,
+		w: Math.max(0, bounds.w - tIns - bIns),
+		h: Math.max(0, bounds.h - lIns - rIns)
+	};
 	const paraData = [];
 	let hasAnyText = false;
 	for (let p = 0; p < paragraphCount; p++) {
@@ -2121,6 +2302,45 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 			numberLabels[i] = formatAutoNum(num, counter);
 		}
 	}
+	if (authoredAutofit && autoFitScale === 1) {
+		const fitVert = verticalLayoutOf(effectiveBody.vert ?? getShapeTextDirection(shape));
+		const fitCols = getShapeTextColumns(shape);
+		const fitColumns = fitVert === "none" && fitCols && fitCols.count >= 2 ? {
+			count: fitCols.count,
+			gapPx: fitCols.gapEmu !== void 0 ? fitCols.gapEmu / EMU_PER_PX : 12
+		} : null;
+		const fitRect = svgTextRect(fitVert);
+		const fitBoxPx = (fitVert === "cw90" || fitVert === "cw270" ? fitRect.w : fitRect.h) / EMU_PER_PX;
+		const fitArgsBase = {
+			pres,
+			shape,
+			theme,
+			paraData,
+			numberLabels,
+			lineHeightScale,
+			defaultPt,
+			themeFace,
+			defaultColor: activeDeckTextColor,
+			anchor: anchor === "center" || anchor === "bottom" ? anchor : "top",
+			wrap: effectiveBody.wrap !== "none",
+			innerX: fitRect.x,
+			innerY: fitRect.y,
+			innerW: fitRect.w,
+			innerH: fitRect.h,
+			measure: ctx.measure,
+			vert: fitVert,
+			columns: fitColumns
+		};
+		let s = 1;
+		while (s > AUTOFIT_FLOOR) {
+			if (measureTextBodyHeight(buildSvgTextInput({
+				...fitArgsBase,
+				autoFitScale: s
+			}), ctx.measure) <= fitBoxPx) break;
+			s -= AUTOFIT_STEP;
+		}
+		autoFitScale = Math.max(AUTOFIT_FLOOR, s);
+	}
 	const paragraphs = [];
 	for (let pi = 0; pi < paraData.length; pi++) {
 		const para = paraData[pi];
@@ -2130,7 +2350,7 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 				const hlinkColor = theme ? normalizeHex(theme.hyperlink) : "#0563C1";
 				runFmt = {
 					...runFmt,
-					color: runFmt?.color ?? hlinkColor,
+					color: hlinkColor,
 					underline: runFmt?.underline ?? true
 				};
 			}
@@ -2162,8 +2382,8 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 		const explicitChar = para.bulletStyle !== null && typeof para.bulletStyle === "object" && "char" in para.bulletStyle ? para.bulletStyle.char : null;
 		const numberLabel = numberLabels[pi];
 		const showBullet = para.bulletStyle === "bullet" || explicitChar !== null || numberLabel !== null || para.bulletIsPicture || para.bulletStyle !== "none" && para.level > 0;
+		const baseBulletPx = (para.runs.find((r) => r.text !== "\n" && r.text !== "")?.sizePt ?? defaultPt) * PX_PER_PT * autoFitScale;
 		if (showBullet && para.bulletImageHref) {
-			const baseBulletPx = defaultPt * PX_PER_PT * autoFitScale;
 			const bulletPx = para.bulletDetail.sizePct !== null ? baseBulletPx * para.bulletDetail.sizePct : para.bulletDetail.sizePts !== null ? para.bulletDetail.sizePts * PX_PER_PT * autoFitScale : baseBulletPx;
 			const imgStyles = [
 				`width:${bulletPx.toFixed(2)}px`,
@@ -2179,7 +2399,8 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 			if (para.bulletDetail.color) bulletStyles.push(`color:${resolveColor(para.bulletDetail.color, theme, "#000000")}`);
 			if (para.bulletDetail.sizePct !== null) bulletStyles.push(`font-size:${(para.bulletDetail.sizePct * 100).toFixed(1)}%`);
 			else if (para.bulletDetail.sizePts !== null) bulletStyles.push(`font-size:${(para.bulletDetail.sizePts * PX_PER_PT * autoFitScale).toFixed(2)}px`);
-			if (para.bulletDetail.font) bulletStyles.push(`font-family:${escapeXml(para.bulletDetail.font)}, ${DEFAULT_FONT}`);
+			else bulletStyles.push(`font-size:${baseBulletPx.toFixed(2)}px`);
+			bulletStyles.push(para.bulletDetail.font ? `font-family:${escapeXml(para.bulletDetail.font)}, ${DEFAULT_FONT}` : `font-family:${DEFAULT_BULLET_FONT}, ${DEFAULT_FONT}`);
 			prefix = `<span style="${bulletStyles.join(";")}">${escapeXml(char)}</span>`;
 		}
 		paragraphs.push(`<p style="${pStyles.join(";")}">${prefix}${runHtmls.join("") || "&#8203;"}</p>`);
@@ -2187,7 +2408,6 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 	const justify = ANCHOR_TO_CSS[anchor] ?? "flex-start";
 	const defaultColor = activeDeckTextColor;
 	if (ctx.mode === "svg") {
-		const svgScale = authoredAutofit?.fontScale ?? 1;
 		const svgLineScale = 1 - (authoredAutofit?.lnSpcReduction ?? 0);
 		const svgVert = verticalLayoutOf(effectiveBody.vert ?? getShapeTextDirection(shape));
 		const svgCols = getShapeTextColumns(shape);
@@ -2195,31 +2415,37 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 			count: svgCols.count,
 			gapPx: svgCols.gapEmu !== void 0 ? svgCols.gapEmu / EMU_PER_PX : 12
 		} : null;
-		const svgInner = buildAndLayoutSvgText({
+		const { x: vInnerX, y: vInnerY, w: vInnerW, h: vInnerH } = svgTextRect(svgVert);
+		if (vInnerW <= 0 || vInnerH <= 0) return "";
+		const svgArgsBase = {
 			pres,
 			shape,
 			theme,
 			paraData,
 			numberLabels,
-			autoFitScale: svgScale,
 			lineHeightScale: svgLineScale,
 			defaultPt,
 			themeFace,
 			defaultColor,
 			anchor: anchor === "center" || anchor === "bottom" ? anchor : "top",
 			wrap: effectiveBody.wrap !== "none",
-			innerX,
-			innerY,
-			innerW,
-			innerH,
+			innerX: vInnerX,
+			innerY: vInnerY,
+			innerW: vInnerW,
+			innerH: vInnerH,
 			measure: ctx.measure,
 			vert: svgVert,
 			columns: svgColumns
+		};
+		const svgScale = authoredAutofit ? autoFitScale : 1;
+		const svgInner = buildAndLayoutSvgText({
+			...svgArgsBase,
+			autoFitScale: svgScale
 		});
 		const bodyRotDegSvg = getShapeTextBodyRotationDeg(shape);
 		if (bodyRotDegSvg !== null && bodyRotDegSvg !== 0) {
-			const pivotX = innerX + innerW / 2;
-			const pivotY = innerY + innerH / 2;
+			const pivotX = vInnerX + vInnerW / 2;
+			const pivotY = vInnerY + vInnerH / 2;
 			return `<g transform="rotate(${bodyRotDegSvg} ${E(pivotX)} ${E(pivotY)})">${svgInner}</g>`;
 		}
 		return svgInner;
@@ -2272,15 +2498,16 @@ const accentSequence = (theme) => {
 	].map((c) => normalizeHex(c)).filter((c) => /^#[0-9A-Fa-f]{6}$/.test(c));
 	return hexes.length > 0 ? hexes : fallbacks;
 };
-const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true) => {
+const DEFAULT_CHART_TITLE_PT = 13;
+const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT) => {
 	const x = xEmu / EMU_PER_PX;
 	const y = yEmu / EMU_PER_PX;
 	const w = wEmu / EMU_PER_PX;
 	const h = hEmu / EMU_PER_PX;
-	const titleStrip = hasTitle && !titleOverlay ? 18 : 0;
+	const titleStrip = hasTitle && !titleOverlay ? Math.round(titlePx * 2.4) : 0;
 	const legendStrip = hasLegend && !legendOverlay ? 18 : 0;
 	const padding = 8;
-	const yAxisGutter = hasAxes ? 40 : 0;
+	const yAxisGutter = hasAxes ? 32 : 0;
 	const xAxisGutter = hasAxes ? 18 : 0;
 	return {
 		x,
@@ -2291,7 +2518,7 @@ const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = f
 		plotY: y + titleStrip + padding,
 		plotW: Math.max(0, w - 2 * padding - yAxisGutter),
 		plotH: Math.max(0, h - titleStrip - legendStrip - xAxisGutter - 2 * padding),
-		titleY: y + (titleOverlay ? 14 : titleStrip - 2),
+		titleY: y + (titleOverlay ? 14 : padding + titlePx * .7),
 		legendY: y + h - (legendOverlay ? 18 : legendStrip / 2)
 	};
 };
@@ -2379,12 +2606,13 @@ const DISPLAY_UNIT_LABEL = {
 const DEFAULT_AXIS_COLOR = "#000000";
 const DEFAULT_GRID_COLOR = "#D9D9D9";
 const AXIS_TICK_LEN = 5;
+const chartFontPx = (sizePt) => (sizePt * PX_PER_PT).toFixed(1);
 const axisTickAttrs = (style) => {
 	const sz = style?.sizePt ?? 10;
 	const fill = style?.color ?? "#6B7280";
 	const weight = style?.bold ? " font-weight=\"600\"" : "";
 	const italic = style?.italic ? " font-style=\"italic\"" : "";
-	return `font-family="sans-serif" font-size="${sz.toFixed(1)}" fill="${fill}"${weight}${italic}`;
+	return `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}"${weight}${italic}`;
 };
 const renderValueAxis = (f, axis) => {
 	const ticks = axis.majorUnit ? (() => {
@@ -2537,11 +2765,11 @@ const seriesMinMax = (spec) => {
 };
 const renderChartTitle = (f, title, style) => {
 	if (!title) return "";
-	const sz = style?.sizePt ?? 13;
+	const sz = style?.sizePt ?? DEFAULT_CHART_TITLE_PT;
 	const fill = style?.color ?? "#1F2937";
 	const weight = style?.bold === false ? "400" : "600";
 	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="${sz.toFixed(1)}" fill="${fill}" font-weight="${weight}"${fontStyleAttr}>${escapeXml(title)}</text>`;
+	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 renderChartLegend = (f, names, colors, position = "b", textStyle, markerSymbols) => {
 	if (names.length === 0) return "";
@@ -2549,7 +2777,7 @@ const renderChartLegend = (f, names, colors, position = "b", textStyle, markerSy
 	const fill = textStyle?.color ?? "#374151";
 	const weight = textStyle?.bold ? " font-weight=\"600\"" : "";
 	const italic = textStyle?.italic ? " font-style=\"italic\"" : "";
-	const textAttrs = `font-family="sans-serif" font-size="${sz.toFixed(1)}" fill="${fill}"${weight}${italic}`;
+	const textAttrs = `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}"${weight}${italic}`;
 	const swatch = (i, swatchX, swatchY) => {
 		const color = colors[i % colors.length];
 		const sym = markerSymbols?.[i];
@@ -2836,7 +3064,7 @@ const dataLabelTextAttrs = (spec, seriesIdx, fallbackFill, fallbackSizePt = 9, f
 	const fill = style?.color ?? fallbackFill;
 	const weight = style?.bold ?? fallbackBold ? " font-weight=\"600\"" : "";
 	const italic = style?.italic ? " font-style=\"italic\"" : "";
-	return `font-family="sans-serif" font-size="${sz.toFixed(1)}" fill="${fill}"${weight}${italic}`;
+	return `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}"${weight}${italic}`;
 };
 const renderBarChart = (f, spec, colors) => {
 	const N = pointCount(spec);
@@ -2930,11 +3158,13 @@ const renderLineChart = (f, spec, colors, fill) => {
 	const isPercent = grouping === "percentStacked";
 	const { min, max } = seriesMinMax(spec);
 	const range = max - min || 1;
-	const step = N > 1 ? f.plotW / (N - 1) : 0;
+	const band = N > 1 ? fill ? f.plotW / (N - 1) : f.plotW / N : 0;
+	const xAt = (c) => fill ? f.plotX + c * band : f.plotX + (c + .5) * band;
 	const baseY = f.plotY + f.plotH - (0 - min) / range * f.plotH;
 	const out = [];
 	out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="#E5E7EB" stroke-width="0.5"/>`);
 	const accumulated = Array.from({ length: N }, () => 0);
+	const perSeries = [];
 	for (let s = 0; s < spec.series.length; s++) {
 		const series = spec.series[s];
 		if (!series) continue;
@@ -2943,7 +3173,7 @@ const renderLineChart = (f, spec, colors, fill) => {
 		const ptsRaw = [];
 		const basePtsRaw = [];
 		for (let c = 0; c < N; c++) {
-			const xp = f.plotX + c * step;
+			const xp = xAt(c);
 			const rawV = series.values[c];
 			const isNullish = rawV === null || rawV === void 0 || !Number.isFinite(rawV);
 			let v;
@@ -2982,10 +3212,22 @@ const renderLineChart = (f, spec, colors, fill) => {
 			}
 			return path.trim();
 		})();
-		if (fill) {
-			const back = basePts.slice().reverse().map(([xp, yp]) => `L${px(xp)},${px(yp)}`).join(" ");
-			out.push(`<path d="${dPath} ${back} Z" fill="${color}" stroke="none"/>`);
-		}
+		perSeries.push({
+			s,
+			series,
+			color,
+			ptsRaw,
+			pts,
+			basePts,
+			dPath
+		});
+	}
+	const paintOrder = fill && !isStacked ? perSeries.slice().reverse() : perSeries;
+	if (fill) for (const { color, basePts, dPath } of paintOrder) {
+		const back = basePts.slice().reverse().map(([xp, yp]) => `L${px(xp)},${px(yp)}`).join(" ");
+		out.push(`<path d="${dPath} ${back} Z" fill="${color}" stroke="none"/>`);
+	}
+	for (const { s, series, color, ptsRaw, pts, dPath } of paintOrder) {
 		const lineWPx = series.lineWidthEmu ? Math.max(.3, series.lineWidthEmu / EMU_PER_PX) : 1.5;
 		const dashAttr = series.lineDash ? (() => {
 			const sw = lineWPx;
@@ -3058,7 +3300,7 @@ const renderLineChart = (f, spec, colors, fill) => {
 		}
 	}
 	if (!isStacked && (spec.dropLines || spec.hiLowLines) && spec.series.length > 0) for (let c = 0; c < N; c++) {
-		const xp = f.plotX + c * step;
+		const xp = xAt(c);
 		if (spec.dropLines) {
 			const firstVal = spec.series[0]?.values[c];
 			if (firstVal !== null && firstVal !== void 0 && Number.isFinite(firstVal)) {
@@ -3136,12 +3378,12 @@ const renderPieChart = (f, spec, colors, doughnut) => {
 		const labelX = sx + labelR * Math.cos(labelMid);
 		const labelY = sy + labelR * Math.sin(labelMid);
 		const labels = [];
-		if (spec.dataLabels?.showValue) labels.push(formatDataLabelValue(spec, 0, v));
-		if (spec.dataLabels?.showPercent) labels.push(`${(v / total * 100).toFixed(0)}%`);
 		if (spec.dataLabels?.showCategory) {
 			const catLabel = spec.categories[i];
 			if (catLabel) labels.push(catLabel);
 		}
+		if (spec.dataLabels?.showValue) labels.push(formatDataLabelValue(spec, 0, v));
+		if (spec.dataLabels?.showPercent) labels.push(`${(v / total * 100).toFixed(0)}%`);
 		if (labels.length > 0) out.push(`<text x="${px(labelX)}" y="${px(labelY)}" text-anchor="middle" dominant-baseline="middle" ${dataLabelTextAttrs(spec, 0, labelFill, 10, true)}>${escapeXml(labels.join(spec.series[0]?.dataLabels?.separator ?? spec.dataLabels?.separator ?? " "))}</text>`);
 	}
 	return out.join("");
@@ -3363,7 +3605,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 	const isCartesian = spec.kind === "column" || spec.kind === "bar" || spec.kind === "line" || spec.kind === "area";
 	const hasAxes = isCartesian || spec.kind === "scatter" || spec.kind === "bubble";
 	const hasLegend = spec.legend !== void 0 && spec.legend.position !== null;
-	const f = layoutChart(x, y, w, h, !!spec.title, hasAxes, spec.titleOverlay ?? false, spec.legend?.overlay ?? false, hasLegend);
+	const f = layoutChart(x, y, w, h, !!spec.title, hasAxes, spec.titleOverlay ?? false, spec.legend?.overlay ?? false, hasLegend, (spec.titleStyle?.sizePt ?? DEFAULT_CHART_TITLE_PT) * PX_PER_PT);
 	const allNamesForLegend = spec.kind === "pie" || spec.kind === "doughnut" ? Array.from(spec.categories) : spec.series.map((s) => s.name);
 	const allColorsForLegend = spec.kind === "pie" || spec.kind === "doughnut" ? spec.categories.map((_, i) => spec.series[0]?.pointColors?.[i] ?? spec.series[0]?.color ?? colors[i % colors.length] ?? "#888") : spec.series.map((s, i) => s.color ?? colors[i % colors.length] ?? "#888");
 	const hiddenSet = new Set(spec.legend?.hiddenIndices ?? []);
@@ -3443,13 +3685,13 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		const fill = style?.color ?? "#374151";
 		const weight = style?.bold === false ? "400" : "600";
 		const italicAttr = style?.italic ? " font-style=\"italic\"" : "";
-		return `font-family="sans-serif" font-size="${sz.toFixed(1)}" fill="${fill}" font-weight="${weight}"${italicAttr}`;
+		return `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}" font-weight="${weight}"${italicAttr}`;
 	};
 	const valueAxisTitleRot = spec.valueAxisTitleRotationDeg ?? -90;
 	const valueAxisTitleSvg = spec.valueAxisTitle ? `<text x="${px(f.plotX - 26)}" y="${px(f.plotY + f.plotH / 2)}" text-anchor="middle" ${axisTitleAttrs(spec.valueAxisTitleStyle)} transform="rotate(${valueAxisTitleRot} ${px(f.plotX - 26)} ${px(f.plotY + f.plotH / 2)})">${escapeXml(spec.valueAxisTitle)}</text>` : "";
 	const catTitleRot = spec.categoryAxisTitleRotationDeg ?? 0;
 	const catTitleCx = f.plotX + f.plotW / 2;
-	const catTitleCy = f.plotY + f.plotH + 16;
+	const catTitleCy = f.plotY + f.plotH + 28;
 	const catTitleTransform = catTitleRot !== 0 ? ` transform="rotate(${catTitleRot} ${px(catTitleCx)} ${px(catTitleCy)})"` : "";
 	const categoryAxisTitleSvg = spec.categoryAxisTitle ? `<text x="${px(catTitleCx)}" y="${px(catTitleCy)}" text-anchor="middle" ${axisTitleAttrs(spec.categoryAxisTitleStyle)}${catTitleTransform}>${escapeXml(spec.categoryAxisTitle)}</text>` : "";
 	return [
@@ -3584,7 +3826,8 @@ const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 	const flags = getTableStyleFlags(shape);
 	const accent = theme ? normalizeHex(theme.accent1) : "#4472C4";
 	const headerFill = accent;
-	const bandFill = mixHex(accent, "#FFFFFF", .92);
+	const bandFill = mixHex(accent, "#FFFFFF", .12);
+	const bandFill2 = mixHex(accent, "#FFFFFF", .27);
 	const textColor = activeDeckTextColor;
 	const tableThemeFace = getPresentationFonts(pres)?.minorLatin ?? null;
 	const out = [];
@@ -3610,8 +3853,8 @@ const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 		else if (flags.lastRow && r === dims.rows - 1) resolvedFill = headerFill;
 		else if (flags.firstCol && c === 0) resolvedFill = bandFill;
 		else if (flags.lastCol && c === dims.cols - 1) resolvedFill = bandFill;
-		else if (flags.bandRow && r % 2 === (flags.firstRow ? 0 : 1)) resolvedFill = bandFill;
-		else if (flags.bandCol && c % 2 === (flags.firstCol ? 0 : 1)) resolvedFill = bandFill;
+		else if (flags.bandRow) resolvedFill = (r - (flags.firstRow ? 1 : 0)) % 2 === 0 ? bandFill : bandFill2;
+		else if (flags.bandCol) resolvedFill = (c - (flags.firstCol ? 1 : 0)) % 2 === 0 ? bandFill : bandFill2;
 		else resolvedFill = "none";
 		const cellTextColor = resolvedFill === headerFill ? "#FFFFFF" : textColor;
 		out.push(`<rect x="${px(cx)}" y="${px(cy)}" width="${px(cw)}" height="${px(ch)}" fill="${resolvedFill}"/>`);
@@ -3794,7 +4037,8 @@ const renderShape = (shape, pres, theme, ctx) => {
 	if (flip.horizontal) transforms.push(`translate(${E(2 * cx)} 0) scale(-1 1)`);
 	if (flip.vertical) transforms.push(`translate(0 ${E(2 * cy)}) scale(1 -1)`);
 	const transform = transforms.length > 0 ? ` transform="${transforms.join(" ")}"` : "";
-	const textTransform = rotation !== 0 ? ` transform="rotate(${rotation} ${E(cx)} ${E(cy)})"` : "";
+	const textRotation = (flip.vertical ? rotation + 180 : rotation) % 360;
+	const textTransform = textRotation !== 0 ? ` transform="rotate(${textRotation} ${E(cx)} ${E(cy)})"` : "";
 	const textOverlay = kind === "shape" || kind === "graphicFrame" ? renderTextBody(pres, shape, {
 		x,
 		y,
@@ -3818,11 +4062,14 @@ const renderShape = (shape, pres, theme, ctx) => {
 			y1 = y + h;
 			y2 = y;
 		}
+		const connectorTransform = rotation !== 0 ? ` transform="rotate(${rotation} ${E(cx)} ${E(cy)})"` : "";
 		const strokeColor = p.stroke === "none" ? resolveColor("scheme:tx1", theme, "#1F2937") : p.stroke;
 		const sa = p.strokeAttrs ? ` ${p.strokeAttrs}` : "";
 		const ma = p.markerAttrs ?? "";
+		const capDefault = sa.includes("stroke-linecap") ? "" : " stroke-linecap=\"round\"";
+		const joinDefault = sa.includes("stroke-linejoin") ? "" : " stroke-linejoin=\"round\"";
 		const preset = getShapePreset(shape) ?? "line";
-		if (preset === "straightConnector1" || preset === "line") return `${p.defs}<line x1="${E(x1)}" y1="${E(y1)}" x2="${E(x2)}" y2="${E(y2)}" stroke="${strokeColor}" stroke-width="${E(sw)}" stroke-linecap="round"${sa}${ma}${transform}/>`;
+		if (preset === "straightConnector1" || preset === "line") return `${p.defs}<line x1="${E(x1)}" y1="${E(y1)}" x2="${E(x2)}" y2="${E(y2)}" stroke="${strokeColor}" stroke-width="${E(sw)}"${capDefault}${sa}${ma}${connectorTransform}/>`;
 		const px1 = x1 / EMU_PER_PX;
 		const py1 = y1 / EMU_PER_PX;
 		const px2 = x2 / EMU_PER_PX;
@@ -3847,7 +4094,7 @@ const renderShape = (shape, pres, theme, ctx) => {
 			const c2x = px1 + 2 * (px2 - px1) / 3;
 			d += ` C${c1x.toFixed(2)} ${py1.toFixed(2)} ${c2x.toFixed(2)} ${py2.toFixed(2)} ${px2.toFixed(2)} ${py2.toFixed(2)}`;
 		} else d += ` L${px2.toFixed(2)} ${py2.toFixed(2)}`;
-		return `${p.defs}<path d="${d}" fill="none" stroke="${strokeColor}" stroke-width="${E(sw)}" stroke-linecap="round" stroke-linejoin="round"${sa}${ma}${transform}/>`;
+		return `${p.defs}<path d="${d}" fill="none" stroke="${strokeColor}" stroke-width="${E(sw)}"${capDefault}${joinDefault}${sa}${ma}${connectorTransform}/>`;
 	}
 	if (kind === "group") {
 		const xform = getGroupTransform(shape);
@@ -3923,7 +4170,7 @@ const renderShape = (shape, pres, theme, ctx) => {
 		if (pathFn) geomSvg = `<path d="${pathFn(x / EMU_PER_PX, y / EMU_PER_PX, w / EMU_PER_PX, h / EMU_PER_PX)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}" fill-rule="evenodd"${sa}${ma}/>`;
 		else {
 			const pointsFn = PRESET_POINTS[preset];
-			if (pointsFn) geomSvg = `<polygon points="${pointsFn().map(([nx, ny]) => `${E(x + nx * w)},${E(y + ny * h)}`).join(" ")}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
+			if (pointsFn) geomSvg = `<polygon points="${pointsFn(w / EMU_PER_PX, h / EMU_PER_PX).map(([nx, ny]) => `${E(x + nx * w)},${E(y + ny * h)}`).join(" ")}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
 			else geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma} data-pptx-preset="${escapeXml(preset)}"><title>${escapeXml(`preset: ${preset}`)}</title></rect>`;
 		}
 	}
@@ -4040,11 +4287,13 @@ const buildEffectsFilter = (pres, shape) => {
 		primitives.push(`<feGaussianBlur in="SourceAlpha" stdDeviation="${blurPx.toFixed(2)}" result="innerBlur${i}"/>`, `<feOffset in="innerBlur${i}" dx="${dx.toFixed(2)}" dy="${dy.toFixed(2)}" result="innerOff${i}"/>`, `<feComposite in="innerOff${i}" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="innerMask${i}"/>`, `<feFlood flood-color="${color}" flood-opacity="${opacity.toFixed(3)}" result="innerCol${i}"/>`, `<feComposite in="innerCol${i}" in2="innerMask${i}" operator="in" result="innerOut${i}"/>`);
 		layers.push(`innerOut${i}`);
 	} else if (e.kind === "glow") {
-		const blurPx = e.radiusEmu / EMU_PER_PX / 2;
+		const radiusPx = e.radiusEmu / EMU_PER_PX;
+		const dilatePx = radiusPx * .5;
+		const featherPx = radiusPx * .3;
 		const color = e.color || "#FFFFFF";
 		const opacity = e.opacity ?? 1;
 		const i = primitives.length;
-		primitives.push(`<feMorphology in="SourceAlpha" operator="dilate" radius="${(blurPx / 4).toFixed(2)}" result="glowExp${i}"/>`, `<feGaussianBlur in="glowExp${i}" stdDeviation="${blurPx.toFixed(2)}" result="glowBlur${i}"/>`, `<feFlood flood-color="${color}" flood-opacity="${opacity.toFixed(3)}" result="glowCol${i}"/>`, `<feComposite in="glowCol${i}" in2="glowBlur${i}" operator="in" result="glowOut${i}"/>`);
+		primitives.push(`<feMorphology in="SourceAlpha" operator="dilate" radius="${dilatePx.toFixed(2)}" result="glowExp${i}"/>`, `<feGaussianBlur in="glowExp${i}" stdDeviation="${featherPx.toFixed(2)}" result="glowBlur${i}"/>`, `<feFlood flood-color="${color}" flood-opacity="${opacity.toFixed(3)}" result="glowCol${i}"/>`, `<feComposite in="glowCol${i}" in2="glowBlur${i}" operator="in" result="glowOut${i}"/>`);
 		layers.push(`glowOut${i}`);
 	} else if (e.kind === "softEdge") {
 		const blurPx = e.radiusEmu / EMU_PER_PX / 2;
@@ -4174,4 +4423,4 @@ const detectImageFormatLocal = (bytes) => {
 //#endregion
 export { SERIF as a, substituteFamily as c, SANS as i, ARIAL as n, TIMES as o, MONO as r, defaultMeasurer as s, renderSlideSvg as t };
 
-//# sourceMappingURL=src-CDTTqUfI.js.map
+//# sourceMappingURL=src-Q2z_XgT6.js.map