From a80e61963756a28a3963a0442a8ccc1572518373 Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Tue, 28 Jul 2026 14:35:24 +0200 Subject: 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. --- internal/calendar/calendar.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'internal/calendar/calendar.go') diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index d224e87..9f24caf 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -145,10 +145,29 @@ func movableMemorialsOF(y int) []movableCel { // transferIfImpeded moves a solemnity off a band-1/2 temporal day to the next // free day. Non-solemnities are never transferred (they yield instead). +// +// Two impeded solemnities are ANTICIPATED (moved earlier) rather than deferred, +// matching the General Roman Calendar's published transfers: +// - St Joseph (Mar 19) falling in Holy Week goes to the Saturday before Palm +// Sunday. (The Annunciation, by contrast, defers past the octave via the +// generic forward walk below -- to the Monday after the 2nd Sunday of Easter.) +// - The Nativity of St John the Baptist (Jun 24), when the day is a solemnity +// of the Lord (the Sacred Heart or Corpus Christi falling on Jun 24), goes +// to Jun 23. func transferIfImpeded(cel Celebration, when time.Time, sel Selection) time.Time { if cel.Rank != RankSolemnity { return when } + if strings.Contains(cel.Slug, "joseph-husband") { + if palm := Easter(when.Year()).AddDate(0, 0, -7); !when.Before(palm) { + return palm.AddDate(0, 0, -1) // Holy Week -> Saturday before Palm Sunday + } + } + if strings.Contains(cel.Slug, "john-the-baptist") { + if td := temporal(when, sel); td.Cel.Rank == RankSolemnity && td.Class == ClassLord && !td.Sunday { + return when.AddDate(0, 0, -1) // Sacred Heart / Corpus Christi on Jun 24 -> Jun 23 + } + } day := when for i := 0; i < 30; i++ { b := temporal(day, sel) -- cgit v1.3 From cf45e9f7f3146bca6039b63e2be02463b02f8043 Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Tue, 28 Jul 2026 14:46:17 +0200 Subject: fix(EF): fill reading gaps (major feasts, feria-repeat-through-feast, sundays) EF readings had ~1.8% of days with no readings (major feasts falling back to the wrong Sunday, feria-repeats broken when the preceding Sunday was a feast). Now 0 gaps over 9496 days (2025-2050); reading correctness spot-checks match missalemeum except the resumed-Epiphany-Sunday edge (next commit). - calendar.TemporalSlug: the green-season weekday-repeats-the-Sunday rule uses the Sunday's TEMPORAL slug, so a Monday still finds its Sunday Mass when that Sunday was displaced by a feast (e.g. the Purification on Feb 2). - Add the missing EF temporal Masses (from missalemeum): the Nativity Day Mass (Heb 1:1-12 / John 1:1-14), Epiphany (Isa 60:1-6 / Matt 2:1-12), the Octave Day of Christmas (Titus 2:11-15 / Luke 2:21), the 6th Sunday after Epiphany (1 Thess 1:2-10 / Matt 13:31-35), and the last Sunday after Pentecost (Col 1:9-14 / Matt 24:15-35). --- internal/caldata/readings.go | 7 ++++--- internal/caldata/tridentine-lectionary.ini | 20 ++++++++++++++++++++ internal/calendar/calendar.go | 13 +++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) (limited to 'internal/calendar/calendar.go') diff --git a/internal/caldata/readings.go b/internal/caldata/readings.go index 1b87b7a..3e46ccd 100644 --- a/internal/caldata/readings.go +++ b/internal/caldata/readings.go @@ -76,11 +76,12 @@ func Readings(sel calendar.Selection, layers []calendar.Layer, date time.Time, d return r } } - // EF: a green-season weekday with no proper Mass repeats the preceding Sunday. + // EF: a green-season weekday with no proper Mass repeats the preceding + // Sunday's Mass. Use the Sunday's TEMPORAL slug (not its observed) so the + // repeat still resolves when that Sunday was a feast (e.g. the Purification). if sel.Form == "old" && day.Observed.Layer == "temporal" && date.Weekday() != time.Sunday { sun := date.AddDate(0, 0, -int(date.Weekday())) // preceding Sunday (Sunday = 0) - sd := calendar.Compute(sun, sel, layers) - return TemporalReadings(sel.Form, sd.Observed.Slug) + return TemporalReadings(sel.Form, calendar.TemporalSlug(sun, sel)) } return nil } diff --git a/internal/caldata/tridentine-lectionary.ini b/internal/caldata/tridentine-lectionary.ini index cef3f2d..52ac060 100644 --- a/internal/caldata/tridentine-lectionary.ini +++ b/internal/caldata/tridentine-lectionary.ini @@ -472,3 +472,23 @@ gospel = Luke 19:41-47 [ef-trinity] first = Rom 11:33-36. gospel = Matt 28:18-20 + +[ef-nativity] +first = Heb 1:1-12 +gospel = John 1:1-14 + +[ef-epiphany] +first = Isa 60:1-6 +gospel = Matt 2:1-12 + +[ef-circumcision] +first = Titus 2:11-15 +gospel = Luke 2:21 + +[ef-time-after-epiphany-sunday-6] +first = 1 Thess 1:2-10 +gospel = Matt 13:31-35 + +[ef-time-after-pentecost-sunday-28] +first = Col 1:9-14 +gospel = Matt 24:15-35 diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index 9f24caf..33706d8 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -18,6 +18,19 @@ func Compute(date time.Time, sel Selection, layers []Layer) LiturgicalDay { return computeOF(date, sel, layers) } +// TemporalSlug returns the slug of date's TEMPORAL day (the season's Sunday or +// feria), ignoring any sanctoral celebration that outranks it. The EF's +// green-season weekday-repeats-the-Sunday rule uses this so a Monday still finds +// its Sunday Mass even when that Sunday was displaced by a feast (e.g. the +// Purification on Feb 2). +func TemporalSlug(date time.Time, sel Selection) string { + date = date.UTC().Truncate(24 * time.Hour) + if sel.Form == "old" { + return temporalEF(date).Cel.Slug + } + return temporal(date, sel).Cel.Slug +} + // computeEF computes the Extraordinary Form (1962) day. func computeEF(date time.Time, sel Selection, layers []Layer) LiturgicalDay { td := temporalEF(date) -- cgit v1.3