@jannchie/icons 0.3.0 → 0.4.0

package/dist/src/quality.js

@@ -1,5 +1,5 @@
 import { rounded } from "./geometry.js";
-import { line } from "./letters.js";
+import { LABEL, line, snap } from "./letters.js";
 //#region src/quality.js
 var H = 1.2;
 var widthOf = (n) => n > 2 ? .85 : 1.2;
@@ -48,9 +48,9 @@ function quality(text, radius) {
 		[21.5, 5.5],
 		[21.5, 18.5],
 		[2.5, 18.5]
-	], Math.min(radius, 2.5)), ...line(text, [12, 12], widthOf(text.length), GAP, H).map((d) => ({
+	], Math.min(radius, 2.5)), ...snap(line(text, [12, 12], widthOf(text.length), GAP, H, LABEL)).map((d) => ({
 		d,
-		detail: true
+		thin: true
 	}))];
 }
 //#endregion

package/dist/src/rate.js

@@ -1,5 +1,5 @@
 import { dot } from "./scene.js";
-import { advance, glyph, shift, snap } from "./letters.js";
+import { LABEL, advance, glyph, shift, snap } from "./letters.js";
 //#region src/rate.js
 var H = 7;
 var TOP = 12 - H / 2;
@@ -31,8 +31,8 @@ function rate(text) {
 			out.push(dot(x + POINT / 2, 15.25));
 			x += POINT;
 		} else {
-			out.push(glyph(c, x - shift(c) * sx, TOP, sx, sy));
-			x += advance(c) * sx;
+			out.push(glyph(c, x - shift(c, LABEL) * sx, TOP, sx, sy, LABEL));
+			x += advance(c, LABEL) * sx;
 		}
 		x += gapAfter(i);
 	});

package/dist/src/rating.js

@@ -1,5 +1,5 @@
 import { circle, rounded } from "./geometry.js";
