@office-open/core 0.10.2 → 0.10.3

package/dist/{src-DaZbVB3f.mjs → src-BPRAxccL.mjs}

@@ -1,7 +1,7 @@
-import "./patch-DocIv0Sn.mjs";
+import "./patch-DEPPafeB.mjs";
 import "./smartart-DCY-Vdv7.mjs";
 import "./chart-DwE8FCFk.mjs";
-import { d as parse$1, f as stringify$1 } from "./descriptor-BdWTH1vv.mjs";
+import { d as stringify$1, u as parse$1 } from "./descriptor-DAER86Rt.mjs";
 import "./theme-CiNzdl-9.mjs";
 import { attr, attrMeasure, attrNum, element, escapeXml, findChild, js2xml, stringify, textOf, xml2js } from "@office-open/xml";
 import { AsyncZipDeflate, Zip, ZipPassThrough, strFromU8, strFromU8 as strFromU8$1, strToU8, unzipSync, unzipSync as unzipSync$1, zip, zipSync } from "fflate";
@@ -40,6 +40,69 @@ var Relationships = class {
 		return p.join("");
 	}
 };
+/**
+* Serialize a Relationships part only when it carries at least one
+* relationship. Optional parts (fontTable, headers, footers, charts, drawings,
+* worksheets, …) emit no .rels part when empty — Office strips empty rels
+* shells when re-saving, so skipping them keeps generated packages free of
+* redundant empty parts and matches Office's normalized output.
+*
+* Always-on parts (the package `_rels/.rels` and the main
+* document/presentation/workbook parts) carry relationships by construction
+* and must NOT use this gate.
+*/
+function optionalRelsPart(rel, xmlDeclaration, path) {
+	return rel.relationshipCount > 0 ? {
+		data: xmlDeclaration + rel.serialize(),
+		path
+	} : void 0;
+}
+//#endregion
+//#region src/opc/media.ts
+/**
+* Shared media collection for docx/pptx/xlsx. Generic over the package's entry
+* type so each package keeps its own metadata while sharing the registration +
+* dedup logic.
+*/
+var Media = class {
+	map = /* @__PURE__ */ new Map();
+	counter = 0;
+	/**
+	* Register media, reusing the existing entry when the bytes already exist.
+	* Returns the canonical entry (shared across all identical references) —
+	* callers read `entry.fileName` for placeholders/relationship targets or use
+	* the whole entry (e.g. drawing XML). The `build` callback constructs the
+	* package-specific entry from the allocated file name.
+	*
+	* Pass `fileName` to pin the name (round-trip scenarios preserving a source
+	* file name); omit it to allocate the next sequential `imageN.ext`.
+	*/
+	addMedia(data, type, build, fileName) {
+		const existingKey = this.findByContent(data);
+		if (existingKey) return this.map.get(existingKey);
+		const resolvedName = fileName ?? `image${++this.counter}.${type}`;
+		const entry = build(resolvedName);
+		this.map.set(resolvedName, entry);
+		return entry;
+	}
+	/** Find the key of an existing entry with byte-identical content. */
+	findByContent(data) {
+		for (const [key, entry] of this.map) {
+			const existing = entry.data;
+			if (existing.length !== data.length) continue;
+			let match = true;
+			for (let i = 0; i < existing.length; i++) if (existing[i] !== data[i]) {
+				match = false;
+				break;
+			}
+			if (match) return key;
+		}
+	}
+	/** All registered media entries. */
+	get array() {
+		return [...this.map.values()];
+	}
+};
 //#endregion
 //#region src/opc/content-types.ts
 /**
@@ -2409,9 +2472,10 @@ const DOCX_PARTS = {
 		},
 		{
 			path: "word/theme/theme1.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.theme+xml",
 			presence: {
 				kind: "conditional",
-				flag: "rawParts theme"
+				flag: "freshCompile"
 			}
 		}
 	]
@@ -4207,7 +4271,7 @@ const extractBlipFillMedia = (fill, nameAllocator) => {
 /**
 * Builds a DrawingML fill XML string from a FillOptions config.
 */
