diff options
Diffstat (limited to 'internal/calendar/calendar.go')
| -rw-r--r-- | internal/calendar/calendar.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/calendar/calendar.go b/internal/calendar/calendar.go index 3465182..98dec43 100644 --- a/internal/calendar/calendar.go +++ b/internal/calendar/calendar.go @@ -26,10 +26,10 @@ func Compute(date time.Time, sel Selection, layers []Layer) LiturgicalDay { } // On band-2 privileged days only solemnities survive (and they transfer); // on Sundays (band 6) only feasts and solemnities compete. - if td.Privileged && cel.Rank < RankSolemnity { + if td.Privileged && ofRankOrder(cel.Rank) < ofRankOrder(RankSolemnity) { continue } - if td.Sunday && cel.Rank < RankFeast { + if td.Sunday && ofRankOrder(cel.Rank) < ofRankOrder(RankFeast) { continue } effective := transferIfImpeded(cel, when, sel) @@ -105,6 +105,9 @@ func buildCelebration(slug string, rc RawCelebration) Celebration { 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) } |