diff --git a/format-master.xml b/format-master.xml
index 8eea931..f8bd8f8 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This will mostly be a list of element names to match, along with the corresponding HTML and LaTeX handling XSLT code. -->
 <stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -140,17 +140,20 @@
 	-->
 	<template name="space" match="space">
 		<common formats="/latex/xelatex/"><xsl:text>\ </xsl:text></common>
+		<!-- U+0020 SPACE -->
 		<common formats="/html/xhtml/"><xsl:text> </xsl:text></common>
 	</template>
 
-	<template name="non-breaking-space" match="non-breaking-space|nbsp">
+	<template name="non-breaking-space" match="non-breaking-space|nbsp|no-break-space">
 		<common formats="/latex/xelatex/">~</common>
 		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></common>
+		<!-- Could use U+00A0 NO-BREAK SPACE for XHTML? -->
 	</template>
 	
 	<template name="thin-space" match="thin-space|thinspace">
 		<common formats="/latex/xelatex/">\,</common>
 		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;thinsp;</xsl:text></common>
+		<!-- Could use U+2009 THIN SPACE for XHTML? -->
 	</template>
 	
 	<!--
@@ -158,6 +161,7 @@
 	-->
 	<template name="discretionary-hyphen" match="hyphen">
 		<common formats="/latex/xelatex/">\-</common>
+		<!-- Could use U+00AD SOFT HYPHEN for XHTML? -->
 	</template>
 	
 	<!--
@@ -167,44 +171,51 @@
 		&#160; for a non-breaking space) and which ones don't (e.g.,
 		&amp;).
 	-->
-	<template name="ellipsis-sign" match="ellipsis-sign|etc|ellipsis|dots">
+	<template name="ellipsis-sign" match="ellipsis-sign|etc|ellipsis|dots|horizontal-ellipsis">
 		<common formats="/latex/xelatex/">{\ldots}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;hellip;</xsl:text></html>
-		<xhtml>…</xhtml>
+		<!-- U+2026 HORIZONTAL ELLIPSIS -->
+		<xhtml><xsl:text>…</xsl:text></xhtml>
 	</template>
 
 	<!-- Misc typographic symbols -->
 	<template name="endash" match="endash|en-dash">	
 		<common formats="/latex/xelatex/">--</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text></html>
-		<xhtml>–</xhtml>
+		<!-- U+2013 EN DASH -->
+		<xhtml><xsl:text>–</xsl:text></xhtml>
 	</template>
 
 	<template name="emdash" match="emdash|em-dash">
 		<common formats="/latex/xelatex/">---</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;mdash;</xsl:text></html>
-		<xhtml>—</xhtml>
+		<xhtml><xsl:text>—</xsl:text></xhtml>
+		<!-- U+2014 EM DASH -->
 	</template>
 	
 	<!-- Use this for literal underscores that appear outside code blocks. Such things cause LaTeX to wig out. -->
-	<template name="underscore" match="underscore">
+	<template name="underscore" match="underscore|low-line">
 		<common formats="/latex/xelatex/">\_</common>
+		<!-- U+005F LOW LINE -->
 		<common formats="/html/xhtml/">_</common>
 	</template>
 
-	<template name="apostrophe" match="apostrophe">
+	<template name="apostrophe" match="apostrophe|right-single-quotation-mark">
 		<common formats="/latex/xelatex/">'</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;rsquo;</xsl:text></html>
-		<xhtml>’</xhtml>
+		<!-- U+2019 RIGHT SINGLE QUOTATION MARK -->
+		<xhtml><xsl:text>’</xsl:text></xhtml>
 	</template>
 
 	<template name="dollar" match="dollar|dollar-sign">
 		<common formats="/latex/xelatex/">{\$}</common>
+		<!-- U+0024 DOLLAR SIGN -->
 		<common formats="/html/xhtml/">$</common>
 	</template>
 
 	<template name="percent-sign" match="percent-sign|percentage-sign|percent">
 		<common formats="/latex/xelatex/">{\%}</common>
+		<!-- U+0025 PERCENT SIGN -->
 		<common formats="/html/xhtml/">%</common>
 	</template>
 
