Merge branch 'engine-precedence-fixes': OF/EF calendar+readings flawlessness pass

Per-day validation vs litcal (OF) and missalemeum (EF) 2005-2050, all defects
fixed and re-validated to zero: OF calendar 0 real errors forward, OF readings
0 unresolvable, EF 0 reading gaps + resumed Sundays correct.

4 files changed, 68 insertions, 59 deletions

diff --git a/internal/caldata/of-lectionary.ini b/internal/caldata/of-lectionary.ini
index 41b68cb..44ca1cb 100644
--- a/internal/caldata/of-lectionary.ini
+++ b/internal/caldata/of-lectionary.ini
@@ -185,7 +185,7 @@ psalm = Psalms 85:9ab+10,11-12,13-14
 gospel = Luke 7:18b-23
 
 [advent-4-fri-I]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5,8-9,10,14
 gospel = Luke 1:57-66
 
@@ -200,7 +200,7 @@ psalm = Psalms 89:1-2,3-4,26,28
 gospel = Luke 1:67-79
 
 [advent-4-mon-II]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5,8-9,10,14
 gospel = Luke 1:57-66
 
@@ -215,7 +215,7 @@ psalm = Psalms 89:1-2,3-4,26,28
 gospel = Luke 1:67-79
 
 [advent-4-thu-II]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5,8-9,10,14
 gospel = Luke 1:57-66
 
@@ -230,7 +230,7 @@ psalm = Psalms 89:1-2,3-4,26,28
 gospel = Luke 1:67-79
 
 [advent-4-wed-I]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5,8-9,10,14
 gospel = Luke 1:57-66
 
@@ -409,7 +409,7 @@ gospel = Luke 11:27-28
 
 [baptism-of-the-lord-A]
 first = Isaiah 42:1-4,6-7
-psalm = Psalms 29:1-2,3ac+4,3b+9b-10*
+psalm = Psalms 29:1-2,3ac+4,3b+9b-10
 second = The Acts 10:34-38
 gospel = Matthew 3:13-17
 
@@ -1272,7 +1272,7 @@ second = Ephesians 3:2-3a,5-6
 gospel = Matthew 2:1-12
 
 [holy-family-A]
-first = Sirach 3:3-7,14-17a-Vg
+first = Sirach 3:3-7,14-17a
 =Sir3:2-6,12-14-Gk
 psalm = Psalms 128:1-2,3,4-5
 second = Colossians 3:12-21
@@ -1441,12 +1441,12 @@ psalm = Psalms 119:1-2,4-5,7-8
 gospel = Matthew 5:43-48
 
 [lent-1-thu-I]
-first = Esther C:12,14-16,23-25
+first = Esther 14:1-13
 psalm = Psalms 138:1-2ab,2cde-3,7c-8
 gospel = Matthew 7:7-12
 
 [lent-1-thu-II]
-first = Esther C:12,14-16,23-25
+first = Esther 14:1-13
 psalm = Psalms 138:1-2ab,2cde-3,7c-8
 gospel = Matthew 7:7-12
 
@@ -1754,91 +1754,91 @@ gospel = Matthew 6:1-6,16-18
 first = Genesis 2:7-9;3:1-7
 psalm = Psalms 51:3-4,5-6,12-13,14+17
 second = Romans 5:12-19
-gospel = Matthew 4:1-11-Temptation
+gospel = Matthew 4:1-11
 
 [lent-sunday-1-B]
 first = Genesis 9:8-15
 psalm = Psalms 25:4-5,6-7,8-9
 second = 1 Peter 3:18-22
-gospel = Mark 1:12-15-Temptation
+gospel = Mark 1:12-15
 
 [lent-sunday-1-C]
 first = Deuteronomy 26:4-10
 psalm = Psalms 91:1-2,10-11,12-13,14-15
 second = Romans 10:8-13
