diff --git a/format-master.xml b/format-master.xml
index 27f53eb..3a3851a 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -43,6 +43,11 @@
 		<latex> \\</latex>
 		<html><BR/></html>
 	</template>
+	
+	<template name="page-break" match="page-break">
+		<latex>\newpage</latex>
+	</template>
+	<alias source="new-page" target="page-break"/>
 
 	<template name="non-breaking-space" match="non-breaking-space">
 		<latex>~</latex>
@@ -177,9 +182,9 @@
 
 	<template name="code-block" match="code-block">
 		<latex>
-			<xsl:text>\begin{verbatim}</xsl:text>
+			\begin{verbatim}
 				<xsl:apply-templates/>
-			<xsl:text>\end{verbatim}</xsl:text>
+			\end{verbatim}
 		</latex>
 		<html>
 			<PRE CLASS="code"><xsl:apply-templates/></PRE>
@@ -188,12 +193,20 @@
 	
 	<!-- Quoted text. Handles nested quotes correctly. -->
 	<template name="single-quote" match="quote[@single='yes']">
-		<latex>`{<xsl:apply-templates/>}'</latex>
-		<html>&#8216;<xsl:apply-templates/>&#8217;</html>
+		<latex>`<xsl:apply-templates/>'</latex>
+		<html>
+			<xsl:text disable-output-escaping="yes">&amp;#8216;</xsl:text>
+			<xsl:apply-templates/>
+			<xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text>
+		</html>
 	</template>
 	<template name="double-quote" match="quote">
-		<latex>``{<xsl:apply-templates/>}''</latex>
-		<html>&#8220;<xsl:apply-templates/>&#8221;</html>
+		<latex>``<xsl:apply-templates/>''</latex>
+		<html>
+			<xsl:text disable-output-escaping="yes">&amp;#8220;</xsl:text>
+			<xsl:apply-templates/>
+			<xsl:text disable-output-escaping="yes">&amp;#8221;</xsl:text>
+		</html>
 	</template>
 	<template name="nested-double-quote" match="quote//quote">
 		<common>
@@ -230,7 +243,7 @@
 	<template name="itemised-list" match="itemised-list">
 		<latex>
 			\begin{itemize}
-			<xsl:apply-templates/>
+				<xsl:apply-templates/>
 			\end{itemize}
 		</latex>
 		<html>
@@ -286,15 +299,15 @@
 
 	<!-- List elements -->
 	<template name="item" match="item">
-		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
+		<latex>\item <xsl:apply-templates/></latex>
 		<html><LI><xsl:apply-templates/></LI></html>
 	</template>
 
 	<template name="definition-item" match="definition-list/item">
-		<latex><xsl:text>\item[</xsl:text><xsl:apply-templates select="keyword"/><xsl:text>]</xsl:text> <xsl:apply-templates select="definition"/></latex>
+		<latex>\item[<xsl:apply-templates select="keyword"/>] <xsl:apply-templates select="definition"/></latex>
 		<html>
 			<DT><xsl:apply-templates select="keyword"/></DT>
-			<DD><xsl:apply-templates select="definition"/></DD>
+			<DD><xsl:apply-templates select="definition|description|discourse"/></DD>
 		</html>
 	</template>
 	
@@ -303,14 +316,7 @@
 		<html><STRONG><xsl:apply-templates/></STRONG></html>
 	</template>
 	
-	<template name="definition" match="definition">
-		<latex><xsl:apply-templates/></latex>
-		<html><xsl:apply-templates/></html>
-	</template>
-	
 	<alias source="topic" target="keyword"/>
-	<alias source="description" target="definition"/>
-	<alias source="discourse" target="definition"/>
 	
 	
 	<!-- Sections, subsections, subsubsections, ... -->
@@ -451,9 +457,41 @@
 	<template name="omit" match="omit"/>
 	
 	
-	<!-- Tables (equivalent to a tabular in LaTeX terms). -->
-	<template name="table" match="table">
-		<latex></latex>
+	<!-- Tabular structures (LaTeX {tabular}, HTML <TABLE>). -->
+	<template name="tabular" match="tabular">
+		<latex>
+			<xsl:text>\begin{</xsl:text>
+			<xsl:choose>
+				<xsl:when test="(@align = 'left') or (@align = 'right')">
+					<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+				</xsl:when>
+				<xsl:when test="@align = 'center'">
+					<xsl:text>center</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>flushleft</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>}</xsl:text>
+			\begin{tabular}{<xsl:apply-templates select="columns"/>}
+				<xsl:apply-templates select="tabular-header"/>
+				<xsl:apply-templates select="tabular-body"/>
+				<xsl:apply-templates select="tabular-footer"/>
+			\end{tabular}
+			<xsl:text>\end{</xsl:text>
+			<xsl:choose>
+				<xsl:when test="(@align = 'left') or (@align = 'right')">
+					<xsl:text>flush</xsl:text><xsl:value-of select="@align"/>
+				</xsl:when>
+				<xsl:when test="@align = 'center'">
+					<xsl:text>center</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>flushleft</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>}</xsl:text>
+		</latex>
 		<html>
 			<TABLE>
 				<xsl:attribute name="BORDER">
