diff --git a/modules/paper-calendar.xml b/modules/paper-calendar.xml
index bcfe858..6e2d86d 100644
--- a/modules/paper-calendar.xml
+++ b/modules/paper-calendar.xml
@@ -28,6 +28,8 @@
This is mainly relevant to (Xe)LaTeX in order to underline cells correctly. In (Xe)LaTeX it doesn't matter if we draw the same \clines multiple times, so if a column doesn't exist, we just set it's column number to the column number of the previous column. HTML doesn't really care, but we need to do the calculation anyway in order to work out the correct number of columns.
Note that we need to cover both the case of a calendar for a single period, which will have the body element as an immediate child of calendar, versus a calendar for multiple periods, which will have the body elements as immmediate children of calendar/period.
+
+ Note also the implied assumption that a calendar with multiple periods will have the same column structure for all periods. This may or may not be a valid assumption in future!
-->
1
2
@@ -96,7 +98,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -153,37 +155,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -198,128 +200,42 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- \begin{center}
-
-
-
- \begin{sideways}
-
-
- \resizebox{24cm}{!}{%
-
-
- \begin{tabular}{|c|c
-
- |c
-
-
- |c|l
-
-
- |c
-
-
- |c|c
-
-
- |c|c
-
-
- |c
-
- |}
-
-
-
- \multicolumn{
-
- }{c}{\LARGE\textbf{
-
- Teaching Calendar,
-
- ,
-
- }} \\
-
-
-
-
-
- 1
- c
-
- \\
-
-
- \hline
-
-
+
+
+
-
-
-
+
\hline\hline
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
\hline\hline
-
-
-
+
- \hline
-
-
- \end{tabular}%
-
-
- }
-
-
- \end{sideways}
-
-
- \end{center}
-
+
+
@@ -333,35 +249,18 @@
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -373,13 +272,8 @@
Header/footer rows for the calendar table. To get proper table headings/footings, use HEADING/FOOTING. For other text, use NOTE.
-->
-
-
-
-
-
-
+
\\
-
-
-
@@ -426,11 +315,9 @@
We can't use generate-content-cell here because we need TH rather than TD. This is a one-off anyway.
-->
-
-
-
-
-
+
+
+
|
@@ -444,7 +331,7 @@
-->
-
+
@@ -465,24 +352,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -734,11 +621,16 @@
-->
-
+
- \hline\hline
-
+
+
+ \hline\hline
+
+
@@ -757,8 +649,8 @@
\\
- \hline\hline
-
+ \hline\hline
+
@@ -1215,4 +1107,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \begin{center}
+
+
+
+ \begin{sideways}
+
+
+ \resizebox{24cm}{!}{%
+
+
+ \begin{tabular}{|c|c
+
+ |c
+
+
+ |c|l
+
+
+ |c
+
+
+ |c|c
+
+
+ |c|c
+
+
+ |c
+
+ |}
+
+
+
+ \multicolumn{
+
+ }{c}{\LARGE\textbf{
+
+ Teaching Calendar,
+
+ ,
+
+ }} \\
+
+
+
+
+
+ 1
+ c
+
+ \\
+
+
+ \hline
+
+
+
+
+
+
+
+
+
+
+
+
+ \hline
+
+
+
+ \multicolumn{
+
+ }{r}{\emph{
+
+ }} \\
+
+
+
+ \end{tabular}%
+
+
+ }
+
+
+ \end{sideways}
+
+
+ \end{center}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \newpage
+
+
+
+
+
+
+ \hline\hline
+
+
+
+
+
+
+