@jannchie/icons 0.6.0 → 0.8.0

package/dist/src/license.js

@@ -1,41 +1,49 @@
 import { circle, rounded } from "./geometry.js";
-import { LABEL, line, snap, textWidth } from "./letters.js";
+import { LABEL, line, snap } from "./letters.js";
 //#region src/license.js
 var SEAL = [
 	17,
 	16,
 	2.5
 ];
-var seal = () => {
+var seal = (h) => {
 	const [x, y, r] = SEAL;
 	return [{
 		d: circle(x, y, r),
 		cut: true,
 		occlude: true,
 		gap: .5
-	}, `M${x - 1.25} ${y + r - .25}L${x - 1.75} 22M${x + 1.25} ${y + r - .25}L${x + 1.75} 22`];
+	}, {
+		d: `M${x - 1.25} ${y + r - .25}L${x - 1.75} ${22 - h}M${x + 1.25} ${y + r - .25}L${x + 1.75} ${22 - h}`,
+		cut: true,
+		gap: .5
+	}];
 };
-var paper = (radius) => rounded([
-	[2.5, 2.5],
-	[21.5, 2.5],
-	[21.5, 16.5],
-	[2.5, 16.5]
+var paper = (radius, h) => rounded([
+	[2 + h, 2 + h],
+	[22 - h, 2 + h],
+	[22 - h, 17 - h],
+	[2 + h, 17 - h]
 ], Math.min(radius, 2));
-var GAP = 2;
-function license(text, radius) {
-	const sx = Math.min(.8, (13 - GAP * (text.length - 1)) / textWidth(text, 1, 1.5, LABEL));
+var BOX = [5.25, 18.75];
+function license(text, radius, stroke = 1.5) {
+	const h = stroke / 2;
+	const n = text.length;
+	const gap = n > 3 ? 1.75 : 2;
+	const sx = Math.min(.8, (BOX[1] - BOX[0] - gap * (n - 1)) / (3.5 * n));
+	const letters = line(text, [12, 8], sx, gap, 5.5 / 6, LABEL);
 	return [
-		paper(radius),
-		...seal(),
-		...snap(line(text, [12, 8], sx, GAP, 5 / 6, LABEL)).map((d) => ({
+		paper(radius, h),
+		...seal(h),
+		...(n > 3 ? letters : snap(letters)).map((d) => ({
 			d,
 			thin: true
 		}))
 	];
 }
-var certificate = (radius) => [
-	paper(radius),
-	...seal(),
+var certificate = (radius, stroke = 1.5) => [
+	paper(radius, stroke / 2),
+	...seal(stroke / 2),
 	{
 		d: "M6 7H18M6 10.5H12.5",
 		thin: true

package/dist/src/list.cjs

@@ -46,11 +46,11 @@ function listBadge(outline, k, stroke, draw, radius) {
 	return result;
 }
 var markRows = [
-	-3.5,
-	-.5,
-	2.5
+	-3,
+	0,
+	3
 ];
-var listMark = ([cx, cy]) => require_tone.accent([...markRows.map((y) => require_scene.dot(cx - 3.25, cy + y, 1.5)), ...markRows.map((y, i) => `M${cx - 1.25} ${cy + y}H${cx + (i === 2 ? 1.5 : 3.5)}`)]);
+var listMark = ([cx, cy], stroke = 1.5) => require_tone.accent([...markRows.map((y) => require_scene.dot(cx - 3.25, cy + y, 1.5)), ...markRows.map((y, i) => `M${cx - 1.25} ${cy + y}H${cx + (i === 2 ? 1.5 : 4 - stroke / 2)}`)]);
 //#endregion
 exports.list = list;
 exports.listBadge = listBadge;

package/dist/src/list.js

@@ -46,10 +46,10 @@ function listBadge(outline, k, stroke, draw, radius) {
 	return result;
 }
 var markRows = [
-	-3.5,
-	-.5,
-	2.5
+	-3,
+	0,
+	3
 ];
-var listMark = ([cx, cy]) => accent([...markRows.map((y) => dot(cx - 3.25, cy + y, 1.5)), ...markRows.map((y, i) => `M${cx - 1.25} ${cy + y}H${cx + (i === 2 ? 1.5 : 3.5)}`)]);
+var listMark = ([cx, cy], stroke = 1.5) => accent([...markRows.map((y) => dot(cx - 3.25, cy + y, 1.5)), ...markRows.map((y, i) => `M${cx - 1.25} ${cy + y}H${cx + (i === 2 ? 1.5 : 4 - stroke / 2)}`)]);
 //#endregion
 export { list, listBadge, listMark };

package/dist/src/manga.cjs

@@ -25,26 +25,44 @@ var bubble = (radius) => require_geometry.rounded(BUBBLE.map(([x, y, tip]) => ti
 var BUBBLE_CENTER = [12.5, 9.75];
 var [CX, CY] = [12, 10];
 var SPIKES = 11;
-var shoutPoints = () => Array.from({ length: 22 }, (_, i) => {
-	const a = -Math.PI / 2 + i * Math.PI / SPIKES;
-	if (i === 14) return [
-		3.5,
-		21.5,
-		"tip"
-	];
-	const [rx, ry] = i % 2 ? [7.75, 6.25] : [10.25, 8.5];
-	return [
-		+(CX + Math.cos(a) * rx).toFixed(3),
-		+(CY + Math.sin(a) * ry).toFixed(3),
-		i % 2 ? "" : "tip"
-	];
-});
-var shout = (radius) => require_geometry.rounded(shoutPoints().map(([x, y, tip]) => tip ? [
+var OUTER = [10.25, 8.4];
+var INNER = [7.75, 6.25];
+var shoutPoints = (radius, h) => {
+	const at = (i, [rx, ry]) => {
+		const a = -Math.PI / 2 + i * Math.PI / SPIKES;
+		return [CX + Math.cos(a) * rx, CY + Math.sin(a) * ry];
+	};
+	const r = radius ? require_geometry.crisp(radius) : 0;
+	return Array.from({ length: 22 }, (_, i) => {
+		if (i === 12) return [
+			3.5,
+			21.75,
+			"tip"
+		];
+		if (i % 2) return [...at(i, INNER), ""];
+		const [p, q, n] = [
+			at(i, OUTER),
+			at(i - 1, INNER),
+			at(i + 1, INNER)
+		];
+		const [u, v] = [[q[0] - p[0], q[1] - p[1]], [n[0] - p[0], n[1] - p[1]]];
+		const half = Math.acos((u[0] * v[0] + u[1] * v[1]) / Math.hypot(...u) / Math.hypot(...v)) / 2;
+		const out = r ? h - r * (1 / Math.sin(half) - 1) : h / Math.sin(half);
+		const [dx, dy] = [p[0] - CX, p[1] - CY];
+		const k = 1 - out / Math.hypot(dx, dy);
+		return [
+			+(CX + dx * k).toFixed(3),
+			+(CY + dy * k).toFixed(3),
+			"tip"
+		];
+	});
+};
+var shout = (radius, stroke = 1.5) => require_geometry.rounded(shoutPoints(radius, stroke / 2).map(([x, y, tip]) => tip ? [
 	x,
 	y,
 	require_geometry.crisp(radius)
 ] : [x, y]), Math.min(radius, .75));
-var SHOUT_CENTER = [12.5, 10];
+var SHOUT_CENTER = [CX, CY];
 var question = (cx, cy, s = 1) => [`M${cx - 2 * s} ${cy - 2 * s}A${2 * s} ${2 * s} 0 1 1 ${cx + 1.1 * s} ${cy - .35 * s}C${cx + .5 * s} ${cy + .05 * s} ${cx} ${cy + .5 * s} ${cx} ${cy + 1.25 * s}`, require_scene.dot(cx, cy + 4 * s)];
 var exclaim = (cx, cy, s = 1) => [`M${cx} ${cy - 4 * s}V${cy + 1.25 * s}`, require_scene.dot(cx, cy + 4 * s)];
 var CONTENTS = {

package/dist/src/manga.js

@@ -25,26 +25,44 @@ var bubble = (radius) => rounded(BUBBLE.map(([x, y, tip]) => tip ? [
 var BUBBLE_CENTER = [12.5, 9.75];
 var [CX, CY] = [12, 10];
 var SPIKES = 11;
-var shoutPoints = () => Array.from({ length: 22 }, (_, i) => {
-	const a = -Math.PI / 2 + i * Math.PI / SPIKES;
-	if (i === 14) return [
-		3.5,
-		21.5,
-		"tip"
-	];
-	const [rx, ry] = i % 2 ? [7.75, 6.25] : [10.25, 8.5];
-	return [
-		+(CX + Math.cos(a) * rx).toFixed(3),
-		+(CY + Math.sin(a) * ry).toFixed(3),
-		i % 2 ? "" : "tip"
-	];
-});
-var shout = (radius) => rounded(shoutPoints().map(([x, y, tip]) => tip ? [
+var OUTER = [10.25, 8.4];
+var INNER = [7.75, 6.25];
+var shoutPoints = (radius, h) => {
+	const at = (i, [rx, ry]) => {
+		const a = -Math.PI / 2 + i * Math.PI / SPIKES;
+		return [CX + Math.cos(a) * rx, CY + Math.sin(a) * ry];
+	};
+	const r = radius ? crisp(radius) : 0;
+	return Array.from({ length: 22 }, (_, i) => {
+		if (i === 12) return [
+			3.5,
+			21.75,
+			"tip"
+		];
+		if (i % 2) return [...at(i, INNER), ""];
+		const [p, q, n] = [
+			at(i, OUTER),
+			at(i - 1, INNER),
+			at(i + 1, INNER)
+		];
+		const [u, v] = [[q[0] - p[0], q[1] - p[1]], [n[0] - p[0], n[1] - p[1]]];
+		const half = Math.acos((u[0] * v[0] + u[1] * v[1]) / Math.hypot(...u) / Math.hypot(...v)) / 2;
+		const out = r ? h - r * (1 / Math.sin(half) - 1) : h / Math.sin(half);
+		const [dx, dy] = [p[0] - CX, p[1] - CY];
+		const k = 1 - out / Math.hypot(dx, dy);
+		return [
+			+(CX + dx * k).toFixed(3),
+			+(CY + dy * k).toFixed(3),
+			"tip"
+		];
+	});
+};
+var shout = (radius, stroke = 1.5) => rounded(shoutPoints(radius, stroke / 2).map(([x, y, tip]) => tip ? [
 	x,
 	y,
 	crisp(radius)
 ] : [x, y]), Math.min(radius, .75));
-var SHOUT_CENTER = [12.5, 10];
+var SHOUT_CENTER = [CX, CY];
 var question = (cx, cy, s = 1) => [`M${cx - 2 * s} ${cy - 2 * s}A${2 * s} ${2 * s} 0 1 1 ${cx + 1.1 * s} ${cy - .35 * s}C${cx + .5 * s} ${cy + .05 * s} ${cx} ${cy + .5 * s} ${cx} ${cy + 1.25 * s}`, dot(cx, cy + 4 * s)];
 var exclaim = (cx, cy, s = 1) => [`M${cx} ${cy - 4 * s}V${cy + 1.25 * s}`, dot(cx, cy + 4 * s)];
 var CONTENTS = {

package/dist/src/marks-cn.cjs

@@ -0,0 +1,40 @@
+const require_geometry = require("./geometry.cjs");
+//#region src/marks-cn.js
+var GLYPHS = {
+	yue: (r) => [
+		"M7.5 7V17",
+		"M9.75 7H16.5V16.25C16.5 16.9 16.25 17.25 15.75 17.25",
+		"M10.25 9.25L10.75 10",
+		"M13.75 9.25L13.25 10",
+		require_geometry.rounded([
+			[10, 12.25],
+			[14, 12.25],
+			[14, 14.75],
+			[10, 14.75]
+		], r),
+		"M11 14.75C11 16 10.6 16.9 9.75 17.5",
+		"M13 14.75V16.9C13 17.3 13.15 17.5 13.5 17.5"
+	],
+	you: () => [
+		"M10.5 6.75L6.5 12.75",
+		"M8.5 9.75V17.25",
+		"M10.5 10.5H17.75",
+		"M13 6.75V9.5C13 13 12.4 15.25 11 17",
+		"M15.25 10.5V15.5C15.25 16.5 15.6 16.9 16.25 16.9C16.85 16.9 17.1 16.4 17.1 15.5",
+		"M16 7.25L16.75 8.5"
+	],
+	zhun: () => [
+		"M7.5 8L8.25 9",
+		"M7.25 16.25L8.75 13.25",
+		"M13 6.5L9.5 11",
+		"M11.5 8.43V17.25",
+		"M15 6.25L15.5 7.25",
+		"M14.25 9.5V17",
+		"M11.5 9.5H16.75",
+		"M11.5 12H16.25",
+		"M11.5 14.5H16.25",
+		"M11.5 17H16.5"
+	]
+};
+//#endregion
+exports.GLYPHS = GLYPHS;

package/dist/src/marks-cn.js

@@ -0,0 +1,40 @@
+import { rounded } from "./geometry.js";
+//#region src/marks-cn.js
+var GLYPHS = {
+	yue: (r) => [
+		"M7.5 7V17",
+		"M9.75 7H16.5V16.25C16.5 16.9 16.25 17.25 15.75 17.25",
+		"M10.25 9.25L10.75 10",
+		"M13.75 9.25L13.25 10",
+		rounded([
+			[10, 12.25],
+			[14, 12.25],
+			[14, 14.75],
+			[10, 14.75]
+		], r),
+		"M11 14.75C11 16 10.6 16.9 9.75 17.5",
+		"M13 14.75V16.9C13 17.3 13.15 17.5 13.5 17.5"
+	],
+	you: () => [
+		"M10.5 6.75L6.5 12.75",
+		"M8.5 9.75V17.25",
+		"M10.5 10.5H17.75",
+		"M13 6.75V9.5C13 13 12.4 15.25 11 17",
+		"M15.25 10.5V15.5C15.25 16.5 15.6 16.9 16.25 16.9C16.85 16.9 17.1 16.4 17.1 15.5",
+		"M16 7.25L16.75 8.5"
+	],
+	zhun: () => [
+		"M7.5 8L8.25 9",
+		"M7.25 16.25L8.75 13.25",
+		"M13 6.5L9.5 11",
+		"M11.5 8.43V17.25",
+		"M15 6.25L15.5 7.25",
+		"M14.25 9.5V17",
+		"M11.5 9.5H16.75",
+		"M11.5 12H16.25",
+		"M11.5 14.5H16.25",
+		"M11.5 17H16.5"
+	]
+};
+//#endregion
+export { GLYPHS };

package/dist/src/marks.cjs

@@ -8,7 +8,7 @@ var square = (radius) => require_geometry.rounded([
 	[3.5, 20.5]
 ], radius);
 function glyphSquare(radius, stroke) {
-	const [a, b] = [3 + stroke / 2, 21 - stroke / 2];
+	const [a, b] = [2.5 + stroke / 2, 21.5 - stroke / 2];
 	return require_geometry.rounded([
 		[a, a],
 		[b, a],

package/dist/src/marks.js

@@ -8,7 +8,7 @@ var square = (radius) => rounded([
 	[3.5, 20.5]
 ], radius);
 function glyphSquare(radius, stroke) {
-	const [a, b] = [3 + stroke / 2, 21 - stroke / 2];
+	const [a, b] = [2.5 + stroke / 2, 21.5 - stroke / 2];
 	return rounded([
 		[a, a],
 		[b, a],

package/dist/src/modality.cjs

@@ -12,9 +12,9 @@ var line = (c, k, a, b) => {
 var plain = (paths) => paths.map((p) => p.d ?? p);
 var M = {
 	text: (c, k) => [
-		line(c, k, [-3.5, -3.5], [3.5, -3.5]),
-		line(c, k, [-3.5, -.5], [3.5, -.5]),
-		line(c, k, [-3.5, 2.5], [1, 2.5])
+		line(c, k, [-3.5, -3], [3.5, -3]),
+		line(c, k, [-3.5, 0], [3.5, 0]),
+		line(c, k, [-3.5, 3], [1, 3])
 	],
 	image: (c, k, r) => plain(require_symbols.image(c, k, r)),
 	video: (c, k, r) => [require_geometry.rounded(pts(c, k, [
@@ -29,21 +29,21 @@ var M = {
 		[1.5, .75]
 	]), Math.min(r, k * .5), false)],
 	audio: (c, k) => [
-		[-3.5, 1.25],
-		[-1.5, 3.5],
-		[.5, 2.5],
-		[2.5, 1]
+		[-3, 1.25],
+		[-1, 3.5],
+		[1, 2.5],
+		[3, 1]
 	].map(([x, h]) => line(c, k, [x, -h], [x, h])),
 	music: (c, k, r) => plain(require_symbols.music(c, k, r)),
 	speech: (c, k) => [
 		require_geometry.rounded(pts(c, k, [
-			[-.5, -3.5],
-			[1.5, -3.5],
-			[1.5, 0],
-			[-.5, 0]
+			[-1, -3.5],
+			[1, -3.5],
+			[1, 0],
+			[-1, 0]
 		]), k),
-		`M${at(c, k)([-2.5, -.5]).join(" ")}A${3 * k} ${3 * k} 0 0 0 ${at(c, k)([3.5, -.5]).join(" ")}`,
-		line(c, k, [.5, 2.5], [.5, 3.5])
+		`M${at(c, k)([-3, -.5]).join(" ")}A${3 * k} ${3 * k} 0 0 0 ${at(c, k)([3, -.5]).join(" ")}`,
+		line(c, k, [0, 2.5], [0, 3.5])
 	],
 	doc: (c, k, r) => [
 		require_geometry.rounded(pts(c, k, [
@@ -67,7 +67,7 @@ var M = {
 		line(c, k, [-1.5, -.5], [-1.5, 2.5])
 	],
 	cube: (c, k, r) => {
-		const [x, h] = [.5, 3];
+		const [x, h] = [0, 3];
 		return [
 			require_geometry.rounded(pts(c, k, [
 				[x, -3.5],
@@ -82,7 +82,7 @@ var M = {
 		];
 	},
 	any: (c, k, r) => plain(require_symbols.sparkle(c, k, r)),
-	lang: (c, k) => [require_letters.glyph("A", at(c, k)([-1.75 * 1.15, 0])[0], at(c, k)([0, 1.5 - 4.6])[1], 1.15 * k)],
+	lang: (c, k) => [require_letters.glyph("A", at(c, k)([-1.75 * 1.15, 0])[0], at(c, k)([0, -3 * 1.15])[1], 1.15 * k)],
 	tokens: (c, k, r) => [
 		line(c, k, [-3.5, -2.5], [3.5, -2.5]),
 		line(c, k, [-3.5, 1.5], [-3, 1.5]),
@@ -145,7 +145,7 @@ var M = {
 			[3, -1.5],
 			[-2, 3.5],
 			[2, 3.5]
-		].map(([x, y]) => [x + .5, y]);
+		];
 		return [
 			`M${at(c, k)(p[2]).join(" ")}L${at(c, k)(p[0]).join(" ")}L${at(c, k)(p[3]).join(" ")}`,
 			`M${at(c, k)(p[0]).join(" ")}L${at(c, k)(p[1]).join(" ")}`,
@@ -159,9 +159,9 @@ var M = {
 		`M${at(c, k)([-3.5, 2]).join(" ")}L${at(c, k)([0, 4]).join(" ")}L${at(c, k)([3.5, 2]).join(" ")}`
 	],
 	rank: (c, k) => [
-		line(c, k, [-3.5, -3.5], [3.5, -3.5]),
-		line(c, k, [-3.5, -.5], [1.5, -.5]),
-		line(c, k, [-3.5, 2.5], [-.5, 2.5])
+		line(c, k, [-3.5, -3], [3.5, -3]),
+		line(c, k, [-3.5, 0], [1.5, 0]),
+		line(c, k, [-3.5, 3], [-.5, 3])
 	],
 	blank: (c, k, r) => [
 		line(c, k, [-3.5, -2.5], [3.5, -2.5]),

package/dist/src/modality.js

@@ -12,9 +12,9 @@ var line = (c, k, a, b) => {
 var plain = (paths) => paths.map((p) => p.d ?? p);
 var M = {
 	text: (c, k) => [
-		line(c, k, [-3.5, -3.5], [3.5, -3.5]),
-		line(c, k, [-3.5, -.5], [3.5, -.5]),
-		line(c, k, [-3.5, 2.5], [1, 2.5])
+		line(c, k, [-3.5, -3], [3.5, -3]),
+		line(c, k, [-3.5, 0], [3.5, 0]),
+		line(c, k, [-3.5, 3], [1, 3])
 	],
 	image: (c, k, r) => plain(image(c, k, r)),
 	video: (c, k, r) => [rounded(pts(c, k, [
@@ -29,21 +29,21 @@ var M = {
 		[1.5, .75]
 	]), Math.min(r, k * .5), false)],
 	audio: (c, k) => [
-		[-3.5, 1.25],
-		[-1.5, 3.5],
-		[.5, 2.5],
-		[2.5, 1]
+		[-3, 1.25],
+		[-1, 3.5],
+		[1, 2.5],
+		[3, 1]
 	].map(([x, h]) => line(c, k, [x, -h], [x, h])),
 	music: (c, k, r) => plain(music(c, k, r)),
 	speech: (c, k) => [
 		rounded(pts(c, k, [
-			[-.5, -3.5],
-			[1.5, -3.5],
-			[1.5, 0],
-			[-.5, 0]
+			[-1, -3.5],
+			[1, -3.5],
+			[1, 0],
+			[-1, 0]
 		]), k),
-		`M${at(c, k)([-2.5, -.5]).join(" ")}A${3 * k} ${3 * k} 0 0 0 ${at(c, k)([3.5, -.5]).join(" ")}`,
-		line(c, k, [.5, 2.5], [.5, 3.5])
+		`M${at(c, k)([-3, -.5]).join(" ")}A${3 * k} ${3 * k} 0 0 0 ${at(c, k)([3, -.5]).join(" ")}`,
+		line(c, k, [0, 2.5], [0, 3.5])
 	],
 	doc: (c, k, r) => [
 		rounded(pts(c, k, [
@@ -67,7 +67,7 @@ var M = {
 		line(c, k, [-1.5, -.5], [-1.5, 2.5])
 	],
 	cube: (c, k, r) => {
-		const [x, h] = [.5, 3];
+		const [x, h] = [0, 3];
 		return [
 			rounded(pts(c, k, [
 				[x, -3.5],
@@ -82,7 +82,7 @@ var M = {
 		];
 	},
 	any: (c, k, r) => plain(sparkle(c, k, r)),
-	lang: (c, k) => [glyph("A", at(c, k)([-1.75 * 1.15, 0])[0], at(c, k)([0, 1.5 - 4.6])[1], 1.15 * k)],
+	lang: (c, k) => [glyph("A", at(c, k)([-1.75 * 1.15, 0])[0], at(c, k)([0, -3 * 1.15])[1], 1.15 * k)],
 	tokens: (c, k, r) => [
 		line(c, k, [-3.5, -2.5], [3.5, -2.5]),
 		line(c, k, [-3.5, 1.5], [-3, 1.5]),
@@ -145,7 +145,7 @@ var M = {
 			[3, -1.5],
 			[-2, 3.5],
 			[2, 3.5]
-		].map(([x, y]) => [x + .5, y]);
+		];
 		return [
 			`M${at(c, k)(p[2]).join(" ")}L${at(c, k)(p[0]).join(" ")}L${at(c, k)(p[3]).join(" ")}`,
 			`M${at(c, k)(p[0]).join(" ")}L${at(c, k)(p[1]).join(" ")}`,
@@ -159,9 +159,9 @@ var M = {
 		`M${at(c, k)([-3.5, 2]).join(" ")}L${at(c, k)([0, 4]).join(" ")}L${at(c, k)([3.5, 2]).join(" ")}`
 	],
 	rank: (c, k) => [
-		line(c, k, [-3.5, -3.5], [3.5, -3.5]),
-		line(c, k, [-3.5, -.5], [1.5, -.5]),
-		line(c, k, [-3.5, 2.5], [-.5, 2.5])
+		line(c, k, [-3.5, -3], [3.5, -3]),
+		line(c, k, [-3.5, 0], [1.5, 0]),
+		line(c, k, [-3.5, 3], [-.5, 3])
 	],
 	blank: (c, k, r) => [
 		line(c, k, [-3.5, -2.5], [3.5, -2.5]),

package/dist/src/notation.cjs

@@ -155,12 +155,12 @@ var NOTATION = {
 	"whole-rest": {
 		zh: "全休止符",
 		section: "rest",
-		paths: (r) => ["M4.5 9.5H19.5", {
+		paths: (r) => ["M4.5 10H19.5", {
 			d: require_geometry.rounded([
-				[8.5, 9.5],
-				[15.5, 9.5],
-				[15.5, 13.5],
-				[8.5, 13.5]
+				[8.5, 10],
+				[15.5, 10],
+				[15.5, 14],
+				[8.5, 14]
 			], require_geometry.crisp(r)),
 			fill: true
 		}]
@@ -168,12 +168,12 @@ var NOTATION = {
 	"half-rest": {
 		zh: "二分休止符",
 		section: "rest",
-		paths: (r) => ["M4.5 14.5H19.5", {
+		paths: (r) => ["M4.5 14H19.5", {
 			d: require_geometry.rounded([
-				[8.5, 10.5],
-				[15.5, 10.5],
-				[15.5, 14.5],
-				[8.5, 14.5]
+				[8.5, 10],
+				[15.5, 10],
+				[15.5, 14],
+				[8.5, 14]
 			], require_geometry.crisp(r)),
 			fill: true
 		}]
@@ -285,9 +285,9 @@ var NOTATION = {
 		zh: "尾声（Coda）",
 		section: "other",
 		paths: () => [
-			ellipse(11.5, 11.5, 5, 6),
-			"M11.5 2.5V20.5",
-			"M2.5 11.5H20.5"
+			ellipse(12, 12, 5, 6),
+			"M12 3V21",
+			"M3 12H21"
 		]
 	},
 	"staff": {

package/dist/src/notation.js

@@ -155,12 +155,12 @@ var NOTATION = {
 	"whole-rest": {
 		zh: "全休止符",
 		section: "rest",
-		paths: (r) => ["M4.5 9.5H19.5", {
+		paths: (r) => ["M4.5 10H19.5", {
 			d: rounded([
-				[8.5, 9.5],
-				[15.5, 9.5],
-				[15.5, 13.5],
-				[8.5, 13.5]
+				[8.5, 10],
+				[15.5, 10],
+				[15.5, 14],
+				[8.5, 14]
 			], crisp(r)),
 			fill: true
 		}]
@@ -168,12 +168,12 @@ var NOTATION = {
 	"half-rest": {
 		zh: "二分休止符",
 		section: "rest",
-		paths: (r) => ["M4.5 14.5H19.5", {
+		paths: (r) => ["M4.5 14H19.5", {
 			d: rounded([
-				[8.5, 10.5],
-				[15.5, 10.5],
-				[15.5, 14.5],
-				[8.5, 14.5]
+				[8.5, 10],
+				[15.5, 10],
+				[15.5, 14],
+				[8.5, 14]
 			], crisp(r)),
 			fill: true
 		}]
@@ -285,9 +285,9 @@ var NOTATION = {
 		zh: "尾声（Coda）",
 		section: "other",
 		paths: () => [
-			ellipse(11.5, 11.5, 5, 6),
-			"M11.5 2.5V20.5",
-			"M2.5 11.5H20.5"
+			ellipse(12, 12, 5, 6),
+			"M12 3V21",
+			"M3 12H21"
 		]
 	},
 	"staff": {

package/dist/src/okta.cjs

@@ -1,6 +1,6 @@
 const require_geometry = require("./geometry.cjs");
 //#region src/okta.js
-var [C, R] = [11.5, 9];
+var [C, R] = [12, 9];
 var ring = () => require_geometry.circle(C, C, R);
 var fill = (d) => ({
 	d,

package/dist/src/okta.js

@@ -1,6 +1,6 @@
 import { circle } from "./geometry.js";
 //#region src/okta.js
-var [C, R] = [11.5, 9];
+var [C, R] = [12, 9];
 var ring = () => circle(C, C, R);
 var fill = (d) => ({
 	d,