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, 22 insertions, 6 deletions

diff --git a/lib/kernel/calendar.ml b/lib/kernel/calendar.ml
index 98e9032..a1309f9 100644
--- a/lib/kernel/calendar.ml
+++ b/lib/kernel/calendar.ml
@@ -79,7 +79,7 @@ let resolve_with_injected ?(suppressed = no_suppression) (rite : ('s, 'r) Rite.t
     { Precedence.cel = temporal.Temporal.office; origin = Precedence.Temporal }
   in
   let natural =
-    Layer.on_date idx date
+    Layer.on_date ~fixed_key:rite.Rite.fixed_key idx date
     |> List.map (fun (e : 'r Layer.entry) ->
            { Precedence.cel = e.Layer.cel; origin = Precedence.Sanctoral })
   in
@@ -339,7 +339,7 @@ let rg33_suppressed (rite : ('s, 'r) Rite.t) (idx : 'r Layer.index)
   Array.iter
     (fun date ->
       let candidates =
-        Layer.on_date idx date
+        Layer.on_date ~fixed_key:rite.Rite.fixed_key idx date
         |> List.map (fun (e : 'r Layer.entry) ->
                { Precedence.cel = e.Layer.cel; origin = Precedence.Sanctoral })
       in
@@ -529,7 +529,8 @@ let build_day (rite : ('s, 'r) Rite.t) (idx : 'r Layer.index)
     | None -> []
     | Some slugs ->
         let on_date =
-          Layer.on_date idx date |> List.map (fun (e : 'r Layer.entry) -> e.Layer.cel)
+          Layer.on_date ~fixed_key:rite.Rite.fixed_key idx date
+          |> List.map (fun (e : 'r Layer.entry) -> e.Layer.cel)
         in
         let temporal_office = temporal.Temporal.office in
         (temporal_office :: (on_date @ List.map (fun c -> c.Precedence.cel) arrived))
@@ -543,6 +544,19 @@ let build_day (rite : ('s, 'r) Rite.t) (idx : 'r Layer.index)
       |> List.map (fun c -> (c.Precedence.cel, reason_for c)))
     @ rg33_omitted
   in
+  let formulary, citations =
+    rite.Rite.readings ~observed:resolution.Precedence.observed.Precedence.cel ~temporal ~date
+      ~temporal_at:rite.Rite.temporal
+  in
+  let creed =
+    rite.Rite.creed ~temporal ~observed:resolution.Precedence.observed.Precedence.cel ~date
+  in
+  let gloria =
+    rite.Rite.gloria ~temporal ~observed:resolution.Precedence.observed.Precedence.cel ~date
+  in
+  let preface =
+    rite.Rite.preface ~temporal ~observed:resolution.Precedence.observed.Precedence.cel ~date
+  in
   {
     Liturgical_day.date;
     rite = rite.Rite.id;
@@ -553,9 +567,11 @@ let build_day (rite : ('s, 'r) Rite.t) (idx : 'r Layer.index)
     transferred_in;
     transferred_out;
     omitted;
-    citations =
-      rite.Rite.readings ~observed:resolution.Precedence.observed.Precedence.cel ~temporal ~date
-        ~temporal_at:rite.Rite.temporal;
+    citations;
+    formulary;
+    creed;
+    gloria;
+    preface;
   }
 
 let year (rite : ('s, 'r) Rite.t) (layer : 'r Layer.t) (y : int) :