diff --git a/format-master.xml b/format-master.xml
index 4dfa695..0403e1b 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -135,15 +135,52 @@
 		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html><LI><xsl:apply-templates/></LI></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/>
+		</html>
+	</template>
 
 	<!-- Sections, subsections, subsubsections, ... -->
 	<template name="section" match="section">
-		<!-- Need to figure out depth of section! -->
-		<latex><xsl:text>
-\section{</xsl:text><xsl:apply-templates select="title"/><xsl:text>}
+		<latex>
+			<xsl:text>\</xsl:text>
+			<!-- Depth calculation for LaTeX hasn't been tested! -->
+			<xsl:call-template name="generate-subs">
+				<xsl:with-param name="depth">
+					<xsl:number value="count(ancestor::section)"/>
+					<xsl:if test="count(ancestor::section) > 2">2</xsl:if>
+				</xsl:with-param>
+			</xsl:call-template>
+			<xsl:text>section</xsl:text>
+			<xsl:apply-templates select="title"/><xsl:text>}
 
 </xsl:text><xsl:apply-templates select="section|paragraph|figure|itemised-list|enumerated-list"/></latex>
-		<html><H1><xsl:apply-templates select="title"/></H1><xsl:apply-templates select="section|paragraph|figure|itemised-list|enumerated-list"/></html>
+		<html>
+			<xsl:variable name="depth">
+				<xsl:number value="1 + count(ancestor::section)"/>
+				<xsl:if test="1 + count(ancestor::section) > 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>
 </stylesheet>
 
