fix(of): correct memorial readings (ferial fallback) + Lord-feast class

Validation vs USCCB (Catholic Readings API) caught two bugs:
- Obligatory memorials were keyed by their own slug, freezing ONE year's ferial
  (a memorial's fixed date lands in a different Ordinary-Time week each year), so
  most weekday memorials showed the wrong week's reading. Now memorials are
  skipped in the harvest and fall back to the day's ferial slug at runtime -> the
  correct week's reading. (Proper-reading memorials show the permitted ferial;
  their propers are a later refinement.)
- gen-sanctoral classOf missed feasts of the Lord whose title says 'Holy Cross'
  (not 'of the Cross') etc., so the Exaltation of the Cross (and Transfiguration,
  Presentation) did not displace an Ordinary Sunday. Fixed the Lord/BVM class
  inference; the Cross now correctly displaces the Sunday and shows its proper.

USCCB agreement on the sampled 2025 window rose to ~92%; residual diffs are
proper-reading memorials (Guardian Angels/Sorrows gospels), citation-granularity
(same reading, different verse range), and week numbering around feast-displaced
Sundays -- documented as known refinements.

2 files changed, 82 insertions, 718 deletions

diff --git a/internal/caldata/of-lectionary.ini b/internal/caldata/of-lectionary.ini
index 64f79e0..b0187d0 100644
--- a/internal/caldata/of-lectionary.ini
+++ b/internal/caldata/of-lectionary.ini
@@ -300,26 +300,6 @@ first = Micah 5:1-4
 psalm = Psalms 80:1ac,2,14-15,17-18
 gospel = Luke 1:39-45
 
-[agatha-virgin-and-martyr-I]
-first = Hebrews 13:1-8
-psalm = Psalms 27:1bcde,3,5,8-9
-gospel = Mark 6:14-29
-
-[agatha-virgin-and-martyr-II]
-first = 2 Samuel 24:2,9-17
-psalm = Psalms 32:1-2,5,6-7
-gospel = Mark 6:1-6
-
-[agnes-virgin-and-martyr-I]
-first = Hebrews 7:25-8:6
-psalm = Psalms 40:6-7,7-9,16
-gospel = Mark 3:7-12
-
-[agnes-virgin-and-martyr-II]
-first = 1 Samuel 16:1-13
-psalm = Psalms 89:19,20-21,26-27
-gospel = Mark 2:23-28
-
 [all-saints-A]
 first = Revelation 7:2-4,9-14
 psalm = Psalms 24:1-2,3-4,5-6
@@ -350,56 +330,6 @@ first = Job 19:1,23-27
 psalm = Psalms 27:1bcde,4,7,8,9,13-14
 gospel = Luke 23:44-46,50,52-53
 
-[aloysius-gonzaga-religious-I]
-first = Genesis 12:1-9
-psalm = Psalms 33:12-13,18-19,20,22
-gospel = Mat 7:1-5
-
-[aloysius-gonzaga-religious-II]
-first = 2 Kings 19:9-11,14-21,31-35,36
-psalm = Psalms 48:1-2,2-3,9-10
-gospel = Mat 7:6,12-14
-
-[alphonsus-maria-de-liguori-bishop-and-doctor-of-the-church-I]
-first = Exodus 33:7-11;34:5-9,28
-psalm = Psalms 103:6-7,8-9,10-11,12-13
-gospel = Mat 13:36-43
-
-[alphonsus-maria-de-liguori-bishop-and-doctor-of-the-church-II]
-first = Jeremiah 26:11-16,24
-psalm = Psalms 69:14-15,29-30,32-33
-gospel = Mat 14:1-12
-
-[ambrose-bishop-and-doctor-I]
-first = Isaiah 35:1-10
-psalm = Psalms 85:8ab,9,10-11,12-13
-gospel = Luke 5:17-26
-
-[ambrose-bishop-and-doctor-II]
-first = Isaiah 40:1-11
-psalm = Psalms 96:1-2,3,10ac,11-12,13
-gospel = Mat 18:12-14
-
-[andrew-dung-lac-and-his-companions-martyrs-I]
-first = Daniel 5:1-6,13-14,16-17,23-28
-psalm = Daniel 3:62,63,64,65,66,67
-gospel = Luke 21:12-19
-
-[andrew-dung-lac-and-his-companions-martyrs-II]
-first = Revelation 14:14-20
-psalm = Psalms 96:10,11-12,13
-gospel = Luke 21:5-11
-
-[andrew-kim-taegon-priest-and-paul-chong-hasang-and-companions-martyrs-I]
-first = Ezra 1:1-6
-psalm = Psalms 126:1-2,2-3,4-5,6
-gospel = Luke 8:16-18
-
-[andrew-kim-taegon-priest-and-paul-chong-hasang-and-companions-martyrs-II]
-first = Proverbs 21:1-6,10-13
-psalm = Psalms 119:1,27,30,34,35,44
-gospel = Luke 8:19-21
-
 [andrew-the-apostle-A]
 first = Isaiah 49:1-6
 psalm = Psalms 19:1-2,3-4
@@ -433,26 +363,6 @@ first = Isaiah 7:10-14;8:10
 psalm = Psalms 40:6-7,7-9,10
 gospel = Luke 1:26-38
 
-[anthony-of-egypt-abbot-I]
-first = Hebrews 6:10-20
-psalm = Psalms 111:1-2,4-5,9,10
-gospel = Mark 2:23-28
-
-[anthony-of-egypt-abbot-II]
-first = 1 Samuel 8:4-7,10-22
-psalm = Psalms 89:15-16,17-18
-gospel = Mark 2:1-12
-
-[anthony-of-padua-priest-and-doctor-I]
-first = 2 Corinthians 1:18-22
-psalm = Psalms 119:129-130,131-132,133,135
-gospel = Mat 5:13-16
-
-[anthony-of-padua-priest-and-doctor-II]
-first = 1 Kings 19:19-21
-psalm = Psalms 16:1-2,5,7-8,9-10
-gospel = Mat 5:33-37
-
 [ascension-A]
 first = Acts 18:1-8
 psalm = Psalms 98:1bcde,2-3,3-4
