colregs 0.3.2 → 0.3.4

package/docs/requirements.md

@@ -72,15 +72,16 @@ Neither consumer lives in this repo.
 - **REQ-SCOPE-3** — A jurisdiction MUST be expressible as a *delta*: entries
   absent from a jurisdiction's data inherit from `intl`. A jurisdiction MUST
   NOT require restating the whole body of rules. Inheritance is "unless
-  suppressed", not unconditional — see Q-11: verified Inland structure
-  (Rule 28 "[Reserved]") means silence-means-inherit would apply
-  international law where the national body deliberately has none, so no
-  non-`intl` jurisdiction lands before an explicit suppression mechanism
-  exists. That bar is about suppression, not licensing: it is independent of
-  REQ-PROV-2 and ADR 0010, and it binds whether a jurisdiction's text ships or
-  is withheld. A delta that only *adds* entries is exempt: it suppresses nothing,
-  so the Q-11 hazard cannot arise from it (ADR 0008, `rule:30a:mooring_buoy`/`rule:30b:mooring_buoy`).
-  A delta that suppresses or replaces an `intl` entry still waits.
+  suppressed", not unconditional: verified Inland structure (Rule 28
+  "[Reserved]") means silence-means-inherit would apply international law
+  where the national body deliberately has none, so a jurisdiction MUST
+  tombstone each inherited entry it deliberately lacks in `suppressions[]`
+  (ADR 0018; Q-11). The delta is an RFC 7396 merge patch over `intl` by
+  entry id — own entries present, tombstones `null`, silence inherits — and
+  a test proves the stored tables equal to that patch applied. This binds
+  whether a jurisdiction's text ships or is withheld (REQ-PROV-2, ADR 0010
+  are separate). A delta that only *adds* entries has no tombstones (ADR
+  0008); one that replaces an `intl` entry tombstones it and adds its own.
 - **REQ-SCOPE-4** — Adding a jurisdiction MUST be additive. It MUST NOT require
   a schema change or edits to existing `intl` entries.
 - **REQ-SCOPE-5** — Geography that gates a rule (Great Lakes, Western Rivers,
@@ -164,14 +165,14 @@ Four layers, each independently addressable.
 - **REQ-MODEL-6** — Entries MUST compose. Multiple entries applying to one fact
   record is the normal case, not an error (Rule 28 is "in addition to" Rule 23).
 - **REQ-MODEL-7** — Five relations MUST be supported:
-  - `rel:includes` — import another entry's **lights only**, never its predicate;
-  - `rel:in_lieu_of` — legal alternatives for the same fact record;
+  - `rel:includes` — import another entry's lights, modality and scalar gates, never its axes (ADR 0019);
+  - `rel:in_lieu_of` — legal alternatives for the same fact record; overlapping targets are alternatives to each other (ADR 0019);
   - `rel:excludes` — mutual exclusion, including across rules; symmetric
     (A excludes B implies B excludes A), and no participating entry MAY be
     forceful (`modality:shall`/`modality:shall-if-practicable`) — a directed "this one
-    prevails" is `rel:overrides` (ADR 0007), not `rel:excludes`;
-  - `rel:exempts` — one entry lifting another's obligation;
-  - `rel:conditional_includes` — import or alternatives, gated on a predicate.
+    prevails" is `rel:overrides` (ADR 0007), not `rel:excludes`; a constraint on one display, never a removal (ADR 0019);
+  - `rel:exempts` — one entry lifting another's obligation; reaches an entry in force, never an import (ADR 0019);
+  - `rel:conditional_includes` — import or alternatives, gated on a predicate; a `one_of` yields exactly one per display, or none under a `may` carrier (ADR 0019).
   The five are not interchangeable; README.md holds the working semantics.
 - **REQ-MODEL-13** — Where a condition goes is not a style choice. A
   condition on whether a paragraph *applies to this vessel at all* MUST be in
@@ -474,24 +475,21 @@ See ADR 0003.
   resolve to a known paragraph path, and on a corpus filename that disagrees
   with the file's internal metadata. Silence MUST NOT imply coverage (the
   language mirror of REQ-SCOPE-6).
