@johnmorrisdotca/dougu-sports 0.5.2 → 0.7.0

package/dist/emblems/gear/gear.core.js

@@ -23,8 +23,17 @@ export function drawGear(id, title, spec, options) {
     let body = "";
     let across = false;
     let along = false;
+    // Parts in a row with one transform share one group, so that a close-up of many parts says its transform once.
+    let open = "";
     for (const p of spec.parts) {
-        const t = p.t === undefined ? "" : ` transform="${escape(p.t)}"`;
+        const move = p.t ?? "";
+        if (move !== open) {
+            if (open !== "")
+                body += "</g>";
+            if (move !== "")
+                body += `<g transform="${escape(move)}">`;
+            open = move;
+        }
         const fill = resolve(p.fill);
         const hasFill = fill !== undefined && fill !== "none";
         if (line) {
@@ -32,33 +41,35 @@ export function drawGear(id, title, spec, options) {
             if (mode === "none" || p.fx === true)
                 continue;
             if (mode === "ink" && hasFill)
-                body += `<path d="${p.d}" fill="currentColor"${t}/>`;
+                body += `<path d="${p.d}" fill="currentColor"/>`;
             else if (!hasFill && p.stroke !== undefined)
-                body += `<path d="${p.d}" fill="none" stroke="currentColor" stroke-width="${num(p.w ?? 2, 2)}"${t}/>`;
+                body += `<path d="${p.d}" fill="none" stroke="currentColor" stroke-width="${num(p.w ?? 2, 2)}"/>`;
             else
-                body += `<path d="${p.d}" fill="none" stroke="currentColor" stroke-width="${num(Math.max(p.w ?? 2, 1.6), 2)}"${t}/>`;
+                body += `<path d="${p.d}" fill="none" stroke="currentColor" stroke-width="${num(Math.max(p.w ?? 2, 1.6), 2)}"/>`;
             continue;
         }
         const op = p.op === undefined ? "" : ` opacity="${p.op}"`;
         if (p.fx === true) {
             if (!flat)
-                body += `<path d="${p.d}" fill="${fill}"${op}${t}/>`;
+                body += `<path d="${p.d}" fill="${fill}"${op}/>`;
             continue;
         }
         const stroke = resolve(p.stroke) ?? (hasFill ? mix(readColour(fill) === undefined ? "#888888" : fill, -0.45) : "none");
         const w = p.w ?? 0.9;
-        body += `<path d="${p.d}" fill="${hasFill ? fill : "none"}" stroke="${stroke}" stroke-width="${num(w, 2)}"${hasFill || stroke === "none" ? ` stroke-linejoin="round"` : ` stroke-linecap="round"`}${op}${t}/>`;
+        body += `<path d="${p.d}" fill="${hasFill ? fill : "none"}" stroke="${stroke}" stroke-width="${num(w, 2)}"${hasFill || stroke === "none" ? ` stroke-linejoin="round"` : ` stroke-linecap="round"`}${op}/>`;
         if (hasFill && !flat) {
             if (p.shade !== 0) {
                 along = true;
-                body += `<path d="${p.d}" fill="url(#${gid})"${p.shade === undefined ? "" : ` opacity="${p.shade}"`}${t}/>`;
+                body += `<path d="${p.d}" fill="url(#${gid})"${p.shade === undefined ? "" : ` opacity="${p.shade}"`}/>`;
             }
             if (p.cyl !== undefined && p.cyl > 0) {
                 across = true;
-                body += `<path d="${p.d}" fill="url(#${gid}c)"${p.cyl === 1 ? "" : ` opacity="${p.cyl}"`}${t}/>`;
+                body += `<path d="${p.d}" fill="url(#${gid}c)"${p.cyl === 1 ? "" : ` opacity="${p.cyl}"`}/>`;
             }
         }
     }
+    if (open !== "")
+        body += "</g>";
     const defs = (along ? `<linearGradient id="${gid}" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#fff" stop-opacity=".42"/><stop offset=".5" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#000" stop-opacity=".3"/></linearGradient>` : "") +
         (across ? `<linearGradient id="${gid}c" x2="1"><stop offset="0" stop-color="#000" stop-opacity=".34"/><stop offset=".26" stop-color="#fff" stop-opacity=".5"/><stop offset=".55" stop-color="#fff" stop-opacity="0"/><stop offset=".88" stop-color="#000" stop-opacity=".22"/><stop offset="1" stop-color="#000" stop-opacity=".4"/></linearGradient>` : "");
     const box = spec.box ?? "0 0 64 64";

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

@@ -17,10 +17,11 @@ 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_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_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_JUDOGI_BACK, GEAR_JUDOGI_BLUE_BACK, 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_OBI_STEP_1, GEAR_OBI_STEP_2, GEAR_OBI_STEP_3, GEAR_OBI_STEP_4, GEAR_OBI_STEP_5, GEAR_OBI_STEP_6 } from "./gear.budo.steps.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_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];
+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_JUDOGI_BACK, GEAR_JUDOGI_BLUE_BACK, 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_OBI_STEP_1, GEAR_OBI_STEP_2, GEAR_OBI_STEP_3, GEAR_OBI_STEP_4, GEAR_OBI_STEP_5, GEAR_OBI_STEP_6, 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/judo.js

@@ -1,4 +1,4 @@
-// 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.
+// Judo: a pictogram of the judogi, drawn for this package in a 64 by 64 box: the jacket with its sleeves hanging out and down to the wrist (a judogi has no short sleeves: IJF C1.10), 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. */
@@ -7,10 +7,10 @@ export const SPORT_JUDO = /* @__PURE__ */ defineIcon("sport:judo", "Judo", "柔
     ink: true,
     front: [
         ["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"],
+        ["m", "M26 6Q32 3.8 38 6L45 9L61 38.4L51.2 43L46.4 27L46 39H18L17.6 27L12.8 43L3 38.4L19 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"],
+        ["t", "M17.6 27L18 38M46.4 27L46 38M5 35.6L14 39.8M59 35.6L50 39.8"],
         ["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,4 +1,4 @@
-// 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
+// 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 three-quarter sleeves (WKF 2.2.1 j), 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. */
@@ -7,7 +7,7 @@ export const SPORT_KARATE = /* @__PURE__ */ defineIcon("sport:karate", "Karate",
     ink: true,
     front: [
         ["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"],
+        ["m", "M26 6Q32 3.8 38 6L45 8.6L62.2 32.9L54.9 38.1L45.4 23L45 40H19L18.6 23L9.1 38.1L1.8 32.9L19 8.6Z"],
         ["k", "M27 5.6H37L32 20Z"],
         ["n", bar(37, 6.4, 24, 40, 3)],
         ["k", "M18.8 31H45.2V35.4H18.8Z"],

package/dist/emblems-entry.d.ts

@@ -8,7 +8,7 @@ export { EMBLEM_INK, EMBLEM_PAGE, EMBLEM_STYLES, METALS } from "./emblems/emblem
 export type { Emblem, EmblemKind, EmblemLocale, EmblemOptions, EmblemSource, EmblemStyle, EmblemTheme, FrameOptions } from "./emblems/emblem.core.ts";
 export { lineup } from "./emblems/ball/ball.index.ts";
 export type { LineupOptions } from "./emblems/ball/ball.index.ts";
-export type { PieceSize } from "./emblems/ball/ball.core.ts";
+export type { Backnumber, PieceSize } from "./emblems/ball/ball.core.ts";
 export type { Ball, BallKind, Decor, Handle, LatheModel, Poles, Pt, Solid } from "./emblems/emblem.lathe.ts";
 export type { FlatModel, Role, Shape } from "./emblems/emblem.shapes.ts";
 export { emblemSprite } from "./emblems/emblem.sprite.ts";

package/dist/index.d.ts

@@ -138,7 +138,9 @@ 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_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 { GEAR_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_JUDOGI_BACK, GEAR_JUDOGI_BLUE_BACK, 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_OBI_STEP_1, GEAR_OBI_STEP_2, GEAR_OBI_STEP_3, GEAR_OBI_STEP_4, GEAR_OBI_STEP_5, GEAR_OBI_STEP_6, obiStep } from "./emblems/gear/gear.budo.steps.ts";
+export type { ObiStep } from "./emblems/gear/gear.budo.steps.ts";
 export { GEAR_YUMI, GEAR_YA } from "./emblems/gear/gear.kyudo.ts";
 export { VERSION } from "./version.ts";

package/dist/index.js

@@ -139,6 +139,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.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_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_JUDOGI, GEAR_JUDOGI_BLUE, GEAR_JUDOGI_FOLDED, GEAR_JUDOGI_BLUE_FOLDED, GEAR_JUDOGI_BACK, GEAR_JUDOGI_BLUE_BACK, 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_OBI_STEP_1, GEAR_OBI_STEP_2, GEAR_OBI_STEP_3, GEAR_OBI_STEP_4, GEAR_OBI_STEP_5, GEAR_OBI_STEP_6, obiStep } from "./emblems/gear/gear.budo.steps.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.5.2";
+export declare const VERSION = "0.7.0";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "0.5.2";
+export const VERSION = "0.7.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnmorrisdotca/dougu-sports",
-  "version": "0.5.2",
+  "version": "0.7.0",
   "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",