@shbernal/ts-pptx 2.0.0 → 3.1.0

package/dist/{text-B1ZrPEeK.js → text-B6PbMFih.js}

@@ -1,10 +1,10 @@
 import { n as warn, r as warnOnce } from "./diagnostics-DYQC7xLV.js";
-import { n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-DGE9zh3U.js";
-import { a as FIXED_PCT_PER_PERCENT, d as emuToInches, g as pixelsToEmu, i as EMU_PER_POINT, l as STANDARD_LAYOUTS, m as inchesToEmu, r as EMU_PER_INCH, s as PERCENT_SCALE, t as ANGLE_UNITS_PER_DEGREE, v as ptToHundredths } from "./units-B-JUKwCS.js";
-import { $ as connectorPresetFor, C as DEF_PRES_LAYOUT_NAME, D as DEF_TEXT_GLOW, E as DEF_SLIDE_MARGIN_IN, F as PIECHART_COLORS, G as PlaceholderType, I as REGEX_HEX_COLOR, K as SchemeColor, L as SLDNUMFLDID, M as LAYOUT_IDX_SERIES_BASE, N as LETTERS, O as DEF_TEXT_SHADOW, Q as asChartType, R as XML_DECL, S as DEF_PRES_LAYOUT, T as DEF_SHAPE_SHADOW, Z as VALID_SHAPE_PRESETS, _ as DEF_CELL_BORDER, a as lineWidthToEmu, b as DEF_CHART_GRIDLINE, c as resolveTableColWidthsEmu, d as AXIS_ID_CATEGORY_PRIMARY, et as isChartExType, f as AXIS_ID_CATEGORY_SECONDARY, g as BARCHART_COLORS, h as AXIS_ID_VALUE_SECONDARY, i as inch2Emu, k as IMG_BROKEN, l as transparencyToAlpha, m as AXIS_ID_VALUE_PRIMARY, n as convertRotationDegrees, o as marginToEmu, p as AXIS_ID_SERIES_PRIMARY, r as getSmartParseNumber, s as opacityToAlpha, t as convertArcAngle, u as valToPts, v as DEF_CELL_MARGIN_IN, x as DEF_FONT_COLOR, y as DEF_CHART_BORDER } from "./units-internal-7JcMfYti.js";
-import { a as decodeBase64ToBytes, n as getImageSizeFromBase64, o as svgMarkupToDataUri, t as fitSrcRectPercents } from "./image-size-C8uYE8GJ.js";
-import { t as getSlidesForTableRows } from "./autopage-tmfjRzL4.js";
-import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit } from "./fit-BSWY0AYt.js";
+import { n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-Bvln0H-7.js";
+import { a as FIXED_PCT_PER_PERCENT, d as emuToInches, g as pixelsToEmu, i as EMU_PER_POINT, l as STANDARD_LAYOUTS, m as inchesToEmu, r as EMU_PER_INCH, s as PERCENT_SCALE, t as ANGLE_UNITS_PER_DEGREE, v as ptToHundredths } from "./units-C7QM1KgH.js";
+import { $ as connectorPresetFor, C as DEF_PRES_LAYOUT_NAME, D as DEF_TEXT_GLOW, E as DEF_SLIDE_MARGIN_IN, F as PIECHART_COLORS, G as PlaceholderType, I as REGEX_HEX_COLOR, K as SchemeColor, L as SLDNUMFLDID, M as LAYOUT_IDX_SERIES_BASE, N as LETTERS, O as DEF_TEXT_SHADOW, Q as asChartType, R as XML_DECL, S as DEF_PRES_LAYOUT, T as DEF_SHAPE_SHADOW, Z as VALID_SHAPE_PRESETS, _ as DEF_CELL_BORDER, a as lineWidthToEmu, b as DEF_CHART_GRIDLINE, c as resolveTableColWidthsEmu, d as AXIS_ID_CATEGORY_PRIMARY, et as isChartExType, f as AXIS_ID_CATEGORY_SECONDARY, g as BARCHART_COLORS, h as AXIS_ID_VALUE_SECONDARY, i as inch2Emu, k as IMG_BROKEN, l as transparencyToAlpha, m as AXIS_ID_VALUE_PRIMARY, n as convertRotationDegrees, o as marginToEmu, p as AXIS_ID_SERIES_PRIMARY, r as getSmartParseNumber, s as opacityToAlpha, t as convertArcAngle, u as valToPts, v as DEF_CELL_MARGIN_IN, x as DEF_FONT_COLOR, y as DEF_CHART_BORDER } from "./units-internal-CR8s8YQa.js";
+import { E as svgMarkupToDataUri, S as getImageSizeFromBase64, T as decodeBase64ToBytes, a as PRESET_MATERIALS, g as PACKAGE_REL_NS, h as OFFICE_REL, i as PRESET_LINE_DASHES, n as LIGHT_RIGS, r as LIGHT_RIG_DIRECTIONS, s as TEXT_HORZ_OVERFLOW, t as BEVEL_PRESETS, u as checkEnumOrWarn, x as fitSrcRectPercents } from "./st-enums-evQG2A7Z.js";
+import { t as getSlidesForTableRows } from "./autopage-QQyfRtoK.js";
+import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit } from "./fit-DhMbQG5O.js";
 import { a as flattenEmbeddedFaces, i as FONT_REL_TYPE, n as FONT_DATA_CONTENT_TYPE, o as serializeEmbeddedFontLst, r as FONT_DATA_EXTENSION, t as EMBEDDED_FONT_SLOTS } from "./embedded-fonts-MaynAHa9.js";
 import { ZipWriter } from "./zip.js";
 //#region src/media/content-type.ts
