1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
|
package calendar
import (
"sort"
"strings"
"time"
)
// Compute returns the liturgical day for date under the given Selection, with
// the ordered layer stack supplying celebrations. It is pure and total: any
// valid Gregorian date yields a LiturgicalDay. Selection.Form "old" computes the
// Extraordinary Form (1962); anything else computes the Ordinary Form.
func Compute(date time.Time, sel Selection, layers []Layer) LiturgicalDay {
date = date.UTC().Truncate(24 * time.Hour)
if sel.Form == "old" {
return computeEF(date, sel, layers)
}
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)
merged := mergeLayers(layers)
year := date.Year()
// occupiedByRank reports whether some OTHER fixed-date sanctoral
// celebration whose rank passes `allowed` resolves onto d this year.
// transferIfImpededEF uses this at two different thresholds: class 1
// only, to decide whether a candidate is impeded in the first place (a
// class-2 occupant never impedes a class-1 feast -- class 1 always beats
// class 2 outright, no tie exists); and class 1 OR 2, for RG 96's "next
// day that is not I or II class" once a transfer is already under way
// (e.g. the Visitation, 2 July, blocking the Precious Blood's transfer
// off 1 July in 2011).
occupiedByRank := func(d time.Time, exceptSlug string, allowed func(Rank) bool) bool {
for slug2, rc2 := range merged {
if slug2 == exceptSlug {
continue
}
cel2 := buildCelebration(slug2, rc2)
if !allowed(cel2.Rank) {
continue
}
if when2, ok := celebrationDate(cel2, year, sel); ok && sameDay(when2, d) {
return true
}
}
return false
}
isClass1 := func(r Rank) bool { return r == RankClass1 }
isClass1Or2 := func(r Rank) bool { return r == RankClass1 || r == RankClass2 }
cands := []candidate{{Cel: td.Cel, Temporal: true, Season: td.Season, Sunday: td.Sunday}}
for slug, rc := range merged {
cel := buildCelebration(slug, rc)
when, ok := celebrationDate(cel, year, sel)
if !ok {
continue
}
effective := transferIfImpededEF(cel, when,
func(d time.Time) bool { return occupiedByRank(d, cel.Slug, isClass1) },
func(d time.Time) bool { return occupiedByRank(d, cel.Slug, isClass1Or2) })
if sameDay(effective, date) {
cands = append(cands, candidate{Cel: cel, Temporal: false, Season: td.Season})
}
}
obs, others := pickEF(cands)
day := LiturgicalDay{
Date: date, Season: td.Season, Week: td.Week, Weekday: date.Weekday(),
Observed: obs.Cel, Colour: colourOf(obs, td), ObservedBand: precedenceEF(obs),
}
for _, o := range others {
if o.Temporal {
continue
}
day.Others = append(day.Others, o.Cel)
}
return day
}
// computeOF computes the Ordinary Form day.
func computeOF(date time.Time, sel Selection, layers []Layer) LiturgicalDay {
td := temporal(date, sel)
merged := mergeLayers(layers)
cands := []candidate{{
Cel: td.Cel, Temporal: true, Privileged: td.Privileged,
PrivFeria: td.PrivFeria, Sunday: td.Sunday, Season: td.Season,
}}
for slug, rc := range merged {
cel := buildCelebration(slug, rc)
when, ok := celebrationDate(cel, date.Year(), sel)
if !ok {
continue
}
// On band-2 privileged days only solemnities survive (and they transfer);
// on Sundays (band 6) only feasts and solemnities compete.
if td.Privileged && ofRankOrder(cel.Rank) < ofRankOrder(RankSolemnity) {
continue
}
if td.Sunday && ofRankOrder(cel.Rank) < ofRankOrder(RankFeast) {
continue
}
effective := transferIfImpeded(cel, when, sel)
if sameDay(effective, date) {
cands = append(cands, candidate{Cel: cel, Temporal: false, Season: td.Season})
}
}
// Movable Marian memorials that have no fixed date (so they cannot live in the
// sanctoral file): Mary, Mother of the Church, and the Immaculate Heart.
for _, mm := range movableMemorialsOF(date.Year()) {
if sameDay(mm.when, date) {
cands = append(cands, candidate{Cel: mm.cel, Temporal: false, Season: td.Season})
}
}
obs, others := pick(cands)
day := LiturgicalDay{
Date: date, Season: td.Season, Week: td.Week, Weekday: date.Weekday(),
Observed: obs.Cel, Colour: colourOf(obs, td), ObservedBand: precedence(obs),
SundayCycle: sundayCycle(liturgicalYearStart(date)),
WeekdayCycle: weekdayCycle(liturgicalYearStart(date).Year() + 1),
}
for _, o := range others {
if o.Temporal {
continue // a superseded ferial/Sunday is not a commemoration
}
day.Others = append(day.Others, o.Cel)
}
return day
}
func colourOf(obs candidate, td temporalDay) Colour {
if obs.Cel.Colour != "" {
return obs.Cel.Colour
}
return td.Colour
}
// celebrationDate resolves a sanctoral celebration's date for the year.
func celebrationDate(cel Celebration, year int, sel Selection) (time.Time, bool) {
return resolveDate(cel.Date, year, Easter(year))
}
// movableCel is a celebration whose date is computed (relative to Easter), not
// read from a fixed-date layer.
type movableCel struct {
when time.Time
cel Celebration
}
// movableMemorialsOF returns the Ordinary Form's two movable Marian memorials,
// which have no fixed calendar date: Mary, Mother of the Church (the Monday after
// Pentecost) and the Immaculate Heart of Mary (the Saturday after the Sacred
// Heart, i.e. easter+69).
func movableMemorialsOF(y int) []movableCel {
e := Easter(y)
mk := func(off int, slug, en, pl string, first, psalm, gospel string) movableCel {
return movableCel{when: e.AddDate(0, 0, off), cel: Celebration{
Slug: slug, Rank: RankMemorial, Class: ClassBVM, Colour: White, Layer: "universal",
Name: map[string]string{"en": en, "pl": pl},
// Proper readings (these memorials have no fixed-date entry to key from).
Masses: []Mass{{Readings: []Reading{
{Part: "first", Citation: first}, {Part: "psalm", Citation: psalm}, {Part: "gospel", Citation: gospel},
}}},
}}
}
return []movableCel{
mk(50, "mary-mother-of-the-church", "Mary, Mother of the Church", "Najświętszej Maryi Panny, Matki Kościoła",
"Genesis 3:9-15,20", "Psalms 87:1-2,3+5,6-7", "John 19:25-34"),
mk(69, "the-immaculate-heart-of-the-blessed-virgin-mary", "The Immaculate Heart of the Blessed Virgin Mary", "Niepokalanego Serca Najświętszej Maryi Panny",
"Isaiah 61:9-11", "1 Samuel 2:1,4-5,6-7,8abcd", "Luke 2:41-51"),
}
}
// 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)
band := precedence(candidate{
Cel: b.Cel, Temporal: true, Privileged: b.Privileged,
PrivFeria: b.PrivFeria, Sunday: b.Sunday, Season: b.Season,
})
if band <= 2 { // impeded by Triduum / a privileged day: push forward
day = day.AddDate(0, 0, 1)
continue
}
return day
}
return day
}
// transferIfImpededEF moves an EF sanctoral feast off a date it cannot be kept
// on. Two rules cover the 1962 cases: All Souls, when Nov 2 is a Sunday, is
// transferred to the Monday (Nov 3); and a I class feast genuinely impeded is
// pushed forward to the next day that is itself neither I nor II class (RG
// 96: "the next following day that is not I or II class"). Lower-rank feasts
// are only commemorated, never transferred (RG 95).
//
// occupiedByClass1 and occupiedByClass1Or2 are deliberately different
// thresholds, not the same check reused twice:
// - a candidate is impeded IN THE FIRST PLACE only by a genuine class-1
// collision -- the temporal office of `when` is itself I class (a Sunday
// of Advent/Lent/Passiontide, Holy Week, a named I-class feast), or
// another FIXED I-class sanctoral feast already sits on `when` (RG
// 97/98). A II-class occupant, temporal or sanctoral, never impedes a
// I-class feast at all -- I class always outranks II class outright, no
// tie-break is even reached -- so using the wider I-OR-II threshold here
// would (and, before this fix, did: e.g. All Saints, 1 Nov, was wrongly
// bumped to 3 Nov merely for landing on an ordinary II-class Sunday it
// would have won outright) send an unimpeded I-class feast on an
// unnecessary walk.
// - once a transfer is under way, the DESTINATION must avoid landing on
// ANY I- or II-class day (RG 96's own wider "not I or II class" text) --
// e.g. the Visitation, 2 July, blocks the Precious Blood's transfer off 1
// July in 2011, and 3 July's ordinary Sunday blocks it a second time.
func transferIfImpededEF(cel Celebration, when time.Time, occupiedByClass1, occupiedByClass1Or2 func(time.Time) bool) time.Time {
if when.Month() == time.November && when.Day() == 2 && when.Weekday() == time.Sunday &&
strings.Contains(cel.Slug, "all-souls") {
return when.AddDate(0, 0, 1)
}
if cel.Rank != RankClass1 {
return when
}
startTemporal := temporalEF(when)
startImpeded := startTemporal.Cel.Rank == RankClass1 || occupiedByClass1(when)
if !startImpeded {
return when
}
day := when.AddDate(0, 0, 1)
for i := 0; i < 30; i++ {
b := temporalEF(day)
band := precedenceEF(candidate{Cel: b.Cel, Temporal: true, Season: b.Season, Sunday: b.Sunday})
if band <= 3 || occupiedByClass1Or2(day) {
day = day.AddDate(0, 0, 1) // still I- or II-class; keep walking
continue
}
return day
}
return day
}
// buildCelebration types a RawCelebration.
func buildCelebration(slug string, rc RawCelebration) Celebration {
c := Celebration{Slug: strings.TrimSpace(slug), Name: map[string]string{}, Layer: rc.Fields["layer"]}
for k, v := range rc.Fields {
switch {
case k == "rank":
c.Rank = ParseRank(v)
case k == "class":
c.Class = ParseClass(v)
case k == "colour":
c.Colour = ParseColour(v)
case k == "date":
c.Date = DateSpec(v)
case strings.HasPrefix(k, "name."):
c.Name[strings.TrimPrefix(k, "name.")] = v
}
}
if c.Rank == "" {
c.Rank = RankFerial
}
if m := massFrom(rc.Fields); len(m.Readings) > 0 {
c.Masses = append(c.Masses, m)
}
var variants []string
for v := range rc.Variants {
variants = append(variants, v)
}
sort.Strings(variants)
for _, v := range variants {
mm := massFrom(rc.Variants[v])
mm.Variant = v
c.Masses = append(c.Masses, mm)
}
return c
}
// BuildCelebrationForTest exposes buildCelebration for cross-package data tests.
func BuildCelebrationForTest(slug string, rc RawCelebration) Celebration {
return buildCelebration(slug, rc)
}
var readingParts = []string{"first", "psalm", "second", "acclamation", "gospel"}
func massFrom(fields map[string]string) Mass {
var m Mass
for _, part := range readingParts {
if cit := fields["reading."+part]; cit != "" {
m.Readings = append(m.Readings, Reading{Part: part, Citation: cit})
}
}
return m
}
// liturgicalYearStart returns the First Sunday of Advent that opened the
// liturgical year containing date.
func liturgicalYearStart(date time.Time) time.Time {
a := adventStart(date.Year())
if date.Before(a) {
return adventStart(date.Year() - 1)
}
return a
}
// sundayCycle: the liturgical year's civil year (Advent year + 1) mod 3 →
// C(0), A(1), B(2).
func sundayCycle(start time.Time) string {
switch (start.Year() + 1) % 3 {
case 0:
return "C"
case 1:
return "A"
default:
return "B"
}
}
// weekdayCycle: odd liturgical-year civil year → I, even → II.
func weekdayCycle(year int) string {
if year%2 == 1 {
return "I"
}
return "II"
}
|