@shbernal/pptxgenjs 5.2.0 → 5.4.0

package/dist/{pptxgen--5RWzhb4.js → pptxgen-S8dEuBnC.js}

@@ -1,32 +1,25 @@
-import { a as emuToInches, c as inchesToEmu, i as STANDARD_LAYOUTS } from "./units-DmzbVUNp.js";
-import { A as DEF_TEXT_GLOW, B as ONEPT, D as DEF_SHAPE_SHADOW, G as SCHEME_COLOR_NAMES, H as PIECHART_COLORS, I as LAYOUT_IDX_SERIES_BASE, K as SHAPE_TYPE, L as LETTERS, M as EMU, N as IMG_BROKEN, R as LINEH_MODIFIER, T as DEF_PRES_LAYOUT_NAME, U as PLACEHOLDER_TYPES, V as OutputType, W as REGEX_HEX_COLOR, X as ShapeType, Y as SchemeColor, _ as DEF_CELL_MARGIN_IN, a as AXIS_ID_SERIES_PRIMARY, b as DEF_CHART_GRIDLINE, c as AlignH, f as CHART_TYPE, g as DEF_CELL_BORDER, i as AXIS_ID_CATEGORY_SECONDARY, j as DEF_TEXT_SHADOW, k as DEF_SLIDE_MARGIN_IN, l as AlignV, m as ChartType, o as AXIS_ID_VALUE_PRIMARY, q as SLDNUMFLDID, r as AXIS_ID_CATEGORY_PRIMARY, s as AXIS_ID_VALUE_SECONDARY, u as BARCHART_COLORS, w as DEF_PRES_LAYOUT, x as DEF_FONT_COLOR, y as DEF_CHART_BORDER } from "./core-interfaces-vUc0ElZs.js";
+import { a as coordToEmu, i as STANDARD_LAYOUTS, l as inchesToEmu, o as emuToInches } from "./units-BMrBTU0-.js";
+import { A as DEF_SLIDE_MARGIN_IN, E as DEF_PRES_LAYOUT_NAME, G as REGEX_HEX_COLOR, H as OutputType, J as SLDNUMFLDID, K as SCHEME_COLOR_NAMES, L as LAYOUT_IDX_SERIES_BASE, M as DEF_TEXT_SHADOW, N as EMU, O as DEF_SHAPE_SHADOW, P as IMG_BROKEN, R as LETTERS, S as DEF_FONT_COLOR, T as DEF_PRES_LAYOUT, U as PIECHART_COLORS, V as ONEPT, W as PLACEHOLDER_TYPES, X as SchemeColor, Z as ShapeType, _ as DEF_CELL_BORDER, a as AXIS_ID_SERIES_PRIMARY, b as DEF_CHART_BORDER, c as AlignH, f as CHART_TYPE, h as ChartType, i as AXIS_ID_CATEGORY_SECONDARY, j as DEF_TEXT_GLOW, l as AlignV, o as AXIS_ID_VALUE_PRIMARY, p as CONNECTOR_PRESETS, q as SHAPE_TYPE, r as AXIS_ID_CATEGORY_PRIMARY, s as AXIS_ID_VALUE_SECONDARY, tt as VALID_SHAPE_PRESETS, u as BARCHART_COLORS, v as DEF_CELL_MARGIN_IN, x as DEF_CHART_GRIDLINE, z as LINEH_MODIFIER } from "./core-interfaces-C091uvh_.js";
 import JSZip from "jszip";
 //#region src/gen-utils.ts
 /**
 * PptxGenJS: Utility Methods
 */
 /**
-* Translates any type of `x`/`y`/`w`/`h` prop to EMU
-* - guaranteed to return a result regardless of undefined, null, etc. (0)
-* - {number} - 12800 (EMU)
-* - {number} - 0.5 (inches)
-* - {string} - "75%"
-* @param {number|string} size - numeric ("5.5") or percentage ("90%")
-* @param {'X' | 'Y'} xyDir - direction
-* @param {PresLayout} layout - presentation layout
-* @returns {number} calculated size
+* Resolve a user `Coord` (x/y/w/h) to EMU — the single user-coordinate → EMU boundary.
+* - bare `number` → **inches** (no magnitude guessing); `"<n>%"` → percent of the slide axis;
+*   `"<n>in"`/`"<n>pt"`/`"<n>emu"` → explicit units (see {@link Coord} / {@link coordToEmu})
+* - `null`/`undefined` → 0 (callers may omit a coordinate)
+* - throws on a non-finite number rather than silently collapsing the object to zero size
+* @param {Coord|null|undefined} size - user coordinate
+* @param {'X' | 'Y'} xyDir - axis (selects slide width vs height for percentages)
+* @param {PresLayout} layout - presentation layout (EMU dimensions)
+* @returns {Emu} resolved EMU value
 */
 function getSmartParseNumber(size, xyDir, layout) {
-	if (typeof size === "string" && !isNaN(Number(size))) size = Number(size);
+	if (size === null || size === void 0) return 0;
 	if (typeof size === "number" && !isFinite(size)) throw new Error(`Invalid ${xyDir || "coordinate"} value: expected a finite number but received ${String(size)}. This usually means a layout dimension was read from a missing property (e.g. \`layout.width\` returning \`undefined\`). Use \`slide.width\`/\`slide.height\` or \`STANDARD_LAYOUTS.<NAME>.width\`/\`.height\` (inches).`);
-	if (typeof size === "number" && size < 100) return inch2Emu(size);
-	if (typeof size === "number" && size >= 100) return size;
-	if (typeof size === "string" && size.includes("%")) {
-		if (xyDir && xyDir === "X") return Math.round(parseFloat(size) / 100 * layout.width);
-		if (xyDir && xyDir === "Y") return Math.round(parseFloat(size) / 100 * layout.height);
-		return Math.round(parseFloat(size) / 100 * layout.width);
-	}
-	return 0;
+	return coordToEmu(size, xyDir === "Y" ? layout.height : layout.width);
 }
 /**
 * Basic UUID Generator Adapted
@@ -99,14 +92,16 @@ function getDuplicateObjectNames(names) {
 	return Array.from(dupes);
 }
 /**
-* Convert inches into EMU
-* @param {number|string} inches - as string or number
-* @returns {number} EMU value
+* Convert inches into EMU.
+* - accepts a number (inches) or a numeric/`"<n>in"` string
+* - no magnitude guessing: values are always treated as inches (use {@link coordToEmu} for
+*   user coordinates that may carry other units)
+* @param {number|string} inches - inches as number or string
+* @returns {Emu} EMU value
 */
 function inch2Emu(inches) {
-	if (typeof inches === "number" && inches > 100) return inches;
 	if (typeof inches === "string") inches = Number(inches.replace(/in*/gi, ""));
-	return Math.round(EMU * inches);
+	return inchesToEmu(inches);
 }
 /**
 * Convert `pt` into points (using `ONEPT`)
@@ -118,6 +113,33 @@ function valToPts(pt) {
 	return isNaN(points) ? 0 : Math.round(points * ONEPT);
 }
 /**
+* Convert a transparency percentage (0-100) into a schema-valid `<a:alpha>` value
+* (ST_PositiveFixedPercentage, 0-100000). Out-of-range transparency yields an
+* alpha that PowerPoint rejects as needing repair, so clamp into range and warn.
+*/
+function transparencyToAlpha(transparency) {
+	const pct = Math.min(100, Math.max(0, transparency));
+	if (pct !== transparency) console.warn(`Warning: transparency ${transparency} is outside the valid range 0-100; using ${pct}.`);
+	return Math.round((100 - pct) * 1e3);
+}
+/** Convert an opacity (0-1) into a schema-valid `<a:alpha>` value (0-100000); clamps + warns on out-of-range input. */
+function opacityToAlpha(opacity) {
+	const o = Math.min(1, Math.max(0, opacity));
+	if (o !== opacity) console.warn(`Warning: opacity ${opacity} is outside the valid range 0-1; using ${o}.`);
+	return Math.round(o * 1e5);
+}
+/**
+* Convert a line width (points) to EMU clamped into ST_LineWidth (0..20116800 EMU,
+* i.e. 0-1584pt). Out-of-range widths make PowerPoint report the package as needing
+* repair, so clamp into range and warn.
+*/
+function lineWidthToEmu(widthPts) {
+	const raw = valToPts(widthPts);
+	const clamped = Math.min(20116800, Math.max(0, raw));
+	if (clamped !== raw) console.warn(`Warning: line width ${widthPts} is outside the valid range 0-1584pt; using ${clamped / ONEPT}.`);
+	return clamped;
+}
+/**
 * Convert degrees (0..360) to PowerPoint `rot` value
 * @param {number} d degrees
 * @returns {number} calculated `rot` value
@@ -165,8 +187,10 @@ function createColorElement(colorStr, innerElements) {
 	}
 	let colorVal = (colorStr || "").replace("#", "");
 	if (/^[0-9a-fA-F]{8}$/.test(colorVal)) {
-		const alphaHex = colorVal.slice(6, 8);
-		innerElements = `<a:alpha val="${Math.round(parseInt(alphaHex, 16) / 255 * 1e5)}"/>${innerElements || ""}`;
+		if (!innerElements?.includes("<a:alpha")) {
+			const alphaHex = colorVal.slice(6, 8);
+			innerElements = `<a:alpha val="${Math.round(parseInt(alphaHex, 16) / 255 * 1e5)}"/>${innerElements || ""}`;
+		}
 		colorVal = colorVal.slice(0, 6);
 	}
 	if (!REGEX_HEX_COLOR.test(colorVal) && colorVal !== "bg1" && colorVal !== "bg2" && colorVal !== "tx1" && colorVal !== "tx2" && colorVal !== "accent1" && colorVal !== "accent2" && colorVal !== "accent3" && colorVal !== "accent4" && colorVal !== "accent5" && colorVal !== "accent6") {
@@ -192,12 +216,38 @@ function createGlowElement(options, defaults) {
 	};
 	const size = Math.round(opts.size * ONEPT);
 	const color = opts.color || "000000";
-	const opacity = Math.round((opts.opacity ?? 0) * 1e5);
+	const opacity = opacityToAlpha(opts.opacity ?? 0);
 	strXml += `<a:glow rad="${size}">`;
 	strXml += createColorElement(color, `<a:alpha val="${opacity}"/>`);
 	strXml += "</a:glow>";
 	return strXml;
 }
+/**
+* Creates an `a:outerShdw`/`a:innerShdw` element for a text run or shape.
+* Returns the shadow element only (no wrapping `a:effectLst`) so callers can
+* combine it with other effects (e.g. glow) inside a single `a:effectLst`.
+* @param {ShadowProps} options shadow properties
+* @param {ShadowProps} defaults defaults for unspecified properties in `options`
+* @see http://officeopenxml.com/drwSp-effects.php
+* @returns {string} XML string, or '' when type is 'none'
+*/
+function createShadowElement$1(options, defaults) {
+	const opts = {
+		...defaults,
+		...options
+	};
+	if (opts.type === "none") return "";
+	const type = opts.type || "outer";
+	const blur = valToPts(opts.blur ?? 0);
+	const offset = valToPts(opts.offset ?? 0);
+	const angle = Math.round((opts.angle ?? 0) * 6e4);
+	const opacity = Math.round((opts.opacity ?? .75) * 1e5);
+	const color = opts.color || "000000";
+	let strXml = `<a:${type}Shdw ${type === "outer" ? "sx=\"100000\" sy=\"100000\" kx=\"0\" ky=\"0\" algn=\"bl\" rotWithShape=\"0\" " : ""}blurRad="${blur}" dist="${offset}" dir="${angle}">`;
+	strXml += createColorElement(color, `<a:alpha val="${opacity}"/>`);
+	strXml += `</a:${type}Shdw>`;
+	return strXml;
+}
 function boolToXml(value) {
 	return value ? "1" : "0";
 }