-- **REQ-LANG-6** **(unimplemented — no display catalogs exist)** — Display
-  strings for the identifier vocabularies (light names, fact-value labels,
-  modality labels, image captions) MUST be addressable via stable string keys
-  with per-language catalogs, separate from legal corpora. Catalog entries are
-  static strings: no interpolation, plural or gender grammar — message
-  composition belongs to the consumer's i18n system, and this package MUST NOT
-  grow one. Each catalog MUST carry lightweight provenance: contributors,
-  reviewers, review date, licence. Maintainer notes inside structural files
-  are working documentation, not display strings, not part of the localization
-  surface, and stay untranslated.
-- **REQ-LANG-7** **(unimplemented in part — no fallback policy is encoded, but
-  the mixed-corpus statement is missing from the package documentation)** — The
-  package MUST NOT encode a language fallback policy, and MUST NOT silently
-  substitute one corpus for another. Text is only addressable inside a corpus,
-  so every textual unit a consumer retrieves is attributable to its corpus;
-  package documentation MUST state that a mixed-corpus rendering is never a
-  single authoritative edition. Choice and fallback beyond that are the
-  consumer's (the language mirror of REQ-CONS-3).
+- **REQ-LANG-6** — Display strings for the closed vocabularies the package
+  emits (light, modality, role, encounter, jurisdiction, fact values, and
+  image captions **(unimplemented — no catalog yet)**) MUST be addressable
+  via stable string keys with per-language catalogs, separate from legal
+  corpora; not being an identifier does not exclude a vocabulary. Catalog
+  entries are static strings — no interpolation, plural or gender grammar —
+  and MUST carry provenance (contributors, reviewers, review date, licence);
+  definitions stay untranslated in structural files, not catalogued.
+- **REQ-LANG-7** — The package MUST NOT encode a language fallback policy,
+  and MUST NOT silently substitute one corpus for another. Text is only
+  addressable inside a corpus, so every textual unit a consumer retrieves
+  is attributable to its corpus; package documentation MUST state that a
+  mixed-corpus rendering is never a single authoritative edition. Choice
+  and fallback beyond that are the consumer's (the language mirror of
+  REQ-CONS-3).
 - **REQ-LANG-8** — A `community`-tier corpus MUST record who produced and
   who reviewed it. Machine translation without named human review MUST NOT
   be accepted.
@@ -507,6 +505,9 @@ See ADR 0003.
   reflects. The two MAY differ — a corpus transcribed from an older
   consolidation is legitimate — but the difference MUST be machine-visible,
   never silent.
+- **REQ-LANG-11** — Exactly one language MUST be declared reference-complete;
+  CI MUST fail if its catalog omits an emitted value. Other catalogs MAY be
+  partial, gated only by the existing key-resolution check.
 
 ---
 
@@ -638,8 +639,7 @@ specification until 1.0.
 
 ### Open gates
 
-Each gate names the declined design, the closing event, and the trigger.
-
+Each names the declined design, closing event, and trigger.
 - **GATE-1 — `paragraph_id` split from `citation_path`**
   (ADR 0003, declined; REQ-LANG-3, REQ-PKG-4).
   *Closing event*: the 1.0 tag. Before it, splitting the two is a
@@ -763,8 +763,9 @@ Each gate names the declined design, the closing event, and the trigger.
   unlikely short of major success. Recorded regardless: "unlikely" is not
   a closing event (REQ-GATE-1).
 
-Gates whose closing event is "none" are recorded because a future reader
-will otherwise re-ask whether they were merely deferred. They were not.
+Four gates from ADR 0013 (option B), *closing event* for all four the first national text whose edition cannot be determined: **GATE-7 — validity intervals on editions (`in_force_until`)**, trigger an edition superseded with no successor to bound it; **GATE-8 — a per-source publication record separate from the edition (FRBR manifestation)**, trigger two published sources for one edition that disagree; **GATE-9 — a content digest per corpus for verification**, trigger a corpus differing from its cited source with no edition or source change; **GATE-10 — a skeleton per edition**, trigger the first amendment that deletes or renumbers a path.
+
+Gates whose closing event is "none" are recorded because a future reader will otherwise re-ask whether they were merely deferred. They were not.
 
 ### Gate status is data
 
