@office-kit/pptx-preview 0.13.0 → 0.15.0

package/dist/{src-DYfIZIh8.js → src-pb3C61GD.js}

@@ -1,50 +1,22 @@
-import { getEffectiveColorMap, getGroupChildren, getGroupTransform, getParagraphAlignment, getParagraphBullet, getParagraphBulletImageBytes, getParagraphBulletStyle, getParagraphIndent, getParagraphLevel, getParagraphPropertiesEffective, getParagraphSpacing, getPresentationFirstSlideNumber, getPresentationFonts, getPresentationTheme, getShapeAdjustValues, getShapeAltTitle, getShapeBodyPrEffective, getShapeBounds, getShapeBoundsResolved, getShapeChartSpec, getShapeClickAction, getShapeCustomGeometry, getShapeDescription, getShapeEffectsEffective, getShapeFillColorResolved, getShapeFillEffective, getShapeFillOpacity, getShapeFlip, getShapeGradientFill, getShapeGradientFillEffective, getShapeHyperlinkTooltip, getShapeId, getShapeImageBiLevelThreshold, getShapeImageBrightness, getShapeImageBytes, getShapeImageContrast, getShapeImageCrop, getShapeImageDuotone, getShapeImageFillBytes, getShapeImageFillLayout, getShapeImageFormat, getShapeImageIntrinsicSize, 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, getShapeTextAutoFit, getShapeTextAutoFitParams, getShapeTextBodyRotationDeg, getShapeTextColumns, getShapeTextDirection, getShapeTextMargins, getShapeXmlString, getSlideBackground, getSlideBackgroundGradientFill, getSlideBackgroundImageBytes, getSlideBackgroundImageCrop, getSlideBackgroundImageFillLayout, getSlideBackgroundImageIntrinsicSize, getSlideBackgroundImageOpacity, getSlideBackgroundPatternFill, getSlideIndex, getSlideLayout, getSlideLayoutBackground, getSlideLayoutBackgroundGradientFill, getSlideLayoutBackgroundImageBytes, getSlideLayoutBackgroundPatternFill, getSlideLayoutShapes, getSlideMasterBackground, getSlideMasterBackgroundGradientFill, getSlideMasterBackgroundImageBytes, getSlideMasterBackgroundPatternFill, getSlideMasterShapes, getSlideShapes, getSlideSize, getSlides, getTableCellAnchor, getTableCellAppearanceEffective, getTableCellMargins, getTableCellParagraphs, getTableCellRunFormatEffective, getTableCellSpan, getTableCellTextDirection, getTableCells, getTableColumnWidths, getTableDimensions, getTableRowHeights, isChartShape, isParagraphBulletPicture, isShapeHidden, isShapeImageGrayscale, isShapePlaceholder, isShapeTextBox, isSlideBackgroundGraphicsHidden, isSlideLayoutBackgroundGraphicsHidden, isTableShape, resolveDeckBodyTextColor } from "@office-kit/pptx";
+import { emu, getEffectiveColorMap, getGroupChildren, getGroupTransform, getParagraphAlignment, getParagraphBullet, getParagraphBulletImageBytes, getParagraphBulletStyle, getParagraphElementLanguages, getParagraphIndent, getParagraphLevel, getParagraphPropertiesEffective, getParagraphSpacing, getPresentationFirstSlideNumber, getPresentationFonts, getPresentationTheme, getPresetGeometry, getShape3D, getShapeAdjustValues, getShapeAltTitle, getShapeBodyPrEffective, getShapeBounds, getShapeBoundsResolved, getShapeChartSpec, getShapeClickAction, getShapeCustomGeometry, getShapeDescription, getShapeEffectsEffective, getShapeFillColorResolved, getShapeFillEffective, getShapeFillOpacity, getShapeFlip, getShapeGradientFill, getShapeGradientFillEffective, getShapeHyperlinkTooltip, getShapeId, getShapeImageBiLevelThreshold, getShapeImageBrightness, getShapeImageBytes, getShapeImageContrast, getShapeImageCrop, getShapeImageDuotone, getShapeImageFillBytes, getShapeImageFillLayout, getShapeImageFormat, getShapeImageIntrinsicSize, getShapeImageLinkUrl, getShapeImageOpacity, getShapeImagePartName, getShapeKind, getShapeName, getShapeParagraphCount, getShapeParagraphElements, getShapePatternFill, getShapePlaceholderType, getShapePreset, getShapeRotation, getShapeRunClickAction, getShapeRunFormat, getShapeRunFormatEffective, getShapeRunHyperlink, getShapeRunHyperlinkTooltip, getShapeStrokeArrow, getShapeStrokeCap, getShapeStrokeColorResolved, getShapeStrokeCompound, getShapeStrokeDash, getShapeStrokeEffective, getShapeStrokeGradient, getShapeStrokeJoin, getShapeStrokeOpacity, getShapeStrokeSketch, getShapeText3D, getShapeTextAnchor, getShapeTextAutoFit, getShapeTextAutoFitParams, getShapeTextBodyRotationDeg, getShapeTextColumns, getShapeTextDirection, getShapeTextMargins, getShapeXmlString, getSlideBackground, getSlideBackgroundGradientFill, getSlideBackgroundImageBytes, getSlideBackgroundImageCrop, getSlideBackgroundImageFillLayout, getSlideBackgroundImageIntrinsicSize, getSlideBackgroundImageOpacity, getSlideBackgroundPatternFill, getSlideIndex, getSlideLayout, getSlideLayoutBackground, getSlideLayoutBackgroundGradientFill, getSlideLayoutBackgroundImageBytes, getSlideLayoutBackgroundPatternFill, getSlideLayoutShapes, getSlideMasterBackground, getSlideMasterBackgroundGradientFill, getSlideMasterBackgroundImageBytes, getSlideMasterBackgroundPatternFill, getSlideMasterShapes, getSlideShapes, getSlideSize, getSlides, getTableBackgroundEffective, getTableCellAnchor, getTableCellAppearanceEffective, getTableCellMargins, getTableCellParagraphs, getTableCellRunFormatEffective, getTableCellSpan, getTableCellText3D, getTableCellTextDirection, getTableCells, getTableColumnWidths, getTableDimensions, getTableRowHeights, isChartShape, isParagraphBulletPicture, isShapeHidden, isShapeImageGrayscale, isShapePlaceholder, isShapeTextBox, isSlideBackgroundGraphicsHidden, isSlideLayoutBackgroundGraphicsHidden, isTableShape, resolveDeckBodyTextColor } from "@office-kit/pptx";
 //#region src/text-body-rect.ts
-const presetTextRect = (preset) => {
-	switch (preset) {
-		case "triangle": return {
-			l: .25,
-			t: .5,
-			r: .75,
-			b: 1
-		};
-		case "diamond": return {
-			l: .25,
-			t: .25,
-			r: .75,
-			b: .75
-		};
-		case "pentagon": return {
-			l: .191,
-			t: .236,
-			r: .809,
-			b: 1
-		};
-		case "star5": return {
-			l: .309,
-			t: .382,
-			r: .691,
-			b: .764
-		};
-		case "leftRightArrow": return {
-			l: .18,
-			t: .35,
-			r: .82,
-			b: .65
-		};
-		default: return null;
-	}
-};
 /**
-* The text rectangle a custom-geometry shape states for itself, as fractions
-* of its own extent, or `null` for a preset shape and for a custom one that
-* states none. `<a:rect>` is written in EMU against the shape's extents, so
-* dividing by them here is what lets the result travel with a shape that a
-* group has scaled.
+* Where a shape lays out its text, as fractions of its own extent: the
+* `<a:rect>` its geometry states, written in its `<a:custGeom>` or in
+* ECMA-376's definition of its preset (an ellipse's inscribed rectangle, a
+* triangle's lower middle, an arrow's shaft). `null` lays text into the whole
+* box: a shape that inherits its geometry, or whose rectangle has no room.
+*
+* The rectangle is in the shape's own `<a:ext>` space, so dividing by that —
+* not by on-screen bounds, which carry a group's or autofit's scale — is what
+* lets the result travel with the shape.
 */