@@ -1326,7 +1326,7 @@ function addImageDefinition(target, opt) {
 	let defWidth = intWidth;
 	let defHeight = intHeight;
 	let szAuto;
-	if ((!intWidth || !intHeight) && strImgExtn !== "svg") {
+	if ((!intWidth || !intHeight) && !(strImgExtn === "svg" && !intWidth && !intHeight)) {
 		const natural = strImageData ? getImageSizeFromBase64(strImageData) : null;
 		if (natural) {
 			if (!intWidth && !intHeight) {
@@ -1961,23 +1961,6 @@ function addMediaDefinition(target, opt) {
 	target._slideObjects.push(slideData);
 }
 //#endregion
-//#region src/gen/define/notes.ts
-/**
-* Adds Notes to a slide.
-* @param {PresSlideInternal} `target` slide object
-* @param {string | NotesProps | NotesProps[]} `notes` plain text, or rich runs (inline formatting / hyperlinks)
-*/
-function addNotesDefinition(target, notes) {
-	const runs = typeof notes === "string" ? [{ text: notes }] : (Array.isArray(notes) ? notes : [notes]).map((run) => ({
-		text: run.text,
-		options: run.options
-	}));
-	target._slideObjects.push({
-		_type: "notes",
-		text: runs
-	});
-}
-//#endregion
 //#region src/gen/define/preview-image.ts
 /**
 * Register a preview/cover image as a slide media rel (deduped like `addImage`) and return its rId.
@@ -2010,11 +1993,140 @@ function registerPreviewImage(target, cover) {
 	return rId;
 }
 //#endregion
+//#region src/gen/define/model3d.ts
+/** OPC content type for a glTF binary, as PowerPoint spells it in `[Content_Types].xml`. */
+const GLB_CONTENT_TYPE = "model/gltf.binary";
+/** `.rels` `Type` URI for the embedded 3D model part. Note `2017/06` — not the namespace's `2017`. */
+const MODEL3D_REL_TYPE = "http://schemas.microsoft.com/office/2017/06/relationships/model3d";
+/** Fixed-point denominator for `am3d` linear values: `am3d:up@dy="36000000"` is the unit vector. */
+const AM3D_UNIT = 36e6;
+/** Denominator of every `am3d` rational (`meterPerModelUnit`, `scale`, `illuminance`, `intensity`). */
+const AM3D_RATIO_DEN = 1e6;
+/** `am3d:perspective@fov` is in 60000ths of a degree, like every other DrawingML angle. */
+const FOV_PER_DEGREE = 6e4;
+/**
+* The camera PowerPoint wrote for the 2×2×2 cube fixture, in caller units (metres / degrees).
+* `z` is `sqrt(3)/2 / sin(22.5°)` — the bounding sphere of a 1-metre cube framed at a 45° fov.
+*/
+const DEFAULT_CAMERA = {
+	pos: {
+		x: 0,
+		y: 0,
+		z: 2.2630334
+	},
+	lookAt: {
+		x: 0,
+		y: 0,
+		z: 0
+	},
+	up: {
+		x: 0,
+		y: 1,
+		z: 0
+	},
+	fov: 45
+};
+/** `am3d:meterPerModelUnit` for the cube fixture: 1 / (its 2-unit largest extent). */
+const DEFAULT_METER_PER_MODEL_UNIT = .5;
+/** Reject a non-finite camera component rather than letting `NaN` reach the XML as `"NaN"`. */
+function toAm3dUnits(point, fallback, label) {
+	const src = point ?? fallback;
+	for (const axis of [
+		"x",
+		"y",
+		"z"
+	]) if (!Number.isFinite(src[axis])) throw new InvalidOptionError("model3d/invalid-camera", `addModel3d(): camera.${label}.${axis} must be a finite number, got ${String(src[axis])}.`);
+	return {
+		x: Math.round(src.x * AM3D_UNIT),
+		y: Math.round(src.y * AM3D_UNIT),
+		z: Math.round(src.z * AM3D_UNIT)
+	};
+}
+/** Resolve `camera` + `meterPerModelUnit` into the wire units {@link Model3dInternal} carries. */
+function resolveCamera(camera, meterPerModelUnit) {
+	const fovDeg = camera?.fov ?? DEFAULT_CAMERA.fov;
+	if (!Number.isFinite(fovDeg) || fovDeg <= 0 || fovDeg >= 180) throw new InvalidOptionError("model3d/invalid-fov", `addModel3d(): camera.fov must be greater than 0 and less than 180 degrees, got ${String(fovDeg)}.`);
+	const scale = meterPerModelUnit ?? DEFAULT_METER_PER_MODEL_UNIT;
+	if (!Number.isFinite(scale) || scale <= 0) throw new InvalidOptionError("model3d/invalid-scale", `addModel3d(): meterPerModelUnit must be a finite number greater than 0, got ${String(scale)}.`);
+	const up = toAm3dUnits(camera?.up, DEFAULT_CAMERA.up, "up");
+	return {
+		pos: toAm3dUnits(camera?.pos, DEFAULT_CAMERA.pos, "pos"),
+		lookAt: toAm3dUnits(camera?.lookAt, DEFAULT_CAMERA.lookAt, "lookAt"),
+		up: {
+			dx: up.x,
+			dy: up.y,
+			dz: up.z
+		},
+		fov: Math.round(fovDeg * FOV_PER_DEGREE),
+		meterPerModelUnitN: Math.round(scale * AM3D_RATIO_DEN)
+	};
+}
+/**
+* Adds an embedded 3D model to a slide definition.
+* @param {PresSlideInternal} target - slide the model will be added to
+* @param {Model3dProps} opt - 3D model options
+*/
+function addModel3dDefinition(target, opt) {
+	const strData = opt.data || "";
+	const strPath = opt.path || "";
+	if (!strPath && !strData) throw new InvalidOptionError("model3d/missing-source", "addModel3d(): either `data` or `path` are required!");
+	const camera = resolveCamera(opt.camera, opt.meterPerModelUnit);
+	const nameIdx = nextObjectNameIdx(target, "model3d");
+	const objectName = opt.objectName ? encodeXmlAttrValue(validateObjectName(opt.objectName, "model3d")) : `3D Model ${nameIdx + 1}`;
+	const modelRid = getNewRelId(target);
+	const mediaSlideKey = target._slideNum == null ? "sm" : target._slideNum >= 1e3 ? `sl-${target._slideNum}` : target._slideNum;
+	target._relsMedia.push({
+		path: strPath || "preencoded.glb",
+		type: GLB_CONTENT_TYPE,
+		extn: "glb",
+		data: strData,
+		rId: modelRid,
+		model3dRelType: MODEL3D_REL_TYPE,
+		Target: `../media/model3d-${mediaSlideKey}-${target._relsMedia.length + 1}.glb`
+	});
+	if (!opt.preview?.path && !opt.preview?.data) warn("model3d/preview-missing", "addModel3d(): no `preview` image supplied, so a gray placeholder is embedded. PowerPoint 2019+ draws the live model over it, but thumbnails, PDF export and older viewers show the placeholder.");
+	const previewRid = registerPreviewImage(target, opt.preview);
+	const slideData = {
+		_type: "model3d",
+		options: {
+			x: opt.x ?? 0,
+			y: opt.y ?? 0,
+			w: opt.w ?? 4,
+			h: opt.h ?? 3,
+			objectName,
+			...opt.altText ? { altText: opt.altText } : {}
+		},
+		model3d: {
+			modelRid,
+			previewRid,
+			...camera
+		}
+	};
+	target._slideObjects.push(slideData);
+}
+//#endregion
+//#region src/gen/define/notes.ts
+/**
+* Adds Notes to a slide.
+* @param {PresSlideInternal} `target` slide object
+* @param {string | NotesProps | NotesProps[]} `notes` plain text, or rich runs (inline formatting / hyperlinks)
+*/
+function addNotesDefinition(target, notes) {
+	const runs = typeof notes === "string" ? [{ text: notes }] : (Array.isArray(notes) ? notes : [notes]).map((run) => ({
+		text: run.text,
+		options: run.options
+	}));
+	target._slideObjects.push({
+		_type: "notes",
+		text: runs
+	});
+}
+//#endregion
 //#region src/gen/define/ole.ts
 /** Rel type for an embedded OPC package (an Office file, itself a zip). */
-const PACKAGE_REL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+const PACKAGE_REL = OFFICE_REL + "package";
 /** Rel type for a generic OLE-server blob — a compound-file `.bin` (ECMA-376 Part 1 §15.2.10). */
-const OLE_OBJECT_REL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
+const OLE_OBJECT_REL = OFFICE_REL + "oleObject";
 /**
 * Embeddable payload formats, keyed by file extension. The six Office extensions are OPC packages
 * and keep their own extension in `ppt/embeddings/`; everything else is embedded as a generic OLE
@@ -2220,7 +2332,7 @@ function applyTableHeaderColumnSugar(tableRows, opt) {
 					options: {}
 				} : {
 					...cell,
-					options: { ...cell.options || {} }
+					options: { ...cell.options }
 				};
 				const colDef = cols ? cols[colCursor] : void 0;
 				colCursor += cellObj.options?.colspan || 1;
@@ -2805,6 +2917,24 @@ var SlideBuilder = class {
 		return this;
 	}
 	/**
+	* Add an embedded 3D model (PowerPoint's Insert ▸ 3D Models) to the Slide.
+	*
+	* The `.glb` bytes ship inside the `.pptx`, so PowerPoint 2019+ renders the model live and lets
+	* the viewer orbit it. Everything else — older PowerPoint, thumbnails, PDF export — draws the
+	* `preview` picture instead; without one a neutral gray placeholder is embedded.
+	*
+	* Most models also need `meterPerModelUnit`: ts-pptx does not parse the `.glb`, so it cannot
+	* measure the bounding box PowerPoint would have scaled the scene by. Set it to
+	* `1 / <largest bounding-box dimension in model units>`.
+	* @param {Model3dProps} options - 3D model options
+	* @return {SlideBuilder} this Slide
+	* @example slide.addModel3d({ path: 'engine.glb', preview: { path: 'engine.png' }, x: 1, y: 1, w: 6, h: 4 })
+	*/
+	addModel3d(options) {
+		addModel3dDefinition(this, options);
+		return this;
+	}
+	/**
 	* Add speaker notes to Slide
 	* @param {string | NotesProps | NotesProps[]} notes - notes text, or rich runs with inline
 	* formatting / hyperlinks. A plain string is the single-run case; pass run objects to add
@@ -3075,6 +3205,9 @@ function genXmlColorSelection(props) {
 			internalElements += alphaFromTransparency(props.transparency);
 		}
 		switch (fillType) {
+			case "none":
+				outText += voidEl("a:noFill");
+				break;
 			case "solid":
 				outText += el("a:solidFill", null, raw(createColorElement(colorVal, internalElements)));
 				break;
@@ -3104,23 +3237,6 @@ const BORDER_KEYS = [
 	"cap"
 ];
 /**
-* The `ST_PresetLineDashVal` tokens `BorderProps.dashType` accepts — the same set
-* `ShapeLineProps.dashType` does, so a caller who knows one knows the other.
-*/
-const BORDER_DASH_VALUES = [
-	"solid",
-	"dot",
-	"dash",
-	"lgDash",
-	"dashDot",
-	"lgDashDot",
-	"lgDashDotDot",
-	"sysDash",
-	"sysDot",
-	"sysDashDot",
-	"sysDashDotDot"
-];
-/**
 * Resolve the `a:prstDash/@val` a border should emit.
 *
 * `BorderProps.type` is a three-way switch, so on its own it can only say "dashed" and
@@ -3136,14 +3252,7 @@ const BORDER_DASH_VALUES = [
 */
 function resolveBorderDash(border) {
 	const fromType = border.type === "dash" ? "sysDash" : "solid";
-	const dash = border.dashType;
-	if (dash === void 0 || dash === null) return fromType;
-	if (BORDER_DASH_VALUES.includes(dash)) return dash;
-	warnOnce("border/invalid-dash-type", `border: dashType \`${String(dash)}\` is not a valid value and is ignored — use one of ${BORDER_DASH_VALUES.join(", ")}.`, {
-		received: dash,
-		valid: BORDER_DASH_VALUES
-	});
-	return fromType;
+	return checkEnumOrWarn(border.dashType, PRESET_LINE_DASHES, "border/invalid-dash-type", "border: dashType") ?? fromType;
 }
 /**
 * Report an authored key that is not part of `BorderProps`, which the library would
@@ -3585,7 +3694,34 @@ function makeSeriesDataPointsXml(chartType, obj, opts, varyColors) {
 * gridlines, optional axis title -- but PowerPoint requires the child elements in a
 * fixed order that differs per axis, so they stay as three separate builders rather
 * than one parameterized one. Called by {@link ./chart-xml}'s axis region.
-*/
+*
+* Sub-blocks are shared where they can be shared *exactly*: {@link axisLineSpPr} covers
+* `<c:spPr>`, which differs between the three only by indent width. `<c:txPr>` is
+* deliberately left duplicated — its inherited indentation is irregular *within* each copy
+* as well as between them (the category axis closes `</a:defRPr>` at three spaces, the value
+* axis at six), so parameterising it would take about as many indent arguments as it has
+* lines and would hide the quirks rather than share the structure.
+*/
+/**
+* The `<c:spPr>` axis-line block, identical in shape on all three axes.
+*
+* The only thing that differed between the three copies was how far each was indented — two
+* spaces on the category and series axes, one on the value axis — and that irregularity is
+* inherited, not meaningful. It is reproduced here rather than normalised because inter-element
+* whitespace being inert does not make changing it free: byte-identity is the gate that proves
+* an emitter refactor changed nothing, and it cannot tell a "harmless" whitespace edit from a
+* real one. `indent` keeps the quirk visible at the call site.
+* @param {number} indent - leading spaces on the `<c:spPr>` line; children step out by 2 and 4
+* @param {number} widthEmu - line width for `a:ln@w`
+* @param {boolean | undefined} show - false emits `<a:noFill/>` instead of a colour
+* @param {string | undefined} color - line colour, defaulting to {@link DEF_GRIDLINE_COLOR}
+* @param {string} dash - `a:prstDash@val`
+* @return {string} XML `<c:spPr>`
+*/
+function axisLineSpPr(indent, widthEmu, show, color, dash) {
+	const at = (extra) => " ".repeat(indent + extra);
+	return `${at(0)}<c:spPr>${at(2)}<a:ln w="${widthEmu}" cap="flat">` + (!show ? "<a:noFill/>" : genXmlColorSelection(color || DEF_GRIDLINE_COLOR)) + `${at(4)}<a:prstDash val="${dash}"/>${at(4)}<a:round/>${at(2)}</a:ln>${at(0)}</c:spPr>`;
+}
 function makeCatAxis(opts, axisId, valAxisId) {
 	let strXml = "";
 	const usesValueAxisForCategories = opts._type === "scatter" || opts._type === "bubble" || opts._type === "bubble3D";
@@ -3594,7 +3730,7 @@ function makeCatAxis(opts, axisId, valAxisId) {
 	else strXml += "<c:" + (opts.catLabelFormatCode ? "dateAx" : "catAx") + ">";
 	strXml += "  <c:axId val=\"" + axisId + "\"/>";
 	strXml += "  <c:scaling>";
-	strXml += "<c:orientation val=\"" + (opts.catAxisOrientation || (opts.barDir === "col" ? "minMax" : "minMax")) + "\"/>";
+	strXml += "<c:orientation val=\"" + (opts.catAxisOrientation || "minMax") + "\"/>";
 	if (opts.catAxisMaxVal || opts.catAxisMaxVal === 0) strXml += `<c:max val="${opts.catAxisMaxVal}"/>`;
 	if (opts.catAxisMinVal || opts.catAxisMinVal === 0) strXml += `<c:min val="${opts.catAxisMinVal}"/>`;
 	strXml += "</c:scaling>";
@@ -3627,13 +3763,7 @@ function makeCatAxis(opts, axisId, valAxisId) {
 		strXml += "  <c:minorTickMark val=\"" + (opts.catAxisMinorTickMark || "none") + "\"/>";
 		strXml += "  <c:tickLblPos val=\"" + (opts.catAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo")) + "\"/>";
 	}
-	strXml += "  <c:spPr>";
-	strXml += `    <a:ln w="${opts.catAxisLineSize ? valToPts(opts.catAxisLineSize) : EMU_PER_POINT}" cap="flat">`;
-	strXml += !opts.catAxisLineShow ? "<a:noFill/>" : genXmlColorSelection(opts.catAxisLineColor || DEF_GRIDLINE_COLOR);
-	strXml += "      <a:prstDash val=\"" + (opts.catAxisLineStyle || "solid") + "\"/>";
-	strXml += "      <a:round/>";
-	strXml += "    </a:ln>";
-	strXml += "  </c:spPr>";
+	strXml += axisLineSpPr(2, opts.catAxisLineSize ? valToPts(opts.catAxisLineSize) : EMU_PER_POINT, opts.catAxisLineShow, opts.catAxisLineColor, opts.catAxisLineStyle || "solid");
 	strXml += "  <c:txPr>";
 	if (opts.catAxisLabelRotate) strXml += `<a:bodyPr rot="${convertRotationDegrees(opts.catAxisLabelRotate)}"/>`;
 	else strXml += "<a:bodyPr/>";
@@ -3697,7 +3827,7 @@ function makeValAxis(opts, valAxisId) {
 	strXml += "  <c:axId val=\"" + valAxisId + "\"/>";
 	strXml += "  <c:scaling>";
 	if (opts.valAxisLogScaleBase) strXml += `<c:logBase val="${opts.valAxisLogScaleBase}"/>`;
-	strXml += "<c:orientation val=\"" + (opts.valAxisOrientation || (opts.barDir === "col" ? "minMax" : "minMax")) + "\"/>";
+	strXml += "<c:orientation val=\"" + (opts.valAxisOrientation || "minMax") + "\"/>";
 	if (opts.valAxisMaxVal || opts.valAxisMaxVal === 0) strXml += `<c:max val="${opts.valAxisMaxVal}"/>`;
 	if (opts.valAxisMinVal || opts.valAxisMinVal === 0) strXml += `<c:min val="${opts.valAxisMinVal}"/>`;
 	strXml += "  </c:scaling>";
@@ -3724,13 +3854,7 @@ function makeValAxis(opts, valAxisId) {
 		strXml += " <c:minorTickMark val=\"" + (opts.valAxisMinorTickMark || "none") + "\"/>";
 		strXml += " <c:tickLblPos val=\"" + (opts.valAxisLabelPos || (opts.barDir === "col" ? "nextTo" : "low")) + "\"/>";
 	}
-	strXml += " <c:spPr>";
-	strXml += `   <a:ln w="${opts.valAxisLineSize ? valToPts(opts.valAxisLineSize) : EMU_PER_POINT}" cap="flat">`;
-	strXml += !opts.valAxisLineShow ? "<a:noFill/>" : genXmlColorSelection(opts.valAxisLineColor || DEF_GRIDLINE_COLOR);
-	strXml += "     <a:prstDash val=\"" + (opts.valAxisLineStyle || "solid") + "\"/>";
-	strXml += "     <a:round/>";
-	strXml += "   </a:ln>";
-	strXml += " </c:spPr>";
+	strXml += axisLineSpPr(1, opts.valAxisLineSize ? valToPts(opts.valAxisLineSize) : EMU_PER_POINT, opts.valAxisLineShow, opts.valAxisLineColor, opts.valAxisLineStyle || "solid");
 	strXml += " <c:txPr>";
 	strXml += `  <a:bodyPr${opts.valAxisLabelRotate ? " rot=\"" + convertRotationDegrees(opts.valAxisLabelRotate).toString() + "\"" : ""}/>`;
 	strXml += "  <a:lstStyle/>";
@@ -3765,7 +3889,7 @@ function makeSerAxis(opts, axisId, valAxisId) {
 	let strXml = "";
 	strXml += "<c:serAx>";
 	strXml += "  <c:axId val=\"" + axisId + "\"/>";
-	strXml += "  <c:scaling><c:orientation val=\"" + (opts.serAxisOrientation || (opts.barDir === "col" ? "minMax" : "minMax")) + "\"/></c:scaling>";
+	strXml += "  <c:scaling><c:orientation val=\"" + (opts.serAxisOrientation || "minMax") + "\"/></c:scaling>";
 	strXml += "  <c:delete val=\"" + (opts.serAxisHidden ? "1" : "0") + "\"/>";
 	strXml += "  <c:axPos val=\"" + (opts.barDir === "col" ? "b" : "l") + "\"/>";
 	strXml += opts.serGridLine && opts.serGridLine.style !== "none" ? createGridLineElement(opts.serGridLine) : "";
@@ -3783,13 +3907,7 @@ function makeSerAxis(opts, axisId, valAxisId) {
 	strXml += "  <c:majorTickMark val=\"out\"/>";
 	strXml += "  <c:minorTickMark val=\"none\"/>";
 	strXml += `  <c:tickLblPos val="${opts.serAxisLabelPos || (opts.barDir === "col" ? "low" : "nextTo")}"/>`;
-	strXml += "  <c:spPr>";
-	strXml += "    <a:ln w=\"12700\" cap=\"flat\">";
-	strXml += !opts.serAxisLineShow ? "<a:noFill/>" : genXmlColorSelection(opts.serAxisLineColor || DEF_GRIDLINE_COLOR);
-	strXml += "      <a:prstDash val=\"solid\"/>";
-	strXml += "      <a:round/>";
-	strXml += "    </a:ln>";
-	strXml += "  </c:spPr>";
+	strXml += axisLineSpPr(2, EMU_PER_POINT, opts.serAxisLineShow, opts.serAxisLineColor, "solid");
 	strXml += "  <c:txPr>";
 	strXml += "    <a:bodyPr/>";
 	strXml += "    <a:lstStyle/>";
@@ -5139,7 +5257,8 @@ function chartExLayoutId(type) {
 /**
 * A deterministic `uniqueId` GUID for a `<cx:series>`, derived from the chart's package-global id.
 * PowerPoint stamps a random GUID here; deriving it keeps output byte-stable (the project pins
-* chart determinism — see `docs/backlog.yml` `fork-chart-counter-nondeterminism`). `seriesIdx`
+* chart determinism — the package-wide id this derives from is assigned at write time in
+* `package/assemble.ts`, STEP 2). `seriesIdx`
 * distinguishes multiple series within one chart (pareto emits two), varying the 4th GUID group so
 * every series still gets a distinct id.
 */
@@ -5383,9 +5502,15 @@ function makeXmlChartEx(rel) {
 * template — analogous to the default theme/worksheet boilerplate the library already embeds. They
 * reference theme scheme colors, so they adapt to the deck theme without per-chart customization.
 */
-/** The `cs:colorStyle` payload for a chartEx chart's `colors{N}.xml` part (theme-accent cycle). */
+/**
+* The `cs:colorStyle` payload for a chartEx chart's `colors{N}.xml` part (theme-accent cycle).
+* @raw-xml-asset Captured verbatim from PowerPoint; not built here, so not a migration target.
+*/
 const CHARTEX_COLORS_BODY = "<cs:colorStyle xmlns:cs=\"http://schemas.microsoft.com/office/drawing/2012/chartStyle\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" meth=\"cycle\" id=\"10\"><a:schemeClr val=\"accent1\"/><a:schemeClr val=\"accent2\"/><a:schemeClr val=\"accent3\"/><a:schemeClr val=\"accent4\"/><a:schemeClr val=\"accent5\"/><a:schemeClr val=\"accent6\"/><cs:variation/><cs:variation><a:lumMod val=\"60000\"/></cs:variation><cs:variation><a:lumMod val=\"80000\"/><a:lumOff val=\"20000\"/></cs:variation><cs:variation><a:lumMod val=\"80000\"/></cs:variation><cs:variation><a:lumMod val=\"60000\"/><a:lumOff val=\"40000\"/></cs:variation><cs:variation><a:lumMod val=\"50000\"/></cs:variation><cs:variation><a:lumMod val=\"70000\"/><a:lumOff val=\"30000\"/></cs:variation><cs:variation><a:lumMod val=\"70000\"/></cs:variation><cs:variation><a:lumMod val=\"50000\"/><a:lumOff val=\"50000\"/></cs:variation></cs:colorStyle>";
-/** The `cs:chartStyle` payload for a chartEx chart's `style{N}.xml` part (PowerPoint default). */
+/**
+* The `cs:chartStyle` payload for a chartEx chart's `style{N}.xml` part (PowerPoint default).
+* @raw-xml-asset Captured verbatim from PowerPoint; not built here, so not a migration target.
+*/
 const CHARTEX_STYLE_BODY = "<cs:chartStyle xmlns:cs=\"http://schemas.microsoft.com/office/drawing/2012/chartStyle\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" id=\"395\"><cs:axisTitle><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1197\"/></cs:axisTitle><cs:categoryAxis><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr><cs:defRPr sz=\"1197\"/></cs:categoryAxis><cs:chartArea mods=\"allowNoFillOverride allowNoLineOverride\"><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"bg1\"/></a:solidFill><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr><cs:defRPr sz=\"1330\"/></cs:chartArea><cs:dataLabel><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1197\"/></cs:dataLabel><cs:dataLabelCallout><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"dk1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill><a:ln><a:solidFill><a:schemeClr val=\"dk1\"><a:lumMod val=\"25000\"/><a:lumOff val=\"75000\"/></a:schemeClr></a:solidFill></a:ln></cs:spPr><cs:defRPr sz=\"1197\"/><cs:bodyPr rot=\"0\" spcFirstLastPara=\"1\" vertOverflow=\"clip\" horzOverflow=\"clip\" vert=\"horz\" wrap=\"square\" lIns=\"36576\" tIns=\"18288\" rIns=\"36576\" bIns=\"18288\" anchor=\"ctr\" anchorCtr=\"1\"><a:spAutoFit/></cs:bodyPr></cs:dataLabelCallout><cs:dataPoint><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:fillRef><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></cs:spPr></cs:dataPoint><cs:dataPoint3D><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:fillRef><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></cs:spPr></cs:dataPoint3D><cs:dataPointLine><cs:lnRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:lnRef><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"28575\" cap=\"rnd\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:round/></a:ln></cs:spPr></cs:dataPointLine><cs:dataPointMarker><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:fillRef><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:ln w=\"9525\"><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill></a:ln></cs:spPr></cs:dataPointMarker><cs:dataPointMarkerLayout symbol=\"circle\" size=\"5\"/><cs:dataPointWireframe><cs:lnRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:lnRef><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"28575\" cap=\"rnd\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:round/></a:ln></cs:spPr></cs:dataPointWireframe><cs:dataTable><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:spPr><a:ln w=\"9525\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill></a:ln></cs:spPr><cs:defRPr sz=\"1197\"/></cs:dataTable><cs:downBar><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"dk1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"dk1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill><a:ln w=\"9525\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill></a:ln></cs:spPr></cs:downBar><cs:dropLine><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"35000\"/><a:lumOff val=\"65000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:dropLine><cs:errorBar><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:errorBar><cs:floor><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef></cs:floor><cs:gridlineMajor><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:gridlineMajor><cs:gridlineMinor><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:gridlineMinor><cs:hiLoLine><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"75000\"/><a:lumOff val=\"25000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:hiLoLine><cs:leaderLine><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"35000\"/><a:lumOff val=\"65000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr></cs:leaderLine><cs:legend><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1197\"/></cs:legend><cs:plotArea mods=\"allowNoFillOverride allowNoLineOverride\"><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef></cs:plotArea><cs:plotArea3D mods=\"allowNoFillOverride allowNoLineOverride\"><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef></cs:plotArea3D><cs:seriesAxis><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill><a:round/></a:ln></cs:spPr><cs:defRPr sz=\"1197\"/></cs:seriesAxis><cs:seriesLine><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"9525\" cap=\"flat\"><a:solidFill><a:srgbClr val=\"D9D9D9\"/></a:solidFill><a:round/></a:ln></cs:spPr></cs:seriesLine><cs:title><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1862\"/></cs:title><cs:trendline><cs:lnRef idx=\"0\"><cs:styleClr val=\"auto\"/></cs:lnRef><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef><cs:spPr><a:ln w=\"19050\" cap=\"rnd\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"sysDash\"/></a:ln></cs:spPr></cs:trendline><cs:trendlineLabel><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1197\"/></cs:trendlineLabel><cs:upBar><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"dk1\"/></cs:fontRef><cs:spPr><a:solidFill><a:schemeClr val=\"lt1\"/></a:solidFill><a:ln w=\"9525\"><a:solidFill><a:schemeClr val=\"tx1\"><a:lumMod val=\"15000\"/><a:lumOff val=\"85000\"/></a:schemeClr></a:solidFill></a:ln></cs:spPr></cs:upBar><cs:valueAxis><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"><a:lumMod val=\"65000\"/><a:lumOff val=\"35000\"/></a:schemeClr></cs:fontRef><cs:defRPr sz=\"1197\"/></cs:valueAxis><cs:wall><cs:lnRef idx=\"0\"/><cs:fillRef idx=\"0\"/><cs:effectRef idx=\"0\"/><cs:fontRef idx=\"minor\"><a:schemeClr val=\"tx1\"/></cs:fontRef></cs:wall></cs:chartStyle>";
 /** Build the `ppt/charts/colors{N}.xml` part body. */
 function makeChartExColorsXml() {
@@ -5397,7 +5522,6 @@ function makeChartExStyleXml() {
 }
 //#endregion
 //#region src/gen/chart/embed-xlsx.ts
-const PACKAGE_REL_NS$2 = "http://schemas.openxmlformats.org/package/2006/relationships";
 function relationship$2(id, type, target) {
 	return voidEl("Relationship", {
 		Id: id,
@@ -5407,7 +5531,7 @@ function relationship$2(id, type, target) {
 }
 /** `<Relationships>` wrapper shared by the workbook's `.rels` parts (all flat, no indent). */
 function relationships(rels) {
-	return el("Relationships", { xmlns: PACKAGE_REL_NS$2 }, rels.map(raw));
+	return el("Relationships", { xmlns: PACKAGE_REL_NS }, rels.map(raw));
 }
 /**
 * Build the chart's embedded Excel workbook as a standalone OPC package and
@@ -5426,22 +5550,22 @@ function buildEmbeddedWorksheet(chartObject) {
 		const IS_MULTI_CAT_AXES = (data[0]?.labels?.length ?? 0) > 1;
 		zipExcel.add("[Content_Types].xml", XML_DECL + "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">  <Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>  <Default Extension=\"xml\" ContentType=\"application/xml\"/>  <Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>  <Override PartName=\"/xl/worksheets/sheet1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/>  <Override PartName=\"/xl/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/>  <Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/>  <Override PartName=\"/xl/sharedStrings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml\"/>  <Override PartName=\"/xl/tables/table1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml\"/>  <Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/>  <Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/></Types>\n");
 		zipExcel.add("_rels/.rels", XML_DECL + relationships([
-			relationship$2("rId1", "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties", "docProps/core.xml"),
-			relationship$2("rId2", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties", "docProps/app.xml"),
-			relationship$2("rId3", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument", "xl/workbook.xml")
+			relationship$2("rId1", PACKAGE_REL_NS + "/metadata/core-properties", "docProps/core.xml"),
+			relationship$2("rId2", OFFICE_REL + "extended-properties", "docProps/app.xml"),
+			relationship$2("rId3", OFFICE_REL + "officeDocument", "xl/workbook.xml")
 		]) + "\n");
 		zipExcel.add("docProps/app.xml", XML_DECL + "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\"><Application>Microsoft Macintosh Excel</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size=\"2\" baseType=\"variant\"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size=\"1\" baseType=\"lpstr\"><vt:lpstr>Sheet1</vt:lpstr></vt:vector></TitlesOfParts><Company></Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>16.0300</AppVersion></Properties>\n");
 		zipExcel.add("docProps/core.xml", XML_DECL + "<cp:coreProperties xmlns:cp=\"http://schemas.openxmlformats.org/package/2006/metadata/core-properties\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcmitype=\"http://purl.org/dc/dcmitype/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><dc:creator>TsPptx</dc:creator><cp:lastModifiedBy>TsPptx</cp:lastModifiedBy><dcterms:created xsi:type=\"dcterms:W3CDTF\">" + (/* @__PURE__ */ new Date()).toISOString() + "</dcterms:created><dcterms:modified xsi:type=\"dcterms:W3CDTF\">" + (/* @__PURE__ */ new Date()).toISOString() + "</dcterms:modified></cp:coreProperties>");
 		zipExcel.add("xl/_rels/workbook.xml.rels", XML_DECL + relationships([
-			relationship$2("rId3", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles", "styles.xml"),
-			relationship$2("rId2", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme", "theme/theme1.xml"),
-			relationship$2("rId1", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet", "worksheets/sheet1.xml"),
-			relationship$2("rId4", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings", "sharedStrings.xml")
+			relationship$2("rId3", OFFICE_REL + "styles", "styles.xml"),
+			relationship$2("rId2", OFFICE_REL + "theme", "theme/theme1.xml"),
+			relationship$2("rId1", OFFICE_REL + "worksheet", "worksheets/sheet1.xml"),
+			relationship$2("rId4", OFFICE_REL + "sharedStrings", "sharedStrings.xml")
 		]));
 		zipExcel.add("xl/styles.xml", XML_DECL + "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\"><numFmts count=\"1\"><numFmt numFmtId=\"0\" formatCode=\"General\"/></numFmts><fonts count=\"4\"><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"9\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"10\"/><color indexed=\"8\"/><name val=\"Geneva\"/></font><font><sz val=\"18\"/><color indexed=\"8\"/><name val=\"Arial\"/></font></fonts><fills count=\"2\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill></fills><borders count=\"1\"><border><left/><right/><top/><bottom/><diagonal/></border></borders><dxfs count=\"0\"/><tableStyles count=\"0\"/><colors><indexedColors><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ffff0000\"/><rgbColor rgb=\"ff00ff00\"/><rgbColor rgb=\"ff0000ff\"/><rgbColor rgb=\"ffffff00\"/><rgbColor rgb=\"ffff00ff\"/><rgbColor rgb=\"ff00ffff\"/><rgbColor rgb=\"ff000000\"/><rgbColor rgb=\"ffffffff\"/><rgbColor rgb=\"ff878787\"/><rgbColor rgb=\"fff9f9f9\"/></indexedColors></colors></styleSheet>\n");
 		zipExcel.add("xl/theme/theme1.xml", XML_DECL + "<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\"><a:themeElements><a:clrScheme name=\"Office\"><a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1><a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1><a:dk2><a:srgbClr val=\"44546A\"/></a:dk2><a:lt2><a:srgbClr val=\"E7E6E6\"/></a:lt2><a:accent1><a:srgbClr val=\"4472C4\"/></a:accent1><a:accent2><a:srgbClr val=\"ED7D31\"/></a:accent2><a:accent3><a:srgbClr val=\"A5A5A5\"/></a:accent3><a:accent4><a:srgbClr val=\"FFC000\"/></a:accent4><a:accent5><a:srgbClr val=\"5B9BD5\"/></a:accent5><a:accent6><a:srgbClr val=\"70AD47\"/></a:accent6><a:hlink><a:srgbClr val=\"0563C1\"/></a:hlink><a:folHlink><a:srgbClr val=\"954F72\"/></a:folHlink></a:clrScheme><a:fontScheme name=\"Office\"><a:majorFont><a:latin typeface=\"Calibri Light\" panose=\"020F0302020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic Light\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian Light\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Times New Roman\"/><a:font script=\"Hebr\" typeface=\"Times New Roman\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"MoolBoran\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Times New Roman\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:majorFont><a:minorFont><a:latin typeface=\"Calibri\" panose=\"020F0502020204030204\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"Yu Gothic\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"DengXian\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Arial\"/><a:font script=\"Hebr\" typeface=\"Arial\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"DaunPenh\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Arial\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/><a:font script=\"Geor\" typeface=\"Sylfaen\"/></a:minorFont></a:fontScheme><a:fmtScheme name=\"Office\"><a:fillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"110000\"/><a:satMod val=\"105000\"/><a:tint val=\"67000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"103000\"/><a:tint val=\"73000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"105000\"/><a:satMod val=\"109000\"/><a:tint val=\"81000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:satMod val=\"103000\"/><a:lumMod val=\"102000\"/><a:tint val=\"94000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:satMod val=\"110000\"/><a:lumMod val=\"100000\"/><a:shade val=\"100000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:lumMod val=\"99000\"/><a:satMod val=\"120000\"/><a:shade val=\"78000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w=\"6350\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"12700\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln><a:ln w=\"19050\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/><a:miter lim=\"800000\"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"57150\" dist=\"19050\" dir=\"5400000\" algn=\"ctr\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"63000\"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"><a:tint val=\"95000\"/><a:satMod val=\"170000\"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"93000\"/><a:satMod val=\"150000\"/><a:shade val=\"98000\"/><a:lumMod val=\"102000\"/></a:schemeClr></a:gs><a:gs pos=\"50000\"><a:schemeClr val=\"phClr\"><a:tint val=\"98000\"/><a:satMod val=\"130000\"/><a:shade val=\"90000\"/><a:lumMod val=\"103000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"63000\"/><a:satMod val=\"120000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"5400000\" scaled=\"0\"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/><a:extLst><a:ext uri=\"{05A4C25C-085E-4340-85A3-A5531E510DB2}\"><thm15:themeFamily xmlns:thm15=\"http://schemas.microsoft.com/office/thememl/2012/main\" name=\"Office Theme\" id=\"{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}\" vid=\"{4A3C46E8-61CC-4603-A589-7422A47A8E4A}\"/></a:ext></a:extLst></a:theme>");
 		zipExcel.add("xl/workbook.xml", XML_DECL + "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" mc:Ignorable=\"x15\" xmlns:x15=\"http://schemas.microsoft.com/office/spreadsheetml/2010/11/main\"><fileVersion appName=\"xl\" lastEdited=\"7\" lowestEdited=\"6\" rupBuild=\"10507\"/><workbookPr/><bookViews><workbookView xWindow=\"0\" yWindow=\"500\" windowWidth=\"20960\" windowHeight=\"15960\"/></bookViews><sheets><sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/></sheets><calcPr calcId=\"0\" concurrentCalc=\"0\"/></workbook>\n");
-		zipExcel.add("xl/worksheets/_rels/sheet1.xml.rels", XML_DECL + relationships([relationship$2("rId1", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table", "../tables/table1.xml")]) + "\n");
+		zipExcel.add("xl/worksheets/_rels/sheet1.xml.rels", XML_DECL + relationships([relationship$2("rId1", OFFICE_REL + "table", "../tables/table1.xml")]) + "\n");
 		zipExcel.add("xl/sharedStrings.xml", buildXlsxSharedStrings(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES));
 		zipExcel.add("xl/tables/table1.xml", buildXlsxTable(chartObject, data, intBubbleCols));
 		zipExcel.add("xl/worksheets/sheet1.xml", buildXlsxSheet(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES));
@@ -5622,7 +5746,7 @@ function buildXlsxSheet(chartObject, data, intBubbleCols, IS_MULTI_CAT_AXES) {
 * @return {string} the chart part's `.rels` XML
 */
 function buildChartRelsXml(embeddingTarget) {
-	return XML_DECL + relationships([relationship$2("rId1", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package", embeddingTarget)]);
+	return XML_DECL + relationships([relationship$2("rId1", OFFICE_REL + "package", embeddingTarget)]);
 }
 /**
 * Build the `.rels` for a chartEx chart part: the embedded workbook (rId1, via `<cx:externalData>`)
@@ -5634,7 +5758,7 @@ function buildChartRelsXml(embeddingTarget) {
 */
 function buildChartExRelsXml(embeddingTarget, colorsTarget, styleTarget) {
 	return XML_DECL + relationships([
-		relationship$2("rId1", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package", embeddingTarget),
+		relationship$2("rId1", OFFICE_REL + "package", embeddingTarget),
 		relationship$2("rId2", "http://schemas.microsoft.com/office/2011/relationships/chartColorStyle", colorsTarget),
 		relationship$2("rId3", "http://schemas.microsoft.com/office/2011/relationships/chartStyle", styleTarget)
 	]);
@@ -5752,6 +5876,63 @@ function encodeSlideMediaRels(layout, runtime, onMediaError = "throw") {
 	return imageProms;
 }
 //#endregion
+//#region src/gen/prepare.ts
+/**
+* ts-pptx: the pre-serialization pass
+*
+* Everything that must happen to authored slide state *before* any XML is built. Two callers
+* reach serialization and both need it:
+*
+*   - `package/assemble.ts` — the normal `write`/`stream`/`writeFile` path, building a
+*     complete `.pptx`.
+*   - `PresentationCore.extractSlides()` — serializes slide bodies only, for splicing into
+*     an already-loaded deck via `Presentation.appendSlides()` (`ts-pptx/read`).
+*
+* The second used to reimplement the first inline, kept in step by a comment that said
+* "exactly as ... does". Nothing failed when they drifted: `extractSlides` would simply emit
+* slides that did not match what a normal write produces, and no test compares the two.
+*
+* Two primitives rather than one combined pass, because the package path has work of its own
+* that must land *between* them: it de-duplicates identical media across the deck (which
+* needs the encoded bytes {@link encodeMediaForTargets} produces) and assigns package-unique
+* chart part filenames, both before any slide content is baked. Exposing the halves lets
+* `assemble` keep its established order exactly while still sharing the code.
+*
+* The order across the two is load-bearing:
+*
+* 1. **Media first.** It is the only asynchronous step, and the sync XML pass reads the
+*    `rel.data` it populates.
+* 2. **Backfill placeholders**, so a slide inherits its layout's placeholder objects before
+*    anything measures or serializes them.
+* 3. **Bake measured fit last**, because it measures the text step 2 may have just added and
+*    writes the `fontScale` the sync XML pass then reads.
+*
+* The two functions take different target sets on purpose: media lives on layouts and the
+* master as well as on slides, while placeholder backfill and measured fit apply only to
+* slides. `extractSlides` passes only its slides to both, because it emits no layout or
+* master parts.
+*/
+/**
+* Step 1: load and base64-encode every media rel on the given targets, populating `rel.data`.
+* @param {ReadonlyArray<PresSlideInternal | SlideLayoutInternal>} targets - media-bearing targets (slides, layouts, master)
+* @param {RuntimeAdapter} runtime - runtime adapter used to load media
+* @param {'throw' | 'placeholder'} onMediaError - failure policy for unloadable media
+*/
+async function encodeMediaForTargets(targets, runtime, onMediaError) {
+	const promises = [];
+	for (const target of targets) promises.push(...encodeSlideMediaRels(target, runtime, onMediaError));
+	await Promise.all(promises);
+}
+/**
+* Steps 2 and 3: backfill inherited layout placeholders, then bake measured text fit.
+* @param {PresSlideInternal[]} slides - the slides to prepare
+* @param {FontMetricsRegistry} fontMetrics - registered font metrics; an empty registry skips the fit bake
+*/
+function bakeSlideContent(slides, fontMetrics) {
+	for (const slide of slides) if (slide._slideLayout) addPlaceholdersToSlideLayouts(slide);
+	applyMeasuredFit(slides, fontMetrics);
+}
+//#endregion
 //#region src/gen/slide/shape-ids.ts
 /**
 * Every object a slide renders, paired with the `<p:cNvPr>` id it is rendered with: top-level
@@ -5761,7 +5942,7 @@ function encodeSlideMediaRels(layout, runtime, onMediaError = "throw") {
 * This **mirrors** the allocation in `slideObjectToXml`, which hands out ids as it walks the tree.
 * A reference that must name an id *before* the walk reaches it — a connector's `<a:stCxn>`, an
 * animation's `<p:spTgt spid>` — cannot wait for that, so it resolves through this map instead.
-* The two must stay in step: `test/regression/group-shapes.test.js` parses the emitted `cNvPr` ids
+* The two must stay in step: `test/regression/shape/group-shapes.test.js` parses the emitted `cNvPr` ids
 * back out and asserts each reference points at the shape it names, so drift fails there.
 * @param slideObjects - the slide's top-level objects
 * @returns each object's `<p:cNvPr>` id, keyed by object identity, in id order
@@ -6482,13 +6663,13 @@ function genXmlParagraphProperties(textObj, isDefault) {
 		const isPictureBullet = !!(bulletImage && (bulletImage.path || bulletImage.data));
 		if (opts.bullet?.indent) bulletMarL = valToPts(opts.bullet.indent);
 		if (opts.bullet.color && !isPictureBullet) strXmlBulletColor = el("a:buClr", null, raw(createColorElement(opts.bullet.color)));
-		let bulletSizePct = PERCENT_SCALE;
+		let bulletSizePct;
 		if (opts.bullet.size !== void 0) {
 			const bulletSize = Number(opts.bullet.size);
 			if (isNaN(bulletSize) || bulletSize < 25 || bulletSize > 400) warn("bullet/size-out-of-range", "`bullet.size` must be a percentage between 25 and 400!");
 			else bulletSizePct = Math.round(bulletSize * FIXED_PCT_PER_PERCENT);
 		}
-		const strXmlBulletSize = voidEl("a:buSzPct", { val: bulletSizePct });
+		const strXmlBulletSize = bulletSizePct === void 0 ? "" : voidEl("a:buSzPct", { val: bulletSizePct });
 		const strXmlBulletFont = opts.bullet.fontFace ? voidEl("a:buFont", { typeface: opts.bullet.fontFace }) : "";
 		const bulletIndentAttrs = () => ` marL="${opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
 		if (isPictureBullet) {
@@ -6523,7 +6704,7 @@ function genXmlParagraphProperties(textObj, isDefault) {
 		}
 	} else if (opts.bullet) {
 		paragraphPropXml += ` marL="${opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-		strXmlBullet = voidEl("a:buSzPct", { val: "100000" }) + buChar("&#x2022;");
+		strXmlBullet = buChar("&#x2022;");
 	} else if (!opts.bullet) {
 		paragraphPropXml += " indent=\"0\" marL=\"0\"";
 		strXmlBullet = voidEl("a:buNone");
@@ -6655,7 +6836,7 @@ function groupRunsIntoLines(arrTextObjects, opts) {
 				arrLines.push(arrTexts);
 				arrTexts = [];
 			}
-		} else if (arrTexts.length > 0 && textObj.options.bullet && arrTexts.length > 0) {
+		} else if (arrTexts.length > 0 && textObj.options.bullet) {
 			arrLines.push(arrTexts);
 			arrTexts = [];
 			textObj.options.breakLine = false;
@@ -7299,28 +7480,31 @@ function genXmlCustGeom(options, cx, cy, layout) {
 * ts-pptx: DrawingML image sizing & cropping
 *
 * Build the `<a:srcRect>` (+ `<a:stretch>`) blipFill children for the image
-* sizing modes (`cover` / `contain` / `crop`) and for explicit percentage crops.
+* sizing modes (`cover` / `contain` / `crop` / `stretch`), for the implicit
+* aspect-correct placement a vector source gets, and for explicit percentage crops.
 */
 /** Every `<a:srcRect>` below is followed by this same fill directive. */
 const STRETCH = el("a:stretch", null, raw(voidEl("a:fillRect")));
+/** The `<a:srcRect>` fitting `imgSize` into `boxDim`, followed by the fill directive. */
+function fitSrcRect(type, imgSize, boxDim) {
+	const { l, r, t, b } = fitSrcRectPercents(type, imgSize, boxDim);
+	return voidEl("a:srcRect", {
+		l,
+		r,
+		t,
+		b
+	}) + STRETCH;
+}
 const ImageSizingXml = {
 	cover: function(imgSize, boxDim) {
-		const { l, r, t, b } = fitSrcRectPercents("cover", imgSize, boxDim);
-		return voidEl("a:srcRect", {
-			l,
-			r,
-			t,
-			b
-		}) + STRETCH;
+		return fitSrcRect("cover", imgSize, boxDim);
 	},
 	contain: function(imgSize, boxDim) {
-		const { l, r, t, b } = fitSrcRectPercents("contain", imgSize, boxDim);
-		return voidEl("a:srcRect", {
-			l,
-			r,
-			t,
-			b
-		}) + STRETCH;
+		return fitSrcRect("contain", imgSize, boxDim);
+	},
+	/** No source rectangle at all: the image fills the box, aspect ratio be damned. */
+	stretch: function() {
+		return STRETCH;
 	},
 	crop: function(imgSize, boxDim) {
 		const l = boxDim.x;
@@ -7345,6 +7529,23 @@ const ImageSizingXml = {
 	}
 };
 /**
+* The blipFill children for a vector source the caller gave no `sizing` for: letterbox it to its
+* own aspect ratio inside its frame, the way `sizing: 'contain'` would — an SVG carries an
+* intrinsic ratio, and stretching a glyph into a box that disagrees with it is never the intent.
+*
+* Returns `null` when the two ratios already agree, which is the overwhelmingly common case (a
+* square icon in a square box). The caller then emits the plain `<a:stretch>` it always did, so
+* this default costs nothing — neither bytes nor a behaviour change — until it actually differs.
+* @param imgSize - the vector's intrinsic size (viewBox or width/height)
+* @param boxDim - the picture's displayed frame
+* @returns the `<a:srcRect>` + `<a:stretch>` children, or `null` if no letterboxing is needed
+*/
+function genXmlVectorAspectFit(imgSize, boxDim) {
+	const { l, r, t, b } = fitSrcRectPercents("contain", imgSize, boxDim);
+	if (l === 0 && r === 0 && t === 0 && b === 0) return null;
+	return fitSrcRect("contain", imgSize, boxDim);
+}
+/**
 * Build an explicit `<a:srcRect>` crop from percentage edge insets (0–100), emitted verbatim.
 * Each inset is the percent of the *source* image trimmed from that edge; values serialize in
 * 1000ths of a percent (DrawingML `ST_Percentage`, where 100% = 100000). Unlike `sizing: 'crop'`
@@ -7381,10 +7582,12 @@ function genXmlImageCrop(crop, objectName) {
 function renderImageObject(slideItemObj, idx, slide, x, y, cx, cy, imgWidth, imgHeight, placeholderObj, locationAttrs, sizing, rounding) {
 	let strSlideXml = "";
 	slideItemObj.options = slideItemObj.options || {};
+	const mediaRel = (slide._relsMedia || []).find((rel) => rel.rId === slideItemObj.imageRid);
+	const relData = mediaRel?.data;
+	const naturalSize = () => typeof relData === "string" ? getImageSizeFromBase64(relData) : null;
 	if (slideItemObj.options._szAuto) {
 		const szAuto = slideItemObj.options._szAuto;
-		const relData = (slide._relsMedia || []).find((rel) => rel.rId === slideItemObj.imageRid)?.data;
-		const natural = typeof relData === "string" ? getImageSizeFromBase64(relData) : null;
+		const natural = naturalSize();
 		if (natural) {
 			if (szAuto.w && szAuto.h) {
 				cx = pixelsToEmu(natural.w, 96);
@@ -7415,7 +7618,8 @@ function renderImageObject(slideItemObj, idx, slide, x, y, cx, cy, imgWidth, img
 		imgOpts.biLevel ? raw(voidEl("a:biLevel", { thresh: Math.round(imgOpts.biLevel.threshold * PERCENT_SCALE) })) : null
 	];
 	strSlideXml += "<p:blipFill>";
-	if ((slide._relsMedia || []).find((rel) => rel.rId === slideItemObj.imageRid)?.extn === "svg") strSlideXml += el("a:blip", { "r:embed": `rId${(slideItemObj.imageRid ?? 0) - 1}` }, [...blipEffects(" "), raw(el("a:extLst", null, raw(el("a:ext", { uri: "{96DAC541-7B7A-43D3-8B79-37D633B846F1}" }, raw(voidEl("asvg:svgBlip", {
+	const isVector = mediaRel?.extn === "svg";
+	if (isVector) strSlideXml += el("a:blip", { "r:embed": `rId${(slideItemObj.imageRid ?? 0) - 1}` }, [...blipEffects(" "), raw(el("a:extLst", null, raw(el("a:ext", { uri: "{96DAC541-7B7A-43D3-8B79-37D633B846F1}" }, raw(voidEl("asvg:svgBlip", {
 		"xmlns:asvg": "http://schemas.microsoft.com/office/drawing/2016/SVG/main",
 		"r:embed": `rId${slideItemObj.imageRid}`
 	}, { openPrefix: "   " })), {
@@ -7439,8 +7643,7 @@ function renderImageObject(slideItemObj, idx, slide, x, y, cx, cy, imgWidth, img
 			h: imgHeight
 		};
 		if (sizing.type === "cover" || sizing.type === "contain") {
-			const relData = (slide._relsMedia || []).find((rel) => rel.rId === slideItemObj.imageRid)?.data;
-			const natural = typeof relData === "string" ? getImageSizeFromBase64(relData) : null;
+			const natural = naturalSize();
 			if (natural) cropSize = natural;
 			else warn("image/unmeasurable-natural-size", `sizing '${sizing.type}' could not measure natural dimensions for image "${slideItemObj.options.objectName}"; falling back to displayed aspect ratio (crop may be inexact). Provide a raster image (PNG/JPEG/GIF/BMP/WebP) or an SVG with width/height or a viewBox to enable an aspect-correct crop.`);
 		}
@@ -7452,7 +7655,14 @@ function renderImageObject(slideItemObj, idx, slide, x, y, cx, cy, imgWidth, img
 		});
 		imgWidth = boxW;
 		imgHeight = boxH;
-	} else strSlideXml += el("a:stretch", null, raw(voidEl("a:fillRect")), { openPrefix: "  " });
+	} else {
+		const natural = isVector ? naturalSize() : null;
+		const aspectFit = natural ? genXmlVectorAspectFit(natural, {
+			w: imgWidth,
+			h: imgHeight
+		}) : null;
+		strSlideXml += aspectFit ?? el("a:stretch", null, raw(voidEl("a:fillRect")), { openPrefix: "  " });
+	}
 	strSlideXml += "</p:blipFill>";
 	strSlideXml += "<p:spPr>";
 	strSlideXml += el("a:xfrm", locationAttrs, [raw(voidEl("a:off", {
@@ -7526,6 +7736,216 @@ function renderMediaObject(slideItemObj, idx, x, y, cx, cy, locationAttrs) {
 	]);
 }
 //#endregion
+//#region src/gen/slide/objects/model3d.ts
+/** The `am3d` namespace, doubling as `a:graphicData@uri` and the `mc:Choice Requires` token's URI. */
+const AM3D_NS = "http://schemas.microsoft.com/office/drawing/2017/model3d";
+/** Denominator of every `am3d` rational element (`@n`/`@d`). */
+const RATIO_DEN = 1e6;
+/**
+* `am3d:raster@rName`/`@rVer` — the renderer that produced the cached preview. PowerPoint stamps
+* its own renderer here; ts-pptx did not rasterize anything, but the attributes are what PowerPoint
+* writes and the element is where the preview blip lives, so they are reproduced verbatim.
+*/
+const RASTER = {
+	rName: "Office3DRenderer",
+	rVer: "16.0.8326"
+};
+/**
+* `am3d:objViewport@viewportSz`. Bounding-box derived in PowerPoint's output (a cube and a slab
+* gave different values); the cube's is emitted, matching the fixed default camera.
+*/
+const OBJ_VIEWPORT_SZ = 3338805;
+/** The three point lights PowerPoint writes for every inserted model — key, fill and rim. */
+const PT_LIGHTS = [
+	{
+		clr: {
+			r: 1e5,
+			g: 75e3,
+			b: 5e4
+		},
+		intensityN: 9765625,
+		pos: {
+			x: 21959998,
+			y: 70920001,
+			z: 16344003
+		}
+	},
+	{
+		clr: {
+			r: 4e4,
+			g: 6e4,
+			b: 95e3
+		},
+		intensityN: 1225e4,
+		pos: {
+			x: -37964106,
+			y: 51130435,
+			z: 57631972
+		}
+	},
+	{
+		clr: {
+			r: 86837,
+			g: 72700,
+			b: 1e5
+		},
+		intensityN: 3125e3,
+		pos: {
+			x: -37739122,
+			y: 58056624,
+			z: -34769649
+		}
+	}
+];
+/** `am3d:ambientLight` — neutral 50% scRGB at half illuminance, constant like the point lights. */
+const AMBIENT = {
+	clr: {
+		r: 5e4,
+		g: 5e4,
+		b: 5e4
+	},
+	illuminanceN: 5e5
+};
+/** `<am3d:clr><a:scrgbClr …/></am3d:clr>` — the colour wrapper both light kinds share. */
+function lightColor(clr) {
+	return el("am3d:clr", null, raw(voidEl("a:scrgbClr", clr)));
+}
+/** The `am3d:camera` block: eye position, up vector, aim point and perspective fov. */
+function cameraEl(model) {
+	return el("am3d:camera", null, [
+		raw(voidEl("am3d:pos", model.pos)),
+		raw(voidEl("am3d:up", model.up)),
+		raw(voidEl("am3d:lookAt", model.lookAt)),
+		raw(voidEl("am3d:perspective", { fov: model.fov }))
+	]);
+}
+/**
+* The `am3d:trans` block: model-unit scale plus an identity placement. Only `meterPerModelUnit`
+* varies — `preTrans`/`scale`/`rot`/`postTrans` are the identity PowerPoint writes for a model
+* inserted without any subsequent 3D manipulation, and `am3d:rot` is emitted attribute-less.
+*/
+function transEl(model) {
+	const unit = {
+		n: RATIO_DEN,
+		d: RATIO_DEN
+	};
+	return el("am3d:trans", null, [
+		raw(voidEl("am3d:meterPerModelUnit", {
+			n: model.meterPerModelUnitN,
+			d: RATIO_DEN
+		})),
+		raw(voidEl("am3d:preTrans", {
+			dx: 0,
+			dy: 0,
+			dz: 0
+		})),
+		raw(el("am3d:scale", null, [
+			raw(voidEl("am3d:sx", unit)),
+			raw(voidEl("am3d:sy", unit)),
+			raw(voidEl("am3d:sz", unit))
+		])),
+		raw(voidEl("am3d:rot")),
+		raw(voidEl("am3d:postTrans", {
+			dx: 0,
+			dy: 0,
+			dz: 0
+		}))
+	]);
+}
+/** The fixed lighting rig: one ambient light and three point lights, in PowerPoint's order. */
+function lightsXml() {
+	return el("am3d:ambientLight", null, [raw(lightColor(AMBIENT.clr)), raw(voidEl("am3d:illuminance", {
+		n: AMBIENT.illuminanceN,
+		d: RATIO_DEN
+	}))]) + PT_LIGHTS.map((light) => el("am3d:ptLight", { rad: 0 }, [
+		raw(lightColor(light.clr)),
+		raw(voidEl("am3d:intensity", {
+			n: light.intensityN,
+			d: RATIO_DEN
+		})),
+		raw(voidEl("am3d:pos", light.pos))
+	])).join("");
+}
+/** The `mc:Fallback` picture — the cached preview, drawn by everything that is not PowerPoint 2019+. */
+function fallbackPic(picId, objectName, altText, model, xf) {
+	return el("p:pic", null, [
+		raw(el("p:nvPicPr", null, [
+			raw(cNvPrOpen(picId, objectName, altText) + "/>"),
+			raw(el("p:cNvPicPr", null, raw(voidEl("a:picLocks", {
+				noGrp: "1",
+				noRot: "1",
+				noChangeAspect: "1",
+				noMove: "1",
+				noResize: "1",
+				noEditPoints: "1",
+				noAdjustHandles: "1",
+				noChangeArrowheads: "1",
+				noChangeShapeType: "1",
+				noCrop: "1"
+			})))),
+			raw(voidEl("p:nvPr"))
+		])),
+		raw(el("p:blipFill", null, [raw(voidEl("a:blip", { "r:embed": `rId${model.previewRid}` })), raw(el("a:stretch", null, raw(voidEl("a:fillRect"))))])),
+		raw(el("p:spPr", null, [raw(el("a:xfrm", null, [raw(voidEl("a:off", {
+			x: xf.x,
+			y: xf.y
+		})), raw(voidEl("a:ext", {
+			cx: xf.cx,
+			cy: xf.cy
+		}))])), raw(el("a:prstGeom", { prst: "rect" }, raw(voidEl("a:avLst"))))]))
+	]);
+}
+/**
+* Render a `model3d` slide object to its `<mc:AlternateContent>` XML. The `mc:Choice` carries the
+* real `<p:graphicFrame>` (the `am3d:model3d` graphicData PowerPoint 2019+ renders live); the
+* `mc:Fallback` carries the cached preview picture. See `gen/define/model3d.ts`.
+*/
+function renderModel3dObject(slideItemObj, idx, x, y, cx, cy) {
+	const model = slideItemObj.model3d;
+	if (!model) return "";
+	const opts = slideItemObj.options || {};
+	const altText = opts.altText || "";
+	const spPr = el("am3d:spPr", null, [raw(el("a:xfrm", null, [raw(voidEl("a:off", {
+		x: 0,
+		y: 0
+	})), raw(voidEl("a:ext", {
+		cx,
+		cy
+	}))])), raw(el("a:prstGeom", { prst: "rect" }, raw(voidEl("a:avLst"))))]);
+	const model3d = el("am3d:model3d", { "r:embed": `rId${model.modelRid}` }, [
+		raw(spPr),
+		raw(cameraEl(model)),
+		raw(transEl(model)),
+		raw(el("am3d:raster", RASTER, raw(voidEl("am3d:blip", { "r:embed": `rId${model.previewRid}` })))),
+		raw(voidEl("am3d:objViewport", { viewportSz: OBJ_VIEWPORT_SZ })),
+		raw(lightsXml())
+	]);
+	const graphicFrame = el("p:graphicFrame", null, [
+		raw(el("p:nvGraphicFramePr", null, [
+			raw(cNvPrOpen(idx + 2, opts.objectName, altText) + "/>"),
+			raw(el("p:cNvGraphicFramePr", null, raw(voidEl("a:graphicFrameLocks")))),
+			raw(voidEl("p:nvPr"))
+		])),
+		raw(el("p:xfrm", null, [raw(voidEl("a:off", {
+			x,
+			y
+		})), raw(voidEl("a:ext", {
+			cx,
+			cy
+		}))])),
+		raw(el("a:graphic", null, raw(el("a:graphicData", { uri: AM3D_NS }, raw(model3d)))))
+	]);
+	return el("mc:AlternateContent", { "xmlns:mc": MC_NS }, [raw(el("mc:Choice", {
+		"xmlns:am3d": AM3D_NS,
+		Requires: "am3d"
+	}, raw(graphicFrame))), raw(el("mc:Fallback", null, raw(fallbackPic(idx + 2, opts.objectName, altText, model, {
+		x,
+		y,
+		cx,
+		cy
+	}))))]);
+}
+//#endregion
 //#region src/gen/slide/objects/ole.ts
 /** VML namespace — declared by an OLE object's `mc:Choice Requires="v"` (no VML content is emitted). */
 const VML_NS = "urn:schemas-microsoft-com:vml";
@@ -7686,95 +8106,12 @@ function genTableCellBorderXml(cellBorder, diagonal) {
 }
 //#endregion
 //#region src/gen/drawingml/table-cell3d.ts
-/** `ST_BevelPresetType`. */
-const BEVEL_PRESETS = [
-	"relaxedInset",
-	"circle",
-	"slope",
-	"cross",
-	"angle",
-	"softRound",
-	"convex",
-	"coolSlant",
-	"divot",
-	"riblet",
-	"hardEdge",
-	"artDeco"
-];
-/** `ST_PresetMaterialType`. */
-const MATERIALS = [
-	"legacyMatte",
-	"legacyPlastic",
-	"legacyMetal",
-	"legacyWireframe",
-	"matte",
-	"plastic",
-	"metal",
-	"warmMatte",
-	"translucentPowder",
-	"powder",
-	"dkEdge",
-	"softEdge",
-	"clear",
-	"flat",
-	"softmetal"
-];
-/** `ST_LightRigType`. */
-const LIGHT_RIGS = [
-	"legacyFlat1",
-	"legacyFlat2",
-	"legacyFlat3",
-	"legacyFlat4",
-	"legacyNormal1",
-	"legacyNormal2",
-	"legacyNormal3",
-	"legacyNormal4",
-	"legacyHarsh1",
-	"legacyHarsh2",
-	"legacyHarsh3",
-	"legacyHarsh4",
-	"threePt",
-	"balanced",
-	"soft",
-	"harsh",
-	"flood",
-	"contrasting",
-	"morning",
-	"sunrise",
-	"sunset",
-	"chilly",
-	"freezing",
-	"flat",
-	"twoPt",
-	"glow",
-	"brightRoom"
-];
-/** `ST_LightRigDirection`. */
-const LIGHT_DIRECTIONS = [
-	"tl",
-	"t",
-	"tr",
-	"l",
-	"r",
-	"bl",
-	"b",
-	"br"
-];
 /**
-* Vet one enumerated value before it reaches the XML. Anything outside its `ST_` union would
-* make the slide part schema-invalid, and PowerPoint reports that as a corrupt file rather
-* than as a mis-set option — so an unrecognized value is reported and the attribute dropped,
-* leaving the renderer on the schema default.
+* Vet one enumerated value before it reaches the XML, reporting and dropping anything outside
+* its `ST_` union. See `ooxml/check-enum.ts` for why the write path drops rather than throws.
 */
 function resolveEnum(value, valid, field) {
-	if (value === void 0 || value === null) return null;
-	if (valid.includes(value)) return value;
-	warnOnce("table/invalid-cell3d", `table cell: cell3D \`${field}\` value \`${String(value)}\` is not valid and is ignored — use one of ${valid.join(", ")}.`, {
-		received: value,
-		field,
-		valid
-	});
-	return null;
+	return checkEnumOrWarn(value, valid, "table/invalid-cell3d", `table cell: cell3D \`${field}\``, { field });
 }
 /**
 * A bevel dimension in EMU (`ST_PositiveCoordinate`), from a width in points.
@@ -7805,32 +8142,22 @@ function genTableCell3DXml(cell3D) {
 		prst: resolveEnum(cell3D.preset, BEVEL_PRESETS, "preset")
 	});
 	const rig = resolveEnum(cell3D.lightRig?.rig, LIGHT_RIGS, "lightRig.rig");
-	const dir = resolveEnum(cell3D.lightRig?.dir, LIGHT_DIRECTIONS, "lightRig.dir");
+	const dir = resolveEnum(cell3D.lightRig?.dir, LIGHT_RIG_DIRECTIONS, "lightRig.dir");
 	const lightRig = rig && dir ? voidEl("a:lightRig", {
 		rig,
 		dir
 	}) : "";
 	if (cell3D.lightRig && !lightRig) warnOnce("table/invalid-cell3d", "table cell: cell3D `lightRig` needs both `rig` and `dir` (both are required by CT_LightRig); the light rig is dropped and the bevel takes the renderer default.", { received: cell3D.lightRig });
-	return el("a:cell3D", { prstMaterial: resolveEnum(cell3D.material, MATERIALS, "material") }, [raw(bevel), lightRig ? raw(lightRig) : null]);
+	return el("a:cell3D", { prstMaterial: resolveEnum(cell3D.material, PRESET_MATERIALS, "material") }, [raw(bevel), lightRig ? raw(lightRig) : null]);
 }
 //#endregion
 //#region src/gen/slide/objects/table.ts
-/** The two values `ST_TextHorzOverflowType` allows on `a:tcPr/@horzOverflow`. */
-const HORZ_OVERFLOW_VALUES = ["clip", "overflow"];
 /**
-* Validate a cell's `horzOverflow` before it reaches the XML. Anything outside
-* `ST_TextHorzOverflowType` would make the slide part schema-invalid — and PowerPoint
-* reports that as a corrupt file, not as a mis-set option — so an unrecognized value is
-* reported and dropped instead of written. `undefined` (the common case) emits nothing.
+* Validate a cell's `horzOverflow` before it reaches the XML, reporting and dropping anything
+* outside `ST_TextHorzOverflowType`. `undefined` (the common case) emits nothing.
 */
 function resolveHorzOverflow(value) {
-	if (value === void 0 || value === null) return null;
-	if (HORZ_OVERFLOW_VALUES.includes(value)) return value;
-	warnOnce("table/invalid-horz-overflow", `table cell: horzOverflow \`${String(value)}\` is not a valid value and is ignored — use ${HORZ_OVERFLOW_VALUES.join(" or ")}.`, {
-		received: value,
-		valid: HORZ_OVERFLOW_VALUES
-	});
-	return null;
+	return checkEnumOrWarn(value, TEXT_HORZ_OVERFLOW, "table/invalid-horz-overflow", "table cell: horzOverflow");
 }
 /**
 * Overlay `TableProps.outerBorder` onto one cell's own 4-side border tuple.
@@ -8295,7 +8622,6 @@ function renderZoomObject(slideItemObj, idx, x, y, cx, cy) {
 }
 //#endregion
 //#region src/gen/slide/object.ts
-const PACKAGE_REL_NS$1 = "http://schemas.openxmlformats.org/package/2006/relationships";
 /** The MS-2007 `media` rel that pairs with an ECMA audio/video/online rel on the same Target. */
 const MS_MEDIA_REL = "http://schemas.microsoft.com/office/2007/relationships/media";
 /** Slide→chartEx-part relationship type (MS, not the ECMA `.../relationships/chart`). */
@@ -8506,6 +8832,9 @@ function slideObjectToXml(slide) {
 			case "zoom":
 				strSlideXml += renderZoomObject(slideItemObj, idx, x, y, cx, cy);
 				break;
+			case "model3d":
+				strSlideXml += renderModel3dObject(slideItemObj, idx, x, y, cx, cy);
+				break;
 			case "group": {
 				const groupChildren = slideItemObj._groupObjects || [];
 				let innerXml = "";
@@ -8654,12 +8983,12 @@ function slideObjectRelationsToXml(slide, defaultRels) {
 		lastRid = Math.max(lastRid, rel.rId);
 		if (isHyperlinkRel(rel)) if (rel.data === "slide") rels.push(voidEl("Relationship", {
 			Id: `rId${rel.rId}`,
-			Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide",
+			Type: OFFICE_REL + "slide",
 			Target: `slide${rel.Target}.xml`
 		}));
 		else rels.push(voidEl("Relationship", {
 			Id: `rId${rel.rId}`,
-			Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
+			Type: OFFICE_REL + "hyperlink",
 			Target: rel.Target,
 			TargetMode: "External"
 		}));
@@ -8668,7 +8997,7 @@ function slideObjectRelationsToXml(slide, defaultRels) {
 		lastRid = Math.max(lastRid, rel.rId);
 		rels.push(voidEl("Relationship", {
 			Id: `rId${rel.rId}`,
-			Type: rel.isChartEx ? CHARTEX_REL : "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart",
+			Type: rel.isChartEx ? CHARTEX_REL : OFFICE_REL + "chart",
 			Target: rel.Target
 		}));
 	});
@@ -8683,10 +9012,11 @@ function slideObjectRelationsToXml(slide, defaultRels) {
 		});
 		lastRid = Math.max(lastRid, rel.rId);
 		if (rel.oleRelType) rels.push(media(rel.oleRelType));
-		else if (relType.includes("image")) rels.push(media("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"));
-		else if (relType.includes("audio")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL) : media("http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio"));
-		else if (relType.includes("video")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL) : media("http://schemas.openxmlformats.org/officeDocument/2006/relationships/video"));
-		else if (relType.includes("online")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL, "External") : media("http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", "External"));
+		else if (rel.model3dRelType) rels.push(media(rel.model3dRelType));
+		else if (relType.includes("image")) rels.push(media(OFFICE_REL + "image"));
+		else if (relType.includes("audio")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL) : media(OFFICE_REL + "audio"));
+		else if (relType.includes("video")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL) : media(OFFICE_REL + "video"));
+		else if (relType.includes("online")) rels.push(hasTarget(relTarget) ? media(MS_MEDIA_REL, "External") : media(OFFICE_REL + "video", "External"));
 	});
 	defaultRels.forEach((rel, idx) => {
 		rels.push(voidEl("Relationship", {
@@ -8695,7 +9025,7 @@ function slideObjectRelationsToXml(slide, defaultRels) {
 			Target: rel.target
 		}));
 	});
-	return XML_DECL + "\r\n" + el("Relationships", { xmlns: PACKAGE_REL_NS$1 }, rels.map(raw));
+	return XML_DECL + "\r\n" + el("Relationships", { xmlns: PACKAGE_REL_NS }, rels.map(raw));
 }
 //#endregion
 //#region src/gen/slide/slide.ts
@@ -8773,7 +9103,6 @@ function getLayoutIdxForSlide(slides, slideLayouts, slideNumber) {
 }
 //#endregion
 //#region src/gen/slide/notes.ts
-const PACKAGE_REL_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
 /**
 * Collect the speaker-notes runs for a slide (flattened across any number of `addNotes()` calls).
 * @param {PresSlideInternal} slide - the slide object
@@ -9257,19 +9586,19 @@ function makeXmlNotesSlide(slide) {
 function makeXmlNotesSlideRel(slide, slideNumber) {
 	const hlinkRels = buildNotesSlideRels(slide).map((rel) => voidEl("Relationship", {
 		Id: `rId${rel.rId}`,
-		Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
+		Type: OFFICE_REL + "hyperlink",
 		Target: rel.Target,
 		TargetMode: "External"
 	})).join("");
 	return XML_DECL + el("Relationships", { xmlns: PACKAGE_REL_NS }, [
 		raw(voidEl("Relationship", {
 			Id: "rId1",
-			Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster",
+			Type: OFFICE_REL + "notesMaster",
 			Target: "../notesMasters/notesMaster1.xml"
 		})),
 		raw(voidEl("Relationship", {
 			Id: "rId2",
-			Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide",
+			Type: OFFICE_REL + "slide",
 			Target: `../slides/slide${slideNumber}.xml`
 		})),
 		raw(hlinkRels)
@@ -9286,7 +9615,7 @@ function makeXmlNotesSlideRel(slide, slideNumber) {
 function makeXmlNotesMasterRel() {
 	return XML_DECL + "\r\n" + el("Relationships", { xmlns: PACKAGE_REL_NS }, raw(voidEl("Relationship", {
 		Id: "rId1",
-		Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",
+		Type: OFFICE_REL + "theme",
 		Target: "../theme/theme2.xml"
 	})), {
 		childPrefix: "\n		",
@@ -9772,11 +10101,10 @@ function makeXmlCustomProperties(props) {
 * Emit the package root relationships (app/core/presentation, plus custom-props
 * when present).
 */
-const SCHEMA_BASE = "http://schemas.openxmlformats.org/";
 function relationship$1(id, type, target) {
 	return voidEl("Relationship", {
 		Id: id,
-		Type: SCHEMA_BASE + type,
+		Type: type,
 		Target: target
 	}, { openPrefix: "\n		" });
 }
@@ -9785,11 +10113,11 @@ function relationship$1(id, type, target) {
 * @returns XML
 */
 function makeXmlRootRels(hasCustomProps) {
-	return XML_DECL + "\r\n" + el("Relationships", { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" }, [
-		raw(relationship$1("rId1", "officeDocument/2006/relationships/extended-properties", "docProps/app.xml")),
-		raw(relationship$1("rId2", "package/2006/relationships/metadata/core-properties", "docProps/core.xml")),
-		raw(relationship$1("rId3", "officeDocument/2006/relationships/officeDocument", "ppt/presentation.xml")),
-		hasCustomProps ? raw(relationship$1("rId4", "officeDocument/2006/relationships/custom-properties", "docProps/custom.xml")) : null
+	return XML_DECL + "\r\n" + el("Relationships", { xmlns: PACKAGE_REL_NS }, [
+		raw(relationship$1("rId1", OFFICE_REL + "extended-properties", "docProps/app.xml")),
+		raw(relationship$1("rId2", PACKAGE_REL_NS + "/metadata/core-properties", "docProps/core.xml")),
+		raw(relationship$1("rId3", OFFICE_REL + "officeDocument", "ppt/presentation.xml")),
+		hasCustomProps ? raw(relationship$1("rId4", OFFICE_REL + "custom-properties", "docProps/custom.xml")) : null
 	], { closePrefix: "\n		" });
 }
 //#endregion
@@ -9829,13 +10157,13 @@ function presentationFontRelStart(slides) {
 }
 function makeXmlPresentationRels(slides, embeddedFonts) {
 	let intRelNum = 1;
-	const rels = [relationship(1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster", "slideMasters/slideMaster1.xml")];
-	for (let idx = 1; idx <= slides.length; idx++) rels.push(relationship(++intRelNum, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide", `slides/slide${idx}.xml`));
+	const rels = [relationship(1, OFFICE_REL + "slideMaster", "slideMasters/slideMaster1.xml")];
+	for (let idx = 1; idx <= slides.length; idx++) rels.push(relationship(++intRelNum, OFFICE_REL + "slide", `slides/slide${idx}.xml`));
 	intRelNum++;
-	rels.push(relationship(intRelNum + 0, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster", "notesMasters/notesMaster1.xml"), relationship(intRelNum + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/presProps", "presProps.xml"), relationship(intRelNum + 2, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/viewProps", "viewProps.xml"), relationship(intRelNum + 3, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme", "theme/theme1.xml"), relationship(intRelNum + 4, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles", "tableStyles.xml"));
-	if ((slides || []).some((slide) => (slide._comments || []).length > 0)) rels.push(relationship(intRelNum + 5, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors", "commentAuthors.xml"));
+	rels.push(relationship(intRelNum + 0, OFFICE_REL + "notesMaster", "notesMasters/notesMaster1.xml"), relationship(intRelNum + 1, OFFICE_REL + "presProps", "presProps.xml"), relationship(intRelNum + 2, OFFICE_REL + "viewProps", "viewProps.xml"), relationship(intRelNum + 3, OFFICE_REL + "theme", "theme/theme1.xml"), relationship(intRelNum + 4, OFFICE_REL + "tableStyles", "tableStyles.xml"));
+	if ((slides || []).some((slide) => (slide._comments || []).length > 0)) rels.push(relationship(intRelNum + 5, OFFICE_REL + "commentAuthors", "commentAuthors.xml"));
 	for (const face of flattenEmbeddedFaces(embeddedFonts || [], presentationFontRelStart(slides))) rels.push(relationship(face.rId, FONT_REL_TYPE, `fonts/font${face.partIndex}.fntdata`));
-	return XML_DECL + "\r\n" + el("Relationships", { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" }, rels.map(raw));
+	return XML_DECL + "\r\n" + el("Relationships", { xmlns: PACKAGE_REL_NS }, rels.map(raw));
 }
 //#endregion
 //#region src/gen/pres/presentation.ts
@@ -10563,18 +10891,14 @@ function createChartMediaRels(slide, zip, chartPromises) {
 async function buildPackageParts(source, props) {
 	const pres = source.presentation;
 	const arrChartPromises = [];
-	let arrMediaPromises = [];
 	const zip = new ZipWriter();
 	registerTransitionSounds(pres.slides);
 	const onMediaError = props.onMediaError ?? "throw";
-	pres.slides.forEach((slide) => {
-		arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(slide, source.runtime, onMediaError));
-	});
-	pres.slideLayouts.forEach((layout) => {
-		arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(layout, source.runtime, onMediaError));
-	});
-	arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(pres.masterSlide, source.runtime, onMediaError));
-	return await Promise.all(arrMediaPromises).then(async () => {
+	return await encodeMediaForTargets([
+		...pres.slides,
+		...pres.slideLayouts,
+		pres.masterSlide
+	], source.runtime, onMediaError).then(async () => {
 		const canonicalMediaTargets = /* @__PURE__ */ new Map();
 		for (const target of [
 			...pres.slides,
@@ -10600,10 +10924,7 @@ async function buildPackageParts(source, props) {
 			rel.fileName = `${chartBase}.xml`;
 			rel.Target = `/ppt/charts/${chartBase}.xml`;
 		}
-		pres.slides.forEach((slide) => {
-			if (slide._slideLayout) addPlaceholdersToSlideLayouts(slide);
-		});
-		applyMeasuredFit(pres.slides, source.fontMetrics);
+		bakeSlideContent(pres.slides, source.fontMetrics);
 		const hasCustomProps = source.customProperties.length > 0;
 		zip.add("[Content_Types].xml", makeXmlContTypes(pres.slides, pres.slideLayouts, pres.masterSlide, hasCustomProps, pres.embeddedFonts));
 		zip.add("_rels/.rels", makeXmlRootRels(hasCustomProps));
@@ -10674,60 +10995,20 @@ async function writePackage(source, props) {
 //#endregion
 //#region src/presentation.ts
 /**
-*  :: presentation.ts ::
-*
-*  TypeScript/ESM library that creates PowerPoint (pptx) presentations
-*  https://github.com/gitbrent/PptxGenJS
-*
-*  This framework is released under the MIT Public License (MIT)
+* ts-pptx: the presentation core
 *
-*  PptxGenJS (C) 2015-present Brent Ely -- https://github.com/gitbrent
+* Home of {@link PresentationCore}, the class every entry point subclasses with a runtime
+* adapter (`index.ts`, `node.ts`, `browser.ts`). See the class doc below for the layout of
+* its body and where package assembly actually happens.
 *
-*  Some code derived from the OfficeGen project:
-*  github.com/Ziv-Barber/officegen/ (Copyright 2013 Ziv Barber)
+* Units: this library takes user coordinates in inches and converts to EMU on output — see
+* `units.ts` for the conversions and `STANDARD_LAYOUTS` for the built-in slide sizes.
 *
-*  Permission is hereby granted, free of charge, to any person obtaining a copy
-*  of this software and associated documentation files (the "Software"), to deal
-*  in the Software without restriction, including without limitation the rights
-*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*  copies of the Software, and to permit persons to whom the Software is
-*  furnished to do so, subject to the following conditions:
-*
-*  The above copyright notice and this permission notice shall be included in all
-*  copies or substantial portions of the Software.
-*
-*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-*  SOFTWARE.
+* Derived from PptxGenJS (C) 2015-present Brent Ely (MIT), which in turn took some code from
+* the OfficeGen project (Copyright 2013 Ziv Barber). This project is likewise MIT; the full
+* license text is in `LICENSE` at the repository root.
 */
-/**
-* Units of Measure used in PowerPoint documents
-*
-* PowerPoint (DrawingML) positions and sizes shapes in `EMU`; font sizing is in points.
-* This library takes user coordinates in inches and converts to EMU on output.
-* - 914400 EMUs is 1 inch
-* -  12700 EMUs is 1 point
-* -      72 points is 1 inch
-*
-* @see https://startbigthinksmall.wordpress.com/2010/01/04/points-inches-and-emus-measuring-units-in-office-open-xml/
-*/
-/**
-* Object Layouts
-*
-* - 16x9 (10" x 5.625")
-* - 16x10 (10" x 6.25")
-* - 4x3 (10" x 7.5")
-* - Wide (13.33" x 7.5")
-* - [custom] (any size)
-*
-* @see https://docs.microsoft.com/en-us/office/open-xml/structure-of-a-presentationml-document
-* @see https://docs.microsoft.com/en-us/previous-versions/office/developer/office-2010/hh273476(v=office.14)
-*/
-const VERSION = "2.0.0";
+const VERSION = "3.1.0";
 function standardLayoutToPresLayout(layout) {
 	return {
 		name: layout.name,
@@ -11046,15 +11327,8 @@ var PresentationCore = class {
 	*/
 	extractSlides = async (opts = {}) => {
 		const onMediaError = opts.onMediaError ?? "throw";
-		let mediaPromises = [];
-		this._slides.forEach((slide) => {
-			mediaPromises = mediaPromises.concat(encodeSlideMediaRels(slide, this._runtime, onMediaError));
-		});
-		await Promise.all(mediaPromises);
-		this._slides.forEach((slide) => {
-			if (slide._slideLayout) addPlaceholdersToSlideLayouts(slide);
-		});
-		applyMeasuredFit(this._slides, this._fontMetrics);
+		await encodeMediaForTargets(this._slides, this._runtime, onMediaError);
+		bakeSlideContent(this._slides, this._fontMetrics);
 		const slides = this._slides.map((slide) => {
 			const relByRid = new Map(slide._relsMedia.map((rel) => [rel.rId, rel]));
 			const avPreviewRids = /* @__PURE__ */ new Set();
@@ -11475,6 +11749,138 @@ var PresentationCore = class {
 	}
 };
 //#endregion
+//#region src/clip.ts
+const HALF_DISC = {
+	deep: {
+		topEdgeX: .31788,
+		botEdgeX: .31788,
+		tipTopX: .30061,
+		tipTopY: .01078,
+		tipBotX: .30061,
+		tipBotY: .98922,
+		apexY: .5,
+		c1b: {
+			x: .11594,
+			y: .86833
+		},
+		c2b: {
+			x: 0,
+			y: .69392
+		},
+		c1t: {
+			x: 0,
+			y: .30609
+		},
+		c2t: {
+			x: .11594,
+			y: .13167
+		}
+	},
+	shallow: {
+		topEdgeX: .12611,
+		botEdgeX: .11128,
+		tipTopX: .09976,
+		tipTopY: .05448,
+		tipBotX: .09976,
+		tipBotY: .97617,
+		apexY: .51533,
+		c1b: {
+			x: .03522,
+			y: .83247
+		},
+		c2b: {
+			x: 0,
+			y: .67725
+		},
+		c1t: {
+			x: 0,
+			y: .3534
+		},
+		c2t: {
+			x: .03522,
+			y: .19818
+		}
+	}
+};
+/**
+* Half-disc clip path for a `w × h` box. Authored flat-right; `flat: 'left'` mirrors `x → 1 - x`.
+*/
+function halfDisc(w, h, flat, preset) {
+	const s = HALF_DISC[preset];
+	const fx = flat === "left" ? (x) => (1 - x) * w : (x) => x * w;
+	const fy = (y) => y * h;
+	return [
+		{
+			x: fx(s.topEdgeX),
+			y: fy(0),
+			moveTo: true
+		},
+		{
+			x: fx(1),
+			y: fy(0)
+		},
+		{
+			x: fx(1),
+			y: fy(1)
+		},
+		{
+			x: fx(s.botEdgeX),
+			y: fy(1)
+		},
+		{
+			x: fx(s.tipBotX),
+			y: fy(s.tipBotY)
+		},
+		{
+			x: fx(0),
+			y: fy(s.apexY),
+			curve: {
+				type: "cubic",
+				x1: fx(s.c1b.x),
+				y1: fy(s.c1b.y),
+				x2: fx(s.c2b.x),
+				y2: fy(s.c2b.y)
+			}
+		},
+		{
+			x: fx(s.tipTopX),
+			y: fy(s.tipTopY),
+			curve: {
+				type: "cubic",
+				x1: fx(s.c1t.x),
+				y1: fy(s.c1t.y),
+				x2: fx(s.c2t.x),
+				y2: fy(s.c2t.y)
+			}
+		},
+		{ close: true }
+	];
+}
+/**
+* Resolve a {@link ClipShape} to a freeform `points` path filling a `w × h` box, ready to hand
+* to `addImage({ points })`.
+*
+* `w`/`h` are the image box's size **in inches** and must match the `w`/`h` the picture is drawn
+* at — the path is emitted in the box's own coordinate space, not normalized (see the module
+* note above).
+* @param {ClipShape} shape - the named silhouette and its options
+* @param {number} w - image box width (inches)
+* @param {number} h - image box height (inches)
+* @returns {GeometryPoint[]} the freeform path, for `addImage({ points })`
+* @example
+* const w = 5.22, h = 7.5
+* slide.addImage({
+*   path: 'cover.jpg', x: 0, y: 0, w, h,
+*   points: clipPath({ kind: 'half-disc', flat: 'right' }, w, h),
+*   sizing: { type: 'cover' },   // center-crop the photo into the "D"
+* })
+*/
+function clipPath(shape, w, h) {
+	switch (shape.kind) {
+		case "half-disc": return halfDisc(w, h, shape.flat, shape.preset ?? "deep");
+	}
+}
+//#endregion
 //#region src/types/text.ts
 /** Factory for a single inline text run. Prevents `as never` casts when building mixed-style run arrays. */
 function textRun(text, options) {
@@ -11488,6 +11894,6 @@ function textRuns(runs) {
 	return runs;
 }
 //#endregion
-export { textRuns as n, PresentationCore as r, textRun as t };
+export { PresentationCore as i, textRuns as n, clipPath as r, textRun as t };
 
-//# sourceMappingURL=text-B1ZrPEeK.js.map
+//# sourceMappingURL=text-B6PbMFih.js.map