diff --git a/format-master.xml b/format-master.xml
index 84882f1..38acd11 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -63,10 +63,14 @@
 	<template name="pi" match="pi">						<latex><xsl:text>{\pi}</xsl:text></latex>		<html><xsl:text>&#960;</xsl:text></html></template>
 	<template name="LaTeX" match="LaTeX">				<latex><xsl:text>{\latex}</xsl:text></latex>	<html><xsl:text>LaTeX</xsl:text></html></template>
 	<alias source="latex" target="LaTeX"/>
+	<!-- Could use \triangleright in LaTeX, but is there an equivalent in HTML? -->
+	<template name="menu-separator" match="menu-separator"><latex>$\rightarrow$</latex><html>&#8594;</html></template>
 
 	<!-- Special styles -->
 	<template name="emph" match="emph"><latex><xsl:text>\emph{</xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text></latex><html><EM><xsl:apply-templates/></EM></html></template>
 	<template name="italic" match="italic"><latex><xsl:text>\textit{</xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text></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></template>
+	<template name="bold" match="bold"><latex>\textbf{<xsl:apply-templates/>}</latex><html><B><xsl:apply-templates/></B></html></template>
 	<template name="quote" match="quote"><latex><xsl:text>``{</xsl:text><xsl:apply-templates/><xsl:text>}''</xsl:text></latex><html><xsl:text>&#8220;</xsl:text><xsl:apply-templates/><xsl:text>&#8221;</xsl:text></html></template>
 	<template name="term" match="term"><latex>\term<xsl:apply-templates/>}</latex><html><I CLASS="term"><xsl:apply-templates/></I></html></template>
 	<template name="foreign" match="foreign"><latex><xsl:text>\foreign{</xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text></latex><html><I CLASS="foreign"><xsl:apply-templates/></I></html></template>
@@ -192,7 +196,9 @@
 		for LaTeX.
 		
 		Parameter: $depth
-		Meaning: the number of repetitions (normally <= 2)
+		Meaning: the number of repetitions (0 <= $depth <= 2, but there's no
+		need to do bounds checking at the upper end, because that's already
+		dealt with in the "section-title" template below).
 	-->
 	<template name="generate-subs">
 		<latex>
@@ -227,7 +233,7 @@
 			<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:if test="count(ancestor::section) &gt; 2">2</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
 			<xsl:text>section</xsl:text>
@@ -280,10 +286,11 @@
 					<xsl:value-of select="@border"/>
 					<xsl:if test="not(@border)">0</xsl:if>
 				</xsl:attribute>
-				<xsl:attribute name="ALIGN">
-					<xsl:value-of select="@align"/>
-					<xsl:if test="not(@align)">left</xsl:if>
-				</xsl:attribute>
+				<xsl:if test="@align">
+					<xsl:attribute name="ALIGN">
+						<xsl:value-of select="@align"/>
+					</xsl:attribute>
+				</xsl:if>
 				<xsl:apply-templates/>
 			</TABLE>
 		</html>
@@ -332,28 +339,85 @@
 	</template>
 	
 	
-	<!-- Hyperlinks and references. -->
+	<!-- Hyperlinks. -->
 	<template name="hyperlink-label" match="hyperlink[@label]">
-		<latex></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]">
-		<latex></latex>
-		<html>
-			<A HREF="{@url}"><xsl:apply-templates/></A>
-		</html>
+	<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>
 	</template>
 
+	<!-- An empty <hyperlink> element with a URL defaults to the URL as the link text. -->
+	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
+		<!-- Maybe we should be using the url package and \url{...}? -->
+		<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. -->
+	<template name="url" match="url">
+		<!-- Maybe we should be using the url package and \url{...}? -->
+		<latex>\texttt{<xsl:value-of select="@url"/>}</latex>
+		<html><CODE><xsl:apply-templates/></CODE></html>
+	</template>
+	
+	<alias source="uri" target="url"/>
+	<alias source="email" target="url"/>
+	<alias source="email-address" target="url"/>
+
+	<!-- References. -->
 	<template name="reference" match="reference">
 		<latex></latex>
 		<html>
-			<xsl:text>this section</xsl:text>
-<!-- 			<xsl:value-of select="//*[@label=current()/@label]/name()"/> -->
-<!-- 			&#160; -->
-<!-- 			<xsl:value-of select="//*[@label=current()/@label]/position()"/> -->
+			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference"/>
+		</html>
+	</template>
+	
+	<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>
+		<html>Section&#160;<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>
+		<html>Figure&#160;<xsl:number count="figure" level="multiple" format="1"/></html>
+	</template>
+	
+	
+	<!-- Figures. -->
+	<template name="figure" match="figure">
+		<latex>
+			<!-- This should really be more generic, so it can handle figures without graphics.  That'll mean more templates...  Or perhaps do separate XML tags for different kinds of figure? -->
+			<!-- select="id" and select = "label" so it'll work with either -->
+			\begin{figure}
+				\centering
+				<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>
+			\end{figure}
+		</latex>
+		<html>
+			<DIV CLASS="figure">
+				<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
+				<xsl:apply-templates select="*[not(self::caption)]"/>
+				<xsl:if test="count(caption) != 0">
+					<br/>
+					<xsl:apply-templates select="caption"/>
+				</xsl:if>
+			</DIV>
+		</html>
+	</template>
+	
+	<template name="caption" match="caption">
+		<latex><xsl:apply-templates/></latex>
+		<html>
+			<P><STRONG>Figure <xsl:number count="figure" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/></P>
 		</html>
 	</template>
 
