@office-open/pptx 0.6.3 → 0.6.4

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { i as __toCommonJS, n as __exportAll, r as __reExport, t as __esmMin } from "./chunk-090QGkrx.mjs";
-import { AppProperties, BaseXmlComponent, BuilderElement, EmptyElement, Formatter, ImportedXmlComponent, NextAttributeComponent, OoxmlMimeType, PrettifyType, Relationships, XmlComponent, ZIP_STORED_LEVEL, addSmartArtRelationships, buildCorePropertiesXml, collectPlaceholderKeys, convertEmuToInches, convertEmuToPixels, convertEmuToPixels as convertEmuToPixels$1, convertEmuToPoints, convertInchesToEmu, convertPixelsToEmu, convertPixelsToEmu as convertPixelsToEmu$1, convertPointsToEmu, createPacker, escapeRegex, formatId, getReferencedMedia, hasPlaceholders, hashedId, parseArchive, parseCorePropsElement, replaceChartPlaceholders, replaceImagePlaceholders, replaceSmartArtPlaceholders, stringContainerObj, uniqueId, uniqueNumericIdCreator, uniqueUuid } from "@office-open/core";
+import { AppProperties, BaseXmlComponent, BuilderElement, EmptyElement, Formatter, ImportedXmlComponent, NextAttributeComponent, OoxmlMimeType, PrettifyType, Relationships, XmlComponent, ZIP_STORED_LEVEL, addSmartArtRelationships, buildCorePropertiesXml, collectPlaceholderKeys, convertEmuToInches, convertEmuToPixels, convertEmuToPixels as convertEmuToPixels$1, convertEmuToPoints, convertInchesToEmu, convertPixelsToEmu, convertPixelsToEmu as convertPixelsToEmu$1, convertPointsToEmu, createPacker, escapeRegex, formatId, getReferencedMedia, hasPlaceholders, hashedId, parseArchive, parseCorePropsElement, replaceChartPlaceholders, replaceImagePlaceholders, replaceSmartArtPlaceholders, stringContainerObj, uniqueId, uniqueNumericIdCreator, uniqueUuid, xsdRectAlignment, xsdStrikeStyle, xsdTextAlign, xsdTextAnchor, xsdTextCaps, xsdUnderlineStyle } from "@office-open/core";
 import { BevelPresetType, CompoundLine, LineCap, LineJoin, PathShadeType, PenAlignment, PresetDash, PresetGeometry, PresetMaterialType, Stretch, TileFlipMode, buildFill, createBevel, createBlip, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createEffectList as createEffectList$1, createGradientFill, createGradientStop, createGroupTransform2D, createOutline, createOutline as createOutline$1, createScene3D, createScene3D as createScene3D$1, createShape3D, createShape3D as createShape3D$1, createTransform2D, extractBlipFillMedia } from "@office-open/core/drawingml";
 import { ChartCollection, ChartSpace } from "@office-open/core/chart";
 import { DEFAULT_DRAWING_XML, SmartArtCollection, createDataModel, getColorXml, getLayoutXml, getStyleXml } from "@office-open/core/smartart";
-import { attr, attrBool, attrNum, children, findChild, findDeep, textOf, xml } from "@office-open/xml";
+import { attr, attrBool, attrNum, children, colorAttr, findChild, findDeep, textOf, xml } from "@office-open/xml";
 import { toUint8Array } from "undio";
 export * from "@office-open/core/values";
 //#region src/file/drawingml/effects.ts
@@ -59,7 +59,7 @@ function toReflection(opts) {
 	if (opts.scaleY !== void 0) result.scaleY = opts.scaleY * 1e3;
 	if (opts.skewX !== void 0) result.skewX = opts.skewX * 6e4;
 	if (opts.skewY !== void 0) result.skewY = opts.skewY * 6e4;
-	if (opts.alignment !== void 0) result.alignment = ReflectionAlignment[opts.alignment];
+	if (opts.alignment !== void 0) result.alignment = xsdRectAlignment.to(opts.alignment);
 	if (opts.rotateWithShape === false) result.rotWithShape = 0;
 	return result;
 }
@@ -118,15 +118,15 @@ function createPptxEffectList(options) {
 var ReflectionAlignment;
 var init_effects = __esmMin((() => {
 	ReflectionAlignment = {
-		TOP_LEFT: "tl",
-		TOP: "t",
-		TOP_RIGHT: "tr",
-		LEFT: "l",
-		CENTER: "ctr",
-		RIGHT: "r",
-		BOTTOM_LEFT: "bl",
-		BOTTOM: "b",
-		BOTTOM_RIGHT: "br"
+		TOP_LEFT: "topLeft",
+		TOP: "top",
+		TOP_RIGHT: "topRight",
+		LEFT: "left",
+		CENTER: "center",
+		RIGHT: "right",
+		BOTTOM_LEFT: "bottomLeft",
+		BOTTOM: "bottom",
+		BOTTOM_RIGHT: "bottomRight"
 	};
 }));
 //#endregion
@@ -492,7 +492,7 @@ var HyperlinkCollection = class {
 			tooltip
 		});
 	}
-	get Array() {
+	get array() {
 		return [...this.map.values()];
 	}
 };