-function shapeCustomTextRect(custom, extent) {
-	const rect = custom?.textRect;
-	if (!rect || extent === null || extent.w <= 0 || extent.h <= 0) return null;
+function shapeTextRect(shape) {
+	const extent = getShapeBounds(shape);
+	if (extent === null || extent.w <= 0 || extent.h <= 0) return null;
+	const preset = getShapePreset(shape);
+	const rect = (preset === null ? getShapeCustomGeometry(shape) : getPresetGeometry(preset, extent, getShapeAdjustValues(shape)))?.textRect;
+	if (!rect || rect.r <= rect.l || rect.b <= rect.t) return null;
 	return {
 		l: rect.l / extent.w,
 		t: rect.t / extent.h,
@@ -53,18 +25,13 @@ function shapeCustomTextRect(custom, extent) {
 	};
 }
 /**
-* Text layout rectangle used by the preview, including preset geometry and body
-* insets. All coordinates and margins must use the same unit (normally EMU).
-* Preset regions follow the preview's current geometry approximations. When
-* margins collapse a preset region, retain that region without margins.
-*
-* A custom-geometry shape states its own rectangle in `<a:custGeom><a:rect>`.
-* Pass it as `custom`, as fractions of the shape's extent so that it scales
-* with `bounds` the way a preset region does, and it wins: unlike the table
-* above it is not an approximation of anything — it is what the file says.
+* Text layout rectangle used by the preview: `region` (from
+* {@link shapeTextRect}, or `null` for the whole box) placed in `bounds`, less
+* the body insets. All coordinates and margins must use the same unit
+* (normally EMU). When margins collapse a region, the region is kept without
+* them, as the reference desktop app does.
 */
-function resolveTextBodyRect(preset, bounds, margins, custom) {
-	const region = custom ?? presetTextRect(preset);
+function resolveTextBodyRect(bounds, margins, region) {
 	const x = bounds.x + (region?.l ?? 0) * bounds.w;
 	const y = bounds.y + (region?.t ?? 0) * bounds.h;
 	const w = ((region?.r ?? 1) - (region?.l ?? 0)) * bounds.w;
@@ -86,17 +53,17 @@ function resolveTextBodyRect(preset, bounds, margins, custom) {
 }
 //#endregion
 //#region src/text-body-style.ts
-/** Mac PowerPoint uses zero spacing when `spcCol` is absent. */
+/** The reference desktop app on Mac uses zero spacing when `spcCol` is absent. */
 const DEFAULT_COLUMN_GAP_PX = 0;
-const EMU_PER_PX$2 = 9525;
+const EMU_PER_PX$3 = 9525;
 const NONE = {
 	declarations: "",
 	transform: ""
 };
 /**
 * `<a:bodyPr vert="…"/>` as CSS. `writing-mode` is the right primitive for
-* the East-Asian and Mongolian cases, and `text-orientation` for the WordArt
-* ones, which stack upright glyphs. `vert270` reads bottom-to-top, which no
+* the East-Asian and Mongolian cases, and `text-orientation` for the
+* `wordArtVert` ones, which stack upright glyphs. `vert270` reads bottom-to-top, which no
 * writing-mode expresses on its own — hence the half turn. Its columns still
 * follow the OOXML vertical-rl progression before that half turn; using
 * vertical-lr here reverses the column order relative to the SVG renderer.
@@ -134,7 +101,7 @@ function verticalTextStyle(vert) {
 */
 function textColumnsStyle(cols) {
 	if (!cols || cols.count < 2) return "";
-	const gapPx = cols.gapEmu !== void 0 ? (cols.gapEmu / EMU_PER_PX$2).toFixed(2) : DEFAULT_COLUMN_GAP_PX;
+	const gapPx = cols.gapEmu !== void 0 ? (cols.gapEmu / EMU_PER_PX$3).toFixed(2) : DEFAULT_COLUMN_GAP_PX;
 	return `column-count:${cols.count};column-gap:${gapPx}px`;
 }
 //#endregion
@@ -250,6 +217,30 @@ const paragraphNumberLabels = (paraData) => {
 	return numberLabels;
 };
 //#endregion
+//#region src/decimal-separator.ts
+const separators = /* @__PURE__ */ new Map();
+/**
+* The character a decimal tab stop aligns on for a run's language
+* (`<a:rPr lang>`): `,` for `de-DE`, `.` for `en-US`. Runs without a
+* language, or with one Intl does not know, align on `.`. The reference desktop app on Mac
+* uses the run language too, not the UI or system locale (native capture
+* 2026-10-07: Set Proofing Language to German moved alignment to `,`).
+*/
+function decimalSeparatorOf(lang) {
+	if (!lang) return ".";
+	let separator = separators.get(lang);
+	if (separator === void 0) {
+		separator = ".";
+		try {
+			separator = new Intl.NumberFormat(lang, { numberingSystem: "latn" }).formatToParts(1.5).find((part) => part.type === "decimal")?.value ?? ".";
+		} catch (error) {
+			if (!(error instanceof RangeError)) throw error;
+		}
+		separators.set(lang, separator);
+	}
+	return separator;
+}
+//#endregion
 //#region src/emf.ts
 const WORD_BYTES = 4;
 const SHORT_BYTES = 2;
@@ -526,7 +517,7 @@ const FALLBACK_DESCENT = .22;
 const FALLBACK_LINEGAP = .08;
 const BASELINE_LEADING_DROP = .036;
 const GRID_NUDGE_X = -.75;
-const EMU_PER_PX$1 = 9525;
+const EMU_PER_PX$2 = 9525;
 let reflectionNamespace = 0;
 const EAST_ASIAN_CHAR = /[ᄀ-ᅟ⺀-〾ぁ-㏿㐀-䶿一-鿿ꀀ-꓏가-힣豈-﫿︰-﹏＀-｠￠-￦]/;
 const CLOSING_PUNCT = /^[、。，．・）」』】〉》”’！？：；ー〜…,.!?:;)\]}]+$/;
@@ -711,7 +702,7 @@ const layoutCore = (input, measure) => {
 					fieldWidth = decimalWidth = 0;
 				} else {
 					fieldWidth += token.width;
-					const decimal = token.text.indexOf(".");
+					const decimal = token.text.indexOf(token.piece.decimalSeparator ?? ".");
 					decimalWidth = decimal < 0 ? decimalWidth + token.width : mWidth(token.text.slice(0, decimal), {
 						...specOf(token.piece),
 						sizePx: renderedSizePxOf(token.piece)
@@ -869,7 +860,7 @@ const lineContentExtent = (line, dx) => {
 	};
 };
 const resolveFillPaints = (placements) => {
-	if (!placements.some(({ line }) => line.tokens.some((t) => t.piece.fillPaint))) return {
+	if (!placements.some(({ line }) => line.tokens.some((t) => t.piece.fillPaint || t.piece.outlinePaint))) return {
 		defs: "",
 		placements
 	};
@@ -897,12 +888,7 @@ const resolveFillPaints = (placements) => {
 	};
 	const painted = /* @__PURE__ */ new Map();
 	let defs = "";
-	const pieces = /* @__PURE__ */ new Map();
-	const repaint = (piece) => {
-		const paint = piece.fillPaint;
-		if (paint === void 0) return piece;
-		let next = pieces.get(piece);
-		if (next) return next;
+	const resolve = (paint) => {
 		let fill = painted.get(paint);
 		if (fill === void 0) {
 			const built = paint(bounds);
@@ -910,9 +896,16 @@ const resolveFillPaints = (placements) => {
 			fill = built.fill;
 			painted.set(paint, fill);
 		}
+		return fill;
+	};
+	const pieces = /* @__PURE__ */ new Map();
+	const repaint = (piece) => {
+		let next = pieces.get(piece);
+		if (next) return next;
 		next = {
 			...piece,
-			fillHex: fill
+			...piece.fillPaint ? { fillHex: resolve(piece.fillPaint) } : {},
+			...piece.outlinePaint ? { outlineHex: resolve(piece.outlinePaint) } : {}
 		};
 		pieces.set(piece, next);
 		return next;
@@ -921,7 +914,7 @@ const resolveFillPaints = (placements) => {
 		...placement,
 		line: {
 			...placement.line,
-			tokens: placement.line.tokens.map((token) => token.piece.fillPaint ? {
+			tokens: placement.line.tokens.map((token) => token.piece.fillPaint || token.piece.outlinePaint ? {
 				...token,
 				piece: repaint(token.piece)
 			} : token)
@@ -1069,8 +1062,9 @@ const emitLine = (line, baselineY, dx, descent, nextEffectId, effectsOnly, effec
 	const reflections = effectKind === "reflection" || effectKind === "all" ? emitTextReflections(groups, line.textAnchor, x0, baselineY, descent, nextEffectId) : "";
 	const outerEffects = effectKind === "outer" || effectKind === "all" ? emitTextOuterEffects(groups, line.textAnchor, x0, baselineY, nextEffectId) : "";
 	const innerShadows = effectKind === "innerShadow" || effectKind === "all" ? emitTextInnerShadows(groups, line.textAnchor, x0, baselineY, nextEffectId) : "";
-	if (effectsOnly) return outerEffects + reflections + innerShadows;
-	return emitHighlights(groups, line.textAnchor, x0, baselineY) + outerEffects + reflections + text + innerShadows + emitTextDecorations(groups, line.textAnchor, x0, baselineY);
+	const bevels = effectKind === "bevel" || effectKind === "all" ? emitTextBevel(groups, line.textAnchor, x0, baselineY, nextEffectId) : "";
+	if (effectsOnly) return outerEffects + reflections + bevels + innerShadows;
+	return emitHighlights(groups, line.textAnchor, x0, baselineY) + outerEffects + reflections + text + bevels + innerShadows + emitTextDecorations(groups, line.textAnchor, x0, baselineY);
 };
 const unpaintedPiece = (piece) => {
 	const { outlineHex: _outline, shadow: _shadow, glow: _glow, ...rest } = piece;
@@ -1118,7 +1112,7 @@ const emitTextReflections = (groups, textAnchor, x0, baselineY, descent, nextEff
 			continue;
 		}
 		const scaleY = reflection.scaleY ?? 1;
-		const distPx = (reflection.offsetEmu ?? 0) / EMU_PER_PX$1;
+		const distPx = (reflection.offsetEmu ?? 0) / EMU_PER_PX$2;
 		const contactY = baselineY + descent;
 		const angleRad = (reflection.angleDeg ?? 0) * Math.PI / 180;
 		const offsetX = distPx * Math.cos(angleRad);
@@ -1131,7 +1125,7 @@ const emitTextReflections = (groups, textAnchor, x0, baselineY, descent, nextEff
 		const gradientId = `${id}-gradient`;
 		const maskId = `${id}-mask`;
 		const filterId = `${id}-blur`;
-		const blurPx = Math.max(0, (reflection.blurEmu ?? 0) / EMU_PER_PX$1 / 2);
+		const blurPx = Math.max(0, (reflection.blurEmu ?? 0) / EMU_PER_PX$2 / 2);
 		const fadeDirection = reflection.fadeDirection;
 		const defs = `<defs><linearGradient id="${gradientId}" ${fadeDirection === void 0 || fadeDirection === 90 ? "x1=\"0\" y1=\"1\" x2=\"0\" y2=\"0\"" : (() => {
 			const radians = fadeDirection * Math.PI / 180;
@@ -1167,8 +1161,8 @@ const emitTextOuterEffects = (groups, textAnchor, x0, baselineY, nextId) => {
 		if (shadow) {
 			const id = nextId("outer-shadow");
 			const angle = (shadow.angleDeg ?? 45) * Math.PI / 180;
-			const distance = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$1;
-			const blur = Math.max(0, (shadow.blurEmu ?? 50800) / EMU_PER_PX$1 / 2);
+			const distance = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$2;
+			const blur = Math.max(0, (shadow.blurEmu ?? 50800) / EMU_PER_PX$2 / 2);
 			const glyphSize = renderedSizePxOf(group.piece);
 			const pad = Math.max(1, distance + blur * 3);
 			const color = shadow.color ?? "#000000";
@@ -1178,7 +1172,7 @@ const emitTextOuterEffects = (groups, textAnchor, x0, baselineY, nextId) => {
 		}
 		if (glow) {
 			const id = nextId("glow");
-			const radius = Math.max(0, (glow.radiusEmu ?? 63500) / EMU_PER_PX$1);
+			const radius = Math.max(0, (glow.radiusEmu ?? 63500) / EMU_PER_PX$2);
 			const glyphSize = renderedSizePxOf(group.piece);
 			const pad = Math.max(1, radius * 2);
 			const color = glow.color ?? "#FFFF00";
@@ -1202,9 +1196,9 @@ const emitTextInnerShadows = (groups, textAnchor, x0, baselineY, nextId) => {
 		}
 		const id = nextId("inner-shadow");
 		const angle = (shadow.angleDeg ?? 45) * Math.PI / 180;
-		const dx = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$1 * Math.cos(angle);
-		const dy = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$1 * Math.sin(angle);
-		const blurPx = Math.max(0, (shadow.blurEmu ?? 50800) / EMU_PER_PX$1 / 2);
+		const dx = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$2 * Math.cos(angle);
+		const dy = (shadow.offsetEmu ?? 38100) / EMU_PER_PX$2 * Math.sin(angle);
+		const blurPx = Math.max(0, (shadow.blurEmu ?? 50800) / EMU_PER_PX$2 / 2);
 		const color = shadow.color ?? "#000000";
 		const opacity = Math.max(0, Math.min(1, shadow.opacity ?? 1));
 		const defs = `<defs><filter id="${id}" x="-25%" y="-25%" width="150%" height="150%"><feGaussianBlur in="SourceAlpha" stdDeviation="${fmt(blurPx)}" result="innerBlur"/><feOffset in="innerBlur" dx="${fmt(dx)}" dy="${fmt(dy)}" result="innerOff"/><feComposite in="innerOff" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="innerMask"/><feFlood flood-color="${escapeXml$1(color)}" flood-opacity="${opacity.toFixed(3)}" result="innerColor"/><feComposite in="innerColor" in2="innerMask" operator="in" result="innerOut"/><feComposite in="innerOut" in2="SourceAlpha" operator="in"/></filter></defs>`;
@@ -1214,6 +1208,25 @@ const emitTextInnerShadows = (groups, textAnchor, x0, baselineY, nextId) => {
 	}
 	return parts.join("");
 };
+const emitTextBevel = (groups, textAnchor, x0, baselineY, nextId) => {
+	const bevel = groups.find((g) => g.piece.bevel && !g.isTab && g.width > 0)?.piece.bevel;
+	if (!bevel) return "";
+	const id = nextId("bevel");
+	const widthPx = bevel.widthEmu / EMU_PER_PX$2;
+	const surfaceScale = bevel.heightEmu / EMU_PER_PX$2 * bevel.relief;
+	const table = [...bevel.profile.slice(1).map(() => 0), ...bevel.profile];
+	const flat = Math.sin(bevel.elevationDeg * Math.PI / 180);
+	const lightGain = bevel.contrast / (1 - flat);
+	const shadeGain = bevel.contrast / flat;
+	const light = `<feDistantLight azimuth="${fmt(bevel.azimuthDeg)}" elevation="${fmt(bevel.elevationDeg)}"/>`;
+	const specular = bevel.specular ? `<feSpecularLighting in="bevelHeight" surfaceScale="${fmt(surfaceScale)}" specularConstant="${fmt(bevel.specular.constant)}" specularExponent="${fmt(bevel.specular.exponent)}" lighting-color="#fff" result="bevelSpecular">${light}</feSpecularLighting>` : "";
+	const defs = `<defs><filter id="${id}" x="-25%" y="-25%" width="150%" height="150%" color-interpolation-filters="sRGB" data-pptx-bevel="1"><feGaussianBlur in="SourceAlpha" stdDeviation="${fmt(widthPx / 2)}" result="bevelBlur"/><feComponentTransfer in="bevelBlur" result="bevelHeight"><feFuncA type="table" tableValues="${table.map(fmt).join(" ")}"/></feComponentTransfer><feDiffuseLighting in="bevelHeight" surfaceScale="${fmt(surfaceScale)}" diffuseConstant="1" lighting-color="#fff" result="bevelDiffuse">${light}</feDiffuseLighting><feColorMatrix in="bevelDiffuse" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 ${fmt(lightGain)} 0 0 0 ${fmt(-lightGain * flat)}" result="bevelLight"/><feColorMatrix in="bevelDiffuse" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ${fmt(-shadeGain)} 0 0 0 ${fmt(shadeGain * flat)}" result="bevelShade"/>` + specular + `<feMerge result="bevelMerged"><feMergeNode in="bevelShade"/><feMergeNode in="bevelLight"/>${specular ? "<feMergeNode in=\"bevelSpecular\"/>" : ""}</feMerge><feComposite in="bevelMerged" in2="SourceAlpha" operator="in"/></filter></defs>`;
+	const beveled = groups.map((g) => g.piece.bevel && !g.isTab ? g : {
+		...g,
+		piece: unpaintedPiece(g.piece)
+	});
+	return `${defs}<text x="${fmt(x0)}" y="${fmt(baselineY)}" text-anchor="${textAnchor}" xml:space="preserve" filter="url(#${id})" aria-hidden="true" pointer-events="none" data-pptx-bevel="text">${beveled.map(tspan).join("")}</text>`;
+};
 const baselineShiftPxOf = (p) => p.sizePx * p.baseline;
 const SUPER_SUB_SIZE_RATIO = .65;
 const SMALL_CAPS_LOWERCASE_RATIO = .8;
@@ -1473,6 +1486,206 @@ function browserTextMeasurer() {
 	};
 }
 //#endregion
+//#region src/text-bevel.ts
+const DEFAULT_BEVEL_EMU$1 = 76200;
+const DEFAULT_PRESET = "circle";
+const DEFAULT_RIG = {
+	type: "threePt",
+	direction: "t"
+};
+const PROFILE_SAMPLES = 9;
+const PROFILES = {
+	circle: (t) => Math.sqrt(1 - (1 - t) ** 2),
+	relaxedInset: (t) => Math.sin(t * Math.PI / 2) ** 2,
+	slope: (t) => t,
+	angle: (t) => t,
+	softRound: (t) => t * t * (3 - 2 * t),
+	convex: (t) => Math.sqrt(Math.sqrt(1 - (1 - t) ** 2)),
+	coolSlant: (t) => Math.min(1, t * 1.6),
+	hardEdge: (t) => Math.min(1, t * 3),
+	cross: (t) => t < .5 ? t * 1.6 : .8 + (t - .5) * .4,
+	divot: (t) => t < .35 ? t / .35 : 1 - .55 * Math.sin((t - .35) / .65 * Math.PI),
+	riblet: (t) => t * .7 + .3 * Math.abs(Math.sin(t * 2.5 * Math.PI)),
+	artDeco: (t) => Math.min(1, Math.floor(t * 3 + .5) / 3 + (t * 3 - Math.floor(t * 3)) * .12)
+};
+const DIRECTION_AZIMUTH = {
+	r: 0,
+	br: 45,
+	b: 90,
+	bl: 135,
+	l: 180,
+	tl: 225,
+	t: 270,
+	tr: 315
+};
+const RIG_LOOK = (type) => {
+	if (type === "flat" || type.startsWith("legacyFlat")) return null;
+	if (type === "harsh" || type.startsWith("legacyHarsh") || type === "contrasting") return {
+		elevationDeg: 30,
+		contrast: .65
+	};
+	if (type === "soft" || type === "flood" || type === "brightRoom" || type === "glow") return {
+		elevationDeg: 45,
+		contrast: .55
+	};
+	return {
+		elevationDeg: 38,
+		contrast: .65
+	};
+};
+const MATTE = {
+	contrastScale: 1,
+	specular: null
+};
+const MATERIAL_LOOK = {
+	plastic: {
+		contrastScale: 1,
+		specular: {
+			constant: .6,
+			exponent: 20
+		}
+	},
+	legacyPlastic: {
+		contrastScale: 1,
+		specular: {
+			constant: .6,
+			exponent: 20
+		}
+	},
+	metal: {
+		contrastScale: 1.2,
+		specular: {
+			constant: .9,
+			exponent: 12
+		}
+	},
+	legacyMetal: {
+		contrastScale: 1.2,
+		specular: {
+			constant: .9,
+			exponent: 12
+		}
+	},
+	softmetal: {
+		contrastScale: 1.1,
+		specular: {
+			constant: .6,
+			exponent: 8
+		}
+	},
+	clear: {
+		contrastScale: .9,
+		specular: {
+			constant: .8,
+			exponent: 30
+		}
+	},
+	softEdge: {
+		contrastScale: .9,
+		specular: {
+			constant: .25,
+			exponent: 10
+		}
+	},
+	powder: {
+		contrastScale: .8,
+		specular: null
+	},
+	translucentPowder: {
+		contrastScale: .7,
+		specular: null
+	},
+	flat: {
+		contrastScale: 0,
+		specular: null
+	}
+};
+const RELIEF = 2.5;
+/**
+* The bevel to shade a text body with, or `null` when it has no top bevel or
+* its rig/material renders it unshaded.
+*/
+const textBevelOf = (text3d) => {
+	const bevel = text3d?.bevelTop;
+	if (!bevel) return null;
+	const widthEmu = bevel.widthEmu ?? DEFAULT_BEVEL_EMU$1;
+	const heightEmu = bevel.heightEmu ?? DEFAULT_BEVEL_EMU$1;
+	if (widthEmu <= 0 || heightEmu <= 0) return null;
+	const rig = text3d.scene?.lightRig ?? DEFAULT_RIG;
+	const look = RIG_LOOK(rig.type);
+	const material = (text3d.material && MATERIAL_LOOK[text3d.material]) ?? MATTE;
+	if (!look || material.contrastScale === 0) return null;
+	const profile = PROFILES[bevel.preset ?? DEFAULT_PRESET];
+	const azimuthDeg = (DIRECTION_AZIMUTH[rig.direction] + (rig.rotation?.revolutionDeg ?? 0)) % 360;
+	return {
+		widthEmu,
+		heightEmu,
+		profile: Array.from({ length: PROFILE_SAMPLES }, (_, i) => Math.max(0, Math.min(1, profile(i / (PROFILE_SAMPLES - 1))))),
+		azimuthDeg,
+		elevationDeg: look.elevationDeg,
+		contrast: Math.min(1, look.contrast * material.contrastScale),
+		relief: RELIEF,
+		specular: material.specular
+	};
+};
+//#endregion
+//#region src/shape-3d.ts
+const EMU_PER_PX$1 = 9525;
+const DEFAULT_BEVEL_EMU = 76200;
+const LIGHT_AZIMUTH_DEG = 225;
+const LIGHT_ELEVATION_DEG = 45;
+const radians = (degrees) => degrees * Math.PI / 180;
+/**
+* An SVG `matrix(...)` for the camera's explicit rotation about the point
+* (`cx`, `cy`) in px, or `null` when the camera keeps the shape face-on.
+* The camera turns, so the shape appears turned the opposite way: a camera
+* revolution of +6° (Picture Style "Rotated, White") tilts the picture 6°
+* counter-clockwise.
+*/
+const cameraTransform = (shape3d, cx, cy) => {
+	const rotation = shape3d?.scene?.cameraRotation;
+	if (!rotation) return null;
+	const { latitudeDeg, longitudeDeg, revolutionDeg } = rotation;
+	if (latitudeDeg === 0 && longitudeDeg === 0 && revolutionDeg === 0) return null;
+	const lon = radians(-longitudeDeg);
+	const lat = radians(-latitudeDeg);
+	const rev = radians(-revolutionDeg);
+	const ex = [Math.cos(lon), Math.sin(lon) * Math.sin(lat)];
+	const ey = [0, Math.cos(lat)];
+	const cos = Math.cos(rev);
+	const sin = Math.sin(rev);
+	const turn = (v) => [cos * v[0] - sin * v[1], sin * v[0] + cos * v[1]];
+	const [a, b] = turn(ex);
+	const [c, d] = turn(ey);
+	return `matrix(${[
+		a,
+		b,
+		c,
+		d,
+		cx - a * cx - c * cy,
+		cy - b * cx - d * cy
+	].map((n) => n.toFixed(6)).join(" ")})`;
+};
+/**
+* The `<filter>` body that shades a top bevel onto whatever the shape painted
+* (picture, fill and border alike): a lit height map built from the blurred
+* outline, multiplied in so flat areas keep their color and slopes facing
+* away from the light darken, plus a specular highlight on the lit slopes.
+* `null` when the shape has no top bevel.
+*/
+const bevelFilterPrimitives = (shape3d) => {
+	const bevel = shape3d?.bevelTop;
+	if (!bevel) return null;
+	const widthPx = (bevel.widthEmu ?? DEFAULT_BEVEL_EMU) / EMU_PER_PX$1;
+	const heightPx = (bevel.heightEmu ?? DEFAULT_BEVEL_EMU) / EMU_PER_PX$1;
+	if (widthPx <= 0 || heightPx <= 0) return null;
+	const blur = widthPx / 2;
+	const surfaceScale = Math.min(10, Math.max(1, heightPx / widthPx * 6));
+	const diffuse = 1 / Math.sin(radians(LIGHT_ELEVATION_DEG));
+	const light = `<feDistantLight azimuth="${LIGHT_AZIMUTH_DEG}" elevation="${LIGHT_ELEVATION_DEG}"/>`;
+	return `<feGaussianBlur in="SourceAlpha" stdDeviation="${blur.toFixed(2)}" result="bevelHeight"/><feDiffuseLighting in="bevelHeight" surfaceScale="${surfaceScale.toFixed(2)}" diffuseConstant="${diffuse.toFixed(4)}" lighting-color="#fff" result="bevelShade">${light}</feDiffuseLighting><feComposite in="SourceGraphic" in2="bevelShade" operator="arithmetic" k1="1" result="bevelLit"/><feSpecularLighting in="bevelHeight" surfaceScale="${surfaceScale.toFixed(2)}" specularConstant="0.6" specularExponent="20" lighting-color="#fff" result="bevelSpec">${light}</feSpecularLighting><feComposite in="bevelSpec" in2="SourceAlpha" operator="in" result="bevelGloss"/><feComposite in="bevelLit" in2="bevelGloss" operator="arithmetic" k2="1" k3="1"/>`;
+};
+//#endregion
 //#region src/render-slide.ts
 const clickActionHref = (pres, action) => {
 	if (!action) return void 0;
@@ -1619,20 +1832,64 @@ const renderPicture = (shape, pres, x, y, w, h, transform, textOverlay, bytes, f
 		}
 		const opacityAttr = opacity !== 1 ? ` opacity="${opacity.toFixed(3)}"` : "";
 		const border = outline.stroke !== "none" && outline.strokeWidth > 0 ? `<g${transform} fill="none" stroke="${outline.stroke}" stroke-width="${E(outline.strokeWidth)}"${outline.strokeAttrs ? ` ${outline.strokeAttrs}` : ""}>${pictureClipGeometry(shape, preset, x, y, w, h)}</g>` : "";
+		const under = outline.fill !== "none" ? `${outline.defs}<g${transform} fill="${outline.fill}"${outline.fillAttrs}>${pictureClipGeometry(shape, preset, x, y, w, h)}</g>` : "";
 		if (layout?.mode === "tile") {
 			const intrinsic = getShapeImageIntrinsicSize(shape);
 			if (intrinsic) {
 				const pattern = imageTilePattern(dataUrl, layout, intrinsic, x, y, w, h, cropL, cropT, cropR, cropB);
 				const geometry = pictureClipGeometry(shape, preset, x, y, w, h);
-				return `${clipDef}${pattern.defs}<g${transform} fill="${pattern.fill}"${filterAttr}${opacityAttr}>${geometry}</g>${border}<g${transform}>${textOverlay}</g>`;
+				return `${clipDef}${pattern.defs}${pictureEffects(pres, shape, {
+					x,
+					y,
+					w,
+					h
+				}, `${under}<g${transform} fill="${pattern.fill}"${filterAttr}${opacityAttr}>${geometry}</g>${border}`)}<g${transform}>${textOverlay}</g>`;
 			}
 		}
-		return `${clipDef}<g${transform}${clipAttr}><image x="${E(imgX)}" y="${E(imgY)}" width="${E(imgW)}" height="${E(imgH)}" href="${dataUrl}" xlink:href="${dataUrl}" preserveAspectRatio="none"${filterAttr}${opacityAttr}/></g>${border}<g${transform}>${textOverlay}</g>`;
+		return `${clipDef}${pictureEffects(pres, shape, {
+			x,
+			y,
+			w,
+			h
+		}, `${under}<g${transform}${clipAttr}><image x="${E(imgX)}" y="${E(imgY)}" width="${E(imgW)}" height="${E(imgH)}" href="${dataUrl}" xlink:href="${dataUrl}" preserveAspectRatio="none"${filterAttr}${opacityAttr}/></g>${border}`)}<g${transform}>${textOverlay}</g>`;
 	}
 	const linkUrl = getShapeImageLinkUrl(shape);
 	const label = !bytes ? linkUrl ? `picture (link: ${linkUrl.length > 48 ? linkUrl.slice(0, 45) + "…" : linkUrl})` : "picture (no bytes)" : `picture (${format ?? "unknown"}${bytes ? `, ${bytes.byteLength} B` : ""})`;
 	return `<g data-pptx-fallback="image"${transform}><rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="#F3F4F6" stroke="#9CA3AF" stroke-width="${E(9525)}" stroke-dasharray="${E(5e4)},${E(3e4)}"/>${renderPicturePlaceholderLabel(x, y, w, h, label)}${textOverlay}</g>`;
 };
+/**
+* Wraps a picture's markup in its 3-D approximation (bevel lighting, then the
+* camera rotation) and its `<a:effectLst>` (shadows, glow, soft edge and the
+* reflection), the same effects a shape gets.
+*/
+const pictureEffects = (pres, shape, box, markup) => {
+	const shape3d = getShape3D(shape);
+	let defs = "";
+	let content = markup;
+	let mirrored = markup;
+	const bevel = bevelFilterPrimitives(shape3d);
+	if (bevel) {
+		const id = mintId();
+		defs += `<defs><filter id="${id}" x="-10%" y="-10%" width="120%" height="120%" color-interpolation-filters="sRGB">${bevel}</filter></defs>`;
+		content = `<g filter="url(#${id})">${content}</g>`;
+	}
+	const camera = cameraTransform(shape3d, (box.x + box.w / 2) / EMU_PER_PX, (box.y + box.h / 2) / EMU_PER_PX);
+	if (camera) {
+		content = `<g transform="${camera}">${content}</g>`;
+		mirrored = `<g transform="${camera}">${mirrored}</g>`;
+	}
+	const reflection = buildReflection(pres, shape, mirrored, box);
+	const fx = buildEffectsFilter(pres, shape);
+	if (fx) {
+		defs += fx.defs;
+		content = `<g filter="url(#${fx.id})">${content}</g>`;
+	}
+	if (reflection) {
+		defs += reflection.defs;
+		content = reflection.svg + content;
+	}
+	return defs + content;
+};
 const imageTilePattern = (dataUrl, layout, intrinsic, x, y, w, h, cropL = 0, cropT = 0, cropR = 0, cropB = 0) => {
 	const sourceW = intrinsic.width * (layout.scaleX ?? 1);
 	const sourceH = intrinsic.height * (layout.scaleY ?? 1);
@@ -1677,15 +1934,11 @@ const imageTilePattern = (dataUrl, layout, intrinsic, x, y, w, h, cropL = 0, cro
 	};
 };
 const pictureClipGeometry = (shape, preset, x, y, w, h) => {
-	if (preset === "ellipse") return `<ellipse cx="${E(x + w / 2)}" cy="${E(y + h / 2)}" rx="${E(w / 2)}" ry="${E(h / 2)}"/>`;
-	if (preset === "roundRect") {
-		const radius = E(Math.min(w, h) * Math.max(0, Math.min(.5, (getShapeAdjustValues(shape).adj ?? 16667) / 1e5)));
-		return `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" rx="${radius}" ry="${radius}"/>`;
-	}
-	const path = PRESET_PATHS[preset];
-	if (path) return `<path d="${path(x / EMU_PER_PX, y / EMU_PER_PX, w / EMU_PER_PX, h / EMU_PER_PX)}" clip-rule="evenodd"/>`;
-	const points = PRESET_POINTS[preset];
-	if (points) return `<polygon points="${points(w / EMU_PER_PX, h / EMU_PER_PX).map(([nx, ny]) => `${E(x + nx * w)},${E(y + ny * h)}`).join(" ")}"/>`;
+	const d = ((preset === "rect" ? null : getPresetGeometry(preset, {
+		w: emu(w),
+		h: emu(h)
+	}, getShapeAdjustValues(shape)))?.paths ?? []).filter((path) => path.fill !== "none").map((path) => geometryPathData(path, x, y, w, h)).filter((data) => data !== "").join(" ");
+	if (d !== "") return `<path d="${d}" clip-rule="evenodd"/>`;
 	return `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}"/>`;
 };
 const renderPicturePlaceholderLabel = (x, y, w, h, text) => {
@@ -1938,7 +2191,22 @@ const patternDef = (pat) => {
 		fillAttr: `url(#${id})`
 	};
 };
-const textFillPaint = (fill, theme) => (box) => {
+const textFillPaint = (fill, theme, solid) => (box) => {
+	if (fill.kind === "none") return {
+		defs: "",
+		fill: "none"
+	};
+	if (fill.kind === "image") {
+		if (!fill.bytes) return {
+			defs: "",
+			fill: solid
+		};
+		const id = mintId();
+		return {
+			defs: `<defs><pattern id="${id}" patternUnits="userSpaceOnUse" x="${box.x.toFixed(2)}" y="${box.y.toFixed(2)}" width="${box.w.toFixed(2)}" height="${box.h.toFixed(2)}"><image href="${bytesToDataUrl(fill.bytes)}" width="${box.w.toFixed(2)}" height="${box.h.toFixed(2)}" preserveAspectRatio="none"/></pattern></defs>`,
+			fill: `url(#${id})`
+		};
+	}
 	if (fill.kind === "pattern") {
 		const built = patternDef({
 			preset: fill.preset,
@@ -1996,6 +2264,32 @@ const buildArrowMarker = (type, width, length, color, orient) => {
 		def: `<defs><marker id="${id}" viewBox="0 0 ${w} ${h}" refX="${w}" refY="${h / 2}" markerWidth="${w}" markerHeight="${h}" orient="${orient}">${body}</marker></defs>`
 	};
 };
+const unrotatedGradientTransform = (grad, shape, pres) => {
+	const bounds = shape && (pres ? getShapeBoundsResolved(pres, shape) : getShapeBounds(shape));
+	if (grad.rotateWithShape !== false || !shape || !bounds || bounds.w <= 0 || bounds.h <= 0) return "";
+	const angle = getShapeRotation(shape) * Math.PI / 180;
+	const cos = Math.cos(angle);
+	const sin = Math.sin(angle);
+	const w = bounds.w;
+	const h = bounds.h;
+	const rotatedW = Math.abs(cos) * w + Math.abs(sin) * h;
+	const rotatedH = Math.abs(sin) * w + Math.abs(cos) * h;
+	const flip = getShapeFlip(shape);
+	const sx = flip?.horizontal ? -1 : 1;
+	const sy = flip?.vertical ? -1 : 1;
+	const a = sx * cos * rotatedW / w;
+	const b = -sy * sin * rotatedW / h;
+	const c = sx * sin * rotatedH / w;
+	const d = sy * cos * rotatedH / h;
+	return ` gradientTransform="matrix(${[
+		a,
+		b,
+		c,
+		d,
+		(1 - a - c) / 2,
+		(1 - b - d) / 2
+	].map((value) => value.toFixed(6)).join(" ")})"`;
+};
 const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 	let fillColor;
 	let fillAttrs = "";
@@ -2010,33 +2304,7 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 	else if (fill.kind === "gradient") {
 		const grad = shape ? pres ? getShapeGradientFillEffective(pres, shape) : getShapeGradientFill(shape) : null;
 		if (grad) {
-			let transform = "";
-			const bounds = shape && (pres ? getShapeBoundsResolved(pres, shape) : getShapeBounds(shape));
-			if (grad.rotateWithShape === false && shape && bounds && bounds.w > 0 && bounds.h > 0) {
-				const angle = getShapeRotation(shape) * Math.PI / 180;
-				const cos = Math.cos(angle);
-				const sin = Math.sin(angle);
-				const w = bounds.w;
-				const h = bounds.h;
-				const rotatedW = Math.abs(cos) * w + Math.abs(sin) * h;
-				const rotatedH = Math.abs(sin) * w + Math.abs(cos) * h;
-				const flip = getShapeFlip(shape);
-				const sx = flip?.horizontal ? -1 : 1;
-				const sy = flip?.vertical ? -1 : 1;
-				const a = sx * cos * rotatedW / w;
-				const b = -sy * sin * rotatedW / h;
-				const c = sx * sin * rotatedH / w;
-				const d = sy * cos * rotatedH / h;
-				transform = ` gradientTransform="matrix(${[
-					a,
-					b,
-					c,
-					d,
-					(1 - a - c) / 2,
-					(1 - b - d) / 2
-				].map((value) => value.toFixed(6)).join(" ")})"`;
-			}
-			const built = gradientDef(grad, theme, transform);
+			const built = gradientDef(grad, theme, unrotatedGradientTransform(grad, shape, pres));
 			defs = built.defs;
 			fillColor = built.fillAttr;
 		} else fillColor = (shape && pres ? getShapeFillColorResolved(pres, shape) : null) ?? "none";
@@ -2053,10 +2321,34 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 	let strokeWidth = 0;
 	const strokeAttrParts = [];
 	let markerAttrs = "";
+	let headColor = strokeColor;
+	let tailColor = strokeColor;
 	if (stroke.kind === "solid") {
 		let resolved = null;
 		if (shape && pres) resolved = getShapeStrokeColorResolved(pres, shape);
 		strokeColor = resolved ?? resolveColor(stroke.color, theme, "#9CA3AF");
+		headColor = strokeColor;
+		tailColor = strokeColor;
+	} else if (stroke.kind === "gradient") {
+		const grad = shape ? getShapeStrokeGradient(shape, pres) : null;
+		const bounds = shape && (pres ? getShapeBoundsResolved(pres, shape) : getShapeBounds(shape));
+		if (grad && bounds) {
+			const stopColor = (stop) => stop ? stop.resolvedColor ?? resolveColor(stop.color, theme, "#9CA3AF") : "#9CA3AF";
+			const ordered = [...grad.stops].sort((a, b) => a.offset - b.offset);
+			headColor = stopColor(ordered[0]);
+			tailColor = stopColor(ordered[ordered.length - 1]);
+			const widthEmu = stroke.widthEmu ?? 9525;
+			const built = bounds.w > 0 && bounds.h > 0 ? gradientDef(grad, theme, unrotatedGradientTransform(grad, shape, pres)) : gradientDef(grad, theme, "", {
+				x: (bounds.w > 0 ? bounds.x : bounds.x - widthEmu / 2) / EMU_PER_PX,
+				y: (bounds.h > 0 ? bounds.y : bounds.y - widthEmu / 2) / EMU_PER_PX,
+				w: Math.max(bounds.w, widthEmu) / EMU_PER_PX,
+				h: Math.max(bounds.h, widthEmu) / EMU_PER_PX
+			});
+			defs += built.defs;
+			strokeColor = built.fillAttr;
+		}
+	}
+	if (strokeColor !== "none" && (stroke.kind === "solid" || stroke.kind === "gradient")) {
 		strokeWidth = stroke.widthEmu ?? 9525;
 		if (shape) {
 			const opacity = getShapeStrokeOpacity(shape, pres);
@@ -2082,12 +2374,12 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 			const head = getShapeStrokeArrow(shape, "head", pres);
 			const tail = getShapeStrokeArrow(shape, "tail", pres);
 			if (head && head.type !== "none") {
-				const m = buildArrowMarker(head.type, head.width, head.length, strokeColor, "auto-start-reverse");
+				const m = buildArrowMarker(head.type, head.width, head.length, headColor, "auto-start-reverse");
 				defs += m.def;
 				markerAttrs += ` marker-start="url(#${m.id})"`;
 			}
 			if (tail && tail.type !== "none") {
-				const m = buildArrowMarker(tail.type, tail.width, tail.length, strokeColor, "auto");
+				const m = buildArrowMarker(tail.type, tail.width, tail.length, tailColor, "auto");
 				defs += m.def;
 				markerAttrs += ` marker-end="url(#${m.id})"`;
 			}
@@ -2103,904 +2395,6 @@ const paint = (shape, fill, stroke, theme, isPlaceholder, pres) => {
 		markerAttrs
 	};
 };
-const polygon = (n, rotation = -Math.PI / 2) => {
-	const out = [];
-	for (let i = 0; i < n; i++) {
-		const a = rotation + i * 2 * Math.PI / n;
-		out.push([.5 + .5 * Math.cos(a), .5 + .5 * Math.sin(a)]);
-	}
-	return out;
-};
-const star = (points, innerRatio = .42) => {
-	const out = [];
-	const rotation = -Math.PI / 2;
-	for (let i = 0; i < points * 2; i++) {
-		const a = rotation + i * Math.PI / points;
-		const r = i % 2 === 0 ? .5 : .5 * innerRatio;
-		out.push([.5 + r * Math.cos(a), .5 + r * Math.sin(a)]);
-	}
-	return out;
-};
-const PRESET_POINTS = {
-	triangle: () => [
-		[.5, 0],
-		[1, 1],
-		[0, 1]
-	],
-	rtTriangle: () => [
-		[0, 0],
-		[1, 1],
-		[0, 1]
-	],
-	diamond: () => [
-		[.5, 0],
-		[1, .5],
-		[.5, 1],
-		[0, .5]
-	],
-	parallelogram: () => [
-		[.25, 0],
-		[1, 0],
-		[.75, 1],
-		[0, 1]
-	],
-	trapezoid: () => [
-		[.25, 0],
-		[.75, 0],
-		[1, 1],
-		[0, 1]
-	],
-	pentagon: () => polygon(5),
-	hexagon: () => polygon(6),
-	heptagon: () => polygon(7),
-	octagon: () => polygon(8),
-	decagon: () => polygon(10),
-	dodecagon: () => polygon(12),
-	star4: () => star(4),
-	star5: () => star(5),
-	star6: () => star(6),
-	star7: () => star(7),
-	star8: () => star(8),
-	star10: () => star(10),
-	star12: () => star(12),
-	star16: () => star(16),
-	star24: () => star(24),
-	star32: () => star(32),
-	rightArrow: (w, h) => {
-		const bx = 1 - Math.min(1, .5 * Math.min(w, h) / w);
-		return [
-			[0, .25],
-			[bx, .25],
-			[bx, 0],
-			[1, .5],
-			[bx, 1],
-			[bx, .75],
-			[0, .75]
-		];
-	},
-	leftArrow: (w, h) => {
-		const bx = Math.min(1, .5 * Math.min(w, h) / w);
-		return [
-			[1, .25],
-			[bx, .25],
-			[bx, 0],
-			[0, .5],
-			[bx, 1],
-			[bx, .75],
-			[1, .75]
-		];
-	},
-	upArrow: (w, h) => {
-		const by = Math.min(1, .5 * Math.min(w, h) / h);
-		return [
-			[.25, 1],
-			[.25, by],
-			[0, by],
-			[.5, 0],
-			[1, by],
-			[.75, by],
-			[.75, 1]
-		];
-	},
-	downArrow: (w, h) => {
-		const by = 1 - Math.min(1, .5 * Math.min(w, h) / h);
-		return [
-			[.25, 0],
-			[.25, by],
-			[0, by],
-			[.5, 1],
-			[1, by],
-			[.75, by],
-			[.75, 0]
-		];
-	},
-	leftRightArrow: () => [
-		[0, .5],
-		[.18, .2],
-		[.18, .35],
-		[.82, .35],
-		[.82, .2],
-		[1, .5],
-		[.82, .8],
-		[.82, .65],
-		[.18, .65],
-		[.18, .8]
-	],
-	upDownArrow: () => [
-		[.5, 0],
-		[.2, .18],
-		[.35, .18],
-		[.35, .82],
-		[.2, .82],
-		[.5, 1],
-		[.8, .82],
-		[.65, .82],
-		[.65, .18],
-		[.8, .18]
-	],
-	chevron: () => [
-		[0, 0],
-		[.7, 0],
-		[1, .5],
-		[.7, 1],
-		[0, 1],
-		[.3, .5]
-	],
-	bentArrow: () => [
-		[0, .45],
-		[.55, .45],
-		[.55, .25],
-		[.55, .05],
-		[.95, .05],
-		[.95, .55],
-		[.8, .55],
-		[.8, .85],
-		[0, .85]
-	],
-	homePlate: () => [
-		[0, 0],
-		[.75, 0],
-		[1, .5],
-		[.75, 1],
-		[0, 1]
-	]
-};
-const PRESET_PATHS = {
-	wedgeRectCallout: (x, y, w, h) => {
-		const bodyH = h * .78;
-		const tailTipX = x + w * .12;
-		const tailTipY = y + h;
-		const tailBaseLeft = x + w * .18;
-		const tailBaseRight = x + w * .32;
-		const bodyB = y + bodyH;
-		return `M${x},${y} L${x + w},${y} L${x + w},${bodyB} L${tailBaseRight},${bodyB} L${tailTipX},${tailTipY} L${tailBaseLeft},${bodyB} L${x},${bodyB} Z`;
-	},
-	wedgeRoundRectCallout: (x, y, w, h) => {
-		const r = Math.min(w, h) * .08;
-		const bodyH = h * .78;
-		const tailTipX = x + w * .12;
-		const tailTipY = y + h;
-		const tailBaseLeft = x + w * .18;
-		const tailBaseRight = x + w * .32;
-		const bodyB = y + bodyH;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${bodyB - r} A${r},${r} 0 0 1 ${x + w - r},${bodyB} L${tailBaseRight},${bodyB} L${tailTipX},${tailTipY} L${tailBaseLeft},${bodyB} L${x + r},${bodyB} A${r},${r} 0 0 1 ${x},${bodyB - r} L${x},${y + r} A${r},${r} 0 0 1 ${x + r},${y} Z`;
-	},
-	wedgeEllipseCallout: (x, y, w, h) => {
-		const bodyCy = y + h * .39;
-		const bodyRy = h * .39;
-		const cx = x + w / 2;
-		const bodyRx = w / 2;
-		const tailTipX = x + w * .12;
-		const tailTipY = y + h;
-		const tailBaseAngle = 1.5;
-		return `M${cx + bodyRx * Math.cos(tailBaseAngle - .18)},${bodyCy + bodyRy * Math.sin(tailBaseAngle - .18)} A${bodyRx},${bodyRy} 0 1 0 ${cx + bodyRx * Math.cos(1.68)},${bodyCy + bodyRy * Math.sin(1.68)} L${tailTipX},${tailTipY} Z`;
-	},
-	cloudCallout: (x, y, w, h) => {
-		const bodyH = h * .78;
-		const cx = x + w / 2;
-		const cy = y + bodyH / 2;
-		const rx = w / 2 * .92;
-		const ry = bodyH / 2 * .85;
-		const lobes = 10;
-		const path = [];
-		for (let i = 0; i < lobes; i++) {
-			const a = i / lobes * 2 * Math.PI - Math.PI / 2;
-			const lobeRx = rx * .32;
-			const lobeRy = ry * .32;
-			const px0 = cx + rx * Math.cos(a);
-			const py0 = cy + ry * Math.sin(a);
-			if (i === 0) path.push(`M${px0 - lobeRx},${py0}`);
-			path.push(`A${lobeRx},${lobeRy} 0 1 1 ${px0 + lobeRx},${py0}`);
-			const nextA = (i + 1) / lobes * 2 * Math.PI - Math.PI / 2;
-			const nextX = cx + rx * Math.cos(nextA) - lobeRx;
-			const nextY = cy + ry * Math.sin(nextA);
-			path.push(`L${nextX},${nextY}`);
-		}
-		path.push("Z");
-		const tailX = x + w * .18;
-		const tailY = y + h * .95;
-		return `${path.join(" ")} M${tailX - 6},${tailY - 14} a4,3 0 1 0 1,0 Z M${tailX},${tailY} a6,4 0 1 0 1,0 Z`;
-	},
-	heart: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const top = y + h * .27;
-		return `M${cx},${y + h} C${x},${y + h * .55} ${x},${top} ${cx},${y + h * .4} C${x + w},${top} ${x + w},${y + h * .55} ${cx},${y + h} Z`;
-	},
-	sun: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const innerR = Math.min(w, h) * .25;
-		const outerR = Math.min(w, h) * .5;
-		const rays = 12;
-		const path = [];
-		for (let i = 0; i < rays * 2; i++) {
-			const r = i % 2 === 0 ? outerR : innerR;
-			const a = i / (rays * 2) * 2 * Math.PI - Math.PI / 2;
-			const px0 = cx + r * Math.cos(a);
-			const py0 = cy + r * Math.sin(a);
-			path.push(`${i === 0 ? "M" : "L"}${px0},${py0}`);
-		}
-		path.push("Z");
-		return path.join(" ");
-	},
-	smileyFace: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2 - 1;
-		const eyeR = r * .07;
-		const eyeOff = r * .32;
-		const mouthW = r * .5;
-		const mouthY = cy + r * .18;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r},${cy} A${r},${r} 0 1 0 ${cx + r},${cy} Z M${cx - eyeOff + eyeR},${cy - eyeOff} A${eyeR},${eyeR} 0 1 1 ${cx - eyeOff - eyeR},${cy - eyeOff} A${eyeR},${eyeR} 0 1 1 ${cx - eyeOff + eyeR},${cy - eyeOff} Z M${cx + eyeOff + eyeR},${cy - eyeOff} A${eyeR},${eyeR} 0 1 1 ${cx + eyeOff - eyeR},${cy - eyeOff} A${eyeR},${eyeR} 0 1 1 ${cx + eyeOff + eyeR},${cy - eyeOff} Z M${cx - mouthW},${mouthY} Q${cx},${mouthY + r * .32} ${cx + mouthW},${mouthY}`;
-	},
-	lightningBolt: (x, y, w, h) => {
-		return `M${x + w * .5},${y} L${x + w * .15},${y + h * .55} L${x + w * .45},${y + h * .55} L${x + w * .3},${y + h} L${x + w * .85},${y + h * .4} L${x + w * .55},${y + h * .4} L${x + w * .7},${y} Z`;
-	},
-	flowChartProcess: (x, y, w, h) => `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z`,
-	flowChartAlternateProcess: (x, y, w, h) => {
-		const r = Math.min(w, h) * .18;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${y + h - r} A${r},${r} 0 0 1 ${x + w - r},${y + h} L${x + r},${y + h} A${r},${r} 0 0 1 ${x},${y + h - r} L${x},${y + r} A${r},${r} 0 0 1 ${x + r},${y} Z`;
-	},
-	flowChartDecision: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${cx},${y} L${x + w},${cy} L${cx},${y + h} L${x},${cy} Z`;
-	},
-	flowChartTerminator: (x, y, w, h) => {
-		const r = h / 2;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w - r},${y + h} L${x + r},${y + h} A${r},${r} 0 0 1 ${x + r},${y} Z`;
-	},
-	flowChartConnector: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		return `M${cx + r},${cy} A${r},${r} 0 1 1 ${cx - r},${cy} A${r},${r} 0 1 1 ${cx + r},${cy} Z`;
-	},
-	flowChartDocument: (x, y, w, h) => {
-		const wave = h * .18;
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h - wave} C${x + w * .75},${y + h + wave * .5} ${x + w * .25},${y + h - wave * 2} ${x},${y + h - wave * .5} Z`;
-	},
-	flowChartMultidocument: (x, y, w, h) => {
-		const inset = w * .06;
-		return `${`M${x + inset},${y + inset * .6} L${x + w},${y + inset * .6} L${x + w},${y + h - inset * .6} L${x + w - inset},${y + h - inset * .6} L${x + w - inset},${y + inset * .6}`} Z ${`M${x},${y + inset * 1.2} L${x + w - inset},${y + inset * 1.2} L${x + w - inset},${y + h * .85} C${x + (w - inset) * .75},${y + h + 6} ${x + (w - inset) * .25},${y + h * .75} ${x},${y + h * .95} Z`}`;
-	},
-	flowChartPredefinedProcess: (x, y, w, h) => {
-		const inset = w * .1;
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z M${x + inset},${y} L${x + inset},${y + h} M${x + w - inset},${y} L${x + w - inset},${y + h}`;
-	},
-	flowChartInternalStorage: (x, y, w, h) => {
-		const inset = Math.min(w, h) * .1;
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z M${x + inset},${y} L${x + inset},${y + h} M${x},${y + inset} L${x + w},${y + inset}`;
-	},
-	flowChartManualInput: (x, y, w, h) => {
-		return `M${x},${y + h * .35} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z`;
-	},
-	flowChartManualOperation: (x, y, w, h) => {
-		return `M${x},${y} L${x + w},${y} L${x + w * .8},${y + h} L${x + w * .2},${y + h} Z`;
-	},
-	flowChartInputOutput: (x, y, w, h) => {
-		const skew = w * .18;
-		return `M${x + skew},${y} L${x + w},${y} L${x + w - skew},${y + h} L${x},${y + h} Z`;
-	},
-	flowChartPunchedTape: (x, y, w, h) => {
-		const wave = h * .12;
-		return `M${x},${y + wave} C${x + w * .25},${y - wave} ${x + w * .75},${y + wave * 2} ${x + w},${y + wave} L${x + w},${y + h - wave} C${x + w * .75},${y + h + wave} ${x + w * .25},${y + h - wave * 2} ${x},${y + h - wave} Z`;
-	},
-	flowChartCard: (x, y, w, h) => {
-		const cut = h * .3;
-		return `M${x + cut},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} L${x},${y + cut} Z`;
-	},
-	flowChartPunchedCard: (x, y, w, h) => {
-		const cut = h * .2;
-		return `M${x + cut},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} L${x},${y + cut} Z`;
-	},
-	flowChartOnlineStorage: (x, y, w, h) => {
-		const cap = w * .12;
-		return `M${x + cap},${y} L${x + w},${y} L${x + w},${y + h} L${x + cap},${y + h} A${cap},${h / 2} 0 0 1 ${x + cap},${y} Z`;
-	},
-	flowChartMagneticDisk: (x, y, w, h) => {
-		const er = h * .12;
-		return `M${x},${y + er} A${w / 2},${er} 0 0 1 ${x + w},${y + er} L${x + w},${y + h - er} A${w / 2},${er} 0 0 1 ${x},${y + h - er} Z M${x},${y + er} A${w / 2},${er} 0 0 0 ${x + w},${y + er}`;
-	},
-	flowChartMagneticDrum: (x, y, w, h) => {
-		const er = w * .12;
-		return `M${x + er},${y} L${x + w - er},${y} A${er},${h / 2} 0 0 1 ${x + w - er},${y + h} L${x + er},${y + h} A${er},${h / 2} 0 0 1 ${x + er},${y} Z M${x + w - er},${y} A${er},${h / 2} 0 0 0 ${x + w - er},${y + h}`;
-	},
-	flowChartMagneticTape: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r * .7},${cy + r * .7} L${x + w},${y + h} L${cx + r},${cy} Z`;
-	},
-	flowChartSummingJunction: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		const off = r * Math.SQRT1_2;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r},${cy} A${r},${r} 0 1 0 ${cx + r},${cy} Z M${cx - off},${cy - off} L${cx + off},${cy + off} M${cx - off},${cy + off} L${cx + off},${cy - off}`;
-	},
-	flowChartOr: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r},${cy} A${r},${r} 0 1 0 ${cx + r},${cy} Z M${cx - r},${cy} L${cx + r},${cy} M${cx},${cy - r} L${cx},${cy + r}`;
-	},
-	flowChartCollate: (x, y, w, h) => {
-		return `M${x},${y} L${x + w},${y} L${x},${y + h} L${x + w},${y + h} Z`;
-	},
-	flowChartSort: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${cx},${y} L${x + w},${cy} L${cx},${y + h} L${x},${cy} Z M${x},${cy} L${x + w},${cy}`;
-	},
-	flowChartExtract: (x, y, w, h) => {
-		return `M${x + w / 2},${y} L${x + w},${y + h} L${x},${y + h} Z`;
-	},
-	flowChartMerge: (x, y, w, h) => {
-		return `M${x},${y} L${x + w},${y} L${x + w / 2},${y + h} Z`;
-	},
-	flowChartOfflineStorage: (x, y, w, h) => {
-		return `M${x + w / 2},${y} L${x + w},${y + h} L${x},${y + h} Z M${x + w * .25},${y + h * .75} L${x + w * .75},${y + h * .75}`;
-	},
-	flowChartDelay: (x, y, w, h) => {
-		const r = h / 2;
-		return `M${x},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w - r},${y + h} L${x},${y + h} Z`;
-	},
-	flowChartDisplay: (x, y, w, h) => {
-		const r = h / 2;
-		return `M${x + r * .5},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w - r},${y + h} L${x + r * .5},${y + h} L${x},${y + h / 2} Z`;
-	},
-	flowChartPreparation: (x, y, w, h) => {
-		const cut = w * .18;
-		return `M${x + cut},${y} L${x + w - cut},${y} L${x + w},${y + h / 2} L${x + w - cut},${y + h} L${x + cut},${y + h} L${x},${y + h / 2} Z`;
-	},
-	notchedRightArrow: (x, y, w, h) => {
-		return `M${x},${y + h * .3} L${x + w * .65},${y + h * .3} L${x + w * .65},${y} L${x + w},${y + h / 2} L${x + w * .65},${y + h} L${x + w * .65},${y + h * .7} L${x},${y + h * .7} L${x + w * .15},${y + h / 2} Z`;
-	},
-	stripedRightArrow: (x, y, w, h) => {
-		const stripe = w * .04;
-		return `M${x},${y + h * .3} L${x + stripe},${y + h * .3} L${x + stripe},${y + h * .7} L${x},${y + h * .7} Z M${x + stripe * 2.5},${y + h * .3} L${x + stripe * 3.5},${y + h * .3} L${x + stripe * 3.5},${y + h * .7} L${x + stripe * 2.5},${y + h * .7} Z M${x + stripe * 5},${y + h * .3} L${x + w * .65},${y + h * .3} L${x + w * .65},${y} L${x + w},${y + h / 2} L${x + w * .65},${y + h} L${x + w * .65},${y + h * .7} L${x + stripe * 5},${y + h * .7} Z`;
-	},
-	curvedRightArrow: (x, y, w, h) => {
-		return `M${x},${y + h * .6} Q${x + w * .5},${y} ${x + w * .85},${y + h * .25} L${x + w},${y + h * .45} L${x + w * .85},${y + h * .55} L${x + w * .7},${y + h * .35} Q${x + w * .45},${y + h * .18} ${x + w * .15},${y + h * .75} Z`;
-	},
-	uturnArrow: (x, y, w, h) => {
-		return `M${x},${y + h} L${x},${y + h / 2} A${w * .4},${h * .4} 0 0 1 ${x + w * .8},${y + h / 2} L${x + w * .8},${y + h * .25} L${x + w},${y + h * .45} L${x + w * .8},${y + h * .65} L${x + w * .8},${y + h / 2} A${w * .2},${h * .25} 0 0 0 ${x + w * .2},${y + h / 2} L${x + w * .2},${y + h} Z`;
-	},
-	leftBracket: (x, y, w, h) => {
-		return `M${x + w},${y} L${x},${y} L${x},${y + h} L${x + w},${y + h}`;
-	},
-	rightBracket: (x, y, w, h) => {
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h}`;
-	},
-	bracketPair: (x, y, w, h) => {
-		return `M${x + w * .1},${y} L${x},${y} L${x},${y + h} L${x + w * .1},${y + h} M${x + w * .9},${y} L${x + w},${y} L${x + w},${y + h} L${x + w * .9},${y + h}`;
-	},
-	leftBrace: (x, y, w, h) => {
-		const mid = y + h / 2;
-		return `M${x + w},${y} Q${x},${y} ${x},${mid - 8} Q${x},${mid} ${x - 4},${mid} Q${x},${mid} ${x},${mid + 8} Q${x},${y + h} ${x + w},${y + h}`;
-	},
-	rightBrace: (x, y, w, h) => {
-		const mid = y + h / 2;
-		return `M${x},${y} Q${x + w},${y} ${x + w},${mid - 8} Q${x + w},${mid} ${x + w + 4},${mid} Q${x + w},${mid} ${x + w},${mid + 8} Q${x + w},${y + h} ${x},${y + h}`;
-	},
-	bracePair: (x, y, w, h) => {
-		const mid = y + h / 2;
-		return `M${x + w * .12},${y} Q${x},${y} ${x},${mid - 8} Q${x},${mid} ${x - 4},${mid} Q${x},${mid} ${x},${mid + 8} Q${x},${y + h} ${x + w * .12},${y + h} M${x + w * .88},${y} Q${x + w},${y} ${x + w},${mid - 8} Q${x + w},${mid} ${x + w + 4},${mid} Q${x + w},${mid} ${x + w},${mid + 8} Q${x + w},${y + h} ${x + w * .88},${y + h}`;
-	},
-	snip1Rect: (x, y, w, h) => {
-		const c = Math.min(w, h) * .18;
-		return `M${x},${y} L${x + w - c},${y} L${x + w},${y + c} L${x + w},${y + h} L${x},${y + h} Z`;
-	},
-	snip2SameRect: (x, y, w, h) => {
-		const c = Math.min(w, h) * .18;
-		return `M${x + c},${y} L${x + w - c},${y} L${x + w},${y + c} L${x + w},${y + h} L${x},${y + h} L${x},${y + c} Z`;
-	},
-	snip2DiagRect: (x, y, w, h) => {
-		const c = Math.min(w, h) * .18;
-		return `M${x},${y} L${x + w - c},${y} L${x + w},${y + c} L${x + w},${y + h} L${x + c},${y + h} L${x},${y + h - c} Z`;
-	},
-	snipRoundRect: (x, y, w, h) => {
-		const c = Math.min(w, h) * .18;
-		return `M${x + c},${y} A${c},${c} 0 0 0 ${x},${y + c} L${x},${y + h} L${x + w},${y + h} L${x + w},${y + c} L${x + w - c},${y} Z`;
-	},
-	round1Rect: (x, y, w, h) => {
-		const r = Math.min(w, h) * .18;
-		return `M${x},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${y + h} L${x},${y + h} Z`;
-	},
-	round2SameRect: (x, y, w, h) => {
-		const r = Math.min(w, h) * .18;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${y + h} L${x},${y + h} L${x},${y + r} A${r},${r} 0 0 1 ${x + r},${y} Z`;
-	},
-	round2DiagRect: (x, y, w, h) => {
-		const r = Math.min(w, h) * .18;
-		return `M${x},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${y + h} L${x + r},${y + h} A${r},${r} 0 0 1 ${x},${y + h - r} Z`;
-	},
-	ribbon: (x, y, w, h) => {
-		const notch = w * .06;
-		const bodyTop = y + h * .2;
-		const bodyBot = y + h * .8;
-		return `M${x},${bodyTop} L${x + notch * 2},${y} L${x + w - notch * 2},${y} L${x + w},${bodyTop} L${x + w * .85},${bodyTop + (bodyBot - bodyTop) / 2} L${x + w},${bodyBot} L${x + w - notch * 2},${y + h} L${x + w - notch * 4},${bodyBot} L${x + notch * 4},${bodyBot} L${x + notch * 2},${y + h} L${x},${bodyBot} L${x + w * .15},${bodyTop + (bodyBot - bodyTop) / 2} Z`;
-	},
-	ribbon2: (x, y, w, h) => {
-		const notch = w * .06;
-		const bodyTop = y + h * .2;
-		const bodyBot = y + h * .8;
-		return `M${x},${bodyBot} L${x + notch * 2},${y + h} L${x + w - notch * 2},${y + h} L${x + w},${bodyBot} L${x + w * .85},${bodyTop + (bodyBot - bodyTop) / 2} L${x + w},${bodyTop} L${x + w - notch * 2},${y} L${x + w - notch * 4},${bodyTop} L${x + notch * 4},${bodyTop} L${x + notch * 2},${y} L${x},${bodyTop} L${x + w * .15},${bodyTop + (bodyBot - bodyTop) / 2} Z`;
-	},
-	verticalScroll: (x, y, w, h) => {
-		const r = w * .08;
-		return `M${x + r},${y + r} A${r},${r} 0 0 1 ${x + r * 2},${y} L${x + w},${y} L${x + w},${y + h - r} A${r},${r} 0 0 1 ${x + w - r * 2},${y + h} L${x},${y + h} L${x},${y + r} A${r},${r} 0 0 1 ${x + r},${y + r} Z`;
-	},
-	horizontalScroll: (x, y, w, h) => {
-		const r = h * .08;
-		return `M${x + r},${y + r} A${r},${r} 0 0 1 ${x},${y + r * 2} L${x},${y + h} L${x + w - r},${y + h} A${r},${r} 0 0 1 ${x + w},${y + h - r * 2} L${x + w},${y} L${x + r},${y} A${r},${r} 0 0 1 ${x + r},${y + r} Z`;
-	},
-	wave: (x, y, w, h) => {
-		return `M${x},${y + h * .5} C${x + w * .25},${y - h * .1} ${x + w * .5},${y + h * .85} ${x + w * .75},${y + h * .3} C${x + w * .85},${y + h * .05} ${x + w * .95},${y + h * .4} ${x + w},${y + h * .5} L${x + w},${y + h} C${x + w * .75},${y + h * .4} ${x + w * .5},${y + h * 1.1} ${x + w * .25},${y + h * .55} C${x + w * .15},${y + h * .3} ${x + w * .05},${y + h * .6} ${x},${y + h * .55} Z`;
-	},
-	doubleWave: (x, y, w, h) => {
-		return `M${x},${y + h * .4} C${x + w * .15},${y - h * .05} ${x + w * .35},${y + h * .65} ${x + w * .5},${y + h * .3} C${x + w * .65},${y - h * .05} ${x + w * .85},${y + h * .65} ${x + w},${y + h * .4} L${x + w},${y + h} C${x + w * .85},${y + h * .4} ${x + w * .65},${y + h * 1.05} ${x + w * .5},${y + h * .7} C${x + w * .35},${y + h * 1.05} ${x + w * .15},${y + h * .4} ${x},${y + h} Z`;
-	},
-	mathPlus: (x, y, w, h) => {
-		const t = Math.min(w, h) * .2;
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${cx - t / 2},${y} L${cx + t / 2},${y} L${cx + t / 2},${cy - t / 2} L${x + w},${cy - t / 2} L${x + w},${cy + t / 2} L${cx + t / 2},${cy + t / 2} L${cx + t / 2},${y + h} L${cx - t / 2},${y + h} L${cx - t / 2},${cy + t / 2} L${x},${cy + t / 2} L${x},${cy - t / 2} L${cx - t / 2},${cy - t / 2} Z`;
-	},
-	mathMinus: (x, y, w, h) => {
-		const t = h * .3;
-		const cy = y + h / 2;
-		return `M${x},${cy - t / 2} L${x + w},${cy - t / 2} L${x + w},${cy + t / 2} L${x},${cy + t / 2} Z`;
-	},
-	mathMultiply: (x, y, w, h) => {
-		const t = Math.min(w, h) * .16;
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${x},${y + t} L${x + t},${y} L${cx},${cy - t} L${x + w - t},${y} L${x + w},${y + t} L${cx + t},${cy} L${x + w},${y + h - t} L${x + w - t},${y + h} L${cx},${cy + t} L${x + t},${y + h} L${x},${y + h - t} L${cx - t},${cy} Z`;
-	},
-	mathDivide: (x, y, w, h) => {
-		const dot = Math.min(w, h) * .1;
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${x},${cy - dot * .4} L${x + w},${cy - dot * .4} L${x + w},${cy + dot * .4} L${x},${cy + dot * .4} Z M${cx - dot},${y + h * .18} A${dot},${dot} 0 1 0 ${cx + dot},${y + h * .18} A${dot},${dot} 0 1 0 ${cx - dot},${y + h * .18} Z M${cx - dot},${y + h * .82} A${dot},${dot} 0 1 0 ${cx + dot},${y + h * .82} A${dot},${dot} 0 1 0 ${cx - dot},${y + h * .82} Z`;
-	},
-	mathEqual: (x, y, w, h) => {
-		const t = h * .2;
-		return `M${x},${y + h * .3 - t / 2} L${x + w},${y + h * .3 - t / 2} L${x + w},${y + h * .3 + t / 2} L${x},${y + h * .3 + t / 2} Z M${x},${y + h * .7 - t / 2} L${x + w},${y + h * .7 - t / 2} L${x + w},${y + h * .7 + t / 2} L${x},${y + h * .7 + t / 2} Z`;
-	},
-	mathNotEqual: (x, y, w, h) => {
-		const t = h * .15;
-		const cy = y + h / 2;
-		return `M${x},${cy - h * .18 - t / 2} L${x + w},${cy - h * .18 - t / 2} L${x + w},${cy - h * .18 + t / 2} L${x},${cy - h * .18 + t / 2} Z M${x},${cy + h * .18 - t / 2} L${x + w},${cy + h * .18 - t / 2} L${x + w},${cy + h * .18 + t / 2} L${x},${cy + h * .18 + t / 2} Z M${x + w * .7},${y} L${x + w * .85},${y} L${x + w * .3},${y + h} L${x + w * .15},${y + h} Z`;
-	},
-	actionButtonBlank: (x, y, w, h) => {
-		const r = Math.min(w, h) * .06;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 1 ${x + w},${y + r} L${x + w},${y + h - r} A${r},${r} 0 0 1 ${x + w - r},${y + h} L${x + r},${y + h} A${r},${r} 0 0 1 ${x},${y + h - r} L${x},${y + r} A${r},${r} 0 0 1 ${x + r},${y} Z`;
-	},
-	irregularSeal1: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		const offsets = [
-			1,
-			.45,
-			.95,
-			.5,
-			1,
-			.4,
-			.9,
-			.55,
-			1,
-			.45,
-			.95,
-			.5,
-			1,
-			.4,
-			.9,
-			.55
-		];
-		const points = [];
-		for (let i = 0; i < offsets.length; i++) {
-			const a = i / offsets.length * 2 * Math.PI - Math.PI / 2;
-			const r = offsets[i] ?? 1;
-			const px0 = cx + rx * r * Math.cos(a);
-			const py0 = cy + ry * r * Math.sin(a);
-			points.push(`${i === 0 ? "M" : "L"}${px0},${py0}`);
-		}
-		points.push("Z");
-		return points.join(" ");
-	},
-	irregularSeal2: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		const offsets = [
-			1,
-			.4,
-			.95,
-			.5,
-			.9,
-			.35,
-			.85,
-			.45,
-			1,
-			.4,
-			.95,
-			.5,
-			.9,
-			.35,
-			.85,
-			.45,
-			1,
-			.4,
-			.95,
-			.5,
-			.9,
-			.35,
-			.85,
-			.45
-		];
-		const points = [];
-		for (let i = 0; i < offsets.length; i++) {
-			const a = i / offsets.length * 2 * Math.PI - Math.PI / 2;
-			const r = offsets[i] ?? 1;
-			const px0 = cx + rx * r * Math.cos(a);
-			const py0 = cy + ry * r * Math.sin(a);
-			points.push(`${i === 0 ? "M" : "L"}${px0},${py0}`);
-		}
-		points.push("Z");
-		return points.join(" ");
-	},
-	cloud: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2 * .92;
-		const ry = h / 2 * .85;
-		const lobes = 10;
-		const path = [];
-		for (let i = 0; i < lobes; i++) {
-			const a = i / lobes * 2 * Math.PI - Math.PI / 2;
-			const lobeRx = rx * .32;
-			const lobeRy = ry * .32;
-			const px0 = cx + rx * Math.cos(a);
-			const py0 = cy + ry * Math.sin(a);
-			if (i === 0) path.push(`M${px0 - lobeRx},${py0}`);
-			path.push(`A${lobeRx},${lobeRy} 0 1 1 ${px0 + lobeRx},${py0}`);
-			const nextA = (i + 1) / lobes * 2 * Math.PI - Math.PI / 2;
-			const nextX = cx + rx * Math.cos(nextA) - lobeRx;
-			const nextY = cy + ry * Math.sin(nextA);
-			path.push(`L${nextX},${nextY}`);
-		}
-		path.push("Z");
-		return path.join(" ");
-	},
-	pie: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		return `M${cx},${cy} L${cx + r},${cy} A${r},${r} 0 1 1 ${cx},${cy - r} Z`;
-	},
-	chord: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		return `M${cx + rx},${cy} A${rx},${ry} 0 1 1 ${cx - rx},${cy} L${cx + rx},${cy} Z`;
-	},
-	teardrop: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		return `M${cx},${y} L${x + w},${y} L${x + w},${cy} A${rx},${ry} 0 1 1 ${cx - rx},${cy} A${rx},${ry} 0 0 1 ${cx},${y} Z`;
-	},
-	arc: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		return `M${cx + rx},${cy} A${rx},${ry} 0 1 1 ${cx},${cy + ry}`;
-	},
-	blockArc: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const outerR = Math.min(w, h) / 2;
-		const innerR = outerR * .6;
-		return `M${cx + outerR},${cy} A${outerR},${outerR} 0 1 1 ${cx},${cy - outerR} L${cx},${cy - innerR} A${innerR},${innerR} 0 1 0 ${cx + innerR},${cy} Z`;
-	},
-	moon: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const rx = w / 2;
-		const ry = h / 2;
-		const innerRx = rx * .78;
-		const offsetX = rx * .32;
-		return `M${cx + rx},${cy} A${rx},${ry} 0 1 1 ${cx - rx},${cy} A${rx},${ry} 0 1 1 ${cx + rx},${cy} M${cx - rx + offsetX + innerRx},${cy} A${innerRx},${ry * .95} 0 1 1 ${cx - rx + offsetX - innerRx},${cy} A${innerRx},${ry * .95} 0 1 1 ${cx - rx + offsetX + innerRx},${cy}`;
-	},
-	plus: (x, y, w, h) => {
-		const t = Math.min(w, h) * .3;
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		return `M${cx - t / 2},${y} L${cx + t / 2},${y} L${cx + t / 2},${cy - t / 2} L${x + w},${cy - t / 2} L${x + w},${cy + t / 2} L${cx + t / 2},${cy + t / 2} L${cx + t / 2},${y + h} L${cx - t / 2},${y + h} L${cx - t / 2},${cy + t / 2} L${x},${cy + t / 2} L${x},${cy - t / 2} L${cx - t / 2},${cy - t / 2} Z`;
-	},
-	plaque: (x, y, w, h) => {
-		const r = Math.min(w, h) * .18;
-		return `M${x + r},${y} L${x + w - r},${y} A${r},${r} 0 0 0 ${x + w},${y + r} L${x + w},${y + h - r} A${r},${r} 0 0 0 ${x + w - r},${y + h} L${x + r},${y + h} A${r},${r} 0 0 0 ${x},${y + h - r} L${x},${y + r} A${r},${r} 0 0 0 ${x + r},${y} Z`;
-	},
-	can: (x, y, w, h) => {
-		const er = h * .12;
-		return `M${x},${y + er} A${w / 2},${er} 0 0 1 ${x + w},${y + er} L${x + w},${y + h - er} A${w / 2},${er} 0 0 1 ${x},${y + h - er} Z M${x},${y + er} A${w / 2},${er} 0 0 0 ${x + w},${y + er}`;
-	},
-	cube: (x, y, w, h) => {
-		const d = Math.min(w, h) * .2;
-		return `M${x},${y + d} L${x + d},${y} L${x + w},${y} L${x + w},${y + h - d} L${x + w - d},${y + h} L${x},${y + h} Z M${x},${y + d} L${x + w - d},${y + d} L${x + w},${y} M${x + w - d},${y + d} L${x + w - d},${y + h}`;
-	},
-	bevel: (x, y, w, h) => {
-		const d = Math.min(w, h) * .12;
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z M${x + d},${y + d} L${x + w - d},${y + d} L${x + w - d},${y + h - d} L${x + d},${y + h - d} Z M${x},${y} L${x + d},${y + d} M${x + w},${y} L${x + w - d},${y + d} M${x},${y + h} L${x + d},${y + h - d} M${x + w},${y + h} L${x + w - d},${y + h - d}`;
-	},
-	donut: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		const innerR = r * .65;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r},${cy} A${r},${r} 0 1 0 ${cx + r},${cy} Z M${cx + innerR},${cy} A${innerR},${innerR} 0 1 1 ${cx - innerR},${cy} A${innerR},${innerR} 0 1 1 ${cx + innerR},${cy} Z`;
-	},
-	noSmoking: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const r = Math.min(w, h) / 2;
-		const innerR = r * .78;
-		const t = r * .12;
-		return `M${cx + r},${cy} A${r},${r} 0 1 0 ${cx - r},${cy} A${r},${r} 0 1 0 ${cx + r},${cy} Z M${cx + innerR},${cy} A${innerR},${innerR} 0 1 1 ${cx - innerR},${cy} A${innerR},${innerR} 0 1 1 ${cx + innerR},${cy} Z M${cx - r * .71 - t},${cy - r * .71 + t} L${cx - r * .71 + t},${cy - r * .71 - t} L${cx + r * .71 + t},${cy + r * .71 - t} L${cx + r * .71 - t},${cy + r * .71 + t} Z`;
-	},
-	frame: (x, y, w, h) => {
-		const f = Math.min(w, h) * .1;
-		return `M${x},${y} L${x + w},${y} L${x + w},${y + h} L${x},${y + h} Z M${x + f},${y + f} L${x + f},${y + h - f} L${x + w - f},${y + h - f} L${x + w - f},${y + f} Z`;
-	},
-	halfFrame: (x, y, w, h) => {
-		const f = Math.min(w, h) * .15;
-		return `M${x},${y} L${x + w},${y} L${x + w - f},${y + f} L${x + f},${y + f} L${x + f},${y + h - f} L${x},${y + h} Z`;
-	},
-	corner: (x, y, w, h) => {
-		const tx = w * .4;
-		const ty = h * .4;
-		return `M${x},${y} L${x + tx},${y} L${x + tx},${y + h - ty} L${x + w},${y + h - ty} L${x + w},${y + h} L${x},${y + h} Z`;
-	},
-	diagStripe: (x, y, w, h) => {
-		return `M${x},${y} L${x + w * .6},${y} L${x},${y + h * .6} Z`;
-	},
-	ellipseRibbon: (x, y, w, h) => {
-		const notch = w * .08;
-		const bodyTop = y + h * .2;
-		const bodyBot = y + h * .85;
-		const arcDip = h * .15;
-		return `M${x},${bodyTop} C${x + w * .3},${bodyTop - arcDip} ${x + w * .7},${bodyTop - arcDip} ${x + w},${bodyTop} L${x + w * .85},${bodyTop + (bodyBot - bodyTop) / 2} L${x + w},${bodyBot} L${x + w - notch * 2},${y + h} L${x + w - notch * 4},${bodyBot} C${x + w * .7},${bodyBot + arcDip * .4} ${x + w * .3},${bodyBot + arcDip * .4} L${x + notch * 4},${bodyBot} L${x + notch * 2},${y + h} L${x},${bodyBot} L${x + w * .15},${bodyTop + (bodyBot - bodyTop) / 2} Z`;
-	},
-	ellipseRibbon2: (x, y, w, h) => {
-		const notch = w * .08;
-		const bodyTop = y + h * .15;
-		const bodyBot = y + h * .8;
-		const arcRise = h * .15;
-		return `M${x},${bodyBot} C${x + w * .3},${bodyBot + arcRise} ${x + w * .7},${bodyBot + arcRise} ${x + w},${bodyBot} L${x + w * .85},${bodyTop + (bodyBot - bodyTop) / 2} L${x + w},${bodyTop} L${x + w - notch * 2},${y} L${x + w - notch * 4},${bodyTop} C${x + w * .7},${bodyTop - arcRise * .4} ${x + w * .3},${bodyTop - arcRise * .4} L${x + notch * 4},${bodyTop} L${x + notch * 2},${y} L${x},${bodyTop} L${x + w * .15},${bodyTop + (bodyBot - bodyTop) / 2} Z`;
-	},
-	quadArrow: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const tip = .2;
-		const stem = .15;
-		const headW = .35;
-		return `M${cx},${y} L${cx + headW * w},${y + tip * h} L${cx + stem * w},${y + tip * h} L${cx + stem * w},${cy - stem * h} L${x + w - tip * w},${cy - stem * h} L${x + w - tip * w},${cy - headW * h} L${x + w},${cy} L${x + w - tip * w},${cy + headW * h} L${x + w - tip * w},${cy + stem * h} L${cx + stem * w},${cy + stem * h} L${cx + stem * w},${y + h - tip * h} L${cx + headW * w},${y + h - tip * h} L${cx},${y + h} L${cx - headW * w},${y + h - tip * h} L${cx - stem * w},${y + h - tip * h} L${cx - stem * w},${cy + stem * h} L${x + tip * w},${cy + stem * h} L${x + tip * w},${cy + headW * h} L${x},${cy} L${x + tip * w},${cy - headW * h} L${x + tip * w},${cy - stem * h} L${cx - stem * w},${cy - stem * h} L${cx - stem * w},${y + tip * h} L${cx - headW * w},${y + tip * h} Z`;
-	},
-	leftRightUpArrow: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const tip = .2;
-		const stem = .15;
-		const headW = .35;
-		return `M${cx},${y} L${cx + headW * w},${y + tip * h} L${cx + stem * w},${y + tip * h} L${cx + stem * w},${y + h - tip * h} L${x + w - tip * w},${y + h - tip * h} L${x + w - tip * w},${y + h - headW * h} L${x + w},${y + h} L${x + w - tip * w},${y + h + headW * h} L${x + w - tip * w},${y + h - tip * h} L${cx - stem * w},${y + h - tip * h} L${cx - stem * w},${y + tip * h} L${cx - headW * w},${y + tip * h} Z`;
-	},
-	bentUpArrow: (x, y, w, h) => {
-		const stem = .3;
-		const tip = .25;
-		return `M${x},${y + h * .55} L${x + w * .5},${y + h * .55} L${x + w * .5},${y + tip * h} L${x + w * (.5 - stem * .5)},${y + tip * h} L${x + w * .75},${y} L${x + w},${y + tip * h} L${x + w * .65},${y + tip * h} L${x + w * .65},${y + h * .55 + h * .4} L${x},${y + h * .55 + h * .4} Z`;
-	},
-	curvedLeftArrow: (x, y, w, h) => {
-		return `M${x + w},${y + h * .6} Q${x + w * .5},${y} ${x + w * .15},${y + h * .25} L${x},${y + h * .45} L${x + w * .15},${y + h * .55} L${x + w * .3},${y + h * .35} Q${x + w * .55},${y + h * .18} ${x + w * .85},${y + h * .75} Z`;
-	},
-	curvedUpArrow: (x, y, w, h) => {
-		return `M${x + w * .4},${y + h} Q${x},${y + h * .5} ${x + w * .25},${y + h * .15} L${x + w * .45},${y} L${x + w * .55},${y + h * .15} L${x + w * .35},${y + h * .3} Q${x + w * .18},${y + h * .55} ${x + w * .75},${y + h * .85} Z`;
-	},
-	curvedDownArrow: (x, y, w, h) => {
-		return `M${x + w * .4},${y} Q${x},${y + h * .5} ${x + w * .25},${y + h * .85} L${x + w * .45},${y + h} L${x + w * .55},${y + h * .85} L${x + w * .35},${y + h * .7} Q${x + w * .18},${y + h * .45} ${x + w * .75},${y + h * .15} Z`;
-	},
-	swooshArrow: (x, y, w, h) => {
-		return `M${x},${y + h * .75} C${x + w * .35},${y + h} ${x + w * .65},${y + h * .3} ${x + w * .75},${y + h * .2} L${x + w * .65},${y + h * .05} L${x + w},${y + h * .18} L${x + w * .78},${y + h * .45} L${x + w * .7},${y + h * .3} C${x + w * .55},${y + h * .6} ${x + w * .35},${y + h * .9} ${x},${y + h * .85} Z`;
-	},
-	circularArrow: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const outerR = Math.min(w, h) / 2;
-		const innerR = outerR * .62;
-		const midR = (outerR + innerR) / 2;
-		return `M${cx},${cy - outerR} A${outerR},${outerR} 0 1 1 ${cx - outerR},${cy} L${cx - midR - midR * .25},${cy + outerR * .15} L${cx - midR + midR * .25},${cy + outerR * .3} L${cx - innerR},${cy} A${innerR},${innerR} 0 1 0 ${cx},${cy - innerR} Z`;
-	},
-	leftCircularArrow: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const outerR = Math.min(w, h) / 2;
-		const innerR = outerR * .62;
-		return `M${cx},${cy - outerR} A${outerR},${outerR} 0 1 0 ${cx + outerR},${cy} L${cx + (outerR + innerR) / 2 + (outerR + innerR) / 2 * .25},${cy + outerR * .15} L${cx + (outerR + innerR) / 2 - (outerR + innerR) / 2 * .25},${cy + outerR * .3} L${cx + innerR},${cy} A${innerR},${innerR} 0 1 1 ${cx},${cy - innerR} Z`;
-	},
-	leftRightCircularArrow: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const outerR = Math.min(w, h) / 2;
-		const innerR = outerR * .62;
-		return `M${cx - outerR * .15},${cy - outerR * 1.05} L${cx + outerR * .15},${cy - outerR * 1.05} L${cx + outerR * .1},${cy - outerR * .85} A${outerR},${outerR} 0 1 1 ${cx - outerR * .1},${cy - outerR * .85} Z M${cx},${cy - innerR} A${innerR},${innerR} 0 1 0 ${cx},${cy + innerR}`;
-	},
-	rightArrowCallout: (x, y, w, h) => {
-		const headW = w * .25;
-		return `M${x},${y + h * .3} L${x + w - headW},${y + h * .3} L${x + w - headW},${y} L${x + w},${y + h / 2} L${x + w - headW},${y + h} L${x + w - headW},${y + h * .7} L${x},${y + h * .7} Z`;
-	},
-	leftArrowCallout: (x, y, w, h) => {
-		const headW = w * .25;
-		return `M${x + headW},${y + h * .3} L${x + w},${y + h * .3} L${x + w},${y + h * .7} L${x + headW},${y + h * .7} L${x + headW},${y + h} L${x},${y + h / 2} L${x + headW},${y} Z`;
-	},
-	upArrowCallout: (x, y, w, h) => {
-		const headH = h * .25;
-		return `M${x + w * .3},${y + headH} L${x + w * .3},${y + h} L${x + w * .7},${y + h} L${x + w * .7},${y + headH} L${x + w},${y + headH} L${x + w / 2},${y} L${x},${y + headH} Z`;
-	},
-	downArrowCallout: (x, y, w, h) => {
-		const headH = h * .25;
-		return `M${x + w * .3},${y} L${x + w * .7},${y} L${x + w * .7},${y + h - headH} L${x + w},${y + h - headH} L${x + w / 2},${y + h} L${x},${y + h - headH} L${x + w * .3},${y + h - headH} Z`;
-	},
-	leftRightArrowCallout: (x, y, w, h) => {
-		const headW = w * .2;
-		return `M${x},${y + h / 2} L${x + headW},${y} L${x + headW},${y + h * .3} L${x + w - headW},${y + h * .3} L${x + w - headW},${y} L${x + w},${y + h / 2} L${x + w - headW},${y + h} L${x + w - headW},${y + h * .7} L${x + headW},${y + h * .7} L${x + headW},${y + h} Z`;
-	},
-	upDownArrowCallout: (x, y, w, h) => {
-		const headH = h * .2;
-		return `M${x + w / 2},${y} L${x},${y + headH} L${x + w * .3},${y + headH} L${x + w * .3},${y + h - headH} L${x},${y + h - headH} L${x + w / 2},${y + h} L${x + w},${y + h - headH} L${x + w * .7},${y + h - headH} L${x + w * .7},${y + headH} L${x + w},${y + headH} Z`;
-	},
-	quadArrowCallout: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const tip = .16;
-		const stem = .18;
-		const headW = .32;
-		const txt = .28;
-		return `M${cx - txt * w},${cy - txt * h} L${cx - txt * w},${cy - stem * h} L${cx - stem * w},${cy - stem * h} L${cx - stem * w},${y + tip * h} L${cx - headW * w},${y + tip * h} L${cx},${y} L${cx + headW * w},${y + tip * h} L${cx + stem * w},${y + tip * h} L${cx + stem * w},${cy - stem * h} L${cx + txt * w},${cy - stem * h} L${cx + txt * w},${cy - txt * h} L${x + w - tip * w},${cy - txt * h} L${x + w - tip * w},${cy - headW * h} L${x + w},${cy} L${x + w - tip * w},${cy + headW * h} L${x + w - tip * w},${cy + txt * h} L${cx + txt * w},${cy + txt * h} L${cx + txt * w},${cy + stem * h} L${cx + stem * w},${cy + stem * h} L${cx + stem * w},${y + h - tip * h} L${cx + headW * w},${y + h - tip * h} L${cx},${y + h} L${cx - headW * w},${y + h - tip * h} L${cx - stem * w},${y + h - tip * h} L${cx - stem * w},${cy + stem * h} L${cx - txt * w},${cy + stem * h} L${cx - txt * w},${cy + txt * h} L${x + tip * w},${cy + txt * h} L${x + tip * w},${cy + headW * h} L${x},${cy} L${x + tip * w},${cy - headW * h} L${x + tip * w},${cy - txt * h} Z`;
-	},
-	actionButtonHome: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s},${cy + s * .6} L${cx - s},${cy - s * .1} L${cx},${cy - s * .7} L${cx + s},${cy - s * .1} L${cx + s},${cy + s * .6} L${cx + s * .3},${cy + s * .6} L${cx + s * .3},${cy + s * .1} L${cx - s * .3},${cy + s * .1} L${cx - s * .3},${cy + s * .6} Z`;
-	},
-	actionButtonForwardNext: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s * .7},${cy - s} L${cx + s * .7},${cy} L${cx - s * .7},${cy + s} Z`;
-	},
-	actionButtonBackPrevious: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx + s * .7},${cy - s} L${cx - s * .7},${cy} L${cx + s * .7},${cy + s} Z`;
-	},
-	actionButtonEnd: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s},${cy - s} L${cx + s * .4},${cy} L${cx - s},${cy + s} Z M${cx + s * .5},${cy - s} L${cx + s},${cy - s} L${cx + s},${cy + s} L${cx + s * .5},${cy + s} Z`;
-	},
-	actionButtonBeginning: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx + s},${cy - s} L${cx - s * .4},${cy} L${cx + s},${cy + s} Z M${cx - s * .5},${cy - s} L${cx - s},${cy - s} L${cx - s},${cy + s} L${cx - s * .5},${cy + s} Z`;
-	},
-	actionButtonReturn: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .28;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx + s},${cy - s} L${cx + s * .4},${cy - s} L${cx + s * .4},${cy + s * .2} L${cx - s * .2},${cy + s * .2} L${cx - s * .2},${cy - s * .2} L${cx - s},${cy + s * .2} L${cx - s * .2},${cy + s} L${cx - s * .2},${cy + s * .5} L${cx + s},${cy + s * .5} Z`;
-	},
-	actionButtonHelp: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s * .4},${cy - s * .4} Q${cx - s * .4},${cy - s} ${cx},${cy - s} Q${cx + s * .4},${cy - s} ${cx + s * .4},${cy - s * .4} Q${cx + s * .4},${cy} ${cx},${cy} L${cx},${cy + s * .4} M${cx - s * .18},${cy + s * .8} L${cx + s * .18},${cy + s * .8} L${cx + s * .18},${cy + s} L${cx - s * .18},${cy + s} Z`;
-	},
-	actionButtonInformation: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s * .2},${cy - s * .7} L${cx + s * .2},${cy - s * .7} L${cx + s * .2},${cy - s * .35} L${cx - s * .2},${cy - s * .35} Z M${cx - s * .2},${cy - s * .1} L${cx + s * .2},${cy - s * .1} L${cx + s * .2},${cy + s} L${cx - s * .2},${cy + s} Z`;
-	},
-	actionButtonDocument: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s * .6},${cy - s} L${cx + s * .3},${cy - s} L${cx + s * .6},${cy - s * .7} L${cx + s * .6},${cy + s} L${cx - s * .6},${cy + s} Z M${cx + s * .3},${cy - s} L${cx + s * .3},${cy - s * .7} L${cx + s * .6},${cy - s * .7}`;
-	},
-	actionButtonSound: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		return `${PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""} M${cx - s},${cy - s * .4} L${cx - s * .3},${cy - s * .4} L${cx + s * .3},${cy - s} L${cx + s * .3},${cy + s} L${cx - s * .3},${cy + s * .4} L${cx - s},${cy + s * .4} Z M${cx + s * .55},${cy - s * .4} Q${cx + s * .95},${cy} ${cx + s * .55},${cy + s * .4}`;
-	},
-	actionButtonMovie: (x, y, w, h) => {
-		const cx = x + w / 2;
-		const cy = y + h / 2;
-		const s = Math.min(w, h) * .3;
-		const out = [PRESET_PATHS.actionButtonBlank?.(x, y, w, h) ?? ""];
-		out.push(`M${cx - s},${cy - s * .6} L${cx + s},${cy - s * .6} L${cx + s},${cy + s * .6} L${cx - s},${cy + s * .6} Z`);
-		for (let i = 0; i < 4; i++) {
-			const px0 = cx - s + (i + .5) * (s * 2 / 4);
-			out.push(`M${px0 - s * .08},${cy - s * .45} L${px0 + s * .08},${cy - s * .45} L${px0 + s * .08},${cy - s * .3} L${px0 - s * .08},${cy - s * .3} Z`);
-			out.push(`M${px0 - s * .08},${cy + s * .3} L${px0 + s * .08},${cy + s * .3} L${px0 + s * .08},${cy + s * .45} L${px0 - s * .08},${cy + s * .45} Z`);
-		}
-		return out.join(" ");
-	},
-	borderCallout1: (x, y, w, h) => {
-		return `M${x},${y} L${x + w * .6},${y} L${x + w * .6},${y + h * .5} L${x},${y + h * .5} Z M${x + w * .6},${y + h * .5} L${x + w},${y + h}`;
-	},
-	borderCallout2: (x, y, w, h) => {
-		return `M${x},${y} L${x + w * .6},${y} L${x + w * .6},${y + h * .5} L${x},${y + h * .5} Z M${x + w * .6},${y + h * .5} L${x + w * .85},${y + h * .75} L${x + w},${y + h}`;
-	},
-	borderCallout3: (x, y, w, h) => {
-		return `M${x},${y} L${x + w * .6},${y} L${x + w * .6},${y + h * .5} L${x},${y + h * .5} Z M${x + w * .6},${y + h * .5} L${x + w * .75},${y + h * .65} L${x + w * .9},${y + h * .65} L${x + w},${y + h}`;
-	},
-	accentCallout1: (x, y, w, h) => {
-		return `M${x},${y} L${x + w * .6},${y} L${x + w * .6},${y + h * .5} L${x},${y + h * .5} Z M${x + w * .58},${y} L${x + w * .58},${y + h * .5} M${x + w * .6},${y + h * .5} L${x + w},${y + h}`;
-	},
-	accentBorderCallout1: (x, y, w, h) => {
-		return PRESET_PATHS.accentCallout1?.(x, y, w, h) ?? "";
-	},
-	callout1: (x, y, w, h) => {
-		return `M${x},${y + h * .5} L${x + w},${y + h}`;
-	},
-	callout2: (x, y, w, h) => {
-		return `M${x},${y + h * .5} L${x + w * .6},${y + h * .7} L${x + w},${y + h}`;
-	},
-	callout3: (x, y, w, h) => {
-		return `M${x},${y + h * .5} L${x + w * .4},${y + h * .55} L${x + w * .7},${y + h * .8} L${x + w},${y + h}`;
-	},
-	straightConnector1: (x, y, w, h) => `M${x},${y} L${x + w},${y + h}`,
-	bentConnector2: (x, y, w, h) => `M${x},${y} L${x + w},${y} L${x + w},${y + h}`,
-	bentConnector3: (x, y, w, h) => `M${x},${y} L${x + w / 2},${y} L${x + w / 2},${y + h} L${x + w},${y + h}`,
-	bentConnector4: (x, y, w, h) => `M${x},${y} L${x + w * .33},${y} L${x + w * .33},${y + h * .5} L${x + w * .66},${y + h * .5} L${x + w * .66},${y + h} L${x + w},${y + h}`,
-	bentConnector5: (x, y, w, h) => `M${x},${y} L${x + w * .25},${y} L${x + w * .25},${y + h * .5} L${x + w * .75},${y + h * .5} L${x + w * .75},${y + h} L${x + w},${y + h}`,
-	curvedConnector2: (x, y, w, h) => `M${x},${y} Q${x + w},${y} ${x + w},${y + h}`,
-	curvedConnector3: (x, y, w, h) => `M${x},${y} C${x + w * .5},${y} ${x + w * .5},${y + h} ${x + w},${y + h}`,
-	curvedConnector4: (x, y, w, h) => `M${x},${y} C${x + w * .33},${y} ${x + w * .33},${y + h * .5} ${x + w * .5},${y + h * .5} C${x + w * .66},${y + h * .5} ${x + w * .66},${y + h} ${x + w},${y + h}`,
-	curvedConnector5: (x, y, w, h) => `M${x},${y} C${x + w * .25},${y} ${x + w * .25},${y + h * .25} ${x + w * .5},${y + h * .5} C${x + w * .75},${y + h * .75} ${x + w * .75},${y + h} ${x + w},${y + h}`
-};
 const ALIGNMENT_TO_CSS = {
 	left: "left",
 	center: "center",
@@ -3032,7 +2426,7 @@ const cssColorWithOpacity = (hex, opacity) => {
 };
 const renderRun = (text, format, theme, effectivePt, defaultColor, _wasDefault = false, suppressLineHeight = false, lineHeightOverride = void 0) => {
 	if (text === "") return "";
-	if (format?.textFill) {
+	if (format?.textFill || format?.outline?.fill) {
 		const { textFill: _fill, outline: _outline, shadow: _shadow, glow: _glow, underline: _underline, strike: _strike, ...layout } = format;
 		return renderRun(text, {
 			...layout,
@@ -3092,6 +2486,10 @@ const renderRun = (text, format, theme, effectivePt, defaultColor, _wasDefault =
 const LINE_HEIGHT = 1.05;
 const AUTOFIT_FLOOR = .25;
 const AUTOFIT_STEP = .05;
+const decimalSeparatorField = (lang) => {
+	const separator = decimalSeparatorOf(lang);
+	return separator === "." ? {} : { decimalSeparator: separator };
+};
 const underlineStyleOf = (fmt) => {
 	const u = fmt?.underline;
 	if (u === void 0 || u === false || u === "none") return "none";
@@ -3121,7 +2519,7 @@ const strikeStyleOf = (fmt) => {
 	if (s === "dblStrike") return "double";
 	return s !== void 0 && s !== false && s !== "noStrike";
 };
-const hasPaintedTextFill = (run) => !!run.fmt?.textFill && !run.href;
+const hasPaintedTextFill = (run) => !!(run.fmt?.textFill || run.fmt?.outline?.fill) && !run.href;
 const alignOf = (a) => a === "center" || a === "right" || a === "justify" ? a : "left";
 const verticalLayoutOf = (vert) => {
 	switch (vert) {
@@ -3199,7 +2597,10 @@ const buildSvgTextInput = (a) => {
 				letterSpacingPx,
 				kerning,
 				fillHex,
-				...fmt?.textFill && !run.href ? { fillPaint: textFillPaint(fmt.textFill, a.theme) } : {},
+				...hasPaintedTextFill(run) ? { fillPaint: fmt?.textFill ? textFillPaint(fmt.textFill, a.theme, fillHex) : () => ({
+					defs: "",
+					fill: fillHex
+				}) } : {},
 				...fmt?.underlineColor !== void 0 && fmt.underlineColor !== null ? { underlineHex: resolveColor(fmt.underlineColor, a.theme, fillHex) } : {},
 				underline: underlineStyleOf(fmt),
 				strike: strikeStyleOf(fmt),
@@ -3208,6 +2609,21 @@ const buildSvgTextInput = (a) => {
 					outlineHex: resolveColor(fmt.outline.color, a.theme, "#000000"),
 					outlineWidthPx: (fmt.outline.widthEmu ?? 9525) / EMU_PER_PX
 				} : {},
+				...fmt?.outline?.fill && !run.href ? (() => {
+					const fill = fmt.outline.fill;
+					const first = fill.stops[0];
+					return {
+						outlineHex: first ? first.resolvedColor ?? resolveColor(first.color, a.theme, "#000000") : "#000000",
+						outlinePaint: (box) => {
+							const built = gradientDef(fill, a.theme, "", box);
+							return {
+								defs: built.defs,
+								fill: built.fillAttr
+							};
+						},
+						outlineWidthPx: (fmt.outline.widthEmu ?? 9525) / EMU_PER_PX
+					};
+				})() : {},
 				...fmt?.shadow ? { shadow: {
 					...fmt.shadow,
 					...fmt.shadow.color ? { color: resolveColor(fmt.shadow.color, a.theme, "#000000") } : {}
@@ -3222,8 +2638,10 @@ const buildSvgTextInput = (a) => {
 					...fmt.innerShadow,
 					...fmt.innerShadow.color ? { color: resolveColor(fmt.innerShadow.color, a.theme, "#000000") } : {}
 				} } : {},
+				...a.bevel ? { bevel: a.bevel } : {},
 				href: run.href ?? null,
-				...run.hrefTip !== void 0 ? { hrefTip: run.hrefTip } : {}
+				...run.hrefTip !== void 0 ? { hrefTip: run.hrefTip } : {},
+				...run.decimalSeparator !== void 0 ? { decimalSeparator: run.decimalSeparator } : {}
 			};
 			const segs = run.text.split("\n");
 			segs.forEach((seg, i) => {
@@ -3373,12 +2791,12 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 	const tIns = margins.top ?? DEFAULT_INSET_Y;
 	const rIns = margins.right ?? DEFAULT_INSET_X;
 	const bIns = margins.bottom ?? DEFAULT_INSET_Y;
-	const { x: innerX, y: innerY, w: innerW, h: innerH } = resolveTextBodyRect(getShapePreset(shape), bounds, {
+	const { x: innerX, y: innerY, w: innerW, h: innerH } = resolveTextBodyRect(bounds, {
 		left: lIns,
 		top: tIns,
 		right: rIns,
 		bottom: bIns
-	}, shapeCustomTextRect(getShapeCustomGeometry(shape), getShapeBounds(shape)));
+	}, shapeTextRect(shape));
 	if (innerW <= 0 || innerH <= 0) return null;
 	const svgTextRect = (v) => useSvgTextRect && v !== "none" && v !== "upright" ? {
 		x: bounds.x + tIns,
@@ -3455,10 +2873,11 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 		} catch {
 			elements = [];
 		}
+		const languages = elements.length ? getParagraphElementLanguages(shape, p) : [];
 		let rIdx = 0;
 		let fieldIndex = 0;
 		let breakIndex = 0;
-		for (const el of elements) {
+		for (const [elementIndex, el] of elements.entries()) {
 			if (el.kind === "br") {
 				const fmt = getShapeRunFormatEffective(pres, shape, p, { breakIndex: breakIndex++ });
 				runs.push({
@@ -3493,6 +2912,7 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 				text: txt,
 				fmt,
 				sizePt,
+				...decimalSeparatorField(languages[elementIndex]),
 				...href !== void 0 ? { href } : {},
 				...hrefTip !== void 0 ? { hrefTip } : {}
 			});
@@ -3632,9 +3052,15 @@ const renderHtmlParagraphs = (paraData, numberLabels, theme, autoFitScale, defau
 			let runFmt = run.fmt;
 			if (run.href) {
 				const hlinkColor = theme ? normalizeHex(theme.hyperlink) : "#0563C1";
-				const { textFill: _linkFill, ...linkFmt } = runFmt ?? {};
+				const { textFill: _linkFill, outline: linkOutline, ...linkFmt } = runFmt ?? {};
+				const { fill: outlineFill, ...solidOutline } = linkOutline ?? {};
+				const outlineColor = outlineFill?.stops[0]?.color ?? solidOutline.color;
 				runFmt = {
 					...linkFmt,
+					...linkOutline ? { outline: {
+						...solidOutline,
+						...outlineColor !== void 0 ? { color: outlineColor } : {}
+					} } : {},
 					color: hlinkColor,
 					underline: runFmt?.underline ?? true
 				};
@@ -3665,8 +3091,8 @@ const renderHtmlParagraphs = (paraData, numberLabels, theme, autoFitScale, defau
 			"padding:0",
 			`text-align:${ALIGNMENT_TO_CSS[para.align] ?? "left"}`,
 			lineHeightCss,
-			leftPx > 0 ? `padding-left:${leftPx.toFixed(2)}px` : "",
-			rightPx > 0 ? `padding-right:${rightPx.toFixed(2)}px` : "",
+			leftPx > 0 ? `padding-inline-start:${leftPx.toFixed(2)}px` : "",
+			rightPx > 0 ? `padding-inline-end:${rightPx.toFixed(2)}px` : "",
 			firstLinePx !== 0 ? `text-indent:${firstLinePx.toFixed(2)}px` : ""
 		].filter(Boolean);
 		let prefix = "";
@@ -3702,6 +3128,7 @@ const renderHtmlParagraphs = (paraData, numberLabels, theme, autoFitScale, defau
 const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body") => {
 	const model = resolveTextBodyModel(pres, shape, bounds, theme, phType, ctx.measure, activeDeckTextColor, ctx.mode === "svg" && output === "body");
 	if (model === null) return "";
+	const bevel = textBevelOf(getShapeText3D(shape));
 	const { paraData, numberLabels, authoredAutofit, autoFitScale, defaultPt, themeFace, effectiveDefaultFont, effectiveBody, anchor, innerX, innerY, innerW, innerH, svgTextRect } = model;
 	const defaultColor = activeDeckTextColor;
 	const paragraphs = renderHtmlParagraphs(paraData, numberLabels, theme, autoFitScale, defaultPt, defaultColor, effectiveBody.wrap !== "none");
@@ -3737,7 +3164,8 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 			measure: ctx.mode === "svg" ? ctx.measure : browserTextMeasurer() ?? ctx.measure,
 			...ctx.mode === "foreignObject" ? { resolveFamily: browserFontFamily } : {},
 			vert: svgVert,
-			columns: svgColumns
+			columns: svgColumns,
+			bevel
 		};
 		if (output === "effects") {
 			const effectArgs = {
@@ -3755,6 +3183,10 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 					...effectArgs,
 					effectKind: "fill"
 				}) : "",
+				bevel ? buildAndLayoutSvgText({
+					...effectArgs,
+					effectKind: "bevel"
+				}) : "",
 				paraData.some((para) => para.runs.some((run) => run.fmt?.innerShadow != null)) ? buildAndLayoutSvgText({
 					...effectArgs,
 					effectKind: "innerShadow"
@@ -3791,10 +3223,11 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 	const content = paragraphs.join("");
 	const body = `<div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:visible;font-family:${effectiveDefaultFont};color:${defaultColor};${`translate:${model.anchorOffset.x}px ${model.anchorOffset.y}px;`}${wrapStyle}${vertStyles}">${content}</div>`;
 	const foreign = `<foreignObject x="${E(innerX)}" y="${E(innerY)}" width="${E(innerW)}" height="${E(innerH)}" overflow="visible">${body}</foreignObject>`;
