diff --git a/format-master.xml b/format-master.xml
index ad2b04a..ef1b1fd 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -4,9 +4,9 @@
 
 	<template name="PaperCode" match="PaperCode">
 		<common>
-			<xsl:value-of select="$department"/>
+			<xsl:value-of select="$department" />
 			<xsl:text> </xsl:text>
-			<xsl:value-of select="$paper"/>
+			<xsl:value-of select="$paper" />
 		</common>
 	</template>
 
@@ -57,21 +57,21 @@
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
 					<xsl:text>\begin{flush</xsl:text>
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="@align" />
 					<xsl:text>}</xsl:text>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:text>\end{flush</xsl:text>
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="@align" />
 					<xsl:text>}</xsl:text>
 				</xsl:when>
 				<xsl:when test="@align = 'center'">
 					<xsl:text>\begin{center}</xsl:text>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:text>\end{center}</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:if test="@indent = 'no'">\noindent </xsl:if>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>
@@ -88,19 +88,19 @@
 				correctly. Fortunately this only needs to be done with
 				paragraphs, so this will work fine.
 			-->
-			<xsl:param name="HTMLStyle"/>
+			<xsl:param name="HTMLStyle" />
 			<P>
 				<xsl:if test="$HTMLStyle">
 					<xsl:attribute name="CLASS">
-						<xsl:value-of select="$HTMLStyle"/>
+						<xsl:value-of select="$HTMLStyle" />
 					</xsl:attribute>
 				</xsl:if>
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
-						<xsl:value-of select="@align"/>
+						<xsl:value-of select="@align" />
 					</xsl:attribute>
 				</xsl:if>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</P>
 		</html>
 	</template>
@@ -110,7 +110,7 @@
 	<template name="newline" match="newline|line-break|br">
 		<latex><xsl:text> \\
 </xsl:text></latex>
-		<html><BR/></html>
+		<html><BR /></html>
 	</template>
 
 	<!-- Whereas newline|line-break is for line breaks intended to be outputted in the final document, this is for additional linebreaks in the generated latex or HTML source (for stuff like avoiding "\end{verbatim}\item" all on one line). -->
@@ -132,7 +132,7 @@
 		space gets gobbled by XSLT, producing leading to non-separated
 		words in the output. It doesn't seem very consistent as to when
 		it does and doesn't happen, unfortunately, but when it does
-		happen, inserting a <space/> will fix the problem.
+		happen, inserting a <space /> will fix the problem.
 
 		This is analogous to putting a \ at the end of macros in LaTeX
 		to ensure that spaces after the macro aren't gobbled, and indeed,
@@ -280,8 +280,8 @@
 			<IMG>
 				<xsl:attribute name="SRC">
 					<xsl:text>/</xsl:text>
-					<xsl:value-of select="$department"/>
-					<xsl:value-of select="$paper"/>
+					<xsl:value-of select="$department" />
+					<xsl:value-of select="$paper" />
 					<xsl:text>/Handbook/join-operator-web.png</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="ALT">
