2 files changed, 73 insertions, 133 deletions
diff --git a/internal/caldata/tridentine-calendar.ini b/internal/caldata/tridentine-calendar.ini
index aaa9841..cce1a65 100644
--- a/internal/caldata/tridentine-calendar.ini
+++ b/internal/caldata/tridentine-calendar.ini
@@ -974,6 +974,14 @@ name.en = St. Paulinus of Nola
 reading.first = 2 Cor. 8:9-15
 reading.gospel = Luke 12:32-34
 
+[vigil-of-the-nativity-of-st-john-the-baptist]
+date = 06-23
+rank = class-2
+colour = violet
+name.en = Vigil of the Nativity of St. John the Baptist
+reading.first = Jer 1:4-10
+reading.gospel = Luke 1:5-17
+
 [nativity-of-st-john-the-baptist]
 date = 06-24
 rank = class-1
@@ -998,6 +1006,14 @@ name.en = Sts. John & Paul
 reading.first = Eccli 44:10-15
 reading.gospel = Luke 12:1-8
 
+[vigil-of-sts-peter-paul]
+date = 06-28
+rank = class-2
+colour = violet
+name.en = Vigil of Sts. Peter & Paul
+reading.first = Acts 3:1-10
+reading.gospel = John 21:15-19
+
 [sts-peter-paul]
 date = 06-29
 rank = class-1
@@ -1352,6 +1368,14 @@ rank = commemoration
 colour = red
 name.en = St. Romanus
 
+[vigil-of-st-lawrence]
+date = 08-09
+rank = class-3
+colour = red
+name.en = Vigil of St. Lawrence
+reading.first = Ecclus 51:1-8, 12
+reading.gospel = Matt 16:24-27
+
 [lawrence]
 date = 08-10
 rank = class-2
@@ -1380,6 +1404,14 @@ rank = commemoration
 colour = red
 name.en = Sts. Hippolytus & Cassian
 
+[vigil-of-the-assumption]
+date = 08-14
+rank = class-2
+colour = white
+name.en = Vigil of the Assumption
+reading.first = Sir 24:23-31
+reading.gospel = Luke 11:27-28
+
 [assumption-of-the-blessed-virgin-mary]
 date = 08-15
 rank = class-1
@@ -2289,6 +2321,14 @@ name.en = St. Thomas
 reading.first = Eph 2:19-22
 reading.gospel = John 20:24-29
 
+[vigil-of-christmas]
+date = 12-24
+rank = class-1
+colour = violet
+name.en = Vigil of Christmas
+reading.first = Rom 1:1-6
+reading.gospel = Matt 1:18-21
+
 [stephen]
 date = 12-26
 rank = class-2
diff --git a/internal/caldata/tridentine-lectionary.ini b/internal/caldata/tridentine-lectionary.ini
index 372be6b..cef3f2d 100644
--- a/internal/caldata/tridentine-lectionary.ini
+++ b/internal/caldata/tridentine-lectionary.ini
@@ -1,30 +1,6 @@
 ; EF (1962) temporal lectionary, keyed by lectio's computed temporal-day slug.
 ; Generated from missalemeum (Divinum Officium). Epistle (first) + Gospel citations.
 
-[ef-advent-1-friday]
-first = Heb 13:7-17
-gospel = Matt 25:14-23
-
-[ef-advent-1-monday]
-first = Sir 51:13-17.
-gospel = Matt 13:44-52.
-
-[ef-advent-1-saturday]
-first = 2 Tim 4:1-8
-gospel = Matt 5:13-19
-
-[ef-advent-1-tuesday]
-first = Rom 10:10-18
-gospel = Mark 16:15-18
-
-[ef-advent-1-wednesday]
-first = 2 Tim 4:1-8
-gospel = Matt 5:13-19
-
-[ef-advent-2-friday]
-first = 2 Cor 10:17-18; 11:1-2
-gospel = Matt 13:44-52.
-
 [ef-advent-2-monday]
 first = Rom 15:4-13
 gospel = Matt 11:2-10
@@ -41,42 +17,18 @@ gospel = Matt 11:2-10
 first = Rom 15:4-13
 gospel = Matt 11:2-10
 
-[ef-advent-2-wednesday]
-first = 1 Pet 5:1-4; 5:10-11.
-gospel = Matt 16:13-19
-
-[ef-advent-3-friday]
+[ef-advent-ember-fri]
 first = Isa 11:1-5
 gospel = Luke 1:39-47
 
-[ef-advent-3-monday]
-first = 2 Cor. 1:3-7
-gospel = Matt 16:24-27.
-
-[ef-advent-3-saturday]
+[ef-advent-ember-sat]
 first = Eph 2:19-22
 gospel = John 20:24-29
 
-[ef-advent-3-wednesday]
+[ef-advent-ember-wed]
 first = Isa 7:10-15
 gospel = Luke 1:26-38
 
-[ef-advent-4-friday]
-first = Rom 1:1-6
-gospel = Matt 1:18-21
-
-[ef-advent-4-thursday]
-first = Rom 1:1-6
-gospel = Matt 1:18-21
-
-[ef-advent-4-tuesday]
-first = Rom 1:1-6
-gospel = Matt 1:18-21
-
-[ef-advent-4-wednesday]
-first = Rom 1:1-6
-gospel = Matt 1:18-21
-
 [ef-advent-sunday-1]
 first = Rom 13:11-14
 gospel = Luke 21:25-33
