@office-kit/pptx-preview 0.9.1 → 0.9.3

package/README.md

@@ -125,8 +125,10 @@ placeholder layout/master cascade), strokes, rotation, effects (shadow, glow,
 soft edge, reflection), images with adjustments, charts (column, bar, line,
 area, pie, doughnut, scatter, radar, bubble), tables with per-run cell text,
 vertical and multi-column text in both text-layout modes, picture bullets, and
-template (layout/master) decoration all render. SmartArt, animations, 3D, and
-EMF/WMF fall back to labelled placeholders carrying a machine-readable marker
+template (layout/master) decoration all render. EMF pictures containing solid-filled
+line/Bézier paths, including rectangular and path clipping with copy semantics,
+render as transparent SVG images. Other EMF drawing commands, WMF, SmartArt,
+animations, and 3D fall back to labelled placeholders carrying a machine-readable marker
 (below). Per-slide closeness to a LibreOffice baseline is measured and gated
 in CI by the fidelity harness in the monorepo (`site/fidelity`) — mean
 fg-SSIM ≈ 0.78 across the corpus, with the residual gaps documented there.

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-C_bsFwWV.js";
+import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-B2rbAoIa.js";
 export { ARIAL, MONO, SANS, SERIF, TIMES, auditTextLayout, defaultMeasurer, renderSlideSvg as renderSlideToSvg, substituteFamily };

package/dist/node.js

@@ -1,4 +1,4 @@
-import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-C_bsFwWV.js";
+import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-B2rbAoIa.js";
 import { getSlideSize } from "@office-kit/pptx";
 import { Resvg } from "@resvg/resvg-js";
 import * as fontkit from "fontkit";

package/dist/{src-C_bsFwWV.js → src-B2rbAoIa.js}

