diff --git a/calendar/teachingdates/templates/paper-calendar-dates.xml.j2 b/calendar/teachingdates/templates/paper-calendar-dates.xml.j2
index 761199d..cb406f4 100644
--- a/calendar/teachingdates/templates/paper-calendar-dates.xml.j2
+++ b/calendar/teachingdates/templates/paper-calendar-dates.xml.j2
@@ -27,7 +27,7 @@
 
 
 <!--
-	AUTOMATICALLY GENERATED ---DO NOT EDIT! This is automatically generated by ../generate_calendar_dates.php!
+	AUTOMATICALLY GENERATED, DO NOT EDIT!
 	
 	Elements and templates for generating teaching period dates. Apart from the wrapper templates, this essentially boils down to a giant parameterised lookup table, which is generated by a script.
 -->
@@ -148,6 +148,82 @@
 		</common>
 	</template>
 	
-{# generated templates go here #}
+	
+	<!--
+		Generate a date (default Monday) for the specified teaching period and week (or break), using the specified date format, with an optional offset from the Monday of the week. Most of the body of this template is automatically generated by the script ../generate_calendar_dates.php.
+		
+		See the attributes of the TeachingPeriodDate template above for descriptions of the parameters.
+	-->
+	<template name="format-teaching-date">
+		<common>
+			<xsl:param name="period" as="xs:string" />
+			<xsl:param name="week" as="xs:string" />
+			<xsl:param name="format" as="xs:string" />
+			<xsl:param name="offset" as="xs:dayTimeDuration" />
+			
+			<xsl:choose>
+				{%- for period, weeks in calendars.items() %}
+				<xsl:when test="$period = '{{period}}'">
+					<xsl:choose>
+						{%- for weeknum, the_date in weeks.items() %}
+						<xsl:when test="$week = '{{weeknum}}'">
+							<xsl:value-of select="format-date( xs:date( '{{the_date.isoformat()}}' ) + $offset, $format )" />
+						</xsl:when>
+						{%- endfor %}
+						<xsl:otherwise>
+							<xsl:message terminate="yes">
+								<xsl:text>Invalid {{period}} week specification "</xsl:text>
+								<xsl:value-of select="$week" />
+								<xsl:text>".</xsl:text>
+							</xsl:message>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
+				{%- endfor %}
+			</xsl:choose>
+		</common>
+	</template>
+
+	
+	<!--
+		Generate a date range for the specified teaching period and week (or break), using the specified month format, with optional wrapping. Most of the body of this template is automatically generated by the script ../generate_calendar_dates.php.
+		
+		See the attributes of the TeachingPeriodDateRange template above for descriptions of the parameters. $month-format is derived from @format.
+	-->
+	<template name="format-teaching-date-range">
+		<common>
+			<xsl:param name="period" as="xs:string" />
+			<xsl:param name="week" as="xs:string" />
+			<xsl:param name="month-format" as="xs:string" />
+			<xsl:param name="wrap" as="xs:boolean" />
+			
+			<xsl:choose>
+				{%- for period, weeks in calendars.items() %}
+				<xsl:when test="$period = '{{period}}'">
+					<xsl:choose>
+						{%- for weeknum, the_date in weeks.items() %}
+						<xsl:when test="$week = '{{weeknum}}'">
+							<xsl:value-of select="format-date( xs:date( '{{the_date.isoformat()}}' ), '[D]' )" />
+							<xsl:call-template name="endash" />
+							<xsl:value-of select="format-date( xs:date( '{{the_date + eow_offset}}' ), '[D] ' )" />
+							<xsl:if test="$wrap">
+								<xsl:call-template name="newline" />
+							</xsl:if>
+							<xsl:value-of select="format-date( xs:date( '{{the_date.isoformat()}}'' ), $month-format )" />
+						</xsl:when>
+						{%- endfor %}
+						<xsl:otherwise>
+							<xsl:message terminate="yes">
+								<xsl:text>Invalid {{period}} week specification "</xsl:text>
+								<xsl:value-of select="$week" />
+								<xsl:text>".</xsl:text>
+							</xsl:message>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
+				{%- endfor %}
+			</xsl:choose>
+		</common>
+	</template>
 
 </stylesheet>