@shbernal/ts-pptx 3.5.0 → 3.6.0

package/dist/{text-D04NUMvA.js → text-CyetbF6p.js}

@@ -1,10 +1,10 @@
-import { i as warnOnce, r as warn } from "./diagnostics-CPVADSL1.js";
+import { S as warnOnce, a as FIXED_PCT_PER_PERCENT, d as emuToInches, g as pixelsToEmu, i as EMU_PER_POINT, l as STANDARD_LAYOUTS, m as inchesToEmu, r as EMU_PER_INCH, s as PERCENT_SCALE, v as ptToHundredths, x as warn } from "./units-1kRzYShk.js";
 import { n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-Bvln0H-7.js";
-import { $ as VALID_SHAPE_PRESETS, A as IMG_BROKEN, B as XML_DECL, C as DEF_PRES_LAYOUT, D as DEF_SLIDE_MARGIN_IN, E as DEF_SHAPE_SHADOW, G as ChartType, I as PIECHART_COLORS, J as SchemeColor, L as REGEX_HEX_COLOR, M as IMG_SVG_PLACEHOLDER, N as LAYOUT_IDX_SERIES_BASE, P as LETTERS, R as SLDNUMFLDID, S as DEF_FONT_COLOR, _ as BARCHART_COLORS, _t as inchesToEmu, a as inch2Emu, b as DEF_CHART_BORDER, ct as FIXED_PCT_PER_PERCENT, et as asChartType, f as AXIS_ID_CATEGORY_PRIMARY, ft as STANDARD_LAYOUTS, g as AXIS_ID_VALUE_SECONDARY, h as AXIS_ID_VALUE_PRIMARY, i as getSmartParseNumber, k as DEF_TEXT_SHADOW, l as ptsToEmuLenient, m as AXIS_ID_SERIES_PRIMARY, mt as emuToInches, n as convertArcAngle, nt as isChartExType, o as lineWidthToEmu, ot as EMU_PER_INCH, p as AXIS_ID_CATEGORY_SECONDARY, q as PlaceholderType, r as convertRotationDegrees, rt as isChartType, s as marginToEmu, st as EMU_PER_POINT, t as convertAngleUnits, tt as connectorPresetFor, u as resolveTableColWidthsEmu, ut as PERCENT_SCALE, v as DEF_CELL_BORDER, w as DEF_PRES_LAYOUT_NAME, x as DEF_CHART_GRIDLINE, xt as ptToHundredths, y as DEF_CELL_MARGIN_IN, yt as pixelsToEmu, z as SLDNUM_PLACEHOLDER_TEXT } from "./units-internal-DNvK2I6o.js";
-import { A as getDuplicateObjectNames, C as createShadowEffectLst, D as voidEl, E as raw, F as validateObjectName, M as getUuid, N as isHyperlinkRel, O as encodeXmlAttrValue, P as mediaSlideKey, S as correctShadowOptions, T as el, _ as flattenEmbeddedFaces, a as makeXmlNotesSlideRel, b as genXmlGradientFill, c as genXmlNormAutofit, d as renderTextParagraphsXml, f as clampFontSizeSz, g as FONT_REL_TYPE, h as FONT_DATA_EXTENSION, i as makeXmlNotesSlide, j as getNewRelId, k as encodeXmlEntities, l as genXmlParagraphProperties, m as FONT_DATA_CONTENT_TYPE, n as makeXmlNotesMaster, p as EMBEDDED_FONT_SLOTS, r as makeXmlNotesMasterRel, s as externalHyperlinkRel, t as buildNotesSlideRels, u as groupRunsIntoLines, v as serializeEmbeddedFontLst, w as createColorElement, x as genXmlPatternFill, y as genXmlColorSelection } from "./notes-DNqAggXx.js";
-import { A as PRESET_MATERIALS, C as decodeBase64ToBytes, D as LIGHT_RIGS, E as BEVEL_PRESETS, F as checkEnumOrWarn, M as TEXT_HORZ_OVERFLOW, O as LIGHT_RIG_DIRECTIONS, S as bytesToBase64, T as toMediaDataUri, b as getImageSizeFromBase64, k as PRESET_LINE_DASHES, l as OFFICE_REL, n as PML_ROOT_NS, t as OOXML_NS, u as PACKAGE_REL_NS, w as svgMarkupToDataUri, y as fitSrcRectPercents } from "./namespaces-CcKuzeuE.js";
-import { t as getSlidesForTableRows } from "./autopage-BYlTzX-l.js";
-import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit, v as isFontCollection } from "./fit-TjpNbMru.js";
+import { $ as isChartExType, A as LAYOUT_IDX_SERIES_BASE, C as DEF_PRES_LAYOUT, D as DEF_SLIDE_MARGIN_IN, E as DEF_SHAPE_SHADOW, F as SLDNUMFLDID, G as SchemeColor, H as ChartType, I as SLDNUM_PLACEHOLDER_TEXT, L as XML_DECL, N as PIECHART_COLORS, P as REGEX_HEX_COLOR, Q as connectorPresetFor, S as DEF_FONT_COLOR, W as PlaceholderType, X as VALID_SHAPE_PRESETS, Z as asChartType, _ as BARCHART_COLORS, a as inch2Emu, b as DEF_CHART_BORDER, et as isChartType, f as AXIS_ID_CATEGORY_PRIMARY, g as AXIS_ID_VALUE_SECONDARY, h as AXIS_ID_VALUE_PRIMARY, i as getSmartParseNumber, j as LETTERS, k as DEF_TEXT_SHADOW, l as ptsToEmuLenient, m as AXIS_ID_SERIES_PRIMARY, n as convertArcAngle, o as lineWidthToEmu, p as AXIS_ID_CATEGORY_SECONDARY, r as convertRotationDegrees, s as marginToEmu, t as convertAngleUnits, u as resolveTableColWidthsEmu, v as DEF_CELL_BORDER, w as DEF_PRES_LAYOUT_NAME, x as DEF_CHART_GRIDLINE, y as DEF_CELL_MARGIN_IN } from "./units-internal-Dg95w_YD.js";
+import { A as getNewRelId, C as createShadowEffectLst, D as voidEl, E as raw, M as isHyperlinkRel, N as mediaSlideKey, O as encodeXmlAttrValue, P as validateObjectName, S as correctShadowOptions, T as el, _ as flattenEmbeddedFaces, a as makeXmlNotesSlideRel, b as genXmlGradientFill, c as genXmlNormAutofit, d as renderTextParagraphsXml, f as clampFontSizeSz, g as FONT_REL_TYPE, h as FONT_DATA_EXTENSION, i as makeXmlNotesSlide, j as getUuid, k as getDuplicateObjectNames, l as genXmlParagraphProperties, m as FONT_DATA_CONTENT_TYPE, n as makeXmlNotesMaster, p as EMBEDDED_FONT_SLOTS, r as makeXmlNotesMasterRel, s as externalHyperlinkRel, t as buildNotesSlideRels, u as groupRunsIntoLines, v as serializeEmbeddedFontLst, w as createColorElement, x as genXmlPatternFill, y as genXmlColorSelection } from "./notes-RLCwdlTE.js";
+import { A as LIGHT_RIG_DIRECTIONS, C as decodeBase64ToBytes, E as BEVEL_PRESETS, M as PRESET_MATERIALS, O as DEFAULT_COLOR_MAP, P as TEXT_HORZ_OVERFLOW, R as checkEnumOrWarn, S as bytesToBase64, T as toMediaDataUri, b as getImageSizeFromBase64, j as PRESET_LINE_DASHES, k as LIGHT_RIGS, l as OFFICE_REL, n as PML_ROOT_NS, t as OOXML_NS, u as PACKAGE_REL_NS, w as svgMarkupToDataUri, y as fitSrcRectPercents } from "./namespaces-BVnNu7sg.js";
+import { t as getSlidesForTableRows } from "./autopage-DkjYZUFD.js";
+import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit, v as isFontCollection } from "./fit-BKs0zxMI.js";
 import { ZipWriter } from "./zip.js";
 //#region src/media/content-type.ts
 /**
@@ -411,61 +411,49 @@ function createChartTextFonts(typeface) {
 	return voidEl("a:latin", { typeface }) + voidEl("a:ea", { typeface }) + voidEl("a:cs", { typeface });
 }
 function genXmlTitle(opts, chartX, chartY) {
-	const align = opts.titleAlign === "left" || opts.titleAlign === "right" ? `<a:pPr algn="${opts.titleAlign.slice(0, 1)}">` : "<a:pPr>";
-	const rotate = opts.titleRotate ? `<a:bodyPr rot="${convertAngleUnits(opts.titleRotate, "titleRotate")}"/>` : "<a:bodyPr/>";
-	const sizeAttr = opts.fontSize ? `sz="${ptToHundredths(opts.fontSize)}"` : "";
-	const titleBold = opts.titleBold ? 1 : 0;
-	const titleItalic = opts.titleItalic ? 1 : 0;
-	const titleUnderline = opts.titleUnderline ? "sng" : "none";
-	let layout = "<c:layout/>";
+	const runAttrs = ` ${opts.fontSize ? `sz="${ptToHundredths(opts.fontSize)}"` : ""} b="${opts.titleBold ? 1 : 0}" i="${opts.titleItalic ? 1 : 0}" u="${opts.titleUnderline ? "sng" : "none"}" strike="noStrike">`;
+	const runChildren = "\n              " + genXmlColorSelection(opts.color || "000000") + "\n              " + createChartTextFonts(opts.fontFace || "Arial") + "\n            ";
 	const hasX = opts.titlePos && typeof opts.titlePos.x === "number";
 	const hasY = opts.titlePos && typeof opts.titlePos.y === "number";
+	/** Fold a slide-relative offset into the fraction-of-chart value `c:x`/`c:y` want. */
+	const edgeFraction = (offset) => {
+		let val = offset === 0 ? 0 : offset * (offset / 5) / 10;
+		if (val >= 1) val = val / 10;
+		if (val >= .1) val = val / 10;
+		return val;
+	};
+	let layout = voidEl("c:layout");
 	if (hasX || hasY) {
-		let modes = "";
-		let vals = "";
-		if (hasX) {
-			const totalX = (opts.titlePos?.x ?? 0) + (chartX ?? 0);
-			let valX = totalX === 0 ? 0 : totalX * (totalX / 5) / 10;
-			if (valX >= 1) valX = valX / 10;
-			if (valX >= .1) valX = valX / 10;
-			modes += "<c:xMode val=\"edge\"/>";
-			vals += `<c:x val="${valX}"/>`;
-		}
-		if (hasY) {
-			const totalY = (opts.titlePos?.y ?? 0) + (chartY ?? 0);
-			let valY = totalY === 0 ? 0 : totalY * (totalY / 5) / 10;
-			if (valY >= 1) valY = valY / 10;
-			if (valY >= .1) valY = valY / 10;
-			modes += "<c:yMode val=\"edge\"/>";
-			vals += `<c:y val="${valY}"/>`;
-		}
-		layout = `<c:layout><c:manualLayout>${modes}${vals}</c:manualLayout></c:layout>`;
-	}
-	return `<c:title>
-      <c:tx>
-        <c:rich>
-          ${rotate}
-          <a:lstStyle/>
-          <a:p>
-            ${align}
-            <a:defRPr ${sizeAttr} b="${titleBold}" i="${titleItalic}" u="${titleUnderline}" strike="noStrike">
-              ${genXmlColorSelection(opts.color || "000000")}
-              ${createChartTextFonts(opts.fontFace || "Arial")}
-            </a:defRPr>
-          </a:pPr>
-          <a:r>
-            <a:rPr ${sizeAttr} b="${titleBold}" i="${titleItalic}" u="${titleUnderline}" strike="noStrike">
-              ${genXmlColorSelection(opts.color || "000000")}
-              ${createChartTextFonts(opts.fontFace || "Arial")}
-            </a:rPr>
-            ${el("a:t", null, opts.title ?? "")}
-          </a:r>
-        </a:p>
-        </c:rich>
-      </c:tx>
-      ${layout}
-      <c:overlay val="0"/>
-    </c:title>`;
+		const modes = (hasX ? voidEl("c:xMode", { val: "edge" }) : "") + (hasY ? voidEl("c:yMode", { val: "edge" }) : "");
+		const vals = (hasX ? voidEl("c:x", { val: edgeFraction((opts.titlePos?.x ?? 0) + (chartX ?? 0)) }) : "") + (hasY ? voidEl("c:y", { val: edgeFraction((opts.titlePos?.y ?? 0) + (chartY ?? 0)) }) : "");
+		layout = el("c:layout", null, raw(el("c:manualLayout", null, raw(modes + vals))));
+	}
+	const paragraph = el("a:p", null, [raw(el("a:pPr", opts.titleAlign === "left" || opts.titleAlign === "right" ? { algn: opts.titleAlign.slice(0, 1) } : null, raw("\n            <a:defRPr" + runAttrs + runChildren + "</a:defRPr>"), {
+		openPrefix: "\n            ",
+		closePrefix: "\n          "
+	})), raw(el("a:r", null, [raw("\n            <a:rPr" + runAttrs + runChildren + "</a:rPr>"), raw("\n            " + el("a:t", null, opts.title ?? ""))], {
+		openPrefix: "\n          ",
+		closePrefix: "\n          "
+	}))], {
+		openPrefix: "\n          ",
+		closePrefix: "\n        "
+	});
+	const rich = el("c:rich", null, [
+		raw(voidEl("a:bodyPr", { rot: opts.titleRotate ? convertAngleUnits(opts.titleRotate, "titleRotate") : void 0 }, { openPrefix: "\n          " })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "\n          " })),
+		raw(paragraph)
+	], {
+		openPrefix: "\n        ",
+		closePrefix: "\n        "
+	});
+	return el("c:title", null, [
+		raw(el("c:tx", null, raw(rich), {
+			openPrefix: "\n      ",
+			closePrefix: "\n      "
+		})),
+		raw("\n      " + layout),
+		raw(voidEl("c:overlay", { val: 0 }, { openPrefix: "\n      " }))
+	], { closePrefix: "\n    " });
 }
 /**
 * Create Grid Line Element
@@ -501,31 +489,62 @@ function createGridLineElement(glOpts) {
 * @param leaderLines - emit the trailing `<c:showLeaderLines>` (category-axis plots only)
 */
 function chartDataLabels(opts, leaderLines) {
-	let xml = "  <c:dLbls>";
-	xml += "    " + voidEl("c:numFmt", {
-		formatCode: (opts.dataLabelFormatCode ?? "") || "General",
-		sourceLinked: 0
+	const defRPr = el("a:defRPr", {
+		b: opts.dataLabelFontBold ? 1 : 0,
+		i: opts.dataLabelFontItalic ? 1 : 0,
+		strike: "noStrike",
+		sz: ptToHundredths(opts.dataLabelFontSize || 12),
+		u: "none"
+	}, [raw(genXmlColorSelection(opts.dataLabelColor || "000000")), raw("          " + createChartTextFonts(opts.dataLabelFontFace || "Arial"))], {
+		openPrefix: "        ",
+		closePrefix: "        "
 	});
-	xml += "    <c:txPr>";
-	xml += "      <a:bodyPr/>";
-	xml += "      <a:lstStyle/>";
-	xml += "      <a:p><a:pPr>";
-	xml += `        <a:defRPr b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" strike="noStrike" sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" u="none">`;
-	xml += genXmlColorSelection(opts.dataLabelColor || "000000");
-	xml += "          " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-	xml += "        </a:defRPr>";
-	xml += "      </a:pPr></a:p>";
-	xml += "    </c:txPr>";
-	if (opts.dataLabelPosition) xml += " <c:dLblPos val=\"" + opts.dataLabelPosition + "\"/>";
-	xml += "    <c:showLegendKey val=\"0\"/>";
-	xml += "    <c:showVal val=\"" + (opts.showValue ? "1" : "0") + "\"/>";
-	xml += "    <c:showCatName val=\"0\"/>";
-	xml += "    <c:showSerName val=\"" + (opts.showSerName ? "1" : "0") + "\"/>";
-	xml += "    <c:showPercent val=\"0\"/>";
-	xml += "    <c:showBubbleSize val=\"0\"/>";
-	if (leaderLines) xml += `    <c:showLeaderLines val="${opts.showLeaderLines ? "1" : "0"}"/>`;
-	xml += "  </c:dLbls>";
-	return xml;
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", null, { openPrefix: "      " })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "      " })),
+		raw(el("a:p", null, raw(el("a:pPr", null, raw(defRPr), { closePrefix: "      " })), { openPrefix: "      " }))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	return el("c:dLbls", null, [
+		raw(voidEl("c:numFmt", {
+			formatCode: (opts.dataLabelFormatCode ?? "") || "General",
+			sourceLinked: 0
+		}, { openPrefix: "    " })),
+		raw(txPr),
+		opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition }, { openPrefix: " " })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showVal", { val: opts.showValue ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showCatName", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showSerName", { val: opts.showSerName ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showPercent", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }, { openPrefix: "    " })),
+		leaderLines ? raw(voidEl("c:showLeaderLines", { val: opts.showLeaderLines ? 1 : 0 }, { openPrefix: "    " })) : null
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+}
+/**
+* An `<a:solidFill>` of the theme text colour dimmed towards the background — the grey the chart
+* furniture (stock hi-low lines and up/down bars, the data-table grid) is drawn in.
+* `lumMod`/`lumOff` are the two halves of one dimming: how much of the luminance survives, and
+* how much white is mixed back in.
+* @param lumMod - surviving luminance, in thousandths of a percent
+* @param lumOff - luminance added back, in thousandths of a percent
+*/
+function dimmedTextFill(lumMod, lumOff) {
+	return el("a:solidFill", null, raw(el("a:schemeClr", { val: "tx1" }, [raw(voidEl("a:lumMod", { val: lumMod })), raw(voidEl("a:lumOff", { val: lumOff }))])));
+}
+/** The hairline outline drawn in {@link dimmedTextFill}, at the same three dimming levels. */
+function dimmedTextLine(lumMod, lumOff, fmt) {
+	return el("a:ln", {
+		w: 9525,
+		cap: "flat",
+		cmpd: "sng",
+		algn: "ctr"
+	}, [raw(dimmedTextFill(lumMod, lumOff)), raw(voidEl("a:round"))], fmt);
 }
 /**
 * Build a `<c:pt>` numeric-cache data point, or '' to leave a gap.
@@ -545,7 +564,7 @@ function numCachePt(idx, value) {
 		warn("chart/non-finite-value", `chart value "${value}" at index ${idx} is not a finite number; data point omitted.`);
 		return "";
 	}
-	return `<c:pt idx="${idx}"><c:v>${value}</c:v></c:pt>`;
+	return el("c:pt", { idx }, raw(el("c:v", null, value)));
 }
 /**
 * Build the error-bar elements (`<c:errBars>`) for a single series.
@@ -568,29 +587,19 @@ function makeChartErrorBarsXml(chartType, errorBars, obj) {
 		const valueType = eb.valueType || "fixedVal";
 		const barType = eb.barType || "both";
 		const direction = eb.direction || "y";
-		strXml += "<c:errBars>";
-		strXml += `<c:errDir val="${direction}"/>`;
-		strXml += `<c:errBarType val="${barType}"/>`;
-		strXml += `<c:errValType val="${valueType}"/>`;
-		strXml += `<c:noEndCap val="${eb.noEndCap ? "1" : "0"}"/>`;
+		let children = voidEl("c:errDir", { val: direction }) + voidEl("c:errBarType", { val: barType }) + voidEl("c:errValType", { val: valueType }) + voidEl("c:noEndCap", { val: eb.noEndCap ? 1 : 0 });
 		if (valueType === "cust") {
 			if (barType !== "minus") {
 				if (!eb.plusValues?.length) warn("chart/error-bars-missing-values", `chart series "${obj.name}" errorBars valueType 'cust' needs \`plusValues\` for barType '${barType}'.`);
-				strXml += makeErrBarNumLit("plus", eb.plusValues || []);
+				children += makeErrBarNumLit("plus", eb.plusValues || []);
 			}
 			if (barType !== "plus") {
 				if (!eb.minusValues?.length) warn("chart/error-bars-missing-values", `chart series "${obj.name}" errorBars valueType 'cust' needs \`minusValues\` for barType '${barType}'.`);
-				strXml += makeErrBarNumLit("minus", eb.minusValues || []);
+				children += makeErrBarNumLit("minus", eb.minusValues || []);
 			}
-		} else if (valueType !== "stdErr") strXml += `<c:val val="${eb.value ?? 1}"/>`;
-		if (eb.color || eb.size != null) {
-			strXml += "<c:spPr><a:ln";
-			strXml += eb.size != null ? ` w="${ptsToEmuLenient(eb.size)}"` : "";
-			strXml += ">";
-			strXml += eb.color ? genXmlColorSelection(eb.color) : "";
-			strXml += "</a:ln></c:spPr>";
-		}
-		strXml += "</c:errBars>";
+		} else if (valueType !== "stdErr") children += voidEl("c:val", { val: eb.value ?? 1 });
+		if (eb.color || eb.size != null) children += el("c:spPr", null, raw(el("a:ln", { w: eb.size != null ? ptsToEmuLenient(eb.size) : void 0 }, raw(eb.color ? genXmlColorSelection(eb.color) : ""))));
+		strXml += el("c:errBars", null, raw(children));
 	});
 	return strXml;
 }
@@ -600,12 +609,12 @@ function makeChartErrorBarsXml(chartType, errorBars, obj) {
 * @param values - per-point magnitudes (index-aligned with the series values)
 */
 function makeErrBarNumLit(tag, values) {
-	let strXml = `<c:${tag}><c:numLit><c:formatCode>General</c:formatCode><c:ptCount val="${values.length}"/>`;
-	values.forEach((value, idx) => {
-		strXml += numCachePt(idx, value);
-	});
-	strXml += `</c:numLit></c:${tag}>`;
-	return strXml;
+	const numLit = el("c:numLit", null, [
+		raw(el("c:formatCode", null, "General")),
+		raw(voidEl("c:ptCount", { val: values.length })),
+		raw(values.map((value, idx) => numCachePt(idx, value)).join(""))
+	]);
+	return el(`c:${tag}`, null, raw(numLit));
 }
 /**
 * Build a `<c:serLines>` ("Series Lines") element for a bar chart.
@@ -614,7 +623,7 @@ function makeErrBarNumLit(tag, values) {
 */
 function createSerLinesElement(opt) {
 	if (!opt) return "";
-	if (opt === true) return "<c:serLines/>";
+	if (opt === true) return voidEl("c:serLines");
 	if (opt.style === "none") return "";
 	const line = el("a:ln", {
 		w: ptsToEmuLenient(opt.size || DEF_CHART_GRIDLINE.size || 1),
@@ -640,7 +649,15 @@ function createLeaderLinesElement(opts) {
 	if (!opts.leaderLineColor && opts.leaderLineSize == null) return "";
 	const w = ptsToEmuLenient(opts.leaderLineSize ?? .75);
 	const color = opts.leaderLineColor || "808080";
-	return `<c:leaderLines><c:spPr><a:ln w="${w}" cap="flat">${genXmlColorSelection(color)}<a:prstDash val="solid"/><a:round/></a:ln><a:effectLst/></c:spPr></c:leaderLines>`;
+	const line = el("a:ln", {
+		w,
+		cap: "flat"
+	}, [
+		raw(genXmlColorSelection(color)),
+		raw(voidEl("a:prstDash", { val: "solid" })),
+		raw(voidEl("a:round"))
+	]);
+	return el("c:leaderLines", null, raw(el("c:spPr", null, [raw(line), raw(voidEl("a:effectLst"))])));
 }
 /**
 * Build a single custom `<c:dLbl>` (rich-text data label) overriding one data point's label.
@@ -656,24 +673,57 @@ function createLeaderLinesElement(opts) {
 */
 function makeCustomDLblXml(idx, text, opts) {
 	const sz = ptToHundredths(opts.dataLabelFontSize || 12);
-	const bold = opts.dataLabelFontBold ? "1" : "0";
-	const italic = opts.dataLabelFontItalic ? "1" : "0";
+	const bold = opts.dataLabelFontBold ? 1 : 0;
+	const italic = opts.dataLabelFontItalic ? 1 : 0;
 	const color = createColorElement(opts.dataLabelColor || "000000");
 	const face = opts.dataLabelFontFace || "Arial";
 	const lang = opts.lang || "en-US";
-	return `<c:dLbl><c:idx val="${idx}"/><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:pPr><a:defRPr sz="${sz}" b="${bold}" i="${italic}" u="none" strike="noStrike"><a:solidFill>${color}</a:solidFill>${createChartTextFonts(face)}</a:defRPr></a:pPr><a:r><a:rPr lang="${lang}" sz="${sz}" b="${bold}" i="${italic}" u="none" strike="noStrike" dirty="0"><a:solidFill>${color}</a:solidFill>${createChartTextFonts(face)}</a:rPr>` + el("a:t", null, text) + "</a:r></a:p></c:rich></c:tx><c:showLegendKey val=\"0\"/><c:showVal val=\"0\"/><c:showCatName val=\"0\"/><c:showSerName val=\"0\"/><c:showPercent val=\"0\"/><c:showBubbleSize val=\"0\"/></c:dLbl>";
+	const runChildren = [raw(el("a:solidFill", null, raw(color))), raw(createChartTextFonts(face))];
+	const fontAttrs = {
+		sz,
+		b: bold,
+		i: italic,
+		u: "none",
+		strike: "noStrike"
+	};
+	const paragraph = el("a:p", null, [raw(el("a:pPr", null, raw(el("a:defRPr", fontAttrs, runChildren)))), raw(el("a:r", null, [raw(el("a:rPr", {
+		lang,
+		...fontAttrs,
+		dirty: 0
+	}, runChildren)), raw(el("a:t", null, text))]))]);
+	const rich = el("c:rich", null, [
+		raw(voidEl("a:bodyPr")),
+		raw(voidEl("a:lstStyle")),
+		raw(paragraph)
+	]);
+	return el("c:dLbl", null, [
+		raw(voidEl("c:idx", { val: idx })),
+		raw(el("c:tx", null, raw(rich))),
+		raw(voidEl("c:showLegendKey", { val: 0 })),
+		raw(voidEl("c:showVal", { val: 0 })),
+		raw(voidEl("c:showCatName", { val: 0 })),
+		raw(voidEl("c:showSerName", { val: 0 })),
+		raw(voidEl("c:showPercent", { val: 0 })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }))
+	]);
 }
 /**
 * Build an `<a:ln>` border element from a per-data-point `BorderProps`.
 * @param border - point border style (`type`, `color`, `pt`)
 */
 function createChartBorderLine(border) {
-	if (border.type === "none") return "<a:ln><a:noFill/></a:ln>";
-	const dash = border.type === "dash" ? "dash" : "solid";
-	return `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(border, 1))}" cap="flat">${genXmlColorSelection({
-		color: border.color || "666666",
-		transparency: border.transparency
-	})}<a:prstDash val="${dash}"/><a:round/></a:ln>`;
+	if (border.type === "none") return el("a:ln", null, raw(voidEl("a:noFill")));
+	return el("a:ln", {
+		w: ptsToEmuLenient(resolveBorderWidth(border, 1)),
+		cap: "flat"
+	}, [
+		raw(genXmlColorSelection({
+			color: border.color || "666666",
+			transparency: border.transparency
+		})),
+		raw(voidEl("a:prstDash", { val: border.type === "dash" ? "dash" : "solid" })),
+		raw(voidEl("a:round"))
+	]);
 }
 /**
 * Build `<c:dPt>` entries for a series in the bar/line/area/scatter loops.
@@ -705,30 +755,89 @@ function makeSeriesDataPointsXml(chartType, obj, opts, varyColors) {
 		const pattern = ptStyle?.pattern;
 		const border = ptStyle?.border;
 		if (!fillColor && !pattern && !border) return;
-		xml += "<c:dPt>";
-		xml += `<c:idx val="${index}"/>`;
-		if (isBar) xml += "<c:invertIfNegative val=\"0\"/>";
-		xml += "<c:bubble3D val=\"0\"/>";
-		xml += "<c:spPr>";
-		if ((isBar || isScatter) && opts.lineSize === 0 && !border && !ptStyle?.fill && !pattern) xml += "<a:ln><a:noFill/></a:ln>";
+		let shape = "";
+		if ((isBar || isScatter) && opts.lineSize === 0 && !border && !ptStyle?.fill && !pattern) shape = el("a:ln", null, raw(voidEl("a:noFill")));
 		else {
-			if (pattern) xml += genXmlPatternFill(fillColor && !pattern.fgColor ? {
+			if (pattern) shape = genXmlPatternFill(fillColor && !pattern.fgColor ? {
 				...pattern,
 				fgColor: fillColor
 			} : pattern);
-			else if (fillColor) {
-				if (chartType === "bar3D") xml += `<a:ln>${genXmlColorSelection(fillColor)}</a:ln>`;
-				else xml += genXmlColorSelection(fillColor);
-			}
-			if (border) xml += createChartBorderLine(border);
+			else if (fillColor) shape = chartType === "bar3D" ? el("a:ln", null, raw(genXmlColorSelection(fillColor))) : genXmlColorSelection(fillColor);
+			if (border) shape += createChartBorderLine(border);
 		}
-		xml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-		xml += "</c:spPr>";
-		xml += "</c:dPt>";
+		xml += el("c:dPt", null, [
+			raw(voidEl("c:idx", { val: index })),
+			isBar ? raw(voidEl("c:invertIfNegative", { val: 0 })) : null,
+			raw(voidEl("c:bubble3D", { val: 0 })),
+			raw(el("c:spPr", null, [raw(shape), raw(createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))]))
+		]);
 	});
 	return xml;
 }
 /**
+* A `<c:tx>` series-name block: the `<c:f>` formula plus the one-point `<c:strCache>` mirroring
+* the header cell it points at. The string counterpart of {@link numRefBlock}.
+*
+* Built through `el()`/`voidEl()` rather than by concatenation, with the indentation carried on
+* the `openPrefix`/`childPrefix`/`closePrefix` byte-layout hooks those helpers already have. The
+* five copies this replaces were all hand-built strings, so routing them here takes fifty-odd
+* hand-written delimiters out of `src/gen/chart/` rather than moving them into one file.
+* @param ref - the `<c:f>` formula, from {@link sheetCellRef} or written inline
+* @param name - the series name to cache; escaped on the way into `<c:v>`
+* @param layout - which of the three historical whitespace spellings to emit; see {@link StrRefLayout}
+*/
+function strRefBlock(ref, name, layout = "indented") {
+	const compact = layout === "compact";
+	const pt = el("c:pt", { idx: 0 }, raw(el("c:v", null, name)));
+	const cacheChildren = [raw(voidEl("c:ptCount", { val: 1 })), raw(pt)];
+	const strCache = layout === "expanded" ? el("c:strCache", null, cacheChildren, {
+		childPrefix: "        ",
+		closePrefix: "      "
+	}) : el("c:strCache", null, cacheChildren);
+	const indent = (spaces) => compact ? "" : spaces;
+	const strRef = el("c:strRef", null, [raw(el("c:f", null, ref)), raw(strCache)], {
+		openPrefix: indent("    "),
+		childPrefix: indent("      "),
+		closePrefix: indent("    ")
+	});
+	return el("c:tx", null, raw(strRef), {
+		openPrefix: indent("  "),
+		closePrefix: indent("  ")
+	});
+}
+/**
+* A `<c:cat>` category reference: the `<c:f>` formula plus the `<c:numCache>`/`<c:strCache>` that
+* mirrors the label cells it points at.
+*
+* `kind` picks the cache: `'num'` for numeric categories — dates, which need a `<c:formatCode>` so
+* PowerPoint renders them as dates rather than serial numbers — and `'str'` for text ones. Stock
+* and cat-axis each carried both arms of that choice, and surface carried the string one, five
+* copies of the same `<c:f>` + `<c:ptCount>` + `<c:pt idx>` loop.
+*
+* `layout` preserves which whitespace spelling each site emitted, for the reason
+* {@link StrRefLayout} gives. The `<c:multiLvlStrRef>` arm of a cat-axis is deliberately not
+* folded in: multi-level categories nest a `<c:lvl>` per label group, which is a different shape
+* rather than a different spelling.
+* @param kind - `num` for a numeric (date) category cache, `str` for a text one
+* @param ref - the `<c:f>` formula
+* @param labels - the category labels, in order; escaped on the way into `<c:v>`
+* @param formatCode - the cached `<c:formatCode>`; numeric caches only
+* @param layout - which whitespace spelling to emit
+*/
+function catRefBlock(kind, ref, labels, formatCode, layout = "compact") {
+	const indent = (spaces) => layout === "indented" ? spaces : "";
+	const points = labels.map((label, idx) => el("c:pt", { idx }, raw(el("c:v", null, label)))).join("");
+	const cache = el(`c:${kind}Cache`, null, [formatCode === void 0 ? null : raw(el("c:formatCode", null, formatCode)), raw(voidEl("c:ptCount", { val: labels.length }) + points)], {
+		childPrefix: indent("      "),
+		closePrefix: indent("    ")
+	});
+	return el(`c:${kind}Ref`, null, [raw(el("c:f", null, ref)), raw(cache)], {
+		openPrefix: indent("  "),
+		childPrefix: indent("    "),
+		closePrefix: indent("  ")
+	});
+}
+/**
 * A `<c:xVal>`/`<c:yVal>` numeric-reference block: the `<c:f>` formula plus the `<c:numCache>`
 * that mirrors the cells it points at.
 *
@@ -748,19 +857,19 @@ function makeSeriesDataPointsXml(chartType, obj, opts, varyColors) {
 *   change wearing a cleanup's clothes, which the byte-identity gate exists to refuse.
 */
 function numRefBlock(tag, ref, formatCode, values, refIndent = "    ") {
-	let xml = `<${tag}>`;
-	xml += "  <c:numRef>";
-	xml += `${refIndent}<c:f>${ref}</c:f>`;
-	xml += "    <c:numCache>";
-	xml += "      <c:formatCode>" + formatCode + "</c:formatCode>";
-	xml += `      <c:ptCount val="${values.length}"/>`;
-	values.forEach((value, idx) => {
-		xml += numCachePt(idx, value);
-	});
-	xml += "    </c:numCache>";
-	xml += "  </c:numRef>";
-	xml += `</${tag}>`;
-	return xml;
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, formatCode, { openPrefix: "      " })),
+		raw(voidEl("c:ptCount", { val: values.length }, { openPrefix: "      " })),
+		raw(values.map((value, idx) => numCachePt(idx, value)).join(""))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, ref, { openPrefix: refIndent })), raw(numCache)], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	return el(tag, null, raw(numRef));
 }
 //#endregion
 //#region src/gen/define/chart.ts