@@ -1,4 +1,247 @@
-import { getEffectiveColorMap, getGroupChildren, getGroupTransform, getParagraphAlignment, getParagraphBullet, getParagraphBulletImageBytes, getParagraphBulletStyle, getParagraphIndent, getParagraphLevel, getParagraphPropertiesEffective, getParagraphSpacing, getPresentationFonts, getPresentationTheme, getShapeAdjustValues, getShapeAltTitle, getShapeBodyPrEffective, getShapeBoundsResolved, getShapeChartSpec, getShapeClickAction, getShapeCustomGeometry, getShapeDescription, getShapeEffectsEffective, getShapeFillColorResolved, getShapeFillEffective, getShapeFlip, getShapeGradientFill, getShapeGradientFillEffective, getShapeHyperlink, getShapeHyperlinkTooltip, getShapeImageBiLevelThreshold, getShapeImageBrightness, getShapeImageBytes, getShapeImageContrast, getShapeImageCrop, getShapeImageDuotone, getShapeImageFillBytes, getShapeImageFormat, getShapeImageLinkUrl, getShapeImageOpacity, getShapeImagePartName, getShapeKind, getShapeName, getShapeParagraphCount, getShapeParagraphElements, getShapePatternFill, getShapePlaceholderType, getShapePreset, getShapeRotation, getShapeRunClickAction, getShapeRunFormat, getShapeRunFormatEffective, getShapeRunHyperlink, getShapeRunHyperlinkTooltip, getShapeStrokeArrow, getShapeStrokeCap, getShapeStrokeColorResolved, getShapeStrokeCompound, getShapeStrokeDash, getShapeStrokeEffective, getShapeStrokeJoin, getShapeTextAnchor, getShapeTextAutoFitParams, getShapeTextBodyRotationDeg, getShapeTextColumns, getShapeTextDirection, getShapeTextMargins, getShapeXmlString, getSlideBackground, getSlideBackgroundGradientFill, getSlideBackgroundImageBytes, getSlideBackgroundPatternFill, getSlideIndex, getSlideLayout, getSlideLayoutBackground, getSlideLayoutBackgroundGradientFill, getSlideLayoutBackgroundImageBytes, getSlideLayoutBackgroundPatternFill, getSlideLayoutShapes, getSlideMasterBackground, getSlideMasterBackgroundGradientFill, getSlideMasterBackgroundImageBytes, getSlideMasterBackgroundPatternFill, getSlideMasterShapes, getSlideShapes, getSlideSize, getSlides, getTableCellAnchor, getTableCellBorders, getTableCellFill, getTableCellMargins, getTableCellParagraphs, getTableCellSpan, getTableCells, getTableColumnWidths, getTableDimensions, getTableRowHeights, getTableStyleFlags, isChartShape, isParagraphBulletPicture, isShapeImageGrayscale, isShapePlaceholder, isShapeTextBox, isTableShape, resolveDeckBodyTextColor } from "@office-kit/pptx";
+import { getEffectiveColorMap, getGroupChildren, getGroupTransform, getParagraphAlignment, getParagraphBullet, getParagraphBulletImageBytes, getParagraphBulletStyle, getParagraphIndent, getParagraphLevel, getParagraphPropertiesEffective, getParagraphSpacing, getPresentationFonts, getPresentationTheme, getShapeAdjustValues, getShapeAltTitle, getShapeBodyPrEffective, getShapeBoundsResolved, getShapeChartSpec, getShapeClickAction, getShapeCustomGeometry, getShapeDescription, getShapeEffectsEffective, getShapeFillColorResolved, getShapeFillEffective, getShapeFillOpacity, getShapeFlip, getShapeGradientFill, getShapeGradientFillEffective, getShapeHyperlink, getShapeHyperlinkTooltip, getShapeImageBiLevelThreshold, getShapeImageBrightness, getShapeImageBytes, getShapeImageContrast, getShapeImageCrop, getShapeImageDuotone, getShapeImageFillBytes, getShapeImageFormat, getShapeImageLinkUrl, getShapeImageOpacity, getShapeImagePartName, getShapeKind, getShapeName, getShapeParagraphCount, getShapeParagraphElements, getShapePatternFill, getShapePlaceholderType, getShapePreset, getShapeRotation, getShapeRunClickAction, getShapeRunFormat, getShapeRunFormatEffective, getShapeRunHyperlink, getShapeRunHyperlinkTooltip, getShapeStrokeArrow, getShapeStrokeCap, getShapeStrokeColorResolved, getShapeStrokeCompound, getShapeStrokeDash, getShapeStrokeEffective, getShapeStrokeJoin, getShapeStrokeOpacity, getShapeTextAnchor, getShapeTextAutoFitParams, getShapeTextBodyRotationDeg, getShapeTextColumns, getShapeTextDirection, getShapeTextMargins, getShapeXmlString, getSlideBackground, getSlideBackgroundGradientFill, getSlideBackgroundImageBytes, getSlideBackgroundPatternFill, getSlideIndex, getSlideLayout, getSlideLayoutBackground, getSlideLayoutBackgroundGradientFill, getSlideLayoutBackgroundImageBytes, getSlideLayoutBackgroundPatternFill, getSlideLayoutShapes, getSlideMasterBackground, getSlideMasterBackgroundGradientFill, getSlideMasterBackgroundImageBytes, getSlideMasterBackgroundPatternFill, getSlideMasterShapes, getSlideShapes, getSlideSize, getSlides, getTableCellAnchor, getTableCellBorders, getTableCellFill, getTableCellMargins, getTableCellParagraphs, getTableCellSpan, getTableCells, getTableColumnWidths, getTableDimensions, getTableRowHeights, getTableStyleFlags, isChartShape, isParagraphBulletPicture, isShapeImageGrayscale, isShapePlaceholder, isShapeTextBox, isTableShape, resolveDeckBodyTextColor } from "@office-kit/pptx";
+//#region src/emf.ts
+const WORD_BYTES = 4;
+const SHORT_BYTES = 2;
+const RECORD_HEADER_BYTES = 8;
+const HEADER_MIN_BYTES = 88;
+const VALUE_RECORD_BYTES = 12;
+const PAIR_RECORD_BYTES = 16;
+const BOUNDS_RECORD_BYTES = 24;
+const BRUSH_RECORD_BYTES = 24;
+const EOF_MIN_BYTES = 20;
+const HEADER_BOUNDS_OFFSET = 8;
+const HEADER_FILE_SIZE_OFFSET = 48;
+const HEADER_RECORD_COUNT_OFFSET = 52;
+const VALUE_OFFSET = RECORD_HEADER_BYTES;
+const SECOND_VALUE_OFFSET = 12;
+const BRUSH_COLOR_OFFSET = 16;
+const RGB_CHANNEL_COUNT = 3;
+const HEX_RADIX = 16;
+const EMFPLUS_COMMENT = 726027589;
+const SIGNATURE_OFFSET = 40;
+const SIGNATURE = 1179469088;
+const POINT_COUNT_OFFSET = 24;
+const POINTS_OFFSET = 28;
+const BEZIER_POINT_COUNT = 3;
+const STOCK_OBJECT_FLAG = 2147483648;
+const REGION_COPY = 5;
+const MAP_TEXT = 1;
+const MAP_ANISOTROPIC = 8;
+const BRUSH_SOLID = 0;
+const BRUSH_NULL = 1;
+const FILL_ALTERNATE = 1;
+const FILL_WINDING = 2;
+const STOCK_BRUSHES = [
+	"#ffffff",
+	"#c0c0c0",
+	"#808080",
+	"#404040",
+	"#000000",
+	"none"
+];
+const RECORD = {
+	HEADER: 1,
+	POLYBEZIERTO: 5,
+	POLYLINETO: 6,
+	SETWINDOWEXTEX: 9,
+	SETWINDOWORGEX: 10,
+	SETVIEWPORTEXTEX: 11,
+	SETVIEWPORTORGEX: 12,
+	SETBRUSHORGEX: 13,
+	EOF: 14,
+	SETMAPMODE: 17,
+	SETBKMODE: 18,
+	SETPOLYFILLMODE: 19,
+	SETSTRETCHBLTMODE: 21,
+	SETTEXTALIGN: 22,
+	MOVETOEX: 27,
+	SELECTOBJECT: 37,
+	CREATEBRUSHINDIRECT: 39,
+	DELETEOBJECT: 40,
+	BEGINPATH: 59,
+	ENDPATH: 60,
+	CLOSEFIGURE: 61,
+	FILLPATH: 62,
+	SELECTCLIPPATH: 67,
+	COMMENT: 70,
+	EXTSELECTCLIPRGN: 75,
+	POLYBEZIERTO16: 88,
+	POLYLINETO16: 89
+};
+const renderEmfToSvg = (bytes) => {
+	if (bytes.byteLength < HEADER_MIN_BYTES) return null;
+	const file = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	if (file.getUint32(0, true) !== RECORD.HEADER || file.getUint32(SIGNATURE_OFFSET, true) !== SIGNATURE) return null;
+	const left = file.getInt32(HEADER_BOUNDS_OFFSET, true);
+	const top = file.getInt32(12, true);
+	const width = file.getInt32(16, true) - left;
+	const height = file.getInt32(20, true) - top;
+	if (width <= 0 || height <= 0 || file.getUint32(HEADER_FILE_SIZE_OFFSET, true) !== bytes.byteLength) return null;
+	let windowX = 0;
+	let windowY = 0;
+	let windowWidth = 1;
+	let windowHeight = 1;
+	let viewportX = 0;
+	let viewportY = 0;
+	let viewportWidth = 1;
+	let viewportHeight = 1;
+	let mapMode = MAP_TEXT;
+	let fillRule = "evenodd";
+	let brush = "#ffffff";
+	const brushes = /* @__PURE__ */ new Map();
+	let path = [];
+	let recordingPath = false;
+	let clip = "";
+	let clipCount = 0;
+	const definitions = [];
+	const drawings = [];
+	let recordCount = 0;
+	const point = (x, y) => {
+		if (mapMode === MAP_TEXT) return `${x} ${y}`;
+		return `${(x - windowX) * viewportWidth / windowWidth + viewportX} ${(y - windowY) * viewportHeight / windowHeight + viewportY}`;
+	};
+	for (let offset = 0; offset < bytes.byteLength;) {
+		if (bytes.byteLength - offset < RECORD_HEADER_BYTES) return null;
+		const type = file.getUint32(offset, true);
+		const size = file.getUint32(offset + WORD_BYTES, true);
+		if (size < RECORD_HEADER_BYTES || size % WORD_BYTES !== 0 || size > bytes.byteLength - offset) return null;
+		const record = new DataView(bytes.buffer, bytes.byteOffset + offset, size);
+		const unsigned = (at) => record.getUint32(at, true);
+		const signed = (at) => record.getInt32(at, true);
+		recordCount++;
+		switch (type) {
+			case RECORD.HEADER:
+				if (offset !== 0 || size < HEADER_MIN_BYTES) return null;
+				break;
+			case RECORD.EOF:
+				if (size < EOF_MIN_BYTES || offset + size !== bytes.byteLength || recordingPath || recordCount !== file.getUint32(HEADER_RECORD_COUNT_OFFSET, true)) return null;
+				return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${left} ${top} ${width} ${height}" width="${width}" height="${height}"><defs>${definitions.join("")}</defs>${drawings.join("")}</svg>`;
+			case RECORD.SETMAPMODE:
+				if (size < VALUE_RECORD_BYTES) return null;
+				mapMode = unsigned(VALUE_OFFSET);
+				if (mapMode !== MAP_TEXT && mapMode !== MAP_ANISOTROPIC) return null;
+				break;
+			case RECORD.SETWINDOWORGEX:
+			case RECORD.SETVIEWPORTORGEX:
+			case RECORD.SETWINDOWEXTEX:
+			case RECORD.SETVIEWPORTEXTEX: {
+				if (size < PAIR_RECORD_BYTES) return null;
+				const x = signed(VALUE_OFFSET);
+				const y = signed(SECOND_VALUE_OFFSET);
+				if (type === RECORD.SETWINDOWORGEX) {
+					windowX = x;
+					windowY = y;
+				} else if (type === RECORD.SETVIEWPORTORGEX) {
+					viewportX = x;
+					viewportY = y;
+				} else {
+					if (x === 0 || y === 0) return null;
+					if (type === RECORD.SETWINDOWEXTEX) {
+						windowWidth = x;
+						windowHeight = y;
+					} else {
+						viewportWidth = x;
+						viewportHeight = y;
+					}
+				}
+				break;
+			}
+			case RECORD.CREATEBRUSHINDIRECT: {
+				if (size < BRUSH_RECORD_BYTES) return null;
+				const style = unsigned(SECOND_VALUE_OFFSET);
+				if (style !== BRUSH_SOLID && style !== BRUSH_NULL) return null;
+				const color = [...bytes.subarray(offset + BRUSH_COLOR_OFFSET, offset + BRUSH_COLOR_OFFSET + RGB_CHANNEL_COUNT)].map((channel) => channel.toString(HEX_RADIX).padStart(2, "0")).join("");
+				brushes.set(unsigned(VALUE_OFFSET), style === BRUSH_NULL ? "none" : `#${color}`);
+				break;
+			}
+			case RECORD.SELECTOBJECT: {
+				if (size < VALUE_RECORD_BYTES) return null;
+				const handle = unsigned(VALUE_OFFSET);
+				const selected = handle >= STOCK_OBJECT_FLAG ? STOCK_BRUSHES[handle - STOCK_OBJECT_FLAG] : brushes.get(handle);
+				if (selected === void 0) return null;
+				brush = selected;
+				break;
+			}
+			case RECORD.DELETEOBJECT:
+				if (size < VALUE_RECORD_BYTES) return null;
+				brushes.delete(unsigned(VALUE_OFFSET));
+				break;
+			case RECORD.SETPOLYFILLMODE:
+				if (size < VALUE_RECORD_BYTES || unsigned(VALUE_OFFSET) !== FILL_ALTERNATE && unsigned(VALUE_OFFSET) !== FILL_WINDING) return null;
+				fillRule = unsigned(VALUE_OFFSET) === FILL_WINDING ? "nonzero" : "evenodd";
+				break;
+			case RECORD.BEGINPATH:
+				path = [];
+				recordingPath = true;
+				break;
+			case RECORD.MOVETOEX:
+				if (size < PAIR_RECORD_BYTES || !recordingPath) return null;
+				path.push(`M${point(signed(VALUE_OFFSET), signed(SECOND_VALUE_OFFSET))}`);
+				break;
+			case RECORD.POLYLINETO:
+			case RECORD.POLYLINETO16:
+			case RECORD.POLYBEZIERTO:
+			case RECORD.POLYBEZIERTO16: {
+				if (size < POINTS_OFFSET || !recordingPath || path.length === 0) return null;
+				const short = type === RECORD.POLYLINETO16 || type === RECORD.POLYBEZIERTO16;
+				const bezier = type === RECORD.POLYBEZIERTO || type === RECORD.POLYBEZIERTO16;
+				const coordinateBytes = short ? SHORT_BYTES : WORD_BYTES;
+				const pointBytes = coordinateBytes * 2;
+				const count = unsigned(POINT_COUNT_OFFSET);
+				if (count > Math.floor((size - POINTS_OFFSET) / pointBytes) || bezier && count % BEZIER_POINT_COUNT !== 0) return null;
+				for (let index = 0; index < count; index++) {
+					const at = POINTS_OFFSET + index * pointBytes;
+					const x = short ? record.getInt16(at, true) : signed(at);
+					const y = short ? record.getInt16(at + coordinateBytes, true) : signed(at + coordinateBytes);
+					const command = bezier ? index % BEZIER_POINT_COUNT === 0 ? "C" : " " : "L";
+					path.push(`${command}${point(x, y)}`);
+				}
+				break;
+			}
+			case RECORD.CLOSEFIGURE:
+				if (!recordingPath || path.length === 0) return null;
+				path.push("Z");
+				break;
+			case RECORD.ENDPATH:
+				if (!recordingPath) return null;
+				recordingPath = false;
+				break;
+			case RECORD.FILLPATH:
+				if (size < BOUNDS_RECORD_BYTES || recordingPath || path.length === 0) return null;
+				drawings.push(`<path d="${path.join("")}" fill="${brush}" fill-rule="${fillRule}"${clip}/>`);
+				path = [];
+				break;
+			case RECORD.SELECTCLIPPATH: {
+				if (size < VALUE_RECORD_BYTES || unsigned(VALUE_OFFSET) !== REGION_COPY || recordingPath || path.length === 0) return null;
+				const id = `emf-clip-${clipCount++}`;
+				definitions.push(`<clipPath id="${id}"><path d="${path.join("")}" clip-rule="${fillRule}"/></clipPath>`);
+				clip = ` clip-path="url(#${id})"`;
+				path = [];
+				break;
+			}
+			case RECORD.EXTSELECTCLIPRGN:
+				if (size < PAIR_RECORD_BYTES || unsigned(VALUE_OFFSET) !== 0 || unsigned(SECOND_VALUE_OFFSET) !== REGION_COPY) return null;
+				clip = "";
+				break;
+			case RECORD.COMMENT:
+				if (size < VALUE_RECORD_BYTES || unsigned(VALUE_OFFSET) > size - VALUE_RECORD_BYTES) return null;
+				if (unsigned(VALUE_OFFSET) >= WORD_BYTES && unsigned(SECOND_VALUE_OFFSET) === EMFPLUS_COMMENT) return null;
+				break;
+			case RECORD.SETBKMODE:
+			case RECORD.SETSTRETCHBLTMODE:
+			case RECORD.SETTEXTALIGN:
+				if (size < VALUE_RECORD_BYTES) return null;
+				break;
+			case RECORD.SETBRUSHORGEX:
+				if (size < PAIR_RECORD_BYTES) return null;
+				break;
+			default: return null;
+		}
+		offset += size;
+	}
+	return null;
+};
+//#endregion
 //#region src/text-layout.ts
 const SANS = "Carlito";
 const SERIF = "Caladea";
