diff --git a/format-master.xml b/format-master.xml
index e122c0d..18e08f7 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -47,7 +47,7 @@
 	<!-- Special characters (should maybe all be named, in case they need to be called explicitly with xsl:call-template) -->
 	<!-- I'd like to use the Unicode names for these; will look them up some time! -->
 	<template name="newline" match="newline">
-		<latex> \\</latex>
+		<latex><xsl:text> \\</xsl:text></latex>
 		<html><BR/></html>
 	</template>
 	
@@ -96,34 +96,34 @@
 	</template>
 
 	<template name="dollar" match="dollar">
-		<latex>\$</latex>
+		<latex>{\$}</latex>
 		<html>$</html>
 	</template>
 
 	<template name="percent-sign" match="percent-sign">
-		<latex>\%</latex>
+		<latex>{\%}</latex>
 		<html>%</html>
 	</template>
 
 	<template name="ampersand" match="ampersand">
-		<latex>\&amp;</latex>
+		<latex>{\&amp;}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text></html>
 	</template>
 
 	<template name="trademark-sign" match="trademark-sign">
-		<latex>\texttrademark</latex>
+		<latex>{\texttrademark}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8482;</xsl:text></html>
 	</template>
 	<alias source="trademark" target="trademark-sign"/>
 	<alias source="TM" target="trademark-sign"/>
 
 	<template name="copyright-sign" match="copyright-sign">
-		<latex>\copyright</latex>
+		<latex>{\copyright}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#169;</xsl:text></html>
 	</template>
 
 	<template name="degree-sign" match="degree-sign">
-		<latex>$^{\circ}$</latex>
+		<latex>\(^{\circ}\)</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
 	</template>
 	<alias source="degrees" target="degree-sign"/>
@@ -142,13 +142,13 @@
 	<!-- Can we use XSLT modes to deal with this? -->
 	<!-- Looks like a "yes": -->
 	<template name="pi-math" match="pi" mode="math">
-		<latex>\pi</latex>
+		<latex>{\pi}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
 	<!-- When not in math mode: -->
 	<template name="pi-normal" match="pi">
-		<latex>$\pi$</latex>
+		<latex>\(\pi\)</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
@@ -160,7 +160,7 @@
 
 	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
 	<template name="menu-separator" match="menu-separator">
-		<latex>$\triangleright$</latex>
+		<latex>\(\triangleright\)</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8594;</xsl:text></html>
 	</template>
 	<alias source="menusep" target="menu-separator"/>
@@ -200,6 +200,27 @@
 		<latex>\verb+<xsl:apply-templates/>+</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
+	
+	<!-- Non-maths super- and subscript. -->
+	<template name="superscript" match="superscript">
+		<latex>\(^{<xsl:apply-templates/>}\)</latex>
+		<html><SUP><xsl:apply-templates/></SUP></html>
+	</template>
+	
+	<template name="subscript" match="subscript">
+		<latex>\(_{<xsl:apply-templates/>}\)</latex>
+		<html><SUB><xsl:apply-templates/></SUB></html>
+	</template>
+	
+	<!--
+		Text that shouldn't be broken across a line (i.e., LaTeX \mbox).
+		Only really relevant for LaTeX because we can't control this in HTML.
+	-->
+	<template name="no-break" match="no-break">
+		<latex>\mbox{<xsl:apply-templates/>}</latex>
+		<html><xsl:apply-templates/></html>
+	</template>
+	<alias source="mbox" target="no-break"/>
 
 	<!-- We can decide later whether to use plain verbatim or listings. -->
 	<template name="code-block" match="code-block">
@@ -331,7 +352,7 @@
 	<template name="definition-list" match="definition-list">
 		<latex>
 			\begin{description}
-				<xsl:apply-templates/>
+				<xsl:apply-templates mode="definition-list"/>
 			\end{description}
 		</latex>
 		<html>
@@ -345,20 +366,19 @@
 				instead.
 			-->
 			<DL>
-				<xsl:apply-templates/>
+				<xsl:apply-templates mode="definition-list"/>
 			</DL>
 <!-- 			<TABLE BORDER="0" CELLPADDING="10"> -->
 <!-- 				<xsl:apply-templates/> -->
 <!-- 			</TABLE> -->
 		</html>
 	</template>
-	
 	<alias source="description-list" target="definition-list"/>
 
 
 	<!-- List elements -->
 	<template name="item" match="item">
