diff --git a/xml2xslt.xsl b/xml2xslt.xsl
index 8b7bf83..c62d1d9 100755
--- a/xml2xslt.xsl
+++ b/xml2xslt.xsl
@@ -8,23 +8,20 @@
 >
 
 	<!--
-		XSLT transformation for a master XML document defining how to
-		transform elements in the course handbook source into HTML and
-		LaTeX.  Hmm, meta-stylesheet?!
+		XSLT transformation for a master XML document defining how to transform elements in the course handbook source into HTML and LaTeX.  Hmm, meta-stylesheet?!
 	-->
 	
 	<!--	<xsl:output method="text" encoding="utf-8" media-type="text/xml" /> -->
 	<xsl:output method="xml" encoding="utf-8" cdata-section-elements="html" />
 
 	<!--
-		What format are we generating a styesheet for?
+		What target format are we generating a styesheet for?
 		Possible values: html, xhtml, latex (includes pdflatex), xelatex.
 	-->
-	<xsl:param name="format">html</xsl:param>
+	<xsl:param name="target-format">html</xsl:param>
 
 	<!--
-		Define an alias for the xsl namespace to avoid confusion when
-		generating xsl: elements in the output of this stylesheet.
+		Define an alias for the xsl namespace to avoid confusion when generating xsl: elements in the output of this stylesheet.
 	-->
 	<xsl:namespace-alias stylesheet-prefix="xsl-out" result-prefix="xsl" />
 
@@ -53,29 +50,39 @@
 		<xsl-out:param name="showanswers" select="'no'" />
 		
 		<xsl-out:param name="base-path">.</xsl-out:param>
+		
+		<!-- The date and time when the document was last built. -->
+		<xsl-out:variable name="date-built" select="current-dateTime()" />
+		
+		<!-- Various items from the CVS ID string, for convenience. -->
+		<xsl-out:variable name="cvs-id-tokens" select="tokenize( /document/@cvs-id, '\s+' )" />
+		<xsl-out:variable name="cvs-file" select="tokenize( $cvs-id-tokens[2], ',' )[1]" />
+		<xsl-out:variable name="cvs-version" select="$cvs-id-tokens[3]" />
+		<xsl-out:variable name="cvs-date" select="tokenize( $cvs-id-tokens[4], ',' )[1]" />
+		<xsl-out:variable name="cvs-time" select="tokenize( $cvs-id-tokens[5], ',' )[1]" />
+		<xsl-out:variable name="cvs-user" select="$cvs-id-tokens[6]" />
 
 		<!-- copy in the generated Oracle documentation code -->
 		<xsl:copy-of select="document('oracle-docs.xsl')/stylesheet/*" />
 		<!-- <xsl:include href="oracle-docs.xsl" /> -->
 
 		<!--
-			We're going to use the text encoding in a few different places,
-			so let's work out what it should be now.
+			We're going to use the text encoding in a few different places, so let's work out what it should be now.
 		-->
 		<xsl:variable name="text-encoding">
 			<xsl:choose>
 			
-				<xsl:when test="($format = 'latex') or ($format = 'html')">
+				<xsl:when test="($target-format = 'latex') or ($target-format = 'html')">
 					<xsl:text>iso-8859-1</xsl:text>
 				</xsl:when>
 				
-				<xsl:when test="($format = 'xelatex') or ($format = 'xhtml')">
+				<xsl:when test="($target-format = 'xelatex') or ($target-format = 'xhtml')">
 					<xsl:text>utf-8</xsl:text>
 				</xsl:when>
 				
 				<xsl:otherwise>
 					<xsl:message terminate="yes">
-						<xsl:text>Sorry, unknown format: </xsl:text><xsl:value-of select="$format" />
+						<xsl:text>Sorry, unknown target format: </xsl:text><xsl:value-of select="$target-format" />
 					</xsl:message>
 				</xsl:otherwise>
 			
@@ -88,16 +95,14 @@
 		-->
 		
 		<!--
