From 900d1d781e62a08a1bda1285c8e8611a7baa0f2f Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Thu, 20 Aug 2026 11:42:25 +0200 Subject: feat(templates): week headers stop repeating the month name Every ordo booklet week header used to print the month name again even though the month heading right above it already established it -- pure noise, repeated once per week for the whole year. All seven ordo flavours now print the week's own Roman numeral plus the span of dates it covers instead, e.g. "Hebdomada I (Ian 1-2)", with no month name on the line; the LaTeX table of contents and the Typst outline (built automatically from its own headings, so editing the heading is the whole fix there) read the same way. A single-day week (e.g. a lone trailing Sunday) renders "Ian 31", not "Ian 31-31": each flavour's dash sits inside an inverted single_day section, so the engine -- which cannot itself compare first_dom to last_dom -- never has to decide anything, it only follows the data. The dash character matches each flavour's own existing convention: LaTeX/Typst's own "--" ligature, groff's \(en escape (alongside its existing \(bu), HTML's – entity (alongside its existing ·), and a literal en dash for the three flavours with no escaping (adoc/md/txt). Every in-template comment describing the new fields is written without ever typing two curly braces together, including in the two comments this touches that used to embed a live {{month_name}}/{{term.week}} tag pair inside a LaTeX % comment -- harmless only because that whole line already started with %, not because the engine has any comment awareness (it has none). Goldens regenerated through test_render_golden.ml's own render path (Test_view.view_of + Template.render_string), not the CLI -- the two differ in default language and would otherwise pin output the test suite never produces. Grid goldens are untouched, matching the grid templates, which have no week header. Verified against real pdflatex (two passes) and typst compile output, not merely the golden pins: both flavours print "Hebdomada I (Ian 1-2)", "Hebdomada II (Ian 3-9)", "Hebdomada III (Ian 10-16)" as their first three week headers and identical text in the table of contents/outline, and both show "Hebdomada VI (Ian 31)" for January's own trailing single-day week with no dash. --- test/golden/ordo-2027.html | 131 +++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 64 deletions(-) (limited to 'test/golden/ordo-2027.html') diff --git a/test/golden/ordo-2027.html b/test/golden/ordo-2027.html index 66831ee..017d871 100644 --- a/test/golden/ordo-2027.html +++ b/test/golden/ordo-2027.html @@ -15,7 +15,10 @@ (unchanged) and a new h3 per week, using the week's own padded, in-month-flagged day list rather than the month's flat, unpadded one -- guarded accordingly below, the same guard every paginated - flavour's grid already needs for that field. --> + flavour's grid already needs for that field. Each h3 is its own + Roman numeral plus the span of in-month dates it covers (e.g. + Hebdomada I (Ian 1-2)), not the month name again -- the h2 above + already establishes it once. --> Ordo 2027 @@ -32,7 +35,7 @@

Ordo 2027 · Roman Missal, 1962 typical edition

January

-

Week 1

+

Week I (Jan 1–2)

1The Octave Day of the Nativity
class-1 · white · Epistle Titus 2:11-15 · Gospel Luke 2:21
@@ -43,7 +46,7 @@
class-4 · white · Epistle Titus 3:4-7 · Gospel Luke 2:15-20
-

Week 2

+

Week II (Jan 3–9)

3The Holy Name of Jesus
class-2 · white · Epistle Acts 4:8-12 · Gospel Luke 2:21
@@ -79,7 +82,7 @@
class-4 · white · Epistle Titus 3:4-7 · Gospel Luke 2:15-20
-

Week 3

+

Week III (Jan 10–16)

10The Holy Family
class-2 · white · Epistle Col 3:12-17 · Gospel Luke 2:42-52
@@ -115,7 +118,7 @@
class-3 · red · Epistle 1 Pet 5:1-4; 5:10-11. · Gospel Matt 16:13-19
-

Week 4

+

Week IV (Jan 17–23)

172nd Sunday after Epiphany
class-2 · green · Epistle Rom 12:6-16 · Gospel John 2:1-11
@@ -151,7 +154,7 @@
class-3 · white · Epistle Sir 31:8-11 · Gospel Luke 12:35-40
Commemoration St. Emerentiana
-

Week 5

+

Week V (Jan 24–30)

