chore(of): extend lectionary harvest to 2018-2025 (98.4% coverage)

More true-ferial years per position; 359/365 days of 2026 now resolve. The 6
residual gaps are rare pre-Lent Ordinary-Time positions (weeks 3/4/9) that never
occurred as a true ferial in the harvestable past (niedziela publishes no future
years) -- an irreducible limit of date-based harvesting, documented.

2 files changed, 299 insertions, 232 deletions

diff --git a/internal/caldata/of-lectionary.ini b/internal/caldata/of-lectionary.ini
index b0187d0..c8bb117 100644
--- a/internal/caldata/of-lectionary.ini
+++ b/internal/caldata/of-lectionary.ini
@@ -124,64 +124,66 @@ psalm = Psalms 103:1-2,3-4,8,10
 gospel = Mat 11:28-30
 
 [advent-3-fri-I]
-first = Jeremiah 23:5-8
-psalm = Psalms 72:1-2,12-13,18-19ab
-gospel = Mat 1:18-24
+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
 
 [advent-3-fri-II]
+first = Isaiah 7:10-14
+psalm = Psalms 24:1-2,3-4,5-6
+gospel = Luke 1:26-38
+
+[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
 
-[advent-3-mon-I]
+[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
 
-[advent-3-mon-II]
-first = Jeremiah 23:5-8
-psalm = Psalms 72:1-2,12-13,18-19ab
-gospel = Mat 1:18-24
-
 [advent-3-sat-I]
+first = 1 Samuel 1:24-28
+psalm = 1 Samuel 2:1bcde,4-5,6-7,8abcd
+gospel = Luke 1:46-56
+
+[advent-3-sat-II]
+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
+
+[advent-3-thu-I]
+first = Isaiah 7:10-14
+psalm = Psalms 24:1-2,3-4,5-6
+gospel = Luke 1:26-38
+
+[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
 
-[advent-3-sat-II]
+[advent-3-tue-I]
 first = Jeremiah 23:5-8
 psalm = Psalms 72:1-2,12-13,18-19ab
 gospel = Mat 1:18-24
 
-[advent-3-thu-I]
+[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
 
-[advent-3-thu-II]
-first = Isaiah 54:1-10
-psalm = Psalms 30:1,3,4-5,10-11,12
-gospel = Luke 7:24-30
-
-[advent-3-tue-I]
-first = Zephaniah 3:1-2,9-13
-psalm = Psalms 34:1-2,5-6,16-17,18,22
-gospel = Mat 21:28-32
-
-[advent-3-tue-II]
+[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
 
-[advent-3-wed-I]
-first = Isaiah 45:6-8,18,21-25
-psalm = Psalms 85:8ab,9,10-11,12-13
-gospel = Luke 7:18-23
-
 [advent-3-wed-II]
-first = Isaiah 45:6-8,18,21-25
-psalm = Psalms 85:8ab,9,10-11,12-13
-gospel = Luke 7:18-23
+first = Jeremiah 23:5-8
+psalm = Psalms 72:1-2,12-13,18-19ab
+gospel = Mat 1:18-24
 
 [advent-4-fri-I]
 first = Malachi 3:1-4,23-24
@@ -194,15 +196,14 @@ psalm = Psalms 89:1-2,3-4,26,28
 gospel = Luke 1:67-79
 
 [advent-4-mon-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 = 2 Samuel 7:1-5,8-12,14,16
+psalm = Psalms 89:1-2,3-4,26,28
+gospel = Luke 1:67-79
 
 [advent-4-mon-II]
-first = Isaiah 7:10-14
-psalm = Psalms 24:1-2,3-4,5-6
-gospel = Luke 1:26-38
+first = Malachi 3:1-4,23-24
+psalm = Psalms 25:4-5,8-9,10,14
+gospel = Luke 1:57-66
 
 [advent-4-sat-I]
 first = 2 Samuel 7:1-5,8-12,14,16
@@ -225,10 +226,9 @@ psalm = 1 Samuel 2:1bcde,4-5,6-7,8abcd
 gospel = Luke 1:46-56
 
 [advent-4-tue-II]
-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 = 2 Samuel 7:1-5,8-12,14,16
+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
@@ -256,9 +256,9 @@ psalm = Psalms 25:4-5,8-9,10,14
 gospel = Luke 21:25-28,34-36
 
 [advent-sunday-2-A]
-first = Isaiah 11:1-10
-psalm = Psalms 72:1-2,7-8,12-13,17
-gospel = Mat 3:1-12
+first = Genesis 3:9-15,20
+psalm = Psalms 98:1bcde,2-3,3-4
+gospel = Luke 1:26-38
 
 [advent-sunday-2-B]
 first = Isaiah 40:1-5,9-11
@@ -354,9 +354,9 @@ psalm = Psalms 40:6-7,7-9,10
 gospel = Luke 1:26-38
 
 [annunciation-of-the-lord-B]
-first = Isaiah 7:10-14;8:10
-psalm = Psalms 40:6-7,7-9,10
-gospel = Luke 1:26-38
+first = Isaiah 42:1-7
+psalm = Psalms 27:1bcde,2,3,13-14
+gospel = John 12:1-11
 
 [annunciation-of-the-lord-C]
 first = Isaiah 7:10-14;8:10
@@ -434,9 +434,9 @@ psalm = Psalms 71:1-2,3-4,5-6ab,15ab,17
 gospel = Luke 1:5-17
 
 [birth-of-saint-john-the-baptist-C]
-first = Ezekiel 34:11-16
-psalm = Psalms 23:1-3,3-4,5,6
-gospel = Luke 15:3-7
+first = Jeremiah 1:4-10
+psalm = Psalms 71:1-2,3-4,5-6ab,15ab,17
+gospel = Luke 1:5-17
 
 [birth-of-the-blessed-virgin-mary-A]
 first = Micah 5:1-4
@@ -477,14 +477,14 @@ psalm = Psalms 23:1-2,2-3,5,6
 gospel = Mat 25:31-46
 
 [christ-the-king-B]
-first = Daniel 7:13-14
-psalm = Psalms 93:1,2,5
-gospel = John 18:33-37
+first = Revelation 10:8-11
+psalm = Psalms 119:14,24,72,103,111,131
+gospel = Luke 19:45-48
 
 [christ-the-king-C]
-first = 2 Samuel 5:1-3
-psalm = Psalms 122:1-2,4-5
-gospel = Luke 23:35-43
+first = 1 Maccabees 6:1-13
+psalm = Psalms 9:2-3,4,6,16,19
+gospel = Luke 20:27-40
 
 [christmas-A]
 first = Isaiah 62:1-5
@@ -502,19 +502,19 @@ psalm = Psalms 89:3-4,15-16,26,28
 gospel = Mat 1:18-25
 
 [christmas-fri-I]
-first = 1 John 4:7-10
-psalm = Psalms 72:1-2,3-4,7-8
-gospel = Mark 6:34-44
+first = 1 John 3:7-10
+psalm = Psalms 98:1bcde,7-8,9
+gospel = John 1:35-42
 
 [christmas-fri-II]
-first = 1 John 2:29-3:6
-psalm = Psalms 98:1bcde,3-4,5-6
-gospel = John 1:29-34
+first = 1 John 3:11-21
+psalm = Psalms 100:2-3,4-5
+gospel = John 1:43-51
 
 [christmas-mon-I]
-first = 1 John 3:7-10
-psalm = Psalms 98:1bcde,7-8,9
-gospel = John 1:35-42
+first = 1 John 3:22-4:6
+psalm = Psalms 2:7-8,10-12
+gospel = Mat 4:12-17,23-25
 
 [christmas-mon-II]
 first = 1 John 2:29-3:6
@@ -527,20 +527,20 @@ psalm = Psalms 96:1-2,11-12,13
 gospel = John 1:1-5,9-14
 
 [christmas-octave-mon-I]
+first = 1 John 2:18-21
+psalm = Psalms 96:1-2,11-12,13
+gospel = John 1:1-5,9-14
+
+[christmas-octave-mon-II]
 first = 1 John 2:12-17
 psalm = Psalms 96:7-8,9-10
 gospel = Luke 2:36-40
 
-[christmas-octave-mon-II]
+[christmas-octave-sat-I]
 first = 1 John 2:3-11
 psalm = Psalms 96:1-2,3,5,6
 gospel = Luke 2:22-35
 
-[christmas-octave-sat-I]
-first = 1 John 2:18-21
-psalm = Psalms 96:1-2,11-12,13
-gospel = John 1:1-5,9-14
-
 [christmas-octave-sat-II]
 first = 1 John 2:12-17
 psalm = Psalms 96:7-8,9-10
@@ -562,9 +562,9 @@ psalm = Psalms 96:1-2,3,5,6
 gospel = Luke 2:22-35
 
 [christmas-octave-tue-II]
-first = 1 John 2:12-17
-psalm = Psalms 96:7-8,9-10
-gospel = Luke 2:36-40
+first = 1 John 2:18-21
+psalm = Psalms 96:1-2,11-12,13
+gospel = John 1:1-5,9-14
 
 [christmas-octave-wed-I]
 first = 1 John 2:12-17
@@ -577,9 +577,9 @@ psalm = Psalms 96:1-2,3,5,6
 gospel = Luke 2:22-35
 
 [christmas-sat-I]
-first = 1 John 4:11-18
-psalm = Psalms 72:1-2,10-11,12-13
-gospel = Mark 6:45-52
+first = 1 John 3:11-21
+psalm = Psalms 100:2-3,4-5
+gospel = John 1:43-51
 
 [christmas-sat-II]
 first = 1 John 3:7-10
@@ -602,19 +602,19 @@ psalm = Psalms 147B:12-13,14-15,19-20
 gospel = John 1:1-5,9-14
 
 [christmas-thu-I]
-first = 1 John 3:22-4:6
-psalm = Psalms 2:7-8,10-12
-gospel = Mat 4:12-17,23-25
+first = 1 John 2:29-3:6
+psalm = Psalms 98:1bcde,3-4,5-6
+gospel = John 1:29-34
 
 [christmas-thu-II]
-first = 1 John 4:11-18
-psalm = Psalms 72:1-2,10-11,12-13
-gospel = Mark 6:45-52
+first = 1 John 3:7-10
+psalm = Psalms 98:1bcde,7-8,9
+gospel = John 1:35-42
 
 [christmas-tue-I]
-first = 1 John 3:11-21
-psalm = Psalms 100:2-3,4-5
-gospel = John 1:43-51
+first = 1 John 4:7-10
+psalm = Psalms 72:1-2,3-4,7-8
+gospel = Mark 6:34-44
 
 [christmas-tue-II]
 first = 1 John 3:22-4:6
@@ -622,14 +622,14 @@ psalm = Psalms 2:7-8,10-12
 gospel = Mat 4:12-17,23-25
 
 [christmas-wed-I]
-first = 1 John 3:7-10
-psalm = Psalms 98:1bcde,7-8,9
-gospel = John 1:35-42
+first = 1 John 4:11-18
+psalm = Psalms 72:1-2,10-11,12-13
+gospel = Mark 6:45-52
 
 [christmas-wed-II]
-first = 1 John 4:7-10
-psalm = Psalms 72:1-2,3-4,7-8
-gospel = Mark 6:34-44
+first = 1 John 2:29-3:6
+psalm = Psalms 98:1bcde,3-4,5-6
+gospel = John 1:29-34
 
 [corpus-christi-A]
 first = Deuteronomy 8:2-3,14-16
@@ -677,9 +677,9 @@ psalm = Psalms 2:1-2,3-4,5-6,7-8
 gospel = John 3:1-8
 
 [easter-2-mon-II]
-first = Acts 4:23-31
-psalm = Psalms 2:1-2,3-4,5-6,7-8
-gospel = John 3:1-8
+first = Isaiah 7:10-14;8:10
+psalm = Psalms 40:6-7,7-9,10
+gospel = Luke 1:26-38
 
 [easter-2-sat-I]
 first = Acts 6:1-7
@@ -697,15 +697,15 @@ psalm = Psalms 34:1,8,16-17,18-19
 gospel = John 3:31-36
 
 [easter-2-thu-II]
+first = Acts 5:27-33
+psalm = Psalms 34:1,8,16-17,18-19
+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
 
-[easter-2-tue-I]
-first = Acts 4:32-37
-psalm = Psalms 93:1,2,5
-gospel = John 3:7-15
-
 [easter-2-tue-II]
 first = Acts 4:32-37
 psalm = Psalms 93:1,2,5
@@ -722,9 +722,9 @@ psalm = Psalms 34:1-2,3-4,5-6,7-8
 gospel = John 3:16-21
 
 [easter-3-fri-I]
-first = Acts 1:3-8
-psalm = Psalms 126:1-2,2-3,4-5,6
-gospel = John 12:24-26
+first = Acts 9:1-20
+psalm = Psalms 117:1-2
+gospel = John 6:52-59
 
 [easter-3-fri-II]
 first = Acts 9:1-20
@@ -732,9 +732,9 @@ psalm = Psalms 117:1-2
 gospel = John 6:52-59
 
 [easter-3-mon-I]
-first = Acts 6:8-15
-psalm = Psalms 119:23-24,26-27,29-30
-gospel = John 6:22-29
+first = 1 Corinthians 15:1-8
+psalm = Psalms 19:1-2,3-4
+gospel = John 14:6-14
 
 [easter-3-mon-II]
 first = Acts 6:8-15
@@ -772,9 +772,9 @@ psalm = Psalms 31:2-3,5,6,7,16,20ab
 gospel = John 6:30-35
 
 [easter-3-wed-I]
-first = Acts 8:1-8
-psalm = Psalms 66:1-3,4-5,6-7
-gospel = John 6:35-40
+first = Acts 20:17-18,28-32,36
+psalm = Psalms 100:2-3,4-5
+gospel = John 10:11-16
 
 [easter-3-wed-II]
 first = Acts 8:1-8
@@ -787,9 +787,9 @@ psalm = Psalms 2:6-7,8-9,10-12
 gospel = John 14:1-6
 
 [easter-4-fri-II]
-first = Acts 20:17-18,28-32,36
-psalm = Psalms 100:2-3,4-5
-gospel = John 10:11-16
+first = Acts 13:26-33
+psalm = Psalms 2:6-7,8-9,10-12
+gospel = John 14:1-6
 
 [easter-4-mon-I]
 first = Acts 11:1-18
@@ -797,9 +797,9 @@ psalm = Psalms 42:1-2;Ps42(41):2,3
 gospel = John 10:11-18
 
 [easter-4-mon-II]
-first = Acts 11:1-18
-psalm = Psalms 42:1-2;Ps42(41):2,3
-gospel = John 10:11-18
+first = Acts 1:3-8
+psalm = Psalms 126:1-2,2-3,4-5,6
+gospel = John 12:24-26
 
 [easter-4-sat-I]
 first = Acts 13:44-52
@@ -812,9 +812,10 @@ psalm = Psalms 98:1bcde,2-3,3-4
 gospel = John 14:7-14
 
 [easter-4-thu-I]
-first = Acts 13:13-25
-psalm = Psalms 89:1-2,20-21,24,26
-gospel = John 13:16-20
+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
 
 [easter-4-thu-II]
 first = Acts 13:13-25
@@ -852,9 +853,9 @@ psalm = Psalms 57:7,9,10-11
 gospel = John 15:12-17
 
 [easter-5-mon-I]
-first = Acts 20:17-18,28-32,36
-psalm = Psalms 100:2-3,4-5
-gospel = John 10:11-16
+first = Acts 14:5-18
+psalm = Psalms 115(113B):1-2,3-4,15-16
+gospel = John 14:21-26
 
 [easter-5-mon-II]
 first = Acts 14:5-18
@@ -862,20 +863,19 @@ psalm = Psalms 115(113B):1-2,3-4,15-16
 gospel = John 14:21-26
 
 [easter-5-sat-I]
-first = Acts 20:17-18,28-32,36
+first = Acts 16:1-10
 psalm = Psalms 100:2-3,4-5
-gospel = John 10:11-16
+gospel = John 15:18-21
 
 [easter-5-sat-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 = Acts 16:1-10
+psalm = Psalms 100:2-3,4-5
+gospel = John 15:18-21
 
 [easter-5-thu-I]
-first = 1 Corinthians 15:1-8
-psalm = Psalms 19:1-2,3-4
-gospel = John 14:6-14
+first = Acts 15:7-21
+psalm = Psalms 96:1-2,2-3,10
+gospel = John 15:9-11
 
 [easter-5-thu-II]
 first = Acts 15:7-21
@@ -938,9 +938,9 @@ psalm = Psalms 138:1-2,2-3,7e-8
 gospel = John 16:5-11
 
 [easter-6-tue-II]
-first = Acts 16:22-34
-psalm = Psalms 138:1-2,2-3,7e-8
-gospel = John 16:5-11
+first = Acts 20:17-18,28-32,36
+psalm = Psalms 100:2-3,4-5
+gospel = John 10:11-16
 
 [easter-6-wed-I]
 first = Acts 17:15,22-18:1
@@ -997,15 +997,21 @@ first = Acts 20:17-27
 psalm = Psalms 68:9-10,19-20
 gospel = John 17:1-11
 
+[easter-7-tue-II]
+first = Acts 20:17-27
+psalm = Psalms 68:9-10,19-20
+gospel = John 17:1-11
+
 [easter-7-wed-I]
 first = Acts 20:28-38
 psalm = Psalms 68:28-29,32-34,34bc,35bc
 gospel = John 17:11-19
 
 [easter-7-wed-II]
-first = Acts 20:28-38
-psalm = Psalms 68:28-29,32-34,34bc,35bc
-gospel = John 17:11-19
+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
 
 [easter-octave-fri-A]
 first = Acts 4:1-12
@@ -1278,9 +1284,9 @@ psalm = Psalms 69:7-9,20-21,30,32-33
 gospel = Mat 26:14-25
 
 [immaculate-conception-of-the-blessed-virgin-mary-A]
-first = Genesis 3:9-15,20
-psalm = Psalms 98:1bcde,2-3,3-4
-gospel = Luke 1:26-38
+first = Isaiah 35:1-10
+psalm = Psalms 85:8ab,9,10-11,12-13
+gospel = Luke 5:17-26
 
 [immaculate-conception-of-the-blessed-virgin-mary-B]
 first = Genesis 3:9-15,20
@@ -1408,10 +1414,9 @@ psalm = Psalms 51:1-2,10-11,16-17
 gospel = Luke 11:29-32
 
 [lent-1-wed-II]
-first = Sirach 51:13-20
-psalm = Psalms 15:1-2,3,4,4-5
-second = Philippians 3:8-14
-gospel = John 15:9-17
+first = Jonah 3:1-10
+psalm = Psalms 51:1-2,10-11,16-17
+gospel = Luke 11:29-32
 
 [lent-2-fri-I]
 first = Genesis 37:3-4,12-13,17-28
@@ -1444,10 +1449,9 @@ psalm = Psalms 103:1-2,3-4,9-10,11-12
 gospel = Luke 15:1-3.11-32
 
 [lent-2-thu-I]
-first = Sirach 51:13-20
-psalm = Psalms 15:1-2,3,4,4-5
-second = Philippians 3:8-14
-gospel = John 15:9-17
+first = Jeremiah 17:5-10
+psalm = Psalms 1:1-2,3,4,6
+gospel = Luke 16:19-31
 
 [lent-2-thu-II]
 first = Jeremiah 17:5-10
@@ -1930,6 +1934,11 @@ first = Tobit 11:5-18
 psalm = Psalms 146:1-2,6-7,8-9,9-10
 gospel = Mark 12:35-37
 
+[ordinary-10-mon-II]
+first = 2 Peter 1:2-7
+psalm = Psalms 91:1-2,14-15,15-16
+gospel = Mark 12:1-12
+
 [ordinary-10-sat-I]
 first = Tobit 12:1,5-15,20
 psalm = Tobit 13:2abcde,6,7,8
@@ -1941,10 +1950,9 @@ psalm = Psalms 71:8-9,14-15,16-17
 gospel = Mark 12:38-44
 
 [ordinary-10-thu-II]
-first = Genesis 22:9-18
-psalm = Psalms 40:6-7,7-8,9-10,16
-second = Hebrews 10:4-10
-gospel = Mat 26:36-42
+first = 2 Timothy 2:8-15
+psalm = Psalms 25:4-5,8-9,10,14
+gospel = Mark 12:28-34
 
 [ordinary-10-tue-I]
 first = Tobit 2:9-14
@@ -1961,15 +1969,26 @@ first = Tobit 3:1-11,16-17
 psalm = Psalms 25:2-3,4-5,6,7bc,8-9
 gospel = Mark 12:18-27
 
+[ordinary-10-wed-II]
+first = 2 Timothy 1:1-3,6-12
+psalm = Psalms 123:1-2
+gospel = Mark 12:18-27
+
+[ordinary-11-fri-I]
+first = 2 Corinthians 4:7-15
+psalm = Psalms 116B(115):10-11,15-16,17-18
+gospel = Mat 5:27-32
+
 [ordinary-11-fri-II]
 first = 1 Kings 19:9,11-16
 psalm = Psalms 27:7-8,8-9,13-14
 gospel = Mat 5:27-32
 
 [ordinary-11-mon-I]
-first = 2 Corinthians 1:1-7
-psalm = Psalms 34:1-2,3-4,5-6,7-8
-gospel = Mat 5:1-12
+first = Genesis 3:9-15,20
+psalm = Psalms 87:1-3,5-7
+second = Acts 1:12-14
+gospel = John 19:25-34
 
 [ordinary-11-mon-II]
 first = 1 Kings 17:1-6
@@ -1981,11 +2000,21 @@ first = Isaiah 61:9-11
 psalm = 1 Samuel 2:1bcde,4-5,6-7,8abcd
 gospel = Luke 2:41-51
 
+[ordinary-11-sat-II]
+first = 1 Kings 19:19-21
+psalm = Psalms 16:1-2,5,7-8,9-10
+gospel = Mat 5:33-37
+
 [ordinary-11-thu-I]
 first = 2 Corinthians 3:15-4:1,3-6
 psalm = Psalms 85:8ab,9,10-11,12-13
 gospel = Mat 5:20-26
 
+[ordinary-11-thu-II]
+first = 1 Kings 18:41-46
+psalm = Psalms 65:9abcd,9e-10,11-12
+gospel = Mat 5:20-26
+
 [ordinary-11-tue-I]
 first = 2 Corinthians 1:18-22
 psalm = Psalms 119:129-130,131-132,133,135
@@ -2032,9 +2061,9 @@ psalm = Psalms 34:7-8,9-10,11-12
 gospel = Mat 6:24-34
 
 [ordinary-12-sat-II]
-first = Isaiah 61:9-11
-psalm = 1 Samuel 2:1bcde,4-5,6-7,8abcd
-gospel = Luke 2:41-51
+first = 2 Chronicles 24:17-25
+psalm = Psalms 89:3-4,28-29,30-31,32-33
+gospel = Mat 6:24-34
 
 [ordinary-12-thu-I]
 first = 2 Corinthians 11:1-11
@@ -2133,9 +2162,9 @@ psalm = Psalms 106:1-2,3-4,4-5
 gospel = Mat 9:9-13
 
 [ordinary-14-fri-II]
-first = Amos 8:4-6,9-12
-psalm = Psalms 119:2,10,20,30,40,131
-gospel = Mat 9:9-13
+first = Isaiah 58:6-10
+psalm = Psalms 98:1bcde,2-3,3-4,5-6
+gospel = John 4:34-38
 
 [ordinary-14-mon-I]
 first = Genesis 18:16-33
@@ -2223,9 +2252,9 @@ psalm = Psalms 105:16-17,18-19,20-21
 gospel = Mat 10:7-15
 
 [ordinary-15-thu-II]
-first = Hosea 11:1-4,8-9
-psalm = Psalms 80:1ac,2,14-15
-gospel = Mat 10:7-15
+first = Isaiah 52:7-10
+psalm = Psalms 96:1-2,3,6,7-8,i10ac
+gospel = John 15:9-17
 
 [ordinary-15-tue-I]
 first = Genesis 32:23-32,33
@@ -2323,9 +2352,9 @@ psalm = Exodus 15:1-2,3-4,5-6
 gospel = Mat 12:38-42
 
 [ordinary-17-mon-II]
-first = Micah 6:1-4,6-8
-psalm = Psalms 50:5-6,8-9,16-17,21,23
-gospel = Mat 12:38-42
+first = Galatians 2:19-20
+psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
+gospel = John 15:1-8
 
 [ordinary-17-sat-I]
 first = Exodus 24:3-8
@@ -2333,9 +2362,9 @@ psalm = Psalms 50:1-2,5-6,14-15
 gospel = Mat 13:24-30
 
 [ordinary-17-sat-II]
-first = Galatians 2:19-20
-psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
-gospel = John 15:1-8
+first = Jeremiah 7:1-11
+psalm = Psalms 84:2-3,4-5,7,10
+gospel = Mat 13:24-30
 
 [ordinary-17-thu-I]
 first = Exodus 19:1-2,9-11,16-20
@@ -2348,9 +2377,9 @@ psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
 gospel = John 15:1-8
 
 [ordinary-17-tue-I]
-first = Exodus 14:21-15:1
-psalm = Exodus 15:8-9,10,12,17
-gospel = Mat 12:46-50
+first = Galatians 2:19-20
+psalm = Psalms 34:1-2,3-4,5-6,7-8,9-10
+gospel = John 15:1-8
 
 [ordinary-17-tue-II]
 first = Micah 7:14-15,18-20
@@ -2427,6 +2456,11 @@ first = Jeremiah 15:10,16-21
 psalm = Psalms 59:1-2,3-4,9-10,16
 gospel = Mat 13:44-46
 
+[ordinary-19-fri-I]
+first = Hosea 2:16,17,21-22
+psalm = Psalms 45:10-11,13-14,15-16
+gospel = Mat 25:1-13
+
 [ordinary-19-fri-II]
 first = Nahum 2:1,3;3:1-3,6-7
 psalm = Deuteronomy 32:35-36,39abcd,41
@@ -2452,6 +2486,11 @@ first = Numbers 20:1-13
 psalm = Psalms 95:1-2,6-7,7d-9
 gospel = Mat 16:13-23
 
+[ordinary-19-thu-II]
+first = Hosea 2:16,17,21-22
+psalm = Psalms 45:10-11,13-14,15-16
+gospel = Mat 25:1-13
+
 [ordinary-19-tue-I]
 first = Numbers 12:1-13
 psalm = Psalms 51:1-2,3-4,4-5,10-11
@@ -2463,9 +2502,9 @@ psalm = Psalms 102:15-16,17-18,19-20,28,21-22
 gospel = Mat 15:1-2,10-14
 
 [ordinary-19-wed-I]
-first = Hosea 2:16,17,21-22
-psalm = Psalms 45:10-11,13-14,15-16
-gospel = Mat 25:1-13
+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
 
 [ordinary-19-wed-II]
 first = Jeremiah 31:1-7
@@ -2544,9 +2583,9 @@ second = Ezekiel 16:59-63
 gospel = Mat 19:3-12
 
 [ordinary-20-mon-I]
-first = Hosea 2:16,17,21-22
-psalm = Psalms 45:10-11,13-14,15-16
-gospel = Mat 25:1-13
+first = Deuteronomy 10:12-22
+psalm = Psalms 147B:12-13,14-15,19-20
+gospel = Mat 17:22-27
 
 [ordinary-20-mon-II]
 first = Ezekiel 1:2-5,24-28
@@ -2619,6 +2658,11 @@ psalm = Psalms 48:1-2,8,9-10,12,13,14
 second = Isaiah 2:2-5
 gospel = John 2:1-11
 
+[ordinary-21-sat-II]
+first = Ezekiel 43:1-7
+psalm = Psalms 85:8ab,9,10-11,12-13
+gospel = Mat 23:1-12
+
 [ordinary-21-thu-I]
 first = Judges 11:29-39
 psalm = Psalms 40:4,6-7,7-9
@@ -2655,16 +2699,16 @@ psalm = Psalms 97:1,2,5-6,10,11-12
 gospel = Mat 25:1-13
 
 [ordinary-22-fri-II]
+first = 1 Corinthians 1:17-25
+psalm = Psalms 33:1-2,4-5,10-11
+gospel = Mat 25:1-13
+
+[ordinary-22-mon-I]
 first = Proverbs 8:22-35
 psalm = Psalms 48:1-2,8,9-10,12,13,14
 second = Isaiah 2:2-5
 gospel = John 2:1-11
 
-[ordinary-22-mon-I]
-first = 1 Thessalonians 1:1-5,8-10
-psalm = Psalms 149:1-2,3-4,5-6,9
-gospel = Mat 23:13-22
-
 [ordinary-22-mon-II]
 first = Proverbs 8:22-35
 psalm = Psalms 48:1-2,8,9-10,12,13,14
@@ -2868,10 +2912,9 @@ psalm = Psalms 56:2,9,10-11,12-13
 gospel = Luke 8:4-15
 
 [ordinary-25-thu-I]
-first = Wisdom 4:7-15
-psalm = Psalms 148:1-2,11-12,13-14
-second = 1 John 2:12-17
-gospel = Luke 2:41-52
+first = 1 Timothy 4:12-16
+psalm = Psalms 111:7-8,9,10
+gospel = Luke 7:36-50
 
 [ordinary-25-thu-II]
 first = 1 Corinthians 15:1-11
@@ -2885,21 +2928,23 @@ psalm = Psalms 101:1-2,2-3,5-6
 gospel = Luke 7:11-17
 
 [ordinary-25-tue-II]
-first = 1 Corinthians 12:12-14,27-31
-psalm = Psalms 100:2-3,4-5
-gospel = Luke 7:11-17
+first = Wisdom 4:7-15
+psalm = Psalms 148:1-2,11-12,13-14
+second = 1 John 2:12-17
+gospel = Luke 2:41-52
 
 [ordinary-25-wed-I]
-first = 1 Timothy 3:14-16
-psalm = Psalms 111:1-2,3-4,5-6
-gospel = Luke 7:31-35
-
-[ordinary-25-wed-II]
 first = Wisdom 4:7-15
 psalm = Psalms 148:1-2,11-12,13-14
 second = 1 John 2:12-17
 gospel = Luke 2:41-52
 
+[ordinary-25-wed-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
+
 [ordinary-26-fri-I]
 first = Haggai 1:15-2:9
 psalm = Psalms 43:1,2,3,4
@@ -2965,11 +3010,21 @@ first = Baruch 1:15-22
 psalm = Psalms 79:1-2,3-4,5,8,9
 gospel = Luke 10:13-16
 
+[ordinary-27-fri-II]
+first = Job 38:1,12-21;40:3-5
+psalm = Psalms 139:1-3,7-8,9-10,13-14
+gospel = Luke 10:13-16
+
 [ordinary-27-mon-II]
 first = Job 1:6-22
 psalm = Psalms 17:1bcd,2-3,6-7
 gospel = Luke 9:46-50
 
+[ordinary-27-sat-I]
+first = Baruch 4:5-12,27-29
+psalm = Psalms 69:32-34,35-36
+gospel = Luke 10:17-24
+
 [ordinary-27-sat-II]
 first = Job 42:1-3,5-6,12-17
 psalm = Psalms 119:66,71,75,91,125,130
@@ -3150,6 +3205,11 @@ first = 2 Samuel 7:18-19,24-29
 psalm = Psalms 132:1-2,3-5,11,12,13-14
 gospel = Mark 4:21-25
 
+[ordinary-3-tue-I]
+first = Hebrews 10:1-10
+psalm = Psalms 40:1ab,3ab,6-7,9,10
+gospel = Mark 3:31-35
+
 [ordinary-3-tue-II]
 first = 2 Samuel 6:12-15,17-19
 psalm = Psalms 24:7-8,9-10
@@ -3407,9 +3467,9 @@ psalm = Psalms 23:1-3,3-4,5,6
 gospel = Luke 17:11-19
 
 [ordinary-34-fri-I]
-first = 1 Maccabees 4:36-37,52-59
-psalm = 1 Chronicles 29:10-11,11-12
-gospel = Luke 19:45-48
+first = Daniel 7:2-14
+psalm = Daniel 3:75,76,77,78,79,80,81
+gospel = Luke 21:29-33
 
 [ordinary-34-fri-II]
 first = Revelation 10:8-11
@@ -3437,14 +3497,14 @@ psalm = Psalms 95:1-2,3-5,6-7
 gospel = Luke 21:34-36
 
 [ordinary-34-thu-I]
-first = 1 Maccabees 2:15-29
-psalm = Psalms 50:1-2,5-6,14-15
-gospel = Luke 19:41-44
+first = Daniel 6:12-28
+psalm = Daniel 3:68,69,70,71,72,73,74
+gospel = Luke 21:20-28
 
 [ordinary-34-thu-II]
-first = Revelation 5:1-10
-psalm = Psalms 149:1-2,3-4,5-6,9
-gospel = Luke 19:41-44
+first = Revelation 18:1-2,21-23;19:1-3,9
+psalm = Psalms 100:2-3,4-5
+gospel = Luke 21:20-28
 
 [ordinary-34-tue-I]
 first = 2 Maccabees 6:18-31
@@ -3457,14 +3517,14 @@ psalm = Psalms 15:1-2,3,4,4-5
 gospel = Luke 19:1-10
 
 [ordinary-34-wed-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
+first = 2 Maccabees 7:1,20-31
+psalm = Psalms 17:1bcd,5-6,8,15
+gospel = Luke 19:11-28
 
 [ordinary-34-wed-II]
-first = Revelation 4:1-11
-psalm = Psalms 150:1-2,3-4,5-6
-gospel = Luke 19:11-28
+first = Revelation 15:1-4
+psalm = Psalms 98:1bcde,2-3,7-8,9
+gospel = Luke 21:12-19
 
 [ordinary-4-fri-I]
 first = Hebrews 13:1-8
@@ -3707,14 +3767,16 @@ psalm = Psalms 103:1-2,3-4,8-9,11-12
 gospel = Mark 10:1-12
 
 [ordinary-8-mon-I]
-first = Sirach 17:24-29
-psalm = Psalms 32:1-2,5,6-7
-gospel = Mark 10:17-27
+first = Sirach 51:13-20
+psalm = Psalms 15:1-2,3,4,4-5
+second = Philippians 3:8-14
+gospel = John 15:9-17
 
 [ordinary-8-mon-II]
-first = 1 Peter 1:3-9
-psalm = Psalms 111:1-2,5-6,9,10
-gospel = Mark 10:17-27
+first = Genesis 3:9-15,20
+psalm = Psalms 87:1-3,5-7
+second = Acts 1:12-14
+gospel = John 19:25-34
 
 [ordinary-8-sat-II]
 first = James 5:13-20
@@ -3728,15 +3790,14 @@ second = Hebrews 10:11-18
 gospel = Mark 14:22-25
 
 [ordinary-8-tue-I]
-first = Sirach 51:13-20
-psalm = Psalms 15:1-2,3,4,4-5
-second = Philippians 3:8-14
-gospel = John 15:9-17
+first = Sirach 35:1-12
+psalm = Psalms 50:5-6,7-8,14,23
+gospel = Mark 10:28-31
 
 [ordinary-8-tue-II]
-first = 1 Peter 1:10-16
-psalm = Psalms 98:1bcde,2-3,3-4
-gospel = Mark 10:28-31
+first = James 4:1-10
+psalm = Psalms 55:6-8,9-10,22
+gospel = Mark 9:30-37
 
 [ordinary-8-wed-II]
 first = James 4:13-17
@@ -3764,6 +3825,11 @@ first = Sirach 51:12-20
 psalm = Psalms 19:7-8,9-10
 gospel = Mark 11:27-33
 
+[ordinary-9-sat-II]
+first = Jude 17,20-25
+psalm = Psalms 63:1,2-3,4-5
+gospel = Mark 11:27-33
+
 [ordinary-9-thu-I]
 first = Jeremiah 31:31-34
 psalm = Psalms 110:1bcde,2-3
@@ -3961,9 +4027,10 @@ psalm = Psalms 138:1-2,2-3,6,8bc
 gospel = Mat 16:13-20
 
 [ordinary-sunday-21-B]
-first = Joshua 24:1-2,15-17,18
-psalm = Psalms 34:1-2,15-16,17-18,19-20,21-22
-gospel = John 6:55,60-69
+first = Proverbs 8:22-35
+psalm = Psalms 48:1-2,8,9-10,12,13,14
+second = Isaiah 2:2-5
+gospel = John 2:1-11
 
 [ordinary-sunday-21-C]
 first = Isaiah 66:18-21
@@ -4477,9 +4544,9 @@ psalm = Psalms 33:4-5,6,9,18-19,20,22
 gospel = Mat 28:16-20
 
 [trinity-sunday-C]
-first = Proverbs 8:22-31
-psalm = Psalms 8:3-4,5-6,7-8
-gospel = John 16:12-15
+first = 2 Corinthians 5:14-21
+psalm = Psalms 103:1-2,3-4,8-9,11-12
+gospel = Mat 5:33-37
 
 [triumph-of-the-holy-cross-A]
 first = Numbers 21:4-9
diff --git a/scripts/genlect-of.go b/scripts/genlect-of.go
index 32a8525..dd57d71 100644
--- a/scripts/genlect-of.go
+++ b/scripts/genlect-of.go
@@ -94,12 +94,12 @@ func main() {
 
 	// niedziela only publishes ~6 weeks ahead, so future years are unavailable;
 	// the cycles repeat, so a liturgical position's readings are identical
-	// whichever civil year they fall in. Harvest 2020-2025 -- TWO+ years per
+	// whichever civil year they fall in. Harvest 2018-2025 -- TWO+ years per
 	// cycle (Sunday A:2020,2023 B:2021,2024 C:2022,2025; weekday I:2021,2023,2025
 	// II:2020,2022,2024) so a position displaced by a saint/feast in one year is
 	// still captured in another. A key is stored from the FIRST year it resolves;
 	// a year where it fails does not block a later retry (seen is set on success).
-	start := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
+	start := time.Date(2018, 1, 1, 0, 0, 0, 0, time.UTC)
 	end := time.Date(2025, 12, 31, 0, 0, 0, 0, time.UTC)
 
 	for d := start; !d.After(end); d = d.AddDate(0, 0, 1) {
@@ -179,7 +179,7 @@ func main() {
 	b.WriteString("; OF (Ordinary Form) temporal lectionary, keyed by <computed-temporal-slug>-<cycle>:\n")
 	b.WriteString("; Sundays & solemnities use the Sunday cycle (A/B/C), ferial weekdays the weekday\n")
 	b.WriteString("; cycle (I/II). Citations English-canonical.\n")
-	b.WriteString("; Generated from niedziela.pl by scripts/genlect-of.go (harvest 2020-2025).\n")
+	b.WriteString("; Generated from niedziela.pl by scripts/genlect-of.go (harvest 2018-2025).\n")
 	for _, k := range keys {
 		v := lect[k]
 		fmt.Fprintf(&b, "\n[%s]\n", k)