@office-kit/pptx-preview 0.19.0 → 0.21.0

package/dist/{src-BGzSNWjt.js → src-DoFuEaap.js}

@@ -1058,6 +1058,30 @@ const emitPlacements = (placements, effectsOnly = false, effectKind = "all") =>
 	close();
 	return paragraphs.join("");
 };
+const familyOf = (g) => g.piece.cssFamily ?? g.piece.family;
+const lineText = (groups, textAnchor, x0, span) => {
+	if (new Set(groups.filter((g) => !g.isTab).map(familyOf)).size < 2 || !groups.some((g) => EAST_ASIAN_CHAR.test(g.text))) return {
+		x: x0,
+		anchor: textAnchor,
+		body: groups.map((g) => span(g)).join("")
+	};
+	const totalWidth = groups.reduce((sum, g) => sum + g.width, 0);
+	const start = x0 - (textAnchor === "middle" ? totalWidth / 2 : textAnchor === "end" ? totalWidth : 0);
+	let cursor = start;
+	let family = null;
+	const parts = [];
+	for (const g of groups) {
+		const changes = !g.isTab && familyOf(g) !== family;
+		parts.push(span(g, changes && family !== null ? cursor : void 0));
+		if (changes) family = familyOf(g);
+		cursor += g.width;
+	}
+	return {
+		x: start,
+		anchor: "start",
+		body: parts.join("")
+	};
+};
 const topPad = (line) => {
 	const lead = line.advance - (line.ascent + line.descent);
 	return lead > 0 ? lead / 2 : 0;
@@ -1076,24 +1100,25 @@ const emitLine = (line, baselineY, dx, descent, nextEffectId, effectsOnly, effec
 	const content = toks.filter((t) => !t.isBreak);
 	if (content.length === 0) return "";
 	const groups = groupTokens(content);
-	const tspans = groups.map((g) => {
-		const span = tspan(g);
+	const x0 = line.anchorX + dx + GRID_NUDGE_X;
+	const linked = lineText(groups, line.textAnchor, x0, (g, x) => {
+		const span = tspan(g, x);
 		const href = g.piece.href ? safeLinkHref(g.piece.href) : void 0;
 		if (!href) return span;
 		const target = href.startsWith("#") ? "" : " target=\"_blank\" rel=\"noopener noreferrer\"";
 		const title = g.piece.hrefTip ? `<title>${escapeXml$1(g.piece.hrefTip)}</title>` : "";
 		return `<a href="${escapeXml$1(href)}"${target}>${title}${span}</a>`;
-	}).join("");
-	if (tspans === "") return "";
-	const x0 = line.anchorX + dx + GRID_NUDGE_X;
-	const text = `<text x="${fmt(x0)}" y="${fmt(baselineY)}" text-anchor="${line.textAnchor}" xml:space="preserve">${tspans}</text>`;
+	});
+	if (linked.body === "") return "";
+	const text = `<text x="${fmt(linked.x)}" y="${fmt(baselineY)}" text-anchor="${linked.anchor}" xml:space="preserve">${linked.body}</text>`;
 	if (effectsOnly && effectKind === "fill") {
 		const painted = groups.map((g) => g.piece.fillPaint ? g : {
 			...g,
 			piece: unpaintedPiece(g.piece)
 		});
 		if (!painted.some((g) => g.piece.fillPaint)) return "";
-		const glyphs = `<text x="${fmt(x0)}" y="${fmt(baselineY)}" text-anchor="${line.textAnchor}" xml:space="preserve" aria-hidden="true" pointer-events="none">${painted.map(tspan).join("")}</text>`;
+		const paintedText = lineText(painted, line.textAnchor, x0, tspan);
+		const glyphs = `<text x="${fmt(paintedText.x)}" y="${fmt(baselineY)}" text-anchor="${paintedText.anchor}" xml:space="preserve" aria-hidden="true" pointer-events="none">${paintedText.body}</text>`;
 		return emitTextOuterEffects(painted, line.textAnchor, x0, baselineY, nextEffectId) + glyphs + emitTextDecorations(painted, line.textAnchor, x0, baselineY);
 	}
 	const reflections = effectKind === "reflection" || effectKind === "all" ? emitTextReflections(groups, line.textAnchor, x0, baselineY, descent, nextEffectId) : "";
@@ -1258,11 +1283,11 @@ const emitTextBevel = (groups, textAnchor, x0, baselineY, nextId) => {
 	const light = `<feDistantLight azimuth="${fmt(bevel.azimuthDeg)}" elevation="${fmt(bevel.elevationDeg)}"/>`;
 	const specular = bevel.specular ? `<feSpecularLighting in="bevelHeight" surfaceScale="${fmt(surfaceScale)}" specularConstant="${fmt(bevel.specular.constant)}" specularExponent="${fmt(bevel.specular.exponent)}" lighting-color="#fff" result="bevelSpecular">${light}</feSpecularLighting>` : "";
 	const defs = `<defs><filter id="${id}" x="-25%" y="-25%" width="150%" height="150%" color-interpolation-filters="sRGB" data-pptx-bevel="1"><feGaussianBlur in="SourceAlpha" stdDeviation="${fmt(widthPx / 2)}" result="bevelBlur"/><feComponentTransfer in="bevelBlur" result="bevelHeight"><feFuncA type="table" tableValues="${table.map(fmt).join(" ")}"/></feComponentTransfer><feDiffuseLighting in="bevelHeight" surfaceScale="${fmt(surfaceScale)}" diffuseConstant="1" lighting-color="#fff" result="bevelDiffuse">${light}</feDiffuseLighting><feColorMatrix in="bevelDiffuse" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 ${fmt(lightGain)} 0 0 0 ${fmt(-lightGain * flat)}" result="bevelLight"/><feColorMatrix in="bevelDiffuse" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ${fmt(-shadeGain)} 0 0 0 ${fmt(shadeGain * flat)}" result="bevelShade"/>` + specular + `<feMerge result="bevelMerged"><feMergeNode in="bevelShade"/><feMergeNode in="bevelLight"/>${specular ? "<feMergeNode in=\"bevelSpecular\"/>" : ""}</feMerge><feComposite in="bevelMerged" in2="SourceAlpha" operator="in"/></filter></defs>`;
-	const beveled = groups.map((g) => g.piece.bevel && !g.isTab ? g : {
+	const beveledText = lineText(groups.map((g) => g.piece.bevel && !g.isTab ? g : {
 		...g,
 		piece: unpaintedPiece(g.piece)
-	});
-	return `${defs}<text x="${fmt(x0)}" y="${fmt(baselineY)}" text-anchor="${textAnchor}" xml:space="preserve" filter="url(#${id})" aria-hidden="true" pointer-events="none" data-pptx-bevel="text">${beveled.map(tspan).join("")}</text>`;
+	}), textAnchor, x0, tspan);
+	return `${defs}<text x="${fmt(beveledText.x)}" y="${fmt(baselineY)}" text-anchor="${beveledText.anchor}" xml:space="preserve" filter="url(#${id})" aria-hidden="true" pointer-events="none" data-pptx-bevel="text">${beveledText.body}</text>`;
 };
 const baselineShiftPxOf = (p) => p.sizePx * p.baseline;
 const SUPER_SUB_SIZE_RATIO = .65;
@@ -1408,11 +1433,12 @@ const sameGlow = (a, b) => {
 	return a.color === b.color && a.radiusEmu === b.radiusEmu && a.opacity === b.opacity;
 };
 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.kerning === b.kerning && a.fillHex === b.fillHex && a.outlineHex === b.outlineHex && a.outlineWidthPx === b.outlineWidthPx && a.underlineHex === b.underlineHex && a.highlightHex === b.highlightHex && a.underline === b.underline && a.strike === b.strike && a.baseline === b.baseline && a.smallCaps === b.smallCaps && sameShadow(a.shadow, b.shadow) && sameGlow(a.glow, b.glow) && sameInnerShadow(a.innerShadow, b.innerShadow) && sameReflection(a.reflection, b.reflection) && a.href === b.href && a.hrefTip === b.hrefTip;
-const tspan = (g) => {
+const tspan = (g, x) => {
 	if (g.isTab) return `<tspan dx="${fmt(g.width)}">&#8203;</tspan>`;
 	const p = g.piece;
 	const sizePx = renderedSizePxOf(p);
 	const attrs = [
+		...x === void 0 ? [] : [`x="${fmt(x)}"`],
 		`font-family="${escapeXml$1(p.cssFamily ?? p.family)}"`,
 		`font-size="${fmt(sizePx)}"`,
 		`fill="${p.fillHex}"`
@@ -1756,6 +1782,10 @@ const BROWSER_FAMILIES = {
 	resolveFamily: browserFontFamily,
 	familyIsCssList: true
 };
+const svgFamilies = (ctx) => ({
+	resolveFamily: ctx.resolveFamily,
+	...ctx.eastAsianFamily === void 0 ? {} : { eastAsianFamily: ctx.eastAsianFamily }
+});
 const DEFAULT_BULLET_FONT = "Arial";
 const DEFAULT_INSET_X = 91440;
 const DEFAULT_INSET_Y = 45720;
@@ -2607,6 +2637,36 @@ const faceOf = (a, font) => {
 		cssFamily: cssFamilyName(family)
 	};
 };
+const eastAsianParts = (piece, family) => {
+	if (family === void 0 || !EAST_ASIAN_CHAR.test(piece.text)) return [piece];
+	const face = {
+		family,
+		cssFamily: cssFamilyName(family)
+	};
+	const parts = [];
+	let current = "";
+	let currentEastAsian = false;
+	const flush = () => {
+		if (current === "") return;
+		parts.push(currentEastAsian ? {
+			...piece,
+			...face,
+			text: current
+		} : {
+			...piece,
+			text: current
+		});
+		current = "";
+	};
+	for (const ch of piece.text) {
+		const eastAsian = EAST_ASIAN_CHAR.test(ch);
+		if (eastAsian !== currentEastAsian) flush();
+		currentEastAsian = eastAsian;
+		current += ch;
+	}
+	flush();
+	return parts;
+};
 const buildSvgTextInput = (a) => {
 	const scale = a.autoFitScale;
 	const paragraphs = a.paraData.map((para, pi) => {
@@ -2696,10 +2756,10 @@ const buildSvgTextInput = (a) => {
 			const segs = run.text.split("\n");
 			segs.forEach((seg, i) => {
 				const segText = caps ? seg.toUpperCase() : seg;
-				const segPieces = cap === "small" ? smallCapsParts(seg, base) : [{
+				const segPieces = (cap === "small" ? smallCapsParts(seg, base) : [{
 					...base,
 					text: segText
-				}];
+				}]).flatMap((piece) => eastAsianParts(piece, a.eastAsianFamily));
 				if (a.vert === "upright") for (const segPiece of segPieces) for (const g of graphemesOf(segPiece.text)) {
 					const last = pieces[pieces.length - 1];
 					if (last !== void 0 && !last.isBreak) pieces.push(breakPiece());
@@ -2799,7 +2859,7 @@ const bulletFillOf = (para, theme, defaultColor) => {
 	const runColor = para.runs.find((r) => r.text !== "\n" && r.text !== "")?.fmt?.color;
 	return runColor === void 0 || runColor === null ? defaultColor : resolveColor(runColor, theme, defaultColor);
 };
-const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defaultColor, useSvgTextRect = false, resolveFamily = substituteFamily) => {
+const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defaultColor, useSvgTextRect = false, resolveFamily = substituteFamily, eastAsianFamily) => {
 	let paragraphCount;
 	try {
 		paragraphCount = getShapeParagraphCount(shape);
@@ -3019,7 +3079,8 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 			measure,
 			vert: fitVert,
 			columns: fitColumns,
-			resolveFamily
+			resolveFamily,
+			...eastAsianFamily === void 0 ? {} : { eastAsianFamily }
 		};
 		let s = 1;
 		while (s > AUTOFIT_FLOOR) {
@@ -3060,6 +3121,7 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 			vert,
 			autoFitScale,
 			resolveFamily,
+			...eastAsianFamily === void 0 ? {} : { eastAsianFamily },
 			columns: vert === "none" && cols && cols.count >= 2 ? {
 				count: cols.count,
 				gapPx: cols.gapEmu !== void 0 ? cols.gapEmu / EMU_PER_PX : 0
@@ -3178,7 +3240,7 @@ const renderHtmlParagraphs = (paraData, numberLabels, theme, autoFitScale, defau
 	return paragraphs;
 };
 const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body") => {
-	const model = resolveTextBodyModel(pres, shape, bounds, theme, phType, ctx.measure, activeDeckTextColor, ctx.mode === "svg" && output === "body", ctx.resolveFamily);
+	const model = resolveTextBodyModel(pres, shape, bounds, theme, phType, ctx.measure, activeDeckTextColor, ctx.mode === "svg" && output === "body", ctx.resolveFamily, ctx.eastAsianFamily);
 	if (model === null) return "";
 	const bevel = textBevelOf(getShapeText3D(shape));
 	const { paraData, numberLabels, authoredAutofit, autoFitScale, defaultPt, themeFace, effectiveDefaultFont, effectiveBody, anchor, innerX, innerY, innerW, innerH, svgTextRect } = model;
@@ -3214,7 +3276,7 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 			innerW: vInnerW,
 			innerH: vInnerH,
 			measure: ctx.mode === "svg" ? ctx.measure : browserTextMeasurer() ?? ctx.measure,
-			...ctx.mode === "foreignObject" ? BROWSER_FAMILIES : { resolveFamily: ctx.resolveFamily },
+			...ctx.mode === "foreignObject" ? BROWSER_FAMILIES : svgFamilies(ctx),
 			vert: svgVert,
 			columns: svgColumns,
 			bevel
@@ -3363,6 +3425,7 @@ const renderTextEffectsSvg = (pres, slide, shape, bounds, opts = {}) => {
 		mode: "foreignObject",
 		measure: opts.measureText ?? browserTextMeasurer() ?? defaultMeasurer,
 		resolveFamily: substituteFamily,
+		eastAsianFamily: void 0,
 		ownShapes: true,
 		background: {
 			id: "",
@@ -3400,6 +3463,7 @@ const renderTableCellEffectsSvgInternal = (pres, slide, shape, cellPosition, bou
 		mode: "foreignObject",
 		measure: opts.measureText ?? browserTextMeasurer() ?? defaultMeasurer,
 		resolveFamily: substituteFamily,
+		eastAsianFamily: void 0,
 		ownShapes: true,
 		background: {
 			id: "",
@@ -3445,17 +3509,22 @@ const chartText = (f, x, y, attrs, content) => {
 	}
 	return `<text x="${px(x)}" y="${px(y)}" ${attrs}>${content}</text>`;
 };
-const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT, plotAreaLayout, yAxisGutter = hasAxes ? DEFAULT_Y_AXIS_GUTTER : 0, xAxisGutter = hasAxes ? BAR_VALUE_LABEL_ROW : 0) => {
+const CHART_AREA_INSET_RATIO = .02;
+const PX_PER_MM = 96 / 25.4;
+const DEFAULT_LEGEND_PT = 11;
+const CATEGORY_LABEL_OFFSET_PX = 12;
+const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT, plotAreaLayout, yAxisGutter = hasAxes ? DEFAULT_Y_AXIS_GUTTER : 0, xAxisGutter = hasAxes ? BAR_VALUE_LABEL_ROW : 0, proportionalInset = false) => {
 	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 ? Math.round(titlePx * 2.4) : 0;
 	const legendStrip = hasLegend && !legendOverlay ? 18 : 0;
-	const padding = 8;
+	const paddingX = proportionalInset ? w * CHART_AREA_INSET_RATIO : 8;
+	const paddingY = proportionalInset ? h * CHART_AREA_INSET_RATIO : 8;
 	const inner = plotAreaLayout?.target === "inner" ? plotAreaLayout : void 0;
-	const plotX = inner ? x + Math.max(0, Math.min(1, inner.x)) * w : x + padding + yAxisGutter;
-	const plotY = inner ? y + Math.max(0, Math.min(1, inner.y)) * h : y + titleStrip + padding;
+	const plotX = inner ? x + Math.max(0, Math.min(1, inner.x)) * w : x + paddingX + yAxisGutter;
+	const plotY = inner ? y + Math.max(0, Math.min(1, inner.y)) * h : y + titleStrip + paddingY;
 	return {
 		x,
 		y,
@@ -3463,9 +3532,9 @@ const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = f
 		h,
 		plotX,
 		plotY,
-		plotW: inner ? Math.max(0, Math.min(x + w, x + (inner.x + inner.w) * w) - plotX) : Math.max(0, w - 2 * padding - yAxisGutter),
-		plotH: inner ? Math.max(0, Math.min(y + h, y + (inner.y + inner.h) * h) - plotY) : Math.max(0, h - titleStrip - legendStrip - xAxisGutter - 2 * padding),
-		titleY: y + (titleOverlay ? 14 : padding + titlePx * .7),
+		plotW: inner ? Math.max(0, Math.min(x + w, x + (inner.x + inner.w) * w) - plotX) : Math.max(0, w - 2 * paddingX - yAxisGutter),
+		plotH: inner ? Math.max(0, Math.min(y + h, y + (inner.y + inner.h) * h) - plotY) : Math.max(0, h - titleStrip - legendStrip - xAxisGutter - 2 * paddingY),
+		titleY: y + (titleOverlay ? 14 : paddingY + titlePx * .7),
 		legendY: y + h - (legendOverlay ? 18 : legendStrip / 2)
 	};
 };
@@ -3631,7 +3700,7 @@ const renderValueAxis = (f, axis) => {
 			const ty2 = tickMark === "out" ? baseY : tickMark === "cross" ? baseY - tickLen : baseY - tickLen;
 			out.push(`<line x1="${px(xp)}" y1="${px(ty1)}" x2="${px(xp)}" y2="${px(ty2)}" stroke="${axisColor}" stroke-width="1"/>`);
 		}
-		const horizLabelY = f.plotY + f.plotH + 12;
+		const horizLabelY = f.plotY + f.plotH + CATEGORY_LABEL_OFFSET_PX;
 		const rotH = axis.labelRotationDeg ?? 0;
 		const transformH = rotH ? ` transform="rotate(${rotH} ${px(xp)} ${px(horizLabelY)})"` : "";
 		out.push(chartText(f, xp, horizLabelY, `text-anchor="middle" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transformH}`, `${escapeXml(fmtTick(t))}`));
@@ -3723,7 +3792,7 @@ const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelSty
 		for (let i = 0; i < pointCount; i++) {
 			if (skip > 1 && i % skip !== 0) continue;
 			const cx = f.plotX + (i + .5) * step;
-			const cy = f.plotY + f.plotH + 12;
+			const cy = f.plotY + f.plotH + CATEGORY_LABEL_OFFSET_PX;
 			const truncated = labels[i] !== void 0 && labels[i].length > truncLen ? `${labels[i].slice(0, truncLen - 2)}…` : labels[i] ?? "";
 			const transform = labelRotationDeg && labelRotationDeg !== 0 ? ` transform="rotate(${labelRotationDeg} ${px(cx)} ${px(cy)})"` : "";
 			const anchor = labelAlign === "l" ? "start" : labelAlign === "r" ? "end" : labelAlign === "ctr" ? "middle" : labelRotationDeg && labelRotationDeg > 0 ? "end" : labelRotationDeg && labelRotationDeg < 0 ? "start" : "middle";
@@ -3839,7 +3908,7 @@ const approxLegendTextPx = (text, fontPx) => {
 };
 const renderChartLegend = (f, names, colors, position = "b", textStyle, markers) => {
 	if (names.length === 0) return "";
-	const sz = textStyle?.sizePt ?? 11;
+	const sz = textStyle?.sizePt ?? DEFAULT_LEGEND_PT;
 	const fill = textStyle?.color ?? "#374151";
 	const weight = textStyle?.bold ? " font-weight=\"600\"" : "";
 	const italic = textStyle?.italic ? " font-style=\"italic\"" : "";
@@ -4173,8 +4242,15 @@ const formatDataLabelValue = (spec, seriesIdx, v, pointIdx) => {
 	const nf = (pointIdx === void 0 ? void 0 : spec.series[seriesIdx]?.pointDataLabels?.[pointIdx])?.numberFormat ?? spec.series[seriesIdx]?.dataLabels?.numberFormat ?? spec.dataLabels?.numberFormat;
 	return nf ? formatAxisLabel(v, nf) : formatChartValue(v);
 };
+const LINE_DATA_LABEL_PT = 9;
+const DEFAULT_MARKER_PT = 5;
+const LABEL_ASCENT_RATIO = .952;
+const LABEL_DESCENT_RATIO = .269;
+const dataLabelStyle = (spec, seriesIdx, pointIdx) => {
+	return (pointIdx === void 0 ? void 0 : spec.series[seriesIdx]?.pointDataLabels?.[pointIdx])?.textStyle ?? spec.series[seriesIdx]?.dataLabels?.textStyle ?? spec.dataLabels?.textStyle;
+};
 const dataLabelTextAttrs = (spec, seriesIdx, fallbackFill, fallbackSizePt = 9, fallbackBold = false, pointIdx) => {
-	const style = (pointIdx === void 0 ? void 0 : spec.series[seriesIdx]?.pointDataLabels?.[pointIdx])?.textStyle ?? spec.series[seriesIdx]?.dataLabels?.textStyle ?? spec.dataLabels?.textStyle;
+	const style = dataLabelStyle(spec, seriesIdx, pointIdx);
 	const sz = style?.sizePt ?? fallbackSizePt;
 	const fill = style?.color ?? fallbackFill;
 	const weight = style?.bold ?? fallbackBold ? " font-weight=\"600\"" : "";
@@ -4333,9 +4409,11 @@ const renderLineChart = (f, spec, colors, fill) => {
 		})() : "";
 		out.push(`<path d="${dPath}" fill="none" stroke="${series.lineColor ?? color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round" stroke-linecap="round"${dashAttr}/>`);
 		const explicitSymbol = series.markerSymbol !== void 0 && series.markerSymbol !== "auto" && series.markerSymbol !== "none";
-		if (series.markerSymbol !== "none" && !fill && (spec.lineMarkers === true || explicitSymbol)) {
+		const markerShown = series.markerSymbol !== "none" && !fill && (spec.lineMarkers === true || explicitSymbol);
+		const markerHalfPx = (series.markerSizePt ?? DEFAULT_MARKER_PT) * PX_PER_PT / 2;
+		if (markerShown) {
 			const symbol = autoMarkerSymbol(series.markerSymbol, s);
-			const size = series.markerSizePt ?? 5;
+			const size = series.markerSizePt ?? DEFAULT_MARKER_PT;
 			const r = Math.max(1, size * .5);
 			for (const [xp, yp] of pts) out.push(seriesMarker(symbol, xp, yp, r, ...markerColors(series, color)));
 		}
@@ -4349,9 +4427,11 @@ const renderLineChart = (f, spec, colors, fill) => {
 			const [xp, yp] = p;
 			const pos = chartPointLabelOptions(spec, s, c).position;
 			const lx = pos === "l" ? xp - 6 : pos === "r" ? xp + 6 : xp;
-			const ly = pos === "b" ? yp + 13 : pos === "ctr" || pos === "l" || pos === "r" ? yp + 3 : yp - 5;
+			const labelPx = (dataLabelStyle(spec, s, c)?.sizePt ?? LINE_DATA_LABEL_PT) * PX_PER_PT;
+			const clearance = (markerShown ? markerHalfPx : 0) + PX_PER_MM;
+			const ly = pos === "b" ? yp + clearance + labelPx * LABEL_ASCENT_RATIO : pos === "ctr" || pos === "l" || pos === "r" ? yp + 3 : yp - clearance - labelPx * LABEL_DESCENT_RATIO;
 			const anchor = pos === "l" ? "end" : pos === "r" ? "start" : "middle";
-			out.push(chartText(f, lx, ly, `text-anchor="${anchor}" ${dataLabelTextAttrs(spec, s, "#374151", 9, false, c)}`, `${escapeXml(labelText)}`));
+			out.push(chartText(f, lx, ly, `text-anchor="${anchor}" ${dataLabelTextAttrs(spec, s, "#374151", LINE_DATA_LABEL_PT, false, c)}`, `${escapeXml(labelText)}`));
 		}
 		if (!isStacked && series.trendline) {
 			const finiteXs = [];
@@ -4694,10 +4774,13 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected, measur
 	const barLabels = spec.kind === "bar" && !spec.categoryAxisHidden && spec.categoryAxisTickLabelPos !== "none" && !spec.categoryAxisLabelRotationDeg ? layoutBarCategoryLabels(spec, w / EMU_PER_PX, measure) : void 0;
 	const barValueTitleRow = spec.kind === "bar" && spec.valueAxisTitle ? axisTitleRowPx(spec.valueAxisTitleStyle) : 0;
 	const barCategoryTitleRow = spec.kind === "bar" && spec.categoryAxisTitle ? axisTitleRowPx(spec.categoryAxisTitleStyle) : 0;
+	const vertical = isCartesian && spec.kind !== "bar";
+	const categoryLabelsShown = !spec.categoryAxisHidden && spec.categoryAxisTickLabelPos !== "none";
+	const categoryLabelRow = vertical && categoryLabelsShown ? Math.max(BAR_VALUE_LABEL_ROW, CATEGORY_LABEL_OFFSET_PX + categoryLabelFontPx(spec.categoryAxisLabelStyle) * CATEGORY_LABEL_LINE_HEIGHT / 2) : void 0;
 	const flip = getShapeFlip(shape);
 	const f = {
 		reflected: groupReflected !== Boolean(flip && flip.horizontal !== flip.vertical),
-		...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, spec.plotAreaLayout, barLabels ? Math.max(DEFAULT_Y_AXIS_GUTTER, barLabels.widthPx + CATEGORY_LABEL_GAP) + barCategoryTitleRow : void 0, barValueTitleRow > 0 ? BAR_VALUE_LABEL_ROW + barValueTitleRow : void 0)
+		...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, spec.plotAreaLayout, barLabels ? Math.max(DEFAULT_Y_AXIS_GUTTER, barLabels.widthPx + CATEGORY_LABEL_GAP) + barCategoryTitleRow : void 0, barValueTitleRow > 0 ? BAR_VALUE_LABEL_ROW + barValueTitleRow : categoryLabelRow, isCartesian)
 	};
 	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");
@@ -4994,7 +5077,7 @@ const renderTableCellText = (cell, paragraphs, cx, cy, cw, ch, color, pres, shap
 		innerW: innerW * EMU_PER_PX,
 		innerH: innerH * EMU_PER_PX,
 		measure: ctx.mode === "svg" ? ctx.measure : browserTextMeasurer() ?? ctx.measure,
-		...ctx.mode === "foreignObject" ? BROWSER_FAMILIES : { resolveFamily: ctx.resolveFamily },
+		...ctx.mode === "foreignObject" ? BROWSER_FAMILIES : svgFamilies(ctx),
 		vert: verticalLayoutOf(getTableCellTextDirection(cell)),
 		columns: null,
 		...effectsOnly ? { effectsOnly: true } : {},
@@ -5874,6 +5957,7 @@ const renderSurface = (pres, surface, opts) => {
 		mode: opts.textLayout ?? "foreignObject",
 		measure: opts.measureText ?? defaultMeasurer,
 		resolveFamily: opts.textLayout === "svg" ? opts.resolveFamily ?? substituteFamily : substituteFamily,
+		eastAsianFamily: opts.textLayout === "svg" ? opts.eastAsianFamily : void 0,
 		ownShapes: true,
 		background: {
 			id: "",
@@ -6316,4 +6400,4 @@ function shapeTextAnchorOffset(pres, shape, options = {}) {
 //#endregion
 export { shapeTextRect as S, paragraphNumberLabels as _, renderSlideSvg as a, verticalTextStyle as b, AVG_GLYPH_W_RATIO as c, SERIF as d, TIMES as f, decimalSeparatorOf as g, substituteFamily as h, renderSlideLayoutSvg as i, MONO as l, isCjk as m, shapeTextAnchorOffset as n, renderTextEffectsSvg as o, defaultMeasurer as p, auditTextLayout as r, ARIAL as s, shapeAutoFitScale as t, SANS as u, textUnderlineStyle as v, resolveTextBodyRect as x, textColumnsStyle as y };
 
-//# sourceMappingURL=src-BGzSNWjt.js.map
+//# sourceMappingURL=src-DoFuEaap.js.map