summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NOTICE9
-rw-r--r--internal/caldata/of-lectionary.ini832
-rw-r--r--internal/caldata/of_test.go22
-rw-r--r--internal/calendar/temporal.go5
-rw-r--r--internal/config/config.go2
-rw-r--r--scripts/genlect-of-season-ferials-cr.py125
6 files changed, 647 insertions, 348 deletions
diff --git a/NOTICE b/NOTICE
index c1bf10d..a054b68 100644
--- a/NOTICE
+++ b/NOTICE
@@ -25,10 +25,11 @@ Lectionary data (reading citations)
The Mass reading CITATIONS (scripture references, not the text) in
internal/caldata/tridentine-lectionary.ini (Extraordinary Form) and
internal/caldata/of-lectionary.ini (Ordinary Form) were compiled from
-missalemeum.com (Divinum Officium data, EF), niedziela.pl (OF seasonal weekday
-ferials), and catholic-resources.org (Fr. Felix Just, S.J. — the Ordinary Form
-Ordinary-Time weekday lectionary via scripts/genlect-of-cr.py; the Sunday and
-temporal-solemnity lectionary, all three cycles, via
+missalemeum.com (Divinum Officium data, EF), niedziela.pl (OF Christmas-season
+weekdays), and catholic-resources.org (Fr. Felix Just, S.J. — the Ordinary Form
+Ordinary-Time weekday lectionary via scripts/genlect-of-cr.py; the proper
+weekdays of Advent, Lent and Eastertide via scripts/genlect-of-season-ferials-cr.py;
+the Sunday and temporal-solemnity lectionary, all three cycles, via
scripts/genlect-of-sundays-cr.py; and the proper readings of the OF sanctoral —
feasts, solemnities and proper-reading memorials — inlined into
roman-calendar.ini via scripts/gen-of-sanctoral-readings.py). Only the references
diff --git a/internal/caldata/of-lectionary.ini b/internal/caldata/of-lectionary.ini
index 18290ae..8d36425 100644
--- a/internal/caldata/of-lectionary.ini
+++ b/internal/caldata/of-lectionary.ini
@@ -5,43 +5,43 @@
[advent-1-fri-I]
first = Isaiah 29:17-24
-psalm = Psalms 27:1bcde,4,13-14
-gospel = Mat 9:27-31
+psalm = Psalms 27:1,4,13-14
+gospel = Matthew 9:27-31
[advent-1-fri-II]
first = Isaiah 29:17-24
-psalm = Psalms 27:1bcde,4,13-14
-gospel = Mat 9:27-31
+psalm = Psalms 27:1,4,13-14
+gospel = Matthew 9:27-31
[advent-1-mon-I]
first = Isaiah 2:1-5
-psalm = Psalms 122:1-2,4-5,6-7,8-9
-gospel = Mat 8:5-11
+psalm = Psalms 122:1-2,3-4b,4cd-5,6-7,8-9
+gospel = Matthew 8:5-11
[advent-1-mon-II]
first = Isaiah 2:1-5
-psalm = Psalms 122:1-2,4-5,6-7,8-9
-gospel = Mat 8:5-11
+psalm = Psalms 122:1-2,3-4b,4cd-5,6-7,8-9
+gospel = Matthew 8:5-11
[advent-1-sat-I]
first = Isaiah 30:19-21,23-26
-psalm = Psalms 147A(146):1-2,3-4,5-6
-gospel = Mat 9:35-10:1,5,6-8
+psalm = Psalms 147:1-2,3-4,5-6
+gospel = Matthew 9:35-10:1,5a,6-8
[advent-1-sat-II]
first = Isaiah 30:19-21,23-26
-psalm = Psalms 147A(146):1-2,3-4,5-6
-gospel = Mat 9:35-10:1,5,6-8
+psalm = Psalms 147:1-2,3-4,5-6
+gospel = Matthew 9:35-10:1,5a,6-8
[advent-1-thu-I]
first = Isaiah 26:1-6
-psalm = Psalms 118:1bc,8-9,19-20,21,25,26-27
-gospel = Mat 7:21,24-27
+psalm = Psalms 118:1+8-9,19-21,25-27a
+gospel = Matthew 7:21,24-27
[advent-1-thu-II]
first = Isaiah 26:1-6
-psalm = Psalms 118:1bc,8-9,19-20,21,25,26-27
-gospel = Mat 7:21,24-27
+psalm = Psalms 118:1+8-9,19-21,25-27a
+gospel = Matthew 7:21,24-27
[advent-1-tue-I]
first = Isaiah 11:1-10
@@ -54,95 +54,94 @@ psalm = Psalms 72:1-2,7-8,12-13,17
gospel = Luke 10:21-24
[advent-1-wed-I]
-first = Isaiah 25:6-10
-psalm = Psalms 23:1-3,3-4,5,6
-gospel = Mat 15:29-37
+first = Isaiah 25:6-10a
+psalm = Psalms 23:1-3a,3b-4,5,6
+gospel = Matthew 15:29-37
[advent-1-wed-II]
-first = Isaiah 25:6-10
-psalm = Psalms 23:1-3,3-4,5,6
-gospel = Mat 15:29-37
+first = Isaiah 25:6-10a
+psalm = Psalms 23:1-3a,3b-4,5,6
+gospel = Matthew 15:29-37
[advent-2-fri-I]
first = Isaiah 48:17-19
-psalm = Psalms 1:1-2,3,4,6
-gospel = Mat 11:16-19
+psalm = Psalms 1:1-2,3,4+6
+gospel = Matthew 11:16-19
[advent-2-fri-II]
first = Isaiah 48:17-19
-psalm = Psalms 1:1-2,3,4,6
-gospel = Mat 11:16-19
+psalm = Psalms 1:1-2,3,4+6
+gospel = Matthew 11:16-19
[advent-2-mon-I]
first = Isaiah 35:1-10
-psalm = Psalms 85:8ab,9,10-11,12-13
+psalm = Psalms 85:9ab+10,11-12,13-14
gospel = Luke 5:17-26
[advent-2-mon-II]
first = Isaiah 35:1-10
-psalm = Psalms 85:8ab,9,10-11,12-13
+psalm = Psalms 85:9ab+10,11-12,13-14
gospel = Luke 5:17-26
[advent-2-sat-I]
first = Sirach 48:1-4,9-11
-psalm = Psalms 80:1ac,2,14-15,17-18
-gospel = Mat 17:10-13
+psalm = Psalms 80:2ac+3b,15-16,18-19
+gospel = Matthew 17:9a,10-135
[advent-2-sat-II]
first = Sirach 48:1-4,9-11
-psalm = Psalms 80:1ac,2,14-15,17-18
-gospel = Mat 17:10-13
+psalm = Psalms 80:2ac+3b,15-16,18-19
+gospel = Matthew 17:9a,10-135
[advent-2-thu-I]
first = Isaiah 41:13-20
-psalm = Psalms 145:1bc,9,10-11,12-13
-gospel = Mat 11:11-15
+psalm = Psalms 145:1+9,10-11,12-13ab
+gospel = Matthew 11:11-15
[advent-2-thu-II]
first = Isaiah 41:13-20
-psalm = Psalms 145:1bc,9,10-11,12-13
-gospel = Mat 11:11-15
+psalm = Psalms 145:1+9,10-11,12-13ab
+gospel = Matthew 11:11-15
[advent-2-tue-I]
first = Isaiah 40:1-11
-psalm = Psalms 96:1-2,3,10ac,11-12,13
-gospel = Mat 18:12-14
+psalm = Psalms 96:1-2,3+10ac,11-12,13
+gospel = Matthew 18:12-14
[advent-2-tue-II]
first = Isaiah 40:1-11
-psalm = Psalms 96:1-2,3,10ac,11-12,13
-gospel = Mat 18:12-14
+psalm = Psalms 96:1-2,3+10ac,11-12,13
+gospel = Matthew 18:12-14
[advent-2-wed-I]
first = Isaiah 40:25-31
-psalm = Psalms 103:1-2,3-4,8,10
-gospel = Mat 11:28-30
+psalm = Psalms 103:1-2,3-4,8+10
+gospel = Matthew 11:28-30
[advent-2-wed-II]
first = Isaiah 40:25-31
-psalm = Psalms 103:1-2,3-4,8,10
-gospel = Mat 11:28-30
+psalm = Psalms 103:1-2,3-4,8+10
+gospel = Matthew 11:28-30
[advent-3-fri-I]
-first = Song of Solomon 2:8-14
-psalm = Psalms 33:2-3,11-12,20-21
-second = Zephaniah 3:14-17
-gospel = Luke 1:39-45
+first = Isaiah 56:1-3a,6-8
+psalm = Psalms 67:2-3,5,7-8
+gospel = John 5:33-36
[advent-3-fri-II]
-first = Isaiah 7:10-14
-psalm = Psalms 24:1-2,3-4,5-6
-gospel = Luke 1:26-38
+first = Isaiah 56:1-3a,6-8
+psalm = Psalms 67:2-3,5,7-8
+gospel = John 5:33-36
[advent-3-mon-I]
-first = Genesis 49:1,2,8-10
-psalm = Psalms 72:1-2,3-4ab,7-8,17
-gospel = Mat 1:1-17
+first = Numbers 24:2-7,15-17a
+psalm = Psalms 25:4-5ab,6+7bc,8-9
+gospel = Matthew 21:23-27
[advent-3-mon-II]
-first = Numbers 24:2-7,15-17
-psalm = Psalms 25:4-5,6,7bc,8-9
-gospel = Mat 21:23-27
+first = Numbers 24:2-7,15-17a
+psalm = Psalms 25:4-5ab,6+7bc,8-9
+gospel = Matthew 21:23-27
[advent-3-sat-I]
first = 1 Samuel 1:24-28
@@ -156,34 +155,34 @@ second = Zephaniah 3:14-17
gospel = Luke 1:39-45
[advent-3-thu-I]
-first = Isaiah 7:10-14
-psalm = Psalms 24:1-2,3-4,5-6
-gospel = Luke 1:26-38
+first = Isaiah 54:1-10
+psalm = Psalms 30:2+4,5-6,11-12a+13b
+gospel = Luke 7:24-30
[advent-3-thu-II]
-first = Judges 13:2-7,24-25
-psalm = Psalms 71:3-4,5-6,16-17
-gospel = Luke 1:5-25
+first = Isaiah 54:1-10
+psalm = Psalms 30:2+4,5-6,11-12a+13b
+gospel = Luke 7:24-30
[advent-3-tue-I]
-first = Jeremiah 23:5-8
-psalm = Psalms 72:1-2,12-13,18-19ab
-gospel = Mat 1:18-24
+first = Zephaniah 3:1-2,9-13
+psalm = Psalms 34:2-3,6-7,17-18,19+23
+gospel = Matthew 21:28-32
[advent-3-tue-II]
-first = Genesis 49:1,2,8-10
-psalm = Psalms 72:1-2,3-4ab,7-8,17
-gospel = Mat 1:1-17
+first = Zephaniah 3:1-2,9-13
+psalm = Psalms 34:2-3,6-7,17-18,19+23
+gospel = Matthew 21:28-32
[advent-3-wed-I]
-first = Judges 13:2-7,24-25
-psalm = Psalms 71:3-4,5-6,16-17
-gospel = Luke 1:5-25
+first = Isaiah 45:6c-8,18,21c-25
+psalm = Psalms 85:9ab+10,11-12,13-14
+gospel = Luke 7:18b-23
[advent-3-wed-II]
-first = Jeremiah 23:5-8
-psalm = Psalms 72:1-2,12-13,18-19ab
-gospel = Mat 1:18-24
+first = Isaiah 45:6c-8,18,21c-25
+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
@@ -689,356 +688,354 @@ psalm = Psalms 46:1-2,4-5,7-8
gospel = John 2:13-22
[easter-2-fri-I]
-first = Acts 5:34-42
-psalm = Psalms 27:1bcde,4,13-14
+first = The Acts 5:34-42
+psalm = Psalms 27:1,4,13-14
gospel = John 6:1-15
[easter-2-fri-II]
-first = Acts 5:34-42
-psalm = Psalms 27:1bcde,4,13-14
+first = The Acts 5:34-42
+psalm = Psalms 27:1,4,13-14
gospel = John 6:1-15
[easter-2-mon-I]
-first = Acts 4:23-31
-psalm = Psalms 2:1-2,3-4,5-6,7-8
+first = The Acts 4:23-31
+psalm = Psalms 2:1-3,4-7a,7b-9
gospel = John 3:1-8
[easter-2-mon-II]
-first = Isaiah 7:10-14;8:10
-psalm = Psalms 40:6-7,7-9,10
-gospel = Luke 1:26-38
+first = The Acts 4:23-31
+psalm = Psalms 2:1-3,4-7a,7b-9
+gospel = John 3:1-8
[easter-2-sat-I]
-first = Acts 6:1-7
+first = The Acts 6:1-7
psalm = Psalms 33:1-2,4-5,18-19
gospel = John 6:16-21
[easter-2-sat-II]
-first = Acts 6:1-7
+first = The Acts 6:1-7
psalm = Psalms 33:1-2,4-5,18-19
gospel = John 6:16-21
[easter-2-thu-I]
-first = Acts 5:27-33
-psalm = Psalms 34:1,8,16-17,18-19
+first = The Acts 5:27-33
+psalm = Psalms 34:2+9,17-18,19-20
gospel = John 3:31-36
[easter-2-thu-II]
-first = Acts 5:27-33
-psalm = Psalms 34:1,8,16-17,18-19
+first = The Acts 5:27-33
+psalm = Psalms 34:2+9,17-18,19-20
gospel = John 3:31-36
[easter-2-tue-I]
-first = Acts 1:3-8
-psalm = Psalms 126:1-2,2-3,4-5,6
-gospel = John 12:24-26
+first = The Acts 4:32-37
+psalm = Psalms 93:1ab,1cd-2,5
+gospel = John 3:7b-15
[easter-2-tue-II]
-first = Acts 4:32-37
-psalm = Psalms 93:1,2,5
-gospel = John 3:7-15
+first = The Acts 4:32-37
+psalm = Psalms 93:1ab,1cd-2,5
+gospel = John 3:7b-15
[easter-2-wed-I]
-first = Acts 5:17-26
-psalm = Psalms 34:1-2,3-4,5-6,7-8
+first = The Acts 5:17-26
+psalm = Psalms 34:2-3,4-5,6-7,8-9
gospel = John 3:16-21
[easter-2-wed-II]
-first = Acts 5:17-26
-psalm = Psalms 34:1-2,3-4,5-6,7-8
+first = The Acts 5:17-26
+psalm = Psalms 34:2-3,4-5,6-7,8-9
gospel = John 3:16-21
[easter-3-fri-I]
-first = Acts 9:1-20
-psalm = Psalms 117:1-2
+first = The Acts 9:1-20
+psalm = Psalms 117:1,2
gospel = John 6:52-59
[easter-3-fri-II]
-first = Acts 9:1-20
-psalm = Psalms 117:1-2
+first = The Acts 9:1-20
+psalm = Psalms 117:1,2
gospel = John 6:52-59
[easter-3-mon-I]
-first = 1 Corinthians 15:1-8
-psalm = Psalms 19:1-2,3-4
-gospel = John 14:6-14
+first = The Acts 6:8-15
+psalm = Psalms 119:23-24,26-27,29-30
+gospel = John 6:22-29
[easter-3-mon-II]
-first = Acts 6:8-15
+first = The Acts 6:8-15
psalm = Psalms 119:23-24,26-27,29-30
gospel = John 6:22-29
[easter-3-sat-I]
-first = Acts 9:31-42
-psalm = Psalms 116B(115):12-13,14-15,16-17
-gospel = John 6:55,60-69
+first = The Acts 9:31-42
+psalm = Psalms 116:12-13,14-15,16-17
+gospel = John 6:60-69
[easter-3-sat-II]
-first = Acts 9:31-42
-psalm = Psalms 116B(115):12-13,14-15,16-17
-gospel = John 6:55,60-69
+first = The Acts 9:31-42
+psalm = Psalms 116:12-13,14-15,16-17
+gospel = John 6:60-69
[easter-3-thu-I]
-first = Acts 8:26-40
-psalm = Psalms 66:8-9,16-17,19-20
+first = The Acts 8:26-40
+psalm = Psalms 66:8-9,16-17,20
gospel = John 6:44-51
[easter-3-thu-II]
-first = Acts 8:26-40
-psalm = Psalms 66:8-9,16-17,19-20
+first = The Acts 8:26-40
+psalm = Psalms 66:8-9,16-17,20
gospel = John 6:44-51
[easter-3-tue-I]
-first = Acts 7:51-8:1
-psalm = Psalms 31:2-3,5,6,7,16,20ab
+first = The Acts 7:51-8:1a
+psalm = Psalms 31:3cd-4,6+7b+8a,17+21ab
gospel = John 6:30-35
[easter-3-tue-II]
-first = Acts 7:51-8:1
-psalm = Psalms 31:2-3,5,6,7,16,20ab
+first = The Acts 7:51-8:1a
+psalm = Psalms 31:3cd-4,6+7b+8a,17+21ab
gospel = John 6:30-35
[easter-3-wed-I]
-first = Acts 20:17-18,28-32,36
-psalm = Psalms 100:2-3,4-5
-gospel = John 10:11-16
+first = The Acts 8:1b-8
+psalm = Psalms 66:1-3a,4-5,6-7a
+gospel = John 6:35-40
[easter-3-wed-II]
-first = Acts 8:1-8
-psalm = Psalms 66:1-3,4-5,6-7
+first = The Acts 8:1b-8
+psalm = Psalms 66:1-3a,4-5,6-7a
gospel = John 6:35-40
[easter-4-fri-I]
-first = Acts 13:26-33
-psalm = Psalms 2:6-7,8-9,10-12
+first = The Acts 13:26-33
+psalm = Psalms 2:6-7,8-9,10-11ab
gospel = John 14:1-6
[easter-4-fri-II]
-first = Acts 13:26-33
-psalm = Psalms 2:6-7,8-9,10-12
+first = The Acts 13:26-33
+psalm = Psalms 2:6-7,8-9,10-11ab
gospel = John 14:1-6
[easter-4-mon-I]
-first = Acts 11:1-18
-psalm = Psalms 42:1-2;Ps42(41):2,3
-gospel = John 10:11-18
+first = The Acts 11:1-18
+psalm = Psalms 42:2-3;42:3,4
+gospel = John 10:1-10
[easter-4-mon-II]
-first = Acts 1:3-8
-psalm = Psalms 126:1-2,2-3,4-5,6
-gospel = John 12:24-26
+first = The Acts 11:1-18
+psalm = Psalms 42:2-3;42:3,4
+gospel = John 10:1-10
[easter-4-sat-I]
-first = Acts 13:44-52
-psalm = Psalms 98:1bcde,2-3,3-4
+first = The Acts 13:44-52
+psalm = Psalms 98:1,2-3ab,3cd-4
gospel = John 14:7-14
[easter-4-sat-II]
-first = Acts 13:44-52
-psalm = Psalms 98:1bcde,2-3,3-4
+first = The Acts 13:44-52
+psalm = Psalms 98:1,2-3ab,3cd-4
gospel = John 14:7-14
[easter-4-thu-I]
-first = Revelation 12:10-12
-psalm = Psalms 34:1-2,3-4,5-6,7-8
-second = 1 Corinthians 1:10-13,17-18
-gospel = John 17:20-26
+first = The Acts 13:13-25
+psalm = Psalms 89:2-3,21-22,25+27
+gospel = John 13:16-20
[easter-4-thu-II]
-first = Acts 13:13-25
-psalm = Psalms 89:1-2,20-21,24,26
+first = The Acts 13:13-25
+psalm = Psalms 89:2-3,21-22,25+27
gospel = John 13:16-20
[easter-4-tue-I]
-first = Acts 11:19-26
-psalm = Psalms 87:1-3,4-5,6-7
+first = The Acts 11:19-26
+psalm = Psalms 87:1b-3,4-5,6-7
gospel = John 10:22-30
[easter-4-tue-II]
-first = Acts 11:19-26
-psalm = Psalms 87:1-3,4-5,6-7
+first = The Acts 11:19-26
+psalm = Psalms 87:1b-3,4-5,6-7
gospel = John 10:22-30
[easter-4-wed-I]
-first = Acts 12:24-13:5
-psalm = Psalms 67:1-2,3-4,5,7
+first = The Acts 12:24-13:5a
+psalm = Psalms 67:2-3,5,6+8
gospel = John 12:44-50
[easter-4-wed-II]
-first = 1 Corinthians 15:1-8
-psalm = Psalms 19:1-2,3-4
-gospel = John 14:6-14
+first = The Acts 12:24-13:5a
+psalm = Psalms 67:2-3,5,6+8
+gospel = John 12:44-50
[easter-5-fri-I]
-first = Acts 15:22-31
-psalm = Psalms 57:7,9,10-11
+first = The Acts 15:22-31
+psalm = Psalms 57:8-9,10+12
gospel = John 15:12-17
[easter-5-fri-II]
-first = Acts 15:22-31
-psalm = Psalms 57:7,9,10-11
+first = The Acts 15:22-31
+psalm = Psalms 57:8-9,10+12
gospel = John 15:12-17
[easter-5-mon-I]
-first = Acts 14:5-18
-psalm = Psalms 115(113B):1-2,3-4,15-16
+first = The Acts 14:5-18
+psalm = Psalms 115:1-2,3-4,15-16
gospel = John 14:21-26
[easter-5-mon-II]
-first = Acts 14:5-18
-psalm = Psalms 115(113B):1-2,3-4,15-16
+first = The Acts 14:5-18
+psalm = Psalms 115:1-2,3-4,15-16
gospel = John 14:21-26
[easter-5-sat-I]
-first = Acts 16:1-10
-psalm = Psalms 100:2-3,4-5
+first = The Acts 16:1-10
+psalm = Psalms 100:1b-2,3,5
gospel = John 15:18-21
[easter-5-sat-II]
-first = Acts 16:1-10
-psalm = Psalms 100:2-3,4-5
+first = The Acts 16:1-10
+psalm = Psalms 100:1b-2,3,5
gospel = John 15:18-21
[easter-5-thu-I]
-first = Acts 15:7-21
-psalm = Psalms 96:1-2,2-3,10
+first = The Acts 15:7-21
+psalm = Psalms 96:1-2a,2b-3,10
gospel = John 15:9-11
[easter-5-thu-II]
-first = Acts 15:7-21
-psalm = Psalms 96:1-2,2-3,10
+first = The Acts 15:7-21
+psalm = Psalms 96:1-2a,2b-3,10
gospel = John 15:9-11
[easter-5-tue-I]
-first = Acts 14:19-28
-psalm = Psalms 145:10-11,12-13,21
-gospel = John 14:27-31
+first = The Acts 14:19-28
+psalm = Psalms 145:10-11,12-13ab,21
+gospel = John 14:27-31a
[easter-5-tue-II]
-first = Acts 14:19-28
-psalm = Psalms 145:10-11,12-13,21
-gospel = John 14:27-31
+first = The Acts 14:19-28
+psalm = Psalms 145:10-11,12-13ab,21
+gospel = John 14:27-31a
[easter-5-wed-I]
-first = Acts 15:1-6
-psalm = Psalms 122:1-2,4-5
+first = The Acts 15:1-6
+psalm = Psalms 122:1-2,3-4ab,4cd-5
gospel = John 15:1-8
[easter-5-wed-II]
-first = Acts 15:1-6
-psalm = Psalms 122:1-2,4-5
+first = The Acts 15:1-6
+psalm = Psalms 122:1-2,3-4ab,4cd-5
gospel = John 15:1-8
[easter-6-fri-I]
-first = Acts 18:9-18
-psalm = Psalms 47:1-2,3-4,5-6
+first = The Acts 18:9-18
+psalm = Psalms 47:2-3,4-5,6-7
gospel = John 16:20-23
[easter-6-fri-II]
-first = Acts 18:9-18
-psalm = Psalms 47:1-2,3-4,5-6
+first = The Acts 18:9-18
+psalm = Psalms 47:2-3,4-5,6-7
gospel = John 16:20-23
[easter-6-mon-I]
-first = Acts 16:11-15
-psalm = Psalms 149:1-2,3-4,5-6,9
-gospel = John 15:26-16:4
+first = The Acts 16:11-15
+psalm = Psalms 149:1b-2,3-4,5-6a+9b
+gospel = John 15:26-16:4a
[easter-6-mon-II]
-first = Acts 16:11-15
-psalm = Psalms 149:1-2,3-4,5-6,9
-gospel = John 15:26-16:4
+first = The Acts 16:11-15
+psalm = Psalms 149:1b-2,3-4,5-6a+9b
+gospel = John 15:26-16:4a
[easter-6-sat-I]
-first = Acts 18:23-28
-psalm = Psalms 47:1-2,7-8,9
-gospel = John 16:23-28
+first = The Acts 18:23-28
+psalm = Psalms 47:2-3,8-9,10
+gospel = John 16:23b-28
[easter-6-sat-II]
-first = Acts 18:23-28
-psalm = Psalms 47:1-2,7-8,9
-gospel = John 16:23-28
+first = The Acts 18:23-28
+psalm = Psalms 47:2-3,8-9,10
+gospel = John 16:23b-28
[easter-6-tue-I]
-first = Acts 16:22-34
-psalm = Psalms 138:1-2,2-3,7e-8
+first = The Acts 16:22-34
+psalm = Psalms 138:1-2ab,2cde-3,7c-8
gospel = John 16:5-11
[easter-6-tue-II]
-first = Acts 20:17-18,28-32,36
-psalm = Psalms 100:2-3,4-5
-gospel = John 10:11-16
+first = The Acts 16:22-34
+psalm = Psalms 138:1-2ab,2cde-3,7c-8
+gospel = John 16:5-11
[easter-6-wed-I]
-first = Acts 17:15,22-18:1
-psalm = Psalms 148:1-2,11-12,13-14
+first = The Acts 17:15,22-18:1
+psalm = Psalms 148:1-2,11-12,13,14
gospel = John 16:12-15
[easter-6-wed-II]
-first = Acts 17:15,22-18:1
-psalm = Psalms 148:1-2,11-12,13-14
+first = The Acts 17:15,22-18:1
+psalm = Psalms 148:1-2,11-12,13,14
gospel = John 16:12-15
[easter-7-fri-I]
-first = Acts 25:13-21
-psalm = Psalms 103:1-2,11-12,19-20
+first = The Acts 25:13b-21
+psalm = Psalms 103:1-2,11-12,19-20ab
gospel = John 21:15-19
[easter-7-fri-II]
-first = Acts 25:13-21
-psalm = Psalms 103:1-2,11-12,19-20
+first = The Acts 25:13b-21
+psalm = Psalms 103:1-2,11-12,19-20ab
gospel = John 21:15-19
[easter-7-mon-I]
-first = Acts 19:1-8
-psalm = Psalms 68:1-2,3,4ac,5-6.
+first = The Acts 19:1-8
+psalm = Psalms 68:2-3ab,4-5acd,6-7ab
gospel = John 16:29-33
[easter-7-mon-II]
-first = Acts 19:1-8
-psalm = Psalms 68:1-2,3,4ac,5-6.
+first = The Acts 19:1-8
+psalm = Psalms 68:2-3ab,4-5acd,6-7ab
gospel = John 16:29-33
[easter-7-sat-I]
-first = Acts 28:16-20,30-31
-psalm = Psalms 11:3,4,6
+first = The Acts 28:16-20,30-31
+psalm = Psalms 11:4,5+7
gospel = John 21:20-25
[easter-7-sat-II]
-first = Acts 28:16-20,30-31
-psalm = Psalms 11:3,4,6
+first = The Acts 28:16-20,30-31
+psalm = Psalms 11:4,5+7
gospel = John 21:20-25
[easter-7-thu-I]
-first = Acts 22:30;23:6-11
-psalm = Psalms 16:1-2,5,7-8,9-10,11
+first = The Acts 22:30;23:6-11
+psalm = Psalms 16:1-2a+5,7-8,9-10,11
gospel = John 17:20-26
[easter-7-thu-II]
-first = Acts 22:30;23:6-11
-psalm = Psalms 16:1-2,5,7-8,9-10,11
+first = The Acts 22:30;23:6-11
+psalm = Psalms 16:1-2a+5,7-8,9-10,11
gospel = John 17:20-26
[easter-7-tue-I]
-first = Acts 20:17-27
-psalm = Psalms 68:9-10,19-20
-gospel = John 17:1-11
+first = The Acts 20:17-27
+psalm = Psalms 68:10-11,20-21
+gospel = John 17:1-11a
[easter-7-tue-II]
-first = Acts 20:17-27
-psalm = Psalms 68:9-10,19-20
-gospel = John 17:1-11
+first = The Acts 20:17-27
+psalm = Psalms 68:10-11,20-21
+gospel = John 17:1-11a
[easter-7-wed-I]
-first = Acts 20:28-38
-psalm = Psalms 68:28-29,32-34,34bc,35bc
-gospel = John 17:11-19
+first = The Acts 20:28-38
+psalm = Psalms 68:29-30,33-35a,35bc-36ab
+gospel = John 17:11b-19
[easter-7-wed-II]
-first = Revelation 12:10-12
-psalm = Psalms 34:1-2,3-4,5-6,7-8
-second = 1 Corinthians 1:10-13,17-18
-gospel = John 17:20-26
+first = The Acts 20:28-38
+psalm = Psalms 68:29-30,33-35a,35bc-36ab
+gospel = John 17:11b-19
[easter-octave-fri-A]
first = Acts 4:1-12
@@ -1275,7 +1272,8 @@ second = Ephesians 3:2-3a,5-6
gospel = Matthew 2:1-12
[holy-family-A]
-first = Sirach 3:3-7,14-17a-Vg =Sir3:2-6,12-14-Gk
+first = Sirach 3:3-7,14-17a-Vg
+=Sir3:2-6,12-14-Gk
psalm = Psalms 128:1-2,3,4-5
second = Colossians 3:12-21
gospel = Matthew 2:13-15,19-23
@@ -1414,212 +1412,212 @@ gospel = John 12:24-26
[lent-1-fri-I]
first = Ezekiel 18:21-28
-psalm = Psalms 130:1-2,3-4,5-7,7-8
-gospel = Mat 5:20-26
+psalm = Psalms 130:1-2,3-4,5-7a,7bc-8
+gospel = Matthew 5:20-26
[lent-1-fri-II]
first = Ezekiel 18:21-28
-psalm = Psalms 130:1-2,3-4,5-7,7-8
-gospel = Mat 5:20-26
+psalm = Psalms 130:1-2,3-4,5-7a,7bc-8
+gospel = Matthew 5:20-26
[lent-1-mon-I]
first = Leviticus 19:1-2,11-18
-psalm = Psalms 19:7-8,9,14
-gospel = Mat 25:31-46
+psalm = Psalms 19:8,9,10,15
+gospel = Matthew 25:31-46
[lent-1-mon-II]
first = Leviticus 19:1-2,11-18
-psalm = Psalms 19:7-8,9,14
-gospel = Mat 25:31-46
+psalm = Psalms 19:8,9,10,15
+gospel = Matthew 25:31-46
[lent-1-sat-I]
first = Deuteronomy 26:16-19
psalm = Psalms 119:1-2,4-5,7-8
-gospel = Mat 5:43-48
+gospel = Matthew 5:43-48
[lent-1-sat-II]
first = Deuteronomy 26:16-19
psalm = Psalms 119:1-2,4-5,7-8
-gospel = Mat 5:43-48
+gospel = Matthew 5:43-48
[lent-1-thu-I]
-first = Esther 4:17k,l-m,r-u
-psalm = Psalms 138:1-2,2-3,7e-8
-gospel = Mat 7:7-12
+first = Esther C:12,14-16,23-25
+psalm = Psalms 138:1-2ab,2cde-3,7c-8
+gospel = Matthew 7:7-12
[lent-1-thu-II]
-first = Esther 4:17k,l-m,r-u
-psalm = Psalms 138:1-2,2-3,7e-8
-gospel = Mat 7:7-12
+first = Esther C:12,14-16,23-25
+psalm = Psalms 138:1-2ab,2cde-3,7c-8
+gospel = Matthew 7:7-12
[lent-1-tue-I]
first = Isaiah 55:10-11
-psalm = Psalms 34:3-4,5-6,15-16,17-18
-gospel = Mat 6:7-15
+psalm = Psalms 34:4-5,6-7,16-17,18-19
+gospel = Matthew 6:7-15
[lent-1-tue-II]
first = Isaiah 55:10-11
-psalm = Psalms 34:3-4,5-6,15-16,17-18
-gospel = Mat 6:7-15
+psalm = Psalms 34:4-5,6-7,16-17,18-19
+gospel = Matthew 6:7-15
[lent-1-wed-I]
first = Jonah 3:1-10
-psalm = Psalms 51:1-2,10-11,16-17
+psalm = Psalms 51:3-4,12-13,18-19
gospel = Luke 11:29-32
[lent-1-wed-II]
first = Jonah 3:1-10
-psalm = Psalms 51:1-2,10-11,16-17
+psalm = Psalms 51:3-4,12-13,18-19
gospel = Luke 11:29-32
[lent-2-fri-I]
-first = Genesis 37:3-4,12-13,17-28
+first = Genesis 37:3-4,12-13a,17b-28a
psalm = Psalms 105:16-17,18-19,20-21
-gospel = Mat 21:33-43,45-46
+gospel = Matthew 21:33-43,45-46
[lent-2-fri-II]
-first = Genesis 37:3-4,12-13,17-28
+first = Genesis 37:3-4,12-13a,17b-28a
psalm = Psalms 105:16-17,18-19,20-21
-gospel = Mat 21:33-43,45-46
+gospel = Matthew 21:33-43,45-46
[lent-2-mon-I]
-first = Daniel 9:4-10
-psalm = Psalms 79:5,8,9,11,13
+first = Daniel 9:4b-10
+psalm = Psalms 78:8,9,11+13
gospel = Luke 6:36-38
[lent-2-mon-II]
-first = Daniel 9:4-10
-psalm = Psalms 79:5,8,9,11,13
+first = Daniel 9:4b-10
+psalm = Psalms 78:8,9,11+13
gospel = Luke 6:36-38
[lent-2-sat-I]
first = Micah 7:14-15,18-20
psalm = Psalms 103:1-2,3-4,9-10,11-12
-gospel = Luke 15:1-3.11-32
+gospel = Luke 15:1-3,11-32
[lent-2-sat-II]
first = Micah 7:14-15,18-20
psalm = Psalms 103:1-2,3-4,9-10,11-12
-gospel = Luke 15:1-3.11-32
+gospel = Luke 15:1-3,11-32
[lent-2-thu-I]
first = Jeremiah 17:5-10
-psalm = Psalms 1:1-2,3,4,6
+psalm = Psalms 1:1-2,3,4+6
gospel = Luke 16:19-31
[lent-2-thu-II]
first = Jeremiah 17:5-10
-psalm = Psalms 1:1-2,3,4,6
+psalm = Psalms 1:1-2,3,4+6
gospel = Luke 16:19-31
[lent-2-tue-I]
first = Isaiah 1:10,16-20
-psalm = Psalms 50:8-9,16-17,21,23
-gospel = Mat 23:1-12
+psalm = Psalms 50:8-9,16bc-17,21+23
+gospel = Matthew 23:1-12
[lent-2-tue-II]
first = Isaiah 1:10,16-20
-psalm = Psalms 50:8-9,16-17,21,23
-gospel = Mat 23:1-12
+psalm = Psalms 50:8-9,16bc-17,21+23
+gospel = Matthew 23:1-12
[lent-2-wed-I]
first = Jeremiah 18:18-20
-psalm = Psalms 31:4-5,13,14-15
-gospel = Mat 20:17-28
+psalm = Psalms 31:5-6,14,15-16
+gospel = Matthew 20:17-28
[lent-2-wed-II]
first = Jeremiah 18:18-20
-psalm = Psalms 31:4-5,13,14-15
-gospel = Mat 20:17-28
+psalm = Psalms 31:5-6,14,15-16
+gospel = Matthew 20:17-28
[lent-3-fri-I]
first = Hosea 14:2-10
-psalm = Psalms 81:5-7,7-8,9-10,13,16
-gospel = Mark 12:28-34
+psalm = Psalms 81:6c-8a,8bc-9,10-11ab,14+17
+gospel = Mark 12:28b-34
[lent-3-fri-II]
first = Hosea 14:2-10
-psalm = Psalms 81:5-7,7-8,9-10,13,16
-gospel = Mark 12:28-34
+psalm = Psalms 81:6c-8a,8bc-9,10-11ab,14+17
+gospel = Mark 12:28b-34
[lent-3-mon-I]
-first = 2 Kings 5:1-15
-psalm = Psalms 42:1-2;Ps42(41):2,3
+first = 2 Kings 5:1-15a
+psalm = Psalms 42:2,3;43:3,4
gospel = Luke 4:24-30
[lent-3-mon-II]
-first = 2 Kings 5:1-15
-psalm = Psalms 42:1-2;Ps42(41):2,3
+first = 2 Kings 5:1-15a
+psalm = Psalms 42:2,3;43:3,4
gospel = Luke 4:24-30
[lent-3-sat-I]
first = Hosea 6:1-6
-psalm = Psalms 51:1-2,16-17,18-19
+psalm = Psalms 51:3-4,18-19,20-21ab
gospel = Luke 18:9-14
[lent-3-sat-II]
first = Hosea 6:1-6
-psalm = Psalms 51:1-2,16-17,18-19
+psalm = Psalms 51:3-4,18-19,20-21ab
gospel = Luke 18:9-14
[lent-3-thu-I]
first = Jeremiah 7:23-28
-psalm = Psalms 95:1-2,6-7,7d-9
+psalm = Psalms 95:1-2,6-7,8-9
gospel = Luke 11:14-23
[lent-3-thu-II]
first = Jeremiah 7:23-28
-psalm = Psalms 95:1-2,6-7,7d-9
+psalm = Psalms 95:1-2,6-7,8-9
gospel = Luke 11:14-23
[lent-3-tue-I]
first = Daniel 3:25,34-43
-psalm = Psalms 25:4-5,6,7bc,8-9
-gospel = Mat 18:21-35
+psalm = Psalms 25:4-5ab,6+7bc,8-9
+gospel = Matthew 18:21-35
[lent-3-tue-II]
first = Daniel 3:25,34-43
-psalm = Psalms 25:4-5,6,7bc,8-9
-gospel = Mat 18:21-35
+psalm = Psalms 25:4-5ab,6+7bc,8-9
+gospel = Matthew 18:21-35
[lent-3-wed-I]
first = Deuteronomy 4:1,5-9
-psalm = Psalms 147B:12-13,15-16,19-20
-gospel = Mat 5:17-19
+psalm = Psalms 147:12-13,15-16,19-20
+gospel = Matthew 5:17-19
[lent-3-wed-II]
first = Deuteronomy 4:1,5-9
-psalm = Psalms 147B:12-13,15-16,19-20
-gospel = Mat 5:17-19
+psalm = Psalms 147:12-13,15-16,19-20
+gospel = Matthew 5:17-19
[lent-4-fri-I]
-first = Wisdom 2:1,12-22
-psalm = Psalms 34:16-17,18-19,20,22
+first = Wisdom 2:1a,12-22
+psalm = Psalms 34:17-18,19-20,21+23
gospel = John 7:1-2,10,25-30
[lent-4-fri-II]
-first = Wisdom 2:1,12-22
-psalm = Psalms 34:16-17,18-19,20,22
+first = Wisdom 2:1a,12-22
+psalm = Psalms 34:17-18,19-20,21+23
gospel = John 7:1-2,10,25-30
[lent-4-mon-I]
first = Isaiah 65:17-21
-psalm = Psalms 30:1,3,4-5,10-11,12
+psalm = Psalms 30:2+4,5-6,11-12a+13b
gospel = John 4:43-54
[lent-4-mon-II]
first = Isaiah 65:17-21
-psalm = Psalms 30:1,3,4-5,10-11,12
+psalm = Psalms 30:2+4,5-6,11-12a+13b
gospel = John 4:43-54
[lent-4-sat-I]
first = Jeremiah 11:18-20
-psalm = Psalms 7:1-2,8-9,10-11
+psalm = Psalms 7:2-3,9bc-10,11-12
gospel = John 7:40-53
[lent-4-sat-II]
first = Jeremiah 11:18-20
-psalm = Psalms 7:1-2,8-9,10-11
+psalm = Psalms 7:2-3,9bc-10,11-12
gospel = John 7:40-53
[lent-4-thu-I]
@@ -1634,55 +1632,53 @@ gospel = John 5:31-47
[lent-4-tue-I]
first = Ezekiel 47:1-9,12
-psalm = Psalms 46:1-2,4-5,7-8
-gospel = John 5:1-16
+psalm = Psalms 46:2-3,5-6,8-9
+gospel = John 5:1-3a,5-16
[lent-4-tue-II]
first = Ezekiel 47:1-9,12
-psalm = Psalms 46:1-2,4-5,7-8
-gospel = John 5:1-16
+psalm = Psalms 46:2-3,5-6,8-9
+gospel = John 5:1-3a,5-16
[lent-4-wed-I]
first = Isaiah 49:8-15
-psalm = Psalms 145:8-9,13-14,17-18
+psalm = Psalms 145:8-9,13cd-14,17-18
gospel = John 5:17-30
[lent-4-wed-II]
first = Isaiah 49:8-15
-psalm = Psalms 145:8-9,13-14,17-18
+psalm = Psalms 145:8-9,13cd-14,17-18
gospel = John 5:17-30
[lent-5-fri-I]
first = Jeremiah 20:10-13
-psalm = Psalms 18:1-2,2-3,4-5,6
+psalm = Psalms 18:2-3a,3bc-4,5-6,7
gospel = John 10:31-42
[lent-5-fri-II]
first = Jeremiah 20:10-13
-psalm = Psalms 18:1-2,2-3,4-5,6
+psalm = Psalms 18:2-3a,3bc-4,5-6,7
gospel = John 10:31-42
[lent-5-mon-I]
first = Daniel 13:1-9,15-17,19-30,33-62
-psalm = Psalms 23:1-3,3-4,5,6
-second = Daniel 13:41-62
-gospel = John 8:1-11/J8:12-20
+psalm = Psalms 23:1-3a,3b-4,5,6
+gospel = John 8:1-11
[lent-5-mon-II]
first = Daniel 13:1-9,15-17,19-30,33-62
-psalm = Psalms 23:1-3,3-4,5,6
-second = Daniel 13:41-62
-gospel = John 8:1-11/J8:12-20
+psalm = Psalms 23:1-3a,3b-4,5,6
+gospel = John 8:1-11
[lent-5-sat-I]
first = Ezekiel 37:21-28
-psalm = Jeremiah 31:10,11-12,13
-gospel = John 11:45-57
+psalm = Jeremiah 31:10,11-12abcd,13
+gospel = John 11:45-56
[lent-5-sat-II]
first = Ezekiel 37:21-28
-psalm = Jeremiah 31:10,11-12,13
-gospel = John 11:45-57
+psalm = Jeremiah 31:10,11-12abcd,13
+gospel = John 11:45-56
[lent-5-thu-I]
first = Genesis 17:3-9
@@ -1696,63 +1692,63 @@ gospel = John 8:51-59
[lent-5-tue-I]
first = Numbers 21:4-9
-psalm = Psalms 102:1-2,2cd,15-16,17-18,19-20
+psalm = Psalms 102:2-3,16-18,19-21
gospel = John 8:21-30
[lent-5-tue-II]
first = Numbers 21:4-9
-psalm = Psalms 102:1-2,2cd,15-16,17-18,19-20
+psalm = Psalms 102:2-3,16-18,19-21
gospel = John 8:21-30
[lent-5-wed-I]
first = Daniel 3:14-20,91-92,95
-psalm = Daniel 3:52,53-54,55-56
+psalm = Daniel 3:52,53,54,55,56
gospel = John 8:31-42
[lent-5-wed-II]
first = Daniel 3:14-20,91-92,95
-psalm = Daniel 3:52,53-54,55-56
+psalm = Daniel 3:52,53,54,55,56
gospel = John 8:31-42
[lent-after-ashes-fri-I]
-first = Isaiah 58:1-9
-psalm = Psalms 51:1-2,3-4,16-17
-gospel = Mat 9:14-15
+first = Isaiah 58:1-9a
+psalm = Psalms 51:3-4,5-6ab,18-19
+gospel = Matthew 9:14-15
[lent-after-ashes-fri-II]
-first = Isaiah 58:1-9
-psalm = Psalms 51:1-2,3-4,16-17
-gospel = Mat 9:14-15
+first = Isaiah 58:1-9a
+psalm = Psalms 51:3-4,5-6ab,18-19
+gospel = Matthew 9:14-15
[lent-after-ashes-sat-I]
-first = Isaiah 58:9-14
+first = Isaiah 58:9b-14
psalm = Psalms 86:1-2,3-4,5-6
gospel = Luke 5:27-32
[lent-after-ashes-sat-II]
-first = Isaiah 58:9-14
+first = Isaiah 58:9b-14
psalm = Psalms 86:1-2,3-4,5-6
gospel = Luke 5:27-32
[lent-after-ashes-thu-I]
first = Deuteronomy 30:15-20
-psalm = Psalms 1:1-2,3,4,6
+psalm = Psalms 1:1-2,3,4+6
gospel = Luke 9:22-25
[lent-after-ashes-thu-II]
first = Deuteronomy 30:15-20
-psalm = Psalms 1:1-2,3,4,6
+psalm = Psalms 1:1-2,3,4+6
gospel = Luke 9:22-25
[lent-after-ashes-wed-I]
first = Joel 2:12-18
-psalm = Psalms 51:1-2,3-4,10-11,12,15
-gospel = Mat 6:1-6,16-18
+psalm = Psalms 51:3-4,5-6ab,12-13,14+17
+gospel = Matthew 6:1-6,16-18
[lent-after-ashes-wed-II]
first = Joel 2:12-18
-psalm = Psalms 51:1-2,3-4,10-11,12,15
-gospel = Mat 6:1-6,16-18
+psalm = Psalms 51:3-4,5-6ab,12-13,14+17
+gospel = Matthew 6:1-6,16-18
[lent-sunday-1-A]
first = Genesis 2:7-9;3:1-7
@@ -4854,3 +4850,153 @@ first = 2 Samuel 12:7-10,13
psalm = Psalms 32:1-2,5,7,11
second = Galatians 2:16,19-21
gospel = Luke 7:36-8:3
+
+[advent-dec-17-I]
+first = Genesis 49:2,8-10
+psalm = Psalms 72:1-2,3-4ab,7-8,17
+gospel = Matthew 1:1-17
+
+[advent-dec-17-II]
+first = Genesis 49:2,8-10
+psalm = Psalms 72:1-2,3-4ab,7-8,17
+gospel = Matthew 1:1-17
+
+[advent-dec-18-I]
+first = Jeremiah 23:5-8
+psalm = Psalms 72:1-2,12-13,18-19
+gospel = Matthew 1:18-24
+
+[advent-dec-18-II]
+first = Jeremiah 23:5-8
+psalm = Psalms 72:1-2,12-13,18-19
+gospel = Matthew 1:18-24
+
+[advent-dec-19-I]
+first = Judges 13:2-7,24-25a
+psalm = Psalms 71:3-4a,5-6ab,16-17
+gospel = Luke 1:5-25
+
+[advent-dec-19-II]
+first = Judges 13:2-7,24-25a
+psalm = Psalms 71:3-4a,5-6ab,16-17
+gospel = Luke 1:5-25
+
+[advent-dec-20-I]
+first = Isaiah 7:10-14
+psalm = Psalms 24:1-2,3-4ab,5-6
+gospel = Luke 1:26-38
+
+[advent-dec-20-II]
+first = Isaiah 7:10-14
+psalm = Psalms 24:1-2,3-4ab,5-6
+gospel = Luke 1:26-38
+
+[advent-dec-21-I]
+first = Song of Solomon 2:8-14
+psalm = Psalms 33:2-3,11-12,20-21
+gospel = Luke 1:39-45
+
+[advent-dec-21-II]
+first = Song of Solomon 2:8-14
+psalm = Psalms 33:2-3,11-12,20-21
+gospel = Luke 1:39-45
+
+[advent-dec-22-I]
+first = 1 Samuel 1:24-28
+psalm = 1 Samuel 2:1,4-5,6-7,8abcd
+gospel = Luke 1:46-56
+
+[advent-dec-22-II]
+first = 1 Samuel 1:24-28
+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
+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
+psalm = Psalms 25:4-5ab,8-9,10+14
+gospel = Luke 1:57-66
+
+[advent-dec-24-I]
+first = 2 Samuel 7:1-5,8b-12,14a,16
+psalm = Psalms 89:2-3,4-5,27+29
+gospel = Luke 1:67-79
+
+[advent-dec-24-II]
+first = 2 Samuel 7:1-5,8b-12,14a,16
+psalm = Psalms 89:2-3,4-5,27+29
+gospel = Luke 1:67-79
+
+[easter-octave-mon-I]
+first = The Acts 2:14,22-33
+psalm = Psalms 16:1-2a+5,7-8,9-10,11
+gospel = Matthew 28:8-15
+
+[easter-octave-mon-II]
+first = The Acts 2:14,22-33
+psalm = Psalms 16:1-2a+5,7-8,9-10,11
+gospel = Matthew 28:8-15
+
+[easter-octave-tue-I]
+first = The Acts 2:36-41
+psalm = Psalms 33:4-5,18-19,20+22
+gospel = John 20:11-18
+
+[easter-octave-tue-II]
+first = The Acts 2:36-41
+psalm = Psalms 33:4-5,18-19,20+22
+gospel = John 20:11-18
+
+[easter-octave-wed-I]
+first = The Acts 3:1-10
+psalm = Psalms 105:1-2,3-4,6-7,8-9
+gospel = Luke 24:13-35
+
+[easter-octave-wed-II]
+first = The Acts 3:1-10
+psalm = Psalms 105:1-2,3-4,6-7,8-9
+gospel = Luke 24:13-35
+
+[easter-octave-thu-I]
+first = The Acts 3:11-26
+psalm = Psalms 8:2ab+5,6-7,8-9
+gospel = Luke 24:35-48
+
+[easter-octave-thu-II]
+first = The Acts 3:11-26
+psalm = Psalms 8:2ab+5,6-7,8-9
+gospel = Luke 24:35-48
+
+[easter-octave-fri-I]
+first = The Acts 4:1-12
+psalm = Psalms 118:1-2+4,22-24,25-27a
+gospel = John 21:1-14
+
+[easter-octave-fri-II]
+first = The Acts 4:1-12
+psalm = Psalms 118:1-2+4,22-24,25-27a
+gospel = John 21:1-14
+
+[easter-octave-sat-I]
+first = The Acts 4:13-21
+psalm = Psalms 118:1+14-15ab,16-18,19-21
+gospel = Mark 16:9-15
+
+[easter-octave-sat-II]
+first = The Acts 4:13-21
+psalm = Psalms 118:1+14-15ab,16-18,19-21
+gospel = Mark 16:9-15
+
+[easter-6-thu-I]
+first = The Acts 18:1-8
+psalm = Psalms 98:1,2-3ab,3cd-4
+gospel = John 16:16-20
+
+[easter-6-thu-II]
+first = The Acts 18:1-8
+psalm = Psalms 98:1,2-3ab,3cd-4
+gospel = John 16:16-20
diff --git a/internal/caldata/of_test.go b/internal/caldata/of_test.go
index 91c9b59..086883a 100644
--- a/internal/caldata/of_test.go
+++ b/internal/caldata/of_test.go
@@ -85,3 +85,25 @@ func TestOFSundayCompleteReadings(t *testing.T) {
}
}
}
+
+func TestOFSeasonalFerials(t *testing.T) {
+ // Seasonal weekday ferials re-sourced from catholic-resources.org: an Easter
+ // weekday no longer contaminated, the Easter octave (was missing), and the
+ // date-based late-Advent days (Dec 17-24, keyed by date not by Advent week).
+ for _, tc := range []struct{ key, firstHas string }{
+ {"easter-3-mon-I", "Acts 6:8-15"}, // had 1 Cor 15 (contamination)
+ {"easter-octave-mon-I", "Acts 2:14"}, // was absent
+ {"advent-dec-17-I", "Genesis 49"},
+ {"advent-dec-24-I", "2 Samuel 7"},
+ } {
+ var first string
+ for _, r := range TemporalReadings("new", tc.key) {
+ if r.Part == "first" {
+ first = r.Citation
+ }
+ }
+ if !strings.Contains(first, tc.firstHas) {
+ t.Errorf("%s: first = %q, want containing %q", tc.key, first, tc.firstHas)
+ }
+ }
+}
diff --git a/internal/calendar/temporal.go b/internal/calendar/temporal.go
index ab1a742..dadae49 100644
--- a/internal/calendar/temporal.go
+++ b/internal/calendar/temporal.go
@@ -215,6 +215,11 @@ func temporal(date time.Time, sel Selection) temporalDay {
if sun {
return sundayDay(Advent, "advent-sunday-"+itoa(week), col, week)
}
+ // From Dec 17 the weekday readings are proper to the DATE (the "O Antiphons"
+ // days), not the Advent week, so key them by date rather than by week-day.
+ if privFeria && date.Day() <= 24 {
+ return ferialDay(Advent, "advent-dec-"+itoa(date.Day()), Violet, week, true)
+ }
return ferialDay(Advent, "advent-"+itoa(week)+"-"+weekdayAbbr(wd), Violet, week, privFeria)
case !date.Before(christmasThis): // Dec 25..Dec 31 — Christmas octave
diff --git a/internal/config/config.go b/internal/config/config.go
index d631c73..9ec37fe 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -63,7 +63,7 @@ const configHeader = `# lectio configuration (INI). Full-line comments only (# o
// Version is lectio's release version, shared by every binary's
// -v/--version output (lectio, lectio-ui, lectio-web).
-const Version = "0.42.0"
+const Version = "0.43.0"
// validVersions are the five scripture versions lectio understands.
var validVersions = map[string]bool{
diff --git a/scripts/genlect-of-season-ferials-cr.py b/scripts/genlect-of-season-ferials-cr.py
new file mode 100644
index 0000000..13c56a3
--- /dev/null
+++ b/scripts/genlect-of-season-ferials-cr.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+"""Re-source the Ordinary Form SEASONAL weekday (ferial) lectionary -- the proper
+weekdays of Advent (weeks 1-3), Lent, and Eastertide -- from catholic-resources.org
+(Fr. Felix Just, S.J.). These are single-cycle (the same every year), so both the
+-I and -II weekday-cycle keys get identical readings.
+
+Fixes niedziela-harvest defects found by diffing: contaminated Easter weekday
+first readings (easter-3-mon had 1 Cor 15 instead of Acts 6:8-15), the missing
+Easter-octave weekdays, and stray psalm-numbering artifacts. The DATE-based days
+(late Advent Dec 17-24 and the Christmas weekdays) are handled elsewhere.
+
+Scripture citations only; text rendered from the public-domain corpora. See NOTICE.
+Requires network. python3 scripts/genlect-of-season-ferials-cr.py
+"""
+import re, sys, html, urllib.request
+
+INI = "internal/caldata/of-lectionary.ini"
+PAGES = ["Weekdays-AdventChristmas", "Weekdays-Lent", "Weekdays-Easter"]
+BASE = "https://www.catholic-resources.org/Lectionary/2002USL-{}.htm"
+WD = {"m": "mon", "mon": "mon", "monday": "mon", "t": "tue", "tue": "tue", "tues": "tue", "tuesday": "tue",
+ "w": "wed", "wed": "wed", "wednesday": "wed", "th": "thu", "thu": "thu", "thurs": "thu", "thursday": "thu",
+ "f": "fri", "fri": "fri", "friday": "fri", "s": "sat", "sat": "sat", "saturday": "sat"}
+
+BOOK = {}
+def reg(full, *al):
+ for a in al: BOOK[a.lower().replace(".", "").strip()] = full
+reg("Genesis","gen");reg("Exodus","exod","ex");reg("Leviticus","lev");reg("Numbers","num")
+reg("Deuteronomy","deut");reg("Joshua","josh");reg("Judges","judg");reg("Ruth","ruth")
+reg("1 Samuel","1 sam");reg("2 Samuel","2 sam");reg("1 Kings","1 kgs");reg("2 Kings","2 kgs")
+reg("1 Chronicles","1 chr");reg("2 Chronicles","2 chr");reg("Ezra","ezra");reg("Nehemiah","neh")
+reg("Tobit","tob");reg("Judith","jdt");reg("Esther","esth");reg("1 Maccabees","1 macc");reg("2 Maccabees","2 macc","2 mac")
+reg("Job","job");reg("Psalms","ps","pss");reg("Proverbs","prov");reg("Ecclesiastes","eccl")
+reg("Song of Solomon","song","cant","songs");reg("Wisdom","wis");reg("Sirach","sir")
+reg("Isaiah","isa","is");reg("Jeremiah","jer");reg("Lamentations","lam");reg("Baruch","bar")
+reg("Ezekiel","ezek","ez");reg("Daniel","dan");reg("Hosea","hos");reg("Joel","joel");reg("Amos","amos")
+reg("Obadiah","obad");reg("Jonah","jonah","jon");reg("Micah","mic","micah");reg("Nahum","nah");reg("Habakkuk","hab")
+reg("Zephaniah","zeph");reg("Haggai","hag");reg("Zechariah","zech","zac");reg("Malachi","mal")
+reg("Matthew","matt","mat","mt");reg("Mark","mark");reg("Luke","luke");reg("John","john","jn")
+reg("The Acts","acts","act");reg("Romans","rom");reg("1 Corinthians","1 cor");reg("2 Corinthians","2 cor")
+reg("Galatians","gal");reg("Ephesians","eph");reg("Philippians","phil");reg("Colossians","col")
+reg("1 Thessalonians","1 thess");reg("2 Thessalonians","2 thess");reg("1 Timothy","1 tim");reg("2 Timothy","2 tim")
+reg("Titus","titus");reg("Philemon","phlm");reg("Hebrews","heb","hebr");reg("James","jas")
+reg("1 Peter","1 pet","1 petr");reg("2 Peter","2 pet");reg("1 John","1 john");reg("2 John","2 john");reg("3 John","3 john")
+reg("Jude","jude");reg("Revelation","rev","apoc")
+for _f in list(set(BOOK.values())): BOOK.setdefault(_f.lower(), _f)
+
+def st(s):
+ return html.unescape(re.sub(r"<[^>]+>", "", s)).replace("\xa0", " ").replace("\n", " ").replace("\r", " ").strip()
+
+def clean_cite(raw):
+ s = st(raw)
+ s = re.sub(r"[†‡*]", "", s) # dagger/star alternate-reading markers
+ s = re.sub(r"[–—]", "-", s)
+ s = re.sub(r"\([^)]*\)", "", s)
+ s = re.sub(r"\s+and\s+.*", "", s) # Ash Wed lists 2nd reading after "and" -> drop for first
+ s = re.split(r"\s+or\b", s, maxsplit=1)[0]
+ s = re.sub(r"^(cf\.?|see)\s+", "", s.strip(), flags=re.I).strip().strip(";,").strip()
+ m = re.match(r"((?:[1-4]\s+)?[A-Za-z][A-Za-z]*)\.?\s*(.*)", s)
+ if not m: return ""
+ full = BOOK.get(m.group(1).lower().strip())
+ if not full:
+ sys.stderr.write(f" ! unknown book {m.group(1)!r} in {raw!r}\n"); return ""
+ return f"{full} {re.sub(r',\s+', ',', m.group(2)).replace(' ', '')}".strip()
+
+def slug_of(day):
+ d = re.sub(r"\s+", " ", st(day).lower())
+ m = re.match(r"december (\d+)", d) # late Advent Dec 17-24: proper to the date
+ if m and 17 <= int(m.group(1)) <= 24: return "advent-dec-" + m.group(1)
+ if "ash wednesday" in d: return "lent-after-ashes-wed"
+ m = re.match(r"(thursday|friday|saturday) after ash", d)
+ if m: return "lent-after-ashes-" + WD[m.group(1)]
+ m = re.search(r"octave of easter\s*[-–—]\s*(\w+)", d)
+ if m and m.group(1) in WD: return "easter-octave-" + WD[m.group(1)]
+ m = re.search(r"(\d+)\w* week of (advent|lent|easter)\s*[-–—]\s*(\w+)", d)
+ if m and m.group(3) in WD: return f"{m.group(2)}-{m.group(1)}-" + WD[m.group(3)]
+ return None # date-based (Dec 17-24, Christmas weekdays): handled by the temporal engine, not here
+
+def firstbook(c):
+ m = re.match(r"((?:[1-4] )?[A-Za-z ]+?) (\d+)", c or "")
+ return f"{m.group(1)} {m.group(2)}" if m else (c or "")
+
+def main():
+ cr = {}
+ for p in PAGES:
+ req = urllib.request.Request(BASE.format(p), headers={"User-Agent": "Mozilla/5.0 (X11; Linux) lectio"})
+ h = urllib.request.urlopen(req, timeout=60).read().decode("utf-8", "replace")
+ n = 0
+ for tr in re.split(r"<tr\b", h):
+ c = [x for x in re.findall(r"<td\b[^>]*>(.*?)</td>", tr, re.S)]
+ if len(c) < 6: continue
+ slug = slug_of(c[2])
+ if not slug: continue
+ cr[slug] = {"first": clean_cite(c[3]), "psalm": clean_cite(c[4]), "gospel": clean_cite(c[-1])}
+ n += 1
+ sys.stderr.write(f"{p}: {n} week-based seasonal ferials\n")
+
+ text = open(INI).read()
+ head = text[:text.index("\n[")]
+ blocks, order = {}, []
+ for b in re.split(r"\n(?=\[)", text[text.index("\n[") + 1:]):
+ k = re.match(r"\[(.+?)\]", b)
+ key = k.group(1) if k else b
+ blocks[key] = b.rstrip("\n"); order.append(key)
+
+ changed = firstdiff = added = 0
+ for slug, p in cr.items():
+ if not (p["first"] and p["gospel"]):
+ continue
+ for cyc in ("I", "II"): # seasonal ferials are single-cycle
+ key = f"{slug}-{cyc}"
+ old = dict(re.findall(r"^(\w+)\s*=\s*(.+)$", blocks.get(key, ""), re.M))
+ if cyc == "I" and old.get("first") and firstbook(old["first"]) != firstbook(p["first"]):
+ firstdiff += 1
+ sys.stderr.write(f" ~ {slug}: first {old['first']!r} -> {p['first']!r}\n")
+ block = f"[{key}]\n" + "\n".join(f"{part} = {p[part]}" for part in ("first", "psalm", "gospel") if p[part])
+ if key not in blocks:
+ order.append(key); added += 1
+ else:
+ changed += 1
+ blocks[key] = block
+ open(INI, "w").write(head.rstrip("\n") + "\n\n" + "\n\n".join(blocks[k] for k in order) + "\n")
+ sys.stderr.write(f"\nseasonal ferials: {changed} replaced, {added} new, {firstdiff} first-book changes\n")
+
+if __name__ == "__main__":
+ main()
generated by cgit v1.3 (git 2.53.0) at 2026-09-19 20:24:54 +0000