colregs 0.3.2 → 0.3.4

package/README.md

@@ -26,7 +26,7 @@ See a [live demo](https://mark-brannan.github.io/searoom/) of searoom and the co
 > by the published rules.
 
 ```text
-data/rules.json          the skeleton: paragraph paths, rule numbers, jurisdictions -- no text
+data/rules.json          the skeleton: paragraph paths, rule numbers, jurisdictions -- no text; non-intl jurisdictions as deltas
 data/editions.json       which edition of which instrument each jurisdiction is on
 data/text/               rule text, one corpus per edition x language x source
 data/corpora.json        index of those corpora and how much each covers
@@ -56,7 +56,17 @@ lights and shapes, Part D sound and light signals, and Annex I geometry.
 [`docs/requirements.md`](docs/requirements.md) is the numbered contract for
 all of it. One case the Convention cannot state, a vessel made fast to a
 mooring buoy, lives only under `us/inland`
-([ADR 0008](docs/adr/0008-mooring-buoy-modifier.md)).
+([ADR 0008](docs/adr/0008-mooring-buoy-modifier.md)); two the Inland Rules
+deliberately lack, Rule 28 and 23(d)(ii), are tombstoned there
+([ADR 0018](docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md)); one it
+spells differently, 23(d), replaces the international entry, and one it
+states differently, the towing lights that replace 24(c)'s sternlight, is
+tombstoned and replaced under its own id. Its Part C skeleton is a delta of
+the same kind: the paths whose text differs, the paths only it has, the
+three it lacks
+([ADR 0020](docs/adr/0020-skeleton-is-a-delta.md)). That is the whole of
+`us/inland` today: seven records and a skeleton, not yet a model of the
+Inland Rules; its text and the entries for its own paths are the next work.
 
 ## The layers
 
@@ -104,7 +114,12 @@ same thing.
 
 **Jurisdiction is a dimension, not a fork.** Every record carries a
 `jurisdiction`: `intl`, or `<country-or-body>/<waters>` as a delta on it.
-Entries a jurisdiction doesn't override are inherited, not restated.
+Entries a jurisdiction doesn't override are inherited, not restated. The
+delta is an [RFC 7396](https://www.rfc-editor.org/rfc/rfc7396) merge patch
+over `intl` keyed by entry id: the jurisdiction's own entries are its keys,
+its `suppressions` are the keys set to `null`, and silence inherits
+([ADR 0018](docs/adr/0018-jurisdiction-delta-is-a-merge-patch.md)). Any
+conformant merge-patch library reproduces the resolved rule set.
 
 **Predicates, not enumerations.** Gates are `fact:length_m < 7`, never a
 pre-built list of configurations. Enumerated tables are where prior art
@@ -136,12 +151,12 @@ paragraphs prevails is a relation.
 
 | relation | meaning |
 |---|---|
-| `rel:includes` | import the referenced entry's **lights only**, never its predicate |
-| `rel:conditional_includes` | import lights when the stated `when` holds; `one_of` is a set of legal alternatives |
-| `rel:in_lieu_of` | this entry's lights replace the referenced entries' lights |
-| `rel:excludes` | must not be shown together: a pick-one between alternatives, never one obligation vetoing another |
-| `rel:exempts` | the referenced requirement does not apply (30(e)) |
-| `rel:overrides` | this paragraph's requirement prevails over the referenced one's when both apply (Rule 18; Rule 26(a) over Rule 30's anchor lights) |
+| `rel:includes` | import the referenced entry's lights, their modality and its scalar gates — never its axes (ADR 0019) |
+| `rel:conditional_includes` | import lights when the stated `when` holds; `one_of` is a set of legal alternatives, exactly one per display, or none under a `may` carrier |
+| `rel:in_lieu_of` | this entry's lights replace the referenced entries' lights; two entries replacing overlapping sets are alternatives to each other |
+| `rel:excludes` | must not be shown together: a pick-one between alternatives, never one obligation vetoing another; a constraint on one display, never a removal |
+| `rel:exempts` | the referenced requirement does not apply (30(e)); reaches an entry in force, never an import |
+| `rel:overrides` | this paragraph's requirement prevails over the referenced one's when both apply (Rule 18; Rule 26(a) over Rule 30's anchor lights); reaches an entry in force, never an import |
 
 Modality is `modality:shall`, `modality:may`, `modality:shall-if-practicable`, `modality:shall-not`,
 `modality:shall-not-impede`, or `modality:conditional` with a `modality_by` table when it turns

package/data/applicability.json

@@ -1,12 +1,12 @@
 {
  "conditions": "night (Rule 20(b): sunset to sunrise), and by 20(c) in restricted visibility by day. Day shapes are not in this release.",
  "relations": {
-  "rel:includes": "import another entry's lights only, never its predicate",
-  "rel:conditional_includes": "import lights when the stated `when` holds; `one_of` is a set of legal alternatives among which the vessel picks one",
-  "rel:in_lieu_of": "this entry's lights replace the referenced entries' lights",
-  "rel:excludes": "the referenced entries must not be shown at the same time",
-  "rel:exempts": "the referenced entries are not required",
-  "rel:overrides": "the superiority relation: the referencing norm's obligation displaces the referenced norm's when both apply"
+  "rel:includes": "import another entry's lights, their modality and its scalar gates, never its axes (ADR 0019)",
+  "rel:conditional_includes": "import lights when the stated `when` holds; `one_of` is a set of legal alternatives among which the vessel picks exactly one, or none under a `may` carrier (ADR 0019)",
+  "rel:in_lieu_of": "this entry's lights replace the referenced entries' lights; two entries whose targets intersect are alternatives to each other (ADR 0019)",
+  "rel:excludes": "the referenced entries must not be shown at the same time; a constraint on one display, never a removal (ADR 0019)",
+  "rel:exempts": "the referenced entries are not required; reaches an entry in force, never an import (ADR 0019)",
+  "rel:overrides": "the superiority relation: the referencing norm's obligation displaces the referenced norm's when both apply; reaches an entry in force, never an import (ADR 0019)"
  },
  "modalities": {
   "modality:shall": "mandatory",
@@ -110,6 +110,16 @@
    "cite": "14(a)",
    "what": "When two power-driven vessels are meeting on reciprocal or nearly reciprocal courses so as to involve risk of collision each shall alter her course to starboard so that each shall pass on the port side of the other.",
    "why": "`category:conduct`, not `category:classification`: the paragraph states the situation in words and prescribes the action, and 14(b) is the paragraph that deems the situation to exist -- entry rule:14b cites it. The action is monitored over a trace rather than evaluated at a point (ADR 0005 sec. 1), and no conduct entry shape exists yet. Q-45."
+  },
+  {
+   "cite": "28",
+   "what": "Under us/inland a record carrying activity:cbd selects nothing: rule:28 is suppressed and the Rule 23(a) entries it imported read activity:none.",
+   "why": "'Constrained by her draft' is not an Inland status, so the record is out of vocabulary there and the package does not pick a reading for it; a consumer that decodes SignalK for inland waters maps it to activity:none (ADR 0018)."
+  },
+  {
+   "cite": "24(j)",
+   "what": "On the Western Rivers (and waters the Secretary specifies), a vessel pushing ahead or towing alongside shows sidelights and two towing lights only -- no masthead lights -- displacing the 24(c) chapeau this package otherwise models for all of us/inland.",
+   "why": "No `fact:waters` exists yet (REQ-SCOPE-5), so the Western Rivers carve-out can't be expressed as a predicate today. `rule:24c:towing_lights` therefore asserts masthead lights across all of us/inland, over-broad on those waters the same way the inherited rule:24c was before this PR replaced it -- not a regression, but the first entry sourced to 83.24(c) itself, so the gap is worth declaring rather than leaving implicit."
   }
  ],
  "represented_paragraphs": [
@@ -1343,7 +1353,8 @@
    "rel:overrides": [
     "rule:15a:keep_out_of_the_way"
    ],
-   "note": "Self is 'a power-driven vessel underway' (18(a)) that is not herself ranked by Rule 18 -- written as the negation the paragraph implies rather than as an enumeration of activity values that had to be edited every time the axis grew (Q-33). A vessel constrained by her draught and a WIG craft on the surface are both power-driven and both stay inside it, which is why the gate is `fact:propulsion` plus the negated rank and not `rule18_class:power`: 18(d) protects a CBD vessel, it does not exempt her from 18(a). Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel not under command are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it."
+   "note": "Self is 'a power-driven vessel underway' (18(a)) that is not herself ranked by Rule 18 -- written as the negation the paragraph implies rather than as an enumeration of activity values that had to be edited every time the axis grew (Q-33). A vessel constrained by her draught and a WIG craft on the surface are both power-driven and both stay inside it, which is why the gate is `fact:propulsion` plus the negated rank and not `rule18_class:power`: 18(d) protects a CBD vessel, it does not exempt her from 18(a). Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel not under command are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18a_ii",
@@ -1373,7 +1384,8 @@
    "rel:overrides": [
     "rule:15a:keep_out_of_the_way"
    ],
-   "note": "Mine clearance (27(f)) and diving (27(e)) reach this entry through `rule18_class:ram`, which decodes them by 3(g), instead of being listed here by hand. That is the display/rank divergence Q-32 named, moved into facts.json. Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel restricted in her ability to manoeuvre are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it."
+   "note": "Mine clearance (27(f)) and diving (27(e)) reach this entry through `rule18_class:ram`, which decodes them by 3(g), instead of being listed here by hand. That is the display/rank divergence Q-32 named, moved into facts.json. Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel restricted in her ability to manoeuvre are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18a_iii",
@@ -1403,7 +1415,8 @@
    "rel:overrides": [
     "rule:15a:keep_out_of_the_way"
    ],
-   "note": "`activity:trawling` reaches this entry through the class decode rather than by being listed beside `activity:fishing`; a fishing vessel under sail is `rule18_class:fishing` too, which is 18(c)'s reading of the axis. Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel engaged in fishing are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it."
+   "note": "`activity:trawling` reaches this entry through the class decode rather than by being listed beside `activity:fishing`; a fishing vessel under sail is `rule18_class:fishing` too, which is 18(c)'s reading of the axis. Overrides `rule:15a:keep_out_of_the_way` (Q-40): self and a vessel engaged in fishing are both power-driven vessels by 3(b) whenever her machinery is in use, so 15(a) is in force between them as well and would hand the give-way role to whichever has the other on her starboard side, rank or no rank. Rule 18's opening words except Rules 9, 10 and 13 and no others, so this paragraph displaces it.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18a_iv",
@@ -1430,7 +1443,8 @@
     "self": "role:give-way",
     "other": "role:stand-on"
    },
-   "note": "A sailing vessel that is also fishing decodes to `rule18_class:fishing` and is ranked by 18(a)(iii), so the class alone carries what the old predicate needed a propulsion gate and an activity list to say."
+   "note": "A sailing vessel that is also fishing decodes to `rule18_class:fishing` and is ranked by 18(a)(iii), so the class alone carries what the old predicate needed a propulsion gate and an activity list to say.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18b_i",
@@ -1455,7 +1469,8 @@
     "rule:12a_ii",
     "rule:12a_iii"
    ],
-   "note": "Self is `rule18_class:sail`, which is 3(c)'s sailing vessel and not a fishing vessel under sail -- the class carries both halves of what the propulsion gate and the activity list used to say between them. Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13."
+   "note": "Self is `rule18_class:sail`, which is 3(c)'s sailing vessel and not a fishing vessel under sail -- the class carries both halves of what the propulsion gate and the activity list used to say between them. Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18b_ii",
@@ -1480,7 +1495,8 @@
     "rule:12a_ii",
     "rule:12a_iii"
    ],
-   "note": "Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13."
+   "note": "Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18b_iii",
@@ -1505,7 +1521,8 @@
     "rule:12a_ii",
     "rule:12a_iii"
    ],
-   "note": "Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13."
+   "note": "Overrides the three Rule 12 entries (Q-40): both subjects can be sailing vessels by 3(c) -- the other under sail and not under command, restricted in her ability to manoeuvre, or engaged in fishing -- so Rule 12 is in force between them too, and Rule 18's chapeau excepts only Rules 9, 10 and 13.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18c_i",
@@ -1531,7 +1548,8 @@
     "rule:12a_iii",
     "rule:15a:keep_out_of_the_way"
    ],
-   "note": "'so far as possible' is the practicability qualifier, so the modality is shall-if-practicable. 18(c) does not distinguish propulsion, and `rule18_class:fishing` does not either: a fishing vessel under sail is ranked here. Overrides the three Rule 12 entries (Q-40): a vessel engaged in fishing under sail is a sailing vessel by 3(c), and if the vessel she must keep out of the way of is under sail as well, Rule 12 is in force between them; Rule 18's chapeau excepts only Rules 9, 10 and 13. It overrides `rule:15a:keep_out_of_the_way` on the same ground (Q-40): a fishing vessel under power and a vessel not under command under power are two power-driven vessels by 3(b), so Rule 15 is in force between them too."
+   "note": "'so far as possible' is the practicability qualifier, so the modality is shall-if-practicable. 18(c) does not distinguish propulsion, and `rule18_class:fishing` does not either: a fishing vessel under sail is ranked here. Overrides the three Rule 12 entries (Q-40): a vessel engaged in fishing under sail is a sailing vessel by 3(c), and if the vessel she must keep out of the way of is under sail as well, Rule 12 is in force between them; Rule 18's chapeau excepts only Rules 9, 10 and 13. It overrides `rule:15a:keep_out_of_the_way` on the same ground (Q-40): a fishing vessel under power and a vessel not under command under power are two power-driven vessels by 3(b), so Rule 15 is in force between them too.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18c_ii",
@@ -1557,7 +1575,8 @@
     "rule:12a_iii",
     "rule:15a:keep_out_of_the_way"
    ],
-   "note": "Overrides the three Rule 12 entries (Q-40): a vessel engaged in fishing under sail is a sailing vessel by 3(c), and if the vessel she must keep out of the way of is under sail as well, Rule 12 is in force between them; Rule 18's chapeau excepts only Rules 9, 10 and 13. It overrides `rule:15a:keep_out_of_the_way` on the same ground (Q-40): a fishing vessel under power and a vessel restricted in her ability to manoeuvre under power are two power-driven vessels by 3(b), so Rule 15 is in force between them too."
+   "note": "Overrides the three Rule 12 entries (Q-40): a vessel engaged in fishing under sail is a sailing vessel by 3(c), and if the vessel she must keep out of the way of is under sail as well, Rule 12 is in force between them; Rule 18's chapeau excepts only Rules 9, 10 and 13. It overrides `rule:15a:keep_out_of_the_way` on the same ground (Q-40): a fishing vessel under power and a vessel restricted in her ability to manoeuvre under power are two power-driven vessels by 3(b), so Rule 15 is in force between them too.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:18d_i",
@@ -1835,7 +1854,8 @@
     "self": "role:give-way",
     "other": "role:stand-on"
    },
-   "note": "Each has the wind on a different side, so the vessel with the wind on the port side keeps out of the way. Evaluated from self's side, so the mirror case -- self on starboard, other on port -- is this same entry read on the swapped situation, and it is what makes the other vessel stand-on. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away."
+   "note": "Each has the wind on a different side, so the vessel with the wind on the port side keeps out of the way. Evaluated from self's side, so the mirror case -- self on starboard, other on port -- is this same entry read on the swapped situation, and it is what makes the other vessel stand-on. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:12a_ii",
@@ -1867,7 +1887,8 @@
     "self": "role:give-way",
     "other": "role:stand-on"
    },
-   "note": "Both have the wind on the same side, so the windward vessel keeps clear. 'The same side' is a comparison between two facts and the predicate language compares a fact to a constant, so the disjunction is written out over the two values the comparison can take -- which is why `wind_side:unknown` on either subject falls through to 12(a)(iii) rather than into this entry. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away."
+   "note": "Both have the wind on the same side, so the windward vessel keeps clear. 'The same side' is a comparison between two facts and the predicate language compares a fact to a constant, so the disjunction is written out over the two values the comparison can take -- which is why `wind_side:unknown` on either subject falls through to 12(a)(iii) rather than into this entry. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:12a_iii",
@@ -1891,7 +1912,8 @@
     "self": "role:give-way",
     "other": "role:stand-on"
    },
-   "note": "The doubt case, and the one paragraph of Rule 12 that is expressible only because uncertainty is a declared value of the fact rather than the fact's absence. `wind_side:unknown` on the other subject is 'cannot determine with certainty', and an absent fact would have been the wrong model for it: absent satisfies nothing, so silence would have relieved self of a duty the paragraph imposes. This is the shape 13(c) and 14(c) would need and do not have -- Q-41. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away."
+   "note": "The doubt case, and the one paragraph of Rule 12 that is expressible only because uncertainty is a declared value of the fact rather than the fact's absence. `wind_side:unknown` on the other subject is 'cannot determine with certainty', and an absent fact would have been the wrong model for it: absent satisfies nothing, so silence would have relieved self of a duty the paragraph imposes. This is the shape 13(c) and 14(c) would need and do not have -- Q-41. 'Two sailing vessels' is 3(c), so both subjects are gated on `fact:propulsion: propulsion:sail` and not on `rule18_class:sail` (Q-40): a vessel engaged in fishing under sail, or not under command under sail, is a sailing vessel by 3(c) and is inside Rule 12. Where Rule 18 also ranks the pair -- 18(b) from the ordinary sailing vessel's side, 18(c) from the fishing vessel's -- that entry carries `rel:overrides` against this one, because Rule 18's opening words except Rules 9, 10 and 13 and no others; 13(a)'s 'notwithstanding' overrides it the same way. Between two sailing vessels Rule 18 leaves unordered -- one not under command and one restricted in her ability to manoeuvre -- this entry is the only norm in force, and it lays a helm duty on a vessel that may be unable to discharge it; that is Rule 2's region and is recorded in Q-40 rather than gated away.",
+   "gap": "Unlike `rule:13a`/`rule:15a:keep_out_of_the_way`, this entry does not gate on `other:hist:was_overtaking`, so it still names self give-way when the other vessel holds 13(d)'s overtaking history. Q-58."
   },
   {
    "id": "rule:13b",
@@ -2175,6 +2197,109 @@
    ],
    "modality": "modality:may",
    "note": "The under-50 m alternative, on the same 33 CFR 90.5 deeming that brings rule:30a:mooring_buoy in. It is a separate entry because widening rule:30b's predicate would edit an intl entry to carry a national delta, which REQ-SCOPE-4 forbids."
+  },
+  {
+   "id": "rule:23d",
+   "jurisdiction": "us/inland",
+   "cite": "23(d)",
+   "when": {
+    "fact:propulsion": "propulsion:power",
+    "fact:activity": "activity:none",
+    "fact:position": "position:underway",
+    "fact:length_m": {
+     "lt": 12
+    }
+   },
+   "lights": [
+    {
+     "light": "light:all_round",
+     "color": "white",
+     "count": 1
+    },
+    {
+     "light": "light:sidelights"
+    }
+   ],
+   "rel:in_lieu_of": [
+    "rule:23a_i",
+    "rule:23a_ii",
+    "rule:23a_iii_iv"
+   ],
+   "modality": "modality:may",
+   "images": [
+    "NRHB_23_di.png"
+   ],
+   "note": "33 CFR 83.23(d) is the under-12 m provision as a single paragraph, not (d)(i): the norm is intl 23(d)(i), the path is not, so the intl entry is tombstoned and this one replaces it (ADR 0018 point 3, ADR 0020)."
+  },
+  {
+   "id": "rule:24c:towing_lights",
+   "jurisdiction": "us/inland",
+   "cite": "24(c)",
+   "when": {
+    "fact:activity": "activity:pushing",
+    "fact:composite_unit": false
+   },
+   "lights": [
+    {
+     "light": "light:masthead",
+     "count": 2,
+     "arrangement": "vertical"
+    }
+   ],
+   "rel:in_lieu_of": [
+    "rule:23a_i",
+    "rule:23a_ii"
+   ],
+   "modality": "modality:shall",
+   "note": "33 CFR 83.24(c)(iii) replaces the international sternlight with two towing lights for a vessel pushing ahead or towing alongside; masthead is unconditional like rule:24c, sidelights and towing lights join only once underway as the sibling entry rule:24c:underway_lights (own predicate, no import, so nothing double-counts), and rule:24c is suppressed and replaced here rather than edited (REQ-SCOPE-4, Q-11, ADR 0018 point 3)."
+  },
+  {
+   "id": "rule:24c:underway_lights",
+   "jurisdiction": "us/inland",
+   "cite": "24(c)",
+   "when": {
+    "fact:activity": "activity:pushing",
+    "fact:composite_unit": false,
+    "fact:position": "position:underway"
+   },
+   "lights": [
+    {
+     "light": "light:sidelights"
+    },
+    {
+     "light": "light:towing",
+     "count": 2,
+     "arrangement": "vertical"
+    }
+   ],
+   "modality": "modality:shall",
+   "note": "The underway-gated half of rule:24c:towing_lights's display, split out so the import reads only sidelights and towing lights, never the sternlight rule:23a_iii_iv still carries for the unreplaced intl paragraph (ADR 0019 point 3: an import reads a referenced entry's lights, never its axes, so the two must stay separate entries rather than one gated by activity elsewhere)."
+  }
+ ],
+ "suppressions": [
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:23d_i",
+   "cite": "23(d)(i)",
+   "why": "33 CFR 83.23(d) has no (i); the same norm is rule:23d at bare 23(d), so this is a replace, not an absence (ADR 0018, ADR 0020)."
+  },
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:28",
+   "cite": "28",
+   "why": "33 CFR 83.28 is [Reserved]: 'constrained by her draft' is not an Inland Rules status, so the Rule 28 signal is deliberately absent under us/inland rather than untranscribed (Q-11, ADR 0018)."
+  },
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:23d_ii",
+   "cite": "23(d)(ii)",
+   "why": "33 CFR 83.23(d) is a single paragraph with no counterpart to the under-7 m, 7 kn exception of 23(d)(ii); the exception is deliberately absent under us/inland (Q-11, ADR 0018)."
+  },
+  {
+   "jurisdiction": "us/inland",
+   "suppresses": "rule:24c",
+   "cite": "24(c)",
+   "why": "33 CFR 83.24(c)(iii) replaces the international sternlight with two towing lights in a vertical line, so rule:24c does not hold as stated under us/inland; rule:24c:towing_lights is the replacement (Q-11, ADR 0018 point 3)."
   }
  ]
 }

package/data/corpora.json

@@ -10,14 +10,14 @@
    "tier": "national",
    "paragraphs": 212
   },
-  "intl@2016.fi.finlex": {
-   "file": "text/intl/2016/fi.finlex.json",
-   "edition": "intl@2016",
-   "edition_status": "claimed",
+  "intl@1977.fi.finlex": {
+   "file": "text/intl/1977/fi.finlex.json",
+   "edition": "intl@1977",
+   "edition_status": "verified",
    "language": "fi",
    "source_id": "finlex",
    "tier": "national",
-   "paragraphs": 0
+   "paragraphs": 194
   },
   "intl@2016.es.boe": {
    "file": "text/intl/2016/es.boe.json",

package/data/editions.json

@@ -9,17 +9,22 @@
      "amended_through": "A.1085(28)",
      "in_force": "2016-01-01",
      "note": "2013 amendment (Part F) verified on imo.org; the resolution number and date are recalled, not yet verified against the resolution text -- REQ-LANG-10."
+    },
+    "intl@1977": {
+     "amended_through": "none (original 1972 text as promulgated)",
+     "in_force": "1977-07-15",
+     "note": "The 1972 Convention as promulgated in Finland (SopS 30/1977), before any IMO amendment. Verified against the Finlex text itself (REQ-LANG-10): it lacks Rule 3(m), 8(f), 10(d)(ii)/(k)/(l), 18(f), 22(d), 23(c), 23(d)(i)/(iii), 24(g)-(i), 27(e)(i) and 30(f); its own 23(c) is the paragraph now numbered 23(d)(ii) and its 24(g) the one now numbered 24(h). The corpus gaps say which amendment each belongs to."
     }
    }
   },
   "us/inland": {
    "instrument": "33 CFR Part 83, Inland Navigation Rules",
-   "skeleton": null,
+   "skeleton": "us/inland@2014",
    "editions": {
     "us/inland@2014": {
      "amended_through": "79 FR 37898 (2014 final rule)",
      "in_force": "2014-08-01",
-     "note": "Recalled, not verified; a stub edition so the second jurisdiction has one to name -- REQ-LANG-10."
+     "note": "Provisional edition id: the Part C skeleton delta was verified against current eCFR text, not the 2014 final rule. Cornell's own source credit on 83.24 runs through 84 FR 30878 (June 28, 2019); this id and amended_through are unverified against the Federal Register and will be corrected or renamed once the corpus fetch settles which amendment the text reflects -- REQ-LANG-10, ADR 0020."
     }
    }
   }

package/data/i18n/en.json

@@ -7,21 +7,87 @@
     "reviewed_by": [
       "mark-brannan"
     ],
-    "review_date": "2026-09-13"
+    "review_date": "2026-09-16"
   },
   "strings": {
-    "light": {
+    "lights": {
       "light:masthead": "Masthead light",
+      "light:sidelights": "Sidelights",
       "light:sidelight_starboard": "Starboard sidelight",
       "light:sidelight_port": "Port sidelight",
       "light:sternlight": "Sternlight",
       "light:towing": "Towing light",
-      "light:all_round": "All-round light"
+      "light:all_round": "All-round light",
+      "light:flashing": "Flashing light",
+      "light:torch": "Electric torch or lighted lantern",
+      "light:deck_lights": "Working or equivalent lights"
     },
-    "modality": {
+    "modalities": {
       "modality:shall": "Required",
       "modality:may": "Permitted",
-      "modality:shall-if-practicable": "Required if practicable"
+      "modality:shall-if-practicable": "Required if practicable",
+      "modality:conditional": "Conditional",
+      "modality:exempt": "Exempt",
+      "modality:shall-not": "Prohibited",
+      "modality:shall-not-impede": "Must not impede"
+    },
+    "roles": {
+      "role:give-way": "Give way",
+      "role:stand-on": "Stand on",
+      "role:shall-not-impede": "Must not impede",
+      "role:keep-clear": "Keep clear",
+      "role:none": "No role"
+    },
+    "encounters": {
+      "encounter:head-on": "Head-on",
+      "encounter:crossing": "Crossing",
+      "encounter:overtaking": "Overtaking",
+      "encounter:none": "No encounter"
+    },
+    "jurisdictions": {
+      "intl": "International",
+      "us/inland": "US Inland"
+    },
+    "facts": {
+      "propulsion:power": "Power-driven",
+      "propulsion:sail": "Sailing",
+      "propulsion:oars": "Oars",
+      "activity:none": "None",
+      "activity:fishing": "Fishing",
+      "activity:trawling": "Trawling",
+      "activity:towing": "Towing",
+      "activity:pushing": "Pushing",
+      "activity:being_towed": "Being towed",
+      "activity:nuc": "Not under command",
+      "activity:ram": "Restricted in her ability to manoeuvre",
+      "activity:ram_underwater": "Restricted in her ability to manoeuvre, engaged in underwater operations",
+      "activity:cbd": "Constrained by her draught",
+      "activity:mine": "Engaged in minesweeping",
+      "activity:pilot": "Engaged on pilotage duty",
+      "activity:diving": "Engaged in diving operations",
+      "position:underway": "Underway",
+      "position:anchored": "At anchor",
+      "position:aground": "Aground",
+      "position:moored": "Moored",
+      "rule18_class:nuc": "Not under command",
+      "rule18_class:ram": "Restricted in ability to manoeuvre",
+      "rule18_class:fishing": "Fishing",
+      "rule18_class:wig": "Wing-in-ground craft",
+      "rule18_class:cbd": "Constrained by draught",
+      "rule18_class:sail": "Sailing vessel",
+      "rule18_class:power": "Power-driven vessel",
+      "dynamics:tanker": "Tanker",
+      "dynamics:cargo": "Cargo ship",
+      "dynamics:ferry": "Ferry",
+      "dynamics:fishing": "Fishing vessel",
+      "dynamics:yacht": "Yacht",
+      "dynamics:rib": "RIB",
+      "dynamics:unknown": "Unknown",
+      "obstruction_side:port": "Port",
+      "obstruction_side:starboard": "Starboard",
+      "wind_side:port": "Port",
+      "wind_side:starboard": "Starboard",
+      "wind_side:unknown": "Unknown"
     }
   }
 }

package/data/i18n/fi.json

@@ -8,7 +8,7 @@
     "review_date": "2026-09-15"
   },
   "strings": {
-    "light": {
+    "lights": {
       "light:masthead": "Mastovalo",
       "light:sidelight_starboard": "Oikea sivuvalo",
       "light:sidelight_port": "Vasen sivuvalo",
@@ -16,7 +16,7 @@
       "light:towing": "Hinausvalo",
       "light:all_round": "Ympäri näköpiirin näkyvä valo"
     },
-    "modality": {
+    "modalities": {
       "modality:shall": "Pakollinen",
       "modality:may": "Sallittu",
       "modality:shall-if-practicable": "Pakollinen, jos mahdollista"

package/data/images.json

@@ -157,10 +157,12 @@
     "Power Driven Vessel less than 12m"
    ],
    "paragraphs": [
-    "23(d)(i)"
+    "23(d)(i)",
+    "23(d)"
    ],
    "entries": [
-    "rule:23d_i"
+    "rule:23d_i",
+    "rule:23d"
    ],
    "depicts": "provision",
    "transcript": [
@@ -196,7 +198,10 @@
    ],
    "description": "Twenty-odd flat hatch covers fill a long straight-sided cargo deck between a forward deckhouse with bridge windows and an after machinery house with a squat funnel: a Great Lakes bulk carrier. She is drawn from above and off the starboard bow, stem to the right, the hull closed by a dashed waterline and no sea beneath. A white lobe caps the short mast on the after house, a second sits on the mast above the forward bridge, and red and green lobes stand either side of that bridge front. No day shapes or inset panels appear.",
    "shapes": [],
-   "unmapped_reason": "illustrates a paragraph outside this release's scope (inland-only, or a rule family not in the table)"
+   "paragraphs": [
+    "23(e)"
+   ],
+   "depicts": "provision"
   },
   "NRHB_24_a.png": {
    "file": "NRHB_24_a.png",
@@ -416,7 +421,10 @@
    ],
    "description": "Square push knees on a small tug are set hard against the flat end of a long box barge, the two drawn as one unit running from upper left to lower right. The view is from above and off the port quarter, with a dashed waterline and no sea. On the tug two white lobes stand in a line on the mast, a green strip runs along the near side of her bridge and a red lobe shows beyond, and two yellow lobes burn one above the other on a staff at her stern. At the head of the tow two yellow lobes sit together with a red lobe outboard and a green lobe on the near side.",
    "shapes": [],
-   "unmapped_reason": "illustrates a paragraph outside this release's scope (inland-only, or a rule family not in the table)"
+   "paragraphs": [
+    "24(j)"
+   ],
+   "depicts": "provision"
   },
   "NRHB_25_a.png": {
    "file": "NRHB_25_a.png",

package/data/lights.json

@@ -8,8 +8,7 @@
  },
  "lights": {
   "light:masthead": {
-   "name": "masthead light",
-   "colregs_term": "masthead light",
+   "term": "masthead light",
    "cite": "21(a)",
    "color": "white",
    "character": "steady",
@@ -22,8 +21,7 @@
    "rule21": true
   },
   "light:sidelights": {
-   "name": "sidelights",
-   "colregs_term": "sidelights",
+   "term": "sidelights",
    "cite": "21(b)",
    "character": "steady",
    "composite": true,
@@ -36,8 +34,7 @@
    "rule21": true
   },
   "light:sidelight_starboard": {
-   "name": "starboard sidelight",
-   "colregs_term": "sidelight",
+   "term": "sidelight",
    "cite": "21(b)",
    "color": "green",
    "character": "steady",
@@ -50,8 +47,7 @@
    "rule21": true
   },
   "light:sidelight_port": {
-   "name": "port sidelight",
-   "colregs_term": "sidelight",
+   "term": "sidelight",
    "cite": "21(b)",
    "color": "red",
    "character": "steady",
@@ -64,8 +60,7 @@
    "rule21": true
   },
   "light:sternlight": {
-   "name": "sternlight",
-   "colregs_term": "sternlight",
+   "term": "sternlight",
    "cite": "21(c)",
    "color": "white",
    "character": "steady",
@@ -78,8 +73,7 @@
    "rule21": true
   },
   "light:towing": {
-   "name": "towing light",
-   "colregs_term": "towing light",
+   "term": "towing light",
    "cite": "21(d)",
    "color": "yellow",
    "character": "steady",
@@ -92,8 +86,7 @@
    "rule21": true
   },
   "light:all_round": {
-   "name": "all-round light",
-   "colregs_term": "all-round light",
+   "term": "all-round light",
    "cite": "21(e)",
    "color": null,
    "color_note": "colour is fixed by the citing paragraph, not by Rule 21",
@@ -106,8 +99,7 @@
    "rule21": true
   },
   "light:flashing": {
-   "name": "flashing light",
-   "colregs_term": "flashing light",
+   "term": "flashing light",
    "cite": "21(f)",
    "color": null,
    "color_note": "colour is fixed by the citing paragraph",
@@ -122,8 +114,7 @@
    "rule21": true
   },
   "light:torch": {
-   "name": "electric torch or lighted lantern",
-   "colregs_term": "electric torch or lighted lantern",
+   "term": "electric torch or lighted lantern",
    "cite": "25(d)(i)",
    "color": "white",
    "character": "shown in sufficient time to prevent collision",
@@ -133,8 +124,7 @@
    "note": "Not a fixed navigation light: it is held ready at hand and shown on approach. It has no prescribed arc, range or position."
   },
   "light:deck_lights": {
-   "name": "working or equivalent lights",
-   "colregs_term": "working or equivalent lights",
+   "term": "working or equivalent lights",
    "cite": "30(c)",
    "color": null,
    "character": "steady",