aboutsummaryrefslogtreecommitdiff
path: root/internal/calendar/precedence.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/calendar/precedence.go')
-rw-r--r--internal/calendar/precedence.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/internal/calendar/precedence.go b/internal/calendar/precedence.go
index 7919879..c27c5d3 100644
--- a/internal/calendar/precedence.go
+++ b/internal/calendar/precedence.go
@@ -26,12 +26,12 @@ func precedence(c candidate) int {
return 1
case c.Privileged:
return 2
+ case c.Sunday: // Ordinary/Christmas Sunday (checked before the solemnity-rank fallback)
+ return 6
case c.Cel.Rank == RankSolemnity: // Trinity, Corpus Christi, Sacred Heart, Christ the King
return 3
case c.Cel.Rank == RankFeast: // feasts of the Lord (Baptism, Holy Family)
return 5
- case c.Sunday:
- return 6
case c.PrivFeria:
return 9
default:
@@ -45,10 +45,14 @@ func precedence(c candidate) int {
}
return 3
case RankFeast:
- if proper {
+ switch {
+ case proper:
return 8
+ case c.Cel.Class == ClassLord: // feasts of the Lord in the General Calendar
+ return 5
+ default:
+ return 7
}
- return 7
case RankMemorial:
if proper {
return 11