aboutsummaryrefslogtreecommitdiff
path: root/internal/calendar/precedence.go
diff options
context:
space:
mode:
authorLukasz Kasprzak <lukas@labunix.xyz>2026-07-28 14:35:24 +0200
committerLukasz Kasprzak <lukas@labunix.xyz>2026-07-28 14:35:24 +0200
commita80e61963756a28a3963a0442a8ccc1572518373 (patch)
tree602540ee619ce1d64c16e7e9ca0adb7a7cfb2194 /internal/calendar/precedence.go
parent0586599fc6020df996c4278230eeea99b9d070cb (diff)
downloadlectio-a80e61963756a28a3963a0442a8ccc1572518373.tar.gz
lectio-a80e61963756a28a3963a0442a8ccc1572518373.zip
fix(calendar): OF precedence/transfer + readings resolution; EF Pentecost octave
Fixes found by validating the offline engine per-day vs the LiturgicalCalendar API (OF) and missalemeum (EF) across 2005-2050. OF calendar is now 0 real errors in the forward window (season/cycle already perfect). OF precedence/transfer (calendar): - Ash Wednesday and Holy Week Mon-Wed are band-2 privileged, so a coinciding feast (Chair of St Peter on Ash Wednesday) is suppressed, not observed. - Solemnities transfer out of Holy Week / the Easter octave: the Annunciation defers to the Monday after the 2nd Sunday of Easter; St Joseph is anticipated to the Saturday before Palm Sunday; the Nativity of St John the Baptist moves to Jun 23 when a Lord's solemnity (Sacred Heart / Corpus Christi) falls Jun 24. - Within a precedence band, a solemnity of the Lord/BVM outranks a saint's (dignity tiebreak) rather than losing an alphabetical slug tie. - Perpetua & Felicity corrected optional -> obligatory memorial. OF readings resolution (bible.OFRef + lectionary data): - Verse-accurate Hebrew->Vulgate psalm mapping incl. the split psalms (9/10, 114/115, 116, 147); "+" verse joins and abbreviated ranges ("127-28") normalized; single-chapter books (2/3 John, Jude) get chapter 1. - Cleaned harvest artifacts from of-lectionary.ini (descriptive-suffix gospels, "or Year A" alternates, "*"/"[Vulg.]"/bracket markers, slash abbreviations); Joel/Malachi/Zechariah/Esther book-versification citations fixed to Vulgate. - Split a merged Ps 15:10/11 row in vul.tsv. Result: 0 unresolvable OF readings over 2557 rendered days (cycles A/B/C, varied Easters). EF: the Octave of Pentecost (Whit Monday-Saturday) is red, not white.
Diffstat (limited to 'internal/calendar/precedence.go')
-rw-r--r--internal/calendar/precedence.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/internal/calendar/precedence.go b/internal/calendar/precedence.go
index 3b7c0a6..3c7bf5f 100644
--- a/internal/calendar/precedence.go
+++ b/internal/calendar/precedence.go
@@ -82,6 +82,13 @@ func pick(cands []candidate) (candidate, []candidate) {
if pi != pj {
return pi < pj
}
+ // Within a band, higher liturgical dignity wins (Table of Liturgical Days:
+ // of the Lord, then of the BVM, then of saints) -- so a Lord's solemnity
+ // (Sacred Heart, Corpus Christi) outranks a coinciding saint's solemnity
+ // rather than losing an alphabetical tie.
+ if di, dj := dignity(sorted[i].Cel), dignity(sorted[j].Cel); di != dj {
+ return di < dj
+ }
return sorted[i].Cel.Slug < sorted[j].Cel.Slug
})
// General Norms 60: when two obligatory memorials fall on the same day, both
@@ -108,6 +115,20 @@ func pick(cands []candidate) (candidate, []candidate) {
return sorted[0], sorted[1:]
}
+// dignity ranks a celebration within its precedence band by the Table of
+// Liturgical Days' order of dignity: of the Lord (0), of the BVM (1), of saints
+// or unclassified (2).
+func dignity(c Celebration) int {
+ switch c.Class {
+ case ClassLord:
+ return 0
+ case ClassBVM:
+ return 1
+ default:
+ return 2
+ }
+}
+
// slugIndex returns the position of the candidate with the given slug, or -1.
func slugIndex(cands []candidate, slug string) int {
for i, c := range cands {