@@ -465,14 +503,55 @@
 						<xsl:value-of select="@align"/>
 					</xsl:attribute>
 				</xsl:if>
-				<xsl:apply-templates/>
+				<!--
+					Note different ordering of tabular components:
+					HTML requires THEAD and TFOOT to precede TBODY.
+				-->
+				<xsl:apply-templates select="tabular-header"/>
+				<xsl:apply-templates select="tabular-footer"/>
+				<xsl:apply-templates select="tabular-body"/>
 			</TABLE>
 		</html>
 	</template>
 	
-	<template name="table-body" match="table-body">
+	<!-- Set left- or right-border to "|" to include a column separator. -->
+	<template name="aligned-column" match="column[@align]">
+		<latex>
+			<xsl:value-of select="@left-border"/>
+			<xsl:value-of select="substring(@align, 1, 1)"/>
+			<xsl:value-of select="@right-border"/>
+		</latex>
+	</template>
+	
+	<template name="unaligned-column" match="column[not(@align)]">
+		<latex>
+			<xsl:value-of select="@left-border"/>
+			<xsl:text>l</xsl:text>
+			<xsl:value-of select="@right-border"/>
+		</latex>
+	</template>
+	
+	<template name="tabular-header" match="tabular-header">
 		<latex></latex>
 		<html>
+			<THEAD>
+				<xsl:apply-templates/>
+			</THEAD>
+		</html>
+	</template>
+
+	<template name="tabular-footer" match="tabular-footer">
+		<latex></latex>
+		<html>
+			<TFOOT>
+				<xsl:apply-templates/>
+			</TFOOT>
+		</html>
+	</template>
+
+	<template name="tabular-body" match="tabular-body">
+		<latex><xsl:apply-templates/></latex>
+		<html>
 			<TBODY>
 				<xsl:apply-templates/>
 			</TBODY>
@@ -480,7 +559,7 @@
 	</template>
 
 	<template name="row" match="row">
-		<latex></latex>
+		<latex><xsl:apply-templates/> \\<xsl:if test="@no-page-break = 'yes'">*</xsl:if><xsl:text> </xsl:text></latex>
 		<html>
 			<TR>
 				<xsl:apply-templates/>
@@ -488,16 +567,97 @@
 		</html>
 	</template>
 
-	<template name="cell" match="cell">
-		<latex></latex>
+	<template name="row-rule-full" match="row-rule[not(@columns)]">
+		<latex>\hline</latex>
+	</template>
+
+	<template name="row-rule-partial" match="row-rule[@columns]">
+		<latex>\cline{<xsl:value-of select="@columns"/>}</latex>
+	</template>
+	
+	<template match="cell" mode="multi-row">
+		<latex>
+			<xsl:text>\multirow{</xsl:text>
+			<xsl:value-of select="@rows"/>
+			<xsl:text>}{*}{</xsl:text>
+			<xsl:apply-templates/>
+			<xsl:text>}</xsl:text>
+		</latex>
+	</template>
+	
+	<template match="cell" mode="multi-column">
+		<latex>
+			<xsl:param name="num-columns">1</xsl:param>
+			<xsl:text>\multicolumn{</xsl:text>
+			<xsl:value-of select="$num-columns"/>
+			<xsl:text>}{</xsl:text>
+			<xsl:value-of select="@left-border"/>
+			<xsl:choose>
+				<xsl:when test="@align">
+					<xsl:value-of select="@align"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>l</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:value-of select="@right-border"/>
+			<xsl:text>}{</xsl:text>
+			<xsl:choose>
+				<xsl:when test="@rows">
+					<xsl:apply-templates select="." mode="multi-row"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>}</xsl:text>
+		</latex>
+	</template>
+	
+	<template match="cell">
+		<common>
+			<!-- position() doesn't seem to work very well in this context -->
+			<xsl:variable name="column-no"><xsl:number/></xsl:variable>
+		</common>
+		<!--
+			Doing this sensibly for LaTeX is actually pretty ugly,
+			because different attribute combinations produce different
+			code :(
+			
+			This is the sort of algorithm that can only really be
+			clearly described by a flow chart :)
+		-->
+		<latex>
+			<xsl:choose>
+				<xsl:when test="@columns">
+					<xsl:apply-templates select="." mode="multi-column">
+						<xsl:with-param name="num-columns" select="@columns"/>
+					</xsl:apply-templates>
+				</xsl:when>
+				<xsl:when test="@align">
+					<xsl:apply-templates select="." mode="multi-column"/>
+				</xsl:when>
+				<xsl:when test="@rows">
+					<xsl:apply-templates select="." mode="multi-row"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:if test="$column-no != last()"> &amp; </xsl:if>
+		</latex>
+		<!--
+			It's much easier in HTML, because a <TD> is a <TD> is a
+			<TD>, regardless of the attributes supplied.
+		-->
 		<html>