-	const hasCharacterEffect = paraData.some((para) => para.runs.some((run) => run.fmt?.reflection !== void 0 && run.fmt.reflection !== null || run.fmt?.innerShadow !== void 0 && run.fmt.innerShadow !== null || hasPaintedTextFill(run)));
+	const hasCharacterEffect = bevel !== null || paraData.some((para) => para.runs.some((run) => run.fmt?.reflection !== void 0 && run.fmt.reflection !== null || run.fmt?.innerShadow !== void 0 && run.fmt.innerShadow !== null || hasPaintedTextFill(run)));
 	let reflectionOverlay = "";
 	let fillOverlay = "";
 	let innerShadowOverlay = "";
+	let bevelOverlay = "";
 	if (hasCharacterEffect) {
 		const svgVert = verticalLayoutOf(effectiveBody.vert ?? getShapeTextDirection(shape));
 		const { x: rX, y: rY, w: rW, h: rH } = svgTextRect(svgVert);
@@ -3820,7 +3253,8 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 			vert: svgVert,
 			columns: null,
 			effectsOnly: true,
-			resolveFamily: browserFontFamily
+			resolveFamily: browserFontFamily,
+			bevel
 		};
 		const hasCharacterReflection = paraData.some((para) => para.runs.some((run) => run.fmt?.reflection !== void 0 && run.fmt.reflection !== null));
 		const hasCharacterInnerShadow = paraData.some((para) => para.runs.some((run) => run.fmt?.innerShadow !== void 0 && run.fmt.innerShadow !== null));
