diff options
| author | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-08-20 11:09:18 +0200 |
|---|---|---|
| committer | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-08-20 11:09:18 +0200 |
| commit | c00bf135defe69eb303f4bcf32ae862f65c01178 (patch) | |
| tree | fea8a088c40e366bc902d991ddf826d2b9b81a0d /test/golden/ordo-2027.ms | |
| parent | 1935f40c156563c134f87093bf6ec8da1cf4fc46 (diff) | |
| download | colitur-c00bf135defe69eb303f4bcf32ae862f65c01178.tar.gz colitur-c00bf135defe69eb303f4bcf32ae862f65c01178.zip | |
feat(templates): the ordo booklet flows continuously, not one week per page
One week per page filled roughly the top third of every A5 page and
cost 65 pages for a year that needed far fewer -- the original
requirement, reversed here: a full 7-day week already occupies most
of an A5 page even at reduced type, so the real saving was always in
the year's many SHORT boundary weeks (a month's first/last week is
rarely a full seven days), not in packing two full weeks together.
lib/render/view.ml gains a [first] field on every week object (true
on a month's own first week, the same 'cheap flag beats invented
template logic' call [last] already made for grid rows) -- there is
still no {{../}} parent-path syntax for a template to test this any
other way.
ordo.tex: the per-week \clearpage is gone. Every week keeps its
existing small header line; the month's own first week additionally
prints a large, ruled banner. \needspace (a template-local LaTeX
dependency, not one of the frozen OCaml deps) keeps a header from
being stranded alone at a page's bottom -- and a real, separate bug
surfaced building it: \label placed BEFORE \needspace captured the
OLD page number when \needspace went on to force a break, producing
a step-stale \pageref in the TOC (fixed by moving \label after both
needspace checks). The day box itself is tightened (rank/colour
folded onto the same line as the citations -- an A5 box is far wider
than tall, so this fits even Holy Week's longest citations with room
to spare) so a second week routinely shares a page with the first.
Measured result: 65 -> 53 pages, two pdflatex passes still settle the
TOC, zero orphaned headers, zero overfull boxes.
ordo.typ: the per-week #pagebreak is gone; #show heading's own
block gains sticky:true, Typst's built-in answer to what ordo.tex
needs \needspace for. The month banner needed its OWN sticky:true,
found live: without it a banner could sit alone at a page's bottom
with the entire month pushed to the next page -- not caught by a
check for an orphaned HEADING, since the banner is plain markup, not
one. Measured result: 65 -> 27 pages (Typst's own page-fill packs
tighter than ordo.tex's needspace-driven approach), one compile pass,
zero orphans.
The five non-paginated flavours (ms/html/md/adoc/txt) never had a
forced page break to remove -- they mainly needed the same header
treatment for structural consistency: a week-level header nested
under each month's existing one, walking months>weeks>days (the
week's own padded, in-month-guarded day list) in place of the old
months>days flat loop. Verified against groff, asciidoctor and an
HTML parser -- zero warnings.
Goldens regenerated through the Test_view.view_of path
test_render_golden.ml itself uses, not the CLI (whose --lang default
would have pinned output the tests never produce).
Diffstat (limited to 'test/golden/ordo-2027.ms')
| -rw-r--r-- | test/golden/ordo-2027.ms | 247 |
1 files changed, 247 insertions, 0 deletions
diff --git a/test/golden/ordo-2027.ms b/test/golden/ordo-2027.ms index 4594e43..cfaada9 100644 --- a/test/golden/ordo-2027.ms +++ b/test/golden/ordo-2027.ms @@ -9,12 +9,21 @@ .\" (Ordo, Epistle, Gospel, Commemoration) comes from the view's term .\" vocabulary rather than being written into this file, so a translated .\" booklet needs no template edit. +.\" +.\" Defect 2: groff -ms paginates its own way (no per-week \" clearpage \" +.\" this template ever forced), so it mainly needed the same header +.\" 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. .TL Ordo 2027 \(bu Roman Missal, 1962 typical edition .SH January + .LP +\fBWeek 1\fR .IP "1" 4 The Octave Day of the Nativity @@ -34,6 +43,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 2:15-20\s+2 + +.LP +\fBWeek 2\fR + .IP "3" 4 The Holy Name of Jesus .br @@ -99,6 +112,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 2:15-20\s+2 + +.LP +\fBWeek 3\fR + .IP "10" 4 The Holy Family .br @@ -168,6 +185,10 @@ St. Marcellus I .br \s-2Gospel Matt 16:13-19\s+2 + +.LP +\fBWeek 4\fR + .IP "17" 4 2nd Sunday after Epiphany .br @@ -239,6 +260,10 @@ St. Raymond of PeƱafort .br \s-2Commemoration St. Emerentiana\s+2 + +.LP +\fBWeek 5\fR + .IP "24" 4 Septuagesima Sunday .br @@ -306,6 +331,10 @@ St. Martina .br \s-2Gospel Matt 25:1-13.\s+2 + +.LP +\fBWeek 6\fR + .IP "31" 4 Sexagesima Sunday .br @@ -316,9 +345,12 @@ Sexagesima Sunday \s-2Gospel Luke 8:4-15\s+2 + .SH February + .LP +\fBWeek 1\fR .IP "1" 4 St. Ignatius of Antioch @@ -378,6 +410,10 @@ St. Titus .br \s-2Commemoration St. Dorothy\s+2 + +.LP +\fBWeek 2\fR + .IP "7" 4 Quinquagesima Sunday .br @@ -447,6 +483,10 @@ Saturday after Ash Wednesday .br \s-2Gospel Mark 6:47-56\s+2 + +.LP +\fBWeek 3\fR + .IP "14" 4 1st Sunday of Lent .br @@ -514,6 +554,10 @@ Lenten Ember Saturday .br \s-2Gospel Matt 17:1-9\s+2 + +.LP +\fBWeek 4\fR + .IP "21" 4 2nd Sunday of Lent .br @@ -587,6 +631,10 @@ Saturday of the 2nd Week of Lent .br \s-2Commemoration St. Gabriel of Our Lady of Sorrows\s+2 + +.LP +\fBWeek 5\fR + .IP "28" 4 3rd Sunday of Lent .br @@ -597,9 +645,12 @@ Saturday of the 2nd Week of Lent \s-2Gospel Luke 11:14-28\s+2 + .SH March + .LP +\fBWeek 1\fR .IP "1" 4 Monday of the 3rd Week of Lent @@ -661,6 +712,10 @@ Saturday of the 3rd Week of Lent .br \s-2Commemoration Sts. Felicitas & Perpetua\s+2 + +.LP +\fBWeek 2\fR + .IP "7" 4 4th Sunday of Lent .br @@ -732,6 +787,10 @@ Saturday of the 4th Week of Lent .br \s-2Gospel John 8:12-20\s+2 + +.LP +\fBWeek 3\fR + .IP "14" 4 Passion Sunday .br @@ -801,6 +860,10 @@ Saturday of the 1st Week of Passion Week .br \s-2Gospel John 12:10-36\s+2 + +.LP +\fBWeek 4\fR + .IP "21" 4 Palm Sunday .br @@ -864,6 +927,10 @@ Holy Saturday .br \s-2Gospel Matt 28:1-7\s+2 + +.LP +\fBWeek 5\fR + .IP "28" 4 Easter Sunday .br @@ -901,9 +968,12 @@ Wednesday of Easter Week \s-2Gospel John 21:1-14\s+2 + .SH April + .LP +\fBWeek 1\fR .IP "1" 4 Thursday of Easter Week @@ -932,6 +1002,10 @@ Saturday of Easter Week .br \s-2Gospel John 20:1-9\s+2 + +.LP +\fBWeek 2\fR + .IP "4" 4 Low Sunday (Sunday in Easter Octave) .br @@ -995,6 +1069,10 @@ Our Lady's Saturday Office .br \s-2Gospel John 19:25-27\s+2 + +.LP +\fBWeek 3\fR + .IP "11" 4 2nd Sunday after Easter .br @@ -1062,6 +1140,10 @@ Our Lady's Saturday Office .br \s-2Commemoration St. Anicetus\s+2 + +.LP +\fBWeek 4\fR + .IP "18" 4 3rd Sunday after Easter .br @@ -1127,6 +1209,10 @@ St. Fidelis of Sigmaringen .br \s-2Gospel John 15:1-7\s+2 + +.LP +\fBWeek 5\fR + .IP "25" 4 4th Sunday after Easter .br @@ -1184,9 +1270,12 @@ St. Catherine of Siena \s-2Gospel Matt 25:1-13.\s+2 + .SH May + .LP +\fBWeek 1\fR .IP "1" 4 St. Joseph the Workman @@ -1197,6 +1286,10 @@ St. Joseph the Workman .br \s-2Gospel Matt 13:54-58\s+2 + +.LP +\fBWeek 2\fR + .IP "2" 4 5th Sunday after Easter .br @@ -1264,6 +1357,10 @@ Our Lady's Saturday Office .br \s-2Gospel John 19:25-27\s+2 + +.LP +\fBWeek 3\fR + .IP "9" 4 Sunday after the Ascension .br @@ -1331,6 +1428,10 @@ Vigil of Pentecost .br \s-2Gospel John 14:15-21.\s+2 + +.LP +\fBWeek 4\fR + .IP "16" 4 Pentecost Sunday (Whitsunday) .br @@ -1394,6 +1495,10 @@ Pentecost Ember Saturday .br \s-2Gospel Luke 4:38-44.\s+2 + +.LP +\fBWeek 5\fR + .IP "23" 4 Trinity Sunday .br @@ -1461,6 +1566,10 @@ St. Mary Magdalene de Pazzi .br \s-2Gospel Matt 25:1-13.\s+2 + +.LP +\fBWeek 6\fR + .IP "30" 4 2nd Sunday after Pentecost .br @@ -1482,9 +1591,12 @@ Queenship of the Blessed Virgin Mary \s-2Commemoration St. Petronilla\s+2 + .SH June + .LP +\fBWeek 1\fR .IP "1" 4 St. Angela Merici @@ -1533,6 +1645,10 @@ St. Boniface .br \s-2Gospel Matt 5:1-12\s+2 + +.LP +\fBWeek 2\fR + .IP "6" 4 3rd Sunday after Pentecost .br @@ -1600,6 +1716,10 @@ St. John of San Fecundo .br \s-2Commemoration St. Basilidus\s+2 + +.LP +\fBWeek 3\fR + .IP "13" 4 4th Sunday after Pentecost .br @@ -1669,6 +1789,10 @@ St. Julia of Falconieri .br \s-2Commemoration Sts. Gervasius and Protasius\s+2 + +.LP +\fBWeek 4\fR + .IP "20" 4 5th Sunday after Pentecost .br @@ -1732,6 +1856,10 @@ Sts. John & Paul .br \s-2Gospel Luke 12:1-8\s+2 + +.LP +\fBWeek 5\fR + .IP "27" 4 6th Sunday after Pentecost .br @@ -1771,9 +1899,12 @@ In Commemoratione Sancti Pauli Apostoli \s-2Commemoration St. Peter\s+2 + .SH July + .LP +\fBWeek 1\fR .IP "1" 4 The Precious Blood of Our Lord Jesus Christ @@ -1804,6 +1935,10 @@ St. Irenaeus .br \s-2Gospel Matt 10:28-33\s+2 + +.LP +\fBWeek 2\fR + .IP "4" 4 7th Sunday after Pentecost .br @@ -1867,6 +2002,10 @@ Seven Holy Brothers and Sts. Rufina & Secunda .br \s-2Gospel Matt 12:46-50\s+2 + +.LP +\fBWeek 3\fR + .IP "11" 4 8th Sunday after Pentecost .br @@ -1936,6 +2075,10 @@ Our Lady's Saturday Office .br \s-2Commemoration St. Alexis\s+2 + +.LP +\fBWeek 4\fR + .IP "18" 4 9th Sunday after Pentecost .br @@ -2007,6 +2150,10 @@ Our Lady's Saturday Office .br \s-2Commemoration St. Christina\s+2 + +.LP +\fBWeek 5\fR + .IP "25" 4 10th Sunday after Pentecost .br @@ -2079,9 +2226,12 @@ St. Ignatius Loyola \s-2Gospel Luke 10:1-9\s+2 + .SH August + .LP +\fBWeek 1\fR .IP "1" 4 11th Sunday after Pentecost @@ -2152,6 +2302,10 @@ St. Cajetan .br \s-2Commemoration St. Donatus\s+2 + +.LP +\fBWeek 2\fR + .IP "8" 4 12th Sunday after Pentecost .br @@ -2223,6 +2377,10 @@ Vigil of the Assumption .br \s-2Commemoration St. Eusebius\s+2 + +.LP +\fBWeek 3\fR + .IP "15" 4 Assumption of the Blessed Virgin Mary .br @@ -2290,6 +2448,10 @@ St. Jane Frances de Chantal .br \s-2Gospel Matt 13:44-52.\s+2 + +.LP +\fBWeek 4\fR + .IP "22" 4 14th Sunday after Pentecost .br @@ -2359,6 +2521,10 @@ St. Augustine .br \s-2Commemoration St. Hermes\s+2 + +.LP +\fBWeek 5\fR + .IP "29" 4 15th Sunday after Pentecost .br @@ -2389,9 +2555,12 @@ St. Raymond Nonnatus \s-2Gospel Luke 12:35-40\s+2 + .SH September + .LP +\fBWeek 1\fR .IP "1" 4 Wednesday of the 15th Week of the Time after Pentecost @@ -2433,6 +2602,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 11:27-28\s+2 + +.LP +\fBWeek 2\fR + .IP "5" 4 16th Sunday after Pentecost .br @@ -2502,6 +2675,10 @@ Our Lady's Saturday Office .br \s-2Commemoration Sts. Protus & Hyacinth\s+2 + +.LP +\fBWeek 3\fR + .IP "12" 4 17th Sunday after Pentecost .br @@ -2571,6 +2748,10 @@ St. Joseph of Cupertino .br \s-2Gospel Matt 22:1-14\s+2 + +.LP +\fBWeek 4\fR + .IP "19" 4 18th Sunday after Pentecost .br @@ -2642,6 +2823,10 @@ September Ember Saturday .br \s-2Gospel Luke 13:6-17\s+2 + +.LP +\fBWeek 5\fR + .IP "26" 4 19th Sunday after Pentecost .br @@ -2688,9 +2873,12 @@ St. Jerome \s-2Gospel Matt 5:13-19\s+2 + .SH October + .LP +\fBWeek 1\fR .IP "1" 4 Friday of the 19th Week of the Time after Pentecost @@ -2712,6 +2900,10 @@ Holy Guardian Angels .br \s-2Gospel Matt 18:1-10\s+2 + +.LP +\fBWeek 2\fR + .IP "3" 4 20th Sunday after Pentecost .br @@ -2783,6 +2975,10 @@ St. John Leonardi .br \s-2Commemoration St. Dionysius and companions\s+2 + +.LP +\fBWeek 3\fR + .IP "10" 4 21st Sunday after Pentecost .br @@ -2846,6 +3042,10 @@ St. Hedwig .br \s-2Gospel Matt 13:44-52.\s+2 + +.LP +\fBWeek 4\fR + .IP "17" 4 22nd Sunday after Pentecost .br @@ -2913,6 +3113,10 @@ St. Anthony Mary Claret .br \s-2Gospel Matt 24:42-47\s+2 + +.LP +\fBWeek 5\fR + .IP "24" 4 23rd Sunday after Pentecost .br @@ -2980,6 +3184,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 11:27-28\s+2 + +.LP +\fBWeek 6\fR + .IP "31" 4 Christ the King .br @@ -2990,9 +3198,12 @@ Christ the King \s-2Gospel John 18:33-37\s+2 + .SH November + .LP +\fBWeek 1\fR .IP "1" 4 All Saints @@ -3050,6 +3261,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 11:27-28\s+2 + +.LP +\fBWeek 2\fR + .IP "7" 4 5th Sunday after Epiphany .br @@ -3121,6 +3336,10 @@ St. Didacus .br \s-2Gospel Luke 12:32-34\s+2 + +.LP +\fBWeek 3\fR + .IP "14" 4 6th Sunday after Epiphany .br @@ -3186,6 +3405,10 @@ St. Felix of Valois .br \s-2Gospel Luke 12:32-34\s+2 + +.LP +\fBWeek 4\fR + .IP "21" 4 24th and Last Sunday after Pentecost .br @@ -3255,6 +3478,10 @@ Our Lady's Saturday Office .br \s-2Gospel Luke 11:27-28\s+2 + +.LP +\fBWeek 5\fR + .IP "28" 4 1st Sunday of Advent .br @@ -3287,9 +3514,12 @@ St. Andrew \s-2Commemoration Tuesday of the 1st Week of Advent\s+2 + .SH December + .LP +\fBWeek 1\fR .IP "1" 4 Wednesday of the 1st Week of Advent @@ -3335,6 +3565,10 @@ St. Peter Chrysologus .br \s-2Commemoration St. Barbara\s+2 + +.LP +\fBWeek 2\fR + .IP "5" 4 2nd Sunday of Advent .br @@ -3408,6 +3642,10 @@ St. Damasus I .br \s-2Commemoration Saturday of the 2nd Week of Advent\s+2 + +.LP +\fBWeek 3\fR + .IP "12" 4 3rd Sunday of Advent .br @@ -3475,6 +3713,10 @@ Advent Ember Saturday .br \s-2Gospel Luke 3:1-6\s+2 + +.LP +\fBWeek 4\fR + .IP "19" 4 4th Sunday of Advent .br @@ -3540,6 +3782,10 @@ The Nativity of Our Lord (Christmas) .br \s-2Gospel John 1:1-14\s+2 + +.LP +\fBWeek 5\fR + .IP "26" 4 Sunday within the Octave of the Nativity .br @@ -3605,3 +3851,4 @@ Holy Innocents \s-2Commemoration St. Silvester\s+2 + |