24Septuagesima Sunday
class-2 · violet · Epistle 1 Cor. 9:24-27; 10:1-5 · Gospel Matt 20:1-16
@@ -187,14 +190,14 @@
class-3 · red · Epistle Sir 51:1-8; 51:12 · Gospel Matt 25:1-13.
-

Week 6

+

Week VI (Jan 31)

31Sexagesima Sunday
class-2 · violet · Epistle 2 Cor. 11:19-33; 12:1-9 · Gospel Luke 8:4-15

February

-

Week 1

+

Week I (Feb 1–6)

1St. Ignatius of Antioch
class-3 · red · Epistle Rom 8:35-39 · Gospel John 12:24-26
@@ -225,7 +228,7 @@
class-3 · white · Epistle Sir 44:16-27; 45:3-20 · Gospel Luke 10:1-9
Commemoration St. Dorothy
-

Week 2

+

Week II (Feb 7–13)

7Quinquagesima Sunday
class-2 · violet · Epistle 1 Cor. 13:1-13 · Gospel Luke 18:31-43
@@ -261,7 +264,7 @@
class-3 · violet · Epistle Isa 58:9-14 · Gospel Mark 6:47-56
-

Week 3

+

Week III (Feb 14–20)

141st Sunday of Lent
class-1 · violet · Epistle 2 Cor. 6:1-10 · Gospel Matt 4:1-11
@@ -297,7 +300,7 @@
class-2 · violet · Epistle 1 Thess. 5:14-23 · Gospel Matt 17:1-9
-

Week 4

+

Week IV (Feb 21–27)

212nd Sunday of Lent
class-1 · violet · Epistle 1 Thess. 4:1-7 · Gospel Matt 17:1-9
@@ -333,14 +336,14 @@
class-3 · violet · Epistle Gen 27:6-40 · Gospel Luke 15:11-32
Commemoration St. Gabriel of Our Lady of Sorrows
-

Week 5

+

Week V (Feb 28)

283rd Sunday of Lent
class-1 · violet · Epistle Eph 5:1-9 · Gospel Luke 11:14-28

March

-

Week 1

+

Week I (Mar 1–6)

1Monday of the 3rd Week of Lent
class-3 · violet · Epistle 4 Kings 5:1-15 · Gospel Luke 4:23-30
@@ -371,7 +374,7 @@
class-3 · violet · Epistle Dan 13:1-9, 15-17, 19-30, 33-62. · Gospel John 8:1-11
Commemoration Sts. Felicitas & Perpetua
-

Week 2

+

Week II (Mar 7–13)

74th Sunday of Lent
class-1 · rose · Epistle Gal 4:22-31 · Gospel John 6:1-15
@@ -407,7 +410,7 @@
class-3 · violet · Epistle Isa 49:8-15 · Gospel John 8:12-20
-

Week 3

+

Week III (Mar 14–20)

14Passion Sunday
class-1 · violet · Epistle Heb 9:11-15. · Gospel John 8:46-59.
@@ -443,7 +446,7 @@
class-3 · violet · Epistle Jer 18:18-23 · Gospel John 12:10-36
-

Week 4

+

Week IV (Mar 21–27)

21Palm Sunday
class-1 · violet · Epistle Phil 2:5-11 · Gospel Matt. 26:36-75; 27:1-60.
@@ -479,7 +482,7 @@
class-1 · violet · Epistle Col 3:1-4 · Gospel Matt 28:1-7
-

Week 5

+

Week V (Mar 28–31)

28Easter Sunday
class-1 · white · Epistle 1 Cor 5:7-8 · Gospel Mark 16:1-7
@@ -501,7 +504,7 @@

April

-

Week 1

+

Week I (Apr 1–3)

1Thursday of Easter Week
class-1 · white · Epistle Acts 8:26-40 · Gospel John 20:11-18
@@ -517,7 +520,7 @@
class-1 · white · Epistle 1 Pet 2:1-10 · Gospel John 20:1-9
-

Week 2

+

Week II (Apr 4–10)

4Low Sunday (Sunday in Easter Octave)
class-1 · white · Epistle 1 John 5:4-10 · Gospel John 20:19-31
@@ -553,7 +556,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27
-

Week 3

+

Week III (Apr 11–17)

112nd Sunday after Easter
class-2 · white · Epistle 1 Pet 2:21-25 · Gospel John 10:11-16
@@ -589,7 +592,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27
Commemoration St. Anicetus
-

