colregs 0.3.1 → 0.3.2

package/docs/identifiers.md

@@ -24,6 +24,17 @@ but it is a name in a namespace and a consumer reads the paragraph out of
 Paragraph-keying is argued in ADR 0001 and required by REQ-MODEL-4; nothing
 here reopens either.
 
+**Jurisdiction values sit beside paragraph paths in this class, and for the
+same reason.** `intl` and `us/inland` are not names this package coined:
+jurisdiction is a coordinate with REQ-SCOPE-2's own `<body>/<waters>`
+grammar, its left segment borrowed from ISO 3166, the whole value doubling
+as a corpus key and a `data/text/` filesystem path — its sibling axis,
+`language`, is a bare BCP 47 tag for the same reason. A jurisdiction value
+is immutable under REQ-MODEL-10 like any identifier here — renaming
+`us/inland` would break every stored provenance and corpus path — it just
+carries no prefix, because the grammar that owns it already keeps it stable
+and collision-free (ADR 0017).
+
 **Vocabulary identifiers carry a type prefix.** These names are this
 package's own — nothing in COLREGS calls anything `masthead` or `nuc`. They
 share one flat string space across five files, and before the prefix they
@@ -31,7 +42,11 @@ collided in it: `towing` was simultaneously a light id (Rule 21(d)) and an
 `activity` value (Rule 24(a)), so a consumer holding the string `towing`
 could not say what it was a name *for* without knowing which field it came
 out of. The prefix makes the namespace part of the identifier, which
-resolves that collision by construction rather than by convention.
+resolves that collision by construction rather than by convention. The same
+shape recurs inside the closed vocabularies themselves: `shall-not-impede`
+names both a modality and a role, and `none` names both a role and an
+encounter — resolved the identical way, `modality:shall-not-impede` and
+`role:shall-not-impede` being two names rather than one (ADR 0017).
 
 ## The scheme
 
@@ -42,6 +57,10 @@ resolves that collision by construction rather than by convention.
 | `fact:<key>` | fact keys — the input vocabulary (`data/facts.json`) | `fact:activity`, `fact:length_m`, `fact:making_way`, `fact:on_mooring_buoy` |
 | `<fact>:<value>` | values of an enumerated fact | `activity:nuc`, `position:anchored`, `propulsion:sail`, `obstruction_side:port` |
 | `rel:<name>` | the five relation verbs (`data/applicability.json`) | `rel:includes`, `rel:in_lieu_of`, `rel:exempts` |
+| `modality:<value>` | modality values (`data/applicability.json` `modalities`) | `modality:shall`, `modality:may` |
+| `role:<value>` | effect role values (`data/applicability.json` `effects.roles`) | `role:give-way`, `role:none` |
+| `encounter:<value>` | effect encounter values (`data/applicability.json` `effects.encounters`) | `encounter:head-on`, `encounter:none` |
+| `category:<value>` | entry category values (`data/applicability.json` `categories`) | `category:precedence`, `category:display` |
 
 The prefix names the namespace the identifier lives in. For a fact *value*
 that namespace is the fact itself, written bare: `activity:nuc`, not
@@ -72,9 +91,9 @@ for a better idea, logging the change. What would settle it: the first
 two-subject entry — Rule 18 — actually being written against it. This
 section answers `Q-28`.
 