@@ -313,7 +313,7 @@
 			<xsl:text>\ensuremath{\</xsl:text>
 			<xsl:choose>
 				<xsl:when test="@type">
-					<xsl:value-of select="@type"/>
+					<xsl:value-of select="@type" />
 				</xsl:when>
 				<!-- default to a full outer join -->
 				<xsl:otherwise>
@@ -335,12 +335,12 @@
 			<IMG>
 				<xsl:attribute name="SRC">
 					<xsl:text>/</xsl:text>
-					<xsl:value-of select="$department"/>
-					<xsl:value-of select="$paper"/>
+					<xsl:value-of select="$department" />
+					<xsl:value-of select="$paper" />
 					<xsl:text>/Handbook/</xsl:text>
 					<xsl:choose>
 						<xsl:when test="@type">
-							<xsl:value-of select="@type"/>
+							<xsl:value-of select="@type" />
 						</xsl:when>
 						<!-- default to a full outer join -->
 						<xsl:otherwise>
@@ -405,74 +405,74 @@
 	</template>
 
 	<template name="menu-item" match="menu/item">
-		<latex>\textbf{<xsl:apply-templates/>}</latex>
-		<html><B><xsl:apply-templates/></B></html>
+		<latex>\textbf{<xsl:apply-templates />}</latex>
+		<html><B><xsl:apply-templates /></B></html>
 	</template>
 	
 	<!-- Special styles -->
 	<template name="emph" match="emph|em">
-		<latex>\emph{<xsl:apply-templates/>}</latex>
-		<html><EM><xsl:apply-templates/></EM></html>
+		<latex>\emph{<xsl:apply-templates />}</latex>
+		<html><EM><xsl:apply-templates /></EM></html>
 	</template>
 	<!--
 		Emphasis inside answers needs to be handled specially in HTML, as
 		it doesn't just flip-flop automatically like it does in LaTeX.
 	-->
 	<template name="emph-in-answer" match="answer//emph|answer//em">
-		<latex>\emph{<xsl:apply-templates/>}</latex>
-		<html><STRONG><xsl:apply-templates/></STRONG></html>
+		<latex>\emph{<xsl:apply-templates />}</latex>
+		<html><STRONG><xsl:apply-templates /></STRONG></html>
 	</template>
 	<template name="italic" match="italic">
-		<latex>\textit{<xsl:apply-templates/>}</latex>
-		<html><I><xsl:apply-templates/></I></html>
+		<latex>\textit{<xsl:apply-templates />}</latex>
+		<html><I><xsl:apply-templates /></I></html>
 	</template>
 	<template name="strong" match="strong">
-		<latex>\textbf{<xsl:apply-templates/>}</latex>
-		<html><STRONG><xsl:apply-templates/></STRONG></html>
+		<latex>\textbf{<xsl:apply-templates />}</latex>
+		<html><STRONG><xsl:apply-templates /></STRONG></html>
 	</template>
 	<template name="bold" match="bold">
-		<latex>\textbf{<xsl:apply-templates/>}</latex>
-		<html><B><xsl:apply-templates/></B></html>
+		<latex>\textbf{<xsl:apply-templates />}</latex>
+		<html><B><xsl:apply-templates /></B></html>
 	</template>
 	<template name="underline" match="underline|u">
-		<latex>\underline{<xsl:apply-templates/>}</latex>
-		<html><U><xsl:apply-templates/></U></html>
+		<latex>\underline{<xsl:apply-templates />}</latex>
+		<html><U><xsl:apply-templates /></U></html>
 	</template>
 	<template name="term" match="term">
-		<latex>\term{<xsl:apply-templates/>}</latex>
-		<html><I CLASS="term"><xsl:apply-templates/></I></html>
+		<latex>\term{<xsl:apply-templates />}</latex>
+		<html><I CLASS="term"><xsl:apply-templates /></I></html>
 	</template>
 	<template name="foreign" match="foreign">
-		<latex>\foreign{<xsl:apply-templates/>}</latex>
-		<html><I CLASS="foreign"><xsl:apply-templates/></I></html>
+		<latex>\foreign{<xsl:apply-templates />}</latex>
+		<html><I CLASS="foreign"><xsl:apply-templates /></I></html>
 	</template>
 	<template name="code" match="code">
-		<!-- <latex>\code{<xsl:apply-templates/>}</latex> -->
+		<!-- <latex>\code{<xsl:apply-templates />}</latex> -->
 		<!-- Using \verb is quite handy because things like underscores don't bother it.  However, it seems it can't be used inside hyperlinks.   Maybe create another template that just does a \texttt on the contents? -->
 		<!-- OK, but then we need an <underscore> element to stop them from freaking LaTeX out. -->
-		<latex>\verb`<xsl:apply-templates/>`</latex>
-		<html><CODE><xsl:apply-templates/></CODE></html>
+		<latex>\verb`<xsl:apply-templates />`</latex>
+		<html><CODE><xsl:apply-templates /></CODE></html>
 	</template>
 
 	<template name="typewriter" match="typewriter|monospace|tt">
-		<latex>\texttt{<xsl:apply-templates/>}</latex>
-		<html><TT><xsl:apply-templates/></TT></html>
+		<latex>\texttt{<xsl:apply-templates />}</latex>
+		<html><TT><xsl:apply-templates /></TT></html>
 	</template>
 	
 	<template name="sans-serif" match="sans-serif|sans|ss|sf">
-		<latex>\textsf{<xsl:apply-templates/>}</latex>
-		<html><FONT FACE="sans-serif"><xsl:apply-templates/></FONT></html>
+		<latex>\textsf{<xsl:apply-templates />}</latex>
+		<html><FONT FACE="sans-serif"><xsl:apply-templates /></FONT></html>
 	</template>
 	
 	<!-- Non-maths super- and subscript. -->
 	<template name="superscript" match="superscript">
-		<latex>\ensuremath{^{\mathrm{<xsl:apply-templates/>}}}</latex>
-		<html><SUP><xsl:apply-templates/></SUP></html>
+		<latex>\ensuremath{^{\mathrm{<xsl:apply-templates />}}}</latex>
+		<html><SUP><xsl:apply-templates /></SUP></html>
 	</template>
 	
 	<template name="subscript" match="subscript">
-		<latex>\ensuremath{_{\mathrm{<xsl:apply-templates/>}}}</latex>
-		<html><SUB><xsl:apply-templates/></SUB></html>
+		<latex>\ensuremath{_{\mathrm{<xsl:apply-templates />}}}</latex>
+		<html><SUB><xsl:apply-templates /></SUB></html>
 	</template>
 	
 	<!--
@@ -484,13 +484,13 @@
 		look different on different machines.
 	-->
 	<template name="tiny" match="tiny">
-		<latex>{\tiny <xsl:apply-templates/>}</latex>
+		<latex>{\tiny <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 			</SPAN>
@@ -499,12 +499,12 @@
 	</template>
 	
 	<template name="scriptsize" match="scriptsize">
-		<latex>{\scriptsize <xsl:apply-templates/>}</latex>
+		<latex>{\scriptsize <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 			</SPAN>
@@ -512,53 +512,53 @@
 	</template>
 	
 	<template name="footnotesize" match="footnotesize">
-		<latex>{\footnotesize <xsl:apply-templates/>}</latex>
+		<latex>{\footnotesize <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:smaller;">
 			<SPAN STYLE="font-size:smaller;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 		</html>
 	</template>
 	
 	<template name="small" match="small">
-		<latex>{\small <xsl:apply-templates/>}</latex>
+		<latex>{\small <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:smaller;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 		</html>
 	</template>
 	
 	<template name="large" match="large">
-		<latex>{\large <xsl:apply-templates/>}</latex>
+		<latex>{\large <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:larger;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 		</html>
 	</template>
 	
 	<!-- Fortunately, XML is case-sensitive. -->
 	<template name="Large" match="Large">
-		<latex>{\Large <xsl:apply-templates/>}</latex>
+		<latex>{\Large <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 		</html>
 	</template>
 	
 	<template name="LARGE" match="LARGE">
-		<latex>{\LARGE <xsl:apply-templates/>}</latex>
+		<latex>{\LARGE <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 			</SPAN>
@@ -566,13 +566,13 @@
 	</template>
 	
 	<template name="huge" match="huge">
-		<latex>{\huge <xsl:apply-templates/>}</latex>
+		<latex>{\huge <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 			</SPAN>
@@ -581,14 +581,14 @@
 	</template>
 	
 	<template name="Huge" match="Huge">
-		<latex>{\Huge <xsl:apply-templates/>}</latex>
+		<latex>{\Huge <xsl:apply-templates />}</latex>
 		<html>
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
 			<SPAN STYLE="font-size:larger;">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			</SPAN>
 			</SPAN>
 			</SPAN>
@@ -602,8 +602,8 @@
 		Only really relevant for LaTeX because we can't control this in HTML.
 	-->
 	<template name="no-break" match="no-break|mbox">
-		<latex>\mbox{<xsl:apply-templates/>}</latex>
-		<html><xsl:apply-templates/></html>
+		<latex>\mbox{<xsl:apply-templates />}</latex>
+		<html><xsl:apply-templates /></html>
 	</template>
 	
 	
@@ -639,40 +639,40 @@
 					\vfill
 				</xsl:when>
 				<xsl:otherwise>
-					\vskip<xsl:value-of select="@size"/>
+					\vskip<xsl:value-of select="@size" />
 				</xsl:otherwise>
 			</xsl:choose>
 		</latex>
 		<!-- For the moment we'll just throw in a BR :) -->
-		<html><BR CLEAR="left"/></html>
+		<html><BR CLEAR="left" /></html>
 	</template>
 	
 
 	<!-- We can decide later whether to use plain verbatim or listings. -->
 	<template name="code-block" match="code-block">
 		<latex>
-			<xsl:call-template name="newline-internal"/>
+			<xsl:call-template name="newline-internal" />
 			<!-- If the code-block specifies "allow-breaks='no'", wrap the verbatim inside a minipage to avoid page breaks within the code. -->
 			<xsl:if test="@allow-breaks = 'no'">
 				<xsl:text>\vskip\baselineskip</xsl:text>
-				<xsl:call-template name="newline-internal"/>
+				<xsl:call-template name="newline-internal" />
 				<xsl:text>\begin{minipage}{\textwidth}</xsl:text>
-				<xsl:call-template name="newline-internal"/>
+				<xsl:call-template name="newline-internal" />
 			</xsl:if>
 			<xsl:text>\begin{verbatim}</xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:text>\end{verbatim}</xsl:text>
-			<xsl:call-template name="newline-internal"/>
+			<xsl:call-template name="newline-internal" />
 			<xsl:if test="@allow-breaks = 'no'">
 				<xsl:text>\end{minipage}</xsl:text>
-				<xsl:call-template name="newline-internal"/>
+				<xsl:call-template name="newline-internal" />
 				<xsl:text>\vskip\baselineskip</xsl:text>
-				<xsl:call-template name="newline-internal"/>
+				<xsl:call-template name="newline-internal" />
 			</xsl:if>
-			<xsl:call-template name="newline-internal"/>
+			<xsl:call-template name="newline-internal" />
 		</latex>
 		<html>
-			<PRE CLASS="code"><xsl:apply-templates/></PRE>
+			<PRE CLASS="code"><xsl:apply-templates /></PRE>
 		</html>
 	</template>
 
@@ -682,14 +682,14 @@
 	-->
 	<template name="verbatim" match="verbatim">
 		<latex>
-			<xsl:call-template name="newline-internal"/>
+			<xsl:call-template name="newline-internal" />
 			<xsl:text>\begin{verbatim}</xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:text>\end{verbatim}</xsl:text>
-			<xsl:call-template name="newline-internal"/>
+			<xsl:call-template name="newline-internal" />
 		</latex>
 		<html>
-			<PRE><xsl:apply-templates/></PRE>
+			<PRE><xsl:apply-templates /></PRE>
 		</html>
 	</template>
 
@@ -702,18 +702,18 @@
 			otherwise => double quotes (""). [default]
 	-->
 	<template name="single-quote" match="quote[@single='yes']|q[@single='yes']">
-		<latex>`<xsl:apply-templates/>'</latex>
+		<latex>`<xsl:apply-templates />'</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">&amp;#8216;</xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text>
 		</html>
 	</template>
 	<template name="double-quote" match="quote|qq">
-		<latex>``<xsl:apply-templates/>''</latex>
+		<latex>``<xsl:apply-templates />''</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">&amp;#8220;</xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:text disable-output-escaping="yes">&amp;#8221;</xsl:text>
 		</html>
 	</template>
@@ -726,10 +726,10 @@
 		<common>
 			<xsl:choose>
 				<xsl:when test="(count(ancestor::quote) mod 2) = 0">
-					<xsl:call-template name="double-quote"/>
+					<xsl:call-template name="double-quote" />
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:call-template name="single-quote"/>
+					<xsl:call-template name="single-quote" />
 				</xsl:otherwise>
 			</xsl:choose>
 		</common>
@@ -738,10 +738,10 @@
 		<common>
 			<xsl:choose>
 				<xsl:when test="(count(ancestor::quote) mod 2) = 0">
-					<xsl:call-template name="single-quote"/>
+					<xsl:call-template name="single-quote" />
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:call-template name="double-quote"/>
+					<xsl:call-template name="double-quote" />
 				</xsl:otherwise>
 			</xsl:choose>
 		</common>
@@ -755,13 +755,13 @@
 	<template name="itemised-list" match="itemised-list|itemize|unordered-list|bulleted-list|bullet-list|bullet-points|UL|ul">
 		<latex>
 			\begin{itemize}
-				<xsl:apply-templates select="item" mode="normal"/>
+				<xsl:apply-templates select="item" mode="normal" />
 			\end{itemize}
 			
 		</latex>
 		<html>
 			<UL>
-				<xsl:apply-templates select="item" mode="normal"/>
+				<xsl:apply-templates select="item" mode="normal" />
 			</UL>
 		</html>
 	</template>
@@ -772,13 +772,13 @@
 	<template name="enumerated-list" match="enumerated-list|enumerate|ordered-list|numbered-list|question-list|OL|ol">
 		<latex>
 			\begin{enumerate}
-				<xsl:apply-templates select="item" mode="normal"/>
+				<xsl:apply-templates select="item" mode="normal" />
 			\end{enumerate}
 			
 		</latex>
 		<html>
 			<OL>
-				<xsl:apply-templates select="item" mode="normal"/>
+				<xsl:apply-templates select="item" mode="normal" />
 			</OL>
 		</html>
 	</template>
@@ -788,7 +788,7 @@
 	<template name="definition-list" match="definition-list|description-list|DL|dl">
 		<latex>
 			\begin{description}
-				<xsl:apply-templates select="item" mode="definition-list"/>
+				<xsl:apply-templates select="item" mode="definition-list" />
 			\end{description}
 			
 		</latex>
@@ -803,14 +803,14 @@
 				<description-list>. The clever details are handled in
 				the "definition-item" template.
 			-->
-			<xsl:apply-templates select="item" mode="definition-list"/>
+			<xsl:apply-templates select="item" mode="definition-list" />
 		</html>
 	</template>
 
 
 	<!-- List elements -->
 	<template name="list-item" match="item" mode="normal">
-		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
+		<latex><xsl:text>\item </xsl:text><xsl:apply-templates /></latex>
 		<html>
 			<xsl:choose>
 				<!--
@@ -819,14 +819,14 @@
 					let them worry about inserting the <P> tags.
 				-->
 				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
-					<LI><xsl:apply-templates/></LI>
+					<LI><xsl:apply-templates /></LI>
 				</xsl:when>
 				<!--
 					Otherwise, insert <P> tags surrounding the item content
 					so that the item spacing looks OK.
 				-->
 				<xsl:otherwise>
-					<LI><P><xsl:apply-templates/></P></LI>
+					<LI><P><xsl:apply-templates /></P></LI>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -835,9 +835,9 @@
 	<template name="definition-item" match="item" mode="definition-list">
 		<latex>
 			<xsl:text>\item[</xsl:text>
-			<xsl:apply-templates select="keyword|term|topic|DT|dt"/>
+			<xsl:apply-templates select="keyword|term|topic|DT|dt" />
 			<xsl:text>] </xsl:text>
-			<xsl:apply-templates select="definition|description|discourse|DD|dd"/>
+			<xsl:apply-templates select="definition|description|discourse|DD|dd" />
 		</latex>
 		<html>
 			<!--
@@ -879,9 +879,9 @@
 				-->
 				<xsl:when test="not(name(child::node()[2]/node()[1]))">
 					<P CLASS="definition1">
-						<xsl:apply-templates select="child::node()[1]"/>
+						<xsl:apply-templates select="child::node()[1]" />
 						<xsl:text> </xsl:text>
-						<xsl:apply-templates select="child::node()[2]"/>
+						<xsl:apply-templates select="child::node()[2]" />
 					</P>
 				</xsl:when>
 				<!--
@@ -898,9 +898,9 @@
 				-->
 				<xsl:when test="child::node()[2]/child::node()[1][self::p] or child::node()[2]/child::node()[1][self::paragraph]">
 					<P CLASS="definition1">
-						<xsl:apply-templates select="child::node()[1]"/>
+						<xsl:apply-templates select="child::node()[1]" />
 						<xsl:text> </xsl:text>
-						<xsl:apply-templates select="child::node()[2]/child::node()[1]/node()"/>
+						<xsl:apply-templates select="child::node()[2]/child::node()[1]/node()" />
 					</P>
 					<xsl:apply-templates select="child::node()[2]/*[position() > 1]">
 						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
@@ -919,7 +919,7 @@
 				-->
 				<xsl:otherwise>
 					<P CLASS="definition1">
-						<xsl:apply-templates select="child::node()[1]"/>
+						<xsl:apply-templates select="child::node()[1]" />
 					</P>
 					<xsl:apply-templates select="child::node()[2]/node()">
 						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
@@ -934,8 +934,8 @@
 		a standalone element.
 	-->
 	<template name="keyword" match="item/keyword|item/term|item/topic|item/DT|item/dt">
-		<latex><xsl:apply-templates/></latex>
-		<html><STRONG><xsl:apply-templates/></STRONG></html>
+		<latex><xsl:apply-templates /></latex>
+		<html><STRONG><xsl:apply-templates /></STRONG></html>
 	</template>
 	
 	
@@ -944,7 +944,7 @@
 		used within <image>.
 	-->
 	<template name="definition" match="item/definition|item/description|item/discourse|item/DD|item/dd">
-		<common><xsl:apply-templates/></common>
+		<common><xsl:apply-templates /></common>
 	</template>
 
 
@@ -956,7 +956,7 @@
 		ends up embedded inside <P>...</P>, which is invalid.
 	-->
 	<template name="question" match="question">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<xsl:choose>
 				<!--
@@ -965,13 +965,13 @@
 					<P> tags.
 				-->
 				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</xsl:when>
 				<!--
 					Otherwise, insert <P> tags surrounding the question content.
 				-->
 				<xsl:otherwise>
-					<P><xsl:apply-templates/></P>
+					<P><xsl:apply-templates /></P>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -996,7 +996,7 @@
 			-->
 			<xsl:if test="$showanswers='yes'">
 			\begin{answer}
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			\end{answer}
 
 			</xsl:if>
@@ -1004,7 +1004,7 @@
 		<html>
 			<xsl:if test="$showanswers='yes'">
 				<DIV CLASS="answer">
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</DIV>
 			</xsl:if>
 		</html>
@@ -1013,7 +1013,7 @@
 	<!--
 		Match hidden answers and do nothing.
 	-->
-	<template name="hidden-answer" match="answer[@hide='yes']"/>
+	<template name="hidden-answer" match="answer[@hide='yes']" />
 
 	
 	<!--
@@ -1027,35 +1027,35 @@
 		<latex>
 			<xsl:apply-templates>
 				<xsl:with-param name="label">
-					<xsl:value-of select="@label"/>
+					<xsl:value-of select="@label" />
 					<xsl:if test="not(@label)">THERE_IS_NO_LABEL</xsl:if>
 				</xsl:with-param>
 			</xsl:apply-templates>
 		</latex>
 		<html>
 			<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</html>
 	</template>
 	
 	
 	<!-- Footnotes. -->
 	<template name="footnote" match="footnote">
-		<latex>\footnote{<xsl:apply-templates/>}</latex>
+		<latex>\footnote{<xsl:apply-templates />}</latex>
 		<html>
 			<A>
 				<xsl:attribute name="NAME">
 					<xsl:text>footnote-</xsl:text>
-					<xsl:number level="any" count="footnote"/>
+					<xsl:number level="any" count="footnote" />
 					<xsl:text>-source</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="HREF">
 					<xsl:text>#footnote-</xsl:text>
-					<xsl:number level="any" count="footnote"/>
+					<xsl:number level="any" count="footnote" />
 					<xsl:text>-target</xsl:text>
 				</xsl:attribute>
 				<xsl:text>[</xsl:text>
-				<xsl:number level="any" count="footnote"/>
+				<xsl:number level="any" count="footnote" />
 				<xsl:text>]</xsl:text>
 			</A>
 		</html>
@@ -1068,21 +1068,23 @@
 				<A>
 					<xsl:attribute name="NAME">
 						<xsl:text>footnote-</xsl:text>
-						<xsl:number level="any" count="footnote"/>
+						<xsl:number level="any" count="footnote" />
 						<xsl:text>-target</xsl:text>
 					</xsl:attribute>
-					<xsl:text>[</xsl:text>
-					<xsl:number level="any" count="footnote"/>
-					<xsl:text>]</xsl:text>
+					<SUP>
+						<xsl:text>[</xsl:text>
+						<xsl:number level="any" count="footnote" />
+						<xsl:text>]</xsl:text>
+					</SUP>
 				</A>
 				<xsl:text> </xsl:text>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 				<xsl:text> </xsl:text>
 				<!-- Provide a back link to the original footnote marker. -->
 				<A>
 					<xsl:attribute name="HREF">
 						<xsl:text>#footnote-</xsl:text>
-						<xsl:number level="any" count="footnote"/>
+						<xsl:number level="any" count="footnote" />
 						<xsl:text>-source</xsl:text>
 					</xsl:attribute>
 					<xsl:text>[Back]</xsl:text>
@@ -1094,22 +1096,22 @@
 	
 	<!-- Document preamble stuff: title, author, date. -->
 	<template name="preamble-title" match="document/title" mode="preamble">
-		<latex>\title{<xsl:apply-templates/>}</latex>
+		<latex>\title{<xsl:apply-templates />}</latex>
 		<!--
 			For HTML, strip out any formatting (e.g., emphasis), as this
 			is not interpreted within the <TITLE> tag, resulting in raw
 			HTML markup in the window title. Ick. We do this by just
 			grabbing the values of all descendant text nodes.
 		-->
-		<html><xsl:value-of select="."/></html>
+		<html><xsl:value-of select="." /></html>
 	</template>
 
 	<template name="preamble-author" match="document/author" mode="preamble">
-		<latex>\author{<xsl:apply-templates/>}</latex>
+		<latex>\author{<xsl:apply-templates />}</latex>
 	</template>
 
 	<template name="preamble-date" match="document/date" mode="preamble">
-		<latex>\date{<xsl:apply-templates/>}</latex>
+		<latex>\date{<xsl:apply-templates />}</latex>
 	</template>
 
 	<template name="document-title" match="document/title">
@@ -1117,29 +1119,29 @@
 		<latex>
 			<!-- Under the LaTeX framework, the rest of the chapter title text is generated by LaTeX macros, so this is pretty simple. -->
 			<!-- I think this is broken? -->
-			<xsl:if test="/document/@standalone = 'yes'"><xsl:apply-templates/></xsl:if>
+			<xsl:if test="/document/@standalone = 'yes'"><xsl:apply-templates /></xsl:if>
 		</latex>
 		<html>
 			<H1>
 				<xsl:choose>
 					<xsl:when test="/document/@class = 'tutorial'">
 						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
-						<xsl:call-template name="PaperCode"/>
+						<xsl:call-template name="PaperCode" />
 						<xsl:text> Tutorial </xsl:text>
-						<xsl:value-of select="/document/@sequence-number"/>
+						<xsl:value-of select="/document/@sequence-number" />
 						<xsl:text>: </xsl:text>
-						<BR/>
+						<BR />
 					</xsl:when>
 					<xsl:when test="/document/@class = 'laboratory'">
 						<xsl:if test="$showanswers='yes'">Selected Answers for </xsl:if>
-						<xsl:call-template name="PaperCode"/>
+						<xsl:call-template name="PaperCode" />
 						<xsl:text> Lab </xsl:text>
-						<xsl:value-of select="/document/@sequence-number"/>
+						<xsl:value-of select="/document/@sequence-number" />
 						<xsl:text>: </xsl:text>
-						<BR/>
+						<BR />
 					</xsl:when>
 				</xsl:choose>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</H1>
 		</html>
 	</template>
@@ -1147,25 +1149,25 @@
 	<!-- New template for tutorials and labs, which are essentially chapters when included in a course book, but are marked up as documents in themselves. -->
 	<template name="chapter-title" match="document/title" mode="chapter">
 		<latex>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</latex>
 		<html>
 			<xsl:choose>
 				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode" /> Tutorial <xsl:value-of select="/document/@sequence-number" /><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR /><xsl:apply-templates /></H1>
 				</xsl:when>
 				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode" /> Lab <xsl:value-of select="/document/@sequence-number" /><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR /><xsl:apply-templates /></H1>
 				</xsl:when>
 				<xsl:otherwise>
-					<H1><xsl:apply-templates/></H1>
+					<H1><xsl:apply-templates /></H1>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
 	</template>
 	
-	<template name="document-author" match="document/author"/>
-	<template name="document-date" match="document/date"/>
+	<template name="document-author" match="document/author" />
+	<template name="document-date" match="document/date" />
 
 	<!--
 		Generate some number of "sub"s so we can produce, e.g.,
@@ -1181,7 +1183,7 @@
 			<xsl:if test="$depth &gt; 1">
 				<xsl:text>sub</xsl:text>
 				<xsl:call-template name="generate-subs">
-					<xsl:with-param name="depth"><xsl:value-of select="$depth - 1"/></xsl:with-param>
+					<xsl:with-param name="depth"><xsl:value-of select="$depth - 1" /></xsl:with-param>
 				</xsl:call-template>
 			</xsl:if>
 		</latex>
@@ -1190,32 +1192,32 @@
 	<!-- Generate section title with nested numbering, e.g., 1.1.3. -->
 	<template name="section-title" match="section/title">
 		<latex>
-			<xsl:param name="label"/>
+			<xsl:param name="label" />
 			<xsl:text>\</xsl:text>
 			<!-- Generate the correct number of "sub"s for LaTeX. -->
 			<xsl:call-template name="generate-subs">
 				<xsl:with-param name="depth">
-					<xsl:number value="count(ancestor::section)"/>
+					<xsl:number value="count(ancestor::section)" />
 					<xsl:if test="count(ancestor::section) &gt; 3">3</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:text>section{</xsl:text>
-			<xsl:apply-templates/><xsl:text>}</xsl:text>
+			<xsl:apply-templates /><xsl:text>}</xsl:text>
 			<xsl:if test="$label != 'THERE_IS_NO_LABEL'">
-				\label{<xsl:value-of select="$label"/>}
+				\label{<xsl:value-of select="$label" />}
 			</xsl:if>
 		</latex>
 		<html>
 			<!-- The depth is used in a couple of places, so we pre-calculate it. -->
 			<xsl:variable name="depth">
-				<xsl:number value="1 + count(ancestor::section)"/>
+				<xsl:number value="1 + count(ancestor::section)" />
 				<xsl:if test="1 + count(ancestor::section) &gt; 6">6</xsl:if>
 			</xsl:variable>
-			<xsl:text disable-output-escaping="yes">&lt;H</xsl:text><xsl:number value="$depth"/><xsl:text disable-output-escaping="yes">&gt;</xsl:text>
-			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1"/>
+			<xsl:text disable-output-escaping="yes">&lt;H</xsl:text><xsl:number value="$depth" /><xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1" />
 			<xsl:text> </xsl:text>
-			<xsl:apply-templates/>
-			<xsl:text disable-output-escaping="yes">&lt;/H</xsl:text><xsl:number value="$depth"/><xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+			<xsl:apply-templates />
+			<xsl:text disable-output-escaping="yes">&lt;/H</xsl:text><xsl:number value="$depth" /><xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 		</html>
 	</template>
 
@@ -1233,21 +1235,21 @@
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
 					<xsl:text>\begin{flush</xsl:text>
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="@align" />
 					<xsl:text>}\itshape </xsl:text>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:text>\end{flush</xsl:text>
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="@align" />
 					<xsl:text>}</xsl:text>
 				</xsl:when>
 				<xsl:when test="(@align = 'center') or (@align = 'centre')">
 					<xsl:text>\begin{center}\itshape </xsl:text>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:text>\end{center}</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:text>\begin{quote}\itshape </xsl:text>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:text>\end{quote}</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
@@ -1257,10 +1259,10 @@
 			<P>
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
-						<xsl:value-of select="@align"/>
+						<xsl:value-of select="@align" />
 					</xsl:attribute>
 				</xsl:if>
-				<I><xsl:apply-templates/></I>
+				<I><xsl:apply-templates /></I>
 			</P>
 		</html>
 	</template>
@@ -1283,13 +1285,13 @@
 	<!--
 		Anything inside an <omit> is also ignored completely.
 	-->
-	<template name="omit" match="omit"/>
+	<template name="omit" match="omit" />
 
 	<!--
 		...and the legacy id tags inside figures.
 	-->
-	<template match="figure/id"/>
-	<template match="figure/label"/>
+	<template match="figure/id" />
+	<template match="figure/label" />
 
 	
 	<!--
@@ -1299,13 +1301,13 @@
 		<latex>
 			<xsl:text>
 \begin{comment}</xsl:text>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 				<xsl:text>\end{comment}
 </xsl:text>
 		</latex>
 		<html>
 			<xsl:comment>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</xsl:comment>
 		</html>
 	</template>
@@ -1344,7 +1346,7 @@
 				<xsl:text>\begin{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -1356,14 +1358,14 @@
 			<!-- tabular rotation -->
 			<xsl:if test="@rotate">
 				<xsl:text>\rotatebox{</xsl:text>
-				<xsl:value-of select="@rotate"/>
+				<xsl:value-of select="@rotate" />
 				<xsl:text>}{</xsl:text>
 			</xsl:if>
 
 			<!-- tabular scaling -->
 			<xsl:if test="@scale">
 				<xsl:text>\scalebox{</xsl:text>
-				<xsl:value-of select="@scale"/>
+				<xsl:value-of select="@scale" />
 				<xsl:text>}{</xsl:text>
 			</xsl:if>
 
@@ -1371,15 +1373,15 @@
 			<!-- vertical alignment -->
 			<xsl:if test="@valign = 'top' or @valign = 'bottom'">
 				<xsl:text>[</xsl:text>
-				<xsl:value-of select="substring(@valign, 1, 1)"/>
+				<xsl:value-of select="substring(@valign, 1, 1)" />
 				<xsl:text>]</xsl:text>
 			</xsl:if>
 			<xsl:text>{</xsl:text>
-			<xsl:apply-templates select="tabular-columns"/>
+			<xsl:apply-templates select="tabular-columns" />
 			<xsl:text>}</xsl:text>
-				<xsl:apply-templates select="tabular-header"/>
-				<xsl:apply-templates select="tabular-body"/>
-				<xsl:apply-templates select="tabular-footer"/>
+				<xsl:apply-templates select="tabular-header" />
+				<xsl:apply-templates select="tabular-body" />
+				<xsl:apply-templates select="tabular-footer" />
 			<xsl:text>\end{tabular}</xsl:text>
 
 			<xsl:if test="@scale"><xsl:text>}</xsl:text></xsl:if>
@@ -1390,7 +1392,7 @@
 				<xsl:text>\end{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -1407,21 +1409,21 @@
 		<html>
 			<TABLE>
 				<xsl:attribute name="BORDER">
-					<xsl:value-of select="@border"/>
+					<xsl:value-of select="@border" />
 					<xsl:if test="not(@border)">0</xsl:if>
 				</xsl:attribute>
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
-						<xsl:value-of select="@align"/>
+						<xsl:value-of select="@align" />
 					</xsl:attribute>
 				</xsl:if>
 				<!--
 					Note different ordering of tabular components:
 					HTML requires THEAD and TFOOT to precede TBODY.
 				-->
-				<xsl:apply-templates select="tabular-header"/>
-				<xsl:apply-templates select="tabular-footer"/>
-				<xsl:apply-templates select="tabular-body"/>
+				<xsl:apply-templates select="tabular-header" />
+				<xsl:apply-templates select="tabular-footer" />
+				<xsl:apply-templates select="tabular-body" />
 			</TABLE>
 		</html>
 	</template>
@@ -1449,43 +1451,43 @@
 	-->
 	<template name="aligned-tabular-column" match="tabular-columns/column[@align]">
 		<latex>
-			<xsl:value-of select="@left-border"/>
-			<xsl:value-of select="substring(@align, 1, 1)"/>
-			<xsl:value-of select="@right-border"/>
+			<xsl:value-of select="@left-border" />
+			<xsl:value-of select="substring(@align, 1, 1)" />
+			<xsl:value-of select="@right-border" />
 		</latex>
 	</template>
 
 	<template name="unaligned-tabular-column" match="tabular-columns/column[not(@align)]">
 		<latex>
-			<xsl:value-of select="@left-border"/>
+			<xsl:value-of select="@left-border" />
 			<xsl:text>l</xsl:text>
-			<xsl:value-of select="@right-border"/>
+			<xsl:value-of select="@right-border" />
 		</latex>
 	</template>
 	
 	<template name="tabular-header" match="tabular-header">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<THEAD>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</THEAD>
 		</html>
 	</template>
 
 	<template name="tabular-footer" match="tabular-footer">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<TFOOT>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</TFOOT>
 		</html>
 	</template>
 
 	<template name="tabular-body" match="tabular-body">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<TBODY>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</TBODY>
 		</html>
 	</template>
@@ -1495,7 +1497,7 @@
 	-->
 	<template name="row" match="row">
 		<latex>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<!-- TODO: Don't put a \\ on the last row of a tabular. -->
 			<xsl:text> \\</xsl:text>
 			<xsl:if test="@no-page-break = 'yes'">*</xsl:if>
@@ -1504,9 +1506,9 @@
 		<html>
 			<TR>
 				<xsl:if test="@valign">
-					<xsl:attribute name="VALIGN"><xsl:value-of select="@valign"/></xsl:attribute>
+					<xsl:attribute name="VALIGN"><xsl:value-of select="@valign" /></xsl:attribute>
 				</xsl:if>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</TR>
 		</html>
 	</template>
@@ -1523,7 +1525,7 @@
 	</template>
 
 	<template name="row-rule-partial" match="row-rule[@columns]">
-		<latex>\cline{<xsl:value-of select="@columns"/>}</latex>
+		<latex>\cline{<xsl:value-of select="@columns" />}</latex>
 	</template>
 	
 	<!--
@@ -1547,7 +1549,7 @@
 	<template name="multirow-cell" match="cell" mode="latex-multi-row">
 		<latex>
 			<xsl:text>\multirow{</xsl:text>
-			<xsl:value-of select="@rows"/>
+			<xsl:value-of select="@rows" />
 			<xsl:text>}{*}{</xsl:text>
 			<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
 
@@ -1556,7 +1558,7 @@
 				<xsl:text>\begin{tabular}{@{}</xsl:text>
 				<xsl:choose>
 					<xsl:when test="@align">
-						<xsl:value-of select="substring(@align, 1, 1)"/>
+						<xsl:value-of select="substring(@align, 1, 1)" />
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:text>l</xsl:text>
@@ -1565,7 +1567,7 @@
 				<xsl:text>@{}}</xsl:text>
 			</xsl:if>
 
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 
 			<xsl:if test="count(child::br) != 0">
 				<xsl:text>\end{tabular}
@@ -1586,22 +1588,22 @@
 		<latex>
 			<xsl:param name="num-columns">1</xsl:param>
 			<xsl:text>\multicolumn{</xsl:text>
-			<xsl:value-of select="$num-columns"/>
+			<xsl:value-of select="$num-columns" />
 			<xsl:text>}{</xsl:text>
-			<xsl:value-of select="@left-border"/>
+			<xsl:value-of select="@left-border" />
 			<xsl:choose>
 				<xsl:when test="@align">
-					<xsl:value-of select="substring(@align, 1, 1)"/>
+					<xsl:value-of select="substring(@align, 1, 1)" />
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:text>l</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
-			<xsl:value-of select="@right-border"/>
+			<xsl:value-of select="@right-border" />
 			<xsl:text>}{</xsl:text>
 			<xsl:choose>
 				<xsl:when test="@rows">
-					<xsl:apply-templates select="." mode="multi-row"/>
+					<xsl:apply-templates select="." mode="multi-row" />
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
@@ -1611,7 +1613,7 @@
 						<xsl:text>\begin{tabular}{@{}</xsl:text>
 						<xsl:choose>
 							<xsl:when test="@align">
-								<xsl:value-of select="substring(@align, 1, 1)"/>
+								<xsl:value-of select="substring(@align, 1, 1)" />
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:text>l</xsl:text>
@@ -1620,7 +1622,7 @@
 						<xsl:text>@{}}</xsl:text>
 					</xsl:if>
 
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 
 					<xsl:if test="count(child::br) != 0">
 						<xsl:text>\end{tabular}
@@ -1643,7 +1645,7 @@
 	<template match="cell">
 		<common>
 			<!-- position() doesn't seem to work very well in this context. -->
-			<xsl:variable name="column-no"><xsl:number/></xsl:variable>
+			<xsl:variable name="column-no"><xsl:number /></xsl:variable>
 		</common>
 		<!--
 			Doing this sensibly for LaTeX is actually pretty ugly,
@@ -1657,14 +1659,14 @@
 			<xsl:choose>
 				<xsl:when test="@columns">
 					<xsl:apply-templates select="." mode="latex-multi-column">
-						<xsl:with-param name="num-columns" select="@columns"/>
+						<xsl:with-param name="num-columns" select="@columns" />
 					</xsl:apply-templates>
 				</xsl:when>
 				<xsl:when test="@align">
-					<xsl:apply-templates select="." mode="latex-multi-column"/>
+					<xsl:apply-templates select="." mode="latex-multi-column" />
 				</xsl:when>
 				<xsl:when test="@rows">
-					<xsl:apply-templates select="." mode="latex-multi-row"/>
+					<xsl:apply-templates select="." mode="latex-multi-row" />
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
@@ -1674,7 +1676,7 @@
 						<xsl:text>\begin{tabular}{@{}</xsl:text>
 						<xsl:choose>
 							<xsl:when test="@align">
-								<xsl:value-of select="substring(@align, 1, 1)"/>
+								<xsl:value-of select="substring(@align, 1, 1)" />
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:text>l</xsl:text>
@@ -1683,7 +1685,7 @@
 						<xsl:text>@{}}</xsl:text>
 					</xsl:if>
 
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 
 					<xsl:if test="count(child::br) != 0">
 						<xsl:text>\end{tabular}
@@ -1712,25 +1714,25 @@
 			</xsl:variable>
 			<xsl:element name="{$celltype}">
 				<xsl:attribute name="ALIGN">
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="@align" />
 					<xsl:if test="not(@align)">
-						<xsl:value-of select="ancestor::tabular/tabular-columns/column[position() = $column-no]/@align"/>
+						<xsl:value-of select="ancestor::tabular/tabular-columns/column[position() = $column-no]/@align" />
 						<xsl:if test="not(ancestor::tabular/tabular-columns/column[position() = $column-no]/@align)">left</xsl:if>
 					</xsl:if>
 				</xsl:attribute>
 				<xsl:attribute name="VALIGN">
-					<xsl:value-of select="@valign"/>
+					<xsl:value-of select="@valign" />
 					<xsl:if test="not(@valign)">middle</xsl:if>
 				</xsl:attribute>
 				<xsl:attribute name="COLSPAN">
-					<xsl:value-of select="@columns"/>
+					<xsl:value-of select="@columns" />
 					<xsl:if test="not(@columns)">1</xsl:if>
 				</xsl:attribute>
 				<xsl:attribute name="ROWSPAN">
-					<xsl:value-of select="@rows"/>
+					<xsl:value-of select="@rows" />
 					<xsl:if test="not(@rows)">1</xsl:if>
 				</xsl:attribute>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</xsl:element>
 		</html>
 	</template>
@@ -1746,35 +1748,35 @@
 		provided, the URL is used as the link text. [optional]
 	-->
 	<template name="hyperlink-label" match="hyperlink[@label]">
-		<latex>\hyperref[<xsl:value-of select="@label"/>]{<xsl:apply-templates/>}</latex>
-		<html><A HREF="#{@label}"><xsl:apply-templates/></A></html>
+		<latex>\hyperref[<xsl:value-of select="@label" />]{<xsl:apply-templates />}</latex>
+		<html><A HREF="#{@label}"><xsl:apply-templates /></A></html>
 	</template>
 
 	<template name="hyperlink-url" match="hyperlink[@url and node()]">
-		<latex>\href{<xsl:value-of select="@url"/>}{<xsl:apply-templates/>}</latex>
-		<html><A HREF="{@url}"><xsl:apply-templates/></A></html>
+		<latex>\href{<xsl:value-of select="@url" />}{<xsl:apply-templates />}</latex>
+		<html><A HREF="{@url}"><xsl:apply-templates /></A></html>
 	</template>
 
 	<!-- Internal parameterised hyperlink template to be called by the likes of the empty Oracle documentation elements. -->
 	<template name="hyperlink-internal" match="hyperlink" mode="hyperlink-internal">
 		<common>
-			<xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="url"/>
-			<xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="label"/>
+			<xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="url" />
+			<xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="label" />
 		</common>
-		<latex>\href{<xsl:value-of select="$url"/>}{<xsl:apply-templates select="exsl:node-set($label)"/>}</latex>
-		<html><A HREF="{$url}"><xsl:apply-templates select="exsl:node-set($label)"/></A></html>
+		<latex>\href{<xsl:value-of select="$url" />}{<xsl:apply-templates select="exsl:node-set($label)" />}</latex>
+		<html><A HREF="{$url}"><xsl:apply-templates select="exsl:node-set($label)" /></A></html>
 	</template>
 
 	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
 		<!-- Note: not safe to use the url package here because \url{...} is fragile. -->
-		<latex>\href{<xsl:value-of select="@url"/>}{\texttt{<xsl:value-of select="@url"/>}}</latex>
-		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url"/></CODE></A></html>
+		<latex>\href{<xsl:value-of select="@url" />}{\texttt{<xsl:value-of select="@url" />}}</latex>
+		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url" /></CODE></A></html>
 	</template>
 
 	<template name="empty-hyperlink-url-internal" match="hyperlink" mode="empty-hyperlink-internal">
-		<common><xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="url"/></common>
-		<latex>\href{<xsl:value-of select="$url"/>}{\texttt{<xsl:value-of select="$url"/>}}</latex>
-		<html><A HREF="{$url}"><CODE><xsl:value-of select="$url"/></CODE></A></html>
+		<common><xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="url" /></common>
+		<latex>\href{<xsl:value-of select="$url" />}{\texttt{<xsl:value-of select="$url" />}}</latex>
+		<html><A HREF="{$url}"><CODE><xsl:value-of select="$url" /></CODE></A></html>
 	</template>
 
 	<!-- A plain URL (i.e., not necessarily a hyperlink). -->
@@ -1786,8 +1788,8 @@
 			with by the <hyperlink> templates), so we'll just use
 			\texttt{...}.
 		-->
-		<latex>\texttt{<xsl:apply-templates/>}</latex>
-		<html><CODE><xsl:apply-templates/></CODE></html>
+		<latex>\texttt{<xsl:apply-templates />}</latex>
+		<html><CODE><xsl:apply-templates /></CODE></html>
 	</template>
 	
 
@@ -1803,45 +1805,45 @@
 	<template name="reference" match="reference">
 		<common>
 			<!-- Find the element whose label is the same as our label. -->
-			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference"/>
+			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference" />
 		</common>
 	</template>
 	
 	<!-- Do a separate template for each type of reference; easier. -->
 	<template name="section-reference" match="section" mode="reference">
 		<!-- It's probably more consistent to just use \ref* and insert "Section" ourselves rather than let LaTeX do it. -->
-		<latex>Section~\ref*{<xsl:value-of select="@label"/>}</latex>
+		<latex>Section~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Section&amp;#160;</xsl:text>
-			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1"/>
+			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1" />
 		</html>
 	</template>
 	
 	<template name="figure-reference" match="figure" mode="reference">
-		<latex>Figure~\ref*{<xsl:value-of select="@label"/>}</latex>
+		<latex>Figure~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Figure&amp;#160;</xsl:text>
 			<xsl:choose>
 				<xsl:when test="$showanswers='yes'">
-					<xsl:number count="figure" level="any" format="1"/>
+					<xsl:number count="figure" level="any" format="1" />
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+					<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
 	</template>
 	
 	<template name="table-reference" match="table" mode="reference">
-		<latex>Table~\ref*{<xsl:value-of select="@label"/>}</latex>
+		<latex>Table~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Table&amp;#160;</xsl:text>
 			<xsl:choose>
 				<xsl:when test="$showanswers='yes'">
-					<xsl:number count="table" level="any" format="1"/>
+					<xsl:number count="table" level="any" format="1" />
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+					<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -1851,13 +1853,13 @@
 	<!-- Figures & tables (in the LaTeX sense, i.e., "floating" items). -->
 	<template name="figure" match="figure">
 		<latex>
-			\begin{figure}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement"/>]</xsl:if>
+			\begin{figure}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
 				\centering
-				<xsl:apply-templates select="*[not(self::caption)]"/>
+				<xsl:apply-templates select="*[not(self::caption)]" />
 				<xsl:if test="count(caption) != 0">
-					\caption{<xsl:apply-templates select="caption"/>}
-					<xsl:if test="@label">\label{<xsl:value-of select="@label"/>}</xsl:if>
-					<xsl:if test="count(id) != 0">\label{<xsl:value-of select="id"/>}</xsl:if>
+					\caption{<xsl:apply-templates select="caption" />}
+					<xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if>
+					<xsl:if test="count(id) != 0">\label{<xsl:value-of select="id" />}</xsl:if>
 				</xsl:if>
 			\end{figure}
 		</latex>
@@ -1866,10 +1868,10 @@
 				<CENTER>
 					<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
 					<xsl:if test="count(id) != 0"><A NAME="{id}"></A></xsl:if>
-					<xsl:apply-templates select="*[not(self::caption)]"/>
+					<xsl:apply-templates select="*[not(self::caption)]" />
 					<xsl:if test="count(caption) != 0">
-						<BR/>
-						<xsl:apply-templates select="caption"/>
+						<BR />
+						<xsl:apply-templates select="caption" />
 					</xsl:if>
 				</CENTER>
 			</DIV>
@@ -1878,12 +1880,12 @@
 	
 	<template name="table" match="table">
 		<latex>
-			\begin{table}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement"/>]</xsl:if>
+			\begin{table}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
 				\centering
-				<xsl:apply-templates select="*[not(self::caption)]"/>
+				<xsl:apply-templates select="*[not(self::caption)]" />
 				<xsl:if test="count(caption) != 0">
-					\caption{<xsl:apply-templates select="caption"/>}
-					<xsl:if test="@label">\label{<xsl:value-of select="@label"/>}</xsl:if>
+					\caption{<xsl:apply-templates select="caption" />}
+					<xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if>
 				</xsl:if>
 			\end{table}
 		</latex>
@@ -1891,10 +1893,10 @@
 			<DIV CLASS="table">
 				<CENTER>
 					<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
-					<xsl:apply-templates select="*[not(self::caption)]"/>
+					<xsl:apply-templates select="*[not(self::caption)]" />
 					<xsl:if test="count(caption) != 0">
-						<BR/>
-						<xsl:apply-templates select="caption"/>
+						<BR />
+						<xsl:apply-templates select="caption" />
 					</xsl:if>
 				</CENTER>
 			</DIV>
@@ -1906,21 +1908,21 @@
 			<xsl:for-each select="part">
 				\begin{table}[p]
 					\centering
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 					<xsl:if test="count(../caption) != 0">
 						<xsl:text>\caption{</xsl:text>
-						<xsl:apply-templates select="../caption"/>
+						<xsl:apply-templates select="../caption" />
 						<xsl:choose>
 							<xsl:when test="position() &gt; 1">
 								<xsl:text> \emph{(continued)}}</xsl:text>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:text> \emph{(continues over)}}</xsl:text>
-								<xsl:if test="../@label">\label{<xsl:value-of select="../@label"/>}</xsl:if>
+								<xsl:if test="../@label">\label{<xsl:value-of select="../@label" />}</xsl:if>
 							</xsl:otherwise>
 						</xsl:choose>
 						<!-- Consider the possibility of labels for each part? -->
-						<!-- <xsl:if test="@label">\label{<xsl:value-of select="@label"/>}</xsl:if> -->
+						<!-- <xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if> -->
 					</xsl:if>
 				\end{table}
 				\addtocounter{table}{-1}
@@ -1931,40 +1933,40 @@
 	</template>
 	
 	<template name="figure-caption" match="figure/caption">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<STRONG>
 				<xsl:text>Figure </xsl:text>
 				<xsl:choose>
 					<xsl:when test="$showanswers='yes'">
-						<xsl:number count="figure" level="any" format="1"/>
+						<xsl:number count="figure" level="any" format="1" />
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+						<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
 					</xsl:otherwise>
 				</xsl:choose>
 				<xsl:text>. </xsl:text>
 			</STRONG>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</html>
 	</template>
 	
 	<template name="table-caption" match="table/caption">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 		<html>
 			<STRONG>
 				<xsl:text>Table </xsl:text>
 				<xsl:choose>
 					<xsl:when test="$showanswers='yes'">
-						<xsl:number count="table" level="any" format="1"/>
+						<xsl:number count="table" level="any" format="1" />
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+						<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
 					</xsl:otherwise>
 				</xsl:choose>
 				<xsl:text>. </xsl:text>
 			</STRONG>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</html>
 	</template>
 	
@@ -1990,14 +1992,14 @@
 			<xsl:if test="count(latex-scaling) != 0">
 				<xsl:message terminate="no">&lt;latex-scaling&gt; element is deprecated in &lt;image&gt;; please use latex-options attribute instead.</xsl:message>
 				<xsl:text>[scale=</xsl:text>
-				<xsl:value-of select="latex-scaling"/>
+				<xsl:value-of select="latex-scaling" />
 				<xsl:text>]</xsl:text>
 			</xsl:if>
 			<!-- Adding general-purpose latex pass-through arguments for \includegraphics; this should eventually subsume the "scale"-only handler above. -->
 			<!-- If providing multiple arguments, these should be comma-separated in the source XML, but do not need the enclosing square brackets. -->
 			<xsl:if test="@latex-options">
 				<xsl:text>[</xsl:text>
-				<xsl:value-of select="@latex-options"/>
+				<xsl:value-of select="@latex-options" />
 				<xsl:text>]</xsl:text>
 			</xsl:if>
 			<xsl:text>{</xsl:text>
@@ -2005,22 +2007,22 @@
 				Work out the full path specification for the file
 				to be included = base-path + location (if specified) + basename.
 			-->
-			<xsl:value-of select="$base-path"/>
+			<xsl:value-of select="$base-path" />
 			<xsl:text>/</xsl:text>	
 			
 			<!-- Check whether the location attribute is included. -->
 			<xsl:if test="@location">
-				<xsl:value-of select="@location"/>
+				<xsl:value-of select="@location" />
 				<xsl:text>/</xsl:text>
 			</xsl:if>
 
 			<!-- need to phase out "basename" as an element and switch to using an attribute -->
 			<xsl:if test="count(basename) != 0">
 				<xsl:message terminate="no">&lt;basename&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
-				<xsl:value-of select="basename"/>
+				<xsl:value-of select="basename" />
 			</xsl:if>
 			<xsl:if test="@basename">
-				<xsl:value-of select="@basename"/>
+				<xsl:value-of select="@basename" />
 			</xsl:if>
 			<xsl:text>-print.</xsl:text>
 			
@@ -2028,13 +2030,13 @@
 			<xsl:choose>
 				<xsl:when test="count(format) != 0">
 					<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-					<xsl:value-of select="format"/>
+					<xsl:value-of select="format" />
 				</xsl:when>
 				<xsl:when test="@format">
-					<xsl:value-of select="@format"/>
+					<xsl:value-of select="@format" />
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="$image-format"/>
+					<xsl:value-of select="$image-format" />
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>}</xsl:text>
@@ -2042,7 +2044,7 @@
 	</template>
 	
 	<template name="normal-image" match="image[count(provide-large-version) = 0]">
-		<latex><xsl:apply-templates select="." mode="latex"/></latex>
+		<latex><xsl:apply-templates select="." mode="latex" /></latex>
 		<html>
 			<IMG CLASS="padded" BORDER="0">
 				<xsl:attribute name="SRC">
@@ -2050,39 +2052,39 @@
 						Work out the full path specification for the file
 						to be included = base-path + location (if specified) + basename.
 					-->
-					<xsl:value-of select="$base-path"/>
+					<xsl:value-of select="$base-path" />
 					<xsl:text>/</xsl:text>	
 					
 					<!-- Check whether the location attribute is included. -->
 					<xsl:if test="@location">
-						<xsl:value-of select="@location"/>
+						<xsl:value-of select="@location" />
 						<xsl:text>/</xsl:text>
 					</xsl:if>
 
-					<xsl:value-of select="basename|@basename"/>
+					<xsl:value-of select="basename|@basename" />
 					<xsl:text>-web.</xsl:text>
 
 					<xsl:choose>
 						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 						<xsl:when test="count(format) != 0">
 							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-							<xsl:value-of select="format"/>
+							<xsl:value-of select="format" />
 						</xsl:when>
 						<xsl:when test="@format">
-							<xsl:value-of select="@format"/>
+							<xsl:value-of select="@format" />
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="$image-format"/>
+							<xsl:value-of select="$image-format" />
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
-				<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
+				<xsl:attribute name="ALT"><xsl:apply-templates select="description" /></xsl:attribute>
 			</IMG>
 		</html>
 	</template>
 
 	<template name="zoomable-image" match="image[count(provide-large-version) != 0]">
-		<latex><xsl:apply-templates select="." mode="latex"/></latex>
+		<latex><xsl:apply-templates select="." mode="latex" /></latex>
 		<html>
 			<A>
 				<xsl:attribute name="HREF">
@@ -2090,29 +2092,29 @@
 						Work out the full path specification for the file
 						to be included = base-path + location (if specified) + basename.
 					-->
-					<xsl:value-of select="$base-path"/>
+					<xsl:value-of select="$base-path" />
 					<xsl:text>/</xsl:text>	
 					
 					<!-- Check whether the location attribute is included. -->
 					<xsl:if test="@location">
-						<xsl:value-of select="@location"/>
+						<xsl:value-of select="@location" />
 						<xsl:text>/</xsl:text>
 					</xsl:if>
 
-					<xsl:value-of select="basename|@basename"/>
+					<xsl:value-of select="basename|@basename" />
 					<xsl:text>-web-zoom.</xsl:text>
 					
 					<xsl:choose>
 						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 						<xsl:when test="count(format) != 0">
 							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-							<xsl:value-of select="format"/>
+							<xsl:value-of select="format" />
 						</xsl:when>
 						<xsl:when test="@format">
-							<xsl:value-of select="@format"/>
+							<xsl:value-of select="@format" />
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="$image-format"/>
+							<xsl:value-of select="$image-format" />
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
@@ -2122,37 +2124,37 @@
 							Work out the full path specification for the file
 							to be included = base-path + location (if specified) + basename.
 						-->
-						<xsl:value-of select="$base-path"/>
+						<xsl:value-of select="$base-path" />
 						<xsl:text>/</xsl:text>	
 						
 						<!-- Check whether the location attribute is included. -->
 						<xsl:if test="@location">
-							<xsl:value-of select="@location"/>
+							<xsl:value-of select="@location" />
 							<xsl:text>/</xsl:text>
 						</xsl:if>
 	
-						<xsl:value-of select="basename|@basename"/>
+						<xsl:value-of select="basename|@basename" />
 						<xsl:text>-web.</xsl:text>
 						
 						<xsl:choose>
 							<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 							<xsl:when test="count(format) != 0">
 								<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-								<xsl:value-of select="format"/>
+								<xsl:value-of select="format" />
 							</xsl:when>
 							<xsl:when test="@format">
-								<xsl:value-of select="@format"/>
+								<xsl:value-of select="@format" />
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:value-of select="$image-format"/>
+								<xsl:value-of select="$image-format" />
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="ALT">
-						<xsl:apply-templates select="description"/>
+						<xsl:apply-templates select="description" />
 					</xsl:attribute>
 				</IMG>
-				<BR CLEAR="right"/>
+				<BR CLEAR="right" />
 				<xsl:text>(Larger version)</xsl:text>
 			</A>
 		</html>
@@ -2200,20 +2202,20 @@
 				to be included = base-path + location + basename.
 			-->
 			<xsl:variable name="file">
-				<xsl:value-of select="$base-path"/>
+				<xsl:value-of select="$base-path" />
 				<xsl:text>/</xsl:text>			
 				<xsl:if test="@location">
-					<xsl:value-of select="@location"/>
+					<xsl:value-of select="@location" />
 					<xsl:text>/</xsl:text>
 				</xsl:if>
-				<xsl:value-of select="@basename"/>
+				<xsl:value-of select="@basename" />
 			</xsl:variable>
 		</common>
 		<html>
 			<DIV>
 				<xsl:attribute name="ALIGN">
 					<xsl:choose>
-						<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+						<xsl:when test="@align"><xsl:value-of select="@align" /></xsl:when>
 						<xsl:otherwise>LEFT</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
@@ -2223,19 +2225,19 @@
 					<xsl:attribute name="TYPE">
 						<xsl:text>text/</xsl:text>
 						<xsl:choose>
-							<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+							<xsl:when test="@type"><xsl:value-of select="@type" /></xsl:when>
 							<xsl:otherwise><xsl:text>html</xsl:text></xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="WIDTH">
 						<xsl:choose>
-							<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+							<xsl:when test="@width"><xsl:value-of select="@width" /></xsl:when>
 							<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="HEIGHT">
 						<xsl:choose>
-							<xsl:when test="@height"><xsl:value-of select="@height"/></xsl:when>
+							<xsl:when test="@height"><xsl:value-of select="@height" /></xsl:when>
 							<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
@@ -2252,7 +2254,7 @@
 				<xsl:text>verbatim</xsl:text>
 			</xsl:if>
 			<xsl:text>input{</xsl:text>
-			<xsl:value-of select="$file"/>
+			<xsl:value-of select="$file" />
 			<xsl:text>}</xsl:text>
 		</latex>
 	</template>
@@ -2267,15 +2269,15 @@
 	<template name="include-xml" match="include-document[@type='xml']">
 		<common>
 			<xsl:variable name="file">
-				<xsl:value-of select="$base-path"/>
+				<xsl:value-of select="$base-path" />
 				<xsl:text>/</xsl:text>
 				<xsl:if test="@location">
-					<xsl:value-of select="@location"/>
+					<xsl:value-of select="@location" />
 					<xsl:text>/</xsl:text>
 				</xsl:if>
-				<xsl:value-of select="@basename"/>
+				<xsl:value-of select="@basename" />
 			</xsl:variable>
-			<xsl:apply-templates select="document($file,/)"/>
+			<xsl:apply-templates select="document($file,/)" />
 		</common>
 	</template>
 	
@@ -2286,7 +2288,7 @@
 		the sub-elements within this, so this template is empty to prevent
 		unwanted stuff accidentally being included in the output.
 	-->
-	<template name="environment" match="environment"/>
+	<template name="environment" match="environment" />
 
 	<!--
 		Load a LaTeX package.
@@ -2294,7 +2296,7 @@
 		@options: Any arguments to the package. [optional]
 	-->
 	<template name="latex-package" match="latex-packages/package">
-		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options"/>]</xsl:if>{<xsl:value-of select="."/>}</latex>
+		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options" />]</xsl:if>{<xsl:value-of select="." />}</latex>
 	</template>
 		
 	<!--
@@ -2302,7 +2304,7 @@
 		counters, fonts, hyperref options, etc.
 	-->
 	<template name="latex-command" match="latex-commands/command">
-		<latex><xsl:value-of select="."/></latex>
+		<latex><xsl:value-of select="." /></latex>
 	</template>
 	
 
@@ -2321,10 +2323,10 @@
 		@options: The required document class options. [optional]
 	-->
 	<template name="latex-documentclass" match="latex-documentclass|documentclass">
-		<latex>\documentclass{<xsl:value-of select="."/>}</latex>
+		<latex>\documentclass{<xsl:value-of select="." />}</latex>
 	</template>
 	<template name="latex-documentclass-options" match="latex-documentclass[@options]|documentclass[@options]">
-		<latex>\documentclass[<xsl:value-of select="@options"/>]{<xsl:value-of select="."/>}</latex>
+		<latex>\documentclass[<xsl:value-of select="@options" />]{<xsl:value-of select="." />}</latex>
 	</template>
 	
 	<!--
@@ -2334,24 +2336,24 @@
 		standard defaults (a4paper, 12pt).
 	-->
 	<template name="latex-document-options" match="latex-document-options">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 	</template>
 	
 	
 	<!-- Sometimes we might need to embed raw code to handle something tricky. -->
 	<template name="raw-latex" match="raw-code[@format = 'latex']|raw-latex">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 	</template>
 		
 	<template name="raw-html" match="raw-code[@format = 'html']|raw-html">
-		<html><xsl:copy-of select="*"/></html>
+		<html><xsl:copy-of select="*" /></html>
 	</template>
 		
 	<!-- Generate a LaTeX \input{} macro. -->
 	<template name="latex-input" match="latex-input">
 		<latex>
 			<xsl:message>Use of latex-input is deprecated. Please use include-document instead.</xsl:message>
-			\input{<xsl:value-of select="."/>}
+			\input{<xsl:value-of select="." />}
 		</latex>
 	</template>
 
@@ -2366,11 +2368,11 @@
 		[required]
 	-->
 	<template name="process-when-latex" match="process-when[@format = 'latex']">
-		<latex><xsl:apply-templates/></latex>
+		<latex><xsl:apply-templates /></latex>
 	</template>
 	
 	<template name="process-when-html" match="process-when[@format = 'html']">
-		<html><xsl:apply-templates/></html>
+		<html><xsl:apply-templates /></html>
 	</template>
 	
 	
@@ -2384,13 +2386,13 @@
 			'display' display expression in its own paragraph
 	-->
 	<template name="math-inline" match="math|math[@style='inline']">
-		<latex>\(<xsl:apply-templates/>\)</latex>
-		<html><xsl:apply-templates/></html>
+		<latex>\(<xsl:apply-templates />\)</latex>
+		<html><xsl:apply-templates /></html>
 	</template>
 	
 	<template name="math-display" match="math[@style='display']">
-		<latex>\[<xsl:apply-templates/>\]</latex>
-		<html><P ALIGN="center"><xsl:apply-templates/></P></html>
+		<latex>\[<xsl:apply-templates />\]</latex>
+		<html><P ALIGN="center"><xsl:apply-templates /></P></html>
 	</template>
 
 	
@@ -2400,11 +2402,11 @@
 		<latex>
 			<xsl:text>\begin{eqnarray*}
 </xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:text>\end{eqnarray*}</xsl:text>
 		</latex>
 		<html>
-			<TABLE CLASS="equation" BORDER="0" ALIGN="CENTER"><xsl:apply-templates/></TABLE>
+			<TABLE CLASS="equation" BORDER="0" ALIGN="CENTER"><xsl:apply-templates /></TABLE>
 		</html>
 	</template>
 
@@ -2412,45 +2414,45 @@
 	<!-- Hmm, LaTeX uses "&" as separators: how do we know if there's another cell coming?  Ah, but the LaTeX eqnarray can have no more than three columns, so there's no need to generalise. -->
 	<template match="equation-array/row">
 		<latex>
-			<xsl:apply-templates select="left"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right"/><xsl:text>	\\
+			<xsl:apply-templates select="left" /><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle" /><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right" /><xsl:text>	\\
 \\
 </xsl:text>
 		</latex>
 		<html>
-			<TR><TD ALIGN="RIGHT"><xsl:apply-templates select="left"/></TD><TD ALIGN="CENTER"><xsl:apply-templates select="middle"/></TD><TD ALIGN="LEFT"><xsl:apply-templates select="right"/></TD></TR>
+			<TR><TD ALIGN="RIGHT"><xsl:apply-templates select="left" /></TD><TD ALIGN="CENTER"><xsl:apply-templates select="middle" /></TD><TD ALIGN="LEFT"><xsl:apply-templates select="right" /></TD></TR>
 		</html>
 	</template>
 	
 
 	<!-- Roman (upright) text inside math environments.  \mathrm sounds like it's probably more correct, but doesn't retain spaces (which \textup does). -->
 	<template name="math-text" match="text">
-		<latex>\textup{<xsl:apply-templates/>}</latex>
-		<html><xsl:apply-templates/></html>
+		<latex>\textup{<xsl:apply-templates />}</latex>
+		<html><xsl:apply-templates /></html>
 	</template>
 	
 	<!--
 		Calligraphic letters (upper case only for LaTeX).
 	-->
 	<template name="calligraphic-text" match="calligraphic|cursive">
-		<latex>\ensuremath{\mathcal{<xsl:apply-templates/>}}</latex>
-		<html><FONT FACE="cursive"><xsl:apply-templates/></FONT></html>
+		<latex>\ensuremath{\mathcal{<xsl:apply-templates />}}</latex>
+		<html><FONT FACE="cursive"><xsl:apply-templates /></FONT></html>
 	</template>
 	
 	<!-- Digit grouping separator character for large numbers.  SI conventions say this should be a space (but we could make it a comma if desired). -->
 	<template name="digit-group-separator" match="digit-group-separator|digitsep">
-		<html><xsl:call-template name="non-breaking-space"/></html>
+		<html><xsl:call-template name="non-breaking-space" /></html>
 		<latex><xsl:text>\,</xsl:text></latex>
 	</template>
 
 	<!-- Mathematical super- and subscript. -->
 	<template name="superscript-math" match="math//superscript">
-		<latex>\ensuremath{^{<xsl:apply-templates/>}}</latex>
-		<html><SUP><xsl:apply-templates/></SUP></html>
+		<latex>\ensuremath{^{<xsl:apply-templates />}}</latex>
+		<html><SUP><xsl:apply-templates /></SUP></html>
 	</template>
 	
 	<template name="subscript-math" match="math//subscript">
-		<latex>\ensuremath{_{<xsl:apply-templates/>}}</latex>
-		<html><SUB><xsl:apply-templates/></SUB></html>
+		<latex>\ensuremath{_{<xsl:apply-templates />}}</latex>
+		<html><SUB><xsl:apply-templates /></SUB></html>
 	</template>
 	
 	<!--
@@ -2574,23 +2576,23 @@
 		probably die horribly in LaTeX :) [required]
 	-->
 	<template name="log-like-function" match="function">
-		<latex>\ensuremath{\<xsl:value-of select="@name"/>}</latex>
-		<html><xsl:value-of select="@name"/></html>
+		<latex>\ensuremath{\<xsl:value-of select="@name" />}</latex>
+		<html><xsl:value-of select="@name" /></html>
 	</template>
 	
 	<!-- Any mathematical variable names. -->
 	<template name="math-variable" match="variable|var">
-		<latex>\ensuremath{\mathit{<xsl:apply-templates/>}}</latex>
-		<html><I><xsl:apply-templates/></I></html>
+		<latex>\ensuremath{\mathit{<xsl:apply-templates />}}</latex>
+		<html><I><xsl:apply-templates /></I></html>
 	</template>
 	
 	<!-- A displayed fraction. Is there a nicer way of doing this in HTML? -->
 	<template name="math-fraction" match="fraction">
-		<latex>\ensuremath{\frac{<xsl:apply-templates select="numerator"/>}{<xsl:apply-templates select="denominator"/>}}</latex>
+		<latex>\ensuremath{\frac{<xsl:apply-templates select="numerator" />}{<xsl:apply-templates select="denominator" />}}</latex>
 		<html>
-			<SUP><xsl:apply-templates select="numerator"/></SUP>
+			<SUP><xsl:apply-templates select="numerator" /></SUP>
 			<xsl:text disable-output-escaping="yes">&amp;#8260;</xsl:text>
-			<SUB><xsl:apply-templates select="denominator"/></SUB>
+			<SUB><xsl:apply-templates select="denominator" /></SUB>
 		</html>
 	</template>
 	
@@ -2602,18 +2604,18 @@
 	-->
 	<template name="paper" match="paper">
 		<common>
-			<xsl:apply-templates select="subject-code"/>
+			<xsl:apply-templates select="subject-code" />
 			<xsl:text> </xsl:text>
-			<xsl:apply-templates select="paper-number"/>
+			<xsl:apply-templates select="paper-number" />
 		</common>
 	</template>
 	
 	<template name="subject-code" match="paper/subject-code">
-		<common><xsl:apply-templates/></common>
+		<common><xsl:apply-templates /></common>
 	</template>
 		
 	<template name="paper-number" match="paper/paper-number">
-		<common><xsl:apply-templates/></common>
+		<common><xsl:apply-templates /></common>
 	</template>
 	
 	
@@ -2639,21 +2641,21 @@
 	<template name="multi-column" match="multi-column">
 		<latex>
 			<xsl:variable name="total-width">
-				<xsl:number value="1"/>
-				<xsl:if test="@width"><xsl:value-of select="@width"/></xsl:if>
+				<xsl:number value="1" />
+				<xsl:if test="@width"><xsl:value-of select="@width" /></xsl:if>
 			</xsl:variable>
 			<xsl:choose>
 				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
 				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
 				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
-				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace"/></xsl:when>
+				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace" /></xsl:when>
 			</xsl:choose>
 			\noindent
 			<xsl:if test="@align">
 				<xsl:text>\begin{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -2663,14 +2665,14 @@
 			</xsl:if>
 			<xsl:apply-templates>
 				<xsl:with-param name="default-width">
-					<xsl:number value="format-number($total-width div count(column),'0.00')"/>
+					<xsl:number value="format-number($total-width div count(column),'0.00')" />
 				</xsl:with-param>
 			</xsl:apply-templates>
 			<xsl:if test="@align">
 				<xsl:text>\end{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -2682,30 +2684,30 @@
 				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
 				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
 				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
-				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace"/></xsl:when>
+				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace" /></xsl:when>
 			</xsl:choose>
 		</latex>
 		<html>
 			<xsl:variable name="total-width">
-				<xsl:number value="100"/>
-				<xsl:if test="@width"><xsl:value-of select="@width * 100"/></xsl:if>
+				<xsl:number value="100" />
+				<xsl:if test="@width"><xsl:value-of select="@width * 100" /></xsl:if>
 			</xsl:variable>
-			<xsl:if test="@vspace"><BR/></xsl:if>
+			<xsl:if test="@vspace"><BR /></xsl:if>
 			<TABLE BORDER="0" WIDTH="{$total-width}%">
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
-						<xsl:value-of select="@align"/>
+						<xsl:value-of select="@align" />
 					</xsl:attribute>
 				</xsl:if>
 				<TR>
 					<xsl:apply-templates>
 						<xsl:with-param name="default-width">
-							<xsl:number value="round($total-width div count(column))"/>
+							<xsl:number value="round($total-width div count(column))" />
 						</xsl:with-param>
 					</xsl:apply-templates>
 				</TR>
 			</TABLE>
-			<xsl:if test="@vspace"><BR/></xsl:if>
+			<xsl:if test="@vspace"><BR /></xsl:if>
 		</html>
 	</template>
 	
@@ -2729,15 +2731,15 @@
 			<xsl:param name="default-width">1</xsl:param>
 			<xsl:text>\begin{minipage}{</xsl:text>
 			<xsl:choose>
-				<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$default-width"/></xsl:otherwise>
+				<xsl:when test="@width"><xsl:value-of select="@width" /></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$default-width" /></xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>\columnwidth}</xsl:text>
 			<xsl:if test="@align">
 				<xsl:text>\begin{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -2745,12 +2747,12 @@
 				</xsl:choose>
 				<xsl:text>}</xsl:text>
 			</xsl:if>
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 			<xsl:if test="@align">
 				<xsl:text>\end{</xsl:text>
 				<xsl:choose>
 					<xsl:when test="(@align = 'left') or (@align = 'right')">
-						<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+						<xsl:text>flush</xsl:text><xsl:value-of select="@align" />
 					</xsl:when>
 					<xsl:when test="(@align = 'center') or (@align = 'centre')">
 						<xsl:text>center</xsl:text>
@@ -2765,17 +2767,17 @@
 			<TD>
 				<xsl:attribute name="WIDTH">
 					<xsl:choose>
-						<xsl:when test="@width"><xsl:value-of select="@width * 100"/></xsl:when>
-						<xsl:otherwise><xsl:value-of select="$default-width"/></xsl:otherwise>
+						<xsl:when test="@width"><xsl:value-of select="@width * 100" /></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$default-width" /></xsl:otherwise>
 					</xsl:choose>
 					<xsl:text>%</xsl:text>
 				</xsl:attribute>
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
-						<xsl:value-of select="@align"/>
+						<xsl:value-of select="@align" />
 					</xsl:attribute>
 				</xsl:if>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</TD>
 		</html>
 	</template>
@@ -2787,15 +2789,82 @@
 	<template name="center" match="center|centering|centre|centring">
 		<latex>
 			\begin{center}
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			\end{center}
 		</latex>
 		<html>
 			<CENTER>
-				<xsl:apply-templates/>
+				<xsl:apply-templates />
 			</CENTER>
 		</html>
 	</template>
+	
+	
+	<!--
+		Simple numbered bibliographies and reference lists (equivalent
+		to LaTeX "plain" style biblipgraphies). We could go the whole
+		hog and try to do something BibTeX-like, but I can't be bothered
+		:)  This is essentially similar to manually creating a LaTeX
+		bibliography, so it's up to the writer to ensure that items are
+		correctly sorted and formatted. An important point to note is
+		that all items will be included, regardless of whether they are
+		cited or not. This should suffice for most of what we want to do
+		for teaching, though.
+		
+		@name: The name of the section as it should appear in print.
+		"References" is used if not specified.
+		
+	-->
+	<template name="bibliography" match="bibliography">
+		<latex>
+			<xsl:if test="@name">
+				\renewcommand{\refname}{<xsl:value-of select="@name" />}
+			</xsl:if>
+			\bibliographystyle{plain}
+			\begin{thebibliography}{99}
+			<xsl:apply-templates />
+			\end{thebibliography}
+		</latex>
+		<html>
+			<H1>
+				<xsl:value-of select="@name" />
+				<xsl:if test="not(@name)">References</xsl:if>
+			</H1>
+			<OL>
+				<xsl:apply-templates />
+			</OL>
+		</html>
+	</template>
+	
+	<!--
+		An item within a bibilography.
+		
+		@label: The unique label of the bibilography item, so it can
+		be cited. [REQUIRED]
+	-->
+	<template name="bibitem" match="bibliography/item">
+		<latex>\bibitem{<xsl:value-of select="@label" />} <xsl:apply-templates /></latex>
+		<html>
+			<LI><A NAME="{@label}"></A><xsl:apply-templates /></LI>
+		</html>
+	</template>
+	
+	<!--
+		A citation.
+		
+		@label: The unique label of the bibliography item. [REQUIRED]
+	-->
+	<template name="citation" match="cite">
+		<latex>\cite{<xsl:value-of select="@label" />}</latex>
+		<html>
+			<xsl:variable name="id">
+				<xsl:value-of select="@label" />
+			</xsl:variable>
+			<xsl:text> [</xsl:text>
+			<A HREF="#{@label}"><xsl:value-of select="1 + count(//bibliography/item[@label = $id]/preceding-sibling::*)" /></A>
+			<xsl:text>]</xsl:text>
+		</html>
+	</template>
 
 
 </stylesheet>
