diff --git a/format-master.xml b/format-master.xml
index 0f0f056..27f53eb 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -11,7 +11,7 @@
 		<latex><xsl:value-of select="$department"/>~<xsl:value-of select="$paper"/></latex>
 		<html>
 			<xsl:value-of select="$department"/>
-			<xsl:text disable-output-escaping="yes">&amp;#160;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
 			<xsl:value-of select="$paper"/>
 		</html>
 	</template>
@@ -39,49 +39,153 @@
 	
 	<!-- 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><html><BR/></html></template>
-<template name="non-breaking-space" match="non-breaking-space"><latex>~</latex><html>&#160;</html></template>	
-<alias source="nbsp" target="non-breaking-space"/>
+	<template name="newline" match="newline">
+		<latex> \\</latex>
+		<html><BR/></html>
+	</template>
 
-	<template name="ellipsis-sign" match="ellipsis-sign">	<latex><xsl:text>{\ldots}</xsl:text></latex>	<html><xsl:text>&#8230;</xsl:text></html></template>
-	
+	<template name="non-breaking-space" match="non-breaking-space">
+		<latex>~</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
+	</template>	
+	<alias source="nbsp" target="non-breaking-space"/>
+
+	<!--
+		Technically we don't need to disable output escaping for all of
+		these, but it's probably better to code them all consistently,
+		rather than trying to figure out which ones do need it (e.g.,
+		&#160; for a non-breaking space) and which ones don't (e.g.,
+		&amp;).
+	-->
+	<template name="ellipsis-sign" match="ellipsis-sign">
+		<latex>{\ldots}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8230;</xsl:text></html>
+	</template>
 	<alias source="etc" target="ellipsis-sign"/>
 	<alias source="ellipsis" target="ellipsis-sign"/>
+	<alias source="dots" target="ellipsis-sign"/>
 
 	<!-- Misc typographic symbols -->
-	<template name="endash" match="endash">				<latex><xsl:text>--</xsl:text></latex>			<html><xsl:text>&#8211;</xsl:text></html></template>
+	<template name="endash" match="endash">	
+		<latex>--</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8211;</xsl:text></html>
+	</template>
 	<alias source="en-dash" target="endash"/>
-	<template name="emdash" match="emdash">				<latex><xsl:text>---</xsl:text></latex>			<html><xsl:text>&#8212;</xsl:text></html></template>
+
+	<template name="emdash" match="emdash">
+		<latex>---</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8212;</xsl:text></html>
+	</template>
 	<alias source="em-dash" target="emdash"/>
-	<template name="apostrophe" match="apostrophe">		<latex><xsl:text>'</xsl:text></latex>			<html><xsl:text>&#8217;</xsl:text></html></template>
-	<template name="dollar" match="dollar">				<latex><xsl:text>\$</xsl:text></latex>			<html><xsl:text>$</xsl:text></html></template>
-	<template name="percent-sign" match="percent-sign">	<latex><xsl:text>\%</xsl:text></latex>			<html><xsl:text>%</xsl:text></html></template>
-	<template name="ampersand" match="ampersand">		<latex><xsl:text>\&amp;</xsl:text></latex>		<html><xsl:text>&amp;</xsl:text></html></template>
-	<template name="trademark-sign" match="trademark-sign">		<latex><xsl:text>(TM)</xsl:text></latex>		<html><xsl:text>&#8482;</xsl:text></html></template>
+
+	<template name="apostrophe" match="apostrophe">
+		<latex>'</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text></html>
+	</template>
+
+	<template name="dollar" match="dollar">
+		<latex>\$</latex>
+		<html>$</html>
+	</template>
+
+	<template name="percent-sign" match="percent-sign">
+		<latex>\%</latex>
+		<html>%</html>
+	</template>
+
+	<template name="ampersand" match="ampersand">
+		<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>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8482;</xsl:text></html>
+	</template>
 	<alias source="trademark" target="trademark-sign"/>
-	<template name="copyright-sign" match="copyright-sign">	<latex><xsl:text>\copyright</xsl:text></latex>		<html><xsl:text>&#169;</xsl:text></html></template>
+	<alias source="TM" target="trademark-sign"/>
+
+	<template name="copyright-sign" match="copyright-sign">
+		<latex>\copyright</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#169;</xsl:text></html>
+	</template>
 	<!--	<alias source="copyright" target="copyright-sign"/> -->
-	<template name="degree-sign" match="degree-sign">	<latex><xsl:text>deg</xsl:text></latex>			<html><xsl:text>&#176;</xsl:text></html></template>
-	<template name="section-sign" match="section-sign">	<latex><xsl:text>{\S}</xsl:text></latex>		<html><xsl:text>&#167;</xsl:text></html></template>
-	<template name="paragraph-sign" match="paragraph-sign">	<latex><xsl:text>{\P}</xsl:text></latex>	<html><xsl:text>&#182;</xsl:text></html></template>
-	<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>
+
+	<template name="degree-sign" match="degree-sign">
+		<latex>$^{\circ}$</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
+	</template>
+	<alias source="degrees" target="degree-sign"/>
+
+	<template name="section-sign" match="section-sign">
+		<latex>{\S}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#167;</xsl:text></html>
+	</template>
+
+	<template name="paragraph-sign" match="paragraph-sign">
+		<latex>{\P}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#182;</xsl:text></html>
+	</template>
+
+	<template name="pi" match="pi">
+		<latex>$\pi$</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
+	</template>
+
+	<template name="LaTeX" match="LaTeX">
+		<latex>{\latex}</latex>
+		<html>LaTeX</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>
+
+	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
+	<template name="menu-separator" match="menu-separator">
+		<latex>$\triangleright$</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8594;</xsl:text></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="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>
+	<template name="emph" match="emph">
+		<latex>\emph{<xsl:apply-templates/>}</latex>
+		<html><EM><xsl:apply-templates/></EM></html>
+	</template>
+	<template name="italic" match="italic">
+		<latex>\textit{<xsl:apply-templates/>}</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="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>\foreign{<xsl:apply-templates/>}</latex>
+		<html><I CLASS="foreign"><xsl:apply-templates/></I></html>
+	</template>
 	<template name="code" match="code">
-		<latex><xsl:text>\code{</xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text></latex>
+		<latex>\code{<xsl:apply-templates/>}</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
 
+	<template name="code-block" match="code-block">
+		<latex>
+			<xsl:text>\begin{verbatim}</xsl:text>
+				<xsl:apply-templates/>
+			<xsl:text>\end{verbatim}</xsl:text>
+		</latex>
+		<html>
+			<PRE CLASS="code"><xsl:apply-templates/></PRE>
+		</html>
+	</template>
+	
 	<!-- Quoted text. Handles nested quotes correctly. -->
 	<template name="single-quote" match="quote[@single='yes']">
 		<latex>`{<xsl:apply-templates/>}'</latex>
@@ -118,17 +222,7 @@
 	<alias source="q" target="single-quote"/>
 	<alias source="qq" target="double-quote"/>
 
-	<template name="code-block" match="code-block">
-		<latex>
-			<xsl:text>\begin{verbatim}</xsl:text>
-				<xsl:apply-templates/>
-			<xsl:text>\end{verbatim}</xsl:text>
-		</latex>
-		<html>
-			<PRE CLASS="code"><xsl:apply-templates/></PRE>
-		</html>
-	</template>
-	
+
 	<!-- Environments (in the LaTeX terminology): enumerated, ordered, and numbered lists. -->
 
 	<!-- Unordered lists -->