@@ -530,6 +773,13 @@ const mimeFromPartName = (name) => {
 const renderPicture = (shape, pres, x, y, w, h, transform, textOverlay, bytes, format) => {
 	let mime = null;
 	if (bytes && format) mime = imageMime[format] ?? null;
+	if (bytes && !mime) {
+		const svg = renderEmfToSvg(bytes);
+		if (svg !== null) {
+			bytes = new TextEncoder().encode(svg);
+			mime = "image/svg+xml";
+		}
+	}
 	if (bytes && !mime) mime = mimeFromPartName(getShapeImagePartName(shape));
 	if (bytes && mime) {
 		const dataUrl = `data:${mime};base64,${u8ToBase64(bytes)}`;
@@ -669,7 +919,8 @@ let activeColorMap = null;
 let activeDeckTextColor = "#000000";
 const gradientDef = (grad, theme) => {
 	const id = mintId();
-	const stops = grad.stops.map((s) => `<stop offset="${s.offset.toFixed(4)}" stop-color="${resolveColor(s.color, theme, "#E5E7EB")}"/>`).join("");
+	const orderedStops = [...grad.stops].sort((a, b) => a.offset - b.offset);
+	const stops = orderedStops.map((s) => `<stop offset="${s.offset.toFixed(4)}" stop-color="${resolveColor(s.color, theme, "#E5E7EB")}"/>`).join("");
 	if (grad.path === "circle" || grad.path === "rect" || grad.path === "shape") {
 		const focus = grad.focus ?? {
 			left: .5,
@@ -679,7 +930,7 @@ const gradientDef = (grad, theme) => {
 		};
 		const cx = (focus.left + focus.right) / 2;
 		const cy = (focus.top + focus.bottom) / 2;
-		const reversed = grad.stops.slice().reverse().map((s) => `<stop offset="${(1 - s.offset).toFixed(4)}" stop-color="${resolveColor(s.color, theme, "#E5E7EB")}"/>`).join("");
+		const reversed = orderedStops.slice().reverse().map((s) => `<stop offset="${(1 - s.offset).toFixed(4)}" stop-color="${resolveColor(s.color, theme, "#E5E7EB")}"/>`).join("");
 		return {
 			defs: `<defs><radialGradient id="${id}" gradientUnits="objectBoundingBox" cx="${cx.toFixed(4)}" cy="${cy.toFixed(4)}" r="${Math.max(.5, Math.max(cx, cy, 1 - cx, 1 - cy)).toFixed(4)}">${reversed}</radialGradient></defs>`,
 			fillAttr: `url(#${id})`
@@ -811,11 +1062,14 @@ const buildArrowMarker = (type, width, length, color, orient) => {
 };
 const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 	let fillColor;
+	let fillAttrs = "";
 	let defs = "";
 	if (fill.kind === "solid") {
 		let resolved = null;
 		if (shape && pres) resolved = getShapeFillColorResolved(pres, shape);
 		fillColor = resolved ?? resolveColor(fill.color, theme, "#E5E7EB");
+		const opacity = shape ? getShapeFillOpacity(shape) : null;
+		if (opacity !== null && opacity < 1) fillAttrs = ` fill-opacity="${opacity.toFixed(3)}"`;
 	} else if (fill.kind === "none") fillColor = "none";
 	else if (fill.kind === "gradient") {
 		const grad = shape ? pres ? getShapeGradientFillEffective(pres, shape) : getShapeGradientFill(shape) : null;
@@ -843,6 +1097,8 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 		strokeColor = resolved ?? resolveColor(stroke.color, theme, "#9CA3AF");
 		strokeWidth = stroke.widthEmu ?? 9525;
 		if (shape) {
+			const opacity = getShapeStrokeOpacity(shape);
+			if (opacity !== null && opacity < 1) strokeAttrParts.push(`stroke-opacity="${opacity.toFixed(3)}"`);
 			const dash = getShapeStrokeDash(shape);
 			if (dash && dash !== "solid") {
 				const pattern = DASH_PATTERNS[dash];
@@ -877,6 +1133,7 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 	}
 	return {
 		fill: fillColor,
+		fillAttrs,
 		stroke: strokeColor,
 		strokeWidth,
 		defs,
@@ -4042,7 +4299,7 @@ const arcToCubicSegments = (startX, startY, wR, hR, stAng, swAng) => {
 * Per-path `fill="none"` paints stroke-only; `stroke="0"` paints
 * fill-only — mirroring `ST_PathFillMode` / the path `stroke` flag.
 */
-const customGeometryToSvg = (geom, x, y, w, h, fill, stroke, strokeWidthEmu, strokeExtra, markerExtra) => {
+const customGeometryToSvg = (geom, x, y, w, h, fill, fillExtra, stroke, strokeWidthEmu, strokeExtra, markerExtra) => {
 	const out = [];
 	for (const path of geom.paths) {
 		const cw = path.w ?? w;
@@ -4099,8 +4356,9 @@ const customGeometryToSvg = (geom, x, y, w, h, fill, stroke, strokeWidthEmu, str
 		}
 		if (d.length === 0) continue;
 		const pathFill = path.fill === "none" ? "none" : fill;
+		const fillAttrs = path.fill === "none" ? "" : fillExtra;
 		const strokeAttrs = path.stroke ? ` stroke="${stroke}" stroke-width="${E(strokeWidthEmu)}"${strokeExtra}${markerExtra}` : " stroke=\"none\"";
-		out.push(`<path d="${d.join(" ")}" fill="${pathFill}"${strokeAttrs} fill-rule="evenodd"/>`);
+		out.push(`<path d="${d.join(" ")}" fill="${pathFill}"${fillAttrs}${strokeAttrs} fill-rule="evenodd"/>`);
 	}
 	return out.join("");
 };
@@ -4244,25 +4502,26 @@ const renderShape = (shape, pres, theme, ctx) => {
 	}
 	const rawPreset = getShapePreset(shape);
 	const preset = rawPreset ?? "rect";
+	const fa = p.fillAttrs;
 	const sa = p.strokeAttrs ? ` ${p.strokeAttrs}` : "";
 	const ma = p.markerAttrs ?? "";
 	const customGeom = rawPreset === null ? getShapeCustomGeometry(shape) : null;
-	let geomSvg = customGeom !== null ? customGeometryToSvg(customGeom, x, y, w, h, p.fill, p.stroke, p.strokeWidth, sa, ma) : "";
+	let geomSvg = customGeom !== null ? customGeometryToSvg(customGeom, x, y, w, h, p.fill, fa, p.stroke, p.strokeWidth, sa, ma) : "";
 	const isCustGeom = geomSvg === "" && rawPreset === null && getShapeXmlString(shape).includes("custGeom");
-	if (geomSvg !== "") {} else if (preset === "rect") geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
+	if (geomSvg !== "") {} else if (preset === "rect") geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
 	else if (preset === "roundRect") {
 		const adjVal = getShapeAdjustValues(shape).adj ?? 16667;
 		const ratio = Math.max(0, Math.min(.5, adjVal / 1e5));
 		const r = E(Math.min(w, h) * ratio);
-		geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" rx="${r}" ry="${r}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
-	} else if (preset === "ellipse" || preset === "oval") geomSvg = `<ellipse cx="${E(cx)}" cy="${E(cy)}" rx="${E(w / 2)}" ry="${E(h / 2)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
+		geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" rx="${r}" ry="${r}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
+	} else if (preset === "ellipse" || preset === "oval") geomSvg = `<ellipse cx="${E(cx)}" cy="${E(cy)}" rx="${E(w / 2)}" ry="${E(h / 2)}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
 	else {
 		const pathFn = PRESET_PATHS[preset];
-		if (pathFn) geomSvg = `<path d="${pathFn(x / EMU_PER_PX, y / EMU_PER_PX, w / EMU_PER_PX, h / EMU_PER_PX)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}" fill-rule="evenodd"${sa}${ma}/>`;
+		if (pathFn) geomSvg = `<path d="${pathFn(x / EMU_PER_PX, y / EMU_PER_PX, w / EMU_PER_PX, h / EMU_PER_PX)}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}" fill-rule="evenodd"${sa}${ma}/>`;
 		else {
 			const pointsFn = PRESET_POINTS[preset];
-			if (pointsFn) geomSvg = `<polygon points="${pointsFn(w / EMU_PER_PX, h / EMU_PER_PX).map(([nx, ny]) => `${E(x + nx * w)},${E(y + ny * h)}`).join(" ")}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
-			else geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}" stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma} data-pptx-preset="${escapeXml(preset)}"><title>${escapeXml(`preset: ${preset}`)}</title></rect>`;
+			if (pointsFn) geomSvg = `<polygon points="${pointsFn(w / EMU_PER_PX, h / EMU_PER_PX).map(([nx, ny]) => `${E(x + nx * w)},${E(y + ny * h)}`).join(" ")}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma}/>`;
+			else geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}"${fa} stroke="${p.stroke}" stroke-width="${E(p.strokeWidth)}"${sa}${ma} data-pptx-preset="${escapeXml(preset)}"><title>${escapeXml(`preset: ${preset}`)}</title></rect>`;
 		}
 	}
 	const fx = buildEffectsFilter(pres, shape);
@@ -4685,4 +4944,4 @@ const auditTextLayout = (pres, options = {}) => {
 //#endregion
 export { MONO as a, TIMES as c, substituteFamily as d, AVG_GLYPH_W_RATIO as i, defaultMeasurer as l, renderSlideSvg as n, SANS as o, ARIAL as r, SERIF as s, auditTextLayout as t, isCjk as u };
 
-//# sourceMappingURL=src-C_bsFwWV.js.map
+//# sourceMappingURL=src-B2rbAoIa.js.map