colregs 0.3.1 → 0.3.3

package/README.md

@@ -56,7 +56,10 @@ 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)). That is
+the whole of `us/inland` today: four records, not a model of the Inland Rules.
 
 ## The layers
 
@@ -104,7 +107,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,23 +144,23 @@ 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) |
-
-Modality is `shall`, `may`, `shall-if-practicable`, `shall-not`,
-`shall-not-impede`, or `conditional` with a `modality_by` table when it turns
+| `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
 on a fact.
 
 Most entries read one vessel and produce lights. The Part B entries read
 **two**, a situation rather than a fact record, and produce an `effect`:
 which section governs, which vessel gives way, whether the encounter is
-`head-on`, `crossing` or `overtaking`. They address each vessel through a
-subject segment (`own:fact:activity`, `other:fact:propulsion`,
-`pair:geo:in_sight`); a key with no subject means `own:`. The encounter
+`encounter:head-on`, `encounter:crossing` or `encounter:overtaking`. They address each vessel through a
+subject segment (`self:fact:activity`, `other:fact:propulsion`,
+`pair:geo:in_sight`); a key with no subject means `self:`. The encounter
 sectors partition relative bearing, so no crossing sector is enumerated and
 none can drift. [`docs/identifiers.md`](docs/identifiers.md) has the
 vocabulary, [`docs/part-b-invariants.md`](docs/part-b-invariants.md) the