-A `display` entry reads one vessel. A `classification` or `precedence`
-entry reads two, and needs to say *whose* `fact:activity` it means. The form
-is three segments:
+A `category:display` entry reads one vessel. A `category:classification` or
+`category:precedence` entry reads two, and needs to say *whose*
+`fact:activity` it means. The form is three segments:
 
 ```
 <subject>:<class>:<key>
@@ -82,14 +101,14 @@ is three segments:
 
 | segment | values |
 |---|---|
-| subject | `own`, `other`, `pair` |
+| subject | `self`, `other`, `pair` |
 | class | `fact`, `kin`, `geo`, `hist` |
 | key | the identifier as it already exists, or a new one in a new class |
 
-`own:fact:activity`, `other:kin:heading_deg`, `pair:geo:in_sight`,
-`own:hist:was_overtaking`.
+`self:fact:activity`, `other:kin:heading_deg`, `pair:geo:in_sight`,
+`self:hist:was_overtaking`.
 
-**A key with no subject segment means `own:`.** This is the whole of the
+**A key with no subject segment means `self:`.** This is the whole of the
 backward-compatibility story and it is why the subject is a *prefix* rather
 than a change to the fact keys. `fact:activity` still spells `fact:activity`
 and still denotes what it always denoted, so every predicate in
@@ -97,14 +116,14 @@ and still denotes what it always denoted, so every predicate in
 `fixtures/applicability-fixtures.json` and every stored citation a consumer
 holds stays correct unedited — `REQ-MODEL-10` is satisfied by construction
 rather than by a migration. The alternative shapes were a suffix
-(`fact:activity:own`), which buries the thing you are scanning for at the
+(`fact:activity:self`), which buries the thing you are scanning for at the
 end of a variable-length name, and per-subject fact keys
 (`fact:own_activity`), which would double the fact vocabulary and repoint
 nothing but would leave two names for one concept forever. Prefixing is the
 only one of the three where the existing vocabulary is a strict subset of
 the new one.
 
-The cost, stated so nobody rediscovers it: `own`, `other` and `pair` are now
+The cost, stated so nobody rediscovers it: `self`, `other` and `pair` are now
 reserved at the head of the identifier space, and no fact, light or relation
 may ever be named one of them. That is the price of a subject segment that
 is not itself prefixed, and it is cheap — the three words are not candidate
@@ -112,9 +131,9 @@ names for anything this package models.
 
 ### The three subjects
 
-`own` is the vessel the rule addresses; `other` is the vessel it is in an
+`self` is the vessel the rule addresses; `other` is the vessel it is in an
 encounter with. **`pair` is the encounter itself**, and it exists because
-some facts belong to neither vessel: range is one number, not own's number
+some facts belong to neither vessel: range is one number, not self's number
 and the other's. Putting `geo:range_m` under both subjects would create two
 identifiers for one quantity and a class of bug — the two disagreeing —
 that has no meaning.
@@ -125,21 +144,21 @@ Geometry splits on whether the quantity is symmetric between the vessels:
 
 | fact | subject | |
 |---|---|---|
-| `geo:rel_bearing_deg` | `own` / `other` | bearing of the *other* subject, clockwise from this subject's heading |
+| `geo:rel_bearing_deg` | `self` / `other` | bearing of the *other* subject, clockwise from this subject's heading |
 | `geo:range_m` | `pair` | |
 | `geo:bearing_change_deg_min` | `pair` | Rule 7(d)(i)'s steady bearing |
 | `geo:cpa_m`, `geo:tcpa_s` | `pair` | |
 | `geo:in_sight` | `pair` | Rule 3(k), symmetric because the rule defines it that way |
 
 The directional row is where the namespace earns its keep.
-`own:geo:rel_bearing_deg` is relative bearing — where the other vessel is
-off own's bow. `other:geo:rel_bearing_deg` is the same fact read from the
+`self:geo:rel_bearing_deg` is relative bearing — where the other vessel is
+off self's bow. `other:geo:rel_bearing_deg` is the same fact read from the
 other side, which is **aspect**. So aspect gets no identifier of its own: it
 is a subject swap, not a second fact. Rule 13(b)'s overtaking sector is then
-`other:geo:rel_bearing_deg` in (112.5, 247.5) — own more than 22.5° abaft
+`other:geo:rel_bearing_deg` in (112.5, 247.5) — self more than 22.5° abaft
 the other vessel's beam — written once, in the units the rule itself uses.
-Swapping `own` and `other` throughout a predicate reverses the encounter,
-which is exactly the operation a `precedence` rule needs and the reason to
+Swapping `self` and `other` throughout a predicate reverses the encounter,
+which is exactly the operation a `category:precedence` rule needs and the reason to
 prefer a subject namespace over two parallel vocabularies.
 
 The directional and the pair geometry are redundant with `kin:` wherever both
@@ -153,7 +172,7 @@ and a record that omits the kinematics is unchecked rather than wrong.
 
 `kin:` is the kinematic class ADR 0005 introduces — `kin:position`,
 `kin:heading_deg`, `kin:sog_kn`, `kin:rot_deg_min`, `kin:dynamics`. It takes
-`own`/`other` only; there is no kinematic state of a pair. `kin:dynamics`
+`self`/`other` only; there is no kinematic state of a pair. `kin:dynamics`
 is an enumerated fact, so its values follow the bare-fact-name rule above:
 `dynamics:tanker`, not `kin:dynamics:tanker`.
 
@@ -164,12 +183,12 @@ overtaking, a subsequent alteration of the bearing does not make her a
 crossing vessel; the instantaneous geometry, read alone, says otherwise and
 hands the duty to the wrong vessel. So the latch is a fact:
 
-- `own:hist:was_overtaking` — this subject was, earlier in this encounter,
+- `self:hist:was_overtaking` — this subject was, earlier in this encounter,
   an overtaking vessel with respect to the other.
-- `own:hist:latched_at_s` — how long ago that attached, for a `conduct`
+- `self:hist:latched_at_s` — how long ago that attached, for a `category:conduct`
   monitor. A predicate at a point does not read it.
 
-History is directional — it is *own* that was overtaking — so it takes a
+History is directional — it is *self* that was overtaking — so it takes a
 subject segment like the fact record does, and never `pair`.
 
 ### What this does not do
@@ -183,41 +202,41 @@ keys would have broken.
 ## Effects `✎`
 
 **Pencil** (`docs/conventions.md`): ADR 0005 puts the whole two-subject shape
-there. What would settle it: a second family of `precedence` paragraphs —
+there. What would settle it: a second family of `category:precedence` paragraphs —
 Rules 12, 14 and 15 — written against it. **Written, and it held with one
-addition**: Rules 7(d) and 13–15 are the first `classification` entries, and a
+addition**: Rules 7(d) and 13–15 are the first `category:classification` entries, and a
 classification produces neither a role nor a section, so the table below grows
-a third row. Rule 12 turned out to be `precedence` and not `classification`
+a third row. Rule 12 turned out to be `category:precedence` and not `category:classification`
 (below). This section answers the data half of `Q-27` and is required by
 `REQ-CAT-8`.
 
-A `display` entry produces `lights`. A `scope` or `precedence` entry produces
+A `category:display` entry produces `lights`. A `category:scope` or `category:precedence` entry produces
 an **effect**, and the shape of the effect is fixed by the category:
 
 | category | effect |
 |---|---|
-| `scope` | `{"part", "section", "applies_rules"}` — which section of which Part governs, and the rules it contains |
-| `precedence` | `{"own": <role>, "other": <role>}` — one role per subject |
-| `classification` | `{"encounter": <encounter>}` **or** `{"risk_of_collision": true}` — exactly one key |
+| `category:scope` | `{"part", "section", "applies_rules"}` — which section of which Part governs, and the rules it contains |
+| `category:precedence` | `{"self": <role>, "other": <role>}` — one role per subject |
+| `category:classification` | `{"encounter": <encounter>}` **or** `{"risk_of_collision": true}` — exactly one key |
 
-Five roles, a closed set: `give-way`, `stand-on`, `shall-not-impede`,
-`keep-clear`, `none`. They are declared in `data/applicability.json` under
-`effects`, and they are **not identifiers** — like modality and jurisdiction
-values they are a closed vocabulary of their own, outside what `REQ-MODEL-10`
-binds.
+Five roles, a closed set: `role:give-way`, `role:stand-on`,
+`role:shall-not-impede`, `role:keep-clear`, `role:none`. They are declared
+in `data/applicability.json` under `effects`, and, like modality and
+category, they are identifiers: prefixed closed vocabularies `REQ-MODEL-10`
+binds (ADR 0017).
 
 ### Encounters, and why a classification effect has two shapes
 
-Four encounters, a closed set like the roles: `head-on` (Rule 14), `crossing`
-(Rule 15), `overtaking` (Rule 13) and `none`. They are declared in
-`data/applicability.json` under `effects.encounters` and, like the roles, they
-are not identifiers.
+Four encounters, a closed set like the roles: `encounter:head-on` (Rule 14),
+`encounter:crossing` (Rule 15), `encounter:overtaking` (Rule 13) and
+`encounter:none`. They are declared in `data/applicability.json` under
+`effects.encounters` and, like the roles, they are identifiers.
 
-A `classification` effect carries **exactly one key**, and which key it is
+A `category:classification` effect carries **exactly one key**, and which key it is
 depends on which question the paragraph answers. Rule 7(d)(i) answers *does
 risk of collision exist* and produces `{"risk_of_collision": true}`; Rules 13,
 14 and 15 answer *what kind of encounter is this* and produce an `encounter`.
-ADR 0005 gives both questions to `classification` — "relative geometry,
+ADR 0005 gives both questions to `category:classification` — "relative geometry,
 history → encounter type, risk of collision" — and the two do not merge. A
 single shape would have made every encounter entry state a risk it does not
 decide, and 15(a)'s crossing test reads `pair:geo:risk_of_collision` as an
@@ -226,7 +245,7 @@ input rather than producing it.
 There is no `{"risk_of_collision": false}` and there never will be. 7(a) makes
 risk a judgement on all available means and deems it to exist in any doubt, so
 an entry can add a ground for risk and nothing in this package can deny one.
-`none` is declared as an encounter for the completeness of the vocabulary and
+`encounter:none` is declared for the completeness of the vocabulary and
 no entry produces it: an encounter type is asserted by a paragraph, and the
 absence of one is the absence of an entry rather than an entry with a null
 value.
@@ -242,17 +261,17 @@ subjects' bearings in half-degree steps and asserts exactly one encounter at
 each of the 518 400 points; the Alloy version of the same property lives in
 `colregs-engine`.
 
-### Rule 12 is `precedence`, not `classification`
+### Rule 12 is `category:precedence`, not `category:classification`
 
 ADR 0005 §1 and the proposal's first-cut table file Rule 12 under
-`classification`. It is `precedence` here, for the reason `Q-37` gives for
+`category:classification`. It is `category:precedence` here, for the reason `Q-37` gives for
 13(a): **12(a) produces a role, and a classification effect has nowhere to put
 one.** "One of them shall keep out of the way of the other" is give-way and
 stand-on in the effect vocabulary that already exists, and it is not an
 encounter type — two sailing vessels meeting are still in a head-on, a
 crossing or an overtaking, and Rule 12 says which of them gives way rather
 than which kind of meeting it is. Rule 12 has no deeming paragraph at all:
-12(b) defines the windward side and is a `definition`, so it is the cite on the
+12(b) defines the windward side and is a `category:definition`, so it is the cite on the
 `kin:wind_side` fact rather than an entry.
 
 The category is `Q-14`'s to settle paragraph by paragraph and this is two more
@@ -280,18 +299,18 @@ that checkable: a Rule 18 entry meets Rule 15 when it assigns a helm role and
 neither subject is gated to a sailing vessel, and every such entry must carry
 the override, so a Rule 18 paragraph added later cannot join Rule 15 silently.
 
-**The effect names both subjects, and that is the point.** A `precedence`
-entry is evaluated from own's side, so 18(a)(i) says own gives way *and* the
-other vessel stands on. Writing only own's half would lose Rule 17, which
+**The effect names both subjects, and that is the point.** A `category:precedence`
+entry is evaluated from self's side, so 18(a)(i) says self gives way *and* the
+other vessel stands on. Writing only self's half would lose Rule 17, which
 attaches to the counterpart of a give-way duty and to nothing else. So
-`stand-on` appears only opposite `give-way`, and the counterpart of
-`shall-not-impede` is always `none` — that is 8(f)(iii) in the data: a vessel
-whose passage is not to be impeded acquires no privilege by it. `none` is
+`role:stand-on` appears only opposite `role:give-way`, and the counterpart of
+`role:shall-not-impede` is always `role:none` — that is 8(f)(iii) in the data: a vessel
+whose passage is not to be impeded acquires no privilege by it. `role:none` is
 written rather than omitted, because a norm that confers nothing on a subject
-is a finding and not an absence: NUC against RAM is `none` on both sides, and
+is a finding and not an absence: NUC against RAM is `role:none` on both sides, and
 that is Rule 18's partial order rather than a gap in the table.
 
-`keep-clear` is one role for the two duties 18(e) and 18(f)(i) impose together
+`role:keep-clear` is one role for the two duties 18(e) and 18(f)(i) impose together
 — keep well clear, and avoid impeding navigation. The vocabulary cannot
 separate them and does not pretend to.
 
@@ -299,7 +318,7 @@ separate them and does not pretend to.
 
 A two-subject entry is keyed on its paragraph like any other (below):
 `rule:18a_i` is 18(a)(i), `rule:9c` is 9(c), `rule:8f_iii` is 8(f)(iii). No
-subject segment appears in an id: every entry is evaluated from own's side,
+subject segment appears in an id: every entry is evaluated from self's side,
 and where the paragraph classifies the pair rather than one vessel the entry
 reads both subjects inside one predicate — `rule:13b` is 13(b) whichever
 vessel is coming up. Where a paragraph's subject is disjunctive — 9(b) is
@@ -391,11 +410,6 @@ implemented in the reference evaluator and asserted by the fixtures.
 
 ## What is not an identifier
 
-- **Modality values** (`shall`, `may`, `shall-if-practicable`,
-  `conditional`, `exempt`) and **jurisdiction values** (`intl`,
-  `us/inland`) are their own closed vocabularies, defined in §2 of the
-  requirements and not part of the identifier space REQ-MODEL-10 binds. So are
-  the **role** and **encounter** values of an effect.
 - **Constants** — `situation.constants` in `data/facts.json`: the numbers a
   Part B predicate needs and the Rules do not always give
   (`appreciable_bearing_change_deg_min`, `head_on_half_angle_deg`, the two
@@ -410,7 +424,7 @@ implemented in the reference evaluator and asserted by the fixtures.
   data is addressed by. Only the values inside them can be identifiers, and
   where they are (`also_activity` holds an activity value) they are prefixed.
   `not` and `any_of` are the second pair of words reserved at the head of an
-  identifier space, after `own`/`other`/`pair`: they appear where a fact key
+  identifier space, after `self`/`other`/`pair`: they appear where a fact key
   appears, so no fact may ever be named either. The cost is the same and as
   cheap — every fact key carries a class prefix (`fact:`, `geo:`, `kin:`,
   `hist:`, `env:`) and neither word could be one.

package/docs/part-b-invariants.md

@@ -46,7 +46,7 @@ suffix naming what distinguishes them.
 A **situation** is the record of `REQ-CAT-4` and `REQ-CAT-6`: two per-vessel
 fact records, a kinematic state each, relative geometry, history and the
 environment, addressed as `<subject>:<class>:<key>`, subject in
-`own`/`other`/`pair`. A **trace** is a sequence of situations for one ordered
+`self`/`other`/`pair`. A **trace** is a sequence of situations for one ordered
 pair, sampled at *t*₀ < *t*₁ < … . Each invariant is a property of one state
 ("at every state") or relates two or more ("at every state after", "from the
 first state at which") — the whole content of §4.1's `conduct` category, and
@@ -74,8 +74,8 @@ latches the result against the geometry that follows.
 `13(b)` under 11 · classification · single-state · `✎`
 
 **Invariant.** At any state at which the two vessels are in sight of one
-another and both underway, own is deemed to be overtaking other exactly when
-own is coming up with other and own bears, from other, more than 22.5° abaft
+another and both underway, self is deemed to be overtaking other exactly when
+self is coming up with other and self bears, from other, more than 22.5° abaft
 other's beam — `other:geo:rel_bearing_deg` strictly inside (112.5°, 247.5°).
 The sector is open at both ends (*more than* 22.5°: a vessel on the edge is
 not overtaking); its edges are the forward edges of Rule 21(c)'s sternlight
@@ -93,7 +93,7 @@ arc, which 13(b)'s second limb states in light terms.
 
 `13(b)` · classification, derived · single-state · `✎`
 
-**Invariant.** Where `INV-13b` holds of own with respect to other, the
+**Invariant.** Where `INV-13b` holds of self with respect to other, the
 encounter type of the pair is `overtaking` read from *either* subject: the
 vessel being overtaken is in an overtaking, not a crossing, though the
 overtaking vessel bears forward of her beam.
@@ -127,13 +127,13 @@ well as Rules 14 and 15.
 `13(d)` · classification · temporal, a state to every later state of the
 encounter · `✎`
 
-**Invariant.** Let *s* be the first state of an encounter at which own is
+**Invariant.** Let *s* be the first state of an encounter at which self is
 deemed to be overtaking other. At every state of that encounter after *s*,
-until own is finally past and clear, the encounter type of the pair is
+until self is finally past and clear, the encounter type of the pair is
 `overtaking` whatever the relative bearings then are; in particular it is not
 `crossing`, and the tests of Rules 14 and 15 do not apply to the pair.
 
-- **State remembered.** One directional boolean per subject per encounter (own
+- **State remembered.** One directional boolean per subject per encounter (self
   was, earlier in this encounter, the overtaking vessel), plus the time of *s*
   for a monitor that says when the duty attached; window *s* to finally past and
   clear. Reading only the current state is wrong in the direction the paragraph
@@ -144,7 +144,7 @@ until own is finally past and clear, the encounter type of the pair is
   model's is its segmentation, and no bearing or range is invented here.
 - **Readings in doubt.** Two: what arms the latch, `Q-51`; what it forbids,
   `Q-52`.
-- Entries: `rule:13d`, reading `own`/`other:hist:was_overtaking` and no geometry; the
+- Entries: `rule:13d`, reading `self`/`other:hist:was_overtaking` and no geometry; the
   `was_overtaking: false` gates on `rule:14b`, `rule:15a:crossing`, `rule:15a:keep_out_of_the_way`
   implement `Q-52`'s *broad* reading. Settled by `Q-51`, `Q-52`, then TLC on a
   three-state trace of an overtaking drawing out onto the bow.
@@ -153,15 +153,15 @@ until own is finally past and clear, the encounter type of the pair is
 
 `13(d)` second limb · precedence · temporal, as `INV-13d` · `✎`
 
-**Invariant.** With *s* as in `INV-13d`, at every state after *s* until own is
-finally past and clear, own holds `give-way` and other `stand-on`, whatever the
+**Invariant.** With *s* as in `INV-13d`, at every state after *s* until self is
+finally past and clear, self holds `give-way` and other `stand-on`, whatever the
 bearings. Separate from `INV-13d` because the two limbs come apart: a reading
 on which 13(d) forbids only the *crossing* reclassification still preserves
 the duty by its second clause, and a formalisation deriving role from encounter
 type alone cannot distinguish `Q-52`'s readings.
 
 - **State remembered.** As `INV-13d`.
-- Entries: `rule:13a`'s `any_of` second limb, `own:hist:was_overtaking: true` — role
+- Entries: `rule:13a`'s `any_of` second limb, `self:hist:was_overtaking: true` — role
   asserted from the latch directly, keeping the limbs separable. Settled by
   `Q-52`.
 
@@ -176,7 +176,7 @@ type alone cannot distinguish `Q-52`'s readings.
 **Invariant.** At any state at which two power-driven vessels are in sight,
 both underway, with risk of collision, and neither latched under `INV-13d`, a
 head-on situation is deemed to exist exactly when each sees the other ahead or
-nearly ahead: `own:geo:rel_bearing_deg` and `other:geo:rel_bearing_deg` each
+nearly ahead: `self:geo:rel_bearing_deg` and `other:geo:rel_bearing_deg` each
 in [0°, 11.25°] ∪ [348.75°, 360°).
 
 - **Both bearings, not one.** 14(b)'s lights limb is a statement about the
@@ -241,7 +241,7 @@ vessel which has the other on her own starboard side holds `give-way` and the
 other holds `stand-on`.
 
 - **Undetermined term.** "On her own starboard side" has no sector in the
-  paragraph; the data reads `own:geo:rel_bearing_deg` in (0°, 112.5°], its upper
+  paragraph; the data reads `self:geo:rel_bearing_deg` in (0°, 112.5°], its upper
   edge 13(b)'s constant, so it is checkable against the partition.
 - Entries: `rule:15a:keep_out_of_the_way`, plus six `rel:overrides` from Rule 18 entries, since
   Rule 18's chapeau excepts Rules 9, 10 and 13 and no others.
@@ -255,7 +255,7 @@ bearings only
 under `INV-15a-give-way`.
 
 - **Why it is not free.** Both-starboard is a consistent *record* and an
-  impossible *situation* on a steady bearing: own's speed times the sine of her
+  impossible *situation* on a steady bearing: self's speed times the sine of her
   relative bearing equals minus other's speed times the sine of the aspect, so
   the bearings lie on opposite sides. A theorem at zero bearing rate, an
   observation elsewhere.
@@ -703,7 +703,7 @@ action in ample time.
 
 **Invariant.** Where `INV-19d-action`'s action is an alteration of course,
 then so far as possible the vessel shall not alter course to port for a vessel
-forward of her beam — `own:geo:rel_bearing_deg` in (270°, 360°) ∪ [0°, 90°) —
+forward of her beam — `self:geo:rel_bearing_deg` in (270°, 360°) ∪ [0°, 90°) —
 other than for a vessel being overtaken.
 
 - **The exception reaches across the switch.** "A vessel being overtaken" is
@@ -718,7 +718,7 @@ other than for a vessel being overtaken.
 
 **Invariant.** Where `INV-19d-action`'s action is an alteration of course,
 then so far as possible the vessel shall not alter course toward a vessel
-abeam or abaft her beam — `own:geo:rel_bearing_deg` in [90°, 270°].
+abeam or abaft her beam — `self:geo:rel_bearing_deg` in [90°, 270°].
 
 - **"Toward"** is the sign of the alteration against the other's bearing, not
   the resulting heading: toward when it reduces her relative bearing off the bow
@@ -760,7 +760,7 @@ paragraph of its own.
 
 `13(a)`, `15(a)`, `12(a)`, `18(a)–(c)` with 18's chapeau · precedence, derived
 · single-state · `✎`, asserted over consistent steady bearings only
-(`REQ-VERIFY-8`)
+(`REQ-VERIFY-8`), over the pooled two-frame read of ADR 0016
 
 **Invariant.** At every state, after every `rel:overrides` is applied, no pair
 holds `give-way` on both subjects, and none holds `stand-on` on both.
@@ -786,7 +786,8 @@ P2.2.
 
 ### INV-PB-one-role-source — a vessel holds one helm role at a time
 
-`13(a)`, `18` chapeau, with 16 and 17 · precedence, derived · single-state · `✎`
+`13(a)`, `18` chapeau, with 16 and 17 · precedence, derived · single-state · `✎`,
+over the pooled two-frame read of ADR 0016
 
 **Invariant.** After every `rel:overrides` is applied, no vessel holds both
 `give-way` and `stand-on` with respect to the same other vessel at the same