@jannchie/icons 0.6.0 → 0.8.0

package/dist/src/rate.cjs

@@ -1,42 +1,61 @@
+const require_clip = require("./clip.cjs");
 const require_scene = require("./scene.cjs");
+const require_transform = require("./transform.cjs");
 const require_letters = require("./letters.cjs");
 //#region src/rate.js
 var H = 7;
 var TOP = 12 - H / 2;
-var CROSS = 4.2;
-var GAP = 1.75;
-var POINT = 1;
-var POINT_GAP = 2;
-var MAX_WIDTH = 21;
+var CROSS = 3;
 var ASPECT = .95;
-function rate(text) {
-	const chars = ["x", ...text];
-	const gapAfter = (i) => chars[i] === "." || chars[i + 1] === "." ? POINT_GAP : GAP;
-	const fixed = chars.reduce((w, c, i) => w + (c === "x" ? CROSS : c === "." ? POINT : 0) + (i < chars.length - 1 ? gapAfter(i) : 0), 0);
-	const units = chars.reduce((w, c) => w + (c === "x" || c === "." ? 0 : require_letters.advance(c)), 0);
-	const sy = H / 6;
-	const sx = Math.min(sy * ASPECT, (MAX_WIDTH - fixed) / units);
-	let x = 12 - (fixed + units * sx) / 2;
+function spanX(list) {
+	let [x0, x1] = [Infinity, -Infinity];
+	for (const p of list) for (const s of require_clip.segments(typeof p === "string" ? p : p.d)) for (const g of s.segs) for (const [x] of require_clip.samples(g, 12)) [x0, x1] = [Math.min(x0, x), Math.max(x1, x)];
+	return [x0, x1];
+}
+var ink = (c, sx) => spanX([require_letters.glyph(c, 0, TOP, sx, H / 6, require_letters.LABEL)]);
+function digits(chars, sx, gap, point) {
 	const out = [];
+	let x = 0;
 	chars.forEach((c, i) => {
-		if (c === "x") {
-			const [cx, cy, h] = [
-				x + CROSS / 2,
-				12,
-				CROSS / 2
-			];
-			out.push(`M${cx - h} ${cy - h}L${cx + h} ${cy + h}`, `M${cx + h} ${cy - h}L${cx - h} ${cy + h}`);
-			x += CROSS;
-		} else if (c === ".") {
-			out.push(require_scene.dot(x + POINT / 2, 15.25));
-			x += POINT;
+		if (c === ".") {
+			x += point - gap;
+			out.push(require_scene.dot(x, 15.25, 1.5));
+			x += point;
 		} else {
-			out.push(require_letters.glyph(c, x - require_letters.shift(c, require_letters.LABEL) * sx, TOP, sx, sy, require_letters.LABEL));
-			x += require_letters.advance(c, require_letters.LABEL) * sx;
+			const [a, b] = ink(c, sx);
+			out.push(require_letters.glyph(c, x - a, TOP, sx, H / 6, require_letters.LABEL));
+			x += b - a + gap;
 		}
-		x += gapAfter(i);
 	});
 	return require_letters.snap(out);
 }
+function rate(text, stroke = 1.5) {
+	const h = stroke / 2;
+	const chars = [...text];
+	const gap = 1.25 + h;
+	const point = gap + .25;
+	const width = 20 - stroke;
+	const fixed = chars.reduce((w, c, i) => w + (c === "." ? 2 * point - gap : i ? gap : 0), CROSS + gap);
+	const units = chars.reduce((w, c) => w + (c === "." ? 0 : ink(c, 1).reduce((a, b) => b - a)), 0);
+	let sx = Math.min(H / 6 * ASPECT, (width - fixed) / units);
+	let out, d0, d1;
+	for (;; sx -= .01) {
+		out = digits(chars, sx, gap, point);
+		[d0, d1] = spanX(out);
+		const spans = out.map((p) => spanX([p]));
+		if (CROSS + gap + d1 - d0 <= width + 1e-6 && spans.every((s, i) => !i || s[0] - spans[i - 1][1] >= stroke + .25 - 1e-6)) break;
+	}
+	const left = 12 - (CROSS + gap + d1 - d0) / 2;
+	const [cx, r] = [left + CROSS / 2, CROSS / 2];
+	const dx = left + CROSS + gap - d0;
+	return [
+		`M${cx - r} ${12 - r}L${cx + r} ${12 + r}`,
+		`M${cx + r} ${12 - r}L${cx - r} ${12 + r}`,
+		...out.map((p) => typeof p === "string" ? require_transform.translate(p, dx, 0) : {
+			...p,
+			d: require_transform.translate(p.d, dx, 0)
+		})
+	];
+}
 //#endregion
 exports.rate = rate;

package/dist/src/rate.js

@@ -1,42 +1,61 @@
+import { samples, segments } from "./clip.js";
 import { dot } from "./scene.js";
-import { LABEL, advance, glyph, shift, snap } from "./letters.js";
+import { translate } from "./transform.js";
+import { LABEL, glyph, snap } from "./letters.js";
 //#region src/rate.js
 var H = 7;
 var TOP = 12 - H / 2;
-var CROSS = 4.2;
-var GAP = 1.75;
-var POINT = 1;
-var POINT_GAP = 2;
-var MAX_WIDTH = 21;
+var CROSS = 3;
 var ASPECT = .95;
-function rate(text) {
-	const chars = ["x", ...text];
-	const gapAfter = (i) => chars[i] === "." || chars[i + 1] === "." ? POINT_GAP : GAP;
-	const fixed = chars.reduce((w, c, i) => w + (c === "x" ? CROSS : c === "." ? POINT : 0) + (i < chars.length - 1 ? gapAfter(i) : 0), 0);
-	const units = chars.reduce((w, c) => w + (c === "x" || c === "." ? 0 : advance(c)), 0);
-	const sy = H / 6;
-	const sx = Math.min(sy * ASPECT, (MAX_WIDTH - fixed) / units);
-	let x = 12 - (fixed + units * sx) / 2;
+function spanX(list) {
+	let [x0, x1] = [Infinity, -Infinity];
+	for (const p of list) for (const s of segments(typeof p === "string" ? p : p.d)) for (const g of s.segs) for (const [x] of samples(g, 12)) [x0, x1] = [Math.min(x0, x), Math.max(x1, x)];
+	return [x0, x1];
+}
+var ink = (c, sx) => spanX([glyph(c, 0, TOP, sx, H / 6, LABEL)]);
+function digits(chars, sx, gap, point) {
 	const out = [];
+	let x = 0;
 	chars.forEach((c, i) => {
-		if (c === "x") {
-			const [cx, cy, h] = [
-				x + CROSS / 2,
-				12,
-				CROSS / 2
-			];
-			out.push(`M${cx - h} ${cy - h}L${cx + h} ${cy + h}`, `M${cx + h} ${cy - h}L${cx - h} ${cy + h}`);
-			x += CROSS;
-		} else if (c === ".") {
-			out.push(dot(x + POINT / 2, 15.25));
-			x += POINT;
+		if (c === ".") {
+			x += point - gap;
+			out.push(dot(x, 15.25, 1.5));
+			x += point;
 		} else {
-			out.push(glyph(c, x - shift(c, LABEL) * sx, TOP, sx, sy, LABEL));
-			x += advance(c, LABEL) * sx;
+			const [a, b] = ink(c, sx);
+			out.push(glyph(c, x - a, TOP, sx, H / 6, LABEL));
+			x += b - a + gap;
 		}
-		x += gapAfter(i);
 	});
 	return snap(out);
 }
+function rate(text, stroke = 1.5) {
+	const h = stroke / 2;
+	const chars = [...text];
+	const gap = 1.25 + h;
+	const point = gap + .25;
+	const width = 20 - stroke;
+	const fixed = chars.reduce((w, c, i) => w + (c === "." ? 2 * point - gap : i ? gap : 0), CROSS + gap);
+	const units = chars.reduce((w, c) => w + (c === "." ? 0 : ink(c, 1).reduce((a, b) => b - a)), 0);
+	let sx = Math.min(H / 6 * ASPECT, (width - fixed) / units);
+	let out, d0, d1;
+	for (;; sx -= .01) {
+		out = digits(chars, sx, gap, point);
+		[d0, d1] = spanX(out);
+		const spans = out.map((p) => spanX([p]));
+		if (CROSS + gap + d1 - d0 <= width + 1e-6 && spans.every((s, i) => !i || s[0] - spans[i - 1][1] >= stroke + .25 - 1e-6)) break;
+	}
+	const left = 12 - (CROSS + gap + d1 - d0) / 2;
+	const [cx, r] = [left + CROSS / 2, CROSS / 2];
+	const dx = left + CROSS + gap - d0;
+	return [
+		`M${cx - r} ${12 - r}L${cx + r} ${12 + r}`,
+		`M${cx + r} ${12 - r}L${cx - r} ${12 + r}`,
+		...out.map((p) => typeof p === "string" ? translate(p, dx, 0) : {
+			...p,
+			d: translate(p.d, dx, 0)
+		})
+	];
+}
 //#endregion
 export { rate };

package/dist/src/roman.cjs

@@ -29,7 +29,7 @@ function stroke(c, x) {
 function roman(n) {
 	const chars = [...ROMAN[n]];
 	const width = chars.reduce((w, c) => w + WIDTH[c], 0) + GAP * (chars.length - 1);
-	const left = Math.floor(12 - width / 2) + .5;
+	const left = 12 - width / 2;
 	let x = left;
 	const paths = chars.flatMap((c) => {
 		const out = stroke(c, x);

package/dist/src/roman.js

@@ -29,7 +29,7 @@ function stroke(c, x) {
 function roman(n) {
 	const chars = [...ROMAN[n]];
 	const width = chars.reduce((w, c) => w + WIDTH[c], 0) + GAP * (chars.length - 1);
-	const left = Math.floor(12 - width / 2) + .5;
+	const left = 12 - width / 2;
 	let x = left;
 	const paths = chars.flatMap((c) => {
 		const out = stroke(c, x);

package/dist/src/runes.cjs

@@ -47,9 +47,9 @@ var RUNES = {
 	kaunan: {
 		zh: "ᚲ kaunan",
 		paths: (r) => [poly([
-			[15.5, 6],
-			[8.5, 11.5],
-			[15.5, 17]
+			[15.5, 6.5],
+			[8.5, 12],
+			[15.5, 17.5]
 		], r)]
 	},
 	gebo: {
@@ -75,11 +75,11 @@ var RUNES = {
 	},
 	naudiz: {
 		zh: "ᚾ naudiz",
-		paths: () => ["M11.5 3V21", "M7 9L16 14.5"]
+		paths: () => ["M12 3V21", "M7.5 9L16.5 14.5"]
 	},
 	isa: {
 		zh: "ᛁ isa",
-		paths: () => ["M11.5 3V21"]
+		paths: () => ["M12 3V21"]
 	},
 	jera: {
 		zh: "ᛃ jera",
@@ -96,10 +96,10 @@ var RUNES = {
 	eihwaz: {
 		zh: "ᛇ eihwaz",
 		paths: (r) => [poly([
-			[15.5, 7.5],
-			[11.5, 3],
-			[11.5, 21],
-			[7.5, 16.5]
+			[16, 7.5],
+			[12, 3],
+			[12, 21],
+			[8, 16.5]
 		], r)]
 	},
 	perthro: {
@@ -115,10 +115,10 @@ var RUNES = {
 	},
 	algiz: {
 		zh: "ᛉ algiz",
-		paths: (r) => ["M11.5 3V21", poly([
-			[5.5, 3],
-			[11.5, 10.5],
-			[17.5, 3]
+		paths: (r) => ["M12 3V21", poly([
+			[6, 3],
+			[12, 10.5],
+			[18, 3]
 		], r)]
 	},
 	sowilo: {
@@ -133,10 +133,10 @@ var RUNES = {
 	},
 	tiwaz: {
 		zh: "ᛏ tiwaz",
-		paths: (r) => ["M11.5 3V21", poly([
-			[5.5, 9],
-			[11.5, 3],
-			[17.5, 9]
+		paths: (r) => ["M12 3V21", poly([
+			[6, 9],
+			[12, 3],
+			[18, 9]
 		], r)]
 	},
 	berkana: {

package/dist/src/runes.js

@@ -47,9 +47,9 @@ var RUNES = {
 	kaunan: {
 		zh: "ᚲ kaunan",
 		paths: (r) => [poly([
-			[15.5, 6],
-			[8.5, 11.5],
-			[15.5, 17]
+			[15.5, 6.5],
+			[8.5, 12],
+			[15.5, 17.5]
 		], r)]
 	},
 	gebo: {
@@ -75,11 +75,11 @@ var RUNES = {
 	},
 	naudiz: {
 		zh: "ᚾ naudiz",
-		paths: () => ["M11.5 3V21", "M7 9L16 14.5"]
+		paths: () => ["M12 3V21", "M7.5 9L16.5 14.5"]
 	},
 	isa: {
 		zh: "ᛁ isa",
-		paths: () => ["M11.5 3V21"]
+		paths: () => ["M12 3V21"]
 	},
 	jera: {
 		zh: "ᛃ jera",
@@ -96,10 +96,10 @@ var RUNES = {
 	eihwaz: {
 		zh: "ᛇ eihwaz",
 		paths: (r) => [poly([
-			[15.5, 7.5],
-			[11.5, 3],
-			[11.5, 21],
-			[7.5, 16.5]
+			[16, 7.5],
+			[12, 3],
+			[12, 21],
+			[8, 16.5]
 		], r)]
 	},
 	perthro: {
@@ -115,10 +115,10 @@ var RUNES = {
 	},
 	algiz: {
 		zh: "ᛉ algiz",
-		paths: (r) => ["M11.5 3V21", poly([
-			[5.5, 3],
-			[11.5, 10.5],
-			[17.5, 3]
+		paths: (r) => ["M12 3V21", poly([
+			[6, 3],
+			[12, 10.5],
+			[18, 3]
 		], r)]
 	},
 	sowilo: {
@@ -133,10 +133,10 @@ var RUNES = {
 	},
 	tiwaz: {
 		zh: "ᛏ tiwaz",
-		paths: (r) => ["M11.5 3V21", poly([
-			[5.5, 9],
-			[11.5, 3],
-			[17.5, 9]
+		paths: (r) => ["M12 3V21", poly([
+			[6, 9],
+			[12, 3],
+			[18, 9]
 		], r)]
 	},
 	berkana: {

package/dist/src/stems.cjs

@@ -5,13 +5,13 @@ var STEMS = {
 		zh: "甲",
 		paths: (r) => [
 			require_geometry.rounded([
-				[4.5, 4.5],
-				[18.5, 4.5],
-				[18.5, 14.5],
-				[4.5, 14.5]
+				[5, 4.5],
+				[19, 4.5],
+				[19, 14.5],
+				[5, 14.5]
 			], r),
-			"M4.5 9.5H18.5",
-			"M11.5 4.5V21"
+			"M5 9.5H19",
+			"M12 4.5V21"
 		]
 	},
 	yi: {
@@ -62,13 +62,13 @@ var STEMS = {
 	xin: {
 		zh: "辛",
 		paths: () => [
-			"M11.5 3V5",
-			"M5.5 5.5H17.5",
-			"M8 7.5L9 9.5",
-			"M15 7.5L14 9.5",
-			"M4.5 10.5H18.5",
-			"M5.5 15.5H17.5",
-			"M11.5 10.5V21"
+			"M12 3V5",
+			"M6 5.5H18",
+			"M8.5 7.5L9.5 9.5",
+			"M15.5 7.5L14.5 9.5",
+			"M5 10.5H19",
+			"M6 15.5H18",
+			"M12 10.5V21"
 		]
 	},
 	ren: {

package/dist/src/stems.js

@@ -5,13 +5,13 @@ var STEMS = {
 		zh: "甲",
 		paths: (r) => [
 			rounded([
-				[4.5, 4.5],
-				[18.5, 4.5],
-				[18.5, 14.5],
-				[4.5, 14.5]
+				[5, 4.5],
+				[19, 4.5],
+				[19, 14.5],
+				[5, 14.5]
 			], r),
-			"M4.5 9.5H18.5",
-			"M11.5 4.5V21"
+			"M5 9.5H19",
+			"M12 4.5V21"
 		]
 	},
 	yi: {
@@ -62,13 +62,13 @@ var STEMS = {
 	xin: {
 		zh: "辛",
 		paths: () => [
-			"M11.5 3V5",
-			"M5.5 5.5H17.5",
-			"M8 7.5L9 9.5",
-			"M15 7.5L14 9.5",
-			"M4.5 10.5H18.5",
-			"M5.5 15.5H17.5",
-			"M11.5 10.5V21"
+			"M12 3V5",
+			"M6 5.5H18",
+			"M8.5 7.5L9.5 9.5",
+			"M15.5 7.5L14.5 9.5",
+			"M5 10.5H19",
+			"M6 15.5H18",
+			"M12 10.5V21"
 		]
 	},
 	ren: {

package/dist/src/svg.cjs

@@ -110,16 +110,19 @@ function minify(d, { packArcs = false } = {}) {
 		const candidates = [];
 		if (type === "M") candidates.push(["M", a], ["m", [a[0] - cx, a[1] - cy]]);
 		else if (type === "L") {
+			if (a[0] === cx && a[1] === cy && !/m/i.test(last)) continue;
 			if (a[1] === cy) candidates.push(["H", [a[0]]], ["h", [a[0] - cx]]);
 			else if (a[0] === cx) candidates.push(["V", [a[1]]], ["v", [a[1] - cy]]);
 			else candidates.push(["L", a], ["l", [a[0] - cx, a[1] - cy]]);
 		} else if (type === "C" || type === "Q") candidates.push([type, a], [type.toLowerCase(), a.map((v, j) => v - (j % 2 ? cy : cx))]);
-		else if (type === "A") candidates.push(["A", a], ["a", [
-			...a.slice(0, 5),
-			a[5] - cx,
-			a[6] - cy
-		]]);
-		else candidates.push(["z", []]);
+		else if (type === "A") {
+			if (a[5] === cx && a[6] === cy) continue;
+			candidates.push(["A", a], ["a", [
+				...a.slice(0, 5),
+				a[5] - cx,
+				a[6] - cy
+			]]);
+		} else candidates.push(["z", []]);
 		const write = (c, n) => packArcs && /a/i.test(c) ? `${glue(join(n.slice(0, 3)), `${n[3]}${n[4]}`)}${join(n.slice(5))}` : join(n);
 		const [cmd, body] = candidates.map(([c, n]) => [c, write(c, n)]).reduce((best, c) => c[1].length < best[1].length ? c : best);
 		out = cmd === last && !/m/i.test(cmd) && cmd !== "z" ? glue(out, body) : out + cmd + body;

package/dist/src/svg.js

@@ -110,16 +110,19 @@ function minify(d, { packArcs = false } = {}) {
 		const candidates = [];
 		if (type === "M") candidates.push(["M", a], ["m", [a[0] - cx, a[1] - cy]]);
 		else if (type === "L") {
+			if (a[0] === cx && a[1] === cy && !/m/i.test(last)) continue;
 			if (a[1] === cy) candidates.push(["H", [a[0]]], ["h", [a[0] - cx]]);
 			else if (a[0] === cx) candidates.push(["V", [a[1]]], ["v", [a[1] - cy]]);
 			else candidates.push(["L", a], ["l", [a[0] - cx, a[1] - cy]]);
 		} else if (type === "C" || type === "Q") candidates.push([type, a], [type.toLowerCase(), a.map((v, j) => v - (j % 2 ? cy : cx))]);
-		else if (type === "A") candidates.push(["A", a], ["a", [
-			...a.slice(0, 5),
-			a[5] - cx,
-			a[6] - cy
-		]]);
-		else candidates.push(["z", []]);
+		else if (type === "A") {
+			if (a[5] === cx && a[6] === cy) continue;
+			candidates.push(["A", a], ["a", [
+				...a.slice(0, 5),
+				a[5] - cx,
+				a[6] - cy
+			]]);
+		} else candidates.push(["z", []]);
 		const write = (c, n) => packArcs && /a/i.test(c) ? `${glue(join(n.slice(0, 3)), `${n[3]}${n[4]}`)}${join(n.slice(5))}` : join(n);
 		const [cmd, body] = candidates.map(([c, n]) => [c, write(c, n)]).reduce((best, c) => c[1].length < best[1].length ? c : best);
 		out = cmd === last && !/m/i.test(cmd) && cmd !== "z" ? glue(out, body) : out + cmd + body;

package/dist/src/symbols.cjs

@@ -568,23 +568,33 @@ var drawBookmark = (c, k = 1, radius = 0) => {
 		p([-2.5, 3.5])
 	], Math.min(radius, k))];
 };
+var starPath = (pt, [cx, cy], R, a) => {
+	const tips = [
+		[0, -R],
+		[R, 0],
+		[0, R],
+		[-R, 0]
+	];
+	const ctrl = [
+		[a, -a],
+		[a, a],
+		[-a, a],
+		[-a, -a]
+	].map(([x, y]) => [x * R, y * R]);
+	const at0 = ([x, y]) => pt([cx + x, cy + y]);
+	return `M${at0(tips[0])}${tips.map((_, i) => `Q${at0(ctrl[i])} ${at0(tips[(i + 1) % 4])}`).join("")}Z`;
+};
 var drawSparkle = (c, k = 1) => {
 	const p = at(c, k);
 	const pt = (q) => p(q).join(" ");
-	const R = 3.5;
-	const b = 1.2 + Math.min(.5, Math.max(0, (2 - k) * .5));
-	const fillet = .6;
-	const s = 1 / Math.sqrt(1 / (b * b) + 1 / (R * R));
-	const tp = Math.acos(s / b);
-	const fp = Math.acos(s / R);
-	const t = tp + fillet / Math.hypot(b * Math.sin(tp), R * Math.cos(tp));
-	const f = fp - fillet / Math.hypot(R * Math.sin(fp), b * Math.cos(fp));
-	const v = [b * Math.cos(t), R * Math.sin(t)];
-	const h = [R * Math.cos(f), b * Math.sin(f)];
-	const q = ([x, y], sx, sy) => pt([x * sx, y * sy]);
-	const arc = (rx, ry, sx, sy, to) => `A${rx * k} ${ry * k} 0 0 1 ${q(to, sx, sy)}`;
-	const corner = (sx, sy, to) => `Q${q([s, s], sx, sy)} ${q(to, sx, sy)}`;
-	return [`M${q(v, -1, -1)}${arc(b, R, 1, -1, v)}${corner(1, -1, h)}${arc(R, b, 1, 1, h)}${corner(1, 1, v)}${arc(b, R, -1, 1, v)}${corner(-1, 1, h)}${arc(R, b, -1, -1, h)}${corner(-1, -1, v)}Z`];
+	return [starPath(pt, [-1, -1], 2.5, .16 + Math.min(.1, Math.max(0, (2 - k) * .1))), k >= 2 ? {
+		d: starPath(pt, [2.35, 2.35], 1.15, .3),
+		round: true
+	} : {
+		d: starPath(pt, [2.35, 2.35], 1.15, .2),
+		fill: true,
+		round: true
+	}];
 };
 var drawPuzzle = (c, k = 1, radius = 0) => {
 	const mirror = at(c, k);

package/dist/src/symbols.js

@@ -568,23 +568,33 @@ var drawBookmark = (c, k = 1, radius = 0) => {
 		p([-2.5, 3.5])
 	], Math.min(radius, k))];
 };
+var starPath = (pt, [cx, cy], R, a) => {
+	const tips = [
+		[0, -R],
+		[R, 0],
+		[0, R],
+		[-R, 0]
+	];
+	const ctrl = [
+		[a, -a],
+		[a, a],
+		[-a, a],
+		[-a, -a]
+	].map(([x, y]) => [x * R, y * R]);
+	const at0 = ([x, y]) => pt([cx + x, cy + y]);
+	return `M${at0(tips[0])}${tips.map((_, i) => `Q${at0(ctrl[i])} ${at0(tips[(i + 1) % 4])}`).join("")}Z`;
+};
 var drawSparkle = (c, k = 1) => {
 	const p = at(c, k);
 	const pt = (q) => p(q).join(" ");
-	const R = 3.5;
-	const b = 1.2 + Math.min(.5, Math.max(0, (2 - k) * .5));
-	const fillet = .6;
-	const s = 1 / Math.sqrt(1 / (b * b) + 1 / (R * R));
-	const tp = Math.acos(s / b);
-	const fp = Math.acos(s / R);
-	const t = tp + fillet / Math.hypot(b * Math.sin(tp), R * Math.cos(tp));
-	const f = fp - fillet / Math.hypot(R * Math.sin(fp), b * Math.cos(fp));
-	const v = [b * Math.cos(t), R * Math.sin(t)];
-	const h = [R * Math.cos(f), b * Math.sin(f)];
-	const q = ([x, y], sx, sy) => pt([x * sx, y * sy]);
-	const arc = (rx, ry, sx, sy, to) => `A${rx * k} ${ry * k} 0 0 1 ${q(to, sx, sy)}`;
-	const corner = (sx, sy, to) => `Q${q([s, s], sx, sy)} ${q(to, sx, sy)}`;
-	return [`M${q(v, -1, -1)}${arc(b, R, 1, -1, v)}${corner(1, -1, h)}${arc(R, b, 1, 1, h)}${corner(1, 1, v)}${arc(b, R, -1, 1, v)}${corner(-1, 1, h)}${arc(R, b, -1, -1, h)}${corner(-1, -1, v)}Z`];
+	return [starPath(pt, [-1, -1], 2.5, .16 + Math.min(.1, Math.max(0, (2 - k) * .1))), k >= 2 ? {
+		d: starPath(pt, [2.35, 2.35], 1.15, .3),
+		round: true
+	} : {
+		d: starPath(pt, [2.35, 2.35], 1.15, .2),
+		fill: true,
+		round: true
+	}];
 };
 var drawPuzzle = (c, k = 1, radius = 0) => {
 	const mirror = at(c, k);

package/dist/src/tally.cjs

@@ -1,15 +1,15 @@
 const require_scene = require("./scene.cjs");
 //#region src/tally.js
 var ZHENG = [
-	"M6.5 4.5H18.5",
-	"M12.5 4.5V19.5",
-	"M12.5 11.5H17.5",
-	"M7.5 11.5V19.5",
-	"M4.5 19.5H20.5"
+	"M6 4.5H18",
+	"M12 4.5V19.5",
+	"M12 11.5H17",
+	"M7 11.5V19.5",
+	"M4 19.5H20"
 ];
-var fiveX = (n) => Array.from({ length: n }, (_, i) => 12.5 + (i - (n - 1) / 2) * 4);
+var fiveX = (n) => Array.from({ length: n }, (_, i) => 12 + (i - (n - 1) / 2) * 4);
 function five(n) {
-	return [fiveX(Math.min(n, 4)).map((x) => `M${x} 5.5V18.5`).join("") + (n === 5 ? "M3.5 15.5L21.5 8.5" : "")];
+	return [fiveX(Math.min(n, 4)).map((x) => `M${x} 5.5V18.5`).join("") + (n === 5 ? "M3 15.5L21 8.5" : "")];
 }
 var SQ = [
 	[6.5, 17.5],
@@ -39,7 +39,7 @@ function dots(n) {
 	if (n >= 9) out.push(`M5.5 5.5L18.5 18.5${n === 10 ? "M18.5 5.5L5.5 18.5" : ""}`);
 	return out;
 }
-var rodX = (n) => Array.from({ length: n }, (_, i) => (n % 2 ? 12.5 : 12) + (i - (n - 1) / 2) * 3);
+var rodX = (n) => Array.from({ length: n }, (_, i) => 12 + (i - (n - 1) / 2) * 3);
 function rod(n) {
 	if (n <= 5) return rodX(n).map((x) => `M${x} 6.5V17.5`);
 	const xs = rodX(n - 5);

package/dist/src/tally.js

@@ -1,15 +1,15 @@
 import { dot } from "./scene.js";
 //#region src/tally.js
 var ZHENG = [
-	"M6.5 4.5H18.5",
-	"M12.5 4.5V19.5",
-	"M12.5 11.5H17.5",
-	"M7.5 11.5V19.5",
-	"M4.5 19.5H20.5"
+	"M6 4.5H18",
+	"M12 4.5V19.5",
+	"M12 11.5H17",
+	"M7 11.5V19.5",
+	"M4 19.5H20"
 ];
-var fiveX = (n) => Array.from({ length: n }, (_, i) => 12.5 + (i - (n - 1) / 2) * 4);
+var fiveX = (n) => Array.from({ length: n }, (_, i) => 12 + (i - (n - 1) / 2) * 4);
 function five(n) {
-	return [fiveX(Math.min(n, 4)).map((x) => `M${x} 5.5V18.5`).join("") + (n === 5 ? "M3.5 15.5L21.5 8.5" : "")];
+	return [fiveX(Math.min(n, 4)).map((x) => `M${x} 5.5V18.5`).join("") + (n === 5 ? "M3 15.5L21 8.5" : "")];
 }
 var SQ = [
 	[6.5, 17.5],
@@ -39,7 +39,7 @@ function dots(n) {
 	if (n >= 9) out.push(`M5.5 5.5L18.5 18.5${n === 10 ? "M18.5 5.5L5.5 18.5" : ""}`);
 	return out;
 }
-var rodX = (n) => Array.from({ length: n }, (_, i) => (n % 2 ? 12.5 : 12) + (i - (n - 1) / 2) * 3);
+var rodX = (n) => Array.from({ length: n }, (_, i) => 12 + (i - (n - 1) / 2) * 3);
 function rod(n) {
 	if (n <= 5) return rodX(n).map((x) => `M${x} 6.5V17.5`);
 	const xs = rodX(n - 5);