-			<xsl:variable name="column-no">
-				<xsl:number/>
-			</xsl:variable>
 			<TD>
 				<xsl:attribute name="ALIGN">
-					<xsl:value-of select="ancestor::table/columns/column[position()=$column-no]/@align"/>
-					<xsl:if test="not(ancestor::table/columns/column[position()=$column-no]/@align)">left</xsl:if>
+					<xsl:value-of select="@align"/>
+					<xsl:if test="not(@align)">
+						<xsl:value-of select="ancestor::tabular/columns/column[position() = $column-no]/@align"/>
+						<xsl:if test="not(ancestor::tabular/columns/column[position() = $column-no]/@align)">left</xsl:if>
+					</xsl:if>
 				</xsl:attribute>
 				<xsl:attribute name="COLSPAN">
 					<xsl:value-of select="@columns"/>
@@ -534,7 +694,7 @@
 	<!-- 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>
+		<latex>\texttt{<xsl:apply-templates/>}</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
 	
@@ -542,9 +702,11 @@
 	<alias source="email" target="url"/>
 	<alias source="email-address" target="url"/>
 
+
 	<!-- References. -->
 	<template name="reference" match="reference">
 		<common>
+			<!-- Find the element whose label is the same as our label. -->
 			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference"/>
 		</common>
 	</template>
@@ -552,20 +714,32 @@
 	<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>
+		<html>
+			<xsl:text disable-output-escaping="yes">Section&amp;#160;</xsl:text>
+			<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>
+		<html>
+			<xsl:text disable-output-escaping="yes">Figure&amp;#160;</xsl:text>
+			<xsl:number count="figure" level="multiple" format="1"/>
+		</html>
+	</template>
+	
+	<template name="table-reference" match="table" mode="reference">
+		<latex>Table~\ref*{<xsl:value-of select="@label"/>}</latex>
+		<html>
+			<xsl:text disable-output-escaping="yes">Table&amp;#160;</xsl:text>
+			<xsl:number count="table" level="multiple" format="1"/>
+		</html>
 	</template>
 	
 	
-	<!-- Figures. -->
+	<!-- Figures & tables. -->
 	<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)]"/>
@@ -587,13 +761,43 @@
 		</html>
 	</template>
 	
-	<template name="caption" match="caption">
+	<template name="table" match="table">
+		<latex>
+			\begin{table}
+				\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{table}
+		</latex>
+		<html>
+			<DIV CLASS="table">
+				<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="figure-caption" match="figure/caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
 			<STRONG>Figure <xsl:number count="figure" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/>
 		</html>
 	</template>
 	
+	<template name="table-caption" match="table/caption">
+		<latex><xsl:apply-templates/></latex>
+		<html>
+			<STRONG>Table <xsl:number count="table" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/>
+		</html>
+	</template>
+	
 	
 	<!-- Images. Includes a scaling factor for LaTeX. -->
 	<template match="image[not(@print-version)]">
@@ -632,6 +836,8 @@
 		inlined, then an appropriate link to the document is generated.
 		Inlined files must be document fragments, not standalone
 		documents!
+		
+		Currently somewhat broken. Needs more work.
 	 -->
 	<template name="include-noinline" match="include-document[not(@inline) or (@inline = 'no')]">
 		<latex>\input{<xsl:value-of select="@basename"/>}</latex>
@@ -672,6 +878,16 @@
 	<template name="latex-command" match="latex-packages/command">
 		<latex><xsl:value-of select="."/></latex>
 	</template>
+	
+	
+	<!-- Sometimes we might need to embed raw code to handle something tricky. -->
+	<template name="raw-latex" match="raw-code[@format = 'latex']">
+		<latex><xsl:apply-templates/></latex>
+	</template>
+		
+	<template name="raw-html" match="raw-code[@format = 'html']">
+		<html><xsl:copy-of select="*"/></html>
+	</template>
 		
 
 </stylesheet>
