diff --git a/xml2xslt.xsl b/xml2xslt.xsl
index 323e265..75edf45 100755
--- a/xml2xslt.xsl
+++ b/xml2xslt.xsl
@@ -17,7 +17,7 @@
 		What target format are we generating a styesheet for?
 		Possible values: html, xhtml, latex (includes pdflatex), xelatex.
 	-->
-	<xsl:param name="target-format">html</xsl:param>
+	<xsl:param name="target-format"><xsl:text>html</xsl:text></xsl:param>
 
 	<!--
 		Define an alias for the xsl namespace to avoid confusion when generating xsl: elements in the output of this stylesheet.
@@ -41,25 +41,25 @@
 		
 		<xsl-out:strip-space elements="*" />
 
-		<xsl-out:param name="subject-code">INFO</xsl-out:param>
+		<xsl-out:param name="subject-code"><xsl:text>INFO</xsl:text></xsl-out:param>
 		<xsl-out:param name="paper-number" />
-		<xsl-out:param name="paper-year" />
+		<xsl-out:param name="paper-year"		select="year-from-date( current-date() )"/>
 		<xsl-out:param name="paper-period" />
 		
-		<xsl-out:param name="showanswers" select="'no'" />
+		<xsl-out:param name="showanswers"><xsl:text>no</xsl:text></xsl-out:param>
 		
-		<xsl-out:param name="base-path">.</xsl-out:param>
+		<xsl-out:param name="base-path"><xsl:text>.</xsl:text></xsl-out:param>
 		
 		<!-- The date and time when the document was last built. -->
-		<xsl-out:variable name="date-built" select="current-dateTime()" />
+		<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]" />
+		<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]" />
 
 		<!-- Include the generated Oracle documentation code. -->
 		<xsl-out:include href="oracle-docs.xsl" />
@@ -144,7 +144,7 @@
 					document. Appears here because it's used in the document
 					preamble.
 				-->
-				<xsl-out:param name="standalone">yes</xsl-out:param>
+				<xsl-out:param name="standalone"><xsl:text>yes</xsl:text></xsl-out:param>
 				
 				<xsl-out:template name="latex-preamble">
 					<xsl-out:text>
@@ -180,7 +180,7 @@
 					document. Appears here because it's used in the document
 					preamble.
 				-->
-				<xsl-out:param name="standalone">yes</xsl-out:param>
+				<xsl-out:param name="standalone"><xsl:text>yes</xsl:text></xsl-out:param>
 				
 				<xsl-out:template name="latex-preamble">
 					<xsl-out:text>
@@ -238,7 +238,7 @@
 				-->
 				
 				<!-- Default to PNG images for web dispay. -->
-				<xsl-out:param name="image-format">png</xsl-out:param>
+				<xsl-out:param name="image-format"><xsl:text>png</xsl:text></xsl-out:param>
 
 			<!-- Nope, includes can only appear as a child of xsl:stylesheet. -->
 			<!-- <xsl-out:include href="xml2html-root.xsl" /> -->
@@ -266,8 +266,10 @@
 									<xsl-out:text>Content-type</xsl-out:text>
 								</xsl-out:attribute>
 								<xsl-out:attribute name="content">
-									<xsl-out:text>text/html;charset=</xsl-out:text>
-									<xsl:value-of select="$text-encoding" />
+									<xsl-out:text>
+										<xsl:text>text/html;charset=</xsl:text>
+										<xsl:value-of select="$text-encoding" />
+									</xsl-out:text>
 								</xsl-out:attribute>
 							</xsl-out:element>
 							<title>
@@ -308,7 +310,7 @@
 			<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>
+				<xsl-out:param name="image-format"><xsl:text>pdf</xsl:text></xsl-out:param>
 
 				<!-- *** LaTeX Source Output *** -->
 				<!-- Should this produce a LaTeX source fragment or an entire valid source document? -->