diff --git a/format-master.xml b/format-master.xml
index fe17adc..4b96b3f 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -292,14 +292,17 @@
 				Hmm, <DL>s in HTML tend to come out with the spacing a
 				bit wrong (or maybe it's just my browser?). Might using
 				a table be better? Messy if the keyword is long,
-				though...
+				though, and you don't get a proper hanging indent...
+				
+				Maybe this is something thaty could be handled in CSS 
+				instead.
 			-->
-<!-- 			<DL> -->
-<!-- 				<xsl:apply-templates/> -->
-<!-- 			</DL> -->
-			<TABLE BORDER="0" CELLPADDING="10">
+			<DL>
 				<xsl:apply-templates/>
-			</TABLE>
+			</DL>
+<!-- 			<TABLE BORDER="0" CELLPADDING="10"> -->
+<!-- 				<xsl:apply-templates/> -->
+<!-- 			</TABLE> -->
 		</html>
 	</template>
 	
@@ -324,12 +327,12 @@
 	<template name="definition-item" match="definition-list/item">
 		<latex>\item[<xsl:apply-templates select="keyword"/>] <xsl:apply-templates select="definition"/></latex>
 		<html>
-<!-- 			<DT><P><xsl:apply-templates select="keyword"/></P></DT> -->
-<!-- 			<DD><xsl:apply-templates select="definition|description|discourse"/></DD> -->
-			<TR VALIGN="TOP">
-				<TD><P><xsl:apply-templates select="keyword"/></P></TD>
-				<TD><xsl:apply-templates select="definition|description|discourse"/></TD>
-			</TR>
+			<DT><P><xsl:apply-templates select="keyword"/></P></DT>
+			<DD><xsl:apply-templates select="definition|description|discourse"/></DD>
+<!-- 			<TR VALIGN="TOP"> -->
+<!-- 				<TD><P><xsl:apply-templates select="keyword"/></P></TD> -->
+<!-- 				<TD><xsl:apply-templates select="definition|description|discourse"/></TD> -->
+<!-- 			</TR> -->
 		</html>
 	</template>
 	
@@ -371,6 +374,62 @@
 		<html>
 			<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
 			<xsl:apply-templates/>
+			<xsl:if test="count(.//footnote) &gt; 0">
+				<P><STRONG>Notes:</STRONG></P>
+				<xsl:apply-templates select=".//footnote" mode="list"/>
+			</xsl:if>
+		</html>
+	</template>
+	
+	
+	<!-- Footnotes. -->
+	<template name="footnote" match="footnote">
+		<latex>\footnote{<xsl:apply-templates/>}</latex>
+		<html>
+			<A>
+				<xsl:attribute name="NAME">
+					<xsl:text>footnote-</xsl:text>
+					<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:text>-target</xsl:text>
+				</xsl:attribute>
+				<xsl:text>[</xsl:text>
+				<xsl:number level="any" count="footnote"/>
+				<xsl:text>]</xsl:text>
+			</A>
+		</html>
+	</template>
+
+	<!-- This is only required for HTML, as LaTeX does it all for you. -->
+	<template name="footnote-list" match="footnote" mode="list">
+		<html>
+			<P>
+				<A>
+					<xsl:attribute name="NAME">
+						<xsl:text>footnote-</xsl:text>
+						<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>
+				</A>
+				<xsl:text> </xsl:text>
+				<xsl:apply-templates/>
+				<xsl:text> </xsl:text>
+				<A>
+					<xsl:attribute name="HREF">
+						<xsl:text>#footnote-</xsl:text>
+						<xsl:number level="any" count="footnote"/>
+						<xsl:text>-source</xsl:text>
+					</xsl:attribute>
+					<xsl:text>[Back]</xsl:text>
+				</A>
+			</P>
 		</html>
 	</template>
 
@@ -929,33 +988,23 @@
 	
 	
 	<!--
-		Include another document into the current one. The @inline
-		attribute specifies whether the document is to be included
-		inline (note that this really only makes sense for HTML).
-		Possible values: yes, no (default no). If the document is not
-		inlined, then an appropriate link to the document is generated.
-		Inlined files must be document fragments, not standalone
-		documents!
+		Include another XML document into the current one. Including
+		LaTeX should be done using <latex-input>. Nothing for HTML
+		includes at present, although this may not actually be necessary
+		anyway given that HTML doesn't natively support this in the
+		first place. You're probably better off just generating a
+		separate document and linking to it.
 		
-		Currently somewhat broken. Needs more work.
-	 -->
-	<template name="include-noinline" match="include-document[not(@inline) or (@inline = 'no')]">
-		<latex>\input{<xsl:value-of select="@basename"/>}</latex>
-		<html>
-			<P><A>
-				<xsl:attribute name="HREF">
-					<xsl:value-of select="@baseurl"/>
-					<xsl:value-of select="@basename"/>
-					<xsl:text>.html</xsl:text>
-				</xsl:attribute>
-				<xsl:apply-templates/>
-			</A></P>
-		</html>
-	</template>
-
-	<template name="include-inline" match="include-document[@inline = 'yes']">
-		<latex>\input{<xsl:value-of select="@basename"/>}</latex>
-		<html><xsl:copy-of select="document(concat(@basename, '.html'))/html/body/*"/></html>
+		It's difficult to produce HTML fragments because the XSLT
+		processor seems to always generate a DOCTYPE when producing
+		HTML, whether you want it or not. Maybe you can turn this off?
+		
+		@file: Name of file to include. REQUIRED.
+	-->
+	<template name="include-xml" match="include-document">
+		<common>
+			<xsl:apply-templates select="document(@file)"/>
+		</common>
 	</template>
 	
 	
@@ -966,8 +1015,13 @@
 		file called "environment.xml"; you don't need to do anything for
 		this file to be loaded. Multiple configuration files may be
 		loaded, as long as they all have different names.
+		
+		You can also define environment entries inline by omitting
+		the file attribute.
+		
+		@file: Name of environment file. OPTIONAL.
 	-->
-	<template name="environment-file" match="environment[@file]">
+	<template name="environment" match="environment[@file]">
 		<xsl:apply-templates select="document(@file)/environment/*"/>
 	</template>
 	
@@ -989,5 +1043,98 @@
 		<html><xsl:copy-of select="*"/></html>
 	</template>
 		
+	<!-- Generate a LaTeX \input{} macro. -->
+	<template name="latex-input" match="latex-input">
+		<latex>\input{<xsl:value-of select="."/>}</latex>
+	</template>
+
+	
+	<!--
+		Conditional processing depending on the format.
+		
+		@format: the format under which this XML is to be processed.
+	-->
+	<template name="process-when-latex" match="process-when[@format = 'latex']">
+		<latex><xsl:apply-templates/></latex>
+	</template>
+	
+	<template name="process-when-html" match="process-when[@format = 'html']">
+		<html><xsl:apply-templates/></html>
+	</template>
+	
+	
+	<!--
+		Basic maths stuff. Anything more complicated is... complicated.
+		We should probably be using MathML, but we still have to mangle
+		it into HTML regardless.
+		
+		A <math> inside a <paragraph> is assumed to be inline, while a
+		<math> on its own is assumed to be displayed in its own paragraph.
+	-->
+	<template name="math-inline" match="paragraph//math|para//math|p//math">
+		<latex>\(<xsl:apply-templates/>\)</latex>
+		<html><xsl:apply-templates/></html>
+	</template>
+	
+	<template name="math-display" match="math">
+		<latex>\[<xsl:apply-templates/>\]</latex>
+		<html><P ALIGN="center"><xsl:apply-templates/></P></html>
+	</template>
+	
+	<!-- Super- and subscript. -->
+	<template name="superscript" match="math//superscript">
+		<latex>^{<xsl:apply-templates/>}</latex>
+		<html><SUP><xsl:apply-templates/></SUP></html>
+	</template>
+	
+	<template name="subscript" match="math//subscript">
+		<latex>_{<xsl:apply-templates/>}</latex>
+		<html><SUB><xsl:apply-templates/></SUB></html>
+	</template>
+	
+	<!-- Basic mathematical operators. -->
+	<template name="plus-operator" match="math//plus">
+		<common>+</common>
+	</template>
+	
+	<template name="minus-operator" match="math//minus">
+		<common>-</common>
+	</template>
+	
+	<template name="times-operator" match="math//times">
+		<latex>\times</latex>
+		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
+	</template>
+	
+	<template name="divide-operator" match="math//divide">
+		<common>/</common>
+	</template>
+	
+	<template name="equals-operator" match="math//equals">
+		<common> = </common>
+	</template>
+	
+	<!--
+		We'll assume the names used by LaTeX here, as they work out correct
+		anyway. There's actually nothing to stop you using any name you like,
+		except that it'll probably die horribly in LaTeX :)
+	-->
+	<template name="log-like-function" match="math//function">
+		<latex>\<xsl:value-of select="@name"/></latex>
+		<html><xsl:value-of select="@name"/></html>
+	</template>
+	
+	<!-- Any mathematical variable names. -->
+	<template name="math-variable" match="math//variable">
+		<latex><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="math//fraction">
+		<latex>\frac{<xsl:apply-templates select="numerator"/>}{<xsl:apply-templates select="denominator"/>}</latex>
+		<html><xsl:apply-templates select="numerator"/><BIG> / </BIG><xsl:apply-templates select="denominator"/></html>
+	</template>
+	
 
 </stylesheet>
