diff --git a/format-master.xml b/format-master.xml
index ffdba32..290d743 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -135,10 +135,53 @@
 		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html><LI><xsl:apply-templates/></LI></html>
 	</template>
+
 	
 	<!-- Sections, subsections, subsubsections, ... -->
 	<template name="section" match="section">
 		<latex>
+			<xsl:apply-templates/>
+		</latex>
+		<html>
+			<xsl:apply-templates/>
+		</html>
+	</template>
+
+	<!--
+		Generate some number of "sub" so we can produce, e.g., "subsubsection"
+		for LaTeX.
+		
+		Parameter: $depth
+		Meaning: the number of repetitions (normally <= 2)
+	-->
+	<template name="generate-subs">
+		<latex>
+			<xsl:param name="depth">0</xsl:param>
+			<xsl:if test="$depth &gt; 0">
+				<xsl:text>sub</xsl:text>
+				<xsl:call-template select="generate-subs">
+					<xsl:with-param><xsl:value-of select="$depth - 1"/></xsl:with-param>
+				</xsl:call-template>
+			</xsl:if>
+		</latex>
+	</template>
+	
+	<template name="window-title" match="document/title" mode="window-title">
+		<html>
+			<xsl:apply-templates/>
+		</html>
+	</template>
+
+	<template name="document-title" match="document/title">
+	<!-- Need to do something sensible for LaTeX here. -->
+<!-- 		<latex><xsl:apply-templates/></latex> -->
+		<html>
+			<H1><xsl:apply-templates/></H1>
+		</html>
+	</template>
+
+	<template name="section-title" match="section/title">
+		<latex>
 			<xsl:text>\</xsl:text>
 			<!-- Depth calculation for LaTeX hasn't been tested! -->
 			<xsl:call-template name="generate-subs">
@@ -148,41 +191,23 @@
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:text>section</xsl:text>
-			<xsl:apply-templates select="title"/><xsl:text>}
+			<xsl:apply-templates/><xsl:text>}
 
-</xsl:text><xsl:apply-templates select="section|paragraph|figure|itemised-list|enumerated-list"/></latex>
+</xsl:text></latex>
 		<html>
 			<xsl:variable name="depth">
 				<xsl:number value="1 + count(ancestor::section)"/>
-				<xsl:if test="1 + count(ancestor::section) > 6">6</xsl:if>
+				<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:apply-templates select="title"/>
-			<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 select="section|paragraph|figure|itemised-list|enumerated-list"/></html>
-	</template>
-
-	<template name="generate-subs">
-		<latex>
-			<xsl:param name="depth">0</xsl:param>
-			<xsl:if test="$depth > 0">
-				<xsl:text>sub</xsl:text>
-				<xsl:call-template select="generate-subs">
-					<xsl:with-param><xsl:value-of select="$depth - 1"/></xsl:with-param>
-				</xsl:call-template>
-			</xsl:if>
-		</latex>
-	</template>
-	
-	<template name="title" match="title">
-		<latex><xsl:apply-templates/></latex>
-		<html>
 			<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>
 		</html>
 	</template>
 
+
 	<!-- A quotation. -->
 	<template name="quotation" match="quotation">
 		<latex>\begin{flushright}\itshape <xsl:apply-templates/>\end{flushright}</latex>
@@ -190,5 +215,14 @@
 			<P align="right"><I><xsl:apply-templates/></I></P>
 		</html>
 	</template>
+	
+	
+	<!--
+		Anything inside an ID element is ignored completely. (More accurately,
+		we pick bits out of it manually as required; it's only ignored by
+		apply-templates.)
+	-->
+	<template name="id" match="id"/>
+
 
 </stylesheet>