-			First, output the document preamble according to format.
-			This is generally different for each output format.
+			First, output the document preamble according to target format. This is generally different for each target format.
 		-->
 		<xsl:choose>
 			
 			<!--
-				The HTML formats are fairly simple: the only things that
-				change are the doctypes, version number and text encoding.
+				The HTML formats are fairly simple: the only things that change are the doctypes, version number and text encoding.
 			-->
-			<xsl:when test="$format = 'html'">
+			<xsl:when test="$target-format = 'html'">
 			
 				<xsl-out:output
 					method="html"
@@ -110,7 +115,7 @@
 				
 			</xsl:when>
 			
-			<xsl:when test="$format = 'xhtml'">
+			<xsl:when test="$target-format = 'xhtml'">
 			
 				<xsl-out:output
 					method="xml"
@@ -125,15 +130,9 @@
 			</xsl:when>
 			
 			<!--
-				The LaTeX formats, however have a bunch of miscellaneous
-				boilerplate that appears at the start of every documents, and
-				requires more complex interleaving because of hyperref.
-				Since we need to stuff this into a template later on, we
-				define this using a callable template, so that we can do
-				useful things like apply-templates within it (which wouldn't
-				work if we just used a variable).
+				The LaTeX formats, however have a bunch of miscellaneous boilerplate that appears at the start of every documents, and requires more complex interleaving because of hyperref. Since we need to stuff this into a template later on, we define this using a callable template, so that we can do useful things like apply-templates within it (which wouldn't work if we just used a variable).
 			-->
-			<xsl:when test="$format = 'latex'">
+			<xsl:when test="$target-format = 'latex'">
 			
 				<xsl-out:output method="text" encoding="{$text-encoding}" media-type="text/plain" />	
 
@@ -163,7 +162,7 @@
 				
 			</xsl:when>
 			
-			<xsl:when test="$format = 'xelatex'">
+			<xsl:when test="$target-format = 'xelatex'">
 			
 				<xsl-out:output method="text" encoding="{$text-encoding}" media-type="text/plain" />	
 
@@ -199,20 +198,17 @@
 			</xsl:when>
 			
 			<!--
-				No need for an otherwise, as weird formats will have already
-				been trapped by the definition of the text-encoding variable
-				above.
+				No need for an otherwise, as weird target formats will have already been trapped by the definition of the text-encoding variable above.
 			-->
 			
 		</xsl:choose>
 		
 		<!--
-			Next, output the main document body according to format.
-			This is generally the same across similar formats.
+			Next, output the main document body according to target format. This is generally the same across similar target formats.
 		-->
 		<xsl:choose>
 
-			<xsl:when test="($format = 'html') or ($format = 'xhtml')">
+			<xsl:when test="($target-format = 'html') or ($target-format = 'xhtml')">
 			
 				<!-- *** (X)HTML Output *** -->
 				
@@ -285,16 +281,16 @@
 								<xsl-out:apply-templates select="//footnote" mode="list" />
 								<hr />
 							</xsl-out:if>
-							<address>
-								<xsl-out:apply-templates select="copyright" />
-								<xsl-out:apply-templates select="/document/@cvs-id" />
-							</address>
+							<xsl-out:call-template name="build-date-internal">
+								<xsl-out:with-param name="format">long</xsl-out:with-param>
+								<xsl-out:with-param name="style">footer</xsl-out:with-param>
+							</xsl-out:call-template>
 						</body>
 					</html>
 				</xsl-out:template>
 			</xsl:when>
 
-			<xsl:when test="($format = 'latex') or ($format = 'xelatex')">
+			<xsl:when test="($target-format = 'latex') or ($target-format = 'xelatex')">
 			
 				<!-- Set to pdf if using PDFLaTeX, otherwise eps. -->
 				<xsl-out:param name="image-format">pdf</xsl-out:param>
@@ -331,16 +327,28 @@
 
 	<xsl-out:apply-templates />
 
-	\vfill
-	{\scriptsize \hfill \verb+<xsl-out:apply-templates select="@cvs-id" />+}
+	<!--
+		If you're having problems with the build date appearing in weird or annoying locations (usually because of floating items like tables and figures), set document/@auto-latex-build-date to "no". You can then use the build-date element to insert the build date wherever you like, if necessary. This really only applies to LaTeX documents. The behaviour of HTML documents is much more predictable because they don't have elements with "minds of their own", so the build date is guaranteed to always appear at the very end.
+	-->
+	<xsl-out:if test="not( @auto-latex-build-date ) or ( @auto-latex-build-date != 'no' )">
+	
+		<xsl-out:call-template name="build-date-internal">
+			<xsl-out:with-param name="format">long</xsl-out:with-param>
+			<xsl-out:with-param name="style">footer</xsl-out:with-param>
+		</xsl-out:call-template>
 \end{document}
+	</xsl-out:if>
 						</xsl-out:when>
 						<!-- Not standalone: -->
 						<xsl-out:otherwise>
 							<xsl-out:apply-templates select="title" mode="chapter" />
 							<xsl-out:apply-templates select="*[not(self::title)]" />
-
-							\vfill {\scriptsize \hfill \verb+<xsl-out:value-of select="@cvs-id" />+}
+							<xsl-out:if test="not( @auto-latex-build-date ) or ( @auto-latex-build-date != 'no' )">
+								<xsl-out:call-template name="build-date-internal">
+									<xsl-out:with-param name="format">long</xsl-out:with-param>
+									<xsl-out:with-param name="style">footer</xsl-out:with-param>
+								</xsl-out:call-template>
+							</xsl-out:if>
 						</xsl-out:otherwise>
 					</xsl-out:choose>
 				</xsl-out:template>
@@ -348,9 +356,7 @@
 			</xsl:when>
 			
 			<!--
-				No need for an otherwise, as weird formats will have already
-				been trapped by the definition of the text-encoding variable
-				above.
+				No need for an otherwise, as weird formats will have already been trapped by the definition of the text-encoding variable above.
 			-->
 			
 		</xsl:choose>
@@ -363,26 +369,26 @@
 
 
 	<!-- General-purpose template-producing template. -->
-	<!--<xsl:template match="template"><![CDATA[<xsl-out:template name="]]><xsl-out:value-of select="name" /><![CDATA[" match="]]><xsl-out:value-of select="match" /><![CDATA[">]]><xsl-out:copy-of select="*[local-name(.)=$format]" /><![CDATA[</xsl-out:template>]]></xsl-out:template>-->
+	<!--<xsl:template match="template"><![CDATA[<xsl-out:template name="]]><xsl-out:value-of select="name" /><![CDATA[" match="]]><xsl-out:value-of select="match" /><![CDATA[">]]><xsl-out:copy-of select="*[local-name(.)=$target-format]" /><![CDATA[</xsl-out:template>]]></xsl-out:template>-->
 
 	<xsl:template match="template">
 		<xsl-out:template>
 		
 			<!--
-				Much easier to just copy all attributes across verbatim rather
-				than copying specific named attributes, because we might want
-				to use attributes that weren't originally anticipated.
+				Much easier to just copy all attributes across verbatim rather than copying specific named attributes, because we might want to use attributes that weren't originally anticipated.
 				
 				Might this be a problem in future?
 			-->
 			<xsl:copy-of select="@*" />
 			
-			<!-- Copy across code that is common to ALL formats. -->
+			<!--
+				Copy across code that is common to ALL target formats. Any code not specific to a particular target format will therefore always appear FIRST in the resulting template.
+			-->
 			<xsl:copy-of select="common[not(@formats)]/node()" />
 			
 			<!-- Copy across code that is specific to the current format. -->
-			<xsl:copy-of select="common[contains(@formats, concat('/', $format, '/'))]/node()" />
-			<xsl:copy-of select="*[name(.)=$format]/node()" />
+			<xsl:copy-of select="common[contains(@formats, concat('/', $target-format, '/'))]/node()" />
+			<xsl:copy-of select="*[name(.)=$target-format]/node()" />
 			
 		</xsl-out:template>
 	</xsl:template>