-const buildFill = (options) => {
+const buildFill = (options, embedPlaceholder) => {
 	if (typeof options === "string") return createSolidFill({ value: options.replace("#", "") });
 	switch (options.type) {
 		case "solid": return createSolidFill(normalizeColor(options.color));
@@ -4227,11 +4291,12 @@ const buildFill = (options) => {
 			});
 		case "blip": {
 			const fileName = `${uniqueId()}.${options.imageType}`;
+			const embed = embedPlaceholder ?? `{${fileName}}`;
 			const blipChildren = [];
 			if (options.blipEffects) blipChildren.push(...createBlipEffects(options.blipEffects));
 			const children = [element("a:blip", {
 				cstate: "none",
-				"r:embed": `{${fileName}}`
+				"r:embed": embed
 			}, blipChildren.length > 0 ? blipChildren : void 0), createSourceRectangle(options.sourceRectangle)];
 			if (options.tile) children.push(createTileInfo(options.tile));
 			else children.push("<a:stretch><a:fillRect/></a:stretch>");
@@ -6769,14 +6834,17 @@ const scRgbColorDesc = {
 const SYSTEM_COLOR_VALUES = new Set(Object.values(SystemColor));
 const PRESET_COLOR_VALUES = new Set(Object.values(PresetColor));
 const SCHEME_COLOR_VALUES = new Set(Object.values(SchemeColor));
-function getColorDescriptor(color) {
-	if ("hue" in color && "saturation" in color && "luminance" in color) return hslColorDesc;
-	if ("r" in color && "g" in color && "b" in color) return scRgbColorDesc;
+/** Stringify an EG_ColorChoice (direct color element, no `a:solidFill` wrapper).
+* Used for gradient stops, fg/bg clr, and effect colors. Replaces the former
+* `getColorDescriptor` which returned a polymorphic `CustomDescriptor<any>`. */
+function stringifyColorChoice(color, ctx) {
+	if ("hue" in color) return stringify$1(hslColorDesc, color, ctx) ?? "";
+	if ("r" in color) return stringify$1(scRgbColorDesc, color, ctx) ?? "";
 	const colorValue = color.value;
-	if (SYSTEM_COLOR_VALUES.has(colorValue)) return systemColorDesc;
-	if (PRESET_COLOR_VALUES.has(colorValue)) return presetColorDesc;
-	if (SCHEME_COLOR_VALUES.has(colorValue)) return schemeColorDesc;
-	return rgbColorDesc;
+	if (SYSTEM_COLOR_VALUES.has(colorValue)) return stringify$1(systemColorDesc, color, ctx) ?? "";
+	if (PRESET_COLOR_VALUES.has(colorValue)) return stringify$1(presetColorDesc, color, ctx) ?? "";
+	if (SCHEME_COLOR_VALUES.has(colorValue)) return stringify$1(schemeColorDesc, color, ctx) ?? "";
+	return stringify$1(rgbColorDesc, color, ctx) ?? "";
 }
 /**
 * Parse an EG_ColorChoice from an element's direct children. Handles all six
@@ -6799,7 +6867,7 @@ function parseColorChoice(el, ctx) {
 const solidFillDesc = {
 	kind: "custom",
 	stringify(color, ctx) {
-		const inner = stringify$1(getColorDescriptor(color), color, ctx);
+		const inner = stringifyColorChoice(color, ctx);
 		if (!inner) return void 0;
 		return `<a:solidFill>${inner}</a:solidFill>`;
 	},
@@ -6808,1431 +6876,1465 @@ const solidFillDesc = {
 	}
 };
 //#endregion
-//#region src/drawingml/fill/fill-descriptors.ts
+//#region src/drawingml/blip/blip-descriptors.ts
 /**
-* Fill descriptors for DrawingML EG_FillProperties.
+* Blip descriptor for DrawingML pictures.
 *
 * @module
 */
-function stringifyRelativeRect(tag, rect) {
-	const parts = [];
-	if (rect.left) parts.push(`l="${escapeXml(rect.left)}"`);
-	if (rect.top) parts.push(`t="${escapeXml(rect.top)}"`);
-	if (rect.right) parts.push(`r="${escapeXml(rect.right)}"`);
-	if (rect.bottom) parts.push(`b="${escapeXml(rect.bottom)}"`);
-	return `<${tag}${parts.length ? " " + parts.join(" ") : ""}/>`;
-}
-function readRelativeRect(el) {
-	const result = {};
-	if (el.attributes?.["l"]) result.left = String(el.attributes["l"]);
-	if (el.attributes?.["t"]) result.top = String(el.attributes["t"]);
-	if (el.attributes?.["r"]) result.right = String(el.attributes["r"]);
-	if (el.attributes?.["b"]) result.bottom = String(el.attributes["b"]);
-	return result;
-}
-function stringifyShade(shade) {
-	if ("angle" in shade) {
-		const parts = [];
-		if (shade.angle !== void 0) parts.push(`ang="${shade.angle}"`);
-		if (shade.scaled !== void 0) parts.push(`scaled="${shade.scaled ? 1 : 0}"`);
-		return `<a:lin${parts.length ? " " + parts.join(" ") : ""}/>`;
-	}
-	const pathShade = shade;
-	const parts = [];
-	if (pathShade.path) parts.push(`path="${escapeXml(pathShade.path)}"`);
-	const attrStr = parts.length ? " " + parts.join(" ") : "";
-	if (pathShade.fillToRectangle) return `<a:path${attrStr}>${stringifyRelativeRect("a:fillToRect", pathShade.fillToRectangle)}</a:path>`;
-	return `<a:path${attrStr}/>`;
-}
-const gradientFillDesc = {
+const tileDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
-		const parts = [];
-		const stopsXml = opts.stops.map((stop) => {
-			const colorXml = stringify$1(getColorDescriptor(stop.color), stop.color, ctx);
-			if (!colorXml) return `<a:gs pos="${stop.position}"/>`;
-			return `<a:gs pos="${stop.position}">${colorXml}</a:gs>`;
-		}).join("");
-		parts.push(`<a:gsLst>${stopsXml}</a:gsLst>`);
-		if (opts.shade) parts.push(stringifyShade(opts.shade));
-		if (opts.tileRectangle) parts.push(stringifyRelativeRect("a:tileRect", opts.tileRectangle));
+	stringify(opts, _ctx) {
 		const attrParts = [];
-		if (opts.flip) attrParts.push(`flip="${escapeXml(opts.flip)}"`);
-		if (opts.rotateWithShape !== void 0) attrParts.push(`rotWithShape="${opts.rotateWithShape ? 1 : 0}"`);
-		return `<a:gradFill${attrParts.length ? " " + attrParts.join(" ") : ""}>${parts.join("")}</a:gradFill>`;
+		if (opts.tx !== void 0) attrParts.push(`tx="${opts.tx}"`);
+		if (opts.ty !== void 0) attrParts.push(`ty="${opts.ty}"`);
+		if (opts.sx !== void 0) attrParts.push(`sx="${opts.sx}"`);
+		if (opts.sy !== void 0) attrParts.push(`sy="${opts.sy}"`);
+		if (opts.flip !== void 0) attrParts.push(`flip="${escapeXml(opts.flip)}"`);
+		if (opts.align !== void 0) attrParts.push(`algn="${escapeXml(xsdRectAlignment.to(opts.align))}"`);
+		return `<a:tile${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
 	},
-	parse(el, ctx) {
+	parse(el, _ctx) {
 		const result = {};
-		const gsLst = findChild(el, "a:gsLst");
-		if (gsLst?.elements) result.stops = gsLst.elements.filter((c) => c.name === "a:gs").map((gs) => {
-			return {
-				position: Number(gs.attributes?.["pos"] ?? 0),
-				color: readDirectColor(gs, ctx)
-			};
-		});
-		const lin = findChild(el, "a:lin");
-		if (lin) {
-			const shade = {};
-			if (lin.attributes?.["ang"] !== void 0) shade.angle = Number(lin.attributes["ang"]);
-			if (lin.attributes?.["scaled"] !== void 0) shade.scaled = lin.attributes["scaled"] !== "0";
-			result.shade = shade;
-		} else {
-			const path = findChild(el, "a:path");
-			if (path) {
-				const shade = {};
-				if (path.attributes?.["path"] !== void 0) shade.path = String(path.attributes["path"]);
-				const fillToRectangle = findChild(path, "a:fillToRect");
-				if (fillToRectangle) shade.fillToRectangle = readRelativeRect(fillToRectangle);
-				result.shade = shade;
-			}
-		}
+		if (el.attributes?.["tx"] !== void 0) result.tx = Number(el.attributes["tx"]);
+		if (el.attributes?.["ty"] !== void 0) result.ty = Number(el.attributes["ty"]);
+		if (el.attributes?.["sx"] !== void 0) result.sx = Number(el.attributes["sx"]);
+		if (el.attributes?.["sy"] !== void 0) result.sy = Number(el.attributes["sy"]);
 		if (el.attributes?.["flip"] !== void 0) result.flip = String(el.attributes["flip"]);
-		if (el.attributes?.["rotWithShape"] !== void 0) result.rotateWithShape = el.attributes["rotWithShape"] !== "0";
-		const tileRectangle = findChild(el, "a:tileRect");
-		if (tileRectangle) result.tileRectangle = readRelativeRect(tileRectangle);
+		if (el.attributes?.["algn"] !== void 0) result.align = xsdRectAlignment.from(String(el.attributes["algn"]));
 		return result;
 	}
 };
-const patternFillDesc = {
+const sourceRectangleDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
-		const parts = [];
-		const prst = xsdPattern.to(opts.pattern);
-		if (opts.foregroundColor) {
-			const colorXml = stringify$1(getColorDescriptor(opts.foregroundColor), opts.foregroundColor, ctx);
-			if (colorXml) parts.push(`<a:fgClr>${colorXml}</a:fgClr>`);
-		}
-		if (opts.backgroundColor) {
-			const colorXml = stringify$1(getColorDescriptor(opts.backgroundColor), opts.backgroundColor, ctx);
-			if (colorXml) parts.push(`<a:bgClr>${colorXml}</a:bgClr>`);
-		}
-		const inner = parts.join("");
-		return `<a:pattFill prst="${escapeXml(prst)}">${inner}</a:pattFill>`;
+	stringify(opts, _ctx) {
+		const attrParts = [];
+		if (opts.left !== void 0) attrParts.push(`l="${opts.left}"`);
+		if (opts.top !== void 0) attrParts.push(`t="${opts.top}"`);
+		if (opts.right !== void 0) attrParts.push(`r="${opts.right}"`);
+		if (opts.bottom !== void 0) attrParts.push(`b="${opts.bottom}"`);
+		return `<a:srcRect${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
 	},
-	parse(el, ctx) {
+	parse(el, _ctx) {
 		const result = {};
-		const prst = el.attributes?.["prst"];
-		if (prst) result.pattern = xsdPattern.from(String(prst));
-		const fgClr = findChild(el, "a:fgClr");
-		if (fgClr) result.foregroundColor = readDirectColor(fgClr, ctx);
-		const bgClr = findChild(el, "a:bgClr");
-		if (bgClr) result.backgroundColor = readDirectColor(bgClr, ctx);
+		if (el.attributes?.["l"] !== void 0) result.left = Number(el.attributes["l"]);
+		if (el.attributes?.["t"] !== void 0) result.top = Number(el.attributes["t"]);
+		if (el.attributes?.["r"] !== void 0) result.right = Number(el.attributes["r"]);
+		if (el.attributes?.["b"] !== void 0) result.bottom = Number(el.attributes["b"]);
 		return result;
 	}
 };
-const fillDesc = {
+const stretchDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
-		if (typeof opts === "string") return stringify$1(solidFillDesc, { value: opts.replace("#", "") }, ctx);
-		switch (opts.type) {
-			case "none": return "<a:noFill/>";
-			case "solid": return stringify$1(solidFillDesc, typeof opts.color === "string" ? { value: opts.color.replace("#", "") } : opts.color, ctx);
-			case "gradient": {
-				if ("options" in opts) return stringify$1(gradientFillDesc, opts.options, ctx);
-				const gradOpts = { stops: opts.stops.map((stop) => ({
-					position: stop.position * 1e3,
-					color: typeof stop.color === "string" ? { value: stop.color.replace("#", "") } : stop.color
-				})) };
-				if (!opts.path && opts.angle !== void 0) gradOpts.shade = {
-					angle: opts.angle * 6e4,
-					scaled: opts.scaled ?? true
-				};
-				if (opts.path) gradOpts.shade = { path: opts.path };
-				return stringify$1(gradientFillDesc, gradOpts, ctx);
-			}
-			case "blip": return;
-			case "pattern": return stringify$1(patternFillDesc, {
-				pattern: opts.pattern,
-				...opts.foregroundColor && { foregroundColor: typeof opts.foregroundColor === "string" ? { value: opts.foregroundColor.replace("#", "") } : opts.foregroundColor },
-				...opts.backgroundColor && { backgroundColor: typeof opts.backgroundColor === "string" ? { value: opts.backgroundColor.replace("#", "") } : opts.backgroundColor }
-			}, ctx);
-			case "group": return "<a:grpFill/>";
-		}
+	stringify(opts, _ctx) {
+		const attrParts = [];
+		if (opts.left !== void 0) attrParts.push(`l="${opts.left}"`);
+		if (opts.top !== void 0) attrParts.push(`t="${opts.top}"`);
+		if (opts.right !== void 0) attrParts.push(`r="${opts.right}"`);
+		if (opts.bottom !== void 0) attrParts.push(`b="${opts.bottom}"`);
+		return `<a:stretch><a:fillRect${attrParts.length ? " " + attrParts.join(" ") : ""}/></a:stretch>`;
 	},
-	parse(el, ctx) {
-		const resolve = (tag) => el.name === tag ? el : findChild(el, tag);
-		if (resolve("a:noFill")) return { type: "none" };
-		const solidFill = resolve("a:solidFill");
-		if (solidFill) return {
-			type: "solid",
-			color: parse$1(solidFillDesc, solidFill, ctx)
-		};
-		const gradFill = resolve("a:gradFill");
-		if (gradFill) return {
-			type: "gradient",
-			options: parse$1(gradientFillDesc, gradFill, ctx)
-		};
-		const pattFill = resolve("a:pattFill");
-		if (pattFill) return {
-			type: "pattern",
-			...parse$1(patternFillDesc, pattFill, ctx)
-		};
-		if (resolve("a:grpFill")) return { type: "group" };
-		return { type: "none" };
+	parse(el, _ctx) {
+		const fillRect = findChild(el, "a:fillRect");
+		if (!fillRect) return {};
+		const result = {};
+		if (fillRect.attributes?.["l"] !== void 0) result.left = Number(fillRect.attributes["l"]);
+		if (fillRect.attributes?.["t"] !== void 0) result.top = Number(fillRect.attributes["t"]);
+		if (fillRect.attributes?.["r"] !== void 0) result.right = Number(fillRect.attributes["r"]);
+		if (fillRect.attributes?.["b"] !== void 0) result.bottom = Number(fillRect.attributes["b"]);
+		return result;
 	}
 };
-function readDirectColor(el, ctx) {
-	const color = parseColorChoice(el, ctx);
-	if (Object.keys(color).length > 0) return color;
-	const solidFill = findChild(el, "a:solidFill");
-	if (solidFill) return parse$1(solidFillDesc, solidFill, ctx);
-	return { value: "" };
-}
-//#endregion
-//#region src/drawingml/outline/outline-descriptors.ts
-/**
-* Outline descriptor for DrawingML shapes.
-*
-* @module
-*/
-function stringifyLineEnd(tag, opts) {
+function stringifyBlipEffects(opts, ctx) {
 	const parts = [];
-	if (opts.type) parts.push(`type="${escapeXml(opts.type)}"`);
-	if (opts.width) parts.push(`w="${escapeXml(opts.width)}"`);
-	if (opts.length) parts.push(`len="${escapeXml(opts.length)}"`);
-	return `<${tag}${parts.length ? " " + parts.join(" ") : ""}/>`;
-}
-function readLineEnd(el) {
-	const result = {};
-	if (el.attributes?.["type"]) result.type = String(el.attributes["type"]);
-	if (el.attributes?.["w"]) result.width = String(el.attributes["w"]);
-	if (el.attributes?.["len"]) result.length = String(el.attributes["len"]);
-	return result;
-}
-function stringifyCustomDash(stops) {
-	return `<a:custDash>${stops.map((s) => `<a:ds d="${escapeXml(s.d)}" sp="${escapeXml(s.sp)}"/>`).join("")}</a:custDash>`;
-}
-const outlineDesc = {
-	kind: "custom",
-	stringify(opts, ctx) {
-		const parts = [];
+	if (opts.grayscale) parts.push("<a:grayscl/>");
+	if (opts.luminance) {
 		const attrParts = [];
-		if (opts.width !== void 0) attrParts.push(`w="${convertToEmu(opts.width)}"`);
-		if (opts.cap !== void 0) attrParts.push(`cap="${escapeXml(opts.cap)}"`);
-		if (opts.compoundLine !== void 0) attrParts.push(`cmpd="${escapeXml(opts.compoundLine)}"`);
-		if (opts.align !== void 0) attrParts.push(`algn="${escapeXml(opts.align)}"`);
+		if (opts.luminance.bright !== void 0) attrParts.push(`bright="${opts.luminance.bright}"`);
+		if (opts.luminance.contrast !== void 0) attrParts.push(`contrast="${opts.luminance.contrast}"`);
 		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		if (opts.type === "noFill") parts.push("<a:noFill/>");
-		else if (opts.type === "solidFill" && opts.color) {
-			const fillXml = stringify$1(solidFillDesc, opts.color, ctx);
-			if (fillXml) parts.push(fillXml);
-		} else if (opts.type === "gradFill" && opts.gradientFill) {
-			const gradXml = stringify$1(gradientFillDesc, opts.gradientFill, ctx);
-			if (gradXml) parts.push(gradXml);
-		}
-		if (opts.customDash) parts.push(stringifyCustomDash(opts.customDash));
-		else if (opts.dash) parts.push(`<a:prstDash val="${escapeXml(opts.dash)}"/>`);
-		if (opts.join) if (opts.join === "miter" && opts.miterLimit !== void 0) parts.push(`<a:miter lim="${opts.miterLimit}"/>`);
-		else parts.push(`<a:${opts.join}/>`);
-		if (opts.headEnd) parts.push(stringifyLineEnd("a:headEnd", opts.headEnd));
-		if (opts.tailEnd) parts.push(stringifyLineEnd("a:tailEnd", opts.tailEnd));
-		if (parts.length === 0 && !attrStr) return void 0;
-		if (parts.length === 0) return `<a:ln${attrStr}/>`;
-		return `<a:ln${attrStr}>${parts.join("")}</a:ln>`;
+		parts.push(`<a:lum${attrStr}/>`);
+	}
+	if (opts.hsl) {
+		const attrParts = [];
+		if (opts.hsl.hue !== void 0) attrParts.push(`hue="${opts.hsl.hue}"`);
+		if (opts.hsl.saturation !== void 0) attrParts.push(`sat="${opts.hsl.saturation}"`);
+		if (opts.hsl.luminance !== void 0) attrParts.push(`lum="${opts.hsl.luminance}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		parts.push(`<a:hsl${attrStr}/>`);
+	}
+	if (opts.tint) {
+		const attrParts = [];
+		if (opts.tint.hue !== void 0) attrParts.push(`hue="${opts.tint.hue}"`);
+		if (opts.tint.amount !== void 0) attrParts.push(`amt="${opts.tint.amount}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		parts.push(`<a:tint${attrStr}/>`);
+	}
+	if (opts.duotone) {
+		const c1 = stringify$1(solidFillDesc, opts.duotone.color1, ctx);
+		const c2 = stringify$1(solidFillDesc, opts.duotone.color2, ctx);
+		parts.push(`<a:duotone>${c1 ?? ""}${c2 ?? ""}</a:duotone>`);
+	}
+	if (opts.biLevel) parts.push(`<a:biLevel thresh="${opts.biLevel.threshold}"/>`);
+	if (opts.alphaCeiling) parts.push("<a:alphaCeiling/>");
+	if (opts.alphaFloor) parts.push("<a:alphaFloor/>");
+	if (opts.alphaInverse !== void 0) if (typeof opts.alphaInverse === "boolean") parts.push("<a:alphaInv/>");
+	else {
+		const colorXml = stringify$1(solidFillDesc, opts.alphaInverse, ctx);
+		parts.push(`<a:alphaInv>${colorXml ?? ""}</a:alphaInv>`);
+	}
+	if (opts.alphaModFix) {
+		const amt = opts.alphaModFix.amount ?? 100;
+		parts.push(`<a:alphaModFix amt="${amt}"/>`);
+	}
+	if (opts.alphaRepl) parts.push(`<a:alphaRepl a="${opts.alphaRepl.amount}"/>`);
+	if (opts.alphaBiLevel) parts.push(`<a:alphaBiLevel thresh="${opts.alphaBiLevel.threshold}"/>`);
+	if (opts.colorChange) {
+		const fromXml = stringify$1(solidFillDesc, opts.colorChange.from, ctx);
+		const toXml = stringify$1(solidFillDesc, opts.colorChange.to, ctx);
+		const attrParts = [];
+		if (opts.colorChange.useAlpha === false) attrParts.push("useA=\"0\"");
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		parts.push(`<a:clrChange${attrStr}><a:clrFrom>${fromXml ?? ""}</a:clrFrom><a:clrTo>${toXml ?? ""}</a:clrTo></a:clrChange>`);
+	}
+	if (opts.colorRepl) {
+		const colorXml = stringify$1(solidFillDesc, opts.colorRepl.color, ctx);
+		parts.push(`<a:clrRepl>${colorXml ?? ""}</a:clrRepl>`);
+	}
+	if (opts.blur) {
+		const attrParts = [];
+		if (opts.blur.radius !== void 0) attrParts.push(`rad="${opts.blur.radius}"`);
+		if (opts.blur.grow === false) attrParts.push("grow=\"0\"");
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		parts.push(`<a:blur${attrStr}/>`);
+	}
+	return parts.join("");
+}
+function readBlipEffects(el, ctx) {
+	const result = {};
+	if (findChild(el, "a:grayscl")) result.grayscale = true;
+	const lum = findChild(el, "a:lum");
+	if (lum) {
+		const opts = {};
+		if (lum.attributes?.["bright"] !== void 0) opts.bright = Number(String(lum.attributes["bright"]).replace("%", ""));
+		if (lum.attributes?.["contrast"] !== void 0) opts.contrast = Number(String(lum.attributes["contrast"]).replace("%", ""));
+		result.luminance = opts;
+	}
+	const hsl = findChild(el, "a:hsl");
+	if (hsl) {
+		const opts = {};
+		if (hsl.attributes?.["hue"] !== void 0) opts.hue = Number(hsl.attributes["hue"]);
+		if (hsl.attributes?.["sat"] !== void 0) opts.saturation = Number(String(hsl.attributes["sat"]).replace("%", ""));
+		if (hsl.attributes?.["lum"] !== void 0) opts.luminance = Number(String(hsl.attributes["lum"]).replace("%", ""));
+		result.hsl = opts;
+	}
+	const tint = findChild(el, "a:tint");
+	if (tint) {
+		const opts = {};
+		if (tint.attributes?.["hue"] !== void 0) opts.hue = Number(tint.attributes["hue"]);
+		if (tint.attributes?.["amt"] !== void 0) opts.amount = Number(String(tint.attributes["amt"]).replace("%", ""));
+		result.tint = opts;
+	}
+	const biLevel = findChild(el, "a:biLevel");
+	if (biLevel?.attributes?.["thresh"] !== void 0) result.biLevel = { threshold: Number(String(biLevel.attributes["thresh"]).replace("%", "")) };
+	if (findChild(el, "a:alphaCeiling")) result.alphaCeiling = true;
+	if (findChild(el, "a:alphaFloor")) result.alphaFloor = true;
+	const alphaInv = findChild(el, "a:alphaInv");
+	if (alphaInv) {
+		const solidFill = findChild(alphaInv, "a:solidFill");
+		if (solidFill) result.alphaInverse = parse$1(solidFillDesc, solidFill, ctx);
+		else result.alphaInverse = {};
+	}
+	const alphaModFix = findChild(el, "a:alphaModFix");
+	if (alphaModFix) {
+		const opts = {};
+		if (alphaModFix.attributes?.["amt"] !== void 0) opts.amount = Number(String(alphaModFix.attributes["amt"]).replace("%", ""));
+		result.alphaModFix = opts;
+	}
+	const alphaRepl = findChild(el, "a:alphaRepl");
+	if (alphaRepl?.attributes?.["a"] !== void 0) result.alphaRepl = { amount: Number(String(alphaRepl.attributes["a"]).replace("%", "")) };
+	const alphaBiLevel = findChild(el, "a:alphaBiLevel");
+	if (alphaBiLevel?.attributes?.["thresh"] !== void 0) result.alphaBiLevel = { threshold: Number(String(alphaBiLevel.attributes["thresh"]).replace("%", "")) };
+	const clrChange = findChild(el, "a:clrChange");
+	if (clrChange) {
+		const opts = {};
+		if (clrChange.attributes?.["useA"] !== void 0) opts.useAlpha = clrChange.attributes["useA"] !== "0";
+		const clrFrom = findChild(clrChange, "a:clrFrom");
+		if (clrFrom) {
+			const fromFill = findChild(clrFrom, "a:solidFill");
+			if (fromFill) opts.from = parse$1(solidFillDesc, fromFill, ctx);
+		}
+		const clrTo = findChild(clrChange, "a:clrTo");
+		if (clrTo) {
+			const toFill = findChild(clrTo, "a:solidFill");
+			if (toFill) opts.to = parse$1(solidFillDesc, toFill, ctx);
+		}
+		result.colorChange = opts;
+	}
+	const clrRepl = findChild(el, "a:clrRepl");
+	if (clrRepl) {
+		const solidFill = findChild(clrRepl, "a:solidFill");
+		if (solidFill) result.colorRepl = { color: parse$1(solidFillDesc, solidFill, ctx) };
+	}
+	const blur = findChild(el, "a:blur");
+	if (blur) {
+		const opts = {};
+		if (blur.attributes?.["rad"] !== void 0) opts.radius = Number(blur.attributes["rad"]);
+		if (blur.attributes?.["grow"] !== void 0) opts.grow = blur.attributes["grow"] !== "0";
+		result.blur = opts;
+	}
+	const duotone = findChild(el, "a:duotone");
+	if (duotone?.elements) {
+		const fills = [];
+		for (const child of duotone.elements) {
+			const sf = findChild(child, "a:solidFill");
+			if (sf) fills.push(parse$1(solidFillDesc, sf, ctx));
+		}
+		if (fills.length >= 2) result.duotone = {
+			color1: fills[0],
+			color2: fills[1]
+		};
+	}
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+const blipDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const attrParts = [];
+		const embedValue = `{${opts.referenceId}}`;
+		attrParts.push(`r:embed="${escapeXml(embedValue)}"`);
+		attrParts.push("cstate=\"none\"");
+		const attrStr = " " + attrParts.join(" ");
+		const parts = [];
+		if (opts.blipEffects) parts.push(stringifyBlipEffects(opts.blipEffects, ctx));
+		const content = parts.join("");
+		if (!content) return `<a:blip${attrStr}/>`;
+		return `<a:blip${attrStr}>${content}</a:blip>`;
 	},
-	parse(el, _ctx) {
+	parse(el, ctx) {
 		const result = {};
-		if (el.attributes) {
-			if (el.attributes["w"] !== void 0) result.width = Number(el.attributes["w"]);
-			if (el.attributes["cap"] !== void 0) result.cap = String(el.attributes["cap"]);
-			if (el.attributes["cmpd"] !== void 0) result.compoundLine = String(el.attributes["cmpd"]);
-			if (el.attributes["algn"] !== void 0) result.align = String(el.attributes["algn"]);
-		}
-		const solidFill = findChild(el, "a:solidFill");
-		if (solidFill) {
-			result.type = "solidFill";
-			result.color = parse$1(solidFillDesc, solidFill, _ctx);
+		const embed = el.attributes?.["r:embed"];
+		if (embed !== void 0) result.referenceId = String(embed).replace(/^\{(.+)\}$/, "$1");
+		const link = el.attributes?.["r:link"];
+		if (link !== void 0) result.referenceId = String(link).replace(/^\{(.+)\}$/, "$1");
+		const effects = readBlipEffects(el, ctx);
+		if (effects) result.blipEffects = effects;
+		return result;
+	}
+};
+const blipFillDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const attrParts = [];
+		if (opts.dpi !== void 0) attrParts.push(`dpi="${opts.dpi}"`);
+		if (opts.rotWithShape !== void 0) attrParts.push(`rotWithShape="${opts.rotWithShape ? 1 : 0}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		const parts = [];
+		if (opts.referenceId) {
+			const blipXml = stringify$1(blipDesc, {
+				referenceId: opts.referenceId,
+				blipEffects: opts.blipEffects
+			}, ctx);
+			if (blipXml) parts.push(blipXml);
 		}
-		if (findChild(el, "a:noFill")) result.type = "noFill";
-		if (findChild(el, "a:gradFill")) {
-			result.type = "gradFill";
-			result.gradientFill = parse$1(gradientFillDesc, findChild(el, "a:gradFill"), _ctx);
+		if (opts.sourceRectangle) {
+			const srcRectXml = stringify$1(sourceRectangleDesc, opts.sourceRectangle, ctx);
+			if (srcRectXml) parts.push(srcRectXml);
 		}
-		const prstDash = findChild(el, "a:prstDash");
-		if (prstDash?.attributes?.["val"]) result.dash = String(prstDash.attributes["val"]);
-		const custDash = findChild(el, "a:custDash");
-		if (custDash?.elements) result.customDash = custDash.elements.filter((c) => c.name === "a:ds").map((c) => ({
-			d: String(c.attributes?.["d"] ?? ""),
-			sp: String(c.attributes?.["sp"] ?? "")
-		}));
-		if (findChild(el, "a:round")) result.join = "round";
-		else if (findChild(el, "a:bevel")) result.join = "bevel";
-		else {
-			const miter = findChild(el, "a:miter");
-			if (miter) {
-				result.join = "miter";
-				if (miter.attributes?.["lim"]) result.miterLimit = Number(miter.attributes["lim"]);
-			}
+		if (opts.tile) {
+			const tileXml = stringify$1(tileDesc, opts.tile, ctx);
+			if (tileXml) parts.push(tileXml);
+		} else parts.push("<a:stretch><a:fillRect/></a:stretch>");
+		const content = parts.join("");
+		if (!attrStr && !content) return void 0;
+		if (!content) return `<pic:blipFill${attrStr}/>`;
+		return `<pic:blipFill${attrStr}>${content}</pic:blipFill>`;
+	},
+	parse(el, ctx) {
+		const result = {};
+		if (el.attributes?.["dpi"] !== void 0) result.dpi = Number(el.attributes["dpi"]);
+		if (el.attributes?.["rotWithShape"] !== void 0) result.rotWithShape = el.attributes["rotWithShape"] !== "0";
+		const blip = findChild(el, "a:blip");
+		if (blip) {
+			const blipResult = parse$1(blipDesc, blip, ctx);
+			if (blipResult.referenceId) result.referenceId = blipResult.referenceId;
+			if (blipResult.blipEffects) result.blipEffects = blipResult.blipEffects;
 		}
-		const headEnd = findChild(el, "a:headEnd");
-		if (headEnd) result.headEnd = readLineEnd(headEnd);
-		const tailEnd = findChild(el, "a:tailEnd");
-		if (tailEnd) result.tailEnd = readLineEnd(tailEnd);
+		const srcRect = findChild(el, "a:srcRect");
+		if (srcRect) result.sourceRectangle = parse$1(sourceRectangleDesc, srcRect, ctx);
+		const tile = findChild(el, "a:tile");
+		if (tile) result.tile = parse$1(tileDesc, tile, ctx);
 		return result;
 	}
 };
 //#endregion
-//#region src/drawingml/effects/effect-descriptors.ts
+//#region src/drawingml/fill/fill-descriptors.ts
 /**
-* Effect list descriptor for DrawingML shapes.
+* Fill descriptors for DrawingML EG_FillProperties.
 *
 * @module
 */
-function stringifyEffectColor(color, ctx) {
-	if (!color) return void 0;
-	return stringify$1(getColorDescriptor(color), color, ctx);
+function stringifyRelativeRect(tag, rect) {
+	const parts = [];
+	if (rect.left) parts.push(`l="${escapeXml(rect.left)}"`);
+	if (rect.top) parts.push(`t="${escapeXml(rect.top)}"`);
+	if (rect.right) parts.push(`r="${escapeXml(rect.right)}"`);
+	if (rect.bottom) parts.push(`b="${escapeXml(rect.bottom)}"`);
+	return `<${tag}${parts.length ? " " + parts.join(" ") : ""}/>`;
 }
-function stringifyColorEffect(tag, attrs, color, ctx) {
-	const attrParts = [];
-	for (const [key, val] of Object.entries(attrs)) if (val !== void 0) attrParts.push(`${key}="${escapeXml(String(val))}"`);
-	const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-	const colorXml = stringifyEffectColor(color, ctx);
-	if (!colorXml && !attrStr) return void 0;
-	if (!colorXml) return `<${tag}${attrStr}/>`;
-	return `<${tag}${attrStr}>${colorXml}</${tag}>`;
+function readRelativeRect(el) {
+	const result = {};
+	if (el.attributes?.["l"]) result.left = String(el.attributes["l"]);
+	if (el.attributes?.["t"]) result.top = String(el.attributes["t"]);
+	if (el.attributes?.["r"]) result.right = String(el.attributes["r"]);
+	if (el.attributes?.["b"]) result.bottom = String(el.attributes["b"]);
+	return result;
 }
-function readColorFromElement(el, ctx) {
-	const color = parseColorChoice(el, ctx);
-	if (!color || Object.keys(color).length === 0) return void 0;
-	return color;
+function stringifyShade(shade) {
+	if ("angle" in shade) {
+		const parts = [];
+		if (shade.angle !== void 0) parts.push(`ang="${shade.angle}"`);
+		if (shade.scaled !== void 0) parts.push(`scaled="${shade.scaled ? 1 : 0}"`);
+		return `<a:lin${parts.length ? " " + parts.join(" ") : ""}/>`;
+	}
+	const pathShade = shade;
+	const parts = [];
+	if (pathShade.path) parts.push(`path="${escapeXml(pathShade.path)}"`);
+	const attrStr = parts.length ? " " + parts.join(" ") : "";
+	if (pathShade.fillToRectangle) return `<a:path${attrStr}>${stringifyRelativeRect("a:fillToRect", pathShade.fillToRectangle)}</a:path>`;
+	return `<a:path${attrStr}/>`;
 }
-const effectListDesc = {
+const gradientFillDesc = {
 	kind: "custom",
 	stringify(opts, ctx) {
 		const parts = [];
-		if (opts.blur) {
-			const attrParts = [];
-			if (opts.blur.radius !== void 0) attrParts.push(`rad="${opts.blur.radius}"`);
-			if (opts.blur.grow === false) attrParts.push("grow=\"0\"");
-			const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-			parts.push(`<a:blur${attrStr}/>`);
-		}
-		if (opts.fillOverlay) parts.push(`<a:fillOverlay blend="${escapeXml(opts.fillOverlay.blend)}"/>`);
-		if (opts.glow) parts.push(stringifyColorEffect("a:glow", { rad: opts.glow.radius }, opts.glow.color, ctx) ?? "");
-		if (opts.innerShadow) parts.push(stringifyColorEffect("a:innerShdw", {
-			blurRad: opts.innerShadow.blurRadius,
-			dist: opts.innerShadow.distance,
-			dir: opts.innerShadow.direction
-		}, opts.innerShadow.color, ctx) ?? "");
-		if (opts.outerShadow) parts.push(stringifyColorEffect("a:outerShdw", {
-			blurRad: opts.outerShadow.blurRadius,
-			dist: opts.outerShadow.distance,
-			dir: opts.outerShadow.direction,
-			sx: opts.outerShadow.scaleX,
-			sy: opts.outerShadow.scaleY,
-			kx: opts.outerShadow.skewX,
-			ky: opts.outerShadow.skewY,
-			algn: opts.outerShadow.alignment,
-			rotWithShape: opts.outerShadow.rotWithShape === false ? 0 : void 0
-		}, opts.outerShadow.color, ctx) ?? "");
-		if (opts.presetShadow) parts.push(stringifyColorEffect("a:prstShdw", {
-			prst: opts.presetShadow.preset,
-			dist: opts.presetShadow.distance,
-			dir: opts.presetShadow.direction
-		}, opts.presetShadow.color, ctx) ?? "");
-		if (opts.reflection) {
-			const refOpts = opts.reflection === true ? {} : opts.reflection;
-			const attrParts = [];
-			if (refOpts.blurRadius !== void 0) attrParts.push(`blurRad="${refOpts.blurRadius}"`);
-			if (refOpts.startAlpha !== void 0) attrParts.push(`stA="${refOpts.startAlpha}"`);
-			if (refOpts.startPosition !== void 0) attrParts.push(`stPos="${refOpts.startPosition}"`);
-			if (refOpts.endAlpha !== void 0) attrParts.push(`endA="${refOpts.endAlpha}"`);
-			if (refOpts.endPosition !== void 0) attrParts.push(`endPos="${refOpts.endPosition}"`);
-			if (refOpts.distance !== void 0) attrParts.push(`dist="${refOpts.distance}"`);
-			if (refOpts.direction !== void 0) attrParts.push(`dir="${refOpts.direction}"`);
-			if (refOpts.fadeDirection !== void 0) attrParts.push(`fadeDir="${refOpts.fadeDirection}"`);
-			if (refOpts.scaleX !== void 0) attrParts.push(`sx="${refOpts.scaleX}"`);
-			if (refOpts.scaleY !== void 0) attrParts.push(`sy="${refOpts.scaleY}"`);
-			if (refOpts.skewX !== void 0) attrParts.push(`kx="${refOpts.skewX}"`);
-			if (refOpts.skewY !== void 0) attrParts.push(`ky="${refOpts.skewY}"`);
-			if (refOpts.alignment !== void 0) attrParts.push(`algn="${refOpts.alignment}"`);
-			if (refOpts.rotWithShape !== void 0) attrParts.push(`rotWithShape="${refOpts.rotWithShape ? 1 : 0}"`);
-			const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-			parts.push(`<a:reflection${attrStr}/>`);
-		}
-		if (opts.softEdge !== void 0) parts.push(`<a:softEdge rad="${opts.softEdge}"/>`);
-		const content = parts.filter(Boolean).join("");
-		if (!content) return void 0;
-		return `<a:effectLst>${content}</a:effectLst>`;
+		const stopsXml = opts.stops.map((stop) => {
+			const colorXml = stringifyColorChoice(stop.color, ctx);
+			if (!colorXml) return `<a:gs pos="${stop.position}"/>`;
+			return `<a:gs pos="${stop.position}">${colorXml}</a:gs>`;
+		}).join("");
+		parts.push(`<a:gsLst>${stopsXml}</a:gsLst>`);
+		if (opts.shade) parts.push(stringifyShade(opts.shade));
+		if (opts.tileRectangle) parts.push(stringifyRelativeRect("a:tileRect", opts.tileRectangle));
+		const attrParts = [];
+		if (opts.flip) attrParts.push(`flip="${escapeXml(opts.flip)}"`);
+		if (opts.rotateWithShape !== void 0) attrParts.push(`rotWithShape="${opts.rotateWithShape ? 1 : 0}"`);
+		return `<a:gradFill${attrParts.length ? " " + attrParts.join(" ") : ""}>${parts.join("")}</a:gradFill>`;
 	},
 	parse(el, ctx) {
 		const result = {};
-		const blur = findChild(el, "a:blur");
-		if (blur) {
-			const blurOpts = {};
-			if (blur.attributes?.["rad"] !== void 0) blurOpts.radius = Number(blur.attributes["rad"]);
-			if (blur.attributes?.["grow"] !== void 0) blurOpts.grow = blur.attributes["grow"] !== "0";
-			result.blur = blurOpts;
-		}
-		const glow = findChild(el, "a:glow");
-		if (glow) {
-			const glowOpts = {};
-			if (glow.attributes?.["rad"] !== void 0) glowOpts.radius = Number(glow.attributes["rad"]);
-			const color = readColorFromElement(glow, ctx);
-			if (color) glowOpts.color = color;
-			result.glow = glowOpts;
-		}
-		const innerShdw = findChild(el, "a:innerShdw");
-		if (innerShdw) {
-			const innerOpts = {};
-			if (innerShdw.attributes?.["blurRad"] !== void 0) innerOpts.blurRadius = Number(innerShdw.attributes["blurRad"]);
-			if (innerShdw.attributes?.["dist"] !== void 0) innerOpts.distance = Number(innerShdw.attributes["dist"]);
-			if (innerShdw.attributes?.["dir"] !== void 0) innerOpts.direction = Number(innerShdw.attributes["dir"]);
-			const color = readColorFromElement(innerShdw, ctx);
-			if (color) innerOpts.color = color;
-			result.innerShadow = innerOpts;
-		}
-		const outerShdw = findChild(el, "a:outerShdw");
-		if (outerShdw) {
-			const outerOpts = {};
-			if (outerShdw.attributes?.["blurRad"] !== void 0) outerOpts.blurRadius = Number(outerShdw.attributes["blurRad"]);
-			if (outerShdw.attributes?.["dist"] !== void 0) outerOpts.distance = Number(outerShdw.attributes["dist"]);
-			if (outerShdw.attributes?.["dir"] !== void 0) outerOpts.direction = Number(outerShdw.attributes["dir"]);
-			if (outerShdw.attributes?.["sx"] !== void 0) outerOpts.scaleX = Number(outerShdw.attributes["sx"]);
-			if (outerShdw.attributes?.["sy"] !== void 0) outerOpts.scaleY = Number(outerShdw.attributes["sy"]);
-			if (outerShdw.attributes?.["kx"] !== void 0) outerOpts.skewX = Number(outerShdw.attributes["kx"]);
-			if (outerShdw.attributes?.["ky"] !== void 0) outerOpts.skewY = Number(outerShdw.attributes["ky"]);
-			if (outerShdw.attributes?.["algn"] !== void 0) outerOpts.alignment = String(outerShdw.attributes["algn"]);
-			if (outerShdw.attributes?.["rotWithShape"] !== void 0) outerOpts.rotWithShape = outerShdw.attributes["rotWithShape"] !== "0";
-			const color = readColorFromElement(outerShdw, ctx);
-			if (color) outerOpts.color = color;
-			result.outerShadow = outerOpts;
-		}
-		const fillOverlay = findChild(el, "a:fillOverlay");
-		if (fillOverlay) {
-			const overlayOpts = {};
-			if (fillOverlay.attributes?.["blend"] !== void 0) overlayOpts.blend = String(fillOverlay.attributes["blend"]);
-			result.fillOverlay = overlayOpts;
+		const gsLst = findChild(el, "a:gsLst");
+		if (gsLst?.elements) result.stops = gsLst.elements.filter((c) => c.name === "a:gs").map((gs) => {
+			return {
+				position: Number(gs.attributes?.["pos"] ?? 0),
+				color: readDirectColor(gs, ctx)
+			};
+		});
+		const lin = findChild(el, "a:lin");
+		if (lin) {
+			const shade = {};
+			if (lin.attributes?.["ang"] !== void 0) shade.angle = Number(lin.attributes["ang"]);
+			if (lin.attributes?.["scaled"] !== void 0) shade.scaled = lin.attributes["scaled"] !== "0";
+			result.shade = shade;
+		} else {
+			const path = findChild(el, "a:path");
+			if (path) {
+				const shade = {};
+				if (path.attributes?.["path"] !== void 0) shade.path = String(path.attributes["path"]);
+				const fillToRectangle = findChild(path, "a:fillToRect");
+				if (fillToRectangle) shade.fillToRectangle = readRelativeRect(fillToRectangle);
+				result.shade = shade;
+			}
 		}
-		const prstShdw = findChild(el, "a:prstShdw");
-		if (prstShdw) {
-			const prstOpts = {};
-			if (prstShdw.attributes?.["prst"] !== void 0) prstOpts.preset = String(prstShdw.attributes["prst"]);
-			if (prstShdw.attributes?.["dist"] !== void 0) prstOpts.distance = Number(prstShdw.attributes["dist"]);
-			if (prstShdw.attributes?.["dir"] !== void 0) prstOpts.direction = Number(prstShdw.attributes["dir"]);
-			const color = readColorFromElement(prstShdw, ctx);
-			if (color) prstOpts.color = color;
-			result.presetShadow = prstOpts;
+		if (el.attributes?.["flip"] !== void 0) result.flip = String(el.attributes["flip"]);
+		if (el.attributes?.["rotWithShape"] !== void 0) result.rotateWithShape = el.attributes["rotWithShape"] !== "0";
+		const tileRectangle = findChild(el, "a:tileRect");
+		if (tileRectangle) result.tileRectangle = readRelativeRect(tileRectangle);
+		return result;
+	}
+};
+const patternFillDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const parts = [];
+		const prst = xsdPattern.to(opts.pattern);
+		if (opts.foregroundColor) {
+			const colorXml = stringifyColorChoice(opts.foregroundColor, ctx);
+			if (colorXml) parts.push(`<a:fgClr>${colorXml}</a:fgClr>`);
 		}
-		const reflection = findChild(el, "a:reflection");
-		if (reflection) {
-			const refOpts = {};
-			if (reflection.attributes?.["blurRad"] !== void 0) refOpts.blurRadius = Number(reflection.attributes["blurRad"]);
-			if (reflection.attributes?.["stA"] !== void 0) refOpts.startAlpha = Number(reflection.attributes["stA"]);
-			if (reflection.attributes?.["stPos"] !== void 0) refOpts.startPosition = Number(reflection.attributes["stPos"]);
-			if (reflection.attributes?.["endA"] !== void 0) refOpts.endAlpha = Number(reflection.attributes["endA"]);
-			if (reflection.attributes?.["endPos"] !== void 0) refOpts.endPosition = Number(reflection.attributes["endPos"]);
-			if (reflection.attributes?.["dist"] !== void 0) refOpts.distance = Number(reflection.attributes["dist"]);
-			if (reflection.attributes?.["dir"] !== void 0) refOpts.direction = Number(reflection.attributes["dir"]);
-			if (reflection.attributes?.["fadeDir"] !== void 0) refOpts.fadeDirection = Number(reflection.attributes["fadeDir"]);
-			if (reflection.attributes?.["sx"] !== void 0) refOpts.scaleX = Number(reflection.attributes["sx"]);
-			if (reflection.attributes?.["sy"] !== void 0) refOpts.scaleY = Number(reflection.attributes["sy"]);
-			if (reflection.attributes?.["kx"] !== void 0) refOpts.skewX = Number(reflection.attributes["kx"]);
-			if (reflection.attributes?.["ky"] !== void 0) refOpts.skewY = Number(reflection.attributes["ky"]);
-			if (reflection.attributes?.["algn"] !== void 0) refOpts.alignment = String(reflection.attributes["algn"]);
-			if (reflection.attributes?.["rotWithShape"] !== void 0) refOpts.rotWithShape = reflection.attributes["rotWithShape"] !== "0";
-			result.reflection = refOpts;
+		if (opts.backgroundColor) {
+			const colorXml = stringifyColorChoice(opts.backgroundColor, ctx);
+			if (colorXml) parts.push(`<a:bgClr>${colorXml}</a:bgClr>`);
 		}
-		const softEdge = findChild(el, "a:softEdge");
-		if (softEdge?.attributes?.["rad"] !== void 0) result.softEdge = Number(softEdge.attributes["rad"]);
+		const inner = parts.join("");
+		return `<a:pattFill prst="${escapeXml(prst)}">${inner}</a:pattFill>`;
+	},
+	parse(el, ctx) {
+		const result = {};
+		const prst = el.attributes?.["prst"];
+		if (prst) result.pattern = xsdPattern.from(String(prst));
+		const fgClr = findChild(el, "a:fgClr");
+		if (fgClr) result.foregroundColor = readDirectColor(fgClr, ctx);
+		const bgClr = findChild(el, "a:bgClr");
+		if (bgClr) result.backgroundColor = readDirectColor(bgClr, ctx);
 		return result;
 	}
 };
-//#endregion
-//#region src/drawingml/locking/locking-descriptors.ts
-const BASE_LOCKING_KEYS = [
-	"noGrp",
-	"noSelect",
-	"noRot",
-	"noChangeAspect",
-	"noMove",
-	"noResize",
-	"noEditPoints",
-	"noAdjustHandles",
-	"noChangeArrowheads",
-	"noChangeShapeType"
-];
-const SHAPE_EXTRA_KEYS = ["noTextEdit"];
-const PICTURE_EXTRA_KEYS = ["noCrop"];
-const GROUP_EXTRA_KEYS = ["noUngrp"];
-const FRAME_EXTRA_KEYS = ["noDrilldown"];
-function stringifyLockingAttrs(opts, keys) {
-	const parts = [];
-	for (const key of keys) if (opts[key] !== void 0) parts.push(`${key}="${opts[key] ? 1 : 0}"`);
-	return parts.length ? " " + parts.join(" ") : "";
-}
-function readLockingAttrs(el, keys) {
-	const result = {};
-	if (!el.attributes) return result;
-	for (const key of keys) {
-		const val = el.attributes[key];
-		if (val !== void 0) result[key] = val === "1" || val === 1 || val === "true";
+function imageTypeFromPath(path) {
+	switch (path.split(".").pop()?.toLowerCase() ?? "") {
+		case "png": return "png";
+		case "jpg":
+		case "jpeg": return "jpg";
+		case "gif": return "gif";
+		case "bmp": return "bmp";
+		case "tif":
+		case "tiff": return "tif";
+		case "ico": return "ico";
+		case "emf": return "emf";
+		case "wmf": return "wmf";
+		default: return "png";
 	}
-	return result;
 }
-const shapeLockingDesc = {
+const fillDesc = {
 	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...SHAPE_EXTRA_KEYS]);
-		if (!attrStr) return void 0;
-		return `<a:spLocks${attrStr}/>`;
-	},
-	parse(el, _ctx) {
-		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...SHAPE_EXTRA_KEYS]);
-	}
-};
-const pictureLockingDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...PICTURE_EXTRA_KEYS]);
-		if (!attrStr) return void 0;
-		return `<a:picLocks${attrStr}/>`;
-	},
-	parse(el, _ctx) {
-		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...PICTURE_EXTRA_KEYS]);
-	}
-};
-const groupLockingDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...GROUP_EXTRA_KEYS]);
-		if (!attrStr) return void 0;
-		return `<a:grpSpLocks${attrStr}/>`;
-	},
-	parse(el, _ctx) {
-		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...GROUP_EXTRA_KEYS]);
-	}
-};
-const graphicFrameLockingDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...FRAME_EXTRA_KEYS]);
-		if (!attrStr) return void 0;
-		return `<a:graphicFrameLocks${attrStr}/>`;
-	},
-	parse(el, _ctx) {
-		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...FRAME_EXTRA_KEYS]);
-	}
-};
-//#endregion
-//#region src/drawingml/geometry/geometry-descriptors.ts
-/**
-* Geometry descriptors for DrawingML shapes.
-*
-* @module
-*/
-const adjustmentValuesDesc = {
-	kind: "custom",
-	stringify(guides, _ctx) {
-		if (!guides || guides.length === 0) return "<a:avLst/>";
-		return `<a:avLst>${guides.map((g) => `<a:gd name="${escapeXml(g.name)}" fmla="${escapeXml(g.formula)}"/>`).join("")}</a:avLst>`;
-	},
-	parse(el, _ctx) {
-		const result = [];
-		if (el.elements) {
-			for (const child of el.elements) if (child.name === "a:gd" && child.attributes) {
-				const name = child.attributes["name"];
-				const fmla = child.attributes["fmla"];
-				if (name !== void 0 && fmla !== void 0) result.push({
-					name: String(name),
-					formula: String(fmla)
-				});
+	stringify(opts, ctx) {
+		if (typeof opts === "string") return stringify$1(solidFillDesc, { value: opts.replace("#", "") }, ctx);
+		switch (opts.type) {
+			case "none": return "<a:noFill/>";
+			case "solid": return stringify$1(solidFillDesc, typeof opts.color === "string" ? { value: opts.color.replace("#", "") } : opts.color, ctx);
+			case "gradient": {
+				if ("options" in opts) return stringify$1(gradientFillDesc, opts.options, ctx);
+				const gradOpts = { stops: opts.stops.map((stop) => ({
+					position: stop.position * 1e3,
+					color: typeof stop.color === "string" ? { value: stop.color.replace("#", "") } : stop.color
+				})) };
+				if (!opts.path && opts.angle !== void 0) gradOpts.shade = {
+					angle: opts.angle * 6e4,
+					scaled: opts.scaled ?? true
+				};
+				if (opts.path) gradOpts.shade = { path: opts.path };
+				return stringify$1(gradientFillDesc, gradOpts, ctx);
 			}
+			case "blip": return buildFill(opts, ctx.addMedia(toUint8Array(opts.data), opts.imageType));
+			case "pattern": return stringify$1(patternFillDesc, {
+				pattern: opts.pattern,
+				...opts.foregroundColor && { foregroundColor: typeof opts.foregroundColor === "string" ? { value: opts.foregroundColor.replace("#", "") } : opts.foregroundColor },
+				...opts.backgroundColor && { backgroundColor: typeof opts.backgroundColor === "string" ? { value: opts.backgroundColor.replace("#", "") } : opts.backgroundColor }
+			}, ctx);
+			case "group": return "<a:grpFill/>";
 		}
-		return result;
-	}
-};
-const presetGeometryDesc = {
-	kind: "custom",
-	stringify(opts, ctx) {
-		const prst = opts.preset ?? "rect";
-		let avXml = "";
-		if (opts.adjustmentValues) avXml = stringify$1(adjustmentValuesDesc, opts.adjustmentValues, ctx) ?? "<a:avLst/>";
-		else avXml = "<a:avLst/>";
-		return `<a:prstGeom prst="${escapeXml(prst)}">${avXml}</a:prstGeom>`;
 	},
 	parse(el, ctx) {
-		const result = {};
-		if (el.attributes?.["prst"] !== void 0) result.preset = String(el.attributes["prst"]);
-		const avLst = findChild(el, "a:avLst");
-		if (avLst) {
-			const guides = parse$1(adjustmentValuesDesc, avLst, ctx);
-			if (guides.length > 0) result.adjustmentValues = guides;
+		const resolve = (tag) => el.name === tag ? el : findChild(el, tag);
+		if (resolve("a:noFill")) return { type: "none" };
+		const solidFill = resolve("a:solidFill");
+		if (solidFill) return {
+			type: "solid",
+			color: parse$1(solidFillDesc, solidFill, ctx)
+		};
+		const gradFill = resolve("a:gradFill");
+		if (gradFill) return {
+			type: "gradient",
+			options: parse$1(gradientFillDesc, gradFill, ctx)
+		};
+		const pattFill = resolve("a:pattFill");
+		if (pattFill) return {
+			type: "pattern",
+			...parse$1(patternFillDesc, pattFill, ctx)
+		};
+		if (resolve("a:grpFill")) return { type: "group" };
+		const blipFill = resolve("a:blipFill");
+		if (blipFill) {
+			const blipOpts = parse$1(blipFillDesc, blipFill, ctx);
+			const mediaPath = blipOpts.referenceId ? ctx.resolveRelationship(blipOpts.referenceId) : void 0;
+			const data = mediaPath ? ctx.getRaw(mediaPath) : void 0;
+			if (mediaPath && data) {
+				const blip = {
+					type: "blip",
+					data,
+					imageType: imageTypeFromPath(mediaPath)
+				};
+				if (blipOpts.dpi !== void 0) blip.dpi = blipOpts.dpi;
+				if (blipOpts.rotWithShape !== void 0) blip.rotWithShape = blipOpts.rotWithShape;
+				if (blipOpts.blipEffects) blip.blipEffects = blipOpts.blipEffects;
+				if (blipOpts.sourceRectangle) blip.sourceRectangle = blipOpts.sourceRectangle;
+				if (blipOpts.tile) blip.tile = blipOpts.tile;
+				return blip;
+			}
 		}
-		return result;
+		return { type: "none" };
 	}
 };
-function stringifyAdjustPoint(pt) {
-	return `<a:pt x="${escapeXml(pt.x)}" y="${escapeXml(pt.y)}"/>`;
+function readDirectColor(el, ctx) {
+	const color = parseColorChoice(el, ctx);
+	if (Object.keys(color).length > 0) return color;
+	const solidFill = findChild(el, "a:solidFill");
+	if (solidFill) return parse$1(solidFillDesc, solidFill, ctx);
+	return { value: "" };
 }
-function stringifyPathCommand(cmd) {
-	switch (cmd.command) {
-		case "moveTo": return `<a:moveTo>${stringifyAdjustPoint(cmd.point)}</a:moveTo>`;
-		case "lineTo": return `<a:lnTo>${stringifyAdjustPoint(cmd.point)}</a:lnTo>`;
-		case "arcTo": return `<a:arcTo wR="${escapeXml(cmd.widthRadius)}" hR="${escapeXml(cmd.heightRadius)}" stAng="${escapeXml(cmd.startAngle)}" swAng="${escapeXml(cmd.sweepAngle)}"/>`;
-		case "quadBezTo": return `<a:quadBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:quadBezTo>`;
-		case "cubicBezTo": return `<a:cubicBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:cubicBezTo>`;
-		case "close": return "<a:close/>";
-	}
+//#endregion
+//#region src/drawingml/outline/outline-descriptors.ts
+/**
+* Outline descriptor for DrawingML shapes.
+*
+* @module
+*/
+function stringifyLineEnd(tag, opts) {
+	const parts = [];
+	if (opts.type) parts.push(`type="${escapeXml(opts.type)}"`);
+	if (opts.width) parts.push(`w="${escapeXml(opts.width)}"`);
+	if (opts.length) parts.push(`len="${escapeXml(opts.length)}"`);
+	return `<${tag}${parts.length ? " " + parts.join(" ") : ""}/>`;
 }
-function stringifyPath(path) {
-	const attrs = [];
-	if (path.w !== void 0) attrs.push(`w="${path.w}"`);
-	if (path.h !== void 0) attrs.push(`h="${path.h}"`);
-	if (path.fill !== void 0) attrs.push(`fill="${escapeXml(path.fill)}"`);
-	if (path.stroke !== void 0) attrs.push(`stroke="${path.stroke}"`);
-	if (path.extrusionOk !== void 0) attrs.push(`extrusionOk="${path.extrusionOk}"`);
-	const attrStr = attrs.length ? " " + attrs.join(" ") : "";
-	const cmds = path.commands.map(stringifyPathCommand).join("");
-	if (!cmds && !attrStr) return "<a:path/>";
-	return `<a:path${attrStr}>${cmds}</a:path>`;
+function readLineEnd(el) {
+	const result = {};
+	if (el.attributes?.["type"]) result.type = String(el.attributes["type"]);
+	if (el.attributes?.["w"]) result.width = String(el.attributes["w"]);
+	if (el.attributes?.["len"]) result.length = String(el.attributes["len"]);
+	return result;
 }
-function readAdjustPoint(el) {
-	if (!el.attributes) return void 0;
-	const x = el.attributes["x"];
-	const y = el.attributes["y"];
-	if (x === void 0 || y === void 0) return void 0;
-	return {
-		x: String(x),
-		y: String(y)
-	};
+function stringifyCustomDash(stops) {
+	return `<a:custDash>${stops.map((s) => `<a:ds d="${escapeXml(s.d)}" sp="${escapeXml(s.sp)}"/>`).join("")}</a:custDash>`;
 }
-function readPathCommand(tag, el) {
-	switch (tag) {
-		case "a:moveTo": {
-			const pt = el.elements?.find((c) => c.name === "a:pt");
-			if (!pt) return void 0;
-			const point = readAdjustPoint(pt);
-			if (!point) return void 0;
-			return {
-				command: "moveTo",
-				point
-			};
-		}
-		case "a:lnTo": {
-			const pt = el.elements?.find((c) => c.name === "a:pt");
-			if (!pt) return void 0;
-			const point = readAdjustPoint(pt);
-			if (!point) return void 0;
-			return {
-				command: "lineTo",
-				point
-			};
-		}
-		case "a:arcTo": {
-			const a = el.attributes;
-			if (!a) return void 0;
-			return {
-				command: "arcTo",
-				widthRadius: String(a["wR"] ?? ""),
-				heightRadius: String(a["hR"] ?? ""),
-				startAngle: String(a["stAng"] ?? ""),
-				sweepAngle: String(a["swAng"] ?? "")
-			};
+const outlineDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const parts = [];
+		const attrParts = [];
+		if (opts.width !== void 0) attrParts.push(`w="${convertToEmu(opts.width)}"`);
+		if (opts.cap !== void 0) attrParts.push(`cap="${escapeXml(opts.cap)}"`);
+		if (opts.compoundLine !== void 0) attrParts.push(`cmpd="${escapeXml(opts.compoundLine)}"`);
+		if (opts.align !== void 0) attrParts.push(`algn="${escapeXml(opts.align)}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		if (opts.type === "noFill") parts.push("<a:noFill/>");
+		else if (opts.type === "solidFill" && opts.color) {
+			const fillXml = stringify$1(solidFillDesc, opts.color, ctx);
+			if (fillXml) parts.push(fillXml);
+		} else if (opts.type === "gradFill" && opts.gradientFill) {
+			const gradXml = stringify$1(gradientFillDesc, opts.gradientFill, ctx);
+			if (gradXml) parts.push(gradXml);
 		}
-		case "a:quadBezTo": {
-			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
-			if (points.length < 2) return void 0;
-			return {
-				command: "quadBezTo",
-				points: [points[0], points[1]]
-			};
+		if (opts.customDash) parts.push(stringifyCustomDash(opts.customDash));
+		else if (opts.dash) parts.push(`<a:prstDash val="${escapeXml(opts.dash)}"/>`);
+		if (opts.join) if (opts.join === "miter" && opts.miterLimit !== void 0) parts.push(`<a:miter lim="${opts.miterLimit}"/>`);
+		else parts.push(`<a:${opts.join}/>`);
+		if (opts.headEnd) parts.push(stringifyLineEnd("a:headEnd", opts.headEnd));
+		if (opts.tailEnd) parts.push(stringifyLineEnd("a:tailEnd", opts.tailEnd));
+		if (parts.length === 0 && !attrStr) return void 0;
+		if (parts.length === 0) return `<a:ln${attrStr}/>`;
+		return `<a:ln${attrStr}>${parts.join("")}</a:ln>`;
+	},
+	parse(el, _ctx) {
+		const result = {};
+		if (el.attributes) {
+			if (el.attributes["w"] !== void 0) result.width = Number(el.attributes["w"]);
+			if (el.attributes["cap"] !== void 0) result.cap = String(el.attributes["cap"]);
+			if (el.attributes["cmpd"] !== void 0) result.compoundLine = String(el.attributes["cmpd"]);
+			if (el.attributes["algn"] !== void 0) result.align = String(el.attributes["algn"]);
 		}
-		case "a:cubicBezTo": {
-			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
-			if (points.length < 3) return void 0;
-			return {
-				command: "cubicBezTo",
-				points: [
-					points[0],
-					points[1],
-					points[2]
-				]
-			};
+		const solidFill = findChild(el, "a:solidFill");
+		if (solidFill) {
+			result.type = "solidFill";
+			result.color = parse$1(solidFillDesc, solidFill, _ctx);
 		}
-		case "a:close": return { command: "close" };
-		default: return;
-	}
-}
-function readPath(el) {
-	const result = {};
-	if (el.attributes) {
-		if (el.attributes["w"] !== void 0) result.w = Number(el.attributes["w"]);
-		if (el.attributes["h"] !== void 0) result.h = Number(el.attributes["h"]);
-		if (el.attributes["fill"] !== void 0) result.fill = String(el.attributes["fill"]);
-		if (el.attributes["stroke"] !== void 0) result.stroke = el.attributes["stroke"] !== "0" && el.attributes["stroke"] !== "false";
-		if (el.attributes["extrusionOk"] !== void 0) result.extrusionOk = el.attributes["extrusionOk"] !== "0" && el.attributes["extrusionOk"] !== "false";
-	}
-	const commands = [];
-	if (el.elements) {
-		for (const child of el.elements) if (child.name) {
-			const cmd = readPathCommand(child.name, child);
-			if (cmd) commands.push(cmd);
+		if (findChild(el, "a:noFill")) result.type = "noFill";
+		if (findChild(el, "a:gradFill")) {
+			result.type = "gradFill";
+			result.gradientFill = parse$1(gradientFillDesc, findChild(el, "a:gradFill"), _ctx);
 		}
-	}
-	if (commands.length > 0) result.commands = commands;
-	return result;
-}
-function stringifyGuideList(tag, guides) {
-	if (!guides || guides.length === 0) return `<${tag}/>`;
-	return `<${tag}>${guides.map((g) => `<a:gd name="${escapeXml(g.name)}" fmla="${escapeXml(g.formula)}"/>`).join("")}</${tag}>`;
-}
-function readGuideList(el) {
-	const result = [];
-	if (el.elements) {
-		for (const child of el.elements) if (child.name === "a:gd" && child.attributes) {
-			const name = child.attributes["name"];
-			const fmla = child.attributes["fmla"];
-			if (name !== void 0 && fmla !== void 0) result.push({
-				name: String(name),
-				formula: String(fmla)
-			});
+		const prstDash = findChild(el, "a:prstDash");
+		if (prstDash?.attributes?.["val"]) result.dash = String(prstDash.attributes["val"]);
+		const custDash = findChild(el, "a:custDash");
+		if (custDash?.elements) result.customDash = custDash.elements.filter((c) => c.name === "a:ds").map((c) => ({
+			d: String(c.attributes?.["d"] ?? ""),
+			sp: String(c.attributes?.["sp"] ?? "")
+		}));
+		if (findChild(el, "a:round")) result.join = "round";
+		else if (findChild(el, "a:bevel")) result.join = "bevel";
+		else {
+			const miter = findChild(el, "a:miter");
+			if (miter) {
+				result.join = "miter";
+				if (miter.attributes?.["lim"]) result.miterLimit = Number(miter.attributes["lim"]);
+			}
 		}
+		const headEnd = findChild(el, "a:headEnd");
+		if (headEnd) result.headEnd = readLineEnd(headEnd);
+		const tailEnd = findChild(el, "a:tailEnd");
+		if (tailEnd) result.tailEnd = readLineEnd(tailEnd);
+		return result;
 	}
-	return result;
-}
-function stringifyAdjustHandlePos(pos) {
-	return `<a:pos x="${escapeXml(pos.x)}" y="${escapeXml(pos.y)}"/>`;
-}
-function stringifyXYAdjustHandle(h) {
-	const attrs = [];
-	if (h.guideRefX !== void 0) attrs.push(`gdRefX="${escapeXml(h.guideRefX)}"`);
-	if (h.minX !== void 0) attrs.push(`minX="${escapeXml(h.minX)}"`);
-	if (h.maxX !== void 0) attrs.push(`maxX="${escapeXml(h.maxX)}"`);
-	if (h.guideRefY !== void 0) attrs.push(`gdRefY="${escapeXml(h.guideRefY)}"`);
-	if (h.minY !== void 0) attrs.push(`minY="${escapeXml(h.minY)}"`);
-	if (h.maxY !== void 0) attrs.push(`maxY="${escapeXml(h.maxY)}"`);
-	return `<a:ahXY${attrs.length ? " " + attrs.join(" ") : ""}>${stringifyAdjustHandlePos(h.position)}</a:ahXY>`;
-}
-function stringifyPolarAdjustHandle(h) {
-	const attrs = [];
-	if (h.guideRefRadius !== void 0) attrs.push(`gdRefR="${escapeXml(h.guideRefRadius)}"`);
-	if (h.minRadius !== void 0) attrs.push(`minR="${escapeXml(h.minRadius)}"`);
-	if (h.maxRadius !== void 0) attrs.push(`maxR="${escapeXml(h.maxRadius)}"`);
-	if (h.guideRefAngle !== void 0) attrs.push(`gdRefAng="${escapeXml(h.guideRefAngle)}"`);
-	if (h.minAngle !== void 0) attrs.push(`minAng="${escapeXml(h.minAngle)}"`);
-	if (h.maxAngle !== void 0) attrs.push(`maxAng="${escapeXml(h.maxAngle)}"`);
-	return `<a:ahPolar${attrs.length ? " " + attrs.join(" ") : ""}>${stringifyAdjustHandlePos(h.position)}</a:ahPolar>`;
-}
-function stringifyAdjustHandle(h) {
-	return h.type === "xy" ? stringifyXYAdjustHandle(h) : stringifyPolarAdjustHandle(h);
-}
-function readAdjustHandlePos(el) {
-	const pos = el.elements?.find((c) => c.name === "a:pos");
-	if (!pos?.attributes) return void 0;
-	const x = pos.attributes["x"];
-	const y = pos.attributes["y"];
-	if (x === void 0 || y === void 0) return void 0;
-	return {
-		x: String(x),
-		y: String(y)
-	};
-}
-function readXYAdjustHandle(el) {
-	const position = readAdjustHandlePos(el);
-	if (!position) return void 0;
-	const result = {
-		type: "xy",
-		position
-	};
-	if (el.attributes?.["gdRefX"] !== void 0) result.guideRefX = String(el.attributes["gdRefX"]);
-	if (el.attributes?.["minX"] !== void 0) result.minX = String(el.attributes["minX"]);
-	if (el.attributes?.["maxX"] !== void 0) result.maxX = String(el.attributes["maxX"]);
-	if (el.attributes?.["gdRefY"] !== void 0) result.guideRefY = String(el.attributes["gdRefY"]);
-	if (el.attributes?.["minY"] !== void 0) result.minY = String(el.attributes["minY"]);
-	if (el.attributes?.["maxY"] !== void 0) result.maxY = String(el.attributes["maxY"]);
-	return result;
-}
-function readPolarAdjustHandle(el) {
-	const position = readAdjustHandlePos(el);
-	if (!position) return void 0;
-	const result = {
-		type: "polar",
-		position
-	};
-	if (el.attributes?.["gdRefR"] !== void 0) result.guideRefRadius = String(el.attributes["gdRefR"]);
-	if (el.attributes?.["minR"] !== void 0) result.minRadius = String(el.attributes["minR"]);
-	if (el.attributes?.["maxR"] !== void 0) result.maxRadius = String(el.attributes["maxR"]);
-	if (el.attributes?.["gdRefAng"] !== void 0) result.guideRefAngle = String(el.attributes["gdRefAng"]);
-	if (el.attributes?.["minAng"] !== void 0) result.minAngle = String(el.attributes["minAng"]);
-	if (el.attributes?.["maxAng"] !== void 0) result.maxAngle = String(el.attributes["maxAng"]);
-	return result;
-}
-function stringifyConnectionSite(site) {
-	return `<a:cxn ang="${escapeXml(site.angle)}">${stringifyAdjustHandlePos(site.position)}</a:cxn>`;
-}
-function readConnectionSite(el) {
-	const ang = el.attributes?.["ang"];
-	if (ang === void 0) return void 0;
-	const position = readAdjustHandlePos(el);
-	if (!position) return void 0;
-	return {
-		angle: String(ang),
-		position
-	};
+};
+//#endregion
+//#region src/drawingml/effects/effect-descriptors.ts
+/**
+* Effect list descriptor for DrawingML shapes.
+*
+* @module
+*/
+function stringifyEffectColor(color, ctx) {
+	if (!color) return void 0;
+	return stringifyColorChoice(color, ctx);
 }
-function stringifyGeomRect(rect) {
-	return `<a:rect l="${escapeXml(rect.left)}" t="${escapeXml(rect.top)}" r="${escapeXml(rect.right)}" b="${escapeXml(rect.bottom)}"/>`;
+function stringifyColorEffect(tag, attrs, color, ctx) {
+	const attrParts = [];
+	for (const [key, val] of Object.entries(attrs)) if (val !== void 0) attrParts.push(`${key}="${escapeXml(String(val))}"`);
+	const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+	const colorXml = stringifyEffectColor(color, ctx);
+	if (!colorXml && !attrStr) return void 0;
+	if (!colorXml) return `<${tag}${attrStr}/>`;
+	return `<${tag}${attrStr}>${colorXml}</${tag}>`;
 }
-function readGeomRect(el) {
-	const a = el.attributes;
-	if (!a) return void 0;
-	const l = a["l"];
-	const t = a["t"];
-	const r = a["r"];
-	const b = a["b"];
-	if (l === void 0 || t === void 0 || r === void 0 || b === void 0) return void 0;
-	return {
-		left: String(l),
-		top: String(t),
-		right: String(r),
-		bottom: String(b)
-	};
+function readColorFromElement(el, ctx) {
+	const color = parseColorChoice(el, ctx);
+	if (!color || Object.keys(color).length === 0) return void 0;
+	return color;
 }
-const customGeometryDesc = {
+const effectListDesc = {
 	kind: "custom",
-	stringify(opts, _ctx) {
+	stringify(opts, ctx) {
 		const parts = [];
-		if (opts.adjustmentValues && opts.adjustmentValues.length > 0) parts.push(stringifyGuideList("a:avLst", opts.adjustmentValues));
-		else parts.push("<a:avLst/>");
-		if (opts.guides && opts.guides.length > 0) parts.push(stringifyGuideList("a:gdLst", opts.guides));
-		if (opts.adjustHandles && opts.adjustHandles.length > 0) {
-			const inner = opts.adjustHandles.map(stringifyAdjustHandle).join("");
-			parts.push(`<a:ahLst>${inner}</a:ahLst>`);
+		if (opts.blur) {
+			const attrParts = [];
+			if (opts.blur.radius !== void 0) attrParts.push(`rad="${opts.blur.radius}"`);
+			if (opts.blur.grow === false) attrParts.push("grow=\"0\"");
+			const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+			parts.push(`<a:blur${attrStr}/>`);
 		}
-		if (opts.connectionSites && opts.connectionSites.length > 0) {
-			const inner = opts.connectionSites.map(stringifyConnectionSite).join("");
-			parts.push(`<a:cxnLst>${inner}</a:cxnLst>`);
+		if (opts.fillOverlay) parts.push(`<a:fillOverlay blend="${escapeXml(opts.fillOverlay.blend)}"/>`);
+		if (opts.glow) parts.push(stringifyColorEffect("a:glow", { rad: opts.glow.radius }, opts.glow.color, ctx) ?? "");
+		if (opts.innerShadow) parts.push(stringifyColorEffect("a:innerShdw", {
+			blurRad: opts.innerShadow.blurRadius,
+			dist: opts.innerShadow.distance,
+			dir: opts.innerShadow.direction
+		}, opts.innerShadow.color, ctx) ?? "");
+		if (opts.outerShadow) parts.push(stringifyColorEffect("a:outerShdw", {
+			blurRad: opts.outerShadow.blurRadius,
+			dist: opts.outerShadow.distance,
+			dir: opts.outerShadow.direction,
+			sx: opts.outerShadow.scaleX,
+			sy: opts.outerShadow.scaleY,
+			kx: opts.outerShadow.skewX,
+			ky: opts.outerShadow.skewY,
+			algn: opts.outerShadow.alignment,
+			rotWithShape: opts.outerShadow.rotWithShape === false ? 0 : void 0
+		}, opts.outerShadow.color, ctx) ?? "");
+		if (opts.presetShadow) parts.push(stringifyColorEffect("a:prstShdw", {
+			prst: opts.presetShadow.preset,
+			dist: opts.presetShadow.distance,
+			dir: opts.presetShadow.direction
+		}, opts.presetShadow.color, ctx) ?? "");
+		if (opts.reflection) {
+			const refOpts = opts.reflection === true ? {} : opts.reflection;
+			const attrParts = [];
+			if (refOpts.blurRadius !== void 0) attrParts.push(`blurRad="${refOpts.blurRadius}"`);
+			if (refOpts.startAlpha !== void 0) attrParts.push(`stA="${refOpts.startAlpha}"`);
+			if (refOpts.startPosition !== void 0) attrParts.push(`stPos="${refOpts.startPosition}"`);
+			if (refOpts.endAlpha !== void 0) attrParts.push(`endA="${refOpts.endAlpha}"`);
+			if (refOpts.endPosition !== void 0) attrParts.push(`endPos="${refOpts.endPosition}"`);
+			if (refOpts.distance !== void 0) attrParts.push(`dist="${refOpts.distance}"`);
+			if (refOpts.direction !== void 0) attrParts.push(`dir="${refOpts.direction}"`);
+			if (refOpts.fadeDirection !== void 0) attrParts.push(`fadeDir="${refOpts.fadeDirection}"`);
+			if (refOpts.scaleX !== void 0) attrParts.push(`sx="${refOpts.scaleX}"`);
+			if (refOpts.scaleY !== void 0) attrParts.push(`sy="${refOpts.scaleY}"`);
+			if (refOpts.skewX !== void 0) attrParts.push(`kx="${refOpts.skewX}"`);
+			if (refOpts.skewY !== void 0) attrParts.push(`ky="${refOpts.skewY}"`);
+			if (refOpts.alignment !== void 0) attrParts.push(`algn="${refOpts.alignment}"`);
+			if (refOpts.rotWithShape !== void 0) attrParts.push(`rotWithShape="${refOpts.rotWithShape ? 1 : 0}"`);
+			const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+			parts.push(`<a:reflection${attrStr}/>`);
 		}
-		if (opts.textRectangle) parts.push(stringifyGeomRect(opts.textRectangle));
-		const pathsXml = opts.pathList.map(stringifyPath).join("");
-		parts.push(`<a:pathLst>${pathsXml}</a:pathLst>`);
-		return `<a:custGeom>${parts.join("")}</a:custGeom>`;
+		if (opts.softEdge !== void 0) parts.push(`<a:softEdge rad="${opts.softEdge}"/>`);
+		const content = parts.filter(Boolean).join("");
+		if (!content) return void 0;
+		return `<a:effectLst>${content}</a:effectLst>`;
 	},
-	parse(el, _ctx) {
+	parse(el, ctx) {
 		const result = {};
-		const avLst = findChild(el, "a:avLst");
-		if (avLst) {
-			const guides = readGuideList(avLst);
-			if (guides.length > 0) result.adjustmentValues = guides;
+		const blur = findChild(el, "a:blur");
+		if (blur) {
+			const blurOpts = {};
+			if (blur.attributes?.["rad"] !== void 0) blurOpts.radius = Number(blur.attributes["rad"]);
+			if (blur.attributes?.["grow"] !== void 0) blurOpts.grow = blur.attributes["grow"] !== "0";
+			result.blur = blurOpts;
 		}
-		const gdLst = findChild(el, "a:gdLst");
-		if (gdLst) {
-			const guides = readGuideList(gdLst);
-			if (guides.length > 0) result.guides = guides;
+		const glow = findChild(el, "a:glow");
+		if (glow) {
+			const glowOpts = {};
+			if (glow.attributes?.["rad"] !== void 0) glowOpts.radius = Number(glow.attributes["rad"]);
+			const color = readColorFromElement(glow, ctx);
+			if (color) glowOpts.color = color;
+			result.glow = glowOpts;
 		}
-		const ahLst = findChild(el, "a:ahLst");
-		if (ahLst?.elements) {
-			const handles = [];
-			for (const child of ahLst.elements) if (child.name === "a:ahXY") {
-				const h = readXYAdjustHandle(child);
-				if (h) handles.push(h);
-			} else if (child.name === "a:ahPolar") {
-				const h = readPolarAdjustHandle(child);
-				if (h) handles.push(h);
-			}
-			if (handles.length > 0) result.adjustHandles = handles;
+		const innerShdw = findChild(el, "a:innerShdw");
+		if (innerShdw) {
+			const innerOpts = {};
+			if (innerShdw.attributes?.["blurRad"] !== void 0) innerOpts.blurRadius = Number(innerShdw.attributes["blurRad"]);
+			if (innerShdw.attributes?.["dist"] !== void 0) innerOpts.distance = Number(innerShdw.attributes["dist"]);
+			if (innerShdw.attributes?.["dir"] !== void 0) innerOpts.direction = Number(innerShdw.attributes["dir"]);
+			const color = readColorFromElement(innerShdw, ctx);
+			if (color) innerOpts.color = color;
+			result.innerShadow = innerOpts;
 		}
-		const cxnLst = findChild(el, "a:cxnLst");
-		if (cxnLst?.elements) {
-			const sites = [];
-			for (const child of cxnLst.elements) if (child.name === "a:cxn") {
-				const site = readConnectionSite(child);
-				if (site) sites.push(site);
-			}
-			if (sites.length > 0) result.connectionSites = sites;
+		const outerShdw = findChild(el, "a:outerShdw");
+		if (outerShdw) {
+			const outerOpts = {};
+			if (outerShdw.attributes?.["blurRad"] !== void 0) outerOpts.blurRadius = Number(outerShdw.attributes["blurRad"]);
+			if (outerShdw.attributes?.["dist"] !== void 0) outerOpts.distance = Number(outerShdw.attributes["dist"]);
+			if (outerShdw.attributes?.["dir"] !== void 0) outerOpts.direction = Number(outerShdw.attributes["dir"]);
+			if (outerShdw.attributes?.["sx"] !== void 0) outerOpts.scaleX = Number(outerShdw.attributes["sx"]);
+			if (outerShdw.attributes?.["sy"] !== void 0) outerOpts.scaleY = Number(outerShdw.attributes["sy"]);
+			if (outerShdw.attributes?.["kx"] !== void 0) outerOpts.skewX = Number(outerShdw.attributes["kx"]);
+			if (outerShdw.attributes?.["ky"] !== void 0) outerOpts.skewY = Number(outerShdw.attributes["ky"]);
+			if (outerShdw.attributes?.["algn"] !== void 0) outerOpts.alignment = String(outerShdw.attributes["algn"]);
+			if (outerShdw.attributes?.["rotWithShape"] !== void 0) outerOpts.rotWithShape = outerShdw.attributes["rotWithShape"] !== "0";
+			const color = readColorFromElement(outerShdw, ctx);
+			if (color) outerOpts.color = color;
+			result.outerShadow = outerOpts;
 		}
-		const rect = findChild(el, "a:rect");
-		if (rect) {
-			const textRectangle = readGeomRect(rect);
-			if (textRectangle) result.textRectangle = textRectangle;
+		const fillOverlay = findChild(el, "a:fillOverlay");
+		if (fillOverlay) {
+			const overlayOpts = {};
+			if (fillOverlay.attributes?.["blend"] !== void 0) overlayOpts.blend = String(fillOverlay.attributes["blend"]);
+			result.fillOverlay = overlayOpts;
 		}
-		const pathLst = findChild(el, "a:pathLst");
-		if (pathLst?.elements) {
-			const paths = [];
-			for (const child of pathLst.elements) if (child.name === "a:path") {
-				const p = readPath(child);
-				if (p.commands && p.commands.length > 0) paths.push(p);
-			}
-			if (paths.length > 0) result.pathList = paths;
+		const prstShdw = findChild(el, "a:prstShdw");
+		if (prstShdw) {
+			const prstOpts = {};
+			if (prstShdw.attributes?.["prst"] !== void 0) prstOpts.preset = String(prstShdw.attributes["prst"]);
+			if (prstShdw.attributes?.["dist"] !== void 0) prstOpts.distance = Number(prstShdw.attributes["dist"]);
+			if (prstShdw.attributes?.["dir"] !== void 0) prstOpts.direction = Number(prstShdw.attributes["dir"]);
+			const color = readColorFromElement(prstShdw, ctx);
+			if (color) prstOpts.color = color;
+			result.presetShadow = prstOpts;
+		}
+		const reflection = findChild(el, "a:reflection");
+		if (reflection) {
+			const refOpts = {};
+			if (reflection.attributes?.["blurRad"] !== void 0) refOpts.blurRadius = Number(reflection.attributes["blurRad"]);
+			if (reflection.attributes?.["stA"] !== void 0) refOpts.startAlpha = Number(reflection.attributes["stA"]);
+			if (reflection.attributes?.["stPos"] !== void 0) refOpts.startPosition = Number(reflection.attributes["stPos"]);
+			if (reflection.attributes?.["endA"] !== void 0) refOpts.endAlpha = Number(reflection.attributes["endA"]);
+			if (reflection.attributes?.["endPos"] !== void 0) refOpts.endPosition = Number(reflection.attributes["endPos"]);
+			if (reflection.attributes?.["dist"] !== void 0) refOpts.distance = Number(reflection.attributes["dist"]);
+			if (reflection.attributes?.["dir"] !== void 0) refOpts.direction = Number(reflection.attributes["dir"]);
+			if (reflection.attributes?.["fadeDir"] !== void 0) refOpts.fadeDirection = Number(reflection.attributes["fadeDir"]);
+			if (reflection.attributes?.["sx"] !== void 0) refOpts.scaleX = Number(reflection.attributes["sx"]);
+			if (reflection.attributes?.["sy"] !== void 0) refOpts.scaleY = Number(reflection.attributes["sy"]);
+			if (reflection.attributes?.["kx"] !== void 0) refOpts.skewX = Number(reflection.attributes["kx"]);
+			if (reflection.attributes?.["ky"] !== void 0) refOpts.skewY = Number(reflection.attributes["ky"]);
+			if (reflection.attributes?.["algn"] !== void 0) refOpts.alignment = String(reflection.attributes["algn"]);
+			if (reflection.attributes?.["rotWithShape"] !== void 0) refOpts.rotWithShape = reflection.attributes["rotWithShape"] !== "0";
+			result.reflection = refOpts;
 		}
+		const softEdge = findChild(el, "a:softEdge");
+		if (softEdge?.attributes?.["rad"] !== void 0) result.softEdge = Number(softEdge.attributes["rad"]);
 		return result;
 	}
 };
 //#endregion
-//#region src/drawingml/transform-descriptors.ts
-/**
-* Transform 2D descriptor for DrawingML shapes.
-*
-* @module
-*/
-const transform2DDesc = {
+//#region src/drawingml/locking/locking-descriptors.ts
+const BASE_LOCKING_KEYS = [
+	"noGrp",
+	"noSelect",
+	"noRot",
+	"noChangeAspect",
+	"noMove",
+	"noResize",
+	"noEditPoints",
+	"noAdjustHandles",
+	"noChangeArrowheads",
+	"noChangeShapeType"
+];
+const SHAPE_EXTRA_KEYS = ["noTextEdit"];
+const PICTURE_EXTRA_KEYS = ["noCrop"];
+const GROUP_EXTRA_KEYS = ["noUngrp"];
+const FRAME_EXTRA_KEYS = ["noDrilldown"];
+function stringifyLockingAttrs(opts, keys) {
+	const parts = [];
+	for (const key of keys) if (opts[key] !== void 0) parts.push(`${key}="${opts[key] ? 1 : 0}"`);
+	return parts.length ? " " + parts.join(" ") : "";
+}
+function readLockingAttrs(el, keys) {
+	const result = {};
+	if (!el.attributes) return result;
+	for (const key of keys) {
+		const val = el.attributes[key];
+		if (val !== void 0) result[key] = val === "1" || val === 1 || val === "true";
+	}
+	return result;
+}
+const shapeLockingDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
-		const parts = [];
-		const attrParts = [];
-		if (opts.flipHorizontal !== void 0) attrParts.push(`flipH="${opts.flipHorizontal ? 1 : 0}"`);
-		if (opts.flipVertical !== void 0) attrParts.push(`flipV="${opts.flipVertical ? 1 : 0}"`);
-		if (opts.rotation !== void 0) attrParts.push(`rot="${opts.rotation}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		if (opts.x !== void 0 || opts.y !== void 0) {
-			const x = opts.x !== void 0 ? convertToEmu(opts.x) : 0;
-			const y = opts.y !== void 0 ? convertToEmu(opts.y) : 0;
-			parts.push(`<a:off x="${x}" y="${y}"/>`);
-		}
-		if (opts.width !== void 0 || opts.height !== void 0) {
-			const cx = opts.width !== void 0 ? convertToEmu(opts.width) : 0;
-			const cy = opts.height !== void 0 ? convertToEmu(opts.height) : 0;
-			parts.push(`<a:ext cx="${cx}" cy="${cy}"/>`);
-		}
-		if (parts.length === 0 && !attrStr) return void 0;
-		if (parts.length === 0) return `<a:xfrm${attrStr}/>`;
-		return `<a:xfrm${attrStr}>${parts.join("")}</a:xfrm>`;
+		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...SHAPE_EXTRA_KEYS]);
+		if (!attrStr) return void 0;
+		return `<a:spLocks${attrStr}/>`;
+	},
+	parse(el, _ctx) {
+		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...SHAPE_EXTRA_KEYS]);
+	}
+};
+const pictureLockingDesc = {
+	kind: "custom",
+	stringify(opts, _ctx) {
+		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...PICTURE_EXTRA_KEYS]);
+		if (!attrStr) return void 0;
+		return `<a:picLocks${attrStr}/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		if (el.attributes) {
-			if (el.attributes["flipH"] !== void 0) result.flipHorizontal = el.attributes["flipH"] === 1 || el.attributes["flipH"] === "1";
-			if (el.attributes["flipV"] !== void 0) result.flipVertical = el.attributes["flipV"] === 1 || el.attributes["flipV"] === "1";
-			if (el.attributes["rot"] !== void 0) result.rotation = Number(el.attributes["rot"]);
-		}
-		const off = findChild(el, "a:off");
-		if (off?.attributes) {
-			result.x = attrMeasure(off, "x") ?? 0;
-			result.y = attrMeasure(off, "y") ?? 0;
-		}
-		const ext = findChild(el, "a:ext");
-		if (ext?.attributes) {
-			result.width = attrMeasure(ext, "cx") ?? 0;
-			result.height = attrMeasure(ext, "cy") ?? 0;
-		}
-		return result;
+		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...PICTURE_EXTRA_KEYS]);
 	}
 };
-const groupTransform2DDesc = {
+const groupLockingDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
-		const base = transform2DDesc.stringify(opts, ctx) ?? "<a:xfrm/>";
-		const chOff = `<a:chOff x="${opts.childOffsetX ?? 0}" y="${opts.childOffsetY ?? 0}"/>`;
-		const chExt = `<a:chExt cx="${opts.childExtentWidth ?? 0}" cy="${opts.childExtentHeight ?? 0}"/>`;
-		if (base.endsWith("/>")) return `<a:xfrm>${chOff}${chExt}</a:xfrm>`;
-		return base.replace(/<\/a:xfrm>$/, `${chOff}${chExt}</a:xfrm>`);
+	stringify(opts, _ctx) {
+		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...GROUP_EXTRA_KEYS]);
+		if (!attrStr) return void 0;
+		return `<a:grpSpLocks${attrStr}/>`;
 	},
-	parse(el, ctx) {
-		const result = transform2DDesc.parse(el, ctx);
-		const chOff = findChild(el, "a:chOff");
-		if (chOff?.attributes) {
-			result.childOffsetX = attrMeasure(chOff, "x") ?? 0;
-			result.childOffsetY = attrMeasure(chOff, "y") ?? 0;
-		}
-		const chExt = findChild(el, "a:chExt");
-		if (chExt?.attributes) {
-			result.childExtentWidth = attrMeasure(chExt, "cx") ?? 0;
-			result.childExtentHeight = attrMeasure(chExt, "cy") ?? 0;
-		}
-		return result;
+	parse(el, _ctx) {
+		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...GROUP_EXTRA_KEYS]);
+	}
+};
+const graphicFrameLockingDesc = {
+	kind: "custom",
+	stringify(opts, _ctx) {
+		const attrStr = stringifyLockingAttrs(opts, [...BASE_LOCKING_KEYS, ...FRAME_EXTRA_KEYS]);
+		if (!attrStr) return void 0;
+		return `<a:graphicFrameLocks${attrStr}/>`;
+	},
+	parse(el, _ctx) {
+		return readLockingAttrs(el, [...BASE_LOCKING_KEYS, ...FRAME_EXTRA_KEYS]);
 	}
 };
 //#endregion
-//#region src/drawingml/three-d/three-d-descriptors.ts
+//#region src/drawingml/geometry/geometry-descriptors.ts
 /**
-* 3D descriptor for DrawingML shapes.
+* Geometry descriptors for DrawingML shapes.
 *
 * @module
 */
-function stringifySphereCoords(coords) {
-	return `<a:rot lat="${coords.lat}" lon="${coords.lon}" rev="${coords.rev}"/>`;
-}
-function readSphereCoords(el) {
-	const lat = el.attributes?.["lat"];
-	const lon = el.attributes?.["lon"];
-	const rev = el.attributes?.["rev"];
-	if (lat === void 0 || lon === void 0 || rev === void 0) return void 0;
-	return {
-		lat: Number(lat),
-		lon: Number(lon),
-		rev: Number(rev)
-	};
-}
-const bevelDesc = {
+const adjustmentValuesDesc = {
 	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrParts = [];
-		if (opts.w !== void 0) attrParts.push(`w="${opts.w}"`);
-		if (opts.h !== void 0) attrParts.push(`h="${opts.h}"`);
-		if (opts.prst !== void 0) attrParts.push(`prst="${escapeXml(opts.prst)}"`);
-		return `<a:bevel${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
+	stringify(guides, _ctx) {
+		if (!guides || guides.length === 0) return "<a:avLst/>";
+		return `<a:avLst>${guides.map((g) => `<a:gd name="${escapeXml(g.name)}" fmla="${escapeXml(g.formula)}"/>`).join("")}</a:avLst>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		if (el.attributes?.["w"] !== void 0) result.w = Number(el.attributes["w"]);
-		if (el.attributes?.["h"] !== void 0) result.h = Number(el.attributes["h"]);
-		if (el.attributes?.["prst"] !== void 0) result.prst = String(el.attributes["prst"]);
+		const result = [];
+		if (el.elements) {
+			for (const child of el.elements) if (child.name === "a:gd" && child.attributes) {
+				const name = child.attributes["name"];
+				const fmla = child.attributes["fmla"];
+				if (name !== void 0 && fmla !== void 0) result.push({
+					name: String(name),
+					formula: String(fmla)
+				});
+			}
+		}
 		return result;
 	}
 };
-const shape3DDesc = {
+const presetGeometryDesc = {
 	kind: "custom",
 	stringify(opts, ctx) {
-		const parts = [];
-		if (opts.bevelT) {
-			const bevelXml = stringify$1(bevelDesc, opts.bevelT, ctx);
-			if (bevelXml) parts.push(bevelXml.replace("<a:bevel", "<a:bevelT"));
-		}
-		if (opts.bevelB) {
-			const bevelXml = stringify$1(bevelDesc, opts.bevelB, ctx);
-			if (bevelXml) parts.push(bevelXml.replace("<a:bevel", "<a:bevelB"));
-		}
-		if (opts.extrusionColor) {
-			const colorXml = stringify$1(solidFillDesc, opts.extrusionColor, ctx);
-			if (colorXml) parts.push(`<a:extrusionClr>${colorXml}</a:extrusionClr>`);
-		}
-		if (opts.contourColor) {
-			const colorXml = stringify$1(solidFillDesc, opts.contourColor, ctx);
-			if (colorXml) parts.push(`<a:contourClr>${colorXml}</a:contourClr>`);
-		}
-		const attrParts = [];
-		if (opts.z !== void 0) attrParts.push(`z="${opts.z}"`);
-		if (opts.extrusionH !== void 0) attrParts.push(`extrusionH="${opts.extrusionH}"`);
-		if (opts.contourW !== void 0) attrParts.push(`contourW="${opts.contourW}"`);
-		if (opts.prstMaterial !== void 0) attrParts.push(`prstMaterial="${escapeXml(xsdMaterialType.to(opts.prstMaterial))}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		const content = parts.join("");
-		if (!attrStr && !content) return void 0;
-		if (!content) return `<a:sp3d${attrStr}/>`;
-		return `<a:sp3d${attrStr}>${content}</a:sp3d>`;
+		const prst = opts.preset ?? "rect";
+		let avXml = "";
+		if (opts.adjustmentValues) avXml = stringify$1(adjustmentValuesDesc, opts.adjustmentValues, ctx) ?? "<a:avLst/>";
+		else avXml = "<a:avLst/>";
+		return `<a:prstGeom prst="${escapeXml(prst)}">${avXml}</a:prstGeom>`;
 	},
 	parse(el, ctx) {
 		const result = {};
-		if (el.attributes?.["z"] !== void 0) result.z = Number(el.attributes["z"]);
-		if (el.attributes?.["extrusionH"] !== void 0) result.extrusionH = Number(el.attributes["extrusionH"]);
-		if (el.attributes?.["contourW"] !== void 0) result.contourW = Number(el.attributes["contourW"]);
-		if (el.attributes?.["prstMaterial"] !== void 0) result.prstMaterial = xsdMaterialType.from(String(el.attributes["prstMaterial"]));
-		const bevelT = findChild(el, "a:bevelT");
-		if (bevelT) result.bevelT = parse$1(bevelDesc, bevelT, ctx);
-		const bevelB = findChild(el, "a:bevelB");
-		if (bevelB) result.bevelB = parse$1(bevelDesc, bevelB, ctx);
-		const extrusionClr = findChild(el, "a:extrusionClr");
-		if (extrusionClr) {
-			const solidFill = findChild(extrusionClr, "a:solidFill");
-			if (solidFill) result.extrusionColor = parse$1(solidFillDesc, solidFill, ctx);
-		}
-		const contourClr = findChild(el, "a:contourClr");
-		if (contourClr) {
-			const solidFill = findChild(contourClr, "a:solidFill");
-			if (solidFill) result.contourColor = parse$1(solidFillDesc, solidFill, ctx);
+		if (el.attributes?.["prst"] !== void 0) result.preset = String(el.attributes["prst"]);
+		const avLst = findChild(el, "a:avLst");
+		if (avLst) {
+			const guides = parse$1(adjustmentValuesDesc, avLst, ctx);
+			if (guides.length > 0) result.adjustmentValues = guides;
 		}
 		return result;
 	}
 };
-const cameraDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrParts = [];
-		attrParts.push(`prst="${escapeXml(opts.preset)}"`);
-		if (opts.fov !== void 0) attrParts.push(`fov="${opts.fov}"`);
-		if (opts.zoom !== void 0) attrParts.push(`zoom="${escapeXml(opts.zoom)}"`);
-		const attrStr = " " + attrParts.join(" ");
-		const parts = [];
-		if (opts.rotation) parts.push(stringifySphereCoords(opts.rotation));
-		const content = parts.join("");
-		if (!content) return `<a:camera${attrStr}/>`;
-		return `<a:camera${attrStr}>${content}</a:camera>`;
-	},
-	parse(el, _ctx) {
-		const result = {};
-		if (el.attributes?.["prst"] !== void 0) result.preset = String(el.attributes["prst"]);
-		if (el.attributes?.["fov"] !== void 0) result.fov = Number(el.attributes["fov"]);
-		if (el.attributes?.["zoom"] !== void 0) result.zoom = String(el.attributes["zoom"]);
-		const rot = findChild(el, "a:rot");
-		if (rot) result.rotation = readSphereCoords(rot);
-		return result;
+function stringifyAdjustPoint(pt) {
+	return `<a:pt x="${escapeXml(pt.x)}" y="${escapeXml(pt.y)}"/>`;
+}
+function stringifyPathCommand(cmd) {
+	switch (cmd.command) {
+		case "moveTo": return `<a:moveTo>${stringifyAdjustPoint(cmd.point)}</a:moveTo>`;
+		case "lineTo": return `<a:lnTo>${stringifyAdjustPoint(cmd.point)}</a:lnTo>`;
+		case "arcTo": return `<a:arcTo wR="${escapeXml(cmd.widthRadius)}" hR="${escapeXml(cmd.heightRadius)}" stAng="${escapeXml(cmd.startAngle)}" swAng="${escapeXml(cmd.sweepAngle)}"/>`;
+		case "quadBezTo": return `<a:quadBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:quadBezTo>`;
+		case "cubicBezTo": return `<a:cubicBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:cubicBezTo>`;
+		case "close": return "<a:close/>";
+	}
+}
+function stringifyPath(path) {
+	const attrs = [];
+	if (path.w !== void 0) attrs.push(`w="${path.w}"`);
+	if (path.h !== void 0) attrs.push(`h="${path.h}"`);
+	if (path.fill !== void 0) attrs.push(`fill="${escapeXml(path.fill)}"`);
+	if (path.stroke !== void 0) attrs.push(`stroke="${path.stroke}"`);
+	if (path.extrusionOk !== void 0) attrs.push(`extrusionOk="${path.extrusionOk}"`);
+	const attrStr = attrs.length ? " " + attrs.join(" ") : "";
+	const cmds = path.commands.map(stringifyPathCommand).join("");
+	if (!cmds && !attrStr) return "<a:path/>";
+	return `<a:path${attrStr}>${cmds}</a:path>`;
+}
+function readAdjustPoint(el) {
+	if (!el.attributes) return void 0;
+	const x = el.attributes["x"];
+	const y = el.attributes["y"];
+	if (x === void 0 || y === void 0) return void 0;
+	return {
+		x: String(x),
+		y: String(y)
+	};
+}
+function readPathCommand(tag, el) {
+	switch (tag) {
+		case "a:moveTo": {
+			const pt = el.elements?.find((c) => c.name === "a:pt");
+			if (!pt) return void 0;
+			const point = readAdjustPoint(pt);
+			if (!point) return void 0;
+			return {
+				command: "moveTo",
+				point
+			};
+		}
+		case "a:lnTo": {
+			const pt = el.elements?.find((c) => c.name === "a:pt");
+			if (!pt) return void 0;
+			const point = readAdjustPoint(pt);
+			if (!point) return void 0;
+			return {
+				command: "lineTo",
+				point
+			};
+		}
+		case "a:arcTo": {
+			const a = el.attributes;
+			if (!a) return void 0;
+			return {
+				command: "arcTo",
+				widthRadius: String(a["wR"] ?? ""),
+				heightRadius: String(a["hR"] ?? ""),
+				startAngle: String(a["stAng"] ?? ""),
+				sweepAngle: String(a["swAng"] ?? "")
+			};
+		}
+		case "a:quadBezTo": {
+			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
+			if (points.length < 2) return void 0;
+			return {
+				command: "quadBezTo",
+				points: [points[0], points[1]]
+			};
+		}
+		case "a:cubicBezTo": {
+			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
+			if (points.length < 3) return void 0;
+			return {
+				command: "cubicBezTo",
+				points: [
+					points[0],
+					points[1],
+					points[2]
+				]
+			};
+		}
+		case "a:close": return { command: "close" };
+		default: return;
 	}
-};
-const lightRigDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrParts = [];
-		attrParts.push(`rig="${escapeXml(opts.rig)}"`);
-		attrParts.push(`dir="${escapeXml(opts.direction)}"`);
-		const attrStr = " " + attrParts.join(" ");
-		const parts = [];
-		if (opts.rotation) parts.push(stringifySphereCoords(opts.rotation));
-		const content = parts.join("");
-		if (!content) return `<a:lightRig${attrStr}/>`;
-		return `<a:lightRig${attrStr}>${content}</a:lightRig>`;
-	},
-	parse(el, _ctx) {
-		const result = {};
-		if (el.attributes?.["rig"] !== void 0) result.rig = String(el.attributes["rig"]);
-		if (el.attributes?.["dir"] !== void 0) result.direction = String(el.attributes["dir"]);
-		const rot = findChild(el, "a:rot");
-		if (rot) result.rotation = readSphereCoords(rot);
-		return result;
+}
+function readPath(el) {
+	const result = {};
+	if (el.attributes) {
+		if (el.attributes["w"] !== void 0) result.w = Number(el.attributes["w"]);
+		if (el.attributes["h"] !== void 0) result.h = Number(el.attributes["h"]);
+		if (el.attributes["fill"] !== void 0) result.fill = String(el.attributes["fill"]);
+		if (el.attributes["stroke"] !== void 0) result.stroke = el.attributes["stroke"] !== "0" && el.attributes["stroke"] !== "false";
+		if (el.attributes["extrusionOk"] !== void 0) result.extrusionOk = el.attributes["extrusionOk"] !== "0" && el.attributes["extrusionOk"] !== "false";
 	}
-};
-const scene3DDesc = {
-	kind: "custom",
-	stringify(opts, ctx) {
-		const parts = [];
-		const cameraXml = stringify$1(cameraDesc, opts.camera, ctx);
-		if (cameraXml) parts.push(cameraXml);
-		const lightRigXml = stringify$1(lightRigDesc, opts.lightRig, ctx);
-		if (lightRigXml) parts.push(lightRigXml);
-		if (opts.backdrop) parts.push(stringifyBackdrop(opts.backdrop));
-		const content = parts.join("");
-		if (!content) return void 0;
-		return `<a:scene3d>${content}</a:scene3d>`;
-	},
-	parse(el, ctx) {
-		const result = {};
-		const camera = findChild(el, "a:camera");
-		if (camera) result.camera = parse$1(cameraDesc, camera, ctx);
-		const lightRig = findChild(el, "a:lightRig");
-		if (lightRig) result.lightRig = parse$1(lightRigDesc, lightRig, ctx);
-		const backdrop = findChild(el, "a:backdrop");
-		if (backdrop) result.backdrop = readBackdrop(backdrop);
-		return result;
+	const commands = [];
+	if (el.elements) {
+		for (const child of el.elements) if (child.name) {
+			const cmd = readPathCommand(child.name, child);
+			if (cmd) commands.push(cmd);
+		}
 	}
-};
-function stringifyPoint3D(name, point) {
-	return `<${name} x="${point.x}" y="${point.y}" z="${point.z}"/>`;
+	if (commands.length > 0) result.commands = commands;
+	return result;
 }
-function stringifyVector3D(name, vector) {
-	return `<${name} dx="${vector.dx}" dy="${vector.dy}" dz="${vector.dz}"/>`;
+function stringifyGuideList(tag, guides) {
+	if (!guides || guides.length === 0) return `<${tag}/>`;
+	return `<${tag}>${guides.map((g) => `<a:gd name="${escapeXml(g.name)}" fmla="${escapeXml(g.formula)}"/>`).join("")}</${tag}>`;
 }
-function stringifyBackdrop(opts) {
-	return `<a:backdrop>${stringifyPoint3D("a:anchor", opts.anchor) + stringifyVector3D("a:norm", opts.normal) + stringifyVector3D("a:up", opts.up)}</a:backdrop>`;
+function readGuideList(el) {
+	const result = [];
+	if (el.elements) {
+		for (const child of el.elements) if (child.name === "a:gd" && child.attributes) {
+			const name = child.attributes["name"];
+			const fmla = child.attributes["fmla"];
+			if (name !== void 0 && fmla !== void 0) result.push({
+				name: String(name),
+				formula: String(fmla)
+			});
+		}
+	}
+	return result;
 }
-function readPoint3D(el) {
-	const x = el.attributes?.["x"];
-	const y = el.attributes?.["y"];
-	const z = el.attributes?.["z"];
-	if (x === void 0 || y === void 0 || z === void 0) return void 0;
+function stringifyAdjustHandlePos(pos) {
+	return `<a:pos x="${escapeXml(pos.x)}" y="${escapeXml(pos.y)}"/>`;
+}
+function stringifyXYAdjustHandle(h) {
+	const attrs = [];
+	if (h.guideRefX !== void 0) attrs.push(`gdRefX="${escapeXml(h.guideRefX)}"`);
+	if (h.minX !== void 0) attrs.push(`minX="${escapeXml(h.minX)}"`);
+	if (h.maxX !== void 0) attrs.push(`maxX="${escapeXml(h.maxX)}"`);
+	if (h.guideRefY !== void 0) attrs.push(`gdRefY="${escapeXml(h.guideRefY)}"`);
+	if (h.minY !== void 0) attrs.push(`minY="${escapeXml(h.minY)}"`);
+	if (h.maxY !== void 0) attrs.push(`maxY="${escapeXml(h.maxY)}"`);
+	return `<a:ahXY${attrs.length ? " " + attrs.join(" ") : ""}>${stringifyAdjustHandlePos(h.position)}</a:ahXY>`;
+}
+function stringifyPolarAdjustHandle(h) {
+	const attrs = [];
+	if (h.guideRefRadius !== void 0) attrs.push(`gdRefR="${escapeXml(h.guideRefRadius)}"`);
+	if (h.minRadius !== void 0) attrs.push(`minR="${escapeXml(h.minRadius)}"`);
+	if (h.maxRadius !== void 0) attrs.push(`maxR="${escapeXml(h.maxRadius)}"`);
+	if (h.guideRefAngle !== void 0) attrs.push(`gdRefAng="${escapeXml(h.guideRefAngle)}"`);
+	if (h.minAngle !== void 0) attrs.push(`minAng="${escapeXml(h.minAngle)}"`);
+	if (h.maxAngle !== void 0) attrs.push(`maxAng="${escapeXml(h.maxAngle)}"`);
+	return `<a:ahPolar${attrs.length ? " " + attrs.join(" ") : ""}>${stringifyAdjustHandlePos(h.position)}</a:ahPolar>`;
+}
+function stringifyAdjustHandle(h) {
+	return h.type === "xy" ? stringifyXYAdjustHandle(h) : stringifyPolarAdjustHandle(h);
+}
+function readAdjustHandlePos(el) {
+	const pos = el.elements?.find((c) => c.name === "a:pos");
+	if (!pos?.attributes) return void 0;
+	const x = pos.attributes["x"];
+	const y = pos.attributes["y"];
+	if (x === void 0 || y === void 0) return void 0;
 	return {
-		x: Number(x),
-		y: Number(y),
-		z: Number(z)
+		x: String(x),
+		y: String(y)
 	};
 }
-function readVector3D(el) {
-	const dx = el.attributes?.["dx"];
-	const dy = el.attributes?.["dy"];
-	const dz = el.attributes?.["dz"];
-	if (dx === void 0 || dy === void 0 || dz === void 0) return void 0;
+function readXYAdjustHandle(el) {
+	const position = readAdjustHandlePos(el);
+	if (!position) return void 0;
+	const result = {
+		type: "xy",
+		position
+	};
+	if (el.attributes?.["gdRefX"] !== void 0) result.guideRefX = String(el.attributes["gdRefX"]);
+	if (el.attributes?.["minX"] !== void 0) result.minX = String(el.attributes["minX"]);
+	if (el.attributes?.["maxX"] !== void 0) result.maxX = String(el.attributes["maxX"]);
+	if (el.attributes?.["gdRefY"] !== void 0) result.guideRefY = String(el.attributes["gdRefY"]);
+	if (el.attributes?.["minY"] !== void 0) result.minY = String(el.attributes["minY"]);
+	if (el.attributes?.["maxY"] !== void 0) result.maxY = String(el.attributes["maxY"]);
+	return result;
+}
+function readPolarAdjustHandle(el) {
+	const position = readAdjustHandlePos(el);
+	if (!position) return void 0;
+	const result = {
+		type: "polar",
+		position
+	};
+	if (el.attributes?.["gdRefR"] !== void 0) result.guideRefRadius = String(el.attributes["gdRefR"]);
+	if (el.attributes?.["minR"] !== void 0) result.minRadius = String(el.attributes["minR"]);
+	if (el.attributes?.["maxR"] !== void 0) result.maxRadius = String(el.attributes["maxR"]);
+	if (el.attributes?.["gdRefAng"] !== void 0) result.guideRefAngle = String(el.attributes["gdRefAng"]);
+	if (el.attributes?.["minAng"] !== void 0) result.minAngle = String(el.attributes["minAng"]);
+	if (el.attributes?.["maxAng"] !== void 0) result.maxAngle = String(el.attributes["maxAng"]);
+	return result;
+}
+function stringifyConnectionSite(site) {
+	return `<a:cxn ang="${escapeXml(site.angle)}">${stringifyAdjustHandlePos(site.position)}</a:cxn>`;
+}
+function readConnectionSite(el) {
+	const ang = el.attributes?.["ang"];
+	if (ang === void 0) return void 0;
+	const position = readAdjustHandlePos(el);
+	if (!position) return void 0;
 	return {
-		dx: Number(dx),
-		dy: Number(dy),
-		dz: Number(dz)
+		angle: String(ang),
+		position
 	};
 }
-function readBackdrop(el) {
-	const anchor = findChild(el, "a:anchor");
-	const norm = findChild(el, "a:norm");
-	const up = findChild(el, "a:up");
-	if (!anchor || !norm || !up) return void 0;
-	const anchorPt = readPoint3D(anchor);
-	const normVec = readVector3D(norm);
-	const upVec = readVector3D(up);
-	if (!anchorPt || !normVec || !upVec) return void 0;
+function stringifyGeomRect(rect) {
+	return `<a:rect l="${escapeXml(rect.left)}" t="${escapeXml(rect.top)}" r="${escapeXml(rect.right)}" b="${escapeXml(rect.bottom)}"/>`;
+}
+function readGeomRect(el) {
+	const a = el.attributes;
+	if (!a) return void 0;
+	const l = a["l"];
+	const t = a["t"];
+	const r = a["r"];
+	const b = a["b"];
+	if (l === void 0 || t === void 0 || r === void 0 || b === void 0) return void 0;
 	return {
-		anchor: anchorPt,
-		normal: normVec,
-		up: upVec
+		left: String(l),
+		top: String(t),
+		right: String(r),
+		bottom: String(b)
 	};
 }
+const customGeometryDesc = {
+	kind: "custom",
+	stringify(opts, _ctx) {
+		const parts = [];
+		if (opts.adjustmentValues && opts.adjustmentValues.length > 0) parts.push(stringifyGuideList("a:avLst", opts.adjustmentValues));
+		else parts.push("<a:avLst/>");
+		if (opts.guides && opts.guides.length > 0) parts.push(stringifyGuideList("a:gdLst", opts.guides));
+		if (opts.adjustHandles && opts.adjustHandles.length > 0) {
+			const inner = opts.adjustHandles.map(stringifyAdjustHandle).join("");
+			parts.push(`<a:ahLst>${inner}</a:ahLst>`);
+		}
+		if (opts.connectionSites && opts.connectionSites.length > 0) {
+			const inner = opts.connectionSites.map(stringifyConnectionSite).join("");
+			parts.push(`<a:cxnLst>${inner}</a:cxnLst>`);
+		}
+		if (opts.textRectangle) parts.push(stringifyGeomRect(opts.textRectangle));
+		const pathsXml = opts.pathList.map(stringifyPath).join("");
+		parts.push(`<a:pathLst>${pathsXml}</a:pathLst>`);
+		return `<a:custGeom>${parts.join("")}</a:custGeom>`;
+	},
+	parse(el, _ctx) {
+		const result = {};
+		const avLst = findChild(el, "a:avLst");
+		if (avLst) {
+			const guides = readGuideList(avLst);
+			if (guides.length > 0) result.adjustmentValues = guides;
+		}
+		const gdLst = findChild(el, "a:gdLst");
+		if (gdLst) {
+			const guides = readGuideList(gdLst);
+			if (guides.length > 0) result.guides = guides;
+		}
+		const ahLst = findChild(el, "a:ahLst");
+		if (ahLst?.elements) {
+			const handles = [];
+			for (const child of ahLst.elements) if (child.name === "a:ahXY") {
+				const h = readXYAdjustHandle(child);
+				if (h) handles.push(h);
+			} else if (child.name === "a:ahPolar") {
+				const h = readPolarAdjustHandle(child);
+				if (h) handles.push(h);
+			}
+			if (handles.length > 0) result.adjustHandles = handles;
+		}
+		const cxnLst = findChild(el, "a:cxnLst");
+		if (cxnLst?.elements) {
+			const sites = [];
+			for (const child of cxnLst.elements) if (child.name === "a:cxn") {
+				const site = readConnectionSite(child);
+				if (site) sites.push(site);
+			}
+			if (sites.length > 0) result.connectionSites = sites;
+		}
+		const rect = findChild(el, "a:rect");
+		if (rect) {
+			const textRectangle = readGeomRect(rect);
+			if (textRectangle) result.textRectangle = textRectangle;
+		}
+		const pathLst = findChild(el, "a:pathLst");
+		if (pathLst?.elements) {
+			const paths = [];
+			for (const child of pathLst.elements) if (child.name === "a:path") {
+				const p = readPath(child);
+				if (p.commands && p.commands.length > 0) paths.push(p);
+			}
+			if (paths.length > 0) result.pathList = paths;
+		}
+		return result;
+	}
+};
 //#endregion
-//#region src/drawingml/blip/blip-descriptors.ts
+//#region src/drawingml/transform-descriptors.ts
 /**
-* Blip descriptor for DrawingML pictures.
+* Transform 2D descriptor for DrawingML shapes.
 *
 * @module
 */
-const tileDesc = {
-	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrParts = [];
-		if (opts.tx !== void 0) attrParts.push(`tx="${opts.tx}"`);
-		if (opts.ty !== void 0) attrParts.push(`ty="${opts.ty}"`);
-		if (opts.sx !== void 0) attrParts.push(`sx="${opts.sx}"`);
-		if (opts.sy !== void 0) attrParts.push(`sy="${opts.sy}"`);
-		if (opts.flip !== void 0) attrParts.push(`flip="${escapeXml(opts.flip)}"`);
-		if (opts.align !== void 0) attrParts.push(`algn="${escapeXml(xsdRectAlignment.to(opts.align))}"`);
-		return `<a:tile${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
-	},
-	parse(el, _ctx) {
-		const result = {};
-		if (el.attributes?.["tx"] !== void 0) result.tx = Number(el.attributes["tx"]);
-		if (el.attributes?.["ty"] !== void 0) result.ty = Number(el.attributes["ty"]);
-		if (el.attributes?.["sx"] !== void 0) result.sx = Number(el.attributes["sx"]);
-		if (el.attributes?.["sy"] !== void 0) result.sy = Number(el.attributes["sy"]);
-		if (el.attributes?.["flip"] !== void 0) result.flip = String(el.attributes["flip"]);
-		if (el.attributes?.["algn"] !== void 0) result.align = xsdRectAlignment.from(String(el.attributes["algn"]));
-		return result;
-	}
-};
-const sourceRectangleDesc = {
+const transform2DDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
+		const parts = [];
 		const attrParts = [];
-		if (opts.left !== void 0) attrParts.push(`l="${opts.left}"`);
-		if (opts.top !== void 0) attrParts.push(`t="${opts.top}"`);
-		if (opts.right !== void 0) attrParts.push(`r="${opts.right}"`);
-		if (opts.bottom !== void 0) attrParts.push(`b="${opts.bottom}"`);
-		return `<a:srcRect${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
+		if (opts.flipHorizontal !== void 0) attrParts.push(`flipH="${opts.flipHorizontal ? 1 : 0}"`);
+		if (opts.flipVertical !== void 0) attrParts.push(`flipV="${opts.flipVertical ? 1 : 0}"`);
+		if (opts.rotation !== void 0) attrParts.push(`rot="${opts.rotation}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		if (opts.x !== void 0 || opts.y !== void 0) {
+			const x = opts.x !== void 0 ? convertToEmu(opts.x) : 0;
+			const y = opts.y !== void 0 ? convertToEmu(opts.y) : 0;
+			parts.push(`<a:off x="${x}" y="${y}"/>`);
+		}
+		if (opts.width !== void 0 || opts.height !== void 0) {
+			const cx = opts.width !== void 0 ? convertToEmu(opts.width) : 0;
+			const cy = opts.height !== void 0 ? convertToEmu(opts.height) : 0;
+			parts.push(`<a:ext cx="${cx}" cy="${cy}"/>`);
+		}
+		if (parts.length === 0 && !attrStr) return void 0;
+		if (parts.length === 0) return `<a:xfrm${attrStr}/>`;
+		return `<a:xfrm${attrStr}>${parts.join("")}</a:xfrm>`;
 	},
 	parse(el, _ctx) {
 		const result = {};
-		if (el.attributes?.["l"] !== void 0) result.left = Number(el.attributes["l"]);
-		if (el.attributes?.["t"] !== void 0) result.top = Number(el.attributes["t"]);
-		if (el.attributes?.["r"] !== void 0) result.right = Number(el.attributes["r"]);
-		if (el.attributes?.["b"] !== void 0) result.bottom = Number(el.attributes["b"]);
+		if (el.attributes) {
+			if (el.attributes["flipH"] !== void 0) result.flipHorizontal = el.attributes["flipH"] === 1 || el.attributes["flipH"] === "1";
+			if (el.attributes["flipV"] !== void 0) result.flipVertical = el.attributes["flipV"] === 1 || el.attributes["flipV"] === "1";
+			if (el.attributes["rot"] !== void 0) result.rotation = Number(el.attributes["rot"]);
+		}
+		const off = findChild(el, "a:off");
+		if (off?.attributes) {
+			result.x = attrMeasure(off, "x") ?? 0;
+			result.y = attrMeasure(off, "y") ?? 0;
+		}
+		const ext = findChild(el, "a:ext");
+		if (ext?.attributes) {
+			result.width = attrMeasure(ext, "cx") ?? 0;
+			result.height = attrMeasure(ext, "cy") ?? 0;
+		}
 		return result;
 	}
 };
-const stretchDesc = {
+const groupTransform2DDesc = {
 	kind: "custom",
-	stringify(opts, _ctx) {
-		const attrParts = [];
-		if (opts.left !== void 0) attrParts.push(`l="${opts.left}"`);
-		if (opts.top !== void 0) attrParts.push(`t="${opts.top}"`);
-		if (opts.right !== void 0) attrParts.push(`r="${opts.right}"`);
-		if (opts.bottom !== void 0) attrParts.push(`b="${opts.bottom}"`);
-		return `<a:stretch><a:fillRect${attrParts.length ? " " + attrParts.join(" ") : ""}/></a:stretch>`;
+	stringify(opts, ctx) {
+		const base = transform2DDesc.stringify(opts, ctx) ?? "<a:xfrm/>";
+		const chOff = `<a:chOff x="${opts.childOffsetX ?? 0}" y="${opts.childOffsetY ?? 0}"/>`;
+		const chExt = `<a:chExt cx="${opts.childExtentWidth ?? 0}" cy="${opts.childExtentHeight ?? 0}"/>`;
+		if (base.endsWith("/>")) return `<a:xfrm>${chOff}${chExt}</a:xfrm>`;
+		return base.replace(/<\/a:xfrm>$/, `${chOff}${chExt}</a:xfrm>`);
 	},
-	parse(el, _ctx) {
-		const fillRect = findChild(el, "a:fillRect");
-		if (!fillRect) return {};
-		const result = {};
-		if (fillRect.attributes?.["l"] !== void 0) result.left = Number(fillRect.attributes["l"]);
-		if (fillRect.attributes?.["t"] !== void 0) result.top = Number(fillRect.attributes["t"]);
-		if (fillRect.attributes?.["r"] !== void 0) result.right = Number(fillRect.attributes["r"]);
-		if (fillRect.attributes?.["b"] !== void 0) result.bottom = Number(fillRect.attributes["b"]);
+	parse(el, ctx) {
+		const result = transform2DDesc.parse(el, ctx);
+		const chOff = findChild(el, "a:chOff");
+		if (chOff?.attributes) {
+			result.childOffsetX = attrMeasure(chOff, "x") ?? 0;
+			result.childOffsetY = attrMeasure(chOff, "y") ?? 0;
+		}
+		const chExt = findChild(el, "a:chExt");
+		if (chExt?.attributes) {
+			result.childExtentWidth = attrMeasure(chExt, "cx") ?? 0;
+			result.childExtentHeight = attrMeasure(chExt, "cy") ?? 0;
+		}
 		return result;
 	}
 };
-function stringifyBlipEffects(opts, ctx) {
-	const parts = [];
-	if (opts.grayscale) parts.push("<a:grayscl/>");
-	if (opts.luminance) {
-		const attrParts = [];
-		if (opts.luminance.bright !== void 0) attrParts.push(`bright="${opts.luminance.bright}"`);
-		if (opts.luminance.contrast !== void 0) attrParts.push(`contrast="${opts.luminance.contrast}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		parts.push(`<a:lum${attrStr}/>`);
-	}
-	if (opts.hsl) {
-		const attrParts = [];
-		if (opts.hsl.hue !== void 0) attrParts.push(`hue="${opts.hsl.hue}"`);
-		if (opts.hsl.saturation !== void 0) attrParts.push(`sat="${opts.hsl.saturation}"`);
-		if (opts.hsl.luminance !== void 0) attrParts.push(`lum="${opts.hsl.luminance}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		parts.push(`<a:hsl${attrStr}/>`);
-	}
-	if (opts.tint) {
-		const attrParts = [];
-		if (opts.tint.hue !== void 0) attrParts.push(`hue="${opts.tint.hue}"`);
-		if (opts.tint.amount !== void 0) attrParts.push(`amt="${opts.tint.amount}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		parts.push(`<a:tint${attrStr}/>`);
-	}
-	if (opts.duotone) {
-		const c1 = stringify$1(solidFillDesc, opts.duotone.color1, ctx);
-		const c2 = stringify$1(solidFillDesc, opts.duotone.color2, ctx);
-		parts.push(`<a:duotone>${c1 ?? ""}${c2 ?? ""}</a:duotone>`);
-	}
-	if (opts.biLevel) parts.push(`<a:biLevel thresh="${opts.biLevel.threshold}"/>`);
-	if (opts.alphaCeiling) parts.push("<a:alphaCeiling/>");
-	if (opts.alphaFloor) parts.push("<a:alphaFloor/>");
-	if (opts.alphaInverse !== void 0) if (typeof opts.alphaInverse === "boolean") parts.push("<a:alphaInv/>");
-	else {
-		const colorXml = stringify$1(solidFillDesc, opts.alphaInverse, ctx);
-		parts.push(`<a:alphaInv>${colorXml ?? ""}</a:alphaInv>`);
-	}
-	if (opts.alphaModFix) {
-		const amt = opts.alphaModFix.amount ?? 100;
-		parts.push(`<a:alphaModFix amt="${amt}"/>`);
-	}
-	if (opts.alphaRepl) parts.push(`<a:alphaRepl a="${opts.alphaRepl.amount}"/>`);
-	if (opts.alphaBiLevel) parts.push(`<a:alphaBiLevel thresh="${opts.alphaBiLevel.threshold}"/>`);
-	if (opts.colorChange) {
-		const fromXml = stringify$1(solidFillDesc, opts.colorChange.from, ctx);
-		const toXml = stringify$1(solidFillDesc, opts.colorChange.to, ctx);
-		const attrParts = [];
-		if (opts.colorChange.useAlpha === false) attrParts.push("useA=\"0\"");
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		parts.push(`<a:clrChange${attrStr}><a:clrFrom>${fromXml ?? ""}</a:clrFrom><a:clrTo>${toXml ?? ""}</a:clrTo></a:clrChange>`);
-	}
-	if (opts.colorRepl) {
-		const colorXml = stringify$1(solidFillDesc, opts.colorRepl.color, ctx);
-		parts.push(`<a:clrRepl>${colorXml ?? ""}</a:clrRepl>`);
-	}
-	if (opts.blur) {
-		const attrParts = [];
-		if (opts.blur.radius !== void 0) attrParts.push(`rad="${opts.blur.radius}"`);
-		if (opts.blur.grow === false) attrParts.push("grow=\"0\"");
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
-		parts.push(`<a:blur${attrStr}/>`);
-	}
-	return parts.join("");
+//#endregion
+//#region src/drawingml/three-d/three-d-descriptors.ts
+/**
+* 3D descriptor for DrawingML shapes.
+*
+* @module
+*/
+function stringifySphereCoords(coords) {
+	return `<a:rot lat="${coords.lat}" lon="${coords.lon}" rev="${coords.rev}"/>`;
 }
-function readBlipEffects(el, ctx) {
-	const result = {};
-	if (findChild(el, "a:grayscl")) result.grayscale = true;
-	const lum = findChild(el, "a:lum");
-	if (lum) {
-		const opts = {};
-		if (lum.attributes?.["bright"] !== void 0) opts.bright = Number(String(lum.attributes["bright"]).replace("%", ""));
-		if (lum.attributes?.["contrast"] !== void 0) opts.contrast = Number(String(lum.attributes["contrast"]).replace("%", ""));
-		result.luminance = opts;
-	}
-	const hsl = findChild(el, "a:hsl");
-	if (hsl) {
-		const opts = {};
-		if (hsl.attributes?.["hue"] !== void 0) opts.hue = Number(hsl.attributes["hue"]);
-		if (hsl.attributes?.["sat"] !== void 0) opts.saturation = Number(String(hsl.attributes["sat"]).replace("%", ""));
-		if (hsl.attributes?.["lum"] !== void 0) opts.luminance = Number(String(hsl.attributes["lum"]).replace("%", ""));
-		result.hsl = opts;
-	}
-	const tint = findChild(el, "a:tint");
-	if (tint) {
-		const opts = {};
-		if (tint.attributes?.["hue"] !== void 0) opts.hue = Number(tint.attributes["hue"]);
-		if (tint.attributes?.["amt"] !== void 0) opts.amount = Number(String(tint.attributes["amt"]).replace("%", ""));
-		result.tint = opts;
-	}
-	const biLevel = findChild(el, "a:biLevel");
-	if (biLevel?.attributes?.["thresh"] !== void 0) result.biLevel = { threshold: Number(String(biLevel.attributes["thresh"]).replace("%", "")) };
-	if (findChild(el, "a:alphaCeiling")) result.alphaCeiling = true;
-	if (findChild(el, "a:alphaFloor")) result.alphaFloor = true;
-	const alphaInv = findChild(el, "a:alphaInv");
-	if (alphaInv) {
-		const solidFill = findChild(alphaInv, "a:solidFill");
-		if (solidFill) result.alphaInverse = parse$1(solidFillDesc, solidFill, ctx);
-		else result.alphaInverse = {};
-	}
-	const alphaModFix = findChild(el, "a:alphaModFix");
-	if (alphaModFix) {
-		const opts = {};
-		if (alphaModFix.attributes?.["amt"] !== void 0) opts.amount = Number(String(alphaModFix.attributes["amt"]).replace("%", ""));
-		result.alphaModFix = opts;
+function readSphereCoords(el) {
+	const lat = el.attributes?.["lat"];
+	const lon = el.attributes?.["lon"];
+	const rev = el.attributes?.["rev"];
+	if (lat === void 0 || lon === void 0 || rev === void 0) return void 0;
+	return {
+		lat: Number(lat),
+		lon: Number(lon),
+		rev: Number(rev)
+	};
+}
+const bevelDesc = {
+	kind: "custom",
+	stringify(opts, _ctx) {
+		const attrParts = [];
+		if (opts.w !== void 0) attrParts.push(`w="${opts.w}"`);
+		if (opts.h !== void 0) attrParts.push(`h="${opts.h}"`);
+		if (opts.prst !== void 0) attrParts.push(`prst="${escapeXml(opts.prst)}"`);
+		return `<a:bevel${attrParts.length ? " " + attrParts.join(" ") : ""}/>`;
+	},
+	parse(el, _ctx) {
+		const result = {};
+		if (el.attributes?.["w"] !== void 0) result.w = Number(el.attributes["w"]);
+		if (el.attributes?.["h"] !== void 0) result.h = Number(el.attributes["h"]);
+		if (el.attributes?.["prst"] !== void 0) result.prst = String(el.attributes["prst"]);
+		return result;
 	}
-	const alphaRepl = findChild(el, "a:alphaRepl");
-	if (alphaRepl?.attributes?.["a"] !== void 0) result.alphaRepl = { amount: Number(String(alphaRepl.attributes["a"]).replace("%", "")) };
-	const alphaBiLevel = findChild(el, "a:alphaBiLevel");
-	if (alphaBiLevel?.attributes?.["thresh"] !== void 0) result.alphaBiLevel = { threshold: Number(String(alphaBiLevel.attributes["thresh"]).replace("%", "")) };
-	const clrChange = findChild(el, "a:clrChange");
-	if (clrChange) {
-		const opts = {};
-		if (clrChange.attributes?.["useA"] !== void 0) opts.useAlpha = clrChange.attributes["useA"] !== "0";
-		const clrFrom = findChild(clrChange, "a:clrFrom");
-		if (clrFrom) {
-			const fromFill = findChild(clrFrom, "a:solidFill");
-			if (fromFill) opts.from = parse$1(solidFillDesc, fromFill, ctx);
+};
+const shape3DDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const parts = [];
+		if (opts.bevelT) {
+			const bevelXml = stringify$1(bevelDesc, opts.bevelT, ctx);
+			if (bevelXml) parts.push(bevelXml.replace("<a:bevel", "<a:bevelT"));
 		}
-		const clrTo = findChild(clrChange, "a:clrTo");
-		if (clrTo) {
-			const toFill = findChild(clrTo, "a:solidFill");
-			if (toFill) opts.to = parse$1(solidFillDesc, toFill, ctx);
+		if (opts.bevelB) {
+			const bevelXml = stringify$1(bevelDesc, opts.bevelB, ctx);
+			if (bevelXml) parts.push(bevelXml.replace("<a:bevel", "<a:bevelB"));
 		}
-		result.colorChange = opts;
-	}
-	const clrRepl = findChild(el, "a:clrRepl");
-	if (clrRepl) {
-		const solidFill = findChild(clrRepl, "a:solidFill");
-		if (solidFill) result.colorRepl = { color: parse$1(solidFillDesc, solidFill, ctx) };
-	}
-	const blur = findChild(el, "a:blur");
-	if (blur) {
-		const opts = {};
-		if (blur.attributes?.["rad"] !== void 0) opts.radius = Number(blur.attributes["rad"]);
-		if (blur.attributes?.["grow"] !== void 0) opts.grow = blur.attributes["grow"] !== "0";
-		result.blur = opts;
-	}
-	const duotone = findChild(el, "a:duotone");
-	if (duotone?.elements) {
-		const fills = [];
-		for (const child of duotone.elements) {
-			const sf = findChild(child, "a:solidFill");
-			if (sf) fills.push(parse$1(solidFillDesc, sf, ctx));
+		if (opts.extrusionColor) {
+			const colorXml = stringify$1(solidFillDesc, opts.extrusionColor, ctx);
+			if (colorXml) parts.push(`<a:extrusionClr>${colorXml}</a:extrusionClr>`);
 		}
-		if (fills.length >= 2) result.duotone = {
-			color1: fills[0],
-			color2: fills[1]
-		};
+		if (opts.contourColor) {
+			const colorXml = stringify$1(solidFillDesc, opts.contourColor, ctx);
+			if (colorXml) parts.push(`<a:contourClr>${colorXml}</a:contourClr>`);
+		}
+		const attrParts = [];
+		if (opts.z !== void 0) attrParts.push(`z="${opts.z}"`);
+		if (opts.extrusionH !== void 0) attrParts.push(`extrusionH="${opts.extrusionH}"`);
+		if (opts.contourW !== void 0) attrParts.push(`contourW="${opts.contourW}"`);
+		if (opts.prstMaterial !== void 0) attrParts.push(`prstMaterial="${escapeXml(xsdMaterialType.to(opts.prstMaterial))}"`);
+		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		const content = parts.join("");
+		if (!attrStr && !content) return void 0;
+		if (!content) return `<a:sp3d${attrStr}/>`;
+		return `<a:sp3d${attrStr}>${content}</a:sp3d>`;
+	},
+	parse(el, ctx) {
+		const result = {};
+		if (el.attributes?.["z"] !== void 0) result.z = Number(el.attributes["z"]);
+		if (el.attributes?.["extrusionH"] !== void 0) result.extrusionH = Number(el.attributes["extrusionH"]);
+		if (el.attributes?.["contourW"] !== void 0) result.contourW = Number(el.attributes["contourW"]);
+		if (el.attributes?.["prstMaterial"] !== void 0) result.prstMaterial = xsdMaterialType.from(String(el.attributes["prstMaterial"]));
+		const bevelT = findChild(el, "a:bevelT");
+		if (bevelT) result.bevelT = parse$1(bevelDesc, bevelT, ctx);
+		const bevelB = findChild(el, "a:bevelB");
+		if (bevelB) result.bevelB = parse$1(bevelDesc, bevelB, ctx);
+		const extrusionClr = findChild(el, "a:extrusionClr");
+		if (extrusionClr) {
+			const solidFill = findChild(extrusionClr, "a:solidFill");
+			if (solidFill) result.extrusionColor = parse$1(solidFillDesc, solidFill, ctx);
+		}
+		const contourClr = findChild(el, "a:contourClr");
+		if (contourClr) {
+			const solidFill = findChild(contourClr, "a:solidFill");
+			if (solidFill) result.contourColor = parse$1(solidFillDesc, solidFill, ctx);
+		}
+		return result;
 	}
-	return Object.keys(result).length > 0 ? result : void 0;
-}
-const blipDesc = {
+};
+const cameraDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
+	stringify(opts, _ctx) {
 		const attrParts = [];
-		const embedValue = `{${opts.referenceId}}`;
-		attrParts.push(`r:embed="${escapeXml(embedValue)}"`);
-		attrParts.push("cstate=\"none\"");
+		attrParts.push(`prst="${escapeXml(opts.preset)}"`);
+		if (opts.fov !== void 0) attrParts.push(`fov="${opts.fov}"`);
+		if (opts.zoom !== void 0) attrParts.push(`zoom="${escapeXml(opts.zoom)}"`);
 		const attrStr = " " + attrParts.join(" ");
 		const parts = [];
-		if (opts.blipEffects) parts.push(stringifyBlipEffects(opts.blipEffects, ctx));
+		if (opts.rotation) parts.push(stringifySphereCoords(opts.rotation));
 		const content = parts.join("");
-		if (!content) return `<a:blip${attrStr}/>`;
-		return `<a:blip${attrStr}>${content}</a:blip>`;
+		if (!content) return `<a:camera${attrStr}/>`;
+		return `<a:camera${attrStr}>${content}</a:camera>`;
 	},
-	parse(el, ctx) {
+	parse(el, _ctx) {
 		const result = {};
-		const embed = el.attributes?.["r:embed"];
-		if (embed !== void 0) result.referenceId = String(embed).replace(/^\{(.+)\}$/, "$1");
-		const link = el.attributes?.["r:link"];
-		if (link !== void 0) result.referenceId = String(link).replace(/^\{(.+)\}$/, "$1");
-		const effects = readBlipEffects(el, ctx);
-		if (effects) result.blipEffects = effects;
+		if (el.attributes?.["prst"] !== void 0) result.preset = String(el.attributes["prst"]);
+		if (el.attributes?.["fov"] !== void 0) result.fov = Number(el.attributes["fov"]);
+		if (el.attributes?.["zoom"] !== void 0) result.zoom = String(el.attributes["zoom"]);
+		const rot = findChild(el, "a:rot");
+		if (rot) result.rotation = readSphereCoords(rot);
 		return result;
 	}
 };
-const blipFillDesc = {
+const lightRigDesc = {
 	kind: "custom",
-	stringify(opts, ctx) {
+	stringify(opts, _ctx) {
 		const attrParts = [];
-		if (opts.dpi !== void 0) attrParts.push(`dpi="${opts.dpi}"`);
-		if (opts.rotWithShape !== void 0) attrParts.push(`rotWithShape="${opts.rotWithShape ? 1 : 0}"`);
-		const attrStr = attrParts.length ? " " + attrParts.join(" ") : "";
+		attrParts.push(`rig="${escapeXml(opts.rig)}"`);
+		attrParts.push(`dir="${escapeXml(opts.direction)}"`);
+		const attrStr = " " + attrParts.join(" ");
 		const parts = [];
-		if (opts.referenceId) {
-			const blipXml = stringify$1(blipDesc, {
-				referenceId: opts.referenceId,
-				blipEffects: opts.blipEffects
-			}, ctx);
-			if (blipXml) parts.push(blipXml);
-		}
-		if (opts.sourceRectangle) {
-			const srcRectXml = stringify$1(sourceRectangleDesc, opts.sourceRectangle, ctx);
-			if (srcRectXml) parts.push(srcRectXml);
-		}
-		if (opts.tile) {
-			const tileXml = stringify$1(tileDesc, opts.tile, ctx);
-			if (tileXml) parts.push(tileXml);
-		} else parts.push("<a:stretch><a:fillRect/></a:stretch>");
+		if (opts.rotation) parts.push(stringifySphereCoords(opts.rotation));
 		const content = parts.join("");
-		if (!attrStr && !content) return void 0;
-		if (!content) return `<pic:blipFill${attrStr}/>`;
-		return `<pic:blipFill${attrStr}>${content}</pic:blipFill>`;
+		if (!content) return `<a:lightRig${attrStr}/>`;
+		return `<a:lightRig${attrStr}>${content}</a:lightRig>`;
+	},
+	parse(el, _ctx) {
+		const result = {};
+		if (el.attributes?.["rig"] !== void 0) result.rig = String(el.attributes["rig"]);
+		if (el.attributes?.["dir"] !== void 0) result.direction = String(el.attributes["dir"]);
+		const rot = findChild(el, "a:rot");
+		if (rot) result.rotation = readSphereCoords(rot);
+		return result;
+	}
+};
+const scene3DDesc = {
+	kind: "custom",
+	stringify(opts, ctx) {
+		const parts = [];
+		const cameraXml = stringify$1(cameraDesc, opts.camera, ctx);
+		if (cameraXml) parts.push(cameraXml);
+		const lightRigXml = stringify$1(lightRigDesc, opts.lightRig, ctx);
+		if (lightRigXml) parts.push(lightRigXml);
+		if (opts.backdrop) parts.push(stringifyBackdrop(opts.backdrop));
+		const content = parts.join("");
+		if (!content) return void 0;
+		return `<a:scene3d>${content}</a:scene3d>`;
 	},
 	parse(el, ctx) {
 		const result = {};
-		if (el.attributes?.["dpi"] !== void 0) result.dpi = Number(el.attributes["dpi"]);
-		if (el.attributes?.["rotWithShape"] !== void 0) result.rotWithShape = el.attributes["rotWithShape"] !== "0";
-		const blip = findChild(el, "a:blip");
-		if (blip) {
-			const blipResult = parse$1(blipDesc, blip, ctx);
-			if (blipResult.referenceId) result.referenceId = blipResult.referenceId;
-			if (blipResult.blipEffects) result.blipEffects = blipResult.blipEffects;
-		}
-		const srcRect = findChild(el, "a:srcRect");
-		if (srcRect) result.sourceRectangle = parse$1(sourceRectangleDesc, srcRect, ctx);
-		const tile = findChild(el, "a:tile");
-		if (tile) result.tile = parse$1(tileDesc, tile, ctx);
+		const camera = findChild(el, "a:camera");
+		if (camera) result.camera = parse$1(cameraDesc, camera, ctx);
+		const lightRig = findChild(el, "a:lightRig");
+		if (lightRig) result.lightRig = parse$1(lightRigDesc, lightRig, ctx);
+		const backdrop = findChild(el, "a:backdrop");
+		if (backdrop) result.backdrop = readBackdrop(backdrop);
 		return result;
 	}
 };
+function stringifyPoint3D(name, point) {
+	return `<${name} x="${point.x}" y="${point.y}" z="${point.z}"/>`;
+}
+function stringifyVector3D(name, vector) {
+	return `<${name} dx="${vector.dx}" dy="${vector.dy}" dz="${vector.dz}"/>`;
+}
+function stringifyBackdrop(opts) {
+	return `<a:backdrop>${stringifyPoint3D("a:anchor", opts.anchor) + stringifyVector3D("a:norm", opts.normal) + stringifyVector3D("a:up", opts.up)}</a:backdrop>`;
+}
+function readPoint3D(el) {
+	const x = el.attributes?.["x"];
+	const y = el.attributes?.["y"];
+	const z = el.attributes?.["z"];
+	if (x === void 0 || y === void 0 || z === void 0) return void 0;
+	return {
+		x: Number(x),
+		y: Number(y),
+		z: Number(z)
+	};
+}
+function readVector3D(el) {
+	const dx = el.attributes?.["dx"];
+	const dy = el.attributes?.["dy"];
+	const dz = el.attributes?.["dz"];
+	if (dx === void 0 || dy === void 0 || dz === void 0) return void 0;
+	return {
+		dx: Number(dx),
+		dy: Number(dy),
+		dz: Number(dz)
+	};
+}
+function readBackdrop(el) {
+	const anchor = findChild(el, "a:anchor");
+	const norm = findChild(el, "a:norm");
+	const up = findChild(el, "a:up");
+	if (!anchor || !norm || !up) return void 0;
+	const anchorPt = readPoint3D(anchor);
+	const normVec = readVector3D(norm);
+	const upVec = readVector3D(up);
+	if (!anchorPt || !normVec || !upVec) return void 0;
+	return {
+		anchor: anchorPt,
+		normal: normVec,
+		up: upVec
+	};
+}
 //#endregion
 //#region src/drawingml/diagram/diagram-descriptors.ts
 /**
@@ -8590,4 +8692,4 @@ function replaceHyperlinkPlaceholders(xml, hyperlinks, offset) {
 	return replacePlaceholders(xml, map);
 }
 //#endregion
-export { solidFillDesc as $, createTileInfo as $n, unzipSync$1 as $r, convertToTwip as $t, bevelDesc as A, createFillOverlayEffect as An, SchemeColor as Ar, createHierBranch as At, shapeLockingDesc as B, createLineEnd as Bn, PART_REGISTRIES as Br, createTableStyleList as Bt, diagramStyleDesc as C, PresetShadowVal as Cn, uniqueUuid as Cr, AnimateOneByOneValue as Ct, sourceRectangleDesc as D, createInnerShadowEffect as Dn, createSolidFill as Dr, createAdjustList as Dt, blipFillDesc as E, createOuterShadowEffect as En, createColorElement as Er, createAdjust as Et, customGeometryDesc as F, PresetDash as Fn, createPresetColor as Fr, createGraphicFrameLocking as Ft, patternFillDesc as G, extractBlipFillMedia as Gn, ParsedArchive as Gr, convertEmuToPoints as Gt, outlineDesc as H, createGroupFill as Hn, XLSX_PARTS as Hr, createTransformation as Ht, presetGeometryDesc as I, createOutline as In, createHslColor as Ir, createGroupLocking as It, parseColorChoice as J, PathShadeType as Jn, ZIP_STORED_LEVEL as Jr, convertMillimetersToTwip as Jt, getColorDescriptor as K, PresetPattern as Kn, parseArchive as Kr, convertInchesToEmu as Kt, graphicFrameLockingDesc as L, LineEndLength as Ln, createColorTransforms as Lr, createPictureLocking as Lt, shape3DDesc as M, LineCap as Mn, createScRgbColor as Mr, createOrgChart as Mt, groupTransform2DDesc as N, LineJoin as Nn, createRgbColor as Nr, createPreferredChildren as Nt, stretchDesc as O, createGlowEffect as On, SystemColor as Or, createAnimateOneByOne as Ot, transform2DDesc as P, PenAlignment as Pn, PresetColor as Pr, createPresentationLayoutVariables as Pt, schemeColorDesc as Q, TileAlignment as Qn, strFromU8$1 as Qr, convertToEmu as Qt, groupLockingDesc as R, LineEndType as Rn, buildContentTypeOverrides as Rr, createShapeLocking as Rt, diagramRelationshipIdsDesc as S, createReflectionEffect as Sn, uniqueNumericIdCreator as Sr, createStyleDefinitionHeaderList as St, blipDesc as T, RectAlignment as Tn, toUint8Array as Tr, HierBranchStyle as Tt, fillDesc as U, createNoFill as Un, summarizeOpcIssues as Ur, convertEmuToInches as Ut, effectListDesc as V, createCustomDash as Vn, PPTX_PARTS as Vr, parseTableStyleList as Vt, gradientFillDesc as W, buildFill as Wn, validateOpcConsistency as Wr, convertEmuToPixels as Wt, rgbColorDesc as X, createGradientFill as Xn, createZipStream as Xr, convertPointsToEmu as Xt, presetColorDesc as Y, TileFlipMode as Yn, createPacker as Yr, convertPixelsToEmu as Yt, scRgbColorDesc as Z, createGradientStop as Zn, levelForMediaName as Zr, convertPositionToEmu as Zt, derivePasswordHash as _, createScene3D as _n, xsdVerticalMergeRev as _r, createColorsDefinitionHeader as _t, getMediaRefs as a, encodeBase64 as ai, stringifyStretch as an, xsdLineEndSize as ar, ColorMethod as at, compileMapping as b, createEffectList as bn, hashedId as br, createLayoutDefinitionHeaderList as bt, hasPlaceholders as c, createDefault as ci, createExtentionList as cn, xsdPattern as cr, StyleMatrixIndex as ct, replaceHyperlinkPlaceholders as d, TargetModeType as di, stringifyAdjustmentValues as dn, xsdRectAlignment as dr, createFillColorList as dt, zipAndConvert as ei, convertUniversalMeasureToEmu as en, invertMap as er, systemColorDesc as et, replaceImagePlaceholders as f, PresetMaterialType as fn, xsdStrikeStyle as fr, createLineColorList as ft, replaceVideoPlaceholders as g, createBottomBevel as gn, xsdUnderlineStyle as gr, createTextLineColorList as gt, replaceSmartArtPlaceholders as h, createBevel as hn, xsdTextCaps as hr, createTextFillColorList as ht, formatId as i, decodeBase64 as ii, createTransform2D as in, xsdLineCap as ir, createDiagramRelationshipIds as it, scene3DDesc as j, CompoundLine as jn, createSchemeColor as jr, createMaxChildren as jt, tileDesc as k, BlendMode as kn, createSystemColor as kr, createAnimationLevel as kt, replaceAllPlaceholders as l, createOverride as li, createCustomGeometry as ln, xsdPenAlignment as lr, createDiagramStyle as lt, replaceNumberingPlaceholders as m, BevelPresetType as mn, xsdTextAnchor as mr, createTextEffectColorList as mt, collectPlaceholderKeys as n, OoxmlMimeType as ni, parseUniversalMeasure as nn, xsdCompoundLine as nr, createDiagramShape3D as nt, getReferencedMedia as o, customPropertiesDesc as oi, createBlipFill as on, xsdMaterialType as or, FontCollectionIndex as ot, replaceMediaPlaceholders as p, createShape3D as pn, xsdTextAlign as pr, createStyleLabel as pt, hslColorDesc as q, createPatternFill as qn, ZIP_DEFLATE_LEVEL as qr, convertInchesToTwip as qt, findAndReplaceImagePlaceholders as r, convertOutput as ri, createGroupTransform2D as rn, xsdEffectContainer as rr, createDiagramTextProperties as rt, getVideoRefs as s, appPropertiesDesc as si, createBlip as sn, xsdPathFillMode as sr, HueDirection as st, addSmartArtRelationships as t, zipSyncAndConvert as ti, convertUniversalMeasureToTwip as tn, xsdBlendMode as tr, createDiagramExtensionList as tt, replaceChartPlaceholders as u, Relationships as ui, stringifyPresetGeometry as un, xsdPresetShadow as ur, createEffectColorList as ut, hashPasswordAgile as v, createEffectDag as vn, createSourceRectangle as vr, createColorsDefinitionHeaderList as vt, presentationLayoutVariablesDesc as w, createPresetShadowEffect as wn, isBase64DataURL as wr, AnimationLevelValue as wt, diagramExtensionListDesc as x, createSoftEdgeEffect as xn, uniqueId as xr, createStyleDefinitionHeader as xt, randomBytes as y, calculateEffectExtent as yn, createBlipEffects as yr, createLayoutDefinitionHeader as yt, pictureLockingDesc as z, LineEndWidth as zn, DOCX_PARTS as zr, createTableStyle as zt };
+export { stringifyColorChoice as $, createTileInfo as $n, unzipSync$1 as $r, convertToTwip as $t, customGeometryDesc as A, createFillOverlayEffect as An, SchemeColor as Ar, createHierBranch as At, patternFillDesc as B, createLineEnd as Bn, PART_REGISTRIES as Br, createTableStyleList as Bt, diagramStyleDesc as C, PresetShadowVal as Cn, uniqueUuid as Cr, AnimateOneByOneValue as Ct, shape3DDesc as D, createInnerShadowEffect as Dn, createSolidFill as Dr, createAdjustList as Dt, scene3DDesc as E, createOuterShadowEffect as En, createColorElement as Er, createAdjust as Et, shapeLockingDesc as F, PresetDash as Fn, createPresetColor as Fr, createGraphicFrameLocking as Ft, tileDesc as G, extractBlipFillMedia as Gn, ParsedArchive as Gr, convertEmuToPoints as Gt, blipFillDesc as H, createGroupFill as Hn, XLSX_PARTS as Hr, createTransformation as Ht, effectListDesc as I, createOutline as In, createHslColor as Ir, createGroupLocking as It, presetColorDesc as J, PathShadeType as Jn, ZIP_STORED_LEVEL as Jr, convertMillimetersToTwip as Jt, hslColorDesc as K, PresetPattern as Kn, parseArchive as Kr, convertInchesToEmu as Kt, outlineDesc as L, LineEndLength as Ln, createColorTransforms as Lr, createPictureLocking as Lt, graphicFrameLockingDesc as M, LineCap as Mn, createScRgbColor as Mr, createOrgChart as Mt, groupLockingDesc as N, LineJoin as Nn, createRgbColor as Nr, createPreferredChildren as Nt, groupTransform2DDesc as O, createGlowEffect as On, SystemColor as Or, createAnimateOneByOne as Ot, pictureLockingDesc as P, PenAlignment as Pn, PresetColor as Pr, createPresentationLayoutVariables as Pt, solidFillDesc as Q, TileAlignment as Qn, strFromU8$1 as Qr, convertToEmu as Qt, fillDesc as R, LineEndType as Rn, buildContentTypeOverrides as Rr, createShapeLocking as Rt, diagramRelationshipIdsDesc as S, createReflectionEffect as Sn, uniqueNumericIdCreator as Sr, createStyleDefinitionHeaderList as St, bevelDesc as T, RectAlignment as Tn, toUint8Array as Tr, HierBranchStyle as Tt, sourceRectangleDesc as U, createNoFill as Un, summarizeOpcIssues as Ur, convertEmuToInches as Ut, blipDesc as V, createCustomDash as Vn, PPTX_PARTS as Vr, parseTableStyleList as Vt, stretchDesc as W, buildFill as Wn, validateOpcConsistency as Wr, convertEmuToPixels as Wt, scRgbColorDesc as X, createGradientFill as Xn, createZipStream as Xr, convertPointsToEmu as Xt, rgbColorDesc as Y, TileFlipMode as Yn, createPacker as Yr, convertPixelsToEmu as Yt, schemeColorDesc as Z, createGradientStop as Zn, levelForMediaName as Zr, convertPositionToEmu as Zt, derivePasswordHash as _, createScene3D as _n, xsdVerticalMergeRev as _r, createColorsDefinitionHeader as _t, getMediaRefs as a, encodeBase64 as ai, stringifyStretch as an, xsdLineEndSize as ar, ColorMethod as at, compileMapping as b, createEffectList as bn, hashedId as br, createLayoutDefinitionHeaderList as bt, hasPlaceholders as c, createDefault as ci, createExtentionList as cn, xsdPattern as cr, StyleMatrixIndex as ct, replaceHyperlinkPlaceholders as d, Relationships as di, stringifyAdjustmentValues as dn, xsdRectAlignment as dr, createFillColorList as dt, zipAndConvert as ei, convertUniversalMeasureToEmu as en, invertMap as er, systemColorDesc as et, replaceImagePlaceholders as f, TargetModeType as fi, PresetMaterialType as fn, xsdStrikeStyle as fr, createLineColorList as ft, replaceVideoPlaceholders as g, createBottomBevel as gn, xsdUnderlineStyle as gr, createTextLineColorList as gt, replaceSmartArtPlaceholders as h, createBevel as hn, xsdTextCaps as hr, createTextFillColorList as ht, formatId as i, decodeBase64 as ii, createTransform2D as in, xsdLineCap as ir, createDiagramRelationshipIds as it, presetGeometryDesc as j, CompoundLine as jn, createSchemeColor as jr, createMaxChildren as jt, transform2DDesc as k, BlendMode as kn, createSystemColor as kr, createAnimationLevel as kt, replaceAllPlaceholders as l, createOverride as li, createCustomGeometry as ln, xsdPenAlignment as lr, createDiagramStyle as lt, replaceNumberingPlaceholders as m, BevelPresetType as mn, xsdTextAnchor as mr, createTextEffectColorList as mt, collectPlaceholderKeys as n, OoxmlMimeType as ni, parseUniversalMeasure as nn, xsdCompoundLine as nr, createDiagramShape3D as nt, getReferencedMedia as o, customPropertiesDesc as oi, createBlipFill as on, xsdMaterialType as or, FontCollectionIndex as ot, replaceMediaPlaceholders as p, optionalRelsPart as pi, createShape3D as pn, xsdTextAlign as pr, createStyleLabel as pt, parseColorChoice as q, createPatternFill as qn, ZIP_DEFLATE_LEVEL as qr, convertInchesToTwip as qt, findAndReplaceImagePlaceholders as r, convertOutput as ri, createGroupTransform2D as rn, xsdEffectContainer as rr, createDiagramTextProperties as rt, getVideoRefs as s, appPropertiesDesc as si, createBlip as sn, xsdPathFillMode as sr, HueDirection as st, addSmartArtRelationships as t, zipSyncAndConvert as ti, convertUniversalMeasureToTwip as tn, xsdBlendMode as tr, createDiagramExtensionList as tt, replaceChartPlaceholders as u, Media as ui, stringifyPresetGeometry as un, xsdPresetShadow as ur, createEffectColorList as ut, hashPasswordAgile as v, createEffectDag as vn, createSourceRectangle as vr, createColorsDefinitionHeaderList as vt, presentationLayoutVariablesDesc as w, createPresetShadowEffect as wn, isBase64DataURL as wr, AnimationLevelValue as wt, diagramExtensionListDesc as x, createSoftEdgeEffect as xn, uniqueId as xr, createStyleDefinitionHeader as xt, randomBytes as y, calculateEffectExtent as yn, createBlipEffects as yr, createLayoutDefinitionHeader as yt, gradientFillDesc as z, LineEndWidth as zn, DOCX_PARTS as zr, createTableStyle as zt };