@@ -483,26 +393,6 @@ first = 1 Chronicles 15:3-4,15-16;16:1-2
 psalm = Psalms 132:6-7,9-10,13-14
 gospel = Luke 11:27-28
 
-[athanasius-bishop-and-doctor-I]
-first = Acts 11:19-26
-psalm = Psalms 87:1-3,4-5,6-7
-gospel = John 10:22-30
-
-[athanasius-bishop-and-doctor-II]
-first = Revelation 11:19;12,1-6,10ab
-psalm = Judith 13:18bcde,19-20
-gospel = John 19:25-27
-
-[augustine-of-hippo-bishop-and-doctor-of-the-church-I]
-first = 1 Thessalonians 4:9-11
-psalm = Psalms 98:1bcde,7-8,9
-gospel = Mat 25:14-30
-
-[augustine-of-hippo-bishop-and-doctor-of-the-church-II]
-first = 1 Corinthians 1:17-25
-psalm = Psalms 33:1-2,4-5,10-11
-gospel = Mat 25:1-13
-
 [baptism-of-the-lord-A]
 first = Isaiah 42:1-4,6-7
 psalm = Psalms 29:1-2,3ac-4,3,9-10
@@ -518,16 +408,6 @@ first = Isaiah 40:1-5,9-11
 psalm = Psalms 104:1-2,3-4,24-25,27-28,29-30
 gospel = Luke 3:15-16.21-22
 
-[barnabas-the-apostle-I]
-first = Acts 11:21-26;13:1-3
-psalm = Psalms 98:1bcde,2-3,3-4,5-6
-gospel = Mat 10:7-13
-
-[barnabas-the-apostle-II]
-first = Acts 11:21-26;13:1-3
-psalm = Psalms 98:1bcde,2-3,3-4,5-6
-gospel = Mat 10:7-13
-
 [bartholomew-the-apostle-A]
 first = Revelation 21:9-14
 psalm = Psalms 145:10-11,12-13,17-18
@@ -543,28 +423,6 @@ first = Revelation 21:9-14
 psalm = Psalms 145:10-11,12-13,17-18
 gospel = John 1:45-51
 
-[benedict-abbot-I]
-first = Proverbs 2:1-9
-psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
-second = Acts 4:32-35
-gospel = Mat 19:27-29
-
-[benedict-abbot-II]
-first = Proverbs 2:1-9
-psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
-second = Acts 4:32-35
-gospel = Mat 19:27-29
-
-[bernard-of-clairvaux-abbot-and-doctor-of-the-church-I]
-first = Ruth 1:1,3-6,14-16,22
-psalm = Psalms 146:5-6,6-7,8-9,9-10
-gospel = Mat 22:34-40
-
-[bernard-of-clairvaux-abbot-and-doctor-of-the-church-II]
-first = Ezekiel 36:23-28
-psalm = Psalms 51:10-11,12-13,16-17
-gospel = Mat 22:1-10
-
 [birth-of-saint-john-the-baptist-A]
 first = Jeremiah 1:4-10
 psalm = Psalms 71:1-2,3-4,5-6ab,15ab,17
@@ -598,46 +456,6 @@ psalm = Psalms 13:6
 second = Romans 8:28-30
 gospel = Mat 1:18-23
 
-[bonaventure-bishop-and-doctor-I]
-first = Exodus 3:13-20
-psalm = Psalms 105:1,5,8-9,24-25,26-27
-gospel = Mat 11:28-30
-
-[bonaventure-bishop-and-doctor-II]
-first = Isaiah 10:5-7,13-16
-psalm = Psalms 94:5-6,7-8,9-10,14-15
-gospel = Mat 11:25-27
-
-[boniface-bishop-and-martyr-I]
-first = Tobit 12:1,5-15,20
-psalm = Tobit 13:2abcde,6,7,8
-gospel = Mark 12:38-44
-
-[boniface-bishop-and-martyr-II]
-first = 2 Timothy 3:10-17
-psalm = Psalms 119:157,160,161,165,166,168
-gospel = Mark 12:35-37
-
-[catherine-of-siena-virgin-and-doctor-of-the-church-I]
-first = 1 John 1:5-2:2
-psalm = Psalms 103:1-2,3-4,8-9,13-14,17-18
-gospel = Mat 11:25-30
-
-[catherine-of-siena-virgin-and-doctor-of-the-church-II]
-first = 1 John 1:5-2:2
-psalm = Psalms 103:1-2,3-4,8-9,13-14,17-18
-gospel = Mat 11:25-30
-
-[cecilia-virgin-and-martyr-I]
-first = Daniel 1:1-6,8-20
-psalm = Daniel 3:52,53-54,55-56
-gospel = Luke 21:1-4
-
-[cecilia-virgin-and-martyr-II]
-first = Revelation 14:14-20
-psalm = Psalms 96:10,11-12,13
-gospel = Luke 21:5-11
-
 [chair-of-saint-peter-apostle-A]
 first = 1 Peter 5:1-4
 psalm = Psalms 23:1-3,3-4,5,6
@@ -653,16 +471,6 @@ first = 1 Peter 5:1-4
 psalm = Psalms 23:1-3,3-4,5,6
 gospel = Mat 16:13-19
 
-[charles-borromeo-bishop-I]
-first = Romans 14:7-12
-psalm = Psalms 27:1bcde,4,13-14
-gospel = Luke 15:1-10
-
-[charles-borromeo-bishop-II]
-first = Philippians 2:12-18
-psalm = Psalms 27:1bcde,4,13-14
-gospel = Luke 14:25-33
-
 [christ-the-king-A]
 first = Ezekiel 34:11-12,15-17
 psalm = Psalms 23:1-2,2-3,5,6
@@ -823,16 +631,6 @@ first = 1 John 4:7-10
 psalm = Psalms 72:1-2,3-4,7-8
 gospel = Mark 6:34-44
 
-[clare-virgin-I]
-first = Deuteronomy 34:1-12
-psalm = Psalms 66:1-3,5,8,16-17
-gospel = Mat 18:15-20
-
-[clare-virgin-II]
-first = Ezekiel 2:8-3:4
-psalm = Psalms 119:14,24,72,103,111,131
-gospel = Mat 18:1-5,10,12-14
-
 [corpus-christi-A]
 first = Deuteronomy 8:2-3,14-16
 psalm = Psalms 147B:12-13,14-15,19-20
