diff --git a/format-master.xml b/format-master.xml
index 571b6a6..bbd76be 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -484,413 +484,11 @@
 	<!-- Cross-references. -->
 	<include href="modules/cross-references.xml" />
 	
+	<!-- "Floating" items such as figures and tables. -->
+	<include href="modules/floaters.xml" />
 	
-	<!--
-		Figures & tables (in the LaTeX sense, i.e., "floating" items).
-		
-		@border-placement: The style of border to place around the figure or table.
-			'none' [default]
-			'box'
-			or: any combination of 'top', 'left', 'bottom', 'right', e.g., 'bottom, left' (not all options may be available)
-	-->
-	<template name="figure" match="figure">
-		<common formats="/latex/xelatex/">
-			\begin{figure}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
-				\centering
-				<xsl:choose>
-					<xsl:when test="@border-placement = 'box'">
-						<xsl:text>\fbox{</xsl:text>
-					</xsl:when>
-					<xsl:when test="contains( @border-placement, 'top' )">
-						<xsl:text>\hrule\medskip</xsl:text>
-					</xsl:when>
-				</xsl:choose>
-				<xsl:apply-templates select="*[not(self::caption)]" />
-				<xsl:choose>
-					<xsl:when test="@border-placement = 'box'">
-						<xsl:text>}</xsl:text>
-					</xsl:when>
-					<xsl:when test="contains( @border-placement, 'bottom' )">
-						<xsl:text>\medskip\hrule</xsl:text>
-					</xsl:when>
-				</xsl:choose>
-				<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 test="count(id) != 0">\label{<xsl:value-of select="id" />}</xsl:if>
-				</xsl:if>
-			\end{figure}
-		</common>
-		<common formats="/html/xhtml/">
-			<div class="figure" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
-				<div>
-					<xsl:attribute name="style">
-						<xsl:if test="@border-placement = 'box'">
-							<xsl:text>border: 1px solid black; padding: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'top' )">
-							<xsl:text>border-top: 1px solid black; padding-top: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'left' )">
-							<xsl:text>border-left: 1px solid black; padding-left: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'bottom' )">
-							<xsl:text>border-bottom: 1px solid black; padding-bottom: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'right' )">
-							<xsl:text>border-right: 1px solid black; padding-right: 1em; </xsl:text>
-						</xsl:if>
-					</xsl:attribute>
-					<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)]" />
-				</div>
-				<xsl:if test="count(caption) != 0">
-					<br />
-					<xsl:apply-templates select="caption" />
-				</xsl:if>
-			</div>
-		</common>
-	</template>
-	
-	<template name="table" match="table">
-		<common formats="/latex/xelatex/">
-			\begin{table}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
-				\centering
-				<xsl:choose>
-					<!-- TODO: test this with embedded tabulars. It might not work! -->
-					<xsl:when test="@border-placement = 'box'">
-						<xsl:text>\fbox{</xsl:text>
-					</xsl:when>
-					<xsl:when test="contains( @border-placement, 'top' )">
-						<xsl:text>\hrule\medskip</xsl:text>
-					</xsl:when>
-				</xsl:choose>
-				<xsl:apply-templates select="*[not(self::caption)]" />
-				<xsl:choose>
-					<xsl:when test="@border-placement = 'box'">
-						<xsl:text>}</xsl:text>
-					</xsl:when>
-					<xsl:when test="contains( @border-placement, 'bottom' )">
-						<xsl:text>\medskip\hrule</xsl:text>
-					</xsl:when>
-				</xsl:choose>
-				<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}
-		</common>
-		<common formats="/html/xhtml/">
-			<div class="table" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
-				<div>
-					<xsl:attribute name="style">
-						<xsl:if test="@border-placement = 'box'">
-							<xsl:text>border: 1px solid black; padding: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'top' )">
-							<xsl:text>border-top: 1px solid black; padding-top: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'left' )">
-							<xsl:text>border-left: 1px solid black; padding-left: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'bottom' )">
-							<xsl:text>border-bottom: 1px solid black; padding-bottom: 1em; </xsl:text>
-						</xsl:if>
-						<xsl:if test="contains( @border-placement, 'right' )">
-							<xsl:text>border-right: 1px solid black; padding-right: 1em; </xsl:text>
-						</xsl:if>
-					</xsl:attribute>
-					<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)]" />
-				</div>
-				<xsl:if test="@label"><a id="{@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>
-		</common>
-	</template>
-	
-	<template name="multipart-table" match="table[count(part) &gt; 0]">
-		<common formats="/latex/xelatex/">
-			<xsl:for-each select="part">
-				\begin{table}[p]
-					\centering
-					<xsl:choose>
-						<!-- TODO: test this with embedded tabulars. It might not work! -->
-						<xsl:when test="../@border-placement = 'box'">
-							<xsl:text>\fbox{</xsl:text>
-						</xsl:when>
-						<xsl:when test="contains( ../@border-placement, 'top' )">
-							<xsl:text>\hrule\medskip</xsl:text>
-						</xsl:when>
-					</xsl:choose>
-					<xsl:apply-templates />
-					<xsl:choose>
-						<xsl:when test="../@border-placement = 'box'">
-							<xsl:text>}</xsl:text>
-						</xsl:when>
-						<xsl:when test="contains( ../@border-placement, 'bottom' )">
-							<xsl:text>\medskip\hrule</xsl:text>
-						</xsl:when>
-					</xsl:choose>
-					<xsl:if test="count(../caption) != 0">
-						<xsl:text>\caption{</xsl:text>
-						<xsl:apply-templates select="../caption" />
-						<xsl:choose>
-							<xsl:when test="position() &gt; 1">
-								<xsl:text> \emph{(continued)}}</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text> \emph{(continues over)}}</xsl:text>
-								<xsl:if test="../@label">\label{<xsl:value-of select="../@label" />}</xsl:if>
-							</xsl:otherwise>
-						</xsl:choose>
-						<!-- Consider the possibility of labels for each part? -->
-						<!-- <xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if> -->
-					</xsl:if>
-				\end{table}
-				\addtocounter{table}{-1}
-				\clearpage
-			</xsl:for-each>
-			\stepcounter{table}
-		</common>
-	</template>
-	
-	<template name="figure-caption" match="figure/caption">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-		<common formats="/html/xhtml/">
-			<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>
-	
-	<template name="table-caption" match="table/caption">
-		<common formats="/latex/xelatex/"><xsl:apply-templates /></common>
-		<common formats="/html/xhtml/">
-			<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>
-	
-	
-	<!--
-		Images. Includes a scaling factor for LaTeX.
-		
-		To do: alternatively, allow defining the scaling factor by specifying what proportion of the page width the image should occupy (a la LaTeX [width] parameter).
-		How about a <latex-attributes> element that can be used to specify \includegraphics arguments?
-			<width keepaspectratio="yes">0.5\columnwidth</width>
-			<height>2cm</height>
-			<scale>0.5</scale>
-			etc.
-		
-		To do: if no description is given, use the basename as the content of the ALT element.
-		Ideally, I think we should be able to define two image formats (PDF, EPS, PNG, ...) when marking up an image: one for LaTeX output, another for HTML.  Mind you, if the generation of the various formats from a single master is handled outside of the XSLT processing...?
-	-->
-	
-	<!-- LaTeX images are always handled the same way regardless. -->
-	<template name="latex-image" match="image" mode="latex">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\includegraphics</xsl:text>
-			<xsl:if test="count(latex-scaling) != 0">
-				<xsl:message terminate="no">&lt;latex-scaling&gt; element is deprecated in &lt;image&gt;; please use latex-options attribute instead.</xsl:message>
-				<xsl:text>[scale=</xsl:text>
-				<xsl:value-of select="latex-scaling" />
-				<xsl:text>]</xsl:text>
-			</xsl:if>
-			<!-- Adding general-purpose latex pass-through arguments for \includegraphics; this should eventually subsume the "scale"-only handler above. -->
-			<!-- If providing multiple arguments, these should be comma-separated in the source XML, but do not need the enclosing square brackets. -->
-			<xsl:if test="@latex-options">
-				<xsl:text>[</xsl:text>
-				<xsl:value-of select="@latex-options" />
-				<xsl:text>]</xsl:text>
-			</xsl:if>
-			<xsl:text>{</xsl:text>
-			<!--
-				Work out the full path specification for the file to be included = base-path + location (if specified) + basename.
-			-->
-			<xsl:value-of select="$base-path" />
-			<xsl:text>/</xsl:text>	
-			
-			<!-- Check whether the location attribute is included. -->
-			<xsl:if test="@location">
-				<xsl:value-of select="@location" />
-				<xsl:text>/</xsl:text>
-			</xsl:if>
-
-			<!-- need to phase out "basename" as an element and switch to using an attribute -->
-			<xsl:if test="count(basename) != 0">
-				<xsl:message terminate="no">&lt;basename&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
-				<xsl:value-of select="basename" />
-			</xsl:if>
-			<xsl:if test="@basename">
-				<xsl:value-of select="@basename" />
-			</xsl:if>
-			<xsl:text>-print.</xsl:text>
-			
-			<!-- Figure out the image format. -->
-			<xsl:choose>
-				<xsl:when test="count(format) != 0">
-					<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-					<xsl:value-of select="format" />
-				</xsl:when>
-				<xsl:when test="@format">
-					<xsl:value-of select="@format" />
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$image-format" />
-				</xsl:otherwise>
-			</xsl:choose>
-			<xsl:text>}</xsl:text>
-		</common>
-	</template>
-	
-	<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-style: none;">
-				<xsl:attribute name="src">
-					<!--
-						Work out the full path specification for the file
-						to be included = base-path + location (if specified) + basename.
-					-->
-					<xsl:value-of select="$base-path" />
-					<xsl:text>/</xsl:text>	
-					
-					<!-- Check whether the location attribute is included. -->
-					<xsl:if test="@location">
-						<xsl:value-of select="@location" />
-						<xsl:text>/</xsl:text>
-					</xsl:if>
-
-					<xsl:value-of select="basename|@basename" />
-					<xsl:text>-web.</xsl:text>
-
-					<xsl:choose>
-						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
-						<xsl:when test="count(format) != 0">
-							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-							<xsl:value-of select="format" />
-						</xsl:when>
-						<xsl:when test="@format">
-							<xsl:value-of select="@format" />
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="$image-format" />
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<xsl:attribute name="alt"><xsl:apply-templates select="description" /></xsl:attribute>
-			</img>
-		</common>
-	</template>
-
-	<template name="zoomable-image" match="image[count(provide-large-version) != 0]">
-		<common formats="/latex/xelatex/"><xsl:apply-templates select="." mode="latex" /></common>
-		<common formats="/html/xhtml/">
-			<a>
-				<xsl:attribute name="href">
-					<!--
-						Work out the full path specification for the file
-						to be included = base-path + location (if specified) + basename.
-					-->
-					<xsl:value-of select="$base-path" />
-					<xsl:text>/</xsl:text>	
-					
-					<!-- Check whether the location attribute is included. -->
-					<xsl:if test="@location">
-						<xsl:value-of select="@location" />
-						<xsl:text>/</xsl:text>
-					</xsl:if>
-
-					<xsl:value-of select="basename|@basename" />
-					<xsl:text>-web-zoom.</xsl:text>
-					
-					<xsl:choose>
-						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
-						<xsl:when test="count(format) != 0">
-							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-							<xsl:value-of select="format" />
-						</xsl:when>
-						<xsl:when test="@format">
-							<xsl:value-of select="@format" />
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="$image-format" />
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<img class="padded" style="border-style: none;">
-					<xsl:attribute name="src">
-						<!--
-							Work out the full path specification for the file
-							to be included = base-path + location (if specified) + basename.
-						-->
-						<xsl:value-of select="$base-path" />
-						<xsl:text>/</xsl:text>	
-						
-						<!-- Check whether the location attribute is included. -->
-						<xsl:if test="@location">
-							<xsl:value-of select="@location" />
-							<xsl:text>/</xsl:text>
-						</xsl:if>
-	
-						<xsl:value-of select="basename|@basename" />
-						<xsl:text>-web.</xsl:text>
-						
-						<xsl:choose>
-							<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
-							<xsl:when test="count(format) != 0">
-								<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
-								<xsl:value-of select="format" />
-							</xsl:when>
-							<xsl:when test="@format">
-								<xsl:value-of select="@format" />
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="$image-format" />
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="alt">
-						<xsl:apply-templates select="description" />
-					</xsl:attribute>
-				</img>
-				<br clear="right" />
-				<xsl:text>(Larger version)</xsl:text>
-			</a>
-		</common>
-	</template>
+	<!-- Images. -->
+	<include href="modules/images.xml" />
 	
 	
 	<!--