merge: celebrant Mass rubrics, and four rubrical corrections

colitur now prints what a real ordo prints for the Mass: which formulary is
said and how it was reached, the Gloria, the Creed, the preface, and the
commemorations with their Low-Mass/sung distinction. colitur rubrics joins
day and readings.

Four defects were found and fixed on the way, each by an external witness
rather than by inspection: the Creed said at Requiem Masses (RG 476(f)),
the missing bissextile shift of St Matthias and St Gabriel (2 041 leap
years), Rogation Monday and Tuesday coloured violet in Paschaltide (RG
119(b)), and the ferias after the Ascension resuming the wrong Sunday's
Mass rather than the Ascension's.

Validation gained a sixth layer and then some: the preface is checked
against three independent publishers over seven witness-years (FIUV, three
LMS editions, three extraordinaryform.org editions), none of which shares
the Divinum Officium -> missalemeum -> lectio lineage the older layers all
descend from.

1 files changed, 43 insertions, 8 deletions

diff --git a/lib/rites/rite_ef/lectionary_ef.mli b/lib/rites/rite_ef/lectionary_ef.mli
index caefc74..715e9c2 100644
--- a/lib/rites/rite_ef/lectionary_ef.mli
+++ b/lib/rites/rite_ef/lectionary_ef.mli
@@ -72,21 +72,28 @@ module Commons : sig
   val assignments : t -> (Slug.t * Slug.t) list
 end
 
-(** The Common assigned to a saint who has no proper, if any. Exposed for the
-    golden pins, which must show WHICH Common fired, not merely that two
-    citations appeared.
+(** The Common assigned to a saint who has no proper, if any -- its own id
+    ALONGSIDE its citations, not the citations alone: {!readings}' step 4
+    needs the id to name which Common fired in the {!Colitur_kernel.Mass_formulary.t}
+    it builds. Exposed for the golden pins too, which must show WHICH Common
+    fired, not merely that two citations appeared.
 
     Takes the table explicitly for the same reason {!readings} takes
     [~lectionary]: the data is the caller's, not this module's. *)
-val commons_for : commons:Commons.t -> Slug.t -> Citation.t list option
+val commons_for : commons:Commons.t -> Slug.t -> (Slug.t * Citation.t list) option
 
-(** The day's Epistle and Gospel citations, or [].
+(** The Mass actually said -- which formulary, and how that was decided --
+    paired with the day's Epistle and Gospel citations. [(None, [])] when
+    none of the four steps below answers.
 
     Four steps, in EXECUTION order 1, 4, 2, 3 (the numbers are the plan's and
     are kept as written, so that every "step 3" already recorded in a test
-    name, comment or report still means the same branch):
+    name, comment or report still means the same branch). Each step's own
+    {!Colitur_kernel.Mass_formulary.source} is built at the point the step
+    decides, not re-derived afterwards from the citations it returns:
 
     - {b Step 1} -- the observed celebration's own proper.
+      {!Colitur_kernel.Mass_formulary.Proper}, [said] the observed slug.
     - {b Step 4} -- a saint who is the day's observed office and has no
       proper says his assigned Common. Runs before the temporal fallbacks,
       not after them: this is the only step in the chain with a direct
@@ -98,14 +105,42 @@ val commons_for : commons:Commons.t -> Slug.t -> Citation.t list option
       a feria, a Sunday, the Triduum and the RG 78 Saturday Office of the
       BVM (whose observed celebration is its own temporal office) are
       structurally excluded, not merely absent from the data.
+      {!Colitur_kernel.Mass_formulary.Common}, [said] the Common's own id.
     - {b Step 2} -- the day's own temporal slug in the lectionary.
+      {!Colitur_kernel.Mass_formulary.Own_slug}, [said] that slug. The RG
+      309(a) Saturday votive Mass of Our Lady also answers here (structurally,
+      not as a fifth numbered step), but is tagged
+      {!Colitur_kernel.Mass_formulary.Votive} instead, not [Own_slug]: RG
+      431(e) ("in Missis votivis IV classis ... de B. Maria Virg. quae in
+      sabbato celebrantur", docs/research/LT.txt) classifies it, in the
+      Missal's own words, as a "Missa votiva" said IN PLACE of the day's own
+      office's Mass, the office (RG 78) itself being kept, corroborated by RG
+      309(a)'s own "iuxta temporum diversitatem" naming the five seasonal
+      Masses RG 431(e) speaks of. (CORRECTED, fix round 2: this previously
+      also cited the Latin Mass Society Ordo as witnessing the tag directly,
+      reading its "V Mass of BVM" as an abbreviation for "votive" -- the
+      coordinator's own misreading. The Ordo's "I"-"V" are ROMAN NUMERALS
+      naming which of the five seasonal Masses is said, not a marker of the
+      Mass's kind; see the implementation comment on this branch for the
+      full account and the validation use this correction still leaves
+      available for Task 6.) [said] is [None] here (whole-branch review fix
+      round, celebrant-rubrics-phase1): the five seasonal Masses RG 309(a)
+      names carry no slug of their own anywhere in the shipped data, so
+      there is no slug this field could honestly report -- see
+      {!Colitur_kernel.Mass_formulary.t}'s own [said] citation for the full
+      account. The day's own OFFICE (the guard that reaches this branch
+      only ever fires when the observed celebration already IS the day's
+      own temporal office) is unaffected and is still [observed.slug] on
+      the same {!Colitur_kernel.Liturgical_day.t}.
     - {b Step 3} -- for a weekday whose own slug has no entry, the preceding
       Sunday's temporal slug (never its observed one; a Sunday is guarded
       out because it has no PRECEDING Sunday to resume, not because
       consulting itself would loop -- [readings] is not recursive, see its
       own implementation comment).
+      {!Colitur_kernel.Mass_formulary.Preceding_sunday}, [said] that
+      Sunday's temporal slug.
 
-    A day matching none of the four gets []. *)
+    A day matching none of the four gets [(None, [])]. *)
 val readings :
   lectionary:Lectionary.t ->
   commons:Commons.t ->
@@ -113,4 +148,4 @@ val readings :
   temporal:(Vocab_ef.season, Vocab_ef.rank) Temporal.t ->
   date:Date.t ->
   temporal_at:(Date.t -> (Vocab_ef.season, Vocab_ef.rank) Temporal.t) ->
-  Citation.t list
+  Mass_formulary.t option * Citation.t list