@@ -1427,6 +1536,42 @@ function addConnectorDefinition(target, opts) {
 	target._slideObjects.push(newObject);
 }
 //#endregion
+//#region src/gen/define/image-rel.ts
+/**
+* Push an image media rel onto `target`, reusing an identical source's package part.
+*
+* De-dup is per target and by source, not by bytes: file-path images are matched on `path`,
+* while base64 `data` images have no real path — they all share the `preencoded.<extn>`
+* placeholder — so they are matched on their payload instead, which is what stops the same
+* inline image being embedded once per use. A rel already marked `isDuplicate` is never
+* matched against, so every duplicate points at the one original rather than at a chain.
+*
+* This is a *slide-local* optimization. `package/assemble.ts` runs a second, deck-wide collapse
+* keyed on extension + bytes once every rel's data is loaded, which subsumes this one for reuse
+* across slides and for sources that only turn out identical after loading.
+* @param target - slide (or layout/master) the rel is registered on
+* @param source - the resolved image source: a `path`, a base64 `data` payload, or both
+* @param relId - the relationship id already allocated for this use
+*/
+function registerImageMediaRel(target, source, relId) {
+	const path = source.path || "";
+	const data = source.data || "";
+	const type = imageContentType(source.extn);
+	const dupe = target._relsMedia.find((item) => {
+		if (item.isDuplicate || !item.Target || item.type !== type) return false;
+		return path ? item.path === path : !!data && item.data === data;
+	});
+	target._relsMedia.push({
+		path: path || "preencoded." + source.extn,
+		type,
+		extn: source.extn,
+		data,
+		rId: relId,
+		isDuplicate: !!dupe?.Target,
+		Target: dupe?.Target ? dupe.Target : `../media/image-${mediaSlideKey(target)}-${target._relsMedia.length + 1}.${source.extn}`
+	});
+}
+//#endregion
 //#region src/gen/define/image.ts
 /** DPI PowerPoint assumes when sizing an inserted raster image (natural pixels / 96 == inches) */
 const IMAGE_NATURAL_DPI = 96;
@@ -1459,21 +1604,11 @@ function registerImageFillMedia(target, fill) {
 		return;
 	}
 	const imageRelId = getNewRelId(target);
-	const mediaKey = mediaSlideKey(target);
-	const imgContentType = imageContentType(strImgExtn);
-	const dupeItem = target._relsMedia.find((item) => {
-		if (item.isDuplicate || !item.Target || item.type !== imgContentType) return false;
-		return strImagePath ? item.path === strImagePath : !!strImageData && item.data === strImageData;
-	});
-	target._relsMedia.push({
-		path: strImagePath || "preencoded." + strImgExtn,
-		type: imgContentType,
-		extn: strImgExtn,
-		data: strImageData || "",
-		rId: imageRelId,
-		isDuplicate: !!dupeItem?.Target,
-		Target: dupeItem?.Target ? dupeItem.Target : `../media/image-${mediaKey}-${target._relsMedia.length + 1}.${strImgExtn}`
-	});
+	registerImageMediaRel(target, {
+		path: strImagePath,
+		data: strImageData,
+		extn: strImgExtn
+	}, imageRelId);
 	fill.type = "image";
 	fill._imgRid = imageRelId;
 }