@@ -526,7 +526,7 @@ var Media = class {
 	addMedia(key, mediaData) {
 		this.map.set(key, mediaData);
 	}
-	get Array() {
+	get array() {
 		return [...this.map.values()];
 	}
 };
@@ -617,10 +617,10 @@ var EndParagraphRunProperties = class extends BuilderElement {
 //#region src/file/shape/paragraph/paragraph-properties.ts
 init_xml_components();
 const TextAlignment = {
-	LEFT: "l",
-	CENTER: "ctr",
-	RIGHT: "r",
-	JUSTIFY: "just"
+	LEFT: "left",
+	CENTER: "center",
+	RIGHT: "right",
+	JUSTIFY: "justify"
 };
 function buildBulletChildren(options) {
 	const children = [];
@@ -651,7 +651,7 @@ function buildBulletChildren(options) {
 function buildParagraphProperties(options) {
 	const children = [];
 	const attrs = {};
-	if (options.alignment) attrs.algn = TextAlignment[options.alignment];
+	if (options.alignment) attrs.algn = xsdTextAlign.to(options.alignment);
 	if (options.indentLevel !== void 0) attrs.lvl = options.indentLevel;
 	if (options.marginIndent !== void 0) attrs.marL = options.marginIndent;
 	if (options.marginRight !== void 0) attrs.marR = options.marginRight;
@@ -686,8 +686,8 @@ init_fill();
 init_xml_components();
 let nextHyperlinkId = 1;
 const UnderlineStyle = {
-	SINGLE: "sng",
-	DOUBLE: "dbl",
+	SINGLE: "single",
+	DOUBLE: "double",
 	NONE: "none"
 };
 const StrikeStyle = {
@@ -711,11 +711,11 @@ function buildRunProperties(options, hyperlinkKey, fillObject, effectListObject,
 	if (options.fontSize) attrs.sz = options.fontSize * 100;
 	if (options.bold !== void 0) attrs.b = options.bold;
 	if (options.italic !== void 0) attrs.i = options.italic;
-	if (options.underline) attrs.u = UnderlineStyle[options.underline];
+	if (options.underline) attrs.u = xsdUnderlineStyle.to(options.underline);
 	if (options.lang) attrs.lang = options.lang;
-	if (options.strike) attrs.strike = StrikeStyle[options.strike];
+	if (options.strike) attrs.strike = xsdStrikeStyle.to(options.strike);
 	if (options.baseline !== void 0) attrs.baseline = options.baseline;
-	if (options.capitalization) attrs.cap = TextCapitalization[options.capitalization] ?? options.capitalization;
+	if (options.capitalization) attrs.cap = xsdTextCaps.to(options.capitalization);
 	if (options.spacing !== void 0) attrs.spc = options.spacing;
 	if (options.noProof !== void 0) attrs.noProof = options.noProof;
 	if (options.dirty !== void 0) attrs.dirty = options.dirty;
@@ -754,7 +754,7 @@ var RunProperties = class extends XmlComponent {
 		let hyperlinkKey;
 		if (opts.hyperlink) {
 			hyperlinkKey = `hlink_${nextHyperlinkId++}`;
-			context.fileData?.Hyperlinks?.addHyperlink(hyperlinkKey, opts.hyperlink.url, opts.hyperlink.tooltip);
+			context.fileData?.hyperlinks?.addHyperlink(hyperlinkKey, opts.hyperlink.url, opts.hyperlink.tooltip);
 		}
 		let fillObj;
 		if (opts.fill !== void 0) fillObj = buildFill(opts.fill).prepForXml(context) ?? void 0;
@@ -872,9 +872,9 @@ var TableCellProperties = class extends BaseXmlComponent {
 //#region src/file/table/table-cell.ts
 init_xml_components();
 const VerticalAlignment = {
-	TOP: "t",
-	CENTER: "ctr",
-	BOTTOM: "b"
+	TOP: "top",
+	CENTER: "center",
+	BOTTOM: "bottom"
 };
 /**
 * a:tc — Table cell with text body and properties.
@@ -916,7 +916,7 @@ var TableCell = class extends BaseXmlComponent {
 		const tcPrObj = new TableCellProperties({
 			fill: opts.fill,
 			borders: opts.borders,
-			verticalAlign: opts.verticalAlign ? VerticalAlignment[opts.verticalAlign] : void 0
+			verticalAlign: opts.verticalAlign ? xsdTextAnchor.to(opts.verticalAlign) : void 0
 		}).prepForXml(context);
 		if (tcPrObj) children.push(tcPrObj);
 		return { "a:tc": children };
@@ -936,7 +936,7 @@ function buildBodyPr(options) {
 	const bodyPrContent = [];
 	const attrs = {};
 	if (options.vertical) attrs.vert = options.vertical;
-	if (options.anchor) attrs.anchor = VerticalAlignment[options.anchor];
+	if (options.anchor) attrs.anchor = xsdTextAnchor.to(options.anchor);
 	if (options.wrap) attrs.wrap = options.wrap;
 	if (options.margins?.top !== void 0) attrs.tIns = options.margins.top;
 	if (options.margins?.bottom !== void 0) attrs.bIns = options.margins.bottom;
@@ -962,11 +962,14 @@ var TextBody = class extends XmlComponent {
 		const children = [];
 		children.push(buildBodyPr(this.options));
 		children.push({ "a:lstStyle": {} });
-		if (this.options.paragraphs) for (const p of this.options.paragraphs) {
+		if (this.options.children) for (const p of this.options.children) {
 			const obj = (typeof p === "string" ? new Paragraph({ children: [new TextRun({ text: p })] }) : p instanceof Paragraph ? p : new Paragraph(p)).prepForXml(context);
 			if (obj) children.push(obj);
 		}
-		else {
+		else if (this.options.text !== void 0) {
+			const obj = new Paragraph({ children: [new TextRun({ text: this.options.text })] }).prepForXml(context);
+			if (obj) children.push(obj);
+		} else {
 			const obj = new Paragraph().prepForXml(context);
 			if (obj) children.push(obj);
 		}
@@ -1154,7 +1157,7 @@ var NotesBodyPlaceholder = class extends XmlComponent {
 				})]
 			})]
 		}));
-		const textBodyOptions = text ? { paragraphs: [new Paragraph({ children: [new TextRun({ text })] })] } : void 0;
+		const textBodyOptions = text ? { children: [new Paragraph({ children: [new TextRun({ text })] })] } : void 0;
 		this.root.push(new TextBody(textBodyOptions));
 	}
 };
@@ -1172,16 +1175,15 @@ function buildPresPropsXml(showOptions) {
 }
 var PresentationProperties = class PresentationProperties extends ImportedXmlComponent {
 	static cache = /* @__PURE__ */ new Map();
+	key;
 	constructor(showOptions) {
 		super("p:presentationPr");
-		const key = showOptions ? JSON.stringify(showOptions) : "";
-		if (!PresentationProperties.cache.has(key)) PresentationProperties.cache.set(key, ImportedXmlComponent.fromXmlString(buildPresPropsXml(showOptions)));
+		this.key = showOptions ? JSON.stringify(showOptions) : "";
+		if (!PresentationProperties.cache.has(this.key)) PresentationProperties.cache.set(this.key, ImportedXmlComponent.fromXmlString(buildPresPropsXml(showOptions)));
 	}
 	prepForXml() {
-		const key = this.showOptions ? JSON.stringify(this.showOptions) : "";
-		return PresentationProperties.cache.get(key).prepForXml({ stack: [] });
+		return PresentationProperties.cache.get(this.key).prepForXml({ stack: [] });
 	}
-	showOptions;
 };
 //#endregion
 //#region src/file/presentation/presentation.ts
@@ -1287,12 +1289,9 @@ var PresentationWrapper = class {
 		this.presentation = new Presentation(options);
 		this.relationships = new Relationships();
 	}
-	get View() {
+	get view() {
 		return this.presentation;
 	}
-	get Relationships() {
-		return this.relationships;
-	}
 };
 //#endregion
 //#region src/file/drawingml/transform-2d.ts
@@ -1368,15 +1367,12 @@ var ChartFrame = class extends XmlComponent {
 	}
 	prepForXml(context) {
 		const file = context.fileData;
-		if (file?.Charts) file.Charts.addChart(this.chartKey, {
+		if (file?.charts) file.charts.addChart(this.chartKey, {
 			chartSpace: new ChartSpace(this.chartOptions),
 			key: this.chartKey
 		});
 		return super.prepForXml(context);
 	}
-	get ChartKey() {
-		return this.chartKey;
-	}
 };
 var GraphicFrameNonVisual$2 = class extends XmlComponent {
 	constructor(id) {
@@ -1479,13 +1475,13 @@ function buildMediaData(type, fileName, width, height, data) {
 */
 var MediaFrameBase = class extends XmlComponent {
 	shapeId;
-	animationOptions;
+	animation;
 	mediaData;
 	posterData;
 	constructor(options, id, mediaFileName, params) {
 		super("p:pic");
 		this.shapeId = id;
-		this.animationOptions = options.animation;
+		this.animation = options.animation;
 		const name = options.name ?? `Media ${id}`;
 		const w = options.width ?? 0;
 		const h = options.height ?? 0;
@@ -1576,16 +1572,10 @@ var MediaFrameBase = class extends XmlComponent {
 			children: [new Transform2D({ ...emuPosition(options) }), new PresetGeometry({ preset: "rect" })]
 		}));
 	}
-	get ShapeId() {
-		return this.shapeId;
-	}
-	get Animation() {
-		return this.animationOptions;
-	}
 	prepForXml(context) {
 		const file = context.fileData;
-		if (this.posterData) file?.Media.addImage(this.posterData.fileName, this.posterData);
-		file?.Media.addMedia(this.mediaData.fileName, this.mediaData);
+		if (this.posterData) file?.media.addImage(this.posterData.fileName, this.posterData);
+		file?.media.addMedia(this.mediaData.fileName, this.mediaData);
 		return super.prepForXml(context);
 	}
 };
@@ -1813,7 +1803,7 @@ var Picture = class Picture extends XmlComponent {
 		}));
 	}
 	prepForXml(context) {
-		context.fileData?.Media.addImage(this.imageData.fileName, this.imageData);
+		context.fileData?.media.addImage(this.imageData.fileName, this.imageData);
 		return super.prepForXml(context);
 	}
 };
@@ -1890,28 +1880,28 @@ var NonVisualShapeProperties = class extends EmptyElement {
 //#endregion
 //#region src/file/drawingml/outline.ts
 const DASH_STYLE_MAP = {
-	solid: "SOLID",
-	dash: "DASH",
-	dashDot: "DASH_DOT",
-	lgDash: "LG_DASH",
-	sysDot: "SYS_DOT",
-	sysDash: "SYS_DASH"
+	solid: "solid",
+	dash: "dash",
+	dashDot: "dashDot",
+	lgDash: "lgDash",
+	sysDot: "sysDot",
+	sysDash: "sysDash"
 };
 const ARROWHEAD_MAP = {
-	triangle: "TRIANGLE",
-	stealth: "STEALTH",
-	diamond: "DIAMOND",
-	oval: "OVAL",
-	open: "ARROW"
+	triangle: "triangle",
+	stealth: "stealth",
+	diamond: "diamond",
+	oval: "oval",
+	open: "arrow"
 };
 const ARROWHEAD_SIZE_MAP = {
-	sm: "SMALL",
-	med: "MEDIUM",
-	lg: "LARGE"
+	sm: "small",
+	med: "medium",
+	lg: "large"
 };
 function toCoreLineEnd(type, width, length) {
 	return {
-		type: ARROWHEAD_MAP[type] ?? "TRIANGLE",
+		type: ARROWHEAD_MAP[type] ?? "triangle",
 		...width ? { width: ARROWHEAD_SIZE_MAP[width] } : {},
 		...length ? { length: ARROWHEAD_SIZE_MAP[length] } : {}
 	};
@@ -1925,7 +1915,7 @@ const createOutlineCompat = (options = {}, arrowheads) => createOutline$1({
 		type: "solidFill",
 		color: { value: options.color.replace("#", "") }
 	} : { type: "noFill" },
-	...options.dashStyle && { dash: DASH_STYLE_MAP[options.dashStyle] ?? "SOLID" },
+	...options.dashStyle && { dash: DASH_STYLE_MAP[options.dashStyle] ?? "solid" },
 	...arrowheads?.endType ? { headEnd: toCoreLineEnd(arrowheads.endType, arrowheads.width, arrowheads.length) } : {},
 	...arrowheads?.beginType ? { tailEnd: toCoreLineEnd(arrowheads.beginType, arrowheads.width, arrowheads.length) } : {}
 });
@@ -2032,9 +2022,6 @@ var LineShape = class LineShape extends XmlComponent {
 			]
 		}));
 	}
-	get ShapeId() {
-		return this.shapeId;
-	}
 };
 /**
 * p:cxnSp — A connector shape on a slide (line with optional arrowheads).
@@ -2127,9 +2114,6 @@ var ConnectorShape = class ConnectorShape extends XmlComponent {
 			children: spPrChildren
 		}));
 	}
-	get ShapeId() {
-		return this.shapeId;
-	}
 };
 //#endregion
 //#region src/file/drawingml/shape-properties.ts
@@ -2156,7 +2140,7 @@ var ShapeProperties = class extends BaseXmlComponent {
 		const geomObj = new PresetGeometry({ preset: opts.geometry ?? "rect" }).prepForXml(context);
 		if (geomObj) children.push(geomObj);
 		const media = opts.fill ? extractBlipFillMedia(opts.fill) : void 0;
-		if (media) context.fileData?.Media.addImage(media.fileName, {
+		if (media) context.fileData?.media.addImage(media.fileName, {
 			data: media.data,
 			fileName: media.fileName,
 			type: media.type,
@@ -2226,24 +2210,18 @@ function buildPlaceholder(type, index) {
 var Shape = class Shape extends XmlComponent {
 	static nextId = 2;
 	shapeId;
-	animationOptions;
+	animation;
 	options;
 	constructor(options = {}) {
 		super("p:sp");
 		const id = options.id ?? Shape.nextId++;
 		this.shapeId = id;
-		this.animationOptions = options.animation;
+		this.animation = options.animation;
 		this.options = {
 			...options,
 			id
 		};
 	}
-	get ShapeId() {
-		return this.shapeId;
-	}
-	get Animation() {
-		return this.animationOptions;
-	}
 	prepForXml(context) {
 		const opts = this.options;
 		const id = this.shapeId;
@@ -2269,16 +2247,7 @@ var Shape = class Shape extends XmlComponent {
 			rotation: opts.rotation
 		}).prepForXml(context);
 		if (spPrObj) children.push(spPrObj);
-		const txBodyObj = new TextBody({
-			paragraphs: opts.paragraphs ?? (opts.text ? [new Paragraph({ text: opts.text })] : void 0),
-			vertical: opts.textVertical,
-			anchor: opts.textAnchor,
-			autoFit: opts.textAutoFit,
-			wrap: opts.textWrap,
-			margins: opts.textMargins,
-			columns: opts.textColumns,
-			columnSpacing: opts.textColumnSpacing
-		}).prepForXml(context);
+		const txBodyObj = new TextBody(opts.textBody ?? {}).prepForXml(context);
 		if (txBodyObj) children.push(txBodyObj);
 		return { "p:sp": children };
 	}
@@ -2311,7 +2280,7 @@ var SmartArtFrame = class extends XmlComponent {
 	}
 	prepForXml(context) {
 		const file = context.fileData;
-		if (file?.SmartArts) file.SmartArts.addSmartArt(this.smartArtKey, {
+		if (file?.smartArts) file.smartArts.addSmartArt(this.smartArtKey, {
 			key: this.smartArtKey,
 			dataModel: this.dataModel,
 			layout: this.layoutId,
@@ -2909,8 +2878,8 @@ function buildChildrenXml(children) {
 	}
 	return result;
 }
-function buildSlideMasterXml(layoutCount, headerFooter, masterOptions, slideWidth = SW_REF, masterIndex = 0) {
-	const hfXml = headerFooter ? `<p:hf dt="0" hdr="0" ftr="0" sldNum="0"/>` : "";
+function buildSlideMasterXml(layoutCount, _headerFooter, masterOptions, slideWidth = SW_REF, masterIndex = 0) {
+	const hfXml = `<p:hf dt="0" hdr="0" ftr="0" sldNum="0"/>`;
 	const ph = masterOptions?.placeholders ?? {};
 	const layoutIdBase = 2147483648 + masterIndex * 12 + 1;
 	const layoutIdEntries = [];
@@ -2945,7 +2914,7 @@ var DefaultSlideMaster = class DefaultSlideMaster extends ImportedXmlComponent {
 	cacheKey;
 	constructor(layoutCount = 1, headerFooter, masterOptions, slideWidth = SW_REF, masterIndex = 0) {
 		super("p:sldMaster");
-		this.cacheKey = `${layoutCount}:${headerFooter ? JSON.stringify(headerFooter) : ""}:${masterOptions ? JSON.stringify(masterOptions) : ""}:${slideWidth}:${masterIndex}`;
+		this.cacheKey = `${layoutCount}:${masterOptions ? JSON.stringify(masterOptions) : ""}:${slideWidth}:${masterIndex}`;
 		if (!DefaultSlideMaster.cache.has(this.cacheKey)) DefaultSlideMaster.cache.set(this.cacheKey, ImportedXmlComponent.fromXmlString(buildSlideMasterXml(layoutCount, headerFooter, masterOptions, slideWidth, masterIndex)));
 	}
 	prepForXml() {
@@ -4076,14 +4045,14 @@ var Transition = class extends BaseXmlComponent {
 //#region src/file/slide/slide.ts
 init_xml_components();
 function isAnimatable(child) {
-	return "ShapeId" in child && "Animation" in child;
+	return "shapeId" in child && "animation" in child;
 }
 function collectAnimations(children) {
 	const entries = [];
 	for (const child of children) if (isAnimatable(child)) {
-		const anim = child.Animation;
+		const anim = child.animation;
 		if (anim) entries.push({
-			spid: child.ShapeId,
+			spid: child.shapeId,
 			options: anim
 		});
 	}
@@ -4336,27 +4305,27 @@ var File = class {
 	slideWidthEmus;
 	slideHeightEmus;
 	masterDefs;
-	coreProperties;
-	appProperties;
-	contentTypes;
-	media;
-	charts;
-	smartArts;
-	hyperlinks;
-	presentationWrapper;
-	tableStyles;
-	presProps;
-	viewProps;
-	notesMasterRels;
+	_coreProperties;
+	_appProperties;
+	_contentTypes;
+	_media;
+	_charts;
+	_smartArts;
+	_hyperlinks;
+	_presentationWrapper;
+	_tableStyles;
+	_presProps;
+	_viewProps;
+	_notesMasterRels;
 	masterMap;
-	allLayouts;
-	allLayoutRels;
-	slides;
-	slideWrappers;
-	notesSlides;
-	commentAuthorList;
-	slideCommentLists;
-	fileRels;
+	_allLayouts;
+	_allLayoutRels;
+	_slides;
+	_slideWrappers;
+	_notesSlides;
+	_commentAuthorList;
+	_slideCommentLists;
+	_fileRels;
 	constructor(options) {
 		this.slideOptions = options.slides ?? [];
 		this.corePropsOptions = options;
@@ -4444,8 +4413,8 @@ var File = class {
 			});
 		}
 		this.masterMap = masters;
-		this.allLayouts = masters.flatMap((m) => m.layouts);
-		this.allLayoutRels = masters.flatMap((m) => m.layoutRels);
+		this._allLayouts = masters.flatMap((m) => m.layouts);
+		this._allLayoutRels = masters.flatMap((m) => m.layoutRels);
 		return this.masterMap;
 	}
 	findLayoutForSlide(slideIndex) {
@@ -4455,30 +4424,30 @@ var File = class {
 		const layoutKey = opts.layout ?? "blank";
 		return master.layouts.find((l) => l.key === layoutKey) ?? master.layouts[0];
 	}
-	get CoreProperties() {
-		return this.coreProperties ??= new CoreProperties(this.corePropsOptions);
+	get coreProperties() {
+		return this._coreProperties ??= new CoreProperties(this.corePropsOptions);
 	}
-	get AppProperties() {
-		return this.appProperties ??= new AppProperties();
+	get appProperties() {
+		return this._appProperties ??= new AppProperties();
 	}
-	get ContentTypes() {
-		if (!this.contentTypes) {
-			this.contentTypes = new ContentTypes();
+	get contentTypes() {
+		if (!this._contentTypes) {
+			this._contentTypes = new ContentTypes();
 			let hasComments = false;
 			for (let i = 0; i < this.slideOptions.length; i++) {
-				this.contentTypes.addSlide(i + 1);
-				if (this.slideOptions[i].notes) this.contentTypes.addNotesSlide(i + 1);
+				this._contentTypes.addSlide(i + 1);
+				if (this.slideOptions[i].notes) this._contentTypes.addNotesSlide(i + 1);
 				if (this.slideOptions[i].comments && this.slideOptions[i].comments.length > 0) {
-					this.contentTypes.addComments(i + 1);
+					this._contentTypes.addComments(i + 1);
 					hasComments = true;
 				}
 			}
-			if (hasComments) this.contentTypes.addCommentAuthors();
+			if (hasComments) this._contentTypes.addCommentAuthors();
 		}
-		return this.contentTypes;
+		return this._contentTypes;
 	}
-	get FileRelationships() {
-		if (!this.fileRels) this.fileRels = buildRelationships([
+	get fileRelationships() {
+		if (!this._fileRels) this._fileRels = buildRelationships([
 			{
 				id: 1,
 				type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
@@ -4495,30 +4464,30 @@ var File = class {
 				target: "docProps/app.xml"
 			}
 		]);
-		return this.fileRels;
+		return this._fileRels;
 	}
-	get Media() {
-		return this.media ??= new Media();
+	get media() {
+		return this._media ??= new Media();
 	}
-	get Charts() {
-		return this.charts ??= new ChartCollection();
+	get charts() {
+		return this._charts ??= new ChartCollection();
 	}
-	get SmartArts() {
-		return this.smartArts ??= new SmartArtCollection();
+	get smartArts() {
+		return this._smartArts ??= new SmartArtCollection();
 	}
-	get Hyperlinks() {
-		return this.hyperlinks ??= new HyperlinkCollection();
+	get hyperlinks() {
+		return this._hyperlinks ??= new HyperlinkCollection();
 	}
-	get PresentationWrapper() {
-		if (!this.presentationWrapper) {
+	get presentationWrapper() {
+		if (!this._presentationWrapper) {
 			const masters = this.getMasterMap();
-			this.presentationWrapper = new PresentationWrapper({
+			this._presentationWrapper = new PresentationWrapper({
 				slideWidth: this.slideWidthEmus,
 				slideHeight: this.slideHeightEmus,
 				slideIds: this.slideOptions.map((_, i) => 256 + i),
 				masterCount: masters.length
 			});
-			const presRels = this.PresentationWrapper.Relationships;
+			const presRels = this._presentationWrapper.relationships;
 			let rid = 1;
 			for (let mi = 0; mi < masters.length; mi++) presRels.addRelationship(rid++, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster", `slideMasters/slideMaster${mi + 1}.xml`);
 			for (let i = 0; i < this.slideOptions.length; i++) presRels.addRelationship(rid++, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide", `slides/slide${i + 1}.xml`);
@@ -4527,49 +4496,49 @@ var File = class {
 			for (let mi = 0; mi < masters.length; mi++) presRels.addRelationship(rid++, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme", `theme/theme${mi + 1}.xml`);
 			presRels.addRelationship(rid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles", "tableStyles.xml");
 		}
-		return this.presentationWrapper;
+		return this._presentationWrapper;
 	}
-	get Themes() {
+	get themes() {
 		return this.getMasterMap().map((m) => m.theme);
 	}
-	get TableStyles() {
-		return this.tableStyles ??= new TableStyles();
+	get tableStyles() {
+		return this._tableStyles ??= new TableStyles();
 	}
-	get PresProps() {
-		return this.presProps ??= new PresentationProperties(this.showOptions);
+	get presProps() {
+		return this._presProps ??= new PresentationProperties(this.showOptions);
 	}
-	get ViewProps() {
-		return this.viewProps ??= new ViewProperties();
+	get viewProps() {
+		return this._viewProps ??= new ViewProperties();
 	}
-	get SlideMasters() {
+	get slideMasters() {
 		return this.getMasterMap().map((m) => m.master);
 	}
-	get SlideMasterRelsArray() {
+	get slideMasterRelsArray() {
 		return this.getMasterMap().map((m) => m.masterRels);
 	}
-	get AllLayouts() {
+	get allLayouts() {
 		this.getMasterMap();
-		return this.allLayouts;
+		return this._allLayouts;
 	}
-	get AllLayoutRelsArray() {
+	get allLayoutRelsArray() {
 		this.getMasterMap();
-		return this.allLayoutRels;
+		return this._allLayoutRels;
 	}
-	get Slides() {
-		if (!this.slides) {
-			this.slides = [];
-			for (const s of this.slideOptions) this.slides.push(new Slide(s.children ?? [], s.background ? new Background(s.background) : void 0, s.transition, s.headerFooter));
+	get slides() {
+		if (!this._slides) {
+			this._slides = [];
+			for (const s of this.slideOptions) this._slides.push(new Slide(s.children ?? [], s.background ? new Background(s.background) : void 0, s.transition, s.headerFooter));
 		}
-		return this.slides;
+		return this._slides;
 	}
-	get SlideWrappers() {
-		if (!this.slideWrappers) {
-			this.slideWrappers = [];
+	get slideWrappers() {
+		if (!this._slideWrappers) {
+			this._slideWrappers = [];
 			for (let i = 0; i < this.slideOptions.length; i++) {
 				const layout = this.findLayoutForSlide(i);
-				this.slideWrappers.push({
-					View: this.Slides[i],
-					Relationships: buildRelationships([{
+				this._slideWrappers.push({
+					view: this.slides[i],
+					relationships: buildRelationships([{
 						id: 1,
 						type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout",
 						target: `../slideLayouts/slideLayout${layout.index + 1}.xml`
@@ -4577,37 +4546,37 @@ var File = class {
 				});
 			}
 		}
-		return this.slideWrappers;
+		return this._slideWrappers;
 	}
-	get NotesSlides() {
-		if (!this.notesSlides) {
-			this.notesSlides = [];
-			for (let i = 0; i < this.slideOptions.length; i++) if (this.slideOptions[i].notes) this.notesSlides.push(new NotesSlide({ text: this.slideOptions[i].notes }));
+	get notesSlides() {
+		if (!this._notesSlides) {
+			this._notesSlides = [];
+			for (let i = 0; i < this.slideOptions.length; i++) if (this.slideOptions[i].notes) this._notesSlides.push(new NotesSlide({ text: this.slideOptions[i].notes }));
 		}
-		return this.notesSlides;
+		return this._notesSlides;
 	}
 	/** Map from slide index → notesSlide index (0-based) for slides that have notes. */
-	get NotesSlideIndexMap() {
+	get notesSlideIndexMap() {
 		const map = /* @__PURE__ */ new Map();
 		let notesIdx = 0;
 		for (let i = 0; i < this.slideOptions.length; i++) if (this.slideOptions[i].notes) map.set(i, notesIdx++);
 		return map;
 	}
-	get NotesMasterRelationships() {
-		return this.notesMasterRels ??= new Relationships();
+	get notesMasterRelationships() {
+		return this._notesMasterRels ??= new Relationships();
 	}
-	get CommentAuthorList() {
-		if (!this.commentAuthorList && !this.slideCommentLists) this.buildComments();
-		return this.commentAuthorList;
+	get commentAuthorList() {
+		if (!this._commentAuthorList && !this._slideCommentLists) this.buildComments();
+		return this._commentAuthorList;
 	}
-	get SlideCommentLists() {
-		if (!this.slideCommentLists) this.buildComments();
-		return this.slideCommentLists;
+	get slideCommentLists() {
+		if (!this._slideCommentLists) this.buildComments();
+		return this._slideCommentLists;
 	}
 	buildComments() {
 		const authorMap = /* @__PURE__ */ new Map();
 		let nextAuthorId = 0;
-		this.slideCommentLists = Array.from({ length: this.slideOptions.length });
+		this._slideCommentLists = Array.from({ length: this.slideOptions.length });
 		for (let i = 0; i < this.slideOptions.length; i++) {
 			const slideComments = this.slideOptions[i].comments;
 			if (!slideComments || slideComments.length === 0) continue;
@@ -4635,7 +4604,7 @@ var File = class {
 					text: c.text
 				});
 			}
-			this.slideCommentLists[i] = new SlideCommentList(commentEntries);
+			this._slideCommentLists[i] = new SlideCommentList(commentEntries);
 		}
 		if (authorMap.size > 0) {
 			const authors = [...authorMap.values()].map((a) => ({
@@ -4645,7 +4614,7 @@ var File = class {
 				clrIdx: a.clrIdx,
 				lastIdx: a.commentCount
 			}));
-			this.commentAuthorList = new CommentAuthorList(authors);
+			this._commentAuthorList = new CommentAuthorList(authors);
 		}
 	}
 };
@@ -4898,40 +4867,40 @@ var Compiler = class {
 		};
 		const mapping = {
 			AppProperties: {
-				data: xml(this.formatter.format(file.AppProperties, context), { declaration }),
+				data: xml(this.formatter.format(file.appProperties, context), { declaration }),
 				path: "docProps/app.xml"
 			},
 			Properties: {
-				data: xml(this.formatter.format(file.CoreProperties, context), {
+				data: xml(this.formatter.format(file.coreProperties, context), {
 					declaration,
 					indent
 				}),
 				path: "docProps/core.xml"
 			},
 			FileRelationships: {
-				data: xml(this.formatter.format(file.FileRelationships, context), { declaration: false }),
+				data: xml(this.formatter.format(file.fileRelationships, context), { declaration: false }),
 				path: "_rels/.rels"
 			}
 		};
-		const themes = file.Themes;
+		const themes = file.themes;
 		for (let ti = 0; ti < themes.length; ti++) mapping[`Theme${ti}`] = {
 			data: this.formatter.formatToXml(themes[ti], context, declaration),
 			path: `ppt/theme/theme${ti + 1}.xml`
 		};
 		mapping["TableStyles"] = {
-			data: this.formatter.formatToXml(file.TableStyles, context, declaration),
+			data: this.formatter.formatToXml(file.tableStyles, context, declaration),
 			path: "ppt/tableStyles.xml"
 		};
 		mapping["PresProps"] = {
-			data: this.formatter.formatToXml(file.PresProps, context, declaration),
+			data: this.formatter.formatToXml(file.presProps, context, declaration),
 			path: "ppt/presProps.xml"
 		};
 		mapping["ViewProps"] = {
-			data: this.formatter.formatToXml(file.ViewProps, context, declaration),
+			data: this.formatter.formatToXml(file.viewProps, context, declaration),
 			path: "ppt/viewProps.xml"
 		};
-		const masters = file.SlideMasters;
-		const masterRels = file.SlideMasterRelsArray;
+		const masters = file.slideMasters;
+		const masterRels = file.slideMasterRelsArray;
 		for (let mi = 0; mi < masters.length; mi++) {
 			mapping[`SlideMaster${mi}`] = {
 				data: this.formatter.formatToXml(masters[mi], context, declaration),
@@ -4942,8 +4911,8 @@ var Compiler = class {
 				path: `ppt/slideMasters/_rels/slideMaster${mi + 1}.xml.rels`
 			};
 		}
-		const layouts = file.AllLayouts;
-		const layoutRels = file.AllLayoutRelsArray;
+		const layouts = file.allLayouts;
+		const layoutRels = file.allLayoutRelsArray;
 		for (let li = 0; li < layouts.length; li++) {
 			mapping[`SlideLayout${li}`] = {
 				data: this.formatter.formatToXml(layouts[li].layout, context, declaration),
@@ -4954,13 +4923,13 @@ var Compiler = class {
 				path: `ppt/slideLayouts/_rels/slideLayout${li + 1}.xml.rels`
 			};
 		}
-		for (let i = 0; i < layouts.length; i++) file.ContentTypes.addSlideLayout(i + 1);
+		for (let i = 0; i < layouts.length; i++) file.contentTypes.addSlideLayout(i + 1);
 		for (let mi = 0; mi < masters.length; mi++) {
-			file.ContentTypes.addSlideMaster(mi + 1);
-			file.ContentTypes.addTheme(mi + 1);
+			file.contentTypes.addSlideMaster(mi + 1);
+			file.contentTypes.addTheme(mi + 1);
 		}
-		if (file.NotesSlides.length > 0) {
-			file.PresentationWrapper.Relationships.addRelationship(file.PresentationWrapper.Relationships.RelationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster", "notesMasters/notesMaster1.xml");
+		if (file.notesSlides.length > 0) {
+			file.presentationWrapper.relationships.addRelationship(file.presentationWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster", "notesMasters/notesMaster1.xml");
 			mapping["NotesMaster"] = {
 				data: xml(this.formatter.format(new DefaultNotesMaster(), context), {
 					declaration,
@@ -4969,17 +4938,17 @@ var Compiler = class {
 				path: "ppt/notesMasters/notesMaster1.xml"
 			};
 			mapping["NotesMasterRelationships"] = {
-				data: xml(this.formatter.format(file.NotesMasterRelationships, context), { declaration: false }),
+				data: xml(this.formatter.format(file.notesMasterRelationships, context), { declaration: false }),
 				path: "ppt/notesMasters/_rels/notesMaster1.xml.rels"
 			};
 		}
-		if (file.CommentAuthorList) file.PresentationWrapper.Relationships.addRelationship(file.PresentationWrapper.Relationships.RelationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors", "commentAuthors.xml");
-		const presentationXml = this.formatter.formatToXml(file.PresentationWrapper.View, context, declaration);
+		if (file.commentAuthorList) file.presentationWrapper.relationships.addRelationship(file.presentationWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors", "commentAuthors.xml");
+		const presentationXml = this.formatter.formatToXml(file.presentationWrapper.view, context, declaration);
 		let currentImageCount = 0;
-		const mediaData = getReferencedMedia(presentationXml, file.Media.Array);
-		const presImageOffset = file.PresentationWrapper.Relationships.RelationshipCount + 1;
+		const mediaData = getReferencedMedia(presentationXml, file.media.array);
+		const presImageOffset = file.presentationWrapper.relationships.relationshipCount + 1;
 		mediaData.forEach((image, idx) => {
-			file.PresentationWrapper.Relationships.addRelationship(presImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
+			file.presentationWrapper.relationships.addRelationship(presImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
 		});
 		const replacedPresentationXml = replaceImagePlaceholders(presentationXml, mediaData, presImageOffset);
 		currentImageCount += mediaData.length;
@@ -4988,38 +4957,38 @@ var Compiler = class {
 			path: "ppt/presentation.xml"
 		};
 		mapping["PresentationRelationships"] = {
-			data: xml(this.formatter.format(file.PresentationWrapper.Relationships, context), { declaration: false }),
+			data: xml(this.formatter.format(file.presentationWrapper.relationships, context), { declaration: false }),
 			path: "ppt/_rels/presentation.xml.rels"
 		};
-		for (let i = 0; i < file.Slides.length; i++) {
-			const slideWrapper = file.SlideWrappers[i];
-			const slideXml = this.formatter.formatToXml(slideWrapper.View, context, declaration);
-			const slideMediaData = getReferencedMedia(slideXml, file.Media.Array);
-			const slideImageOffset = slideWrapper.Relationships.RelationshipCount + 1;
+		for (let i = 0; i < file.slides.length; i++) {
+			const slideWrapper = file.slideWrappers[i];
+			const slideXml = this.formatter.formatToXml(slideWrapper.view, context, declaration);
+			const slideMediaData = getReferencedMedia(slideXml, file.media.array);
+			const slideImageOffset = slideWrapper.relationships.relationshipCount + 1;
 			slideMediaData.forEach((image, idx) => {
-				slideWrapper.Relationships.addRelationship(slideImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
+				slideWrapper.relationships.addRelationship(slideImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
 			});
 			let replacedSlideXml = replaceImagePlaceholders(slideXml, slideMediaData, slideImageOffset);
 			currentImageCount += slideMediaData.length;
 			if (hasPlaceholders(replacedSlideXml)) {
 				const slideChartKeys = collectPlaceholderKeys(replacedSlideXml, "chart:");
 				if (slideChartKeys.length > 0) {
-					const slideChartOffset = slideWrapper.Relationships.RelationshipCount + 1;
-					const slideCharts = file.Charts.Array.filter((c) => slideChartKeys.includes(c.key));
+					const slideChartOffset = slideWrapper.relationships.relationshipCount + 1;
+					const slideCharts = file.charts.array.filter((c) => slideChartKeys.includes(c.key));
 					replacedSlideXml = replaceChartPlaceholders(replacedSlideXml, slideCharts.map((c) => c.key), slideChartOffset);
 					slideCharts.forEach((chartData, ci) => {
-						const globalIndex = file.Charts.Array.indexOf(chartData);
-						slideWrapper.Relationships.addRelationship(slideChartOffset + ci, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", `../charts/chart${globalIndex + 1}.xml`);
+						const globalIndex = file.charts.array.indexOf(chartData);
+						slideWrapper.relationships.addRelationship(slideChartOffset + ci, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", `../charts/chart${globalIndex + 1}.xml`);
 					});
 				}
 				const slideSmartArtKeys = collectPlaceholderKeys(replacedSlideXml, "smartart:");
 				if (slideSmartArtKeys.length > 0) {
-					const slideSmartArts = file.SmartArts.Array.filter((s) => slideSmartArtKeys.includes(s.key));
-					const saOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					const slideSmartArts = file.smartArts.array.filter((s) => slideSmartArtKeys.includes(s.key));
+					const saOffset = slideWrapper.relationships.relationshipCount + 1;
 					replacedSlideXml = replaceSmartArtPlaceholders(replacedSlideXml, slideSmartArts.map((s) => s.key), saOffset);
-					const saGlobalStart = file.SmartArts.Array.indexOf(slideSmartArts[0]);
+					const saGlobalStart = file.smartArts.array.indexOf(slideSmartArts[0]);
 					addSmartArtRelationships(slideSmartArts.map((s) => s.key), (id, type, target) => {
-						slideWrapper.Relationships.addRelationship(id, type, target);
+						slideWrapper.relationships.addRelationship(id, type, target);
 					}, saOffset, saGlobalStart, {
 						pathPrefix: "../",
 						styleRelType: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramQuickStyle"
@@ -5027,25 +4996,25 @@ var Compiler = class {
 				}
 				const slideHlinkKeys = collectPlaceholderKeys(replacedSlideXml, "hlink:");
 				if (slideHlinkKeys.length > 0) {
-					const slideHlinks = file.Hyperlinks.Array.filter((h) => slideHlinkKeys.includes(h.key));
-					const hlinkOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					const slideHlinks = file.hyperlinks.array.filter((h) => slideHlinkKeys.includes(h.key));
+					const hlinkOffset = slideWrapper.relationships.relationshipCount + 1;
 					replacedSlideXml = replaceHyperlinkPlaceholders(replacedSlideXml, slideHlinks, hlinkOffset);
 					slideHlinks.forEach((hlink, hi) => {
-						slideWrapper.Relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hlink.url, "External");
+						slideWrapper.relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hlink.url, "External");
 					});
 				}
-				const slideMediaRefs = getMediaRefs(replacedSlideXml, file.Media.Array);
-				const slideVideoRefs = getVideoRefs(replacedSlideXml, file.Media.Array);
+				const slideMediaRefs = getMediaRefs(replacedSlideXml, file.media.array);
+				const slideVideoRefs = getVideoRefs(replacedSlideXml, file.media.array);
 				if (slideMediaRefs.length > 0 || slideVideoRefs.length > 0) {
-					const mediaOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					const mediaOffset = slideWrapper.relationships.relationshipCount + 1;
 					const videoOffset = mediaOffset + slideMediaRefs.length;
 					replacedSlideXml = replaceMediaPlaceholders(replacedSlideXml, slideMediaRefs, mediaOffset);
 					replacedSlideXml = replaceVideoPlaceholders(replacedSlideXml, slideVideoRefs, videoOffset);
 					slideMediaRefs.forEach((media, mi) => {
-						slideWrapper.Relationships.addRelationship(mediaOffset + mi, "http://schemas.microsoft.com/office/2007/relationships/media", `../media/${media.fileName}`);
+						slideWrapper.relationships.addRelationship(mediaOffset + mi, "http://schemas.microsoft.com/office/2007/relationships/media", `../media/${media.fileName}`);
 					});
 					slideVideoRefs.forEach((video, vi) => {
-						slideWrapper.Relationships.addRelationship(videoOffset + vi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", `../media/${video.fileName}`);
+						slideWrapper.relationships.addRelationship(videoOffset + vi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", `../media/${video.fileName}`);
 					});
 				}
 			}
@@ -5053,26 +5022,26 @@ var Compiler = class {
 				data: replacedSlideXml,
 				path: `ppt/slides/slide${i + 1}.xml`
 			};
-			if (file.SlideCommentLists[i]) slideWrapper.Relationships.addRelationship(slideWrapper.Relationships.RelationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", `../comments/comment${i + 1}.xml`);
-			const notesSlideIndex = file.NotesSlideIndexMap.get(i);
-			if (notesSlideIndex !== void 0) slideWrapper.Relationships.addRelationship(slideWrapper.Relationships.RelationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide", `../notesSlides/notesSlide${notesSlideIndex + 1}.xml`);
+			if (file.slideCommentLists[i]) slideWrapper.relationships.addRelationship(slideWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", `../comments/comment${i + 1}.xml`);
+			const notesSlideIndex = file.notesSlideIndexMap.get(i);
+			if (notesSlideIndex !== void 0) slideWrapper.relationships.addRelationship(slideWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide", `../notesSlides/notesSlide${notesSlideIndex + 1}.xml`);
 			mapping[`SlideRelationships${i}`] = {
-				data: xml(this.formatter.format(slideWrapper.Relationships, context), { declaration: false }),
+				data: xml(this.formatter.format(slideWrapper.relationships, context), { declaration: false }),
 				path: `ppt/slides/_rels/slide${i + 1}.xml.rels`
 			};
 		}
-		file.Charts.Array.forEach((_, i) => {
-			file.ContentTypes.addChart(i + 1);
+		file.charts.array.forEach((_, i) => {
+			file.contentTypes.addChart(i + 1);
 		});
-		file.SmartArts.Array.forEach((_, i) => {
-			file.ContentTypes.addDiagramData(i + 1);
-			file.ContentTypes.addDiagramLayout(i + 1);
-			file.ContentTypes.addDiagramStyle(i + 1);
-			file.ContentTypes.addDiagramColors(i + 1);
-			file.ContentTypes.addDiagramDrawing(i + 1);
+		file.smartArts.array.forEach((_, i) => {
+			file.contentTypes.addDiagramData(i + 1);
+			file.contentTypes.addDiagramLayout(i + 1);
+			file.contentTypes.addDiagramStyle(i + 1);
+			file.contentTypes.addDiagramColors(i + 1);
+			file.contentTypes.addDiagramDrawing(i + 1);
 		});
 		mapping["ContentTypes"] = {
-			data: xml(this.formatter.format(file.ContentTypes, context), { declaration: false }),
+			data: xml(this.formatter.format(file.contentTypes, context), { declaration: false }),
 			path: "[Content_Types].xml"
 		};
 		const files = {};
@@ -5081,8 +5050,8 @@ var Compiler = class {
 			files[entry.path] = textToUint8Array(entry.data);
 		}
 		for (const override of overrides) files[override.path] = override.data instanceof Uint8Array ? override.data : textToUint8Array(override.data);
-		for (let i = 0; i < file.Charts.Array.length; i++) {
-			const chartData = file.Charts.Array[i];
+		for (let i = 0; i < file.charts.array.length; i++) {
+			const chartData = file.charts.array[i];
 			files[`ppt/charts/chart${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(chartData.chartSpace, context), {
 				declaration,
 				indent
@@ -5092,8 +5061,8 @@ var Compiler = class {
 				standalone: "yes"
 			} }));
 		}
-		for (let i = 0; i < file.SmartArts.Array.length; i++) {
-			const smartArtData = file.SmartArts.Array[i];
+		for (let i = 0; i < file.smartArts.array.length; i++) {
+			const smartArtData = file.smartArts.array[i];
 			files[`ppt/diagrams/data${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(smartArtData.dataModel, context), {
 				declaration,
 				indent
@@ -5103,8 +5072,8 @@ var Compiler = class {
 			files[`ppt/diagrams/colors${i + 1}.xml`] = textToUint8Array(getColorXml(smartArtData.color));
 			files[`ppt/diagrams/drawing${i + 1}.xml`] = textToUint8Array(DEFAULT_DRAWING_XML);
 		}
-		for (let i = 0; i < file.NotesSlides.length; i++) {
-			const notesSlide = file.NotesSlides[i];
+		for (let i = 0; i < file.notesSlides.length; i++) {
+			const notesSlide = file.notesSlides[i];
 			files[`ppt/notesSlides/notesSlide${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(notesSlide, context), {
 				declaration,
 				indent
@@ -5114,16 +5083,16 @@ var Compiler = class {
 				standalone: "yes"
 			} }));
 		}
-		if (file.CommentAuthorList) files["ppt/commentAuthors.xml"] = textToUint8Array(xml(this.formatter.format(file.CommentAuthorList, context), {
+		if (file.commentAuthorList) files["ppt/commentAuthors.xml"] = textToUint8Array(xml(this.formatter.format(file.commentAuthorList, context), {
 			declaration,
 			indent
 		}));
-		const commentLists = file.SlideCommentLists;
+		const commentLists = file.slideCommentLists;
 		for (let i = 0; i < commentLists.length; i++) if (commentLists[i]) files[`ppt/comments/comment${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(commentLists[i], context), {
 			declaration,
 			indent
 		}));
-		for (const image of file.Media.Array) {
+		for (const image of file.media.array) {
 			files[`ppt/media/${image.fileName}`] = [image.data, { level: ZIP_STORED_LEVEL }];
 			if (image.type === "svg" && "fallback" in image) {
 				const fallback = image.fallback;
@@ -5354,17 +5323,19 @@ function parseAnimationEffect(el) {
 	}
 	const childTnLst = findChild(cTn, "p:childTnLst");
 	if (childTnLst) for (const sub of childTnLst.elements ?? []) switch (sub.name) {
-		case "p:animEffect": {
-			const subCTn = findChild(sub, "p:cTn");
-			if (subCTn) {
-				const subDur = attr(subCTn, "dur");
-				if (subDur) {
-					const ms = parseDuration(subDur);
-					if (ms !== void 0) opts.duration = ms;
+		case "p:animEffect":
+			if (opts.duration === void 0) {
+				const cBhvr = findChild(sub, "p:cBhvr");
+				const subCTn = cBhvr ? findChild(cBhvr, "p:cTn") : void 0;
+				if (subCTn) {
+					const subDur = attr(subCTn, "dur");
+					if (subDur) {
+						const ms = parseDuration(subDur);
+						if (ms !== void 0) opts.duration = ms;
+					}
 				}
 			}
 			break;
-		}
 		case "p:anim": {
 			const subCTn = findChild(sub, "p:cTn");
 			if (subCTn) {
@@ -5406,12 +5377,15 @@ function parseAnimationEffect(el) {
 		}
 		case "p:animScale":
 			opts.emphasisType = "growShrink";
+			readSubDuration(sub, opts);
 			break;
 		case "p:animRot":
 			opts.emphasisType = "spin";
+			readSubDuration(sub, opts);
 			break;
 		case "p:animClr":
 			opts.emphasisType = "colorChange";
+			readSubDuration(sub, opts);
 			break;
 		case "p:cmd":
 			if (attr(sub, "type") === "call") opts.mediaType = "play";
@@ -5441,6 +5415,21 @@ function findDeep$1(parent, name) {
 	return results;
 }
 /**
+* Read duration from p:cBhvr > p:cTn inside a sub-effect element.
+*/
+function readSubDuration(sub, opts) {
+	if (opts.duration !== void 0) return;
+	const cBhvr = findChild(sub, "p:cBhvr");
+	const subCTn = cBhvr ? findChild(cBhvr, "p:cTn") : void 0;
+	if (subCTn) {
+		const subDur = attr(subCTn, "dur");
+		if (subDur) {
+			const ms = parseDuration(subDur);
+			if (ms !== void 0) opts.duration = ms;
+		}
+	}
+}
+/**
 * Parse OOXML duration string to milliseconds.
 * Format: "PT#H#M#S" or "###ms" or just a number string
 */
@@ -5616,7 +5605,7 @@ function parseTransition(el) {
 	}
 	return opts;
 }
-function parseShape(el, _ctx) {
+function parseShape(el, ctx) {
 	const opts = {};
 	const nvSpPr = findChild(el, "p:nvSpPr");
 	if (nvSpPr) {
@@ -5650,7 +5639,7 @@ function parseShape(el, _ctx) {
 		if (effects) opts.effects = effects;
 	}
 	const txBody = findChild(el, "p:txBody");
-	if (txBody) parseTextBody(txBody, opts);
+	if (txBody) parseTextBody(txBody, opts, ctx.slideRels);
 	return opts;
 }
 function parseLineShape(el) {
@@ -5715,7 +5704,7 @@ function parsePicture(el, ctx) {
 	}
 	const nvPicPr = findChild(el, "p:nvPicPr");
 	if (nvPicPr) {
-		const cNvPr = findChild(nvPicPr, "p:cNvPr");
+		const cNvPr = findChild(nvPicPr, "a:cNvPr") ?? findChild(nvPicPr, "p:cNvPr");
 		if (cNvPr) {
 			const name = attr(cNvPr, "name");
 			if (name) opts.name = name;
@@ -5998,6 +5987,20 @@ function parseTableCell(tc) {
 	if (txBody) {
 		const paragraphs = parseParagraphsFromTxBody(txBody);
 		if (paragraphs.length > 0) opts.children = paragraphs;
+		const bodyPr = findChild(txBody, "a:bodyPr");
+		if (bodyPr) {
+			const margins = {};
+			for (const [attrName, key] of [
+				["tIns", "top"],
+				["bIns", "bottom"],
+				["lIns", "left"],
+				["rIns", "right"]
+			]) {
+				const val = attrNum(bodyPr, attrName);
+				if (val !== void 0) margins[key] = val;
+			}
+			if (Object.keys(margins).length > 0) opts.margins = margins;
+		}
 	}
 	const tcPr = findChild(tc, "a:tcPr");
 	if (tcPr) {
@@ -6006,9 +6009,9 @@ function parseTableCell(tc) {
 		const anchor = attr(tcPr, "anchor");
 		if (anchor) {
 			const anchorMap = {
-				t: "TOP",
-				ctr: "CENTER",
-				b: "BOTTOM"
+				t: "top",
+				ctr: "center",
+				b: "bottom"
 			};
 			if (anchor in anchorMap) opts.verticalAlign = anchorMap[anchor];
 		}
@@ -6035,7 +6038,7 @@ function parseTableCell(tc) {
 				const borderOpts = {};
 				if (w !== void 0) borderOpts.width = w;
 				const fill = parseFillFromElement(borderEl);
-				if (fill) borderOpts.fill = fill;
+				if (typeof fill === "string") borderOpts.color = fill;
 				if (Object.keys(borderOpts).length > 0) borders[key] = borderOpts;
 			}
 		}
@@ -6136,22 +6139,23 @@ function parseGroup(el, ctx) {
 	opts.children = groupChildren;
 	return opts;
 }
-function parseTextBody(txBody, opts) {
+function parseTextBody(txBody, opts, rels) {
+	const textBody = {};
 	const bodyPr = findChild(txBody, "a:bodyPr");
 	if (bodyPr) {
 		const vert = attr(bodyPr, "vert");
-		if (vert) opts.textVertical = vert;
+		if (vert) textBody.vertical = vert;
 		const anchor = attr(bodyPr, "anchor");
 		if (anchor) {
 			const anchorMap = {
-				t: "TOP",
-				ctr: "CENTER",
-				b: "BOTTOM"
+				t: "top",
+				ctr: "center",
+				b: "bottom"
 			};
-			if (anchor in anchorMap) opts.textAnchor = anchorMap[anchor];
+			if (anchor in anchorMap) textBody.anchor = anchorMap[anchor];
 		}
 		const wrap = attr(bodyPr, "wrap");
-		if (wrap) opts.textWrap = wrap;
+		if (wrap) textBody.wrap = wrap;
 		const tIns = attrNum(bodyPr, "tIns");
 		const bIns = attrNum(bodyPr, "bIns");
 		const lIns = attrNum(bodyPr, "lIns");
@@ -6161,34 +6165,36 @@ function parseTextBody(txBody, opts) {
 		if (bIns !== void 0) margins.bottom = bIns;
 		if (lIns !== void 0) margins.left = lIns;
 		if (rIns !== void 0) margins.right = rIns;
-		if (Object.keys(margins).length > 0) opts.textMargins = margins;
+		if (Object.keys(margins).length > 0) textBody.margins = margins;
 		const numCol = attrNum(bodyPr, "numCol");
-		if (numCol !== void 0) opts.textColumns = numCol;
+		if (numCol !== void 0) textBody.columns = numCol;
 		const spcCol = attrNum(bodyPr, "spcCol");
-		if (spcCol !== void 0) opts.textColumnSpacing = spcCol / 100;
-		if (findChild(bodyPr, "a:normAutofit")) opts.textAutoFit = "normal";
-		else if (findChild(bodyPr, "a:spAutoFit")) opts.textAutoFit = "shape";
-		else if (findChild(bodyPr, "a:noAutofit")) opts.textAutoFit = "none";
+		if (spcCol !== void 0) textBody.columnSpacing = spcCol / 100;
+		if (findChild(bodyPr, "a:normAutofit")) textBody.autoFit = "normal";
+		else if (findChild(bodyPr, "a:spAutoFit")) textBody.autoFit = "shape";
+		else if (findChild(bodyPr, "a:noAutofit")) textBody.autoFit = "none";
 	}
-	const paragraphs = parseParagraphsFromTxBody(txBody);
+	const paragraphs = parseParagraphsFromTxBody(txBody, rels);
 	if (paragraphs.length === 1) {
 		const p = paragraphs[0];
 		if (p.text && !p.children) {
 			const props = p.properties;
 			if (!(props && Object.keys(props).some((k) => k !== "bullet" || props[k]?.type !== "none"))) {
-				opts.text = p.text;
+				textBody.text = p.text;
+				opts.textBody = textBody;
 				return;
 			}
 		}
 	}
-	if (paragraphs.length > 0) opts.paragraphs = paragraphs;
+	if (paragraphs.length > 0) textBody.children = paragraphs;
+	if (Object.keys(textBody).length > 0) opts.textBody = textBody;
 }
-function parseParagraphsFromTxBody(txBody) {
+function parseParagraphsFromTxBody(txBody, rels) {
 	const paragraphs = [];
-	for (const pEl of children(txBody, "a:p")) paragraphs.push(parseParagraph(pEl));
+	for (const pEl of children(txBody, "a:p")) paragraphs.push(parseParagraph(pEl, rels));
 	return paragraphs;
 }
-function parseParagraph(el) {
+function parseParagraph(el, rels) {
 	const opts = {};
 	const pPr = findChild(el, "a:pPr");
 	if (pPr) {
@@ -6196,10 +6202,10 @@ function parseParagraph(el) {
 		const algn = attr(pPr, "algn");
 		if (algn) {
 			const alignMap = {
-				l: "LEFT",
-				ctr: "CENTER",
-				r: "RIGHT",
-				just: "JUSTIFY"
+				l: "left",
+				ctr: "center",
+				r: "right",
+				just: "justify"
 			};
 			if (algn in alignMap) props.alignment = alignMap[algn];
 		}
@@ -6219,7 +6225,7 @@ function parseParagraph(el) {
 			if (buClr) {
 				const srgbClr = findChild(buClr, "a:srgbClr");
 				if (srgbClr) {
-					const val = attr(srgbClr, "val");
+					const val = colorAttr(srgbClr, "val");
 					if (val) bulletOpts.color = val;
 				}
 			}
@@ -6270,12 +6276,12 @@ function parseParagraph(el) {
 		if (Object.keys(props).length > 0) opts.properties = props;
 	}
 	const runs = [];
-	for (const rEl of children(el, "a:r")) runs.push(parseRun(rEl));
+	for (const rEl of children(el, "a:r")) runs.push(parseRun(rEl, rels));
 	if (runs.length === 1 && Object.keys(runs[0]).length === 1 && runs[0].text) opts.text = runs[0].text;
 	else if (runs.length > 0) opts.children = runs;
 	return opts;
 }
-function parseRun(el) {
+function parseRun(el, rels) {
 	const opts = {};
 	const rPr = findChild(el, "a:rPr");
 	if (rPr) {
@@ -6288,9 +6294,9 @@ function parseRun(el) {
 		const u = attr(rPr, "u");
 		if (u) {
 			const underlineMap = {
-				sng: "SINGLE",
-				dbl: "DOUBLE",
-				none: "NONE"
+				sng: "single",
+				dbl: "double",
+				none: "none"
 			};
 			if (u in underlineMap) opts.underline = underlineMap[u];
 		}
@@ -6299,9 +6305,9 @@ function parseRun(el) {
 		const strike = attr(rPr, "strike");
 		if (strike) {
 			const strikeMap = {
-				sngStrike: "SINGLE",
-				dblStrike: "DOUBLE",
-				noStrike: "NONE"
+				sngStrike: "sngStrike",
+				dblStrike: "dblStrike",
+				noStrike: "noStrike"
 			};
 			if (strike in strikeMap) opts.strike = strikeMap[strike];
 		}
@@ -6310,9 +6316,9 @@ function parseRun(el) {
 		const cap = attr(rPr, "cap");
 		if (cap) {
 			const capMap = {
-				none: "NONE",
-				all: "ALL",
-				small: "SMALL"
+				none: "none",
+				all: "all",
+				small: "small"
 			};
 			if (cap in capMap) opts.capitalization = capMap[cap];
 		}
@@ -6325,6 +6331,19 @@ function parseRun(el) {
 		}
 		const fill = parseFillFromElement(rPr);
 		if (fill) opts.fill = fill;
+		const hlinkClick = findChild(rPr, "a:hlinkClick");
+		if (hlinkClick && rels) {
+			const rId = attr(hlinkClick, "r:id");
+			if (rId) {
+				const url = rels.get(rId);
+				if (url) {
+					const hyperlink = { url };
+					const tooltip = attr(hlinkClick, "tooltip");
+					if (tooltip) hyperlink.tooltip = tooltip;
+					opts.hyperlink = hyperlink;
+				}
+			}
+		}
 	}
 	const t = findChild(el, "a:t");
 	if (t) opts.text = textOf(t) ?? "";
@@ -6380,7 +6399,7 @@ function parseFillFromElement(parent) {
 	const solidFill = findChild(parent, "a:solidFill");
 	if (solidFill) {
 		const srgbClr = findChild(solidFill, "a:srgbClr");
-		if (srgbClr) return attr(srgbClr, "val");
+		if (srgbClr) return colorAttr(srgbClr, "val");
 		const schemeClr = findChild(solidFill, "a:schemeClr");
 		if (schemeClr) return {
 			type: "scheme",
@@ -6398,7 +6417,7 @@ function parseFillFromElement(parent) {
 		if (fgClr) {
 			const srgbClr = findChild(fgClr, "a:srgbClr");
 			if (srgbClr) {
-				const val = attr(srgbClr, "val");
+				const val = colorAttr(srgbClr, "val");
 				if (val) result.foregroundColor = val;
 			}
 		}
@@ -6406,7 +6425,7 @@ function parseFillFromElement(parent) {
 		if (bgClr) {
 			const srgbClr = findChild(bgClr, "a:srgbClr");
 			if (srgbClr) {
-				const val = attr(srgbClr, "val");
+				const val = colorAttr(srgbClr, "val");
 				if (val) result.backgroundColor = val;
 			}
 		}
@@ -6425,8 +6444,8 @@ function parseFillFromElement(parent) {
 			const pos = attrNum(gs, "pos");
 			const srgbClr = findChild(gs, "a:srgbClr");
 			if (pos !== void 0 && srgbClr) stops.push({
-				position: pos / 1e5,
-				color: attr(srgbClr, "val") ?? ""
+				position: pos / 1e3,
+				color: colorAttr(srgbClr, "val") ?? ""
 			});
 		}
 		if (stops.length > 0) {
@@ -6439,6 +6458,11 @@ function parseFillFromElement(parent) {
 				const ang = attrNum(lin, "ang");
 				if (ang !== void 0) result.angle = Math.round(ang / 6e4);
 			}
+			const pathEl = findChild(gradFill, "a:path");
+			if (pathEl) {
+				const pathType = attr(pathEl, "path");
+				if (pathType) result.path = pathType;
+			}
 			return result;
 		}
 	}
@@ -6453,7 +6477,7 @@ function parseOutlineFromElement(parent) {
 	if (solidFill) {
 		const srgbClr = findChild(solidFill, "a:srgbClr");
 		if (srgbClr) {
-			const val = attr(srgbClr, "val");
+			const val = colorAttr(srgbClr, "val");
 			if (val) opts.color = val;
 		}
 	}
@@ -6465,10 +6489,10 @@ function parseOutlineFromElement(parent) {
 	return Object.keys(opts).length > 0 ? opts : void 0;
 }
 function parseEffectsFromElement(parent) {
-	const effectLst = findChild(findChild(parent, "p:spPr") ?? parent, "a:effectLst");
-	if (!effectLst) return void 0;
+	const spPr = findChild(parent, "p:spPr") ?? parent;
 	const opts = {};
-	for (const child of effectLst.elements ?? []) {
+	const effectLst = findChild(spPr, "a:effectLst");
+	if (effectLst) for (const child of effectLst.elements ?? []) {
 		if (!child.name) continue;
 		switch (child.name) {
 			case "a:outerShdw": {
@@ -6523,6 +6547,10 @@ function parseEffectsFromElement(parent) {
 				if (dist !== void 0) reflection.distance = dist;
 				const dir = attrNum(child, "dir");
 				if (dir !== void 0) reflection.direction = dir;
+				const stA = attrNum(child, "stA");
+				if (stA !== void 0) reflection.startAlpha = stA / 1e3;
+				const endA = attrNum(child, "endA");
+				if (endA !== void 0) reflection.endAlpha = endA / 1e3;
 				opts.reflection = reflection;
 				break;
 			}
@@ -6533,6 +6561,63 @@ function parseEffectsFromElement(parent) {
 			}
 		}
 	}
+	const scene3d = findChild(spPr, "a:scene3d");
+	if (scene3d) {
+		const camera = findChild(scene3d, "a:camera");
+		if (camera) {
+			const rot = findChild(camera, "a:rot");
+			if (rot) {
+				const rotation3d = {};
+				const lat = attrNum(rot, "lat");
+				const lon = attrNum(rot, "lon");
+				const rev = attrNum(rot, "rev");
+				if (lat !== void 0) rotation3d.x = Math.round(lat / 6e4);
+				if (lon !== void 0) rotation3d.y = Math.round(lon / 6e4);
+				if (rev !== void 0) rotation3d.z = Math.round(rev / 6e4);
+				const fov = attrNum(camera, "fov");
+				if (fov !== void 0) rotation3d.perspective = fov;
+				if (Object.keys(rotation3d).length > 0) opts.rotation3D = rotation3d;
+			}
+		}
+		const lightRig = findChild(scene3d, "a:lightRig");
+		if (lightRig) {
+			const rig = attr(lightRig, "rig");
+			if (rig) opts.lighting = rig;
+		}
+	}
+	const sp3d = findChild(spPr, "a:sp3d");
+	if (sp3d) {
+		const bevelT = findChild(sp3d, "a:bevelT");
+		if (bevelT) {
+			const bevel = {};
+			const w = attrNum(bevelT, "w");
+			const h = attrNum(bevelT, "h");
+			if (w !== void 0) bevel.width = Math.round(w / 12700);
+			if (h !== void 0) bevel.height = Math.round(h / 12700);
+			const prst = attr(bevelT, "prst");
+			if (prst) bevel.preset = prst;
+			if (Object.keys(bevel).length > 0) opts.bevelTop = bevel;
+		}
+		const bevelB = findChild(sp3d, "a:bevelB");
+		if (bevelB) {
+			const bevel = {};
+			const w = attrNum(bevelB, "w");
+			const h = attrNum(bevelB, "h");
+			if (w !== void 0) bevel.width = Math.round(w / 12700);
+			if (h !== void 0) bevel.height = Math.round(h / 12700);
+			const prst = attr(bevelB, "prst");
+			if (prst) bevel.preset = prst;
+			if (Object.keys(bevel).length > 0) opts.bevelBottom = bevel;
+		}
+		const z = attrNum(sp3d, "z");
+		if (z !== void 0) opts.depth = z;
+		const contourW = attrNum(sp3d, "contourW");
+		if (contourW !== void 0) opts.contourWidth = contourW;
+		const extrusionH = attrNum(sp3d, "extrusionH");
+		if (extrusionH !== void 0) opts.extrusionH = extrusionH;
+		const prstMaterial = attr(sp3d, "prstMaterial");
+		if (prstMaterial) opts.material = prstMaterial;
+	}
 	return Object.keys(opts).length > 0 ? opts : void 0;
 }
 /**
@@ -6541,7 +6626,7 @@ function parseEffectsFromElement(parent) {
 */
 function extractColorFromElement(el) {
 	for (const child of el.elements ?? []) if (child.name === "a:srgbClr") {
-		const color = attr(child, "val");
+		const color = colorAttr(child, "val");
 		let alpha;
 		for (const transform of child.elements ?? []) if (transform.name === "a:alpha") {
 			const val = attrNum(transform, "val");
@@ -6629,23 +6714,24 @@ function parseMediaFrame(el, ctx, mediaKind) {
 	if (spPr) parseTransformFromSpPr(spPr, opts);
 	const nvPicPr = findChild(el, "p:nvPicPr");
 	if (nvPicPr) {
-		const cNvPr = findChild(nvPicPr, "p:cNvPr");
+		const cNvPr = findChild(nvPicPr, "a:cNvPr") ?? findChild(nvPicPr, "p:cNvPr");
 		if (cNvPr) {
 			const name = attr(cNvPr, "name");
 			if (name) opts.name = name;
 		}
 	}
-	const blip = findDeep(el, "a:blip")[0];
-	if (blip) {
-		const rEmbed = attr(blip, "r:embed");
-		if (rEmbed) {
-			const mediaPath = ctx.slideRels.get(rEmbed);
-			if (mediaPath) {
-				const data = ctx.pptx.doc.getRaw(mediaPath);
-				if (data) {
-					opts.data = data;
-					opts.type = mediaTypeFromPath(mediaPath, mediaKind);
-				}
+	const mediaFileEl = findDeep(el, "a:videoFile")[0] ?? findDeep(el, "a:audioFile")[0];
+	const rLink = mediaFileEl ? attr(mediaFileEl, "r:link") : void 0;
+	const p14media = !mediaFileEl ? findDeep(el, "p14:media")[0] : void 0;
+	const rEmbed = p14media ? attr(p14media, "r:embed") : void 0;
+	const mediaRef = rLink ?? rEmbed;
+	if (mediaRef) {
+		const mediaPath = ctx.slideRels.get(mediaRef);
+		if (mediaPath) {
+			const data = ctx.pptx.doc.getRaw(mediaPath);
+			if (data) {
+				opts.data = data;
+				opts.type = mediaTypeFromPath(mediaPath, mediaKind);
 			}
 		}
 	}
@@ -6739,7 +6825,7 @@ const COLOR_MAP = {
 };
 function extractColor(el) {
 	const srgb = findChild(el, "a:srgbClr");
-	if (srgb) return attr(srgb, "val") ?? void 0;
+	if (srgb) return colorAttr(srgb, "val") ?? void 0;
 	const sysClr = findChild(el, "a:sysClr");
 	if (sysClr) return attr(sysClr, "lastClr") ?? void 0;
 }
@@ -6921,7 +7007,8 @@ function parseSlideRelMap(doc, slidePath) {
 		const id = attr(child, "Id") ?? "";
 		const target = attr(child, "Target") ?? "";
 		if (!id || !target) continue;
-		rels.set(id, resolveRelsPath(target));
+		if (attr(child, "TargetMode") === "External") rels.set(id, target);
+		else rels.set(id, resolveRelsPath(target));
 	}
 	return rels;
 }
@@ -7004,6 +7091,24 @@ function parsePresentation(data) {
 		const bg = cSld ? findChild(cSld, "p:bg") : void 0;
 		const masterBackground = bg ? parseBackground(bg) : void 0;
 		const hasBackground = masterBackground && Object.keys(masterBackground).length > 0;
+		const spTree = cSld ? findChild(cSld, "p:spTree") : void 0;
+		const masterChildren = [];
+		if (spTree) {
+			const emptyCtx = {
+				pptx,
+				slideRels: /* @__PURE__ */ new Map()
+			};
+			for (const child of spTree.elements ?? []) {
+				if (child.name === "p:nvGrpSpPr" || child.name === "p:grpSpPr") continue;
+				if (child.name === "p:sp") {
+					const nvSpPr = findChild(child, "p:nvSpPr");
+					const nvPr = nvSpPr ? findChild(nvSpPr, "p:nvPr") : void 0;
+					if (nvPr && findChild(nvPr, "p:ph")) continue;
+				}
+				const parsed = parseSlideChild(child, emptyCtx);
+				if (parsed !== void 0) masterChildren.push(parsed);
+			}
+		}
 		const masterLayouts = [];
 		for (const layoutPath of pptx.slideLayouts) {
 			if (layoutMasterPaths.get(layoutPath) !== masterPath) continue;
@@ -7015,6 +7120,7 @@ function parsePresentation(data) {
 		masterDef.name = masterName;
 		if (themeOptions) masterDef.theme = themeOptions;
 		if (hasBackground) masterDef.background = masterBackground;
+		if (masterChildren.length > 0) masterDef.children = masterChildren;
 		if (masterLayouts.length > 0) masterDef.layouts = masterLayouts;
 		masterDefs.push(masterDef);
 	}
@@ -7064,8 +7170,9 @@ function parsePresentation(data) {
 				const pos = findChild(cm, "p:pos");
 				const x = pos ? attrNum(pos, "x") : void 0;
 				const y = pos ? attrNum(pos, "y") : void 0;
+				const textEl = findChild(cm, "p:text");
 				const txBody = findChild(cm, "p:txBody");
-				const text = txBody ? extractCommentText(txBody) : "";
+				const text = textEl ? textOf(textEl) ?? "" : txBody ? extractCommentText(txBody) : "";
 				const commentEntry = {};
 				if (authorId !== void 0) commentEntry.authorId = authorId;
 				if (author) commentEntry.author = author.name;