@@ -97,6 +49,10 @@ gospel = Luke 3:1-6
 first = Acts 1:1-11
 gospel = Mark 16:14-20
 
+[ef-ascension-vigil]
+first = Eph. 4:7-13.
+gospel = John 17:1-11.
+
 [ef-ash-wednesday]
 first = Joel 2:12-19
 gospel = Matt 6:16-21
@@ -133,93 +89,21 @@ gospel = Luke 24:36-47
 first = Acts 3:13-15; 3:17-19
 gospel = John 21:1-14
 
-[ef-easter-2-monday]
-first = Isa 7:10-15
-gospel = Luke 1:26-38
-
 [ef-easter-2-saturday]
-first = Wis 10:10-14
-gospel = Luke 14:26-33.
-
-[ef-easter-2-thursday]
-first = 1 Pet 5:1-4; 5:10-11.
-gospel = Matt 16:13-19
+first = Ecclus 24:14-16
+gospel = John 19:25-27
 
 [ef-easter-3-saturday]
 first = Ecclus 24:14-16
 gospel = John 19:25-27
 
-[ef-easter-4-friday]
-first = 1 Pet 5:1-4; 5:10-11.
-gospel = Matt 16:13-19
-
-[ef-easter-4-monday]
-first = 1 Pet 5:1-4; 5:10-11.
-gospel = Matt 16:13-19
-
-[ef-easter-4-saturday]
-first = 2 Tim 4:1-8
-gospel = Matt 5:13-19
-
-[ef-easter-4-thursday]
-first = Ezek 1:10-14
-gospel = Luke 10:1-9
-
-[ef-easter-4-wednesday]
-first = Wis 5:1-5
-gospel = John 15:1-7
-
-[ef-easter-5-monday]
-first = 2 Tim. 2:8-10; 3:10-12.
-gospel = Matt 10:34-42
-
 [ef-easter-5-saturday]
-first = 1 Tim. 5:3-10.
-gospel = Luke 7:11-16
-
-[ef-easter-5-thursday]
-first = 2 Cor. 4:5-14
-gospel = Matt 10:23-28
-
-[ef-easter-5-tuesday]
-first = 2 Cor 10:17-18; 11:1-2
-gospel = Matt 25:1-13.
-
-[ef-easter-5-wednesday]
-first = Col. 3:14-15, 17, 23-24
-gospel = Matt 13:54-58
-
-[ef-easter-6-friday]
-first = Sir 44:16-27; 45:3-20
-gospel = Matt 25:14-23
+first = Ecclus 24:14-16
+gospel = John 19:25-27
 
 [ef-easter-6-saturday]
-first = Wis. 5:1-5
-gospel = John 14:1-13
-
-[ef-easter-6-tuesday]
-first = Wis 5:1-5
-gospel = John 15:1-7
-
-[ef-easter-6-wednesday]
-first = Eph. 4:7-13.
-gospel = John 17:1-11.
-
-[ef-easter-7-friday]
-first = Sir 31:8-11
-gospel = Luke 12:35-40
-
-[ef-easter-7-monday]
-first = Wis 7:7-14.
-gospel = Matt 5:13-19
-
-[ef-easter-7-saturday]
-first = Acts 19:1-8.
-gospel = John 14:15-21.
-
-[ef-easter-7-wednesday]
-first = Sir 31:8-11
-gospel = Matt 18:1-5
+first = Ecclus 24:14-16
+gospel = John 19:25-27
 
 [ef-easter-8-friday]
 first = Joel 2:23-24; 26-27
@@ -282,8 +166,8 @@ first = 1 Thess. 5:14-23
 gospel = Matt 17:1-9
 
 [ef-lent-1-thursday]
-first = 1 Pet 1:1-7
-gospel = Matt 16:13-19
+first = Ezech 18:1-9
+gospel = Matt 15:21-28
 
 [ef-lent-1-tuesday]
 first = Isa 55:6-11
@@ -433,6 +317,22 @@ gospel = John 10:22-38
 first = Acts 2:1-11.
 gospel = John 14:23-31.
 
+[ef-pentecost-vigil]
+first = Acts 19:1-8.
+gospel = John 14:15-21.
+
+[ef-september-ember-fri]
+first = Osee 14:2-10
+gospel = Luke 7:36-50
+
+[ef-september-ember-sat]
+first = Ezek 1:10-14
+gospel = Matt 9:9-13
+
+[ef-september-ember-wed]
+first = 2 Esd. 8:1-10
+gospel = Mark 9:16-28
+
 [ef-septuagesima-sunday-1]
 first = 1 Cor. 9:24-27; 10:1-5
 gospel = Matt 20:1-16
@@ -458,8 +358,8 @@ first = Rom 12:16-21
 gospel = Matt 8:1-13
 
 [ef-time-after-epiphany-sunday-4]
-first = Mal 3:1-4
-gospel = Luke 2:22-32
+first = Rom 13:8-10
+gospel = Matt 8:23-27
 
 [ef-time-after-epiphany-sunday-5]
 first = Col 3:12-17