Week 4

+

Week IV (Apr 18–24)

183rd Sunday after Easter
class-2 · white · Epistle 1 Pet 2:11-19 · Gospel John 16:16-22
@@ -625,7 +628,7 @@
class-3 · red · Epistle Wis 5:1-5 · Gospel John 15:1-7
-

Week 5

+

Week V (Apr 25–30)

254th Sunday after Easter
class-2 · white · Epistle Jas 1:17-21 · Gospel John 16:5-14
@@ -657,13 +660,13 @@

May

-

Week 1

+

Week I (May 1)

1St. Joseph the Workman
class-1 · white · Epistle Col. 3:14-15, 17, 23-24 · Gospel Matt 13:54-58
-

Week 2

+

Week II (May 2–8)

25th Sunday after Easter
class-2 · white · Epistle Jas 1:22-27 · Gospel John 16:23-30
@@ -699,7 +702,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27
-

Week 3

+

Week III (May 9–15)

9Sunday after the Ascension
class-2 · white · Epistle 1 Pet 4:7-11. · Gospel John 15:26-27; 16:1-4.
@@ -735,7 +738,7 @@
class-1 · red · Epistle Acts 19:1-8. · Gospel John 14:15-21.
-

Week 4

+

Week IV (May 16–22)

16Pentecost Sunday (Whitsunday)
class-1 · red · Epistle Acts 2:1-11. · Gospel John 14:23-31.
@@ -771,7 +774,7 @@
class-1 · red · Epistle Rom 5:1-5. · Gospel Luke 4:38-44.
-

Week 5

+

Week V (May 23–29)

23Trinity Sunday
class-1 · white · Epistle Rom 11:33-36. · Gospel Matt 28:18-20
@@ -807,7 +810,7 @@
class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.
-

Week 6

+

Week VI (May 30–31)

302nd Sunday after Pentecost
class-2 · green · Epistle 1 John 3:13-18. · Gospel Luke 14:16-24.
@@ -819,7 +822,7 @@
Commemoration St. Petronilla

June

-

Week 1

+

Week I (Jun 1–5)

1St. Angela Merici
class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.
@@ -845,7 +848,7 @@
class-3 · red · Epistle Ecclus 44:1-15 · Gospel Matt 5:1-12
-

Week 2

+

Week II (Jun 6–12)

63rd Sunday after Pentecost
class-2 · green · Epistle 1 Pet. 5:6-11 · Gospel Luke 15:1-10
@@ -881,7 +884,7 @@
class-3 · white · Epistle Sir 31:8-11 · Gospel Luke 12:35-40
Commemoration St. Basilidus
-

Week 3

+

Week III (Jun 13–19)

134th Sunday after Pentecost
class-2 · green · Epistle Rom 8:18-23 · Gospel Luke 5:1-11
@@ -917,7 +920,7 @@
class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.
Commemoration Sts. Gervasius and Protasius
-

Week 4

+

Week IV (Jun 20–26)

205th Sunday after Pentecost
class-2 · green · Epistle 1 Pet 3:8-15. · Gospel Matt 5:20-24.
@@ -953,7 +956,7 @@
class-3 · red · Epistle Eccli 44:10-15 · Gospel Luke 12:1-8
-

Week 5

+

Week V (Jun 27–30)

276th Sunday after Pentecost
class-2 · green · Epistle Rom 6:3-11. · Gospel Mark 8:1-9
@@ -975,7 +978,7 @@
Commemoration St. Peter

July

-

Week 1

+

Week I (Jul 1–3)

1The Precious Blood of Our Lord Jesus Christ
class-1 · red · Epistle Heb 9:11-15. · Gospel John 19:30-35
@@ -991,7 +994,7 @@
class-3 · red · Epistle 2 Tim. 3:14-17; 4:1-5 · Gospel Matt 10:28-33
-

Week 2

+

Week II (Jul 4–10)

47th Sunday after Pentecost
class-2 · green · Epistle Rom 6:19-23 · Gospel Matt 7:15-21
@@ -1027,7 +1030,7 @@
class-3 · red · Epistle Prov 31:10-31 · Gospel Matt 12:46-50
-

Week 3

+

Week III (Jul 11–17)