-		<latex>\item <xsl:apply-templates/></latex>
+		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
 				<xsl:when test="count(paragraph|para|p) != 0">
@@ -371,8 +391,13 @@
 		</html>
 	</template>
 
-	<template name="definition-item" match="definition-list/item">
-		<latex>\item[<xsl:apply-templates select="keyword"/>] <xsl:apply-templates select="definition"/></latex>
+	<template name="definition-item" match="item" mode="definition-list">
+		<latex>
+			<xsl:text>\item[</xsl:text>
+			<xsl:apply-templates select="keyword"/>
+			<xsl:text>] </xsl:text>
+			<xsl:apply-templates select="definition|description|discourse"/>
+		</latex>
 		<html>
 			<DT><P><xsl:apply-templates select="keyword"/></P></DT>
 			<DD><xsl:apply-templates select="definition|description|discourse"/></DD>
@@ -395,6 +420,7 @@
 		used within <image>.
 	-->
 	<template name="definition" match="item/definition|item/description|item/discourse">
+		<latex><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
 				<xsl:when test="count(paragraph|para|p) != 0">
@@ -580,17 +606,26 @@
 			'right'
 	-->
 	<template name="quotation" match="quotation">
-		<!-- Should we be using a quotation environment? -->
 		<latex>
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
-					\begin{flush<xsl:value-of select="@align"/>}\itshape <xsl:apply-templates/>\end{flush<xsl:value-of select="@align"/>}
+					<xsl:text>\begin{flush</xsl:text>
+					<xsl:value-of select="@align"/>
+					<xsl:text>}\itshape </xsl:text>
+					<xsl:apply-templates/>
+					<xsl:text>\end{flush</xsl:text>
+					<xsl:value-of select="@align"/>
+					<xsl:text>}</xsl:text>
 				</xsl:when>
 				<xsl:when test="@align = 'center'">
-					\begin{center}\itshape <xsl:apply-templates/>\end{center}
+					<xsl:text>\begin{center}\itshape </xsl:text>
+					<xsl:apply-templates/>
+					<xsl:text>\end{center}</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					\begin{quote}\itshape <xsl:apply-templates/>\end{quote}
+					<xsl:text>\begin{quote}\itshape </xsl:text>
+					<xsl:apply-templates/>
+					<xsl:text>\end{quote}</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</latex>
@@ -782,7 +817,12 @@
 		@no-page-break: Inhibit page breaks after this row (LaTeX only).
 	-->
 	<template name="row" match="row">
-		<latex><xsl:apply-templates/> \\<xsl:if test="@no-page-break = 'yes'">*</xsl:if><xsl:text> </xsl:text></latex>
+		<latex>
+			<xsl:apply-templates/>
+			<xsl:text> \\</xsl:text>
+			<xsl:if test="@no-page-break = 'yes'">*</xsl:if>
+			<xsl:text> </xsl:text>
+		</latex>
 		<html>
 			<TR>
 				<xsl:apply-templates/>
@@ -1226,6 +1266,9 @@
 		the file attribute.
 		
 		@file: Name of environment file. [optional]
+		
+		Note: this may produce an error if the file doesn't exist. The
+		XSLT processor should be able to continue from this, however.
 	-->
 	<template name="environment" match="environment[@file]">
 		<xsl:apply-templates select="document(@file)/environment/*"/>
@@ -1288,12 +1331,12 @@
 	-->
 	<template name="math-inline" match="paragraph//math|para//math|p//math">
 		<latex>\(<xsl:apply-templates mode="math"/>\)</latex>
-		<html><xsl:apply-templates/></html>
+		<html><xsl:apply-templates mode="math"/></html>
 	</template>
 	
 	<template name="math-display" match="math">
 		<latex>\[<xsl:apply-templates mode="math"/>\]</latex>
-		<html><P ALIGN="center"><xsl:apply-templates/></P></html>
+		<html><P ALIGN="center"><xsl:apply-templates mode="math"/></P></html>
 	</template>
 
 	
@@ -1303,12 +1346,12 @@
 		<latex>
 			<xsl:text>\begin{eqnarray*}
 </xsl:text>
-			<xsl:apply-templates/>
+			<xsl:apply-templates mode="math"/>
 			<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 mode="math"/></TABLE>
 		</html>
 	</template>
 
@@ -1333,47 +1376,84 @@
 	</template>
 	<alias source="digitsep" target="digit-group-separator"/>
 	