@@ -1599,20 +1734,11 @@ function addImageDefinition(target, opt) {
 		});
 		newObject.imageRid = imageRelId + 1;
 	} else {
-		const imgContentType = imageContentType(strImgExtn);
-		const dupeItem = target._relsMedia.find((item) => {
-			if (item.isDuplicate || !item.Target || item.type !== imgContentType) return false;
-			return strImagePath ? item.path === strImagePath : !!strImageData && item.data === strImageData;
-		});
-		target._relsMedia.push({
-			path: strImagePath || "preencoded." + strImgExtn,
-			type: imgContentType,
-			extn: strImgExtn,
-			data: strImageData || "",
-			rId: imageRelId,
-			isDuplicate: !!dupeItem?.Target,
-			Target: dupeItem?.Target ? dupeItem.Target : `../media/image-${mediaKey}-${target._relsMedia.length + 1}.${strImgExtn}`
-		});
+		registerImageMediaRel(target, {
+			path: strImagePath,
+			data: strImageData,
+			extn: strImgExtn
+		}, imageRelId);
 		newObject.imageRid = imageRelId;
 	}
 	if (typeof objHyperlink === "object") {
@@ -1957,7 +2083,7 @@ const SHAPE_NAME_ALIASES = {
 * @param {ShapeProps} opts shape options
 */
 function addShapeDefinition(target, shapeName, opts) {
-	const options = typeof opts === "object" ? opts : {};
+	const options = typeof opts === "object" ? { ...opts } : {};
 	options.line = options.line || { type: "none" };
 	options.shadow = correctShadowOptions(options.shadow);
 	const resolvedShapeName = typeof shapeName === "string" && SHAPE_NAME_ALIASES[shapeName] ? SHAPE_NAME_ALIASES[shapeName] : shapeName;
@@ -1998,8 +2124,21 @@ function addShapeDefinition(target, shapeName, opts) {
 * @param {boolean} isPlaceholder whether this a placeholder object
 */
 function addTextDefinition(target, text, opts, isPlaceholder) {
-	const textObjects = !text || text.length === 0 ? [{ text: "" }] : text;
-	const objectOptions = opts || {};
+	const owned = /* @__PURE__ */ new Map();
+	/** Copy a caller-supplied options object once, returning the same copy for the same input. */
+	const own = (source) => {
+		if (!source) return {};
+		const already = owned.get(source);
+		if (already) return already;
+		const copy = { ...source };
+		owned.set(source, copy);
+		return copy;
+	};
+	const textObjects = (!text || text.length === 0 ? [{ text: "" }] : text).map((item) => ({
+		...item,
+		options: own(item.options)
+	}));
+	const objectOptions = own(opts);
 	const newObject = {
 		_type: isPlaceholder ? "placeholder" : "text",
 		shape: opts.shape || "rect",
@@ -2032,7 +2171,7 @@ function addTextDefinition(target, text, opts, isPlaceholder) {
 		itemOpts.line = itemOpts.line || {};
 		itemOpts.lineSpacing = itemOpts.lineSpacing && !isNaN(itemOpts.lineSpacing) ? itemOpts.lineSpacing : void 0;
 		itemOpts.lineSpacingMultiple = itemOpts.lineSpacingMultiple && !isNaN(itemOpts.lineSpacingMultiple) ? itemOpts.lineSpacingMultiple : void 0;
-		itemOpts._bodyProp = itemOpts._bodyProp || {};
+		itemOpts._bodyProp = { ...itemOpts._bodyProp };
 		itemOpts._bodyProp.anchor = !itemOpts.placeholder ? "ctr" : void 0;
 		itemOpts._bodyProp.vert = itemOpts.textDirection ?? itemOpts.vert;
 		itemOpts._bodyProp.wrap = typeof itemOpts.wrap === "boolean" ? itemOpts.wrap : true;
@@ -2310,6 +2449,26 @@ function groupObjectsDefinition(target, objectNames, opts) {
 	target._slideObjects.splice(0, target._slideObjects.length, ...regrouped);
 }
 //#endregion
+//#region src/media/placeholders.ts
+/**
+* The three base64 placeholder images the library falls back to.
+*
+* Their own module because of where the bundler puts them, not because they group naturally.
+* The chunker splits by module, so a constant is pulled into every chunk that reaches the module
+* declaring it — and these lived in `constants-internal.ts` beside `XML_DECL`, `DEF_FONT_SIZE`
+* and the rest of the vocabulary all of `src/gen/` imports. The result was that `IMG_PLAYBTN`,
+* a 74 KB PNG wanted by exactly one module, landed in two chunks and cost 149 KB of the shipped
+* package, 13% of the largest chunk. A caller who only ever wrote text boxes paid for the video
+* poster.
+*
+* So the rule this module encodes: a payload measured in tens of kilobytes does not share a
+* module with vocabulary, however tidy that grouping reads.
+*/
+/** Shown in place of media that failed to load, under `onMediaError: 'placeholder'`. */
+const IMG_BROKEN = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAB3CAYAAAD1oOVhAAAGAUlEQVR4Xu2dT0xcRRzHf7tAYSsc0EBSIq2xEg8mtTGebVzEqOVIolz0siRE4gGTStqKwdpWsXoyGhMuyAVJOHBgqyvLNgonDkabeCBYW/8kTUr0wsJC+Wfm0bfuvn37Znbem9mR9303mJnf/Pb7ed95M7PDI5JIJPYJV5EC7e3t1N/fT62trdqViQCIu+bVgpIHEo/Hqbe3V/sdYVKHyWSSZmZm8ilVA0oeyNjYmEnaVC2Xvr6+qg5fAOJAz4DU1dURGzFSqZRVqtMpAFIGyMjICC0vL9PExIRWKADiAYTNshYWFrRCARAOEFZcCKWtrY0GBgaUTYkBRACIE4rKZwqACALR5RQAqQCIDqcASIVAVDsFQCSAqHQKgEgCUeUUAPEBRIVTAMQnEBvK5OQkbW9vk991CoAEAMQJxc86BUACAhKUUwAkQCBBOAVAAgbi1ykAogCIH6cAiCIgsk4BEIVAZJwCIIqBVLqiBxANQFgXS0tLND4+zl08AogmIG5OSSQS1gGKwgtANAIRcQqAaAbCe6YASBWA2E6xDyeyDUl7+AKQMkDYYevm5mZHabA/Li4uUiaTsYLau8QA4gLE/hU7wajyYtv1hReDAiAOxQcHBymbzark4BkbQKom/X8dp9Npmpqasn4BIAYAYSnYp+4BBEAMUcCwNOCQsAKZnp62NtQOw8WmwT09PUo+ijaHsOMx7GppaaH6+nolH0Z10K2tLVpdXbW6UfV3mNqBdHd3U1NTk2rtlMRfW1uj2dlZAFGirkRQAJEQTWUTAFGprkRsAJEQTWUTAFGprkRsAJEQTWUTAFGprkRsAJEQTWUTAFGprkRsAJEQTWUTAFGprkRsAJEQTWUTAGHqrm8caPzQ0WC1logbeiC7X3xJm0PvUmRzh45cuki1588FAmVn9BO6P3yF9utrqGH0MtW82S8UN9RA9v/4k7InjhcJFTs/TLVXLwmJV67S7vD7tHF5pKi46fYdosdOcOOGG8j1OcqefbFEJD9Q3GCwDhqT31HklS4A8VRgfYM2Op6k3bt/BQJl58J7lPvwg5JYNccepaMry0LPqFA7hCm39+NNyp2J0172b19QysGINj5CsRtpij57musOViH0QPJQXn6J9u7dlYJSFkbrMYolrwvDAJAC+WWdEpQz7FTgECeUCpzi6YxvvqXoM6eEhqnCSgDikEzUKUE7Aw7xuHctKB5OYU3dZlNR9syQdAaAcAYTC0pXF+39c09o2Ik+3EqxVKqiB7hbYAxZkk4pbBaEM+AQofv+wTrFwylBOQNABIGwavdfe4O2pg5elO+86l99nY58/VUF0byrYsjiSFluNlXYrOHcBar7+EogUADEQ0YRGHbzoKAASBkg2+9cpM1rV0tK2QOcXW7bLEFAARAXIF4w2DrDWoeUWaf4hQIgDiA8GPZ2iNfi0Q8UACkAIgrDbrJ385eDxaPLLrEsFAB5oG6lMPJQPLZZZKAACBGVhcG2Q+bmuLu2nk55e4jqPv1IeEoceiBeX7s2zCa5MAqdstl91vfXwaEGsv/rb5TtOFk6tWXOuJGh6KmnhO9sayrMninPx103JBtXblHkice58cINZP4Hyr5wpkgkdiChEmc4FWazLzenNKa/p0jncwDiqcD6BuWePk07t1asatZGoYQzSqA4nFJ7soNiP/+EUyfc25GI2GG53dHPrKo1g/1Cw4pIXLrzO+1c+/wg7tBbFDle/EbQcjFCPWQJCau5EoBoFpzXHYDwFNJcDiCaBed1ByA8hTSXA4hmwXndAQhPIc3lAKJZcF53AMJTSHM5gGgWnNcdgPAU0lwOIJoF53UHIDyFNJcfSiCdnZ0Ui8U0SxlMd7lcjubn561gh+Y1scFIU/0o/3sgeLO12E2k7UXKYumgFoAYdg8ACIAYpoBh6cAhAGKYAoalA4cAiGEKGJYOHAIghilgWDpwCIAYpoBh6cAhAGKYAoalA4cAiGEKGJYOHAIghilgWDpwCIAYpoBh6ZQ4JB6PKzviYthnNy4d9h+1M5mMlVckkUjsG5dhiBMCEMPg/wuOfrZZ/RSywQAAAABJRU5ErkJggg==";
+/** 1x1 transparent PNG, standing in for an SVG the runtime could not rasterize. */
+const IMG_SVG_PLACEHOLDER = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==";
+//#endregion
 //#region src/gen/define/media.ts
 /**
 * Adds a media object to a slide definition.
@@ -2436,21 +2595,11 @@ function registerPreviewImage(target, cover) {
 	if (!strImagePath && !strImageData) strImageData = "image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAxSURBVFhH7c4hAQAACMAw+geFGOAJAGbi5mpRmf1Z7HEdAAAAAAAAAAAAAAAAAADAAPwOyNPFH3F8AAAAAElFTkSuQmCC";
 	const extn = imageExtensionForSource(strImagePath, strImageData);
 	const rId = getNewRelId(target);
-	const mediaKey = mediaSlideKey(target);
-	const type = imageContentType(extn);
-	const dupe = target._relsMedia.find((item) => {
-		if (item.isDuplicate || !item.Target || item.type !== type) return false;
-		return strImagePath ? item.path === strImagePath : item.data === strImageData;
-	});
-	target._relsMedia.push({
-		path: strImagePath || "preencoded." + extn,
-		type,
-		extn,
-		data: strImageData || "",
-		rId,
-		isDuplicate: !!dupe?.Target,
-		Target: dupe?.Target ? dupe.Target : `../media/image-${mediaKey}-${target._relsMedia.length + 1}.${extn}`
-	});
+	registerImageMediaRel(target, {
+		path: strImagePath,
+		data: strImageData,
+		extn
+	}, rId);
 	return rId;
 }
 //#endregion
@@ -2555,7 +2704,8 @@ function addModel3dDefinition(target, opt) {
 			w: opt.w ?? 4,
 			h: opt.h ?? 3,
 			objectName,
-			...opt.altText ? { altText: opt.altText } : {}
+			...opt.altText ? { altText: opt.altText } : {},
+			...opt.objectLock ? { objectLock: opt.objectLock } : {}
 		},
 		model3d: {
 			modelRid,
@@ -2709,6 +2859,70 @@ function addOleObjectDefinition(target, opt) {
 	target._slideObjects.push(slideData);
 }
 //#endregion
+//#region src/gen/table/spans.ts
+/**
+* The largest `colspan`/`rowspan` this library will honour.
+*
+* Unlike the read side's point-cache ceiling there is no format number to borrow: `a:tc@gridSpan`
+* is a bare `xsd:int`. So this is a sanity bound rather than a schema one, and it is set an order
+* of magnitude past PowerPoint's own maximum table (its Insert Table dialog stops at 75 columns
+* and 75 rows), which is what makes it something no authored table can reach. What it stops is
+* the other end, where the allocation takes the host process with it.
+*/
+const MAX_TABLE_SPAN = 1e3;
+/**
+* Validate one cell's `colspan`/`rowspan`, warning and falling back to `1` when it is not a whole
+* number in `1..MAX_TABLE_SPAN`.
+*
+* `undefined` is the common case and means "no span" — it warns about nothing and returns `1`.
+* Everything else is caller error: `NaN`, a negative, a fraction and a span past the ceiling all
+* describe a table that cannot be built (a fractional span silently truncates, a negative one
+* shifts every column after it, an enormous one is the allocation above).
+* @param value - the raw option value
+* @param kind - `'colspan'` or `'rowspan'`, for the diagnostic
+* @returns the span to use, at least 1
+*/
+function resolveSpan(value, kind) {
+	if (value === void 0) return 1;
+	if (!Number.isInteger(value) || value < 1 || value > 1e3) {
+		warn("table/span-out-of-range", `table cell: ${kind} must be a whole number between 1 and ${MAX_TABLE_SPAN}; got ${String(value)}. Using 1.`);
+		return 1;
+	}
+	return value;
+}
+/**
+* Re-clone `rows` with every out-of-range `colspan`/`rowspan` corrected to `1`.
+*
+* Runs once, up front, so the column count, the `_hmerge`/`_vmerge` dummies, the auto-pager's
+* grid and the emitted `gridSpan`/`rowSpan` attributes all read the same number — checking at
+* each of those sites instead would warn several times per bad cell and could still disagree.
+*
+* A cell whose spans are fine is passed through by identity, not copied: `_spanOrigin` links the
+* merge dummies back to the origin *object*, and the all-valid path is every real table, which
+* must stay allocation-free and byte-identical.
+* @param rows - the rows to check; row arrays are never mutated
+* @returns the same rows with only the offending cells replaced
+*/
+function withCheckedSpans(rows) {
+	return rows.map((cells) => cells.map((cell) => {
+		const opts = cell?.options;
+		if (!opts) return cell;
+		const colspan = resolveSpan(opts.colspan, "colspan");
+		const rowspan = resolveSpan(opts.rowspan, "rowspan");
+		const colspanOk = opts.colspan === void 0 || opts.colspan === colspan;
+		const rowspanOk = opts.rowspan === void 0 || opts.rowspan === rowspan;
+		if (colspanOk && rowspanOk) return cell;
+		return {
+			...cell,
+			options: {
+				...opts,
+				...opts.colspan === void 0 ? {} : { colspan },
+				...opts.rowspan === void 0 ? {} : { rowspan }
+			}
+		};
+	}));
+}
+//#endregion
 //#region src/gen/define/table.ts
 /**
 * Expand a cell/table border into the 4-side tuple the rest of the pipeline expects.
@@ -2907,7 +3121,8 @@ function registerTableImageFills(target, rows, opt) {
 }
 function addTableDefinition(target, tableRows, options, slideLayout, presLayout, addSlide, getSlide) {
 	const slides = [target];
-	const opt = options && typeof options === "object" ? options : {};
+	const opt = options && typeof options === "object" ? { ...options } : {};
+	if (Array.isArray(opt.border)) opt.border = [...opt.border];
 	opt.objectName = opt.objectName ? encodeXmlAttrValue(validateObjectName(opt.objectName, "table")) : `Table ${target._slideObjects.filter((obj) => obj._type === "table").length}`;
 	if (opt.placeholder && slideLayout?._slideObjects) {
 		const placeHold = slideLayout._slideObjects.find((item) => item._type === "placeholder" && item.options?.placeholder === opt.placeholder);
@@ -2920,7 +3135,7 @@ function addTableDefinition(target, tableRows, options, slideLayout, presLayout,
 	}
 	if (tableRows === null || tableRows.length === 0 || !Array.isArray(tableRows)) throw new InvalidOptionError("table/rows-not-an-array", "addTable: Array expected! EX: 'slide.addTable( [rows], {options} );'");
 	if (!tableRows[0] || !Array.isArray(tableRows[0])) throw new InvalidOptionError("table/rows-not-nested", "addTable: 'rows' should be an array of cells! EX: 'slide.addTable( [ ['A'], ['B'], {text:'C',options:{align:'center'}} ] );'");
-	const arrRows = normalizeTableRows(applyTableHeaderColumnSugar(tableRows, opt), opt);
+	const arrRows = withCheckedSpans(normalizeTableRows(applyTableHeaderColumnSugar(tableRows, opt), opt));
 	if (opt.x === void 0 || opt.x === null) opt.x = .5;
 	if (opt.y === void 0 || opt.y === null) opt.y = .5;
 	opt.fontSize = opt.fontSize || 12;
@@ -3091,7 +3306,8 @@ function pushZoomObject(target, variant, opts, zoom) {
 			y: opts.y ?? 0,
 			w: opts.w ?? 0,
 			h: opts.h ?? 0,
-			objectName
+			objectName,
+			...opts.objectLock ? { objectLock: opts.objectLock } : {}
 		},
 		zoom: {
 			variant,
@@ -3567,16 +3783,17 @@ var SlideBuilder = class {
 * than one parameterized one. Called by {@link ./chart-xml}'s axis region.
 *
 * Sub-blocks are shared where they can be shared *exactly*: {@link axisLineSpPr} covers
-* `<c:spPr>`, which differs between the three only by indent width. `<c:txPr>` is
-* deliberately left duplicated — its inherited indentation is irregular *within* each copy
-* as well as between them (the category axis closes `</a:defRPr>` at three spaces, the value
-* axis at six), so parameterising it would take about as many indent arguments as it has
-* lines and would hide the quirks rather than share the structure.
+* `<c:spPr>`, which differs between the three only by indent width. `<c:txPr>` stays
+* duplicated — its inherited indentation is irregular *within* each copy as well as between
+* them (the category axis closes `</a:defRPr>` at three spaces, the value axis at six), so
+* one parameterised builder would take about as many indent arguments as it has lines, and
+* would hide the quirks rather than share the structure. Each copy states its own layout at
+* its own call site instead.
 *
-* The other way out -- regularising the whitespace so one builder *could* serve all three --
-* is a byte change, which AGENTS.md is explicit about: a whitespace-only diff is a STOP, not
-* a known divergence. Revisit this only if the emitted whitespace in these parts is ever
-* regularised deliberately, as its own decision.
+* Regularising that whitespace so one builder *could* serve all three is still open, and
+* still a byte change — AGENTS.md is explicit that a whitespace-only diff is a STOP, not a
+* known divergence. It is a decision to take deliberately, with a re-baselined gate, not a
+* cleanup to fold into something else.
 */
 /**
 * The `<c:spPr>` axis-line block, identical in shape on all three axes.
@@ -3596,89 +3813,103 @@ var SlideBuilder = class {
 */
 function axisLineSpPr(indent, widthEmu, show, color, dash) {
 	const at = (extra) => " ".repeat(indent + extra);
-	return `${at(0)}<c:spPr>${at(2)}<a:ln w="${widthEmu}" cap="flat">` + (!show ? "<a:noFill/>" : genXmlColorSelection(color || DEF_GRIDLINE_COLOR)) + `${at(4)}<a:prstDash val="${dash}"/>${at(4)}<a:round/>${at(2)}</a:ln>${at(0)}</c:spPr>`;
+	const line = el("a:ln", {
+		w: widthEmu,
+		cap: "flat"
+	}, [
+		raw(!show ? voidEl("a:noFill") : genXmlColorSelection(color || DEF_GRIDLINE_COLOR)),
+		raw(voidEl("a:prstDash", { val: dash }, { openPrefix: at(4) })),
+		raw(voidEl("a:round", null, { openPrefix: at(4) }))
+	], {
+		openPrefix: at(2),
+		closePrefix: at(2)
+	});
+	return el("c:spPr", null, raw(line), {
+		openPrefix: at(0),
+		closePrefix: at(0)
+	});
 }
 function makeCatAxis(opts, axisId, valAxisId) {
-	let strXml = "";
 	const usesValueAxisForCategories = opts._type === "scatter" || opts._type === "bubble" || opts._type === "bubble3D";
 	const usesCategoryAxis = !usesValueAxisForCategories && !opts.catLabelFormatCode;
-	if (usesValueAxisForCategories) strXml += "<c:valAx>";
-	else strXml += "<c:" + (opts.catLabelFormatCode ? "dateAx" : "catAx") + ">";
-	strXml += "  <c:axId val=\"" + axisId + "\"/>";
-	strXml += "  <c:scaling>";
-	strXml += "<c:orientation val=\"" + (opts.catAxisOrientation || "minMax") + "\"/>";
-	if (opts.catAxisMaxVal || opts.catAxisMaxVal === 0) strXml += `<c:max val="${opts.catAxisMaxVal}"/>`;
-	if (opts.catAxisMinVal || opts.catAxisMinVal === 0) strXml += `<c:min val="${opts.catAxisMinVal}"/>`;
-	strXml += "</c:scaling>";
-	strXml += "  <c:delete val=\"" + (opts.catAxisHidden ? "1" : "0") + "\"/>";
-	strXml += "  <c:axPos val=\"" + (opts.barDir === "col" ? "b" : "l") + "\"/>";
-	strXml += opts.catGridLine && opts.catGridLine.style !== "none" ? createGridLineElement(opts.catGridLine) : "";
-	if (opts.showCatAxisTitle) strXml += genXmlTitle({
-		color: opts.catAxisTitleColor,
-		fontFace: opts.catAxisTitleFontFace,
-		fontSize: opts.catAxisTitleFontSize,
-		titleRotate: opts.catAxisTitleRotate,
-		title: opts.catAxisTitle || "Axis Title"
-	});
-	if (opts._type === "scatter" || opts._type === "bubble" || opts._type === "bubble3D") {
-		const xAxisFmtCode = opts.catAxisLabelFormatCode ?? opts.valAxisLabelFormatCode;
-		strXml += "  " + voidEl("c:numFmt", {
-			formatCode: xAxisFmtCode || "General",
-			sourceLinked: 1
-		});
-	} else strXml += "  " + voidEl("c:numFmt", {
+	const tag = usesValueAxisForCategories ? "c:valAx" : opts.catLabelFormatCode ? "c:dateAx" : "c:catAx";
+	const scaling = el("c:scaling", null, [
+		raw(voidEl("c:orientation", { val: opts.catAxisOrientation || "minMax" })),
+		opts.catAxisMaxVal || opts.catAxisMaxVal === 0 ? raw(voidEl("c:max", { val: opts.catAxisMaxVal })) : null,
+		opts.catAxisMinVal || opts.catAxisMinVal === 0 ? raw(voidEl("c:min", { val: opts.catAxisMinVal })) : null
+	], { openPrefix: "  " });
+	const numFmt = usesValueAxisForCategories ? voidEl("c:numFmt", {
+		formatCode: (opts.catAxisLabelFormatCode ?? opts.valAxisLabelFormatCode) || "General",
+		sourceLinked: 1
+	}, { openPrefix: "  " }) : voidEl("c:numFmt", {
 		formatCode: (opts.catLabelFormatCode ?? "") || "General",
 		sourceLinked: 1
+	}, { openPrefix: "  " });
+	const ticks = opts._type === "scatter" ? voidEl("c:majorTickMark", { val: "none" }, { openPrefix: "  " }) + voidEl("c:minorTickMark", { val: "none" }, { openPrefix: "  " }) + voidEl("c:tickLblPos", { val: opts.catAxisLabelPos || "nextTo" }, { openPrefix: "  " }) : voidEl("c:majorTickMark", { val: opts.catAxisMajorTickMark || "out" }, { openPrefix: "  " }) + voidEl("c:minorTickMark", { val: opts.catAxisMinorTickMark || "none" }, { openPrefix: "  " }) + voidEl("c:tickLblPos", { val: opts.catAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo") }, { openPrefix: "  " });
+	const defRPr = el("a:defRPr", {
+		sz: ptToHundredths(opts.catAxisLabelFontSize || 12),
+		b: opts.catAxisLabelFontBold ? 1 : 0,
+		i: opts.catAxisLabelFontItalic ? 1 : 0,
+		u: "none",
+		strike: "noStrike"
+	}, [raw(genXmlColorSelection(opts.catAxisLabelColor || "000000")), raw("      " + createChartTextFonts(opts.catAxisLabelFontFace || "Arial"))], {
+		openPrefix: "      ",
+		closePrefix: "   "
+	});
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", { rot: opts.catAxisLabelRotate ? convertAngleUnits(opts.catAxisLabelRotate, "catAxisLabelRotate") : void 0 })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "    " })),
+		raw(el("a:p", null, [raw(el("a:pPr", null, raw(defRPr), {
+			openPrefix: "    ",
+			closePrefix: "  "
+		})), raw(voidEl("a:endParaRPr", { lang: opts.lang || "en-US" }, { openPrefix: "  " }))], {
+			openPrefix: "    ",
+			closePrefix: "  "
+		}))
+	], {
+		openPrefix: "  ",
+		closePrefix: " "
 	});
-	if (opts._type === "scatter") {
-		strXml += "  <c:majorTickMark val=\"none\"/>";
-		strXml += "  <c:minorTickMark val=\"none\"/>";
-		strXml += "  <c:tickLblPos val=\"" + (opts.catAxisLabelPos || "nextTo") + "\"/>";
-	} else {
-		strXml += "  <c:majorTickMark val=\"" + (opts.catAxisMajorTickMark || "out") + "\"/>";
-		strXml += "  <c:minorTickMark val=\"" + (opts.catAxisMinorTickMark || "none") + "\"/>";
-		strXml += "  <c:tickLblPos val=\"" + (opts.catAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo")) + "\"/>";
-	}
-	strXml += axisLineSpPr(2, opts.catAxisLineSize ? ptsToEmuLenient(opts.catAxisLineSize) : EMU_PER_POINT, opts.catAxisLineShow, opts.catAxisLineColor, opts.catAxisLineStyle || "solid");
-	strXml += "  <c:txPr>";
-	if (opts.catAxisLabelRotate) strXml += `<a:bodyPr rot="${convertAngleUnits(opts.catAxisLabelRotate, "catAxisLabelRotate")}"/>`;
-	else strXml += "<a:bodyPr/>";
-	strXml += "    <a:lstStyle/>";
-	strXml += "    <a:p>";
-	strXml += "    <a:pPr>";
-	strXml += `      <a:defRPr sz="${ptToHundredths(opts.catAxisLabelFontSize || 12)}" b="${opts.catAxisLabelFontBold ? 1 : 0}" i="${opts.catAxisLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
-	strXml += genXmlColorSelection(opts.catAxisLabelColor || "000000");
-	strXml += "      " + createChartTextFonts(opts.catAxisLabelFontFace || "Arial");
-	strXml += "   </a:defRPr>";
-	strXml += "  </a:pPr>";
-	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
-	strXml += "  </a:p>";
-	strXml += " </c:txPr>";
-	strXml += " <c:crossAx val=\"" + valAxisId + "\"/>";
 	const valAxisCrossTag = typeof opts.valAxisCrossesAt === "number" ? "crossesAt" : "crosses";
 	const valAxisCrossValue = typeof opts.valAxisCrossesAt === "number" ? opts.valAxisCrossesAt : opts.valAxisCrossesAt || "autoZero";
-	strXml += ` <c:${valAxisCrossTag} val="${valAxisCrossValue}"/>`;
-	if (!usesValueAxisForCategories) strXml += " <c:auto val=\"1\"/>";
-	if (usesCategoryAxis) {
-		strXml += " <c:lblAlgn val=\"ctr\"/>";
-		if (opts.catAxisLabelFrequency) strXml += " <c:tickLblSkip val=\"" + opts.catAxisLabelFrequency + "\"/>";
-		strXml += ` <c:noMultiLvlLbl val="${opts.catAxisMultiLevelLabels ? 0 : 1}"/>`;
-	}
+	let units = "";
 	if (opts.catLabelFormatCode || usesValueAxisForCategories) {
 		if (opts.catLabelFormatCode) {
 			const baseTimeUnit = validTimeUnit(opts.catAxisBaseTimeUnit, "catAxisBaseTimeUnit");
 			const majorTimeUnit = validTimeUnit(opts.catAxisMajorTimeUnit, "catAxisMajorTimeUnit");
 			const minorTimeUnit = validTimeUnit(opts.catAxisMinorTimeUnit, "catAxisMinorTimeUnit");
-			if (baseTimeUnit) strXml += "<c:baseTimeUnit val=\"" + baseTimeUnit + "\"/>";
-			if (majorTimeUnit) strXml += voidEl("c:majorTimeUnit", { val: majorTimeUnit });
-			if (minorTimeUnit) strXml += voidEl("c:minorTimeUnit", { val: minorTimeUnit });
+			if (baseTimeUnit) units += voidEl("c:baseTimeUnit", { val: baseTimeUnit });
+			if (majorTimeUnit) units += voidEl("c:majorTimeUnit", { val: majorTimeUnit });
+			if (minorTimeUnit) units += voidEl("c:minorTimeUnit", { val: minorTimeUnit });
 		}
-		if (opts.catAxisMajorUnit) strXml += `<c:majorUnit val="${opts.catAxisMajorUnit}"/>`;
-		if (opts.catAxisMinorUnit) strXml += `<c:minorUnit val="${opts.catAxisMinorUnit}"/>`;
-	}
-	if (usesValueAxisForCategories) strXml += "</c:valAx>";
-	else strXml += "</c:" + (opts.catLabelFormatCode ? "dateAx" : "catAx") + ">";
-	return strXml;
+		if (opts.catAxisMajorUnit) units += voidEl("c:majorUnit", { val: opts.catAxisMajorUnit });
+		if (opts.catAxisMinorUnit) units += voidEl("c:minorUnit", { val: opts.catAxisMinorUnit });
+	}
+	return el(tag, null, [
+		raw(voidEl("c:axId", { val: axisId }, { openPrefix: "  " })),
+		raw(scaling),
+		raw(voidEl("c:delete", { val: opts.catAxisHidden ? 1 : 0 }, { openPrefix: "  " })),
+		raw(voidEl("c:axPos", { val: opts.barDir === "col" ? "b" : "l" }, { openPrefix: "  " })),
+		raw(opts.catGridLine && opts.catGridLine.style !== "none" ? createGridLineElement(opts.catGridLine) : ""),
+		opts.showCatAxisTitle ? raw(genXmlTitle({
+			color: opts.catAxisTitleColor,
+			fontFace: opts.catAxisTitleFontFace,
+			fontSize: opts.catAxisTitleFontSize,
+			titleRotate: opts.catAxisTitleRotate,
+			title: opts.catAxisTitle || "Axis Title"
+		})) : null,
+		raw(numFmt),
+		raw(ticks),
+		raw(axisLineSpPr(2, opts.catAxisLineSize ? ptsToEmuLenient(opts.catAxisLineSize) : EMU_PER_POINT, opts.catAxisLineShow, opts.catAxisLineColor, opts.catAxisLineStyle || "solid")),
+		raw(txPr),
+		raw(voidEl("c:crossAx", { val: valAxisId }, { openPrefix: " " })),
+		raw(voidEl(`c:${valAxisCrossTag}`, { val: valAxisCrossValue }, { openPrefix: " " })),
+		usesValueAxisForCategories ? null : raw(voidEl("c:auto", { val: 1 }, { openPrefix: " " })),
+		usesCategoryAxis ? raw(voidEl("c:lblAlgn", { val: "ctr" }, { openPrefix: " " })) : null,
+		usesCategoryAxis && opts.catAxisLabelFrequency ? raw(voidEl("c:tickLblSkip", { val: opts.catAxisLabelFrequency }, { openPrefix: " " })) : null,
+		usesCategoryAxis ? raw(voidEl("c:noMultiLvlLbl", { val: opts.catAxisMultiLevelLabels ? 0 : 1 }, { openPrefix: " " })) : null,
+		raw(units)
+	]);
 }
 /**
 * Create Value Axis (Used by `bar3D`)
@@ -3690,61 +3921,68 @@ function makeValAxis(opts, valAxisId) {
 	let axisPos = valAxisId === "2094734552" ? opts.barDir === "col" ? "l" : "b" : opts.barDir !== "col" ? "r" : "t";
 	if (valAxisId === "2094734553") axisPos = "r";
 	const crossAxId = valAxisId === "2094734552" ? AXIS_ID_CATEGORY_PRIMARY : AXIS_ID_CATEGORY_SECONDARY;
-	let strXml = "";
-	strXml += "<c:valAx>";
-	strXml += "  <c:axId val=\"" + valAxisId + "\"/>";
-	strXml += "  <c:scaling>";
-	if (opts.valAxisLogScaleBase) strXml += `<c:logBase val="${opts.valAxisLogScaleBase}"/>`;
-	strXml += "<c:orientation val=\"" + (opts.valAxisOrientation || "minMax") + "\"/>";
-	if (opts.valAxisMaxVal || opts.valAxisMaxVal === 0) strXml += `<c:max val="${opts.valAxisMaxVal}"/>`;
-	if (opts.valAxisMinVal || opts.valAxisMinVal === 0) strXml += `<c:min val="${opts.valAxisMinVal}"/>`;
-	strXml += "  </c:scaling>";
-	strXml += `  <c:delete val="${opts.valAxisHidden ? 1 : 0}"/>`;
-	strXml += "  <c:axPos val=\"" + axisPos + "\"/>";
-	if (opts.valGridLine && opts.valGridLine.style !== "none") strXml += createGridLineElement(opts.valGridLine);
-	if (opts.showValAxisTitle) strXml += genXmlTitle({
-		color: opts.valAxisTitleColor,
-		fontFace: opts.valAxisTitleFontFace,
-		fontSize: opts.valAxisTitleFontSize,
-		titleRotate: opts.valAxisTitleRotate,
-		title: opts.valAxisTitle || "Axis Title"
-	});
-	strXml += voidEl("c:numFmt", {
-		formatCode: opts.valAxisLabelFormatCode || "General",
-		sourceLinked: 0
+	const scaling = el("c:scaling", null, [
+		opts.valAxisLogScaleBase ? raw(voidEl("c:logBase", { val: opts.valAxisLogScaleBase })) : null,
+		raw(voidEl("c:orientation", { val: opts.valAxisOrientation || "minMax" })),
+		opts.valAxisMaxVal || opts.valAxisMaxVal === 0 ? raw(voidEl("c:max", { val: opts.valAxisMaxVal })) : null,
+		opts.valAxisMinVal || opts.valAxisMinVal === 0 ? raw(voidEl("c:min", { val: opts.valAxisMinVal })) : null
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
 	});
-	if (opts._type === "scatter") {
-		strXml += "  <c:majorTickMark val=\"none\"/>";
-		strXml += "  <c:minorTickMark val=\"none\"/>";
-		strXml += "  <c:tickLblPos val=\"nextTo\"/>";
-	} else {
-		strXml += " <c:majorTickMark val=\"" + (opts.valAxisMajorTickMark || "out") + "\"/>";
-		strXml += " <c:minorTickMark val=\"" + (opts.valAxisMinorTickMark || "none") + "\"/>";
-		strXml += " <c:tickLblPos val=\"" + (opts.valAxisLabelPos || (opts.barDir === "col" ? "nextTo" : "low")) + "\"/>";
-	}
-	strXml += axisLineSpPr(1, opts.valAxisLineSize ? ptsToEmuLenient(opts.valAxisLineSize) : EMU_PER_POINT, opts.valAxisLineShow, opts.valAxisLineColor, opts.valAxisLineStyle || "solid");
-	strXml += " <c:txPr>";
-	strXml += `  <a:bodyPr${opts.valAxisLabelRotate ? " rot=\"" + convertAngleUnits(opts.valAxisLabelRotate, "valAxisLabelRotate").toString() + "\"" : ""}/>`;
-	strXml += "  <a:lstStyle/>";
-	strXml += "  <a:p>";
-	strXml += "    <a:pPr>";
-	strXml += `      <a:defRPr sz="${ptToHundredths(opts.valAxisLabelFontSize || 12)}" b="${opts.valAxisLabelFontBold ? 1 : 0}" i="${opts.valAxisLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
-	strXml += genXmlColorSelection(opts.valAxisLabelColor || "000000");
-	strXml += "        " + createChartTextFonts(opts.valAxisLabelFontFace || "Arial");
-	strXml += "      </a:defRPr>";
-	strXml += "    </a:pPr>";
-	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
-	strXml += "  </a:p>";
-	strXml += " </c:txPr>";
-	strXml += " <c:crossAx val=\"" + crossAxId + "\"/>";
-	if (typeof opts.catAxisCrossesAt === "number") strXml += ` <c:crossesAt val="${opts.catAxisCrossesAt}"/>`;
-	else if (typeof opts.catAxisCrossesAt === "string") strXml += " <c:crosses val=\"" + opts.catAxisCrossesAt + "\"/>";
-	else strXml += " <c:crosses val=\"" + (axisPos === "r" || axisPos === "t" ? "max" : "autoZero") + "\"/>";
-	strXml += " <c:crossBetween val=\"" + (opts.valAxisCrossBetween ? opts.valAxisCrossBetween : opts._type === "scatter" || !!(Array.isArray(opts._type) && opts._type.some((type) => asChartType(type.type) === "area")) ? "midCat" : "between") + "\"/>";
-	if (opts.valAxisMajorUnit) strXml += ` <c:majorUnit val="${opts.valAxisMajorUnit}"/>`;
-	if (opts.valAxisDisplayUnit) strXml += el("c:dispUnits", null, [raw(voidEl("c:builtInUnit", { val: opts.valAxisDisplayUnit })), raw(opts.valAxisDisplayUnitLabel ? voidEl("c:dispUnitsLbl") : "")]);
-	strXml += "</c:valAx>";
-	return strXml;
+	const ticks = opts._type === "scatter" ? voidEl("c:majorTickMark", { val: "none" }, { openPrefix: "  " }) + voidEl("c:minorTickMark", { val: "none" }, { openPrefix: "  " }) + voidEl("c:tickLblPos", { val: "nextTo" }, { openPrefix: "  " }) : voidEl("c:majorTickMark", { val: opts.valAxisMajorTickMark || "out" }, { openPrefix: " " }) + voidEl("c:minorTickMark", { val: opts.valAxisMinorTickMark || "none" }, { openPrefix: " " }) + voidEl("c:tickLblPos", { val: opts.valAxisLabelPos || (opts.barDir === "col" ? "nextTo" : "low") }, { openPrefix: " " });
+	const defRPr = el("a:defRPr", {
+		sz: ptToHundredths(opts.valAxisLabelFontSize || 12),
+		b: opts.valAxisLabelFontBold ? 1 : 0,
+		i: opts.valAxisLabelFontItalic ? 1 : 0,
+		u: "none",
+		strike: "noStrike"
+	}, [raw(genXmlColorSelection(opts.valAxisLabelColor || "000000")), raw("        " + createChartTextFonts(opts.valAxisLabelFontFace || "Arial"))], {
+		openPrefix: "      ",
+		closePrefix: "      "
+	});
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", { rot: opts.valAxisLabelRotate ? convertAngleUnits(opts.valAxisLabelRotate, "valAxisLabelRotate") : void 0 }, { openPrefix: "  " })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "  " })),
+		raw(el("a:p", null, [raw(el("a:pPr", null, raw(defRPr), {
+			openPrefix: "    ",
+			closePrefix: "    "
+		})), raw(voidEl("a:endParaRPr", { lang: opts.lang || "en-US" }, { openPrefix: "  " }))], {
+			openPrefix: "  ",
+			closePrefix: "  "
+		}))
+	], {
+		openPrefix: " ",
+		closePrefix: " "
+	});
+	const crosses = typeof opts.catAxisCrossesAt === "number" ? voidEl("c:crossesAt", { val: opts.catAxisCrossesAt }, { openPrefix: " " }) : typeof opts.catAxisCrossesAt === "string" ? voidEl("c:crosses", { val: opts.catAxisCrossesAt }, { openPrefix: " " }) : voidEl("c:crosses", { val: axisPos === "r" || axisPos === "t" ? "max" : "autoZero" }, { openPrefix: " " });
+	const crossBetween = opts.valAxisCrossBetween || (opts._type === "scatter" || !!(Array.isArray(opts._type) && opts._type.some((type) => asChartType(type.type) === "area")) ? "midCat" : "between");
+	return el("c:valAx", null, [
+		raw(voidEl("c:axId", { val: valAxisId }, { openPrefix: "  " })),
+		raw(scaling),
+		raw(voidEl("c:delete", { val: opts.valAxisHidden ? 1 : 0 }, { openPrefix: "  " })),
+		raw(voidEl("c:axPos", { val: axisPos }, { openPrefix: "  " })),
+		opts.valGridLine && opts.valGridLine.style !== "none" ? raw(createGridLineElement(opts.valGridLine)) : null,
+		opts.showValAxisTitle ? raw(genXmlTitle({
+			color: opts.valAxisTitleColor,
+			fontFace: opts.valAxisTitleFontFace,
+			fontSize: opts.valAxisTitleFontSize,
+			titleRotate: opts.valAxisTitleRotate,
+			title: opts.valAxisTitle || "Axis Title"
+		})) : null,
+		raw(voidEl("c:numFmt", {
+			formatCode: opts.valAxisLabelFormatCode || "General",
+			sourceLinked: 0
+		})),
+		raw(ticks),
+		raw(axisLineSpPr(1, opts.valAxisLineSize ? ptsToEmuLenient(opts.valAxisLineSize) : EMU_PER_POINT, opts.valAxisLineShow, opts.valAxisLineColor, opts.valAxisLineStyle || "solid")),
+		raw(txPr),
+		raw(voidEl("c:crossAx", { val: crossAxId }, { openPrefix: " " })),
+		raw(crosses),
+		raw(voidEl("c:crossBetween", { val: crossBetween }, { openPrefix: " " })),
+		opts.valAxisMajorUnit ? raw(voidEl("c:majorUnit", { val: opts.valAxisMajorUnit }, { openPrefix: " " })) : null,
+		opts.valAxisDisplayUnit ? raw(el("c:dispUnits", null, [raw(voidEl("c:builtInUnit", { val: opts.valAxisDisplayUnit })), raw(opts.valAxisDisplayUnitLabel ? voidEl("c:dispUnitsLbl") : "")])) : null
+	]);
 }
 /**
 * Create Series Axis (Used by `bar3D`)
@@ -3754,651 +3992,850 @@ function makeValAxis(opts, valAxisId) {
 * @return {string} XML
 */
 function makeSerAxis(opts, axisId, valAxisId) {
-	let strXml = "";
-	strXml += "<c:serAx>";
-	strXml += "  <c:axId val=\"" + axisId + "\"/>";
-	strXml += "  <c:scaling><c:orientation val=\"" + (opts.serAxisOrientation || "minMax") + "\"/></c:scaling>";
-	strXml += "  <c:delete val=\"" + (opts.serAxisHidden ? "1" : "0") + "\"/>";
-	strXml += "  <c:axPos val=\"" + (opts.barDir === "col" ? "b" : "l") + "\"/>";
-	strXml += opts.serGridLine && opts.serGridLine.style !== "none" ? createGridLineElement(opts.serGridLine) : "";
-	if (opts.showSerAxisTitle) strXml += genXmlTitle({
-		color: opts.serAxisTitleColor,
-		fontFace: opts.serAxisTitleFontFace,
-		fontSize: opts.serAxisTitleFontSize,
-		titleRotate: opts.serAxisTitleRotate,
-		title: opts.serAxisTitle || "Axis Title"
-	});
-	strXml += "  " + voidEl("c:numFmt", {
-		formatCode: (opts.serLabelFormatCode ?? "") || "General",
-		sourceLinked: 0
+	const defRPr = el("a:defRPr", {
+		sz: ptToHundredths(opts.serAxisLabelFontSize || 12),
+		b: opts.serAxisLabelFontBold ? 1 : 0,
+		i: opts.serAxisLabelFontItalic ? 1 : 0,
+		u: "none",
+		strike: "noStrike"
+	}, [raw("      " + genXmlColorSelection(opts.serAxisLabelColor || "000000")), raw("      " + createChartTextFonts(opts.serAxisLabelFontFace || "Arial"))], {
+		openPrefix: "    ",
+		closePrefix: "   "
 	});
-	strXml += "  <c:majorTickMark val=\"out\"/>";
-	strXml += "  <c:minorTickMark val=\"none\"/>";
-	strXml += `  <c:tickLblPos val="${opts.serAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo")}"/>`;
-	strXml += axisLineSpPr(2, EMU_PER_POINT, opts.serAxisLineShow, opts.serAxisLineColor, "solid");
-	strXml += "  <c:txPr>";
-	strXml += "    <a:bodyPr/>";
-	strXml += "    <a:lstStyle/>";
-	strXml += "    <a:p>";
-	strXml += "    <a:pPr>";
-	strXml += `    <a:defRPr sz="${ptToHundredths(opts.serAxisLabelFontSize || 12)}" b="${opts.serAxisLabelFontBold ? "1" : "0"}" i="${opts.serAxisLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
-	strXml += `      ${genXmlColorSelection(opts.serAxisLabelColor || "000000")}`;
-	strXml += "      " + createChartTextFonts(opts.serAxisLabelFontFace || "Arial");
-	strXml += "   </a:defRPr>";
-	strXml += "  </a:pPr>";
-	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
-	strXml += "  </a:p>";
-	strXml += " </c:txPr>";
-	strXml += " <c:crossAx val=\"" + valAxisId + "\"/>";
-	strXml += " <c:crosses val=\"autoZero\"/>";
-	if (opts.serAxisLabelFrequency) strXml += " <c:tickLblSkip val=\"" + opts.serAxisLabelFrequency + "\"/>";
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", null, { openPrefix: "    " })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "    " })),
+		raw(el("a:p", null, [raw(el("a:pPr", null, raw(defRPr), {
+			openPrefix: "    ",
+			closePrefix: "  "
+		})), raw(voidEl("a:endParaRPr", { lang: opts.lang || "en-US" }, { openPrefix: "  " }))], {
+			openPrefix: "    ",
+			closePrefix: "  "
+		}))
+	], {
+		openPrefix: "  ",
+		closePrefix: " "
+	});
+	let units = "";
 	if (opts.serLabelFormatCode) {
 		const baseTimeUnit = validTimeUnit(opts.serAxisBaseTimeUnit, "serAxisBaseTimeUnit");
 		const majorTimeUnit = validTimeUnit(opts.serAxisMajorTimeUnit, "serAxisMajorTimeUnit");
 		const minorTimeUnit = validTimeUnit(opts.serAxisMinorTimeUnit, "serAxisMinorTimeUnit");
-		if (baseTimeUnit) strXml += ` <c:baseTimeUnit  val="${baseTimeUnit}"/>`;
-		if (majorTimeUnit) strXml += voidEl("c:majorTimeUnit", { val: majorTimeUnit }, { openPrefix: " " });
-		if (minorTimeUnit) strXml += voidEl("c:minorTimeUnit", { val: minorTimeUnit }, { openPrefix: " " });
-		if (opts.serAxisMajorUnit) strXml += ` <c:majorUnit val="${opts.serAxisMajorUnit}"/>`;
-		if (opts.serAxisMinorUnit) strXml += ` <c:minorUnit val="${opts.serAxisMinorUnit}"/>`;
-	}
-	strXml += "</c:serAx>";
-	return strXml;
+		if (baseTimeUnit) units += ` <c:baseTimeUnit  val="${baseTimeUnit}"/>`;
+		if (majorTimeUnit) units += voidEl("c:majorTimeUnit", { val: majorTimeUnit }, { openPrefix: " " });
+		if (minorTimeUnit) units += voidEl("c:minorTimeUnit", { val: minorTimeUnit }, { openPrefix: " " });
+		if (opts.serAxisMajorUnit) units += voidEl("c:majorUnit", { val: opts.serAxisMajorUnit }, { openPrefix: " " });
+		if (opts.serAxisMinorUnit) units += voidEl("c:minorUnit", { val: opts.serAxisMinorUnit }, { openPrefix: " " });
+	}
+	return el("c:serAx", null, [
+		raw(voidEl("c:axId", { val: axisId }, { openPrefix: "  " })),
+		raw(el("c:scaling", null, raw(voidEl("c:orientation", { val: opts.serAxisOrientation || "minMax" })), { openPrefix: "  " })),
+		raw(voidEl("c:delete", { val: opts.serAxisHidden ? 1 : 0 }, { openPrefix: "  " })),
+		raw(voidEl("c:axPos", { val: opts.barDir === "col" ? "b" : "l" }, { openPrefix: "  " })),
+		raw(opts.serGridLine && opts.serGridLine.style !== "none" ? createGridLineElement(opts.serGridLine) : ""),
+		opts.showSerAxisTitle ? raw(genXmlTitle({
+			color: opts.serAxisTitleColor,
+			fontFace: opts.serAxisTitleFontFace,
+			fontSize: opts.serAxisTitleFontSize,
+			titleRotate: opts.serAxisTitleRotate,
+			title: opts.serAxisTitle || "Axis Title"
+		})) : null,
+		raw(voidEl("c:numFmt", {
+			formatCode: (opts.serLabelFormatCode ?? "") || "General",
+			sourceLinked: 0
+		}, { openPrefix: "  " })),
+		raw(voidEl("c:majorTickMark", { val: "out" }, { openPrefix: "  " })),
+		raw(voidEl("c:minorTickMark", { val: "none" }, { openPrefix: "  " })),
+		raw(voidEl("c:tickLblPos", { val: opts.serAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo") }, { openPrefix: "  " })),
+		raw(axisLineSpPr(2, EMU_PER_POINT, opts.serAxisLineShow, opts.serAxisLineColor, "solid")),
+		raw(txPr),
+		raw(voidEl("c:crossAx", { val: valAxisId }, { openPrefix: " " })),
+		raw(voidEl("c:crosses", { val: "autoZero" }, { openPrefix: " " })),
+		opts.serAxisLabelFrequency ? raw(voidEl("c:tickLblSkip", { val: opts.serAxisLabelFrequency }, { openPrefix: " " })) : null,
+		raw(units)
+	]);
 }
-/**
-* Create char title elements
-* @param {ChartPropsTitle} opts - options
-* @return {string} XML `<c:title>`
-*/
 //#endregion
 //#region src/gen/chart/plot-cat-axis.ts
-/**
-* Plot a category-axis chart family (area / bar / bar3d / line / radar) into a
-* `<c:xxxChart>` element. These share the grouping / series / cat+val axis structure.
-*/
-function makeCatAxisPlot(chartType, data, opts, valAxisId, catAxisId, valFmtCode) {
-	let colorIndex = -1;
-	let strXml = "";
-	strXml += `<c:${chartType}Chart>`;
+/** The chart types drawn as a line (a marker per point, an optional smooth) rather than as a body. */
+const isLineLike = (chartType) => chartType === "line" || chartType === "radar";
+/** The two bar families, which share `<c:barDir>`, `<c:invertIfNegative>` and a gap width. */
+const isBarLike = (chartType) => chartType === "bar" || chartType === "bar3D";
+/** The type-gated children that open a plot element, before `<c:varyColors>`. */
+function plotGrouping(chartType, opts) {
 	if (chartType === "area" || chartType === "line") {
 		const lineGrouping = opts.barGrouping === "stacked" || opts.barGrouping === "percentStacked" ? opts.barGrouping : "standard";
-		strXml += "<c:grouping val=\"" + lineGrouping + "\"/>";
-	}
-	if (chartType === "bar" || chartType === "bar3D") {
-		strXml += "<c:barDir val=\"" + opts.barDir + "\"/>";
-		strXml += "<c:grouping val=\"" + (opts.barGrouping || "clustered") + "\"/>";
+		return voidEl("c:grouping", { val: lineGrouping });
 	}
+	if (isBarLike(chartType)) return voidEl("c:barDir", { val: opts.barDir }) + voidEl("c:grouping", { val: opts.barGrouping || "clustered" });
 	if (chartType === "radar") {
 		const radarStyleWire = {
 			radar: "standard",
 			markers: "marker",
 			filled: "filled"
 		}[opts.radarStyle || "radar"] ?? "standard";
-		strXml += "<c:radarStyle val=\"" + radarStyleWire + "\"/>";
-	}
-	strXml += "<c:varyColors val=\"0\"/>";
-	data.forEach((obj) => {
-		colorIndex++;
-		strXml += "<c:ser>";
-		strXml += `  <c:idx val="${obj._dataIndex}"/><c:order val="${obj._dataIndex}"/>`;
-		strXml += "  <c:tx>";
-		strXml += "    <c:strRef>";
-		strXml += `      <c:f>${sheetCellRef(obj._dataIndex + dataLabels(obj).length + 1, 1)}</c:f>`;
-		strXml += "      <c:strCache><c:ptCount val=\"1\"/><c:pt idx=\"0\">" + el("c:v", null, obj.name ?? "") + "</c:pt></c:strCache>";
-		strXml += "    </c:strRef>";
-		strXml += "  </c:tx>";
-		const chartColors = resolveChartPalette(opts);
-		const seriesOverride = opts.seriesOptions?.[obj._dataIndex];
-		const seriesColor = seriesOverride?.color ?? paletteColor(chartColors, colorIndex);
-		strXml += "  <c:spPr>";
-		if (seriesColor === "transparent") strXml += "<a:noFill/>";
-		else if (opts.chartColorsOpacity) strXml += "<a:solidFill>" + createColorElement(seriesColor, `<a:alpha val="${Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT)}"/>`) + "</a:solidFill>";
-		else strXml += genXmlColorSelection(seriesColor);
-		if (chartType === "line" || chartType === "radar") {
-			const effectiveLineSize = seriesOverride?.lineSize ?? opts.lineSize ?? 2;
-			if (effectiveLineSize === 0) strXml += "<a:ln><a:noFill/></a:ln>";
-			else {
-				strXml += `<a:ln w="${ptsToEmuLenient(effectiveLineSize)}" cap="${createLineCap(opts.lineCap)}">${chartColorLineFill(seriesColor)}`;
-				strXml += voidEl("a:prstDash", { val: opts.lineDashValues?.[colorIndex] ?? opts.lineDash ?? "solid" }) + voidEl("a:round") + "</a:ln>";
-			}
-		} else if (opts.dataBorder) strXml += `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75))}" cap="${createLineCap(opts.lineCap)}">${genXmlColorSelection({
+		return voidEl("c:radarStyle", { val: radarStyleWire });
+	}
+	return "";
+}
+/** Fill, outline and shadow for one series, from its resolved colour and the line/border options. */
+function serShapeProps(chartType, opts, seriesColor, lineSize, serIndex) {
+	const fill = seriesColor === "transparent" ? voidEl("a:noFill") : opts.chartColorsOpacity ? el("a:solidFill", null, raw(createColorElement(seriesColor, voidEl("a:alpha", { val: Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT) })))) : genXmlColorSelection(seriesColor);
+	let line = "";
+	if (isLineLike(chartType)) {
+		const effectiveLineSize = lineSize ?? opts.lineSize ?? 2;
+		line = effectiveLineSize === 0 ? el("a:ln", null, raw(voidEl("a:noFill"))) : el("a:ln", {
+			w: ptsToEmuLenient(effectiveLineSize),
+			cap: createLineCap(opts.lineCap)
+		}, [
+			raw(chartColorLineFill(seriesColor)),
+			raw(voidEl("a:prstDash", { val: opts.lineDashValues?.[serIndex] ?? opts.lineDash ?? "solid" })),
+			raw(voidEl("a:round"))
+		]);
+	} else if (opts.dataBorder) line = el("a:ln", {
+		w: ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75)),
+		cap: createLineCap(opts.lineCap)
+	}, [
+		raw(genXmlColorSelection({
 			color: opts.dataBorder.color ?? "363636",
 			transparency: opts.dataBorder.transparency
-		})}<a:prstDash val="solid"/><a:round/></a:ln>`;
-		strXml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-		strXml += "  </c:spPr>";
-		if (chartType === "bar" || chartType === "bar3D") strXml += "  <c:invertIfNegative val=\"0\"/>";
-		if (chartType === "line" || chartType === "radar") {
-			strXml += "<c:marker>";
-			strXml += "  <c:symbol val=\"" + opts.lineDataSymbol + "\"/>";
-			if (opts.lineDataSymbolSize) strXml += `<c:size val="${opts.lineDataSymbolSize}"/>`;
-			strXml += "  <c:spPr>";
-			{
-				const markerColor = paletteColor(chartColors, obj._dataIndex);
-				strXml += markerColor === "transparent" ? "<a:noFill/>" : genXmlColorSelection(markerColor);
-			}
-			strXml += `    <a:ln w="${opts.lineDataSymbolLineSize}" cap="flat">${chartColorLineFill(opts.lineDataSymbolLineColor || seriesColor)}<a:prstDash val="solid"/><a:round/></a:ln>`;
-			strXml += "    <a:effectLst/>";
-			strXml += "  </c:spPr>";
-			strXml += "</c:marker>";
-		}
-		{
-			const barVaryColors = (chartType === "bar" || chartType === "bar3D") && data.length === 1 && (opts.chartColors && opts.chartColors !== BARCHART_COLORS && opts.chartColors.length > 1 || opts.invertedColors?.length) ? opts.chartColors || BARCHART_COLORS : null;
-			strXml += makeSeriesDataPointsXml(chartType, obj, opts, barVaryColors);
-		}
-		if (chartType !== "radar") {
-			const lblColor = seriesOverride?.dataLabelColor ?? opts.dataLabelColor ?? "000000";
-			const lblBold = seriesOverride?.dataLabelFontBold ?? opts.dataLabelFontBold ?? false;
-			const lblItalic = seriesOverride?.dataLabelFontItalic ?? opts.dataLabelFontItalic ?? false;
-			const lblSize = seriesOverride?.dataLabelFontSize ?? opts.dataLabelFontSize ?? 12;
-			const lblFace = seriesOverride?.dataLabelFontFace ?? opts.dataLabelFontFace ?? "Arial";
-			const lblFmtCode = seriesOverride?.dataLabelFormatCode ?? opts.dataLabelFormatCode;
-			strXml += "<c:dLbls>";
-			if (obj.customLabels?.length) obj.customLabels.forEach((lbl, idx) => {
-				if (lbl) strXml += makeCustomDLblXml(idx, lbl, opts);
-			});
-			strXml += voidEl("c:numFmt", {
-				formatCode: (lblFmtCode ?? "") || "General",
-				sourceLinked: 0
-			});
-			if (opts.dataLabelBkgrdColors) strXml += `<c:spPr>${genXmlColorSelection(seriesColor)}</c:spPr>`;
-			strXml += "<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr>";
-			strXml += `<a:defRPr b="${lblBold ? 1 : 0}" i="${lblItalic ? 1 : 0}" strike="noStrike" sz="${ptToHundredths(lblSize)}" u="none">`;
-			strXml += genXmlColorSelection(lblColor);
-			strXml += createChartTextFonts(lblFace);
-			strXml += "</a:defRPr></a:pPr></a:p></c:txPr>";
-			if (opts.dataLabelPosition) strXml += voidEl("c:dLblPos", { val: opts.dataLabelPosition });
-			strXml += "<c:showLegendKey val=\"0\"/>";
-			strXml += `<c:showVal val="${opts.showValue ? "1" : "0"}"/>`;
-			strXml += `<c:showCatName val="0"/><c:showSerName val="${opts.showSerName ? "1" : "0"}"/><c:showPercent val="0"/><c:showBubbleSize val="0"/>`;
-			strXml += `<c:showLeaderLines val="${opts.showLeaderLines ? "1" : "0"}"/>`;
-			strXml += "</c:dLbls>";
-		}
-		if (chartType !== "radar") strXml += makeChartErrorBarsXml(chartType, obj.errorBars, obj);
-		strXml += "<c:cat>";
-		if (opts.catLabelFormatCode) {
-			strXml += "  <c:numRef>";
-			strXml += `    <c:f>Sheet1!$A$2:$A$${firstLabelGroup(obj).length + 1}</c:f>`;
-			strXml += "    <c:numCache>";
-			strXml += "      <c:formatCode>" + (opts.catLabelFormatCode || "General") + "</c:formatCode>";
-			strXml += `      <c:ptCount val="${firstLabelGroup(obj).length}"/>`;
-			firstLabelGroup(obj).forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-			strXml += "    </c:numCache>";
-			strXml += "  </c:numRef>";
-		} else if (dataLabels(obj).length === 1) {
-			strXml += "  <c:strRef>";
-			strXml += `    <c:f>Sheet1!$A$2:$A$${firstLabelGroup(obj).length + 1}</c:f>`;
-			strXml += "    <c:strCache>";
-			strXml += `      <c:ptCount val="${firstLabelGroup(obj).length}"/>`;
-			firstLabelGroup(obj).forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-			strXml += "    </c:strCache>";
-			strXml += "  </c:strRef>";
-		} else {
-			strXml += "  <c:multiLvlStrRef>";
-			strXml += `    <c:f>${sheetRangeRef(1, 2, dataLabels(obj).length, firstLabelGroup(obj).length + 1)}</c:f>`;
-			strXml += "    <c:multiLvlStrCache>";
-			strXml += `      <c:ptCount val="${firstLabelGroup(obj).length}"/>`;
-			dataLabels(obj).forEach((labelsGroup) => {
-				strXml += "<c:lvl>";
-				labelsGroup.forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-				strXml += "</c:lvl>";
-			});
-			strXml += "    </c:multiLvlStrCache>";
-			strXml += "  </c:multiLvlStrRef>";
-		}
-		strXml += "</c:cat>";
-		strXml += "<c:val>";
-		strXml += "  <c:numRef>";
-		strXml += `<c:f>${sheetRangeRef(obj._dataIndex + dataLabels(obj).length + 1, 2, obj._dataIndex + dataLabels(obj).length + 1, firstLabelGroup(obj).length + 1)}</c:f>`;
-		strXml += "    <c:numCache>";
-		strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
-		strXml += `      <c:ptCount val="${firstLabelGroup(obj).length}"/>`;
-		dataValues(obj).forEach((value, idx) => {
-			strXml += numCachePt(idx, value);
-		});
-		strXml += "    </c:numCache>";
-		strXml += "  </c:numRef>";
-		strXml += "</c:val>";
-		if (chartType === "line") strXml += "<c:smooth val=\"" + (opts.lineSmooth ? "1" : "0") + "\"/>";
-		strXml += "</c:ser>";
+		})),
+		raw(voidEl("a:prstDash", { val: "solid" })),
+		raw(voidEl("a:round"))
+	]);
+	return el("c:spPr", null, [
+		raw(fill),
+		raw(line),
+		raw(createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
 	});
-	strXml += chartDataLabels(opts, true);
-	if (chartType === "bar") {
-		strXml += `  <c:gapWidth val="${opts.barGapWidthPct}"/>`;
-		strXml += `  <c:overlap val="${opts.barOverlapPct != null ? opts.barOverlapPct : (opts.barGrouping || "").includes("tacked") ? 100 : 0}"/>`;
-		strXml += createSerLinesElement(opts.barSeriesLine);
-	} else if (chartType === "bar3D") {
-		strXml += `  <c:gapWidth val="${opts.barGapWidthPct}"/>`;
-		strXml += `  <c:gapDepth val="${opts.barGapDepthPct}"/>`;
-		strXml += "  <c:shape val=\"" + opts.bar3DShape + "\"/>";
-	} else if (chartType === "line") strXml += "  <c:marker val=\"1\"/>";
-	strXml += `<c:axId val="${catAxisId}"/><c:axId val="${valAxisId}"/>`;
-	if (chartType === "bar3D") strXml += `<c:axId val="${AXIS_ID_SERIES_PRIMARY}"/>`;
-	strXml += `</c:${chartType}Chart>`;
-	return strXml;
+}
+/**
+* The point marker for a line/radar series. `<c:marker>` must precede `<c:dLbls>` in CT_LineSer
+* (schema order: spPr → marker → dPt → dLbls).
+*/
+function serMarker(opts, markerColor, seriesColor) {
+	const spPr = el("c:spPr", null, [
+		raw(markerColor === "transparent" ? voidEl("a:noFill") : genXmlColorSelection(markerColor)),
+		raw(el("a:ln", {
+			w: opts.lineDataSymbolLineSize,
+			cap: "flat"
+		}, [
+			raw(chartColorLineFill(opts.lineDataSymbolLineColor || seriesColor)),
+			raw(voidEl("a:prstDash", { val: "solid" })),
+			raw(voidEl("a:round"))
+		], { openPrefix: "    " })),
+		raw(voidEl("a:effectLst", null, { openPrefix: "    " }))
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	return el("c:marker", null, [
+		raw(voidEl("c:symbol", { val: opts.lineDataSymbol }, { openPrefix: "  " })),
+		opts.lineDataSymbolSize ? raw(voidEl("c:size", { val: opts.lineDataSymbolSize })) : null,
+		raw(spPr)
+	]);
+}
+/** Per-series `<c:dLbls>`: number format, an optional label background, text style, show flags. */
+function serDataLabels(obj, opts, seriesColor) {
+	const over = opts.seriesOptions?.[obj._dataIndex];
+	const defRPr = el("a:defRPr", {
+		b: over?.dataLabelFontBold ?? opts.dataLabelFontBold ?? false ? 1 : 0,
+		i: over?.dataLabelFontItalic ?? opts.dataLabelFontItalic ?? false ? 1 : 0,
+		strike: "noStrike",
+		sz: ptToHundredths(over?.dataLabelFontSize ?? opts.dataLabelFontSize ?? 12),
+		u: "none"
+	}, [raw(genXmlColorSelection(over?.dataLabelColor ?? opts.dataLabelColor ?? "000000")), raw(createChartTextFonts(over?.dataLabelFontFace ?? opts.dataLabelFontFace ?? "Arial"))]);
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr")),
+		raw(voidEl("a:lstStyle")),
+		raw(el("a:p", null, raw(el("a:pPr", null, raw(defRPr)))))
+	]);
+	const lblFmtCode = over?.dataLabelFormatCode ?? opts.dataLabelFormatCode;
+	return el("c:dLbls", null, [
+		raw((obj.customLabels ?? []).map((lbl, idx) => lbl ? makeCustomDLblXml(idx, lbl, opts) : "").join("")),
+		raw(voidEl("c:numFmt", {
+			formatCode: (lblFmtCode ?? "") || "General",
+			sourceLinked: 0
+		})),
+		opts.dataLabelBkgrdColors ? raw(el("c:spPr", null, raw(genXmlColorSelection(seriesColor)))) : null,
+		raw(txPr),
+		opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 })),
+		raw(voidEl("c:showVal", { val: opts.showValue ? 1 : 0 })),
+		raw(voidEl("c:showCatName", { val: 0 })),
+		raw(voidEl("c:showSerName", { val: opts.showSerName ? 1 : 0 })),
+		raw(voidEl("c:showPercent", { val: 0 })),
+		raw(voidEl("c:showBubbleSize", { val: 0 })),
+		raw(voidEl("c:showLeaderLines", { val: opts.showLeaderLines ? 1 : 0 }))
+	]);
+}
+/**
+* The `<c:cat>` category reference. Numeric (date) categories and single-level text ones are
+* {@link catRefBlock}; multi-level labels nest a `<c:lvl>` per group, which is a different shape
+* rather than a different spelling of the same one.
+*/
+function serCategories(obj, opts) {
+	const groups = dataLabels(obj);
+	const cats = firstLabelGroup(obj);
+	const catRef = `Sheet1!$A$2:$A$${cats.length + 1}`;
+	if (opts.catLabelFormatCode) return el("c:cat", null, raw(catRefBlock("num", catRef, cats, opts.catLabelFormatCode || "General", "indented")));
+	if (groups.length === 1) return el("c:cat", null, raw(catRefBlock("str", catRef, cats, void 0, "indented")));
+	const lvls = groups.map((labelsGroup) => el("c:lvl", null, raw(labelsGroup.map((label, idx) => el("c:pt", { idx }, raw(el("c:v", null, label)))).join("")))).join("");
+	const cache = el("c:multiLvlStrCache", null, [raw(voidEl("c:ptCount", { val: cats.length }, { openPrefix: "      " })), raw(lvls)], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const ref = el("c:multiLvlStrRef", null, [raw(el("c:f", null, sheetRangeRef(1, 2, groups.length, cats.length + 1), { openPrefix: "    " })), raw(cache)], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	return el("c:cat", null, raw(ref));
+}
+/** The `<c:val>` numeric cache: the series' own sheet column, one point per category. */
+function serValues(obj, valFmtCode) {
+	const valCol = obj._dataIndex + dataLabels(obj).length + 1;
+	const catCount = firstLabelGroup(obj).length;
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, valFmtCode, { openPrefix: "      " })),
+		raw(voidEl("c:ptCount", { val: catCount }, { openPrefix: "      " })),
+		raw(dataValues(obj).map((value, idx) => numCachePt(idx, value)).join(""))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, sheetRangeRef(valCol, 2, valCol, catCount + 1))), raw(numCache)], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	return el("c:val", null, raw(numRef));
+}
+/**
+* Plot a category-axis chart family (area / bar / bar3d / line / radar) into a
+* `<c:xxxChart>` element. These share the grouping / series / cat+val axis structure.
+*/
+function makeCatAxisPlot(chartType, data, opts, valAxisId, catAxisId, valFmtCode) {
+	const chartColors = resolveChartPalette(opts);
+	const barVaryColors = isBarLike(chartType) && data.length === 1 && (opts.chartColors && opts.chartColors !== BARCHART_COLORS && opts.chartColors.length > 1 || opts.invertedColors?.length) ? opts.chartColors || BARCHART_COLORS : null;
+	const sers = data.map((obj, serIndex) => {
+		const seriesOverride = opts.seriesOptions?.[obj._dataIndex];
+		const seriesColor = seriesOverride?.color ?? paletteColor(chartColors, serIndex);
+		return el("c:ser", null, [
+			raw(voidEl("c:idx", { val: obj._dataIndex }, { openPrefix: "  " })),
+			raw(voidEl("c:order", { val: obj._dataIndex })),
+			raw(strRefBlock(sheetCellRef(obj._dataIndex + dataLabels(obj).length + 1, 1), obj.name ?? "")),
+			raw(serShapeProps(chartType, opts, seriesColor, seriesOverride?.lineSize, serIndex)),
+			isBarLike(chartType) ? raw(voidEl("c:invertIfNegative", { val: 0 }, { openPrefix: "  " })) : null,
+			isLineLike(chartType) ? raw(serMarker(opts, paletteColor(chartColors, obj._dataIndex), seriesColor)) : null,
+			raw(makeSeriesDataPointsXml(chartType, obj, opts, barVaryColors)),
+			chartType === "radar" ? null : raw(serDataLabels(obj, opts, seriesColor)),
+			chartType === "radar" ? null : raw(makeChartErrorBarsXml(chartType, obj.errorBars, obj)),
+			raw(serCategories(obj, opts)),
+			raw(serValues(obj, valFmtCode)),
+			chartType === "line" ? raw(voidEl("c:smooth", { val: opts.lineSmooth ? 1 : 0 })) : null
+		]);
+	}).join("");
+	let plotOptions = "";
+	if (chartType === "bar") plotOptions = voidEl("c:gapWidth", { val: opts.barGapWidthPct }, { openPrefix: "  " }) + voidEl("c:overlap", { val: opts.barOverlapPct ?? ((opts.barGrouping || "").includes("tacked") ? 100 : 0) }, { openPrefix: "  " }) + createSerLinesElement(opts.barSeriesLine);
+	else if (chartType === "bar3D") plotOptions = voidEl("c:gapWidth", { val: opts.barGapWidthPct }, { openPrefix: "  " }) + voidEl("c:gapDepth", { val: opts.barGapDepthPct }, { openPrefix: "  " }) + voidEl("c:shape", { val: opts.bar3DShape }, { openPrefix: "  " });
+	else if (chartType === "line") plotOptions = voidEl("c:marker", { val: 1 }, { openPrefix: "  " });
+	return el(`c:${chartType}Chart`, null, [
+		raw(plotGrouping(chartType, opts)),
+		raw(voidEl("c:varyColors", { val: 0 })),
+		raw(sers),
+		raw(chartDataLabels(opts, true)),
+		raw(plotOptions),
+		raw(voidEl("c:axId", { val: catAxisId })),
+		raw(voidEl("c:axId", { val: valAxisId })),
+		chartType === "bar3D" ? raw(voidEl("c:axId", { val: AXIS_ID_SERIES_PRIMARY })) : null
+	]);
 }
 //#endregion
 //#region src/gen/chart/plot-scatter.ts
+/** The font attributes a scatter label's `<a:defRPr>` and `<a:rPr>` both carry, in schema order. */
+function labelFontAttrs(opts) {
+	return {
+		sz: ptToHundredths(opts.dataLabelFontSize || 12),
+		b: opts.dataLabelFontBold ? 1 : 0,
+		i: opts.dataLabelFontItalic ? 1 : 0,
+		u: "none",
+		strike: "noStrike"
+	};
+}
+/** The colour and typeface children of those run properties; `indent` is theirs, not the parent's. */
+function labelFontChildren(opts, indent) {
+	return [raw(indent + el("a:solidFill", null, raw(createColorElement(opts.dataLabelColor || "000000")))), raw(indent + createChartTextFonts(opts.dataLabelFontFace || "Arial"))];
+}
+/**
+* The `(x, y)` runs appended to a `customXY` label: a literal `" ("`, an `XVALUE` field, a
+* `", "`, a `YVALUE` field and a `")"`.
+*
+* Each `<a:fld>` id is minted per build. A field id has to be unique, which is a property a
+* derived id would have to reproduce without an oracle for how far that uniqueness has to
+* reach — so the ids stay random and the *comparison* gives: `NORMALIZERS` in
+* `scripts/pptx-parts.mjs` erases exactly these two field types before the byte-identity gate
+* diffs a part. Do not "fix" the nondeterminism here.
+*/
+function customXYRuns(obj, opts) {
+	const lang = opts.lang || "en-US";
+	const literal = (text) => el("a:r", null, [raw(voidEl("a:rPr", {
+		lang,
+		baseline: 0,
+		dirty: 0
+	}, { openPrefix: "                  " })), raw(el("a:t", null, text, { openPrefix: "                  " }))], {
+		openPrefix: "              ",
+		closePrefix: "              "
+	});
+	const field = (type, text) => el("a:fld", {
+		id: `{${getUuid("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")}}`,
+		type
+	}, [
+		raw(voidEl("a:rPr", {
+			lang,
+			baseline: 0
+		}, { openPrefix: "                  " })),
+		raw(el("a:pPr", null, raw(voidEl("a:defRPr", null, { openPrefix: "                      " })), {
+			openPrefix: "                  ",
+			closePrefix: "                  "
+		})),
+		raw("                  " + el("a:t", null, text))
+	], {
+		openPrefix: "              ",
+		closePrefix: "              "
+	});
+	return literal(" (") + field("XVALUE", "[" + (obj.name ?? "")) + literal(", ") + field("YVALUE", "[" + (obj.name ?? "") + "]") + literal(")") + voidEl("a:endParaRPr", {
+		lang,
+		dirty: 0
+	}, { openPrefix: "              " });
+}
+/**
+* One per-point `<c:dLbl>` for the `custom` / `customXY` label formats: rich text carrying the
+* caller's label, optionally followed by the X/Y value fields.
+*/
+function scatterCustomLabel(obj, opts, label, idx, chartUuid) {
+	const rich = el("c:rich", null, [
+		raw(el("a:bodyPr", null, raw(voidEl("a:spAutoFit", null, { openPrefix: "                " })), {
+			openPrefix: "            ",
+			closePrefix: "            "
+		})),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "            " })),
+		raw(el("a:p", null, [
+			raw(el("a:pPr", null, raw(el("a:defRPr", labelFontAttrs(opts), labelFontChildren(opts, "                        "), {
+				openPrefix: "                    ",
+				closePrefix: "                    "
+			})), {
+				openPrefix: "                ",
+				closePrefix: "                "
+			})),
+			raw(el("a:r", null, [raw(el("a:rPr", {
+				lang: opts.lang || "en-US",
+				...labelFontAttrs(opts),
+				dirty: 0
+			}, labelFontChildren(opts, "                        "), {
+				openPrefix: "                    ",
+				closePrefix: "                    "
+			})), raw("                    " + el("a:t", null, label))], {
+				openPrefix: "              ",
+				closePrefix: "              "
+			})),
+			opts.dataLabelFormatScatter === "customXY" && !/^ *$/.test(label) ? raw(customXYRuns(obj, opts)) : null
+		], {
+			openPrefix: "            ",
+			closePrefix: "            "
+		}))
+	], {
+		openPrefix: "      ",
+		closePrefix: "      "
+	});
+	const spPr = el("c:spPr", null, [
+		raw(voidEl("a:noFill", null, { openPrefix: "        " })),
+		raw(el("a:ln", null, raw(voidEl("a:noFill", null, { openPrefix: "            " })), {
+			openPrefix: "        ",
+			closePrefix: "        "
+		})),
+		raw(voidEl("a:effectLst", null, { openPrefix: "        " }))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const extLst = el("c:extLst", null, [raw(voidEl("c:ext", {
+		uri: "{CE6537A1-D6FC-4f65-9D91-7224C49458BB}",
+		"xmlns:c15": "http://schemas.microsoft.com/office/drawing/2012/chart"
+	}, { openPrefix: "      " })), raw(el("c:ext", {
+		uri: "{C3380CC4-5D6E-409C-BE32-E72D297353CC}",
+		"xmlns:c16": "http://schemas.microsoft.com/office/drawing/2014/chart"
+	}, raw(voidEl("c16:uniqueId", { val: `{${String(idx + 1).padStart(8, "0")}${chartUuid}}` }, { openPrefix: "            " })), {
+		openPrefix: "      ",
+		closePrefix: "      "
+	}))], {
+		openPrefix: "    ",
+		closePrefix: "        "
+	});
+	return el("c:dLbl", null, [
+		raw(voidEl("c:idx", { val: idx }, { openPrefix: "    " })),
+		raw(el("c:tx", null, raw(rich), {
+			openPrefix: "    ",
+			closePrefix: "    "
+		})),
+		raw(spPr),
+		opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition }, { openPrefix: " " })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showVal", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showCatName", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showSerName", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showPercent", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showLeaderLines", { val: 1 }, { openPrefix: "       " })),
+		raw(extLst)
+	], { openPrefix: "  " });
+}
+/** The single chart-level `<c:dLbls>` of the `XY` label format: PowerPoint composes the text. */
+function scatterXYLabels(opts) {
+	const spPr = el("c:spPr", null, [
+		raw(voidEl("a:noFill", null, { openPrefix: "        " })),
+		raw(el("a:ln", null, raw(voidEl("a:noFill", null, { openPrefix: "            " })), {
+			openPrefix: "        ",
+			closePrefix: "        "
+		})),
+		raw(voidEl("a:effectLst", null, { openPrefix: "          " }))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const txPr = el("c:txPr", null, [
+		raw(el("a:bodyPr", null, raw(voidEl("a:spAutoFit", null, { openPrefix: "            " })), {
+			openPrefix: "        ",
+			closePrefix: "        "
+		})),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "        " })),
+		raw(el("a:p", null, [raw(el("a:pPr", null, raw(el("a:defRPr", labelFontAttrs(opts), labelFontChildren(opts, "                    "), {
+			openPrefix: "                ",
+			closePrefix: "                "
+		})), {
+			openPrefix: "            ",
+			closePrefix: "            "
+		})), raw(voidEl("a:endParaRPr", { lang: opts.lang || "en-US" }, { openPrefix: "            " }))], {
+			openPrefix: "        ",
+			closePrefix: "        "
+		}))
+	], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const extLst = el("c:extLst", null, raw(el("c:ext", {
+		uri: "{CE6537A1-D6FC-4f65-9D91-7224C49458BB}",
+		"xmlns:c15": "http://schemas.microsoft.com/office/drawing/2012/chart"
+	}, raw(voidEl("c15:showLeaderLines", { val: 1 }, { openPrefix: "            " })), {
+		openPrefix: "        ",
+		closePrefix: "        "
+	})), {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	return el("c:dLbls", null, [
+		raw(spPr),
+		raw(txPr),
+		opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition }, { openPrefix: " " })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showVal", { val: opts.showLabel ? 1 : 0 }, { openPrefix: " " })),
+		raw(voidEl("c:showCatName", { val: opts.showLabel ? 1 : 0 }, { openPrefix: " " })),
+		raw(voidEl("c:showSerName", { val: opts.showSerName ? 1 : 0 }, { openPrefix: " " })),
+		raw(voidEl("c:showPercent", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }, { openPrefix: "    " })),
+		raw(extLst)
+	]);
+}
+/** Fill, outline and shadow for one scatter series. */
+function scatterSerShapeProps(opts, serColor, serIndex) {
+	const fill = serColor === "transparent" ? voidEl("a:noFill") : opts.chartColorsOpacity ? el("a:solidFill", null, raw(createColorElement(serColor, voidEl("a:alpha", { val: Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT) })))) : genXmlColorSelection(serColor);
+	const line = opts.lineSize === 0 ? el("a:ln", null, raw(voidEl("a:noFill"))) : el("a:ln", {
+		w: ptsToEmuLenient(opts.lineSize ?? 2),
+		cap: createLineCap(opts.lineCap)
+	}, [
+		raw(chartColorLineFill(serColor)),
+		raw(voidEl("a:prstDash", { val: opts.lineDashValues?.[serIndex] ?? opts.lineDash ?? "solid" })),
+		raw(voidEl("a:round"))
+	]);
+	return el("c:spPr", null, [
+		raw(fill),
+		raw(line),
+		raw(createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+}
+/** The point marker: symbol, optional size, and its own fill and outline. */
+function scatterMarker(opts, markerColor) {
+	const spPr = el("c:spPr", null, [
+		raw(markerColor === "transparent" ? voidEl("a:noFill") : genXmlColorSelection(markerColor)),
+		raw(el("a:ln", {
+			w: opts.lineDataSymbolLineSize,
+			cap: "flat"
+		}, [
+			raw(chartColorLineFill(opts.lineDataSymbolLineColor || markerColor)),
+			raw(voidEl("a:prstDash", { val: "solid" })),
+			raw(voidEl("a:round"))
+		])),
+		raw(voidEl("a:effectLst"))
+	]);
+	return el("c:marker", null, [
+		raw(voidEl("c:symbol", { val: opts.lineDataSymbol }, { openPrefix: "  " })),
+		opts.lineDataSymbolSize ? raw(voidEl("c:size", { val: opts.lineDataSymbolSize })) : null,
+		raw(spPr)
+	]);
+}
 /**
 * Plot an XY scatter chart into `<c:scatterChart>` (paired X/Y numeric series).
 */
 function makeScatterPlot(chartType, data, opts, valAxisId, catAxisId, valFmtCode) {
-	let colorIndex = -1;
-	let strXml = "";
-	strXml += "<c:" + chartType + "Chart>";
-	strXml += "<c:scatterStyle val=\"lineMarker\"/>";
-	strXml += "<c:varyColors val=\"0\"/>";
-	colorIndex = -1;
-	data.filter((_obj, idx) => idx > 0).forEach((obj, idx) => {
-		colorIndex++;
-		const chartColors = resolveChartPalette(opts);
-		strXml += "<c:ser>";
-		strXml += `  <c:idx val="${idx}"/>`;
-		strXml += `  <c:order val="${idx}"/>`;
-		strXml += "  <c:tx>";
-		strXml += "    <c:strRef>";
-		strXml += `      <c:f>${sheetCellRef(idx + 2, 1)}</c:f>`;
-		strXml += "      <c:strCache><c:ptCount val=\"1\"/><c:pt idx=\"0\">" + el("c:v", null, obj.name ?? "") + "</c:pt></c:strCache>";
-		strXml += "    </c:strRef>";
-		strXml += "  </c:tx>";
-		strXml += "  <c:spPr>";
-		{
-			const tmpSerColor = paletteColor(chartColors, colorIndex);
-			if (tmpSerColor === "transparent") strXml += "<a:noFill/>";
-			else if (opts.chartColorsOpacity) strXml += "<a:solidFill>" + createColorElement(tmpSerColor, "<a:alpha val=\"" + Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT).toString() + "\"/>") + "</a:solidFill>";
-			else strXml += genXmlColorSelection(tmpSerColor);
-			if (opts.lineSize === 0) strXml += "<a:ln><a:noFill/></a:ln>";
-			else {
-				strXml += `<a:ln w="${ptsToEmuLenient(opts.lineSize ?? 2)}" cap="${createLineCap(opts.lineCap)}">${chartColorLineFill(tmpSerColor)}`;
-				strXml += voidEl("a:prstDash", { val: opts.lineDashValues?.[colorIndex] ?? opts.lineDash ?? "solid" }) + voidEl("a:round") + "</a:ln>";
-			}
-			strXml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-		}
-		strXml += "  </c:spPr>";
-		strXml += "<c:marker>";
-		strXml += "  <c:symbol val=\"" + opts.lineDataSymbol + "\"/>";
-		if (opts.lineDataSymbolSize) strXml += `<c:size val="${opts.lineDataSymbolSize}"/>`;
-		strXml += "<c:spPr>";
-		{
-			const markerColor = paletteColor(chartColors, idx);
-			strXml += markerColor === "transparent" ? "<a:noFill/>" : genXmlColorSelection(markerColor);
-		}
-		strXml += `<a:ln w="${opts.lineDataSymbolLineSize}" cap="flat">${chartColorLineFill(opts.lineDataSymbolLineColor || paletteColor(chartColors, colorIndex))}<a:prstDash val="solid"/><a:round/></a:ln>`;
-		strXml += "<a:effectLst/>";
-		strXml += "</c:spPr>";
-		strXml += "</c:marker>";
-		{
-			const scatterVaryColors = data.length === 1 && opts.chartColors !== BARCHART_COLORS ? opts.chartColors || BARCHART_COLORS : null;
-			strXml += makeSeriesDataPointsXml(chartType, obj, opts, scatterVaryColors);
-		}
+	const chartColors = resolveChartPalette(opts);
+	const xValues = dataValues(data[0]);
+	const scatterVaryColors = data.length === 1 && opts.chartColors !== BARCHART_COLORS ? opts.chartColors || BARCHART_COLORS : null;
+	const sers = data.slice(1).map((obj, idx) => {
+		const serColor = paletteColor(chartColors, idx);
+		const yValues = dataValues(obj);
+		const values = numRefBlock("c:xVal", `Sheet1!$A$2:$A$${xValues.length + 1}`, valFmtCode, xValues) + numRefBlock("c:yVal", sheetRangeRef(idx + 2, 2, idx + 2, xValues.length + 1), valFmtCode, xValues.map((_value, i) => yValues[i]));
+		let labels = "";
 		if (opts.showLabel) {
 			const chartUuid = getUuid("-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-			if (dataLabels(obj)[0] && (opts.dataLabelFormatScatter === "custom" || opts.dataLabelFormatScatter === "customXY")) {
-				strXml += "<c:dLbls>";
-				firstLabelGroup(obj).forEach((label, idx) => {
-					if (opts.dataLabelFormatScatter === "custom" || opts.dataLabelFormatScatter === "customXY") {
-						strXml += "  <c:dLbl>";
-						strXml += `    <c:idx val="${idx}"/>`;
-						strXml += "    <c:tx>";
-						strXml += "      <c:rich>";
-						strXml += "            <a:bodyPr>";
-						strXml += "                <a:spAutoFit/>";
-						strXml += "            </a:bodyPr>";
-						strXml += "            <a:lstStyle/>";
-						strXml += "            <a:p>";
-						strXml += "                <a:pPr>";
-						strXml += `                    <a:defRPr sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
-						strXml += "                        <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-						strXml += "                        " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-						strXml += "                    </a:defRPr>";
-						strXml += "                </a:pPr>";
-						strXml += "              <a:r>";
-						strXml += `                    <a:rPr lang="${encodeXmlEntities(opts.lang || "en-US")}" sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike" dirty="0">`;
-						strXml += "                        <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-						strXml += "                        " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-						strXml += "                    </a:rPr>";
-						strXml += "                    " + el("a:t", null, label);
-						strXml += "              </a:r>";
-						if (opts.dataLabelFormatScatter === "customXY" && !/^ *$/.test(label)) {
-							strXml += "              <a:r>";
-							strXml += "                  <a:rPr lang=\"" + (opts.lang || "en-US") + "\" baseline=\"0\" dirty=\"0\"/>";
-							strXml += "                  <a:t> (</a:t>";
-							strXml += "              </a:r>";
-							strXml += "              <a:fld id=\"{" + getUuid("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx") + "}\" type=\"XVALUE\">";
-							strXml += "                  <a:rPr lang=\"" + (opts.lang || "en-US") + "\" baseline=\"0\"/>";
-							strXml += "                  <a:pPr>";
-							strXml += "                      <a:defRPr/>";
-							strXml += "                  </a:pPr>";
-							strXml += "                  " + el("a:t", null, "[" + (obj.name ?? ""));
-							strXml += "              </a:fld>";
-							strXml += "              <a:r>";
-							strXml += "                  <a:rPr lang=\"" + (opts.lang || "en-US") + "\" baseline=\"0\" dirty=\"0\"/>";
-							strXml += "                  <a:t>, </a:t>";
-							strXml += "              </a:r>";
-							strXml += "              <a:fld id=\"{" + getUuid("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx") + "}\" type=\"YVALUE\">";
-							strXml += "                  <a:rPr lang=\"" + (opts.lang || "en-US") + "\" baseline=\"0\"/>";
-							strXml += "                  <a:pPr>";
-							strXml += "                      <a:defRPr/>";
-							strXml += "                  </a:pPr>";
-							strXml += "                  " + el("a:t", null, "[" + (obj.name ?? "") + "]");
-							strXml += "              </a:fld>";
-							strXml += "              <a:r>";
-							strXml += "                  <a:rPr lang=\"" + (opts.lang || "en-US") + "\" baseline=\"0\" dirty=\"0\"/>";
-							strXml += "                  <a:t>)</a:t>";
-							strXml += "              </a:r>";
-							strXml += "              <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\" dirty=\"0\"/>";
-						}
-						strXml += "            </a:p>";
-						strXml += "      </c:rich>";
-						strXml += "    </c:tx>";
-						strXml += "    <c:spPr>";
-						strXml += "        <a:noFill/>";
-						strXml += "        <a:ln>";
-						strXml += "            <a:noFill/>";
-						strXml += "        </a:ln>";
-						strXml += "        <a:effectLst/>";
-						strXml += "    </c:spPr>";
-						if (opts.dataLabelPosition) strXml += " <c:dLblPos val=\"" + opts.dataLabelPosition + "\"/>";
-						strXml += "    <c:showLegendKey val=\"0\"/>";
-						strXml += "    <c:showVal val=\"0\"/>";
-						strXml += "    <c:showCatName val=\"0\"/>";
-						strXml += "    <c:showSerName val=\"0\"/>";
-						strXml += "    <c:showPercent val=\"0\"/>";
-						strXml += "    <c:showBubbleSize val=\"0\"/>";
-						strXml += "       <c:showLeaderLines val=\"1\"/>";
-						strXml += "    <c:extLst>";
-						strXml += "      <c:ext uri=\"{CE6537A1-D6FC-4f65-9D91-7224C49458BB}\" xmlns:c15=\"http://schemas.microsoft.com/office/drawing/2012/chart\"/>";
-						strXml += "      <c:ext uri=\"{C3380CC4-5D6E-409C-BE32-E72D297353CC}\" xmlns:c16=\"http://schemas.microsoft.com/office/drawing/2014/chart\">";
-						strXml += `            <c16:uniqueId val="{${String(idx + 1).padStart(8, "0")}${chartUuid}}"/>`;
-						strXml += "      </c:ext>";
-						strXml += "        </c:extLst>";
-						strXml += "</c:dLbl>";
-					}
-				});
-				strXml += "</c:dLbls>";
-			}
-			if (opts.dataLabelFormatScatter === "XY") {
-				strXml += "<c:dLbls>";
-				strXml += "    <c:spPr>";
-				strXml += "        <a:noFill/>";
-				strXml += "        <a:ln>";
-				strXml += "            <a:noFill/>";
-				strXml += "        </a:ln>";
-				strXml += "          <a:effectLst/>";
-				strXml += "    </c:spPr>";
-				strXml += "    <c:txPr>";
-				strXml += "        <a:bodyPr>";
-				strXml += "            <a:spAutoFit/>";
-				strXml += "        </a:bodyPr>";
-				strXml += "        <a:lstStyle/>";
-				strXml += "        <a:p>";
-				strXml += "            <a:pPr>";
-				strXml += `                <a:defRPr sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
-				strXml += "                    <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-				strXml += "                    " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-				strXml += "                </a:defRPr>";
-				strXml += "            </a:pPr>";
-				strXml += `            <a:endParaRPr lang="${encodeXmlEntities(opts.lang || "en-US")}"/>`;
-				strXml += "        </a:p>";
-				strXml += "    </c:txPr>";
-				if (opts.dataLabelPosition) strXml += " <c:dLblPos val=\"" + opts.dataLabelPosition + "\"/>";
-				strXml += "    <c:showLegendKey val=\"0\"/>";
-				strXml += ` <c:showVal val="${opts.showLabel ? "1" : "0"}"/>`;
-				strXml += ` <c:showCatName val="${opts.showLabel ? "1" : "0"}"/>`;
-				strXml += ` <c:showSerName val="${opts.showSerName ? "1" : "0"}"/>`;
-				strXml += "    <c:showPercent val=\"0\"/>";
-				strXml += "    <c:showBubbleSize val=\"0\"/>";
-				strXml += "    <c:extLst>";
-				strXml += "        <c:ext uri=\"{CE6537A1-D6FC-4f65-9D91-7224C49458BB}\" xmlns:c15=\"http://schemas.microsoft.com/office/drawing/2012/chart\">";
-				strXml += "            <c15:showLeaderLines val=\"1\"/>";
-				strXml += "        </c:ext>";
-				strXml += "    </c:extLst>";
-				strXml += "</c:dLbls>";
-			}
-		}
-		strXml += makeChartErrorBarsXml(chartType, obj.errorBars, obj);
-		{
-			const xValues = dataValues(data[0]);
-			const yValues = dataValues(obj);
-			strXml += numRefBlock("c:xVal", `Sheet1!$A$2:$A$${xValues.length + 1}`, valFmtCode, xValues);
-			strXml += numRefBlock("c:yVal", sheetRangeRef(idx + 2, 2, idx + 2, xValues.length + 1), valFmtCode, xValues.map((_value, i) => yValues[i]));
+			const isCustom = opts.dataLabelFormatScatter === "custom" || opts.dataLabelFormatScatter === "customXY";
+			if (dataLabels(obj)[0] && isCustom) labels += el("c:dLbls", null, raw(firstLabelGroup(obj).map((label, pointIdx) => scatterCustomLabel(obj, opts, label, pointIdx, chartUuid)).join("")));
+			if (opts.dataLabelFormatScatter === "XY") labels += scatterXYLabels(opts);
 		}
-		strXml += "<c:smooth val=\"" + (opts.lineSmooth ? "1" : "0") + "\"/>";
-		strXml += "</c:ser>";
+		return el("c:ser", null, [
+			raw(voidEl("c:idx", { val: idx }, { openPrefix: "  " })),
+			raw(voidEl("c:order", { val: idx }, { openPrefix: "  " })),
+			raw(strRefBlock(sheetCellRef(idx + 2, 1), obj.name ?? "")),
+			raw(scatterSerShapeProps(opts, serColor, idx)),
+			raw(scatterMarker(opts, serColor)),
+			raw(makeSeriesDataPointsXml(chartType, obj, opts, scatterVaryColors)),
+			raw(labels),
+			raw(makeChartErrorBarsXml(chartType, obj.errorBars, obj)),
+			raw(values),
+			raw(voidEl("c:smooth", { val: opts.lineSmooth ? 1 : 0 }))
+		]);
+	}).join("");
+	return el(`c:${chartType}Chart`, null, [
+		raw(voidEl("c:scatterStyle", { val: "lineMarker" })),
+		raw(voidEl("c:varyColors", { val: 0 })),
+		raw(sers),
+		raw(chartDataLabels(opts, false)),
+		raw(voidEl("c:axId", { val: catAxisId })),
+		raw(voidEl("c:axId", { val: valAxisId }))
+	]);
+}
+//#endregion
+//#region src/gen/chart/plot-bubble.ts
+/** Fill + outline + shadow for one bubble series, from the palette colour and the line options. */
+function bubbleSerShapeProps(opts, serColor, serIndex) {
+	const fill = serColor === "transparent" ? voidEl("a:noFill") : opts.chartColorsOpacity ? el("a:solidFill", null, raw(createColorElement(serColor, voidEl("a:alpha", { val: Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT) })))) : genXmlColorSelection(serColor);
+	const line = opts.lineSize === 0 ? el("a:ln", null, raw(voidEl("a:noFill"))) : opts.dataBorder ? el("a:ln", {
+		w: ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75)),
+		cap: "flat"
+	}, [
+		raw(genXmlColorSelection({
+			color: opts.dataBorder.color ?? "363636",
+			transparency: opts.dataBorder.transparency
+		})),
+		raw(voidEl("a:prstDash", { val: "solid" })),
+		raw(voidEl("a:round"))
+	]) : el("a:ln", {
+		w: ptsToEmuLenient(opts.lineSize ?? 2),
+		cap: "flat"
+	}, [
+		raw(genXmlColorSelection(serColor)),
+		raw(voidEl("a:prstDash", { val: opts.lineDashValues?.[serIndex] ?? opts.lineDash ?? "solid" })),
+		raw(voidEl("a:round"))
+	]);
+	return el("c:spPr", null, [
+		raw(fill),
+		raw(line),
+		raw(createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))
+	]);
+}
+/**
+* The `<c:bubbleSize>` cache: the per-point sizes that scale each bubble. Its own block rather
+* than {@link numRefBlock} because the wrapping tag differs and so does the indentation — the
+* `<c:ptCount>` here sits three spaces further in than anything around it.
+*/
+function bubbleSizeBlock(obj, ref) {
+	const sizes = dataSizes(obj);
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, "General", { openPrefix: "        " })),
+		raw(voidEl("c:ptCount", { val: sizes.length }, { openPrefix: "           " })),
+		raw(sizes.map((value, idx) => numCachePt(idx, value)).join(""))
+	], {
+		openPrefix: "      ",
+		closePrefix: "      "
 	});
-	strXml += chartDataLabels(opts, false);
-	strXml += `<c:axId val="${catAxisId}"/><c:axId val="${valAxisId}"/>`;
-	strXml += "</c:" + chartType + "Chart>";
-	return strXml;
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, ref)), raw(numCache)], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	return el("c:bubbleSize", null, raw(numRef), {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+}
+/** The shared `<c:dLbls>` block: number format, label text style, and which parts are shown. */
+function bubbleDataLabels(opts) {
+	const defRPr = el("a:defRPr", {
+		b: opts.dataLabelFontBold ? 1 : 0,
+		i: opts.dataLabelFontItalic ? 1 : 0,
+		strike: "noStrike",
+		sz: ptToHundredths(opts.dataLabelFontSize || 12),
+		u: "none"
+	}, [raw(genXmlColorSelection(opts.dataLabelColor || "000000")), raw(createChartTextFonts(opts.dataLabelFontFace || "Arial"))]);
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr")),
+		raw(voidEl("a:lstStyle")),
+		raw(el("a:p", null, raw(el("a:pPr", null, raw(defRPr)))))
+	]);
+	const extLst = el("c:extLst", null, raw(el("c:ext", {
+		uri: "{CE6537A1-D6FC-4f65-9D91-7224C49458BB}",
+		"xmlns:c15": "http://schemas.microsoft.com/office/drawing/2012/chart"
+	}, raw(voidEl("c15:showLeaderLines", { val: opts.showLeaderLines ? 1 : 0 }, { openPrefix: "    " })), {
+		openPrefix: "  ",
+		closePrefix: "  "
+	})));
+	return el("c:dLbls", null, [
+		raw(voidEl("c:numFmt", {
+			formatCode: (opts.dataLabelFormatCode ?? "") || "General",
+			sourceLinked: 0
+		})),
+		raw(txPr),
+		opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 })),
+		raw(voidEl("c:showVal", { val: opts.showValue ? 1 : 0 })),
+		raw(voidEl("c:showCatName", { val: 0 })),
+		raw(voidEl("c:showSerName", { val: opts.showSerName ? 1 : 0 })),
+		raw(voidEl("c:showPercent", { val: 0 })),
+		raw(voidEl("c:showBubbleSize", { val: opts.showBubbleSize ? 1 : 0 })),
+		raw(extLst)
+	]);
 }
-//#endregion
-//#region src/gen/chart/plot-bubble.ts
 /**
 * Plot a bubble / bubble3d chart into `<c:bubbleChart>` (X/Y plus per-point size).
 */
 function makeBubblePlot(chartType, data, opts, valAxisId, catAxisId, valFmtCode) {
-	let colorIndex = -1;
+	const chartColors = resolveChartPalette(opts);
+	const xValues = dataValues(data[0]);
 	let idxColLtr = 1;
-	let strXml = "";
-	strXml += "<c:bubbleChart>";
-	strXml += "<c:varyColors val=\"0\"/>";
-	colorIndex = -1;
-	data.filter((_obj, idx) => idx > 0).forEach((obj, idx) => {
-		colorIndex++;
-		strXml += "<c:ser>";
-		strXml += `  <c:idx val="${idx}"/>`;
-		strXml += `  <c:order val="${idx}"/>`;
-		strXml += "  <c:tx>";
-		strXml += "    <c:strRef>";
-		strXml += `      <c:f>${sheetCellRef(idxColLtr + 1, 1)}</c:f>`;
-		strXml += "      <c:strCache><c:ptCount val=\"1\"/><c:pt idx=\"0\">" + el("c:v", null, obj.name ?? "") + "</c:pt></c:strCache>";
-		strXml += "    </c:strRef>";
-		strXml += "  </c:tx>";
-		{
-			strXml += "<c:spPr>";
-			const tmpSerColor = paletteColor(resolveChartPalette(opts), colorIndex);
-			if (tmpSerColor === "transparent") strXml += "<a:noFill/>";
-			else if (opts.chartColorsOpacity) strXml += `<a:solidFill>${createColorElement(tmpSerColor, "<a:alpha val=\"" + Math.round(opts.chartColorsOpacity * FIXED_PCT_PER_PERCENT).toString() + "\"/>")}</a:solidFill>`;
-			else strXml += genXmlColorSelection(tmpSerColor);
-			if (opts.lineSize === 0) strXml += "<a:ln><a:noFill/></a:ln>";
-			else if (opts.dataBorder) strXml += `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75))}" cap="flat">${genXmlColorSelection({
-				color: opts.dataBorder.color ?? "363636",
-				transparency: opts.dataBorder.transparency
-			})}<a:prstDash val="solid"/><a:round/></a:ln>`;
-			else {
-				strXml += `<a:ln w="${ptsToEmuLenient(opts.lineSize ?? 2)}" cap="flat">${genXmlColorSelection(tmpSerColor)}`;
-				strXml += voidEl("a:prstDash", { val: opts.lineDashValues?.[colorIndex] ?? opts.lineDash ?? "solid" }) + voidEl("a:round") + "</a:ln>";
-			}
-			strXml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-			strXml += "</c:spPr>";
-		}
-		{
-			const xValues = dataValues(data[0]);
-			const yValues = dataValues(obj);
-			strXml += numRefBlock("c:xVal", `Sheet1!$A$2:$A$${xValues.length + 1}`, valFmtCode, xValues);
-			strXml += numRefBlock("c:yVal", sheetRangeRef(idxColLtr + 1, 2, idxColLtr + 1, xValues.length + 1), valFmtCode, xValues.map((_value, idx) => yValues[idx]), "");
-			idxColLtr++;
-		}
-		strXml += "  <c:bubbleSize>";
-		strXml += "    <c:numRef>";
-		strXml += `<c:f>${sheetRangeRef(idxColLtr + 1, 2, idxColLtr + 1, dataSizes(obj).length + 1)}</c:f>`;
+	const sers = data.slice(1).map((obj, idx) => {
+		const name = strRefBlock(sheetCellRef(idxColLtr + 1, 1), obj.name ?? "");
+		const spPr = bubbleSerShapeProps(opts, paletteColor(chartColors, idx), idx);
+		const yValues = dataValues(obj);
+		const xVal = numRefBlock("c:xVal", `Sheet1!$A$2:$A$${xValues.length + 1}`, valFmtCode, xValues);
+		const yVal = numRefBlock("c:yVal", sheetRangeRef(idxColLtr + 1, 2, idxColLtr + 1, xValues.length + 1), valFmtCode, xValues.map((_value, i) => yValues[i]), "");
 		idxColLtr++;
-		strXml += "      <c:numCache>";
-		strXml += "        <c:formatCode>General</c:formatCode>";
-		strXml += `           <c:ptCount val="${dataSizes(obj).length}"/>`;
-		dataSizes(obj).forEach((value, idx) => {
-			strXml += numCachePt(idx, value);
-		});
-		strXml += "      </c:numCache>";
-		strXml += "    </c:numRef>";
-		strXml += "  </c:bubbleSize>";
-		strXml += "  <c:bubble3D val=\"" + (chartType === "bubble3D" ? "1" : "0") + "\"/>";
-		strXml += "</c:ser>";
-	});
-	strXml += "<c:dLbls>";
-	strXml += voidEl("c:numFmt", {
-		formatCode: (opts.dataLabelFormatCode ?? "") || "General",
-		sourceLinked: 0
-	});
-	strXml += "<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr>";
-	strXml += `<a:defRPr b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" strike="noStrike" sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" u="none">`;
-	strXml += genXmlColorSelection(opts.dataLabelColor || "000000");
-	strXml += createChartTextFonts(opts.dataLabelFontFace || "Arial");
-	strXml += "</a:defRPr></a:pPr></a:p></c:txPr>";
-	if (opts.dataLabelPosition) strXml += voidEl("c:dLblPos", { val: opts.dataLabelPosition });
-	strXml += "<c:showLegendKey val=\"0\"/>";
-	strXml += `<c:showVal val="${opts.showValue ? "1" : "0"}"/>`;
-	strXml += `<c:showCatName val="0"/><c:showSerName val="${opts.showSerName ? "1" : "0"}"/><c:showPercent val="0"/><c:showBubbleSize val="${opts.showBubbleSize ? "1" : "0"}"/>`;
-	strXml += "<c:extLst>";
-	strXml += "  <c:ext uri=\"{CE6537A1-D6FC-4f65-9D91-7224C49458BB}\" xmlns:c15=\"http://schemas.microsoft.com/office/drawing/2012/chart\">";
-	strXml += "    <c15:showLeaderLines val=\"" + (opts.showLeaderLines ? "1" : "0") + "\"/>";
-	strXml += "  </c:ext>";
-	strXml += "</c:extLst>";
-	strXml += "</c:dLbls>";
-	strXml += `<c:axId val="${catAxisId}"/><c:axId val="${valAxisId}"/>`;
-	strXml += "</c:bubbleChart>";
-	return strXml;
+		const sizeRef = sheetRangeRef(idxColLtr + 1, 2, idxColLtr + 1, dataSizes(obj).length + 1);
+		idxColLtr++;
+		return el("c:ser", null, [
+			raw(voidEl("c:idx", { val: idx }, { openPrefix: "  " })),
+			raw(voidEl("c:order", { val: idx }, { openPrefix: "  " })),
+			raw(name),
+			raw(spPr),
+			raw(xVal),
+			raw(yVal),
+			raw(bubbleSizeBlock(obj, sizeRef)),
+			raw(voidEl("c:bubble3D", { val: chartType === "bubble3D" ? 1 : 0 }, { openPrefix: "  " }))
+		]);
+	}).join("");
+	return el("c:bubbleChart", null, [
+		raw(voidEl("c:varyColors", { val: 0 })),
+		raw(sers),
+		raw(bubbleDataLabels(opts)),
+		raw(voidEl("c:axId", { val: catAxisId })),
+		raw(voidEl("c:axId", { val: valAxisId }))
+	]);
 }
 //#endregion
 //#region src/gen/chart/plot-pie.ts
-/**
-* Plot a single-series pie / doughnut chart into `<c:pieChart>` / `<c:doughnutChart>`.
-*/
-function makePiePlot(chartType, data, opts, valFmtCode) {
-	let optsChartData;
-	let strXml = "";
-	{
-		const first = data[0];
-		if (!first) return strXml;
-		optsChartData = first;
-	}
-	strXml += "<c:" + chartType + "Chart>";
-	strXml += "  <c:varyColors val=\"1\"/>";
-	strXml += "<c:ser>";
-	strXml += "  <c:idx val=\"0\"/>";
-	strXml += "  <c:order val=\"0\"/>";
-	strXml += "  <c:tx>";
-	strXml += "    <c:strRef>";
-	strXml += "      <c:f>Sheet1!$B$1</c:f>";
-	strXml += "      <c:strCache>";
-	strXml += "        <c:ptCount val=\"1\"/>";
-	strXml += "        <c:pt idx=\"0\">" + el("c:v", null, optsChartData.name ?? "") + "</c:pt>";
-	strXml += "      </c:strCache>";
-	strXml += "    </c:strRef>";
-	strXml += "  </c:tx>";
-	strXml += "  <c:spPr>";
-	strXml += "    <a:solidFill><a:schemeClr val=\"accent1\"/></a:solidFill>";
-	strXml += "    <a:ln w=\"9525\" cap=\"flat\"><a:solidFill><a:srgbClr val=\"F9F9F9\"/></a:solidFill><a:prstDash val=\"solid\"/><a:round/></a:ln>";
-	if (opts.dataNoEffects) strXml += "<a:effectLst/>";
-	else strXml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-	strXml += "  </c:spPr>";
-	firstLabelGroup(optsChartData).forEach((_label, idx) => {
-		const chartColors = resolveChartPalette(opts);
-		const ptStyle = optsChartData.pointStyles?.[idx];
-		strXml += "<c:dPt>";
-		strXml += ` <c:idx val="${idx}"/>`;
-		strXml += " <c:bubble3D val=\"0\"/>";
-		strXml += " <c:spPr>";
-		strXml += `<a:solidFill>${createColorElement(ptStyle?.fill || paletteColor(chartColors, idx))}</a:solidFill>`;
-		if (ptStyle?.border) strXml += createChartBorderLine(ptStyle.border);
-		else if (opts.dataBorder) strXml += `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75))}" cap="flat">${genXmlColorSelection({
+/** The label run properties both `<c:txPr>` spellings share, differing only in their indentation. */
+function labelDefRPr(opts, fontsIndent, fmt) {
+	return el("a:defRPr", {
+		sz: ptToHundredths(opts.dataLabelFontSize || 12),
+		b: opts.dataLabelFontBold ? 1 : 0,
+		i: opts.dataLabelFontItalic ? 1 : 0,
+		u: "none",
+		strike: "noStrike"
+	}, [raw(genXmlColorSelection(opts.dataLabelColor || "000000")), raw(fontsIndent + createChartTextFonts(opts.dataLabelFontFace || "Arial"))], fmt);
+}
+/** One `<c:dPt>`: the slice's own fill, its border override, and the shared shadow. */
+function pieDataPoint(idx, ptStyle, opts, fallbackColor) {
+	const border = ptStyle?.border ? createChartBorderLine(ptStyle.border) : opts.dataBorder ? el("a:ln", {
+		w: ptsToEmuLenient(resolveBorderWidth(opts.dataBorder, .75)),
+		cap: "flat"
+	}, [
+		raw(genXmlColorSelection({
 			color: opts.dataBorder.color ?? "363636",
 			transparency: opts.dataBorder.transparency
-		})}<a:prstDash val="solid"/><a:round/></a:ln>`;
-		strXml += createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW);
-		strXml += "  </c:spPr>";
-		strXml += "</c:dPt>";
-	});
-	strXml += "<c:dLbls>";
-	firstLabelGroup(optsChartData).forEach((_label, idx) => {
-		const customLbl = optsChartData.customLabels?.[idx];
-		strXml += "<c:dLbl>";
-		strXml += ` <c:idx val="${idx}"/>`;
-		if (customLbl) strXml += `<c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="${encodeXmlEntities(opts.lang || "en-US")}" dirty="0"/>` + el("a:t", null, customLbl) + "</a:r></a:p></c:rich></c:tx>";
-		strXml += "  " + voidEl("c:numFmt", {
-			formatCode: (opts.dataLabelFormatCode ?? "") || "General",
-			sourceLinked: 0
-		});
-		strXml += "  <c:spPr/><c:txPr>";
-		strXml += "   <a:bodyPr/><a:lstStyle/>";
-		strXml += "   <a:p><a:pPr>";
-		strXml += `   <a:defRPr sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
-		strXml += genXmlColorSelection(opts.dataLabelColor || "000000");
-		strXml += "    " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-		strXml += "   </a:defRPr>";
-		strXml += "      </a:pPr></a:p>";
-		strXml += "    </c:txPr>";
-		if (chartType === "pie" && opts.dataLabelPosition) strXml += voidEl("c:dLblPos", { val: opts.dataLabelPosition });
-		strXml += "    <c:showLegendKey val=\"0\"/>";
-		strXml += "    <c:showVal val=\"" + (customLbl ? "0" : opts.showValue ? "1" : "0") + "\"/>";
-		strXml += "    <c:showCatName val=\"" + (opts.showLabel ? "1" : "0") + "\"/>";
-		strXml += "    <c:showSerName val=\"" + (opts.showSerName ? "1" : "0") + "\"/>";
-		strXml += "    <c:showPercent val=\"" + (opts.showPercent ? "1" : "0") + "\"/>";
-		strXml += "    <c:showBubbleSize val=\"0\"/>";
-		strXml += "  </c:dLbl>";
-	});
-	strXml += " " + voidEl("c:numFmt", {
+		})),
+		raw(voidEl("a:prstDash", { val: "solid" })),
+		raw(voidEl("a:round"))
+	]) : "";
+	const spPr = el("c:spPr", null, [
+		raw(el("a:solidFill", null, raw(createColorElement(ptStyle?.fill || fallbackColor)))),
+		raw(border),
+		raw(createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))
+	], {
+		openPrefix: " ",
+		closePrefix: "  "
+	});
+	return el("c:dPt", null, [
+		raw(voidEl("c:idx", { val: idx }, { openPrefix: " " })),
+		raw(voidEl("c:bubble3D", { val: 0 }, { openPrefix: " " })),
+		raw(spPr)
+	]);
+}
+/**
+* One `<c:dLbl>`: a pie labels its points, not its series, so every slice carries its own copy of
+* the number format, text style and show flags. A `customLabels` entry replaces the value with
+* literal rich text, which is why it also forces `<c:showVal>` off.
+*/
+function pieDataLabel(idx, customLbl, opts, chartType) {
+	const numFmt = voidEl("c:numFmt", {
 		formatCode: (opts.dataLabelFormatCode ?? "") || "General",
 		sourceLinked: 0
+	}, { openPrefix: "  " });
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", null, { openPrefix: "   " })),
+		raw(voidEl("a:lstStyle")),
+		raw(el("a:p", null, raw(el("a:pPr", null, raw(labelDefRPr(opts, "    ", {
+			openPrefix: "   ",
+			closePrefix: "   "
+		})), { closePrefix: "      " })), { openPrefix: "   " }))
+	], { closePrefix: "    " });
+	return el("c:dLbl", null, [
+		raw(voidEl("c:idx", { val: idx }, { openPrefix: " " })),
+		customLbl ? raw(el("c:tx", null, raw(el("c:rich", null, [
+			raw(voidEl("a:bodyPr")),
+			raw(voidEl("a:lstStyle")),
+			raw(el("a:p", null, raw(el("a:r", null, [raw(voidEl("a:rPr", {
+				lang: opts.lang || "en-US",
+				dirty: 0
+			})), raw(el("a:t", null, customLbl))]))))
+		])))) : null,
+		raw(numFmt),
+		raw(voidEl("c:spPr", null, { openPrefix: "  " })),
+		raw(txPr),
+		chartType === "pie" && opts.dataLabelPosition ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showVal", { val: customLbl ? 0 : opts.showValue ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showCatName", { val: opts.showLabel ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showSerName", { val: opts.showSerName ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showPercent", { val: opts.showPercent ? 1 : 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }, { openPrefix: "    " }))
+	], { closePrefix: "  " });
+}
+/** The `<c:cat>` slice-name reference and the `<c:val>` cache, both keyed on the label count. */
+function pieCategories(labels) {
+	const strCache = el("c:strCache", null, [raw(voidEl("c:ptCount", { val: labels.length }, { openPrefix: "         " })), raw(labels.map((label, idx) => el("c:pt", { idx }, raw(el("c:v", null, label)))).join(""))], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	const strRef = el("c:strRef", null, [raw(el("c:f", null, `Sheet1!$A$2:$A$${labels.length + 1}`, { openPrefix: "    " })), raw(strCache)], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	return el("c:cat", null, raw(strRef));
+}
+/** The `<c:val>` numeric cache. A missing value keeps its `<c:pt>` with an empty `<c:v>`. */
+function pieValues(obj, count, valFmtCode) {
+	const points = dataValues(obj).map((value, idx) => el("c:pt", { idx }, raw(el("c:v", null, value || value === 0 ? value : "")))).join("");
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, valFmtCode, { openPrefix: "        " })),
+		raw(voidEl("c:ptCount", { val: count }, { openPrefix: "           " })),
+		raw(points)
+	], {
+		openPrefix: "      ",
+		closePrefix: "      "
+	});
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, `Sheet1!$B$2:$B$${count + 1}`, { openPrefix: "      " })), raw(numCache)], {
+		openPrefix: "    ",
+		closePrefix: "    "
+	});
+	return el("c:val", null, raw(numRef), {
+		openPrefix: "  ",
+		closePrefix: "  "
 	});