-import { line, textWidth } from "./letters.js";
+import { LABEL, line, snap, textWidth } from "./letters.js";
 import { tagShape } from "./marks.js";
 //#region src/rating.js
 var sq = (x0, y0, x1, y1) => [
@@ -21,9 +21,9 @@ var FRAMES = {
 	tall: {
 		shape: (r) => rounded(sq(3.5, 2.5, 20.5, 21.5), Math.min(r, 2.5)),
 		box: [
-			7,
+			6.5,
 			5,
-			17,
+			17.5,
 			19
 		]
 	},
@@ -265,26 +265,29 @@ var SYSTEMS = {
 	}
 };
 var GAP = 2;
+var ROW_GAP = 3;
 var PLUS = 3;
 var PLUS_GAP = 2;
 var MAX_SY = 1.2;
 var ASPECT = .95;
 function layout(rows, [x0, y0, x1, y1]) {
 	const extra = (r) => r.plus ? 5 : 0;
-	const sy = Math.min(MAX_SY, (y1 - y0 - GAP * (rows.length - 1)) / (6 * rows.length));
-	const sx = Math.min(sy * ASPECT, ...rows.map((r) => (x1 - x0 - extra(r) - GAP * (r.chars.length - 1)) / textWidth(r.chars, 1, 0)));
+	const sy = Math.min(MAX_SY, (y1 - y0 - ROW_GAP * (rows.length - 1)) / (6 * rows.length));
+	const sx = Math.min(sy * ASPECT, ...rows.map((r) => (x1 - x0 - extra(r) - GAP * (r.chars.length - 1)) / textWidth(r.chars, 1, 0, LABEL)));
 	const h = 6 * sy;
-	const top = (y0 + y1) / 2 - (h * rows.length + GAP * (rows.length - 1)) / 2;
+	const top = (y0 + y1) / 2 - (h * rows.length + ROW_GAP * (rows.length - 1)) / 2;
 	return rows.flatMap((r, i) => {
-		const width = textWidth(r.chars, sx, GAP);
+		const width = textWidth(r.chars, sx, GAP, LABEL);
 		const left = (x0 + x1) / 2 - (width + extra(r)) / 2;
-		const y = top + i * (h + GAP);
-		const out = line(r.chars, [left + width / 2, y + h / 2], sx, GAP, sy);
+		const y = top + i * (h + ROW_GAP);
+		const out = line(r.chars, [left + width / 2, y + h / 2], sx, GAP, sy, LABEL);
+		const row = snap(out);
 		if (r.plus) {
-			const [px, py] = [left + width + PLUS_GAP + PLUS / 2, y + PLUS / 2];
-			out.push(`M${px - PLUS / 2} ${py}H${px + PLUS / 2}M${px} ${py - PLUS / 2}V${py + PLUS / 2}`);
+			const half = (v) => Math.round(v - .5) + .5;
+			const [px, py] = [half(left + width + PLUS_GAP + PLUS / 2), half(y + PLUS / 2)];
+			row.push(`M${px - PLUS / 2} ${py}H${px + PLUS / 2}M${px} ${py - PLUS / 2}V${py + PLUS / 2}`);
 		}
-		return out;
+		return row;
 	});
 }
 function rating(system, text, radius) {

package/dist/src/resin.js

@@ -1,5 +1,5 @@
 import { crisp, rounded } from "./geometry.js";
-import { line } from "./letters.js";
+import { LABEL, line, snap } from "./letters.js";
 //#region src/resin.js
 var V = [
 	[12, 3],
@@ -44,9 +44,9 @@ var RESIN = Object.fromEntries([
 		0,
 		1,
 		2
-	].flatMap((k) => arrow(k, radius)), ...line(n, [12, 14]).map((d) => ({
+	].flatMap((k) => arrow(k, radius)), ...snap(line(n, [12, 14], 1, 1.5, 1, LABEL)).map((d) => ({
 		d,
-		detail: true
+		thin: true
 	}))]
 }]));
 //#endregion

package/dist/src/scene.js

@@ -17,5 +17,9 @@ var opening = (cx, w, h) => [
 	[cx + w / 2, 20 - h],
 	[cx + w / 2, GROUND]
 ];
+var softEar = (a, t, b, k = 1.3) => {
+	const c = (p) => [p[0] + (t[0] - p[0]) * k, p[1] + (t[1] - p[1]) * k].map((v) => +v.toFixed(3)).join(" ");
+	return `C${c(a)} ${c(b)} ${b.map((v) => +v.toFixed(3)).join(" ")}`;
+};
 //#endregion
-export { GROUND, dot, eye, groundLine, opening };
+export { GROUND, dot, eye, groundLine, opening, softEar };

package/dist/src/sensor.js

@@ -1,4 +1,4 @@
-import { line, textWidth } from "./letters.js";
+import { LABEL, line, snap, textWidth } from "./letters.js";
 //#region src/sensor.js
 var L = 2.5;
 var [X0, Y0, X1, Y1] = [
@@ -13,11 +13,12 @@ var cropMarks = () => [
 	`M${X1} ${Y1 - L}V${Y1}H${X1 - L}`,
 	`M${X0 + L} ${Y1}H${X0}V${Y1 - L}`
 ];
-var SPAN = 16;
-var GAP = 1.75;
+var SPAN = 14;
+var GAP = 2;
+var SY = 5 / 6;
 var label = (text) => {
-	const sx = Math.min(1, (SPAN - GAP * (text.length - 1)) / textWidth(text, 1, 0));
-	return line(text, [12, 12], sx, GAP, 1).map((d) => ({
+	const sx = Math.min(1, (SPAN - GAP * (text.length - 1)) / textWidth(text, 1, 0, LABEL));
+	return snap(line(text, [12, 12], sx, GAP, SY, LABEL)).map((d) => ({
 		d,
 		thin: true
 	}));
@@ -41,7 +42,7 @@ var SENSORS = {
 	},
 	"one-inch": {
 		zh: "1 英寸",
-		paths: () => [...line("1", [10.5, 12], 1, GAP, 1), "M14 9V11M16 9V11"].map((d) => ({
+		paths: () => snap([...line("1", [10.5, 12], 1, GAP, SY, LABEL), "M13.5 9.5V11.5M15.5 9.5V11.5"]).map((d) => ({
 			d,
 			thin: true
 		}))

package/dist/src/symbols.js

@@ -31,7 +31,7 @@ var cornerScale = Object.fromEntries(Object.entries({
 	gauge: 1,
 	lock: 1,
 	code: 1,
-	search: 1,
+	search: .85,
 	heart: 1,
 	question: 1,
 	exclaim: 1,
@@ -91,10 +91,10 @@ var outlines = {
 	ring: { circle: 3 },
 	star: { circle: 3.45 },
 	cloud: { box: [
-		-3.65,
-		-2.65,
+		-3.66,
+		-1.66,
 		3.6,
-		2.65
+		2.67
 	] },
 	shield: { box: [
 		-3.01,
@@ -334,19 +334,24 @@ var drawStar = ([x, y], k = 1, radius = 0) => {
 };
 var cloudCircles = [
 	[
-		-1.95,
-		.95,
-		1.7
+		-2.68,
+		1.67,
+		.98
 	],
 	[
-		.1,
-		-.25,
-		2.4
+		-1.11,
+		.29,
+		1.57
 	],
 	[
-		2,
 		1.05,
-		1.6
+		.1,
+		1.76
+	],
+	[
+		2.42,
+		1.49,
+		1.18
 	]
 ];
 var cloudFillet = .5;
@@ -366,23 +371,31 @@ function arcTo([cx, cy, r], from, to) {
 	return `A${r} ${r} 0 ${((Math.atan2(to[1] - cy, to[0] - cx) - a0) % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI) > Math.PI ? 1 : 0} 1 ${to[0]} ${to[1]}`;
 }
 function cloudTop([x, y], k) {
-	const [left, mid, right] = cloudCircles.map(([cx, cy, r]) => [
+	const cs = cloudCircles.map(([cx, cy, r]) => [
 		x + cx * k,
 		y + cy * k,
 		r * k
 	]);
 	const f = cloudFillet * k;
-	const p1 = upperIntersection(left, mid);
-	const p2 = upperIntersection(mid, right);
-	const l1 = pointOn(left, angleOn(left, p1) - f / left[2]);
-	const m1 = pointOn(mid, angleOn(mid, p1) + f / mid[2]);
-	const m2 = pointOn(mid, angleOn(mid, p2) - f / mid[2]);
-	const r1 = pointOn(right, angleOn(right, p2) + f / right[2]);
-	const start = [left[0], left[1] + left[2]];
-	const end = [right[0], right[1] + right[2]];
 	const pt = (p) => `${p[0]} ${p[1]}`;
+	const start = [cs[0][0], cs[0][1] + cs[0][2]];
+	const end = [cs.at(-1)[0], cs.at(-1)[1] + cs.at(-1)[2]];
+	let arcs = "";
+	let from = start;
+	cs.forEach((c, i) => {
+		const next = cs[i + 1];
+		if (!next) {
+			arcs += arcTo(c, from, end);
+			return;
+		}
+		const p = upperIntersection(c, next);
+		const out = pointOn(c, angleOn(c, p) - f / c[2]);
+		const into = pointOn(next, angleOn(next, p) + f / next[2]);
+		arcs += `${arcTo(c, from, out)}Q${pt(p)} ${pt(into)}`;
+		from = into;
+	});
 	return {
-		arcs: `${arcTo(left, start, l1)}Q${pt(p1)} ${pt(m1)}${arcTo(mid, m1, m2)}Q${pt(p2)} ${pt(r1)}${arcTo(right, r1, end)}`,
+		arcs,
 		start,
 		end
 	};

package/dist/src/unit.js

@@ -1,6 +1,6 @@
 import { dot } from "./scene.js";
 import { circle, crisp, rounded } from "./geometry.js";
-import { line, snap } from "./letters.js";
+import { LABEL, line, snap } from "./letters.js";
 //#region src/unit.js
 var [X0, Y0, X1, Y1] = [
 	3.5,
@@ -17,7 +17,7 @@ var cross = [`M${X0} ${Y0}L${X1} ${Y1}`, `M${X1} ${Y0}L${X0} ${Y1}`];
 var track = `M9.5 9.5H15.5A3 3 0 0 1 15.5 15.5H9.5A3 3 0 0 1 9.5 9.5Z`;
 var wings = `M9.5 ${Y1}A1.5 1.5 0 0 1 ${CX} ${Y1}A1.5 1.5 0 0 1 15.5 ${Y1}`;
 var slash = `M${X0} ${Y1}L${X1} ${Y0}`;
-var text = (str) => [snap(line(str, [CX, CY], 1, 2, 1))].flat().map((d) => ({
+var text = (str) => [snap(line(str, [CX, CY], 1, 2, 1, LABEL))].flat().map((d) => ({
 	d,
 	thin: true
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jannchie/icons",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Line icons on a 24-unit grid, redrawn for every corner radius and stroke weight, with pixel hinting and duo-tone colors",
   "license": "MIT",
   "author": "Jianqi Pan",