@@ -930,14 +931,13 @@ Tracked here until resolved; each becomes an ADR.
   Rule 28 "[Reserved]" and has no counterpart for `23(d)(ii)`/`(iii)`
   ([verification](verification/2026-08-30-q6-q8.md), Claim 1), so a
   `us/inland` delta that is merely silent there would inherit the `intl`
-  entries and assert international obligations on inland waters. A delta
-  needs explicit suppression records (tombstones) alongside overrides —
-  "this path/entry deliberately does not exist here", distinguishable from
-  "not yet transcribed". Decide the mechanism in the second-jurisdiction
-  bundle (GATE-1 re-take, GATE-2, Q-10); until then no non-`intl`
-  jurisdiction lands. This is the live blocker on CEVNI, and it is *not* the
-  licence one: ADR 0010 removed the licence block by permitting structure with
-  the text withheld, and left this one standing.
+  entries and assert international obligations on inland waters.
+  **Resolved 2026-09-16, ADR 0018.** Tombstones: `suppressions[]` in
+  `data/applicability.json`, one record per (jurisdiction, `intl` entry),
+  and the whole delta is an RFC 7396 merge patch by entry id, proven by
+  test; the two verified Inland absences are the first tombstones. The hold
+  on non-`intl` jurisdictions is lifted (CEVNI: structure unblocked on both
+  counts, this and ADR 0010). GATE-1, Q-10, Q-8 stay open on their triggers.
   Also from the same verification pass, tracked on the global board rather
   than here: four transcription defects in `data/rules.json` itself
   (`21(a)`, `21(b)`, `23(b)`, `29(b)`) — a data fix, not a design
@@ -1153,7 +1153,7 @@ named that gap before the class existed.
   first-cut table, but it is the one paragraph of Rule 13 that assigns a role
   and a `category:classification` entry has nowhere to put one. Entry `rule:13a` is
   `category:precedence` here, with 13(b)'s sector test left for the `category:classification`