@@ -208,8 +258,8 @@ function normalizeGradientAngle(angle) {
 }
 function gradientStopColorAdjustments(stop) {
 	let internalElements = "";
-	if (stop.alpha) internalElements += `<a:alpha val="${Math.round((100 - stop.alpha) * 1e3)}"/>`;
-	if (stop.transparency) internalElements += `<a:alpha val="${Math.round((100 - stop.transparency) * 1e3)}"/>`;
+	if (stop.alpha) internalElements += `<a:alpha val="${transparencyToAlpha(stop.alpha)}"/>`;
+	if (stop.transparency) internalElements += `<a:alpha val="${transparencyToAlpha(stop.transparency)}"/>`;
 	return internalElements;
 }
 function normalizeGradientStops(stops) {
@@ -259,6 +309,17 @@ function genXmlPatternFill(pattern) {
 * @param {Color | ShapeFillProps | ShapeLineProps} props fill props
 * @returns XML string
 */
+/**
+* Map a friendly `LineCap` value to the OOXML `cap` attribute value (`flat`/`sq`/`rnd`).
+* @param {LineCap} [lineCap] - line cap style (defaults to `flat`)
+* @returns {string} value for the `cap` attribute on `<a:ln>`
+*/
+function createLineCap(lineCap) {
+	if (!lineCap || lineCap === "flat") return "flat";
+	else if (lineCap === "square") return "sq";
+	else if (lineCap === "round") return "rnd";
+	else throw new Error(`Invalid line cap: ${String(lineCap)}`);
+}
 function genXmlColorSelection(props) {
 	let fillType = "solid";
 	let colorVal = "";
@@ -269,8 +330,8 @@ function genXmlColorSelection(props) {
 		else {
 			if (props.type) fillType = props.type;
 			if (props.color) colorVal = props.color;
-			if (props.alpha) internalElements += `<a:alpha val="${Math.round((100 - props.alpha) * 1e3)}"/>`;
-			if (props.transparency) internalElements += `<a:alpha val="${Math.round((100 - props.transparency) * 1e3)}"/>`;
+			if (props.alpha) internalElements += `<a:alpha val="${transparencyToAlpha(props.alpha)}"/>`;
+			if (props.transparency) internalElements += `<a:alpha val="${transparencyToAlpha(props.transparency)}"/>`;
 		}
 		switch (fillType) {
 			case "solid":
@@ -368,15 +429,16 @@ function decodeBase64ToBytes(b64) {
 	}
 }
 /**
-* Read the intrinsic pixel dimensions of a raster image from its header bytes.
+* Read the intrinsic dimensions of an image from its header bytes.
 * - synchronous: parses only file-format headers, never decodes pixels
-* - supports PNG, JPEG, GIF, BMP, and WebP (VP8 / VP8L / VP8X)
-* - vector (SVG) and unrecognized formats return `null` (no intrinsic pixel size)
+* - raster: PNG, JPEG, GIF, BMP, and WebP (VP8 / VP8L / VP8X) — natural pixels
+* - vector: SVG — intrinsic size from the root `<svg>` width/height or viewBox
+* - unrecognized formats return `null` (no measurable intrinsic size)
 *
 * Used by image `sizing: 'cover' | 'contain'` to compute an aspect-correct
 * `<a:srcRect>` crop from the *natural* image ratio rather than the displayed box.
 * @param {string} dataB64 - base64 image payload or `data:` URI
-* @returns {{ w: number, h: number } | null} natural pixel size, or `null` when unmeasurable
+* @returns {{ w: number, h: number } | null} natural size, or `null` when unmeasurable
 */
 function getImageSizeFromBase64(dataB64) {
 	const b = decodeBase64ToBytes(dataB64);
@@ -462,8 +524,46 @@ function getImageSizeFromBase64(dataB64) {
 		}
 		return null;
 	}
+	const text = utf8Decode(b);
+	if (/<svg[\s>]/i.test(text)) return getSvgSizeFromMarkup(text);
 	return null;
 }
+/**
+* Read the intrinsic size of an SVG document from its root `<svg>` element.
+* Follows the SVG sizing model: an explicit absolute `width`/`height` pair wins;
+* otherwise the `viewBox` width/height defines the size (and thus aspect ratio).
+* Percentage or missing `width`/`height` fall through to `viewBox`.
+* @param {string} svg - SVG markup
+* @returns {{ w: number, h: number } | null} intrinsic size, or `null` when undeterminable
+*/
+function getSvgSizeFromMarkup(svg) {
+	const openTag = /<svg\b[^>]*>/i.exec(svg)?.[0];
+	if (!openTag) return null;
+	const attr = (name) => new RegExp(`\\b${name}\\s*=\\s*["']([^"']*)["']`, "i").exec(openTag)?.[1] ?? null;
+	const absLength = (val) => {
+		if (val == null || /%\s*$/.test(val)) return NaN;
+		const m = /^\s*\+?(\d*\.?\d+)/.exec(val);
+		return m ? parseFloat(m[1]) : NaN;
+	};
+	let w = absLength(attr("width"));
+	let h = absLength(attr("height"));
+	if (!(w > 0 && h > 0)) {
+		const vb = attr("viewBox");
+		const p = vb ? vb.trim().split(/[\s,]+/).map(Number) : [];
+		if (p.length === 4 && p[2] > 0 && p[3] > 0) {
+			w = p[2];
+			h = p[3];
+		}
+	}
+	return w > 0 && h > 0 ? {
+		w,
+		h
+	} : null;
+}
+/** Decode UTF-8 bytes to a string, isomorphic across Node and browsers. */
+function utf8Decode(bytes) {
+	return new TextDecoder().decode(bytes);
+}
 //#endregion
 //#region src/gen-tables.ts
 /**
@@ -614,6 +714,7 @@ function getSlidesForTableRows(tableRows = [], tableProps = {}, presLayout, mast
 	let emuSlideTabH = EMU * 1;
 	let emuTabCurrH = 0;
 	let numCols = 0;
+	let warnedNoTabH = false;
 	const tableRowSlides = [];
 	const tablePropX = getSmartParseNumber(tableProps.x, "X", presLayout);
 	const tablePropY = getSmartParseNumber(tableProps.y, "Y", presLayout);
@@ -633,6 +734,15 @@ function getSlidesForTableRows(tableRows = [], tableProps = {}, presLayout, mast
 				if (emuSlideTabH < tablePropH) emuSlideTabH = tablePropH;
 			}
 		}
+		if (emuSlideTabH <= 0) {
+			const emuStartY = tableRowSlides.length === 0 ? tablePropY || inch2Emu(arrInchMargins[0]) : inch2Emu(tableProps.autoPageSlideStartY || tableProps.newSlideStartY || arrInchMargins[0]);
+			const fallbackH = presLayout.height - emuStartY - inch2Emu(arrInchMargins[2]);
+			if (!warnedNoTabH) {
+				console.warn("addTable/autoPage: the table height (`h`) leaves no room to paginate; ignoring it and using the slide height. Increase `h` or decrease `y`.");
+				warnedNoTabH = true;
+			}
+			emuSlideTabH = fallbackH > 0 ? fallbackH : presLayout.height;
+		}
 	}
 	if (tableProps.verbose) {
 		console.log("[[VERBOSE MODE]]");
@@ -805,7 +915,7 @@ function getSlidesForTableRows(tableRows = [], tableProps = {}, presLayout, mast
 					console.log("|-----------------------------------------------------------------------|\n\n");
 				}
 				if (currTableRow.length > 0 && currTableRow.map((cell) => Array.isArray(cell.text) ? cell.text.length : 0).reduce((p, n) => p + n) > 0) newTableRowSlide.rows.push(currTableRow);
-				tableRowSlides.push(newTableRowSlide);
+				if (newTableRowSlide.rows.length > 0) tableRowSlides.push(newTableRowSlide);
 				newTableRowSlide = { rows: [] };
 				currTableRow = [];
 				row.forEach((cell) => currTableRow.push({
@@ -854,7 +964,7 @@ function getSlidesForTableRows(tableRows = [], tableProps = {}, presLayout, mast
 		for (let c = 0; c < numCols; c++) if (colSpanDepths[c] > 0) colSpanDepths[c]--;
 		if (tableProps.verbose) console.log(`- SLIDE [${tableRowSlides.length}]: ROW [${iRow}]: ...COMPLETE ...... emuTabCurrH = ${(emuTabCurrH / EMU).toFixed(2)} ( emuSlideTabH = ${(emuSlideTabH / EMU).toFixed(2)} )`);
 	});
-	tableRowSlides.push(newTableRowSlide);
+	if (newTableRowSlide.rows.length > 0 || tableRowSlides.length === 0) tableRowSlides.push(newTableRowSlide);
 	if (tableProps.verbose) {
 		console.log("\n|================================================|");
 		console.log(`| FINAL: tableRowSlides.length = ${tableRowSlides.length}`);
@@ -864,6 +974,47 @@ function getSlidesForTableRows(tableRows = [], tableProps = {}, presLayout, mast
 	return tableRowSlides;
 }
 /**
+* Convert a computed CSS border (width string + color string) from `getComputedStyle` into a
+* pptx `BorderProps`.
+*
+* Preserves *fractional* widths: a hairline CSS border such as `0.5px` must not be rounded to
+* `0pt` and silently vanish — the table serializer (`valToPts`) emits fractional points just
+* fine, so there is no reason to integer-round here (upstream gitbrent/PptxGenJS#1235). A
+* computed width of `0` (or a non-finite value) yields `{ type: 'none' }` so we never emit a
+* zero-width line.
+* @param {string} widthStr - computed `border-<side>-width`, e.g. `"0.5px"`
+* @param {string} colorStr - computed `border-<side>-color`, e.g. `"rgb(102, 102, 102)"`
+* @returns {BorderProps} border props for the cell side
+*/
+function htmlBorderToProps(widthStr, colorStr) {
+	const pt = Number(String(widthStr).replace("px", ""));
+	if (!isFinite(pt) || pt <= 0) return { type: "none" };
+	const arrRGB = String(colorStr).replace(/\s+/gi, "").replace("rgba(", "").replace("rgb(", "").replace(")", "").split(",");
+	return {
+		pt,
+		color: rgbToHex(Number(arrRGB[0]), Number(arrRGB[1]), Number(arrRGB[2]))
+	};
+}
+/**
+* Resolve a single HTML-table column width for `tableToSlides`.
+*
+* Precedence: an explicit `data-pptx-width` wins outright; otherwise the proportional width
+* derived from the live table is used, raised to `data-pptx-min-width` when that floor is larger.
+*
+* Hidden tables report `offsetWidth` 0 for every cell, which makes `calcWidth` non-finite (a 0/0
+* proportional calc). Fall back to `0` there so an explicit `data-pptx-width` / `data-pptx-min-width`
+* override still drives the column instead of emitting a `NaN` width (upstream gitbrent/PptxGenJS#1157).
+* @param {number} calcWidth - proportional width derived from `offsetWidth` (may be `NaN` for hidden tables)
+* @param {number} setWidth - `data-pptx-width` override (`0`/`NaN` when absent or invalid)
+* @param {number} minWidth - `data-pptx-min-width` floor (`0`/`NaN` when absent or invalid)
+* @returns {number} resolved column width
+*/
+function resolveHtmlColWidth(calcWidth, setWidth, minWidth) {
+	const safeCalc = isFinite(calcWidth) ? calcWidth : 0;
+	if (isFinite(setWidth) && setWidth > 0) return setWidth;
+	return isFinite(minWidth) && minWidth > safeCalc ? minWidth : safeCalc;
+}
+/**
 * Reproduces an HTML table as a PowerPoint table - including column widths, style, etc. - creates 1 or more slides as needed
 * @param {TableToSlidesHost} pptx - pptxgenjs instance
 * @param {string} tabEleId - HTMLElementID of the table
@@ -927,12 +1078,10 @@ function genTableToSlides(pptx, tabEleId, options = {}, masterSlide) {
 	});
 	arrTabColW.forEach((colW, idxW) => {
 		const intCalcWidth = Number((Number(emuSlideTabW) * (colW / intTabW * 100) / 100 / EMU).toFixed(2));
-		let intMinWidth = 0;
-		const colSelectorMin = document.querySelector(`#${tabEleId} thead tr:first-child th:nth-child(${idxW + 1})`);
-		if (colSelectorMin) intMinWidth = Number(colSelectorMin.getAttribute("data-pptx-min-width"));
-		const colSelectorSet = document.querySelector(`#${tabEleId} thead tr:first-child th:nth-child(${idxW + 1})`);
-		if (colSelectorSet) intMinWidth = Number(colSelectorSet.getAttribute("data-pptx-width"));
-		arrColW.push(intMinWidth > intCalcWidth ? intMinWidth : intCalcWidth);
+		const headCell = document.querySelector(`#${tabEleId} thead tr:first-child th:nth-child(${idxW + 1})`);
+		const intSetWidth = headCell ? Number(headCell.getAttribute("data-pptx-width")) : 0;
+		const intMinWidth = headCell ? Number(headCell.getAttribute("data-pptx-min-width")) : 0;
+		arrColW.push(resolveHtmlColWidth(intCalcWidth, intSetWidth, intMinWidth));
 	});
 	if (opts.verbose) console.log(`| arrColW ......................................... = [${arrColW.join(", ")}]`);
 	[
@@ -1011,12 +1160,8 @@ function genTableToSlides(pptx, tabEleId, options = {}, masterSlide) {
 						"bottom",
 						"left"
 					].forEach((val, idxb) => {
-						const intBorderW = Math.round(Number(window.getComputedStyle(cell).getPropertyValue("border-" + val + "-width").replace("px", "")));
-						const arrRGB = window.getComputedStyle(cell).getPropertyValue("border-" + val + "-color").replace(/\s+/gi, "").replace("rgba(", "").replace("rgb(", "").replace(")", "").split(",");
-						cellBorder[idxb] = {
-							pt: intBorderW,
-							color: rgbToHex(Number(arrRGB[0]), Number(arrRGB[1]), Number(arrRGB[2]))
-						};
+						const style = window.getComputedStyle(cell);
+						cellBorder[idxb] = htmlBorderToProps(style.getPropertyValue("border-" + val + "-width"), style.getPropertyValue("border-" + val + "-color"));
 					});
 					cellOpts.border = cellBorder;
 				}
@@ -1086,6 +1231,8 @@ function genTableToSlides(pptx, tabEleId, options = {}, masterSlide) {
 */
 /** counter for included charts (used for index in their filenames) */
 let _chartCounter = 0;
+/** DPI PowerPoint assumes when sizing an inserted raster image (natural pixels / 96 == inches) */
+const IMAGE_NATURAL_DPI = 96;
 function normalizeBorderTuple(border) {
 	return Array.isArray(border) ? border : [
 		border,
@@ -1108,7 +1255,7 @@ function createSlideMaster(props, target) {
 		else if ("line" in object) addShapeDefinition(tgt, "line", object.line);
 		else if ("rect" in object) addShapeDefinition(tgt, "rect", object.rect);
 		else if ("roundRect" in object) addShapeDefinition(tgt, "roundRect", object.roundRect);
-		else if ("text" in object) addTextDefinition(tgt, [{ text: object.text.text }], object.text.options || {}, false);
+		else if ("text" in object) addTextDefinition(tgt, Array.isArray(object.text.text) ? object.text.text : [{ text: object.text.text }], object.text.options || {}, false);
 		else if ("placeholder" in object) {
 			const placeholder = object.placeholder;
 			const { name, type, ...rawPlaceholderOptions } = placeholder.options;
@@ -1122,6 +1269,26 @@ function createSlideMaster(props, target) {
 	if (props.slideNumber && typeof props.slideNumber === "object") target._slideNumberProps = props.slideNumber;
 }
 /**
+* Round and clamp an integer chart percentage/angle option into a schema-valid range.
+*
+* Several chart attributes are bounded integer types whose out-of-range values make
+* PowerPoint report the package as needing repair: `<c:overlap>` (ST_Overlap, -100..100),
+* `<c:gapWidth>`/`<c:gapDepth>` (ST_GapAmount, 0..500), `<c:holeSize>` (ST_HoleSize, 10..90)
+* and `<c:firstSliceAng>` (ST_FirstSliceAng, 0..360). Missing/non-numeric input returns
+* `undefined` so the caller can apply its own default; an out-of-range value is clamped
+* and a warning is emitted (per the library's warn-rather-than-degrade policy).
+* @param value - caller-supplied option value
+* @param min - inclusive lower bound
+* @param max - inclusive upper bound
+* @param name - option name, for the warning message
+*/
+function clampChartPct(value, min, max, name) {
+	if (typeof value !== "number" || isNaN(value)) return void 0;
+	const clamped = Math.min(max, Math.max(min, Math.round(value)));
+	if (clamped !== value) console.warn(`Warning: ${name} ${value} is outside the valid range ${min}-${max}; using ${clamped}.`);
+	return clamped;
+}
+/**
 * Generate the chart based on input data.
 * OOXML Chart Spec: ISO/IEC 29500-1:2016(E)
 *
@@ -1293,7 +1460,13 @@ function addChartDefinition(target, type, data, opt) {
 		"marker",
 		"filled"
 	].includes(options.radarStyle || "")) options.radarStyle = "standard";
-	options.lineDataSymbolSize = options.lineDataSymbolSize && !isNaN(options.lineDataSymbolSize) ? options.lineDataSymbolSize : 6;
+	{
+		const rawSymbolSize = options.lineDataSymbolSize;
+		const hasSymbolSize = rawSymbolSize != null && !isNaN(rawSymbolSize);
+		const symbolSize = Math.min(72, Math.max(2, Math.round(hasSymbolSize ? rawSymbolSize : 6)));
+		if (hasSymbolSize && symbolSize !== rawSymbolSize) console.warn(`Warning: lineDataSymbolSize ${rawSymbolSize} is outside the valid marker size range (integer 2-72); using ${symbolSize}.`);
+		options.lineDataSymbolSize = symbolSize;
+	}
 	options.lineDataSymbolLineSize = options.lineDataSymbolLineSize && !isNaN(options.lineDataSymbolLineSize) ? valToPts(options.lineDataSymbolLineSize) : valToPts(.75);
 	const chartLayout = options.layout;
 	if (chartLayout) [
@@ -1343,8 +1516,11 @@ function addChartDefinition(target, type, data, opt) {
 	options.v3DRotY = typeof options.v3DRotY === "number" && !isNaN(options.v3DRotY) && options.v3DRotY >= 0 && options.v3DRotY <= 360 ? options.v3DRotY : 30;
 	options.v3DRAngAx = options.v3DRAngAx || !options.v3DRAngAx ? options.v3DRAngAx : true;
 	options.v3DPerspective = typeof options.v3DPerspective === "number" && !isNaN(options.v3DPerspective) && options.v3DPerspective >= 0 && options.v3DPerspective <= 240 ? options.v3DPerspective : 30;
-	options.barGapWidthPct = typeof options.barGapWidthPct === "number" && !isNaN(options.barGapWidthPct) && options.barGapWidthPct >= 0 && options.barGapWidthPct <= 1e3 ? options.barGapWidthPct : 150;
-	options.barGapDepthPct = typeof options.barGapDepthPct === "number" && !isNaN(options.barGapDepthPct) && options.barGapDepthPct >= 0 && options.barGapDepthPct <= 1e3 ? options.barGapDepthPct : 150;
+	options.barGapWidthPct = clampChartPct(options.barGapWidthPct, 0, 500, "barGapWidthPct") ?? 150;
+	options.barGapDepthPct = clampChartPct(options.barGapDepthPct, 0, 500, "barGapDepthPct") ?? 150;
+	options.barOverlapPct = clampChartPct(options.barOverlapPct, -100, 100, "barOverlapPct");
+	options.holeSize = clampChartPct(options.holeSize, 10, 90, "holeSize");
+	options.firstSliceAng = clampChartPct(options.firstSliceAng, 0, 360, "firstSliceAng");
 	options.chartColors = Array.isArray(options.chartColors) ? options.chartColors : options._type === "pie" || options._type === "doughnut" ? PIECHART_COLORS : BARCHART_COLORS;
 	options.chartColorsOpacity = options.chartColorsOpacity && !isNaN(options.chartColorsOpacity) ? options.chartColorsOpacity : void 0;
 	options.border = options.border && typeof options.border === "object" ? options.border : void 0;
@@ -1433,16 +1609,29 @@ function addImageDefinition(target, opt) {
 	else if (strImageData?.toLowerCase().includes("image/svg+xml")) strImgExtn = "svg";
 	newObject._type = "image";
 	newObject.image = strImagePath || "preencoded.png";
+	let defWidth = intWidth;
+	let defHeight = intHeight;
+	if ((!intWidth || !intHeight) && strImageData && strImgExtn !== "svg") {
+		const natural = getImageSizeFromBase64(strImageData);
+		if (natural) {
+			if (!intWidth && !intHeight) {
+				defWidth = natural.w / IMAGE_NATURAL_DPI;
+				defHeight = natural.h / IMAGE_NATURAL_DPI;
+			} else if (typeof intWidth === "number" && intWidth && !intHeight) defHeight = intWidth * (natural.h / natural.w);
+			else if (typeof intHeight === "number" && intHeight && !intWidth) defWidth = intHeight * (natural.w / natural.h);
+		}
+	}
 	const objectOptions = {
 		x: intPosX || 0,
 		y: intPosY || 0,
-		w: intWidth || 1,
-		h: intHeight || 1,
+		w: defWidth || 1,
+		h: defHeight || 1,
 		altText: opt.altText || "",
 		rounding: typeof opt.rounding === "boolean" ? opt.rounding : false,
 		shape: opt.shape,
 		points: opt.points,
 		rectRadius: opt.rectRadius,
+		shapeAdjust: opt.shapeAdjust,
 		sizing,
 		placeholder: opt.placeholder,
 		rotate: opt.rotate || 0,
@@ -1451,6 +1640,7 @@ function addImageDefinition(target, opt) {
 		transparency: opt.transparency || 0,
 		duotone: opt.duotone,
 		objectName,
+		objectLock: opt.objectLock,
 		shadow: correctShadowOptions(opt.shadow)
 	};
 	newObject.options = objectOptions;
@@ -1480,7 +1670,10 @@ function addImageDefinition(target, opt) {
 		});
 		newObject.imageRid = imageRelId + 1;
 	} else {
-		const dupeItem = target._relsMedia.find((item) => item.path && item.path === strImagePath && item.type === "image/" + strImgExtn && !item.isDuplicate);
+		const dupeItem = target._relsMedia.find((item) => {
+			if (item.isDuplicate || !item.Target || item.type !== "image/" + strImgExtn) return false;
+			return strImagePath ? item.path === strImagePath : !!strImageData && item.data === strImageData;
+		});
 		target._relsMedia.push({
 			path: strImagePath || "preencoded." + strImgExtn,
 			type: "image/" + strImgExtn,
@@ -1538,6 +1731,7 @@ function addMediaDefinition(target, opt) {
 	slideData.options.h = intSizeY;
 	slideData.options.objectName = objectName;
 	if (opt.altText) slideData.options.altText = opt.altText;
+	if (opt.objectLock) slideData.options.objectLock = opt.objectLock;
 	/**
 	* NOTE:
 	* - rId starts at 2 (hence the intRels+1 below) as slideLayout.xml is rId=1!
@@ -1567,7 +1761,10 @@ function addMediaDefinition(target, opt) {
 			Target: `../media/image-${target._slideNum}-${target._relsMedia.length + 1}.png`
 		});
 	} else {
-		const dupeItem = target._relsMedia.find((item) => item.path && item.path === strPath && item.type === strType + "/" + strExtn && !item.isDuplicate);
+		const dupeItem = target._relsMedia.find((item) => {
+			if (item.isDuplicate || !item.Target || item.type !== strType + "/" + strExtn) return false;
+			return strPath ? item.path === strPath : !!strData && item.data === strData;
+		});
 		const relId1 = getNewRelId(target);
 		target._relsMedia.push({
 			path: strPath || "preencoded" + strExtn,
@@ -1632,12 +1829,14 @@ function addShapeDefinition(target, shapeName, opts) {
 	const options = typeof opts === "object" ? opts : {};
 	options.line = options.line || { type: "none" };
 	options.shadow = correctShadowOptions(options.shadow);
+	const resolvedShapeName = typeof shapeName === "string" && SHAPE_NAME_ALIASES[shapeName] ? SHAPE_NAME_ALIASES[shapeName] : shapeName;
 	const newObject = {
 		_type: "text",
-		shape: (typeof shapeName === "string" && SHAPE_NAME_ALIASES[shapeName] ? SHAPE_NAME_ALIASES[shapeName] : shapeName) || "rect",
+		shape: resolvedShapeName || "rect",
 		options
 	};
 	if (!shapeName) throw new Error("Missing/Invalid shape parameter! Example: `addShape(pptxgen.shapes.LINE, {x:1, y:1, w:1, h:1});`");
+	if (!VALID_SHAPE_PRESETS.has(resolvedShapeName)) throw new Error(`Invalid shape "${String(shapeName)}"! Use a value from \`pptxgen.shapes.*\` (e.g. \`pptxgen.shapes.RECTANGLE\`). PowerPoint can't render unknown preset geometries and will drop the shape during repair.`);
 	const newLineOpts = {
 		type: options.line.type || "solid",
 		color: options.line.color || "333333",
@@ -1666,6 +1865,51 @@ function addShapeDefinition(target, shapeName, opts) {
 	target._slideObjects.push(newObject);
 }
 /**
+* Adds a connector object to a slide definition.
+* A connector is a line between two points emitted as a PowerPoint connector (`<p:cxnSp>`).
+* Endpoints are converted to a bounding box (`x/y/w/h`) plus `flipH`/`flipV` so the box can be
+* oriented from any corner; the connector preset geometry is derived from `type`.
+* @param {PresSlideInternal} target - slide the connector is added to
+* @param {ConnectorProps} opts - connector options (endpoints + line styling)
+*/
+function addConnectorDefinition(target, opts) {
+	if (!opts || [
+		opts.x1,
+		opts.y1,
+		opts.x2,
+		opts.y2
+	].some((v) => typeof v === "undefined")) throw new Error("addConnector requires { x1, y1, x2, y2 }. Example: `slide.addConnector({ x1:1, y1:1, x2:4, y2:3 })`");
+	const preset = CONNECTOR_PRESETS[opts.type || "straight"];
+	if (!preset) throw new Error(`Invalid connector type "${String(opts.type)}". Use 'straight', 'elbow', or 'curved'.`);
+	const x1 = getSmartParseNumber(opts.x1, "X", target._presLayout) / EMU;
+	const y1 = getSmartParseNumber(opts.y1, "Y", target._presLayout) / EMU;
+	const x2 = getSmartParseNumber(opts.x2, "X", target._presLayout) / EMU;
+	const y2 = getSmartParseNumber(opts.y2, "Y", target._presLayout) / EMU;
+	const newObject = {
+		_type: "connector",
+		shape: preset,
+		options: {
+			x: Math.min(x1, x2),
+			y: Math.min(y1, y2),
+			w: Math.abs(x2 - x1),
+			h: Math.abs(y2 - y1),
+			flipH: x2 < x1,
+			flipV: y2 < y1,
+			line: {
+				type: "solid",
+				color: opts.color || "333333",
+				width: typeof opts.width === "number" ? opts.width : 1,
+				dashType: opts.dashType || "solid",
+				beginArrowType: opts.beginArrowType,
+				endArrowType: opts.endArrowType
+			},
+			altText: opts.altText,
+			objectName: opts.objectName ? encodeXmlEntities(validateObjectName(opts.objectName, "connector")) : `Connector ${target._slideObjects.filter((obj) => obj._type === "connector").length}`
+		}
+	};
+	target._slideObjects.push(newObject);
+}
+/**
 * Adds a table object to a slide definition.
 * @param {PresSlideInternal} target - slide object that the table should be added to
 * @param {TableRow[]} tableRows - table data
@@ -1734,9 +1978,8 @@ function addTableDefinition(target, tableRows, options, slideLayout, presLayout,
 		}
 		arrRows.push(newRow);
 	});
-	opt.x = getSmartParseNumber(opt.x || (opt.x === 0 ? 0 : EMU / 2), "X", presLayout);
-	opt.y = getSmartParseNumber(opt.y || (opt.y === 0 ? 0 : EMU / 2), "Y", presLayout);
-	if (opt.h) opt.h = getSmartParseNumber(opt.h, "Y", presLayout);
+	if (opt.x === void 0 || opt.x === null) opt.x = .5;
+	if (opt.y === void 0 || opt.y === null) opt.y = .5;
 	opt.fontSize = opt.fontSize || 12;
 	opt.margin = opt.margin === 0 || opt.margin ? opt.margin : DEF_CELL_MARGIN_IN;
 	if (typeof opt.margin === "number") opt.margin = [
@@ -1768,6 +2011,7 @@ function addTableDefinition(target, tableRows, options, slideLayout, presLayout,
 		});
 	}
 	opt.autoPage = typeof opt.autoPage === "boolean" ? opt.autoPage : false;
+	opt.autoPagePlaceholder = typeof opt.autoPagePlaceholder === "boolean" ? opt.autoPagePlaceholder : false;
 	opt.autoPageRepeatHeader = typeof opt.autoPageRepeatHeader === "boolean" ? opt.autoPageRepeatHeader : false;
 	opt.autoPageHeaderRows = typeof opt.autoPageHeaderRows !== "undefined" && !isNaN(Number(opt.autoPageHeaderRows)) ? Number(opt.autoPageHeaderRows) : 1;
 	opt.autoPageLineWeight = typeof opt.autoPageLineWeight !== "undefined" && !isNaN(Number(opt.autoPageLineWeight)) ? Number(opt.autoPageLineWeight) : 0;
@@ -1805,12 +2049,7 @@ function addTableDefinition(target, tableRows, options, slideLayout, presLayout,
 			console.warn("addTable: mismatch: (colW.length != data.length) Therefore, defaulting to evenly distributed col widths.");
 			opt.colW = void 0;
 		}
-	} else if (opt.w) opt.w = getSmartParseNumber(opt.w, "X", presLayout);
-	else opt.w = Math.floor((presLayout._sizeW || presLayout.width) / EMU - arrTableMargin[1] - arrTableMargin[3]);
-	if (opt.x && opt.x < 20) opt.x = inch2Emu(opt.x);
-	if (opt.y && opt.y < 20) opt.y = inch2Emu(opt.y);
-	if (opt.w && typeof opt.w === "number" && opt.w < 20) opt.w = inch2Emu(opt.w);
-	if (opt.h && typeof opt.h === "number" && opt.h < 20) opt.h = inch2Emu(opt.h);
+	} else if (opt.w) {} else opt.w = Math.floor((presLayout._sizeW || presLayout.width) / EMU - arrTableMargin[1] - arrTableMargin[3]);
 	arrRows.forEach((row) => {
 		row.forEach((cell, idy) => {
 			if (typeof cell === "number" || typeof cell === "string") row[idy] = {
@@ -1836,12 +2075,14 @@ function addTableDefinition(target, tableRows, options, slideLayout, presLayout,
 		});
 	} else {
 		if (opt.autoPageRepeatHeader) opt._arrObjTabHeadRows = arrRows.filter((_row, idx) => idx < (opt.autoPageHeaderRows || 1));
+		const sourcePlaceholders = opt.autoPagePlaceholder && Array.isArray(target._slideObjects) ? target._slideObjects.filter((obj) => obj._type !== "table" && obj.options?.placeholder) : [];
 		getSlidesForTableRows(arrRows, opt, presLayout, slideLayout).forEach((slide, idx) => {
 			if (!getSlide(target._slideNum + idx)) slides.push(addSlide({ masterName: slideLayout?._name || void 0 }));
-			if (idx > 0) opt.y = inch2Emu(opt.autoPageSlideStartY || opt.newSlideStartY || arrTableMargin[0]);
+			if (idx > 0) opt.y = opt.autoPageSlideStartY || opt.newSlideStartY || arrTableMargin[0];
 			{
 				const newSlide = getSlide(target._slideNum + idx);
 				opt.autoPage = false;
+				if (idx > 0 && sourcePlaceholders.length > 0) sourcePlaceholders.forEach((ph) => newSlide._slideObjects.push(structuredClone(ph)));
 				createHyperlinkRels(newSlide, slide.rows);
 				newSlide.addTable(slide.rows, { ...opt });
 				if (idx > 0) newAutoPagedSlides.push(newSlide);
@@ -1910,6 +2151,10 @@ function addTextDefinition(target, text, opts, isPlaceholder) {
 		itemOpts._bodyProp.anchor = !itemOpts.placeholder ? "ctr" : void 0;
 		itemOpts._bodyProp.vert = itemOpts.vert;
 		itemOpts._bodyProp.wrap = typeof itemOpts.wrap === "boolean" ? itemOpts.wrap : true;
+		if (itemOpts.columns !== void 0) if (typeof itemOpts.columns !== "number" || isNaN(itemOpts.columns) || itemOpts.columns < 1 || itemOpts.columns > 16) console.warn("Warning: text `columns` must be a number 1-16 (ignoring value)");
+		else itemOpts._bodyProp.numCol = Math.round(itemOpts.columns);
+		if (itemOpts.columnSpacing !== void 0) if (typeof itemOpts.columnSpacing !== "number" || isNaN(itemOpts.columnSpacing) || itemOpts.columnSpacing < 0) console.warn("Warning: text `columnSpacing` must be a number >= 0 (ignoring value)");
+		else itemOpts._bodyProp.spcCol = valToPts(itemOpts.columnSpacing);
 		if (itemOpts.inset && !isNaN(Number(itemOpts.inset)) || itemOpts.inset === 0) {
 			itemOpts._bodyProp.lIns = inch2Emu(itemOpts.inset);
 			itemOpts._bodyProp.rIns = inch2Emu(itemOpts.inset);
@@ -2190,6 +2435,16 @@ var Slide = class {
 		return this;
 	}
 	/**
+	* Add a connector (a line drawn between two points, emitted as a PowerPoint `<p:cxnSp>`).
+	* @param {ConnectorProps} options - connector endpoints (`x1,y1,x2,y2`) and line styling
+	* @return {Slide} this Slide
+	* @example slide.addConnector({ type: 'elbow', x1: 1, y1: 1, x2: 5, y2: 3, endArrowType: 'triangle' })
+	*/
+	addConnector(options) {
+		addConnectorDefinition(this, options);
+		return this;
+	}
+	/**
 	* Add table to Slide
 	* @param {TableRow[]} tableRows - table rows
 	* @param {TableProps} options - table options
@@ -2419,6 +2674,22 @@ async function createExcelWorksheet(chartObject, zip) {
 	});
 }
 /**
+* Emit the `<a:latin>/<a:ea>/<a:cs>` font trio for a chart text run.
+*
+* In DrawingML run properties a typeface applies only to the script class of
+* its element: `<a:latin>` covers Latin/ASCII, `<a:ea>` covers East Asian, and
+* `<a:cs>` covers complex scripts. Emitting `<a:latin>` alone leaves East Asian
+* (e.g. Chinese) and complex-script glyphs falling back to the theme font, so a
+* user-specified font never takes effect for that text — most visibly on
+* PowerPoint for Mac. Stamping the same typeface onto all three classes is what
+* choosing a font in PowerPoint's UI does (upstream gitbrent/PptxGenJS#1420).
+* @param {string} typeface - font face name
+* @return {string} `<a:latin/><a:ea/><a:cs/>` XML
+*/
+function createChartTextFonts(typeface) {
+	return `<a:latin typeface="${typeface}"/><a:ea typeface="${typeface}"/><a:cs typeface="${typeface}"/>`;
+}
+/**
 * Main entry point method for create charts
 * @see: http://www.datypic.com/sc/ooxml/s-dml-chart.xsd.html
 * @param {ISlideRelChart} rel - chart object
@@ -2428,6 +2699,10 @@ function makeXmlCharts(rel) {
 	let strXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
 	let usesSecondaryValAxis = false;
 	let usesSecondaryCatAxis = false;
+	let primaryCatAxisValType = null;
+	let secondaryCatAxisValType = null;
+	let primaryCatAxisHasCategoryChart = false;
+	let secondaryCatAxisHasCategoryChart = false;
 	strXml += "<c:chartSpace xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">";
 	strXml += "<c:date1904 val=\"0\"/>";
 	strXml += `<c:roundedCorners val="${rel.opts.chartArea.roundedCorners ? "1" : "0"}"/>`;
@@ -2440,6 +2715,8 @@ function makeXmlCharts(rel) {
 			fontSize: rel.opts.titleFontSize || 18,
 			titleAlign: rel.opts.titleAlign,
 			titleBold: rel.opts.titleBold,
+			titleItalic: rel.opts.titleItalic,
+			titleUnderline: rel.opts.titleUnderline,
 			titlePos: rel.opts.titlePos,
 			titleRotate: rel.opts.titleRotate
 		}, rel.opts.x, rel.opts.y);
@@ -2472,18 +2749,37 @@ function makeXmlCharts(rel) {
 		const catAxisId = options.secondaryCatAxis ? AXIS_ID_CATEGORY_SECONDARY : AXIS_ID_CATEGORY_PRIMARY;
 		usesSecondaryValAxis = usesSecondaryValAxis || options.secondaryValAxis;
 		usesSecondaryCatAxis = usesSecondaryCatAxis || options.secondaryCatAxis;
+		const usesValueXAxis = type.type === "scatter" || type.type === "bubble" || type.type === "bubble3D";
+		if (options.secondaryCatAxis) if (usesValueXAxis) secondaryCatAxisValType = type.type;
+		else secondaryCatAxisHasCategoryChart = true;
+		else if (usesValueXAxis) primaryCatAxisValType = type.type;
+		else primaryCatAxisHasCategoryChart = true;
 		strXml += makeChartType(type.type, type.data, options, valAxisId, catAxisId);
 	});
 	else strXml += makeChartType(rel.opts._type, rel.data, rel.opts, AXIS_ID_VALUE_PRIMARY, AXIS_ID_CATEGORY_PRIMARY);
 	if (rel.opts._type !== "pie" && rel.opts._type !== "doughnut") {
 		if (rel.opts.valAxes && rel.opts.valAxes.length > 1 && !usesSecondaryValAxis) throw new Error("Secondary axis must be used by one of the multiple charts");
+		const comboCatAxisType = (isSecondary) => {
+			const valType = isSecondary ? secondaryCatAxisValType : primaryCatAxisValType;
+			const hasCategoryChart = isSecondary ? secondaryCatAxisHasCategoryChart : primaryCatAxisHasCategoryChart;
+			if (!valType) return {};
+			if (hasCategoryChart) {
+				console.warn(`A category-based chart and a scatter/bubble chart cannot share the same ${isSecondary ? "secondary" : "primary"} category axis; emitting a category axis. Put the scatter/bubble series on a separate axis.`);
+				return {};
+			}
+			return { _type: valType };
+		};
 		if (rel.opts.catAxes) {
 			if (!rel.opts.valAxes || rel.opts.valAxes.length !== rel.opts.catAxes.length) throw new Error("There must be the same number of value and category axes.");
 			strXml += makeCatAxis({
 				...rel.opts,
-				...rel.opts.catAxes[0]
+				...rel.opts.catAxes[0],
+				...comboCatAxisType(false)
 			}, AXIS_ID_CATEGORY_PRIMARY, AXIS_ID_VALUE_PRIMARY);
-		} else strXml += makeCatAxis(rel.opts, AXIS_ID_CATEGORY_PRIMARY, AXIS_ID_VALUE_PRIMARY);
+		} else strXml += makeCatAxis({
+			...rel.opts,
+			...comboCatAxisType(false)
+		}, AXIS_ID_CATEGORY_PRIMARY, AXIS_ID_VALUE_PRIMARY);
 		if (rel.opts.valAxes) {
 			strXml += makeValAxis({
 				...rel.opts,
@@ -2500,9 +2796,13 @@ function makeXmlCharts(rel) {
 		}
 		if (rel.opts?.catAxes && rel.opts?.catAxes[1]) strXml += makeCatAxis({
 			...rel.opts,
-			...rel.opts.catAxes[1]
+			...rel.opts.catAxes[1],
+			...comboCatAxisType(true)
+		}, AXIS_ID_CATEGORY_SECONDARY, AXIS_ID_VALUE_SECONDARY);
+		else if (usesSecondaryCatAxis && (!rel.opts.catAxes || !rel.opts.catAxes[1])) strXml += makeCatAxis({
+			...rel.opts,
+			...comboCatAxisType(true)
 		}, AXIS_ID_CATEGORY_SECONDARY, AXIS_ID_VALUE_SECONDARY);
-		else if (usesSecondaryCatAxis && (!rel.opts.catAxes || !rel.opts.catAxes[1])) strXml += makeCatAxis(rel.opts, AXIS_ID_CATEGORY_SECONDARY, AXIS_ID_VALUE_SECONDARY);
 	}
 	if (rel.opts.showDataTable) {
 		strXml += "<c:dTable>";
@@ -2557,8 +2857,7 @@ function makeXmlCharts(rel) {
 			strXml += "    <a:pPr>";
 			strXml += rel.opts.legendFontSize ? `<a:defRPr sz="${Math.round(Number(rel.opts.legendFontSize) * 100)}">` : "<a:defRPr>";
 			if (rel.opts.legendColor) strXml += genXmlColorSelection(rel.opts.legendColor);
-			if (rel.opts.legendFontFace) strXml += "<a:latin typeface=\"" + rel.opts.legendFontFace + "\"/>";
-			if (rel.opts.legendFontFace) strXml += "<a:cs    typeface=\"" + rel.opts.legendFontFace + "\"/>";
+			if (rel.opts.legendFontFace) strXml += createChartTextFonts(rel.opts.legendFontFace);
 			strXml += "      </a:defRPr>";
 			strXml += "    </a:pPr>";
 			strXml += "    <a:endParaRPr lang=\"en-US\"/>";
@@ -2596,6 +2895,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 	let idxColLtr = 1;
 	let optsChartData;
 	let strXml = "";
+	const valFmtCode = encodeXmlEntities(opts.valLabelFormatCode || opts.dataTableFormatCode || opts.dataLabelFormatCode || "General");
 	switch (chartType) {
 		case "area":
 		case "bar":
@@ -2639,7 +2939,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				} else if (opts.dataBorder) strXml += `<a:ln w="${valToPts(opts.dataBorder.pt)}" cap="${createLineCap(opts.lineCap)}"><a:solidFill>${createColorElement(opts.dataBorder.color)}</a:solidFill><a:prstDash val="solid"/><a:round/></a:ln>`;
 				strXml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
 				strXml += "  </c:spPr>";
-				if (chartType !== "line" && chartType !== "radar") strXml += "  <c:invertIfNegative val=\"0\"/>";
+				if (chartType === "bar" || chartType === "bar3D") strXml += "  <c:invertIfNegative val=\"0\"/>";
 				if (chartType === "line" || chartType === "radar") {
 					strXml += "<c:marker>";
 					strXml += "  <c:symbol val=\"" + opts.lineDataSymbol + "\"/>";
@@ -2654,6 +2954,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 					strXml += "  </c:spPr>";
 					strXml += "</c:marker>";
 				}
+				{
+					const barVaryColors = (chartType === "bar" || chartType === "bar3D") && data.length === 1 && (opts.chartColors && opts.chartColors !== BARCHART_COLORS && opts.chartColors.length > 1 || opts.invertedColors?.length) ? opts.chartColors || BARCHART_COLORS : null;
+					strXml += makeSeriesDataPointsXml(chartType, obj, opts, barVaryColors);
+				}
 				if (chartType !== "radar") {
 					const lblColor = seriesOverride?.dataLabelColor ?? opts.dataLabelColor ?? "000000";
 					const lblBold = seriesOverride?.dataLabelFontBold ?? opts.dataLabelFontBold ?? false;
@@ -2661,12 +2965,15 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 					const lblSize = seriesOverride?.dataLabelFontSize ?? opts.dataLabelFontSize ?? 12;
 					const lblFace = seriesOverride?.dataLabelFontFace ?? opts.dataLabelFontFace ?? "Arial";
 					strXml += "<c:dLbls>";
+					if (obj.customLabels?.length) obj.customLabels.forEach((lbl, idx) => {
+						if (lbl) strXml += makeCustomDLblXml(idx, lbl, opts);
+					});
 					strXml += `<c:numFmt formatCode="${encodeXmlEntities(opts.dataLabelFormatCode) || "General"}" sourceLinked="0"/>`;
 					if (opts.dataLabelBkgrdColors) strXml += `<c:spPr><a:solidFill>${createColorElement(seriesColor)}</a:solidFill></c:spPr>`;
 					strXml += "<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr>";
 					strXml += `<a:defRPr b="${lblBold ? 1 : 0}" i="${lblItalic ? 1 : 0}" strike="noStrike" sz="${Math.round(lblSize * 100)}" u="none">`;
 					strXml += `<a:solidFill>${createColorElement(lblColor)}</a:solidFill>`;
-					strXml += `<a:latin typeface="${lblFace}"/>`;
+					strXml += createChartTextFonts(lblFace);
 					strXml += "</a:defRPr></a:pPr></a:p></c:txPr>";
 					if (opts.dataLabelPosition) strXml += `<c:dLblPos val="${opts.dataLabelPosition}"/>`;
 					strXml += "<c:showLegendKey val=\"0\"/>";
@@ -2675,29 +2982,6 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 					strXml += `<c:showLeaderLines val="${opts.showLeaderLines ? "1" : "0"}"/>`;
 					strXml += "</c:dLbls>";
 				}
-				if ((chartType === "bar" || chartType === "bar3D") && data.length === 1 && (opts.chartColors && opts.chartColors !== BARCHART_COLORS && opts.chartColors.length > 1 || opts.invertedColors?.length)) obj.values.forEach((value, index) => {
-					const arrColors = value < 0 ? opts.invertedColors || opts.chartColors || BARCHART_COLORS : opts.chartColors || [];
-					strXml += "  <c:dPt>";
-					strXml += `    <c:idx val="${index}"/>`;
-					strXml += "      <c:invertIfNegative val=\"0\"/>";
-					strXml += "    <c:bubble3D val=\"0\"/>";
-					strXml += "    <c:spPr>";
-					if (opts.lineSize === 0) strXml += "<a:ln><a:noFill/></a:ln>";
-					else if (chartType === "bar") {
-						strXml += "<a:solidFill>";
-						strXml += "  <a:srgbClr val=\"" + arrColors[index % arrColors.length] + "\"/>";
-						strXml += "</a:solidFill>";
-					} else {
-						strXml += "<a:ln>";
-						strXml += "  <a:solidFill>";
-						strXml += "   <a:srgbClr val=\"" + arrColors[index % arrColors.length] + "\"/>";
-						strXml += "  </a:solidFill>";
-						strXml += "</a:ln>";
-					}
-					strXml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
-					strXml += "    </c:spPr>";
-					strXml += "  </c:dPt>";
-				});
 				strXml += "<c:cat>";
 				if (opts.catLabelFormatCode) {
 					strXml += "  <c:numRef>";
@@ -2734,10 +3018,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += "  <c:numRef>";
 				strXml += `<c:f>Sheet1!$${getExcelColName(obj._dataIndex + obj.labels.length + 1)}$2:$${getExcelColName(obj._dataIndex + obj.labels.length + 1)}$${obj.labels[0].length + 1}</c:f>`;
 				strXml += "    <c:numCache>";
-				strXml += "      <c:formatCode>" + (opts.valLabelFormatCode || opts.dataTableFormatCode || "General") + "</c:formatCode>";
+				strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
 				strXml += `      <c:ptCount val="${obj.labels[0].length}"/>`;
 				obj.values.forEach((value, idx) => {
-					if (value != null) strXml += `<c:pt idx="${idx}"><c:v>${value}</c:v></c:pt>`;
+					strXml += numCachePt(idx, value);
 				});
 				strXml += "    </c:numCache>";
 				strXml += "  </c:numRef>";
@@ -2753,7 +3037,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "      <a:p><a:pPr>";
 			strXml += `        <a:defRPr b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" strike="noStrike" sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" u="none">`;
 			strXml += "          <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-			strXml += "          <a:latin typeface=\"" + (opts.dataLabelFontFace || "Arial") + "\"/>";
+			strXml += "          " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 			strXml += "        </a:defRPr>";
 			strXml += "      </a:pPr></a:p>";
 			strXml += "    </c:txPr>";
@@ -2769,6 +3053,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			if (chartType === "bar") {
 				strXml += `  <c:gapWidth val="${opts.barGapWidthPct}"/>`;
 				strXml += `  <c:overlap val="${opts.barOverlapPct != null ? opts.barOverlapPct : (opts.barGrouping || "").includes("tacked") ? 100 : 0}"/>`;
+				strXml += createSerLinesElement(opts.barSeriesLine);
 			} else if (chartType === "bar3D") {
 				strXml += `  <c:gapWidth val="${opts.barGapWidthPct}"/>`;
 				strXml += `  <c:gapDepth val="${opts.barGapDepthPct}"/>`;
@@ -2820,6 +3105,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += "<a:effectLst/>";
 				strXml += "</c:spPr>";
 				strXml += "</c:marker>";
+				{
+					const scatterVaryColors = data.length === 1 && opts.chartColors !== BARCHART_COLORS ? opts.chartColors || BARCHART_COLORS : null;
+					strXml += makeSeriesDataPointsXml(chartType, obj, opts, scatterVaryColors);
+				}
 				if (opts.showLabel) {
 					const chartUuid = getUuid("-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
 					if (obj.labels[0] && (opts.dataLabelFormatScatter === "custom" || opts.dataLabelFormatScatter === "customXY")) {
@@ -2838,13 +3127,13 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 								strXml += "                <a:pPr>";
 								strXml += `                    <a:defRPr sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
 								strXml += "                        <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-								strXml += `                        <a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+								strXml += "                        " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 								strXml += "                    </a:defRPr>";
 								strXml += "                </a:pPr>";
 								strXml += "              <a:r>";
 								strXml += `                    <a:rPr lang="${opts.lang || "en-US"}" sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike" dirty="0">`;
 								strXml += "                        <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-								strXml += `                        <a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+								strXml += "                        " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 								strXml += "                    </a:rPr>";
 								strXml += "                    <a:t>" + encodeXmlEntities(label) + "</a:t>";
 								strXml += "              </a:r>";
@@ -2924,7 +3213,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 						strXml += "            <a:pPr>";
 						strXml += `                <a:defRPr sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
 						strXml += "                    <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-						strXml += `                    <a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+						strXml += "                    " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 						strXml += "                </a:defRPr>";
 						strXml += "            </a:pPr>";
 						strXml += `            <a:endParaRPr lang="${opts.lang || "en-US"}"/>`;
@@ -2945,31 +3234,14 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 						strXml += "</c:dLbls>";
 					}
 				}
-				if (data.length === 1 && opts.chartColors !== BARCHART_COLORS) obj.values.forEach((value, index) => {
-					const arrColors = value < 0 ? opts.invertedColors || opts.chartColors || BARCHART_COLORS : opts.chartColors || [];
-					strXml += "  <c:dPt>";
-					strXml += `    <c:idx val="${index}"/>`;
-					strXml += "      <c:invertIfNegative val=\"0\"/>";
-					strXml += "    <c:bubble3D val=\"0\"/>";
-					strXml += "    <c:spPr>";
-					if (opts.lineSize === 0) strXml += "<a:ln><a:noFill/></a:ln>";
-					else {
-						strXml += "<a:solidFill>";
-						strXml += " <a:srgbClr val=\"" + arrColors[index % arrColors.length] + "\"/>";
-						strXml += "</a:solidFill>";
-					}
-					strXml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
-					strXml += "    </c:spPr>";
-					strXml += "  </c:dPt>";
-				});
 				strXml += "<c:xVal>";
 				strXml += "  <c:numRef>";
 				strXml += `    <c:f>Sheet1!$A$2:$A$${data[0].values.length + 1}</c:f>`;
 				strXml += "    <c:numCache>";
-				strXml += "      <c:formatCode>General</c:formatCode>";
+				strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
 				strXml += `      <c:ptCount val="${data[0].values.length}"/>`;
 				data[0].values.forEach((value, idx) => {
-					if (value != null) strXml += `<c:pt idx="${idx}"><c:v>${value}</c:v></c:pt>`;
+					strXml += numCachePt(idx, value);
 				});
 				strXml += "    </c:numCache>";
 				strXml += "  </c:numRef>";
@@ -2978,10 +3250,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += "  <c:numRef>";
 				strXml += `    <c:f>Sheet1!$${getExcelColName(idx + 2)}$2:$${getExcelColName(idx + 2)}$${data[0].values.length + 1}</c:f>`;
 				strXml += "    <c:numCache>";
-				strXml += "      <c:formatCode>General</c:formatCode>";
+				strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
 				strXml += `      <c:ptCount val="${data[0].values.length}"/>`;
 				data[0].values.forEach((_value, idx) => {
-					if (obj.values[idx] != null) strXml += `<c:pt idx="${idx}"><c:v>${obj.values[idx]}</c:v></c:pt>`;
+					strXml += numCachePt(idx, obj.values[idx]);
 				});
 				strXml += "    </c:numCache>";
 				strXml += "  </c:numRef>";
@@ -2997,7 +3269,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "      <a:p><a:pPr>";
 			strXml += `        <a:defRPr b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" strike="noStrike" sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" u="none">`;
 			strXml += "          <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-			strXml += "          <a:latin typeface=\"" + (opts.dataLabelFontFace || "Arial") + "\"/>";
+			strXml += "          " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 			strXml += "        </a:defRPr>";
 			strXml += "      </a:pPr></a:p>";
 			strXml += "    </c:txPr>";
@@ -3047,10 +3319,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += "  <c:numRef>";
 				strXml += `    <c:f>Sheet1!$A$2:$A$${data[0].values.length + 1}</c:f>`;
 				strXml += "    <c:numCache>";
-				strXml += "      <c:formatCode>General</c:formatCode>";
+				strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
 				strXml += `      <c:ptCount val="${data[0].values.length}"/>`;
 				data[0].values.forEach((value, idx) => {
-					strXml += `<c:pt idx="${idx}"><c:v>${value || value === 0 ? value : ""}</c:v></c:pt>`;
+					strXml += numCachePt(idx, value);
 				});
 				strXml += "    </c:numCache>";
 				strXml += "  </c:numRef>";
@@ -3060,10 +3332,10 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += `<c:f>Sheet1!$${getExcelColName(idxColLtr + 1)}$2:$${getExcelColName(idxColLtr + 1)}$${data[0].values.length + 1}</c:f>`;
 				idxColLtr++;
 				strXml += "    <c:numCache>";
-				strXml += "      <c:formatCode>General</c:formatCode>";
+				strXml += "      <c:formatCode>" + valFmtCode + "</c:formatCode>";
 				strXml += `      <c:ptCount val="${data[0].values.length}"/>`;
 				data[0].values.forEach((_value, idx) => {
-					strXml += `<c:pt idx="${idx}"><c:v>${obj.values[idx] || obj.values[idx] === 0 ? obj.values[idx] : ""}</c:v></c:pt>`;
+					strXml += numCachePt(idx, obj.values[idx]);
 				});
 				strXml += "    </c:numCache>";
 				strXml += "  </c:numRef>";
@@ -3076,7 +3348,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 				strXml += "        <c:formatCode>General</c:formatCode>";
 				strXml += `           <c:ptCount val="${obj.sizes.length}"/>`;
 				obj.sizes.forEach((value, idx) => {
-					strXml += `<c:pt idx="${idx}"><c:v>${value ?? ""}</c:v></c:pt>`;
+					strXml += numCachePt(idx, value);
 				});
 				strXml += "      </c:numCache>";
 				strXml += "    </c:numRef>";
@@ -3089,12 +3361,12 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr>";
 			strXml += `<a:defRPr b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" strike="noStrike" sz="${Math.round(Math.round(opts.dataLabelFontSize || 12) * 100)}" u="none">`;
 			strXml += `<a:solidFill>${createColorElement(opts.dataLabelColor || "000000")}</a:solidFill>`;
-			strXml += `<a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+			strXml += createChartTextFonts(opts.dataLabelFontFace || "Arial");
 			strXml += "</a:defRPr></a:pPr></a:p></c:txPr>";
 			if (opts.dataLabelPosition) strXml += `<c:dLblPos val="${opts.dataLabelPosition}"/>`;
 			strXml += "<c:showLegendKey val=\"0\"/>";
 			strXml += `<c:showVal val="${opts.showValue ? "1" : "0"}"/>`;
-			strXml += `<c:showCatName val="0"/><c:showSerName val="${opts.showSerName ? "1" : "0"}"/><c:showPercent val="0"/><c:showBubbleSize val="0"/>`;
+			strXml += `<c:showCatName val="0"/><c:showSerName val="${opts.showSerName ? "1" : "0"}"/><c:showPercent val="0"/><c:showBubbleSize val="${opts.showBubbleSize ? "1" : "0"}"/>`;
 			strXml += "<c:extLst>";
 			strXml += "  <c:ext uri=\"{CE6537A1-D6FC-4f65-9D91-7224C49458BB}\" xmlns:c15=\"http://schemas.microsoft.com/office/drawing/2012/chart\">";
 			strXml += "    <c15:showLeaderLines val=\"" + (opts.showLeaderLines ? "1" : "0") + "\"/>";
@@ -3128,33 +3400,37 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			else strXml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
 			strXml += "  </c:spPr>";
 			optsChartData.labels[0].forEach((_label, idx) => {
+				const ptStyle = optsChartData.pointStyles?.[idx];
 				strXml += "<c:dPt>";
 				strXml += ` <c:idx val="${idx}"/>`;
 				strXml += " <c:bubble3D val=\"0\"/>";
 				strXml += " <c:spPr>";
-				strXml += `<a:solidFill>${createColorElement(opts.chartColors[idx + 1 > opts.chartColors.length ? Math.floor(Math.random() * opts.chartColors.length) : idx])}</a:solidFill>`;
-				if (opts.dataBorder) strXml += `<a:ln w="${valToPts(opts.dataBorder.pt)}" cap="flat"><a:solidFill>${createColorElement(opts.dataBorder.color)}</a:solidFill><a:prstDash val="solid"/><a:round/></a:ln>`;
+				strXml += `<a:solidFill>${createColorElement(ptStyle?.fill || opts.chartColors[idx + 1 > opts.chartColors.length ? Math.floor(Math.random() * opts.chartColors.length) : idx])}</a:solidFill>`;
+				if (ptStyle?.border) strXml += createChartBorderLine(ptStyle.border);
+				else if (opts.dataBorder) strXml += `<a:ln w="${valToPts(opts.dataBorder.pt)}" cap="flat"><a:solidFill>${createColorElement(opts.dataBorder.color)}</a:solidFill><a:prstDash val="solid"/><a:round/></a:ln>`;
 				strXml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
 				strXml += "  </c:spPr>";
 				strXml += "</c:dPt>";
 			});
 			strXml += "<c:dLbls>";
 			optsChartData.labels[0].forEach((_label, idx) => {
+				const customLbl = optsChartData.customLabels?.[idx];
 				strXml += "<c:dLbl>";
 				strXml += ` <c:idx val="${idx}"/>`;
+				if (customLbl) strXml += `<c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="${opts.lang || "en-US"}" dirty="0"/><a:t>${encodeXmlEntities(customLbl)}</a:t></a:r></a:p></c:rich></c:tx>`;
 				strXml += `  <c:numFmt formatCode="${encodeXmlEntities(opts.dataLabelFormatCode) || "General"}" sourceLinked="0"/>`;
 				strXml += "  <c:spPr/><c:txPr>";
 				strXml += "   <a:bodyPr/><a:lstStyle/>";
 				strXml += "   <a:p><a:pPr>";
 				strXml += `   <a:defRPr sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" b="${opts.dataLabelFontBold ? 1 : 0}" i="${opts.dataLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
 				strXml += "    <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-				strXml += `    <a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+				strXml += "    " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 				strXml += "   </a:defRPr>";
 				strXml += "      </a:pPr></a:p>";
 				strXml += "    </c:txPr>";
 				if (chartType === "pie" && opts.dataLabelPosition) strXml += `<c:dLblPos val="${opts.dataLabelPosition}"/>`;
 				strXml += "    <c:showLegendKey val=\"0\"/>";
-				strXml += "    <c:showVal val=\"" + (opts.showValue ? "1" : "0") + "\"/>";
+				strXml += "    <c:showVal val=\"" + (customLbl ? "0" : opts.showValue ? "1" : "0") + "\"/>";
 				strXml += "    <c:showCatName val=\"" + (opts.showLabel ? "1" : "0") + "\"/>";
 				strXml += "    <c:showSerName val=\"" + (opts.showSerName ? "1" : "0") + "\"/>";
 				strXml += "    <c:showPercent val=\"" + (opts.showPercent ? "1" : "0") + "\"/>";
@@ -3169,7 +3445,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "        <a:pPr>";
 			strXml += `          <a:defRPr sz="${Math.round((opts.dataLabelFontSize || 12) * 100)}" b="${opts.dataLabelFontBold ? "1" : "0"}" i="${opts.dataLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
 			strXml += "            <a:solidFill>" + createColorElement(opts.dataLabelColor || "000000") + "</a:solidFill>";
-			strXml += `            <a:latin typeface="${opts.dataLabelFontFace || "Arial"}"/>`;
+			strXml += "            " + createChartTextFonts(opts.dataLabelFontFace || "Arial");
 			strXml += "          </a:defRPr>";
 			strXml += "        </a:pPr>";
 			strXml += "      </a:p>";
@@ -3182,6 +3458,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "    <c:showPercent val=\"1\"/>";
 			strXml += "    <c:showBubbleSize val=\"0\"/>";
 			strXml += ` <c:showLeaderLines val="${opts.showLeaderLines ? "1" : "0"}"/>`;
+			strXml += createLeaderLinesElement(opts);
 			strXml += "</c:dLbls>";
 			strXml += "<c:cat>";
 			strXml += "  <c:strRef>";
@@ -3198,6 +3475,7 @@ function makeChartType(chartType, data, opts, valAxisId, catAxisId) {
 			strXml += "    <c:numRef>";
 			strXml += `      <c:f>Sheet1!$B$2:$B$${optsChartData.labels[0].length + 1}</c:f>`;
 			strXml += "      <c:numCache>";
+			strXml += "        <c:formatCode>" + valFmtCode + "</c:formatCode>";
 			strXml += `           <c:ptCount val="${optsChartData.labels[0].length}"/>`;
 			optsChartData.values.forEach((value, idx) => {
 				strXml += `<c:pt idx="${idx}"><c:v>${value || value === 0 ? value : ""}</c:v></c:pt>`;
@@ -3273,7 +3551,7 @@ function makeCatAxis(opts, axisId, valAxisId) {
 	strXml += "    <a:pPr>";
 	strXml += `      <a:defRPr sz="${Math.round((opts.catAxisLabelFontSize || 12) * 100)}" b="${opts.catAxisLabelFontBold ? 1 : 0}" i="${opts.catAxisLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
 	strXml += "      <a:solidFill>" + createColorElement(opts.catAxisLabelColor || "000000") + "</a:solidFill>";
-	strXml += "      <a:latin typeface=\"" + (opts.catAxisLabelFontFace || "Arial") + "\"/>";
+	strXml += "      " + createChartTextFonts(opts.catAxisLabelFontFace || "Arial");
 	strXml += "   </a:defRPr>";
 	strXml += "  </a:pPr>";
 	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
@@ -3366,7 +3644,7 @@ function makeValAxis(opts, valAxisId) {
 	strXml += "    <a:pPr>";
 	strXml += `      <a:defRPr sz="${Math.round((opts.valAxisLabelFontSize || 12) * 100)}" b="${opts.valAxisLabelFontBold ? 1 : 0}" i="${opts.valAxisLabelFontItalic ? 1 : 0}" u="none" strike="noStrike">`;
 	strXml += "        <a:solidFill>" + createColorElement(opts.valAxisLabelColor || "000000") + "</a:solidFill>";
-	strXml += "        <a:latin typeface=\"" + (opts.valAxisLabelFontFace || "Arial") + "\"/>";
+	strXml += "        " + createChartTextFonts(opts.valAxisLabelFontFace || "Arial");
 	strXml += "      </a:defRPr>";
 	strXml += "    </a:pPr>";
 	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
@@ -3422,7 +3700,7 @@ function makeSerAxis(opts, axisId, valAxisId) {
 	strXml += "    <a:pPr>";
 	strXml += `    <a:defRPr sz="${Math.round((opts.serAxisLabelFontSize || 12) * 100)}" b="${opts.serAxisLabelFontBold ? "1" : "0"}" i="${opts.serAxisLabelFontItalic ? "1" : "0"}" u="none" strike="noStrike">`;
 	strXml += `      <a:solidFill>${createColorElement(opts.serAxisLabelColor || "000000")}</a:solidFill>`;
-	strXml += `      <a:latin typeface="${opts.serAxisLabelFontFace || "Arial"}"/>`;
+	strXml += "      " + createChartTextFonts(opts.serAxisLabelFontFace || "Arial");
 	strXml += "   </a:defRPr>";
 	strXml += "  </a:pPr>";
 	strXml += "  <a:endParaRPr lang=\"" + (opts.lang || "en-US") + "\"/>";
@@ -3462,17 +3740,31 @@ function genXmlTitle(opts, chartX, chartY) {
 	const rotate = opts.titleRotate ? `<a:bodyPr rot="${convertRotationDegrees(opts.titleRotate)}"/>` : "<a:bodyPr/>";
 	const sizeAttr = opts.fontSize ? `sz="${Math.round(opts.fontSize * 100)}"` : "";
 	const titleBold = opts.titleBold ? 1 : 0;
+	const titleItalic = opts.titleItalic ? 1 : 0;
+	const titleUnderline = opts.titleUnderline ? "sng" : "none";
 	let layout = "<c:layout/>";
-	if (opts.titlePos && typeof opts.titlePos.x === "number" && typeof opts.titlePos.y === "number") {
-		const totalX = opts.titlePos.x + chartX;
-		const totalY = opts.titlePos.y + chartY;
-		let valX = totalX === 0 ? 0 : totalX * (totalX / 5) / 10;
-		if (valX >= 1) valX = valX / 10;
-		if (valX >= .1) valX = valX / 10;
-		let valY = totalY === 0 ? 0 : totalY * (totalY / 5) / 10;
-		if (valY >= 1) valY = valY / 10;
-		if (valY >= .1) valY = valY / 10;
-		layout = `<c:layout><c:manualLayout><c:xMode val="edge"/><c:yMode val="edge"/><c:x val="${valX}"/><c:y val="${valY}"/></c:manualLayout></c:layout>`;
+	const hasX = opts.titlePos && typeof opts.titlePos.x === "number";
+	const hasY = opts.titlePos && typeof opts.titlePos.y === "number";
+	if (hasX || hasY) {
+		let modes = "";
+		let vals = "";
+		if (hasX) {
+			const totalX = opts.titlePos.x + chartX;
+			let valX = totalX === 0 ? 0 : totalX * (totalX / 5) / 10;
+			if (valX >= 1) valX = valX / 10;
+			if (valX >= .1) valX = valX / 10;
+			modes += "<c:xMode val=\"edge\"/>";
+			vals += `<c:x val="${valX}"/>`;
+		}
+		if (hasY) {
+			const totalY = opts.titlePos.y + chartY;
+			let valY = totalY === 0 ? 0 : totalY * (totalY / 5) / 10;
+			if (valY >= 1) valY = valY / 10;
+			if (valY >= .1) valY = valY / 10;
+			modes += "<c:yMode val=\"edge\"/>";
+			vals += `<c:y val="${valY}"/>`;
+		}
+		layout = `<c:layout><c:manualLayout>${modes}${vals}</c:manualLayout></c:layout>`;
 	}
 	return `<c:title>
       <c:tx>
@@ -3481,15 +3773,15 @@ function genXmlTitle(opts, chartX, chartY) {
           <a:lstStyle/>
           <a:p>
             ${align}
-            <a:defRPr ${sizeAttr} b="${titleBold}" i="0" u="none" strike="noStrike">
+            <a:defRPr ${sizeAttr} b="${titleBold}" i="${titleItalic}" u="${titleUnderline}" strike="noStrike">
               <a:solidFill>${createColorElement(opts.color || "000000")}</a:solidFill>
-              <a:latin typeface="${opts.fontFace || "Arial"}"/>
+              ${createChartTextFonts(opts.fontFace || "Arial")}
             </a:defRPr>
           </a:pPr>
           <a:r>
-            <a:rPr ${sizeAttr} b="${titleBold}" i="0" u="none" strike="noStrike">
+            <a:rPr ${sizeAttr} b="${titleBold}" i="${titleItalic}" u="${titleUnderline}" strike="noStrike">
               <a:solidFill>${createColorElement(opts.color || "000000")}</a:solidFill>
-              <a:latin typeface="${opts.fontFace || "Arial"}"/>
+              ${createChartTextFonts(opts.fontFace || "Arial")}
             </a:rPr>
             <a:t>${encodeXmlEntities(opts.title) || ""}</a:t>
           </a:r>
@@ -3563,11 +3855,123 @@ function createGridLineElement(glOpts) {
 	strXml += "</c:majorGridlines>";
 	return strXml;
 }
-function createLineCap(lineCap) {
-	if (!lineCap || lineCap === "flat") return "flat";
-	else if (lineCap === "square") return "sq";
-	else if (lineCap === "round") return "rnd";
-	else throw new Error(`Invalid chart line cap: ${lineCap}`);
+/**
+* Build a `<c:pt>` numeric-cache data point, or '' to leave a gap.
+*
+* `<c:v>` inside a `<c:numCache>` is an `xsd:double`; emitting `NaN`, `Infinity`
+* or an empty string yields an invalid value that makes PowerPoint report the
+* package as needing repair. Null/undefined are intentional gaps and are skipped
+* silently (a sparse, idx-keyed cache is valid); other non-finite numbers are
+* skipped with a warning, per the library's "warn rather than emit a degenerate
+* result" policy.
+* @param idx - zero-based data-point index (emitted as `idx`)
+* @param value - numeric value (or null/undefined gap)
+*/
+function numCachePt(idx, value) {
+	if (value == null) return "";
+	if (!Number.isFinite(value)) {
+		console.warn(`Warning: chart value "${value}" at index ${idx} is not a finite number; data point omitted.`);
+		return "";
+	}
+	return `<c:pt idx="${idx}"><c:v>${value}</c:v></c:pt>`;
+}
+/**
+* Build a `<c:serLines>` ("Series Lines") element for a bar chart.
+* @param opt - `true` for PowerPoint automatic styling, an {@link OptsChartGridLine}
+*   to customize the line, or falsy / `{ style: 'none' }` to omit the element.
+*/
+function createSerLinesElement(opt) {
+	if (!opt) return "";
+	if (opt === true) return "<c:serLines/>";
+	if (opt.style === "none") return "";
+	let strXml = "<c:serLines><c:spPr>";
+	strXml += `<a:ln w="${valToPts(opt.size || DEF_CHART_GRIDLINE.size)}" cap="${createLineCap(opt.cap || DEF_CHART_GRIDLINE.cap)}">`;
+	strXml += `<a:solidFill><a:srgbClr val="${opt.color || DEF_CHART_GRIDLINE.color}"/></a:solidFill>`;
+	strXml += `<a:prstDash val="${opt.style || DEF_CHART_GRIDLINE.style}"/><a:round/>`;
+	strXml += "</a:ln></c:spPr></c:serLines>";
+	return strXml;
+}
+/**
+* Build the `<c:leaderLines>` element for pie/doughnut data labels.
+*
+* Schema position: inside `<c:dLbls>`, immediately after `<c:showLeaderLines>`
+* (CT_DLbls / Group_DLbls order: showLeaderLines → leaderLines).
+*
+* Returns `''` unless the caller both enabled leader lines (`showLeaderLines`)
+* and configured their appearance (`leaderLineColor` / `leaderLineSize`). When
+* appearance is unset we leave the element off so PowerPoint applies its
+* automatic leader-line color, matching prior behavior.
+*
+* @param opts - chart options (reads `showLeaderLines`, `leaderLineColor`, `leaderLineSize`)
+*/
+function createLeaderLinesElement(opts) {
+	if (!opts.showLeaderLines) return "";
+	if (!opts.leaderLineColor && opts.leaderLineSize == null) return "";
+	return `<c:leaderLines><c:spPr><a:ln w="${valToPts(opts.leaderLineSize ?? .75)}" cap="flat"><a:solidFill>${createColorElement(opts.leaderLineColor || "808080")}</a:solidFill><a:prstDash val="solid"/><a:round/></a:ln><a:effectLst/></c:spPr></c:leaderLines>`;
+}
+function makeCustomDLblXml(idx, text, opts) {
+	const sz = Math.round((opts.dataLabelFontSize || 12) * 100);
+	const bold = opts.dataLabelFontBold ? "1" : "0";
+	const italic = opts.dataLabelFontItalic ? "1" : "0";
+	const color = createColorElement(opts.dataLabelColor || "000000");
+	const face = opts.dataLabelFontFace || "Arial";
+	const lang = opts.lang || "en-US";
+	return `<c:dLbl><c:idx val="${idx}"/><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:pPr><a:defRPr sz="${sz}" b="${bold}" i="${italic}" u="none" strike="noStrike"><a:solidFill>${color}</a:solidFill>${createChartTextFonts(face)}</a:defRPr></a:pPr><a:r><a:rPr lang="${lang}" sz="${sz}" b="${bold}" i="${italic}" u="none" strike="noStrike" dirty="0"><a:solidFill>${color}</a:solidFill>${createChartTextFonts(face)}</a:rPr><a:t>${encodeXmlEntities(text)}</a:t></a:r></a:p></c:rich></c:tx><c:showLegendKey val="0"/><c:showVal val="0"/><c:showCatName val="0"/><c:showSerName val="0"/><c:showPercent val="0"/><c:showBubbleSize val="0"/></c:dLbl>`;
+}
+/**
+* Build an `<a:ln>` border element from a per-data-point `BorderProps`.
+* @param border - point border style (`type`, `color`, `pt`)
+*/
+function createChartBorderLine(border) {
+	if (border.type === "none") return "<a:ln><a:noFill/></a:ln>";
+	const dash = border.type === "dash" ? "dash" : "solid";
+	return `<a:ln w="${valToPts(border.pt ?? 1)}" cap="flat"><a:solidFill>${createColorElement(border.color || "666666")}</a:solidFill><a:prstDash val="${dash}"/><a:round/></a:ln>`;
+}
+/**
+* Build `<c:dPt>` entries for a series in the bar/line/area/scatter loops.
+*
+* Merges two sources into a single `c:dPt` per index so we never emit a
+* duplicate `<c:idx>` (which corrupts the chart):
+* - legacy single-series color-vary fills (bar/scatter), supplied via `varyColors`
+* - per-point `pointStyles` border/fill overrides
+*
+* Must be emitted in schema position *before* `c:dLbls` (CT_*Ser order).
+* RADAR is skipped: extra per-point markup historically corrupts the chart.
+*
+* @param chartType  - series chart type
+* @param obj        - series data (reads `values`, `pointStyles`)
+* @param opts       - chart options (fill/shadow/lineSize context)
+* @param varyColors - color array when single-series color-vary applies, else `null`
+*/
+function makeSeriesDataPointsXml(chartType, obj, opts, varyColors) {
+	if (chartType === "radar") return "";
+	const pointStyles = obj.pointStyles;
+	if (!varyColors && !pointStyles?.length) return "";
+	const isBar = chartType === "bar" || chartType === "bar3D";
+	const isScatter = chartType === "scatter";
+	let xml = "";
+	obj.values.forEach((value, index) => {
+		const ptStyle = pointStyles?.[index];
+		const arrColors = varyColors ? value < 0 ? opts.invertedColors || opts.chartColors || BARCHART_COLORS : varyColors : null;
+		const fillColor = ptStyle?.fill || (arrColors ? arrColors[index % arrColors.length] : null);
+		const border = ptStyle?.border;
+		if (!fillColor && !border) return;
+		xml += "<c:dPt>";
+		xml += `<c:idx val="${index}"/>`;
+		if (isBar) xml += "<c:invertIfNegative val=\"0\"/>";
+		xml += "<c:bubble3D val=\"0\"/>";
+		xml += "<c:spPr>";
+		if ((isBar || isScatter) && opts.lineSize === 0 && !border && !ptStyle?.fill) xml += "<a:ln><a:noFill/></a:ln>";
+		else {
+			if (fillColor) if (chartType === "bar3D") xml += `<a:ln><a:solidFill>${createColorElement(fillColor)}</a:solidFill></a:ln>`;
+			else xml += `<a:solidFill>${createColorElement(fillColor)}</a:solidFill>`;
+			if (border) xml += createChartBorderLine(border);
+		}
+		xml += createShadowElement(opts.shadow, DEF_SHAPE_SHADOW);
+		xml += "</c:spPr>";
+		xml += "</c:dPt>";
+	});
+	return xml;
 }
 //#endregion
 //#region src/gen-media.ts
@@ -3580,9 +3984,11 @@ function hasEncodingPath(rel) {
 /**
 * Encode Image/Audio/Video into base64
 * @param {PresSlideInternal | SlideLayoutInternal} layout - slide layout
+* @param {RuntimeAdapter} runtime - runtime adapter (Node/browser media loader)
+* @param {'throw' | 'placeholder'} onMediaError - failure policy: reject the export (default) or substitute a placeholder and warn
 * @return {Promise} promise
 */
-function encodeSlideMediaRels(layout, runtime) {
+function encodeSlideMediaRels(layout, runtime, onMediaError = "throw") {
 	const imageProms = [];
 	const candidateRels = layout._relsMedia.filter((rel) => rel.type !== "online" && !rel.data && hasEncodingPath(rel));
 	const unqPaths = [];
@@ -3600,9 +4006,13 @@ function encodeSlideMediaRels(layout, runtime) {
 				if (rel.isSvgPng) await runtime.createSvgPngPreview(rel);
 				return "done";
 			} catch (ex) {
-				rel.data = IMG_BROKEN;
-				candidateRels.filter((dupe) => dupe.isDuplicate && dupe.path === rel.path).forEach((dupe) => dupe.data = rel.data);
-				throw ex;
+				if (onMediaError === "placeholder") {
+					console.warn(`[WARNING] Failed to load media "${rel.path}"; embedding a broken-image placeholder. (${String(ex)})`);
+					rel.data = IMG_BROKEN;
+					candidateRels.filter((dupe) => dupe.isDuplicate && dupe.path === rel.path).forEach((dupe) => dupe.data = rel.data);
+					return "done";
+				}
+				throw new Error(`Failed to load media "${rel.path}" during export.`, { cause: ex });
 			}
 		})());
 	});
@@ -3616,6 +4026,37 @@ function encodeSlideMediaRels(layout, runtime) {
 /**
 * PptxGenJS: XML Generation
 */
+const _warnedTextRangeMsgs = /* @__PURE__ */ new Set();
+function warnTextRangeOnce(msg) {
+	if (_warnedTextRangeMsgs.has(msg)) return;
+	_warnedTextRangeMsgs.add(msg);
+	console.warn(msg);
+}
+/**
+* Clamp a font size (points) into ST_TextFontSize (1-4000pt) and return it in
+* hundredths of a point for the `sz` attribute. Out-of-range sizes make
+* PowerPoint report the package as needing repair (e.g. `sz` > 400000 or < 100).
+*/
+function clampFontSizeSz(fontSizePts) {
+	const raw = Math.round(fontSizePts * 100);
+	const clamped = Math.min(4e5, Math.max(100, raw));
+	if (clamped !== raw) warnTextRangeOnce(`Warning: fontSize ${fontSizePts} is outside the valid range 1-4000pt; using ${clamped / 100}.`);
+	return clamped;
+}
+/** Clamp character spacing (points) into ST_TextPoint (-4000..4000pt); returns hundredths for the `spc` attribute. */
+function clampCharSpacingSpc(charSpacingPts) {
+	const raw = Math.round(charSpacingPts * 100);
+	const clamped = Math.min(4e5, Math.max(-4e5, raw));
+	if (clamped !== raw) warnTextRangeOnce(`Warning: charSpacing ${charSpacingPts} is outside the valid range -4000..4000pt; using ${clamped / 100}.`);
+	return clamped;
+}
+/** Clamp line spacing (points) into ST_TextSpacingPoint (0..1584pt); returns hundredths for `<a:spcPts val>`. */
+function clampLineSpacingPts(lineSpacingPts) {
+	const raw = Math.round(lineSpacingPts * 100);
+	const clamped = Math.min(158400, Math.max(0, raw));
+	if (clamped !== raw) warnTextRangeOnce(`Warning: lineSpacing ${lineSpacingPts} is outside the valid range 0-1584pt; using ${clamped / 100}.`);
+	return clamped;
+}
 const ImageSizingXml = {
 	cover: function(imgSize, boxDim) {
 		const imgRatio = imgSize.h / imgSize.w;
@@ -3662,23 +4103,90 @@ const ImageSizingXml = {
 * @return {string} `<a:prstGeom>` XML
 */
 const RECT_RADIUS_ADJ1_SHAPES = new Set(["round2SameRect", "round2DiagRect"]);
+const SHAPE_LOCK_ATTRS = [
+	"noGrp",
+	"noSelect",
+	"noRot",
+	"noChangeAspect",
+	"noMove",
+	"noResize",
+	"noEditPoints",
+	"noAdjustHandles",
+	"noChangeArrowheads",
+	"noChangeShapeType",
+	"noTextEdit"
+];
+const PICTURE_LOCK_ATTRS = [
+	"noGrp",
+	"noSelect",
+	"noRot",
+	"noChangeAspect",
+	"noMove",
+	"noResize",
+	"noEditPoints",
+	"noAdjustHandles",
+	"noChangeArrowheads",
+	"noChangeShapeType",
+	"noCrop"
+];
+const GRAPHIC_FRAME_LOCK_ATTRS = [
+	"noGrp",
+	"noDrilldown",
+	"noSelect",
+	"noChangeAspect",
+	"noMove",
+	"noResize"
+];
+/**
+* Serialize an object-lock element (`a:spLocks` / `a:picLocks` / `a:graphicFrameLocks`).
+* Only flags set to `true` AND valid for this element type are emitted; a flag set on an
+* unsupported element type is dropped with a warning (silent coercion is a footgun).
+* @param tag - locking element tag, e.g. `'a:spLocks'`
+* @param allowed - attribute names this element type supports, in desired emit order
+* @param locks - merged lock flags (callers fold any hard-coded default in first)
+* @param objectName - for the warning message
+* @returns the locking element string, or `''` when no applicable flag is set
+*/
+function genXmlObjectLock(tag, allowed, locks, objectName) {
+	if (!locks) return "";
+	const lockMap = locks;
+	for (const key of Object.keys(lockMap)) if (lockMap[key] && !allowed.includes(key)) console.warn(`Warning: objectLock.${key} is not supported on <${tag}> (object "${objectName ?? ""}") and was ignored.`);
+	const attrs = allowed.filter((name) => lockMap[name] === true).map((name) => `${name}="1"`);
+	return attrs.length > 0 ? `<${tag} ${attrs.join(" ")}/>` : "";
+}
 function genXmlPresetGeom(shapeName, options, cx, cy) {
-	let strXml = `<a:prstGeom prst="${shapeName}"><a:avLst>`;
+	if (!VALID_SHAPE_PRESETS.has(shapeName)) throw new Error(`Invalid shape "${String(shapeName)}"! Use a value from \`pptxgen.shapes.*\` (e.g. \`pptxgen.shapes.RECTANGLE\`). PowerPoint can't render unknown preset geometries and will drop the shape during repair.`);
+	let avLst = "";
+	const emittedAdjNames = /* @__PURE__ */ new Set();
+	const emitGuide = (name, fmlaVal) => {
+		avLst += `<a:gd name="${name}" fmla="val ${fmlaVal}"/>`;
+		emittedAdjNames.add(name);
+	};
 	if (options.rectRadius) {
 		const adjVal = Math.round(options.rectRadius * EMU * 1e5 / Math.min(cx, cy));
 		if (RECT_RADIUS_ADJ1_SHAPES.has(shapeName)) {
-			strXml += `<a:gd name="adj1" fmla="val ${adjVal}"/>`;
-			strXml += "<a:gd name=\"adj2\" fmla=\"val 0\"/>";
-		} else strXml += `<a:gd name="adj" fmla="val ${adjVal}"/>`;
+			emitGuide("adj1", adjVal);
+			emitGuide("adj2", 0);
+		} else emitGuide("adj", adjVal);
 	} else if (options.angleRange) {
 		for (let i = 0; i < 2; i++) {
 			const angle = options.angleRange[i];
-			strXml += `<a:gd name="adj${i + 1}" fmla="val ${convertRotationDegrees(angle)}" />`;
+			emitGuide(`adj${i + 1}`, convertRotationDegrees(angle));
 		}
-		if (options.arcThicknessRatio) strXml += `<a:gd name="adj3" fmla="val ${Math.round(options.arcThicknessRatio * 5e4)}" />`;
+		if (options.arcThicknessRatio) emitGuide("adj3", Math.round(options.arcThicknessRatio * 5e4));
 	}
-	strXml += "</a:avLst></a:prstGeom>";
-	return strXml;
+	if (options.shapeAdjust) (Array.isArray(options.shapeAdjust) ? options.shapeAdjust : [options.shapeAdjust]).forEach((adj) => {
+		if (!adj || typeof adj.name !== "string" || adj.name.length === 0 || typeof adj.value !== "number" || !isFinite(adj.value)) {
+			console.warn(`Warning: shapeAdjust entry ${JSON.stringify(adj)} is invalid (needs { name:string, value:number }) and was ignored.`);
+			return;
+		}
+		if (emittedAdjNames.has(adj.name)) {
+			console.warn(`Warning: shapeAdjust "${adj.name}" was ignored because rectRadius/angleRange already set that handle.`);
+			return;
+		}
+		emitGuide(adj.name, Math.round(adj.value * 1e5));
+	});
+	return `<a:prstGeom prst="${shapeName}"><a:avLst>${avLst}</a:avLst></a:prstGeom>`;
 }
 /**
 * Emit an `<a:custGeom>` for a freeform path built from `points`.
@@ -3731,6 +4239,45 @@ function genXmlCustGeom(points, cx, cy, layout) {
 }
 const PLACEHOLDER_TYPE_MAP = PLACEHOLDER_TYPES;
 /**
+* Emit the `<a:lnL>/<a:lnR>/<a:lnT>/<a:lnB>` border children of an `<a:tcPr>` for a table cell.
+* Shared by normal cells and the dummy span (`_hmerge`/`_vmerge`) cells so a merged region's
+* outer edges render with the same border as its origin cell (Issue #680).
+* @param {BorderProps[]} cellBorder - 4-tuple of border props in [top, right, bottom, left] order
+* @return {string} concatenated border element XML, in the LRTB document order PowerPoint expects
+*/
+function genTableCellBorderXml(cellBorder) {
+	let strXml = "";
+	[
+		{
+			idx: 3,
+			name: "lnL"
+		},
+		{
+			idx: 1,
+			name: "lnR"
+		},
+		{
+			idx: 0,
+			name: "lnT"
+		},
+		{
+			idx: 2,
+			name: "lnB"
+		}
+	].forEach((obj) => {
+		const border = cellBorder[obj.idx];
+		if (!border) return;
+		const cap = createLineCap(border.cap);
+		if (border.type !== "none") {
+			strXml += `<a:${obj.name} w="${valToPts(border.pt)}" cap="${cap}" cmpd="sng" algn="ctr">`;
+			strXml += `<a:solidFill>${createColorElement(border.color)}</a:solidFill>`;
+			strXml += `<a:prstDash val="${border.type === "dash" ? "sysDash" : "solid"}"/><a:round/><a:headEnd type="none" w="med" len="med"/><a:tailEnd type="none" w="med" len="med"/>`;
+			strXml += `</a:${obj.name}>`;
+		} else strXml += `<a:${obj.name} w="0" cap="${cap}" cmpd="sng" algn="ctr"><a:noFill/></a:${obj.name}>`;
+	});
+	return strXml;
+}
+/**
 * Transforms a slide or slideLayout to resulting XML string - Creates `ppt/slide*.xml`
 * @param {PresSlideInternal|SlideLayoutInternal} slideObject - slide object created within createSlideObject
 * @return {string} XML string with <p:cSld> as the root
@@ -3789,7 +4336,10 @@ function slideObjectToXml(slide) {
 					intColCnt += cellOpts?.colspan ? Number(cellOpts.colspan) : 1;
 				});
 				strXml = `<p:graphicFrame><p:nvGraphicFramePr><p:cNvPr id="${intTableNum * slide._slideNum + 1}" name="${slideItemObj.options.objectName}" descr="${encodeXmlEntities(slideItemObj.options.altText || "")}"/>`;
-				strXml += "<p:cNvGraphicFramePr><a:graphicFrameLocks noGrp=\"1\"/></p:cNvGraphicFramePr>  <p:nvPr><p:extLst><p:ext uri=\"{D42A27DB-BD31-4B8C-83A1-F6EECF244321}\"><p14:modId xmlns:p14=\"http://schemas.microsoft.com/office/powerpoint/2010/main\" val=\"1579011935\"/></p:ext></p:extLst></p:nvPr></p:nvGraphicFramePr>";
+				strXml += `<p:cNvGraphicFramePr>${genXmlObjectLock("a:graphicFrameLocks", GRAPHIC_FRAME_LOCK_ATTRS, {
+					noGrp: true,
+					...slideItemObj.options.objectLock
+				}, slideItemObj.options.objectName)}</p:cNvGraphicFramePr>  <p:nvPr><p:extLst><p:ext uri="{D42A27DB-BD31-4B8C-83A1-F6EECF244321}"><p14:modId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1579011935"/></p:ext></p:extLst></p:nvPr></p:nvGraphicFramePr>`;
 				strXml += `<p:xfrm><a:off x="${x || (x === 0 ? 0 : EMU)}" y="${y || (y === 0 ? 0 : EMU)}"/><a:ext cx="${cx || (cx === 0 ? 0 : EMU)}" cy="${cy || EMU}"/></p:xfrm>`;
 				{
 					const tblPrAttrs = (objTabOpts.hasHeader ? " firstRow=\"1\"" : "") + (objTabOpts.hasFooter ? " lastRow=\"1\"" : "") + (objTabOpts.hasBandedRows ? " bandRow=\"1\"" : "") + (objTabOpts.hasBandedColumns ? " bandCol=\"1\"" : "") + (objTabOpts.hasFirstColumn ? " firstCol=\"1\"" : "") + (objTabOpts.hasLastColumn ? " lastCol=\"1\"" : "");
@@ -3821,7 +4371,8 @@ function slideObjectToXml(slide) {
 								return {
 									_type: "tablecell",
 									options: { rowspan },
-									_hmerge: true
+									_hmerge: true,
+									_spanOrigin: cell
 								};
 							});
 							cells.splice(cIdx + 1, 0, ...vMergeCells);
@@ -3837,12 +4388,14 @@ function slideObjectToXml(slide) {
 						const colspan = cell.options?.colspan;
 						const _hmerge = cell._hmerge;
 						if (rowspan && rowspan > 1) {
+							const _spanOrigin = cell._spanOrigin || cell;
 							const hMergeCell = {
 								_type: "tablecell",
 								options: { colspan },
 								_rowContinue: rowspan - 1,
 								_vmerge: true,
-								_hmerge
+								_hmerge,
+								_spanOrigin
 							};
 							nextRow.splice(cIdx, 0, hMergeCell);
 						}
@@ -3852,7 +4405,7 @@ function slideObjectToXml(slide) {
 					let intRowH = 0;
 					if (Array.isArray(objTabOpts.rowH) && objTabOpts.rowH[rIdx]) intRowH = inch2Emu(Number(objTabOpts.rowH[rIdx]));
 					else if (objTabOpts.rowH && !isNaN(Number(objTabOpts.rowH))) intRowH = inch2Emu(Number(objTabOpts.rowH));
-					else if (slideItemObj.options.cy || slideItemObj.options.h) intRowH = Math.round((slideItemObj.options.h ? inch2Emu(slideItemObj.options.h) : typeof slideItemObj.options.cy === "number" ? slideItemObj.options.cy : 1) / arrTabRows.length);
+					else if (slideItemObj.options.cy || slideItemObj.options.h) intRowH = Math.round((slideItemObj.options.h ? cy : typeof slideItemObj.options.cy === "number" ? slideItemObj.options.cy : 1) / arrTabRows.length);
 					strXml += `<a:tr h="${intRowH}">`;
 					cells.forEach((cellObj) => {
 						const cell = cellObj;
@@ -3865,7 +4418,17 @@ function slideObjectToXml(slide) {
 						let cellSpanAttrStr = Object.entries(cellSpanAttrs).filter(([, v]) => !!v).map(([k, v]) => `${String(k)}="${String(v)}"`).join(" ");
 						if (cellSpanAttrStr) cellSpanAttrStr = " " + cellSpanAttrStr;
 						if (cell._hmerge || cell._vmerge) {
-							strXml += `<a:tc${cellSpanAttrStr}><a:tcPr/></a:tc>`;
+							const origin = cell._spanOrigin;
+							let spanPrXml = "";
+							if (origin) {
+								const originOpts = origin.options || {};
+								const originBorder = Array.isArray(originOpts.border) ? originOpts.border : null;
+								if (originBorder) spanPrXml += genTableCellBorderXml(originBorder);
+								let spanFill = origin._optImp?.fill?.color ? origin._optImp.fill.color : origin._optImp?.fill && typeof origin._optImp.fill === "string" ? origin._optImp.fill : "";
+								spanFill = spanFill || originOpts.fill ? originOpts.fill : "";
+								if (spanFill) spanPrXml += genXmlColorSelection(spanFill);
+							}
+							strXml += `<a:tc${cellSpanAttrStr}><a:tcPr>${spanPrXml}</a:tcPr></a:tc>`;
 							return;
 						}
 						const cellOpts = cell.options || {};
@@ -3909,32 +4472,7 @@ function slideObjectToXml(slide) {
 						else cellMarginXml = ` marL="${inch2Emu(cellMargin[3])}" marR="${inch2Emu(cellMargin[1])}" marT="${inch2Emu(cellMargin[0])}" marB="${inch2Emu(cellMargin[2])}"`;
 						strXml += `<a:tc${cellSpanAttrStr}>${genXmlTextBody(cell)}<a:tcPr${cellMarginXml}${cellValign}${cellTextDir}>`;
 						const cellBorder = Array.isArray(cellOpts.border) ? cellOpts.border : null;
-						if (cellBorder) [
-							{
-								idx: 3,
-								name: "lnL"
-							},
-							{
-								idx: 1,
-								name: "lnR"
-							},
-							{
-								idx: 0,
-								name: "lnT"
-							},
-							{
-								idx: 2,
-								name: "lnB"
-							}
-						].forEach((obj) => {
-							const border = cellBorder[obj.idx];
-							if (border.type !== "none") {
-								strXml += `<a:${obj.name} w="${valToPts(border.pt)}" cap="flat" cmpd="sng" algn="ctr">`;
-								strXml += `<a:solidFill>${createColorElement(border.color)}</a:solidFill>`;
-								strXml += `<a:prstDash val="${border.type === "dash" ? "sysDash" : "solid"}"/><a:round/><a:headEnd type="none" w="med" len="med"/><a:tailEnd type="none" w="med" len="med"/>`;
-								strXml += `</a:${obj.name}>`;
-							} else strXml += `<a:${obj.name} w="0" cap="flat" cmpd="sng" algn="ctr"><a:noFill/></a:${obj.name}>`;
-						});
+						if (cellBorder) strXml += genTableCellBorderXml(cellBorder);
 						strXml += cellFill;
 						strXml += "  </a:tcPr>";
 						strXml += " </a:tc>";
@@ -3953,10 +4491,10 @@ function slideObjectToXml(slide) {
 				if (!slideItemObj.options.line && cy === 0) cy = EMU * .3;
 				if (!slideItemObj.options._bodyProp) slideItemObj.options._bodyProp = {};
 				if (slideItemObj.options.margin && Array.isArray(slideItemObj.options.margin)) {
-					slideItemObj.options._bodyProp.lIns = valToPts(slideItemObj.options.margin[0] || 0);
+					slideItemObj.options._bodyProp.tIns = valToPts(slideItemObj.options.margin[0] || 0);
 					slideItemObj.options._bodyProp.rIns = valToPts(slideItemObj.options.margin[1] || 0);
 					slideItemObj.options._bodyProp.bIns = valToPts(slideItemObj.options.margin[2] || 0);
-					slideItemObj.options._bodyProp.tIns = valToPts(slideItemObj.options.margin[3] || 0);
+					slideItemObj.options._bodyProp.lIns = valToPts(slideItemObj.options.margin[3] || 0);
 				} else if (typeof slideItemObj.options.margin === "number") {
 					slideItemObj.options._bodyProp.lIns = valToPts(slideItemObj.options.margin);
 					slideItemObj.options._bodyProp.rIns = valToPts(slideItemObj.options.margin);
@@ -3968,7 +4506,11 @@ function slideObjectToXml(slide) {
 				if (slideItemObj.options.hyperlink?.url) strSlideXml += `<a:hlinkClick r:id="rId${slideItemObj.options.hyperlink._rId}" tooltip="${slideItemObj.options.hyperlink.tooltip ? encodeXmlEntities(slideItemObj.options.hyperlink.tooltip) : ""}"/>`;
 				if (slideItemObj.options.hyperlink?.slide) strSlideXml += `<a:hlinkClick r:id="rId${slideItemObj.options.hyperlink._rId}" tooltip="${slideItemObj.options.hyperlink.tooltip ? encodeXmlEntities(slideItemObj.options.hyperlink.tooltip) : ""}" action="ppaction://hlinksldjump"/>`;
 				strSlideXml += "</p:cNvPr>";
-				strSlideXml += "<p:cNvSpPr" + (slideItemObj.options?.isTextBox ? " txBox=\"1\"/>" : "/>");
+				{
+					const spLockXml = genXmlObjectLock("a:spLocks", SHAPE_LOCK_ATTRS, slideItemObj.options.objectLock, slideItemObj.options.objectName);
+					strSlideXml += "<p:cNvSpPr" + (slideItemObj.options?.isTextBox ? " txBox=\"1\"" : "");
+					strSlideXml += spLockXml ? `>${spLockXml}</p:cNvSpPr>` : "/>";
+				}
 				strSlideXml += `<p:nvPr>${slideItemObj._type === "placeholder" ? genXmlPlaceholder(slideItemObj) : genXmlPlaceholder(placeholderObj)}</p:nvPr>`;
 				strSlideXml += "</p:nvSpPr><p:spPr>";
 				strSlideXml += `<a:xfrm${locationAttr}>`;
@@ -3978,7 +4520,8 @@ function slideObjectToXml(slide) {
 				else strSlideXml += genXmlPresetGeom(slideItemObj.shape, slideItemObj.options, cx, cy);
 				strSlideXml += slideItemObj.options.fill ? genXmlColorSelection(slideItemObj.options.fill) : "<a:noFill/>";
 				if (slideItemObj.options.line) {
-					strSlideXml += slideItemObj.options.line.width ? `<a:ln w="${valToPts(slideItemObj.options.line.width)}">` : "<a:ln>";
+					const lnAttrs = (slideItemObj.options.line.width ? ` w="${lineWidthToEmu(slideItemObj.options.line.width)}"` : "") + (slideItemObj.options.line.cap ? ` cap="${createLineCap(slideItemObj.options.line.cap)}"` : "");
+					strSlideXml += `<a:ln${lnAttrs}>`;
 					if (slideItemObj.options.line.color) strSlideXml += genXmlColorSelection(slideItemObj.options.line);
 					if (slideItemObj.options.line.dashType) strSlideXml += `<a:prstDash val="${slideItemObj.options.line.dashType}"/>`;
 					if (slideItemObj.options.line.beginArrowType) strSlideXml += `<a:headEnd type="${slideItemObj.options.line.beginArrowType}"/>`;
@@ -4004,6 +4547,24 @@ function slideObjectToXml(slide) {
 				strSlideXml += genXmlTextBody(slideItemObj);
 				strSlideXml += "</p:sp>";
 				break;
+			case "connector":
+				strSlideXml += "<p:cxnSp><p:nvCxnSpPr>";
+				strSlideXml += `<p:cNvPr id="${idx + 2}" name="${slideItemObj.options.objectName}" descr="${encodeXmlEntities(slideItemObj.options.altText || "")}"/>`;
+				strSlideXml += "<p:cNvCxnSpPr/><p:nvPr/></p:nvCxnSpPr><p:spPr>";
+				strSlideXml += `<a:xfrm${locationAttr}><a:off x="${x}" y="${y}"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm>`;
+				strSlideXml += `<a:prstGeom prst="${slideItemObj.shape}"><a:avLst/></a:prstGeom>`;
+				{
+					const ln = slideItemObj.options.line || {};
+					const lnAttrs = (ln.width ? ` w="${lineWidthToEmu(ln.width)}"` : "") + (ln.cap ? ` cap="${createLineCap(ln.cap)}"` : "");
+					strSlideXml += `<a:ln${lnAttrs}>`;
+					if (ln.color) strSlideXml += genXmlColorSelection(ln);
+					if (ln.dashType) strSlideXml += `<a:prstDash val="${ln.dashType}"/>`;
+					if (ln.beginArrowType) strSlideXml += `<a:headEnd type="${ln.beginArrowType}"/>`;
+					if (ln.endArrowType) strSlideXml += `<a:tailEnd type="${ln.endArrowType}"/>`;
+					strSlideXml += "</a:ln>";
+				}
+				strSlideXml += "</p:spPr></p:cxnSp>";
+				break;
 			case "image":
 				strSlideXml += "<p:pic>";
 				strSlideXml += "  <p:nvPicPr>";
@@ -4011,7 +4572,10 @@ function slideObjectToXml(slide) {
 				if (slideItemObj.hyperlink?.url) strSlideXml += `<a:hlinkClick r:id="rId${slideItemObj.hyperlink._rId}" tooltip="${slideItemObj.hyperlink.tooltip ? encodeXmlEntities(slideItemObj.hyperlink.tooltip) : ""}"/>`;
 				if (slideItemObj.hyperlink?.slide) strSlideXml += `<a:hlinkClick r:id="rId${slideItemObj.hyperlink._rId}" tooltip="${slideItemObj.hyperlink.tooltip ? encodeXmlEntities(slideItemObj.hyperlink.tooltip) : ""}" action="ppaction://hlinksldjump"/>`;
 				strSlideXml += "    </p:cNvPr>";
-				strSlideXml += "    <p:cNvPicPr><a:picLocks noChangeAspect=\"1\"/></p:cNvPicPr>";
+				strSlideXml += `    <p:cNvPicPr>${genXmlObjectLock("a:picLocks", PICTURE_LOCK_ATTRS, {
+					noChangeAspect: true,
+					...slideItemObj.options.objectLock
+				}, slideItemObj.options.objectName)}</p:cNvPicPr>`;
 				strSlideXml += "    <p:nvPr>" + genXmlPlaceholder(placeholderObj) + "</p:nvPr>";
 				strSlideXml += "  </p:nvPicPr>";
 				strSlideXml += "<p:blipFill>";
@@ -4044,7 +4608,7 @@ function slideObjectToXml(slide) {
 						const relData = (slide._relsMedia || []).find((rel) => rel.rId === slideItemObj.imageRid)?.data;
 						const natural = typeof relData === "string" ? getImageSizeFromBase64(relData) : null;
 						if (natural) cropSize = natural;
-						else console.warn(`Warning: sizing '${sizing.type}' could not measure natural dimensions for image "${slideItemObj.options.objectName}"; falling back to displayed aspect ratio (crop may be inexact). Provide a raster image (PNG/JPEG/GIF/BMP/WebP) to enable an aspect-correct crop.`);
+						else console.warn(`Warning: sizing '${sizing.type}' could not measure natural dimensions for image "${slideItemObj.options.objectName}"; falling back to displayed aspect ratio (crop may be inexact). Provide a raster image (PNG/JPEG/GIF/BMP/WebP) or an SVG with width/height or a viewBox to enable an aspect-correct crop.`);
 					}
 					strSlideXml += ImageSizingXml[sizing.type](cropSize, {
 						w: boxW,
@@ -4063,6 +4627,16 @@ function slideObjectToXml(slide) {
 				strSlideXml += " </a:xfrm>";
 				if (slideItemObj.options.points) strSlideXml += " " + genXmlCustGeom(slideItemObj.options.points, imgWidth, imgHeight, slide._presLayout);
 				else strSlideXml += " " + genXmlPresetGeom(slideItemObj.options.shape ?? (rounding ? "ellipse" : "rect"), slideItemObj.options, imgWidth, imgHeight);
+				if (slideItemObj.options.line) {
+					const imgLine = slideItemObj.options.line;
+					const lnAttrs = (imgLine.width ? ` w="${lineWidthToEmu(imgLine.width)}"` : "") + (imgLine.cap ? ` cap="${createLineCap(imgLine.cap)}"` : "");
+					strSlideXml += `<a:ln${lnAttrs}>`;
+					if (imgLine.color) strSlideXml += genXmlColorSelection(imgLine);
+					if (imgLine.dashType) strSlideXml += `<a:prstDash val="${imgLine.dashType}"/>`;
+					if (imgLine.beginArrowType) strSlideXml += `<a:headEnd type="${imgLine.beginArrowType}"/>`;
+					if (imgLine.endArrowType) strSlideXml += `<a:tailEnd type="${imgLine.endArrowType}"/>`;
+					strSlideXml += "</a:ln>";
+				}
 				if (slideItemObj.options.shadow && slideItemObj.options.shadow.type !== "none") {
 					const sh = slideItemObj.options.shadow;
 					const shadowType = sh.type || "outer";
@@ -4086,7 +4660,7 @@ function slideObjectToXml(slide) {
 					strSlideXml += "<p:pic>";
 					strSlideXml += " <p:nvPicPr>";
 					strSlideXml += `<p:cNvPr id="${slideItemObj.mediaRid + 2}" name="${slideItemObj.options.objectName}" descr="${encodeXmlEntities(slideItemObj.options.altText || "")}"/>`;
-					strSlideXml += " <p:cNvPicPr/>";
+					strSlideXml += ` <p:cNvPicPr>${genXmlObjectLock("a:picLocks", PICTURE_LOCK_ATTRS, slideItemObj.options.objectLock, slideItemObj.options.objectName)}</p:cNvPicPr>`;
 					strSlideXml += " <p:nvPr>";
 					strSlideXml += `  <a:videoFile r:link="rId${slideItemObj.mediaRid}"/>`;
 					strSlideXml += " </p:nvPr>";
@@ -4101,7 +4675,10 @@ function slideObjectToXml(slide) {
 					strSlideXml += "<p:pic>";
 					strSlideXml += " <p:nvPicPr>";
 					strSlideXml += `<p:cNvPr id="${slideItemObj.mediaRid + 2}" name="${slideItemObj.options.objectName}" descr="${encodeXmlEntities(slideItemObj.options.altText || "")}"><a:hlinkClick r:id="" action="ppaction://media"/></p:cNvPr>`;
-					strSlideXml += " <p:cNvPicPr><a:picLocks noChangeAspect=\"1\"/></p:cNvPicPr>";
+					strSlideXml += ` <p:cNvPicPr>${genXmlObjectLock("a:picLocks", PICTURE_LOCK_ATTRS, {
+						noChangeAspect: true,
+						...slideItemObj.options.objectLock
+					}, slideItemObj.options.objectName)}</p:cNvPicPr>`;
 					strSlideXml += " <p:nvPr>";
 					strSlideXml += `  <a:videoFile r:link="rId${slideItemObj.mediaRid}"/>`;
 					strSlideXml += "  <p:extLst>";
@@ -4165,7 +4742,7 @@ function slideObjectToXml(slide) {
 		strSlideXml += "/>";
 		strSlideXml += "  <a:lstStyle><a:lvl1pPr>";
 		if (slide._slideNumberProps.fontFace || slide._slideNumberProps.fontSize || slide._slideNumberProps.color) {
-			strSlideXml += `<a:defRPr sz="${Math.round((slide._slideNumberProps.fontSize || 12) * 100)}">`;
+			strSlideXml += `<a:defRPr sz="${clampFontSizeSz(slide._slideNumberProps.fontSize || 12)}">`;
 			if (slide._slideNumberProps.color) strSlideXml += genXmlColorSelection(slide._slideNumberProps.color);
 			if (slide._slideNumberProps.fontFace) strSlideXml += `<a:latin typeface="${slide._slideNumberProps.fontFace}"/><a:ea typeface="${slide._slideNumberProps.fontFace}"/><a:cs typeface="${slide._slideNumberProps.fontFace}"/>`;
 			strSlideXml += "</a:defRPr>";
@@ -4254,7 +4831,7 @@ function genXmlParagraphProperties(textObj, isDefault) {
 			paragraphPropXml += "";
 			break;
 	}
-	if (textObj.options.lineSpacing) strXmlLnSpc = `<a:lnSpc><a:spcPts val="${Math.round(textObj.options.lineSpacing * 100)}"/></a:lnSpc>`;
+	if (textObj.options.lineSpacing) strXmlLnSpc = `<a:lnSpc><a:spcPts val="${clampLineSpacingPts(textObj.options.lineSpacing)}"/></a:lnSpc>`;
 	else if (textObj.options.lineSpacingMultiple) strXmlLnSpc = `<a:lnSpc><a:spcPct val="${Math.round(textObj.options.lineSpacingMultiple * 1e5)}"/></a:lnSpc>`;
 	if (textObj.options.indentLevel && !isNaN(Number(textObj.options.indentLevel)) && textObj.options.indentLevel > 0) paragraphPropXml += ` lvl="${textObj.options.indentLevel}"`;
 	if (textObj.options.paraSpaceBefore && !isNaN(Number(textObj.options.paraSpaceBefore)) && textObj.options.paraSpaceBefore > 0) strXmlParaSpc += `<a:spcBef><a:spcPts val="${Math.round(textObj.options.paraSpaceBefore * 100)}"/></a:spcBef>`;
@@ -4262,9 +4839,17 @@ function genXmlParagraphProperties(textObj, isDefault) {
 	if (typeof textObj.options.bullet === "object") {
 		if (textObj?.options?.bullet?.indent) bulletMarL = valToPts(textObj.options.bullet.indent);
 		if (textObj.options.bullet.color) strXmlBulletColor = `<a:buClr>${createColorElement(textObj.options.bullet.color)}</a:buClr>`;
+		let bulletSizePct = 1e5;
+		if (textObj.options.bullet.size !== void 0) {
+			const bulletSize = Number(textObj.options.bullet.size);
+			if (isNaN(bulletSize) || bulletSize < 25 || bulletSize > 400) console.warn("Warning: `bullet.size` must be a percentage between 25 and 400!");
+			else bulletSizePct = Math.round(bulletSize * 1e3);
+		}
+		const strXmlBulletSize = `<a:buSzPct val="${bulletSizePct}"/>`;
+		const strXmlBulletFont = textObj.options.bullet.fontFace ? `<a:buFont typeface="${encodeXmlEntities(textObj.options.bullet.fontFace)}"/>` : "";
 		if (textObj.options.bullet.type && textObj.options.bullet.type.toString().toLowerCase() === "number") {
 			paragraphPropXml += ` marL="${textObj.options.indentLevel && textObj.options.indentLevel > 0 ? bulletMarL + bulletMarL * textObj.options.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-			strXmlBullet = `<a:buSzPct val="100000"/><a:buFont typeface="+mj-lt"/><a:buAutoNum type="${textObj.options.bullet.style || "arabicPeriod"}" startAt="${textObj.options.bullet.numberStartAt || textObj.options.bullet.startAt || "1"}"/>`;
+			strXmlBullet = `${strXmlBulletSize}${strXmlBulletFont || "<a:buFont typeface=\"+mj-lt\"/>"}<a:buAutoNum type="${textObj.options.bullet.style || "arabicPeriod"}" startAt="${textObj.options.bullet.numberStartAt || textObj.options.bullet.startAt || "1"}"/>`;
 		} else if (textObj.options.bullet.characterCode) {
 			let bulletCode = `&#x${textObj.options.bullet.characterCode};`;
 			if (!/^[0-9A-Fa-f]{4}$/.test(textObj.options.bullet.characterCode)) {
@@ -4272,7 +4857,7 @@ function genXmlParagraphProperties(textObj, isDefault) {
 				bulletCode = "&#x2022;";
 			}
 			paragraphPropXml += ` marL="${textObj.options.indentLevel && textObj.options.indentLevel > 0 ? bulletMarL + bulletMarL * textObj.options.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-			strXmlBullet = "<a:buSzPct val=\"100000\"/><a:buChar char=\"" + bulletCode + "\"/>";
+			strXmlBullet = strXmlBulletSize + strXmlBulletFont + "<a:buChar char=\"" + bulletCode + "\"/>";
 		} else if (textObj.options.bullet.code) {
 			let bulletCode = `&#x${textObj.options.bullet.code};`;
 			if (!/^[0-9A-Fa-f]{4}$/.test(textObj.options.bullet.code)) {
@@ -4280,10 +4865,10 @@ function genXmlParagraphProperties(textObj, isDefault) {
 				bulletCode = "&#x2022;";
 			}
 			paragraphPropXml += ` marL="${textObj.options.indentLevel && textObj.options.indentLevel > 0 ? bulletMarL + bulletMarL * textObj.options.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-			strXmlBullet = "<a:buSzPct val=\"100000\"/><a:buChar char=\"" + bulletCode + "\"/>";
+			strXmlBullet = strXmlBulletSize + strXmlBulletFont + "<a:buChar char=\"" + bulletCode + "\"/>";
 		} else {
 			paragraphPropXml += ` marL="${textObj.options.indentLevel && textObj.options.indentLevel > 0 ? bulletMarL + bulletMarL * textObj.options.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-			strXmlBullet = `<a:buSzPct val="100000"/><a:buChar char="&#x2022;"/>`;
+			strXmlBullet = `${strXmlBulletSize}${strXmlBulletFont}<a:buChar char="&#x2022;"/>`;
 		}
 	} else if (textObj.options.bullet) {
 		paragraphPropXml += ` marL="${textObj.options.indentLevel && textObj.options.indentLevel > 0 ? bulletMarL + bulletMarL * textObj.options.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
@@ -4308,7 +4893,7 @@ function genXmlTextRunProperties(opts, isDefault) {
 	let runProps = "";
 	const runPropsTag = isDefault ? "a:defRPr" : "a:rPr";
 	runProps += "<" + runPropsTag + " lang=\"" + (opts.lang ? opts.lang : "en-US") + "\"" + (opts.lang ? " altLang=\"en-US\"" : "");
-	runProps += opts.fontSize ? ` sz="${Math.round(opts.fontSize * 100)}"` : "";
+	runProps += opts.fontSize ? ` sz="${clampFontSizeSz(opts.fontSize)}"` : "";
 	runProps += opts?.bold ? ` b="${opts.bold ? "1" : "0"}"` : "";
 	runProps += opts?.italic ? ` i="${opts.italic ? "1" : "0"}"` : "";
 	runProps += opts?.strike ? ` strike="${typeof opts.strike === "string" ? opts.strike : "sngStrike"}"` : "";
@@ -4319,17 +4904,23 @@ function genXmlTextRunProperties(opts, isDefault) {
 	if (opts.baseline) runProps += ` baseline="${Math.round(opts.baseline * 50)}"`;
 	else if (opts.subscript) runProps += " baseline=\"-40000\"";
 	else if (opts.superscript) runProps += " baseline=\"30000\"";
-	runProps += opts.charSpacing ? ` spc="${Math.round(opts.charSpacing * 100)}" kern="0"` : "";
+	runProps += opts.charSpacing ? ` spc="${clampCharSpacingSpc(opts.charSpacing)}" kern="0"` : "";
 	runProps += " dirty=\"0\">";
-	if (opts.color || opts.fontFace || opts.outline || typeof opts.underline === "object" && opts.underline.color) {
-		if (opts.outline && typeof opts.outline === "object") runProps += `<a:ln w="${valToPts(opts.outline.size || .75)}">${genXmlColorSelection(opts.outline.color || "FFFFFF")}</a:ln>`;
+	const hasShadow = !!opts.shadow && opts.shadow.type !== "none";
+	if (opts.color || opts.fontFace || opts.outline || opts.glow || hasShadow || typeof opts.underline === "object" && opts.underline.color) {
+		if (opts.outline && typeof opts.outline === "object") runProps += `<a:ln w="${lineWidthToEmu(opts.outline.size || .75)}">${genXmlColorSelection(opts.outline.color || "FFFFFF")}</a:ln>`;
 		if (opts.color) runProps += genXmlColorSelection({
 			color: opts.color,
 			transparency: opts.transparency
 		});
+		if (opts.glow || hasShadow) {
+			runProps += "<a:effectLst>";
+			if (opts.glow) runProps += createGlowElement(opts.glow, DEF_TEXT_GLOW);
+			if (hasShadow) runProps += createShadowElement$1(opts.shadow, DEF_TEXT_SHADOW);
+			runProps += "</a:effectLst>";
+		}
 		if (opts.highlight) runProps += `<a:highlight>${createColorElement(opts.highlight)}</a:highlight>`;
 		if (typeof opts.underline === "object" && opts.underline.color) runProps += `<a:uFill>${genXmlColorSelection(opts.underline.color)}</a:uFill>`;
-		if (opts.glow) runProps += `<a:effectLst>${createGlowElement(opts.glow, DEF_TEXT_GLOW)}</a:effectLst>`;
 		if (opts.fontFace) runProps += `<a:latin typeface="${opts.fontFace}" pitchFamily="34" charset="0"/><a:ea typeface="${opts.fontFace}" pitchFamily="34" charset="-122"/><a:cs typeface="${opts.fontFace}" pitchFamily="34" charset="-120"/>`;
 	}
 	if (opts.hyperlink) {
@@ -4359,6 +4950,28 @@ function genXmlTextRun(textObj) {
 	return `<a:r>${genXmlTextRunProperties(textObj.options, false)}<a:t>${encodeXmlEntities(String(textObj.text))}</a:t></a:r>`;
 }
 /**
+* Builds `<a:normAutofit>` with explicit fontScale/lnSpcReduction for "shrink text on overflow"
+* @param {TextFitShrinkProps} fit - shrink fit options
+* @return {string} XML string (`<a:normAutofit .../>`)
+* @see ECMA-376 CT_TextNormAutofit (attributes in 1000ths of a percent)
+*/
+function genXmlNormAutofit(fit) {
+	let attrs = "";
+	const pct = (val, name) => {
+		if (val === void 0 || val === null) return null;
+		if (typeof val !== "number" || isNaN(val) || val < 0 || val > 100) {
+			console.warn(`Warning: fit.${name} must be a number between 0 and 100 (percent); received ${String(val)} - attribute ignored.`);
+			return null;
+		}
+		return Math.round(val * 1e3);
+	};
+	const fontScale = pct(fit.fontScale, "fontScale");
+	if (fontScale !== null) attrs += ` fontScale="${fontScale}"`;
+	const lnSpcReduction = pct(fit.lnSpcReduction, "lnSpcReduction");
+	if (lnSpcReduction !== null) attrs += ` lnSpcReduction="${lnSpcReduction}"`;
+	return `<a:normAutofit${attrs}/>`;
+}
+/**
 * Builds `<a:bodyPr></a:bodyPr>` tag for "genXmlTextBody()"
 * @param {ISlideObject | TableCell} slideObject - various options
 * @return {string} XML string
@@ -4371,6 +4984,8 @@ function genXmlBodyProperties(slideObject) {
 		if (slideObject.options._bodyProp.tIns || slideObject.options._bodyProp.tIns === 0) bodyProperties += ` tIns="${slideObject.options._bodyProp.tIns}"`;
 		if (slideObject.options._bodyProp.rIns || slideObject.options._bodyProp.rIns === 0) bodyProperties += ` rIns="${slideObject.options._bodyProp.rIns}"`;
 		if (slideObject.options._bodyProp.bIns || slideObject.options._bodyProp.bIns === 0) bodyProperties += ` bIns="${slideObject.options._bodyProp.bIns}"`;
+		if (slideObject.options._bodyProp.numCol) bodyProperties += ` numCol="${slideObject.options._bodyProp.numCol}"`;
+		if (slideObject.options._bodyProp.spcCol) bodyProperties += ` spcCol="${slideObject.options._bodyProp.spcCol}"`;
 		bodyProperties += " rtlCol=\"0\"";
 		if (slideObject.options._bodyProp.anchor) bodyProperties += " anchor=\"" + slideObject.options._bodyProp.anchor + "\"";
 		if (slideObject.options._bodyProp.vert) bodyProperties += " vert=\"" + slideObject.options._bodyProp.vert + "\"";
@@ -4381,9 +4996,11 @@ function genXmlBodyProperties(slideObject) {
 		* @see: http://www.datypic.com/sc/ooxml/g-a_EG_TextAutofit.html
 		*/
 		if (slideObject.options.fit) {
-			if (slideObject.options.fit === "none") bodyProperties += "";
-			else if (slideObject.options.fit === "shrink") bodyProperties += "<a:normAutofit/>";
-			else if (slideObject.options.fit === "resize") bodyProperties += "<a:spAutoFit/>";
+			const fit = slideObject.options.fit;
+			if (fit === "none") bodyProperties += "";
+			else if (fit === "shrink") bodyProperties += "<a:normAutofit/>";
+			else if (fit === "resize") bodyProperties += "<a:spAutoFit/>";
+			else if (typeof fit === "object" && fit.type === "shrink") bodyProperties += genXmlNormAutofit(fit);
 		}
 		if (slideObject.options.shrinkText) bodyProperties += "<a:normAutofit/>";
 		bodyProperties += slideObject.options._bodyProp.autoFit ? "<a:spAutoFit/>" : "";
@@ -4519,13 +5136,13 @@ function genXmlTextBody(slideObj) {
 			}
 		});
 		if (slideObj._type === "tablecell" && (opts.fontSize || opts.fontFace)) if (opts.fontFace) {
-			strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${Math.round(opts.fontSize * 100)}"` : "") + " dirty=\"0\">";
+			strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${clampFontSizeSz(opts.fontSize)}"` : "") + " dirty=\"0\">";
 			strSlideXml += `<a:latin typeface="${opts.fontFace}" charset="0"/>`;
 			strSlideXml += `<a:ea typeface="${opts.fontFace}" charset="0"/>`;
 			strSlideXml += `<a:cs typeface="${opts.fontFace}" charset="0"/>`;
 			strSlideXml += "</a:endParaRPr>";
-		} else strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${Math.round(opts.fontSize * 100)}"` : "") + " dirty=\"0\"/>";
-		else if (reqsClosingFontSize) strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${Math.round(opts.fontSize * 100)}"` : "") + " dirty=\"0\"/>";
+		} else strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${clampFontSizeSz(opts.fontSize)}"` : "") + " dirty=\"0\"/>";
+		else if (reqsClosingFontSize) strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}"` + (opts.fontSize ? ` sz="${clampFontSizeSz(opts.fontSize)}"` : "") + " dirty=\"0\"/>";
 		else strSlideXml += `<a:endParaRPr lang="${opts.lang || "en-US"}" dirty="0"/>`;
 		strSlideXml += "</a:p>";
 	});
@@ -4866,11 +5483,51 @@ function getLayoutIdxForSlide(slides, slideLayouts, slideNumber) {
 	return 1;
 }
 /**
+* Theme `<a:clrScheme>` slots in OOXML document order, with their default Office color child.
+* `dk1`/`lt1` default to `sysClr` (windowText/window); the rest are `srgbClr`. A user override
+* for any slot is emitted as `<a:srgbClr>` (see `buildThemeClrScheme`).
+*/
+const THEME_CLR_SCHEME_DEFAULTS = [
+	["dk1", "<a:sysClr val=\"windowText\" lastClr=\"000000\"/>"],
+	["lt1", "<a:sysClr val=\"window\" lastClr=\"FFFFFF\"/>"],
+	["dk2", "<a:srgbClr val=\"44546A\"/>"],
+	["lt2", "<a:srgbClr val=\"E7E6E6\"/>"],
+	["accent1", "<a:srgbClr val=\"4472C4\"/>"],
+	["accent2", "<a:srgbClr val=\"ED7D31\"/>"],
+	["accent3", "<a:srgbClr val=\"A5A5A5\"/>"],
+	["accent4", "<a:srgbClr val=\"FFC000\"/>"],
+	["accent5", "<a:srgbClr val=\"5B9BD5\"/>"],
+	["accent6", "<a:srgbClr val=\"70AD47\"/>"],
+	["hlink", "<a:srgbClr val=\"0563C1\"/>"],
+	["folHlink", "<a:srgbClr val=\"954F72\"/>"]
+];
+/**
+* Build the theme `<a:clrScheme>` block, applying any caller-supplied color overrides over the
+* default Office scheme. Invalid (non 6-digit-hex) overrides warn and keep the default rather
+* than emitting a degenerate color.
+* @param {ThemeColorScheme} [scheme] - per-slot hex overrides
+* @return {string} the `<a:clrScheme>...</a:clrScheme>` XML
+*/
+function buildThemeClrScheme(scheme) {
+	return `<a:clrScheme name="Office">${THEME_CLR_SCHEME_DEFAULTS.map(([slot, defaultChild]) => {
+		const override = scheme?.[slot];
+		let child = defaultChild;
+		if (typeof override === "string" && override.length > 0) {
+			const hex = override.replace("#", "");
+			if (REGEX_HEX_COLOR.test(hex)) child = `<a:srgbClr val="${hex.toUpperCase()}"/>`;
+			else console.warn(`makeXmlTheme: colorScheme.${slot} "${override}" is not a 6-digit hex color; keeping the Office default.`);
+		}
+		return `<a:${slot}>${child}</a:${slot}>`;
+	}).join("")}</a:clrScheme>`;
+}
+/**
 * Creates `ppt/theme/theme1.xml`
 * @return {string} XML
 */
 function makeXmlTheme(pres) {
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="44546A"/></a:dk2><a:lt2><a:srgbClr val="E7E6E6"/></a:lt2><a:accent1><a:srgbClr val="4472C4"/></a:accent1><a:accent2><a:srgbClr val="ED7D31"/></a:accent2><a:accent3><a:srgbClr val="A5A5A5"/></a:accent3><a:accent4><a:srgbClr val="FFC000"/></a:accent4><a:accent5><a:srgbClr val="5B9BD5"/></a:accent5><a:accent6><a:srgbClr val="70AD47"/></a:accent6><a:hlink><a:srgbClr val="0563C1"/></a:hlink><a:folHlink><a:srgbClr val="954F72"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont>${pres.theme?.headFontFace ? `<a:latin typeface="${pres.theme?.headFontFace}"/>` : "<a:latin typeface=\"Calibri Light\" panose=\"020F0302020204030204\"/>"}<a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游ゴシック Light"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线 Light"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Angsana New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:majorFont><a:minorFont>${pres.theme?.bodyFontFace ? `<a:latin typeface="${pres.theme?.bodyFontFace}"/>` : "<a:latin typeface=\"Calibri\" panose=\"020F0502020204030204\"/>"}<a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游ゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Cordia New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/><a:extLst><a:ext uri="{05A4C25C-085E-4340-85A3-A5531E510DB2}"><thm15:themeFamily xmlns:thm15="http://schemas.microsoft.com/office/thememl/2012/main" name="Office Theme" id="{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}" vid="{4A3C46E8-61CC-4603-A589-7422A47A8E4A}"/></a:ext></a:extLst></a:theme>`;
+	const majorFont = pres.theme?.headFontFace ? `<a:latin typeface="${pres.theme?.headFontFace}"/>` : "<a:latin typeface=\"Calibri Light\" panose=\"020F0302020204030204\"/>";
+	const minorFont = pres.theme?.bodyFontFace ? `<a:latin typeface="${pres.theme?.bodyFontFace}"/>` : "<a:latin typeface=\"Calibri\" panose=\"020F0502020204030204\"/>";
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements>${buildThemeClrScheme(pres.theme?.colorScheme)}<a:fontScheme name="Office"><a:majorFont>${majorFont}<a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游ゴシック Light"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线 Light"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Angsana New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:majorFont><a:minorFont>${minorFont}<a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游ゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Cordia New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/><a:extLst><a:ext uri="{05A4C25C-085E-4340-85A3-A5531E510DB2}"><thm15:themeFamily xmlns:thm15="http://schemas.microsoft.com/office/thememl/2012/main" name="Office Theme" id="{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}" vid="{4A3C46E8-61CC-4603-A589-7422A47A8E4A}"/></a:ext></a:extLst></a:theme>`;
 }
 /**
 * Create presentation file (`ppt/presentation.xml`)
@@ -5001,7 +5658,7 @@ function genXmlTableStyleBorders(border) {
 		xml += `<a:${side}>`;
 		if (b.type === "none") xml += "<a:ln><a:noFill/></a:ln>";
 		else {
-			xml += `<a:ln w="${valToPts(b.pt ?? 1)}" cap="flat" cmpd="sng" algn="ctr">`;
+			xml += `<a:ln w="${lineWidthToEmu(b.pt ?? 1)}" cap="flat" cmpd="sng" algn="ctr">`;
 			xml += `<a:solidFill>${createColorElement(b.color ?? "666666")}</a:solidFill>`;
 			xml += `<a:prstDash val="${b.type === "dash" ? "sysDash" : "solid"}"/>`;
 			xml += "</a:ln>";
@@ -5079,7 +5736,7 @@ function makeXmlViewProps() {
 * @see https://docs.microsoft.com/en-us/office/open-xml/structure-of-a-presentationml-document
 * @see https://docs.microsoft.com/en-us/previous-versions/office/developer/office-2010/hh273476(v=office.14)
 */
-const VERSION = "5.2.0";
+const VERSION = "5.4.0";
 function standardLayoutToPresLayout(layout) {
 	return {
 		name: layout.name,
@@ -5331,6 +5988,7 @@ var PptxGenJS = class {
 		this._tableStyles = [];
 		this._masterSlide = {
 			addChart: null,
+			addConnector: null,
 			addImage: null,
 			addMedia: null,
 			addNotes: null,
@@ -5403,14 +6061,27 @@ var PptxGenJS = class {
 		const arrChartPromises = [];
 		let arrMediaPromises = [];
 		const zip = new JSZip();
+		const onMediaError = props.onMediaError ?? "throw";
 		this._slides.forEach((slide) => {
-			arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(slide, this._runtime));
+			arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(slide, this._runtime, onMediaError));
 		});
 		this._slideLayouts.forEach((layout) => {
-			arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(layout, this._runtime));
+			arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(layout, this._runtime, onMediaError));
 		});
-		arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(this._masterSlide, this._runtime));
+		arrMediaPromises = arrMediaPromises.concat(encodeSlideMediaRels(this._masterSlide, this._runtime, onMediaError));
 		return await Promise.all(arrMediaPromises).then(async () => {
+			const canonicalMediaTargets = /* @__PURE__ */ new Map();
+			for (const target of [
+				...this._slides,
+				...this._slideLayouts,
+				this._masterSlide
+			]) for (const rel of target._relsMedia || []) {
+				if (rel.type === "online" || rel.type === "hyperlink" || typeof rel.data !== "string" || !rel.data) continue;
+				const key = (rel.extn || "") + "\0" + rel.data;
+				const canonical = canonicalMediaTargets.get(key);
+				if (canonical) rel.Target = canonical;
+				else canonicalMediaTargets.set(key, rel.Target);
+			}
 			this._slides.forEach((slide) => {
 				if (slide._slideLayout) addPlaceholdersToSlideLayouts(slide);
 			});
@@ -5463,14 +6134,18 @@ var PptxGenJS = class {
 			});
 			this.createChartMediaRels(this._masterSlide, zip, arrChartPromises);
 			return await Promise.all(arrChartPromises).then(async () => {
+				const compression = props.compression === false ? "STORE" : "DEFLATE";
 				if (props.outputType === "STREAM") return await zip.generateAsync({
 					type: "nodebuffer",
-					compression: props.compression ? "DEFLATE" : "STORE"
+					compression
+				});
+				else if (props.outputType) return await zip.generateAsync({
+					type: props.outputType,
+					compression
 				});
-				else if (props.outputType) return await zip.generateAsync({ type: props.outputType });
 				else return await zip.generateAsync({
 					type: "blob",
-					compression: props.compression ? "DEFLATE" : "STORE"
+					compression
 				});
 			});
 		});
@@ -5493,10 +6168,12 @@ var PptxGenJS = class {
 	*/
 	async write(props) {
 		const propsOutpType = typeof props === "object" && props?.outputType ? props.outputType : props ? props : null;
-		const propsCompress = typeof props === "object" && props?.compression ? props.compression : false;
+		const propsCompress = typeof props === "object" ? props?.compression : void 0;
+		const propsMediaError = typeof props === "object" ? props?.onMediaError : void 0;
 		return await this.exportPresentation({
 			compression: propsCompress,
-			outputType: propsOutpType
+			outputType: propsOutpType,
+			onMediaError: propsMediaError
 		});
 	}
 	/**
@@ -5510,11 +6187,12 @@ var PptxGenJS = class {
 			console.warn("[WARNING] writeFile(string) is deprecated - pass { fileName } instead.");
 			props = { fileName: props };
 		}
-		const { fileName: rawName = "Presentation.pptx", compression = false } = props;
+		const { fileName: rawName = "Presentation.pptx", compression, onMediaError } = props;
 		const fileName = rawName.toLowerCase().endsWith(".pptx") ? rawName : `${rawName}.pptx`;
 		const data = await this.exportPresentation({
 			compression,
-			outputType: this._runtime.writeFileOutputType
+			outputType: this._runtime.writeFileOutputType,
+			onMediaError
 		});
 		return await this._runtime.writeFile(fileName, data);
 	}
@@ -5676,4 +6354,4 @@ var PptxGenJS = class {
 //#endregion
 export { PptxGenJS as t };
 
-//# sourceMappingURL=pptxgen--5RWzhb4.js.map
+//# sourceMappingURL=pptxgen-S8dEuBnC.js.map