@@ -863,16 +661,6 @@ first = Ezekiel 47:1-2,8-9,12
 psalm = Psalms 46:1-2,4-5,7-8
 gospel = John 2:13-22
 
-[dominic-priest-I]
-first = Numbers 12:1-13
-psalm = Psalms 51:1-2,3-4,4-5,10-11
-gospel = Mat 15:1-2,10-14
-
-[dominic-priest-II]
-first = Habakkuk 1:12-2:4
-psalm = Psalms 9:8-9,10-11,12-13
-gospel = Mat 17:14-20
-
 [easter-2-fri-I]
 first = Acts 5:34-42
 psalm = Psalms 27:1bcde,4,13-14
@@ -1414,16 +1202,6 @@ first = Acts 10:34,37-43
 psalm = Psalms 118:1-2,16-17,22-23
 gospel = Luke 24:13-35
 
-[elizabeth-of-hungary-religious-I]
-first = 2 Maccabees 7:1,20-31
-psalm = Psalms 17:1bcd,5-6,8,15
-gospel = Luke 19:11-28
-
-[elizabeth-of-hungary-religious-II]
-first = Revelation 3:1-6,14-22
-psalm = Psalms 15:1-2,3,4,4-5
-gospel = Luke 19:1-10
-
 [epiphany-A]
 first = Isaiah 60:1-6
 psalm = Psalms 72:1-2,7-8,10-11,12-13
@@ -1439,56 +1217,6 @@ first = Isaiah 60:1-6
 psalm = Psalms 72:1-2,7-8,10-11,12-13
 gospel = Mat 2:1-12
 
-[francis-de-sales-bishop-and-doctor-I]
-first = Hebrews 10:1-10
-psalm = Psalms 40:1ab,3ab,6-7,9,10
-gospel = Mark 3:31-35
-
-[francis-de-sales-bishop-and-doctor-II]
-first = 1 Samuel 24:3-21
-psalm = Psalms 57:1,2-3,5,10
-gospel = Mark 3:13-19
-
-[francis-of-assisi-I]
-first = Jonah 1:1-2:1,11
-psalm = Jonah 2:3,4,5,8
-gospel = Luke 10:25-37
-
-[francis-of-assisi-II]
-first = Galatians 1:13-24
-psalm = Psalms 139:1-3,13-14,14-15
-gospel = Luke 10:38-42
-
-[francis-xavier-priest-I]
-first = Isaiah 26:1-6
-psalm = Psalms 118:1bc,8-9,19-20,21,25,26-27
-gospel = Mat 7:21,24-27
-
-[francis-xavier-priest-II]
-first = Isaiah 29:17-24
-psalm = Psalms 27:1bcde,4,13-14
-gospel = Mat 9:27-31
-
-[gregory-the-great-pope-and-doctor-I]
-first = Colossians 1:15-20
-psalm = Psalms 100:2-3,4-5
-gospel = Luke 5:33-39
-
-[gregory-the-great-pope-and-doctor-II]
-first = 1 Corinthians 3:18-23
-psalm = Psalms 24:1-2,3-4,5-6
-gospel = Luke 5:1-11
-
-[guardian-angels-I]
-first = Exodus 23:20-23
-psalm = Psalms 91:1-2,3-4,5-6,10-11
-gospel = Mat 18:1-5,10
-
-[guardian-angels-II]
-first = Exodus 23:20-23
-psalm = Psalms 91:1-2,3-4,5-6,10-11
-gospel = Mat 18:1-5,10
-
 [holy-family-A]
 first = Sirach 3:2-6,12-14
 psalm = Psalms 128:1-2,3,4-5
@@ -1549,26 +1277,6 @@ first = Isaiah 50:4-9
 psalm = Psalms 69:7-9,20-21,30,32-33
 gospel = Mat 26:14-25
 
-[ignatius-of-antioch-bishop-and-martyr-I]
-first = Romans 1:16-25
-psalm = Psalms 19:1-2,3-4
-gospel = Luke 11:37-41
-
-[ignatius-of-antioch-bishop-and-martyr-II]
-first = Ephesians 1:15-23
-psalm = Psalms 8:1,2,3-4,5-6
-gospel = Luke 12:8-12
-
-[ignatius-of-loyola-priest-I]
-first = Leviticus 25:1,8-17
-psalm = Psalms 67:1-2,3-4,6-7
-gospel = Mat 14:1-12
-
-[ignatius-of-loyola-priest-II]
-first = Jeremiah 26:1-9
-psalm = Psalms 69:4,7-9,13
-gospel = Mat 13:54-58
-
 [immaculate-conception-of-the-blessed-virgin-mary-A]
 first = Genesis 3:9-15,20
 psalm = Psalms 98:1bcde,2-3,3-4
@@ -1599,56 +1307,6 @@ first = 2 Corinthians 4:7-15
 psalm = Psalms 126:1-2,2-3,4-5,6
 gospel = Mat 20:20-28
 
-[jean-vianney-the-cure-of-ars-priest-I]
-first = Numbers 13:1-2,25-14:1,26-30,34-35
-psalm = Psalms 106:6-7,13-14,21-22,23
-gospel = Mat 15:21-28
-
-[jean-vianney-the-cure-of-ars-priest-II]
-first = Jeremiah 30:1-2,12-15,18-22
-psalm = Psalms 102:15-16,17-18,19-20,28,21-22
-gospel = Mat 15:1-2,10-14
-
-[jerome-priest-and-doctor-I]
-first = Nehemiah 8:1-4,5-6,7-12
-psalm = Psalms 19:7-8,9-10
-gospel = Luke 10:1-12
-
-[jerome-priest-and-doctor-II]
-first = Job 9:1-12,14-16
-psalm = Psalms 88:9-10,11-12,13-14
-gospel = Luke 9:57-62
-
-[john-bosco-priest-I]
-first = Hebrews 12:1-4
-psalm = Psalms 22:25-26,27,29ab,29-31
-gospel = Mark 5:21-43
-
-[john-bosco-priest-II]
-first = 2 Samuel 11:1-4,5-10,13-17
-psalm = Psalms 51:1-2,3-4,4-5,8-9
-gospel = Mark 4:26-34
-
-[john-chrysostom-bishop-and-doctor-I]
-first = 1 Timothy 2:1-8
-psalm = Psalms 28:2,7,8-9
-gospel = Luke 7:1-10
-
-[john-chrysostom-bishop-and-doctor-II]
-first = 1 Corinthians 12:12-14,27-31
-psalm = Psalms 100:2-3,4-5
-gospel = Luke 7:11-17
-
-[john-of-the-cross-priest-and-doctor-I]
-first = Numbers 24:2-7,15-17
-psalm = Psalms 25:4-5,6,7bc,8-9
-gospel = Mat 21:23-27
-
-[john-of-the-cross-priest-and-doctor-II]
-first = Zephaniah 3:1-2,9-13
-psalm = Psalms 34:1-2,5-6,16-17,18,22
-gospel = Mat 21:28-32
-
 [john-the-apostle-and-evangelist-A]
 first = 1 John 1:1-4
 psalm = Psalms 97:1-2,5-6,11-12