-	strXml += "    <c:txPr>";
-	strXml += "      <a:bodyPr/>";
-	strXml += "      <a:lstStyle/>";
-	strXml += "      <a:p>";
-	strXml += "        <a:pPr>";
-	strXml += `          <a:defRPr sz="${ptToHundredths(opts.dataLabelFontSize || 12)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
-	strXml += genXmlColorSelection(opts.dataLabelColor || "000000");
-	strXml += "            " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
-	strXml += "          </a:defRPr>";
-	strXml += "        </a:pPr>";
-	strXml += "      </a:p>";
-	strXml += "    </c:txPr>";
-	strXml += chartType === "pie" ? voidEl("c:dLblPos", { val: opts.dataLabelPosition || "ctr" }) : "";
-	strXml += "    <c:showLegendKey val=\"0\"/>";
-	strXml += "    <c:showVal val=\"0\"/>";
-	strXml += "    <c:showCatName val=\"1\"/>";
-	strXml += "    <c:showSerName val=\"0\"/>";
-	strXml += "    <c:showPercent val=\"1\"/>";
-	strXml += "    <c:showBubbleSize val=\"0\"/>";
-	strXml += ` <c:showLeaderLines val="${opts.showLeaderLines ? "1" : "0"}"/>`;
-	strXml += createLeaderLinesElement(opts);
-	strXml += "</c:dLbls>";
-	strXml += "<c:cat>";
-	strXml += "  <c:strRef>";
-	strXml += `    <c:f>Sheet1!$A$2:$A$${firstLabelGroup(optsChartData).length + 1}</c:f>`;
-	strXml += "    <c:strCache>";
-	strXml += `         <c:ptCount val="${firstLabelGroup(optsChartData).length}"/>`;
-	firstLabelGroup(optsChartData).forEach((label, idx) => {
-		strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`;
-	});
-	strXml += "    </c:strCache>";
-	strXml += "  </c:strRef>";
-	strXml += "</c:cat>";
-	strXml += "  <c:val>";
-	strXml += "    <c:numRef>";
-	strXml += `      <c:f>Sheet1!$B$2:$B$${firstLabelGroup(optsChartData).length + 1}</c:f>`;
-	strXml += "      <c:numCache>";
-	strXml += "        <c:formatCode>" + valFmtCode + "</c:formatCode>";
-	strXml += `           <c:ptCount val="${firstLabelGroup(optsChartData).length}"/>`;
-	dataValues(optsChartData).forEach((value, idx) => {
-		strXml += `<c:pt idx="${idx}"><c:v>${value || value === 0 ? value : ""}</c:v></c:pt>`;
-	});
-	strXml += "      </c:numCache>";
-	strXml += "    </c:numRef>";
-	strXml += "  </c:val>";
-	strXml += "  </c:ser>";
-	strXml += `  <c:firstSliceAng val="${opts.firstSliceAng ? Math.round(opts.firstSliceAng) : 0}"/>`;
-	if (chartType === "doughnut") strXml += `<c:holeSize val="${typeof opts.holeSize === "number" ? opts.holeSize : "50"}"/>`;
-	strXml += "</c:" + chartType + "Chart>";
-	return strXml;
 }
 /**
-* Create Category axis
-* @param {ChartOptsInternal} opts - chart options
-* @param {string} axisId - value
-* @param {string} valAxisId - value
-* @return {string} XML
+* Plot a single-series pie / doughnut chart into `<c:pieChart>` / `<c:doughnutChart>`.
 */
