@johnmorrisdotca/kyogijo-stadiums 0.5.0 → 0.6.0

package/dist/style.js

@@ -5,6 +5,7 @@ import { KYOGIJO_FIELDS_STYLE } from "./fields.style.js";
 import { KYOGIJO_HARDWOOD_STYLE } from "./hardwood.js";
 import { KYOGIJO_ATHLETICS_STYLE, KYOGIJO_TRACK_STYLE } from "./athletics.style.js";
 import { KYOGIJO_SKATING_STYLE } from "./skating.style.js";
+import { KYOGIJO_BUDO_STYLE } from "./budo.style.js";
 import { KYOGIJO_FEATURE_STYLE } from "./features.js";
 import { KYOGIJO_GRID_STYLE } from "./layout.style.js";
 import { KYOGIJO_LOOK_STYLE } from "./look.js";
@@ -12,6 +13,7 @@ import { KYOGIJO_MARK_STYLE } from "./mark.js";
 import { KYOGIJO_PAGEANT_MOTION, KYOGIJO_PAGEANT_STYLE } from "./pageant.style.js";
 import { KYOGIJO_POOL_STYLE } from "./pool.style.js";
 import { KYOGIJO_ROAD_STYLE } from "./road.style.js";
+import { KYOGIJO_SITUATION_STYLE } from "./situation.style.js";
 import { KYOGIJO_SPECIAL_STYLE } from "./special.style.js";
 /**
  * The drawing's stylesheet, without the heat layers' rules: custom properties for every colour, in light and dark, and the rule of each class. It is
@@ -170,7 +172,12 @@ export const KYOGIJO_TEAM_STYLE = `
 .kyogijo .ky-ro{fill:var(--c,var(--ky-layer));fill-opacity:.7;stroke:var(--ky-layer-edge);stroke-width:calc(var(--w,.3)*1px);stroke-linejoin:round}
 .kyogijo .ky-ro-r{fill:none;stroke:var(--c,var(--ky-layer));stroke-opacity:.45;stroke-dasharray:calc(var(--w,.3)*3px) calc(var(--w,.3)*3px);stroke-width:calc(var(--w,.3)*1px)}
 .kyogijo .ky-fm>*{fill:var(--c,var(--ky-layer));stroke:var(--ky-layer-edge);stroke-width:calc(var(--w,.3)*1px)}
-.kyogijo .ky-fm>.ky-e{fill:var(--ky-layer-hollow);stroke:var(--c,var(--ky-layer));stroke-width:calc(var(--w,.3)*2.2px)}`.trim();
+.kyogijo .ky-fm>.ky-e{fill:var(--ky-layer-hollow);stroke:var(--c,var(--ky-layer));stroke-width:calc(var(--w,.3)*2.2px)}
+.kyogijo .ky-fm>path{stroke-linejoin:round}
+.kyogijo .ky-nm{fill:var(--ky-plate-ink);stroke:var(--ky-plate);stroke-width:.14em;paint-order:stroke;stroke-linejoin:round;font-family:var(--ky-font);font-weight:700;font-variant-numeric:tabular-nums}
+.kyogijo .ky-lc{fill:var(--ky-post);stroke:var(--ky-layer-edge);stroke-width:calc(var(--w,.3)*1px)}
+.kyogijo .ky-cl{fill:var(--ky-plate);stroke:none;font-family:var(--ky-font);font-weight:700}
+.kyogijo .ky-lf{fill:none;stroke:var(--ky-layer-edge);stroke-width:calc(var(--w,.3)*1px)}`.trim();
 /**
  * The rules of the annotations (the arrows of `direction`, the axes of `axes` and the labels and leaders of `landmarks`): words in the ink of the page with an outline in the
  * apron's colour, thin leaders, and the arrows in the home and away colours. A drawing that has an annotation writes them in; `KYOGIJO_STYLE` has them for a page.
@@ -184,4 +191,4 @@ export const KYOGIJO_NOTE_STYLE = `
 .kyogijo .ky-an-ar{stroke:var(--c);fill:none}
 .kyogijo .ky-an-hd{fill:var(--c)}`.trim();
 /** Every rule of the package, for a page that draws with `style: "none"` and supplies the stylesheet itself. */
