@office-open/core 0.11.0 → 0.12.0

package/dist/{chart-Kf_utasF.mjs → chart-DED4tXC9.mjs}

@@ -1,9 +1,9 @@
-import { ut as parseOnOff } from "./generators-CElPsAhd.mjs";
-import { o as parse$1, s as stringify$1 } from "./descriptor-BX8xW8na.mjs";
-import { B as blipFillDesc, C as shapePropertiesDesc, S as groupShapePropertiesDesc, T as transform2DDesc, a as textBodyDesc, pt as stringifyNonVisualDrawingProperties } from "./drawing-FBzd2I0m.mjs";
-import { i as stringifyShapeStyle, n as parseShapeStyle } from "./style-matrix-DAP6XrLv.mjs";
+import { B as xsdAxisCrossBetween, Ct as xsdSizeRepresents, Ft as xsdTrendlineType, H as xsdAxisLabelAlignment, Tt as xsdSplitType, U as xsdAxisOrientation, V as xsdAxisCrosses, W as xsdAxisPosition, Z as xsdDataLabelPosition, Zt as parseOnOff, st as xsdLegendPosition, tt as xsdErrorValueType } from "./ext-uri-BHBcIrW7.mjs";
+import { A as groupShapePropertiesDesc, N as transform2DDesc, a as textBodyDesc, dt as stringifyNonVisualDrawingProperties, hn as blipFillDesc, j as shapePropertiesDesc } from "./drawing-BCAyrCCw.mjs";
+import { o as parse$1, s as stringify$1 } from "./descriptor-BqaNZrrZ.mjs";
+import { i as stringifyShapeStyle, n as parseShapeStyle } from "./style-matrix-B6jhPAT3.mjs";
 import { n as parseColorMapping, r as stringifyColorMapping } from "./color-mapping-CFF0vRSe.mjs";