-gospel = Luke 4:1-13-Temptation
+gospel = Luke 4:1-13
 
 [lent-sunday-2-A]
 first = Genesis 12:1-4a
 psalm = Psalms 33:4-5,18-19,20+22
 second = 2 Timothy 1:8b-10
-gospel = Matthew 17:1-9-Transfiguration
+gospel = Matthew 17:1-9
 
 [lent-sunday-2-B]
 first = Genesis 22:1-2,9a,10-13,15-18
 psalm = Psalms 116:10+15,16-17,18-19
 second = Romans 8:31b-34
-gospel = Mark 9:2-10-Transfiguration
+gospel = Mark 9:2-10
 
 [lent-sunday-2-C]
 first = Genesis 15:5-12,17-18
 psalm = Psalms 27:1,7-8a,8b-9,13-14
 second = Philippians 3:17-4:1
-gospel = Luke 9:28b-36-Transfiguration
+gospel = Luke 9:28b-36
 
 [lent-sunday-3-A]
 first = Exodus 17:3-7
 psalm = Psalms 95:1-2,6-7b,7c-9
 second = Romans 5:1-2,5-8
-gospel = John 4:5-42-SamaritanWoman
+gospel = John 4:5-42
 
 [lent-sunday-3-B]
 first = Exodus 20:1-17
 psalm = Psalms 19:8,9,10,11
 second = 1 Corinthians 1:22-25
-gospel = John 2:13-25-IncidentinTemple
+gospel = John 2:13-25
 
 [lent-sunday-3-C]
 first = Exodus 3:1-8a,13-15
 psalm = Psalms 103:1-2,3-4,6-7,8+11
 second = 1 Corinthians 10:1-6,10-12
-gospel = Luke 13:1-9-OnRepentance
+gospel = Luke 13:1-9
 
 [lent-sunday-4-A]
 first = 1 Samuel 16:1b,6-7,10-13a
 psalm = Psalms 23:1-3a,3b-4,5,6
 second = Ephesians 5:8-14
-gospel = John 9:1-41-ManBornBlind
+gospel = John 9:1-41
 
 [lent-sunday-4-B]
 first = 2 Chronicles 36:14-16,19-23
 psalm = Psalms 137:1-2,3,4-5,6
 second = Ephesians 2:4-10
-gospel = John 3:14-21-Jesus&Nicodemus
+gospel = John 3:14-21
 
 [lent-sunday-4-C]
 first = Joshua 5:9a,10-12
 psalm = Psalms 34:2-3,4-5,6-7
 second = 2 Corinthians 5:17-21
-gospel = Luke 15:1-3,11-32-ProdigalFather
+gospel = Luke 15:1-3,11-32
 
 [lent-sunday-5-A]
 first = Ezekiel 37:12-14
 psalm = Psalms 130:1-2,3-4,5-6,7-8
 second = Romans 8:8-11
-gospel = John 11:1-45-RaisingofLazarus
+gospel = John 11:1-45
 
 [lent-sunday-5-B]
 first = Jeremiah 31:31-34
 psalm = Psalms 51:3-4,12-13,14-15
 second = Hebrews 5:7-9
-gospel = John 12:20-33-TheHourHasCome
+gospel = John 12:20-33
 
 [lent-sunday-5-C]
 first = Isaiah 43:16-21
 psalm = Psalms 126:1-2a,2b-3,4-5,6
 second = Philippians 3:8-14
-gospel = John 8:1-11-AdulterousWoman
+gospel = John 8:1-11
 
 [luke-the-evangelist-A]
 first = 2 Timothy 4:10-17
@@ -2147,7 +2147,7 @@ psalm = Psalms 74:1b-2,3-5,6-7,20-21
 gospel = Matthew 8:5-17
 
 [ordinary-12-thu-I]
-first = Genesis 16:1-12,15-16or16:6b-12,15-16
+first = Genesis 16:1-12,15-16
 psalm = Psalms 106:1b-2,3-4a,4b-5
 gospel = Matthew 7:21-29
 