-	<!-- Super- and subscript. -->
-	<template name="superscript" match="math//superscript">
-		<latex>^{<xsl:apply-templates/>}</latex>
-		<html><SUP><xsl:apply-templates/></SUP></html>
+	<!-- Mathematical super- and subscript. -->
+	<template name="superscript-math" match="superscript" mode="math">
+		<latex>^{<xsl:apply-templates mode="math"/>}</latex>
+		<html><SUP><xsl:apply-templates mode="math"/></SUP></html>
 	</template>
 	
-	<template name="subscript" match="math//subscript">
-		<latex>_{<xsl:apply-templates/>}</latex>
-		<html><SUB><xsl:apply-templates/></SUB></html>
+	<template name="subscript-math" match="subscript" mode="math">
+		<latex>_{<xsl:apply-templates mode="math"/>}</latex>
+		<html><SUB><xsl:apply-templates mode="math"/></SUB></html>
 	</template>
 	
-	<!-- Basic mathematical operators. -->
-	<template name="plus-operator" match="math//plus">
+	<!--
+		Basic mathematical operators.
+
+		Unfortunately we need to define math and non-math mode
+		versions of each template even when they're identical,
+		because if we're in math mode, non-math mode templates
+		are ignored (as far as I can tell anyway). There's no
+		such thing as mode="*" :(
+		
+		Do we need <left-parenthesis> and <right-parenthesis>?
+		Maybe we're getting a little carried away with these :)
+	-->
+	<template name="plus-operator-math" match="plus" mode="math">
+		<common>+</common>
+	</template>
+	<template name="plus-operator" match="plus">
 		<common>+</common>
 	</template>
 	
-	<template name="minus-operator" match="math//minus">
+	<template name="minus-operator-math" match="minus" mode="math">
 		<common>-</common>
 	</template>
+	<template name="minus-operator" match="minus">
+		<latex>\(-\)</latex>
+		<html>-</html>
+	</template>
 	
-	<template name="times-operator" match="math//times">
+	<template name="times-operator-math" match="times" mode="math">
 		<latex>\times</latex>
 		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
 	</template>
-	<alias source="times" target="times-operator"/>
+	<template name="times-operator" match="times">
+		<latex>\(\times\)</latex>
+		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
+	</template>
 	
-	<template name="divide-operator" match="math//divide">
+	<template name="divide-operator-math" match="divide" mode="math">
+		<common>/</common>
+	</template>
+	<template name="divide-operator" match="divide">
 		<common>/</common>
 	</template>
 	
-	<template name="equals-operator" match="math//equals">
+	<template name="equals-operator-math" match="equals" mode="math">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<common> = </common>
+	</template>
+	<template name="equals-operator" match="equals">
 		<common> = </common>
 	</template>
 
-	<template name="approximately-equals-operator" match="approximately-equals-operator">
-		<latex>{\approx}</latex>
-		<html><xsl:text disable-output-escaping="yes">&#8776;</xsl:text></html>
+	<template name="approximately-equals-operator-math" match="approximately-equals" mode="math">
+		<latex>\(\approx\)</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
 	</template>
-	<alias source="approximately-equals" target="approximately-equals-operator"/>
+	<template name="approximately-equals-operator" match="approximately-equals">
+		<latex>{\approx}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
+	</template>
 	<alias source="approximately-equal-to" target="approximately-equals-operator"/>
+	<alias source="approx" target="approximately-equals-operator"/>
 	
+	<template name="degree-sign-math" match="degree-sign" mode="math">
+		<latex>^{\circ}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
+	</template>
+
 	<!--
 		The equivalent of LaTeX's "log-like functions".
 		
@@ -1382,21 +1462,21 @@
 		nothing to stop you using any name you like, except that it'll
 		probably die horribly in LaTeX :) [required]
 	-->
-	<template name="log-like-function" match="math//function">
+	<template name="log-like-function" match="function" mode="math">
 		<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 name="math-variable" match="variable" mode="math">
+		<latex><xsl:apply-templates mode="math"/></latex>
+		<html><I><xsl:apply-templates mode="math"/></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 name="math-fraction" match="fraction" mode="math">
+		<latex>\frac{<xsl:apply-templates select="numerator" mode="math"/>}{<xsl:apply-templates select="denominator" mode="math"/>}</latex>
+		<html><xsl:apply-templates select="numerator" mode="math"/><BIG> / </BIG><xsl:apply-templates select="denominator" mode="math"/></html>
 	</template>
 	
 
