diff options
| -rw-r--r-- | templates/ef/ordo.adoc | 5 | ||||
| -rw-r--r-- | templates/ef/ordo.html | 7 | ||||
| -rw-r--r-- | templates/ef/ordo.md | 7 | ||||
| -rw-r--r-- | templates/ef/ordo.ms | 7 | ||||
| -rw-r--r-- | templates/ef/ordo.tex | 28 | ||||
| -rw-r--r-- | templates/ef/ordo.txt | 2 | ||||
| -rw-r--r-- | templates/ef/ordo.typ | 27 | ||||
| -rw-r--r-- | test/golden/ordo-2027.adoc | 129 | ||||
| -rw-r--r-- | test/golden/ordo-2027.html | 131 | ||||
| -rw-r--r-- | test/golden/ordo-2027.md | 131 | ||||
| -rw-r--r-- | test/golden/ordo-2027.ms | 131 | ||||
| -rw-r--r-- | test/golden/ordo-2027.tex | 276 | ||||
| -rw-r--r-- | test/golden/ordo-2027.txt | 126 | ||||
| -rw-r--r-- | test/golden/ordo-2027.typ | 151 |
14 files changed, 610 insertions, 548 deletions
diff --git a/templates/ef/ordo.adoc b/templates/ef/ordo.adoc index 0b5785d..f250426 100644 --- a/templates/ef/ordo.adoc +++ b/templates/ef/ordo.adoc @@ -19,6 +19,9 @@ // hand-built TOC and ordo.typ's outline already do. Walks // months>weeks>days (the week's own padded, in-month-guarded day list) in // place of the old months>days flat loop over the month's own flat one. +// Each week heading 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 month's own == heading above already establishes it once. = {{term.ordo}} {{year}} · {{rite_name}} :toc: @@ -26,7 +29,7 @@ == {{name}} {{#weeks}} -=== {{term.week}} {{num}} +=== {{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}–{{last_dom}}{{/single_day}}) {{#days}}{{#in_month}} *{{dom}}* {{name}} + diff --git a/templates/ef/ordo.html b/templates/ef/ordo.html index 4936974..6fdba6f 100644 --- a/templates/ef/ordo.html +++ b/templates/ef/ordo.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. --> <!doctype html> <html lang="la"><head><meta charset="utf-8"> <title>{{term.ordo}} {{year}}</title> @@ -32,7 +35,7 @@ </style></head><body> <h1>{{term.ordo}} {{year}} · {{rite_name}}</h1> {{#months}}<h2>{{name}}</h2> -{{#weeks}}<h3>{{term.week}} {{num}}</h3> +{{#weeks}}<h3>{{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}–{{last_dom}}{{/single_day}})</h3> {{#days}}{{#in_month}}<div class="day {{colour}}"> <span class="dom">{{dom}}</span>{{name}} <div class="meta">{{rank}} · {{colour}}{{#first}} · {{term.epistle}} {{first}}{{/first}}{{#gospel}} · {{term.gospel}} {{gospel}}{{/gospel}}</div> diff --git a/templates/ef/ordo.md b/templates/ef/ordo.md index fd8094f..59a92db 100644 --- a/templates/ef/ordo.md +++ b/templates/ef/ordo.md @@ -15,14 +15,17 @@ the same header treatment as the paginated flavours, for structural consistency -- a ### per week under each month's ##, walking months>weeks>days (the week's own padded, in-month-guarded day - list, not the flat unpadded one the old months>days loop used). --> + list, not the flat unpadded one the old months>days loop used). Each + week heading 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 month's own ## heading above already establishes it once. --> # {{term.ordo}} {{year}} · {{rite_name}} {{#months}} ## {{name}} {{#weeks}} -### {{term.week}} {{num}} +### {{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}–{{last_dom}}{{/single_day}}) {{#days}}{{#in_month}} **{{dom}}** {{name}} diff --git a/templates/ef/ordo.ms b/templates/ef/ordo.ms index a5d7100..1035a0d 100644 --- a/templates/ef/ordo.ms +++ b/templates/ef/ordo.ms @@ -15,7 +15,10 @@ .\" treatment as the paginated flavours, for structural consistency -- a .\" bold week run-in under each month's own .SH, walking months>weeks>days .\" (the week's own padded, in-month-guarded day list) in place of the -.\" old months>days flat loop over the month's own flat one. +.\" old months>days flat loop over the month's own flat one. The run-in +.\" 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 month's +.\" own .SH heading above already establishes it once. .TL {{term.ordo}} {{year}} \(bu {{rite_name}} {{#months}} @@ -23,7 +26,7 @@ {{name}} {{#weeks}} .LP -\fB{{term.week}} {{num}}\fR +\fB{{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}\(en{{last_dom}}{{/single_day}})\fR {{#days}}{{#in_month}} .IP "{{dom}}" 4 {{name}} diff --git a/templates/ef/ordo.tex b/templates/ef/ordo.tex index a7fcbb3..4ffc9e9 100644 --- a/templates/ef/ordo.tex +++ b/templates/ef/ordo.tex @@ -7,11 +7,13 @@ % the top third of every page and cost 65 pages for a year that needed far % fewer; that requirement is reversed here on purpose, not merely relaxed). % Structure stays scannable through two header weights instead: every -% week still opens with its existing small header line ({{month_name}} . -% {{term.week}} N), and the month's own FIRST week additionally gets a -% large, ruled banner above that line ({{#first}}...{{/first}}, a real -% view field -- lib/render/view.ml -- not template-side arithmetic, since -% this engine has no way to test "is this the first item" any other way). +% week still opens with its own header line -- a Roman week number plus +% the span of in-month dates it covers, e.g. Hebdomada I (Ian 1-2), with +% no month name repeated, since the month heading above already +% establishes it -- and the month's own FIRST week additionally gets a +% large, ruled banner above that line (view field [first], lib/render/ +% view.ml -- not template-side arithmetic, since this engine has no way +% to test "is this the first item" any other way). % \needspace (a genuine, tiny dependency, not one of the deps this project % freezes at the OCaml level -- LaTeX packages are a template author's own % concern) keeps a header from being stranded alone at a page's bottom @@ -68,9 +70,15 @@ % The engine has no parent-path syntax: nested inside a month's own week % loop, a bare week-number reference finds the WEEK's own number, and there % is no way to reach the enclosing month's from there. That is why each -% week object carries its own month number and month name fields -% (lib/render/view.ml, Task 5) -- used throughout below instead of a -% parent-path reference, which this engine cannot express. +% week object carries its own month number, month name and abbreviated +% month name fields (lib/render/view.ml) -- used throughout below instead +% of a parent-path reference, which this engine cannot express. The same +% view resolves the week's own Roman numeral too (num_roman, arabic num +% kept alongside it for a tradition that wants it), the day-of-month of +% its first and last in-month day (first_dom/last_dom), and single_day +% (true for a one-day week) -- a punctuation choice (Ian 1 vs Ian 1-2) +% this logic-less engine cannot make for itself, so the template below +% picks the dash only inside an inverted single_day section. % % This template's own %-comments are plain text to the engine: it has no % awareness of LaTeX's comment syntax, and a stray double-brace pair inside @@ -127,7 +135,7 @@ \begin{small} {{#months}} \textbf{ {{name}} }\par -{{#weeks}}\hspace*{4mm}{{term.week}} {{num}}\dotfill\pageref{w{{month_num}}-{{num}}}\par +{{#weeks}}\hspace*{4mm}{{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}--{{last_dom}}{{/single_day}})\dotfill\pageref{w{{month_num}}-{{num}}}\par {{/weeks}} {{/months}} \end{small} @@ -142,7 +150,7 @@ {{/first}} \needspace{16mm} \label{w{{month_num}}-{{num}}} -{\bfseries\large {{month_name}} }\hfill{\small {{term.week}} {{num}}}\par\vspace{0.5mm} +{\bfseries\large {{term.week}} {{num_roman}} }{\small ({{month_abbr}} {{first_dom}}{{^single_day}}--{{last_dom}}{{/single_day}})}\par\vspace{0.5mm} {{#days}} {{#in_month}} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] diff --git a/templates/ef/ordo.txt b/templates/ef/ordo.txt index 0ac0366..1edf0a9 100644 --- a/templates/ef/ordo.txt +++ b/templates/ef/ordo.txt @@ -1,7 +1,7 @@ {{#months}} {{name}} {{year}} {{#weeks}} -== {{term.week}} {{num}} == +== {{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}–{{last_dom}}{{/single_day}}) == {{#days}}{{#in_month}} {{dom}} {{name}} {{rank}} · {{colour}} diff --git a/templates/ef/ordo.typ b/templates/ef/ordo.typ index 85b609e..829bf1e 100644 --- a/templates/ef/ordo.typ +++ b/templates/ef/ordo.typ @@ -27,9 +27,16 @@ // The engine has no parent-path syntax: nested inside a month's own week // loop, a bare week-number reference finds the WEEK's own number, and there // is no way to reach the enclosing month's from there. That is why each -// week object carries its own month number and month name fields -// (lib/render/view.ml), used below via month_name/month_num instead of a -// parent-path reference the engine cannot express. +// week object carries its own month number, month name and abbreviated +// month name fields (lib/render/view.ml), used below via month_name/ +// month_num/month_abbr instead of a parent-path reference the engine +// cannot express. The same view resolves the week's own Roman numeral too +// (num_roman, arabic num kept alongside it for a tradition that wants it), +// the day-of-month of its first and last in-month day (first_dom/ +// last_dom), and single_day (true for a one-day week) -- the punctuation +// choice between Ian 1 and Ian 1-2 this logic-less engine cannot make for +// itself, so the heading below picks the dash only inside an inverted +// single_day section. // // The engine also rejects an empty tag path outright (a bare-dot section or // variable is a parse error, not an invented "current context" behaviour), @@ -46,10 +53,14 @@ // per month with its weeks dotted-and-paginated underneath, because it // walks the months-then-weeks nesting directly in its own hand-built TOC // loop. Typst's outline instead builds its table of contents automatically -// from real document headings, so this stays a flat list of "Month . Week -// N" headings rather than being restructured into two heading levels -- -// changing outline depth/structure is a bigger, riskier change than this -// defect calls for. Defect 2 DID add a "is this the month's first week" +// from real document headings, so this stays a flat list of week headings +// rather than being restructured into two heading levels -- changing +// outline depth/structure is a bigger, riskier change than this defect +// calls for. Each heading is the week's own Roman numeral plus the span +// of in-month dates it covers (e.g. Hebdomada I (Ian 1-2)), with no month +// name repeated -- the month heading below is a separate, non-heading +// BANNER (not part of the outline) that already establishes it once per +// month. Defect 2 DID add a "is this the month's first week" // flag to the view model (lib/render/view.ml's own [first], the same // "cheap flag beats invented template logic" call [last] already made // elsewhere) -- used below for a separate, non-heading month BANNER @@ -125,7 +136,7 @@ #text(size: 15pt, weight: "bold")[{{month_name}} {{year}}] ] {{/first}} -= {{month_name}} #sym.dot.c {{term.week}} {{num}} += {{term.week}} {{num_roman}} ({{month_abbr}} {{first_dom}}{{^single_day}}--{{last_dom}}{{/single_day}}) {{#days}} {{#in_month}} diff --git a/test/golden/ordo-2027.adoc b/test/golden/ordo-2027.adoc index 45eb306..008cf16 100644 --- a/test/golden/ordo-2027.adoc +++ b/test/golden/ordo-2027.adoc @@ -19,6 +19,9 @@ // hand-built TOC and ordo.typ's outline already do. Walks // months>weeks>days (the week's own padded, in-month-guarded day list) in // place of the old months>days flat loop over the month's own flat one. +// Each week heading 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 month's own == heading above already establishes it once. = Ordo 2027 · Roman Missal, 1962 typical edition :toc: @@ -26,7 +29,7 @@ == January -=== Week 1 +=== Week I (Jan 1–2) *1* The Octave Day of the Nativity + @@ -41,7 +44,7 @@ Epistle Titus 3:4-7 Gospel Luke 2:15-20 -=== Week 2 +=== Week II (Jan 3–9) *3* The Holy Name of Jesus + @@ -87,7 +90,7 @@ Epistle Titus 3:4-7 Gospel Luke 2:15-20 -=== Week 3 +=== Week III (Jan 10–16) *10* The Holy Family + @@ -135,7 +138,7 @@ Epistle 1 Pet 5:1-4; 5:10-11. Gospel Matt 16:13-19 -=== Week 4 +=== Week IV (Jan 17–23) *17* 2nd Sunday after Epiphany + @@ -184,7 +187,7 @@ Epistle Sir 31:8-11 Gospel Luke 12:35-40 Commemoration St. Emerentiana -=== Week 5 +=== Week V (Jan 24–30) *24* Septuagesima Sunday + @@ -231,7 +234,7 @@ Epistle Sir 51:1-8; 51:12 Gospel Matt 25:1-13. -=== Week 6 +=== Week VI (Jan 31) *31* Sexagesima Sunday + @@ -243,7 +246,7 @@ Epistle 2 Cor. 11:19-33; 12:1-9 Gospel Luke 8:4-15 == February -=== Week 1 +=== Week I (Feb 1–6) *1* St. Ignatius of Antioch + @@ -284,7 +287,7 @@ Epistle Sir 44:16-27; 45:3-20 Gospel Luke 10:1-9 Commemoration St. Dorothy -=== Week 2 +=== Week II (Feb 7–13) *7* Quinquagesima Sunday + @@ -332,7 +335,7 @@ Epistle Isa 58:9-14 Gospel Mark 6:47-56 -=== Week 3 +=== Week III (Feb 14–20) *14* 1st Sunday of Lent + @@ -379,7 +382,7 @@ Epistle 1 Thess. 5:14-23 Gospel Matt 17:1-9 -=== Week 4 +=== Week IV (Feb 21–27) *21* 2nd Sunday of Lent + @@ -429,7 +432,7 @@ Epistle Gen 27:6-40 Gospel Luke 15:11-32 Commemoration St. Gabriel of Our Lady of Sorrows -=== Week 5 +=== Week V (Feb 28) *28* 3rd Sunday of Lent + @@ -441,7 +444,7 @@ Epistle Eph 5:1-9 Gospel Luke 11:14-28 == March -=== Week 1 +=== Week I (Mar 1–6) *1* Monday of the 3rd Week of Lent + @@ -483,7 +486,7 @@ 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) *7* 4th Sunday of Lent + @@ -532,7 +535,7 @@ Epistle Isa 49:8-15 Gospel John 8:12-20 -=== Week 3 +=== Week III (Mar 14–20) *14* Passion Sunday + @@ -580,7 +583,7 @@ Epistle Jer 18:18-23 Gospel John 12:10-36 -=== Week 4 +=== Week IV (Mar 21–27) *21* Palm Sunday + @@ -625,7 +628,7 @@ Epistle Col 3:1-4 Gospel Matt 28:1-7 -=== Week 5 +=== Week V (Mar 28–31) *28* Easter Sunday + @@ -655,7 +658,7 @@ Epistle Acts 3:13-15; 3:17-19 Gospel John 21:1-14 == April -=== Week 1 +=== Week I (Apr 1–3) *1* Thursday of Easter Week + @@ -676,7 +679,7 @@ Epistle 1 Pet 2:1-10 Gospel John 20:1-9 -=== Week 2 +=== Week II (Apr 4–10) *4* Low Sunday (Sunday in Easter Octave) + @@ -721,7 +724,7 @@ Epistle Ecclus 24:14-16 Gospel John 19:25-27 -=== Week 3 +=== Week III (Apr 11–17) *11* 2nd Sunday after Easter + @@ -768,7 +771,7 @@ Epistle Ecclus 24:14-16 Gospel John 19:25-27 Commemoration St. Anicetus -=== Week 4 +=== Week IV (Apr 18–24) *18* 3rd Sunday after Easter + @@ -814,7 +817,7 @@ Epistle Wis 5:1-5 Gospel John 15:1-7 -=== Week 5 +=== Week V (Apr 25–30) *25* 4th Sunday after Easter + @@ -857,7 +860,7 @@ Epistle 2 Cor 10:17-18; 11:1-2 Gospel Matt 25:1-13. == May -=== Week 1 +=== Week I (May 1) *1* St. Joseph the Workman + @@ -866,7 +869,7 @@ Epistle Col. 3:14-15, 17, 23-24 Gospel Matt 13:54-58 -=== Week 2 +=== Week II (May 2–8) *2* 5th Sunday after Easter + @@ -913,7 +916,7 @@ Epistle Ecclus 24:14-16 Gospel John 19:25-27 -=== Week 3 +=== Week III (May 9–15) *9* Sunday after the Ascension + @@ -960,7 +963,7 @@ Epistle Acts 19:1-8. Gospel John 14:15-21. -=== Week 4 +=== Week IV (May 16–22) *16* Pentecost Sunday (Whitsunday) + @@ -1005,7 +1008,7 @@ Epistle Rom 5:1-5. Gospel Luke 4:38-44. -=== Week 5 +=== Week V (May 23–29) *23* Trinity Sunday + @@ -1052,7 +1055,7 @@ Epistle 2 Cor 10:17-18; 11:1-2 Gospel Matt 25:1-13. -=== Week 6 +=== Week VI (May 30–31) *30* 2nd Sunday after Pentecost + @@ -1071,7 +1074,7 @@ Commemoration St. Petronilla == June -=== Week 1 +=== Week I (Jun 1–5) *1* St. Angela Merici + @@ -1105,7 +1108,7 @@ Epistle Ecclus 44:1-15 Gospel Matt 5:1-12 -=== Week 2 +=== Week II (Jun 6–12) *6* 3rd Sunday after Pentecost + @@ -1152,7 +1155,7 @@ Epistle Sir 31:8-11 Gospel Luke 12:35-40 Commemoration St. Basilidus -=== Week 3 +=== Week III (Jun 13–19) *13* 4th Sunday after Pentecost + @@ -1200,7 +1203,7 @@ 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) *20* 5th Sunday after Pentecost + @@ -1245,7 +1248,7 @@ Epistle Eccli 44:10-15 Gospel Luke 12:1-8 -=== Week 5 +=== Week V (Jun 27–30) *27* 6th Sunday after Pentecost + @@ -1276,7 +1279,7 @@ Commemoration St. Peter == July -=== Week 1 +=== Week I (Jul 1–3) *1* The Precious Blood of Our Lord Jesus Christ + @@ -1298,7 +1301,7 @@ Epistle 2 Tim. 3:14-17; 4:1-5 Gospel Matt 10:28-33 -=== Week 2 +=== Week II (Jul 4–10) *4* 7th Sunday after Pentecost + @@ -1343,7 +1346,7 @@ Epistle Prov 31:10-31 Gospel Matt 12:46-50 -=== Week 3 +=== Week III (Jul 11–17) *11* 8th Sunday after Pentecost + @@ -1391,7 +1394,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 Commemoration St. Alexis -=== Week 4 +=== Week IV (Jul 18–24) *18* 9th Sunday after Pentecost + @@ -1440,7 +1443,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 Commemoration St. Christina -=== Week 5 +=== Week V (Jul 25–31) *25* 10th Sunday after Pentecost + @@ -1492,7 +1495,7 @@ Epistle 2 Tim. 2:8-10; 3:10-12. Gospel Luke 10:1-9 == August -=== Week 1 +=== Week I (Aug 1–7) *1* 11th Sunday after Pentecost + @@ -1540,7 +1543,7 @@ Epistle Sir 31:8-11 Gospel Matt 6:24-33 Commemoration St. Donatus -=== Week 2 +=== Week II (Aug 8–14) *8* 12th Sunday after Pentecost + @@ -1589,7 +1592,7 @@ Epistle Sir 24:23-31 Gospel Luke 11:27-28 Commemoration St. Eusebius -=== Week 3 +=== Week III (Aug 15–21) *15* Assumption of the Blessed Virgin Mary + @@ -1636,7 +1639,7 @@ Epistle Prov 31:10-31 Gospel Matt 13:44-52. -=== Week 4 +=== Week IV (Aug 22–28) *22* 14th Sunday after Pentecost + @@ -1684,7 +1687,7 @@ Epistle 2 Tim 4:1-8 Gospel Matt 5:13-19 Commemoration St. Hermes -=== Week 5 +=== Week V (Aug 29–31) *29* 15th Sunday after Pentecost + @@ -1709,7 +1712,7 @@ Epistle Sir 31:8-11 Gospel Luke 12:35-40 == September -=== Week 1 +=== Week I (Sep 1–4) *1* Wednesday of the 15th Week of the Time after Pentecost + @@ -1738,7 +1741,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 -=== Week 2 +=== Week II (Sep 5–11) *5* 16th Sunday after Pentecost + @@ -1786,7 +1789,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 Commemoration Sts. Protus & Hyacinth -=== Week 3 +=== Week III (Sep 12–18) *12* 17th Sunday after Pentecost + @@ -1834,7 +1837,7 @@ Epistle 1 Cor 13:1-8 Gospel Matt 22:1-14 -=== Week 4 +=== Week IV (Sep 19–25) *19* 18th Sunday after Pentecost + @@ -1883,7 +1886,7 @@ Epistle Heb 9:2-12 Gospel Luke 13:6-17 -=== Week 5 +=== Week V (Sep 26–30) *26* 19th Sunday after Pentecost + @@ -1919,7 +1922,7 @@ Epistle 2 Tim 4:1-8 Gospel Matt 5:13-19 == October -=== Week 1 +=== Week I (Oct 1–2) *1* Friday of the 19th Week of the Time after Pentecost + @@ -1935,7 +1938,7 @@ Epistle Exod 23:20-23 Gospel Matt 18:1-10 -=== Week 2 +=== Week II (Oct 3–9) *3* 20th Sunday after Pentecost + @@ -1984,7 +1987,7 @@ 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) *10* 21st Sunday after Pentecost + @@ -2029,7 +2032,7 @@ Epistle Prov 31:10-31 Gospel Matt 13:44-52. -=== Week 4 +=== Week IV (Oct 17–23) *17* 22nd Sunday after Pentecost + @@ -2076,7 +2079,7 @@ Epistle Heb 7:23-27 Gospel Matt 24:42-47 -=== Week 5 +=== Week V (Oct 24–30) *24* 23rd Sunday after Pentecost + @@ -2123,7 +2126,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 -=== Week 6 +=== Week VI (Oct 31) *31* Christ the King + @@ -2135,7 +2138,7 @@ Epistle Col 1:12-20. Gospel John 18:33-37 == November -=== Week 1 +=== Week I (Nov 1–6) *1* All Saints + @@ -2175,7 +2178,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 -=== Week 2 +=== Week II (Nov 7–13) *7* 5th Sunday after Epiphany + @@ -2224,7 +2227,7 @@ Epistle 1 Cor 4:9-14 Gospel Luke 12:32-34 -=== Week 3 +=== Week III (Nov 14–20) *14* 6th Sunday after Epiphany + @@ -2270,7 +2273,7 @@ Epistle 1 Cor. 4:9-14 Gospel Luke 12:32-34 -=== Week 4 +=== Week IV (Nov 21–27) *21* 24th and Last Sunday after Pentecost + @@ -2318,7 +2321,7 @@ Epistle Ecclus 24:14-16 Gospel Luke 11:27-28 -=== Week 5 +=== Week V (Nov 28–30) *28* 1st Sunday of Advent + @@ -2344,7 +2347,7 @@ Commemoration Tuesday of the 1st Week of Advent == December -=== Week 1 +=== Week I (Dec 1–4) *1* Wednesday of the 1st Week of Advent + @@ -2375,7 +2378,7 @@ Commemoration Saturday of the 1st Week of Advent + Commemoration St. Barbara -=== Week 2 +=== Week II (Dec 5–11) *5* 2nd Sunday of Advent + @@ -2425,7 +2428,7 @@ 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) *12* 3rd Sunday of Advent + @@ -2472,7 +2475,7 @@ Epistle 2 Thess 2:1-8 Gospel Luke 3:1-6 -=== Week 4 +=== Week IV (Dec 19–25) *19* 4th Sunday of Advent + @@ -2518,7 +2521,7 @@ Epistle Heb 1:1-12 Gospel John 1:1-14 -=== Week 5 +=== Week V (Dec 26–31) *26* Sunday within the Octave of the Nativity + 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. --> <!doctype html> <html lang="la"><head><meta charset="utf-8"> <title>Ordo 2027</title> @@ -32,7 +35,7 @@ </style></head><body> <h1>Ordo 2027 · Roman Missal, 1962 typical edition</h1> <h2>January</h2> -<h3>Week 1</h3> +<h3>Week I (Jan 1–2)</h3> <div class="day white"> <span class="dom">1</span>The Octave Day of the Nativity <div class="meta">class-1 · white · Epistle Titus 2:11-15 · Gospel Luke 2:21</div> @@ -43,7 +46,7 @@ <div class="meta">class-4 · white · Epistle Titus 3:4-7 · Gospel Luke 2:15-20</div> </div> -<h3>Week 2</h3> +<h3>Week II (Jan 3–9)</h3> <div class="day white"> <span class="dom">3</span>The Holy Name of Jesus <div class="meta">class-2 · white · Epistle Acts 4:8-12 · Gospel Luke 2:21</div> @@ -79,7 +82,7 @@ <div class="meta">class-4 · white · Epistle Titus 3:4-7 · Gospel Luke 2:15-20</div> </div> -<h3>Week 3</h3> +<h3>Week III (Jan 10–16)</h3> <div class="day white"> <span class="dom">10</span>The Holy Family <div class="meta">class-2 · white · Epistle Col 3:12-17 · Gospel Luke 2:42-52</div> @@ -115,7 +118,7 @@ <div class="meta">class-3 · red · Epistle 1 Pet 5:1-4; 5:10-11. · Gospel Matt 16:13-19</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Jan 17–23)</h3> <div class="day green"> <span class="dom">17</span>2nd Sunday after Epiphany <div class="meta">class-2 · green · Epistle Rom 12:6-16 · Gospel John 2:1-11</div> @@ -151,7 +154,7 @@ <div class="meta">class-3 · white · Epistle Sir 31:8-11 · Gospel Luke 12:35-40</div> <div class="meta">Commemoration St. Emerentiana</div> </div> -<h3>Week 5</h3> +<h3>Week V (Jan 24–30)</h3> <div class="day violet"> <span class="dom">24</span>Septuagesima Sunday <div class="meta">class-2 · violet · Epistle 1 Cor. 9:24-27; 10:1-5 · Gospel Matt 20:1-16</div> @@ -187,14 +190,14 @@ <div class="meta">class-3 · red · Epistle Sir 51:1-8; 51:12 · Gospel Matt 25:1-13.</div> </div> -<h3>Week 6</h3> +<h3>Week VI (Jan 31)</h3> <div class="day violet"> <span class="dom">31</span>Sexagesima Sunday <div class="meta">class-2 · violet · Epistle 2 Cor. 11:19-33; 12:1-9 · Gospel Luke 8:4-15</div> </div> <h2>February</h2> -<h3>Week 1</h3> +<h3>Week I (Feb 1–6)</h3> <div class="day red"> <span class="dom">1</span>St. Ignatius of Antioch <div class="meta">class-3 · red · Epistle Rom 8:35-39 · Gospel John 12:24-26</div> @@ -225,7 +228,7 @@ <div class="meta">class-3 · white · Epistle Sir 44:16-27; 45:3-20 · Gospel Luke 10:1-9</div> <div class="meta">Commemoration St. Dorothy</div> </div> -<h3>Week 2</h3> +<h3>Week II (Feb 7–13)</h3> <div class="day violet"> <span class="dom">7</span>Quinquagesima Sunday <div class="meta">class-2 · violet · Epistle 1 Cor. 13:1-13 · Gospel Luke 18:31-43</div> @@ -261,7 +264,7 @@ <div class="meta">class-3 · violet · Epistle Isa 58:9-14 · Gospel Mark 6:47-56</div> </div> -<h3>Week 3</h3> +<h3>Week III (Feb 14–20)</h3> <div class="day violet"> <span class="dom">14</span>1st Sunday of Lent <div class="meta">class-1 · violet · Epistle 2 Cor. 6:1-10 · Gospel Matt 4:1-11</div> @@ -297,7 +300,7 @@ <div class="meta">class-2 · violet · Epistle 1 Thess. 5:14-23 · Gospel Matt 17:1-9</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Feb 21–27)</h3> <div class="day violet"> <span class="dom">21</span>2nd Sunday of Lent <div class="meta">class-1 · violet · Epistle 1 Thess. 4:1-7 · Gospel Matt 17:1-9</div> @@ -333,14 +336,14 @@ <div class="meta">class-3 · violet · Epistle Gen 27:6-40 · Gospel Luke 15:11-32</div> <div class="meta">Commemoration St. Gabriel of Our Lady of Sorrows</div> </div> -<h3>Week 5</h3> +<h3>Week V (Feb 28)</h3> <div class="day violet"> <span class="dom">28</span>3rd Sunday of Lent <div class="meta">class-1 · violet · Epistle Eph 5:1-9 · Gospel Luke 11:14-28</div> </div> <h2>March</h2> -<h3>Week 1</h3> +<h3>Week I (Mar 1–6)</h3> <div class="day violet"> <span class="dom">1</span>Monday of the 3rd Week of Lent <div class="meta">class-3 · violet · Epistle 4 Kings 5:1-15 · Gospel Luke 4:23-30</div> @@ -371,7 +374,7 @@ <div class="meta">class-3 · violet · Epistle Dan 13:1-9, 15-17, 19-30, 33-62. · Gospel John 8:1-11</div> <div class="meta">Commemoration Sts. Felicitas & Perpetua</div> </div> -<h3>Week 2</h3> +<h3>Week II (Mar 7–13)</h3> <div class="day rose"> <span class="dom">7</span>4th Sunday of Lent <div class="meta">class-1 · rose · Epistle Gal 4:22-31 · Gospel John 6:1-15</div> @@ -407,7 +410,7 @@ <div class="meta">class-3 · violet · Epistle Isa 49:8-15 · Gospel John 8:12-20</div> </div> -<h3>Week 3</h3> +<h3>Week III (Mar 14–20)</h3> <div class="day violet"> <span class="dom">14</span>Passion Sunday <div class="meta">class-1 · violet · Epistle Heb 9:11-15. · Gospel John 8:46-59.</div> @@ -443,7 +446,7 @@ <div class="meta">class-3 · violet · Epistle Jer 18:18-23 · Gospel John 12:10-36</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Mar 21–27)</h3> <div class="day violet"> <span class="dom">21</span>Palm Sunday <div class="meta">class-1 · violet · Epistle Phil 2:5-11 · Gospel Matt. 26:36-75; 27:1-60.</div> @@ -479,7 +482,7 @@ <div class="meta">class-1 · violet · Epistle Col 3:1-4 · Gospel Matt 28:1-7</div> </div> -<h3>Week 5</h3> +<h3>Week V (Mar 28–31)</h3> <div class="day white"> <span class="dom">28</span>Easter Sunday <div class="meta">class-1 · white · Epistle 1 Cor 5:7-8 · Gospel Mark 16:1-7</div> @@ -501,7 +504,7 @@ </div> <h2>April</h2> -<h3>Week 1</h3> +<h3>Week I (Apr 1–3)</h3> <div class="day white"> <span class="dom">1</span>Thursday of Easter Week <div class="meta">class-1 · white · Epistle Acts 8:26-40 · Gospel John 20:11-18</div> @@ -517,7 +520,7 @@ <div class="meta">class-1 · white · Epistle 1 Pet 2:1-10 · Gospel John 20:1-9</div> </div> -<h3>Week 2</h3> +<h3>Week II (Apr 4–10)</h3> <div class="day white"> <span class="dom">4</span>Low Sunday (Sunday in Easter Octave) <div class="meta">class-1 · white · Epistle 1 John 5:4-10 · Gospel John 20:19-31</div> @@ -553,7 +556,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27</div> </div> -<h3>Week 3</h3> +<h3>Week III (Apr 11–17)</h3> <div class="day white"> <span class="dom">11</span>2nd Sunday after Easter <div class="meta">class-2 · white · Epistle 1 Pet 2:21-25 · Gospel John 10:11-16</div> @@ -589,7 +592,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27</div> <div class="meta">Commemoration St. Anicetus</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Apr 18–24)</h3> <div class="day white"> <span class="dom">18</span>3rd Sunday after Easter <div class="meta">class-2 · white · Epistle 1 Pet 2:11-19 · Gospel John 16:16-22</div> @@ -625,7 +628,7 @@ <div class="meta">class-3 · red · Epistle Wis 5:1-5 · Gospel John 15:1-7</div> </div> -<h3>Week 5</h3> +<h3>Week V (Apr 25–30)</h3> <div class="day white"> <span class="dom">25</span>4th Sunday after Easter <div class="meta">class-2 · white · Epistle Jas 1:17-21 · Gospel John 16:5-14</div> @@ -657,13 +660,13 @@ </div> <h2>May</h2> -<h3>Week 1</h3> +<h3>Week I (May 1)</h3> <div class="day white"> <span class="dom">1</span>St. Joseph the Workman <div class="meta">class-1 · white · Epistle Col. 3:14-15, 17, 23-24 · Gospel Matt 13:54-58</div> </div> -<h3>Week 2</h3> +<h3>Week II (May 2–8)</h3> <div class="day white"> <span class="dom">2</span>5th Sunday after Easter <div class="meta">class-2 · white · Epistle Jas 1:22-27 · Gospel John 16:23-30</div> @@ -699,7 +702,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel John 19:25-27</div> </div> -<h3>Week 3</h3> +<h3>Week III (May 9–15)</h3> <div class="day white"> <span class="dom">9</span>Sunday after the Ascension <div class="meta">class-2 · white · Epistle 1 Pet 4:7-11. · Gospel John 15:26-27; 16:1-4.</div> @@ -735,7 +738,7 @@ <div class="meta">class-1 · red · Epistle Acts 19:1-8. · Gospel John 14:15-21.</div> </div> -<h3>Week 4</h3> +<h3>Week IV (May 16–22)</h3> <div class="day red"> <span class="dom">16</span>Pentecost Sunday (Whitsunday) <div class="meta">class-1 · red · Epistle Acts 2:1-11. · Gospel John 14:23-31.</div> @@ -771,7 +774,7 @@ <div class="meta">class-1 · red · Epistle Rom 5:1-5. · Gospel Luke 4:38-44.</div> </div> -<h3>Week 5</h3> +<h3>Week V (May 23–29)</h3> <div class="day white"> <span class="dom">23</span>Trinity Sunday <div class="meta">class-1 · white · Epistle Rom 11:33-36. · Gospel Matt 28:18-20</div> @@ -807,7 +810,7 @@ <div class="meta">class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.</div> </div> -<h3>Week 6</h3> +<h3>Week VI (May 30–31)</h3> <div class="day green"> <span class="dom">30</span>2nd Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 John 3:13-18. · Gospel Luke 14:16-24.</div> @@ -819,7 +822,7 @@ <div class="meta">Commemoration St. Petronilla</div> </div> <h2>June</h2> -<h3>Week 1</h3> +<h3>Week I (Jun 1–5)</h3> <div class="day white"> <span class="dom">1</span>St. Angela Merici <div class="meta">class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.</div> @@ -845,7 +848,7 @@ <div class="meta">class-3 · red · Epistle Ecclus 44:1-15 · Gospel Matt 5:1-12</div> </div> -<h3>Week 2</h3> +<h3>Week II (Jun 6–12)</h3> <div class="day green"> <span class="dom">6</span>3rd Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Pet. 5:6-11 · Gospel Luke 15:1-10</div> @@ -881,7 +884,7 @@ <div class="meta">class-3 · white · Epistle Sir 31:8-11 · Gospel Luke 12:35-40</div> <div class="meta">Commemoration St. Basilidus</div> </div> -<h3>Week 3</h3> +<h3>Week III (Jun 13–19)</h3> <div class="day green"> <span class="dom">13</span>4th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Rom 8:18-23 · Gospel Luke 5:1-11</div> @@ -917,7 +920,7 @@ <div class="meta">class-3 · white · Epistle 2 Cor 10:17-18; 11:1-2 · Gospel Matt 25:1-13.</div> <div class="meta">Commemoration Sts. Gervasius and Protasius</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Jun 20–26)</h3> <div class="day green"> <span class="dom">20</span>5th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Pet 3:8-15. · Gospel Matt 5:20-24.</div> @@ -953,7 +956,7 @@ <div class="meta">class-3 · red · Epistle Eccli 44:10-15 · Gospel Luke 12:1-8</div> </div> -<h3>Week 5</h3> +<h3>Week V (Jun 27–30)</h3> <div class="day green"> <span class="dom">27</span>6th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Rom 6:3-11. · Gospel Mark 8:1-9</div> @@ -975,7 +978,7 @@ <div class="meta">Commemoration St. Peter</div> </div> <h2>July</h2> -<h3>Week 1</h3> +<h3>Week I (Jul 1–3)</h3> <div class="day red"> <span class="dom">1</span>The Precious Blood of Our Lord Jesus Christ <div class="meta">class-1 · red · Epistle Heb 9:11-15. · Gospel John 19:30-35</div> @@ -991,7 +994,7 @@ <div class="meta">class-3 · red · Epistle 2 Tim. 3:14-17; 4:1-5 · Gospel Matt 10:28-33</div> </div> -<h3>Week 2</h3> +<h3>Week II (Jul 4–10)</h3> <div class="day green"> <span class="dom">4</span>7th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Rom 6:19-23 · Gospel Matt 7:15-21</div> @@ -1027,7 +1030,7 @@ <div class="meta">class-3 · red · Epistle Prov 31:10-31 · Gospel Matt 12:46-50</div> </div> -<h3>Week 3</h3> +<h3>Week III (Jul 11–17)</h3> <div class="day green"> <span class="dom">11</span>8th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Rom 8:12-17 · Gospel Luke 16:1-9</div> @@ -1063,7 +1066,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> <div class="meta">Commemoration St. Alexis</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Jul 18–24)</h3> <div class="day green"> <span class="dom">18</span>9th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Cor. 10:6-13 · Gospel Luke 19:41-47</div> @@ -1099,7 +1102,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> <div class="meta">Commemoration St. Christina</div> </div> -<h3>Week 5</h3> +<h3>Week V (Jul 25–31)</h3> <div class="day green"> <span class="dom">25</span>10th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Cor. 12:2-11 · Gospel Luke 18:9-14</div> @@ -1136,7 +1139,7 @@ </div> <h2>August</h2> -<h3>Week 1</h3> +<h3>Week I (Aug 1–7)</h3> <div class="day green"> <span class="dom">1</span>11th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Cor. 15:1-10 · Gospel Mark 7:31-37</div> @@ -1172,7 +1175,7 @@ <div class="meta">class-3 · white · Epistle Sir 31:8-11 · Gospel Matt 6:24-33</div> <div class="meta">Commemoration St. Donatus</div> </div> -<h3>Week 2</h3> +<h3>Week II (Aug 8–14)</h3> <div class="day green"> <span class="dom">8</span>12th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 2 Cor. 3:4-9 · Gospel Luke 10:23-37</div> @@ -1208,7 +1211,7 @@ <div class="meta">class-2 · violet · Epistle Sir 24:23-31 · Gospel Luke 11:27-28</div> <div class="meta">Commemoration St. Eusebius</div> </div> -<h3>Week 3</h3> +<h3>Week III (Aug 15–21)</h3> <div class="day white"> <span class="dom">15</span>Assumption of the Blessed Virgin Mary <div class="meta">class-1 · white · Epistle Judith 13:22-25; 15:10 · Gospel Luke 1:41-50</div> @@ -1244,7 +1247,7 @@ <div class="meta">class-3 · white · Epistle Prov 31:10-31 · Gospel Matt 13:44-52.</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Aug 22–28)</h3> <div class="day green"> <span class="dom">22</span>14th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Gal 5:16-24 · Gospel Matt 6:24-33</div> @@ -1280,7 +1283,7 @@ <div class="meta">class-3 · white · Epistle 2 Tim 4:1-8 · Gospel Matt 5:13-19</div> <div class="meta">Commemoration St. Hermes</div> </div> -<h3>Week 5</h3> +<h3>Week V (Aug 29–31)</h3> <div class="day green"> <span class="dom">29</span>15th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Gal 5:25-26; 6:1-10 · Gospel Luke 7:11-16</div> @@ -1297,7 +1300,7 @@ </div> <h2>September</h2> -<h3>Week 1</h3> +<h3>Week I (Sep 1–4)</h3> <div class="day green"> <span class="dom">1</span>Wednesday of the 15th Week of the Time after Pentecost <div class="meta">class-4 · green · Epistle Gal 5:25-26; 6:1-10 · Gospel Luke 7:11-16</div> @@ -1318,7 +1321,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> </div> -<h3>Week 2</h3> +<h3>Week II (Sep 5–11)</h3> <div class="day green"> <span class="dom">5</span>16th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Eph 3:13-21 · Gospel Luke 14:1-11</div> @@ -1354,7 +1357,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> <div class="meta">Commemoration Sts. Protus & Hyacinth</div> </div> -<h3>Week 3</h3> +<h3>Week III (Sep 12–18)</h3> <div class="day green"> <span class="dom">12</span>17th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Eph 4:1-6 · Gospel Matt 22:34-46</div> @@ -1390,7 +1393,7 @@ <div class="meta">class-3 · white · Epistle 1 Cor 13:1-8 · Gospel Matt 22:1-14</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Sep 19–25)</h3> <div class="day green"> <span class="dom">19</span>18th Sunday after Pentecost <div class="meta">class-2 · green · Epistle 1 Cor. 1:4-8 · Gospel Matt 9:1-8</div> @@ -1426,7 +1429,7 @@ <div class="meta">class-2 · violet · Epistle Heb 9:2-12 · Gospel Luke 13:6-17</div> </div> -<h3>Week 5</h3> +<h3>Week V (Sep 26–30)</h3> <div class="day green"> <span class="dom">26</span>19th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Eph 4:23-28 · Gospel Matt 22:1-14</div> @@ -1453,7 +1456,7 @@ </div> <h2>October</h2> -<h3>Week 1</h3> +<h3>Week I (Oct 1–2)</h3> <div class="day green"> <span class="dom">1</span>Friday of the 19th Week of the Time after Pentecost <div class="meta">class-4 · green · Epistle Eph 4:23-28 · Gospel Matt 22:1-14</div> @@ -1464,7 +1467,7 @@ <div class="meta">class-3 · white · Epistle Exod 23:20-23 · Gospel Matt 18:1-10</div> </div> -<h3>Week 2</h3> +<h3>Week II (Oct 3–9)</h3> <div class="day green"> <span class="dom">3</span>20th Sunday after Pentecost <div class="meta">class-2 · green · Epistle Eph 5:15-21 · Gospel John 4:46-53</div> @@ -1500,7 +1503,7 @@ <div class="meta">class-3 · white · Epistle 2 Cor 4:1-6; 4:15-18 · Gospel Luke 10:1-9</div> <div class="meta">Commemoration St. Dionysius and companions</div> </div> -<h3>Week 3</h3> +<h3>Week III (Oct 10–16)</h3> <div class="day green"> <span class="dom">10</span>21st Sunday after Pentecost <div class="meta">class-2 · green · Epistle Eph 6:10-17 · Gospel Matt 18:23-35</div> @@ -1536,7 +1539,7 @@ <div class="meta">class-3 · white · Epistle Prov 31:10-31 · Gospel Matt 13:44-52.</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Oct 17–23)</h3> <div class="day green"> <span class="dom">17</span>22nd Sunday after Pentecost <div class="meta">class-2 · green · Epistle Phil 1:6-11 · Gospel Matt 22:15-21</div> @@ -1572,7 +1575,7 @@ <div class="meta">class-3 · white · Epistle Heb 7:23-27 · Gospel Matt 24:42-47</div> </div> -<h3>Week 5</h3> +<h3>Week V (Oct 24–30)</h3> <div class="day green"> <span class="dom">24</span>23rd Sunday after Pentecost <div class="meta">class-2 · green · Epistle Phil 3:17-21; 4:1-3 · Gospel Matt 9:18-26</div> @@ -1608,14 +1611,14 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> </div> -<h3>Week 6</h3> +<h3>Week VI (Oct 31)</h3> <div class="day white"> <span class="dom">31</span>Christ the King <div class="meta">class-1 · white · Epistle Col 1:12-20. · Gospel John 18:33-37</div> </div> <h2>November</h2> -<h3>Week 1</h3> +<h3>Week I (Nov 1–6)</h3> <div class="day white"> <span class="dom">1</span>All Saints <div class="meta">class-1 · white · Epistle Apoc 7:2-12 · Gospel Matt 5:1-12</div> @@ -1646,7 +1649,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> </div> -<h3>Week 2</h3> +<h3>Week II (Nov 7–13)</h3> <div class="day green"> <span class="dom">7</span>5th Sunday after Epiphany <div class="meta">class-2 · green · Epistle Col 3:12-17 · Gospel Matt 13:24-30</div> @@ -1682,7 +1685,7 @@ <div class="meta">class-3 · white · Epistle 1 Cor 4:9-14 · Gospel Luke 12:32-34</div> </div> -<h3>Week 3</h3> +<h3>Week III (Nov 14–20)</h3> <div class="day green"> <span class="dom">14</span>6th Sunday after Epiphany <div class="meta">class-2 · green · Epistle 1 Thess 1:2-10 · Gospel Matt 13:31-35</div> @@ -1718,7 +1721,7 @@ <div class="meta">class-3 · white · Epistle 1 Cor. 4:9-14 · Gospel Luke 12:32-34</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Nov 21–27)</h3> <div class="day green"> <span class="dom">21</span>24th and Last Sunday after Pentecost <div class="meta">class-2 · green · Epistle Col 1:9-14 · Gospel Matt 24:15-35</div> @@ -1754,7 +1757,7 @@ <div class="meta">class-4 · white · Epistle Ecclus 24:14-16 · Gospel Luke 11:27-28</div> </div> -<h3>Week 5</h3> +<h3>Week V (Nov 28–30)</h3> <div class="day violet"> <span class="dom">28</span>1st Sunday of Advent <div class="meta">class-1 · violet · Epistle Rom 13:11-14 · Gospel Luke 21:25-33</div> @@ -1771,7 +1774,7 @@ <div class="meta">Commemoration Tuesday of the 1st Week of Advent</div> </div> <h2>December</h2> -<h3>Week 1</h3> +<h3>Week I (Dec 1–4)</h3> <div class="day violet"> <span class="dom">1</span>Wednesday of the 1st Week of Advent <div class="meta">class-3 · violet · Epistle Rom 13:11-14 · Gospel Luke 21:25-33</div> @@ -1792,7 +1795,7 @@ <div class="meta">class-3 · white · Epistle 2 Tim 4:1-8 · Gospel Matt 5:13-19</div> <div class="meta">Commemoration Saturday of the 1st Week of Advent</div><div class="meta">Commemoration St. Barbara</div> </div> -<h3>Week 2</h3> +<h3>Week II (Dec 5–11)</h3> <div class="day violet"> <span class="dom">5</span>2nd Sunday of Advent <div class="meta">class-1 · violet · Epistle Rom 15:4-13 · Gospel Matt 11:2-10</div> @@ -1828,7 +1831,7 @@ <div class="meta">class-3 · white · Epistle 1 Pet 5:1-4; 5:10-11. · Gospel Matt 16:13-19</div> <div class="meta">Commemoration Saturday of the 2nd Week of Advent</div> </div> -<h3>Week 3</h3> +<h3>Week III (Dec 12–18)</h3> <div class="day rose"> <span class="dom">12</span>3rd Sunday of Advent <div class="meta">class-1 · rose · Epistle Phil 4:4-7 · Gospel John 1:19-28</div> @@ -1864,7 +1867,7 @@ <div class="meta">class-2 · violet · Epistle 2 Thess 2:1-8 · Gospel Luke 3:1-6</div> </div> -<h3>Week 4</h3> +<h3>Week IV (Dec 19–25)</h3> <div class="day violet"> <span class="dom">19</span>4th Sunday of Advent <div class="meta">class-1 · violet · Epistle 1 Cor. 4:1-5 · Gospel Luke 3:1-6</div> @@ -1900,7 +1903,7 @@ <div class="meta">class-1 · white · Epistle Heb 1:1-12 · Gospel John 1:1-14</div> </div> -<h3>Week 5</h3> +<h3>Week V (Dec 26–31)</h3> <div class="day white"> <span class="dom">26</span>Sunday within the Octave of the Nativity <div class="meta">class-2 · white · Epistle Gal 4:1-7 · Gospel Luke 2:33-40</div> diff --git a/test/golden/ordo-2027.md b/test/golden/ordo-2027.md index 583b4f6..ebf9710 100644 --- a/test/golden/ordo-2027.md +++ b/test/golden/ordo-2027.md @@ -15,14 +15,17 @@ the same header treatment as the paginated flavours, for structural consistency -- a ### per week under each month's ##, walking months>weeks>days (the week's own padded, in-month-guarded day - list, not the flat unpadded one the old months>days loop used). --> + list, not the flat unpadded one the old months>days loop used). Each + week heading 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 month's own ## heading above already establishes it once. --> # Ordo 2027 · Roman Missal, 1962 typical edition ## January -### Week 1 +### Week I (Jan 1–2) **1** The Octave Day of the Nativity @@ -35,7 +38,7 @@ -### Week 2 +### Week II (Jan 3–9) **3** The Holy Name of Jesus @@ -75,7 +78,7 @@ -### Week 3 +### Week III (Jan 10–16) **10** The Holy Family @@ -119,7 +122,7 @@ -### Week 4 +### Week IV (Jan 17–23) **17** 2nd Sunday after Epiphany @@ -165,7 +168,7 @@ -### Week 5 +### Week V (Jan 24–30) **24** Septuagesima Sunday @@ -207,7 +210,7 @@ -### Week 6 +### Week VI (Jan 31) **31** Sexagesima Sunday @@ -218,7 +221,7 @@ ## February -### Week 1 +### Week I (Feb 1–6) **1** St. Ignatius of Antioch @@ -255,7 +258,7 @@ -### Week 2 +### Week II (Feb 7–13) **7** Quinquagesima Sunday @@ -299,7 +302,7 @@ -### Week 3 +### Week III (Feb 14–20) **14** 1st Sunday of Lent @@ -341,7 +344,7 @@ -### Week 4 +### Week IV (Feb 21–27) **21** 2nd Sunday of Lent @@ -389,7 +392,7 @@ -### Week 5 +### Week V (Feb 28) **28** 3rd Sunday of Lent @@ -400,7 +403,7 @@ ## March -### Week 1 +### Week I (Mar 1–6) **1** Monday of the 3rd Week of Lent @@ -439,7 +442,7 @@ -### Week 2 +### Week II (Mar 7–13) **7** 4th Sunday of Lent @@ -485,7 +488,7 @@ -### Week 3 +### Week III (Mar 14–20) **14** Passion Sunday @@ -529,7 +532,7 @@ -### Week 4 +### Week IV (Mar 21–27) **21** Palm Sunday @@ -567,7 +570,7 @@ -### Week 5 +### Week V (Mar 28–31) **28** Easter Sunday @@ -593,7 +596,7 @@ ## April -### Week 1 +### Week I (Apr 1–3) **1** Thursday of Easter Week @@ -611,7 +614,7 @@ -### Week 2 +### Week II (Apr 4–10) **4** Low Sunday (Sunday in Easter Octave) @@ -649,7 +652,7 @@ -### Week 3 +### Week III (Apr 11–17) **11** 2nd Sunday after Easter @@ -691,7 +694,7 @@ -### Week 4 +### Week IV (Apr 18–24) **18** 3rd Sunday after Easter @@ -731,7 +734,7 @@ -### Week 5 +### Week V (Apr 25–30) **25** 4th Sunday after Easter @@ -769,7 +772,7 @@ ## May -### Week 1 +### Week I (May 1) **1** St. Joseph the Workman @@ -777,7 +780,7 @@ -### Week 2 +### Week II (May 2–8) **2** 5th Sunday after Easter @@ -819,7 +822,7 @@ -### Week 3 +### Week III (May 9–15) **9** Sunday after the Ascension @@ -861,7 +864,7 @@ -### Week 4 +### Week IV (May 16–22) **16** Pentecost Sunday (Whitsunday) @@ -899,7 +902,7 @@ -### Week 5 +### Week V (May 23–29) **23** Trinity Sunday @@ -941,7 +944,7 @@ -### Week 6 +### Week VI (May 30–31) **30** 2nd Sunday after Pentecost @@ -959,7 +962,7 @@ ## June -### Week 1 +### Week I (Jun 1–5) **1** St. Angela Merici @@ -989,7 +992,7 @@ -### Week 2 +### Week II (Jun 6–12) **6** 3rd Sunday after Pentecost @@ -1031,7 +1034,7 @@ -### Week 3 +### Week III (Jun 13–19) **13** 4th Sunday after Pentecost @@ -1075,7 +1078,7 @@ -### Week 4 +### Week IV (Jun 20–26) **20** 5th Sunday after Pentecost @@ -1113,7 +1116,7 @@ -### Week 5 +### Week V (Jun 27–30) **27** 6th Sunday after Pentecost @@ -1141,7 +1144,7 @@ ## July -### Week 1 +### Week I (Jul 1–3) **1** The Precious Blood of Our Lord Jesus Christ @@ -1161,7 +1164,7 @@ -### Week 2 +### Week II (Jul 4–10) **4** 7th Sunday after Pentecost @@ -1199,7 +1202,7 @@ -### Week 3 +### Week III (Jul 11–17) **11** 8th Sunday after Pentecost @@ -1243,7 +1246,7 @@ -### Week 4 +### Week IV (Jul 18–24) **18** 9th Sunday after Pentecost @@ -1289,7 +1292,7 @@ -### Week 5 +### Week V (Jul 25–31) **25** 10th Sunday after Pentecost @@ -1338,7 +1341,7 @@ ## August -### Week 1 +### Week I (Aug 1–7) **1** 11th Sunday after Pentecost @@ -1382,7 +1385,7 @@ -### Week 2 +### Week II (Aug 8–14) **8** 12th Sunday after Pentecost @@ -1428,7 +1431,7 @@ -### Week 3 +### Week III (Aug 15–21) **15** Assumption of the Blessed Virgin Mary @@ -1470,7 +1473,7 @@ -### Week 4 +### Week IV (Aug 22–28) **22** 14th Sunday after Pentecost @@ -1514,7 +1517,7 @@ -### Week 5 +### Week V (Aug 29–31) **29** 15th Sunday after Pentecost @@ -1537,7 +1540,7 @@ ## September -### Week 1 +### Week I (Sep 1–4) **1** Wednesday of the 15th Week of the Time after Pentecost @@ -1564,7 +1567,7 @@ -### Week 2 +### Week II (Sep 5–11) **5** 16th Sunday after Pentecost @@ -1608,7 +1611,7 @@ -### Week 3 +### Week III (Sep 12–18) **12** 17th Sunday after Pentecost @@ -1652,7 +1655,7 @@ -### Week 4 +### Week IV (Sep 19–25) **19** 18th Sunday after Pentecost @@ -1698,7 +1701,7 @@ -### Week 5 +### Week V (Sep 26–30) **26** 19th Sunday after Pentecost @@ -1729,7 +1732,7 @@ ## October -### Week 1 +### Week I (Oct 1–2) **1** Friday of the 19th Week of the Time after Pentecost @@ -1744,7 +1747,7 @@ -### Week 2 +### Week II (Oct 3–9) **3** 20th Sunday after Pentecost @@ -1790,7 +1793,7 @@ -### Week 3 +### Week III (Oct 10–16) **10** 21st Sunday after Pentecost @@ -1828,7 +1831,7 @@ -### Week 4 +### Week IV (Oct 17–23) **17** 22nd Sunday after Pentecost @@ -1870,7 +1873,7 @@ -### Week 5 +### Week V (Oct 24–30) **24** 23rd Sunday after Pentecost @@ -1912,7 +1915,7 @@ -### Week 6 +### Week VI (Oct 31) **31** Christ the King @@ -1923,7 +1926,7 @@ ## November -### Week 1 +### Week I (Nov 1–6) **1** All Saints @@ -1958,7 +1961,7 @@ -### Week 2 +### Week II (Nov 7–13) **7** 5th Sunday after Epiphany @@ -2004,7 +2007,7 @@ -### Week 3 +### Week III (Nov 14–20) **14** 6th Sunday after Epiphany @@ -2044,7 +2047,7 @@ -### Week 4 +### Week IV (Nov 21–27) **21** 24th and Last Sunday after Pentecost @@ -2088,7 +2091,7 @@ -### Week 5 +### Week V (Nov 28–30) **28** 1st Sunday of Advent @@ -2113,7 +2116,7 @@ ## December -### Week 1 +### Week I (Dec 1–4) **1** Wednesday of the 1st Week of Advent @@ -2144,7 +2147,7 @@ -### Week 2 +### Week II (Dec 5–11) **5** 2nd Sunday of Advent @@ -2192,7 +2195,7 @@ -### Week 3 +### Week III (Dec 12–18) **12** 3rd Sunday of Advent @@ -2234,7 +2237,7 @@ -### Week 4 +### Week IV (Dec 19–25) **19** 4th Sunday of Advent @@ -2274,7 +2277,7 @@ -### Week 5 +### Week V (Dec 26–31) **26** Sunday within the Octave of the Nativity diff --git a/test/golden/ordo-2027.ms b/test/golden/ordo-2027.ms index cfaada9..785a7ac 100644 --- a/test/golden/ordo-2027.ms +++ b/test/golden/ordo-2027.ms @@ -15,7 +15,10 @@ .\" treatment as the paginated flavours, for structural consistency -- a .\" bold week run-in under each month's own .SH, walking months>weeks>days .\" (the week's own padded, in-month-guarded day list) in place of the -.\" old months>days flat loop over the month's own flat one. +.\" old months>days flat loop over the month's own flat one. The run-in +.\" 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 month's +.\" own .SH heading above already establishes it once. .TL Ordo 2027 \(bu Roman Missal, 1962 typical edition @@ -23,7 +26,7 @@ Ordo 2027 \(bu Roman Missal, 1962 typical edition January .LP -\fBWeek 1\fR +\fBWeek I (Jan 1\(en2)\fR .IP "1" 4 The Octave Day of the Nativity @@ -45,7 +48,7 @@ Our Lady's Saturday Office .LP -\fBWeek 2\fR +\fBWeek II (Jan 3\(en9)\fR .IP "3" 4 The Holy Name of Jesus @@ -114,7 +117,7 @@ Our Lady's Saturday Office .LP -\fBWeek 3\fR +\fBWeek III (Jan 10\(en16)\fR .IP "10" 4 The Holy Family @@ -187,7 +190,7 @@ St. Marcellus I .LP -\fBWeek 4\fR +\fBWeek IV (Jan 17\(en23)\fR .IP "17" 4 2nd Sunday after Epiphany @@ -262,7 +265,7 @@ St. Raymond of Peñafort .LP -\fBWeek 5\fR +\fBWeek V (Jan 24\(en30)\fR .IP "24" 4 Septuagesima Sunday @@ -333,7 +336,7 @@ St. Martina .LP -\fBWeek 6\fR +\fBWeek VI (Jan 31)\fR .IP "31" 4 Sexagesima Sunday @@ -350,7 +353,7 @@ Sexagesima Sunday February .LP -\fBWeek 1\fR +\fBWeek I (Feb 1\(en6)\fR .IP "1" 4 St. Ignatius of Antioch @@ -412,7 +415,7 @@ St. Titus .LP -\fBWeek 2\fR +\fBWeek II (Feb 7\(en13)\fR .IP "7" 4 Quinquagesima Sunday @@ -485,7 +488,7 @@ Saturday after Ash Wednesday .LP -\fBWeek 3\fR +\fBWeek III (Feb 14\(en20)\fR .IP "14" 4 1st Sunday of Lent @@ -556,7 +559,7 @@ Lenten Ember Saturday .LP -\fBWeek 4\fR +\fBWeek IV (Feb 21\(en27)\fR .IP "21" 4 2nd Sunday of Lent @@ -633,7 +636,7 @@ Saturday of the 2nd Week of Lent .LP -\fBWeek 5\fR +\fBWeek V (Feb 28)\fR .IP "28" 4 3rd Sunday of Lent @@ -650,7 +653,7 @@ Saturday of the 2nd Week of Lent March .LP -\fBWeek 1\fR +\fBWeek I (Mar 1\(en6)\fR .IP "1" 4 Monday of the 3rd Week of Lent @@ -714,7 +717,7 @@ Saturday of the 3rd Week of Lent .LP -\fBWeek 2\fR +\fBWeek II (Mar 7\(en13)\fR .IP "7" 4 4th Sunday of Lent @@ -789,7 +792,7 @@ Saturday of the 4th Week of Lent .LP -\fBWeek 3\fR +\fBWeek III (Mar 14\(en20)\fR .IP "14" 4 Passion Sunday @@ -862,7 +865,7 @@ Saturday of the 1st Week of Passion Week .LP -\fBWeek 4\fR +\fBWeek IV (Mar 21\(en27)\fR .IP "21" 4 Palm Sunday @@ -929,7 +932,7 @@ Holy Saturday .LP -\fBWeek 5\fR +\fBWeek V (Mar 28\(en31)\fR .IP "28" 4 Easter Sunday @@ -973,7 +976,7 @@ Wednesday of Easter Week April .LP -\fBWeek 1\fR +\fBWeek I (Apr 1\(en3)\fR .IP "1" 4 Thursday of Easter Week @@ -1004,7 +1007,7 @@ Saturday of Easter Week .LP -\fBWeek 2\fR +\fBWeek II (Apr 4\(en10)\fR .IP "4" 4 Low Sunday (Sunday in Easter Octave) @@ -1071,7 +1074,7 @@ Our Lady's Saturday Office .LP -\fBWeek 3\fR +\fBWeek III (Apr 11\(en17)\fR .IP "11" 4 2nd Sunday after Easter @@ -1142,7 +1145,7 @@ Our Lady's Saturday Office .LP -\fBWeek 4\fR +\fBWeek IV (Apr 18\(en24)\fR .IP "18" 4 3rd Sunday after Easter @@ -1211,7 +1214,7 @@ St. Fidelis of Sigmaringen .LP -\fBWeek 5\fR +\fBWeek V (Apr 25\(en30)\fR .IP "25" 4 4th Sunday after Easter @@ -1275,7 +1278,7 @@ St. Catherine of Siena May .LP -\fBWeek 1\fR +\fBWeek I (May 1)\fR .IP "1" 4 St. Joseph the Workman @@ -1288,7 +1291,7 @@ St. Joseph the Workman .LP -\fBWeek 2\fR +\fBWeek II (May 2\(en8)\fR .IP "2" 4 5th Sunday after Easter @@ -1359,7 +1362,7 @@ Our Lady's Saturday Office .LP -\fBWeek 3\fR +\fBWeek III (May 9\(en15)\fR .IP "9" 4 Sunday after the Ascension @@ -1430,7 +1433,7 @@ Vigil of Pentecost .LP -\fBWeek 4\fR +\fBWeek IV (May 16\(en22)\fR .IP "16" 4 Pentecost Sunday (Whitsunday) @@ -1497,7 +1500,7 @@ Pentecost Ember Saturday .LP -\fBWeek 5\fR +\fBWeek V (May 23\(en29)\fR .IP "23" 4 Trinity Sunday @@ -1568,7 +1571,7 @@ St. Mary Magdalene de Pazzi .LP -\fBWeek 6\fR +\fBWeek VI (May 30\(en31)\fR .IP "30" 4 2nd Sunday after Pentecost @@ -1596,7 +1599,7 @@ Queenship of the Blessed Virgin Mary June .LP -\fBWeek 1\fR +\fBWeek I (Jun 1\(en5)\fR .IP "1" 4 St. Angela Merici @@ -1647,7 +1650,7 @@ St. Boniface .LP -\fBWeek 2\fR +\fBWeek II (Jun 6\(en12)\fR .IP "6" 4 3rd Sunday after Pentecost @@ -1718,7 +1721,7 @@ St. John of San Fecundo .LP -\fBWeek 3\fR +\fBWeek III (Jun 13\(en19)\fR .IP "13" 4 4th Sunday after Pentecost @@ -1791,7 +1794,7 @@ St. Julia of Falconieri .LP -\fBWeek 4\fR +\fBWeek IV (Jun 20\(en26)\fR .IP "20" 4 5th Sunday after Pentecost @@ -1858,7 +1861,7 @@ Sts. John & Paul .LP -\fBWeek 5\fR +\fBWeek V (Jun 27\(en30)\fR .IP "27" 4 6th Sunday after Pentecost @@ -1904,7 +1907,7 @@ In Commemoratione Sancti Pauli Apostoli July .LP -\fBWeek 1\fR +\fBWeek I (Jul 1\(en3)\fR .IP "1" 4 The Precious Blood of Our Lord Jesus Christ @@ -1937,7 +1940,7 @@ St. Irenaeus .LP -\fBWeek 2\fR +\fBWeek II (Jul 4\(en10)\fR .IP "4" 4 7th Sunday after Pentecost @@ -2004,7 +2007,7 @@ Seven Holy Brothers and Sts. Rufina & Secunda .LP -\fBWeek 3\fR +\fBWeek III (Jul 11\(en17)\fR .IP "11" 4 8th Sunday after Pentecost @@ -2077,7 +2080,7 @@ Our Lady's Saturday Office .LP -\fBWeek 4\fR +\fBWeek IV (Jul 18\(en24)\fR .IP "18" 4 9th Sunday after Pentecost @@ -2152,7 +2155,7 @@ Our Lady's Saturday Office .LP -\fBWeek 5\fR +\fBWeek V (Jul 25\(en31)\fR .IP "25" 4 10th Sunday after Pentecost @@ -2231,7 +2234,7 @@ St. Ignatius Loyola August .LP -\fBWeek 1\fR +\fBWeek I (Aug 1\(en7)\fR .IP "1" 4 11th Sunday after Pentecost @@ -2304,7 +2307,7 @@ St. Cajetan .LP -\fBWeek 2\fR +\fBWeek II (Aug 8\(en14)\fR .IP "8" 4 12th Sunday after Pentecost @@ -2379,7 +2382,7 @@ Vigil of the Assumption .LP -\fBWeek 3\fR +\fBWeek III (Aug 15\(en21)\fR .IP "15" 4 Assumption of the Blessed Virgin Mary @@ -2450,7 +2453,7 @@ St. Jane Frances de Chantal .LP -\fBWeek 4\fR +\fBWeek IV (Aug 22\(en28)\fR .IP "22" 4 14th Sunday after Pentecost @@ -2523,7 +2526,7 @@ St. Augustine .LP -\fBWeek 5\fR +\fBWeek V (Aug 29\(en31)\fR .IP "29" 4 15th Sunday after Pentecost @@ -2560,7 +2563,7 @@ St. Raymond Nonnatus September .LP -\fBWeek 1\fR +\fBWeek I (Sep 1\(en4)\fR .IP "1" 4 Wednesday of the 15th Week of the Time after Pentecost @@ -2604,7 +2607,7 @@ Our Lady's Saturday Office .LP -\fBWeek 2\fR +\fBWeek II (Sep 5\(en11)\fR .IP "5" 4 16th Sunday after Pentecost @@ -2677,7 +2680,7 @@ Our Lady's Saturday Office .LP -\fBWeek 3\fR +\fBWeek III (Sep 12\(en18)\fR .IP "12" 4 17th Sunday after Pentecost @@ -2750,7 +2753,7 @@ St. Joseph of Cupertino .LP -\fBWeek 4\fR +\fBWeek IV (Sep 19\(en25)\fR .IP "19" 4 18th Sunday after Pentecost @@ -2825,7 +2828,7 @@ September Ember Saturday .LP -\fBWeek 5\fR +\fBWeek V (Sep 26\(en30)\fR .IP "26" 4 19th Sunday after Pentecost @@ -2878,7 +2881,7 @@ St. Jerome October .LP -\fBWeek 1\fR +\fBWeek I (Oct 1\(en2)\fR .IP "1" 4 Friday of the 19th Week of the Time after Pentecost @@ -2902,7 +2905,7 @@ Holy Guardian Angels .LP -\fBWeek 2\fR +\fBWeek II (Oct 3\(en9)\fR .IP "3" 4 20th Sunday after Pentecost @@ -2977,7 +2980,7 @@ St. John Leonardi .LP -\fBWeek 3\fR +\fBWeek III (Oct 10\(en16)\fR .IP "10" 4 21st Sunday after Pentecost @@ -3044,7 +3047,7 @@ St. Hedwig .LP -\fBWeek 4\fR +\fBWeek IV (Oct 17\(en23)\fR .IP "17" 4 22nd Sunday after Pentecost @@ -3115,7 +3118,7 @@ St. Anthony Mary Claret .LP -\fBWeek 5\fR +\fBWeek V (Oct 24\(en30)\fR .IP "24" 4 23rd Sunday after Pentecost @@ -3186,7 +3189,7 @@ Our Lady's Saturday Office .LP -\fBWeek 6\fR +\fBWeek VI (Oct 31)\fR .IP "31" 4 Christ the King @@ -3203,7 +3206,7 @@ Christ the King November .LP -\fBWeek 1\fR +\fBWeek I (Nov 1\(en6)\fR .IP "1" 4 All Saints @@ -3263,7 +3266,7 @@ Our Lady's Saturday Office .LP -\fBWeek 2\fR +\fBWeek II (Nov 7\(en13)\fR .IP "7" 4 5th Sunday after Epiphany @@ -3338,7 +3341,7 @@ St. Didacus .LP -\fBWeek 3\fR +\fBWeek III (Nov 14\(en20)\fR .IP "14" 4 6th Sunday after Epiphany @@ -3407,7 +3410,7 @@ St. Felix of Valois .LP -\fBWeek 4\fR +\fBWeek IV (Nov 21\(en27)\fR .IP "21" 4 24th and Last Sunday after Pentecost @@ -3480,7 +3483,7 @@ Our Lady's Saturday Office .LP -\fBWeek 5\fR +\fBWeek V (Nov 28\(en30)\fR .IP "28" 4 1st Sunday of Advent @@ -3519,7 +3522,7 @@ St. Andrew December .LP -\fBWeek 1\fR +\fBWeek I (Dec 1\(en4)\fR .IP "1" 4 Wednesday of the 1st Week of Advent @@ -3567,7 +3570,7 @@ St. Peter Chrysologus .LP -\fBWeek 2\fR +\fBWeek II (Dec 5\(en11)\fR .IP "5" 4 2nd Sunday of Advent @@ -3644,7 +3647,7 @@ St. Damasus I .LP -\fBWeek 3\fR +\fBWeek III (Dec 12\(en18)\fR .IP "12" 4 3rd Sunday of Advent @@ -3715,7 +3718,7 @@ Advent Ember Saturday .LP -\fBWeek 4\fR +\fBWeek IV (Dec 19\(en25)\fR .IP "19" 4 4th Sunday of Advent @@ -3784,7 +3787,7 @@ The Nativity of Our Lord (Christmas) .LP -\fBWeek 5\fR +\fBWeek V (Dec 26\(en31)\fR .IP "26" 4 Sunday within the Octave of the Nativity diff --git a/test/golden/ordo-2027.tex b/test/golden/ordo-2027.tex index e432f8c..336ddc1 100644 --- a/test/golden/ordo-2027.tex +++ b/test/golden/ordo-2027.tex @@ -7,11 +7,13 @@ % the top third of every page and cost 65 pages for a year that needed far % fewer; that requirement is reversed here on purpose, not merely relaxed). % Structure stays scannable through two header weights instead: every -% week still opens with its existing small header line ( . -% Week N), and the month's own FIRST week additionally gets a -% large, ruled banner above that line (, a real -% view field -- lib/render/view.ml -- not template-side arithmetic, since -% this engine has no way to test "is this the first item" any other way). +% week still opens with its own header line -- a Roman week number plus +% the span of in-month dates it covers, e.g. Hebdomada I (Ian 1-2), with +% no month name repeated, since the month heading above already +% establishes it -- and the month's own FIRST week additionally gets a +% large, ruled banner above that line (view field [first], lib/render/ +% view.ml -- not template-side arithmetic, since this engine has no way +% to test "is this the first item" any other way). % \needspace (a genuine, tiny dependency, not one of the deps this project % freezes at the OCaml level -- LaTeX packages are a template author's own % concern) keeps a header from being stranded alone at a page's bottom @@ -68,9 +70,15 @@ % The engine has no parent-path syntax: nested inside a month's own week % loop, a bare week-number reference finds the WEEK's own number, and there % is no way to reach the enclosing month's from there. That is why each -% week object carries its own month number and month name fields -% (lib/render/view.ml, Task 5) -- used throughout below instead of a -% parent-path reference, which this engine cannot express. +% week object carries its own month number, month name and abbreviated +% month name fields (lib/render/view.ml) -- used throughout below instead +% of a parent-path reference, which this engine cannot express. The same +% view resolves the week's own Roman numeral too (num_roman, arabic num +% kept alongside it for a tradition that wants it), the day-of-month of +% its first and last in-month day (first_dom/last_dom), and single_day +% (true for a one-day week) -- a punctuation choice (Ian 1 vs Ian 1-2) +% this logic-less engine cannot make for itself, so the template below +% picks the dash only inside an inverted single_day section. % % This template's own %-comments are plain text to the engine: it has no % awareness of LaTeX's comment syntax, and a stray double-brace pair inside @@ -127,102 +135,102 @@ \begin{small} \textbf{ January }\par -\hspace*{4mm}Week 1\dotfill\pageref{w1-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w1-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w1-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w1-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w1-5}\par -\hspace*{4mm}Week 6\dotfill\pageref{w1-6}\par +\hspace*{4mm}Week I (Jan 1--2)\dotfill\pageref{w1-1}\par +\hspace*{4mm}Week II (Jan 3--9)\dotfill\pageref{w1-2}\par +\hspace*{4mm}Week III (Jan 10--16)\dotfill\pageref{w1-3}\par +\hspace*{4mm}Week IV (Jan 17--23)\dotfill\pageref{w1-4}\par +\hspace*{4mm}Week V (Jan 24--30)\dotfill\pageref{w1-5}\par +\hspace*{4mm}Week VI (Jan 31)\dotfill\pageref{w1-6}\par \textbf{ February }\par -\hspace*{4mm}Week 1\dotfill\pageref{w2-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w2-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w2-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w2-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w2-5}\par +\hspace*{4mm}Week I (Feb 1--6)\dotfill\pageref{w2-1}\par +\hspace*{4mm}Week II (Feb 7--13)\dotfill\pageref{w2-2}\par +\hspace*{4mm}Week III (Feb 14--20)\dotfill\pageref{w2-3}\par +\hspace*{4mm}Week IV (Feb 21--27)\dotfill\pageref{w2-4}\par +\hspace*{4mm}Week V (Feb 28)\dotfill\pageref{w2-5}\par \textbf{ March }\par -\hspace*{4mm}Week 1\dotfill\pageref{w3-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w3-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w3-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w3-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w3-5}\par +\hspace*{4mm}Week I (Mar 1--6)\dotfill\pageref{w3-1}\par +\hspace*{4mm}Week II (Mar 7--13)\dotfill\pageref{w3-2}\par +\hspace*{4mm}Week III (Mar 14--20)\dotfill\pageref{w3-3}\par +\hspace*{4mm}Week IV (Mar 21--27)\dotfill\pageref{w3-4}\par +\hspace*{4mm}Week V (Mar 28--31)\dotfill\pageref{w3-5}\par \textbf{ April }\par -\hspace*{4mm}Week 1\dotfill\pageref{w4-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w4-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w4-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w4-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w4-5}\par +\hspace*{4mm}Week I (Apr 1--3)\dotfill\pageref{w4-1}\par +\hspace*{4mm}Week II (Apr 4--10)\dotfill\pageref{w4-2}\par +\hspace*{4mm}Week III (Apr 11--17)\dotfill\pageref{w4-3}\par +\hspace*{4mm}Week IV (Apr 18--24)\dotfill\pageref{w4-4}\par +\hspace*{4mm}Week V (Apr 25--30)\dotfill\pageref{w4-5}\par \textbf{ May }\par -\hspace*{4mm}Week 1\dotfill\pageref{w5-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w5-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w5-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w5-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w5-5}\par -\hspace*{4mm}Week 6\dotfill\pageref{w5-6}\par +\hspace*{4mm}Week I (May 1)\dotfill\pageref{w5-1}\par +\hspace*{4mm}Week II (May 2--8)\dotfill\pageref{w5-2}\par +\hspace*{4mm}Week III (May 9--15)\dotfill\pageref{w5-3}\par +\hspace*{4mm}Week IV (May 16--22)\dotfill\pageref{w5-4}\par +\hspace*{4mm}Week V (May 23--29)\dotfill\pageref{w5-5}\par +\hspace*{4mm}Week VI (May 30--31)\dotfill\pageref{w5-6}\par \textbf{ June }\par -\hspace*{4mm}Week 1\dotfill\pageref{w6-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w6-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w6-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w6-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w6-5}\par +\hspace*{4mm}Week I (Jun 1--5)\dotfill\pageref{w6-1}\par +\hspace*{4mm}Week II (Jun 6--12)\dotfill\pageref{w6-2}\par +\hspace*{4mm}Week III (Jun 13--19)\dotfill\pageref{w6-3}\par +\hspace*{4mm}Week IV (Jun 20--26)\dotfill\pageref{w6-4}\par +\hspace*{4mm}Week V (Jun 27--30)\dotfill\pageref{w6-5}\par \textbf{ July }\par -\hspace*{4mm}Week 1\dotfill\pageref{w7-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w7-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w7-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w7-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w7-5}\par +\hspace*{4mm}Week I (Jul 1--3)\dotfill\pageref{w7-1}\par +\hspace*{4mm}Week II (Jul 4--10)\dotfill\pageref{w7-2}\par +\hspace*{4mm}Week III (Jul 11--17)\dotfill\pageref{w7-3}\par +\hspace*{4mm}Week IV (Jul 18--24)\dotfill\pageref{w7-4}\par +\hspace*{4mm}Week V (Jul 25--31)\dotfill\pageref{w7-5}\par \textbf{ August }\par -\hspace*{4mm}Week 1\dotfill\pageref{w8-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w8-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w8-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w8-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w8-5}\par +\hspace*{4mm}Week I (Aug 1--7)\dotfill\pageref{w8-1}\par +\hspace*{4mm}Week II (Aug 8--14)\dotfill\pageref{w8-2}\par +\hspace*{4mm}Week III (Aug 15--21)\dotfill\pageref{w8-3}\par +\hspace*{4mm}Week IV (Aug 22--28)\dotfill\pageref{w8-4}\par +\hspace*{4mm}Week V (Aug 29--31)\dotfill\pageref{w8-5}\par \textbf{ September }\par -\hspace*{4mm}Week 1\dotfill\pageref{w9-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w9-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w9-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w9-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w9-5}\par +\hspace*{4mm}Week I (Sep 1--4)\dotfill\pageref{w9-1}\par +\hspace*{4mm}Week II (Sep 5--11)\dotfill\pageref{w9-2}\par +\hspace*{4mm}Week III (Sep 12--18)\dotfill\pageref{w9-3}\par +\hspace*{4mm}Week IV (Sep 19--25)\dotfill\pageref{w9-4}\par +\hspace*{4mm}Week V (Sep 26--30)\dotfill\pageref{w9-5}\par \textbf{ October }\par -\hspace*{4mm}Week 1\dotfill\pageref{w10-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w10-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w10-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w10-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w10-5}\par -\hspace*{4mm}Week 6\dotfill\pageref{w10-6}\par +\hspace*{4mm}Week I (Oct 1--2)\dotfill\pageref{w10-1}\par +\hspace*{4mm}Week II (Oct 3--9)\dotfill\pageref{w10-2}\par +\hspace*{4mm}Week III (Oct 10--16)\dotfill\pageref{w10-3}\par +\hspace*{4mm}Week IV (Oct 17--23)\dotfill\pageref{w10-4}\par +\hspace*{4mm}Week V (Oct 24--30)\dotfill\pageref{w10-5}\par +\hspace*{4mm}Week VI (Oct 31)\dotfill\pageref{w10-6}\par \textbf{ November }\par -\hspace*{4mm}Week 1\dotfill\pageref{w11-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w11-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w11-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w11-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w11-5}\par +\hspace*{4mm}Week I (Nov 1--6)\dotfill\pageref{w11-1}\par +\hspace*{4mm}Week II (Nov 7--13)\dotfill\pageref{w11-2}\par +\hspace*{4mm}Week III (Nov 14--20)\dotfill\pageref{w11-3}\par +\hspace*{4mm}Week IV (Nov 21--27)\dotfill\pageref{w11-4}\par +\hspace*{4mm}Week V (Nov 28--30)\dotfill\pageref{w11-5}\par \textbf{ December }\par -\hspace*{4mm}Week 1\dotfill\pageref{w12-1}\par -\hspace*{4mm}Week 2\dotfill\pageref{w12-2}\par -\hspace*{4mm}Week 3\dotfill\pageref{w12-3}\par -\hspace*{4mm}Week 4\dotfill\pageref{w12-4}\par -\hspace*{4mm}Week 5\dotfill\pageref{w12-5}\par +\hspace*{4mm}Week I (Dec 1--4)\dotfill\pageref{w12-1}\par +\hspace*{4mm}Week II (Dec 5--11)\dotfill\pageref{w12-2}\par +\hspace*{4mm}Week III (Dec 12--18)\dotfill\pageref{w12-3}\par +\hspace*{4mm}Week IV (Dec 19--25)\dotfill\pageref{w12-4}\par +\hspace*{4mm}Week V (Dec 26--31)\dotfill\pageref{w12-5}\par \end{small} @@ -237,7 +245,7 @@ \needspace{16mm} \label{w1-1} -{\bfseries\large January }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Jan 1--2)}\par\vspace{0.5mm} @@ -272,7 +280,7 @@ \needspace{16mm} \label{w1-2} -{\bfseries\large January }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Jan 3--9)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -342,7 +350,7 @@ \needspace{16mm} \label{w1-3} -{\bfseries\large January }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Jan 10--16)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -412,7 +420,7 @@ \needspace{16mm} \label{w1-4} -{\bfseries\large January }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Jan 17--23)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -482,7 +490,7 @@ \needspace{16mm} \label{w1-5} -{\bfseries\large January }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Jan 24--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -552,7 +560,7 @@ \needspace{16mm} \label{w1-6} -{\bfseries\large January }\hfill{\small Week 6}\par\vspace{0.5mm} +{\bfseries\large Week VI }{\small (Jan 31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -586,7 +594,7 @@ \needspace{16mm} \label{w2-1} -{\bfseries\large February }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Feb 1--6)}\par\vspace{0.5mm} @@ -649,7 +657,7 @@ \needspace{16mm} \label{w2-2} -{\bfseries\large February }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Feb 7--13)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -719,7 +727,7 @@ \needspace{16mm} \label{w2-3} -{\bfseries\large February }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Feb 14--20)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -789,7 +797,7 @@ \needspace{16mm} \label{w2-4} -{\bfseries\large February }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Feb 21--27)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -859,7 +867,7 @@ \needspace{16mm} \label{w2-5} -{\bfseries\large February }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Feb 28)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -893,7 +901,7 @@ \needspace{16mm} \label{w3-1} -{\bfseries\large March }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Mar 1--6)}\par\vspace{0.5mm} @@ -956,7 +964,7 @@ \needspace{16mm} \label{w3-2} -{\bfseries\large March }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Mar 7--13)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1026,7 +1034,7 @@ \needspace{16mm} \label{w3-3} -{\bfseries\large March }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Mar 14--20)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1096,7 +1104,7 @@ \needspace{16mm} \label{w3-4} -{\bfseries\large March }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Mar 21--27)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1166,7 +1174,7 @@ \needspace{16mm} \label{w3-5} -{\bfseries\large March }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Mar 28--31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1221,7 +1229,7 @@ \needspace{16mm} \label{w4-1} -{\bfseries\large April }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Apr 1--3)}\par\vspace{0.5mm} @@ -1263,7 +1271,7 @@ \needspace{16mm} \label{w4-2} -{\bfseries\large April }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Apr 4--10)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1333,7 +1341,7 @@ \needspace{16mm} \label{w4-3} -{\bfseries\large April }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Apr 11--17)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1403,7 +1411,7 @@ \needspace{16mm} \label{w4-4} -{\bfseries\large April }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Apr 18--24)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1473,7 +1481,7 @@ \needspace{16mm} \label{w4-5} -{\bfseries\large April }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Apr 25--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1542,7 +1550,7 @@ \needspace{16mm} \label{w5-1} -{\bfseries\large May }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (May 1)}\par\vspace{0.5mm} @@ -1570,7 +1578,7 @@ \needspace{16mm} \label{w5-2} -{\bfseries\large May }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (May 2--8)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1640,7 +1648,7 @@ \needspace{16mm} \label{w5-3} -{\bfseries\large May }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (May 9--15)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1710,7 +1718,7 @@ \needspace{16mm} \label{w5-4} -{\bfseries\large May }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (May 16--22)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1780,7 +1788,7 @@ \needspace{16mm} \label{w5-5} -{\bfseries\large May }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (May 23--29)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1850,7 +1858,7 @@ \needspace{16mm} \label{w5-6} -{\bfseries\large May }\hfill{\small Week 6}\par\vspace{0.5mm} +{\bfseries\large Week VI }{\small (May 30--31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -1891,7 +1899,7 @@ \needspace{16mm} \label{w6-1} -{\bfseries\large June }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Jun 1--5)}\par\vspace{0.5mm} @@ -1947,7 +1955,7 @@ \needspace{16mm} \label{w6-2} -{\bfseries\large June }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Jun 6--12)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2017,7 +2025,7 @@ \needspace{16mm} \label{w6-3} -{\bfseries\large June }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Jun 13--19)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2087,7 +2095,7 @@ \needspace{16mm} \label{w6-4} -{\bfseries\large June }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Jun 20--26)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2157,7 +2165,7 @@ \needspace{16mm} \label{w6-5} -{\bfseries\large June }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Jun 27--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2212,7 +2220,7 @@ \needspace{16mm} \label{w7-1} -{\bfseries\large July }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Jul 1--3)}\par\vspace{0.5mm} @@ -2254,7 +2262,7 @@ \needspace{16mm} \label{w7-2} -{\bfseries\large July }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Jul 4--10)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2324,7 +2332,7 @@ \needspace{16mm} \label{w7-3} -{\bfseries\large July }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Jul 11--17)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2394,7 +2402,7 @@ \needspace{16mm} \label{w7-4} -{\bfseries\large July }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Jul 18--24)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2464,7 +2472,7 @@ \needspace{16mm} \label{w7-5} -{\bfseries\large July }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Jul 25--31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2540,7 +2548,7 @@ \needspace{16mm} \label{w8-1} -{\bfseries\large August }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Aug 1--7)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2610,7 +2618,7 @@ \needspace{16mm} \label{w8-2} -{\bfseries\large August }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Aug 8--14)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2680,7 +2688,7 @@ \needspace{16mm} \label{w8-3} -{\bfseries\large August }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Aug 15--21)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2750,7 +2758,7 @@ \needspace{16mm} \label{w8-4} -{\bfseries\large August }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Aug 22--28)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2820,7 +2828,7 @@ \needspace{16mm} \label{w8-5} -{\bfseries\large August }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Aug 29--31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2868,7 +2876,7 @@ \needspace{16mm} \label{w9-1} -{\bfseries\large September }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Sep 1--4)}\par\vspace{0.5mm} @@ -2917,7 +2925,7 @@ \needspace{16mm} \label{w9-2} -{\bfseries\large September }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Sep 5--11)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -2987,7 +2995,7 @@ \needspace{16mm} \label{w9-3} -{\bfseries\large September }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Sep 12--18)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3057,7 +3065,7 @@ \needspace{16mm} \label{w9-4} -{\bfseries\large September }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Sep 19--25)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3127,7 +3135,7 @@ \needspace{16mm} \label{w9-5} -{\bfseries\large September }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Sep 26--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3189,7 +3197,7 @@ \needspace{16mm} \label{w10-1} -{\bfseries\large October }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Oct 1--2)}\par\vspace{0.5mm} @@ -3224,7 +3232,7 @@ \needspace{16mm} \label{w10-2} -{\bfseries\large October }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Oct 3--9)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3294,7 +3302,7 @@ \needspace{16mm} \label{w10-3} -{\bfseries\large October }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Oct 10--16)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3364,7 +3372,7 @@ \needspace{16mm} \label{w10-4} -{\bfseries\large October }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Oct 17--23)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3434,7 +3442,7 @@ \needspace{16mm} \label{w10-5} -{\bfseries\large October }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Oct 24--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3504,7 +3512,7 @@ \needspace{16mm} \label{w10-6} -{\bfseries\large October }\hfill{\small Week 6}\par\vspace{0.5mm} +{\bfseries\large Week VI }{\small (Oct 31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3538,7 +3546,7 @@ \needspace{16mm} \label{w11-1} -{\bfseries\large November }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Nov 1--6)}\par\vspace{0.5mm} @@ -3601,7 +3609,7 @@ \needspace{16mm} \label{w11-2} -{\bfseries\large November }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Nov 7--13)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3671,7 +3679,7 @@ \needspace{16mm} \label{w11-3} -{\bfseries\large November }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Nov 14--20)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3741,7 +3749,7 @@ \needspace{16mm} \label{w11-4} -{\bfseries\large November }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Nov 21--27)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3811,7 +3819,7 @@ \needspace{16mm} \label{w11-5} -{\bfseries\large November }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Nov 28--30)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3859,7 +3867,7 @@ \needspace{16mm} \label{w12-1} -{\bfseries\large December }\hfill{\small Week 1}\par\vspace{0.5mm} +{\bfseries\large Week I }{\small (Dec 1--4)}\par\vspace{0.5mm} @@ -3908,7 +3916,7 @@ \needspace{16mm} \label{w12-2} -{\bfseries\large December }\hfill{\small Week 2}\par\vspace{0.5mm} +{\bfseries\large Week II }{\small (Dec 5--11)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -3978,7 +3986,7 @@ \needspace{16mm} \label{w12-3} -{\bfseries\large December }\hfill{\small Week 3}\par\vspace{0.5mm} +{\bfseries\large Week III }{\small (Dec 12--18)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -4048,7 +4056,7 @@ \needspace{16mm} \label{w12-4} -{\bfseries\large December }\hfill{\small Week 4}\par\vspace{0.5mm} +{\bfseries\large Week IV }{\small (Dec 19--25)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] @@ -4118,7 +4126,7 @@ \needspace{16mm} \label{w12-5} -{\bfseries\large December }\hfill{\small Week 5}\par\vspace{0.5mm} +{\bfseries\large Week V }{\small (Dec 26--31)}\par\vspace{0.5mm} \begin{tcolorbox}[colback=white,colframe=black!35,boxrule=0.3pt,left=1.4mm,right=1.4mm,top=0.2mm,bottom=0.2mm,before skip=0.2mm,after skip=0mm] diff --git a/test/golden/ordo-2027.txt b/test/golden/ordo-2027.txt index 2fdfc4b..8b496de 100644 --- a/test/golden/ordo-2027.txt +++ b/test/golden/ordo-2027.txt @@ -1,7 +1,7 @@ January 2027 -== Week 1 == +== Week I (Jan 1–2) == 1 The Octave Day of the Nativity class-1 · white @@ -14,7 +14,7 @@ January 2027 Gospel Luke 2:15-20 -== Week 2 == +== Week II (Jan 3–9) == 3 The Holy Name of Jesus class-2 · white @@ -53,7 +53,7 @@ January 2027 Gospel Luke 2:15-20 -== Week 3 == +== Week III (Jan 10–16) == 10 The Holy Family class-2 · white @@ -94,7 +94,7 @@ January 2027 Gospel Matt 16:13-19 -== Week 4 == +== Week IV (Jan 17–23) == 17 2nd Sunday after Epiphany class-2 · green @@ -136,7 +136,7 @@ January 2027 Commemoration St. Emerentiana -== Week 5 == +== Week V (Jan 24–30) == 24 Septuagesima Sunday class-2 · violet @@ -176,7 +176,7 @@ January 2027 Gospel Matt 25:1-13. -== Week 6 == +== Week VI (Jan 31) == 31 Sexagesima Sunday class-2 · violet @@ -187,7 +187,7 @@ January 2027 February 2027 -== Week 1 == +== Week I (Feb 1–6) == 1 St. Ignatius of Antioch class-3 · red @@ -222,7 +222,7 @@ February 2027 Commemoration St. Dorothy -== Week 2 == +== Week II (Feb 7–13) == 7 Quinquagesima Sunday class-2 · violet @@ -263,7 +263,7 @@ February 2027 Gospel Mark 6:47-56 -== Week 3 == +== Week III (Feb 14–20) == 14 1st Sunday of Lent class-1 · violet @@ -303,7 +303,7 @@ February 2027 Gospel Matt 17:1-9 -== Week 4 == +== Week IV (Feb 21–27) == 21 2nd Sunday of Lent class-1 · violet @@ -346,7 +346,7 @@ February 2027 Commemoration St. Gabriel of Our Lady of Sorrows -== Week 5 == +== Week V (Feb 28) == 28 3rd Sunday of Lent class-1 · violet @@ -357,7 +357,7 @@ February 2027 March 2027 -== Week 1 == +== Week I (Mar 1–6) == 1 Monday of the 3rd Week of Lent class-3 · violet @@ -393,7 +393,7 @@ March 2027 Commemoration Sts. Felicitas & Perpetua -== Week 2 == +== Week II (Mar 7–13) == 7 4th Sunday of Lent class-1 · rose @@ -435,7 +435,7 @@ March 2027 Gospel John 8:12-20 -== Week 3 == +== Week III (Mar 14–20) == 14 Passion Sunday class-1 · violet @@ -476,7 +476,7 @@ March 2027 Gospel John 12:10-36 -== Week 4 == +== Week IV (Mar 21–27) == 21 Palm Sunday class-1 · violet @@ -514,7 +514,7 @@ March 2027 Gospel Matt 28:1-7 -== Week 5 == +== Week V (Mar 28–31) == 28 Easter Sunday class-1 · white @@ -540,7 +540,7 @@ March 2027 April 2027 -== Week 1 == +== Week I (Apr 1–3) == 1 Thursday of Easter Week class-1 · white @@ -558,7 +558,7 @@ April 2027 Gospel John 20:1-9 -== Week 2 == +== Week II (Apr 4–10) == 4 Low Sunday (Sunday in Easter Octave) class-1 · white @@ -596,7 +596,7 @@ April 2027 Gospel John 19:25-27 -== Week 3 == +== Week III (Apr 11–17) == 11 2nd Sunday after Easter class-2 · white @@ -636,7 +636,7 @@ April 2027 Commemoration St. Anicetus -== Week 4 == +== Week IV (Apr 18–24) == 18 3rd Sunday after Easter class-2 · white @@ -675,7 +675,7 @@ April 2027 Gospel John 15:1-7 -== Week 5 == +== Week V (Apr 25–30) == 25 4th Sunday after Easter class-2 · white @@ -712,7 +712,7 @@ April 2027 May 2027 -== Week 1 == +== Week I (May 1) == 1 St. Joseph the Workman class-1 · white @@ -720,7 +720,7 @@ May 2027 Gospel Matt 13:54-58 -== Week 2 == +== Week II (May 2–8) == 2 5th Sunday after Easter class-2 · white @@ -760,7 +760,7 @@ May 2027 Gospel John 19:25-27 -== Week 3 == +== Week III (May 9–15) == 9 Sunday after the Ascension class-2 · white @@ -800,7 +800,7 @@ May 2027 Gospel John 14:15-21. -== Week 4 == +== Week IV (May 16–22) == 16 Pentecost Sunday (Whitsunday) class-1 · red @@ -838,7 +838,7 @@ May 2027 Gospel Luke 4:38-44. -== Week 5 == +== Week V (May 23–29) == 23 Trinity Sunday class-1 · white @@ -878,7 +878,7 @@ May 2027 Gospel Matt 25:1-13. -== Week 6 == +== Week VI (May 30–31) == 30 2nd Sunday after Pentecost class-2 · green @@ -895,7 +895,7 @@ May 2027 June 2027 -== Week 1 == +== Week I (Jun 1–5) == 1 St. Angela Merici class-3 · white @@ -924,7 +924,7 @@ June 2027 Gospel Matt 5:1-12 -== Week 2 == +== Week II (Jun 6–12) == 6 3rd Sunday after Pentecost class-2 · green @@ -964,7 +964,7 @@ June 2027 Commemoration St. Basilidus -== Week 3 == +== Week III (Jun 13–19) == 13 4th Sunday after Pentecost class-2 · green @@ -1005,7 +1005,7 @@ June 2027 Commemoration Sts. Gervasius and Protasius -== Week 4 == +== Week IV (Jun 20–26) == 20 5th Sunday after Pentecost class-2 · green @@ -1043,7 +1043,7 @@ June 2027 Gospel Luke 12:1-8 -== Week 5 == +== Week V (Jun 27–30) == 27 6th Sunday after Pentecost class-2 · green @@ -1070,7 +1070,7 @@ June 2027 July 2027 -== Week 1 == +== Week I (Jul 1–3) == 1 The Precious Blood of Our Lord Jesus Christ class-1 · red @@ -1089,7 +1089,7 @@ July 2027 Gospel Matt 10:28-33 -== Week 2 == +== Week II (Jul 4–10) == 4 7th Sunday after Pentecost class-2 · green @@ -1127,7 +1127,7 @@ July 2027 Gospel Matt 12:46-50 -== Week 3 == +== Week III (Jul 11–17) == 11 8th Sunday after Pentecost class-2 · green @@ -1168,7 +1168,7 @@ July 2027 Commemoration St. Alexis -== Week 4 == +== Week IV (Jul 18–24) == 18 9th Sunday after Pentecost class-2 · green @@ -1210,7 +1210,7 @@ July 2027 Commemoration St. Christina -== Week 5 == +== Week V (Jul 25–31) == 25 10th Sunday after Pentecost class-2 · green @@ -1255,7 +1255,7 @@ July 2027 August 2027 -== Week 1 == +== Week I (Aug 1–7) == 1 11th Sunday after Pentecost class-2 · green @@ -1296,7 +1296,7 @@ August 2027 Commemoration St. Donatus -== Week 2 == +== Week II (Aug 8–14) == 8 12th Sunday after Pentecost class-2 · green @@ -1338,7 +1338,7 @@ August 2027 Commemoration St. Eusebius -== Week 3 == +== Week III (Aug 15–21) == 15 Assumption of the Blessed Virgin Mary class-1 · white @@ -1378,7 +1378,7 @@ August 2027 Gospel Matt 13:44-52. -== Week 4 == +== Week IV (Aug 22–28) == 22 14th Sunday after Pentecost class-2 · green @@ -1419,7 +1419,7 @@ August 2027 Commemoration St. Hermes -== Week 5 == +== Week V (Aug 29–31) == 29 15th Sunday after Pentecost class-2 · green @@ -1441,7 +1441,7 @@ August 2027 September 2027 -== Week 1 == +== Week I (Sep 1–4) == 1 Wednesday of the 15th Week of the Time after Pentecost class-4 · green @@ -1466,7 +1466,7 @@ September 2027 Gospel Luke 11:27-28 -== Week 2 == +== Week II (Sep 5–11) == 5 16th Sunday after Pentecost class-2 · green @@ -1507,7 +1507,7 @@ September 2027 Commemoration Sts. Protus & Hyacinth -== Week 3 == +== Week III (Sep 12–18) == 12 17th Sunday after Pentecost class-2 · green @@ -1548,7 +1548,7 @@ September 2027 Gospel Matt 22:1-14 -== Week 4 == +== Week IV (Sep 19–25) == 19 18th Sunday after Pentecost class-2 · green @@ -1590,7 +1590,7 @@ September 2027 Gospel Luke 13:6-17 -== Week 5 == +== Week V (Sep 26–30) == 26 19th Sunday after Pentecost class-2 · green @@ -1621,7 +1621,7 @@ September 2027 October 2027 -== Week 1 == +== Week I (Oct 1–2) == 1 Friday of the 19th Week of the Time after Pentecost class-4 · green @@ -1635,7 +1635,7 @@ October 2027 Gospel Matt 18:1-10 -== Week 2 == +== Week II (Oct 3–9) == 3 20th Sunday after Pentecost class-2 · green @@ -1677,7 +1677,7 @@ October 2027 Commemoration St. Dionysius and companions -== Week 3 == +== Week III (Oct 10–16) == 10 21st Sunday after Pentecost class-2 · green @@ -1715,7 +1715,7 @@ October 2027 Gospel Matt 13:44-52. -== Week 4 == +== Week IV (Oct 17–23) == 17 22nd Sunday after Pentecost class-2 · green @@ -1755,7 +1755,7 @@ October 2027 Gospel Matt 24:42-47 -== Week 5 == +== Week V (Oct 24–30) == 24 23rd Sunday after Pentecost class-2 · green @@ -1795,7 +1795,7 @@ October 2027 Gospel Luke 11:27-28 -== Week 6 == +== Week VI (Oct 31) == 31 Christ the King class-1 · white @@ -1806,7 +1806,7 @@ October 2027 November 2027 -== Week 1 == +== Week I (Nov 1–6) == 1 All Saints class-1 · white @@ -1840,7 +1840,7 @@ November 2027 Gospel Luke 11:27-28 -== Week 2 == +== Week II (Nov 7–13) == 7 5th Sunday after Epiphany class-2 · green @@ -1882,7 +1882,7 @@ November 2027 Gospel Luke 12:32-34 -== Week 3 == +== Week III (Nov 14–20) == 14 6th Sunday after Epiphany class-2 · green @@ -1921,7 +1921,7 @@ November 2027 Gospel Luke 12:32-34 -== Week 4 == +== Week IV (Nov 21–27) == 21 24th and Last Sunday after Pentecost class-2 · green @@ -1962,7 +1962,7 @@ November 2027 Gospel Luke 11:27-28 -== Week 5 == +== Week V (Nov 28–30) == 28 1st Sunday of Advent class-1 · violet @@ -1985,7 +1985,7 @@ November 2027 December 2027 -== Week 1 == +== Week I (Dec 1–4) == 1 Wednesday of the 1st Week of Advent class-3 · violet @@ -2012,7 +2012,7 @@ December 2027 Commemoration St. Barbara -== Week 2 == +== Week II (Dec 5–11) == 5 2nd Sunday of Advent class-1 · violet @@ -2055,7 +2055,7 @@ December 2027 Commemoration Saturday of the 2nd Week of Advent -== Week 3 == +== Week III (Dec 12–18) == 12 3rd Sunday of Advent class-1 · rose @@ -2095,7 +2095,7 @@ December 2027 Gospel Luke 3:1-6 -== Week 4 == +== Week IV (Dec 19–25) == 19 4th Sunday of Advent class-1 · violet @@ -2134,7 +2134,7 @@ December 2027 Gospel John 1:1-14 -== Week 5 == +== Week V (Dec 26–31) == 26 Sunday within the Octave of the Nativity class-2 · white diff --git a/test/golden/ordo-2027.typ b/test/golden/ordo-2027.typ index 73d32fc..2e725ed 100644 --- a/test/golden/ordo-2027.typ +++ b/test/golden/ordo-2027.typ @@ -27,9 +27,16 @@ // The engine has no parent-path syntax: nested inside a month's own week // loop, a bare week-number reference finds the WEEK's own number, and there // is no way to reach the enclosing month's from there. That is why each -// week object carries its own month number and month name fields -// (lib/render/view.ml), used below via month_name/month_num instead of a -// parent-path reference the engine cannot express. +// week object carries its own month number, month name and abbreviated +// month name fields (lib/render/view.ml), used below via month_name/ +// month_num/month_abbr instead of a parent-path reference the engine +// cannot express. The same view resolves the week's own Roman numeral too +// (num_roman, arabic num kept alongside it for a tradition that wants it), +// the day-of-month of its first and last in-month day (first_dom/ +// last_dom), and single_day (true for a one-day week) -- the punctuation +// choice between Ian 1 and Ian 1-2 this logic-less engine cannot make for +// itself, so the heading below picks the dash only inside an inverted +// single_day section. // // The engine also rejects an empty tag path outright (a bare-dot section or // variable is a parse error, not an invented "current context" behaviour), @@ -46,10 +53,14 @@ // per month with its weeks dotted-and-paginated underneath, because it // walks the months-then-weeks nesting directly in its own hand-built TOC // loop. Typst's outline instead builds its table of contents automatically -// from real document headings, so this stays a flat list of "Month . Week -// N" headings rather than being restructured into two heading levels -- -// changing outline depth/structure is a bigger, riskier change than this -// defect calls for. Defect 2 DID add a "is this the month's first week" +// from real document headings, so this stays a flat list of week headings +// rather than being restructured into two heading levels -- changing +// outline depth/structure is a bigger, riskier change than this defect +// calls for. Each heading is the week's own Roman numeral plus the span +// of in-month dates it covers (e.g. Hebdomada I (Ian 1-2)), with no month +// name repeated -- the month heading below is a separate, non-heading +// BANNER (not part of the outline) that already establishes it once per +// month. Defect 2 DID add a "is this the month's first week" // flag to the view model (lib/render/view.ml's own [first], the same // "cheap flag beats invented template logic" call [last] already made // elsewhere) -- used below for a separate, non-heading month BANNER @@ -125,7 +136,7 @@ #text(size: 15pt, weight: "bold")[January 2027] ] -= January #sym.dot.c Week 1 += Week I (Jan 1--2) @@ -158,7 +169,7 @@ -= January #sym.dot.c Week 2 += Week II (Jan 3--9) @@ -227,7 +238,7 @@ -= January #sym.dot.c Week 3 += Week III (Jan 10--16) @@ -298,7 +309,7 @@ -= January #sym.dot.c Week 4 += Week IV (Jan 17--23) @@ -370,7 +381,7 @@ -= January #sym.dot.c Week 5 += Week V (Jan 24--30) @@ -440,7 +451,7 @@ -= January #sym.dot.c Week 6 += Week VI (Jan 31) @@ -473,7 +484,7 @@ #text(size: 15pt, weight: "bold")[February 2027] ] -= February #sym.dot.c Week 1 += Week I (Feb 1--6) @@ -536,7 +547,7 @@ -= February #sym.dot.c Week 2 += Week II (Feb 7--13) @@ -607,7 +618,7 @@ -= February #sym.dot.c Week 3 += Week III (Feb 14--20) @@ -677,7 +688,7 @@ -= February #sym.dot.c Week 4 += Week IV (Feb 21--27) @@ -750,7 +761,7 @@ -= February #sym.dot.c Week 5 += Week V (Feb 28) @@ -783,7 +794,7 @@ #text(size: 15pt, weight: "bold")[March 2027] ] -= March #sym.dot.c Week 1 += Week I (Mar 1--6) @@ -847,7 +858,7 @@ -= March #sym.dot.c Week 2 += Week II (Mar 7--13) @@ -919,7 +930,7 @@ -= March #sym.dot.c Week 3 += Week III (Mar 14--20) @@ -990,7 +1001,7 @@ -= March #sym.dot.c Week 4 += Week IV (Mar 21--27) @@ -1058,7 +1069,7 @@ -= March #sym.dot.c Week 5 += Week V (Mar 28--31) @@ -1112,7 +1123,7 @@ #text(size: 15pt, weight: "bold")[April 2027] ] -= April #sym.dot.c Week 1 += Week I (Apr 1--3) @@ -1152,7 +1163,7 @@ -= April #sym.dot.c Week 2 += Week II (Apr 4--10) @@ -1220,7 +1231,7 @@ -= April #sym.dot.c Week 3 += Week III (Apr 11--17) @@ -1290,7 +1301,7 @@ -= April #sym.dot.c Week 4 += Week IV (Apr 18--24) @@ -1359,7 +1370,7 @@ -= April #sym.dot.c Week 5 += Week V (Apr 25--30) @@ -1428,7 +1439,7 @@ #text(size: 15pt, weight: "bold")[May 2027] ] -= May #sym.dot.c Week 1 += Week I (May 1) @@ -1454,7 +1465,7 @@ -= May #sym.dot.c Week 2 += Week II (May 2--8) @@ -1524,7 +1535,7 @@ -= May #sym.dot.c Week 3 += Week III (May 9--15) @@ -1594,7 +1605,7 @@ -= May #sym.dot.c Week 4 += Week IV (May 16--22) @@ -1662,7 +1673,7 @@ -= May #sym.dot.c Week 5 += Week V (May 23--29) @@ -1732,7 +1743,7 @@ -= May #sym.dot.c Week 6 += Week VI (May 30--31) @@ -1773,7 +1784,7 @@ #text(size: 15pt, weight: "bold")[June 2027] ] -= June #sym.dot.c Week 1 += Week I (Jun 1--5) @@ -1828,7 +1839,7 @@ -= June #sym.dot.c Week 2 += Week II (Jun 6--12) @@ -1898,7 +1909,7 @@ -= June #sym.dot.c Week 3 += Week III (Jun 13--19) @@ -1969,7 +1980,7 @@ -= June #sym.dot.c Week 4 += Week IV (Jun 20--26) @@ -2037,7 +2048,7 @@ -= June #sym.dot.c Week 5 += Week V (Jun 27--30) @@ -2092,7 +2103,7 @@ #text(size: 15pt, weight: "bold")[July 2027] ] -= July #sym.dot.c Week 1 += Week I (Jul 1--3) @@ -2133,7 +2144,7 @@ -= July #sym.dot.c Week 2 += Week II (Jul 4--10) @@ -2201,7 +2212,7 @@ -= July #sym.dot.c Week 3 += Week III (Jul 11--17) @@ -2272,7 +2283,7 @@ -= July #sym.dot.c Week 4 += Week IV (Jul 18--24) @@ -2344,7 +2355,7 @@ -= July #sym.dot.c Week 5 += Week V (Jul 25--31) @@ -2423,7 +2434,7 @@ #text(size: 15pt, weight: "bold")[August 2027] ] -= August #sym.dot.c Week 1 += Week I (Aug 1--7) @@ -2494,7 +2505,7 @@ -= August #sym.dot.c Week 2 += Week II (Aug 8--14) @@ -2566,7 +2577,7 @@ -= August #sym.dot.c Week 3 += Week III (Aug 15--21) @@ -2636,7 +2647,7 @@ -= August #sym.dot.c Week 4 += Week IV (Aug 22--28) @@ -2707,7 +2718,7 @@ -= August #sym.dot.c Week 5 += Week V (Aug 29--31) @@ -2755,7 +2766,7 @@ #text(size: 15pt, weight: "bold")[September 2027] ] -= September #sym.dot.c Week 1 += Week I (Sep 1--4) @@ -2804,7 +2815,7 @@ -= September #sym.dot.c Week 2 += Week II (Sep 5--11) @@ -2875,7 +2886,7 @@ -= September #sym.dot.c Week 3 += Week III (Sep 12--18) @@ -2946,7 +2957,7 @@ -= September #sym.dot.c Week 4 += Week IV (Sep 19--25) @@ -3018,7 +3029,7 @@ -= September #sym.dot.c Week 5 += Week V (Sep 26--30) @@ -3079,7 +3090,7 @@ #text(size: 15pt, weight: "bold")[October 2027] ] -= October #sym.dot.c Week 1 += Week I (Oct 1--2) @@ -3113,7 +3124,7 @@ -= October #sym.dot.c Week 2 += Week II (Oct 3--9) @@ -3185,7 +3196,7 @@ -= October #sym.dot.c Week 3 += Week III (Oct 10--16) @@ -3253,7 +3264,7 @@ -= October #sym.dot.c Week 4 += Week IV (Oct 17--23) @@ -3323,7 +3334,7 @@ -= October #sym.dot.c Week 5 += Week V (Oct 24--30) @@ -3393,7 +3404,7 @@ -= October #sym.dot.c Week 6 += Week VI (Oct 31) @@ -3426,7 +3437,7 @@ #text(size: 15pt, weight: "bold")[November 2027] ] -= November #sym.dot.c Week 1 += Week I (Nov 1--6) @@ -3488,7 +3499,7 @@ -= November #sym.dot.c Week 2 += Week II (Nov 7--13) @@ -3560,7 +3571,7 @@ -= November #sym.dot.c Week 3 += Week III (Nov 14--20) @@ -3629,7 +3640,7 @@ -= November #sym.dot.c Week 4 += Week IV (Nov 21--27) @@ -3700,7 +3711,7 @@ -= November #sym.dot.c Week 5 += Week V (Nov 28--30) @@ -3749,7 +3760,7 @@ #text(size: 15pt, weight: "bold")[December 2027] ] -= December #sym.dot.c Week 1 += Week I (Dec 1--4) @@ -3800,7 +3811,7 @@ -= December #sym.dot.c Week 2 += Week II (Dec 5--11) @@ -3873,7 +3884,7 @@ -= December #sym.dot.c Week 3 += Week III (Dec 12--18) @@ -3943,7 +3954,7 @@ -= December #sym.dot.c Week 4 += Week IV (Dec 19--25) @@ -4012,7 +4023,7 @@ -= December #sym.dot.c Week 5 += Week V (Dec 26--31) |