-export const KYOGIJO_STYLE = `${KYOGIJO_BASE_STYLE}\n${KYOGIJO_HEAT_STYLE}\n${KYOGIJO_TEAM_STYLE}\n${KYOGIJO_CURLING_STYLE}\n${KYOGIJO_FOLD_STYLE}\n${KYOGIJO_WALLS_STYLE}\n${KYOGIJO_COURTS_STYLE}\n${KYOGIJO_FIELDS_STYLE}\n${KYOGIJO_POOL_STYLE}\n${KYOGIJO_ATHLETICS_STYLE}\n${KYOGIJO_SKATING_STYLE}\n${KYOGIJO_LOOK_STYLE}\n${KYOGIJO_HARDWOOD_STYLE}\n${KYOGIJO_TRACK_STYLE}\n${KYOGIJO_FEATURE_STYLE}\n${KYOGIJO_NOTE_STYLE}\n${KYOGIJO_SPECIAL_STYLE}\n${KYOGIJO_BACKGROUND_STYLE}\n${KYOGIJO_CROWD_STYLE}\n${KYOGIJO_GRID_STYLE}\n${KYOGIJO_MARK_STYLE}\n${KYOGIJO_PAGEANT_STYLE}\n${KYOGIJO_PAGEANT_MOTION}\n${KYOGIJO_ROAD_STYLE}`;
+export const KYOGIJO_STYLE = `${KYOGIJO_BASE_STYLE}\n${KYOGIJO_HEAT_STYLE}\n${KYOGIJO_TEAM_STYLE}\n${KYOGIJO_CURLING_STYLE}\n${KYOGIJO_FOLD_STYLE}\n${KYOGIJO_WALLS_STYLE}\n${KYOGIJO_COURTS_STYLE}\n${KYOGIJO_FIELDS_STYLE}\n${KYOGIJO_POOL_STYLE}\n${KYOGIJO_ATHLETICS_STYLE}\n${KYOGIJO_SKATING_STYLE}\n${KYOGIJO_BUDO_STYLE}\n${KYOGIJO_LOOK_STYLE}\n${KYOGIJO_HARDWOOD_STYLE}\n${KYOGIJO_TRACK_STYLE}\n${KYOGIJO_FEATURE_STYLE}\n${KYOGIJO_NOTE_STYLE}\n${KYOGIJO_SPECIAL_STYLE}\n${KYOGIJO_BACKGROUND_STYLE}\n${KYOGIJO_CROWD_STYLE}\n${KYOGIJO_GRID_STYLE}\n${KYOGIJO_MARK_STYLE}\n${KYOGIJO_PAGEANT_STYLE}\n${KYOGIJO_PAGEANT_MOTION}\n${KYOGIJO_SITUATION_STYLE}\n${KYOGIJO_ROAD_STYLE}`;

package/dist/surfaces/artistic.d.ts

@@ -2,8 +2,8 @@ import type { ArtisticPlan } from "../pool.ts";
 import { type PoolCtx } from "../pool.kit.ts";
 import { type BuildOptions, type Surface } from "./surface.ts";
 /**
- * An artistic swimming area lying wide, from World Aquatics' rules (Part Seven, Article 27): 30 by 20 m for the Olympic Games and the World Championships (27.2.2), or the least, 25 by 15 m of which 12 by 12 m is the
- * deep part (27.1.2), the floor marked with contrasting lines in one direction along its length (27.2.4), the judges' platform not more than 2 m from the pool's edge (27.2.8) and the starting platform at centre
- * stage (27.2.7). The sizes of the two platforms are ours: the rules give their heights.
+ * An artistic swimming area lying wide, from World Aquatics' rules (Part Seven, Article 12): 30 by 20 m for the Olympic Games and the World Championships (12.2.2), or the least, 25 by 15 m of which 12 by 12 m is the
+ * deep part (12.1.1), the floor marked with contrasting lines in one direction along its length (12.1.3), the judges' (Technical Officials') platform not more than 2 m from the pool's edge (12.2.5) and the starting platform at centre
+ * stage (12.1.7). The sizes of the two platforms are ours: the rules give their heights.
  */
 export declare function artistic(o: BuildOptions, plan: ArtisticPlan, ctx?: PoolCtx): Surface;

package/dist/surfaces/artistic.js