118th Sunday after Pentecost
class-2 · green · Epistle Rom 8:12-17 · Gospel Luke 16:1-9
@@ -1063,7 +1066,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
Commemoration St. Alexis
-

Week 4

+

Week IV (Jul 18–24)

189th Sunday after Pentecost
class-2 · green · Epistle 1 Cor. 10:6-13 · Gospel Luke 19:41-47
@@ -1099,7 +1102,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
Commemoration St. Christina
-

Week 5

+

Week V (Jul 25–31)

2510th Sunday after Pentecost
class-2 · green · Epistle 1 Cor. 12:2-11 · Gospel Luke 18:9-14
@@ -1136,7 +1139,7 @@

August

-

Week 1

+

Week I (Aug 1–7)

111th Sunday after Pentecost
class-2 · green · Epistle 1 Cor. 15:1-10 · Gospel Mark 7:31-37
@@ -1172,7 +1175,7 @@
class-3 · white · Epistle Sir 31:8-11 · Gospel Matt 6:24-33
Commemoration St. Donatus
-

Week 2

+

Week II (Aug 8–14)

812th Sunday after Pentecost
class-2 · green · Epistle 2 Cor. 3:4-9 · Gospel Luke 10:23-37
@@ -1208,7 +1211,7 @@
class-2 · violet · Epistle Sir 24:23-31 · Gospel Luke 11:27-28
Commemoration St. Eusebius
-

Week 3

+

Week III (Aug 15–21)

15Assumption of the Blessed Virgin Mary
class-1 · white · Epistle Judith 13:22-25; 15:10 · Gospel Luke 1:41-50
@@ -1244,7 +1247,7 @@
class-3 · white · Epistle Prov 31:10-31 · Gospel Matt 13:44-52.
-

Week 4

+

Week IV (Aug 22–28)

2214th Sunday after Pentecost
class-2 · green · Epistle Gal 5:16-24 · Gospel Matt 6:24-33
@@ -1280,7 +1283,7 @@
class-3 · white · Epistle 2 Tim 4:1-8 · Gospel Matt 5:13-19
Commemoration St. Hermes
-

Week 5

+

Week V (Aug 29–31)

2915th Sunday after Pentecost
class-2 · green · Epistle Gal 5:25-26; 6:1-10 · Gospel Luke 7:11-16
@@ -1297,7 +1300,7 @@

September

-

Week 1

+

Week I (Sep 1–4)

1Wednesday of the 15th Week of the Time after Pentecost
class-4 · green · Epistle Gal 5:25-26; 6:1-10 · Gospel Luke 7:11-16
@@ -1318,7 +1321,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
-

Week 2

+

Week II (Sep 5–11)

516th Sunday after Pentecost
class-2 · green · Epistle Eph 3:13-21 · Gospel Luke 14:1-11
@@ -1354,7 +1357,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
Commemoration Sts. Protus & Hyacinth
-

Week 3

+

Week III (Sep 12–18)

1217th Sunday after Pentecost
class-2 · green · Epistle Eph 4:1-6 · Gospel Matt 22:34-46
@@ -1390,7 +1393,7 @@
class-3 · white · Epistle 1 Cor 13:1-8 · Gospel Matt 22:1-14
-

Week 4

+

Week IV (Sep 19–25)

1918th Sunday after Pentecost
class-2 · green · Epistle 1 Cor. 1:4-8 · Gospel Matt 9:1-8
@@ -1426,7 +1429,7 @@
class-2 · violet · Epistle Heb 9:2-12 · Gospel Luke 13:6-17
-

Week 5

+

Week V (Sep 26–30)

2619th Sunday after Pentecost
class-2 · green · Epistle Eph 4:23-28 · Gospel Matt 22:1-14
@@ -1453,7 +1456,7 @@

October

-

Week 1

+

Week I (Oct 1–2)

1Friday of the 19th Week of the Time after Pentecost
class-4 · green · Epistle Eph 4:23-28 · Gospel Matt 22:1-14
@@ -1464,7 +1467,7 @@
class-3 · white · Epistle Exod 23:20-23 · Gospel Matt 18:1-10
-

Week 2

+

Week II (Oct 3–9)

