diff --git a/format-master.xml b/format-master.xml
index 52245d0..4f62b40 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -431,7 +431,7 @@
 
 
 	<!-- List elements -->
-	<template name="item" match="item">
+	<template name="list-item" match="item">
 		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
@@ -808,37 +808,37 @@
 	<template name="tabular" match="tabular">
 		<latex>
 			<!-- Overall table alignment. -->
-			<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:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
+			<xsl:text>\begin{tabular}{</xsl:text>
+			<xsl:apply-templates select="tabular-columns"/>
 			<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>
+			<xsl:text>\end{tabular}</xsl:text>
+			<xsl:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
 		</latex>
 		<html>
 			<TABLE>
@@ -883,7 +883,7 @@
 		required, because \multicolumn overrides the default border
 		specification.
 	-->
-	<template name="aligned-column" match="column[@align]">
+	<template name="aligned-tabular-column" match="tabular-columns/column[@align]">
 		<latex>
 			<xsl:value-of select="@left-border"/>
 			<xsl:value-of select="substring(@align, 1, 1)"/>
@@ -891,7 +891,7 @@
 		</latex>
 	</template>
 
-	<template name="unaligned-column" match="column[not(@align)]">
+	<template name="unaligned-tabular-column" match="tabular-columns/column[not(@align)]">
 		<latex>
 			<xsl:value-of select="@left-border"/>
 			<xsl:text>l</xsl:text>
@@ -1092,8 +1092,8 @@
 				<xsl:attribute name="ALIGN">
 					<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:value-of select="ancestor::tabular/tabular-columns/column[position() = $column-no]/@align"/>
+						<xsl:if test="not(ancestor::tabular/tabular-columns/column[position() = $column-no]/@align)">left</xsl:if>
 					</xsl:if>
 				</xsl:attribute>
 				<xsl:attribute name="VALIGN">
@@ -1797,7 +1797,170 @@
 	<template name="paper-number" match="paper/paper-number">
 		<common><xsl:apply-templates/></common>
 	</template>
-		
 	
+	
+	<!--
+		Create a layout of multiple columns across the page. By default,
+		columns are of equal width, but may be varied on a
+		column-by-column basis. Each column is totally independent of
+		the others, i.e., you can't have text automatically flowing from
+		one column to the next (yet).
+		
+		@vspace: The amount of vertical space to put around the
+		multi-column elements. [small, medium, big, LaTeX length, NONE]
+		
+		@align: Overall alignment of the columns (only relevant if the
+		total width of the columns is less than the page width). [LEFT,
+		center, right]
+		
+		@width: Total width of the column set, expressed as a fraction
+		of the usable page width between 0 and 1 (this will be
+		multiplied by 100 for HTML). Individual column widths are then
+		expressed as a fraction of this total width. [default is 1]
+	-->
+	<template name="multi-column" match="multi-column">
+		<latex>
+			<xsl:variable name="total-width">
+				<xsl:number value="1"/>
+				<xsl:if test="@width"><xsl:value-of select="@width"/></xsl:if>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
+				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
+				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
+				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace"/></xsl:when>
+			</xsl:choose>
+			\noindent
+			<xsl:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
+			<xsl:apply-templates>
+				<xsl:with-param name="default-width">
+					<xsl:number value="format-number($total-width div count(column),'0.00')"/>
+				</xsl:with-param>
+			</xsl:apply-templates>
+			<xsl:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
+			<xsl:choose>
+				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
+				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
+				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
+				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace"/></xsl:when>
+			</xsl:choose>
+		</latex>
+		<html>
+			<xsl:variable name="total-width">
+				<xsl:number value="100"/>
+				<xsl:if test="@width"><xsl:value-of select="@width * 100"/></xsl:if>
+			</xsl:variable>
+			<xsl:if test="@vspace"><BR/></xsl:if>
+			<TABLE BORDER="0" WIDTH="{$total-width}%">
+				<xsl:if test="@align">
+					<xsl:attribute name="ALIGN">
+						<xsl:value-of select="@align"/>
+					</xsl:attribute>
+				</xsl:if>
+				<TR>
+					<xsl:apply-templates>
+						<xsl:with-param name="default-width">
+							<xsl:number value="round($total-width div count(column))"/>
+						</xsl:with-param>
+					</xsl:apply-templates>
+				</TR>
+			</TABLE>
+			<xsl:if test="@vspace"><BR/></xsl:if>
+		</html>
+	</template>
+	
+	<!--
+		A column within a multi-column element.
+		
+		$default-width: The default width of the column, expressed as a
+		fraction of the total column set width. This is calculated by
+		the <multi-column> template and should be 1/n of the column set
+		width, where n is the number of columns.
+		
+		@width: The width of this particular column (overrides the
+		default). This should be expressed as a fraction between 0 and 1
+		(which is then multipled by 100 for HTML). Make sure that all
+		widths add up!
+		
+		@align: How each individual column is to be aligned internally.
+	-->
+	<template name="multi-column-column" match="multi-column/column">
+		<latex>
+			<xsl:param name="default-width">1</xsl:param>
+			<xsl:text>\begin{minipage}{</xsl:text>
+			<xsl:choose>
+				<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$default-width"/></xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>\columnwidth}</xsl:text>
+			<xsl:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
+			<xsl:apply-templates/>
+			<xsl:if test="@align">
+				<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:choose>
+				<xsl:text>}</xsl:text>
+			</xsl:if>
+			<xsl:text>\end{minipage}</xsl:text>
+		</latex>
+		<html>
+			<xsl:param name="default-width">100</xsl:param>
+			<TD>
+				<xsl:attribute name="WIDTH">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width * 100"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$default-width"/></xsl:otherwise>
+					</xsl:choose>
+					<xsl:text>%</xsl:text>
+				</xsl:attribute>
+				<xsl:if test="@align">
+					<xsl:attribute name="ALIGN">
+						<xsl:value-of select="@align"/>
+					</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates/>
+			</TD>
+		</html>
+	</template>
+
 
 </stylesheet>