-  entry that would set the `hist:was_overtaking` latch. Settled with the rest
+  entry that would set the `hist:was_overtaking` overtaking-history fact. Settled with the rest
   of `Q-14`, paragraph by paragraph.
 
   **Closed in pencil 2026-09-04 (PR #26).** 13(b) is now written, as *two*
@@ -1161,7 +1161,7 @@ named that gap before the class existed.
   encounter type belongs to the pair and reading aspect alone classified the
   overtaken vessel's side of the same encounter as a crossing. 13(a) stays `category:precedence`, and its predicate now carries both
   halves of "any vessel overtaking any other": the 13(b) sector and the 13(d)
-  latch, as an `any_of`, which closes the gap the entry recorded. 13(d) is a
+  overtaking history, as an `any_of`, which closes the gap the entry recorded. 13(d) is a
   third `category:classification` entry, reading history and no geometry at all. The
   split confirms the thing ADR 0005 §1 was really defending — one category per
   paragraph. **Reversed in part, 2026-09-16:** ADR 0015 as rewritten makes
@@ -1242,7 +1242,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   again: on those unordered pairs Rule 15 lays a give-way duty on a vessel
   that may be unable to discharge it, which is Rule 2's region and is
   recorded, not gated. `rule:13a` needs no override against `rule:15a:keep_out_of_the_way` — the
-  entry excludes every overtaking by the `hist:was_overtaking` latch and by
+  entry excludes every overtaking by the `hist:was_overtaking` overtaking history and by
   13(b)'s sector — and a test pins that absence so it stays a reason rather
   than an oversight. The hand-list of six is asserted complete by a derived
   check: every Rule 18 entry that assigns a helm role and does not gate a
@@ -1284,7 +1284,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
 - **Q-43** — **The partition needs history to be present, and says nothing when
   it is absent.** `rule:14b` and `rule:15a:crossing` are gated on `hist:was_overtaking`
   being `false` on both subjects, which is 13(d)'s requirement and the only way
-  the three encounter types stay disjoint once the latch is set. Because absent
+  the three encounter types stay disjoint once the overtaking history is set. Because absent
   is absent, a situation that omits the fact is classified as *no encounter at
   all* rather than as a head-on or a crossing. That is conservative in the
   right direction and completely silent, which is the wrong way to be
@@ -1344,7 +1344,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   in seamanship and is one here. Settled by deciding whether the language gains
   fact-to-fact comparison — a bigger change than `not` and `any_of` were, and
   not one to make for a single paragraph.
-- **Q-47** — **13(d)'s latch never clears.** The paragraph runs "until she is
+- **Q-47** — **13(d)'s overtaking history never clears.** The paragraph runs "until she is
   finally past and clear", nothing in the fact vocabulary carries that, and so
   in this model `hist:was_overtaking` is set by a consumer and cleared by a
   consumer while entry `rule:13d` classifies an overtaking for as long as it stands.
@@ -1354,14 +1354,14 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   `category:conduct` monitors, which are the things that watch a duty end rather than
   begin.
 
-  **Ruled 2026-09-08:** while one vessel holds the latch, 13(a)'s sector
-  test is suppressed on the other, newly-gaining vessel — once overtaking,
-  always overtaking, per 13(d)'s own text, so a geometry test that would
-  newly name a second give-way vessel must not fire while the first still
-  holds the role by history alone. `rule:13a`'s sector branch now also reads
-  `other:hist:was_overtaking: false`; the closing fixture in
+  **Ruled 2026-09-08:** while one vessel's overtaking history stands, 13(a)'s
+  sector test is suppressed on the other, newly-gaining vessel — once
+  overtaking, always overtaking, per 13(d)'s own text, so a geometry test
+  that would newly name a second give-way vessel must not fire while the
+  first still holds the role by history alone. `rule:13a`'s sector branch now
+  also reads `other:hist:was_overtaking: false`; the closing fixture in
   `fixtures/situation-fixtures.json` is the case this closes — a vessel
-  drops back onto the latch-holder's own stern, and only the latch-holder
+  drops back onto the history-holder's own stern, and only the history-holder
   gives way.
 - **Q-48** — **Nothing checks that a situation is geometrically possible.**
   `self:geo:rel_bearing_deg`, `other:geo:rel_bearing_deg`, the two
@@ -1392,7 +1392,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   bearing-rate values were placeholders. They were re-derived from the headings
   and speeds. Two cases could not keep their story: the R1 head-on had both
   vessels with the other to starboard, which no speeds make a steady bearing,
-  and is recast as one; the 13(d) latch case is 400 m abeam with the CPA
+  and is recast as one; the 13(d) overtaking-history case is 400 m abeam with the CPA
   already past, and lost `rule:7d_i`. The partition sweep now constructs positions
   and headings for every bearing pair and is consistent at every point. The
   "never both give-way" property is asserted over a sweep of steady-bearing
@@ -1416,6 +1416,7 @@ written up in `docs/identifiers.md` §"Effects"; what it could not is here.
   - Default: narrow (nothing changes).
   - Recommendation: narrow — the test named below shows the fact resolves out of sight
     (`Q-49: hist:was_overtaking resolves out of sight; rule:13d does not fire`, `test/data.test.mjs`).
+- **Q-58** — **Do the Rule 18/12 role entries need `other:hist:was_overtaking: false`, like `rule:13a` and `rule:15a:keep_out_of_the_way` (Q-47)?** The nine `18a*`/`18b*`/`18c*` and three `12a*` entries carry no such gate, and `rule:13a` overrides them only when *self* holds the history; when the *other* holds it, self is named give-way under Rule 18 or 12 while 13(a) puts the duty on the other alone. Default **ungated** (nothing changes), recorded as a `gap` on the twelve. Recommend **gated**, in Q-47's shape: 13(a)'s 'notwithstanding' and Rule 18's own exception for Rule 13 both displace these entries, and Q-47 already ruled the history decides who holds the role. colregs-engine#75 (closed) read the table as self-centric and recommended a consumer swap subjects for the other's duty; that answers the other's role, not self's wrong one. `colregs#117`.
 
 ### From the Part B invariants (P4.1)
 
@@ -1426,22 +1427,20 @@ nothing is blocked while open.
 - **Q-50** — **Does risk of collision gate Rules 13 and 18?** 14(a) and 15(a)
   say "so as to involve risk of collision"; Rule 13 and Rule 18 do not.
   *Wide:* they attach whenever in sight and the geometry holds — Rule 11 is the
-  only gate Section II states — so a vessel overtaking a mile clear abeam is
-  give-way and Rule 16 binds her. *Narrow:* Section II's duties attach only with
+  only gate Section II states. *Narrow:* Section II's duties attach only with
   risk of collision; 14 and 15 are emphasis. Default **wide**: `rule:13a`, `rule:13b`,
-  `rule:13d` and every Rule 18 entry read `in_sight` only. No recommendation.
-- **Q-51** — **What arms 13(d)'s latch?** *A:* 13(b)'s deeming, at the first
+  `rule:13d` and every Rule 18 entry read `in_sight` only. **Ruled
+  2026-09-17:** wide — the window is the encounter itself. A pair the engine is
+  evaluating is an encounter, at whatever range suits the vessels; inside it 13
+  and 18 attach on sight and geometry alone, and how close is clear stays a
+  monitor parameter. *The Nowy Sacz* [1977] 2 Lloyd's Rep 91 (CA) holds risk
+  of collision unnecessary for the overtaking rule; *Meghna Princess* [2017]
+  SGHC 220 [56] restates it; nothing found on Rule 18 either way (colregs#72).
+- **Q-51** — **What arms 13(d)'s overtaking history?** *A:* 13(b)'s deeming, at the first
   state the geometry holds. *B:* 13(a)'s duty actually attaching. They differ
-  where the geometry holds but a condition on 13(a) does not — `Q-50`'s
-  surface. Pencilled **B** ✎ (Solace, 2026-09-14): the latch arms when the
-  duty attaches. KIVELI [2025] EWHC 1185 (Admlty) holds the analogous Rule 14
-  latch arms on risk of collision and then persists; no authority was found on
-  overtaking geometry with no risk of collision. Free to reverse: four entries
-  (`rule:13a`, `rule:13b`, `rule:13d`) and their fixtures, and nothing consumes the one
-  state this changes the answer for. Settled by: a decision on Rule 13 itself,
-  or Cockcroft & Lameijer on whether overtaking status needs risk of
-  collision.
-- **Q-52** — **What does 13(d)'s latch forbid?** *Narrow:* reclassification to
+  only on `Q-50`'s surface. **Ruled 2026-09-17:** B, closed by `Q-50` wide —
+  with no gate between geometry and duty the two readings coincide (colregs#72).
+- **Q-52** — **What does 13(d)'s overtaking history forbid?** *Narrow:* reclassification to
   *crossing* only, as the paragraph says, leaving head-on to Rule 14 on the
   geometry of the moment. *Broad:* the encounter stays an overtaking and no
   other Section II classification attaches. Both preserve the duty; they differ
@@ -1456,23 +1455,25 @@ nothing is blocked while open.
   *Suspension:* "may, however" lifts the duty once non-compliance is apparent;
   a monitor then flags nothing. *Exception:* the duty stands and a departure is
   lawful only as action to avoid collision by her manoeuvre alone; a monitor
-  flags any other alteration. No default (Rule 17 has no entry). Recommend
-  **exception**: 17(a)(ii) describes an action, not a proviso, and leaves a
-  monitor something to check — a drafting argument, not a source.
-- **Q-54** — **Are Rule 17's phases monotone?** *Latching:* one three-valued
-  monotone latch per stand-on vessel per encounter; late compliance does not
-  take the permission away. *Re-evaluating:* each phase is a predicate on the
-  current state and the vessel may fall back — and must she then hold her *new*
-  course and speed? TLC distinguishes them on a four-state trace, so settle
-  before P4.2. No default. Recommend **latching**: one late alteration does not
-  restore reliance — an argument from purpose, not a source.
+  flags any other alteration. No default (Rule 17 has no entry). **Ruled
+  2026-09-16:** exception — the 17(a)(i) duty stands and a departure is lawful
+  only as action to avoid collision; a monitor flags any other alteration.
+  Purpose, not source (colregs#72); read with `Q-54`.
+- **Q-54** — **Are Rule 17's phases monotone?** *Monotone:* one three-valued
+  marker per stand-on vessel per encounter; late compliance does not take the
+  permission away. *Re-evaluating:* each phase is a predicate on the current
+  state and the vessel may fall back — must she then hold her *new* course
+  and speed? TLC distinguishes them on a four-state trace. **Ruled
+  2026-09-16:** monotone — permission or duty, once arisen, survives belated
+  compliance; a fall-back needs a baseline the Rules lack (`Q-57`). No holding on point (colregs#72); *Ever Smart* [2021] UKSC 6 para 61 has the obligation cease at 17(a)(ii)/17(b) with no revival — consistent with monotone, not a ruling on it.
 - **Q-55** — **What does a visibility transition do to Section II state?**
   Rule 11 and 19(a) switch on the current state; no paragraph says what
-  becomes of a 13(d) latch or a Rule 17 phase. *Persisting:* they belong to the
+  becomes of a 13(d) overtaking history or a Rule 17 phase. *Persisting:* they belong to the
   encounter and survive the fog. *Resetting:* Section II starts afresh on the
   geometry when sight is regained — the reclassification 13(d) forbids, via
-  visibility. No default (nothing is temporal). Recommend **persisting**, which
-  `INV-13d`'s "same encounter" is written for; likeliest surprising TLC trace.
+  visibility. No default (nothing is temporal). **Deferred indefinitely** (Solace,
+  2026-09-16): no authority either way (colregs#72); scenario contrived. Lean, not
+  ruling: **resetting** — a new encounter after the fog; persisting withdrawn.
 - **Q-56** — **The third visibility state: a hole, or closed by the model?**
   Not in sight *and* not in or near restricted visibility (clear weather, beyond
   visual range, radar contact) is outside Rule 11 and 19(a): Section I only.
@@ -1494,7 +1495,5 @@ module, expensive after.
 
 A third, ruled rather than pencil: **`docs/part-b-invariants.md` stays
 hand-written Markdown; no derived JSON registry.** Ruled 2026-09-08. Revisit
-only if P4.2's TLA+ needs to cite `INV-` ids mechanically — the id scheme
-just above is already the cheap-to-change half of that trigger, so the
-revisit costs one file's worth of tooling, not a re-derivation of the ids
-themselves.
+only if P4.2's TLA+ needs to cite `INV-` ids mechanically; the cost then is one
+file's worth of tooling, not a re-derivation of the ids.

package/fixtures/applicability-fixtures.json

@@ -923,6 +923,96 @@
     "fact:length_m": 11.6
    },
    "expect": []
+  },
+  {
+   "name": "constrained by draft, US Inland: Rule 28 is [Reserved], the record is out of vocabulary and selects nothing",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:cbd",
+    "fact:position": "position:underway",
+    "fact:length_m": 200
+   },
+   "expect": []
+  },
+  {
+   "name": "6 m outboard, max speed 6 kn, US Inland: 23(d)(ii) has no Inland counterpart, 23(d)(i) is replaced by 23(d), 23(a) is inherited",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:none",
+    "fact:position": "position:underway",
+    "fact:length_m": 6,
+    "fact:max_speed_kn": 6
+   },
+   "expect": [
+    "rule:23a_i",
+    "rule:23a_ii",
+    "rule:23a_iii_iv",
+    "rule:23d"
+   ]
+  },
+  {
+   "name": "constrained by draft, at anchor, US Inland: Rule 30 is inherited untouched",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:cbd",
+    "fact:position": "position:anchored",
+    "fact:length_m": 200
+   },
+   "expect": [
+    "rule:30a",
+    "rule:30c"
+   ]
+  },
+  {
+   "name": "same yacht motoring, US Inland: 23(d)(i) is replaced by Inland 23(d)",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:none",
+    "fact:position": "position:underway",
+    "fact:length_m": 11.6
+   },
+   "expect": [
+    "rule:23a_i",
+    "rule:23a_ii",
+    "rule:23a_iii_iv",
+    "rule:23d"
+   ]
+  },
+  {
+   "name": "pushing ahead, not a composite unit, US Inland: 24(c)(iii) replaces the sternlight with two towing lights",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:pushing",
+    "fact:position": "position:underway",
+    "fact:length_m": 30,
+    "fact:composite_unit": false
+   },
+   "expect": [
+    "rule:24c:towing_lights",
+    "rule:24c:underway_lights"
+   ]
+  },
+  {
+   "name": "pushing ahead, not a composite unit, at anchor, US Inland (issue #137 review: sidelights/towing lights are underway-gated, masthead only at anchor)",
+   "jurisdiction": "us/inland",
+   "facts": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:pushing",
+    "fact:position": "position:anchored",
+    "fact:length_m": 30,
+    "fact:composite_unit": false
+   },
+   "expect": [
+    "rule:24c:towing_lights",
+    "rule:30a",
+    "rule:30b",
+    "rule:30c"
+   ]
   }
  ]
 }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "colregs",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "COLREGS 72 and its national amalgamations as language-neutral JSON — rule text, light definitions, and applicability predicates — with cross-implementation fixtures",
   "license": "Apache-2.0",
