@office-kit/pptx-preview 0.13.0 → 0.14.0

package/dist/{src-DYfIZIh8.js → src-Bwmf324Z.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, getParagraphIndent, getParagraphLevel, getParagraphPropertiesEffective, getParagraphSpacing, getPresentationFirstSlideNumber, getPresentationFonts, getPresentationTheme, getPresetGeometry, 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, 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, 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 PowerPoint 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;
@@ -1069,8 +1036,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;
@@ -1214,6 +1182,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$1;
+	const surfaceScale = bevel.heightEmu / EMU_PER_PX$1 * 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 +1460,149 @@ function browserTextMeasurer() {
 	};
 }
 //#endregion
+//#region src/text-bevel.ts
+const DEFAULT_BEVEL_EMU = 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;
+	const heightEmu = bevel.heightEmu ?? DEFAULT_BEVEL_EMU;
+	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/render-slide.ts
 const clickActionHref = (pres, action) => {
 	if (!action) return void 0;
@@ -1677,15 +1807,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) => {
@@ -2103,904 +2229,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",
@@ -3222,6 +2450,7 @@ 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 } : {}
 			};
@@ -3373,12 +2602,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,
@@ -3702,6 +2931,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 +2967,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 +2986,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 +3026,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 +3056,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 +3069,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 +3082,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
@@ -5404,13 +4645,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 +4668,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 +4677,7 @@ 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 renderTable = (shape, pres, x, y, w, h, transform, theme, ctx) => {
 	let dims;
@@ -5547,8 +4794,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,11 +4828,76 @@ 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.
+* 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 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\""
+};
+/**
+* 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.
@@ -5589,63 +4905,18 @@ const arcToCubicSegments = (startX, startY, wR, hR, stAng, swAng) => {
 const customGeometryToSvg = (geom, x, y, w, h, fill, fillExtra, stroke, strokeWidthEmu, strokeExtra, markerExtra) => {
 	const out = [];
 	for (const path of geom.paths) {
-		const cw = path.w ?? w;
-		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)}`;
-		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;
-		}
-		if (d.length === 0) continue;
-		const pathFill = path.fill === "none" ? "none" : fill;
-		const fillAttrs = path.fill === "none" ? "" : fillExtra;
+		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("");
 };
@@ -5839,20 +5110,10 @@ const renderShapeContent = (shape, pres, theme, ctx) => {
 	let geomSvg = customGeom !== null ? customGeometryToSvg(customGeom, x, y, w, h, p.fill, fa, p.stroke, p.strokeWidth, sa, ma) : "";
 	const isCustGeom = geomSvg === "" && rawPreset === null && getShapeXmlString(shape).includes("custGeom");
 	if (geomSvg !== "") {} else if (preset === "rect") geomSvg = `<rect x="${E(x)}" y="${E(y)}" width="${E(w)}" height="${E(h)}" fill="${p.fill}"${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})"` : "";
@@ -6373,6 +5634,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 { textColumnsStyle as _, renderTextEffectsSvg as a, shapeTextRect 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 };
 
-//# sourceMappingURL=src-DYfIZIh8.js.map
+//# sourceMappingURL=src-Bwmf324Z.js.map