+function makePiePlot(chartType, data, opts, valFmtCode) {
+	const optsChartData = data[0];
+	if (!optsChartData) return "";
+	const chartColors = resolveChartPalette(opts);
+	const labels = firstLabelGroup(optsChartData);
+	const spPr = el("c:spPr", null, [
+		raw(el("a:solidFill", null, raw(voidEl("a:schemeClr", { val: "accent1" })), { openPrefix: "    " })),
+		raw(el("a:ln", {
+			w: 9525,
+			cap: "flat"
+		}, [
+			raw(el("a:solidFill", null, raw(voidEl("a:srgbClr", { val: "F9F9F9" })))),
+			raw(voidEl("a:prstDash", { val: "solid" })),
+			raw(voidEl("a:round"))
+		], { openPrefix: "    " })),
+		raw(opts.dataNoEffects ? voidEl("a:effectLst") : createShadowEffectLst(opts.shadow, DEF_SHAPE_SHADOW))
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	const dLbls = el("c:dLbls", null, [
+		raw(labels.map((_label, idx) => pieDataLabel(idx, optsChartData.customLabels?.[idx], opts, chartType)).join("")),
+		raw(voidEl("c:numFmt", {
+			formatCode: (opts.dataLabelFormatCode ?? "") || "General",
+			sourceLinked: 0
+		}, { openPrefix: " " })),
+		raw(el("c:txPr", null, [
+			raw(voidEl("a:bodyPr", null, { openPrefix: "      " })),
+			raw(voidEl("a:lstStyle", null, { openPrefix: "      " })),
+			raw(el("a:p", null, raw(el("a:pPr", null, raw(labelDefRPr(opts, "            ", {
+				openPrefix: "          ",
+				closePrefix: "          "
+			})), {
+				openPrefix: "        ",
+				closePrefix: "        "
+			})), {
+				openPrefix: "      ",
+				closePrefix: "      "
+			}))
+		], {
+			openPrefix: "    ",
+			closePrefix: "    "
+		})),
+		chartType === "pie" ? raw(voidEl("c:dLblPos", { val: opts.dataLabelPosition || "ctr" })) : null,
+		raw(voidEl("c:showLegendKey", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showVal", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showCatName", { val: 1 }, { openPrefix: "    " })),
+		raw(voidEl("c:showSerName", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showPercent", { val: 1 }, { openPrefix: "    " })),
+		raw(voidEl("c:showBubbleSize", { val: 0 }, { openPrefix: "    " })),
+		raw(voidEl("c:showLeaderLines", { val: opts.showLeaderLines ? 1 : 0 }, { openPrefix: " " })),
+		raw(createLeaderLinesElement(opts))
+	]);
+	const ser = el("c:ser", null, [
+		raw(voidEl("c:idx", { val: 0 }, { openPrefix: "  " })),
+		raw(voidEl("c:order", { val: 0 }, { openPrefix: "  " })),
+		raw(strRefBlock("Sheet1!$B$1", optsChartData.name ?? "", "expanded")),
+		raw(spPr),
+		raw(labels.map((_label, idx) => pieDataPoint(idx, optsChartData.pointStyles?.[idx], opts, paletteColor(chartColors, idx))).join("")),
+		raw(dLbls),
+		raw(pieCategories(labels)),
+		raw(pieValues(optsChartData, labels.length, valFmtCode))
+	], { closePrefix: "  " });
+	return el(`c:${chartType}Chart`, null, [
+		raw(voidEl("c:varyColors", { val: 1 }, { openPrefix: "  " })),
+		raw(ser),
+		raw(voidEl("c:firstSliceAng", { val: opts.firstSliceAng ? Math.round(opts.firstSliceAng) : 0 }, { openPrefix: "  " })),
+		chartType === "doughnut" ? raw(voidEl("c:holeSize", { val: typeof opts.holeSize === "number" ? opts.holeSize : 50 })) : null
+	]);
+}
 //#endregion
 //#region src/gen/chart/plot-stock.ts
 /**
@@ -4432,54 +4869,56 @@ const STOCK_STYLE_SPEC = {
 /** True when the given (already-normalized) stock style leads with a Volume bar series. */
 const isVolumeStockStyle = (style) => !!style && STOCK_STYLE_SPEC[style].volume;
 /** Minimal `<c:dLbls>` block (all labels off) shared by the stock and volume-bar subcharts. */
-const STOCK_DLBLS = "<c:dLbls><c:showLegendKey val=\"0\"/><c:showVal val=\"0\"/><c:showCatName val=\"0\"/><c:showSerName val=\"0\"/><c:showPercent val=\"0\"/><c:showBubbleSize val=\"0\"/></c:dLbls>";
+const STOCK_DLBLS = el("c:dLbls", null, [
+	raw(voidEl("c:showLegendKey", { val: 0 })),
+	raw(voidEl("c:showVal", { val: 0 })),
+	raw(voidEl("c:showCatName", { val: 0 })),
+	raw(voidEl("c:showSerName", { val: 0 })),
+	raw(voidEl("c:showPercent", { val: 0 })),
+	raw(voidEl("c:showBubbleSize", { val: 0 }))
+]);
 /** Emit the shared `<c:cat>` + `<c:val>` refs for a stock/volume series (single-level categories). */
 function stockCatVal(obj, opts, valFmtCode) {
 	const cats = firstLabelGroup(obj);
 	const valColRow = obj._dataIndex + dataLabels(obj).length + 1;
-	let strXml = "<c:cat>";
-	if (opts.catLabelFormatCode) {
-		strXml += "<c:numRef>";
-		strXml += `<c:f>Sheet1!$A$2:$A$${cats.length + 1}</c:f>`;
-		strXml += "<c:numCache>";
-		strXml += `<c:formatCode>${opts.catLabelFormatCode || "General"}</c:formatCode>`;
-		strXml += `<c:ptCount val="${cats.length}"/>`;
-		cats.forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-		strXml += "</c:numCache></c:numRef>";
-	} else {
-		strXml += "<c:strRef>";
-		strXml += `<c:f>Sheet1!$A$2:$A$${cats.length + 1}</c:f>`;
-		strXml += "<c:strCache>";
-		strXml += `<c:ptCount val="${cats.length}"/>`;
-		cats.forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-		strXml += "</c:strCache></c:strRef>";
-	}
-	strXml += "</c:cat>";
-	strXml += "<c:val><c:numRef>";
-	strXml += `<c:f>${sheetRangeRef(valColRow, 2, valColRow, cats.length + 1)}</c:f>`;
-	strXml += "<c:numCache>";
-	strXml += `<c:formatCode>${valFmtCode}</c:formatCode>`;
-	strXml += `<c:ptCount val="${cats.length}"/>`;
-	dataValues(obj).forEach((value, idx) => strXml += numCachePt(idx, value));
-	strXml += "</c:numCache></c:numRef></c:val>";
-	return strXml;
+	const catRef = `Sheet1!$A$2:$A$${cats.length + 1}`;
+	const cat = el("c:cat", null, raw(opts.catLabelFormatCode ? catRefBlock("num", catRef, cats, opts.catLabelFormatCode || "General") : catRefBlock("str", catRef, cats)));
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, valFmtCode)),
+		raw(voidEl("c:ptCount", { val: cats.length })),
+		raw(dataValues(obj).map((value, idx) => numCachePt(idx, value)).join(""))
+	]);
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, sheetRangeRef(valColRow, 2, valColRow, cats.length + 1))), raw(numCache)]);
+	return cat + el("c:val", null, raw(numRef));
 }
 /** Emit the `<c:tx>` series-name reference for a stock/volume series. */
 function stockSeriesName(obj) {
-	return `<c:tx><c:strRef><c:f>${sheetCellRef(obj._dataIndex + dataLabels(obj).length + 1, 1)}</c:f><c:strCache><c:ptCount val="1"/><c:pt idx="0">` + el("c:v", null, obj.name ?? "") + "</c:pt></c:strCache></c:strRef></c:tx>";
+	return strRefBlock(sheetCellRef(obj._dataIndex + dataLabels(obj).length + 1, 1), obj.name ?? "", "compact");
 }
 /** Emit a single stock (line) series: invisible line, optional close-marker, cat/val refs. */
 function makeStockLineSer(obj, opts, valFmtCode, markCloseColor) {
-	let strXml = "<c:ser>";
-	strXml += `<c:idx val="${obj._dataIndex}"/><c:order val="${obj._dataIndex}"/>`;
-	strXml += stockSeriesName(obj);
-	strXml += "<c:spPr><a:ln w=\"19050\" cap=\"rnd\"><a:noFill/><a:round/></a:ln><a:effectLst/></c:spPr>";
-	if (markCloseColor) strXml += "<c:marker><c:symbol val=\"dot\"/><c:size val=\"5\"/><c:spPr>" + genXmlColorSelection(markCloseColor) + `<a:ln w="9525">${genXmlColorSelection(markCloseColor)}</a:ln><a:effectLst/></c:spPr></c:marker>`;
-	else strXml += "<c:marker><c:symbol val=\"none\"/></c:marker>";
-	strXml += stockCatVal(obj, opts, valFmtCode);
-	strXml += "<c:smooth val=\"0\"/>";
-	strXml += "</c:ser>";
-	return strXml;
+	const spPr = el("c:spPr", null, [raw(el("a:ln", {
+		w: 19050,
+		cap: "rnd"
+	}, [raw(voidEl("a:noFill")), raw(voidEl("a:round"))])), raw(voidEl("a:effectLst"))]);
+	const marker = markCloseColor ? el("c:marker", null, [
+		raw(voidEl("c:symbol", { val: "dot" })),
+		raw(voidEl("c:size", { val: 5 })),
+		raw(el("c:spPr", null, [
+			raw(genXmlColorSelection(markCloseColor)),
+			raw(el("a:ln", { w: 9525 }, raw(genXmlColorSelection(markCloseColor)))),
+			raw(voidEl("a:effectLst"))
+		]))
+	]) : el("c:marker", null, raw(voidEl("c:symbol", { val: "none" })));
+	return el("c:ser", null, [
+		raw(voidEl("c:idx", { val: obj._dataIndex })),
+		raw(voidEl("c:order", { val: obj._dataIndex })),
+		raw(stockSeriesName(obj)),
+		raw(spPr),
+		raw(marker),
+		raw(stockCatVal(obj, opts, valFmtCode)),
+		raw(voidEl("c:smooth", { val: 0 }))
+	]);
 }
 /**
 * Plot a stock chart. For `vhlc`/`vohlc` the first data series is a Volume column drawn as a
@@ -4494,32 +4933,52 @@ function makeStockPlot(_chartType, data, opts, valAxisId, catAxisId, valFmtCode)
 	const stockSeries = spec.volume ? data.slice(1) : data;
 	let strXml = "";
 	if (volumeSeries) {
-		strXml += "<c:barChart>";
-		strXml += "<c:barDir val=\"col\"/><c:grouping val=\"clustered\"/><c:varyColors val=\"0\"/>";
-		strXml += "<c:ser>";
-		strXml += `<c:idx val="${volumeSeries._dataIndex}"/><c:order val="${volumeSeries._dataIndex}"/>`;
-		strXml += stockSeriesName(volumeSeries);
-		strXml += `<c:spPr>${genXmlColorSelection(chartColors[0] ?? "4472C4")}</c:spPr>`;
-		strXml += "<c:invertIfNegative val=\"0\"/>";
-		strXml += stockCatVal(volumeSeries, opts, valFmtCode);
-		strXml += "</c:ser>";
-		strXml += STOCK_DLBLS;
-		strXml += "<c:gapWidth val=\"150\"/>";
-		strXml += `<c:axId val="${AXIS_ID_CATEGORY_PRIMARY}"/><c:axId val="${AXIS_ID_VALUE_PRIMARY}"/>`;
-		strXml += "</c:barChart>";
-	}
-	strXml += "<c:stockChart>";
-	stockSeries.forEach((obj, idx) => {
-		const markColor = !spec.upDownBars && idx === stockSeries.length - 1 ? paletteColor(chartColors, obj._dataIndex, "ED7D31") : null;
-		strXml += makeStockLineSer(obj, opts, valFmtCode, markColor);
-	});
-	strXml += STOCK_DLBLS;
-	strXml += "<c:hiLowLines><c:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"75000\"/><a:lumOff val=\"25000\"/></a:schemeClr></a:solidFill><a:round/></a:ln><a:effectLst/></c:spPr></c:hiLowLines>";
-	if (spec.upDownBars) strXml += "<c:upDownBars><c:gapWidth val=\"150\"/><c:upBars><c:spPr><a:solidFill><a:schemeClr val=\"bg1\"/></a:solidFill><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill><a:round/></a:ln><a:effectLst/></c:spPr></c:upBars><c:downBars><c:spPr><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill><a:round/></a:ln><a:effectLst/></c:spPr></c:downBars></c:upDownBars>";
+		const volumeSer = el("c:ser", null, [
+			raw(voidEl("c:idx", { val: volumeSeries._dataIndex })),
+			raw(voidEl("c:order", { val: volumeSeries._dataIndex })),
+			raw(stockSeriesName(volumeSeries)),
+			raw(el("c:spPr", null, raw(genXmlColorSelection(chartColors[0] ?? "4472C4")))),
+			raw(voidEl("c:invertIfNegative", { val: 0 })),
+			raw(stockCatVal(volumeSeries, opts, valFmtCode))
+		]);
+		strXml += el("c:barChart", null, [
+			raw(voidEl("c:barDir", { val: "col" })),
+			raw(voidEl("c:grouping", { val: "clustered" })),
+			raw(voidEl("c:varyColors", { val: 0 })),
+			raw(volumeSer),
+			raw(STOCK_DLBLS),
+			raw(voidEl("c:gapWidth", { val: 150 })),
+			raw(voidEl("c:axId", { val: AXIS_ID_CATEGORY_PRIMARY })),
+			raw(voidEl("c:axId", { val: AXIS_ID_VALUE_PRIMARY }))
+		]);
+	}
+	const sers = stockSeries.map((obj, idx) => {
+		return makeStockLineSer(obj, opts, valFmtCode, !spec.upDownBars && idx === stockSeries.length - 1 ? paletteColor(chartColors, obj._dataIndex, "ED7D31") : null);
+	}).join("");
+	const hiLowLines = el("c:hiLowLines", null, raw(el("c:spPr", null, [raw(dimmedTextLine(75e3, 25e3)), raw(voidEl("a:effectLst"))])));
+	const upDownBars = spec.upDownBars ? el("c:upDownBars", null, [
+		raw(voidEl("c:gapWidth", { val: 150 })),
+		raw(el("c:upBars", null, raw(el("c:spPr", null, [
+			raw(el("a:solidFill", null, raw(voidEl("a:schemeClr", { val: "bg1" })))),
+			raw(dimmedTextLine(65e3, 35e3)),
+			raw(voidEl("a:effectLst"))
+		])))),
+		raw(el("c:downBars", null, raw(el("c:spPr", null, [
+			raw(dimmedTextFill(65e3, 35e3)),
+			raw(dimmedTextLine(65e3, 35e3)),
+			raw(voidEl("a:effectLst"))
+		]))))
+	]) : "";
 	const stockCatId = spec.volume ? AXIS_ID_CATEGORY_SECONDARY : catAxisId;
 	const stockValId = spec.volume ? AXIS_ID_VALUE_SECONDARY : valAxisId;
-	strXml += `<c:axId val="${stockCatId}"/><c:axId val="${stockValId}"/>`;
-	strXml += "</c:stockChart>";
+	strXml += el("c:stockChart", null, [
+		raw(sers),
+		raw(STOCK_DLBLS),
+		raw(hiLowLines),
+		raw(upDownBars),
+		raw(voidEl("c:axId", { val: stockCatId })),
+		raw(voidEl("c:axId", { val: stockValId }))
+	]);
 	return strXml;
 }
 //#endregion
@@ -4530,28 +4989,30 @@ const isSurface3D = (opts) => opts.surface3D !== false;
 function surfaceCatVal(obj, valFmtCode) {
 	const cats = firstLabelGroup(obj);
 	const valCol = obj._dataIndex + dataLabels(obj).length + 1;
-	let strXml = "<c:cat><c:strRef>";
-	strXml += `<c:f>Sheet1!$A$2:$A$${cats.length + 1}</c:f>`;
-	strXml += `<c:strCache><c:ptCount val="${cats.length}"/>`;
-	cats.forEach((label, idx) => strXml += `<c:pt idx="${idx}">${el("c:v", null, label)}</c:pt>`);
-	strXml += "</c:strCache></c:strRef></c:cat>";
-	strXml += "<c:val><c:numRef>";
-	strXml += `<c:f>${sheetRangeRef(valCol, 2, valCol, cats.length + 1)}</c:f>`;
-	strXml += `<c:numCache><c:formatCode>${valFmtCode}</c:formatCode><c:ptCount val="${cats.length}"/>`;
-	dataValues(obj).forEach((value, idx) => strXml += numCachePt(idx, value));
-	strXml += "</c:numCache></c:numRef></c:val>";
-	return strXml;
+	const numCache = el("c:numCache", null, [
+		raw(el("c:formatCode", null, valFmtCode)),
+		raw(voidEl("c:ptCount", { val: cats.length })),
+		raw(dataValues(obj).map((value, idx) => numCachePt(idx, value)).join(""))
+	]);
+	const numRef = el("c:numRef", null, [raw(el("c:f", null, sheetRangeRef(valCol, 2, valCol, cats.length + 1))), raw(numCache)]);
+	return el("c:cat", null, raw(catRefBlock("str", `Sheet1!$A$2:$A$${cats.length + 1}`, cats))) + el("c:val", null, raw(numRef));
 }
 /** Emit a single surface series: name ref, 3-D shape props, and cat/val refs. */
 function makeSurfaceSer(obj, valFmtCode, seriesColor) {
 	const nameCol = obj._dataIndex + dataLabels(obj).length + 1;
-	let strXml = "<c:ser>";
-	strXml += `<c:idx val="${obj._dataIndex}"/><c:order val="${obj._dataIndex}"/>`;
-	strXml += `<c:tx><c:strRef><c:f>${sheetCellRef(nameCol, 1)}</c:f><c:strCache><c:ptCount val="1"/><c:pt idx="0">` + el("c:v", null, obj.name ?? "") + "</c:pt></c:strCache></c:strRef></c:tx>";
-	strXml += `<c:spPr>${genXmlColorSelection(seriesColor)}<a:ln/><a:effectLst/><a:sp3d/></c:spPr>`;
-	strXml += surfaceCatVal(obj, valFmtCode);
-	strXml += "</c:ser>";
-	return strXml;
+	const spPr = el("c:spPr", null, [
+		raw(genXmlColorSelection(seriesColor)),
+		raw(voidEl("a:ln")),
+		raw(voidEl("a:effectLst")),
+		raw(voidEl("a:sp3d"))
+	]);
+	return el("c:ser", null, [
+		raw(voidEl("c:idx", { val: obj._dataIndex })),
+		raw(voidEl("c:order", { val: obj._dataIndex })),
+		raw(strRefBlock(sheetCellRef(nameCol, 1), obj.name ?? "", "compact")),
+		raw(spPr),
+		raw(surfaceCatVal(obj, valFmtCode))
+	]);
 }
 /**
 * Plot a surface chart into a `<c:surface3DChart>` (3-D) or `<c:surfaceChart>` (2-D contour). Every
@@ -4561,14 +5022,14 @@ function makeSurfaceSer(obj, valFmtCode, seriesColor) {
 function makeSurfacePlot(_chartType, data, opts, valAxisId, catAxisId, valFmtCode) {
 	const tag = isSurface3D(opts) ? "surface3DChart" : "surfaceChart";
 	const chartColors = resolveChartPalette(opts);
-	let strXml = `<c:${tag}>`;
-	strXml += `<c:wireframe val="${opts.surfaceWireframe ? 1 : 0}"/>`;
-	data.forEach((obj, idx) => {
-		strXml += makeSurfaceSer(obj, valFmtCode, paletteColor(chartColors, idx, "4472C4"));
-	});
-	strXml += `<c:axId val="${catAxisId}"/><c:axId val="${valAxisId}"/><c:axId val="${AXIS_ID_SERIES_PRIMARY}"/>`;
-	strXml += `</c:${tag}>`;
-	return strXml;
+	const sers = data.map((obj, idx) => makeSurfaceSer(obj, valFmtCode, paletteColor(chartColors, idx, "4472C4"))).join("");
+	return el(`c:${tag}`, null, [
+		raw(voidEl("c:wireframe", { val: opts.surfaceWireframe ? 1 : 0 })),
+		raw(sers),
+		raw(voidEl("c:axId", { val: catAxisId })),
+		raw(voidEl("c:axId", { val: valAxisId })),
+		raw(voidEl("c:axId", { val: AXIS_ID_SERIES_PRIMARY }))
+	]);
 }
 /**
 * Build the `<c:view3D>` + floor/side/back walls for a surface chart. A 3-D surface tilts the scene
@@ -4577,13 +5038,23 @@ function makeSurfacePlot(_chartType, data, opts, valAxisId, catAxisId, valFmtCod
 * `<c:plotArea>` in CT_Chart document order (view3D → floor → sideWall → backWall → plotArea).
 */
 function makeSurfaceScene(opts) {
-	const wall = "<c:thickness val=\"0\"/><c:spPr><a:noFill/><a:ln><a:noFill/></a:ln><a:effectLst/><a:sp3d/></c:spPr>";
-	let strXml = "<c:view3D>";
-	if (isSurface3D(opts)) strXml += `<c:rotX val="${opts.v3DRotX}"/><c:rotY val="${opts.v3DRotY}"/><c:rAngAx val="0"/>`;
-	else strXml += "<c:rotX val=\"90\"/><c:rotY val=\"0\"/><c:rAngAx val=\"0\"/><c:perspective val=\"0\"/>";
-	strXml += "</c:view3D>";
-	strXml += `<c:floor>${wall}</c:floor><c:sideWall>${wall}</c:sideWall><c:backWall>${wall}</c:backWall>`;
-	return strXml;
+	const wall = voidEl("c:thickness", { val: 0 }) + el("c:spPr", null, [
+		raw(voidEl("a:noFill")),
+		raw(el("a:ln", null, raw(voidEl("a:noFill")))),
+		raw(voidEl("a:effectLst")),
+		raw(voidEl("a:sp3d"))
+	]);
+	const scene = isSurface3D(opts) ? [
+		raw(voidEl("c:rotX", { val: opts.v3DRotX })),
+		raw(voidEl("c:rotY", { val: opts.v3DRotY })),
+		raw(voidEl("c:rAngAx", { val: 0 }))
+	] : [
+		raw(voidEl("c:rotX", { val: 90 })),
+		raw(voidEl("c:rotY", { val: 0 })),
+		raw(voidEl("c:rAngAx", { val: 0 })),
+		raw(voidEl("c:perspective", { val: 0 }))
+	];
+	return el("c:view3D", null, scene) + el("c:floor", null, raw(wall)) + el("c:sideWall", null, raw(wall)) + el("c:backWall", null, raw(wall));
 }
 //#endregion
 //#region src/gen/chart/chart-xml.ts