@@ -1664,16 +1322,6 @@ first = 1 John 1:1-4
 psalm = Psalms 97:1-2,5-6,11-12
 gospel = John 20:2-8
 
-[josaphat-bishop-and-martyr-I]
-first = Wisdom 13:1-9
-psalm = Psalms 19:1-2,3-4
-gospel = Luke 17:26-37
-
-[josaphat-bishop-and-martyr-II]
-first = Philemon 7-20
-psalm = Psalms 146:6-7,8-9,9-10
-gospel = Luke 17:20-25
-
 [joseph-husband-of-the-blessed-virgin-mary-A]
 first = 2 Samuel 7:4-5,12-14,16
 psalm = Psalms 89:1-2,3-4,26,28
@@ -1689,17 +1337,6 @@ first = 2 Samuel 7:4-5,12-14,16
 psalm = Psalms 89:1-2,3-4,26,28
 gospel = Luke 2:41-51
 
-[justin-martyr-I]
-first = Tobit 2:9-14
-psalm = Psalms 112:1-2,7-8,9
-gospel = Mark 12:13-17
-
-[justin-martyr-II]
-first = Genesis 3:9-15,20
-psalm = Psalms 87:1-3,5-7
-second = Acts 1:12-14
-gospel = John 19:25-34
-
 [lawrence-deacon-and-martyr-A]
 first = 2 Corinthians 9:6-10
 psalm = Psalms 112:1-2,5-6,7-8,9
@@ -2135,26 +1772,6 @@ first = Isaiah 43:16-21
 psalm = Psalms 126:1-2,2-3,4-5,6
 gospel = John 8:1-11
 
-[leo-the-great-pope-and-doctor-I]
-first = Wisdom 6:1-11
-psalm = Psalms 82:3-4,6-7
-gospel = Luke 17:11-19
-
-[leo-the-great-pope-and-doctor-II]
-first = Titus 2:1-8,11-14
-psalm = Psalms 37:3-4,18,23,27,29
-gospel = Luke 17:7-10
-
-[lucy-of-syracuse-virgin-and-martyr-I]
-first = Zephaniah 3:1-2,9-13
-psalm = Psalms 34:1-2,5-6,16-17,18,22
-gospel = Mat 21:28-32
-
-[lucy-of-syracuse-virgin-and-martyr-II]
-first = Numbers 24:2-7,15-17
-psalm = Psalms 25:4-5,6,7bc,8-9
-gospel = Mat 21:23-27
-
 [luke-the-evangelist-A]
 first = 2 Timothy 4:10-17
 psalm = Psalms 145:10-11,12-13,17-18
@@ -2185,26 +1802,6 @@ first = 1 Peter 5:5-14
 psalm = Psalms 89:1-2,5-6,15-16
 gospel = Mark 16:15-20
 
-[martha-I]
-first = 1 John 4:7-16
-psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
-gospel = Luke 10:38-42
-
-[martha-II]
-first = 1 John 4:7-16
-psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
-gospel = Luke 10:38-42
-
-[martin-of-tours-bishop-I]
-first = Wisdom 7:22-8:1
-psalm = Psalms 119:89-90,91,130,135,175
-gospel = Luke 17:20-25
-
-[martin-of-tours-bishop-II]
-first = Titus 3:1-7
-psalm = Psalms 23:1-3,3-4,5,6
-gospel = Luke 17:11-19
-
 [mary-magdalene-A]
 first = Song of Solomon 8:6-7
 psalm = Psalms 63:1,2-3,4-5,7-8
@@ -2238,16 +1835,6 @@ first = Numbers 6:22-27
 psalm = Psalms 67:1-2,4,7
 gospel = Luke 2:16-21
 
-[mary-mother-of-the-church-I]
-first = 2 Corinthians 3:4-11
-psalm = Psalms 99:5-6,7-8,9
-gospel = Mat 5:17-19
-
-[mary-mother-of-the-church-II]
-first = 1 Kings 17:7-16
-psalm = Psalms 4:1,2-3,3-4,6-7
-gospel = Mat 5:13-16
-
 [matthew-the-evangelist-apostle-evangelist-A]
 first = Ephesians 4:1-7,11-13
 psalm = Psalms 19:1-2,3-4
@@ -2278,27 +1865,6 @@ first = Acts 1:15-17,20-26
 psalm = Psalms 113:1-2,3-4,5-6,7-8
 gospel = John 15:9-17
 
-[maximilian-mary-kolbe-priest-and-martyr-I]
-first = Wisdom 3:1-9
-psalm = Psalms 116B(115):10-11,12-13,16-17
-gospel = John 15:9-17
-
-[maximilian-mary-kolbe-priest-and-martyr-II]
-first = Ezekiel 16:1-15,60,63
-psalm = Isaiah 12:2,3,4bcd,5-6
-second = Ezekiel 16:59-63
-gospel = Mat 19:3-12
-
-[monica-I]
-first = 1 Thessalonians 4:1-8
-psalm = Psalms 97:1,2,5-6,10,11-12
-gospel = Mat 25:1-13
-
-[monica-II]
-first = 1 Corinthians 1:1-9
-psalm = Psalms 145:2-3,4-5,6-7
-gospel = Mat 24:42-51
-
 [ordinary-1-fri-I]
 first = Hebrews 4:1-5,11
 psalm = Psalms 78:3,4bc,6-7,8