+  "colregs": {
+    "referenceLanguage": "en"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mark-brannan/colregs.git"

package/schema/applicability.schema.json

@@ -306,6 +306,21 @@
         "classification_shape": { "type": "string" }
       }
     },
+    "suppressions": {
+      "$comment": "Tombstones (REQ-SCOPE-3, ADR 0018): a jurisdiction deliberately lacks an inherited intl entry, as distinct from not-yet-transcribed. With the jurisdiction's own entries these form its RFC 7396 merge patch over intl; suppresses is the key that patch sets to null.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["jurisdiction", "suppresses", "cite", "why"],
+        "properties": {
+          "jurisdiction": { "type": "string", "pattern": "^[a-z]+(/[a-z]+)+$" },
+          "suppresses": { "$ref": "#/$defs/ruleId" },
+          "cite": { "type": "string", "minLength": 1 },
+          "why": { "type": "string", "minLength": 1 }
+        }
+      }
+    },
     "known_omissions": {
       "type": "array",
       "items": {

package/schema/display-evaluation.schema.json

@@ -9,7 +9,6 @@
     "colregs",
     "applied",
     "exempted",
-    "excluded",
     "overridden",
     "displays",
     "optional_additions",
@@ -27,9 +26,6 @@
     "exempted": {
       "$ref": "evaluation.schema.json#/$defs/byEntryList"
     },
-    "excluded": {
-      "$ref": "evaluation.schema.json#/$defs/byEntryList"
-    },
     "overridden": {
       "$ref": "evaluation.schema.json#/$defs/byEntryList"
     },

package/schema/i18n-catalog.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/mark-brannan/colregs/schema/i18n-catalog.schema.json",
   "title": "data/i18n/*.json",
-  "description": "Display catalog for one BCP 47 language: UI strings for identifier vocabularies (light names, fact-axis labels, modality labels, image captions), not legal text -- see docs/adr/0003-language-as-a-dimension.md 'Display catalogs'.",
+  "description": "Display catalog for one BCP 47 language: UI strings for the closed vocabularies the package emits (lights, modalities, roles, encounters, jurisdictions, closed-list fact values), not legal text -- see docs/adr/0003-language-as-a-dimension.md 'Display catalogs' and REQ-LANG-6.",
   "type": "object",
   "additionalProperties": false,
   "required": ["language", "provenance", "strings"],
@@ -25,18 +25,39 @@
     },
     "strings": {
       "type": "object",
-      "description": "One section per vocabulary. Every section is keyed by the identifier itself, as documented in docs/identifiers.md -- light identifiers (light:) and closed-vocabulary identifiers (modality:, and any of role:/encounter:/category: that gain a catalog section) alike, as stored in data/applicability.json. Values are static strings: no interpolation, no plurals -- the consumer's i18n system owns composition.",
+      "description": "One section per vocabulary (REQ-LANG-6, REQ-LANG-9's ruling docs/adr/0017). Every section is keyed by the identifier itself, as documented in docs/identifiers.md -- light, modality, role and encounter identifiers carry a type prefix; jurisdiction and closed-list fact values are keyed by their own bare or fact-prefixed form. Values are static strings: no interpolation, no plurals -- the consumer's i18n system owns composition.",
       "additionalProperties": false,
       "properties": {
-        "light": {
+        "lights": {
           "type": "object",
           "propertyNames": { "pattern": "^light:[a-z_]+$" },
           "additionalProperties": { "$ref": "#/$defs/label" }
         },
-        "modality": {
+        "modalities": {
           "type": "object",
           "propertyNames": { "pattern": "^modality:[a-z]+(-[a-z]+)*$" },
           "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "roles": {
+          "type": "object",
+          "propertyNames": { "pattern": "^role:[a-z]+(-[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "encounters": {
+          "type": "object",
+          "propertyNames": { "pattern": "^encounter:[a-z]+(-[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "jurisdictions": {
+          "type": "object",
+          "propertyNames": { "pattern": "^[a-z]+(/[a-z]+)*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
+        },
+        "facts": {
+          "type": "object",
+          "description": "Closed-list fact-value labels only (Tier A): propulsion, activity, position, rule18_class, dynamics, obstruction_side, wind_side. Field names (fact:length_m, geo:tcpa_s, ...) have no closed list behind them and are never catalogued here -- form-label text and unit/number formatting are the consumer's.",
+          "propertyNames": { "pattern": "^[a-z][a-z0-9_]*:[a-z][a-z0-9_]*$" },
+          "additionalProperties": { "$ref": "#/$defs/label" }
         }
       }
     }

package/schema/lights.schema.json

@@ -53,10 +53,9 @@
         "^light:[a-z_]+$": {
           "type": "object",
           "additionalProperties": false,
-          "required": ["name", "colregs_term", "cite", "character", "rule21"],
+          "required": ["term", "cite", "character", "rule21"],
           "properties": {
-            "name": { "type": "string", "minLength": 1 },
-            "colregs_term": { "type": "string", "minLength": 1 },
+            "term": { "type": "string", "minLength": 1 },
             "cite": { "type": "string", "minLength": 1 },
             "color": { "type": ["string", "null"] },
             "color_note": { "type": "string" },

package/schema/rules.schema.json

@@ -12,6 +12,54 @@
     "note": {
       "type": "string"
     },
+    "paragraphs": {
+      "$ref": "#/$defs/paragraphs"
+    },
+    "deltas": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Per-jurisdiction skeleton deltas over `paragraphs` (ADR 0020): own paragraphs by path, suppressed paths, everything else inherited.",
+      "patternProperties": {
+        "^[a-z]+(/[a-z]+)+$": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "paragraphs",
+            "suppressions"
+          ],
+          "properties": {
+            "note": {
+              "type": "string"
+            },
+            "paragraphs": {
+              "$ref": "#/$defs/paragraphs"
+            },
+            "suppressions": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": [
+                  "path",
+                  "why"
+                ],
+                "properties": {
+                  "path": {
+                    "$ref": "evaluation.schema.json#/$defs/paragraphCite"
+                  },
+                  "why": {
+                    "type": "string",
+                    "minLength": 1
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "$defs": {
     "paragraphs": {
       "type": "object",
       "additionalProperties": false,

package/data/text/intl/2016/fi.finlex.json

@@ -1,22 +0,0 @@
-{
- "id": "intl@2016.fi.finlex",
- "edition": "intl@2016",
- "edition_status": "claimed",
- "language": "fi",
- "source_id": "finlex",
- "tier": "national",
- "normalization": "NFC",
- "source": {
-  "publisher": "Finlex (Oikeusministeriö), Suomen säädöskokoelman sopimussarja",
-  "title": "Asetus kansainvälisistä säännöistä yhteentörmäämisen ehkäisemiseksi merellä vuonna 1972 tehdyn yleissopimuksen voimaansaattamisesta, SopS 30/1977",
-  "url": "https://www.finlex.fi/fi/sopimukset/sopsteksti/1977/19770030",
-  "retrieved": "2026-09-12"
- },
- "rights": {
-  "source_text": "Tekijänoikeuslaki 404/1961 §9: no copyright in treaties and their official translations",
-  "redistribution_basis": "Finlex FAQ: published materials carry no usage restriction; open data CC BY 4.0",
-  "package_licence": "Apache-2.0"
- },
- "note": "Stub: identity and provenance only; the Finnish text is not transcribed yet. GATE-2 is adopted in docs/gates.json, settled by ADR 0013, so nothing structural blocks it.",
- "paragraphs": {}
-}