320th Sunday after Pentecost
class-2 · green · Epistle Eph 5:15-21 · Gospel John 4:46-53
@@ -1500,7 +1503,7 @@
class-3 · white · Epistle 2 Cor 4:1-6; 4:15-18 · Gospel Luke 10:1-9
Commemoration St. Dionysius and companions
-

Week 3

+

Week III (Oct 10–16)

1021st Sunday after Pentecost
class-2 · green · Epistle Eph 6:10-17 · Gospel Matt 18:23-35
@@ -1536,7 +1539,7 @@
class-3 · white · Epistle Prov 31:10-31 · Gospel Matt 13:44-52.
-

Week 4

+

Week IV (Oct 17–23)

1722nd Sunday after Pentecost
class-2 · green · Epistle Phil 1:6-11 · Gospel Matt 22:15-21
@@ -1572,7 +1575,7 @@
class-3 · white · Epistle Heb 7:23-27 · Gospel Matt 24:42-47
-

Week 5

+

Week V (Oct 24–30)

2423rd Sunday after Pentecost
class-2 · green · Epistle Phil 3:17-21; 4:1-3 · Gospel Matt 9:18-26
@@ -1608,14 +1611,14 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
-

Week 6

+

Week VI (Oct 31)

31Christ the King
class-1 · white · Epistle Col 1:12-20. · Gospel John 18:33-37

November

-

Week 1

+

Week I (Nov 1–6)

1All Saints
class-1 · white · Epistle Apoc 7:2-12 · Gospel Matt 5:1-12
@@ -1646,7 +1649,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
-

Week 2

+

Week II (Nov 7–13)

75th Sunday after Epiphany
class-2 · green · Epistle Col 3:12-17 · Gospel Matt 13:24-30
@@ -1682,7 +1685,7 @@
class-3 · white · Epistle 1 Cor 4:9-14 · Gospel Luke 12:32-34
-

Week 3

+

Week III (Nov 14–20)

146th Sunday after Epiphany
class-2 · green · Epistle 1 Thess 1:2-10 · Gospel Matt 13:31-35
@@ -1718,7 +1721,7 @@
class-3 · white · Epistle 1 Cor. 4:9-14 · Gospel Luke 12:32-34
-

Week 4

+

Week IV (Nov 21–27)

2124th and Last Sunday after Pentecost
class-2 · green · Epistle Col 1:9-14 · Gospel Matt 24:15-35
@@ -1754,7 +1757,7 @@
class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28
-

Week 5

+

Week V (Nov 28–30)

281st Sunday of Advent
class-1 · violet · Epistle Rom 13:11-14 · Gospel Luke 21:25-33
@@ -1771,7 +1774,7 @@
Commemoration Tuesday of the 1st Week of Advent

December

-

Week 1

+

Week I (Dec 1–4)

1Wednesday of the 1st Week of Advent
class-3 · violet · Epistle Rom 13:11-14 · Gospel Luke 21:25-33
@@ -1792,7 +1795,7 @@
class-3 · white · Epistle 2 Tim 4:1-8 · Gospel Matt 5:13-19
Commemoration Saturday of the 1st Week of Advent
Commemoration St. Barbara
-

Week 2

+

Week II (Dec 5–11)

52nd Sunday of Advent
class-1 · violet · Epistle Rom 15:4-13 · Gospel Matt 11:2-10
@@ -1828,7 +1831,7 @@
class-3 · white · Epistle 1 Pet 5:1-4; 5:10-11. · Gospel Matt 16:13-19
Commemoration Saturday of the 2nd Week of Advent
-

Week 3

+

Week III (Dec 12–18)

123rd Sunday of Advent
class-1 · rose · Epistle Phil 4:4-7 · Gospel John 1:19-28
@@ -1864,7 +1867,7 @@
class-2 · violet · Epistle 2 Thess 2:1-8 · Gospel Luke 3:1-6
-

Week 4

+

Week IV (Dec 19–25)

194th Sunday of Advent
class-1 · violet · Epistle 1 Cor. 4:1-5 · Gospel Luke 3:1-6
@@ -1900,7 +1903,7 @@
class-1 · white · Epistle Heb 1:1-12 · Gospel John 1:1-14
-

Week 5

+

Week V (Dec 26–31)

26Sunday within the Octave of the Nativity
class-2 · white · Epistle Gal 4:1-7 · Gospel Luke 2:33-40
-- cgit v1.3