@@ -4602,6 +5073,12 @@ function makeSurfaceScene(opts) {
 * written by the embedded workbook ({@link ./embed-xlsx}); that mapping lives in
 * {@link ./data-refs}.
 */
+/** The three namespaces every `<c:chartSpace>` declares, in the order PowerPoint writes them. */
+const CHART_SPACE_NS = {
+	"xmlns:c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
+	"xmlns:a": "http://schemas.openxmlformats.org/drawingml/2006/main",
+	"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+};
 /**
 * Whether a chart-area/plot-area `fill` says anything the fill dispatch can act on.
 *
@@ -4624,58 +5101,52 @@ function isStatedFill(fill) {
 	return Boolean(fill?.color || fill?.type);
 }
 /**
-* Build the chartSpace/chart header: chartSpace open, title (or autoTitleDeleted),
-* optional 3D view, and the plotArea open with optional manual layout.
+* The chart title (or the `autoTitleDeleted` flag that suppresses PowerPoint's default one)
+* followed by the 3-D scene, for the two families that plot into one.
 */
 function makeChartHeaderXml(rel) {
-	const chartArea = rel.opts.chartArea ?? {};
-	let strXml = "";
-	strXml += "<c:chartSpace xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">";
-	strXml += voidEl("c:date1904", { val: 0 });
-	strXml += voidEl("c:roundedCorners", { val: chartArea.roundedCorners ? 1 : 0 });
-	strXml += "<c:chart>";
-	if (rel.opts.showTitle) {
-		strXml += genXmlTitle({
-			title: rel.opts.title || "Chart Title",
-			color: rel.opts.titleColor,
-			fontFace: rel.opts.titleFontFace,
-			fontSize: rel.opts.titleFontSize || 18,
-			titleAlign: rel.opts.titleAlign,
-			titleBold: rel.opts.titleBold,
-			titleItalic: rel.opts.titleItalic,
-			titleUnderline: rel.opts.titleUnderline,
-			titlePos: rel.opts.titlePos,
-			titleRotate: rel.opts.titleRotate
-		}, rel.opts.x, rel.opts.y);
-		strXml += voidEl("c:autoTitleDeleted", { val: 0 });
-	} else strXml += voidEl("c:autoTitleDeleted", { val: 1 });
-	/** Add 3D view tag
-	* @see: https://c-rex.net/projects/samples/ooxml/e1/Part4/OOXML_P4_DOCX_perspective_topic_ID0E6BUQB.html
-	*/
-	if (rel.opts._type === "bar3D") strXml += el("c:view3D", null, [
+	const title = rel.opts.showTitle ? genXmlTitle({
+		title: rel.opts.title || "Chart Title",
+		color: rel.opts.titleColor,
+		fontFace: rel.opts.titleFontFace,
+		fontSize: rel.opts.titleFontSize || 18,
+		titleAlign: rel.opts.titleAlign,
+		titleBold: rel.opts.titleBold,
+		titleItalic: rel.opts.titleItalic,
+		titleUnderline: rel.opts.titleUnderline,
+		titlePos: rel.opts.titlePos,
+		titleRotate: rel.opts.titleRotate
+	}, rel.opts.x, rel.opts.y) + voidEl("c:autoTitleDeleted", { val: 0 }) : voidEl("c:autoTitleDeleted", { val: 1 });
+	if (rel.opts._type === "bar3D") return title + el("c:view3D", null, [
 		raw(voidEl("c:rotX", { val: rel.opts.v3DRotX })),
 		raw(voidEl("c:rotY", { val: rel.opts.v3DRotY })),
 		raw(voidEl("c:rAngAx", { val: !rel.opts.v3DRAngAx ? 0 : 1 })),
 		raw(voidEl("c:perspective", { val: rel.opts.v3DPerspective }))
 	]);
-	else if (rel.opts._type === "surface") strXml += makeSurfaceScene(rel.opts);
-	strXml += "<c:plotArea>";
-	if (rel.opts.layout) {
-		const manualLayout = el("c:manualLayout", null, [
-			raw(voidEl("c:layoutTarget", { val: "inner" }, { closePrefix: " " })),
-			raw(voidEl("c:xMode", { val: "edge" }, { closePrefix: " " })),
-			raw(voidEl("c:yMode", { val: "edge" }, { closePrefix: " " })),
-			raw(voidEl("c:x", { val: rel.opts.layout.x || 0 }, { closePrefix: " " })),
-			raw(voidEl("c:y", { val: rel.opts.layout.y || 0 }, { closePrefix: " " })),
-			raw(voidEl("c:w", { val: rel.opts.layout.w || 1 }, { closePrefix: " " })),
-			raw(voidEl("c:h", { val: rel.opts.layout.h || 1 }, { closePrefix: " " }))
-		], {
-			childPrefix: "  ",
-			closePrefix: " "
-		});
-		strXml += el("c:layout", null, raw(manualLayout), { childPrefix: " " });
-	} else strXml += voidEl("c:layout");
-	return strXml;
+	if (rel.opts._type === "surface") return title + makeSurfaceScene(rel.opts);
+	return title;
+}
+/**
+* The plot area's `<c:layout>`. Manual layout is emitted only when the caller asked for one:
+* an empty `<c:layout/>` lets PowerPoint auto-fit, which it does well across all four TRBL
+* legend positions.
+*/
+function makePlotAreaLayoutXml(rel) {
+	const layout = rel.opts.layout;
+	if (!layout) return voidEl("c:layout");
+	const manualLayout = el("c:manualLayout", null, [
+		raw(voidEl("c:layoutTarget", { val: "inner" }, { closePrefix: " " })),
+		raw(voidEl("c:xMode", { val: "edge" }, { closePrefix: " " })),
+		raw(voidEl("c:yMode", { val: "edge" }, { closePrefix: " " })),
+		raw(voidEl("c:x", { val: layout.x || 0 }, { closePrefix: " " })),
+		raw(voidEl("c:y", { val: layout.y || 0 }, { closePrefix: " " })),
+		raw(voidEl("c:w", { val: layout.w || 1 }, { closePrefix: " " })),
+		raw(voidEl("c:h", { val: layout.h || 1 }, { closePrefix: " " }))
+	], {
+		childPrefix: "  ",
+		closePrefix: " "
+	});
+	return el("c:layout", null, raw(manualLayout), { childPrefix: " " });
 }
 /**
 * Build the category/value/series axis XML (empty for pie/doughnut). Resolves combo-chart
@@ -4745,97 +5216,132 @@ function makeChartAxesXml(rel, usesSecondaryValAxis, usesSecondaryCatAxis, prima
 	return strXml;
 }
 /**
-* Build the plotArea properties (data table, fill, border), close plotArea, then the legend.
+* The `<c:spPr>` shared by the plot area and the chart space: a stated fill or none, a border
+* or an explicit no-line, and an empty effect list. The two differ only in how far in they are
+* indented, which is what `fmt` and `effectIndent` carry.
 */
-function makeChartPlotAreaPropsXml(rel) {
-	const plotArea = rel.opts.plotArea ?? {};
-	let strXml = "";
-	if (rel.opts.showDataTable) {
-		strXml += "<c:dTable>";
-		strXml += `  <c:showHorzBorder val="${!rel.opts.showDataTableHorzBorder ? 0 : 1}"/>`;
-		strXml += `  <c:showVertBorder val="${!rel.opts.showDataTableVertBorder ? 0 : 1}"/>`;
-		strXml += `  <c:showOutline    val="${!rel.opts.showDataTableOutline ? 0 : 1}"/>`;
-		strXml += `  <c:showKeys       val="${!rel.opts.showDataTableKeys ? 0 : 1}"/>`;
-		strXml += "  <c:spPr>";
-		strXml += "    <a:noFill/>";
-		strXml += "    <a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln>";
-		strXml += "    <a:effectLst/>";
-		strXml += "  </c:spPr>";
-		strXml += "  <c:txPr>";
-		strXml += "   <a:bodyPr rot=\"0\" spcFirstLastPara=\"1\" vertOverflow=\"ellipsis\" vert=\"horz\" wrap=\"square\" anchor=\"ctr\" anchorCtr=\"1\"/>";
-		strXml += "   <a:lstStyle/>";
-		strXml += "   <a:p>";
-		strXml += "     <a:pPr rtl=\"0\">";
-		strXml += `       <a:defRPr sz="${ptToHundredths(rel.opts.dataTableFontSize || 12)}" b="0" i="0" u="none" strike="noStrike" kern="1200" baseline="0">`;
-		strXml += "         <a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill>";
-		strXml += "         <a:latin typeface=\"+mn-lt\"/>";
-		strXml += "         <a:ea typeface=\"+mn-ea\"/>";
-		strXml += "         <a:cs typeface=\"+mn-cs\"/>";
-		strXml += "       </a:defRPr>";
-		strXml += "     </a:pPr>";
-		strXml += "    <a:endParaRPr lang=\"en-US\"/>";
-		strXml += "   </a:p>";
-		strXml += " </c:txPr>";
-		strXml += "</c:dTable>";
-	}
-	strXml += "  <c:spPr>";
-	strXml += isStatedFill(plotArea.fill) ? genXmlColorSelection(plotArea.fill) : "<a:noFill/>";
-	strXml += plotArea.border ? `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(plotArea.border, 1))}" cap="flat">${genXmlColorSelection({
-		color: plotArea.border.color ?? "363636",
-		transparency: plotArea.border.transparency
-	})}</a:ln>` : "<a:ln><a:noFill/></a:ln>";
-	strXml += "    <a:effectLst/>";
-	strXml += "  </c:spPr>";
-	strXml += "</c:plotArea>";
-	if (rel.opts.showLegend) {
-		strXml += "<c:legend>";
-		strXml += "<c:legendPos val=\"" + rel.opts.legendPos + "\"/>";
-		if (Array.isArray(rel.opts._type)) {
-			let seriesIdx = 0;
-			rel.opts._type.forEach((type) => {
-				if (type.options?.showLegend === false) for (let i = 0; i < type.data.length; i++) strXml += `<c:legendEntry><c:idx val="${seriesIdx + i}"/><c:delete val="1"/></c:legendEntry>`;
-				seriesIdx += type.data.length;
-			});
-		}
-		const legendLayout = rel.opts.legendLayout;
-		const hasLegendX = legendLayout && typeof legendLayout.x === "number";
-		const hasLegendY = legendLayout && typeof legendLayout.y === "number";
-		const hasLegendW = legendLayout && typeof legendLayout.w === "number";
-		const hasLegendH = legendLayout && typeof legendLayout.h === "number";
-		if (hasLegendX || hasLegendY || hasLegendW || hasLegendH) {
-			let modes = "";
-			let vals = "";
-			if (hasLegendX) {
-				modes += "<c:xMode val=\"edge\"/>";
-				vals += `<c:x val="${legendLayout.x}"/>`;
-			}
-			if (hasLegendY) {
-				modes += "<c:yMode val=\"edge\"/>";
-				vals += `<c:y val="${legendLayout.y}"/>`;
-			}
-			if (hasLegendW) vals += `<c:w val="${legendLayout.w}"/>`;
-			if (hasLegendH) vals += `<c:h val="${legendLayout.h}"/>`;
-			strXml += `<c:layout><c:manualLayout>${modes}${vals}</c:manualLayout></c:layout>`;
-		}
-		strXml += "<c:overlay val=\"0\"/>";
-		if (rel.opts.legendFontFace || rel.opts.legendFontSize || rel.opts.legendColor) {
-			strXml += "<c:txPr>";
-			strXml += "  <a:bodyPr/>";
-			strXml += "  <a:lstStyle/>";
-			strXml += "  <a:p>";
-			strXml += "    <a:pPr>";
-			strXml += rel.opts.legendFontSize ? `<a:defRPr sz="${ptToHundredths(rel.opts.legendFontSize)}">` : "<a:defRPr>";
-			if (rel.opts.legendColor) strXml += genXmlColorSelection(rel.opts.legendColor);
-			if (rel.opts.legendFontFace) strXml += createChartTextFonts(rel.opts.legendFontFace);
-			strXml += "      </a:defRPr>";
-			strXml += "    </a:pPr>";
-			strXml += "    <a:endParaRPr lang=\"en-US\"/>";
-			strXml += "  </a:p>";
-			strXml += "</c:txPr>";
+function chartShapeProps(fill, border, effectIndent, fmt) {
+	return el("c:spPr", null, [
+		raw(isStatedFill(fill) ? genXmlColorSelection(fill) : voidEl("a:noFill")),
+		raw(border ? el("a:ln", {
+			w: ptsToEmuLenient(resolveBorderWidth(border, 1)),
+			cap: "flat"
+		}, raw(genXmlColorSelection({
+			color: border.color ?? "363636",
+			transparency: border.transparency
+		}))) : el("a:ln", null, raw(voidEl("a:noFill")))),
+		raw(voidEl("a:effectLst", null, { openPrefix: effectIndent }))
+	], fmt);
+}
+/**
+* The `<c:dTable>` grid drawn under the plot. Sits between the last `</c:valAx>` and the plot
+* area's own `<c:spPr>`.
+*/
+function makeDataTableXml(rel) {
+	const spPr = el("c:spPr", null, [
+		raw(voidEl("a:noFill", null, { openPrefix: "    " })),
+		raw(dimmedTextLine(15e3, 85e3, { openPrefix: "    " })),
+		raw(voidEl("a:effectLst", null, { openPrefix: "    " }))
+	], {
+		openPrefix: "  ",
+		closePrefix: "  "
+	});
+	const defRPr = el("a:defRPr", {
+		sz: ptToHundredths(rel.opts.dataTableFontSize || 12),
+		b: 0,
+		i: 0,
+		u: "none",
+		strike: "noStrike",
+		kern: 1200,
+		baseline: 0
+	}, [
+		raw("         " + dimmedTextFill(65e3, 35e3)),
+		raw(voidEl("a:latin", { typeface: "+mn-lt" }, { openPrefix: "         " })),
+		raw(voidEl("a:ea", { typeface: "+mn-ea" }, { openPrefix: "         " })),
+		raw(voidEl("a:cs", { typeface: "+mn-cs" }, { openPrefix: "         " }))
+	], {
+		openPrefix: "       ",
+		closePrefix: "       "
+	});
+	const txPr = el("c:txPr", null, [
+		raw(voidEl("a:bodyPr", {
+			rot: 0,
+			spcFirstLastPara: 1,
+			vertOverflow: "ellipsis",
+			vert: "horz",
+			wrap: "square",
+			anchor: "ctr",
+			anchorCtr: 1
+		}, { openPrefix: "   " })),
+		raw(voidEl("a:lstStyle", null, { openPrefix: "   " })),
+		raw(el("a:p", null, [raw(el("a:pPr", { rtl: 0 }, raw(defRPr), {
+			openPrefix: "     ",
+			closePrefix: "     "
+		})), raw(voidEl("a:endParaRPr", { lang: "en-US" }, { openPrefix: "    " }))], {
+			openPrefix: "   ",
+			closePrefix: "   "
+		}))
+	], {
+		openPrefix: "  ",
+		closePrefix: " "
+	});
+	return el("c:dTable", null, [
+		raw(voidEl("c:showHorzBorder", { val: !rel.opts.showDataTableHorzBorder ? 0 : 1 }, { openPrefix: "  " })),
+		raw(voidEl("c:showVertBorder", { val: !rel.opts.showDataTableVertBorder ? 0 : 1 }, { openPrefix: "  " })),
+		raw(`  <c:showOutline    val="${!rel.opts.showDataTableOutline ? 0 : 1}"/>`),
+		raw(`  <c:showKeys       val="${!rel.opts.showDataTableKeys ? 0 : 1}"/>`),
+		raw(spPr),
+		raw(txPr)
+	]);
+}
+/**
+* The `<c:legend>`: position, the entries a combo chart deletes, an optional manual placement,
+* and the text properties when any legend font option is set.
+*/
+function makeLegendXml(rel) {
+	let entries = "";
+	if (Array.isArray(rel.opts._type)) {
+		let seriesIdx = 0;
+		for (const type of rel.opts._type) {
+			if (type.options?.showLegend === false) for (let i = 0; i < type.data.length; i++) entries += el("c:legendEntry", null, [raw(voidEl("c:idx", { val: seriesIdx + i })), raw(voidEl("c:delete", { val: 1 }))]);
+			seriesIdx += type.data.length;
 		}
-		strXml += "</c:legend>";
 	}
-	return strXml;
+	const legendLayout = rel.opts.legendLayout;
+	const placed = (key) => typeof legendLayout?.[key] === "number";
+	let layout = "";
+	if (placed("x") || placed("y") || placed("w") || placed("h")) {
+		const modes = (placed("x") ? voidEl("c:xMode", { val: "edge" }) : "") + (placed("y") ? voidEl("c:yMode", { val: "edge" }) : "");
+		const vals = [
+			"x",
+			"y",
+			"w",
+			"h"
+		].filter(placed).map((key) => voidEl(`c:${key}`, { val: legendLayout?.[key] })).join("");
+		layout = el("c:layout", null, raw(el("c:manualLayout", null, raw(modes + vals))));
+	}
+	let txPr = "";
+	if (rel.opts.legendFontFace || rel.opts.legendFontSize || rel.opts.legendColor) {
+		const defRPr = el("a:defRPr", { sz: rel.opts.legendFontSize ? ptToHundredths(rel.opts.legendFontSize) : void 0 }, [raw(rel.opts.legendColor ? genXmlColorSelection(rel.opts.legendColor) : ""), raw(rel.opts.legendFontFace ? createChartTextFonts(rel.opts.legendFontFace) : "")], { closePrefix: "      " });
+		txPr = el("c:txPr", null, [
+			raw(voidEl("a:bodyPr", null, { openPrefix: "  " })),
+			raw(voidEl("a:lstStyle", null, { openPrefix: "  " })),
+			raw(el("a:p", null, [raw(el("a:pPr", null, raw(defRPr), {
+				openPrefix: "    ",
+				closePrefix: "    "
+			})), raw(voidEl("a:endParaRPr", { lang: "en-US" }, { openPrefix: "    " }))], {
+				openPrefix: "  ",
+				closePrefix: "  "
+			}))
+		]);
+	}
+	return el("c:legend", null, [
+		raw(voidEl("c:legendPos", { val: rel.opts.legendPos })),
+		raw(entries),
+		raw(layout),
+		raw(voidEl("c:overlay", { val: 0 })),
+		raw(txPr)
+	]);
 }
 /**
 * Main entry point method for create charts
@@ -4844,16 +5350,16 @@ function makeChartPlotAreaPropsXml(rel) {
 * @return {string} XML
 */
 function makeXmlCharts(rel) {
-	let strXml = XML_DECL;
 	const chartArea = rel.opts.chartArea ?? {};
+	const plotAreaOpts = rel.opts.plotArea ?? {};
 	let usesSecondaryValAxis = false;
 	let usesSecondaryCatAxis = false;
 	let primaryCatAxisValType = null;
 	let secondaryCatAxisValType = null;
 	let primaryCatAxisHasCategoryChart = false;
 	let secondaryCatAxisHasCategoryChart = false;
-	strXml += makeChartHeaderXml(rel);
-	if (Array.isArray(rel.opts._type)) rel.opts._type.forEach((type) => {
+	let plots = "";
+	if (Array.isArray(rel.opts._type)) for (const type of rel.opts._type) {
 		const options = {
 			...rel.opts,
 			...type.options
@@ -4869,27 +5375,36 @@ function makeXmlCharts(rel) {
 			else secondaryCatAxisHasCategoryChart = true;
 		} else if (usesValueXAxis) primaryCatAxisValType = subType;
 		else primaryCatAxisHasCategoryChart = true;
-		strXml += makeChartType(subType, type.data, options, valAxisId, catAxisId);
-	});
-	else if (rel.opts._type) strXml += makeChartType(rel.opts._type, rel.data, rel.opts, AXIS_ID_VALUE_PRIMARY, AXIS_ID_CATEGORY_PRIMARY);
-	strXml += makeChartAxesXml(rel, usesSecondaryValAxis, usesSecondaryCatAxis, primaryCatAxisValType, secondaryCatAxisValType, primaryCatAxisHasCategoryChart, secondaryCatAxisHasCategoryChart);
-	strXml += makeChartPlotAreaPropsXml(rel);
-	strXml += "  <c:plotVisOnly val=\"1\"/>";
-	strXml += "  <c:dispBlanksAs val=\"" + rel.opts.displayBlanksAs + "\"/>";
-	if (rel.opts._type === "scatter") strXml += "<c:showDLblsOverMax val=\"1\"/>";
-	strXml += "</c:chart>";
-	strXml += "<c:spPr>";
-	strXml += isStatedFill(chartArea.fill) ? genXmlColorSelection(chartArea.fill) : "<a:noFill/>";
-	strXml += chartArea.border ? `<a:ln w="${ptsToEmuLenient(resolveBorderWidth(chartArea.border, 1))}" cap="flat">${genXmlColorSelection({
-		color: chartArea.border.color ?? "363636",
-		transparency: chartArea.border.transparency
-	})}</a:ln>` : "<a:ln><a:noFill/></a:ln>";
-	strXml += "  <a:effectLst/>";
-	strXml += "</c:spPr>";
-	strXml += "<c:externalData r:id=\"rId1\"><c:autoUpdate val=\"0\"/></c:externalData>";
-	strXml += genXmlChartMetadata(rel.opts.metadata);
-	strXml += "</c:chartSpace>";
-	return strXml;
+		plots += makeChartType(subType, type.data, options, valAxisId, catAxisId);
+	}
+	else if (rel.opts._type) plots = makeChartType(rel.opts._type, rel.data, rel.opts, AXIS_ID_VALUE_PRIMARY, AXIS_ID_CATEGORY_PRIMARY);
+	const axes = makeChartAxesXml(rel, usesSecondaryValAxis, usesSecondaryCatAxis, primaryCatAxisValType, secondaryCatAxisValType, primaryCatAxisHasCategoryChart, secondaryCatAxisHasCategoryChart);
+	const plotArea = el("c:plotArea", null, [
+		raw(makePlotAreaLayoutXml(rel)),
+		raw(plots),
+		raw(axes),
+		rel.opts.showDataTable ? raw(makeDataTableXml(rel)) : null,
+		raw(chartShapeProps(plotAreaOpts.fill, plotAreaOpts.border, "    ", {
+			openPrefix: "  ",
+			closePrefix: "  "
+		}))
+	]);
+	const chart = el("c:chart", null, [
+		raw(makeChartHeaderXml(rel)),
+		raw(plotArea),
+		rel.opts.showLegend ? raw(makeLegendXml(rel)) : null,
+		raw(voidEl("c:plotVisOnly", { val: 1 }, { openPrefix: "  " })),
+		raw(voidEl("c:dispBlanksAs", { val: rel.opts.displayBlanksAs }, { openPrefix: "  " })),
+		rel.opts._type === "scatter" ? raw(voidEl("c:showDLblsOverMax", { val: 1 })) : null
+	]);
+	return XML_DECL + el("c:chartSpace", CHART_SPACE_NS, [
+		raw(voidEl("c:date1904", { val: 0 })),
+		raw(voidEl("c:roundedCorners", { val: chartArea.roundedCorners ? 1 : 0 })),
+		raw(chart),
+		raw(chartShapeProps(chartArea.fill, chartArea.border, "  ", {})),
+		raw(el("c:externalData", { "r:id": "rId1" }, raw(voidEl("c:autoUpdate", { val: 0 })))),
+		raw(genXmlChartMetadata(rel.opts.metadata))
+	]);
 }
 /**
 * Stable ts-pptx vendor GUID identifying the chart-metadata extension on `c:chartSpace/c:extLst`.
@@ -4944,7 +5459,7 @@ function genXmlChartMetadata(metadata) {
 * @return {string} XML chart
 */
 function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
-	const valFmtCode = encodeXmlEntities(opts.valLabelFormatCode || opts.dataTableFormatCode || opts.dataLabelFormatCode || "General");
+	const valFmtCode = opts.valLabelFormatCode || opts.dataTableFormatCode || opts.dataLabelFormatCode || "General";
 	switch (chartType) {
 		case "area":
 		case "bar":
@@ -5328,6 +5843,13 @@ function makeChartExStyleXml() {
 //#region src/gen/chart/embed-xlsx.ts
 /** MS chart-extension relationship types (chartEx style + color-style sidecar parts). */
 const MS_CHART_REL = "http://schemas.microsoft.com/office/2011/relationships/";
+/** The SpreadsheetML namespace every part of the embedded workbook is written in. */
+const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+/** OPC content types, and the prefix the four SpreadsheetML part types share. */
+const CT_NS = "http://schemas.openxmlformats.org/package/2006/content-types";
+const SML_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.";
+/** One `<si>` shared string carrying literal text. */
+const sharedString = (text) => el("si", null, raw(el("t", null, text)));
 function relationship$2(id, type, target) {
 	return voidEl("Relationship", {
 		Id: id,
@@ -5340,6 +5862,17 @@ function relationships(rels) {
 	return el("Relationships", { xmlns: PACKAGE_REL_NS }, rels.map(raw));
 }
 /**
+* The embedded workbook's style sheet, captured verbatim from an Excel-authored chart workbook.
+* @raw-xml-asset
+*/
+const XLSX_STYLES_XML = "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\"><numFmts count=\"1\"><numFmt numFmtId=\"0\" formatCode=\"General\"/></numFmts><fonts count=\"4\"><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"10\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"18\"/><color indexed=\"8\"/><name val=\"Arial\"/></font></fonts><fills count=\"2\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill></fills><borders count=\"1\"><border><left/><right/><top/><bottom/><diagonal/></border></borders><dxfs count=\"0\"/><tableStyles count=\"0\"/><colors><indexedColors><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ffff0000\"/><rgbColor rgb=\"ff00ff00\"/><rgbColor rgb=\"ff0000ff\"/><rgbColor rgb=\"ffffff00\"/><rgbColor rgb=\"ffff00ff\"/><rgbColor rgb=\"ff00ffff\"/><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ff878787\"/><rgbColor rgb=\"fff9f9f9\"/></indexedColors></colors></styleSheet>\n";
+/**
+* The Office theme the embedded workbook ships, captured verbatim. PowerPoint reads it when a user
+* opens the chart's data, so it has to be exactly the bytes Office writes.
+* @raw-xml-asset
+*/
+const XLSX_THEME_XML = "<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\"><a:themeElements><a:clrScheme name=\"Office\"><a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1><a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1><a:dk2><a:srgbClr val=\"44546A\"/></a:dk2><a:lt2><a:srgbClr val=\"E7E6E6\"/></a:lt2><a:accent1><a:srgbClr val=\"4472C4\"/></a:accent1><a:accent2><a:srgbClr val=\"ED7D31\"/></a:accent2><a:accent3><a:srgbClr val=\"A5A5A5\"/></a:accent3><a:accent4><a:srgbClr val=\"FFC000\"/></a:accent4><a:accent5><a:srgbClr val=\"5B9BD5\"/></a:accent5><a:accent6><a:srgbClr val=\"70AD47\"/></a:accent6><a:hlink><a:srgbClr val=\"0563C1\"/></a:hlink><a:folHlink><a:srgbClr val=\"954F72\"/></a:folHlink></a:clrScheme><a:fontScheme name=\"Office\"><a:majorFont><a:latin typeface=\"Calibri Light\" panose=\"020F0302020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic Light\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian Light\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Times New Roman\"/><a:font script=\"Hebr\" typeface=\"Times New Roman\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"MoolBoran\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Times New Roman\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:majorFont><a:minorFont><a:latin typeface=\"Calibri\" panose=\"020F0502020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Arial\"/><a:font script=\"Hebr\" typeface=\"Arial\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"DaunPenh\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Arial\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:minorFont></a:fontScheme><a:fmtScheme name=\"Office\"><a:fillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"110000\"/><a:satMod val=\"105000\"/><a:tint val=\"67000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"103000\"/><a:tint val=\"73000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"109000\"/><a:tint val=\"81000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:satMod val=\"103000\"/><a:lumMod val=\"102000\"/><a:tint val=\"94000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:satMod val=\"110000\"/><a:lumMod val=\"100000\"/><a:shade val=\"100000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"99000\"/><a:satMod val=\"120000\"/><a:shade val=\"78000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w=\"6350\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"12700\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"19050\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"57150\" dist=\"19050\" dir=\"5400000\" algn=\"ctr\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"63000\"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"><a:tint val=\"95000\"/><a:satMod val=\"170000\"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"93000\"/><a:satMod val=\"150000\"/><a:shade val=\"98000\"/><a:lumMod val=\"102000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:tint val=\"98000\"/><a:satMod val=\"130000\"/><a:shade val=\"90000\"/><a:lumMod val=\"103000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"63000\"/><a:satMod val=\"120000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/><a:extLst><a:ext uri=\"{05A4C25C-085E-4340-85A3-A5531E510DB2}\"><thm15:themeFamily xmlns:thm15=\"http://schemas.microsoft.com/office/thememl/2012/main\" name=\"Office Theme\" id=\"{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}\" vid=\"{4A3C46E8-61CC-4603-A589-7422A47A8E4A}\"/></a:ext></a:extLst></a:theme>";
+/**
 * Build the chart's embedded Excel workbook as a standalone OPC package and
 * return its bytes — the data source PowerPoint opens when a user edits the
 * chart's data. Pure (no zip side effects), so both the package write path
@@ -5354,24 +5887,108 @@ function buildEmbeddedWorksheet(chartObject) {
 		const zipExcel = new ZipWriter();
 		const intBubbleCols = (data.length - 1) * 2 + 1;
 		const IS_MULTI_CAT_AXES = (data[0]?.labels?.length ?? 0) > 1;
-		zipExcel.add("[Content_Types].xml", XML_DECL + "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">  <Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>  <Default Extension=\"xml\" ContentType=\"application/xml\"/>  <Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>  <Override PartName=\"/xl/worksheets/sheet1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/>  <Override PartName=\"/xl/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/>  <Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/>  <Override PartName=\"/xl/sharedStrings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml\"/>  <Override PartName=\"/xl/tables/table1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml\"/>  <Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/>  <Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/></Types>\n");
-		zipExcel.add("_rels/.rels", XML_DECL + relationships([
-			relationship$2("rId1", PACKAGE_REL_NS + "/metadata/core-properties", "docProps/core.xml"),
-			relationship$2("rId2", OFFICE_REL + "extended-properties", "docProps/app.xml"),
-			relationship$2("rId3", OFFICE_REL + "officeDocument", "xl/workbook.xml")
-		]) + "\n");
-		zipExcel.add("docProps/app.xml", XML_DECL + "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\"><Application>Microsoft Macintosh Excel</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size=\"2\" baseType=\"variant\"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size=\"1\" baseType=\"lpstr\"><vt:lpstr>Sheet1</vt:lpstr></vt:vector></TitlesOfParts><Company></Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>16.0300</AppVersion></Properties>\n");
-		zipExcel.add("docProps/core.xml", XML_DECL + "<cp:coreProperties xmlns:cp=\"http://schemas.openxmlformats.org/package/2006/metadata/core-properties\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcmitype=\"http://purl.org/dc/dcmitype/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><dc:creator>TsPptx</dc:creator><cp:lastModifiedBy>TsPptx</cp:lastModifiedBy><dcterms:created xsi:type=\"dcterms:W3CDTF\">" + (/* @__PURE__ */ new Date()).toISOString() + "</dcterms:created><dcterms:modified xsi:type=\"dcterms:W3CDTF\">" + (/* @__PURE__ */ new Date()).toISOString() + "</dcterms:modified></cp:coreProperties>");
-		zipExcel.add("xl/_rels/workbook.xml.rels", XML_DECL + relationships([
-			relationship$2("rId3", OFFICE_REL + "styles", "styles.xml"),
-			relationship$2("rId2", OFFICE_REL + "theme", "theme/theme1.xml"),
-			relationship$2("rId1", OFFICE_REL + "worksheet", "worksheets/sheet1.xml"),
-			relationship$2("rId4", OFFICE_REL + "sharedStrings", "sharedStrings.xml")
-		]));
-		zipExcel.add("xl/styles.xml", XML_DECL + "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\"><numFmts count=\"1\"><numFmt numFmtId=\"0\" formatCode=\"General\"/></numFmts><fonts count=\"4\"><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"10\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"18\"/><color indexed=\"8\"/><name val=\"Arial\"/></font></fonts><fills count=\"2\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill></fills><borders count=\"1\"><border><left/><right/><top/><bottom/><diagonal/></border></borders><dxfs count=\"0\"/><tableStyles count=\"0\"/><colors><indexedColors><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ffff0000\"/><rgbColor rgb=\"ff00ff00\"/><rgbColor rgb=\"ff0000ff\"/><rgbColor rgb=\"ffffff00\"/><rgbColor rgb=\"ffff00ff\"/><rgbColor rgb=\"ff00ffff\"/><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ff878787\"/><rgbColor rgb=\"fff9f9f9\"/></indexedColors></colors></styleSheet>\n");
-		zipExcel.add("xl/theme/theme1.xml", XML_DECL + "<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\"><a:themeElements><a:clrScheme name=\"Office\"><a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1><a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1><a:dk2><a:srgbClr val=\"44546A\"/></a:dk2><a:lt2><a:srgbClr val=\"E7E6E6\"/></a:lt2><a:accent1><a:srgbClr val=\"4472C4\"/></a:accent1><a:accent2><a:srgbClr val=\"ED7D31\"/></a:accent2><a:accent3><a:srgbClr val=\"A5A5A5\"/></a:accent3><a:accent4><a:srgbClr val=\"FFC000\"/></a:accent4><a:accent5><a:srgbClr val=\"5B9BD5\"/></a:accent5><a:accent6><a:srgbClr val=\"70AD47\"/></a:accent6><a:hlink><a:srgbClr val=\"0563C1\"/></a:hlink><a:folHlink><a:srgbClr val=\"954F72\"/></a:folHlink></a:clrScheme><a:fontScheme name=\"Office\"><a:majorFont><a:latin typeface=\"Calibri Light\" panose=\"020F0302020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic Light\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian Light\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Times New Roman\"/><a:font script=\"Hebr\" typeface=\"Times New Roman\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"MoolBoran\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Times New Roman\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:majorFont><a:minorFont><a:latin typeface=\"Calibri\" panose=\"020F0502020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Arial\"/><a:font script=\"Hebr\" typeface=\"Arial\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"DaunPenh\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Arial\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:minorFont></a:fontScheme><a:fmtScheme name=\"Office\"><a:fillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"110000\"/><a:satMod val=\"105000\"/><a:tint val=\"67000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"103000\"/><a:tint val=\"73000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"109000\"/><a:tint val=\"81000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:satMod val=\"103000\"/><a:lumMod val=\"102000\"/><a:tint val=\"94000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:satMod val=\"110000\"/><a:lumMod val=\"100000\"/><a:shade val=\"100000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"99000\"/><a:satMod val=\"120000\"/><a:shade val=\"78000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w=\"6350\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"12700\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"19050\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"57150\" dist=\"19050\" dir=\"5400000\" algn=\"ctr\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"63000\"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"><a:tint val=\"95000\"/><a:satMod val=\"170000\"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"93000\"/><a:satMod val=\"150000\"/><a:shade val=\"98000\"/><a:lumMod val=\"102000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:tint val=\"98000\"/><a:satMod val=\"130000\"/><a:shade val=\"90000\"/><a:lumMod val=\"103000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"63000\"/><a:satMod val=\"120000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/><a:extLst><a:ext uri=\"{05A4C25C-085E-4340-85A3-A5531E510DB2}\"><thm15:themeFamily xmlns:thm15=\"http://schemas.microsoft.com/office/thememl/2012/main\" name=\"Office Theme\" id=\"{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}\" vid=\"{4A3C46E8-61CC-4603-A589-7422A47A8E4A}\"/></a:ext></a:extLst></a:theme>");
-		zipExcel.add("xl/workbook.xml", XML_DECL + "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" mc:Ignorable=\"x15\" xmlns:x15=\"http://schemas.microsoft.com/office/spreadsheetml/2010/11/main\"><fileVersion appName=\"xl\" lastEdited=\"7\" lowestEdited=\"6\" rupBuild=\"10507\"/><workbookPr/><bookViews><workbookView xWindow=\"0\" yWindow=\"500\" windowWidth=\"20960\" windowHeight=\"15960\"/></bookViews><sheets><sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/></sheets><calcPr calcId=\"0\" concurrentCalc=\"0\"/></workbook>\n");
-		zipExcel.add("xl/worksheets/_rels/sheet1.xml.rels", XML_DECL + relationships([relationship$2("rId1", OFFICE_REL + "table", "../tables/table1.xml")]) + "\n");
+		{
+			const override = (partName, contentType) => voidEl("Override", {
+				PartName: partName,
+				ContentType: contentType
+			}, { openPrefix: "  " });
+			zipExcel.add("[Content_Types].xml", XML_DECL + el("Types", { xmlns: CT_NS }, [
+				raw(voidEl("Default", {
+					Extension: "rels",
+					ContentType: "application/vnd.openxmlformats-package.relationships+xml"
+				}, { openPrefix: "  " })),
+				raw(voidEl("Default", {
+					Extension: "xml",
+					ContentType: "application/xml"
+				}, { openPrefix: "  " })),
+				raw(override("/xl/workbook.xml", SML_CT + "sheet.main+xml")),
+				raw(override("/xl/worksheets/sheet1.xml", SML_CT + "worksheet+xml")),
+				raw(override("/xl/theme/theme1.xml", "application/vnd.openxmlformats-officedocument.theme+xml")),
+				raw(override("/xl/styles.xml", SML_CT + "styles+xml")),
+				raw(override("/xl/sharedStrings.xml", SML_CT + "sharedStrings+xml")),
+				raw(override("/xl/tables/table1.xml", SML_CT + "table+xml")),
+				raw(override("/docProps/core.xml", "application/vnd.openxmlformats-package.core-properties+xml")),
+				raw(override("/docProps/app.xml", "application/vnd.openxmlformats-officedocument.extended-properties+xml"))
+			]) + "\n");
+			zipExcel.add("_rels/.rels", XML_DECL + relationships([
+				relationship$2("rId1", PACKAGE_REL_NS + "/metadata/core-properties", "docProps/core.xml"),
+				relationship$2("rId2", OFFICE_REL + "extended-properties", "docProps/app.xml"),
+				relationship$2("rId3", OFFICE_REL + "officeDocument", "xl/workbook.xml")
+			]) + "\n");
+			const headingPairs = el("vt:vector", {
+				size: 2,
+				baseType: "variant"
+			}, [raw(el("vt:variant", null, raw(el("vt:lpstr", null, "Worksheets")))), raw(el("vt:variant", null, raw(el("vt:i4", null, 1))))]);
+			zipExcel.add("docProps/app.xml", XML_DECL + el("Properties", {
+				xmlns: "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties",
+				"xmlns:vt": "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
+			}, [
+				raw(el("Application", null, "Microsoft Macintosh Excel")),
+				raw(el("DocSecurity", null, 0)),
+				raw(el("ScaleCrop", null, "false")),
+				raw(el("HeadingPairs", null, raw(headingPairs))),
+				raw(el("TitlesOfParts", null, raw(el("vt:vector", {
+					size: 1,
+					baseType: "lpstr"
+				}, raw(el("vt:lpstr", null, "Sheet1")))))),
+				raw(el("Company", null)),
+				raw(el("LinksUpToDate", null, "false")),
+				raw(el("SharedDoc", null, "false")),
+				raw(el("HyperlinksChanged", null, "false")),
+				raw(el("AppVersion", null, "16.0300"))
+			]) + "\n");
+			zipExcel.add("docProps/core.xml", XML_DECL + el("cp:coreProperties", {
+				"xmlns:cp": "http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
+				"xmlns:dc": "http://purl.org/dc/elements/1.1/",
+				"xmlns:dcterms": "http://purl.org/dc/terms/",
+				"xmlns:dcmitype": "http://purl.org/dc/dcmitype/",
+				"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance"
+			}, [
+				raw(el("dc:creator", null, "TsPptx")),
+				raw(el("cp:lastModifiedBy", null, "TsPptx")),
+				raw(el("dcterms:created", { "xsi:type": "dcterms:W3CDTF" }, (/* @__PURE__ */ new Date()).toISOString())),
+				raw(el("dcterms:modified", { "xsi:type": "dcterms:W3CDTF" }, (/* @__PURE__ */ new Date()).toISOString()))
+			]));
+			zipExcel.add("xl/_rels/workbook.xml.rels", XML_DECL + relationships([
+				relationship$2("rId3", OFFICE_REL + "styles", "styles.xml"),
+				relationship$2("rId2", OFFICE_REL + "theme", "theme/theme1.xml"),
+				relationship$2("rId1", OFFICE_REL + "worksheet", "worksheets/sheet1.xml"),
+				relationship$2("rId4", OFFICE_REL + "sharedStrings", "sharedStrings.xml")
+			]));
+			zipExcel.add("xl/styles.xml", XML_DECL + XLSX_STYLES_XML);
+			zipExcel.add("xl/theme/theme1.xml", XML_DECL + XLSX_THEME_XML);
+			zipExcel.add("xl/workbook.xml", XML_DECL + el("workbook", {
+				xmlns: SML_NS,
+				"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+				"xmlns:mc": "http://schemas.openxmlformats.org/markup-compatibility/2006",
+				"mc:Ignorable": "x15",
+				"xmlns:x15": "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"
+			}, [
+				raw(voidEl("fileVersion", {
+					appName: "xl",
+					lastEdited: 7,
+					lowestEdited: 6,
+					rupBuild: 10507
+				})),
+				raw(voidEl("workbookPr")),
+				raw(el("bookViews", null, raw(voidEl("workbookView", {
+					xWindow: 0,
+					yWindow: 500,
+					windowWidth: 20960,
+					windowHeight: 15960
+				})))),
+				raw(el("sheets", null, raw(voidEl("sheet", {
+					name: "Sheet1",
+					sheetId: 1,
+					"r:id": "rId1"
+				})))),
+				raw(voidEl("calcPr", {
+					calcId: 0,
+					concurrentCalc: 0
+				}))
+			]) + "\n");
+			zipExcel.add("xl/worksheets/_rels/sheet1.xml.rels", XML_DECL + relationships([relationship$2("rId1", OFFICE_REL + "table", "../tables/table1.xml")]) + "\n");
+		}
 		zipExcel.add("xl/sharedStrings.xml", buildXlsxSharedStrings(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES));
 		zipExcel.add("xl/tables/table1.xml", buildXlsxTable(chartObject, data, intBubbleCols));
 		zipExcel.add("xl/worksheets/sheet1.xml", buildXlsxSheet(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES));
@@ -5382,167 +5999,201 @@ function buildEmbeddedWorksheet(chartObject) {
 * Build the embedded workbook's `xl/sharedStrings.xml` (series names + category labels).
 */
 function buildXlsxSharedStrings(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES) {
-	let strSharedStrings = XML_DECL;
-	if (chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D") strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${intBubbleCols}" uniqueCount="${intBubbleCols}">`;
-	else if (chartObject.opts._type === "scatter") strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${data.length}" uniqueCount="${data.length}">`;
+	const isBubble = chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D";
+	const isScatter = chartObject.opts._type === "scatter";
+	let count;
+	let uniqueCount;
+	let blank = "";
+	if (isBubble) count = uniqueCount = intBubbleCols;
+	else if (isScatter) count = uniqueCount = data.length;
 	else if (IS_MULTI_CAT_AXES) {
 		let totCount = data.length + 1;
 		dataLabels(data[0]).forEach((arrLabel) => totCount += arrLabel.filter((label) => label && label !== "").length);
-		strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${totCount}" uniqueCount="${totCount}">`;
-		strSharedStrings += "<si><t/></si>";
+		count = uniqueCount = totCount;
+		blank = el("si", null, raw(voidEl("t")));
 	} else {
-		const totCount = data.length + dataLabels(data[0]).length * firstLabelGroup(data[0]).length + dataLabels(data[0]).length;
-		const unqCount = data.length + dataLabels(data[0]).length * firstLabelGroup(data[0]).length + 1;
-		strSharedStrings += `<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${totCount}" uniqueCount="${unqCount}">`;
-		strSharedStrings += "<si><t xml:space=\"preserve\"></t></si>";
-	}
-	if (chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D") data.forEach((objData, idx) => {
-		if (idx === 0) strSharedStrings += "<si><t>X-Axis</t></si>";
-		else {
-			strSharedStrings += `<si><t>${encodeXmlEntities(objData.name || `Y-Axis${idx}`)}</t></si>`;
-			strSharedStrings += `<si><t>${encodeXmlEntities(`Size${idx}`)}</t></si>`;
-		}
-	});
-	else data.forEach((objData) => {
-		strSharedStrings += `<si><t>${encodeXmlEntities((objData.name || " ").replace("X-Axis", "X-Values"))}</t></si>`;
-	});
-	if (chartObject.opts._type !== "bubble" && chartObject.opts._type !== "bubble3D" && chartObject.opts._type !== "scatter") dataLabels(data[0]).slice().reverse().forEach((labelsGroup) => {
-		labelsGroup.filter((label) => label && label !== "").forEach((label) => {
-			strSharedStrings += `<si><t>${encodeXmlEntities(label)}</t></si>`;
-		});
-	});
-	strSharedStrings += "</sst>\n";
-	return strSharedStrings;
+		count = data.length + dataLabels(data[0]).length * firstLabelGroup(data[0]).length + dataLabels(data[0]).length;
+		uniqueCount = data.length + dataLabels(data[0]).length * firstLabelGroup(data[0]).length + 1;
+		blank = el("si", null, raw(el("t", { "xml:space": "preserve" })));
+	}
+	const names = isBubble ? data.map((objData, idx) => idx === 0 ? sharedString("X-Axis") : sharedString(objData.name || `Y-Axis${idx}`) + sharedString(`Size${idx}`)).join("") : data.map((objData) => sharedString((objData.name || " ").replace("X-Axis", "X-Values"))).join("");
+	const labels = isBubble || isScatter ? "" : dataLabels(data[0]).slice().reverse().map((labelsGroup) => labelsGroup.filter((label) => label && label !== "").map((label) => sharedString(label)).join("")).join("");
+	return XML_DECL + el("sst", {
+		xmlns: SML_NS,
+		count,
+		uniqueCount
+	}, [
+		raw(blank),
+		raw(names),
+		raw(labels)
+	]) + "\n";
 }
 /**
 * Build the embedded workbook's `xl/tables/table1.xml` (the data table over the sheet range).
 */
 function buildXlsxTable(chartObject, data, intBubbleCols) {
-	let strTableXml = XML_DECL;
+	const labelCols = dataLabels(data[0]).length;
+	let ref;
+	let columns;
 	if (chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D") {
-		strTableXml += `<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="1" name="Table1" displayName="Table1" ref="A1:${getExcelColName(intBubbleCols)}${intBubbleCols}" totalsRowShown="0">`;
-		strTableXml += `<tableColumns count="${intBubbleCols}">`;
+		ref = `A1:${getExcelColName(intBubbleCols)}${intBubbleCols}`;
 		let idxColLtr = 1;
-		data.forEach((obj, idx) => {
-			if (idx === 0) strTableXml += `<tableColumn id="${idx + 1}" name="X-Values"/>`;
-			else {
-				strTableXml += `<tableColumn id="${idx + idxColLtr}" name="${obj.name}"/>`;
-				idxColLtr++;
-				strTableXml += `<tableColumn id="${idx + idxColLtr}" name="Size${idx}"/>`;
-			}
-		});
+		columns = data.map((obj, idx) => {
+			if (idx === 0) return voidEl("tableColumn", {
+				id: idx + 1,
+				name: "X-Values"
+			});
+			const nameCol = voidEl("tableColumn", {
+				id: idx + idxColLtr,
+				name: obj.name
+			});
+			idxColLtr++;
+			return nameCol + voidEl("tableColumn", {
+				id: idx + idxColLtr,
+				name: `Size${idx}`
+			});
+		}).join("");
 	} else if (chartObject.opts._type === "scatter") {
-		strTableXml += `<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="1" name="Table1" displayName="Table1" ref="A1:${getExcelColName(data.length)}${dataValues(data[0]).length + 1}" totalsRowShown="0">`;
-		strTableXml += `<tableColumns count="${data.length}">`;
-		data.forEach((_obj, idx) => {
-			strTableXml += `<tableColumn id="${idx + 1}" name="${idx === 0 ? "X-Values" : "Y-Value "}${idx}"/>`;
-		});
+		ref = `A1:${getExcelColName(data.length)}${dataValues(data[0]).length + 1}`;
+		columns = data.map((_obj, idx) => voidEl("tableColumn", {
+			id: idx + 1,
+			name: `${idx === 0 ? "X-Values" : "Y-Value "}${idx}`
+		})).join("");
 	} else {
-		strTableXml += `<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="1" name="Table1" displayName="Table1" ref="A1:${getExcelColName(data.length + dataLabels(data[0]).length)}${firstLabelGroup(data[0]).length + 1}" totalsRowShown="0">`;
-		strTableXml += `<tableColumns count="${data.length + dataLabels(data[0]).length}">`;
-		dataLabels(data[0]).forEach((_labelsGroup, idx) => {
-			strTableXml += `<tableColumn id="${idx + 1}" name="Column${idx + 1}"/>`;
-		});
-		data.forEach((obj, idx) => {
-			strTableXml += `<tableColumn id="${idx + dataLabels(data[0]).length + 1}" name="${encodeXmlEntities(obj.name ?? "")}"/>`;
-		});
+		ref = `A1:${getExcelColName(data.length + labelCols)}${firstLabelGroup(data[0]).length + 1}`;
+		columns = dataLabels(data[0]).map((_labelsGroup, idx) => voidEl("tableColumn", {
+			id: idx + 1,
+			name: `Column${idx + 1}`
+		})).join("") + data.map((obj, idx) => voidEl("tableColumn", {
+			id: idx + labelCols + 1,
+			name: obj.name ?? ""
+		})).join("");
 	}
-	strTableXml += "</tableColumns>";
-	strTableXml += "<tableStyleInfo showFirstColumn=\"0\" showLastColumn=\"0\" showRowStripes=\"1\" showColumnStripes=\"0\"/>";
-	strTableXml += "</table>";
-	return strTableXml;
+	const columnCount = chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D" ? intBubbleCols : chartObject.opts._type === "scatter" ? data.length : data.length + labelCols;
+	return XML_DECL + el("table", {
+		xmlns: SML_NS,
+		id: 1,
+		name: "Table1",
+		displayName: "Table1",
+		ref,
+		totalsRowShown: 0
+	}, [raw(el("tableColumns", { count: columnCount }, raw(columns))), raw(voidEl("tableStyleInfo", {
+		showFirstColumn: 0,
+		showLastColumn: 0,
+		showRowStripes: 1,
+		showColumnStripes: 0
+	}))]);
 }
 /**
 * Build the embedded workbook's `xl/worksheets/sheet1.xml` (header row + per-series data rows).
 */
 function buildXlsxSheet(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES) {
-	let strSheetXml = XML_DECL;
-	strSheetXml += "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" mc:Ignorable=\"x14ac\" xmlns:x14ac=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac\">";
-	if (chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D") strSheetXml += `<dimension ref="A1:${getExcelColName(intBubbleCols)}${dataValues(data[0]).length + 1}"/>`;
-	else if (chartObject.opts._type === "scatter") strSheetXml += `<dimension ref="A1:${getExcelColName(data.length)}${dataValues(data[0]).length + 1}"/>`;
-	else strSheetXml += `<dimension ref="A1:${getExcelColName(data.length + dataLabels(data[0]).length)}${dataValues(data[0]).length + 1}"/>`;
-	strSheetXml += "<sheetViews><sheetView tabSelected=\"1\" workbookViewId=\"0\"><selection activeCell=\"B1\" sqref=\"B1\"/></sheetView></sheetViews>";
-	strSheetXml += "<sheetFormatPr baseColWidth=\"10\" defaultRowHeight=\"16\"/>";
-	if (chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D") {
-		strSheetXml += "<sheetData>";
-		strSheetXml += `<row r="1" spans="1:${intBubbleCols}">`;
-		strSheetXml += "<c r=\"A1\" t=\"s\"><v>0</v></c>";
-		for (let idx = 1; idx < intBubbleCols; idx++) strSheetXml += `<c r="${getExcelColName(idx + 1)}1" t="s"><v>${idx}</v></c>`;
-		strSheetXml += "</row>";
+	const isBubble = chartObject.opts._type === "bubble" || chartObject.opts._type === "bubble3D";
+	const isScatter = chartObject.opts._type === "scatter";
+	const labelCols = dataLabels(data[0]).length;
+	/** One cell. `t="s"` marks a shared-string index; without it the value is a number. */
+	const cell = (col, row, value, shared = false) => el("c", {
+		r: `${getExcelColName(col)}${row}`,
+		t: shared ? "s" : void 0
+	}, raw(el("v", null, value)));
+	/** One row, spanning the sheet's full column count. */
+	const sheetRow = (row, span, cells) => el("row", {
+		r: row,
+		spans: `1:${span}`
+	}, raw(cells));
+	const colCount = isBubble ? intBubbleCols : isScatter ? data.length : data.length + labelCols;
+	let rows = "";
+	if (isBubble) {
+		let header = "";
+		for (let idx = 0; idx < intBubbleCols; idx++) header += cell(idx + 1, 1, idx, true);
+		rows += sheetRow(1, intBubbleCols, header);
 		dataValues(data[0]).forEach((val, idx) => {
-			strSheetXml += `<row r="${idx + 2}" spans="1:${intBubbleCols}">`;
-			strSheetXml += `<c r="A${idx + 2}"><v>${val}</v></c>`;
+			let cells = cell(1, idx + 2, val);
 			let idxColLtr = 2;
 			for (let idy = 1; idy < data.length; idy++) {
-				strSheetXml += `<c r="${getExcelColName(idxColLtr)}${idx + 2}"><v>${dataValues(data[idy])[idx] ?? ""}</v></c>`;
-				idxColLtr++;
-				strSheetXml += `<c r="${getExcelColName(idxColLtr)}${idx + 2}"><v>${dataSizes(data[idy])[idx] ?? ""}</v></c>`;
-				idxColLtr++;
+				cells += cell(idxColLtr++, idx + 2, dataValues(data[idy])[idx] ?? "");
+				cells += cell(idxColLtr++, idx + 2, dataSizes(data[idy])[idx] ?? "");
 			}
-			strSheetXml += "</row>";
+			rows += sheetRow(idx + 2, intBubbleCols, cells);
 		});
-	} else if (chartObject.opts._type === "scatter") {
-		strSheetXml += "<sheetData>";
-		strSheetXml += `<row r="1" spans="1:${data.length}">`;
-		for (let idx = 0; idx < data.length; idx++) strSheetXml += `<c r="${getExcelColName(idx + 1)}1" t="s"><v>${idx}</v></c>`;
-		strSheetXml += "</row>";
+	} else if (isScatter) {
+		let header = "";
+		for (let idx = 0; idx < data.length; idx++) header += cell(idx + 1, 1, idx, true);
+		rows += sheetRow(1, data.length, header);
 		dataValues(data[0]).forEach((val, idx) => {
-			strSheetXml += `<row r="${idx + 2}" spans="1:${data.length}">`;
-			strSheetXml += `<c r="A${idx + 2}"><v>${val}</v></c>`;
-			for (let idy = 1; idy < data.length; idy++) strSheetXml += `<c r="${getExcelColName(idy + 1)}${idx + 2}"><v>${dataValues(data[idy])[idx] || dataValues(data[idy])[idx] === 0 ? dataValues(data[idy])[idx] : ""}</v></c>`;
-			strSheetXml += "</row>";
+			let cells = cell(1, idx + 2, val);
+			for (let idy = 1; idy < data.length; idy++) {
+				const yValue = dataValues(data[idy])[idx];
+				cells += cell(idy + 1, idx + 2, yValue || yValue === 0 ? yValue : "");
+			}
+			rows += sheetRow(idx + 2, data.length, cells);
 		});
+	} else if (!IS_MULTI_CAT_AXES) {
+		let header = "";
+		for (let idx = 0; idx < labelCols; idx++) header += cell(idx + 1, 1, 0, true);
+		for (let idx = 0; idx < data.length; idx++) header += cell(idx + 1 + labelCols, 1, idx + 1, true);
+		rows += sheetRow(1, data.length + labelCols, header);
+		const rowCount = firstLabelGroup(data[0]).length || Math.max(0, ...data.map((series) => dataValues(series).length));
+		for (let idx = 0; idx < rowCount; idx++) {
+			let cells = "";
+			for (let idx2 = labelCols - 1; idx2 >= 0; idx2--) cells += cell(labelCols - idx2, idx + 2, data.length + idx + 1, true);
+			for (let idy = 0; idy < data.length; idy++) cells += cell(labelCols + idy + 1, idx + 2, dataValues(data[idy])[idx] ?? "");
+			rows += sheetRow(idx + 2, data.length + labelCols, cells);
+		}
 	} else {
-		strSheetXml += "<sheetData>";
-		if (!IS_MULTI_CAT_AXES) {
-			strSheetXml += `<row r="1" spans="1:${data.length + dataLabels(data[0]).length}">`;
-			dataLabels(data[0]).forEach((_labelsGroup, idx) => {
-				strSheetXml += `<c r="${getExcelColName(idx + 1)}1" t="s"><v>0</v></c>`;
-			});
-			for (let idx = 0; idx < data.length; idx++) strSheetXml += `<c r="${getExcelColName(idx + 1 + dataLabels(data[0]).length)}1" t="s"><v>${idx + 1}</v></c>`;
-			strSheetXml += "</row>";
-			const rowCount = firstLabelGroup(data[0]).length || Math.max(0, ...data.map((series) => dataValues(series).length));
-			for (let idx = 0; idx < rowCount; idx++) {
-				strSheetXml += `<row r="${idx + 2}" spans="1:${data.length + dataLabels(data[0]).length}">`;
-				for (let idx2 = dataLabels(data[0]).length - 1; idx2 >= 0; idx2--) {
-					strSheetXml += `<c r="${getExcelColName(dataLabels(data[0]).length - idx2)}${idx + 2}" t="s">`;
-					strSheetXml += `<v>${data.length + idx + 1}</v>`;
-					strSheetXml += "</c>";
-				}
-				for (let idy = 0; idy < data.length; idy++) strSheetXml += `<c r="${getExcelColName(dataLabels(data[0]).length + idy + 1)}${idx + 2}"><v>${dataValues(data[idy])[idx] ?? ""}</v></c>`;
-				strSheetXml += "</row>";
-			}
-		} else {
-			const TOT_SER = data.length;
-			const TOT_CAT = firstLabelGroup(data[0]).length;
-			const TOT_LVL = dataLabels(data[0]).length;
-			const revLabelGroups = dataLabels(data[0]).slice().reverse();
-			const ssLabelMap = /* @__PURE__ */ new Map();
-			let ssIdx = TOT_SER + 1;
-			revLabelGroups.forEach((labelsGroup, revLevelIdx) => {
-				labelsGroup.forEach((label, rowIdx) => {
-					if (label && label !== "") ssLabelMap.set(`${revLevelIdx}:${rowIdx}`, ssIdx++);
-				});
+		const TOT_SER = data.length;
+		const TOT_CAT = firstLabelGroup(data[0]).length;
+		const revLabelGroups = dataLabels(data[0]).slice().reverse();
+		const ssLabelMap = /* @__PURE__ */ new Map();
+		let ssIdx = TOT_SER + 1;
+		revLabelGroups.forEach((labelsGroup, revLevelIdx) => {
+			labelsGroup.forEach((label, rowIdx) => {
+				if (label && label !== "") ssLabelMap.set(`${revLevelIdx}:${rowIdx}`, ssIdx++);
 			});
-			strSheetXml += `<row r="1" spans="1:${TOT_SER + TOT_LVL}">`;
-			for (let col = 1; col <= TOT_LVL; col++) strSheetXml += `<c r="${getExcelColName(col)}1" t="s"><v>0</v></c>`;
-			for (let ser = 0; ser < TOT_SER; ser++) strSheetXml += `<c r="${getExcelColName(TOT_LVL + ser + 1)}1" t="s"><v>${ser + 1}</v></c>`;
-			strSheetXml += "</row>";
-			for (let idx = 0; idx < TOT_CAT; idx++) {
-				strSheetXml += `<row r="${idx + 2}" spans="1:${TOT_SER + TOT_LVL}">`;
-				revLabelGroups.forEach((labelsGroup, idy) => {
-					const colLabel = labelsGroup[idx];
-					if (colLabel && colLabel !== "") strSheetXml += `<c r="${getExcelColName(idy + 1)}${idx + 2}" t="s"><v>${ssLabelMap.get(`${idy}:${idx}`)}</v></c>`;
-				});
-				for (let idy = 0; idy < TOT_SER; idy++) strSheetXml += `<c r="${getExcelColName(TOT_LVL + idy + 1)}${idx + 2}"><v>${dataValues(data[idy])[idx] ?? ""}</v></c>`;
-				strSheetXml += "</row>";
-			}
+		});
+		let header = "";
+		for (let col = 1; col <= labelCols; col++) header += cell(col, 1, 0, true);
+		for (let ser = 0; ser < TOT_SER; ser++) header += cell(labelCols + ser + 1, 1, ser + 1, true);
+		rows += sheetRow(1, TOT_SER + labelCols, header);
+		for (let idx = 0; idx < TOT_CAT; idx++) {
+			let cells = revLabelGroups.map((labelsGroup, idy) => {
+				const colLabel = labelsGroup[idx];
+				return colLabel && colLabel !== "" ? cell(idy + 1, idx + 2, ssLabelMap.get(`${idy}:${idx}`) ?? "", true) : "";
+			}).join("");
+			for (let idy = 0; idy < TOT_SER; idy++) cells += cell(labelCols + idy + 1, idx + 2, dataValues(data[idy])[idx] ?? "");
+			rows += sheetRow(idx + 2, TOT_SER + labelCols, cells);
 		}
 	}
-	strSheetXml += "</sheetData>";
-	strSheetXml += "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>";
-	strSheetXml += "</worksheet>\n";
-	return strSheetXml;
+	const sheetView = el("sheetViews", null, raw(el("sheetView", {
+		tabSelected: 1,
+		workbookViewId: 0
+	}, raw(voidEl("selection", {
+		activeCell: "B1",
+		sqref: "B1"
+	})))));
+	return XML_DECL + el("worksheet", {
+		xmlns: SML_NS,
+		"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+		"xmlns:mc": "http://schemas.openxmlformats.org/markup-compatibility/2006",
+		"mc:Ignorable": "x14ac",
+		"xmlns:x14ac": "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac"
+	}, [
+		raw(voidEl("dimension", { ref: `A1:${getExcelColName(colCount)}${dataValues(data[0]).length + 1}` })),
+		raw(sheetView),
+		raw(voidEl("sheetFormatPr", {
+			baseColWidth: 10,
+			defaultRowHeight: 16
+		})),
+		raw(el("sheetData", null, raw(rows))),
+		raw(voidEl("pageMargins", {
+			left: .7,
+			right: .7,
+			top: .75,
+			bottom: .75,
+			header: .3,
+			footer: .3
+		}))
+	]) + "\n";
 }
 /**
 * Build the standalone `.rels` for a chart part: a single `rId1` relationship to
@@ -7012,17 +7663,17 @@ function fallbackPic(picId, objectName, altText, model, xf) {
 	return el("p:pic", null, [
 		raw(el("p:nvPicPr", null, [
 			raw(cNvPrOpen(picId, objectName, altText) + "/>"),
-			raw(el("p:cNvPicPr", null, raw(voidEl("a:picLocks", {
-				noGrp: "1",
-				noRot: "1",
-				noChangeAspect: "1",
-				noMove: "1",
-				noResize: "1",
-				noEditPoints: "1",
-				noAdjustHandles: "1",
-				noChangeArrowheads: "1",
-				noChangeShapeType: "1",
-				noCrop: "1"
+			raw(el("p:cNvPicPr", null, raw(genXmlObjectLock("a:picLocks", PICTURE_LOCK_ATTRS, {
+				noGrp: true,
+				noRot: true,
+				noChangeAspect: true,
+				noMove: true,
+				noResize: true,
+				noEditPoints: true,
+				noAdjustHandles: true,
+				noChangeArrowheads: true,
+				noChangeShapeType: true,
+				noCrop: true
 			})))),
 			raw(voidEl("p:nvPr"))
 		])),
@@ -7064,7 +7715,7 @@ function renderModel3dObject(slideItemObj, idx, x, y, cx, cy) {
 	const graphicFrame = el("p:graphicFrame", null, [
 		raw(el("p:nvGraphicFramePr", null, [
 			raw(cNvPrOpen(idx + 2, opts.objectName, altText) + "/>"),
-			raw(el("p:cNvGraphicFramePr", null, raw(voidEl("a:graphicFrameLocks")))),
+			raw(el("p:cNvGraphicFramePr", null, raw(genXmlObjectLock("a:graphicFrameLocks", GRAPHIC_FRAME_LOCK_ATTRS, opts.objectLock, opts.objectName) || voidEl("a:graphicFrameLocks")))),
 			raw(voidEl("p:nvPr"))
 		])),
 		raw(el("p:xfrm", null, [raw(voidEl("a:off", {
@@ -7355,7 +8006,7 @@ function renderTableObject(slideItemObj, idx, x, y, cx, cy, placeholderObj, item
 	let intColCnt = 0;
 	let tblInner = "";
 	let cellOpts = null;
-	arrTabRows = (slideItemObj.arrTabRows ?? []).map((row) => [...row]);
+	arrTabRows = withCheckedSpans((slideItemObj.arrTabRows ?? []).map((row) => [...row]));
 	objTabOpts = itemOpts;
 	intColCnt = 0;
 	(arrTabRows[0] ?? []).forEach((cell) => {
@@ -7639,16 +8290,16 @@ function zoomFallbackPic(picId, objectName, tile, absXf) {
 				"r:id": `rId${tile.fallbackSlideRid}`,
 				action: "ppaction://hlinksldjump"
 			}) + "</p:cNvPr>"),
-			raw(el("p:cNvPicPr", null, raw(voidEl("a:picLocks", {
-				noGrp: "1",
-				noRot: "1",
-				noChangeAspect: "1",
-				noMove: "1",
-				noResize: "1",
-				noEditPoints: "1",
-				noAdjustHandles: "1",
-				noChangeArrowheads: "1",
-				noChangeShapeType: "1"
+			raw(el("p:cNvPicPr", null, raw(genXmlObjectLock("a:picLocks", PICTURE_LOCK_ATTRS, {
+				noGrp: true,
+				noRot: true,
+				noChangeAspect: true,
+				noMove: true,
+				noResize: true,
+				noEditPoints: true,
+				noAdjustHandles: true,
+				noChangeArrowheads: true,
+				noChangeShapeType: true
 			})))),
 			raw(voidEl("p:nvPr"))
 		])),
@@ -7675,7 +8326,8 @@ function zoomFallbackPic(picId, objectName, tile, absXf) {
 function renderZoomObject(slideItemObj, idx, x, y, cx, cy) {
 	const zoom = slideItemObj.zoom;
 	if (!zoom) return "";
-	const objectName = (slideItemObj.options || {}).objectName;
+	const opts = slideItemObj.options || {};
+	const objectName = opts.objectName;
 	const { uri, prefix, zm } = ZOOM_VARIANTS[zoom.variant];
 	const firstTile = zoom.tiles[0];
 	if (!firstTile) return "";
@@ -7693,7 +8345,10 @@ function renderZoomObject(slideItemObj, idx, x, y, cx, cy) {
 	const graphicFrame = el("p:graphicFrame", null, [
 		raw(el("p:nvGraphicFramePr", null, [
 			raw(cNvPrOpen(idx + 2, objectName, "") + "/>"),
-			raw(el("p:cNvGraphicFramePr", null, raw(voidEl("a:graphicFrameLocks", { noChangeAspect: "1" })))),
+			raw(el("p:cNvGraphicFramePr", null, raw(genXmlObjectLock("a:graphicFrameLocks", GRAPHIC_FRAME_LOCK_ATTRS, {
+				noChangeAspect: true,
+				...opts.objectLock
+			}, objectName)))),
 			raw(voidEl("p:nvPr"))
 		])),
 		raw(el("p:xfrm", null, [raw(voidEl("a:off", {
@@ -8352,56 +9007,18 @@ function buildThemeClrScheme(scheme) {
 		return raw(el(`a:${slot}`, null, child));
 	}));
 }
-const MAJOR_FONT_LIST = [
-	["Jpan", "游ゴシック Light"],
-	["Hang", "맑은 고딕"],
-	["Hans", "等线 Light"],
-	["Hant", "新細明體"],
-	["Arab", "Times New Roman"],
-	["Hebr", "Times New Roman"],
-	["Thai", "Angsana New"],
-	["Ethi", "Nyala"],
-	["Beng", "Vrinda"],
-	["Gujr", "Shruti"],
-	["Khmr", "MoolBoran"],
-	["Knda", "Tunga"],
-	["Guru", "Raavi"],
-	["Cans", "Euphemia"],
-	["Cher", "Plantagenet Cherokee"],
-	["Yiii", "Microsoft Yi Baiti"],
-	["Tibt", "Microsoft Himalaya"],
-	["Thaa", "MV Boli"],
-	["Deva", "Mangal"],
-	["Telu", "Gautami"],
-	["Taml", "Latha"],
-	["Syrc", "Estrangelo Edessa"],
-	["Orya", "Kalinga"],
-	["Mlym", "Kartika"],
-	["Laoo", "DokChampa"],
-	["Sinh", "Iskoola Pota"],
-	["Mong", "Mongolian Baiti"],
-	["Viet", "Times New Roman"],
-	["Uigh", "Microsoft Uighur"],
-	["Geor", "Sylfaen"],
-	["Armn", "Arial"],
-	["Bugi", "Leelawadee UI"],
-	["Bopo", "Microsoft JhengHei"],
-	["Java", "Javanese Text"],
-	["Lisu", "Segoe UI"],
-	["Mymr", "Myanmar Text"],
-	["Nkoo", "Ebrima"],
-	["Olck", "Nirmala UI"],
-	["Osma", "Ebrima"],
-	["Phag", "Phagspa"],
-	["Syrn", "Estrangelo Edessa"],
-	["Syrj", "Estrangelo Edessa"],
-	["Syre", "Estrangelo Edessa"],
-	["Sora", "Nirmala UI"],
-	["Tale", "Microsoft Tai Le"],
-	["Talu", "Microsoft New Tai Lue"],
-	["Tfng", "Ebrima"]
-];
-const MINOR_FONT_LIST = [
+/**
+* The per-script theme font fallback table (`a:fontScheme`'s CT_TextFont lists), in OOXML
+* document order. Static Office defaults — no caller data, no escaping risk — unlike the
+* `<a:latin>`/`<a:ea>`/`<a:cs>` slots above.
+*
+* Forty-one of the forty-seven scripts take the same face in the major and minor lists, so the
+* shared table below is the whole thing and the two override maps hold the six-odd rows that
+* actually differ. Written out twice, ninety-four lines said less than these do, and one row
+* mistyped in one copy produces a theme that opens fine and paints a script in the wrong face —
+* a difference nobody reviewing a diff of two 47-row tables would see.
+*/
+const THEME_FONT_LIST = [
 	["Jpan", "游ゴシック"],
 	["Hang", "맑은 고딕"],
 	["Hans", "等线"],
@@ -8450,6 +9067,24 @@ const MINOR_FONT_LIST = [
 	["Talu", "Microsoft New Tai Lue"],
 	["Tfng", "Ebrima"]
 ];
+/**
+* The seven scripts whose *heading* face differs from the body one. Latin and CJK headings take
+* the Light weight; the scripts with no Light cut take a serif (or, for Khmer, a different face
+* entirely) where the body takes a sans. Every other script in {@link THEME_FONT_LIST} uses one
+* face for both.
+*/
+const MAJOR_FONT_OVERRIDES = {
+	Jpan: "游ゴシック Light",
+	Hans: "等线 Light",
+	Arab: "Times New Roman",
+	Hebr: "Times New Roman",
+	Thai: "Angsana New",
+	Khmr: "MoolBoran",
+	Viet: "Times New Roman"
+};
+/** The major (heading) and minor (body) lists, both derived from the one table. */
+const MAJOR_FONT_LIST = THEME_FONT_LIST.map(([script, face]) => [script, MAJOR_FONT_OVERRIDES[script] ?? face]);
+const MINOR_FONT_LIST = THEME_FONT_LIST;
 function fontListChildren(scriptFaces) {
 	return scriptFaces.map(([script, typeface]) => raw(voidEl("a:font", {
 		script,
@@ -9390,20 +10025,7 @@ function makeXmlMaster(slide, layouts) {
 		id: LAYOUT_IDX_SERIES_BASE + idx,
 		"r:id": `rId${slide._rels.length + idx + 1}`
 	})).join("");
-	const clrMap = voidEl("p:clrMap", {
-		bg1: "lt1",
-		tx1: "dk1",
-		bg2: "lt2",
-		tx2: "dk2",
-		accent1: "accent1",
-		accent2: "accent2",
-		accent3: "accent3",
-		accent4: "accent4",
-		accent5: "accent5",
-		accent6: "accent6",
-		hlink: "hlink",
-		folHlink: "folHlink"
-	});
+	const clrMap = voidEl("p:clrMap", DEFAULT_COLOR_MAP);
 	const hf = voidEl("p:hf", {
 		sldNum: slide._slideNumberProps ? null : 0,
 		hdr: 0,
@@ -9671,7 +10293,7 @@ async function writePackage(source, props) {
 * the OfficeGen project (Copyright 2013 Ziv Barber). This project is likewise MIT; the full
 * license text is in `LICENSE` at the repository root.
 */
-const VERSION = "3.5.0";
+const VERSION = "3.6.0";
 function standardLayoutToPresLayout(layout) {
 	return {
 		name: layout.name,
@@ -10651,6 +11273,6 @@ function textRuns(runs) {
 	return runs;
 }
 //#endregion
-export { fetchMediaBase64 as a, PresentationCore as c, fetchFontBytes as i, textRuns as n, isRemote as o, clipPath as r, placeholderSvgPreview as s, textRun as t };
+export { fetchMediaBase64 as a, PresentationCore as c, fetchFontBytes as i, IMG_SVG_PLACEHOLDER as l, textRuns as n, isRemote as o, clipPath as r, placeholderSvgPreview as s, textRun as t };
 
-//# sourceMappingURL=text-D04NUMvA.js.map
+//# sourceMappingURL=text-CyetbF6p.js.map