@jannchie/icons 0.7.0 → 0.8.0

package/dist/src/icons/violin.cjs

@@ -1,11 +1,10 @@
 const require_transform = require("../transform.cjs");
 //#region src/icons/violin.js
-var violin_default = ({ radius }) => [
-	require_transform.rotate("M12 8C10 8 8.5 9 8.5 10.5C8.5 11.5 9.3 12 9.3 12.8C9.3 13.5 8 14 8 16C8 18.5 9.8 21 12 21C14.2 21 16 18.5 16 16C16 14 14.7 13.5 14.7 12.8C14.7 12 15.5 11.5 15.5 10.5C15.5 9 14 8 12 8Z", -45),
-	require_transform.rotate("M10.25 14.25V17.25", -45),
-	require_transform.rotate("M13.75 14.25V17.25", -45),
-	require_transform.rotate("M12 8V3.25", -45),
-	require_transform.rotate("M12 3.25C12 1.5 14 1.25 14.25 2.6C14.4 3.4 13.5 3.8 13 3.2", -45)
+var violin_default = () => [
+	require_transform.rotate("M11 8C8.75 8 7.25 9 7.25 10.5C7.25 11.5 8.25 12 8.25 12.75C8.25 13.25 6.75 14 6.75 16.5C6.75 19 8.75 21 11 21C13.25 21 15.25 19 15.25 16.5C15.25 14 13.75 13.25 13.75 12.75C13.75 12 14.75 11.5 14.75 10.5C14.75 9 13.25 8 11 8Z", -45),
+	require_transform.rotate("M9.5 15V17.75", -45),
+	require_transform.rotate("M12.5 15V17.75", -45),
+	require_transform.rotate("M11 8V3.75A1.75 1.75 0 1 1 13.75 5.18", -45)
 ];
 //#endregion
 exports.default = violin_default;

package/dist/src/icons/violin.js

@@ -1,11 +1,10 @@
 import { rotate } from "../transform.js";
 //#region src/icons/violin.js
-var violin_default = ({ radius }) => [
-	rotate("M12 8C10 8 8.5 9 8.5 10.5C8.5 11.5 9.3 12 9.3 12.8C9.3 13.5 8 14 8 16C8 18.5 9.8 21 12 21C14.2 21 16 18.5 16 16C16 14 14.7 13.5 14.7 12.8C14.7 12 15.5 11.5 15.5 10.5C15.5 9 14 8 12 8Z", -45),
-	rotate("M10.25 14.25V17.25", -45),
-	rotate("M13.75 14.25V17.25", -45),
-	rotate("M12 8V3.25", -45),
-	rotate("M12 3.25C12 1.5 14 1.25 14.25 2.6C14.4 3.4 13.5 3.8 13 3.2", -45)
+var violin_default = () => [
+	rotate("M11 8C8.75 8 7.25 9 7.25 10.5C7.25 11.5 8.25 12 8.25 12.75C8.25 13.25 6.75 14 6.75 16.5C6.75 19 8.75 21 11 21C13.25 21 15.25 19 15.25 16.5C15.25 14 13.75 13.25 13.75 12.75C13.75 12 14.75 11.5 14.75 10.5C14.75 9 13.25 8 11 8Z", -45),
+	rotate("M9.5 15V17.75", -45),
+	rotate("M12.5 15V17.75", -45),
+	rotate("M11 8V3.75A1.75 1.75 0 1 1 13.75 5.18", -45)
 ];
 //#endregion
 export { violin_default as default };

package/dist/src/icons/x-list.cjs

@@ -1,7 +1,7 @@
 const require_symbols = require("../symbols.cjs");
 const require_list = require("../list.cjs");
 //#region src/icons/x-list.js
-var x_list_default = ({ radius }) => [...require_symbols.cross([12, 12], 2, radius), ...require_list.listMark([18, 18]).map((p) => typeof p === "string" ? {
+var x_list_default = ({ radius, stroke }) => [...require_symbols.cross([12, 12], 2, radius), ...require_list.listMark([18, 18], stroke).map((p) => typeof p === "string" ? {
 	d: p,
 	cut: true
 } : {

package/dist/src/icons/x-list.js

@@ -1,7 +1,7 @@
 import { cross } from "../symbols.js";
 import { listMark } from "../list.js";
 //#region src/icons/x-list.js
-var x_list_default = ({ radius }) => [...cross([12, 12], 2, radius), ...listMark([18, 18]).map((p) => typeof p === "string" ? {
+var x_list_default = ({ radius, stroke }) => [...cross([12, 12], 2, radius), ...listMark([18, 18], stroke).map((p) => typeof p === "string" ? {
 	d: p,
 	cut: true
 } : {

package/dist/src/letters.cjs

@@ -29,7 +29,7 @@ var GLYPHS = {
 	X: "M0 0L3.5 6M3.5 0L0 6",
 	Y: "M0 0L1.75 3L3.5 0M1.75 3V6",
 	Z: "M0 0H3.5L0 6H3.5",
-	0: "M0 1.75A1.75 1.75 0 0 1 3.5 1.75V4.25A1.75 1.75 0 0 1 0 4.25Z",
+	0: "M.375 1.75A1.375 1.75 0 0 1 3.125 1.75V4.25A1.375 1.75 0 0 1 .375 4.25Z",
 	1: "M.75 1.25L2 0V6",
 	2: "M0 1.5A1.75 1.5 0 1 1 3.18 2.36L0 6H3.5",
 	3: "M0 1.5A1.75 1.5 0 1 1 1.75 3A1.75 1.5 0 1 1 0 4.5",
@@ -69,7 +69,7 @@ var LABEL_GLYPHS = {
 	X: "M0 0L3.5 7M3.5 0L0 7",
 	Y: "M0 0L1.75 3.5L3.5 0M1.75 3.5V7",
 	Z: "M0 0H3.5L0 7H3.5",
-	0: "M1 0H2.5L3.5 1V6L2.5 7H1L0 6V1Z",
+	0: "M1.25 0H2.25L3.125 .875V6.125L2.25 7H1.25L.375 6.125V.875Z",
 	1: "M1 1L2.25 0V7",
 	2: "M0 1L1 0H2.5L3.5 1V2.5L2.5 3.5H1L0 4.5V7H3.5",
 	3: "M0 0H2.5L3.5 1V2.5L2.5 3.5H1M2.5 3.5L3.5 4.5V6L2.5 7H0",

package/dist/src/letters.js

@@ -29,7 +29,7 @@ var GLYPHS = {
 	X: "M0 0L3.5 6M3.5 0L0 6",
 	Y: "M0 0L1.75 3L3.5 0M1.75 3V6",
 	Z: "M0 0H3.5L0 6H3.5",
-	0: "M0 1.75A1.75 1.75 0 0 1 3.5 1.75V4.25A1.75 1.75 0 0 1 0 4.25Z",
+	0: "M.375 1.75A1.375 1.75 0 0 1 3.125 1.75V4.25A1.375 1.75 0 0 1 .375 4.25Z",
 	1: "M.75 1.25L2 0V6",
 	2: "M0 1.5A1.75 1.5 0 1 1 3.18 2.36L0 6H3.5",
 	3: "M0 1.5A1.75 1.5 0 1 1 1.75 3A1.75 1.5 0 1 1 0 4.5",
@@ -69,7 +69,7 @@ var LABEL_GLYPHS = {
 	X: "M0 0L3.5 7M3.5 0L0 7",
 	Y: "M0 0L1.75 3.5L3.5 0M1.75 3.5V7",
 	Z: "M0 0H3.5L0 7H3.5",
-	0: "M1 0H2.5L3.5 1V6L2.5 7H1L0 6V1Z",
+	0: "M1.25 0H2.25L3.125 .875V6.125L2.25 7H1.25L.375 6.125V.875Z",
 	1: "M1 1L2.25 0V7",
 	2: "M0 1L1 0H2.5L3.5 1V2.5L2.5 3.5H1L0 4.5V7H3.5",
 	3: "M0 0H2.5L3.5 1V2.5L2.5 3.5H1M2.5 3.5L3.5 4.5V6L2.5 7H0",

package/dist/src/license.cjs

@@ -6,36 +6,44 @@ var SEAL = [
 	16,
 	2.5
 ];
-var seal = () => {
+var seal = (h) => {
 	const [x, y, r] = SEAL;
 	return [{
 		d: require_geometry.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) => require_geometry.rounded([
-	[2.5, 2.5],
-	[21.5, 2.5],
-	[21.5, 16.5],
-	[2.5, 16.5]
+var paper = (radius, h) => require_geometry.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)) / require_letters.textWidth(text, 1, 1.5, require_letters.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 = require_letters.line(text, [12, 8], sx, gap, 5.5 / 6, require_letters.LABEL);
 	return [
-		paper(radius),
-		...seal(),
-		...require_letters.snap(require_letters.line(text, [12, 8], sx, GAP, 5 / 6, require_letters.LABEL)).map((d) => ({
+		paper(radius, h),
+		...seal(h),
+		...(n > 3 ? letters : require_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/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

@@ -50,7 +50,7 @@ var markRows = [
 	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

@@ -50,6 +50,6 @@ var markRows = [
 	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,21 +25,39 @@ 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)

package/dist/src/manga.js

@@ -25,21 +25,39 @@ 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)

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/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 };