@@ -4664,26 +4230,6 @@ first = Deuteronomy 5:12-15
 psalm = Psalms 81:2-3,4-5,5-7,9-10
 gospel = Mark 2:23-28
 
-[our-lady-of-sorrows-I]
-first = Hebrews 5:7-9
-psalm = Psalms 31:1-2,2-3,4-5,14-15,19
-gospel = Luke 2:33-35
-
-[our-lady-of-sorrows-II]
-first = Hebrews 5:7-9
-psalm = Psalms 31:1-2,2-3,4-5,14-15,19
-gospel = Luke 2:33-35
-
-[our-lady-of-the-rosary-I]
-first = Malachi 3:13-20
-psalm = Psalms 1:1-2,3,4,6
-gospel = Luke 11:5-13
-
-[our-lady-of-the-rosary-II]
-first = Galatians 2:1-2,7-14
-psalm = Psalms 117:1-2
-gospel = Luke 11:1-4
-
 [palm-sunday-A]
 first = Isaiah 50:4-7
 psalm = Psalms 22:7-8,16-17,18-19,22-23
@@ -4714,46 +4260,6 @@ first = Genesis 11:1-9
 psalm = Psalms 104:1-2,24,35,27-28,29-30
 gospel = John 7:37-39
 
-[philip-neri-priest-I]
-first = Sirach 36:1,4-5,10-17
-psalm = Psalms 79:5,8,9,11,13
-gospel = Mark 10:32-45
-
-[philip-neri-priest-II]
-first = Acts 20:17-27
-psalm = Psalms 68:9-10,19-20
-gospel = John 17:1-11
-
-[pio-of-pietrelcina-padre-pio-priest-I]
-first = Haggai 1:1-8
-psalm = Psalms 149:1-2,3-4,5-6,9
-gospel = Luke 9:7-9
-
-[pio-of-pietrelcina-padre-pio-priest-II]
-first = Proverbs 30:5-9
-psalm = Psalms 119:29,72,89,101,104,163
-gospel = Luke 9:1-6
-
-[pius-x-pope-I]
-first = Ruth 2:1-3,8-11;4:13-17
-psalm = Psalms 128:1-2,3,4-5
-gospel = Mat 23:1-12
-
-[pius-x-pope-II]
-first = Ezekiel 37:1-14
-psalm = Psalms 107:2-3,4-5,6-7,8-9
-gospel = Mat 22:34-40
-
-[presentation-of-the-blessed-virgin-mary-I]
-first = 2 Maccabees 6:18-31
-psalm = Psalms 3:1-2,3-4,5-6
-gospel = Luke 19:1-10
-
-[presentation-of-the-blessed-virgin-mary-II]
-first = Revelation 11:4-12
-psalm = Psalms 144:1-2,9-10
-gospel = Luke 20:27-40
-
 [presentation-of-the-lord-A]
 first = Malachi 3:1-4
 psalm = Psalms 24:7-8,9-10
@@ -4769,16 +4275,6 @@ first = Malachi 3:1-4
 psalm = Psalms 24:7-8,9-10
 gospel = Luke 2:22-32
 
-[queenship-of-blessed-virgin-mary-I]
-first = Judges 6:11-24
-psalm = Psalms 85:8,10-11,12-13
-gospel = Mat 19:23-30
-
-[queenship-of-blessed-virgin-mary-II]
-first = Ezekiel 43:1-7
-psalm = Psalms 85:8ab,9,10-11,12-13
-gospel = Mat 23:1-12
-
 [sacred-heart-A]
 first = Deuteronomy 7:6-11
 psalm = Psalms 103:1-2,3-4,6-7,8,10
@@ -4794,57 +4290,6 @@ first = Ezekiel 34:11-16
 psalm = Psalms 23:1-3,3-4,5,6
 gospel = Luke 15:3-7
 
-[saints-basil-the-great-and-gregory-nazianzen-bishops-and-doctors-I]
-first = 1 John 2:22-28
-psalm = Psalms 98:1bcde,2-3,3-4
-gospel = John 1:19-28
-
-[saints-basil-the-great-and-gregory-nazianzen-bishops-and-doctors-II]
-first = 1 John 2:22-28
-psalm = Psalms 98:1bcde,2-3,3-4
-gospel = John 1:19-28
-
-[saints-charles-lwanga-and-companions-martyrs-I]
-first = Sirach 51:12-20
-psalm = Psalms 19:7-8,9-10
-gospel = Mark 11:27-33
-
-[saints-charles-lwanga-and-companions-martyrs-II]
-first = 2 Timothy 1:1-3,6-12
-psalm = Psalms 123:1-2
-gospel = Mark 12:18-27
-
-[saints-cornelius-pope-and-cyprian-bishop-martyrs-I]
-first = 1 Timothy 4:12-16
-psalm = Psalms 111:7-8,9,10
-gospel = Luke 7:36-50
-
-[saints-cornelius-pope-and-cyprian-bishop-martyrs-II]
-first = 1 Corinthians 12:31-13:13
-psalm = Psalms 33:2-3,4-5,12,22
-second = 1 Corinthians 13:4-13
-gospel = Luke 7:31-35
-
-[saints-cyril-monk-and-methodius-bishop-I]
-first = Acts 13:46-49
-psalm = Psalms 117:1-2
-gospel = Luke 10:1-9
-
-[saints-cyril-monk-and-methodius-bishop-II]
-first = Acts 13:46-49
-psalm = Psalms 117:1-2
-gospel = Luke 10:1-9
-
-[saints-joachim-and-anne-I]
-first = Exodus 32:15-24,30-34
-psalm = Psalms 106:19-20,21-22,23
-gospel = Mat 13:31-35
-
-[saints-joachim-and-anne-II]
-first = Jeremiah 14:17-22
-psalm = Psalms 79:5,8,9,11,13
-gospel = Mat 13:36-43
-
 [saints-michael-gabriel-and-raphael-archangels-A]
 first = Daniel 7:9-10,13-14
 psalm = Psalms 138:1-2,2-3,4-5
