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/temporal_ef.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'internal/calendar/temporal_ef.go') diff --git a/internal/calendar/temporal_ef.go b/internal/calendar/temporal_ef.go index 877545c..9e7e7b2 100644 --- a/internal/calendar/temporal_ef.go +++ b/internal/calendar/temporal_ef.go @@ -82,6 +82,11 @@ func temporalEF(date time.Time) temporalDay { easter := Easter(y) season := efSeason(date, y, easter) col := efColour(season) + // The Octave of Pentecost (Whit Monday through the Ember Saturday, easter+50 + // to +55) is red, not the white of the rest of Paschaltide. + if !date.Before(easter.AddDate(0, 0, 50)) && !date.After(easter.AddDate(0, 0, 55)) { + col = Red + } sun := date.Weekday() == time.Sunday // Major feasts of the Lord (I class): nice titles + colour. -- cgit v1.3 From c5abf87fa7198c8f245f407774e2326e4b6c9b9c Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Tue, 28 Jul 2026 14:54:10 +0200 Subject: fix(EF): resumed Sundays after Pentecost use the Epiphany Masses In early-Easter years there are more than 24 Sundays after Pentecost. Per the 1960 Rubrics the surplus Sundays resume the Sundays after Epiphany that Septuagesima cut short (highest-numbered first) and the last Sunday keeps the 24th (Last) Mass. temporalEF now routes those Sundays to the resumed Epiphany slug for readings while keeping the calendrical time-after-pentecost season; the mis-harvested tail entries (post-Pentecost sundays 24-28) are corrected to the true 24th Mass and the surplus removed. Validated: 88/88 tail/resumed Sunday gospels match missalemeum 2025-2050; EF oracle green. --- internal/caldata/tridentine-lectionary.ini | 16 ++-------------- internal/calendar/temporal_ef.go | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'internal/calendar/temporal_ef.go') diff --git a/internal/caldata/tridentine-lectionary.ini b/internal/caldata/tridentine-lectionary.ini index 52ac060..06ad9fd 100644 --- a/internal/caldata/tridentine-lectionary.ini +++ b/internal/caldata/tridentine-lectionary.ini @@ -426,20 +426,11 @@ first = Phil 3:17-21; 4:1-3 gospel = Matt 9:18-26 [ef-time-after-pentecost-sunday-24] -first = Rom 13:8-10 -gospel = Matt 8:23-27 +first = Col 1:9-14 +gospel = Matt 24:15-35 -[ef-time-after-pentecost-sunday-25] -first = Col 3:12-17 -gospel = Matt 13:24-30 -[ef-time-after-pentecost-sunday-26] -first = 1 Thess. 1:2-10 -gospel = Matt 13:31-35 -[ef-time-after-pentecost-sunday-27] -first = Col 1:9-14 -gospel = Matt 24:15-35 [ef-time-after-pentecost-sunday-3] first = 1 Pet. 5:6-11 @@ -489,6 +480,3 @@ gospel = Luke 2:21 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/temporal_ef.go b/internal/calendar/temporal_ef.go index 9e7e7b2..7420ebd 100644 --- a/internal/calendar/temporal_ef.go +++ b/internal/calendar/temporal_ef.go @@ -132,6 +132,24 @@ func temporalEF(date time.Time) temporalDay { if season == Advent && sameDay(date, adventStart(y)) { rank = RankClass1 // 1st Sunday of Advent } + // Resumed Sundays after Pentecost (1960 Rubrics): when Easter is early + // there are more than 24 Sundays after Pentecost. The LAST Sunday before + // Advent always keeps the 24th (Last) Mass; the surplus Sundays between the + // 23rd and the last resume the Sundays after Epiphany that Septuagesima cut + // short -- the highest-numbered ones, so the 6th sits just before the Last. + if season == TimeAfterPentecost { + lastSun := adventStart(y).AddDate(0, 0, -7) + if sameDay(date, lastSun) { + return efCel(TimeAfterPentecost, "ef-time-after-pentecost-sunday-24", col, rank, 24) + } + if week > 23 { + p := daysBetween(easter.AddDate(0, 0, 49), lastSun) / 7 // total Sundays after Pentecost + e := week - p + 7 // resumed Sunday after Epiphany + // Season stays time-after-pentecost (calendrical); the Epiphany + // slug only routes the readings to the resumed Mass. + return efCel(TimeAfterPentecost, "ef-time-after-epiphany-sunday-"+strconv.Itoa(e), Green, rank, e) + } + } return efCel(season, "ef-"+string(season)+"-sunday-"+strconv.Itoa(week), col, rank, week) } // The days between Ash Wednesday and the 1st Sunday of Lent have their own -- cgit v1.3