diff --git a/html_calendar.xsl b/html_calendar.xsl
index 2ad9e5f..93fb5e2 100755
--- a/html_calendar.xsl
+++ b/html_calendar.xsl
@@ -5,9 +5,10 @@
 
 	<xsl:param name="standalone">yes</xsl:param>
 
-	<xsl:param name="department">INFO</xsl:param>
-
-	<xsl:param name="paper" />
+	<xsl:param name="subject-code">INFO</xsl:param>
+	<xsl:param name="paper-number" />
+	<xsl:param name="paper-year" />
+	<xsl:param name="paper-period" />
 
 	<xsl:strip-space elements="*" />
 
@@ -36,7 +37,7 @@
 							<xsl:apply-templates select="calendar/paper" />
 							<xsl:text> Paper Calendar, </xsl:text>
 							<xsl:apply-templates select="calendar/period" />
-							<xsl:text> </xsl:text>
+							<xsl:text>, </xsl:text>
 							<xsl:apply-templates select="calendar/year" />
 						</TITLE>
 						<xsl:element name="LINK">
@@ -45,8 +46,8 @@
 							</xsl:attribute>
 							<xsl:attribute name="HREF">
 								<xsl:text>http://info-nts-12.otago.ac.nz/</xsl:text>
-								<xsl:value-of select="$department" />
-								<xsl:value-of select="$paper" />
+								<xsl:value-of select="$subject-code" />
+								<xsl:value-of select="$paper-number" />
 								<xsl:text>/db_styles.css</xsl:text>
 							</xsl:attribute>
 							<xsl:attribute name="TYPE">
@@ -88,7 +89,7 @@
 			<xsl:apply-templates select="paper" />
 			<xsl:text> Paper Calendar, </xsl:text>
 			<xsl:apply-templates select="period" />
-			<xsl:text> </xsl:text>
+			<xsl:text>, </xsl:text>
 			<xsl:apply-templates select="year" />
 		</H2>
 		
@@ -114,6 +115,37 @@
 		</DIV>
 	</xsl:template>
 	
+	<xsl:template name="SubjectCode" match="SubjectCode">
+		<xsl:value-of select="$subject-code" />
+	</xsl:template>
+
+	<xsl:template name="PaperNumber" match="PaperNumber">
+		<xsl:value-of select="$paper-number" />
+	</xsl:template>
+
+	<xsl:template name="PaperCode" match="PaperCode">
+		<xsl:value-of select="$subject-code" />
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="$paper-number" />
+	</xsl:template>
+
+	<xsl:template name="PaperYear" match="PaperYear">
+		<!--
+			@offset lets us output the year +/- some integer value.
+			The input value is truncated and defaults to zero if not
+			supplied.
+		-->
+		<xsl:variable name="add">
+			<xsl:value-of select="floor(@offset)" />
+			<xsl:if test="not(@offset)">0</xsl:if>
+		</xsl:variable>
+		<xsl:value-of select="$paper-year + $add" />
+	</xsl:template>
+
+	<xsl:template name="PaperPeriod" match="PaperPeriod">
+		<xsl:value-of select="$paper-period" />
+	</xsl:template>
+
 	<!--
 		Header/footer rows for the calendar table. To get proper table
 		headings/footings, use HEADING/FOOTING. For other text, use NOTE.