@@ -4863,16 +4308,6 @@ psalm = Psalms 138:1-2,2-3,4-5
 second = Revelation 12:7-12
 gospel = John 1:47-51
 
-[saints-paul-miki-and-companions-martyrs-I]
-first = Hebrews 13:15-17,20-21
-psalm = Psalms 23:1-3,3-4,5,6
-gospel = Mark 6:30-34
-
-[saints-paul-miki-and-companions-martyrs-II]
-first = 1 Kings 2:1-4,10-12
-psalm = 1 Chronicles 29:10-11,11-12
-gospel = Mark 6:7-13
-
 [saints-peter-and-paul-apostles-A]
 first = Acts 3:1-10
 psalm = Psalms 19:1-2,3-4
@@ -4903,27 +4338,6 @@ first = Revelation 11:19;12,1-6,10ab
 psalm = Judith 13:18bcde,19-20
 gospel = John 19:25-27
 
-[saints-timothy-and-titus-bishops-I]
-first = Hebrews 10:1-10
-psalm = Psalms 40:1ab,3ab,6-7,9,10
-gospel = Mark 3:31-35
-
-[saints-timothy-and-titus-bishops-II]
-first = 2 Timothy 1:1-8
-psalm = Psalms 96:1-2,2-3,7-8,10
-second = Titus 1:1-5
-gospel = Luke 10:1-9
-
-[scholastica-virgin-I]
-first = Genesis 2:4-9,15-17
-psalm = Psalms 104:1-2,27-28,29-30
-gospel = Mark 7:14-23
-
-[scholastica-virgin-II]
-first = 1 Kings 8:1-7,9-13
-psalm = Psalms 132:6-7,9-10
-gospel = Mark 6:53-56
-
 [simon-and-saint-jude-apostles-A]
 first = Ephesians 2:19-22
 psalm = Psalms 19:1-2,3-4
@@ -4954,26 +4368,6 @@ first = Acts 6:8-10;7:54-60
 psalm = Psalms 31:2-3,5,7ab,15-16
 gospel = Mat 10:17-22
 
-[teresa-of-jesus-virgin-and-doctor-I]
-first = Romans 4:1-8
-psalm = Psalms 32:1-2,5,11
-gospel = Luke 12:1-7
-
-[teresa-of-jesus-virgin-and-doctor-II]
-first = Ephesians 1:1-10
-psalm = Psalms 98:1bcde,2-3,3-4,5-6
-gospel = Luke 11:47-54
-
-[the-beheading-of-saint-john-the-baptist-martyr-I]
-first = Jeremiah 1:17-19
-psalm = Psalms 71:1-2,3-4,5-6,15ab,17
-gospel = Mark 6:17-29
-
-[the-beheading-of-saint-john-the-baptist-martyr-II]
-first = Jeremiah 1:17-19
-psalm = Psalms 71:1-2,3-4,5-6,15ab,17
-gospel = Mark 6:17-29
-
 [the-conversion-of-saint-paul-apostle-A]
 first = Acts 22:3-16
 psalm = Psalms 117:1-2
@@ -4992,26 +4386,6 @@ psalm = Psalms 117:1-2
 second = Acts 9:1-22
 gospel = Mark 16:15-18
 
-[therese-of-the-child-jesus-virgin-and-doctor-I]
-first = Baruch 1:15-22
-psalm = Psalms 79:1-2,3-4,5,8,9
-gospel = Luke 10:13-16
-
-[therese-of-the-child-jesus-virgin-and-doctor-II]
-first = Job 19:21-27
-psalm = Psalms 27:7-8,8-9,13-14
-gospel = Luke 10:1-12
-
-[thomas-aquinas-priest-and-doctor-I]
-first = Hebrews 10:19-25
-psalm = Psalms 24:1-2,3-4,5-6
-gospel = Mark 4:21-25
-
-[thomas-aquinas-priest-and-doctor-II]
-first = 2 Samuel 6:12-15,17-19
-psalm = Psalms 24:7-8,9-10
-gospel = Mark 3:31-35
-
 [thomas-the-apostle-A]
 first = Ephesians 2:19-22
 psalm = Psalms 117:1-2
@@ -5125,16 +4499,6 @@ psalm = Psalms 78:1-2,34-35,36-37,38
 second = Philippians 2:6-11
 gospel = John 3:13-17
 
-[vincent-de-paul-priest-I]
-first = Zechariah 8:1-8
-psalm = Psalms 102:15-16,17-18,19-20,28,21-22
-gospel = Luke 9:46-50
-
-[vincent-de-paul-priest-II]
-first = Job 3:1-3,11-17,20-23
-psalm = Psalms 88:1-2,3-4,5,6-7
-gospel = Luke 9:51-56
-
 [visitation-of-the-blessed-virgin-mary-A]
 first = Zephaniah 3:14-17
 psalm = Isaiah 12:2,3,4bcd,5-6
diff --git a/internal/caldata/roman-calendar.ini b/internal/caldata/roman-calendar.ini
index 733056c..8804612 100644
--- a/internal/caldata/roman-calendar.ini
+++ b/internal/caldata/roman-calendar.ini
@@ -31,7 +31,7 @@ name.la = Ss. Basilii et Gregorii Nazianzeni, episcoporum et Ecclesiae doctorum
 [the-most-holy-name-of-jesus]
 date = 01-03
 rank = optional
-class = saint
+class = lord
 colour = white
 name.en = The Most Holy Name of Jesus
 name.la = Ss.mi Nominis Iesu
@@ -69,21 +69,21 @@ colour = white
 name.en = The Memorial of the Blessed Virgin Mary on Saturday
 name.la = The Memorial of the Blessed Virgin Mary on Saturday
 
-[fabian-pope-and-martyr]
+[sebastian-martyr]
 date = 01-20
 rank = optional
 class = saint
 colour = red
-name.en = Saint Fabian, pope and martyr
-name.la = S. Fabiani, papae et martyris
+name.en = Saint Sebastian, martyr
+name.la = S. Sebastiani, martyris
 
-[sebastian-martyr]
+[fabian-pope-and-martyr]
 date = 01-20
 rank = optional
 class = saint
 colour = red