-import { attr, children, escapeXml, findChild, stringifyElement, textOf } from "@office-open/xml";
+import { attr, children, escapeXml, findChild, findFirst, stringify, stringifyElement, textOf } from "@office-open/xml";
 //#region src/chart/chart-collection.ts
 var ChartCollection = class {
 	map;
@@ -45,7 +45,7 @@ const CHART_TYPE_TAGS_3D = {
 	pie: "c:pie3DChart",
 	area: "c:area3DChart"
 };
-const NO_AXES_TYPES = new Set([
+const NO_AXES_TYPES = /* @__PURE__ */ new Set([
 	"pie",
 	"doughnut",
 	"ofPie"
@@ -93,7 +93,7 @@ function valEl(tag, value) {
 	return `<${tag} ${attrVal("val", value)}/>`;
 }
 function boolVal(value) {
-	return value === false ? ` val="0"` : "";
+	return ` val="${value === false ? 0 : 1}"`;
 }
 function stringifyNumLit(value) {
 	return `<c:numLit><c:formatCode>General</c:formatCode><c:ptCount val="1"/><c:pt idx="0"><c:v>${value}</c:v></c:pt></c:numLit>`;
@@ -101,7 +101,7 @@ function stringifyNumLit(value) {
 function stringifyTrendline(opts) {
 	const parts = [];
 	if (opts.name !== void 0) parts.push(`<c:name>${escapeXml(opts.name)}</c:name>`);
-	parts.push(valEl("c:trendlineType", opts.type ?? "linear"));
+	parts.push(valEl("c:trendlineType", xsdTrendlineType.to(opts.type ?? "linear")));
 	if (opts.order !== void 0) parts.push(valEl("c:order", opts.order));
 	if (opts.period !== void 0) parts.push(valEl("c:period", opts.period));
 	if (opts.forward !== void 0) parts.push(valEl("c:forward", opts.forward));
@@ -115,26 +115,42 @@ function stringifyTrendline(opts) {
 }
 function stringifyErrBars(opts) {
 	const parts = [];
-	if (opts.direction !== void 0) parts.push(valEl("c:errDir", opts.direction));
+	if (opts.direction === "x" || opts.direction === "y") parts.push(valEl("c:errDir", opts.direction));
 	parts.push(valEl("c:errBarType", opts.barType ?? "both"));
-	parts.push(valEl("c:errValType", opts.valueType ?? "fixedVal"));
+	parts.push(valEl("c:errValType", xsdErrorValueType.to(opts.valueType ?? "fixedValue")));
 	if (opts.noEndCap !== void 0) parts.push(`<c:noEndCap${boolVal(opts.noEndCap)}/>`);
 	if (opts.plusValue !== void 0) parts.push(`<c:plus>${stringifyNumLit(opts.plusValue)}</c:plus>`);
 	if (opts.minusValue !== void 0) parts.push(`<c:minus>${stringifyNumLit(opts.minusValue)}</c:minus>`);
 	if (opts.value !== void 0) parts.push(valEl("c:val", opts.value));
 	return `<c:errBars>${parts.join("")}</c:errBars>`;
 }
-function stringifyDataLabel(opts) {
+function stringifyDataLabel(opts, ctx) {
 	if (opts.delete) return `<c:dLbl><c:idx val="${opts.index}"/><c:delete val="1"/></c:dLbl>`;
 	const inner = [];
+	if (opts.layout === true) inner.push("<c:layout/>");
+	else if (opts.layout) inner.push(stringifyLayout(opts.layout));
+	if (opts.text) inner.push(`<c:tx><c:rich>${textBodyDesc.stringify(opts.text, ctx) ?? ""}</c:rich></c:tx>`);
 	if (opts.numberFormat !== void 0) inner.push(`<c:numFmt formatCode="${escapeXml(opts.numberFormat)}" sourceLinked="0"/>`);
-	if (opts.position !== void 0) inner.push(valEl("c:dLblPos", opts.position));
+	inner.push(chartSpPr(opts.shapeProperties, ctx));
+	if (opts.textProperties) inner.push(`<c:txPr>${textBodyDesc.stringify(opts.textProperties, ctx) ?? ""}</c:txPr>`);
+	if (opts.position !== void 0) inner.push(valEl("c:dLblPos", xsdDataLabelPosition.to(opts.position)));
+	if (opts.showLegendKey !== void 0) inner.push(`<c:showLegendKey${boolVal(opts.showLegendKey)}/>`);
+	if (opts.showVal !== void 0) inner.push(`<c:showVal${boolVal(opts.showVal)}/>`);
+	if (opts.showCatName !== void 0) inner.push(`<c:showCatName${boolVal(opts.showCatName)}/>`);
+	if (opts.showSerName !== void 0) inner.push(`<c:showSerName${boolVal(opts.showSerName)}/>`);
+	if (opts.showPercent !== void 0) inner.push(`<c:showPercent${boolVal(opts.showPercent)}/>`);
+	if (opts.showBubbleSize !== void 0) inner.push(`<c:showBubbleSize${boolVal(opts.showBubbleSize)}/>`);
+	if (opts.separator !== void 0) inner.push(`<c:separator>${escapeXml(opts.separator)}</c:separator>`);
 	return `<c:dLbl><c:idx val="${opts.index}"/>${inner.join("")}</c:dLbl>`;
 }
-function stringifyDataLabels(opts) {
+function stringifyDataLabels(opts, ctx) {
 	const parts = [];
-	if (opts.labels) for (const lbl of opts.labels) parts.push(stringifyDataLabel(lbl));
-	if (opts.position !== void 0) parts.push(valEl("c:dLblPos", opts.position));
+	if (opts.labels) for (const lbl of opts.labels) parts.push(stringifyDataLabel(lbl, ctx));
+	if (opts.delete !== void 0) parts.push(`<c:delete${boolVal(opts.delete)}/>`);
+	if (opts.numberFormat !== void 0) parts.push(`<c:numFmt formatCode="${escapeXml(opts.numberFormat)}" sourceLinked="0"/>`);
+	parts.push(chartSpPr(opts.shapeProperties, ctx));
+	if (opts.textProperties) parts.push(`<c:txPr>${textBodyDesc.stringify(opts.textProperties, ctx) ?? ""}</c:txPr>`);
+	if (opts.position !== void 0) parts.push(valEl("c:dLblPos", xsdDataLabelPosition.to(opts.position)));
 	if (opts.showLegendKey !== void 0) parts.push(`<c:showLegendKey${boolVal(opts.showLegendKey)}/>`);
 	if (opts.showVal !== void 0) parts.push(`<c:showVal${boolVal(opts.showVal)}/>`);
 	if (opts.showCatName !== void 0) parts.push(`<c:showCatName${boolVal(opts.showCatName)}/>`);
@@ -142,8 +158,10 @@ function stringifyDataLabels(opts) {
 	if (opts.showPercent !== void 0) parts.push(`<c:showPercent${boolVal(opts.showPercent)}/>`);
 	if (opts.showBubbleSize !== void 0) parts.push(`<c:showBubbleSize${boolVal(opts.showBubbleSize)}/>`);
 	if (opts.separator !== void 0) parts.push(`<c:separator>${escapeXml(opts.separator)}</c:separator>`);
-	if (opts.showLeaderLines !== void 0) parts.push(`<c:showLeaderLines${boolVal(opts.showLeaderLines)}/>`);
-	if (opts.leaderLines) parts.push(emptyEl("c:leaderLines"));
+	if (opts.delete === void 0) {
+		if (opts.showLeaderLines !== void 0) parts.push(`<c:showLeaderLines${boolVal(opts.showLeaderLines)}/>`);
+		if (opts.leaderLines) parts.push(emptyEl("c:leaderLines"));
+	}
 	return `<c:dLbls>${parts.join("")}</c:dLbls>`;
 }
 function stringifyView3D(opts) {
@@ -170,10 +188,11 @@ function stringifyLayout(manualLayout) {
 	if (manualLayout.h !== void 0) parts.push(valEl("c:h", manualLayout.h));
 	return `<c:layout><c:manualLayout>${parts.join("")}</c:manualLayout></c:layout>`;
 }
-function stringifySurface(tag, opts) {
+function stringifySurface(tag, opts, ctx) {
 	if (!opts) return "";
 	const parts = [];
 	if (opts.thickness !== void 0) parts.push(valEl("c:thickness", typeof opts.thickness === "string" ? Number(opts.thickness.replace("%", "")) : opts.thickness));
+	if (opts.shapeProperties) parts.push(chartSpPr(opts.shapeProperties, ctx));
 	return parts.length ? `<${tag}>${parts.join("")}</${tag}>` : `<${tag}/>`;
 }
 const AXIS_TAG = {
@@ -186,14 +205,11 @@ function stringifyScaling(opts) {
 	if (!opts) return emptyEl("c:scaling");
 	const parts = [];
 	if (opts.logBase !== void 0) parts.push(valEl("c:logBase", opts.logBase));
-	if (opts.orientation !== void 0) parts.push(valEl("c:orientation", opts.orientation));
+	if (opts.orientation !== void 0) parts.push(valEl("c:orientation", xsdAxisOrientation.to(opts.orientation)));
 	if (opts.max !== void 0) parts.push(valEl("c:max", opts.max));
 	if (opts.min !== void 0) parts.push(valEl("c:min", opts.min));
 	return `<c:scaling>${parts.join("")}</c:scaling>`;
 }
-function stringifyAxisTitle(title) {
-	return `<c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>${escapeXml(title)}</a:t></a:r></a:p></c:rich></c:tx><c:overlay val="0"/></c:title>`;
-}
 function stringifyDisplayUnits(opts) {
 	const parts = [];
 	if (opts.customUnit !== void 0) parts.push(valEl("c:custUnit", opts.customUnit));
@@ -206,26 +222,33 @@ function stringifyDisplayUnits(opts) {
 * EG_AxShared (axId…crosses/crossesAt), then the kind-specific tail from
 * CT_CatAx / CT_DateAx / CT_SerAx / CT_ValAx.
 */
-function stringifyAxis(opts) {
+function stringifyAxis(opts, ctx) {
 	const parts = [];
 	parts.push(valEl("c:axId", opts.id));
 	parts.push(stringifyScaling(opts.scaling));
 	if (opts.delete !== void 0) parts.push(`<c:delete${boolVal(opts.delete)}/>`);
-	if (opts.position !== void 0) parts.push(valEl("c:axPos", opts.position));
-	if (opts.majorGridlines) parts.push(emptyEl("c:majorGridlines"));
-	if (opts.minorGridlines) parts.push(emptyEl("c:minorGridlines"));
-	if (opts.title !== void 0) parts.push(stringifyAxisTitle(opts.title));
-	if (opts.numberFormat !== void 0) parts.push(`<c:numFmt formatCode="${escapeXml(opts.numberFormat)}" sourceLinked="1"/>`);
+	const axPos = opts.position ?? (opts.kind === "value" ? "left" : "bottom");
+	parts.push(valEl("c:axPos", xsdAxisPosition.to(axPos)));
+	parts.push(stringifyChartLines("c:majorGridlines", opts.majorGridlines, ctx));
+	parts.push(stringifyChartLines("c:minorGridlines", opts.minorGridlines, ctx));
+	if (opts.title !== void 0) parts.push(typeof opts.title === "string" && opts.title === "" ? emptyEl("c:title") : stringifyTitle(opts.title, ctx));
+	if (opts.numberFormat !== void 0) {
+		const fmt = typeof opts.numberFormat === "string" ? { formatCode: opts.numberFormat } : opts.numberFormat;
+		const linked = fmt.sourceLinked === void 0 || fmt.sourceLinked ? 1 : 0;
+		parts.push(`<c:numFmt formatCode="${escapeXml(fmt.formatCode)}" sourceLinked="${linked}"/>`);
+	}
 	if (opts.majorTickMark !== void 0) parts.push(valEl("c:majorTickMark", opts.majorTickMark));
 	if (opts.minorTickMark !== void 0) parts.push(valEl("c:minorTickMark", opts.minorTickMark));
 	if (opts.tickLabelPosition !== void 0) parts.push(valEl("c:tickLblPos", opts.tickLabelPosition));
+	parts.push(chartSpPr(opts.shapeProperties, ctx));
+	if (opts.textProperties) parts.push(`<c:txPr>${textBodyDesc.stringify(opts.textProperties, ctx) ?? ""}</c:txPr>`);
 	parts.push(valEl("c:crossAx", opts.crossAxisId));
 	if (opts.crossesAt !== void 0) parts.push(valEl("c:crossesAt", opts.crossesAt));
-	else if (opts.crosses !== void 0) parts.push(valEl("c:crosses", opts.crosses));
+	else if (opts.crosses !== void 0) parts.push(valEl("c:crosses", xsdAxisCrosses.to(opts.crosses)));
 	switch (opts.kind) {
 		case "category":
 			if (opts.auto !== void 0) parts.push(`<c:auto${boolVal(opts.auto)}/>`);
-			if (opts.labelAlignment !== void 0) parts.push(valEl("c:lblAlgn", opts.labelAlignment));
+			if (opts.labelAlignment !== void 0) parts.push(valEl("c:lblAlgn", xsdAxisLabelAlignment.to(opts.labelAlignment)));
 			if (opts.labelOffset !== void 0) parts.push(valEl("c:lblOffset", opts.labelOffset));
 			if (opts.tickLabelSkip !== void 0) parts.push(valEl("c:tickLblSkip", opts.tickLabelSkip));
 			if (opts.tickMarkSkip !== void 0) parts.push(valEl("c:tickMarkSkip", opts.tickMarkSkip));
@@ -245,38 +268,54 @@ function stringifyAxis(opts) {
 			if (opts.tickMarkSkip !== void 0) parts.push(valEl("c:tickMarkSkip", opts.tickMarkSkip));
 			break;
 		case "value":
-			if (opts.crossBetween !== void 0) parts.push(valEl("c:crossBetween", opts.crossBetween));
+			if (opts.crossBetween !== void 0) parts.push(valEl("c:crossBetween", xsdAxisCrossBetween.to(opts.crossBetween)));
 			if (opts.majorUnit !== void 0) parts.push(valEl("c:majorUnit", opts.majorUnit));
 			if (opts.minorUnit !== void 0) parts.push(valEl("c:minorUnit", opts.minorUnit));
 			if (opts.displayUnits) parts.push(stringifyDisplayUnits(opts.displayUnits));
-			break;
 	}
 	const tag = AXIS_TAG[opts.kind];
 	return `<${tag}>${parts.join("")}</${tag}>`;
 }
-function stringifyStrRef(values) {
-	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${escapeXml(v)}</c:v></c:pt>`).join("");
-	return `<c:strRef><c:f/><c:strCache><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:strCache></c:strRef>`;
+/** Worksheet reference formula (c:f); empty element when not round-tripped. */
+function refFormula(formula) {
+	return `<c:f>${escapeXml(formula ?? "")}</c:f>`;
+}
+function stringifyStrRef(values, formula) {
+	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${escapeXml(v ?? "")}</c:v></c:pt>`).join("");
+	return `<c:strRef>${refFormula(formula)}<c:strCache><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:strCache></c:strRef>`;
 }
 function stringifyStrLit(values) {
 	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${escapeXml(v)}</c:v></c:pt>`).join("");
 	return `<c:strLit><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:strLit>`;
 }
-function stringifyMultiLvlStrRef(levels) {
+function stringifyMultiLvlStrRef(levels, formula) {
 	const ptCount = levels.reduce((max, lvl) => Math.max(max, lvl.length), 0);
 	const lvls = levels.map((lvl) => {
 		return `<c:lvl>${lvl.map((v, i) => `<c:pt idx="${i}"><c:v>${escapeXml(v)}</c:v></c:pt>`).join("")}</c:lvl>`;
 	}).join("");
-	return `<c:multiLvlStrRef><c:f/><c:multiLvlStrCache><c:ptCount ${attrVal("val", ptCount)}/>${lvls}</c:multiLvlStrCache></c:multiLvlStrRef>`;
+	return `<c:multiLvlStrRef>${refFormula(formula)}<c:multiLvlStrCache><c:ptCount ${attrVal("val", ptCount)}/>${lvls}</c:multiLvlStrCache></c:multiLvlStrRef>`;
+}
+function stringifyNumCatRef(values, formula, formatCode) {
+	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${escapeXml(v)}</c:v></c:pt>`).join("");
+	return `<c:numRef>${refFormula(formula)}<c:numCache><c:formatCode>${escapeXml(formatCode ?? "General")}</c:formatCode><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:numCache></c:numRef>`;
+}
+/** Whether the chart carries category-source data (c:cat is optional in CT_Ser). */
+function hasCategoryData(opts) {
+	return opts.categories !== void 0 || opts.categoryLabels !== void 0 || opts.multiLevelCategories !== void 0 || opts.numericCategories === true;
 }
 function stringifyCategorySource(opts) {
-	if (opts.multiLevelCategories) return stringifyMultiLvlStrRef(opts.multiLevelCategories);
+	if (opts.multiLevelCategories) return stringifyMultiLvlStrRef(opts.multiLevelCategories, opts.categoryFormula);
 	if (opts.categoryLabels) return stringifyStrLit(opts.categoryLabels);
-	return stringifyStrRef(opts.categories ?? []);
+	if (opts.numericCategories) return stringifyNumCatRef(opts.categories ?? [], opts.categoryFormula, opts.categoryFormatCode);
+	return stringifyStrRef(opts.categories ?? [], opts.categoryFormula);
+}
+function stringifyNumRef(values, formula, formatCode) {
+	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${v}</c:v></c:pt>`).join("");
+	return `<c:numRef>${refFormula(formula)}<c:numCache><c:formatCode>${escapeXml(formatCode ?? "General")}</c:formatCode><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:numCache></c:numRef>`;
 }
-function stringifyNumRef(values) {
+function stringifyNumLitList(values, formatCode) {
 	const pts = values.map((v, i) => `<c:pt idx="${i}"><c:v>${v}</c:v></c:pt>`).join("");
-	return `<c:numRef><c:f/><c:numCache><c:formatCode>General</c:formatCode><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:numCache></c:numRef>`;
+	return `<c:numLit><c:formatCode>${escapeXml(formatCode ?? "General")}</c:formatCode><c:ptCount ${attrVal("val", values.length)}/>${pts}</c:numLit>`;
 }
 function stringifyUpDownBars(gapWidth) {
 	const inner = [];
@@ -285,12 +324,14 @@ function stringifyUpDownBars(gapWidth) {
 	inner.push(emptyEl("c:downBars"));
 	return `<c:upDownBars>${inner.join("")}</c:upDownBars>`;
 }
-function stringifyDataTable(opts) {
+function stringifyDataTable(opts, ctx) {
 	const parts = [];
 	if (opts.showHorizontalBorder !== void 0) parts.push(`<c:showHorzBorder${boolVal(opts.showHorizontalBorder)}/>`);
 	if (opts.showVerticalBorder !== void 0) parts.push(`<c:showVertBorder${boolVal(opts.showVerticalBorder)}/>`);
 	if (opts.showOutline !== void 0) parts.push(`<c:showOutline${boolVal(opts.showOutline)}/>`);
 	if (opts.showLegendKeys !== void 0) parts.push(`<c:showKeys${boolVal(opts.showLegendKeys)}/>`);
+	if (opts.shapeProperties) parts.push(chartSpPr(opts.shapeProperties, ctx));
+	if (opts.textProperties) parts.push(`<c:txPr>${textBodyDesc.stringify(opts.textProperties, ctx) ?? ""}</c:txPr>`);
 	return `<c:dTable>${parts.join("")}</c:dTable>`;
 }
 function stringifyProtection(opts) {
@@ -303,6 +344,7 @@ function stringifyProtection(opts) {
 	return `<c:protection>${parts.join("")}</c:protection>`;
 }
 function stringifyExternalData(opts) {
+	if (!opts.relationshipId || /^r?Id?(0|undefined)?$/i.test(opts.relationshipId)) return void 0;
 	const auto = opts.autoUpdate !== void 0 ? `<c:autoUpdate val="${opts.autoUpdate ? 1 : 0}"/>` : "";
 	return `<c:externalData r:id="${escapeXml(opts.relationshipId)}">${auto}</c:externalData>`;
 }
@@ -318,7 +360,9 @@ function stringifyHeaderFooter(opts) {
 	if (opts.alignWithMargins !== void 0) attrs.push(`alignWithMargins="${opts.alignWithMargins ? 1 : 0}"`);
 	if (opts.differentOddEven !== void 0) attrs.push(`differentOddEven="${opts.differentOddEven ? 1 : 0}"`);
 	if (opts.differentFirst !== void 0) attrs.push(`differentFirst="${opts.differentFirst ? 1 : 0}"`);
-	return `<c:headerFooter${attrs.length ? " " + attrs.join(" ") : ""}>${parts.join("")}</c:headerFooter>`;
+	const attrStr = attrs.length ? " " + attrs.join(" ") : "";
+	if (parts.length === 0) return `<c:headerFooter${attrStr}/>`;
+	return `<c:headerFooter${attrStr}>${parts.join("")}</c:headerFooter>`;
 }
 function stringifyPageMargins(opts) {
 	return `<c:pageMargins l="${opts.left ?? .7}" r="${opts.right ?? .7}" t="${opts.top ?? .75}" b="${opts.bottom ?? .75}" header="${opts.header ?? .3}" footer="${opts.footer ?? .3}"/>`;
@@ -336,6 +380,7 @@ function stringifyPageSetup(opts) {
 	if (opts.horizontalDpi !== void 0) attrs.push(`horizontalDpi="${opts.horizontalDpi}"`);
 	if (opts.verticalDpi !== void 0) attrs.push(`verticalDpi="${opts.verticalDpi}"`);
 	if (opts.copies !== void 0) attrs.push(`copies="${opts.copies}"`);
+	if (attrs.length === 0) return `<c:pageSetup/>`;
 	return `<c:pageSetup ${attrs.join(" ")}/>`;
 }
 function stringifyPrintSettings(opts) {
@@ -354,34 +399,27 @@ function chartTypeHeader(opts) {
 		case "column":
 		case "bar":
 			headerParts.push(valEl("c:barDir", opts.type === "column" ? "col" : "bar"));
-			headerParts.push(valEl("c:grouping", "clustered"));
+			headerParts.push(valEl("c:grouping", opts.grouping ?? "clustered"));
 			break;
 		case "line":
 		case "area":
-			headerParts.push(valEl("c:grouping", "standard"));
+			headerParts.push(valEl("c:grouping", opts.grouping ?? "standard"));
 			break;
 		case "scatter":
 			headerParts.push(valEl("c:scatterStyle", "line"));
 			break;
 		case "radar":
-			headerParts.push(valEl("c:radarStyle", "standard"));
+			headerParts.push(valEl("c:radarStyle", opts.radarStyle ?? "standard"));
 			break;
 		case "ofPie":
 			headerParts.push(valEl("c:ofPieType", opts.ofPieType ?? "pie"));
-			headerParts.push(valEl("c:varyColors", 1));
-			break;
-		case "pie":
-		case "doughnut":
-		case "bubble":
-			headerParts.push(valEl("c:varyColors", 1));
-			break;
-		case "surface":
-			if (opts.wireframe !== void 0) headerParts.push(`<c:wireframe${boolVal(opts.wireframe)}/>`);
 			break;
+		case "surface": if (opts.wireframe !== void 0) headerParts.push(`<c:wireframe${boolVal(opts.wireframe)}/>`);
 	}
+	if (opts.varyColors !== void 0) headerParts.push(`<c:varyColors${boolVal(opts.varyColors)}/>`);
 	return `<${tag}>${headerParts.join("")}`;
 }
-function chartTypeFooter(opts) {
+function chartTypeFooter(opts, ctx) {
 	const tag = opts.threeD ? CHART_TYPE_TAGS_3D[opts.type] : CHART_TYPE_TAGS[opts.type];
 	const parts = [];
 	switch (opts.type) {
@@ -390,25 +428,28 @@ function chartTypeFooter(opts) {
 			if (opts.gapWidth !== void 0) parts.push(valEl("c:gapWidth", opts.gapWidth));
 			if (opts.threeD) {
 				if (opts.gapDepth !== void 0) parts.push(valEl("c:gapDepth", opts.gapDepth));
+				if (opts.shape !== void 0) parts.push(valEl("c:shape", opts.shape));
 			} else {
 				if (opts.overlap !== void 0) parts.push(valEl("c:overlap", opts.overlap));
-				if (opts.seriesLines) parts.push(emptyEl("c:serLines"));
+				parts.push(stringifyChartLines("c:serLines", opts.seriesLines, ctx));
 			}
 			break;
 		case "line":
-			if (opts.dropLines) parts.push(emptyEl("c:dropLines"));
+			parts.push(stringifyChartLines("c:dropLines", opts.dropLines, ctx));
 			if (!opts.threeD) {
-				if (opts.highLowLines) parts.push(emptyEl("c:hiLowLines"));
+				parts.push(stringifyChartLines("c:hiLowLines", opts.highLowLines, ctx));
 				if (opts.upDownBars) parts.push(stringifyUpDownBars(opts.upDownBarsGapWidth));
+				if (opts.markers !== void 0) parts.push(`<c:marker${boolVal(opts.markers)}/>`);
+				if (opts.smooth !== void 0) parts.push(`<c:smooth${boolVal(opts.smooth)}/>`);
 			} else if (opts.gapDepth !== void 0) parts.push(valEl("c:gapDepth", opts.gapDepth));
 			break;
 		case "area":
-			if (opts.dropLines) parts.push(emptyEl("c:dropLines"));
+			parts.push(stringifyChartLines("c:dropLines", opts.dropLines, ctx));
 			if (opts.threeD && opts.gapDepth !== void 0) parts.push(valEl("c:gapDepth", opts.gapDepth));
 			break;
 		case "stock":
-			if (opts.dropLines) parts.push(emptyEl("c:dropLines"));
-			if (opts.highLowLines) parts.push(emptyEl("c:hiLowLines"));
+			parts.push(stringifyChartLines("c:dropLines", opts.dropLines, ctx));
+			parts.push(stringifyChartLines("c:hiLowLines", opts.highLowLines, ctx));
 			if (opts.upDownBars) parts.push(stringifyUpDownBars(opts.upDownBarsGapWidth));
 			break;
 		case "pie":
@@ -416,35 +457,37 @@ function chartTypeFooter(opts) {
 			break;
 		case "doughnut":
 			if (opts.firstSliceAngle !== void 0) parts.push(valEl("c:firstSliceAng", opts.firstSliceAngle));
-			if (opts.holeSize !== void 0) parts.push(valEl("c:holeSize", opts.holeSize));
+			parts.push(valEl("c:holeSize", opts.holeSize ?? 10));
 			break;
 		case "bubble":
 			if (opts.bubbleScale !== void 0) parts.push(valEl("c:bubbleScale", opts.bubbleScale));
 			if (opts.showNegativeBubbles !== void 0) parts.push(`<c:showNegBubbles${boolVal(opts.showNegativeBubbles)}/>`);
-			if (opts.sizeRepresents !== void 0) parts.push(valEl("c:sizeRepresents", opts.sizeRepresents));
+			if (opts.sizeRepresents !== void 0) parts.push(valEl("c:sizeRepresents", xsdSizeRepresents.to(opts.sizeRepresents)));
 			break;
 		case "ofPie":
 			if (opts.gapWidth !== void 0) parts.push(valEl("c:gapWidth", opts.gapWidth));
-			if (opts.splitType !== void 0) parts.push(valEl("c:splitType", opts.splitType));
+			if (opts.splitType !== void 0) parts.push(valEl("c:splitType", xsdSplitType.to(opts.splitType)));
 			if (opts.splitPosition !== void 0) parts.push(valEl("c:splitPos", opts.splitPosition));
 			if (opts.customSplitPoints?.length) {
 				const pts = opts.customSplitPoints.map((p) => valEl("c:secondPiePt", p)).join("");
 				parts.push(`<c:custSplit>${pts}</c:custSplit>`);
 			}
 			if (opts.secondPieSize !== void 0) parts.push(valEl("c:secondPieSize", opts.secondPieSize));
-			if (opts.seriesLines) parts.push(emptyEl("c:serLines"));
-			break;
-		case "surface":
-			if (opts.bandFormats?.length) parts.push(stringifyBandFormats(opts.bandFormats));
+			parts.push(stringifyChartLines("c:serLines", opts.seriesLines, ctx));
 			break;
+		case "surface": if (opts.bandFormats?.length) parts.push(stringifyBandFormats(opts.bandFormats));
+	}
+	if (!NO_AXES_TYPES.has(opts.type)) {
+		const ids = opts.axes && opts.axisIds ? opts.axisIds : axesFor(opts).map((axis) => axis.id);
+		for (const id of ids) parts.push(valEl("c:axId", id));
 	}
-	if (!NO_AXES_TYPES.has(opts.type)) for (const axis of axesFor(opts)) parts.push(valEl("c:axId", axis.id));
 	return `${parts.join("")}</${tag}>`;
 }
-function stringifyMarker$1(opts) {
+function stringifyMarker$1(opts, ctx) {
 	const parts = [];
 	if (opts.symbol !== void 0) parts.push(valEl("c:symbol", opts.symbol));
 	if (opts.size !== void 0) parts.push(valEl("c:size", opts.size));
+	parts.push(chartSpPr(opts.shapeProperties, ctx));
 	return `<c:marker>${parts.join("")}</c:marker>`;
 }
 function stringifyPictureOptions(opts) {
@@ -456,26 +499,27 @@ function stringifyPictureOptions(opts) {
 	if (opts.pictureStackUnit !== void 0) parts.push(valEl("c:pictureStackUnit", opts.pictureStackUnit));
 	return `<c:pictureOptions>${parts.join("")}</c:pictureOptions>`;
 }
-function stringifyDataPoint(opts) {
+function stringifyDataPoint(opts, ctx) {
 	const parts = [valEl("c:idx", opts.index)];
 	if (opts.invertIfNegative !== void 0) parts.push(`<c:invertIfNegative${boolVal(opts.invertIfNegative)}/>`);
-	if (opts.marker) parts.push(stringifyMarker$1(opts.marker));
+	if (opts.marker) parts.push(stringifyMarker$1(opts.marker, ctx));
 	if (opts.bubble3D !== void 0) parts.push(`<c:bubble3D${boolVal(opts.bubble3D)}/>`);
 	if (opts.explosion !== void 0) parts.push(valEl("c:explosion", opts.explosion));
+	parts.push(chartSpPr(opts.shapeProperties, ctx));
 	if (opts.pictureOptions) parts.push(stringifyPictureOptions(opts.pictureOptions));
 	return `<c:dPt>${parts.join("")}</c:dPt>`;
 }
-function stringifySeries(index, series, opts) {
-	const chartType = opts.type;
-	const categories = opts.categories ?? [];
+function stringifySeries(index, series, opts, ctx, groupType) {
+	const chartType = groupType ?? opts.type;
 	const parts = [];
 	const s = series;
-	parts.push(valEl("c:idx", index));
-	parts.push(valEl("c:order", index));
-	parts.push(`<c:tx>${stringifyStrRef([series.name])}</c:tx>`);
-	parts.push(emptyEl("c:spPr"));
+	parts.push(valEl("c:idx", s.index ?? index));
+	parts.push(valEl("c:order", s.order ?? index));
+	if (series.nameLiteral && series.name !== void 0) parts.push(`<c:tx><c:v>${escapeXml(series.name)}</c:v></c:tx>`);
+	else if (series.name !== void 0 || series.nameFormula !== void 0) parts.push(`<c:tx>${stringifyStrRef([series.name], series.nameFormula)}</c:tx>`);
+	parts.push(chartSpPr(s.shapeProperties, ctx));
 	if (chartType === "line" || chartType === "scatter" || chartType === "radar") {
-		if (s.marker) parts.push(stringifyMarker$1(s.marker));
+		if (s.marker) parts.push(stringifyMarker$1(s.marker, ctx));
 	} else if (chartType === "column" || chartType === "bar") {
 		if (s.invertIfNegative !== void 0) parts.push(`<c:invertIfNegative${boolVal(s.invertIfNegative)}/>`);
 		if (s.pictureOptions) parts.push(stringifyPictureOptions(s.pictureOptions));
@@ -486,8 +530,8 @@ function stringifySeries(index, series, opts) {
 	} else if (chartType === "pie" || chartType === "doughnut" || chartType === "ofPie") {
 		if (s.explosion !== void 0) parts.push(valEl("c:explosion", s.explosion));
 	}
-	if (s.dataPoints) for (const dp of s.dataPoints) parts.push(stringifyDataPoint(dp));
-	if (s.dataLabels) parts.push(stringifyDataLabels(s.dataLabels));
+	if (s.dataPoints) for (const dp of s.dataPoints) parts.push(stringifyDataPoint(dp, ctx));
+	if (s.dataLabels) parts.push(stringifyDataLabels(s.dataLabels, ctx));
 	if (s.trendlines) for (const tl of s.trendlines) parts.push(stringifyTrendline(tl));
 	if (s.errorBars) parts.push(stringifyErrBars(s.errorBars));
 	if (chartType === "bubble") {
@@ -496,46 +540,186 @@ function stringifySeries(index, series, opts) {
 		parts.push(`<c:yVal>${stringifyNumRef(bs.yValues)}</c:yVal>`);
 		parts.push(`<c:bubbleSize>${stringifyNumRef(bs.bubbleSize)}</c:bubbleSize>`);
 	} else if (chartType === "scatter") {
-		parts.push(`<c:xVal>${stringifyStrRef(categories)}</c:xVal>`);
-		parts.push(`<c:yVal>${stringifyNumRef(s.values)}</c:yVal>`);
-	} else {
+		if ("xValues" in series) {
+			parts.push(`<c:xVal>${stringifyNumRef(series.xValues)}</c:xVal>`);
+			parts.push(`<c:yVal>${stringifyNumRef(series.yValues, series.valueFormula, series.formatCode)}</c:yVal>`);
+		} else {
+			parts.push(`<c:xVal>${stringifyCategorySource(opts)}</c:xVal>`);
+			parts.push(`<c:yVal>${stringifyNumRef(s.values, s.valueFormula, s.formatCode)}</c:yVal>`);
+		}
+	} else if (hasCategoryData(opts)) {
 		parts.push(`<c:cat>${stringifyCategorySource(opts)}</c:cat>`);
-		parts.push(`<c:val>${stringifyNumRef(s.values)}</c:val>`);
-	}
+		parts.push(`<c:val>${s.valueLiteral ? stringifyNumLitList(s.values, s.formatCode) : stringifyNumRef(s.values, s.valueFormula, s.formatCode)}</c:val>`);
+	} else parts.push(`<c:val>${s.valueLiteral ? stringifyNumLitList(s.values, s.formatCode) : stringifyNumRef(s.values, s.valueFormula, s.formatCode)}</c:val>`);
 	if ((chartType === "line" || chartType === "scatter") && s.smooth !== void 0) parts.push(`<c:smooth${boolVal(s.smooth)}/>`);
 	if ((chartType === "column" || chartType === "bar") && s.shape !== void 0) parts.push(valEl("c:shape", s.shape));
 	if (chartType === "bubble" && s.bubble3D !== void 0) parts.push(`<c:bubble3D${boolVal(s.bubble3D)}/>`);
+	if (s.ext) parts.push(`<c:extLst>${s.ext}</c:extLst>`);
 	return `<c:ser>${parts.join("")}</c:ser>`;
 }
-function stringifyTitle(title) {
-	return `<c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>${escapeXml(title)}</a:t></a:r></a:p></c:rich></c:tx><c:overlay val="0"/></c:title>`;
+function stringifyChartLines(tag, opts, ctx) {
+	if (opts === void 0 || opts === false) return "";
+	if (opts === true) return emptyEl(tag);
+	return `<${tag}>${chartSpPr(opts.shapeProperties, ctx)}</${tag}>`;
+}
+/** Read any CT_ChartLines element: true when bare, decorations when carried. */
+function readChartLines(parent, tag, ctx) {
+	const el = findChild(parent, tag);
+	if (!el) return void 0;
+	const spPrEl = findChild(el, "c:spPr");
+	if (!spPrEl) return true;
+	const lines = {};
+	const shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+	if (shapeProperties) lines.shapeProperties = shapeProperties;
+	return lines;
+}
+/** Read one secondary chart group (combo): own series, flags, and 2D group tail. */
+function readSecondaryGroup(secondaryEl, ctx) {
+	const mapping = TAG_TO_CHART_TYPE[secondaryEl.name ?? ""];
+	if (!mapping) return void 0;
+	let secType = mapping.type;
+	if (secondaryEl.name === "c:barChart" || secondaryEl.name === "c:bar3DChart") {
+		const barDir = findChild(secondaryEl, "c:barDir");
+		const barDirVal = barDir ? attr(barDir, "val") : void 0;
+		if (barDirVal === "bar") secType = "bar";
+		else if (barDirVal === "col") secType = "column";
+	}
+	const g = {
+		type: secType,
+		series: []
+	};
+	const grouping = readValStr(secondaryEl, "c:grouping");
+	if (grouping) g.grouping = grouping;
+	const varyColors = readBoolAttr(secondaryEl, "c:varyColors");
+	if (varyColors !== void 0) g.varyColors = varyColors;
+	const groupLabels = readDataLabels(secondaryEl, ctx);
+	if (groupLabels) g.dataLabels = groupLabels;
+	if (secType === "bar" || secType === "column") {
+		const gapWidth = readValNum(secondaryEl, "c:gapWidth");
+		if (gapWidth !== void 0) g.gapWidth = gapWidth;
+		if (!mapping.threeD) {
+			const overlap = readValNum(secondaryEl, "c:overlap");
+			if (overlap !== void 0) g.overlap = overlap;
+		} else {
+			const gapDepth = readValNum(secondaryEl, "c:gapDepth");
+			if (gapDepth !== void 0) g.gapDepth = gapDepth;
+		}
+		const seriesLines = readChartLines(secondaryEl, "c:serLines", ctx);
+		if (seriesLines !== void 0) g.seriesLines = seriesLines;
+	} else if (secType === "line") {
+		const dropLines = readChartLines(secondaryEl, "c:dropLines", ctx);
+		if (dropLines !== void 0) g.dropLines = dropLines;
+		const highLowLines = readChartLines(secondaryEl, "c:hiLowLines", ctx);
+		if (highLowLines !== void 0) g.highLowLines = highLowLines;
+		const upDownBars = findChild(secondaryEl, "c:upDownBars");
+		if (upDownBars) {
+			g.upDownBars = true;
+			const gw = readValNum(upDownBars, "c:gapWidth");
+			if (gw !== void 0) g.upDownBarsGapWidth = gw;
+		}
+		const markers = readBoolAttr(secondaryEl, "c:marker");
+		if (markers !== void 0) g.markers = markers;
+		const smooth = readBoolAttr(secondaryEl, "c:smooth");
+		if (smooth !== void 0) g.smooth = smooth;
+	} else if (secType === "area") {
+		const dropLines = readChartLines(secondaryEl, "c:dropLines", ctx);
+		if (dropLines !== void 0) g.dropLines = dropLines;
+	}
+	const secAxIds = children(secondaryEl, "c:axId");
+	if (secAxIds.length > 0) {
+		const ids = secAxIds.map((e) => Number(attr(e, "val"))).filter((n) => !isNaN(n));
+		if (ids.length > 0) g.axisIds = ids;
+	}
+	const secSeries = [];
+	for (const serEl of children(secondaryEl, "c:ser")) {
+		const { name, literal: nameLiteral } = readSeriesName(serEl);
+		const txEl = findChild(serEl, "c:tx");
+		const nameFormula = txEl ? readRefMeta(txEl).formula : void 0;
+		const valueEl = findChild(serEl, "c:val") ?? findChild(serEl, "c:yVal");
+		const valueLiteral = valueEl ? findChild(valueEl, "c:numLit") !== void 0 : false;
+		const values = valueEl ? readNumCache(valueEl) : [];
+		const valMeta = valueEl ? readRefMeta(valueEl) : {};
+		secSeries.push({
+			name,
+			...nameLiteral ? { nameLiteral } : {},
+			...nameFormula ? { nameFormula } : {},
+			...valueLiteral ? { valueLiteral } : {},
+			...valMeta.formula ? { valueFormula: valMeta.formula } : {},
+			...valMeta.formatCode ? { formatCode: valMeta.formatCode } : {},
+			values,
+			...readSeriesCommon(serEl, ctx)
+		});
+	}
+	g.series = secSeries;
+	return g;
+}
+function stringifySecondaryGroup(g, opts, ctx) {
+	const parts = [chartTypeHeader(g)];
+	for (const [i, series] of (g.series ?? []).entries()) parts.push(stringifySeries(i, series, opts, ctx, g.type));
+	if (g.dataLabels) parts.push(stringifyDataLabels(g.dataLabels, ctx));
+	switch (g.type) {
+		case "bar":
+		case "column":
+			if (g.gapWidth !== void 0) parts.push(valEl("c:gapWidth", g.gapWidth));
+			if (g.overlap !== void 0) parts.push(valEl("c:overlap", g.overlap));
+			parts.push(stringifyChartLines("c:serLines", g.seriesLines, ctx));
+			break;
+		case "line":
+			parts.push(stringifyChartLines("c:dropLines", g.dropLines, ctx));
+			parts.push(stringifyChartLines("c:hiLowLines", g.highLowLines, ctx));
+			if (g.upDownBars) parts.push(stringifyUpDownBars(g.upDownBarsGapWidth));
+			if (g.markers !== void 0) parts.push(`<c:marker${boolVal(g.markers)}/>`);
+			if (g.smooth !== void 0) parts.push(`<c:smooth${boolVal(g.smooth)}/>`);
+			break;
+		case "area": parts.push(stringifyChartLines("c:dropLines", g.dropLines, ctx));
+	}
+	for (const id of g.axisIds ?? []) parts.push(valEl("c:axId", id));
+	return `${parts.join("")}</${CHART_TYPE_TAGS[g.type]}>`;
+}
+function stringifyTitle(title, ctx) {
+	if (typeof title !== "string") {
+		const parts = [];
+		if (title.text !== void 0) parts.push(typeof title.text === "string" ? `<c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>${escapeXml(title.text)}</a:t></a:r></a:p></c:rich></c:tx>` : `<c:tx><c:rich>${textBodyDesc.stringify(title.text, ctx) ?? ""}</c:rich></c:tx>`);
+		if (title.layout !== void 0) parts.push(title.layout === true ? "<c:layout/>" : stringifyLayout(title.layout));
+		if (title.overlay !== void 0) parts.push(`<c:overlay${boolVal(title.overlay)}/>`);
+		if (title.shapeProperties) parts.push(chartSpPr(title.shapeProperties, ctx));
+		if (title.textProperties) parts.push(`<c:txPr>${textBodyDesc.stringify(title.textProperties, ctx) ?? ""}</c:txPr>`);
+		return `<c:title>${parts.join("")}</c:title>`;
+	}
+	return `<c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>${escapeXml(title)}</a:t></a:r></a:p></c:rich></c:tx></c:title>`;
 }
-const LEGEND_TXPR = "<c:txPr><a:bodyPr rot=\"0\" spcFirstLastPara=\"1\" vertOverflow=\"ellipsis\" vert=\"horz\" wrap=\"square\" anchor=\"ctr\" anchorCtr=\"1\"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr lang=\"en-US\"/></a:p></c:txPr>";
-function stringifyLegendEntry(entry) {
-	if (!entry.delete) return "";
-	return `<c:legendEntry><c:idx val="${entry.index}"/><c:delete val="1"/></c:legendEntry>`;
+function stringifyLegendEntry(entry, ctx) {
+	if (entry.delete) return `<c:legendEntry><c:idx val="${entry.index}"/><c:delete val="1"/></c:legendEntry>`;
+	if (entry.textProperties) {
+		const txPr = textBodyDesc.stringify(entry.textProperties, ctx) ?? "";
+		return `<c:legendEntry><c:idx val="${entry.index}"/><c:txPr>${txPr}</c:txPr></c:legendEntry>`;
+	}
+	return "";
 }
-function stringifyLegend(opts) {
-	return `<c:legend><c:legendPos val="${opts.legendPosition ?? "b"}"/>${(opts.legendEntries ?? []).map(stringifyLegendEntry).join("")}<c:layout/><c:overlay val="0"/><c:spPr><a:noFill/><a:ln><a:noFill/></a:ln><a:effectLst/></c:spPr>${LEGEND_TXPR}</c:legend>`;
+function stringifyLegend(opts, ctx) {
+	return `<c:legend>${opts.legendPosition !== void 0 ? `<c:legendPos val="${xsdLegendPosition.to(opts.legendPosition)}"/>` : opts.showLegend === true ? "" : `<c:legendPos val="b"/>`}${(opts.legendEntries ?? []).map((e) => stringifyLegendEntry(e, ctx)).join("")}${opts.legendLayout === true ? "<c:layout/>" : opts.legendLayout ? stringifyLayout(opts.legendLayout) : ""}${opts.legendOverlay !== void 0 ? `<c:overlay${boolVal(opts.legendOverlay)}/>` : ""}${chartSpPr(opts.legendShapeProperties, ctx)}${opts.legendTextProperties ? `<c:txPr>${textBodyDesc.stringify(opts.legendTextProperties, ctx) ?? ""}</c:txPr>` : ""}</c:legend>`;
 }
 function stringifyPivotSource(opts) {
 	return `<c:pivotSource><c:name>${escapeXml(opts.name)}</c:name><c:fmtId val="${opts.formatId}"/></c:pivotSource>`;
 }
-function stringifyPivotFormats(formats) {
+function stringifyPivotFormats(formats, ctx) {
 	return `<c:pivotFmts>${formats.map((f) => {
 		let entry = `<c:idx val="${f.index}"/>`;
-		if (f.marker) entry += stringifyMarker$1(f.marker);
+		if (f.marker) entry += stringifyMarker$1(f.marker, ctx);
 		return `<c:pivotFmt>${entry}</c:pivotFmt>`;
 	}).join("")}</c:pivotFmts>`;
 }
 function stringifyBandFormats(formats) {
 	return `<c:bandFmts>${formats.map((f) => `<c:bandFmt><c:idx val="${f.index}"/></c:bandFmt>`).join("")}</c:bandFmts>`;
 }
-function noFillSpPr() {
-	return `<c:spPr><a:noFill/><a:ln><a:noFill/></a:ln><a:effectLst/></c:spPr>`;
-}
-function chartTxPr() {
-	return `<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr lang="en-US"/></a:p></c:txPr>`;
+/**
+* Wrap c:spPr inner content. An empty shape-properties object is a real
+* `<c:spPr/>` placeholder (presence itself is the content), so undefined
+* inner still emits the bare element.
+*/
+function chartSpPr(opts, ctx) {
+	if (!opts) return "";
+	return `<c:spPr>${shapePropertiesDesc.stringify(opts, ctx) ?? ""}</c:spPr>`;
 }
 /** Default bottom category axis (c:catAx) for generated charts. */
 function categoryAxis(id, crossAxisId) {
@@ -543,10 +727,10 @@ function categoryAxis(id, crossAxisId) {
 		kind: "category",
 		id,
 		crossAxisId,
-		scaling: { orientation: "minMax" },
+		scaling: { orientation: "ascending" },
 		delete: false,
-		position: "b",
-		crosses: "autoZero",
+		position: "bottom",
+		crosses: "zero",
 		auto: true,
 		labelOffset: 100,
 		noMultiLevelLabel: false
@@ -558,11 +742,11 @@ function valueAxis(id, crossAxisId) {
 		kind: "value",
 		id,
 		crossAxisId,
-		scaling: { orientation: "minMax" },
+		scaling: { orientation: "ascending" },
 		delete: false,
-		position: "l",
+		position: "left",
 		numberFormat: "General",
-		crosses: "autoZero"
+		crosses: "zero"
 	};
 }
 /** Default series axis (c:serAx) for surface charts. */
@@ -571,11 +755,11 @@ function seriesAxis(id, crossAxisId) {
 		kind: "series",
 		id,
 		crossAxisId,
-		scaling: { orientation: "minMax" },
+		scaling: { orientation: "ascending" },
 		delete: false,
-		position: "b",
+		position: "bottom",
 		numberFormat: "General",
-		crosses: "autoZero",
+		crosses: "zero",
 		tickLabelSkip: 1
 	};
 }
@@ -598,10 +782,19 @@ function defaultAxesFor(chartType, threeD) {
 }
 /** Provided axes override defaults; otherwise defaults are derived from chart type. */
 function axesFor(opts) {
-	return opts.axes ?? defaultAxesFor(opts.type, opts.threeD);
+	if (!opts.axes) return defaultAxesFor(opts.type, opts.threeD);
+	const slots = defaultAxesFor(opts.type, opts.threeD);
+	return opts.axes.map((axis, i) => {
+		const slot = slots[i] ?? slots[slots.length - 1];
+		return {
+			...axis,
+			id: axis.id ?? slot.id,
+			crossAxisId: axis.crossAxisId ?? slot.crossAxisId
+		};
+	});
 }
-function stringifyAxes(opts) {
-	return axesFor(opts).map(stringifyAxis).join("");
+function stringifyAxes(opts, ctx) {
+	return axesFor(opts).map((axis) => stringifyAxis(axis, ctx)).join("");
 }
 function readStrCache(el) {
 	const strRef = findChild(el, "c:strRef");
@@ -609,13 +802,53 @@ function readStrCache(el) {
 	const strCache = findChild(strRef, "c:strCache");
 	if (!strCache?.elements) return [];
 	const result = [];
-	for (const pt of strCache.elements) if (pt.name === "c:pt" && pt.elements) {
-		const v = pt.elements.find((c) => c.name === "c:v");
+	for (const pt of strCache.elements) if (pt.name === "c:pt") {
+		const v = findChild(pt, "c:v");
 		const text = v ? textOf(v) : "";
 		if (text !== "") result.push(text);
 	}
 	return result;
 }
+/** Numeric category labels read as literal text (c:cat > c:numRef > c:numCache). */
+function readNumCacheText(el) {
+	const numRef = findChild(el, "c:numRef");
+	if (!numRef) return [];
+	const numCache = findChild(numRef, "c:numCache");
+	if (!numCache?.elements) return [];
+	const result = [];
+	for (const pt of numCache.elements) if (pt.name === "c:pt") {
+		const v = findChild(pt, "c:v");
+		const text = v ? textOf(v) ?? "" : "";
+		result.push(text);
+	}
+	return result;
+}
+/** Reference metadata on a data-source slot: the c:f formula and, for numRef,
+*  the cached c:formatCode — both round-trip only. */
+function readRefMeta(el) {
+	const strRef = findChild(el, "c:strRef");
+	const numRef = strRef ? void 0 : findChild(el, "c:numRef");
+	const ref = strRef ?? numRef;
+	const meta = {};
+	if (ref) {
+		const f = findChild(ref, "c:f");
+		const text = f ? textOf(f) : "";
+		if (text) meta.formula = text;
+	}
+	if (numRef) {
+		const cache = findChild(numRef, "c:numCache");
+		const fc = cache ? findChild(cache, "c:formatCode") : void 0;
+		const text = fc ? textOf(fc) : "";
+		if (text) meta.formatCode = text;
+	}
+	const numLit = strRef || numRef ? void 0 : findChild(el, "c:numLit");
+	if (numLit) {
+		const fc = findChild(numLit, "c:formatCode");
+		const text = fc ? textOf(fc) : "";
+		if (text) meta.formatCode = text;
+	}
+	return meta;
+}
 function readStrLit(el) {
 	const strLit = findChild(el, "c:strLit");
 	if (!strLit) return void 0;
@@ -645,14 +878,32 @@ function readMultiLvlStrCache(el) {
 	}
 	return levels;
 }
+function readNumLitPoints(numLit) {
+	const result = [];
+	for (const pt of numLit.elements ?? []) if (pt.name === "c:pt") {
+		const v = findChild(pt, "c:v");
+		const text = v ? textOf(v) : "";
+		if (text !== "") result.push(Number(text));
+	}
+	return result;
+}
+/** A scatter series carries numeric x values when c:xVal holds the
+* CT_NumDataSource choice (numRef/numLit); the label-x shape stringifies
+* x as a strRef category source instead. */
+function hasNumericXRef(serEl) {
+	const xVal = findChild(serEl, "c:xVal");
+	return xVal !== void 0 && (findChild(xVal, "c:numRef") !== void 0 || findChild(xVal, "c:numLit") !== void 0);
+}
 function readNumCache(el) {
+	const numLit = findChild(el, "c:numLit");
+	if (numLit) return readNumLitPoints(numLit);
 	const numRef = findChild(el, "c:numRef");
 	if (!numRef) return [];
 	const numCache = findChild(numRef, "c:numCache");
 	if (!numCache?.elements) return [];
 	const result = [];
-	for (const pt of numCache.elements) if (pt.name === "c:pt" && pt.elements) {
-		const v = pt.elements.find((c) => c.name === "c:v");
+	for (const pt of numCache.elements) if (pt.name === "c:pt") {
+		const v = findChild(pt, "c:v");
 		const text = v ? textOf(v) : "";
 		if (text !== "") result.push(Number(text));
 	}
@@ -660,16 +911,79 @@ function readNumCache(el) {
 }
 function readSeriesName(serEl) {
 	const tx = findChild(serEl, "c:tx");
-	if (!tx) return "";
-	return readStrCache(tx)[0] ?? "";
+	if (!tx) return {
+		name: void 0,
+		literal: false
+	};
+	const v = findChild(tx, "c:v");
+	if (v && !findChild(tx, "c:strRef")) {
+		const text = textOf(v);
+		return {
+			name: text !== "" ? text : void 0,
+			literal: true
+		};
+	}
+	return {
+		name: readStrCache(tx)[0] ?? "",
+		literal: false
+	};
+}
+/** Read a c:title. Plain text stays a string; layout/overlay/spPr/txPr
+*  decorations promote it to the ChartTitleOptions object form. */
+/** Read the title's c:tx > c:rich body; undefined when absent or strRef-linked. */
+function readTitleBody(titleEl, ctx) {
+	const rich = findChild(findChild(titleEl, "c:tx") ?? titleEl, "c:rich");
+	if (!rich) return void 0;
+	return collapseTitleBody(textBodyDesc.parse(rich, ctx));
+}
+/**
+* Collapse a parsed title body to its plain text when it is exactly what the
+* string form emits (empty bodyPr/listStyle, one bare run), keeping simple
+* titles readable in the Options JSON.
+*/
+function collapseTitleBody(body) {
+	if (body.listStyle !== void 0) return body;
+	if (body.bodyProperties !== void 0 && Object.keys(body.bodyProperties).length > 0) return body;
+	const ps = body.paragraphs ?? [];
+	if (ps.length !== 1) return body;
+	const p = ps[0];
+	if (p === void 0) return body;
+	if (typeof p === "string") return p;
+	if (p.properties !== void 0 || p.children !== void 0) return body;
+	if (p.endParagraphProperties !== void 0 && p.endParagraphProperties !== false) return body;
+	return p.text ?? "";
+}
+function readTitle(titleEl, ctx) {
+	const body = readTitleBody(titleEl, ctx);
+	const text = body === void 0 ? readTitleText(titleEl) : void 0;
+	const layoutEl = findChild(titleEl, "c:layout");
+	const overlayEl = findChild(titleEl, "c:overlay");
+	const spPrEl = findChild(titleEl, "c:spPr");
+	const txPrEl = findChild(titleEl, "c:txPr");
+	if (!layoutEl && !overlayEl && !spPrEl && !txPrEl) {
+		if (typeof body === "string" || body === void 0) return body ?? text ?? "";
+		return { text: body };
+	}
+	const title = {};
+	if (body !== void 0) title.text = body;
+	else if (text !== void 0) title.text = text;
+	if (layoutEl) title.layout = readManualLayout(layoutEl) ?? true;
+	if (overlayEl) title.overlay = parseOnOff(attr(overlayEl, "val")) ?? false;
+	if (spPrEl) title.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+	if (txPrEl) title.textProperties = textBodyDesc.parse(txPrEl, ctx);
+	return title;
 }
 function readTitleText(titleEl) {
 	const tx = findChild(titleEl, "c:tx");
 	if (!tx?.elements) return void 0;
-	for (const child of tx.elements) if (child.name === "c:rich" && child.elements) {
-		for (const sub of child.elements) if (sub.name === "a:p" && sub.elements) {
-			for (const r of sub.elements) if (r.name === "a:r" && r.elements) {
-				for (const t of r.elements) if (t.name === "a:t") {
+	for (const child of tx.elements) {
+		if (child.name !== "c:rich") continue;
+		for (const sub of child.elements ?? []) {
+			if (sub.name !== "a:p") continue;
+			for (const r of sub.elements ?? []) {
+				if (r.name !== "a:r") continue;
+				const t = findChild(r, "a:t");
+				if (t) {
 					const text = textOf(t);
 					if (text) return text;
 				}
@@ -700,8 +1014,8 @@ function readNumLit(el, childName) {
 	if (!child) return void 0;
 	const numLit = findChild(child, "c:numLit");
 	if (!numLit?.elements) return void 0;
-	for (const pt of numLit.elements) if (pt.name === "c:pt" && pt.elements) {
-		const v = pt.elements.find((c) => c.name === "c:v");
+	for (const pt of numLit.elements) if (pt.name === "c:pt") {
+		const v = findChild(pt, "c:v");
 		if (v) {
 			const text = textOf(v);
 			if (text) return Number(text);
@@ -714,7 +1028,7 @@ function readTrendlines(serEl) {
 	return tlEls.map((tl) => {
 		const opts = {};
 		const type = readValStr(tl, "c:trendlineType");
-		if (type) opts.type = type;
+		if (type) opts.type = xsdTrendlineType.from(type);
 		const order = readValNum(tl, "c:order");
 		if (order !== void 0) opts.order = order;
 		const period = readValNum(tl, "c:period");
@@ -729,7 +1043,8 @@ function readTrendlines(serEl) {
 		if (dispRSqr !== void 0) opts.dispRSqr = dispRSqr;
 		const dispEq = readBoolAttr(tl, "c:dispEq");
 		if (dispEq !== void 0) opts.dispEq = dispEq;
-		const nameText = textOf(findChild(tl, "c:name"));
+		const nameEl = findChild(tl, "c:name");
+		const nameText = textOf(nameEl);
 		if (nameText) opts.name = nameText;
 		const labelFmt = attr(findChild(findChild(tl, "c:trendlineLbl"), "c:numFmt"), "formatCode");
 		if (labelFmt) opts.label = { numberFormat: labelFmt };
@@ -745,7 +1060,7 @@ function readErrBars(serEl) {
 	const barType = readValStr(ebEl, "c:errBarType");
 	if (barType) opts.barType = barType;
 	const valueType = readValStr(ebEl, "c:errValType");
-	if (valueType) opts.valueType = valueType;
+	if (valueType) opts.valueType = xsdErrorValueType.from(valueType);
 	const noEndCap = readBoolAttr(ebEl, "c:noEndCap");
 	if (noEndCap !== void 0) opts.noEndCap = noEndCap;
 	const plusValue = readNumLit(ebEl, "c:plus");
@@ -756,12 +1071,26 @@ function readErrBars(serEl) {
 	if (value !== void 0) opts.value = value;
 	return opts;
 }
-function readDataLabels(serEl) {
+function readDataLabels(serEl, ctx) {
 	const dlEl = findChild(serEl, "c:dLbls");
 	if (!dlEl) return void 0;
 	const opts = {};
+	const groupDelete = readBoolAttr(dlEl, "c:delete");
+	if (groupDelete !== void 0) opts.delete = groupDelete;
+	const numFmt = attr(findChild(dlEl, "c:numFmt"), "formatCode");
+	if (numFmt) opts.numberFormat = numFmt;
+	const dlSpPr = findChild(dlEl, "c:spPr");
+	if (dlSpPr) {
+		const shapeProperties = shapePropertiesDesc.parse(dlSpPr, ctx);
+		if (shapeProperties) opts.shapeProperties = shapeProperties;
+	}
+	const dlTxPr = findChild(dlEl, "c:txPr");
+	if (dlTxPr) {
+		const textProperties = textBodyDesc.parse(dlTxPr, ctx);
+		if (textProperties) opts.textProperties = textProperties;
+	}
 	const position = readValStr(dlEl, "c:dLblPos");
-	if (position) opts.position = position;
+	if (position) opts.position = xsdDataLabelPosition.from(position);
 	const showLegendKey = readBoolAttr(dlEl, "c:showLegendKey");
 	if (showLegendKey !== void 0) opts.showLegendKey = showLegendKey;
 	const showVal = readBoolAttr(dlEl, "c:showVal");
@@ -776,22 +1105,53 @@ function readDataLabels(serEl) {
 	if (showBubbleSize !== void 0) opts.showBubbleSize = showBubbleSize;
 	const showLeaderLines = readBoolAttr(dlEl, "c:showLeaderLines");
 	if (showLeaderLines !== void 0) opts.showLeaderLines = showLeaderLines;
-	const sepText = textOf(findChild(dlEl, "c:separator"));
+	const sepEl = findChild(dlEl, "c:separator");
+	const sepText = textOf(sepEl);
 	if (sepText) opts.separator = sepText;
 	const lblEls = children(dlEl, "c:dLbl");
 	if (lblEls.length > 0) opts.labels = lblEls.map((el) => {
 		const result = { index: readValNum(el, "c:idx") ?? 0 };
 		if (findChild(el, "c:delete")) result.delete = true;
+		const layoutEl = findChild(el, "c:layout");
+		if (layoutEl) result.layout = readManualLayout(layoutEl) ?? true;
+		const richEl = findChild(findChild(el, "c:tx"), "c:rich");
+		if (richEl) {
+			const text = textBodyDesc.parse(richEl, ctx);
+			if (text) result.text = text;
+		}
 		const numFmt = attr(findChild(el, "c:numFmt"), "formatCode");
 		if (numFmt) result.numberFormat = numFmt;
+		const lblSpPr = findChild(el, "c:spPr");
+		if (lblSpPr) {
+			const shapeProperties = shapePropertiesDesc.parse(lblSpPr, ctx);
+			if (shapeProperties) result.shapeProperties = shapeProperties;
+		}
+		const lblTxPr = findChild(el, "c:txPr");
+		if (lblTxPr) {
+			const textProperties = textBodyDesc.parse(lblTxPr, ctx);
+			if (textProperties) result.textProperties = textProperties;
+		}
 		const pos = readValStr(el, "c:dLblPos");
-		if (pos) result.position = pos;
+		if (pos) result.position = xsdDataLabelPosition.from(pos);
+		for (const flag of [
+			"showLegendKey",
+			"showVal",
+			"showCatName",
+			"showSerName",
+			"showPercent",
+			"showBubbleSize"
+		]) {
+			const v = readBoolAttr(el, `c:${flag}`);
+			if (v !== void 0) result[flag] = v;
+		}
+		const sep = textOf(findChild(el, "c:separator"));
+		if (sep) result.separator = sep;
 		return result;
 	});
 	if (findChild(dlEl, "c:leaderLines")) opts.leaderLines = true;
 	return opts;
 }
-function readMarker$1(parent) {
+function readMarker$1(parent, ctx) {
 	const el = findChild(parent, "c:marker");
 	if (!el) return void 0;
 	const opts = {};
@@ -799,6 +1159,11 @@ function readMarker$1(parent) {
 	if (symbol) opts.symbol = symbol;
 	const size = readValNum(el, "c:size");
 	if (size !== void 0) opts.size = size;
+	const spPr = findChild(el, "c:spPr");
+	if (spPr) {
+		const shapeProperties = shapePropertiesDesc.parse(spPr, ctx);
+		if (shapeProperties) opts.shapeProperties = shapeProperties;
+	}
 	return Object.keys(opts).length ? opts : void 0;
 }
 function readPictureOptions(parent) {
@@ -817,36 +1182,47 @@ function readPictureOptions(parent) {
 	if (stack !== void 0) opts.pictureStackUnit = stack;
 	return Object.keys(opts).length ? opts : void 0;
 }
-function readDataPoints(serEl) {
+function readDataPoints(serEl, ctx) {
 	const els = children(serEl, "c:dPt");
 	if (els.length === 0) return void 0;
 	return els.map((el) => {
 		const dp = { index: readValNum(el, "c:idx") ?? 0 };
 		const invertIfNegative = readBoolAttr(el, "c:invertIfNegative");
 		if (invertIfNegative !== void 0) dp.invertIfNegative = invertIfNegative;
-		const marker = readMarker$1(el);
+		const marker = readMarker$1(el, ctx);
 		if (marker) dp.marker = marker;
 		const bubble3D = readBoolAttr(el, "c:bubble3D");
 		if (bubble3D !== void 0) dp.bubble3D = bubble3D;
 		const explosion = readValNum(el, "c:explosion");
 		if (explosion !== void 0) dp.explosion = explosion;
+		const spPr = findChild(el, "c:spPr");
+		if (spPr) {
+			const shapeProperties = shapePropertiesDesc.parse(spPr, ctx);
+			if (shapeProperties) dp.shapeProperties = shapeProperties;
+		}
 		const pictureOptions = readPictureOptions(el);
 		if (pictureOptions) dp.pictureOptions = pictureOptions;
 		return dp;
 	});
 }
 /** Read shared ser enhancement fields (CT_Ser children beyond EG_SerShared). */
-function readSeriesCommon(serEl) {
+function readSeriesCommon(serEl, ctx) {
 	const common = {};
+	const idx = readValNum(serEl, "c:idx");
+	if (idx !== void 0) common.index = idx;
+	const order = readValNum(serEl, "c:order");
+	if (order !== void 0) common.order = order;
+	const spPrEl = findChild(serEl, "c:spPr");
+	if (spPrEl) common.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
 	const trendlines = readTrendlines(serEl);
 	if (trendlines) common.trendlines = trendlines;
 	const errorBars = readErrBars(serEl);
 	if (errorBars) common.errorBars = errorBars;
-	const dataLabels = readDataLabels(serEl);
+	const dataLabels = readDataLabels(serEl, ctx);
 	if (dataLabels) common.dataLabels = dataLabels;
-	const dataPoints = readDataPoints(serEl);
+	const dataPoints = readDataPoints(serEl, ctx);
 	if (dataPoints) common.dataPoints = dataPoints;
-	const marker = readMarker$1(serEl);
+	const marker = readMarker$1(serEl, ctx);
 	if (marker) common.marker = marker;
 	const invertIfNegative = readBoolAttr(serEl, "c:invertIfNegative");
 	if (invertIfNegative !== void 0) common.invertIfNegative = invertIfNegative;
@@ -860,6 +1236,11 @@ function readSeriesCommon(serEl) {
 	if (shape) common.shape = shape;
 	const bubble3D = readBoolAttr(serEl, "c:bubble3D");
 	if (bubble3D !== void 0) common.bubble3D = bubble3D;
+	const extLst = findChild(serEl, "c:extLst");
+	if (extLst) {
+		const inner = stringify(extLst);
+		if (inner) common.ext = inner;
+	}
 	return common;
 }
 function readView3D(chartEl) {
@@ -905,25 +1286,43 @@ function readManualLayout(layoutEl) {
 	if (h !== void 0) opts.h = h;
 	return Object.keys(opts).length ? opts : void 0;
 }
-function readSurface(chartEl, tag) {
+function readSurface(chartEl, tag, ctx) {
 	const el = findChild(chartEl, tag);
 	if (!el) return void 0;
+	const opts = {};
 	const thickness = readValStr(el, "c:thickness");
-	if (thickness === void 0) return void 0;
-	return { thickness: thickness.endsWith("%") ? thickness : Number(thickness) };
+	if (thickness !== void 0) opts.thickness = thickness.endsWith("%") ? thickness : Number(thickness);
+	const spPr = findChild(el, "c:spPr");
+	if (spPr) opts.shapeProperties = shapePropertiesDesc.parse(spPr, ctx);
+	return opts;
 }
-function readChartTypeScalars(chartTypeEl, type, threeD, result) {
+function readChartTypeScalars(chartTypeEl, type, threeD, result, ctx) {
 	if (!chartTypeEl) return;
+	if (type !== "surface" && type !== "stock") {
+		const varyColors = readBoolAttr(chartTypeEl, "c:varyColors");
+		if (varyColors !== void 0) result.varyColors = varyColors;
+	}
+	if (type === "column" || type === "bar" || type === "line" || type === "area") {
+		const grouping = readValStr(chartTypeEl, "c:grouping");
+		if (grouping) {
+			if (grouping !== (type === "column" || type === "bar" ? "clustered" : "standard")) result.grouping = grouping;
+		}
+	}
 	if (type === "column" || type === "bar") {
 		const gapWidth = readValNum(chartTypeEl, "c:gapWidth");
 		if (gapWidth !== void 0) result.gapWidth = gapWidth;
 		if (threeD) {
 			const gapDepth = readValNum(chartTypeEl, "c:gapDepth");
 			if (gapDepth !== void 0) result.gapDepth = gapDepth;
+			const shape = readValStr(chartTypeEl, "c:shape");
+			if (shape) result.shape = shape;
 		} else {
 			const overlap = readValNum(chartTypeEl, "c:overlap");
 			if (overlap !== void 0) result.overlap = overlap;
 		}
+	} else if (type === "area" && threeD) {
+		const gapDepth = readValNum(chartTypeEl, "c:gapDepth");
+		if (gapDepth !== void 0) result.gapDepth = gapDepth;
 	} else if (type === "pie" || type === "doughnut") {
 		const firstSliceAng = readValNum(chartTypeEl, "c:firstSliceAng");
 		if (firstSliceAng !== void 0) result.firstSliceAngle = firstSliceAng;
@@ -935,19 +1334,22 @@ function readChartTypeScalars(chartTypeEl, type, threeD, result) {
 		const showNeg = readBoolAttr(chartTypeEl, "c:showNegBubbles");
 		if (showNeg !== void 0) result.showNegativeBubbles = showNeg;
 		const sizeRep = readValStr(chartTypeEl, "c:sizeRepresents");
-		if (sizeRep) result.sizeRepresents = sizeRep;
+		if (sizeRep) result.sizeRepresents = xsdSizeRepresents.from(sizeRep);
 	} else if (type === "surface") {
 		const wireframe = readBoolAttr(chartTypeEl, "c:wireframe");
 		if (wireframe !== void 0) result.wireframe = wireframe;
 		const bandFormats = readBandFormats(chartTypeEl);
 		if (bandFormats) result.bandFormats = bandFormats;
+	} else if (type === "radar") {
+		const radarStyle = readValStr(chartTypeEl, "c:radarStyle");
+		if (radarStyle) result.radarStyle = radarStyle;
 	} else if (type === "ofPie") {
 		const ofPieType = readValStr(chartTypeEl, "c:ofPieType");
 		if (ofPieType) result.ofPieType = ofPieType;
 		const gapWidth = readValNum(chartTypeEl, "c:gapWidth");
 		if (gapWidth !== void 0) result.gapWidth = gapWidth;
 		const splitType = readValStr(chartTypeEl, "c:splitType");
-		if (splitType) result.splitType = splitType;
+		if (splitType) result.splitType = xsdSplitType.from(splitType);
 		const splitPos = readValNum(chartTypeEl, "c:splitPos");
 		if (splitPos !== void 0) result.splitPosition = splitPos;
 		const custSplit = findChild(chartTypeEl, "c:custSplit");
@@ -957,38 +1359,53 @@ function readChartTypeScalars(chartTypeEl, type, threeD, result) {
 		}
 		const secondPieSize = readValStr(chartTypeEl, "c:secondPieSize");
 		if (secondPieSize !== void 0) result.secondPieSize = secondPieSize.endsWith("%") ? secondPieSize : Number(secondPieSize);
-		if (findChild(chartTypeEl, "c:serLines")) result.seriesLines = true;
+		const seriesLines = readChartLines(chartTypeEl, "c:serLines", ctx);
+		if (seriesLines !== void 0) result.seriesLines = seriesLines;
 	}
 }
-function readChartTypeDecorations(chartTypeEl, type, threeD, result) {
+function readChartTypeDecorations(chartTypeEl, type, threeD, result, ctx) {
 	if (!chartTypeEl) return;
 	const readUpDownBars = (el) => {
 		result.upDownBars = true;
 		const gw = readValNum(el, "c:gapWidth");
 		if (gw !== void 0) result.upDownBarsGapWidth = gw;
 	};
-	if (type === "line") if (threeD) {
-		if (findChild(chartTypeEl, "c:dropLines")) result.dropLines = true;
-	} else {
-		if (findChild(chartTypeEl, "c:hiLowLines")) result.highLowLines = true;
-		const upDownBars = findChild(chartTypeEl, "c:upDownBars");
-		if (upDownBars) readUpDownBars(upDownBars);
-		if (findChild(chartTypeEl, "c:dropLines")) result.dropLines = true;
-	}
-	else if (type === "area") {
-		if (findChild(chartTypeEl, "c:dropLines")) result.dropLines = true;
-		if (threeD && findChild(chartTypeEl, "c:serLines")) result.seriesLines = true;
+	if (type === "line") {
+		if (threeD) {
+			const dropLinesV = readChartLines(chartTypeEl, "c:dropLines", ctx);
+			if (dropLinesV !== void 0) result.dropLines = dropLinesV;
+		} else {
+			const highLowLinesV = readChartLines(chartTypeEl, "c:hiLowLines", ctx);
+			if (highLowLinesV !== void 0) result.highLowLines = highLowLinesV;
+			const upDownBars = findChild(chartTypeEl, "c:upDownBars");
+			if (upDownBars) readUpDownBars(upDownBars);
+			const dropLinesV = readChartLines(chartTypeEl, "c:dropLines", ctx);
+			if (dropLinesV !== void 0) result.dropLines = dropLinesV;
+			const markers = readBoolAttr(chartTypeEl, "c:marker");
+			if (markers !== void 0) result.markers = markers;
+			const smooth = readBoolAttr(chartTypeEl, "c:smooth");
+			if (smooth !== void 0) result.smooth = smooth;
+		}
+	} else if (type === "area") {
+		const dropLinesV = readChartLines(chartTypeEl, "c:dropLines", ctx);
+		if (dropLinesV !== void 0) result.dropLines = dropLinesV;
+		const threeDSeriesLines = readChartLines(chartTypeEl, "c:serLines", ctx);
+		if (threeD && threeDSeriesLines !== void 0) result.seriesLines = threeDSeriesLines;
 	} else if (type === "stock") {
-		if (findChild(chartTypeEl, "c:dropLines")) result.dropLines = true;
-		if (findChild(chartTypeEl, "c:hiLowLines")) result.highLowLines = true;
+		const dropLinesV = readChartLines(chartTypeEl, "c:dropLines", ctx);
+		if (dropLinesV !== void 0) result.dropLines = dropLinesV;
+		const highLowLinesV = readChartLines(chartTypeEl, "c:hiLowLines", ctx);
+		if (highLowLinesV !== void 0) result.highLowLines = highLowLinesV;
 		const upDownBars = findChild(chartTypeEl, "c:upDownBars");
 		if (upDownBars) readUpDownBars(upDownBars);
-		if (findChild(chartTypeEl, "c:serLines")) result.seriesLines = true;
+		const seriesLines = readChartLines(chartTypeEl, "c:serLines", ctx);
+		if (seriesLines !== void 0) result.seriesLines = seriesLines;
 	} else if ((type === "column" || type === "bar") && !threeD) {
-		if (findChild(chartTypeEl, "c:serLines")) result.seriesLines = true;
+		const seriesLines = readChartLines(chartTypeEl, "c:serLines", ctx);
+		if (seriesLines !== void 0) result.seriesLines = seriesLines;
 	}
 }
-function readDataTable(plotArea) {
+function readDataTable(plotArea, ctx) {
 	if (!plotArea) return void 0;
 	const dTable = findChild(plotArea, "c:dTable");
 	if (!dTable) return void 0;
@@ -1001,7 +1418,11 @@ function readDataTable(plotArea) {
 	if (outline !== void 0) opts.showOutline = outline;
 	const keys = readBoolAttr(dTable, "c:showKeys");
 	if (keys !== void 0) opts.showLegendKeys = keys;
-	return Object.keys(opts).length ? opts : void 0;
+	const spPrEl = findChild(dTable, "c:spPr");
+	if (spPrEl) opts.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+	const txPrEl = findChild(dTable, "c:txPr");
+	if (txPrEl) opts.textProperties = textBodyDesc.parse(txPrEl, ctx);
+	return opts;
 }
 function readProtection(el) {
 	const protection = findChild(el, "c:protection");
@@ -1049,7 +1470,7 @@ function readPivotSource(el) {
 		formatId: Number(attr(fmtIdEl, "val"))
 	};
 }
-function readPivotFormats(chart) {
+function readPivotFormats(chart, ctx) {
 	const pf = findChild(chart, "c:pivotFmts");
 	if (!pf) return void 0;
 	const result = [];
@@ -1057,7 +1478,7 @@ function readPivotFormats(chart) {
 		const idxEl = findChild(fmt, "c:idx");
 		if (!idxEl) continue;
 		const opt = { index: Number(attr(idxEl, "val")) };
-		const marker = readMarker$1(fmt);
+		const marker = readMarker$1(fmt, ctx);
 		if (marker) opt.marker = marker;
 		result.push(opt);
 	}
@@ -1073,7 +1494,7 @@ function readBandFormats(chartTypeEl) {
 	}
 	return result.length ? result : void 0;
 }
-function readLegendEntries(legend) {
+function readLegendEntries(legend, ctx) {
 	const entries = children(legend, "c:legendEntry");
 	if (!entries.length) return void 0;
 	const result = [];
@@ -1081,26 +1502,41 @@ function readLegendEntries(legend) {
 		const idxEl = findChild(entry, "c:idx");
 		if (!idxEl) continue;
 		const deleteEl = findChild(entry, "c:delete");
-		if (!deleteEl) continue;
-		const v = attr(deleteEl, "val");
-		result.push({
+		if (deleteEl) {
+			const v = attr(deleteEl, "val");
+			result.push({
+				index: Number(attr(idxEl, "val")),
+				delete: parseOnOff(v) ?? true
+			});
+			continue;
+		}
+		const txPrEl = findChild(entry, "c:txPr");
+		if (txPrEl) result.push({
 			index: Number(attr(idxEl, "val")),
-			delete: parseOnOff(v) ?? true
+			textProperties: textBodyDesc.parse(txPrEl, ctx)
 		});
 	}
 	return result.length ? result : void 0;
 }
-function readLegend(chart) {
+function readLegend(chart, ctx) {
 	const legend = findChild(chart, "c:legend");
 	if (!legend) return void 0;
 	const result = {};
 	const posEl = findChild(legend, "c:legendPos");
 	if (posEl) {
 		const v = attr(posEl, "val");
-		if (v) result.position = v;
+		if (v) result.position = xsdLegendPosition.from(v);
 	}
-	const entries = readLegendEntries(legend);
+	const entries = readLegendEntries(legend, ctx);
 	if (entries) result.entries = entries;
+	const layoutEl = findChild(legend, "c:layout");
+	if (layoutEl) result.layout = readManualLayout(layoutEl) ?? true;
+	const overlayEl = findChild(legend, "c:overlay");
+	if (overlayEl) result.overlay = parseOnOff(attr(overlayEl, "val")) ?? false;
+	const spPrEl = findChild(legend, "c:spPr");
+	if (spPrEl) result.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+	const txPr = findChild(legend, "c:txPr");
+	if (txPr) result.textProperties = textBodyDesc.parse(txPr, ctx);
 	return Object.keys(result).length ? result : void 0;
 }
 function readHeaderFooter(ps) {
@@ -1133,7 +1569,7 @@ function readHeaderFooter(ps) {
 	if (differentOddEven !== void 0) opts.differentOddEven = differentOddEven;
 	const differentFirst = readFlag("differentFirst");
 	if (differentFirst !== void 0) opts.differentFirst = differentFirst;
-	return Object.keys(opts).length ? opts : void 0;
+	return opts;
 }
 function readPageMargins(ps) {
 	const pm = findChild(ps, "c:pageMargins");
@@ -1191,7 +1627,7 @@ function readPageSetup(ps) {
 	if (verticalDpi !== void 0) opts.verticalDpi = verticalDpi;
 	const copies = readNum("copies");
 	if (copies !== void 0) opts.copies = copies;
-	return Object.keys(opts).length ? opts : void 0;
+	return opts;
 }
 function readPrintSettings(el) {
 	const ps = findChild(el, "c:printSettings");
@@ -1216,7 +1652,7 @@ const AXIS_KIND_BY_TAG = {
 	"c:dateAx": "date",
 	"c:serAx": "series"
 };
-function readAxis(el, kind) {
+function readAxis(el, kind, ctx) {
 	const result = {
 		kind,
 		id: readValNum(el, "c:axId") ?? 0,
@@ -1228,7 +1664,7 @@ function readAxis(el, kind) {
 		const logBase = readValNum(scalingEl, "c:logBase");
 		if (logBase !== void 0) scaling.logBase = logBase;
 		const orientation = readValStr(scalingEl, "c:orientation");
-		if (orientation) scaling.orientation = orientation;
+		if (orientation) scaling.orientation = xsdAxisOrientation.from(orientation);
 		const max = readValNum(scalingEl, "c:max");
 		if (max !== void 0) scaling.max = max;
 		const min = readValNum(scalingEl, "c:min");
@@ -1238,18 +1674,18 @@ function readAxis(el, kind) {
 	const del = readBoolAttr(el, "c:delete");
 	if (del !== void 0) result.delete = del;
 	const pos = readValStr(el, "c:axPos");
-	if (pos) result.position = pos;
-	if (findChild(el, "c:majorGridlines")) result.majorGridlines = true;
-	if (findChild(el, "c:minorGridlines")) result.minorGridlines = true;
+	if (pos) result.position = xsdAxisPosition.from(pos);
+	result.majorGridlines = readChartLines(el, "c:majorGridlines", ctx);
+	result.minorGridlines = readChartLines(el, "c:minorGridlines", ctx);
 	const titleEl = findChild(el, "c:title");
-	if (titleEl) {
-		const titleText = readTitleText(titleEl);
-		if (titleText !== void 0) result.title = titleText;
-	}
+	if (titleEl) result.title = readTitle(titleEl, ctx);
 	const numFmtEl = findChild(el, "c:numFmt");
 	if (numFmtEl) {
 		const formatCode = attr(numFmtEl, "formatCode");
-		if (formatCode) result.numberFormat = formatCode;
+		if (formatCode) result.numberFormat = attr(numFmtEl, "sourceLinked") === "0" ? {
+			formatCode,
+			sourceLinked: false
+		} : formatCode;
 	}
 	const majorTickMark = readValStr(el, "c:majorTickMark");
 	if (majorTickMark) result.majorTickMark = majorTickMark;
@@ -1257,11 +1693,15 @@ function readAxis(el, kind) {
 	if (minorTickMark) result.minorTickMark = minorTickMark;
 	const tickLblPos = readValStr(el, "c:tickLblPos");
 	if (tickLblPos) result.tickLabelPosition = tickLblPos;
+	const spPrEl = findChild(el, "c:spPr");
+	if (spPrEl) result.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+	const axisTxPr = findChild(el, "c:txPr");
+	if (axisTxPr) result.textProperties = textBodyDesc.parse(axisTxPr, ctx);
 	const crossesAt = readValNum(el, "c:crossesAt");
 	if (crossesAt !== void 0) result.crossesAt = crossesAt;
 	else {
 		const crosses = readValStr(el, "c:crosses");
-		if (crosses) result.crosses = crosses;
+		if (crosses) result.crosses = xsdAxisCrosses.from(crosses);
 	}
 	if (kind === "category" || kind === "date") {
 		const auto = readBoolAttr(el, "c:auto");
@@ -1269,7 +1709,7 @@ function readAxis(el, kind) {
 	}
 	if (kind === "category") {
 		const lblAlgn = readValStr(el, "c:lblAlgn");
-		if (lblAlgn) result.labelAlignment = lblAlgn;
+		if (lblAlgn) result.labelAlignment = xsdAxisLabelAlignment.from(lblAlgn);
 	}
 	if (kind === "category" || kind === "date") {
 		const lblOffsetEl = findChild(el, "c:lblOffset");
@@ -1304,7 +1744,7 @@ function readAxis(el, kind) {
 	}
 	if (kind === "value") {
 		const crossBetween = readValStr(el, "c:crossBetween");
-		if (crossBetween) result.crossBetween = crossBetween;
+		if (crossBetween) result.crossBetween = xsdAxisCrossBetween.from(crossBetween);
 		const dispUnitsEl = findChild(el, "c:dispUnits");
 		if (dispUnitsEl) {
 			const displayUnits = {};
@@ -1319,60 +1759,88 @@ function readAxis(el, kind) {
 	return result;
 }
 /** Read all axis elements (c:catAx/c:valAx/c:dateAx/c:serAx) under plotArea. */
-function readAxes(plotArea) {
+function readAxes(plotArea, ctx) {
 	if (!plotArea?.elements) return void 0;
 	const axes = [];
 	for (const child of plotArea.elements) {
 		if (!child.name) continue;
 		const kind = AXIS_KIND_BY_TAG[child.name];
-		if (kind) axes.push(readAxis(child, kind));
+		if (kind) axes.push(readAxis(child, kind, ctx));
 	}
 	return axes.length > 0 ? axes : void 0;
 }
 const chartSpaceDesc = {
 	kind: "custom",
-	stringify(opts, _ctx) {
+	stringify(opts, ctx) {
 		const parts = [];
-		parts.push(`<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">`);
-		parts.push(valEl("c:date1904", 0));
-		parts.push(valEl("c:lang", "en-US"));
-		parts.push(valEl("c:roundedCorners", 0));
-		if (opts.style !== void 0) parts.push(valEl("c:style", opts.style));
+		const ns = opts.dialect === "strict" ? `xmlns:c="http://purl.oclc.org/ooxml/drawingml/chart" xmlns:a="http://purl.oclc.org/ooxml/drawingml/main" xmlns:r="http://purl.oclc.org/ooxml/officeDocument/relationships"` : `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"`;
+		parts.push(`<c:chartSpace ${ns}>`);
+		if (opts.date1904 !== void 0) parts.push(`<c:date1904${boolVal(opts.date1904)}/>`);
+		if (opts.lang !== void 0) parts.push(valEl("c:lang", opts.lang));
+		if (opts.roundedCorners !== void 0) parts.push(`<c:roundedCorners${boolVal(opts.roundedCorners)}/>`);
+		if (opts.style2010) {
+			const fallback = opts.style2010.fallbackStyle !== void 0 ? `<mc:Fallback>${valEl("c:style", opts.style2010.fallbackStyle)}</mc:Fallback>` : "";
+			parts.push(`<mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"><mc:Choice xmlns:c14="http://schemas.microsoft.com/office/drawing/2007/8/2/chart" Requires="c14"><c14:style val="${opts.style2010.style}"/></mc:Choice>${fallback}</mc:AlternateContent>`);
+		} else if (opts.style !== void 0) parts.push(valEl("c:style", opts.style));
 		if (opts.colorMappingOverride) parts.push(stringifyColorMapping(opts.colorMappingOverride, "c:clrMapOvr"));
 		if (opts.pivotSource) parts.push(stringifyPivotSource(opts.pivotSource));
 		if (opts.protection) parts.push(stringifyProtection(opts.protection));
 		parts.push("<c:chart>");
-		if (opts.title) parts.push(stringifyTitle(opts.title));
-		parts.push(valEl("c:autoTitleDeleted", 0));
-		if (opts.pivotFormats?.length) parts.push(stringifyPivotFormats(opts.pivotFormats));
+		if (opts.title !== void 0) parts.push(typeof opts.title === "string" && opts.title === "" ? emptyEl("c:title") : stringifyTitle(opts.title, ctx));
+		if (opts.autoTitleDeleted !== void 0) parts.push(`<c:autoTitleDeleted${boolVal(opts.autoTitleDeleted)}/>`);
+		if (opts.pivotFormats?.length) parts.push(stringifyPivotFormats(opts.pivotFormats, ctx));
 		if (opts.view3D) parts.push(stringifyView3D(opts.view3D));
-		parts.push(stringifySurface("c:floor", opts.floor));
-		parts.push(stringifySurface("c:sideWall", opts.sideWall));
-		parts.push(stringifySurface("c:backWall", opts.backWall));
+		parts.push(stringifySurface("c:floor", opts.floor, ctx));
+		parts.push(stringifySurface("c:sideWall", opts.sideWall, ctx));
+		parts.push(stringifySurface("c:backWall", opts.backWall, ctx));
 		parts.push(`<c:plotArea>${stringifyLayout(opts.plotAreaLayout)}`);
 		parts.push(chartTypeHeader(opts));
-		for (const [i, series] of opts.series.entries()) parts.push(stringifySeries(i, series, opts));
-		parts.push(chartTypeFooter(opts));
-		parts.push(stringifyAxes(opts));
-		if (opts.dataTable) parts.push(stringifyDataTable(opts.dataTable));
+		for (const [i, series] of (opts.series ?? []).entries()) parts.push(stringifySeries(i, series, opts, ctx));
+		if (opts.dataLabels) parts.push(stringifyDataLabels(opts.dataLabels, ctx));
+		parts.push(chartTypeFooter(opts, ctx));
+		for (const g of opts.secondaryGroups ?? []) parts.push(stringifySecondaryGroup(g, opts, ctx));
+		parts.push(stringifyAxes(opts, ctx));
+		if (opts.dataTable) parts.push(stringifyDataTable(opts.dataTable, ctx));
+		parts.push(chartSpPr(opts.plotAreaShapeProperties, ctx));
 		parts.push("</c:plotArea>");
-		if (opts.showLegend !== false) parts.push(stringifyLegend(opts));
+		if (opts.showLegend !== false) parts.push(stringifyLegend(opts, ctx));
 		parts.push(`<c:plotVisOnly${boolVal(opts.plotVisOnly ?? true)}/>`);
 		if (opts.displayBlanksAs !== void 0) parts.push(valEl("c:dispBlanksAs", opts.displayBlanksAs));
 		if (opts.showDataLabelsOverMax !== void 0) parts.push(`<c:showDLblsOverMax${boolVal(opts.showDataLabelsOverMax)}/>`);
 		parts.push("</c:chart>");
-		parts.push(noFillSpPr());
-		parts.push(chartTxPr());
-		if (opts.externalData) parts.push(stringifyExternalData(opts.externalData));
+		parts.push(chartSpPr(opts.shapeProperties, ctx));
+		if (opts.textProperties) parts.push(`<c:txPr>${textBodyDesc.stringify(opts.textProperties, ctx) ?? ""}</c:txPr>`);
+		if (opts.externalData) {
+			const ext = stringifyExternalData(opts.externalData);
+			if (ext) parts.push(ext);
+		}
 		if (opts.printSettings) parts.push(stringifyPrintSettings(opts.printSettings));
 		if (opts.userShapes !== void 0) parts.push(`<c:userShapes r:id="${escapeXml(opts.userShapes)}"/>`);
+		if (opts.ext) parts.push(`<c:extLst>${opts.ext}</c:extLst>`);
 		parts.push("</c:chartSpace>");
 		return parts.join("");
 	},
-	parse(el, _ctx) {
+	parse(el, ctx) {
 		const result = {};
-		const styleEl = findChild(el, "c:style");
-		if (styleEl?.attributes?.["val"] !== void 0) result.style = Number(styleEl.attributes["val"]);
+		if (el.attributes?.["xmlns:c"] === "http://purl.oclc.org/ooxml/drawingml/chart") result.dialect = "strict";
+		const date1904 = readBoolAttr(el, "c:date1904");
+		if (date1904 !== void 0) result.date1904 = date1904;
+		const langVal = readValStr(el, "c:lang");
+		if (langVal) result.lang = langVal;
+		const roundedCorners = readBoolAttr(el, "c:roundedCorners");
+		if (roundedCorners !== void 0) result.roundedCorners = roundedCorners;
+		const mcStyleEl = findChild(el, "mc:AlternateContent");
+		const c14StyleEl = mcStyleEl && findChild(findChild(mcStyleEl, "mc:Choice") ?? mcStyleEl, "c14:style");
+		if (c14StyleEl?.attributes?.["val"] !== void 0) {
+			const fallbackEl = findFirst(mcStyleEl, "c:style");
+			result.style2010 = {
+				style: Number(c14StyleEl.attributes["val"]),
+				...fallbackEl?.attributes?.["val"] !== void 0 ? { fallbackStyle: Number(fallbackEl.attributes["val"]) } : {}
+			};
+		} else {
+			const styleEl = findChild(el, "c:style");
+			if (styleEl?.attributes?.["val"] !== void 0) result.style = Number(styleEl.attributes["val"]);
+		}
 		const colorMappingOverride = parseColorMapping(findChild(el, "c:clrMapOvr"));
 		if (colorMappingOverride) result.colorMappingOverride = colorMappingOverride;
 		const protection = readProtection(el);
@@ -1382,33 +1850,37 @@ const chartSpaceDesc = {
 		const chart = findChild(el, "c:chart");
 		if (!chart) return result;
 		const titleEl = findChild(chart, "c:title");
-		if (titleEl) {
-			const title = readTitleText(titleEl);
-			if (title !== void 0) result.title = title;
-		}
-		const pivotFormats = readPivotFormats(chart);
+		if (titleEl) result.title = readTitle(titleEl, ctx);
+		const autoTitleDeleted = readBoolAttr(chart, "c:autoTitleDeleted");
+		if (autoTitleDeleted !== void 0) result.autoTitleDeleted = autoTitleDeleted;
+		const pivotFormats = readPivotFormats(chart, ctx);
 		if (pivotFormats) result.pivotFormats = pivotFormats;
 		const view3D = readView3D(chart);
 		if (view3D) result.view3D = view3D;
-		const floor = readSurface(chart, "c:floor");
+		const floor = readSurface(chart, "c:floor", ctx);
 		if (floor) result.floor = floor;
-		const sideWall = readSurface(chart, "c:sideWall");
+		const sideWall = readSurface(chart, "c:sideWall", ctx);
 		if (sideWall) result.sideWall = sideWall;
-		const backWall = readSurface(chart, "c:backWall");
+		const backWall = readSurface(chart, "c:backWall", ctx);
 		if (backWall) result.backWall = backWall;
 		const plotArea = findChild(chart, "c:plotArea");
 		if (plotArea?.elements) {
 			const manualLayout = readManualLayout(findChild(plotArea, "c:layout"));
 			if (manualLayout) result.plotAreaLayout = manualLayout;
-			const dataTable = readDataTable(plotArea);
+			const dataTable = readDataTable(plotArea, ctx);
 			if (dataTable) result.dataTable = dataTable;
 			let detectedType;
 			let threeD = false;
 			let chartTypeEl;
+			const secondaryEls = [];
 			for (const child of plotArea.elements) {
 				if (!child.name) continue;
 				const mapping = TAG_TO_CHART_TYPE[child.name];
 				if (mapping) {
+					if (chartTypeEl) {
+						secondaryEls.push(child);
+						continue;
+					}
 					detectedType = mapping.type;
 					threeD = mapping.threeD ?? false;
 					chartTypeEl = child;
@@ -1418,69 +1890,132 @@ const chartSpaceDesc = {
 						if (barDirVal === "bar") detectedType = "bar";
 						else if (barDirVal === "col") detectedType = "column";
 					}
-					break;
 				}
 			}
-			if (detectedType) {
+			if (detectedType && chartTypeEl) {
 				result.type = detectedType;
 				if (threeD) result.threeD = true;
-				readChartTypeScalars(chartTypeEl, detectedType, threeD, result);
-				readChartTypeDecorations(chartTypeEl, detectedType, threeD, result);
+				readChartTypeScalars(chartTypeEl, detectedType, threeD, result, ctx);
+				readChartTypeDecorations(chartTypeEl, detectedType, threeD, result, ctx);
+				const groupLabels = readDataLabels(chartTypeEl, ctx);
+				if (groupLabels) result.dataLabels = groupLabels;
+				const axIdEls = children(chartTypeEl, "c:axId");
+				if (axIdEls.length > 0) result.axisIds = axIdEls.map((e) => Number(attr(e, "val"))).filter((n) => !isNaN(n));
 			}
 			const seriesEls = chartTypeEl ? children(chartTypeEl, "c:ser") : [];
-			if (seriesEls.length > 0) if (detectedType === "bubble") {
-				const bubbleSeries = [];
-				for (const serEl of seriesEls) {
-					const name = readSeriesName(serEl);
-					const xVal = findChild(serEl, "c:xVal");
-					const yVal = findChild(serEl, "c:yVal");
-					const bubbleSize = findChild(serEl, "c:bubbleSize");
-					bubbleSeries.push({
-						name,
-						xValues: xVal ? readNumCache(xVal) : [],
-						yValues: yVal ? readNumCache(yVal) : [],
-						bubbleSize: bubbleSize ? readNumCache(bubbleSize) : [],
-						...readSeriesCommon(serEl)
-					});
-				}
-				result.series = bubbleSeries;
-			} else {
-				const chartSeries = [];
-				let categories;
-				for (const serEl of seriesEls) {
-					const name = readSeriesName(serEl);
-					if (!categories && !result.multiLevelCategories && !result.categoryLabels) {
-						const catEl = findChild(serEl, "c:cat") ?? findChild(serEl, "c:xVal");
-						if (catEl) {
-							const multi = readMultiLvlStrCache(catEl);
-							if (multi) result.multiLevelCategories = multi;
-							else {
-								const lit = readStrLit(catEl);
-								if (lit) {
-									result.categoryLabels = lit;
-									categories = lit;
-								} else categories = readStrCache(catEl);
+			if (seriesEls.length > 0) {
+				if (detectedType === "bubble") {
+					const bubbleSeries = [];
+					for (const serEl of seriesEls) {
+						const { name } = readSeriesName(serEl);
+						const xVal = findChild(serEl, "c:xVal");
+						const yVal = findChild(serEl, "c:yVal");
+						const bubbleSize = findChild(serEl, "c:bubbleSize");
+						bubbleSeries.push({
+							name,
+							xValues: xVal ? readNumCache(xVal) : [],
+							yValues: yVal ? readNumCache(yVal) : [],
+							bubbleSize: bubbleSize ? readNumCache(bubbleSize) : [],
+							...readSeriesCommon(serEl, ctx)
+						});
+					}
+					result.series = bubbleSeries;
+				} else if (detectedType === "scatter" && hasNumericXRef(seriesEls[0])) {
+					const xySeries = [];
+					for (const serEl of seriesEls) {
+						const { name, literal: nameLiteral } = readSeriesName(serEl);
+						const txEl = findChild(serEl, "c:tx");
+						const nameFormula = txEl ? readRefMeta(txEl).formula : void 0;
+						const xVal = findChild(serEl, "c:xVal");
+						const yVal = findChild(serEl, "c:yVal");
+						const valueLiteral = yVal ? findChild(yVal, "c:numLit") !== void 0 : false;
+						const yMeta = yVal ? readRefMeta(yVal) : {};
+						xySeries.push({
+							name,
+							...nameLiteral ? { nameLiteral } : {},
+							...nameFormula ? { nameFormula } : {},
+							...valueLiteral ? { valueLiteral } : {},
+							...yMeta.formula ? { valueFormula: yMeta.formula } : {},
+							...yMeta.formatCode ? { formatCode: yMeta.formatCode } : {},
+							xValues: xVal ? readNumCache(xVal) : [],
+							yValues: yVal ? readNumCache(yVal) : [],
+							...readSeriesCommon(serEl, ctx)
+						});
+					}
+					result.series = xySeries;
+				} else {
+					const chartSeries = [];
+					let categories;
+					for (const serEl of seriesEls) {
+						const { name, literal: nameLiteral } = readSeriesName(serEl);
+						const txEl = findChild(serEl, "c:tx");
+						const nameFormula = txEl ? readRefMeta(txEl).formula : void 0;
+						if (!categories && !result.multiLevelCategories && !result.categoryLabels) {
+							const catEl = findChild(serEl, "c:cat") ?? findChild(serEl, "c:xVal");
+							if (catEl) {
+								const multi = readMultiLvlStrCache(catEl);
+								if (multi) {
+									result.multiLevelCategories = multi;
+									const multiRef = findChild(catEl, "c:multiLvlStrRef");
+									const multiF = multiRef ? findChild(multiRef, "c:f") : void 0;
+									const multiText = multiF ? textOf(multiF) : "";
+									if (multiText) result.categoryFormula = multiText;
+								} else {
+									const lit = readStrLit(catEl);
+									if (lit) {
+										result.categoryLabels = lit;
+										categories = lit;
+									} else if (findChild(catEl, "c:numRef")) {
+										result.numericCategories = true;
+										categories = readNumCacheText(catEl);
+									} else categories = readStrCache(catEl);
+									const catMeta = readRefMeta(catEl);
+									if (catMeta.formula) result.categoryFormula = catMeta.formula;
+									if (catMeta.formatCode) result.categoryFormatCode = catMeta.formatCode;
+								}
 							}
 						}
+						const valueEl = findChild(serEl, "c:val") ?? findChild(serEl, "c:yVal");
+						const valueLiteral = valueEl ? findChild(valueEl, "c:numLit") !== void 0 : false;
+						const values = valueEl ? readNumCache(valueEl) : [];
+						const valMeta = valueEl ? readRefMeta(valueEl) : {};
+						chartSeries.push({
+							name,
+							...nameLiteral ? { nameLiteral } : {},
+							...nameFormula ? { nameFormula } : {},
+							...valueLiteral ? { valueLiteral } : {},
+							...valMeta.formula ? { valueFormula: valMeta.formula } : {},
+							...valMeta.formatCode ? { formatCode: valMeta.formatCode } : {},
+							values,
+							...readSeriesCommon(serEl, ctx)
+						});
 					}
-					const valEl = findChild(serEl, "c:val") ?? findChild(serEl, "c:yVal");
-					const values = valEl ? readNumCache(valEl) : [];
-					chartSeries.push({
-						name,
-						values,
-						...readSeriesCommon(serEl)
-					});
+					result.series = chartSeries;
+					if (categories) result.categories = categories;
 				}
-				result.series = chartSeries;
-				if (categories?.length) result.categories = categories;
+			}
+			if (secondaryEls.length > 0) {
+				const groups = [];
+				for (const secondaryEl of secondaryEls) {
+					const g = readSecondaryGroup(secondaryEl, ctx);
+					if (g) groups.push(g);
+				}
+				if (groups.length > 0) result.secondaryGroups = groups;
 			}
 		}
-		const axes = readAxes(plotArea);
+		const axes = readAxes(plotArea, ctx);
 		if (axes) result.axes = axes;
+		const plotSpPr = plotArea && findChild(plotArea, "c:spPr");
+		if (plotSpPr) result.plotAreaShapeProperties = shapePropertiesDesc.parse(plotSpPr, ctx);
 		if (!findChild(chart, "c:legend")) result.showLegend = false;
 		else {
-			const legendData = readLegend(chart);
+			result.showLegend = true;
+			const legendData = readLegend(chart, ctx);
 			if (legendData?.position) result.legendPosition = legendData.position;
+			if (legendData?.layout !== void 0) result.legendLayout = legendData.layout;
+			if (legendData?.overlay !== void 0) result.legendOverlay = legendData.overlay;
+			if (legendData?.shapeProperties) result.legendShapeProperties = legendData.shapeProperties;
+			if (legendData?.textProperties) result.legendTextProperties = legendData.textProperties;
 			if (legendData?.entries) result.legendEntries = legendData.entries;
 		}
 		const plotVisOnly = readBoolAttr(chart, "c:plotVisOnly");
@@ -1489,6 +2024,10 @@ const chartSpaceDesc = {
 		if (dispBlanksAs) result.displayBlanksAs = dispBlanksAs;
 		const showDLblsOverMax = readBoolAttr(chart, "c:showDLblsOverMax");
 		if (showDLblsOverMax !== void 0) result.showDataLabelsOverMax = showDLblsOverMax;
+		const spPrEl = findChild(el, "c:spPr");
+		if (spPrEl) result.shapeProperties = shapePropertiesDesc.parse(spPrEl, ctx);
+		const spaceTxPr = findChild(el, "c:txPr");
+		if (spaceTxPr) result.textProperties = textBodyDesc.parse(spaceTxPr, ctx);
 		const externalData = readExternalData(el);
 		if (externalData) result.externalData = externalData;
 		const printSettings = readPrintSettings(el);
@@ -1498,6 +2037,8 @@ const chartSpaceDesc = {
 			const rid = attr(userShapesEl, "r:id");
 			if (rid !== void 0) result.userShapes = rid;
 		}
+		const spaceExtLst = findChild(el, "c:extLst");
+		if (spaceExtLst) result.ext = (spaceExtLst.elements ?? []).map((e) => stringifyElement(e)).join("");
 		return result;
 	}
 };
@@ -1560,10 +2101,11 @@ function stringifyObject(obj) {
 		}
 		case "picture": {
 			const nvPicPr = `<cdr:nvPicPr>${stringifyCnvPr(obj.id, obj.nonVisualProperties)}<cdr:cNvPicPr/></cdr:nvPicPr>`;
-			const blipFillXml = (stringify$1(blipFillDesc, {
+			const fillOpts = {
 				...obj.blipFill,
 				referenceId: obj.referenceId
-			}, DIRECT_CTX) ?? "").replace(/pic:blipFill/g, "cdr:blipFill");
+			};
+			const blipFillXml = (stringify$1(blipFillDesc, fillOpts, DIRECT_CTX) ?? "").replace(/pic:blipFill/g, "cdr:blipFill");
 			const spPrXml = stringify$1(shapePropertiesDesc, obj.shapeProperties, DIRECT_CTX) ?? "";
 			const styleXml = obj.style ? stringifyShapeStyle(obj.style, DIRECT_CTX) : "";
 			return `<cdr:pic${commonAttrs(obj)}>` + nvPicPr + blipFillXml + `<cdr:spPr>${spPrXml}</cdr:spPr>` + styleXml + "</cdr:pic>";
@@ -1605,6 +2147,13 @@ function readCnvPr(el) {
 		nvp
 	};
 }
+/** macro/fPublished attributes shared by every non-group user-shape object. */
+function readCommonAttrs(el) {
+	const out = {};
+	if (el.attributes?.["macro"] !== void 0) out.macro = String(el.attributes["macro"]);
+	if (el.attributes?.["fPublished"] !== void 0) out.published = parseOnOff(el.attributes["fPublished"]) ?? false;
+	return out;
+}
 function readObject(el, ctx) {
 	switch (el.name) {
 		case "cdr:sp": {
@@ -1625,10 +2174,9 @@ function readObject(el, ctx) {
 			if (styleEl) result.style = parseShapeStyle(styleEl, ctx);
 			const txBody = findChild(el, "cdr:txBody");
 			if (txBody) result.textBody = parse$1(textBodyDesc, txBody, ctx);
-			if (el.attributes?.["macro"] !== void 0) result.macro = String(el.attributes["macro"]);
+			Object.assign(result, readCommonAttrs(el));
 			if (el.attributes?.["textlink"] !== void 0) result.textLink = String(el.attributes["textlink"]);
 			if (el.attributes?.["fLocksText"] !== void 0) result.locksText = parseOnOff(el.attributes["fLocksText"]) ?? true;
-			if (el.attributes?.["fPublished"] !== void 0) result.published = parseOnOff(el.attributes["fPublished"]) ?? false;
 			return result;
 		}
 		case "cdr:cxnSp": {
@@ -1645,8 +2193,7 @@ function readObject(el, ctx) {
 			};
 			const styleEl = findChild(el, "a:style");
 			if (styleEl) result.style = parseShapeStyle(styleEl, ctx);
-			if (el.attributes?.["macro"] !== void 0) result.macro = String(el.attributes["macro"]);
-			if (el.attributes?.["fPublished"] !== void 0) result.published = parseOnOff(el.attributes["fPublished"]) ?? false;
+			Object.assign(result, readCommonAttrs(el));
 			return result;
 		}
 		case "cdr:pic": {
@@ -1667,8 +2214,7 @@ function readObject(el, ctx) {
 			if (Object.keys(blipFillOpts).length > 0) result.blipFill = blipFillOpts;
 			const styleEl = findChild(el, "a:style");
 			if (styleEl) result.style = parseShapeStyle(styleEl, ctx);
-			if (el.attributes?.["macro"] !== void 0) result.macro = String(el.attributes["macro"]);
-			if (el.attributes?.["fPublished"] !== void 0) result.published = parseOnOff(el.attributes["fPublished"]) ?? false;
+			Object.assign(result, readCommonAttrs(el));
 			return result;
 		}
 		case "cdr:graphicFrame": {
@@ -1704,8 +2250,7 @@ function readObject(el, ctx) {
 					if (Object.keys(flags).length > 0) result.graphicFrameLocks = flags;
 				} else result.graphicFrameLocks = {};
 			}
-			if (el.attributes?.["macro"] !== void 0) result.macro = String(el.attributes["macro"]);
-			if (el.attributes?.["fPublished"] !== void 0) result.published = parseOnOff(el.attributes["fPublished"]) ?? false;
+			Object.assign(result, readCommonAttrs(el));
 			return result;
 		}
 		case "cdr:grpSp": {
@@ -1777,4 +2322,4 @@ function readAnchorObject(anchorEl, ctx) {
 //#endregion
 export { chartSpaceDesc as n, ChartCollection as r, userShapesDesc as t };
 
-//# sourceMappingURL=chart-Kf_utasF.mjs.map
+//# sourceMappingURL=chart-DED4tXC9.mjs.map