@johnmorrisdotca/dougu-sports 0.4.1 → 0.5.1

package/dist/emblems/gear/gear.budo.js

@@ -1,5 +1,8 @@
-import { drawn, seg } from "./gear.core.js";
-/** The colours of a judo belt from the first rank to the black belt, in order, which `tint` takes. */
+import { drawn, rect } from "./gear.core.js";
+/**
+ * The colours of the judo belts, which `tint` takes: the six kyu colours in order, black (1st to 5th dan), `kohaku` (the red of the red-and-white belt of the 6th to 8th dan, whose white panels are the accent) and
+ * `red` (9th and 10th dan). The Kodokan's own kyu belts are white and brown only; the colours between are a later, national addition, so a country's order may differ.
+ */
 export const OBI_RANKS = {
     white: "#f2efe8",
     yellow: "#f2c21b",
@@ -8,53 +11,311 @@ export const OBI_RANKS = {
     blue: "#2b64c8",
     brown: "#7a4a24",
     black: "#1f2228",
+    kohaku: "#c4202e",
+    red: "#c4202e",
 };
-const CLOTH = "#f4f2ec";
-const EDGE = "#7b8491";
-/** A belt tied at the waist (a flat band, a knot, two ends hanging) from `x0` to `x1` at height `y`. */
-const tied = (x0, x1, y) => {
-    const c = (x0 + x1) / 2;
-    return `M${x0} ${y}H${x1}V${y + 4}H${x0}zM${c - 3} ${y - 0.6}h6v5.2h-6zM${c - 1.4} ${y + 4.6}L${c - 4.6} ${y + 14}h3.4L${c + 0.4} ${y + 4.6}zM${c + 1.4} ${y + 4.6}L${c + 4.8} ${y + 13.4}h-3.4L${c - 0.4} ${y + 4.6}z`;
+/** Judogi colours: the IJF white ("snow white") and blue (between Pantone 285M and 286M). */
+export const JUDOGI_WHITE = "#f6f4ee";
+export const JUDOGI_BLUE = "#1456b6";
+const f = (n) => String(Math.round(n * 10) / 10);
+const path = (pts, close = true) => `M${pts.map((p) => `${f(p[0])} ${f(p[1])}`).join("L")}${close ? "z" : ""}`;
+const mirror = (pts) => pts.map((p) => [64 - p[0], p[1]]);
+/** A rectangle of width `w` along the segment from `a` to `b`, as a polygon. */
+const strip = (a, b, w) => {
+    const dx = b[0] - a[0], dy = b[1] - a[1];
+    const l = Math.hypot(dx, dy) || 1;
+    const nx = (-dy / l) * (w / 2), ny = (dx / l) * (w / 2);
+    return [[a[0] + nx, a[1] + ny], [b[0] + nx, b[1] + ny], [b[0] - nx, b[1] - ny], [a[0] - nx, a[1] - ny]];
+};
+const lerp = (a, b, t) => [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t];
+/** A line parallel to the segment from `a` to `b`, `off` to its side, between the fractions `t0` and `t1` of its length. */
+const along = (a, b, off, t0, t1) => {
+    const dx = b[0] - a[0], dy = b[1] - a[1];
+    const l = Math.hypot(dx, dy) || 1;
+    const nx = (-dy / l) * off, ny = (dx / l) * off;
+    const p0 = lerp(a, b, t0), p1 = lerp(a, b, t1);
+    return `M${f(p0[0] + nx)} ${f(p0[1] + ny)}L${f(p1[0] + nx)} ${f(p1[1] + ny)}`;
+};
+/** Horizontal rows (every `step`, from `y0` to `y1`) clipped to a convex polygon, as one path. */
+function rows(poly, y0, y1, step, inset = 0) {
+    let d = "";
+    for (let y = y0; y <= y1 + 1e-6; y += step) {
+        const xs = [];
+        for (let i = 0; i < poly.length; i++) {
+            const a = poly[i], b = poly[(i + 1) % poly.length];
+            if ((a[1] <= y && b[1] > y) || (b[1] <= y && a[1] > y))
+                xs.push(a[0] + ((y - a[1]) / (b[1] - a[1])) * (b[0] - a[0]));
+        }
+        if (xs.length >= 2) {
+            const xa = Math.min(...xs) + inset, xb = Math.max(...xs) - inset;
+            if (xb > xa)
+                d += `M${f(xa)} ${f(y)}H${f(xb)}`;
+        }
+    }
+    return d;
+}
+// Cloth lines are laid over the cloth as ink at low opacity (dark rows) or as light rows, so they follow any tint.
+const INK = "#0d1522";
+/** The edge of a black belt: light enough to show on a dark page. */
+const BELT_EDGE = "#5d6672";
+const dark = (d, w = 0.3, op = 0.2) => ({ d, fill: "none", stroke: INK, w, op, line: "none" });
+const light = (d, w = 0.3, op = 0.3) => ({ d, fill: "none", stroke: "#ffffff", w, op, line: "none" });
+/** A belt tied at the front: two wraps, a flat square knot and two equal ends hanging a little apart. Parts, back to front. */
+function belt(s) {
+    const parts = [];
+    const hw = (s.x1 - s.x0) / 2;
+    const w = s.w;
+    const alt = s.alt ?? s.main;
+    const edge = (x, y) => y + s.sag * (1 - ((x - s.cx) / hw) ** 2);
+    const sample = (xa, xb) => {
+        const n = Math.max(2, Math.ceil((xb - xa) / 9));
+        return Array.from({ length: n + 1 }, (_, i) => xa + ((xb - xa) * i) / n);
+    };
+    /** The wrap between `xa` and `xb`, from the fraction `f0` to `f1` of its width, whose top is at `y`, as a polygon that follows the sag. */
+    const band = (xa, xb, y, f0 = 0, f1 = 1) => {
+        const xs = sample(xa, xb);
+        return [...xs.map((x) => [x, edge(x, y + w * f0)]), ...xs.map((x) => [x, edge(x, y + w * f1)]).reverse()];
+    };
+    const line = (y, xa, xb) => path(sample(xa, xb).map((x) => [x, edge(x, y)]), false);
+    const colourAt = (cuts, start, other) => {
+        const xs = [s.x0, ...cuts, s.x1];
+        return xs.slice(0, -1).map((x, i) => [x, xs[i + 1], i % 2 === 0 ? start : other]);
+    };
+    const yU = s.y, yL = s.y + w - 0.3;
+    const wraps = [
+        [yL, s.panels === undefined ? [[s.x0, s.x1, s.main]] : colourAt(s.panels.lower, alt, s.main)],
+        [yU, s.panels === undefined ? [[s.x0, s.x1, s.main]] : colourAt(s.panels.upper, s.main, alt)],
+    ];
+    const stitches = (y, xa, xb) => {
+        parts.push(dark(line(y + w * 0.3, xa, xb) + line(y + w * 0.7, xa, xb), 0.28, 0.3));
+        parts.push(light(line(y + w * 0.3 + 0.35, xa, xb) + line(y + w * 0.7 + 0.35, xa, xb), 0.25, 0.2));
+    };
+    for (const [y, segments] of wraps) {
+        for (const [xa, xb, fill] of segments)
+            parts.push({ d: path(band(xa, xb, y)), fill, stroke: s.edge, cyl: 0.5, shade: 0.25 });
+        if (s.half === true)
+            parts.push({ d: path(band(s.x0, s.x1, y, 0.5, 1)), fill: alt, stroke: "none", cyl: 0.5, shade: 0.25, line: "none" });
+        stitches(y, s.x0 + 0.8, s.x1 - 0.8);
+        if (s.stripe === true)
+            parts.push({ d: path(band(s.x0, s.x1, y, 0.425, 0.575)), fill: "#f6f4ee", stroke: "none", line: "none" });
+    }
+    // The knot sits over both wraps. The two ends come out from under it, a little apart and of one length; the knot is a flat blob closed across the middle by the turn of the second end.
+    const yc = (yU + yL + w) / 2 + s.sag;
+    const hh = w * 1.2;
+    const kw = s.knot;
+    const yt = yc - hh, yb = yc + hh;
+    const rad = (s.splay * Math.PI) / 180;
+    const tw = w * 1.02;
+    const tailFill = s.panels?.tail ?? s.main;
+    for (const side of [-1, 1]) {
+        const a = [s.cx + side * kw * 0.2, yc + hh * 0.2];
+        const b = [a[0] + side * Math.sin(rad) * s.tail, a[1] + Math.cos(rad) * s.tail];
+        parts.push({ d: path(strip(a, b, tw)), fill: tailFill, stroke: s.edge, cyl: 0.55, shade: 0.25 });
+        if (s.half === true) {
+            const q = strip(a, b, tw);
+            parts.push({ d: path([lerp(q[0], q[3], 0.5), lerp(q[1], q[2], 0.5), q[2], q[3]]), fill: alt, stroke: "none", cyl: 0.55, shade: 0.25, line: "none" });
+        }
+        parts.push(dark(along(a, b, -tw * 0.18, 0.3, 0.98) + along(a, b, tw * 0.18, 0.3, 0.98), 0.28, 0.3));
+        parts.push(light(along(a, b, -tw * 0.18 + 0.35, 0.3, 0.98) + along(a, b, tw * 0.18 + 0.35, 0.3, 0.98), 0.25, 0.2));
+        if (s.stripe === true)
+            parts.push({ d: path(strip(lerp(a, b, 0.25), lerp(a, b, 1), tw * 0.15)), fill: "#f6f4ee", stroke: "none", line: "none" });
+        if (s.bars === true)
+            parts.push({ d: path(strip(lerp(a, b, 1 - 3.4 / s.tail), lerp(a, b, 1 - 2.2 / s.tail), tw)), fill: "$accent", stroke: "none", op: 0.9, line: "none" });
+    }
+    const kfill = s.panels === undefined ? s.main : alt;
+    const blob = rect(s.cx - kw / 2, yt, kw, hh * 2, Math.min(2.4, kw * 0.22));
+    parts.push({ d: blob, fill: kfill, stroke: s.edge, cyl: 0.6, shade: 0.3 });
+    if (s.half === true)
+        parts.push({ d: rect(s.cx - kw / 2, yc, kw, hh, Math.min(2.4, kw * 0.22)), fill: alt, stroke: "none", cyl: 0.6, shade: 0.3, line: "none" });
+    // the folds of the knot: two diagonals that cross, from the top corners to the foot of the knot
+    const fx0 = s.cx - kw / 2, fx1 = s.cx + kw / 2;
+    parts.push(dark(`M${f(fx0 + 0.9)} ${f(yt + 0.9)}L${f(fx1 - 1.6)} ${f(yb - 0.9)}M${f(fx1 - 0.9)} ${f(yt + 0.9)}L${f(fx0 + 1.6)} ${f(yb - 0.9)}`, 0.34, 0.42));
+    parts.push(light(`M${f(fx0 + 1.5)} ${f(yt + 0.9)}L${f(fx1 - 1)} ${f(yb - 0.9)}M${f(fx1 - 1.5)} ${f(yt + 0.9)}L${f(fx0 + 1)} ${f(yb - 0.9)}`, 0.3, 0.3));
+    const wt = yc - w * 0.46, wh = w * 0.92;
+    parts.push({ d: rect(fx0 - 0.5, wt, kw + 1, wh, 0.9), fill: s.main, stroke: s.edge, cyl: 0.9, shade: 0.3 });
+    if (s.half === true)
+        parts.push({ d: rect(fx0 - 0.5, yc, kw + 1, wh / 2, 0.5), fill: alt, stroke: "none", cyl: 0.9, shade: 0.3, line: "none" });
+    parts.push(dark(`M${f(fx0)} ${f(yc)}H${f(fx1)}`, 0.28, 0.3));
+    if (s.stripe === true)
+        parts.push({ d: rect(fx0 - 0.3, yc - w * 0.075, kw + 0.6, w * 0.15), fill: "#f6f4ee", stroke: "none", line: "none" });
+    return parts;
+}
+// ───────────────────────────── the judogi ─────────────────────────────
+/**
+ * The judogi laid flat: jacket (sleeves out to the sides, lapels crossed left over right, thick stitched collar, quilted upper body, vented skirt), the belt tied over it and the trousers below with a drawstring
+ * waist and reinforced knees. `$main` is the cloth, `$accent` the belt.
+ */
+function judogiFlat() {
+    const parts = [];
+    // Trousers, behind everything: straight legs, a waistband with its drawstring, reinforced knees.
+    const trousers = [[18.4, 37], [45.6, 37], [46.6, 62], [34.6, 62], [32, 43.6], [29.4, 62], [17.4, 62]];
+    parts.push({ d: path(trousers), fill: "$main", shade: 0.3, cyl: 0.25 });
+    parts.push({ d: path([[18.4, 37], [45.6, 37], [45.7, 39.8], [18.3, 39.8]]), fill: "$main", shade: 0.2 });
+    parts.push(dark("M18.6 38.9H45.4", 0.3, 0.35));
+    parts.push({ d: "M40.6 39.8Q39.4 42.8 40.4 45.2M42 39.8Q43 42.6 42.2 45", fill: "none", stroke: INK, w: 0.4, op: 0.5, line: "none" });
+    const knees = [[[19.2, 49.8], [30.8, 49.8], [30, 57.6], [18.8, 57.6]], [[33.2, 49.8], [44.8, 49.8], [45.2, 57.6], [34, 57.6]]];
+    for (const k of knees) {
+        parts.push({ d: path(k), fill: "$main", stroke: "none", shade: 0, line: "none" });
+        parts.push(dark(path(k) + rows(k, 51.4, 56.4, 1.6, 0.3), 0.28, 0.35));
+    }
+    parts.push(dark("M17.6 60.2H29.6M34.4 60.2H46.4", 0.3, 0.3));
+    // Sleeves: long, wide, ending past the wrist, laid out and down.
+    const sleeve = [[19.8, 6.4], [1.4, 20.2], [4.6, 27.6], [18.6, 22.4]];
+    for (const pts of [sleeve, mirror(sleeve)])
+        parts.push({ d: path(pts), fill: "$main", cyl: 0.15, shade: 0.35 });
+    const jacket = [[19.4, 6.6], [26.2, 4], [32, 3.2], [37.8, 4], [44.6, 6.6], [45.6, 8], [45.6, 36], [18.4, 36], [18.4, 8]];
+    parts.push({ d: path(jacket), fill: "$main", shade: 0.35, cyl: 0.18 });
+    // Quilting: rows over the shoulders, chest and sleeves (the cloth of a judogi is heavy and woven double).
+    const body = [[19, 7], [45, 7], [45.6, 26], [18.4, 26]];
+    parts.push(dark(rows(body, 8, 25, 1.4, 0.5), 0.28, 0.1));
+    parts.push(light(rows(body, 8.5, 25.5, 1.4, 0.5), 0.24, 0.2));
+    for (const pts of [sleeve, mirror(sleeve)]) {
+        let d = "";
+        for (let t = 0.1; t <= 0.9; t += 0.08) {
+            const a = lerp(pts[0], pts[1], t), b = lerp(pts[3], pts[2], t);
+            const a2 = lerp(a, b, 0.07), b2 = lerp(a, b, 0.93);
+            d += `M${f(a2[0])} ${f(a2[1])}L${f(b2[0])} ${f(b2[1])}`;
+        }
+        parts.push(dark(d, 0.28, 0.1));
+    }
+    // The neck: the collar goes round the back of the neck, and the opening is a V that ends under 10 cm below the sternum.
+    parts.push({ d: path([[26.4, 4.2], [37.6, 4.2], [33.4, 14]]), fill: INK, stroke: INK, w: 0.3, op: 0.62, line: "none" });
+    parts.push({ d: "M25.4 5.4Q32 2 38.6 5.4L37.6 8.2Q32 5.4 26.4 8.2Z", fill: "$main", cyl: 0.4, shade: 0.3 });
+    // Under lapel (the right front, worn under), its band running down to where the left front covers it.
+    parts.push({ d: path(strip([26.8, 5.4], [33.8, 14.4], 2.9)), fill: "$main", cyl: 0.5, shade: 0.3 });
+    // The left front, laid over: its panel and its thick, stitched lapel from the right of the neck to the hem.
+    const over = [[36.4, 4.4], [44.6, 6.6], [45.6, 8], [45.6, 36], [22.8, 36]];
+    parts.push({ d: path(over), fill: "$main", shade: 0.35, cyl: 0.1 });
+    const overBody = [[36, 5], [45.6, 8], [45.6, 26], [28.8, 26]];
+    parts.push(dark(rows(overBody, 8, 25, 1.4, 0.5), 0.3, 0.14));
+    parts.push(light(rows(overBody, 8.5, 25.5, 1.4, 0.5), 0.26, 0.22));
+    parts.push({ d: path(strip([37, 4.8], [24.4, 35], 3.9)), fill: "$main", cyl: 0.55, shade: 0.35 });
+    parts.push({ d: path(strip([37, 4.8], [24.4, 35], 3.9)), fill: "none", stroke: INK, w: 0.3, op: 0.5, line: "none" });
+    // Rows of stitching down both lapels.
+    const lapelRows = (a, b, shift = 0) => [-1.3, -0.45, 0.45, 1.3].map((o) => along([a[0] + shift, a[1]], [b[0] + shift, b[1]], o, 0, 1)).join("");
+    parts.push(dark(lapelRows([36.6, 7.4], [24.8, 34.4]), 0.28, 0.45));
+    parts.push(light(lapelRows([36.6, 7.4], [24.8, 34.4], 0.35), 0.25, 0.3));
+    parts.push(dark(lapelRows([27.2, 6.4], [33.4, 14]), 0.28, 0.45));
+    // Shadow of the lapel on the cloth under it.
+    parts.push({ d: path(strip([34.6, 5.4], [22.6, 36], 1.2)), fill: INK, stroke: "none", op: 0.14, fx: true });
+    // Hem: the skirt reaches past the belt, with short vents at the sides and a stitched edge.
+    parts.push(dark("M18.8 34.4H44.8", 0.3, 0.32));
+    parts.push(dark("M20.2 31.4V36M43.8 31.4V36", 0.4, 0.45));
+    // The belt, over the jacket, wrapped twice.
+    parts.push(...belt({ edge: BELT_EDGE, main: "$accent", cx: 32, x0: 18.2, x1: 45.8, y: 25.2, w: 2.5, sag: 0, knot: 6.4, tail: 11.4, splay: 6 }));
+    return parts;
+}
+/** The judogi folded into a neat rectangle: collar and lapel stitching on top, the belt tied round it. */
+function judogiFolded() {
+    const parts = [];
+    // The front of the pile (its thickness) under the top.
+    const front = [[8.4, 41], [55.6, 41], [55.2, 52], [8.8, 52]];
+    parts.push({ d: path(front), fill: "$main", shade: 0.25, cyl: 0.4 });
+    parts.push({ d: path(front), fill: INK, stroke: "none", op: 0.12, fx: true });
+    parts.push(dark("M9 44.6H55M8.9 48.2H55.1", 0.3, 0.3));
+    parts.push(light("M9 45.2H55M8.9 48.8H55.1", 0.26, 0.25));
+    // The top: sleeves folded back at the sides, the body folded over in thirds.
+    const top = [[9, 9.4], [55, 9.4], [55.6, 41], [8.4, 41]];
+    parts.push({ d: path(top), fill: "$main", shade: 0.35, cyl: 0.18 });
+    parts.push(dark(rows(top, 10.4, 40, 1.4, 0.8), 0.3, 0.14));
+    parts.push(light(rows(top, 10.9, 40.5, 1.4, 0.8), 0.26, 0.22));
+    parts.push(dark("M14.6 10.4L14.2 40.4M49.4 10.4L49.8 40.4", 0.35, 0.28));
+    // The collar, lapels crossed left over right, with rows of stitching.
+    parts.push({ d: path([[27.2, 9.4], [36.8, 9.4], [32.8, 18]]), fill: INK, stroke: INK, w: 0.3, op: 0.34, line: "none" });
+    parts.push({ d: "M23.6 10.6Q32 5.6 40.4 10.6L39.2 14Q32 10.2 24.8 14Z", fill: "$main", cyl: 0.4, shade: 0.3 });
+    parts.push({ d: path(strip([27.2, 10.8], [33.4, 18.6], 3.1)), fill: "$main", cyl: 0.5, shade: 0.3 });
+    const over = [[36.4, 9.8], [55, 9.4], [55.6, 41], [22.4, 41]];
+    parts.push({ d: path(over), fill: "$main", shade: 0.35, cyl: 0.1 });
+    parts.push(dark(rows([[36.4, 10], [55, 10], [55, 26], [29, 26]], 10.4, 25.6, 1.4, 0.8), 0.3, 0.14));
+    parts.push({ d: path(strip([37.2, 10], [23.2, 40], 3.8)), fill: "$main", cyl: 0.55, shade: 0.35 });
+    parts.push({ d: path(strip([37.2, 10], [23.2, 40], 3.8)), fill: "none", stroke: INK, w: 0.3, op: 0.5, line: "none" });
+    const rowsAlong = (a, b) => [-1.3, -0.45, 0.45, 1.3].map((o) => along(a, b, o, 0, 1)).join("");
+    parts.push(dark(rowsAlong([37, 12], [24, 39]), 0.28, 0.45));
+    parts.push(dark(rowsAlong([28, 11.4], [33.2, 18]), 0.28, 0.45));
+    parts.push({ d: path(strip([36, 10.6], [22.6, 41], 1.4)), fill: INK, stroke: "none", op: 0.12, fx: true });
+    // The belt wrapped round it and tied on top.
+    parts.push(...belt({ edge: BELT_EDGE, main: "$accent", cx: 32, x0: 7.6, x1: 56.4, y: 26.4, w: 3, sag: 0, knot: 7.4, tail: 12.6, splay: 6 }));
+    return parts;
+}
+export const GEAR_JUDOGI = /* @__PURE__ */ drawn("gear:judogi", "Judo suit", "柔道衣", { main: JUDOGI_WHITE, accent: OBI_RANKS.black, parts: judogiFlat() });
+export const GEAR_JUDOGI_BLUE = /* @__PURE__ */ drawn("gear:judogi-blue", "Blue judo suit", "青い柔道衣", { main: JUDOGI_BLUE, accent: OBI_RANKS.black, parts: judogiFlat() });
+export const GEAR_JUDOGI_FOLDED = /* @__PURE__ */ drawn("gear:judogi-folded", "Folded judo suit", "畳んだ柔道衣", { main: JUDOGI_WHITE, accent: OBI_RANKS.black, parts: judogiFolded() });
+export const GEAR_JUDOGI_BLUE_FOLDED = /* @__PURE__ */ drawn("gear:judogi-blue-folded", "Folded blue judo suit", "畳んだ青い柔道衣", { main: JUDOGI_BLUE, accent: OBI_RANKS.black, parts: judogiFolded() });
+// ───────────────────────────── the karate-gi ─────────────────────────────
+/** The karate-gi laid flat: lighter cloth (no quilting), a plain narrow collar, shorter jacket and sleeves than the judogi, tie strings, ankle-length trousers and the belt. `$main` is the cloth, `$accent` the belt. */
+function karateFlat() {
+    const parts = [];
+    const trousers = [[19.4, 40], [44.6, 40], [45.4, 61.4], [34.4, 61.4], [32, 49], [29.6, 61.4], [18.6, 61.4]];
+    parts.push({ d: path(trousers), fill: "$main", shade: 0.3, cyl: 0.15 });
+    parts.push({ d: path([[19.4, 40], [44.6, 40], [44.6, 41.8], [19.4, 41.8]]), fill: "$main", shade: 0.15 });
+    parts.push(dark("M19.6 41.4H44.4", 0.3, 0.3));
+    parts.push({ d: "M26 41.8Q24.4 44.6 25.4 47M27.6 41.8Q28.4 44.4 27.4 46.8", fill: "none", stroke: INK, w: 0.35, op: 0.45, line: "none" });
+    parts.push(dark("M18.8 60H29.6M34.4 60H45.2", 0.3, 0.25));
+    // Sleeves reach the bend of the wrist at most (WKF 2.2.1 j), so they are shorter than a judogi's, with a wide cuff.
+    const sleeve = [[20.6, 8], [8.6, 16.6], [11.8, 23], [19.4, 22]];
+    for (const pts of [sleeve, mirror(sleeve)])
+        parts.push({ d: path(pts), fill: "$main", shade: 0.3, cyl: 0.12 });
+    const jacket = [[20.2, 8], [26.6, 5.2], [32, 4.4], [37.4, 5.2], [43.8, 8], [44.8, 38.6], [19.2, 38.6]];
+    parts.push({ d: path(jacket), fill: "$main", shade: 0.3, cyl: 0.15 });
+    // Neck: a wide V that ends lower than the judogi's, a plain thin collar.
+    parts.push({ d: path([[27.4, 5.4], [36.6, 5.4], [32, 19.6]]), fill: INK, stroke: INK, w: 0.3, op: 0.3, line: "none" });
+    parts.push({ d: "M26.4 6.2Q32 3.4 37.6 6.2L37 8Q32 5.6 27 8Z", fill: "$main", cyl: 0.3, shade: 0.2 });
+    parts.push({ d: path(strip([26.6, 6.6], [32.6, 19.8], 1.8)), fill: "$main", cyl: 0.3, shade: 0.2 });
+    const over = [[36.4, 6.2], [43.8, 8], [44.8, 38.6], [24.6, 38.6]];
+    parts.push({ d: path(over), fill: "$main", shade: 0.3, cyl: 0.08 });
+    parts.push({ d: path(strip([36.8, 6.4], [23.4, 38], 2)), fill: "$main", cyl: 0.35, shade: 0.25 });
+    parts.push({ d: path(strip([36.8, 6.4], [23.4, 38], 2)), fill: "none", stroke: INK, w: 0.3, op: 0.5, line: "none" });
+    parts.push({ d: path(strip([35.6, 7.2], [23, 38.6], 1)), fill: INK, stroke: "none", op: 0.1, fx: true });
+    // The ties of the jacket (WKF 2.2.1 i): two short strings at the chest.
+    parts.push({ d: "M29.6 21.6Q28 23.6 28.6 26M27.4 22.4Q26.2 24.4 26.4 26.4", fill: "none", stroke: INK, w: 0.4, op: 0.5, line: "none" });
+    parts.push(dark("M19.8 36.6H44.2", 0.3, 0.3));
+    // The belt: 5 cm wide, with 15 cm free on each side of the knot, tied low on the hips; red (AKA) by default.
+    parts.push(...belt({ main: "$accent", cx: 32, x0: 19, x1: 45, y: 27.4, w: 2.6, sag: 0, knot: 6.2, tail: 8.8, splay: 7 }));
+    return parts;
+}
+export const GEAR_KARATE_GI = /* @__PURE__ */ drawn("gear:karate-gi", "Karate suit", "空手衣", { main: "#fbfaf6", accent: "#c4202e", parts: karateFlat() });
+// ───────────────────────────── the belts ─────────────────────────────
+const obiSpec = (extra) => belt({ main: "$main", cx: 32, x0: 2.4, x1: 61.6, y: 13, w: 5, sag: 1.6, knot: 11.2, tail: 23, splay: 7, bars: true, ...extra });
+const obiPiece = (id, en, ja, main, parts, accent) => drawn(id, en, ja, { main, accent, parts });
+export const GEAR_OBI = /* @__PURE__ */ obiPiece("gear:obi", "Belt", "武道の帯", OBI_RANKS.black, obiSpec({ edge: BELT_EDGE }));
+export const GEAR_OBI_WHITE = /* @__PURE__ */ obiPiece("gear:obi-white", "White belt", "白帯", OBI_RANKS.white, obiSpec());
+export const GEAR_OBI_YELLOW = /* @__PURE__ */ obiPiece("gear:obi-yellow", "Yellow belt", "黄帯", OBI_RANKS.yellow, obiSpec());
+export const GEAR_OBI_ORANGE = /* @__PURE__ */ obiPiece("gear:obi-orange", "Orange belt", "橙帯", OBI_RANKS.orange, obiSpec());
+export const GEAR_OBI_GREEN = /* @__PURE__ */ obiPiece("gear:obi-green", "Green belt", "緑帯", OBI_RANKS.green, obiSpec());
+export const GEAR_OBI_BLUE = /* @__PURE__ */ obiPiece("gear:obi-blue", "Blue belt", "青帯", OBI_RANKS.blue, obiSpec());
+export const GEAR_OBI_BROWN = /* @__PURE__ */ obiPiece("gear:obi-brown", "Brown belt", "茶帯", OBI_RANKS.brown, obiSpec());
+export const GEAR_OBI_RED = /* @__PURE__ */ obiPiece("gear:obi-red", "Red belt", "紅帯", OBI_RANKS.red, obiSpec());
+/** The red-and-white belt of the 6th to 8th dan: panels of red and white (about 21 cm long), red at both ends. */
+export const GEAR_OBI_KOHAKU = /* @__PURE__ */ obiPiece("gear:obi-kohaku", "Red and white belt", "紅白帯", OBI_RANKS.kohaku, obiSpec({ alt: "$accent", panels: { upper: [19, 45], lower: [11, 53], tail: "$main" }, bars: false }), "#f6f4ee");
+/** The black belt of a woman in Japan: a white stripe down the middle of the belt along its whole length. */
+export const GEAR_OBI_WOMEN = /* @__PURE__ */ obiPiece("gear:obi-women", "Women's black belt", "女子用の黒帯", OBI_RANKS.black, obiSpec({ stripe: true, edge: BELT_EDGE }));
+const OBI_BY_RANK = { white: GEAR_OBI_WHITE, yellow: GEAR_OBI_YELLOW, orange: GEAR_OBI_ORANGE, green: GEAR_OBI_GREEN, blue: GEAR_OBI_BLUE, brown: GEAR_OBI_BROWN, black: GEAR_OBI, kohaku: GEAR_OBI_KOHAKU, red: GEAR_OBI_RED };
+// Two-colour belts: the intermediate belts several countries give between two kyu (the IJF names white-yellow, yellow-orange, orange-green and green-blue; France has had them since 1990), drawn as two halves of the
+// belt's width, running the whole length. `tint` is the colour of the upper half and `accent` the colour of the lower.
+const SPLIT = obiSpec({ half: true, alt: "$accent", bars: false });
+const split = (id, en, ja, a, b) => obiPiece(id, en, ja, OBI_RANKS[a], SPLIT, OBI_RANKS[b]);
+export const GEAR_OBI_WHITE_YELLOW = /* @__PURE__ */ split("gear:obi-white-yellow", "White and yellow belt", "白と黄の二色帯", "white", "yellow");
+export const GEAR_OBI_YELLOW_ORANGE = /* @__PURE__ */ split("gear:obi-yellow-orange", "Yellow and orange belt", "黄と橙の二色帯", "yellow", "orange");
+export const GEAR_OBI_ORANGE_GREEN = /* @__PURE__ */ split("gear:obi-orange-green", "Orange and green belt", "橙と緑の二色帯", "orange", "green");
+export const GEAR_OBI_GREEN_BLUE = /* @__PURE__ */ split("gear:obi-green-blue", "Green and blue belt", "緑と青の二色帯", "green", "blue");
+export const GEAR_OBI_BLUE_BROWN = /* @__PURE__ */ split("gear:obi-blue-brown", "Blue and brown belt", "青と茶の二色帯", "blue", "brown");
+/** Any two colours: the belt `obi` draws for a pair. */
+const OBI_SPLIT = /* @__PURE__ */ split("gear:obi-split", "Two-colour belt", "二色の帯", "white", "yellow");
+/**
+ * The belt of a rank: `"white"`, `"yellow"`, `"orange"`, `"green"`, `"blue"`, `"brown"` (the kyu), `"black"` (1st to 5th dan), `"kohaku"` (red and white panels, 6th to 8th dan) or `"red"` (9th and 10th dan), or
+ * a pair of ranks (`["white", "yellow"]`) for a two-colour belt. An unknown rank is the black belt. `tint` takes one colour, or a pair for a two-colour belt. `women: true` adds the white stripe that women wear on a
+ * black belt in Japan.
+ */
+export const obi = (rank, options) => {
+    const { women, tint, ...rest } = options ?? {};
+    const colour = (r) => (Object.hasOwn(OBI_RANKS, r) ? OBI_RANKS[r] : OBI_RANKS.black);
+    if (Array.isArray(tint) && tint.length === 2)
+        return OBI_SPLIT.svg({ ...rest, tint: tint[0], accent: tint[1] });
+    if (Array.isArray(rank))
+        return OBI_SPLIT.svg({ ...rest, tint: colour(rank[0]), accent: colour(rank[1]) });
+    const known = typeof rank === "string" && Object.hasOwn(OBI_RANKS, rank) ? rank : "black";
+    const one = typeof tint === "string" ? { ...rest, tint } : rest;
+    if (women === true && known === "black")
+        return GEAR_OBI_WOMEN.svg(one);
+    return OBI_BY_RANK[known].svg(one);
 };
-export const GEAR_JUDOGI = /* @__PURE__ */ drawn("gear:judogi", "Judo suit", "柔道衣", {
-    main: CLOTH,
-    accent: "#1f2228",
-    parts: [
-        { d: "M22.4 44.4H31.6L30.8 61H21.2ZM32.4 44.4H41.6L42.8 61H33.2Z", fill: "$main", cyl: 0.6, shade: 0.3 },
-        { d: "M23.6 9.4L8 36.4Q6.6 39.4 9.4 41.4L14.6 45Q17.4 46.4 19 43.4L29 27.4Z", fill: "$main", cyl: 0.5, shade: 0.4 },
-        { d: "M40.4 9.4L56 36.4Q57.4 39.4 54.6 41.4L49.4 45Q46.6 46.4 45 43.4L35 27.4Z", fill: "$main", cyl: 0.5, shade: 0.4 },
-        { d: "M23.6 9.4Q32 7 40.4 9.4L45 27.4V46H19V27.4Z", fill: "$main", cyl: 0.6, shade: 0.4 },
-        { d: "M26 8.6L35.4 31M38 8.6L28.6 31", fill: "none", stroke: "#cfc8b8", w: 3.6, line: "none" },
-        { d: "M26 8.6L35.4 31M38 8.6L28.6 31", fill: "none", stroke: "#8f98a3", w: 0.7, line: "stroke" },
-        { d: "M29.2 9.4Q32 12 34.8 9.4L32 16Z", fill: "#3a414b", stroke: "none", op: 0.5, line: "none", fx: true },
-        { d: "M13 31L19.4 39.4M11.4 34.4L17.6 42.4M47 31L40.6 39.4M48.6 34.4L42.4 42.4", fill: "none", stroke: "#a9b1bb", w: 0.7, line: "none" },
-        { d: tied(19, 45, 40.4), fill: "$accent", stroke: EDGE, cyl: 0.8, shade: 0.2 },
-    ],
-});
-export const GEAR_KARATE_GI = /* @__PURE__ */ drawn("gear:karate-gi", "Karate suit", "空手衣", {
-    main: CLOTH,
-    accent: "#1f2228",
-    parts: [
-        { d: "M20.4 46H31.4L28.4 61H17.8ZM32.6 46H43.6L46.2 61H35.6Z", fill: "$main", cyl: 0.6, shade: 0.3 },
-        { d: "M22.6 9.6L9 27.4Q7 30.4 9.6 32.4L13 34.6Q15.6 36.6 17.6 33.6L26 22Z", fill: "$main", cyl: 0.5, shade: 0.4 },
-        { d: "M41.4 9.6L55 27.4Q57 30.4 54.4 32.4L51 34.6Q48.4 36.6 46.4 33.6L38 22Z", fill: "$main", cyl: 0.5, shade: 0.4 },
-        { d: "M22.6 9.6Q32 7.4 41.4 9.6L44.8 28V48H19.2V28Z", fill: "$main", cyl: 0.6, shade: 0.4 },
-        { d: "M25.4 8.8L37 37M38.6 8.8L27 37", fill: "none", stroke: "#8f98a3", w: 0.9, line: "stroke" },
-        { d: "M28.8 9.6Q32 13 35.2 9.6L32 19Z", fill: "#3a414b", stroke: "none", op: 0.5, line: "none", fx: true },
-        { d: tied(19.2, 44.8, 40), fill: "$accent", stroke: EDGE, cyl: 0.8, shade: 0.2 },
-    ],
-});
-export const GEAR_OBI = /* @__PURE__ */ drawn("gear:obi", "Belt", "武道の帯", {
-    main: OBI_RANKS.black,
-    parts: [
-        { d: "M35 34L24.4 57.6L30 61L40.6 36Z", fill: "$main", stroke: EDGE, cyl: 0.7, shade: 0.3 },
-        { d: "M29 34L40.4 57.6L46 55.4L34.6 34Z", fill: "$main", stroke: EDGE, cyl: 0.7, shade: 0.3 },
-        { d: seg(27.4, 55.6, 31.4, 58.4) + seg(38.4, 54.6, 42.4, 53), fill: "none", stroke: "$accent", w: 1.6, line: "none" },
-        { d: "M2.6 23.4Q32 27.6 61.4 23.4V34.4Q32 38.6 2.6 34.4Z", fill: "$main", stroke: EDGE, cyl: 0.7, shade: 0.3 },
-        { d: "M2.6 27.2Q32 31.4 61.4 27.2", fill: "none", stroke: "$accent", w: 1.4, line: "none" },
-        { d: "M25.4 22.4h13.2v15.6H25.4z", fill: "$main", stroke: EDGE, cyl: 1, shade: 0.3 },
-        { d: "M25.4 27.6h13.2M25.4 32.6h13.2", fill: "none", stroke: "$accent", w: 0.8, line: "none" },
-    ],
-});
-/** The belt of a rank, `"white"` to `"black"`: the same as `GEAR_OBI.svg({ ...options, tint: OBI_RANKS[rank] })`. An unknown rank is the black belt. */
-export const obi = (rank, options) => GEAR_OBI.svg({ ...options, tint: Object.hasOwn(OBI_RANKS, rank) ? OBI_RANKS[rank] : OBI_RANKS.black });

package/dist/emblems/gear/gear.index.js

@@ -17,10 +17,10 @@ import { GEAR_STARTING_BLOCKS, GEAR_RELAY_BATON, GEAR_JAVELIN, GEAR_HURDLES } fr
 import { GEAR_DIVING_BOARD, GEAR_SWIM_GOGGLES } from "./gear.water.js";
 import { GEAR_GUNBAI, GEAR_MAWASHI } from "./gear.sumo.js";
 import { GEAR_SHINAI, GEAR_KENDO_MEN } from "./gear.kendo.js";
-import { GEAR_JUDOGI, GEAR_KARATE_GI, GEAR_OBI } from "./gear.budo.js";
+import { GEAR_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_KARATE_GI, GEAR_OBI, GEAR_OBI_WHITE, GEAR_OBI_YELLOW, GEAR_OBI_ORANGE, GEAR_OBI_GREEN, GEAR_OBI_BLUE, GEAR_OBI_BROWN, GEAR_OBI_KOHAKU, GEAR_OBI_RED, GEAR_OBI_WOMEN, GEAR_OBI_WHITE_YELLOW, GEAR_OBI_YELLOW_ORANGE, GEAR_OBI_ORANGE_GREEN, GEAR_OBI_GREEN_BLUE, GEAR_OBI_BLUE_BROWN } from "./gear.budo.js";
 import { GEAR_YUMI, GEAR_YA } from "./gear.kyudo.js";
 /** Every piece of gear, in the order a gallery shows them. */
-export const GEARS = [GEAR_HOCKEY_STICK, GEAR_GOALIE_STICK, GEAR_HOCKEY_SKATE, GEAR_GOALIE_MASK, GEAR_GOAL_NET, GEAR_FIELD_HOCKEY_STICK, GEAR_LACROSSE_STICK, GEAR_CRICKET_BAT, GEAR_WICKET, GEAR_TABLE_TENNIS_PADDLE, GEAR_BADMINTON_RACKET, GEAR_TENNIS_RACKET, GEAR_SQUASH_RACKET, GEAR_RACQUETBALL_RACKET, GEAR_PADEL_RACKET, GEAR_PICKLEBALL_PADDLE, GEAR_ROUNDNET_SET, GEAR_VOLLEYBALL_NET, GEAR_BASKETBALL_HOOP, GEAR_BASEBALL_BAT, GEAR_BASEBALL_GLOVE, GEAR_FOOTBALL_HELMET, GEAR_GOALPOSTS, GEAR_HURLEY, GEAR_CURLING_BROOM, GEAR_FIGURE_SKATE, GEAR_SPEED_SKATE, GEAR_DIVING_BOARD, GEAR_SWIM_GOGGLES, GEAR_STARTING_BLOCKS, GEAR_RELAY_BATON, GEAR_JAVELIN, GEAR_HURDLES, GEAR_GUNBAI, GEAR_MAWASHI, GEAR_SHINAI, GEAR_KENDO_MEN, GEAR_JUDOGI, GEAR_OBI, GEAR_YUMI, GEAR_YA, GEAR_KARATE_GI];
+export const GEARS = [GEAR_HOCKEY_STICK, GEAR_GOALIE_STICK, GEAR_HOCKEY_SKATE, GEAR_GOALIE_MASK, GEAR_GOAL_NET, GEAR_FIELD_HOCKEY_STICK, GEAR_LACROSSE_STICK, GEAR_CRICKET_BAT, GEAR_WICKET, GEAR_TABLE_TENNIS_PADDLE, GEAR_BADMINTON_RACKET, GEAR_TENNIS_RACKET, GEAR_SQUASH_RACKET, GEAR_RACQUETBALL_RACKET, GEAR_PADEL_RACKET, GEAR_PICKLEBALL_PADDLE, GEAR_ROUNDNET_SET, GEAR_VOLLEYBALL_NET, GEAR_BASKETBALL_HOOP, GEAR_BASEBALL_BAT, GEAR_BASEBALL_GLOVE, GEAR_FOOTBALL_HELMET, GEAR_GOALPOSTS, GEAR_HURLEY, GEAR_CURLING_BROOM, GEAR_FIGURE_SKATE, GEAR_SPEED_SKATE, GEAR_DIVING_BOARD, GEAR_SWIM_GOGGLES, GEAR_STARTING_BLOCKS, GEAR_RELAY_BATON, GEAR_JAVELIN, GEAR_HURDLES, GEAR_GUNBAI, GEAR_MAWASHI, GEAR_SHINAI, GEAR_KENDO_MEN, GEAR_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_OBI, GEAR_OBI_WHITE, GEAR_OBI_YELLOW, GEAR_OBI_ORANGE, GEAR_OBI_GREEN, GEAR_OBI_BLUE, GEAR_OBI_BROWN, GEAR_OBI_KOHAKU, GEAR_OBI_RED, GEAR_OBI_WOMEN, GEAR_OBI_WHITE_YELLOW, GEAR_OBI_YELLOW_ORANGE, GEAR_OBI_ORANGE_GREEN, GEAR_OBI_GREEN_BLUE, GEAR_OBI_BLUE_BROWN, GEAR_YUMI, GEAR_YA, GEAR_KARATE_GI];
 /** The id of every piece of gear: `"gear:hockey-stick"`. */
 export const GEAR_IDS = GEARS.map((g) => g.id);
 const TABLE = new Map(GEARS.map((g) => [g.id, g]));

package/dist/emblems/sport/cfl.js

@@ -1,5 +1,5 @@
-// Canadian football: a pictogram drawn for this package, in a 64 by 64 box. The metal style paints its main shapes with a grey sheet, the line style draws one outline.
+// Canadian football: the pictogram of the ball with a white stripe all the way round near each end (CFL Rule 1, Section 2), drawn for this package from `ball:football-cfl`, in a 64 by 64 box.
 import { defineIcon } from "../emblem.shapes.js";
-import { SPORT_NFL } from "./nfl.js";
+import { footballModel } from "./nfl.js";
 /** Canadian football. */
-export const SPORT_CFL = /* @__PURE__ */ defineIcon("sport:cfl", "Canadian football", "カナディアンフットボール", "ours", SPORT_NFL.model);
+export const SPORT_CFL = /* @__PURE__ */ defineIcon("sport:cfl", "Canadian football", "カナディアンフットボール", "ours", footballModel("ring"));

package/dist/emblems/sport/ifaf.js

@@ -1,5 +1,5 @@
-// International football: a pictogram drawn for this package, in a 64 by 64 box. The metal style paints its main shapes with a grey sheet, the line style draws one outline.
+// International football: the pictogram of the ball with a stripe near each end on the two panels next to the laces only (IFAF Rule 1, Section 3), drawn for this package from `ball:football-ifaf`, in a 64 by 64 box.
 import { defineIcon } from "../emblem.shapes.js";
-import { SPORT_NFL } from "./nfl.js";
+import { footballModel } from "./nfl.js";
 /** American football, international rules. */
-export const SPORT_IFAF = /* @__PURE__ */ defineIcon("sport:ifaf", "International football", "国際アメフト", "ours", SPORT_NFL.model);
+export const SPORT_IFAF = /* @__PURE__ */ defineIcon("sport:ifaf", "International football", "国際アメフト", "ours", footballModel("top"));

package/dist/emblems/sport/judo.js

@@ -1,13 +1,18 @@
-// Judo: a pictogram of the suit and its belt, drawn for this package, in a 64 by 64 box. The metal style paints its main shapes with a grey sheet, the line style draws one outline.
-import { defineIcon } from "../emblem.shapes.js";
+// Judo: a pictogram of the judogi, drawn for this package in a 64 by 64 box: the jacket with its sleeves out, the lapels crossed left over right, the belt tied in a flat knot with the two ends hanging, and the trousers.
+// The metal style paints its main shapes with a grey sheet, the line style draws one outline.
+import { bar, defineIcon } from "../emblem.shapes.js";
 /** Judo. */
 export const SPORT_JUDO = /* @__PURE__ */ defineIcon("sport:judo", "Judo", "柔道", "ours", {
     metal: "flat",
     ink: true,
     front: [
-        ["m", "M23.6 8L7 36.6Q5.6 39.6 8.4 41.6L14.4 45.4Q17.2 46.8 18.8 43.8L19.4 42.6V58H31V46.6H33V58H44.6V42.6L45.2 43.8Q46.8 46.8 49.6 45.4L55.6 41.6Q58.4 39.6 57 36.6L40.4 8Q32 5.6 23.6 8Z"],
-        ["n", "M25.4 7.6L36 32M38.6 7.6L28 32"],
-        ["k", "M19.4 38.4H44.6V44H19.4z"],
-        ["k", "M29.4 44L26 56h3.6L32.4 44zM34.6 44L38 55h-3.6L31.6 44z"],
+        ["m", "M18.6 38H45.4L47.2 60H34.4L32 45.4L29.6 60H16.8Z"],
+        ["m", "M26 6Q32 3.8 38 6L45 9L60.4 23L56.6 30.4L46.4 26.2L46 39H18L17.6 26.2L7.4 30.4L3.6 23L19 9Z"],
+        ["k", "M27 5.6H37L32.8 16Z"],
+        ["n", bar(37.2, 6.4, 24.8, 38, 4.6)],
+        ["t", "M17.6 26.2L18 38M46.4 26.2L46 38"],
+        ["k", "M17.8 27.6H46.2V32H17.8Z"],
+        ["k", "M28 26.4H36V33H28Z"],
+        ["k", "M29.4 32L26.6 46h4.4L32.6 32zM34.6 32L37.4 46h-4.4L31.4 32z"],
     ],
 });

package/dist/emblems/sport/karate.js

@@ -1,13 +1,17 @@
-// Karate: a pictogram of a clenched fist seen from the front, drawn for this package, in a 64 by 64 box. The metal style paints its main shapes with a grey sheet, the line style draws one outline.
-import { defineIcon } from "../emblem.shapes.js";
+// Karate: a pictogram of the karate-gi, drawn for this package in a 64 by 64 box: a lighter suit than the judogi's, with shorter sleeves, a wide V of plain lapels, a short jacket, a belt tied low with its ends hanging
+// and straight trousers. The metal style paints its main shapes with a grey sheet, the line style draws one outline.
+import { bar, defineIcon } from "../emblem.shapes.js";
 /** Karate. */
 export const SPORT_KARATE = /* @__PURE__ */ defineIcon("sport:karate", "Karate", "空手", "ours", {
     metal: "flat",
     ink: true,
     front: [
-        ["m", "M14 30V21a4.5 4.5 0 0 1 9 0v9zM23 30V17a4.5 4.5 0 0 1 9 0v13zM32 30V17a4.5 4.5 0 0 1 9 0v13zM41 30V21a4.5 4.5 0 0 1 9 0v9z"],
-        ["m", "M14 28H50V46Q50 59 37 59H27Q14 59 14 46Z"],
-        ["m", "M19 34H45a4.4 4.4 0 0 1 0 8.8H19a4.4 4.4 0 0 1 0-8.8z"],
-        ["t", "M16 50Q32 55 48 50"],
+        ["m", "M20 36H44L45.6 61H34.6L32 46L29.4 61H18.4Z"],
+        ["m", "M26 6Q32 3.8 38 6L45 8.6L56 18L52.6 24.6L45.4 21L45 40H19L18.6 21L11.4 24.6L8 18L19 8.6Z"],
+        ["k", "M27 5.6H37L32 20Z"],
+        ["n", bar(37, 6.4, 24, 40, 3)],
+        ["k", "M18.8 31H45.2V35.4H18.8Z"],
+        ["k", "M28.4 29.8H35.6V36.4H28.4Z"],
+        ["k", "M29.6 36L27.2 48h4L32.6 36zM34.4 36L36.8 48h-4L31.4 36z"],
     ],
 });

package/dist/emblems/sport/nfl.d.ts

@@ -1,3 +1,5 @@
 import { type FlatModel } from "../emblem.shapes.ts";
+/** The football pictogram: no stripes (the NFL), a ring near each end (the CFL) or the arcs on the laces' side only (IFAF). */
+export declare function footballModel(stripes: "none" | "ring" | "top"): FlatModel;
 /** American football. */
 export declare const SPORT_NFL: import("../emblem.core.ts").Emblem<FlatModel>;

package/dist/emblems/sport/nfl.js

@@ -1,15 +1,34 @@
-// American football: a pictogram of the ball, drawn for this package, in a 64 by 64 box. The Canadian and the international-rules pictograms are the same drawing.
+// American football: a pictogram of the ball, drawn for this package from the drawings of the balls (`ball:football`, `ball:football-cfl`, `ball:football-ifaf`), in a 64 by 64 box: a prolate ball whose ends come to
+// a blunt point, lying on the diagonal with its laces on the upper side. The Canadian ball has a white stripe all the way round near each end (CFL Rule 1, Section 2); the IFAF ball has a stripe near each end on the
+// two panels next to the laces only, which is the upper half of the picture (IFAF Rule 1, Section 3); the NFL ball has none.
 import { defineIcon } from "../emblem.shapes.js";
-/** A pointed ball on the diagonal, with laces and a band near each end. */
-const FOOTBALL = {
-    metal: "flat",
-    ink: true,
-    front: [
-        ["m", "M8 56Q15.4 15.4 56 8Q48.6 48.6 8 56Z"],
-        ["n", "M26 38L38 26"],
-        ["t", "M29.4 31.2l3.4 3.4M32.2 28.4l3.4 3.4M26.6 34l3.4 3.4M23.8 36.8l3.4 3.4M35 25.6l3.4 3.4"],
-        ["t", "M14.6 40.6l5.6 5.6M43.8 17.8l5.6 5.6"],
-    ],
+const f = (n) => String(Math.round(n * 10) / 10);
+const TURN = (40 * Math.PI) / 180;
+/** A point of the ball's own frame (long axis along x, the laces on the upper side, y negative) put on the picture: turned 40 degrees about the centre of the box. */
+const at = (x, y) => `${f(32 + x * Math.cos(TURN) - y * Math.sin(TURN))} ${f(32 + x * Math.sin(TURN) + y * Math.cos(TURN))}`;
+const HALF = 29.6;
+const WIDTH = 17.4;
+/** The half width of the ball at `x` along its axis: an ellipse whose ends are drawn out a little, so they come to a blunt point as the real ball's do. */
+const half = (x) => WIDTH * (1 - Math.min(1, Math.abs(x / HALF)) ** 2) ** 0.72;
+const outline = () => {
+    const xs = Array.from({ length: 33 }, (_, i) => -HALF * Math.cos((Math.PI * i) / 32));
+    return `M${xs.map((x) => at(x, -half(x))).join("L")}L${[...xs].reverse().map((x) => at(x, half(x))).join("L")}z`;
 };
+/** The ball between `x0` and `x1` along its axis, over the part of its width from `y0` to `y1` (as fractions of the half width, -1 the upper edge): a stripe. */
+const band = (x0, x1, y0, y1) => {
+    const xs = Array.from({ length: 7 }, (_, i) => x0 + ((x1 - x0) * i) / 6);
+    return `M${xs.map((x) => at(x, y0 * half(x))).join("L")}L${[...xs].reverse().map((x) => at(x, y1 * half(x))).join("L")}z`;
+};
+/** The football pictogram: no stripes (the NFL), a ring near each end (the CFL) or the arcs on the laces' side only (IFAF). */
+export function footballModel(stripes) {
+    const front = [["m", outline()]];
+    if (stripes !== "none")
+        for (const sign of [-1, 1])
+            front.push(["f", band(sign * 15.6, sign * 20.6, stripes === "ring" ? -1 : -1, stripes === "ring" ? 1 : 0.05), "#f4f0e6"]);
+    // the laces: a row of short bars across a line, on the upper side of the middle
+    const rungs = [-8, -4.8, -1.6, 1.6, 4.8, 8].map((x) => `M${at(x, -9.4)}L${at(x, -3)}`).join("");
+    front.push(["t", `M${at(-9.6, -6.2)}L${at(9.6, -6.2)}${rungs}`]);
+    return { metal: "flat", ink: true, front };
+}
 /** American football. */
-export const SPORT_NFL = /* @__PURE__ */ defineIcon("sport:nfl", "American football", "アメリカンフットボール", "ours", FOOTBALL);
+export const SPORT_NFL = /* @__PURE__ */ defineIcon("sport:nfl", "American football", "アメリカンフットボール", "ours", footballModel("none"));

package/dist/index.d.ts

@@ -108,6 +108,11 @@ export { BALL_LACROSSE, BALL_RACQUETBALL, BALL_TABLE_TENNIS, BALL_SHOT } from ".
 export { BALL_SOCCER, BALL_SOCCER_COLOUR } from "./emblems/ball/ball.soccer.ts";
 export { BALL_SOCCER_26, BALL_SOCCER_18, BALL_SOCCER_14, BALL_SOCCER_12, BALL_SOCCER_6, BALL_SOCCER_ORANGE, BALL_SOCCER_26_ORANGE, BALL_SOCCER_18_ORANGE, BALL_SOCCER_14_ORANGE, BALL_SOCCER_12_ORANGE, BALL_SOCCER_6_ORANGE, BALL_SOCCER_YELLOW, BALL_SOCCER_26_YELLOW, BALL_SOCCER_18_YELLOW, BALL_SOCCER_14_YELLOW, BALL_SOCCER_12_YELLOW, BALL_SOCCER_6_YELLOW } from "./emblems/ball/ball.soccer.panels.ts";
 export { BALL_FUTSAL, BALL_BEACH_SOCCER } from "./emblems/ball/ball.soccer.indoor.ts";
+export { BALL_SOCCER_1870_HAND_STITCHED, BALL_SOCCER_1900_LACED, BALL_SOCCER_1930_18_PANEL, BALL_SOCCER_1950_12_PANEL, BALL_SOCCER_1960_32_PANEL_LEATHER } from "./emblems/ball/ball.soccer.vintage.ts";
+export { BALL_SOCCER_1970_BLACK_WHITE, BALL_SOCCER_1978_TRIAD, BALL_SOCCER_1986_DECORATED_TRIAD, BALL_SOCCER_1998_COLOURED_TRIAD, BALL_SOCCER_2002_TRIANGLE_SWEEP, BALL_SOCCER_2006_PROPELLER, BALL_SOCCER_2010_GROOVED, BALL_SOCCER_2014_RIBBON, BALL_SOCCER_2018_PIXEL, BALL_SOCCER_2022_SPEED_SHELL, BALL_SOCCER_TRAINING_HIGH_VIS } from "./emblems/ball/ball.soccer.era.ts";
+export { BALL_SOCCER_STARS_BLUE, BALL_SOCCER_STARS_RED, BALL_SOCCER_STARS_NIGHT, BALL_SOCCER_HEXAGONS_CYAN, BALL_SOCCER_HEXAGONS_MAGENTA, BALL_SOCCER_HEXAGONS_LIME, BALL_SOCCER_FLAMES_FIRE, BALL_SOCCER_FLAMES_ICE, BALL_SOCCER_FLAMES_TOXIC, BALL_SOCCER_CHEVRONS_RED, BALL_SOCCER_CHEVRONS_GREEN, BALL_SOCCER_CHEVRONS_BLUE, BALL_SOCCER_SWIRL_BLUE, BALL_SOCCER_SWIRL_RED, BALL_SOCCER_SWIRL_TEAL, BALL_SOCCER_METALLIC_GOLD, BALL_SOCCER_METALLIC_SILVER, BALL_SOCCER_METALLIC_COBALT } from "./emblems/ball/ball.soccer.store.ts";
+export { BALL_BASEBALL_LEMON_PEEL, BALL_BASEBALL_RED_BLUE, BALL_BASEBALL_BLACK_RED, BALL_BASEBALL_VINTAGE_LEATHER, BALL_SOFTBALL_11_OPTIC } from "./emblems/ball/ball.baseball.vintage.ts";
+export { BALL_VOLLEYBALL_COLOURS, BALL_VOLLEYBALL_BRAZIL, BALL_VOLLEYBALL_JAPAN, BALL_VOLLEYBALL_CANADA, BALL_VOLLEYBALL_USA, BALL_VOLLEYBALL_ITALY, BALL_VOLLEYBALL_POLAND, BALL_VOLLEYBALL_FRANCE, BALL_VOLLEYBALL_SERBIA, BALL_VOLLEYBALL_NETHERLANDS, BALL_VOLLEYBALL_GERMANY } from "./emblems/ball/ball.volleyball.flag.ts";
 export { BALL_SOFTBALL } from "./emblems/ball/ball.softball.ts";
 export { BALL_SQUASH_DOUBLE_YELLOW, BALL_SQUASH_YELLOW, BALL_SQUASH_RED, BALL_SQUASH_BLUE, BALL_SQUASH_GREEN } from "./emblems/ball/ball.squash.ts";
 export { BALL_TENNIS } from "./emblems/ball/ball.tennis.ts";
@@ -133,7 +138,7 @@ export { GEAR_STARTING_BLOCKS, GEAR_RELAY_BATON, GEAR_JAVELIN, GEAR_HURDLES } fr
 export { GEAR_DIVING_BOARD, GEAR_SWIM_GOGGLES } from "./emblems/gear/gear.water.ts";
 export { GEAR_GUNBAI, GEAR_MAWASHI } from "./emblems/gear/gear.sumo.ts";
 export { GEAR_SHINAI, GEAR_KENDO_MEN } from "./emblems/gear/gear.kendo.ts";
-export { GEAR_JUDOGI, GEAR_KARATE_GI, GEAR_OBI, OBI_RANKS, obi } from "./emblems/gear/gear.budo.ts";
-export type { ObiRank } from "./emblems/gear/gear.budo.ts";
+export { GEAR_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_KARATE_GI, GEAR_OBI, GEAR_OBI_WHITE, GEAR_OBI_YELLOW, GEAR_OBI_ORANGE, GEAR_OBI_GREEN, GEAR_OBI_BLUE, GEAR_OBI_BROWN, GEAR_OBI_KOHAKU, GEAR_OBI_RED, GEAR_OBI_WOMEN, GEAR_OBI_WHITE_YELLOW, GEAR_OBI_YELLOW_ORANGE, GEAR_OBI_ORANGE_GREEN, GEAR_OBI_GREEN_BLUE, GEAR_OBI_BLUE_BROWN, JUDOGI_WHITE, JUDOGI_BLUE, OBI_RANKS, obi } from "./emblems/gear/gear.budo.ts";
+export type { ObiRank, ObiOptions } from "./emblems/gear/gear.budo.ts";
 export { GEAR_YUMI, GEAR_YA } from "./emblems/gear/gear.kyudo.ts";
 export { VERSION } from "./version.ts";

package/dist/index.js

@@ -109,6 +109,11 @@ export { BALL_LACROSSE, BALL_RACQUETBALL, BALL_TABLE_TENNIS, BALL_SHOT } from ".
 export { BALL_SOCCER, BALL_SOCCER_COLOUR } from "./emblems/ball/ball.soccer.js";
 export { BALL_SOCCER_26, BALL_SOCCER_18, BALL_SOCCER_14, BALL_SOCCER_12, BALL_SOCCER_6, BALL_SOCCER_ORANGE, BALL_SOCCER_26_ORANGE, BALL_SOCCER_18_ORANGE, BALL_SOCCER_14_ORANGE, BALL_SOCCER_12_ORANGE, BALL_SOCCER_6_ORANGE, BALL_SOCCER_YELLOW, BALL_SOCCER_26_YELLOW, BALL_SOCCER_18_YELLOW, BALL_SOCCER_14_YELLOW, BALL_SOCCER_12_YELLOW, BALL_SOCCER_6_YELLOW } from "./emblems/ball/ball.soccer.panels.js";
 export { BALL_FUTSAL, BALL_BEACH_SOCCER } from "./emblems/ball/ball.soccer.indoor.js";
+export { BALL_SOCCER_1870_HAND_STITCHED, BALL_SOCCER_1900_LACED, BALL_SOCCER_1930_18_PANEL, BALL_SOCCER_1950_12_PANEL, BALL_SOCCER_1960_32_PANEL_LEATHER } from "./emblems/ball/ball.soccer.vintage.js";
+export { BALL_SOCCER_1970_BLACK_WHITE, BALL_SOCCER_1978_TRIAD, BALL_SOCCER_1986_DECORATED_TRIAD, BALL_SOCCER_1998_COLOURED_TRIAD, BALL_SOCCER_2002_TRIANGLE_SWEEP, BALL_SOCCER_2006_PROPELLER, BALL_SOCCER_2010_GROOVED, BALL_SOCCER_2014_RIBBON, BALL_SOCCER_2018_PIXEL, BALL_SOCCER_2022_SPEED_SHELL, BALL_SOCCER_TRAINING_HIGH_VIS } from "./emblems/ball/ball.soccer.era.js";
+export { BALL_SOCCER_STARS_BLUE, BALL_SOCCER_STARS_RED, BALL_SOCCER_STARS_NIGHT, BALL_SOCCER_HEXAGONS_CYAN, BALL_SOCCER_HEXAGONS_MAGENTA, BALL_SOCCER_HEXAGONS_LIME, BALL_SOCCER_FLAMES_FIRE, BALL_SOCCER_FLAMES_ICE, BALL_SOCCER_FLAMES_TOXIC, BALL_SOCCER_CHEVRONS_RED, BALL_SOCCER_CHEVRONS_GREEN, BALL_SOCCER_CHEVRONS_BLUE, BALL_SOCCER_SWIRL_BLUE, BALL_SOCCER_SWIRL_RED, BALL_SOCCER_SWIRL_TEAL, BALL_SOCCER_METALLIC_GOLD, BALL_SOCCER_METALLIC_SILVER, BALL_SOCCER_METALLIC_COBALT } from "./emblems/ball/ball.soccer.store.js";
+export { BALL_BASEBALL_LEMON_PEEL, BALL_BASEBALL_RED_BLUE, BALL_BASEBALL_BLACK_RED, BALL_BASEBALL_VINTAGE_LEATHER, BALL_SOFTBALL_11_OPTIC } from "./emblems/ball/ball.baseball.vintage.js";
+export { BALL_VOLLEYBALL_COLOURS, BALL_VOLLEYBALL_BRAZIL, BALL_VOLLEYBALL_JAPAN, BALL_VOLLEYBALL_CANADA, BALL_VOLLEYBALL_USA, BALL_VOLLEYBALL_ITALY, BALL_VOLLEYBALL_POLAND, BALL_VOLLEYBALL_FRANCE, BALL_VOLLEYBALL_SERBIA, BALL_VOLLEYBALL_NETHERLANDS, BALL_VOLLEYBALL_GERMANY } from "./emblems/ball/ball.volleyball.flag.js";
 export { BALL_SOFTBALL } from "./emblems/ball/ball.softball.js";
 export { BALL_SQUASH_DOUBLE_YELLOW, BALL_SQUASH_YELLOW, BALL_SQUASH_RED, BALL_SQUASH_BLUE, BALL_SQUASH_GREEN } from "./emblems/ball/ball.squash.js";
 export { BALL_TENNIS } from "./emblems/ball/ball.tennis.js";
@@ -134,6 +139,6 @@ export { GEAR_STARTING_BLOCKS, GEAR_RELAY_BATON, GEAR_JAVELIN, GEAR_HURDLES } fr
 export { GEAR_DIVING_BOARD, GEAR_SWIM_GOGGLES } from "./emblems/gear/gear.water.js";
 export { GEAR_GUNBAI, GEAR_MAWASHI } from "./emblems/gear/gear.sumo.js";
 export { GEAR_SHINAI, GEAR_KENDO_MEN } from "./emblems/gear/gear.kendo.js";
-export { GEAR_JUDOGI, GEAR_KARATE_GI, GEAR_OBI, OBI_RANKS, obi } from "./emblems/gear/gear.budo.js";
+export { GEAR_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_KARATE_GI, GEAR_OBI, GEAR_OBI_WHITE, GEAR_OBI_YELLOW, GEAR_OBI_ORANGE, GEAR_OBI_GREEN, GEAR_OBI_BLUE, GEAR_OBI_BROWN, GEAR_OBI_KOHAKU, GEAR_OBI_RED, GEAR_OBI_WOMEN, GEAR_OBI_WHITE_YELLOW, GEAR_OBI_YELLOW_ORANGE, GEAR_OBI_ORANGE_GREEN, GEAR_OBI_GREEN_BLUE, GEAR_OBI_BLUE_BROWN, JUDOGI_WHITE, JUDOGI_BLUE, OBI_RANKS, obi } from "./emblems/gear/gear.budo.js";
 export { GEAR_YUMI, GEAR_YA } from "./emblems/gear/gear.kyudo.js";
 export { VERSION } from "./version.js";

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.4.1";
+export declare const VERSION = "0.5.1";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "0.4.1";
+export const VERSION = "0.5.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnmorrisdotca/dougu-sports",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "Dougu Sports 道具, sports emblems as SVG strings: trophies, medals, crests, sport icons, and the ball and gear of every sport, in metal, line or flat colour, with optional 3D turning. Light and dark, accessible, tree-shakeable. Zero dependencies.",
   "keywords": [
     "sports",