-name.en = Saint Sebastian, martyr
-name.la = S. Sebastiani, martyris
+name.en = Saint Fabian, pope and martyr
+name.la = S. Fabiani, papae et martyris
 
 [agnes-virgin-and-martyr]
 date = 01-21
@@ -163,14 +163,6 @@ name.en = Presentation of the Lord
 name.pl = Ofiarowania Pańskiego
 name.la = IN PRAESENTATIONE DOMINI
 
-[blase-bishop-and-martyr]
-date = 02-03
-rank = optional
-class = saint
-colour = red
-name.en = Saint Blase, bishop and martyr
-name.la = S. Blasii, episcopi et martyris
-
 [ansgar-bishop]
 date = 02-03
 rank = optional
@@ -179,6 +171,14 @@ colour = white
 name.en = Saint Ansgar, bishop
 name.la = S. Ansgarii, episcopi
 
+[blase-bishop-and-martyr]
+date = 02-03
+rank = optional
+class = saint
+colour = red
+name.en = Saint Blase, bishop and martyr
+name.la = S. Blasii, episcopi et martyris
+
 [agatha-virgin-and-martyr]
 date = 02-05
 rank = memorial
@@ -197,21 +197,21 @@ name.en = Saints Paul Miki and companions, martyrs
 name.pl = świętych męczenników Pawła Miki i Towarzyszy
 name.la = Ss. Pauli Miki et sociorum, martyrum
 
-[josephine-bakhita-virgin]
+[jerome-emiliani-priest]
 date = 02-08
 rank = optional
 class = saint
 colour = white
-name.en = Saint Josephine Bakhita, virgin
-name.la = S. Iosephinae Bakhita, virginis
+name.en = Saint Jerome Emiliani, priest
+name.la = S. Hieronymi Emiliani
 
-[jerome-emiliani-priest]
+[josephine-bakhita-virgin]
 date = 02-08
 rank = optional
 class = saint
 colour = white
-name.en = Saint Jerome Emiliani, priest
-name.la = S. Hieronymi Emiliani
+name.en = Saint Josephine Bakhita, virgin
+name.la = S. Iosephinae Bakhita, virginis
 
 [scholastica-virgin]
 date = 02-10
@@ -314,21 +314,21 @@ colour = white
 name.en = Saint Anselm of Canterbury, bishop and doctor of the Church
 name.la = S. Anselmi, episcopi et Ecclesiae doctoris
 
-[adalbert-bishop-and-martyr]
+[george-martyr]
 date = 04-23
 rank = optional
 class = saint
 colour = red
-name.en = Saint Adalbert, bishop and martyr
-name.la = S. Adalberti, episcopi et martyris
+name.en = Saint George, martyr
+name.la = S. Georgii, martyris
 
-[george-martyr]
+[adalbert-bishop-and-martyr]
 date = 04-23
 rank = optional
 class = saint
 colour = red
-name.en = Saint George, martyr
-name.la = S. Georgii, martyris
+name.en = Saint Adalbert, bishop and martyr
+name.la = S. Adalberti, episcopi et martyris
 
 [fidelis-of-sigmaringen-priest-and-martyr]
 date = 04-24
@@ -346,14 +346,6 @@ colour = red
 name.en = Saint Mark the Evangelist
 name.la = S. Marci, evangelistae
 
-[louis-grignon-de-montfort-priest]
-date = 04-28
-rank = optional
-class = saint
-colour = white
-name.en = Saint Louis Grignon de Montfort, priest
-name.la = S. Ludovici Mariae Grignion de Montfort, presbyteri
-
 [peter-chanel-priest-and-martyr]
 date = 04-28
 rank = optional
@@ -362,6 +354,14 @@ colour = red
 name.en = Saint Peter Chanel, priest and martyr
 name.la = S. Petri Chanel, presbyteri et martyris
 
+[louis-grignon-de-montfort-priest]
+date = 04-28
+rank = optional
+class = saint
+colour = white
+name.en = Saint Louis Grignon de Montfort, priest
+name.la = S. Ludovici Mariae Grignion de Montfort, presbyteri
+
 [catherine-of-siena-virgin-and-doctor-of-the-church]
 date = 04-29
 rank = memorial
@@ -470,6 +470,14 @@ colour = white
 name.en = Saint Rita of Cascia
 name.la = S. Ritae de Cascia, religiosae
 
+[bede-the-venerable-priest-and-doctor]
+date = 05-25
+rank = optional
+class = saint
+colour = white
+name.en = Saint Bede the Venerable, priest and doctor
+name.la = S. Bedae Venerabilis, presbyteri et Ecclesiae doctoris
+
 [gregory-vii-pope]
 date = 05-25
 rank = optional
@@ -486,14 +494,6 @@ colour = white
 name.en = Saint Mary Magdalene de Pazzi, virgin
 name.la = S. Mariae Magdalenae de' Pazzi, virginis
 
-[bede-the-venerable-priest-and-doctor]
-date = 05-25
-rank = optional
-class = saint
-colour = white
-name.en = Saint Bede the Venerable, priest and doctor
-name.la = S. Bedae Venerabilis, presbyteri et Ecclesiae doctoris
-
 [philip-neri-priest]
 date = 05-26
 rank = memorial
@@ -656,14 +656,6 @@ colour = white
 name.en = Saint Cyril of Alexandria, bishop and doctor
 name.la = S. Cyrilli Alexandrini, episcopi et Ecclesiae doctoris
 
-[irenaeus-bishop-and-martyr]
-date = 06-28
-rank = optional
-class = saint
-colour = red
-name.en = Saint Irenaeus, bishop and martyr
-name.la = S. Irenaei, episcopi et martyris
-
 [the-immaculate-heart-of-mary]
 date = 06-28
 rank = optional
@@ -672,6 +664,14 @@ colour = white
 name.en = The Immaculate Heart of Mary
 name.la = The Immaculate Heart of Mary
 
+[irenaeus-bishop-and-martyr]
+date = 06-28
+rank = optional
+class = saint
+colour = red
+name.en = Saint Irenaeus, bishop and martyr
+name.la = S. Irenaei, episcopi et martyris
+
 [saints-peter-and-paul-apostles]
 date = 06-29
 rank = solemnity