@@ -2489,12 +2489,12 @@ gospel = Matthew 16:24-28
 [ordinary-18-mon-I]
 first = Numbers 11:4b-15
 psalm = Psalms 81:12-13,14-15,16-17
-gospel = Matthew 14:13-21or,inYearA,Matt14:22-36
+gospel = Matthew 14:13-21
 
 [ordinary-18-mon-II]
 first = Jeremiah 28:1-17
 psalm = Psalms 119:29,43,79,80,95,102
-gospel = Matthew 14:13-21or,inYearA,Matt14:22-36
+gospel = Matthew 14:13-21
 
 [ordinary-18-sat-I]
 first = Deuteronomy 6:4-13
@@ -2519,12 +2519,12 @@ gospel = Matthew 16:13-23
 [ordinary-18-tue-I]
 first = Numbers 12:1-13
 psalm = Psalms 51:3-4,5-6ab,6cd-7,12-13
-gospel = Matthew 14:22-36or,inYearA,Matt15:1-2,10-14
+gospel = Matthew 14:22-36
 
 [ordinary-18-tue-II]
 first = Jeremiah 30:1-2,12-15,18-22
 psalm = Psalms 102:16-18,19-21,29+22-23
-gospel = Matthew 14:22-36or,inYearA,Matt15:1-2,10-14
+gospel = Matthew 14:22-36
 
 [ordinary-18-wed-I]
 first = Numbers 13:1-2,25-14:1,26a-29a,34-35
@@ -2542,7 +2542,7 @@ psalm = Psalms 136:1-3,16-18,21-22+24
 gospel = Matthew 19:3-12
 
 [ordinary-19-fri-II]
-first = Ezekiel 16:1-15,60,63or16:59-63
+first = Ezekiel 16:1-15,60,63
 psalm = Isaiah 12:2-3,4bcd,5-6
 gospel = Matthew 19:3-12
 
@@ -2962,7 +2962,7 @@ psalm = Psalms 43:1,2,3,4
 gospel = Luke 9:18-22
 
 [ordinary-25-fri-II]
-first = Ecclesiastes /Qoh3:1-11
+first = Ecclesiastes 3:1-11
 psalm = Psalms 144:1b+2abc,3-4
 gospel = Luke 9:18-22
 
@@ -2977,12 +2977,12 @@ psalm = Psalms 15:2-3a,3bc-4ab,5
 gospel = Luke 8:16-18
 
 [ordinary-25-sat-I]
-first = Zechariah 2:5-9,14-15a
+first = Zechariah 2:1-5,10-11
 psalm = Jeremiah 31:10,11-12ab,13
 gospel = Luke 9:43b-45
 
 [ordinary-25-sat-II]
-first = Ecclesiastes /Qoh11:9-12:8
+first = Ecclesiastes 11:9-12:8
 psalm = Psalms 90:3-4,5-6,12-13,14+17
 gospel = Luke 9:43b-45
 
@@ -2992,7 +2992,7 @@ psalm = Psalms 149:1b-2,3-4,5-6a+9b
 gospel = Luke 9:7-9
 
 [ordinary-25-thu-II]
-first = Ecclesiastes /Qoh1:2-11
+first = Ecclesiastes 1:2-11
 psalm = Psalms 90:3-4,5-6,12-13,14+17bc
 gospel = Luke 9:7-9
 
@@ -3008,7 +3008,7 @@ gospel = Luke 8:19-21
 
 [ordinary-25-wed-I]
 first = Ezra 9:5-9
-psalm = Tobit 13:2,3-4a,6,7,10[Vulg.]
+psalm = Tobit 13:2,3-4a,6,7,10
 gospel = Luke 9:1-6
 
 [ordinary-25-wed-II]