@@ -213,110 +224,128 @@
 		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text></common>
 	</template>
 
-	<template name="trademark-sign" match="trademark-sign|trademark|TM|tm">
+	<template name="trademark-sign" match="trademark-sign|trademark|tm|trade-mark-sign">
 		<common formats="/latex/xelatex/">{\texttrademark}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;trade;</xsl:text></html>
-		<xhtml>™</xhtml>
+		<!-- U+2122 TRADE MARK SIGN -->
+		<xhtml><xsl:text>™</xsl:text></xhtml>
 	</template>
 
 	<template name="copyright-sign" match="copyright-sign">
 		<common formats="/latex/xelatex/">{\copyright}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text></html>
-		<xhtml>©</xhtml>
+		<!-- U+00A9 COPYRIGHT SIGN -->
+		<xhtml><xsl:text>©</xsl:text></xhtml>
 	</template>
 
 	<template name="degree-sign" match="degree-sign|degrees">
 		<common formats="/latex/xelatex/">\ensuremath{^{\circ}}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;deg;</xsl:text></html>
-		<xhtml>°</xhtml>
+		<!-- U+0080 DEGREE SIGN -->
+		<xhtml><xsl:text>°</xsl:text></xhtml>
 	</template>
 
 	<template name="section-sign" match="section-sign">
 		<common formats="/latex/xelatex/">{\S}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sect;</xsl:text></html>
-		<xhtml>§</xhtml>
+		<!-- U+00A7 SECTION SIGN -->
+		<xhtml><xsl:text>§</xsl:text></xhtml>
 	</template>
 