@@ -866,21 +866,21 @@ name.en = Saint Alphonsus Maria de Liguori, bishop and doctor of the Church
 name.pl = św. Alfonsa Marii Liguoriego, biskupa i doktora Kościoła
 name.la = S. Alfonsi Mariae de' Liguori, episcopi et Ecclesiae doctoris
 
-[peter-julian-eymard-priest]
+[eusebius-of-vercelli-bishop]
 date = 08-02
 rank = optional
 class = saint
 colour = white
-name.en = Saint Peter Julian Eymard, priest
-name.la = S. Petri Iuliani Eymard, presbyteri
+name.en = Saint Eusebius of Vercelli, bishop
+name.la = S. Eusebii Vercellensis, episcopi
 
-[eusebius-of-vercelli-bishop]
+[peter-julian-eymard-priest]
 date = 08-02
 rank = optional
 class = saint
 colour = white
-name.en = Saint Eusebius of Vercelli, bishop
-name.la = S. Eusebii Vercellensis, episcopi
+name.en = Saint Peter Julian Eymard, priest
+name.la = S. Petri Iuliani Eymard, presbyteri
 
 [jean-vianney-the-cure-of-ars-priest]
 date = 08-04
@@ -908,14 +908,6 @@ name.en = Transfiguration of the Lord
 name.pl = Przemienienia Pańskiego
 name.la = IN TRANSFIGURATIONE DOMINI
 
-[sixtus-ii-pope-and-companions-martyrs]
-date = 08-07
-rank = optional
-class = saint
-colour = red
-name.en = Saint Sixtus II, pope, and companions, martyrs
-name.la = Ss. Xysti, papae, et sociorum, martyrum
-
 [cajetan-priest]
 date = 08-07
 rank = optional
@@ -924,6 +916,14 @@ colour = white
 name.en = Saint Cajetan, priest
 name.la = S. Caietani, presbyteri
 
+[sixtus-ii-pope-and-companions-martyrs]
+date = 08-07
+rank = optional
+class = saint
+colour = red
+name.en = Saint Sixtus II, pope, and companions, martyrs
+name.la = Ss. Xysti, papae, et sociorum, martyrum
+
 [dominic-priest]
 date = 08-08
 rank = memorial
@@ -936,7 +936,7 @@ name.la = S. Dominici, presbyteri
 [teresa-benedicta-of-the-cross-edith-stein-virgin-and-martyr]
 date = 08-09
 rank = optional
-class = lord
+class = saint
 colour = red
 name.en = Saint Teresa Benedicta of the Cross (Edith Stein), virgin and martyr
 name.la = S. Teresiae Benedictae a Cruce, virginis et martyris
@@ -1140,7 +1140,7 @@ name.la = S. Ioannis Chrysostomi, episcopi et Ecclesiae doctoris
 [triumph-of-the-holy-cross]
 date = 09-14
 rank = feast
-class = saint
+class = lord
 colour = red
 name.en = Triumph of the Holy Cross
 name.pl = Podwyższenia Krzyża Świętego
@@ -1223,21 +1223,21 @@ name.en = Saint Vincent de Paul, priest
 name.pl = św. Wincentego à Paulo, prezbitera
 name.la = S. Vincentii de Paul, presbyteri
 
-[wenceslaus-martyr]
+[saints-lawrence-ruiz-and-companions-martyrs]
 date = 09-28
 rank = optional
 class = saint
 colour = red
-name.en = Saint Wenceslaus, martyr
-name.la = S. Venceslai, martyris
+name.en = Saints Lawrence Ruiz and companions, martyrs
+name.la = S. Laurentii Ruiz et sociorum, martyrum
 
-[saints-lawrence-ruiz-and-companions-martyrs]
+[wenceslaus-martyr]
 date = 09-28
 rank = optional
 class = saint
 colour = red
-name.en = Saints Lawrence Ruiz and companions, martyrs
-name.la = S. Laurentii Ruiz et sociorum, martyrum
+name.en = Saint Wenceslaus, martyr
+name.la = S. Venceslai, martyris
 
 [saints-michael-gabriel-and-raphael-archangels]
 date = 09-29
@@ -1342,21 +1342,21 @@ name.en = Saint Teresa of Jesus, virgin and doctor
 name.pl = św. Teresy od Jezusa, dziewicy i doktora Kościoła
 name.la = S. Teresiae a Iesu, virginis et Ecclesiae doctoris
 
-[hedwig-religious]
+[margaret-mary-alacoque-virgin]
 date = 10-16
 rank = optional
 class = saint
 colour = white
-name.en = Saint Hedwig, religious
-name.la = S. Hedvigis, religiosae
+name.en = Saint Margaret Mary Alacoque, virgin
+name.la = S. Margaritae Mariae Alacoque, virginis
 
-[margaret-mary-alacoque-virgin]
+[hedwig-religious]
 date = 10-16
 rank = optional
 class = saint
 colour = white
-name.en = Saint Margaret Mary Alacoque, virgin
-name.la = S. Margaritae Mariae Alacoque, virginis
+name.en = Saint Hedwig, religious
+name.la = S. Hedvigis, religiosae
 
 [ignatius-of-antioch-bishop-and-martyr]
 date = 10-17
@@ -1387,7 +1387,7 @@ name.la = Ss. Ioannis de Brébeuf et Isaac Jogues, presbyterorum, et sociorum, m
 [paul-of-the-cross-priest]
 date = 10-19
 rank = optional
-class = lord
+class = saint
 colour = white
 name.en = Saint Paul of the Cross, priest
 name.la = S. Pauli a Cruce, presbyteri
@@ -1463,7 +1463,7 @@ name.la = S. Caroli Borromeo, episcopi
 [dedication-of-the-lateran-basilica]
 date = 11-09
 rank = feast
-class = saint
+class = lord
 colour = white
 name.en = Dedication of the Lateran basilica
 name.la = IN DEDICATIONE BASILICAE LATERANENSIS
@@ -1682,7 +1682,7 @@ name.la = S. Luciae, virginis et martyris
 [john-of-the-cross-priest-and-doctor]
 date = 12-14
 rank = memorial
-class = lord
+class = saint
 colour = white
 name.en = Saint John of the Cross, priest and doctor
 name.la = S. Ioannis a Cruce, presbyteri et Ecclesiae doctoris