@@ -5,9 +5,9 @@ import { ARTISTIC, SWIMMING } from "../pool.figures.js";
 import { GUTTER } from "./pool.js";
 import { atEnds, edges, ft, quarterTurn, textOn } from "./surface.js";
 /**
- * An artistic swimming area lying wide, from World Aquatics' rules (Part Seven, Article 27): 30 by 20 m for the Olympic Games and the World Championships (27.2.2), or the least, 25 by 15 m of which 12 by 12 m is the
- * deep part (27.1.2), the floor marked with contrasting lines in one direction along its length (27.2.4), the judges' platform not more than 2 m from the pool's edge (27.2.8) and the starting platform at centre
- * stage (27.2.7). The sizes of the two platforms are ours: the rules give their heights.
+ * An artistic swimming area lying wide, from World Aquatics' rules (Part Seven, Article 12): 30 by 20 m for the Olympic Games and the World Championships (12.2.2), or the least, 25 by 15 m of which 12 by 12 m is the
+ * deep part (12.1.1), the floor marked with contrasting lines in one direction along its length (12.1.3), the judges' (Technical Officials') platform not more than 2 m from the pool's edge (12.2.5) and the starting platform at centre
+ * stage (12.1.7). The sizes of the two platforms are ours: the rules give their heights.
  */
 export function artistic(o, plan, ctx = {}) {
     const L = plan.length;

package/dist/surfaces/baseball.js

@@ -179,6 +179,8 @@ export function baseball(points, o, era, diamond = MLB_DIAMOND) {
         Object.assign(right, { cx: (umax + m - 6 + 62) / 2, cy, w, h: 58 });
     }
     const surface = { sport: "mlb", view, base, lines, defs: clip, left, right, plate: { cx: 0, cy: -Math.round(vmax * 0.42), w: 150, h: 62 }, turned: false, lineRef: { width: thin, feet: 1 }, box: { x: umin, y: -vmax, w: umax - umin, h: vmax } };
+    // The bases as drawn (first, second, third) for a situation to light.
+    surface.anchors = { kind: "baseball", bases: bases.map(([u, v]) => [u, -v]), half: h, backstop };
     // A pageant: the home team's picture on the infield, the visitors' in the outfield beyond the plate, and the emblem on the mound.
     {
         const inW = 2 * centreV * 0.6 * 0.95;

package/dist/surfaces/basketball.js

@@ -10,7 +10,7 @@ import { atEnds, edges, ft, quarterTurn, textOn } from "./surface.js";
  */
 export function basketball(o, era, court = NBA_COURT) {
     // The NBA's court has a history of its own (eras.ts); a league's, if it has one, is already in its `court`.
-    const nba = court === NBA_COURT ? (era ?? rulesFor("nba").rules) : undefined;
+    const nba = court === NBA_COURT || era !== undefined ? (era ?? rulesFor("nba").rules) : undefined;
     const { length: L, width: W } = court;
     const m = o.margin ?? 7;
     const view0 = { x: -m, y: -m, w: L + 2 * m, h: W + 2 * m };

package/dist/surfaces/budo.d.ts

@@ -0,0 +1,6 @@
+import type { BudoPlan } from "../budo/plan.ts";
+import { type BuildOptions, type Surface } from "./surface.ts";
+/** Feet in a metre. */
+export declare const K: number;
+/** The surface of the plan lying wide. `margin` is the ground round what is drawn, in feet. */
+export declare function budoSurface(o: BuildOptions, plan: BudoPlan, margin: number): Surface;

package/dist/surfaces/budo.js

@@ -0,0 +1,104 @@
+// A budō surface lying wide, from its plan (budo/plan.ts): the floor and the free zone, the mats in their tones with their heri and their seams, the walls, the clay and the straw of a dohyō, the tape,
+// the targets. The plan is in metres; the drawing is in feet, as every surface lies, so the whole is drawn inside a group that scales metres to feet and moves the surface's box to the origin.
+import { el } from "../format.js";
+import { areaD, marks, strokes } from "./field.js";
+import { atEnds, edges, ft, quarterTurn } from "./surface.js";
+/** Feet in a metre. */
+export const K = 1 / 0.3048;
+const feetBox = (b, ox, oy) => edges((b.x0 - ox) * K, (b.y0 - oy) * K, (b.x1 - ox) * K, (b.y1 - oy) * K);
+/** A plan's named range in feet, as a surface lists them. */
+function rangeOf(r, ox, oy) {
+    return "left" in r ? atEnds((end) => feetBox(end === "left" ? r.left : r.right, ox, oy)) : feetBox(r, ox, oy);
+}
+/** The surface of the plan lying wide. `margin` is the ground round what is drawn, in feet. */
+export function budoSurface(o, plan, margin) {
+    const ox = plan.box.x0;
+    const oy = plan.box.y0;
+    const full = o.detail === "full";
+    const view0 = { x: (plan.extent.x0 - ox) * K - margin, y: (plan.extent.y0 - oy) * K - margin, w: (plan.extent.x1 - plan.extent.x0) * K + 2 * margin, h: (plan.extent.y1 - plan.extent.y0) * K + 2 * margin };
+    const place = `scale(${K.toFixed(6)}) translate(${(-ox).toFixed(4)} ${(-oy).toFixed(4)})`;
+    const group = (inner, cls) => el("g", { class: cls, transform: place }, inner);
+    const turned = o.portrait;
+    let base = el("rect", { class: ft(o, "apron", "ky-apron"), x: view0.x, y: view0.y, width: view0.w, height: view0.h });
+    let ground = "";
+    let defs = "";
+    // The weave of a mat, over the tones and under the heri and the seams: a ridge and its highlight, a repeating gradient that every mat shares (one `<defs>` entry, which a `<pattern>` would
+    // have to share with the background's), turned a quarter for a mat that lies across. Drawn only at full detail.
+    const pieces = plan.dojo?.pieces ?? plan.judo?.pieces ?? [];
+    const weave = full && plan.texture && pieces.length > 0;
+    const stripe = (at, colour, opacity, width) => el("stop", { offset: at, "stop-color": colour, "stop-opacity": 0 }) + el("stop", { offset: at, "stop-color": colour, "stop-opacity": opacity }) + el("stop", { offset: at + width, "stop-color": colour, "stop-opacity": opacity }) + el("stop", { offset: at + width, "stop-color": colour, "stop-opacity": 0 });
+    const woven = () => {
+        defs += el("linearGradient", { id: `${o.id}-weave`, x1: 0, y1: 0, x2: 0, y2: 0.1, gradientUnits: "userSpaceOnUse", spreadMethod: "repeat" }, stripe(0.1, "#000000", 0.16, 0.22) + stripe(0.52, "#ffffff", 0.14, 0.16));
+        const rect = (p) => `M${p.x0} ${p.y0}H${p.x1}V${p.y1}H${p.x0}Z`;
+        // A mat that lies across is drawn in a group turned a quarter, with its corners turned back, so that its ridges run along it.
+        const turned = (p) => `M${p.y0} ${-p.x0}H${p.y1}V${-p.x1}H${p.y0}Z`;
+        const across = pieces.filter((p) => p.along === "x");
+        const down = pieces.filter((p) => p.along === "y");
+        let out = "";
+        if (across.length > 0)
+            out += el("path", { class: "ky-bud-weave", d: across.map(rect).join(""), fill: `url(#${o.id}-weave)` });
+        if (down.length > 0)
+            out += el("g", { transform: "rotate(90)" }, el("path", { class: "ky-bud-weave", d: down.map(turned).join(""), fill: `url(#${o.id}-weave)` }));
+        // A faint light line along the edge of each mat, where its rounded edge catches the light.
+        out += el("path", { class: "ky-bud-edge", d: pieces.map(rect).join(""), fill: "none" });
+        return out;
+    };
+    let pending = false;
+    let wove = false;
+    for (const a of plan.areas) {
+        const tone = a.cls === "ky-bud-t1" || a.cls === "ky-bud-t2" || a.cls === "ky-bud-t3";
+        if (weave && !wove && pending && !tone) {
+            wove = true;
+            ground += woven();
+        }
+        if (tone)
+            pending = true;
+        ground += el("path", { class: ft(o, a.feature, a.cls), d: areaD(a), "fill-rule": a.evenodd === true ? "evenodd" : undefined });
+    }
+    if (weave && !wove)
+        ground += woven();
+    base += group(ground, "ky-bud-ground");
+    const thick = o.exact ? plan.lineWidth : plan.drawnLine;
+    // The seams are the plan's finest lines: left out of a drawing that asks for the simple detail.
+    const shown = full ? plan : { ...plan, shapes: plan.shapes.filter((s) => s.feature !== "seams" && s.feature !== "boards") };
+    const lines = group(strokes(shown, o) + marks(shown, o), "ky-bud-lines");
+    const W = (plan.box.x1 - plan.box.x0) * K;
+    const H = (plan.box.y1 - plan.box.y0) * K;
+    const cx = (plan.centre.x - ox) * K;
+    const cy = (plan.centre.y - oy) * K;
+    // The score's board lies on the middle of the surface; the teams are named on it, not painted on the mats.
+    const plateW = Math.min(W * 0.52, 190);
+    // The names a score paints (kyūdō's and a dojo's: the others have a board): on the shajō's floor and over the yamichi, or either side of the middle.
+    const kyu = plan.kyudo;
+    const places = kyu === undefined ? { left: { cx: W * 0.27, cy: H / 2, w: W * 0.2, h: H * 0.11, rot: 0 }, right: { cx: W * 0.73, cy: H / 2, w: W * 0.2, h: H * 0.11, rot: 0 } } : { left: { cx: ((kyu.shajo.x0 + kyu.shajo.x1) / 2 - ox) * K, cy: H * 0.3, w: (kyu.shajo.x1 - kyu.shajo.x0) * K * 0.5, h: H * 0.09, rot: 0 }, right: { cx: ((kyu.yamichi.x0 + kyu.yamichi.x1) / 2 + (kyu.yamichi.x1 - kyu.yamichi.x0) / 4 - ox) * K, cy: (((kyu.yamichi.y0 + kyu.yamichi.y1) / 2) - oy) * K, w: (kyu.yamichi.x1 - kyu.yamichi.x0) * K * 0.3, h: H * 0.09, rot: 0 } };
+    const surface = {
+        sport: plan.sport,
+        view: view0,
+        base,
+        lines,
+        defs,
+        left: places.left,
+        right: places.right,
+        plate: { cx, cy, w: plateW, h: plateW * 0.55 },
+        turned,
+        bannersOver: true,
+        onColour: false,
+        centreRadius: plan.centre.r * K,
+    };
+    surface.box = { x: 0, y: 0, w: W, h: H };
+    surface.lineRef = { width: thick, feet: K };
+    const ranges = {};
+    for (const [name, r] of Object.entries(plan.ranges))
+        ranges[name] = rangeOf(r, ox, oy);
+    surface.ranges = ranges;
+    if (o.landmarks === true) {
+        const m = plan.marks.map((p) => ({ id: p.id, x: (p.x - ox) * K, y: (p.y - oy) * K, side: p.side }));
+        surface.marks = full ? m : m.filter((p) => !p.id.startsWith("~"));
+    }
+    if (turned) {
+        const t = quarterTurn(view0);
+        surface.view = t.view;
+        surface.turn = t.turn;
+    }
+    return surface;
+}

package/dist/surfaces/dive.d.ts

@@ -2,8 +2,8 @@ import type { DivePlan } from "../pool.ts";
 import { type PoolCtx } from "../pool.kit.ts";
 import { type BuildOptions, type Surface } from "./surface.ts";
 /**
- * A diving well seen from above, from World Aquatics' rules (Part Four, Article 13 and Appendix 2): the pool wall the boards stand at on the left, the diving direction towards the right. Every springboard is 4.88 m
- * long and 0.50 m wide with its front edge, the plummet, 2.22 m beyond the wall; each platform has the length and width of the table, its front edge 0.75 to 1.50 m beyond the wall (13.1.2.5); the boards stand the preferred
- * distance (Appendix 2, B and C) from the side wall and from each other. The three lines across the well (13.2.7) are 21 m long, 2.5 m apart, the first under the plummet of the 3 m springboard.
+ * A diving well seen from above, from World Aquatics' rules (Part Four, Article 15 and Appendix 2): the pool wall the boards stand at on the left, the diving direction towards the right. Every springboard is 4.88 m
+ * long and 0.50 m wide with its front edge, the plummet, 2.22 m beyond the wall; each platform has the length and width of the table, its front edge 0.75 to 1.50 m beyond the wall (15.4.9); the boards stand the preferred
+ * distance (Appendix 2, B and C) from the side wall and from each other. The three lines across the well (15.6.3.1) are 21 m long, 2.5 m apart, the first under the plummet of the 3 m springboard.
  */
 export declare function diving(o: BuildOptions, plan: DivePlan, ctx?: PoolCtx): Surface;

package/dist/surfaces/dive.js

@@ -8,9 +8,9 @@ import { edges, ft, quarterTurn, textOn } from "./surface.js";
 /** The name a board goes by in the words of the landmarks. */
 const markId = (b) => (b.kind === "springboard" ? `springboard-${b.height}m` : `platform-${String(b.height).replace(".", "-")}m`);
 /**
- * A diving well seen from above, from World Aquatics' rules (Part Four, Article 13 and Appendix 2): the pool wall the boards stand at on the left, the diving direction towards the right. Every springboard is 4.88 m
- * long and 0.50 m wide with its front edge, the plummet, 2.22 m beyond the wall; each platform has the length and width of the table, its front edge 0.75 to 1.50 m beyond the wall (13.1.2.5); the boards stand the preferred
- * distance (Appendix 2, B and C) from the side wall and from each other. The three lines across the well (13.2.7) are 21 m long, 2.5 m apart, the first under the plummet of the 3 m springboard.
+ * A diving well seen from above, from World Aquatics' rules (Part Four, Article 15 and Appendix 2): the pool wall the boards stand at on the left, the diving direction towards the right. Every springboard is 4.88 m
+ * long and 0.50 m wide with its front edge, the plummet, 2.22 m beyond the wall; each platform has the length and width of the table, its front edge 0.75 to 1.50 m beyond the wall (15.4.9); the boards stand the preferred
+ * distance (Appendix 2, B and C) from the side wall and from each other. The three lines across the well (15.6.3.1) are 21 m long, 2.5 m apart, the first under the plummet of the 3 m springboard.
  */
 export function diving(o, plan, ctx = {}) {
     const L = plan.length;

package/dist/surfaces/football.js

@@ -93,6 +93,8 @@ export function football(spec, o, marks = { hashMarks: true, postShape: "slingsh
     if (numbered && spec.id === "cfl" && (yardsLong / 2) % 10 !== 0)
         positions.push({ x: e + (yardsLong / 2) * 3, label: spec.centre, pos: yardsLong / 2 });
     let numbers = "";
+    const arrows = [];
+    const numerals = [];
     for (const side of ["near", "far"]) {
         const y = side === "near" ? W - centreY : centreY;
         for (const p of positions) {
@@ -100,6 +102,9 @@ export function football(spec, o, marks = { hashMarks: true, postShape: "slingsh
             const centre = p.label === spec.centre || p.pos === yardsLong / 2;
             const digits = [...p.label];
             const flip = side === "far";
+            // The numeral's box in the wide frame: the digits stand along the field, or across it when the field is turned.
+            const spread = digits.length === 1 ? 3 : 5.9;
+            numerals.push([p.x, y, turned ? DIGIT_HEIGHT / 2 : spread, turned ? spread : DIGIT_HEIGHT / 2]);
             if (digits.length === 1)
                 numbers += textOn(turned, p.x, y + DIGIT_HEIGHT / 2, p.label, { size, anchor: "middle", cls: numCls, flip, weight: 700 });
             else {
@@ -118,6 +123,7 @@ export function football(spec, o, marks = { hashMarks: true, postShape: "slingsh
             if (full && !centre && Number(p.label) < 50) {
                 const ax = nearGoalLeft ? p.x - 8.4 : p.x + 8.4;
                 const dir = nearGoalLeft ? -1 : 1;
+                arrows.push([ax, y, 1.5, 1.6]);
                 numbers += el("path", { class: ft(o, "numbers", "ky-fill-line"), d: `M${num(ax + dir * 1.5)} ${num(y)}L${num(ax - dir * 1.5)} ${num(y - 1.6)}V${num(y + 1.6)}Z` });
             }
         }
@@ -169,6 +175,7 @@ export function football(spec, o, marks = { hashMarks: true, postShape: "slingsh
     };
     surface.lineRef = { width: lw, feet: 1 };
     surface.box = { x: 0, y: 0, w: L, h: W };
+    surface.anchors = { kind: "football", length: spec.length, endZone: e, width: W, arrows, numerals };
     // The red zone is the 20 yards before a goal line and the end zone behind it; the half is from an end line to midfield.
     const twenty = 60;
     const half = atEnds((end) => (end === "left" ? edges(0, 0, L / 2, W) : edges(L / 2, 0, L, W)));

package/dist/surfaces/hockey.js

@@ -15,8 +15,8 @@ export function boardsY(x, radius = NHL.cornerRadius) {
  * season (today's by default) marked it; with a `rink` (leagues.ts), that league's, in feet.
  */
 export function hockey(o, era, rink = NHL_RINK) {
-    // The NHL's rink has a history of its own (eras.ts); a league's, if it has one, is already in its `rink`.
-    const nhl = rink === NHL_RINK ? (era ?? rulesFor("nhl").rules) : undefined;
+    // The NHL's rink has a history of its own (eras.ts), and so has an arena's rink of another size (an `era` given with it); a league's, if it has one, is already in its `rink`.
+    const nhl = rink === NHL_RINK || era !== undefined ? (era ?? rulesFor("nhl").rules) : undefined;
     const { length: L, width: W, cornerRadius: r } = rink;
     const g = nhl?.goalLine ?? rink.goalLine;
     const blueLine = nhl?.blueLine ?? rink.blueLine;
@@ -129,6 +129,7 @@ export function hockey(o, era, rink = NHL_RINK) {
     surface.lineRef = { width: thin, feet: 1 };
     surface.box = { x: 0, y: 0, w: L, h: W };
     surface.centreRadius = rink.circleRadius;
+    surface.anchors = { kind: "hockey", length: L, width: W, blueLine, goalLine: g, cornerRadius: r, net: net_ };
     // The zones of the ice: from the end boards to a blue line, and between the blue lines.
     const zone = atEnds((end) => (end === "left" ? edges(0, 0, blueLine, W) : edges(L - blueLine, 0, L, W)));
     surface.ranges = {

package/dist/surfaces/polo.d.ts

@@ -1,12 +1,12 @@
 import type { PoloPlan } from "../pool.ts";
 import { type PoolCtx } from "../pool.kit.ts";
 import { type BuildOptions, type Surface } from "./surface.ts";
-/** The space behind each goal line where the goal's net hangs, in metres (CR 18.3.5): the pool is the field of play, 25 m between the goal lines (CR 18.1.2), and this behind each of them. */
+/** The space behind each goal line where the goal's net hangs, in metres (Part Six 21.6.5 and 21.7.2.1: the goal at least 0.3 m deep, the lane rope 0.3 m behind the goal line): the pool is the field of play, 25 m between the goal lines (Part Six 20.2.2.1), and this behind each of them. */
 export declare const POLO_BEHIND: 0.3;
 /**
  * A water polo field of play lying wide, from World Aquatics' rules: 25 by 20 m between the goal lines; lane ropes along both sides whose floats are white at the goal line and the half distance line, red to
- * the 2 m mark, yellow from 2 to 6 m and green from 6 m to the half distance line, with a red mark at 5 m (CR 18.3.1 and Appendix 4, 20.4.1.5); the 2 m lines from the goal posts that make the goal areas
- * (20.4.1.2); the goals, 3 m between the posts (18.3.3); the re-entry area 2.0 by 1.08 m in each corner on the side away from the official table (18.3.4); the referees' platforms 1 m wide along both sides, coloured
- * as the ropes are (18.3.2); the official table and the area for flying substitutions on the side of the benches (18.1.8).
+ * the 2 m mark, yellow from 2 to 6 m and green from 6 m to the half distance line, with a red mark at 5 m (Part Six 21.7.1 and 21.7.2); the 2 m lines from the goal posts that make the goal areas
+ * (Part Six 20.4 and 21.7.2.1.2); the goals, 3 m between the posts (21.6.3.2); the re-entry area 2.0 by 1.08 m in each corner on the side away from the official table (20.7); the referees' platforms 1 m wide along both sides, coloured
+ * as the ropes are (21.9.3); the official table (21.10) and the area for flying substitutions on the side of the benches (20.6).
  */
 export declare function waterPolo(o: BuildOptions, plan: PoloPlan, ctx?: PoolCtx): Surface;

package/dist/surfaces/polo.js

@@ -4,13 +4,13 @@ import { box, deckMarkup, leastWidth, paintDefs, poolIds, ropeMarkup, waterMarku
 import { WATER_POLO } from "../pool.figures.js";
 import { GUTTER } from "./pool.js";
 import { atEnds, edges, ft, quarterTurn } from "./surface.js";
-/** The space behind each goal line where the goal's net hangs, in metres (CR 18.3.5): the pool is the field of play, 25 m between the goal lines (CR 18.1.2), and this behind each of them. */
+/** The space behind each goal line where the goal's net hangs, in metres (Part Six 21.6.5 and 21.7.2.1: the goal at least 0.3 m deep, the lane rope 0.3 m behind the goal line): the pool is the field of play, 25 m between the goal lines (Part Six 20.2.2.1), and this behind each of them. */
 export const POLO_BEHIND = WATER_POLO.goal.netClear;
 /**
  * A water polo field of play lying wide, from World Aquatics' rules: 25 by 20 m between the goal lines; lane ropes along both sides whose floats are white at the goal line and the half distance line, red to
- * the 2 m mark, yellow from 2 to 6 m and green from 6 m to the half distance line, with a red mark at 5 m (CR 18.3.1 and Appendix 4, 20.4.1.5); the 2 m lines from the goal posts that make the goal areas
- * (20.4.1.2); the goals, 3 m between the posts (18.3.3); the re-entry area 2.0 by 1.08 m in each corner on the side away from the official table (18.3.4); the referees' platforms 1 m wide along both sides, coloured
- * as the ropes are (18.3.2); the official table and the area for flying substitutions on the side of the benches (18.1.8).
+ * the 2 m mark, yellow from 2 to 6 m and green from 6 m to the half distance line, with a red mark at 5 m (Part Six 21.7.1 and 21.7.2); the 2 m lines from the goal posts that make the goal areas
+ * (Part Six 20.4 and 21.7.2.1.2); the goals, 3 m between the posts (21.6.3.2); the re-entry area 2.0 by 1.08 m in each corner on the side away from the official table (20.7); the referees' platforms 1 m wide along both sides, coloured
+ * as the ropes are (21.9.3); the official table (21.10) and the area for flying substitutions on the side of the benches (20.6).
  */
 export function waterPolo(o, plan, ctx = {}) {
     const Lp = plan.length;
@@ -56,7 +56,7 @@ export function waterPolo(o, plan, ctx = {}) {
         lines += across("six-metre-lines", "yellow", at(WATER_POLO.sixMetre, from));
         lines += across("five-metre-marks", "red", at(WATER_POLO.fiveMetre, from), `${num(feet(0.5))} ${num(feet(0.5))}`);
     }
-    // The goal areas: red lines 2 m long from the outer faces of the goal posts (Appendix 4, 20.4.1.2).
+    // The goal areas: red lines 2 m long from the outer faces of the goal posts (Part Six 20.4.1 and 21.7.2.1.2).
     const post = WATER_POLO.goal.post;
     const half = WATER_POLO.goal.width / 2;
     for (const from of ["left", "right"]) {

package/dist/surfaces/pool.d.ts

@@ -15,7 +15,7 @@ export interface SwimBody {
 /** The gutter round the water, in metres: the width of the coping the pool is drawn with. */
 export declare const GUTTER = 0.4;
 /**
- * The body of a swimming pool: every figure is the rules' (`SWIMMING`, pool.figures.ts). The lane markings on the floor are 46 m (21 m in a 25 m pool) long and end 2 m from the walls in a cross line 1 m long (CR 16.2.15); a
+ * The body of a swimming pool: every figure is the rules' (`SWIMMING`, pool.figures.ts). The lane markings on the floor are 46 m (21 m in a 25 m pool) long and end 2 m from the walls in a cross line 1 m long (Part Two 15.13.1 and 15.13.2); a
  * cross line 0.5 m long at 15 m from each end; the touch panels 2.4 m wide at the walls with the target lines; the ropes in the rules' colours with red floats within 5 m of the walls and a mark at 15 m and 25 m;
  * the starting blocks with their lane numbers; the backstroke flags 5 m from each end, and the false start rope 15 m from the starting end.
  */

package/dist/surfaces/pool.js

@@ -8,7 +8,7 @@ import { atEnds, edges, ft, quarterTurn, textOn } from "./surface.js";
 /** The gutter round the water, in metres: the width of the coping the pool is drawn with. */
 export const GUTTER = 0.4;
 /**
- * The body of a swimming pool: every figure is the rules' (`SWIMMING`, pool.figures.ts). The lane markings on the floor are 46 m (21 m in a 25 m pool) long and end 2 m from the walls in a cross line 1 m long (CR 16.2.15); a
+ * The body of a swimming pool: every figure is the rules' (`SWIMMING`, pool.figures.ts). The lane markings on the floor are 46 m (21 m in a 25 m pool) long and end 2 m from the walls in a cross line 1 m long (Part Two 15.13.1 and 15.13.2); a
  * cross line 0.5 m long at 15 m from each end; the touch panels 2.4 m wide at the walls with the target lines; the ropes in the rules' colours with red floats within 5 m of the walls and a mark at 15 m and 25 m;
  * the starting blocks with their lane numbers; the backstroke flags 5 m from each end, and the false start rope 15 m from the starting end.
  */
@@ -76,7 +76,7 @@ export function swimBody(o, plan, ids) {
             runs.push(["white", Math.max(0, x - run), Math.min(L, x + run), rope.y]);
     }
     lines += ropeMarkup(o, runs, SWIMMING.floatDiameter, 0.45);
-    // The marks on the deck at 15 m (and 25 m) from the walls, and the standards of the flags: on both sides of the pool (CR 16.1.10).
+    // The marks on the deck at 15 m (and 25 m) from the walls, and the standards of the flags: on both sides of the pool (Part Two 15.9.1).
     if (full && !neutral) {
         let ticks = "";
         for (const x of [SWIMMING.markAt15, L - SWIMMING.markAt15, ...(plan.course === "long" ? [SWIMMING.markAt25] : [])]) {
@@ -104,7 +104,7 @@ export function swimBody(o, plan, ids) {
                     lines += el("circle", { class: "ky-pl-st", cx: fx, cy: feet(y), r: feet(0.22) * s });
         }
     }
-    // The starting blocks, 0.5 by 0.6 m, one in each lane at each end, numbered on the top (CR 16.2.8 and 16.2.9).
+    // The starting blocks, 0.5 by 0.5 m (Part Two 15.8.1 asks at least that; the June 2025 edition asked 0.6 m long at the Olympic Games and the World Championships), one in each lane at each end, numbered on the top (Part Two 15.8.1 and 15.8.6).
     if (plan.blocks && !neutral) {
         const bw = SWIMMING.block.width * s;
         const bl = SWIMMING.block.length * s;

package/dist/surfaces/surface.d.ts

@@ -46,6 +46,36 @@ export type SurfaceRanges = Readonly<Record<string, Box | {
     left: Box;
     right: Box;
 }>>;
+/** The places of a surface's own parts that a game's situation (`situation`) is drawn against, in the wide frame, in feet. */
+export type SituationAnchors = {
+    kind: "hockey";
+    length: number;
+    width: number;
+    blueLine: number;
+    goalLine: number;
+    cornerRadius: number;
+    net: {
+        width: number;
+        depth: number;
+    };
+}
+/** The centre of each base, as the drawing has it (first, second, third), and half the diagonal of a base as drawn; where the backstop stands behind home plate. */
+ | {
+    kind: "baseball";
+    bases: readonly (readonly [number, number])[];
+    half: number;
+    backstop: number;
+}
+/** The field of play from goal line to goal line, with its end zones. */
+/** `arrows` and `numerals`: what a tag must not cover, each as its centre and half its size along the field and across it (`[x, y, hx, hy]`): the arrows beside the yard numbers that point to a goal line, when the field draws them, and the numbers. */
+ | {
+    kind: "football";
+    length: number;
+    endZone: number;
+    width: number;
+    arrows: readonly (readonly [number, number, number, number])[];
+    numerals: readonly (readonly [number, number, number, number])[];
+};
 /** A surface, ready for the teams and the score to be laid on it. */
 export interface Surface {
     sport: Sport;
@@ -127,6 +157,8 @@ export interface Surface {
     };
     /** For a surface with a crowd: the margin it was drawn with, which holds the stands. */
     crowdMargin?: number;
+    /** Where the parts a situation is drawn against are: a rink's lines and nets, a diamond's bases, a gridiron's goal lines. */
+    anchors?: SituationAnchors;
 }
 /** A part of a surface to label: its anchor on the surface in feet and the margin its label stands in (the top or the bottom as the surface lies wide). */
 export interface Mark {

package/dist/surfaces/venue.d.ts

@@ -6,7 +6,7 @@ export declare function venueName(item: VenueLayout["items"][number], language:
 /**
  * Several pools in one hall, to scale: each pool is drawn by its own sport's builder (the competition pool of 8 lanes, a diving well, a warm-up pool, a water polo pool or an artistic swimming area) and set at its place,
  * with the deck round the hall drawn once and the paint of the water and the deck defined once for all of them. The pools stand at least 8 m apart, 10 m by default, as the rules keep a swimming pool and a diving well
- * (CR 16.2.17). The water of the whole hall is the surface's `box`.
+ * (Part Two 15.15.1). The water of the whole hall is the surface's `box`.
  */
 export declare function natatorium(o: BuildOptions, style: PoolStyle, look: {
     look: "flat" | "water" | "tiled";

package/dist/surfaces/venue.js

@@ -31,7 +31,7 @@ export function venueName(item, language) {
 /**
  * Several pools in one hall, to scale: each pool is drawn by its own sport's builder (the competition pool of 8 lanes, a diving well, a warm-up pool, a water polo pool or an artistic swimming area) and set at its place,
  * with the deck round the hall drawn once and the paint of the water and the deck defined once for all of them. The pools stand at least 8 m apart, 10 m by default, as the rules keep a swimming pool and a diving well
- * (CR 16.2.17). The water of the whole hall is the surface's `box`.
+ * (Part Two 15.15.1). The water of the whole hall is the surface's `box`.
  */
 export function natatorium(o, style, look, language) {
     const layout = venueLayout(style);

package/dist/target-entry.d.ts

@@ -0,0 +1,2 @@
+export { GOAL_SPORTS, KYOGIJO_TARGET_STYLE, LENGTH_ZONES, TARGET_SPORTS, drawGoalMouth, drawStrikeZone, drawStumps, drawTarget, goalSize, goalZoneIds, lengthZoneOf, targetZoneAt } from "./target.ts";
+export type { GoalSport, TargetDrawing, TargetFrame, TargetOptions, TargetPlace, TargetShot, TargetSport, TargetUnit } from "./target.ts";

package/dist/target-entry.js

@@ -0,0 +1,2 @@
+// The targets seen end-on: the mouth of a goal from the shooter's side, the stumps from the bowler's end and the strike zone from the catcher's, with the shots, deliveries and pitches on them.
+export { GOAL_SPORTS, KYOGIJO_TARGET_STYLE, LENGTH_ZONES, TARGET_SPORTS, drawGoalMouth, drawStrikeZone, drawStumps, drawTarget, goalSize, goalZoneIds, lengthZoneOf, targetZoneAt } from "./target.js";