@@ -3097,7 +3097,7 @@ psalm = Psalms 111:1b-2,7-8,9+10c
 gospel = Luke 10:25-37
 
 [ordinary-27-sat-I]
-first = Joel 4:12-21
+first = Joel 3:12-21
 psalm = Psalms 97:1-2,5-6,11-12
 gospel = Luke 11:27-28
 
@@ -3107,7 +3107,7 @@ psalm = Psalms 105:2-3,4-5,6-7
 gospel = Luke 11:27-28
 
 [ordinary-27-thu-I]
-first = Malachi 3:13-20b
+first = Malachi 3:13-18;4:1-2
 psalm = Psalms 1:1-2,3,4+6
 gospel = Luke 11:5-13
 
@@ -3938,7 +3938,7 @@ gospel = Mark 12:1-12
 
 [ordinary-9-sat-I]
 first = Tobit 12:1,5-15,20
-psalm = Tobit 13:2,6,7,10[Vulg.]
+psalm = Tobit 13:2,6,7,10
 gospel = Mark 12:38-44
 
 [ordinary-9-sat-II]
@@ -4427,7 +4427,7 @@ second = Hebrews 10:11-14,18
 gospel = Mark 13:24-32
 
 [ordinary-sunday-33-C]
-first = Malachi 3:19-20a
+first = Malachi 4:1-2
 psalm = Psalms 98:5-6,7-8,9
 second = 2 Thessalonians 3:7-12
 gospel = Luke 21:5-19
@@ -4563,7 +4563,7 @@ gospel = Luke 2:22-32
 
 [sacred-heart-A]
 first = Deuteronomy 7:6-11
-psalm = Psalms 103:1-2,3-4,[6-7,]8+10
+psalm = Psalms 103:1-2,3-4,6-7,8+10
 second = 1 John 4:7-16
 gospel = Matthew 11:25-30
 
@@ -4724,19 +4724,19 @@ gospel = John 18:1-19:42
 
 [triduum-sat-A]
 first = Genesis 1:1-2:2
-psalm = Psalms 118:1-2,16-17,22-2
+psalm = Psalms 118:1-2,16-17,22-23
 second = Genesis 1:1,26-31
 gospel = Mat 28:1-10
 
 [triduum-sat-B]
 first = Genesis 1:1-2:2
-psalm = Psalms 118:1-2,16-17,22-2
+psalm = Psalms 118:1-2,16-17,22-23
 second = Genesis 1:1,26-31
 gospel = Mat 28:1-10
 
 [triduum-sat-C]
 first = Genesis 1:1-2:2
-psalm = Psalms 118:1-2,16-17,22-2
+psalm = Psalms 118:1-2,16-17,22-23
 second = Genesis 1:1,26-31
 gospel = Mat 28:1-10
 
@@ -4912,12 +4912,12 @@ psalm = 1 Samuel 2:1,4-5,6-7,8abcd
 gospel = Luke 1:46-56
 
 [advent-dec-23-I]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5ab,8-9,10+14
 gospel = Luke 1:57-66
 
 [advent-dec-23-II]
-first = Malachi 3:1-4,23-24
+first = Malachi 3:1-4;4:5-6
 psalm = Psalms 25:4-5ab,8-9,10+14
 gospel = Luke 1:57-66
 
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/roman-calendar.ini b/internal/caldata/roman-calendar.ini
index f82224f..02faaaa 100644
--- a/internal/caldata/roman-calendar.ini
+++ b/internal/caldata/roman-calendar.ini
@@ -289,7 +289,7 @@ name.la = S. Casimiri
 
 [saints-perpetua-and-felicity-martyrs]
 date = 03-07
-rank = optional
+rank = memorial
 class = saint
 colour = violet
 name.en = Saints Perpetua and Felicity, martyrs
diff --git a/internal/caldata/tridentine-lectionary.ini b/internal/caldata/tridentine-lectionary.ini
index cef3f2d..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
@@ -472,3 +463,20 @@ 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
+