-	<template name="sharp-sign" match="sharp|hash">
+	<template name="sharp-sign" match="sharp|hash|number-sign">
 		<common formats="/latex/xelatex/">{\#}</common>
+		<!-- U+0023 NUMBER SIGN -->
 		<common formats="/html/xhtml/"><xsl:text>#</xsl:text></common>
 	</template>
 
-	<template name="paragraph-sign" match="paragraph-sign">
+	<template name="paragraph-sign" match="paragraph-sign|pilcrow|pilcrow-sign">
 		<common formats="/latex/xelatex/">{\P}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;para;</xsl:text></html>
-		<xhtml>¶</xhtml>
+		<!-- U+00B6 PILCROW SIGN -->
+		<xhtml><xsl:text>¶</xsl:text></xhtml>
 	</template>
 
 	<template name="left-curly-bracket" match="left-curly-bracket|left-curly-brace|left-brace">
 		<common formats="/latex/xelatex/">\ensuremath{\{}</common>
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">{</xsl:text></common>
+		<!-- U+007B LEFT CURLY BRACKET -->
+		<common formats="/html/xhtml/"><xsl:text>{</xsl:text></common>
 	</template>
 
 	<template name="right-curly-bracket" match="right-curly-bracket|right-curly-brace|right-brace">
 		<common formats="/latex/xelatex/">\ensuremath{\}}</common>
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">}</xsl:text></common>
+		<!-- U+007D LEFT CURLY BRACKET -->
+		<common formats="/html/xhtml/"><xsl:text>}</xsl:text></common>
 	</template>
 
 	<!-- I think the pi symbol is only available in LaTeX in math mode, but if we're already in math mode, the extra $ signs will mess things up... -->
 	<!-- Use \ensuremath to resolve the problem. -->
-	<template name="pi" match="pi|project">
-		<common formats="/latex/xelatex/">\ensuremath{\pi}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;pi;</xsl:text></html>
-		<xhtml>π</xhtml>
-	</template>
-	<template name="epsilon" match="epsilon|extend">
+	<template name="epsilon" match="epsilon|extend|greek-small-letter-epsilon">
 		<common formats="/latex/xelatex/">\ensuremath{\epsilon}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;epsilon;</xsl:text></html>
-		<xhtml>ε</xhtml>
+		<!-- U+03B5 GREEK SMALL LETTER EPSILON -->
+		<xhtml><span class="unicode"><xsl:text>ε</xsl:text></span></xhtml>
 	</template>
-	<template name="sigma" match="sigma|restrict">
-		<common formats="/latex/xelatex/">\ensuremath{\sigma}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;sigma;</xsl:text></html>
-		<xhtml>σ</xhtml>
+	<template name="pi" match="pi|project|greek-small-letter-pi">
+		<common formats="/latex/xelatex/">\ensuremath{\pi}</common>
+		<html><xsl:text disable-output-escaping="yes">&amp;pi;</xsl:text></html>
+		<!-- U+03C0 GREEK SMALL LETTER PI -->
+		<xhtml><span class="unicode"><xsl:text>π</xsl:text></span></xhtml>
 	</template>
-	<template name="rho" match="rho|rename">
+	<template name="rho" match="rho|rename|greek-small-letter-rho">
 		<common formats="/latex/xelatex/">\ensuremath{\rho}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;rho;</xsl:text></html>
-		<xhtml>ρ</xhtml>
+		<!-- U+03C1 GREEK SMALL LETTER RHO -->
+		<xhtml><span class="unicode"><xsl:text>ρ</xsl:text></span></xhtml>
 	</template>
-	<template name="capital-phi" match="Phi">
+	<template name="sigma" match="sigma|restrict|greek-small-letter-sigma">
+		<common formats="/latex/xelatex/">\ensuremath{\sigma}</common>
+		<html><xsl:text disable-output-escaping="yes">&amp;sigma;</xsl:text></html>
+		<!-- U+03C3 GREEK SMALL LETTER SIGMA -->
+		<xhtml><span class="unicode"><xsl:text>σ</xsl:text></span></xhtml>
+	</template>
+	<template name="capital-phi" match="Phi|greek-capital-letter-phi">
 		<common formats="/latex/xelatex/">\ensuremath{\Phi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Phi;</xsl:text></html>
-		<xhtml>Φ</xhtml>
+		<!-- U+03A6 GREEK CAPITAL LETTER PHI -->
+		<xhtml><span class="unicode"><xsl:text>Φ</xsl:text></span></xhtml>
 	</template>
 
 	<template name="empty-set-sign" match="empty-set-sign|empty-set|null">
 		<common formats="/latex/xelatex/">\ensuremath{\emptyset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;empty;</xsl:text></html>
-		<xhtml>∅</xhtml>
+		<!-- U+2205 EMPTY SET -->
+		<xhtml><span class="unicode"><xsl:text>∅</xsl:text></span></xhtml>
 	</template>
 
 	<template name="element-sign" match="element-sign|element|element-of|is-element-of|is-an-element-of">
 		<common formats="/latex/xelatex/">\ensuremath{\in}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;isin;</xsl:text></html>
-		<xhtml>∈</xhtml>
+		<!-- U+2208 ELEMENT OF -->
+		<xhtml><span class="unicode"><xsl:text>∈</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="not-element-sign" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of">
+	<template name="not-element-sign" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of|not-an-element-of">
 		<common formats="/latex/xelatex/">\ensuremath{\not\in}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;notin;</xsl:text></html>
-		<xhtml>∉</xhtml>
+		<!-- U+2209 NOT AN ELEMENT OF -->
+		<xhtml><span class="unicode"><xsl:text>∉</xsl:text></span></xhtml>
 	</template>
 	
 	<template name="subset-sign" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of">
 		<common formats="/latex/xelatex/">\ensuremath{\subset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sub;</xsl:text></html>
-		<xhtml>⊂</xhtml>
+		<!-- U+2282 SUBSET OF -->
+		<xhtml><span class="unicode"><xsl:text>⊂</xsl:text></span></xhtml>
 	</template>
 
 	<template name="superset-sign" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of">
 		<common formats="/latex/xelatex/">\ensuremath{\supset}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;sup;</xsl:text></html>
-		<xhtml>⊃</xhtml>
+		<!-- U+2283 SUPERSET OF -->
+		<xhtml><span class="unicode"><xsl:text>⊃</xsl:text></span></xhtml>
 	</template>
 
-	<template name="join-operator" match="join-operator|join|natural-join">
+	<template name="join-operator" match="join-operator|join|natural-join|bowtie">
 		<common formats="/latex/xelatex/">\ensuremath{\Join}</common>
 		<!--
 			No easy way at present to get the join symbol in HTML, so
@@ -335,7 +364,7 @@
 					<xsl:text>/Handbook/join-operator-web.png</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="alt">
-					<xsl:text>Join operator</xsl:text>
+					<xsl:text>join operator</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="width">
 					<xsl:text>10</xsl:text>
@@ -348,7 +377,14 @@
 				</xsl:attribute>
 			</img>
 		</html>
-		<xhtml>⋈</xhtml>
+		<!--
+			Note that we use the Unicode BOWTIE character (U+22C8) rather
+			than JOIN (U+2A1D) because the latter appears to have less
+			font support than the former, and isn't different enough to
+			have any significant effect.
+		-->
+		<!-- U+22C8 BOWTIE -->
+		<xhtml><span class="unicode"><xsl:text>⋈</xsl:text></span></xhtml>
 	</template>
 
 	<!--
@@ -361,7 +397,7 @@
 	-->
 	<template name="outer-join-operator" match="outer-join-operator|outer-join">
 		<common formats="/latex/xelatex/">
-			<xsl:text>\ensuremath{\</xsl:text>
+			<xsl:text>\ensuremath{\Rel</xsl:text>
 			<xsl:choose>
 				<xsl:when test="@type">
 					<xsl:value-of select="@type" />
@@ -381,9 +417,6 @@
 			
 			We need to ensure that the path is absolute, because we don't
 			necessarily know where the document will end up in the tree.
-			
-			Note that these characters are available in Unicode, but I'm not
-			sure how widespread font support will be as yet (Dec 2010).
 		-->
 		<common formats="/html/xhtml/">
 			<img>
@@ -404,7 +437,16 @@
 					<xsl:text>-outer-join-operator-web.png</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="alt">
-					<xsl:text>Join operator</xsl:text>
+					<xsl:choose>
+						<xsl:when test="@type">
+							<xsl:value-of select="@type" />
+						</xsl:when>
+						<!-- default to a full outer join -->
+						<xsl:otherwise>
+							<xsl:text>full</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:text> outer join operator</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="width">
 					<xsl:choose>
@@ -425,36 +467,62 @@
 				</xsl:attribute>
 			</img>
 		</common>
+		<!-- 
+			Note that these characters are available in Unicode (U+27D5
+			LEFT OUTER JOIN, U+27D6 RIGHT OUTER JOIN and U+27D7 FULL OUTER
+			JOIN), but I don't think font support is very widespread yet
+			(Dec 2010).
+		-->
+<!-- 
+		<xhtml>
+			<xsl:choose>
+				<xsl:when test="@type = 'left'">
+					<span class="unicode"><xsl:text>⟕</xsl:text></span>
+				</xsl:when>
+				<xsl:when test="@type = 'right'">
+					<span class="unicode"><xsl:text>⟖</xsl:text></span>
+				</xsl:when>
+				<xsl:otherwise>
+					<span class="unicode"><xsl:text>⟗</xsl:text></span>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xhtml>
+ -->
 	</template>
 
 	<template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
 		<common formats="/latex/xelatex/">\ensuremath{\cap}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;cap;</xsl:text></html>
-		<xhtml>∩</xhtml>
+		<!-- U+2229 INTERSECTION -->
+		<xhtml><span class="unicode"><xsl:text>∩</xsl:text></span></xhtml>
 	</template>
 
 	<template name="union-operator" match="union-operator|union|cup">
 		<common formats="/latex/xelatex/">\ensuremath{\cup}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;cup;</xsl:text></html>
-		<xhtml>∪</xhtml>
+		<!-- U+222A UNION -->
+		<xhtml><span class="unicode"><xsl:text>∪</xsl:text></span></xhtml>
 	</template>
 
 	<template name="logical-and-operator" match="logical-and-operator|logical-and|and|and-operator|hat|wedge">
 		<common formats="/latex/xelatex/">\ensuremath{\wedge}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;and;</xsl:text></html>
-		<xhtml>∧</xhtml>
+		<!-- U+2227 LOGICAL AND -->
+		<xhtml><span class="unicode"><xsl:text>∧</xsl:text></span></xhtml>
 	</template>
 
 	<template name="logical-or-operator" match="logical-or-operator|logical-or|or|or-operator|vee">
 		<common formats="/latex/xelatex/">\ensuremath{\vee}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;or;</xsl:text></html>
-		<xhtml>∨</xhtml>
+		<!-- U+2228 LOGICAL OR -->
+		<xhtml><span class="unicode"><xsl:text>∨</xsl:text></span></xhtml>
 	</template>
 
-	<template name="logical-not-operator" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg">
+	<template name="logical-not-operator" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg|not-sign">
 		<common formats="/latex/xelatex/">\ensuremath{\neg}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;not;</xsl:text></html>
-		<xhtml>¬</xhtml>
+		<!-- U+00AC NOT SIGN -->
+		<xhtml><span class="unicode"><xsl:text>¬</xsl:text></span></xhtml>
 	</template>
 
 	<template name="LaTeX" match="LaTeX|latex">
@@ -466,7 +534,8 @@
 	<template name="menu-separator" match="menu-separator|menusep|menu/separator">
 		<common formats="/latex/xelatex/"> \ensuremath{\triangleright} </common>
 		<html><xsl:text disable-output-escaping="yes"> &amp;rarr; </xsl:text></html>
-		<xhtml> ▹ </xhtml>
+		<!-- U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE -->
+		<xhtml><span class="unicode"><xsl:text> ▹ </xsl:text></span></xhtml>
 	</template>
 
 	<template name="menu-item" match="menu/item">
@@ -504,26 +573,29 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="@type = 'sad'">
-					<xsl:text>:(</xsl:text>
+					<span class="unicode"><xsl:text>:(</xsl:text></span>
 				</xsl:when>
 				<xsl:when test="@type = 'neutral' or @type = 'meh'">
 					<xsl:text>:|</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text>:)</xsl:text>
+					<span class="unicode"><xsl:text>:)</xsl:text></span>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
 		<xhtml>
 			<xsl:choose>
 				<xsl:when test="@type = 'sad'">
-					<xsl:text>☹</xsl:text>
+					<!-- U+2639 WHILE FROWNING FACE -->
+					<span class="unicode"><xsl:text>☹</xsl:text></span>
 				</xsl:when>
+				<!-- There doesn't appear to be a Unicode character for this one. :( -->
 				<xsl:when test="@type = 'neutral' or @type = 'meh'">
 					<xsl:text>:|</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text>☺</xsl:text>
+					<!-- U+263A WHILE SMILING FACE -->
+					<span class="unicode"><xsl:text>☺</xsl:text></span>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xhtml>
@@ -828,7 +900,13 @@
 			<xsl:apply-templates />
 			<xsl:text disable-output-escaping="yes">&amp;rsquo;</xsl:text>
 		</html>
-		<xhtml>‘<xsl:apply-templates />’</xhtml>
+		<xhtml>
+			<!-- U+2018 LEFT SINGLE QUOTATION MARK -->
+			<xsl:text>‘</xsl:text>
+			<xsl:apply-templates />
+			<!-- U+2019 RIGHT SINGLE QUOTATION MARK -->
+			<xsl:text>’</xsl:text>
+		</xhtml>
 	</template>
 	<template name="double-quote" match="quote|qq">
 		<common formats="/latex/xelatex/">``<xsl:apply-templates />''</common>
@@ -837,7 +915,13 @@
 			<xsl:apply-templates />
 			<xsl:text disable-output-escaping="yes">&amp;rdquo;</xsl:text>
 		</html>
-		<xhtml>“<xsl:apply-templates />”</xhtml>
+		<xhtml>
+			<!-- U+201C LEFT DOUBLE QUOTATION MARK -->
+			<xsl:text>“</xsl:text>
+			<xsl:apply-templates />
+			<!-- U+201D RIGHT DOUBLE QUOTATION MARK -->
+			<xsl:text>”</xsl:text>
+		</xhtml>
 	</template>
 	<!--
 		With nested quotes, we need to figure out what depth of nesting
@@ -1538,11 +1622,19 @@
 					<xsl:value-of select="@border" />
 					<xsl:if test="not(@border)">0</xsl:if>
 				</xsl:attribute>
-				<xsl:if test="@align">
-					<xsl:attribute name="align">
-						<xsl:value-of select="@align" />
-					</xsl:attribute>
-				</xsl:if>
+				<xsl:choose>
+					<xsl:when test="@align='center'">
+						<xsl:attribute name="style">
+							<xsl:text>margin-left:auto; margin-right: auto;</xsl:text>
+						</xsl:attribute>
+					</xsl:when>
+					<xsl:when test="@align='right'">
+						<xsl:attribute name="style">
+							<xsl:text>margin-left:auto;</xsl:text>
+						</xsl:attribute>
+					</xsl:when>
+					<xsl:otherwise />
+				</xsl:choose>
 				<!--
 					Note different ordering of tabular components:
 					HTML requires THEAD and TFOOT to precede TBODY.
@@ -2002,7 +2094,7 @@
 			\end{figure}
 		</common>
 		<common formats="/html/xhtml/">
-			<div class="figure" style="margin-left, margin-right: auto;">
+			<div class="figure" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
 				<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
 				<xsl:if test="count(id) != 0"><a id="{id}"></a></xsl:if>
 				<xsl:apply-templates select="*[not(self::caption)]" />
@@ -2026,7 +2118,7 @@
 			\end{table}
 		</common>
 		<common formats="/html/xhtml/">
-			<div class="table" style="margin-left, margin-right: auto;">
+			<div class="table" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
 				<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
 				<xsl:apply-templates select="*[not(self::caption)]" />
 				<xsl:if test="count(caption) != 0">
@@ -2069,19 +2161,21 @@
 	<template name="figure-caption" match="figure/caption">
 		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
 		<common formats="/html/xhtml/">
-			<strong>
-				<xsl:text>Figure </xsl:text>
-				<xsl:choose>
-					<xsl:when test="$showanswers='yes'">
-						<xsl:number count="figure" level="any" format="1" />
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:text>. </xsl:text>
-			</strong>
-			<xsl:apply-templates />
+			<p style="text-align: center;">
+				<strong>
+					<xsl:text>Figure </xsl:text>
+					<xsl:choose>
+						<xsl:when test="$showanswers='yes'">
+							<xsl:number count="figure" level="any" format="1" />
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:text>. </xsl:text>
+				</strong>
+				<xsl:apply-templates />
+			</p>
 		</common>
 	</template>
 	
@@ -2089,18 +2183,21 @@
 		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
 		<common formats="/html/xhtml/">
 			<strong>
-				<xsl:text>Table </xsl:text>
-				<xsl:choose>
-					<xsl:when test="$showanswers='yes'">
-						<xsl:number count="table" level="any" format="1" />
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
-					</xsl:otherwise>
-				</xsl:choose>
-				<xsl:text>. </xsl:text>
-			</strong>
-			<xsl:apply-templates />
+			<p style="text-align: center;">
+				<strong>
+					<xsl:text>Table </xsl:text>
+					<xsl:choose>
+						<xsl:when test="$showanswers='yes'">
+							<xsl:number count="table" level="any" format="1" />
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1" />
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:text>. </xsl:text>
+				</strong>
+				<xsl:apply-templates />
+			</p>
 		</common>
 	</template>
 	
@@ -2180,7 +2277,7 @@
 	<template name="normal-image" match="image[count(provide-large-version) = 0]">
 		<common formats="/latex/xelatex/"><xsl:apply-templates select="." mode="latex" /></common>
 		<common formats="/html/xhtml/">
-			<img class="padded" style="border: none;">
+			<img class="padded" style="border-style: none;">
 				<xsl:attribute name="src">
 					<!--
 						Work out the full path specification for the file
@@ -2252,7 +2349,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
-				<img class="padded" style="border: none;">
+				<img class="padded" style="border-style: none;">
 					<xsl:attribute name="src">
 						<!--
 							Work out the full path specification for the file
@@ -2541,7 +2638,7 @@
 	
 	<template name="math-display" match="math[@style='display']">
 		<common formats="/latex/xelatex/">\[<xsl:apply-templates />\]</common>
-		<common formats="/html/xhtml/"><p align="center"><xsl:apply-templates /></p></common>
+		<common formats="/html/xhtml/"><p style="text-align: center;"><xsl:apply-templates /></p></common>
 	</template>
 
 	
@@ -2555,7 +2652,7 @@
 			<xsl:text>\end{eqnarray*}</xsl:text>
 		</common>
 		<common formats="/html/xhtml/">
-			<table class="equation" border="0" align="center"><xsl:apply-templates /></table>
+			<table class="equation" border="0" style="margin-left: auto; margin-right: auto;"><xsl:apply-templates /></table>
 		</common>
 	</template>
 
@@ -2619,67 +2716,82 @@
 		<common>+</common>
 	</template>
 	
-	<template name="minus-operator" match="minus">
+	<template name="minus-operator" match="minus|subtract|minus-sign">
 		<common formats="/latex/xelatex/">\ensuremath{-}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;minus;</xsl:text></html>
-		<xhtml>−</xhtml>
+		<!-- U+2212 MINUS SIGN -->
+		<xhtml><span class="unicode"><xsl:text>−</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="times-operator" match="times">
+	<template name="times-operator" match="times|multiply|multiplication|multiplication-sign">
 		<common formats="/latex/xelatex/">\ensuremath{\times}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;times;</xsl:text></html>
-		<xhtml>×</xhtml>
+		<!-- U+00D7 MULTIPLICATION SIGN -->
+		<xhtml><span class="unicode"><xsl:text>×</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="divide-operator" match="divide">
-		<common>/</common>
+	<template name="divide-operator" match="divide|division|division-slash">
+		<common formats="/latex/xelatex/">\ensuremath{/}</common>
+		<html><xsl:text>/</xsl:text></html>
+		<!-- U+2215 DIVISION SLASH -->
+		<xhtml><span class="unicode"><xsl:text>∕</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="equals-operator" match="equals">
+	<template name="equals-operator" match="equals|eq|equals-sign|equality">
+		<common formats="/latex/xelatex/">\ensuremath{=}</common>
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common>=</common>
+		<!-- U+003D EQUALS SIGN -->
+		<common formats="/html/xhtml/"><xsl:text> = </xsl:text></common>
 	</template>
 
-	<template name="not-equals-operator" match="not-equals|ne">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+	<template name="not-equals-operator" match="not-equals|ne|inequality|not-equal-to">
 		<common formats="/latex/xelatex/">\ensuremath{\neq}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;ne;</xsl:text></html>
-		<xhtml>≠</xhtml>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<html><xsl:text disable-output-escaping="yes"> &amp;ne; </xsl:text></html>
+		<!-- U+2260 NOT EQUAL TO -->
+		<xhtml><xsl:text> ≠ </xsl:text></xhtml>
 	</template>
 
-	<template name="greater-than-operator" match="greater-than|gt">
+	<template name="greater-than-operator" match="greater-than|gt|greater-than-sign">
+		<common formats="/latex/xelatex/">\ensuremath{&lt;}</common>
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes"> &amp;gt; </xsl:text></common>
+	</template>
+
+	<template name="greater-equals-operator" match="greater-equals|ge|greater-than-or-equal-to">
+		<common formats="/latex/xelatex/">\ensuremath{\geq}</common>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<html><xsl:text disable-output-escaping="yes"> &amp;ge; </xsl:text></html>
+		<!-- U+2265 GREATER-THAN OR EQUAL TO -->
+		<xhtml><xsl:text> ≥ </xsl:text></xhtml>
+	</template>
+
+	<template name="less-than-operator" match="less-than|lt|less-than-sign">
 		<common formats="/latex/xelatex/"> \ensuremath{&lt;} </common>
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;gt;</xsl:text></common>
-	</template>
-
-	<template name="greater-equals-operator" match="greater-equals|ge">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common formats="/latex/xelatex/"> \ensuremath{\geq} </common>
-		<html><xsl:text disable-output-escaping="yes">&amp;ge;</xsl:text></html>
-		<xhtml>≥</xhtml>
-	</template>
-
-	<template name="less-than-operator" match="less-than|lt">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common formats="/latex/xelatex/"> \ensuremath{&lt;} </common>
-		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes">&amp;lt;</xsl:text></common>
+		<common formats="/html/xhtml/"><xsl:text disable-output-escaping="yes"> &amp;lt; </xsl:text></common>
 	</template>
 
 	<template name="less-equals-operator" match="less-equals|le">
-		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<common formats="/latex/xelatex/"> \ensuremath{\leq} </common>
-		<html><xsl:text disable-output-escaping="yes">&amp;le;</xsl:text></html>
-		<xhtml>≤</xhtml>
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<html><xsl:text disable-output-escaping="yes"> &amp;le; </xsl:text></html>
+		<!-- U+2264 LESS-THAN OR EQUAL TO -->
+		<xhtml><xsl:text> ≤ </xsl:text></xhtml>
 	</template>
 
 	<template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx">
 		<common formats="/latex/xelatex/">\ensuremath{\approx}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;asymp;</xsl:text></html>
-		<xhtml>≈</xhtml>
+		<xhtml><xsl:text>≈</xsl:text></xhtml>
 	</template>
 	
-	<template name="right-arrow" match="right-arrow|rightarrow|implies|rarr|rarrow">
+	<!--
+		Can't include the Unicode name in the match list, because the template
+		handles more than one style of arrow. The closest we can manage is
+		"rightwards-arrow".
+	-->
+	<template name="right-arrow" match="right-arrow|rightarrow|implies|rarr|rarrow|rightwards-arrow">
 		<common formats="/latex/xelatex/">
 			<xsl:text> \ensuremath{\</xsl:text>
 			<xsl:choose>
@@ -2701,16 +2813,25 @@
 		<xhtml>
 			<xsl:choose>
 				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes">⇒</xsl:text>
+					<!-- U+21D2 RIGHTWARDS DOUBLE ARROW -->
+					<span class="unicode">
+						<xsl:text>⇒</xsl:text>
+					</span>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes">→</xsl:text>
+					<!-- U+2192 RIGHTWARDS ARROW -->
+					<xsl:text>→</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xhtml>
 	</template>
 	
-	<template name="left-arrow" match="left-arrow|leftarrow|larr|larrow">
+	<!--
+		Can't include the Unicode name in the match list, because the template
+		handles more than one style of arrow. The closest we can manage is
+		"leftwards-arrow".
+	-->
+	<template name="left-arrow" match="left-arrow|leftarrow|larr|larrow|leftwards-arrow">
 		<common formats="/latex/xelatex/">
 			<xsl:text> \ensuremath{\</xsl:text>
 			<xsl:choose>
@@ -2732,10 +2853,12 @@
 		<xhtml>
 			<xsl:choose>
 				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes">⇐</xsl:text>
+					<!-- U+21D0 LEFTWARDS DOUBLE ARROW -->
+					<xsl:text>⇐</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes">←</xsl:text>
+					<!-- U+2190 LEFTWARDS ARROW -->
+					<xsl:text>←</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xhtml>
@@ -2770,7 +2893,10 @@
 		</html>
 		<xhtml>
 			<sup><xsl:apply-templates select="numerator" /></sup>
-			<xsl:text disable-output-escaping="yes">⁄</xsl:text>
+			<span class="unicode">
+				<!-- U+2044 FRACTION SLASH -->
+				<xsl:text>⁄</xsl:text>
+			</span>
 			<sub><xsl:apply-templates select="denominator" /></sub>
 		</xhtml>
 	</template>
@@ -2972,7 +3098,7 @@
 			\end{center}
 		</common>
 		<common formats="/html/xhtml/">
-			<div style="margin-left, margin-right: auto;">
+			<div style="text-align: center;">
 				<xsl:apply-templates />
 			</div>
 		</common>
