diff options
| author | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-08-20 11:42:25 +0200 |
|---|---|---|
| committer | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-08-20 11:42:25 +0200 |
| commit | 900d1d781e62a08a1bda1285c8e8611a7baa0f2f (patch) | |
| tree | 621e920076409f74e164cfc15016ad9910bcf40a /test/golden/ordo-2027.tex | |
| parent | e2e56ac5af290b60ea01037e58e8bc00545c021c (diff) | |
| download | colitur-900d1d781e62a08a1bda1285c8e8611a7baa0f2f.tar.gz colitur-900d1d781e62a08a1bda1285c8e8611a7baa0f2f.zip | |
feat(templates): week headers stop repeating the month name
Every ordo booklet week header used to print the month name again
even though the month heading right above it already established it
-- pure noise, repeated once per week for the whole year. All seven
ordo flavours now print the week's own Roman numeral plus the span of
dates it covers instead, e.g. "Hebdomada I (Ian 1-2)", with no month
name on the line; the LaTeX table of contents and the Typst outline
(built automatically from its own headings, so editing the heading is
the whole fix there) read the same way.
A single-day week (e.g. a lone trailing Sunday) renders "Ian 31", not
"Ian 31-31": each flavour's dash sits inside an inverted single_day
section, so the engine -- which cannot itself compare first_dom to
last_dom -- never has to decide anything, it only follows the data.
The dash character matches each flavour's own existing convention:
LaTeX/Typst's own "--" ligature, groff's \(en escape (alongside its
existing \(bu), HTML's – entity (alongside its existing
·), and a literal en dash for the three flavours with no
escaping (adoc/md/txt).
Every in-template comment describing the new fields is written without
ever typing two curly braces together, including in the two comments
this touches that used to embed a live {{month_name}}/{{term.week}}
tag pair inside a LaTeX % comment -- harmless only because that whole
line already started with %, not because the engine has any comment
awareness (it has none).
Goldens regenerated through test_render_golden.ml's own render path
(Test_view.view_of + Template.render_string), not the CLI -- the two
differ in default language and would otherwise pin output the test
suite never produces. Grid goldens are untouched, matching the grid
templates, which have no week header.
Verified against real pdflatex (two passes) and typst compile output,
not merely the golden pins: both flavours print "Hebdomada I (Ian
1-2)", "Hebdomada II (Ian 3-9)", "Hebdomada III (Ian 10-16)" as their
first three week headers and identical text in the table of
contents/outline, and both show "Hebdomada VI (Ian 31)" for January's
own trailing single-day week with no dash.
Diffstat (limited to 'test/golden/ordo-2027.tex')
| -rw-r--r-- | test/golden/ordo-2027.tex | 276 |
1 files changed, 142 insertions, 134 deletions
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] |