@@ -3832,6 +3266,10 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 			...effectArgs,
 			effectKind: "fill"
 		});
+		if (bevel) bevelOverlay = buildAndLayoutSvgText({
+			...effectArgs,
+			effectKind: "bevel"
+		});
 		if (hasCharacterInnerShadow) innerShadowOverlay = buildAndLayoutSvgText({
 			...effectArgs,
 			effectKind: "innerShadow"
@@ -3841,10 +3279,10 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 	if (bodyRotDeg !== null && bodyRotDeg !== 0) {
 		const pivotX = innerX + innerW / 2;
 		const pivotY = innerY + innerH / 2;
-		const content = output === "effects" ? `${reflectionOverlay}${fillOverlay}${innerShadowOverlay}` : `${reflectionOverlay}${foreign}${fillOverlay}${innerShadowOverlay}`;
+		const content = output === "effects" ? `${reflectionOverlay}${fillOverlay}${bevelOverlay}${innerShadowOverlay}` : `${reflectionOverlay}${foreign}${fillOverlay}${bevelOverlay}${innerShadowOverlay}`;
 		return `<g transform="rotate(${bodyRotDeg} ${E(pivotX)} ${E(pivotY)})">${content}</g>`;
 	}
-	return output === "effects" ? reflectionOverlay + fillOverlay + innerShadowOverlay : reflectionOverlay + foreign + fillOverlay + innerShadowOverlay;
+	return output === "effects" ? reflectionOverlay + fillOverlay + bevelOverlay + innerShadowOverlay : reflectionOverlay + foreign + fillOverlay + bevelOverlay + innerShadowOverlay;
 };
 /**
 * Paint only character reflection/inner-shadow effects for an editable text
@@ -5313,10 +4751,11 @@ const cellParaData = (paragraphs, cell, pres) => {
 			const bulletIsPicture = isParagraphBulletPicture(cell, index);
 			const bulletImageBytes = bulletIsPicture ? getParagraphBulletImageBytes(cell, index) : null;
 			const runs = [];
+			const languages = getParagraphElementLanguages(cell, index);
 			let rIdx = 0;
 			let fieldIndex = 0;
 			let breakIndex = 0;
-			for (const el of para.elements) {
+			for (const [elementIndex, el] of para.elements.entries()) {
 				if (el.kind === "br") {
 					const fmt = getTableCellRunFormatEffective(pres, cell, index, { breakIndex: breakIndex++ });
 					runs.push({
@@ -5333,6 +4772,7 @@ const cellParaData = (paragraphs, cell, pres) => {
 					text: el.text,
 					fmt,
 					sizePt: fmt?.size ?? DEFAULT_BODY_PT,
+					...decimalSeparatorField(languages[elementIndex]),
 					...href ? {
 						href,
 						...el.tooltip !== void 0 ? { hrefTip: el.tooltip } : {}
@@ -5404,13 +4844,19 @@ const renderTableCellText = (cell, paragraphs, cx, cy, cw, ch, color, pres, shap
 		...ctx.mode === "foreignObject" ? { resolveFamily: browserFontFamily } : {},
 		vert: verticalLayoutOf(getTableCellTextDirection(cell)),
 		columns: null,
-		...effectsOnly ? { effectsOnly: true } : {}
+		...effectsOnly ? { effectsOnly: true } : {},
+		bevel: textBevelOf(getTableCellText3D(cell))
 	};
 	const fillOverlay = () => paraData.some((para) => para.runs.some(hasPaintedTextFill)) ? buildAndLayoutSvgText({
 		...svgArgs,
 		effectsOnly: true,
 		effectKind: "fill"
 	}) : "";
+	const bevelOverlay = () => svgArgs.bevel ? buildAndLayoutSvgText({
+		...svgArgs,
+		effectsOnly: true,
+		effectKind: "bevel"
+	}) : "";
 	if (ctx.mode === "svg" || customTabs || effectsOnly) {
 		if (effectsOnly) {
 			const reflection = paraData.some((para) => para.runs.some((run) => run.fmt?.reflection != null)) ? buildAndLayoutSvgText({
@@ -5421,7 +4867,7 @@ const renderTableCellText = (cell, paragraphs, cx, cy, cw, ch, color, pres, shap
 				...svgArgs,
 				effectKind: "innerShadow"
 			}) : "";
-			return reflection + fillOverlay() + innerShadow;
+			return reflection + fillOverlay() + bevelOverlay() + innerShadow;
 		}
 		return buildAndLayoutSvgText(svgArgs);
 	}
@@ -5430,7 +4876,34 @@ const renderTableCellText = (cell, paragraphs, cx, cy, cw, ch, color, pres, shap
 	const justify = vAnchor === "top" ? "flex-start" : vAnchor === "bottom" ? "flex-end" : "center";
 	const familyFont = themeFace ? `${escapeXml(themeFace)}, ${DEFAULT_FONT}` : DEFAULT_FONT;
 	const body = renderHtmlParagraphs(paraData, numberLabels, theme, 1, DEFAULT_BODY_PT, color).join("");
-	return `<foreignObject x="${px(innerX)}" y="${px(innerY)}" width="${px(innerW)}" height="${px(innerH)}"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:hidden;line-height:${LINE_HEIGHT};font-family:${familyFont};color:${color};word-break:break-word;${directionStyle}">${body}</div></foreignObject>${fillOverlay()}`;
+	return `<foreignObject x="${px(innerX)}" y="${px(innerY)}" width="${px(innerW)}" height="${px(innerH)}"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:hidden;line-height:${LINE_HEIGHT};font-family:${familyFont};color:${color};word-break:break-word;${directionStyle}">${body}</div></foreignObject>${fillOverlay()}${bevelOverlay()}`;
+};
+const TWO_STOP_TABLE_GRADIENT_EXPONENT = 1.85;
+const TWO_STOP_TABLE_GRADIENT_SAMPLES = 16;
+const twoStopTableGradient = (grad, theme) => {
+	if (grad.path !== void 0 || grad.stops.length !== 2) return grad;
+	const [start, end] = [...grad.stops].sort((a, b) => a.offset - b.offset);
+	if (!start || !end || end.offset <= start.offset) return grad;
+	const span = end.offset - start.offset;
+	const colorOf = (stop) => stop.resolvedColor ?? resolveColor(stop.color, theme, "#E5E7EB");
+	const startColor = colorOf(start);
+	const endColor = colorOf(end);
+	const stops = Array.from({ length: 17 }, (_, i) => {
+		const along = i / TWO_STOP_TABLE_GRADIENT_SAMPLES;
+		const startWeight = (1 - along) ** TWO_STOP_TABLE_GRADIENT_EXPONENT;
+		const color = mixHex(startColor, endColor, startWeight);
+		const opacity = start.opacity === void 0 && end.opacity === void 0 ? void 0 : (start.opacity ?? 1) * startWeight + (end.opacity ?? 1) * (1 - startWeight);
+		return {
+			offset: start.offset + along * span,
+			color,
+			resolvedColor: color,
+			...opacity === void 0 ? {} : { opacity }
+		};
+	});
+	return {
+		...grad,
+		stops
+	};
 };
 const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 	let dims;
@@ -5464,6 +4937,16 @@ const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 	const tableThemeFace = getPresentationFonts(pres)?.minorLatin ?? null;
 	const out = [];
 	out.push(`<g${transform}>`);
+	const background = getTableBackgroundEffective(pres, shape);
+	const tableW = (colXs[dims.cols] ?? xPx) - xPx;
+	const tableH = (rowYs[dims.rows] ?? yPx) - yPx;
+	if (background?.fill.kind === "solid") {
+		const opacity = background.fillOpacity !== void 0 && background.fillOpacity < 1 ? ` fill-opacity="${background.fillOpacity.toFixed(3)}"` : "";
+		out.push(`<rect x="${px(xPx)}" y="${px(yPx)}" width="${px(tableW)}" height="${px(tableH)}" fill="${resolveColor(background.fill.color, theme, "#FFFFFF")}"${opacity}/>`);
+	} else if (background?.gradient) {
+		const built = gradientDef(twoStopTableGradient(background.gradient, theme), theme);
+		out.push(`${built.defs}<rect x="${px(xPx)}" y="${px(yPx)}" width="${px(tableW)}" height="${px(tableH)}" fill="${built.fillAttr}"/>`);
+	}
 	const borderEdges = [];
 	const borderEdgeCandidates = /* @__PURE__ */ new Map();
 	for (let r = 0; r < dims.rows; r++) for (let c = 0; c < dims.cols; c++) {
@@ -5486,7 +4969,8 @@ const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 		else if (fill.kind !== "inherit") resolvedFill = "none";
 		else resolvedFill = "none";
 		const cellTextColor = textColor;
-		out.push(`<g data-pptx-cell="${r},${c}"><rect x="${px(cx)}" y="${px(cy)}" width="${px(cw)}" height="${px(ch)}" fill="${resolvedFill}"/>`);
+		const fillOpacity = fill.kind === "solid" && appearance.fillOpacity !== void 0 && appearance.fillOpacity < 1 ? ` fill-opacity="${appearance.fillOpacity.toFixed(3)}"` : "";
+		out.push(`<g data-pptx-cell="${r},${c}"><rect x="${px(cx)}" y="${px(cy)}" width="${px(cw)}" height="${px(ch)}" fill="${resolvedFill}"${fillOpacity}/>`);
 		const borders = appearance.borders;
 		const dashAttr = (dash, widthPx) => {
 			if (!dash || dash === "solid") return "";
@@ -5547,8 +5031,12 @@ const renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 */
 const arcToCubicSegments = (startX, startY, wR, hR, stAng, swAng) => {
 	const toRad = (a) => a / 6e4 * (Math.PI / 180);
-	const st = toRad(stAng);
-	const sw = toRad(swAng);
+	const parametric = (visual) => {
+		const offset = Math.atan2(wR * Math.sin(visual), hR * Math.cos(visual)) - visual;
+		return visual + Math.atan2(Math.sin(offset), Math.cos(offset));
+	};
+	const st = parametric(toRad(stAng));
+	const sw = parametric(toRad(stAng + swAng)) - st;
 	const cx = startX - wR * Math.cos(st);
 	const cy = startY - hR * Math.sin(st);
 	const segCount = Math.max(1, Math.ceil(Math.abs(sw) / (Math.PI / 2)));
@@ -5577,75 +5065,237 @@ const arcToCubicSegments = (startX, startY, wR, hR, stAng, swAng) => {
 	return segs;
 };
 /**
-* Renders an evaluated {@link CustomGeometry} as one `<path>` per
-* `GeomPath`, scaling each path's coordinate space (its own `w`/`h`, or
-* the shape extents when those are absent) onto the shape's slide box
-* `(x, y, w, h)` in EMU. Returns `''` when nothing drawable remains, so
-* the caller can fall back to the labelled rect.
-*
-* Per-path `fill="none"` paints stroke-only; `stroke="0"` paints
-* fill-only — mirroring `ST_PathFillMode` / the path `stroke` flag.
+* The SVG path data of one evaluated {@link GeomPath}, scaling its coordinate
+* space (its own `w`/`h`, or the shape extents when those are absent) onto
+* the shape's slide box `(x, y, w, h)` in EMU. `''` when nothing is drawable.
 */
-const customGeometryToSvg = (geom, x, y, w, h, fill, fillExtra, stroke, strokeWidthEmu, strokeExtra, markerExtra) => {
-	const out = [];
-	for (const path of geom.paths) {
+const geometryPathData = (path, x, y, w, h) => {
+	const cw = path.w ?? w;
+	const ch = path.h ?? h;
+	if (cw === 0 || ch === 0) return "";
+	const sx = w / cw;
+	const sy = h / ch;
+	const fx = (gx) => ((x + gx * sx) / EMU_PER_PX).toFixed(2);
+	const fy = (gy) => ((y + gy * sy) / EMU_PER_PX).toFixed(2);
+	const pt = (gx, gy) => `${fx(gx)},${fy(gy)}`;
+	let curX = 0;
+	let curY = 0;
+	let startX = 0;
+	let startY = 0;
+	const d = [];
+	for (const cmd of path.commands) switch (cmd.kind) {
+		case "moveTo":
+			curX = cmd.pt.x;
+			curY = cmd.pt.y;
+			startX = curX;
+			startY = curY;
+			d.push(`M${pt(curX, curY)}`);
+			break;
+		case "lnTo":
+			curX = cmd.pt.x;
+			curY = cmd.pt.y;
+			d.push(`L${pt(curX, curY)}`);
+			break;
+		case "quadBezTo":
+			d.push(`Q${pt(cmd.pts[0].x, cmd.pts[0].y)} ${pt(cmd.pts[1].x, cmd.pts[1].y)}`);
+			curX = cmd.pts[1].x;
+			curY = cmd.pts[1].y;
+			break;
+		case "cubicBezTo":
+			d.push(`C${pt(cmd.pts[0].x, cmd.pts[0].y)} ${pt(cmd.pts[1].x, cmd.pts[1].y)} ${pt(cmd.pts[2].x, cmd.pts[2].y)}`);
+			curX = cmd.pts[2].x;
+			curY = cmd.pts[2].y;
+			break;
+		case "arcTo": {
+			const segs = arcToCubicSegments(curX, curY, cmd.wR, cmd.hR, cmd.stAng, cmd.swAng);
+			for (const s of segs) d.push(`C${pt(s.c1x, s.c1y)} ${pt(s.c2x, s.c2y)} ${pt(s.ex, s.ey)}`);
+			const last = segs[segs.length - 1];
+			if (last) {
+				curX = last.ex;
+				curY = last.ey;
+			}
+			break;
+		}
+		case "close":
+			d.push("Z");
+			curX = startX;
+			curY = startY;
+			break;
+	}
+	return d.join(" ");
+};
+const PATH_SHADE = {
+	darken: "fill=\"#000\" fill-opacity=\"0.4\"",
+	darkenLess: "fill=\"#000\" fill-opacity=\"0.2\"",
+	lighten: "fill=\"#fff\" fill-opacity=\"0.4\"",
+	lightenLess: "fill=\"#fff\" fill-opacity=\"0.2\""
+};
+const SKETCH_AMPLITUDE = {
+	curved: .008,
+	freehand: .014,
+	scribble: .022
+};
+const SKETCH_STEP = .12;
+const seededRandom = (seed) => {
+	let state = seed >>> 0;
+	return () => {
+		state = state + 1831565813 >>> 0;
+		let t = state;
+		t = Math.imul(t ^ t >>> 15, t | 1);
+		t ^= t + Math.imul(t ^ t >>> 7, t | 61);
+		return ((t ^ t >>> 14) >>> 0) / 4294967296;
+	};
+};
+/**
+* An approximation of a sketched outline (`ask:lineSketchStyleProps`): every
+* edge of `geom` is redrawn as a seeded hand-drawn wobble. Only used for a
+* preset geometry the writer left crisp; sketches the reference desktop app wrote already
+* carry their hand-drawn path as custom geometry.
+*/
+const sketchGeometry = (geom, sketch, w, h, seed) => {
+	const random = seededRandom(seed);
+	const jitter = (amp) => (random() * 2 - 1) * amp;
+	const paths = geom.paths.map((path) => {
 		const cw = path.w ?? w;
 		const ch = path.h ?? h;
-		if (cw === 0 || ch === 0) continue;
-		const sx = w / cw;
-		const sy = h / ch;
-		const fx = (gx) => ((x + gx * sx) / EMU_PER_PX).toFixed(2);
-		const fy = (gy) => ((y + gy * sy) / EMU_PER_PX).toFixed(2);
-		const pt = (gx, gy) => `${fx(gx)},${fy(gy)}`;
+		const size = Math.max(Math.min(cw, ch), Math.max(cw, ch) / 4);
+		const amp = SKETCH_AMPLITUDE[sketch] * size;
+		const step = SKETCH_STEP * Math.max(cw, ch);
+		const nudge = (pt) => ({
+			x: pt.x + jitter(amp),
+			y: pt.y + jitter(amp)
+		});
+		const commands = [];
 		let curX = 0;
 		let curY = 0;
 		let startX = 0;
 		let startY = 0;
-		const d = [];
+		const wobbleTo = (x, y) => {
+			const dx = x - curX;
+			const dy = y - curY;
+			const len = Math.hypot(dx, dy);
+			const count = step > 0 ? Math.max(1, Math.round(len / step)) : 1;
+			const nx = len > 0 ? -dy / len : 0;
+			const ny = len > 0 ? dx / len : 0;
+			let px = curX;
+			let py = curY;
+			for (let i = 1; i <= count; i++) {
+				const last = i === count;
+				const ex = curX + dx * i / count + (last ? 0 : jitter(amp / 2));
+				const ey = curY + dy * i / count + (last ? 0 : jitter(amp / 2));
+				const bend = jitter(amp);
+				const control = {
+					x: (px + ex) / 2 + nx * bend,
+					y: (py + ey) / 2 + ny * bend
+				};
+				commands.push({
+					kind: "quadBezTo",
+					pts: [control, {
+						x: ex,
+						y: ey
+					}]
+				});
+				px = ex;
+				py = ey;
+			}
+			curX = x;
+			curY = y;
+		};
 		for (const cmd of path.commands) switch (cmd.kind) {
 			case "moveTo":
 				curX = cmd.pt.x;
 				curY = cmd.pt.y;
 				startX = curX;
 				startY = curY;
-				d.push(`M${pt(curX, curY)}`);
+				commands.push(cmd);
 				break;
 			case "lnTo":
-				curX = cmd.pt.x;
-				curY = cmd.pt.y;
-				d.push(`L${pt(curX, curY)}`);
+				wobbleTo(cmd.pt.x, cmd.pt.y);
 				break;
 			case "quadBezTo":
-				d.push(`Q${pt(cmd.pts[0].x, cmd.pts[0].y)} ${pt(cmd.pts[1].x, cmd.pts[1].y)}`);
+				commands.push({
+					kind: "quadBezTo",
+					pts: [nudge(cmd.pts[0]), cmd.pts[1]]
+				});
 				curX = cmd.pts[1].x;
 				curY = cmd.pts[1].y;
 				break;
 			case "cubicBezTo":
-				d.push(`C${pt(cmd.pts[0].x, cmd.pts[0].y)} ${pt(cmd.pts[1].x, cmd.pts[1].y)} ${pt(cmd.pts[2].x, cmd.pts[2].y)}`);
+				commands.push({
+					kind: "cubicBezTo",
+					pts: [
+						nudge(cmd.pts[0]),
+						nudge(cmd.pts[1]),
+						cmd.pts[2]
+					]
+				});
 				curX = cmd.pts[2].x;
 				curY = cmd.pts[2].y;
 				break;
-			case "arcTo": {
-				const segs = arcToCubicSegments(curX, curY, cmd.wR, cmd.hR, cmd.stAng, cmd.swAng);
-				for (const s of segs) d.push(`C${pt(s.c1x, s.c1y)} ${pt(s.c2x, s.c2y)} ${pt(s.ex, s.ey)}`);
-				const last = segs[segs.length - 1];
-				if (last) {
-					curX = last.ex;
-					curY = last.ey;
+			case "arcTo":
+				for (const s of arcToCubicSegments(curX, curY, cmd.wR, cmd.hR, cmd.stAng, cmd.swAng)) {
+					commands.push({
+						kind: "cubicBezTo",
+						pts: [
+							nudge({
+								x: s.c1x,
+								y: s.c1y
+							}),
+							nudge({
+								x: s.c2x,
+								y: s.c2y
+							}),
+							{
+								x: s.ex,
+								y: s.ey
+							}
+						]
+					});
+					curX = s.ex;
+					curY = s.ey;
 				}
 				break;
-			}
 			case "close":
-				d.push("Z");
+				if (curX !== startX || curY !== startY) wobbleTo(startX, startY);
+				commands.push(cmd);
 				curX = startX;
 				curY = startY;
 				break;
 		}
-		if (d.length === 0) continue;
-		const pathFill = path.fill === "none" ? "none" : fill;
-		const fillAttrs = path.fill === "none" ? "" : fillExtra;
+		return {
+			...path,
+			commands
+		};
+	});
+	return {
+		...geom,
+		paths
+	};
+};
+/**
+* Renders an evaluated {@link CustomGeometry} (a `<a:custGeom>` or a preset
+* from `getPresetGeometry`) as `<path>`s in the shape's slide box. Returns
+* `''` when nothing drawable remains, so the caller can fall back to the
+* labelled rect.
+*
+* 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, fillExtra, stroke, strokeWidthEmu, strokeExtra, markerExtra) => {
+	const out = [];
+	for (const path of geom.paths) {
+		const d = geometryPathData(path, x, y, w, h);
+		if (d === "") continue;
+		const filled = path.fill !== "none" && fill !== "none";
 		const strokeAttrs = path.stroke ? ` stroke="${stroke}" stroke-width="${E(strokeWidthEmu)}"${strokeExtra}${markerExtra}` : " stroke=\"none\"";
-		out.push(`<path d="${d.join(" ")}" fill="${pathFill}"${fillAttrs}${strokeAttrs} fill-rule="evenodd"/>`);
+		if (filled && path.fill !== "norm") {
+			out.push(`<path d="${d}" fill="${fill}"${fillExtra} stroke="none" fill-rule="evenodd"/>`);
+			out.push(`<path d="${d}" ${PATH_SHADE[path.fill]} stroke="none" fill-rule="evenodd"/>`);
+			if (path.stroke) out.push(`<path d="${d}" fill="none"${strokeAttrs}/>`);
+			continue;
+		}
+		const fillAttrs = filled ? `fill="${fill}"${fillExtra}` : "fill=\"none\"";
+		out.push(`<path d="${d}" ${fillAttrs}${strokeAttrs} fill-rule="evenodd"/>`);
 	}
 	return out.join("");
 };
@@ -5838,21 +5488,16 @@ const renderShapeContent = (shape, pres, theme, ctx) => {
 	const customGeom = rawPreset === null ? getShapeCustomGeometry(shape) : null;
 	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");
+	const sketch = rawPreset !== null ? getShapeStrokeSketch(shape) : null;
+	if (geomSvg !== "") {} else if (sketch !== null && p.stroke !== "none") {
+		const geometry = getPresetGeometry(preset, bounds, getShapeAdjustValues(shape));
+		if (geometry !== null) geomSvg = customGeometryToSvg(sketchGeometry(geometry, sketch, w, h, getShapeId(shape)), x, y, w, h, p.fill, fa, p.stroke, 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}"${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}"${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}"${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 geometry = getPresetGeometry(preset, bounds, getShapeAdjustValues(shape));
+		if (geometry !== null) geomSvg = customGeometryToSvg(geometry, x, y, w, h, p.fill, fa, p.stroke, p.strokeWidth, sa, ma);
+		if (geomSvg === "") 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);
 	const filterAttr = fx ? ` filter="url(#${fx.id})"` : "";
@@ -5940,11 +5585,14 @@ const buildReflection = (pres, shape, geomRaw, box) => {
 	const f = refl.scaleY ?? -1;
 	const startA = refl.startOpacity ?? 1;
 	const endA = refl.opacity ?? 0;
+	const startPos = refl.startPosition ?? 0;
+	const endPos = Math.max(startPos, refl.endPosition ?? 1);
 	const contactPx = (box.y + box.h) / EMU_PER_PX;
 	const transform = `translate(0 ${(refl.distEmu / EMU_PER_PX + contactPx * (1 - f)).toFixed(2)}) scale(1 ${f})`;
 	const maskId = mintId();
 	const gradId = mintId();
-	const defs = `<defs><linearGradient id="${gradId}" x1="0" y1="0" x2="0" y2="1"><stop offset="0" stop-color="#fff" stop-opacity="${startA.toFixed(3)}"/><stop offset="1" stop-color="#fff" stop-opacity="${endA.toFixed(3)}"/></linearGradient><mask id="${maskId}" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#${gradId})"/></mask></defs>`;
+	const [y1, y2] = f < 0 ? [1, 0] : [0, 1];
+	const defs = `<defs><linearGradient id="${gradId}" x1="0" y1="${y1}" x2="0" y2="${y2}"><stop offset="${startPos.toFixed(3)}" stop-color="#fff" stop-opacity="${startA.toFixed(3)}"/><stop offset="${endPos.toFixed(3)}" stop-color="#fff" stop-opacity="${endA.toFixed(3)}"/></linearGradient><mask id="${maskId}" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#${gradId})"/></mask></defs>`;
 	return {
 		svg: `<g transform="${transform}" mask="url(#${maskId})" data-pptx-reflection="1">${geomRaw}</g>`,
 		defs
@@ -5992,9 +5640,9 @@ const buildEffectsFilter = (pres, shape) => {
 		primitives.push(`<feMorphology in="SourceAlpha" operator="dilate" radius="${dilatePx.toFixed(2)}" result="glowExp${i}"/>`, `<feGaussianBlur in="glowExp${i}" stdDeviation="${featherPx.toFixed(2)}" result="glowBlur${i}"/>`, `<feFlood flood-color="${color}" flood-opacity="${opacity.toFixed(3)}" result="glowCol${i}"/>`, `<feComposite in="glowCol${i}" in2="glowBlur${i}" operator="in" result="glowOut${i}"/>`);
 		layers.push(`glowOut${i}`);
 	} else if (e.kind === "softEdge") {
-		const blurPx = e.radiusEmu / EMU_PER_PX / 2;
+		const radiusPx = e.radiusEmu / EMU_PER_PX;
 		const i = primitives.length;
-		primitives.push(`<feGaussianBlur in="SourceGraphic" stdDeviation="${blurPx.toFixed(2)}" result="softOut${i}"/>`);
+		primitives.push(`<feMorphology in="SourceAlpha" operator="erode" radius="${(radiusPx / 2).toFixed(2)}" result="softCore${i}"/>`, `<feGaussianBlur in="softCore${i}" stdDeviation="${(radiusPx / 4).toFixed(2)}" result="softMask${i}"/>`, `<feComposite in="SourceGraphic" in2="softMask${i}" operator="in" result="softOut${i}"/>`);
 		layers.length = 0;
 		layers.push(`softOut${i}`);
 	} else if (e.kind === "blur") {
@@ -6036,14 +5684,33 @@ const topLevelShapes = (shapes, opts) => {
 	}
 	return out;
 };
-const renderSlideSvg = (pres, slide, opts = {}) => {
+const renderSlideSvg = (pres, slide, opts = {}) => renderSurface(pres, {
+	slide,
+	layout: getSlideLayout(slide),
+	master: false
+}, opts);
+/**
+* Draws a slide layout — or, with `master`, its slide master — the way
+* the reference desktop app's Slide Master view shows it behind the placeholders: the
+* background and the decorative (non-placeholder) shapes of the master and,
+* for a layout, of the layout itself. A layout that hides background graphics
+* leaves the master's shapes out. Placeholders are not drawn; an editor draws
+* them with their prompt text over this.
+*/
+const renderSlideLayoutSvg = (pres, layout, opts = {}) => renderSurface(pres, {
+	slide: null,
+	layout,
+	master: opts.master ?? false
+}, opts);
+const renderSurface = (pres, surface, opts) => {
+	const { slide, master } = surface;
 	const size = getSlideSize(pres) ?? DEFAULT_SIZE;
 	const W = size.width;
 	const H = size.height;
 	const theme = getPresentationTheme(pres);
-	activeColorMap = getEffectiveColorMap(slide);
-	activeDeckTextColor = resolveDeckBodyTextColor(slide) ?? "#000000";
-	const position = getSlides(pres).indexOf(slide);
+	activeColorMap = getEffectiveColorMap(slide ?? surface.layout);
+	activeDeckTextColor = resolveDeckBodyTextColor(slide ?? surface.layout) ?? "#000000";
+	const position = slide ? getSlides(pres).indexOf(slide) : 0;
 	activeSlideNumber = String(getPresentationFirstSlideNumber(pres) + (position < 0 ? 0 : position));
 	const ctx = {
 		groupScale: {
@@ -6061,11 +5728,11 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 		},
 		inverseGroupTransform: ""
 	};
-	let bg = getSlideBackground(slide);
+	let bg = slide ? getSlideBackground(slide) : { kind: "inherit" };
 	if (bg.kind === "inherit") {
-		const layout = getSlideLayout(slide);
+		const layout = surface.layout;
 		if (layout) {
-			const layoutBg = getSlideLayoutBackground(layout);
+			const layoutBg = master ? { kind: "inherit" } : getSlideLayoutBackground(layout);
 			if (layoutBg.kind !== "inherit") bg = layoutBg;
 			else {
 				const masterBg = getSlideMasterBackground(pres, layout);
@@ -6080,11 +5747,11 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 	let bgGradientDefs = "";
 	if (bg.kind === "solid") bgColor = resolveColor(bg.color, theme, "#FFFFFF");
 	else if (bg.kind === "gradient") {
-		let grad = getSlideBackgroundGradientFill(slide);
+		let grad = slide ? getSlideBackgroundGradientFill(slide) : null;
 		if (!grad) {
-			const layout = getSlideLayout(slide);
+			const layout = surface.layout;
 			if (layout) {
-				grad = getSlideLayoutBackgroundGradientFill(layout);
+				grad = master ? null : getSlideLayoutBackgroundGradientFill(layout);
 				if (!grad) grad = getSlideMasterBackgroundGradientFill(pres, layout);
 			}
 		}
@@ -6094,11 +5761,11 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 			bgGradient = `<rect width="${E(W)}" height="${E(H)}" fill="${built.fillAttr}"/>`;
 		}
 	} else if (bg.kind === "pattern") {
-		let pat = getSlideBackgroundPatternFill(pres, slide);
+		let pat = slide ? getSlideBackgroundPatternFill(pres, slide) : null;
 		if (!pat) {
-			const layout = getSlideLayout(slide);
+			const layout = surface.layout;
 			if (layout) {
-				pat = getSlideLayoutBackgroundPatternFill(pres, layout);
+				pat = master ? null : getSlideLayoutBackgroundPatternFill(pres, layout);
 				if (!pat) pat = getSlideMasterBackgroundPatternFill(pres, layout);
 			}
 		}
@@ -6110,23 +5777,23 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 	} else if (theme && bg.kind === "inherit") bgColor = normalizeHex(theme.light1);
 	let bgImage = "";
 	if (bg.kind === "image") {
-		let bytes = getSlideBackgroundImageBytes(slide);
+		let bytes = slide ? getSlideBackgroundImageBytes(slide) : null;
 		if (!bytes && pres) {
-			const layout = getSlideLayout(slide);
+			const layout = surface.layout;
 			if (layout) {
-				bytes = getSlideLayoutBackgroundImageBytes(pres, layout);
+				bytes = master ? null : getSlideLayoutBackgroundImageBytes(pres, layout);
 				if (!bytes) bytes = getSlideMasterBackgroundImageBytes(pres, layout);
 			}
 		}
 		if (bytes) {
 			const fmt = detectImageFormatLocal(bytes);
 			const dataUrl = `data:${fmt ? imageMime[fmt] ?? "image/png" : "image/png"};base64,${u8ToBase64(bytes)}`;
-			const layout = getSlideBackgroundImageFillLayout(slide);
-			const crop = getSlideBackgroundImageCrop(slide);
+			const layout = slide ? getSlideBackgroundImageFillLayout(slide) : null;
+			const crop = slide ? getSlideBackgroundImageCrop(slide) : null;
 			const cropLeft = crop?.left ?? 0, cropTop = crop?.top ?? 0;
 			const cropRight = crop?.right ?? 0, cropBottom = crop?.bottom ?? 0;
-			const opacity = getSlideBackgroundImageOpacity(slide) ?? 1;
-			const intrinsic = layout?.mode === "tile" ? getSlideBackgroundImageIntrinsicSize(slide) : null;
+			const opacity = (slide && getSlideBackgroundImageOpacity(slide)) ?? 1;
+			const intrinsic = layout?.mode === "tile" && slide ? getSlideBackgroundImageIntrinsicSize(slide) : null;
 			if (layout?.mode === "tile" && intrinsic) {
 				const pattern = imageTilePattern(dataUrl, layout, intrinsic, 0, 0, W, H, cropLeft, cropTop, cropRight, cropBottom);
 				bgImage = `${pattern.defs}<rect width="${E(W)}" height="${E(H)}" fill="${pattern.fill}" opacity="${opacity}"/>`;
@@ -6147,10 +5814,11 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 		}
 	}
 	let layoutBgShapes = "";
-	const layoutForBg = getSlideLayout(slide);
-	if (layoutForBg && !isSlideBackgroundGraphicsHidden(slide)) try {
-		const masterShapes = topLevelShapes(isSlideLayoutBackgroundGraphicsHidden(layoutForBg) ? [] : getSlideMasterShapes(pres, layoutForBg), { dropPlaceholders: true });
-		const layoutShapes = topLevelShapes(getSlideLayoutShapes(pres, layoutForBg), { dropPlaceholders: true });
+	const layoutForBg = surface.layout;
+	const paintBackground = opts.background ?? true;
+	if (paintBackground && layoutForBg && !(slide && isSlideBackgroundGraphicsHidden(slide))) try {
+		const masterShapes = topLevelShapes(!master && isSlideLayoutBackgroundGraphicsHidden(layoutForBg) ? [] : getSlideMasterShapes(pres, layoutForBg), { dropPlaceholders: true });
+		const layoutShapes = topLevelShapes(master ? [] : getSlideLayoutShapes(pres, layoutForBg), { dropPlaceholders: true });
 		const bgCtx = {
 			...ctx,
 			ownShapes: false
@@ -6159,12 +5827,12 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 	} catch {
 		layoutBgShapes = "";
 	}
-	const shapesSvg = topLevelShapes(getSlideShapes(slide), { dropPlaceholders: false }).map((s) => renderShape(s, pres, theme, ctx)).join("");
+	const shapesSvg = topLevelShapes(slide ? getSlideShapes(slide) : [], { dropPlaceholders: false }).map((s) => renderShape(s, pres, theme, ctx)).join("");
 	const backgroundSvg = `${bgOpacity === void 0 ? "" : `<rect width="${E(W)}" height="${E(H)}" fill="#FFFFFF"/>`}<rect width="${E(W)}" height="${E(H)}" fill="${bgColor}"${bgOpacityAttr}/>${bgGradient}${bgImage}`;
 	return [
 		`<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 ${E(W)} ${E(H)}" preserveAspectRatio="xMidYMid meet">`,
 		bgGradientDefs,
-		ctx.background.id ? `<defs><g id="${ctx.background.id}">${backgroundSvg}</g></defs><use href="#${ctx.background.id}" xlink:href="#${ctx.background.id}"/>` : backgroundSvg,
+		ctx.background.id ? `<defs><g id="${ctx.background.id}">${backgroundSvg}</g></defs>${paintBackground ? `<use href="#${ctx.background.id}" xlink:href="#${ctx.background.id}"/>` : ""}` : paintBackground ? backgroundSvg : "",
 		layoutBgShapes,
 		shapesSvg,
 		"</svg>"
@@ -6340,7 +6008,7 @@ const auditTextLayout = (pres, options = {}) => {
 *
 * `1` for a shape with no `<a:normAutofit>`: `<a:noAutofit>` overflows and
 * `<a:spAutoFit>` grows the box instead, so neither shrinks the text. A shape
-* with a baked `fontScale` reports that, unchanged — it is what PowerPoint
+* with a baked `fontScale` reports that, unchanged — it is what the reference desktop app
 * itself applied.
 */
 function shapeAutoFitScale(pres, shape, options = {}) {
@@ -6373,6 +6041,6 @@ function shapeTextAnchorOffset(pres, shape, options = {}) {
 	};
 }
 //#endregion
-export { textColumnsStyle as _, renderTextEffectsSvg as a, shapeCustomTextRect as b, MONO as c, TIMES as d, defaultMeasurer as f, textUnderlineStyle as g, paragraphNumberLabels as h, renderSlideSvg as i, SANS as l, substituteFamily as m, shapeTextAnchorOffset as n, ARIAL as o, isCjk as p, auditTextLayout as r, AVG_GLYPH_W_RATIO as s, shapeAutoFitScale as t, SERIF as u, verticalTextStyle as v, resolveTextBodyRect as y };
+export { shapeTextRect as S, paragraphNumberLabels as _, renderSlideSvg as a, verticalTextStyle as b, AVG_GLYPH_W_RATIO as c, SERIF as d, TIMES as f, decimalSeparatorOf as g, substituteFamily as h, renderSlideLayoutSvg as i, MONO as l, isCjk as m, shapeTextAnchorOffset as n, renderTextEffectsSvg as o, defaultMeasurer as p, auditTextLayout as r, ARIAL as s, shapeAutoFitScale as t, SANS as u, textUnderlineStyle as v, resolveTextBodyRect as x, textColumnsStyle as y };
 
-//# sourceMappingURL=src-DYfIZIh8.js.map
+//# sourceMappingURL=src-pb3C61GD.js.map