diff --git a/format-master.xml b/format-master.xml
index 23e4679..94f00f8 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1583,26 +1583,107 @@
 	
 	
 	<!--
-		Include another XML document into the current one. Including
-		LaTeX should be done using <latex-input>. Nothing for HTML
-		includes at present, although this may not actually be necessary
-		anyway given that HTML doesn't natively support this in the
-		first place. You're probably better off just generating a
-		separate document and linking to it.
+		Include another XML/HTML/LaTeX document into the current one. If
+		you don't specify @type, it assumes the type of document that
+		you're currently generating (HTML or LaTeX).
 		
-		It's difficult to produce HTML fragments because the XSLT
-		processor seems to always generate a DOCTYPE when producing
-		HTML, whether you want it or not. Maybe you can turn this off?
+		LaTeX documents are simply included using \input{...}. The old
+		<latex-input> element is now deprecated.
+
+		HTML documents are a little trickier, as there's no equivalent
+		of \input{} in HTML, plus the XSLT processor always seems to
+		generate a DOCTYPE when producing HTML, whether you want it or
+		not, which means that you can only really include entire HTML
+		documents, rather than HTML fragments (maybe you can turn this
+		off?). The solution here is to embed the HTML document inside an
+		<OBJECT>.
+
+		A similar argument applies for plain text documents (such as
+		code listings) that we want to include, but are externally
+		generated and so can't just be embedded in the source XML.
+
+		@type: The type of the document to be included. [optional] Valid
+		values are:
+			"xml"
+			"html" [default for HTML]
+			"latex" [default for LaTeX]
+			"text"
 		
-		@file: Name of file to include. [required]
+		@basename: Name of file to include. [required]
+		
+		@location: Path to file to include. [optional]
 	-->
-	<template name="include-xml" match="include-document">
+	<template name="include-document" match="include-document">
 		<common>
-			<xsl:apply-templates select="document(@file)"/>
+			<!--
+				Work out the full path specification for the file
+				to be included = base-path + location + basename.
+			-->
+			<xsl:variable name="file">
+				<xsl:value-of select="$base-path"/>
+				<xsl:text>/</xsl:text>			
+				<xsl:if test="@location">
+					<xsl:value-of select="@location"/>
+					<xsl:text>/</xsl:text>
+				</xsl:if>
+				<xsl:value-of select="@basename"/>
+			</xsl:variable>
+		</common>
+		<html>
+			<OBJECT DATA="{$file}">
+				<!-- Output text/html or text/plain as appropriate. -->
+				<xsl:attribute name="TYPE">
+					<xsl:text>text/</xsl:text>
+					<xsl:choose>
+						<xsl:when test="@type"><xsl:value-of select="@type"/></xsl:when>
+						<xsl:otherwise><xsl:text>html</xsl:text></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				<xsl:attribute name="WIDTH">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				<xsl:attribute name="HEIGHT">
+					<xsl:choose>
+						<xsl:when test="@height"><xsl:value-of select="@height"/></xsl:when>
+						<xsl:otherwise><xsl:text>100%</xsl:text></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</OBJECT>
+		</html>
+		<latex>
+			<xsl:text>\</xsl:text>
+			<!--
+				Note that input text files are currently verbatim'd in
+				LaTeX. We may want to change this in future?
+			-->
+			<xsl:if test="@type = 'text'">
+				<xsl:text>verbatim</xsl:text>
+			</xsl:if>
+			<xsl:text>input{</xsl:text>
+			<xsl:value-of select="$file"/>
+			<xsl:text>}</xsl:text>
+		</latex>
+	</template>
+	
+	<template name="include-xml" match="include-document[@type='xml']">
+		<common>
+			<xsl:variable name="file">
+				<xsl:value-of select="$base-path"/>
+				<xsl:text>/</xsl:text>
+				<xsl:if test="@location">
+					<xsl:value-of select="@location"/>
+					<xsl:text>/</xsl:text>
+				</xsl:if>
+				<xsl:value-of select="@basename"/>
+			</xsl:variable>
+			<xsl:apply-templates select="document($file,/)"/>
 		</common>
 	</template>
 	
-	
+
 	<!--
 		Environment setup. This enables you to define environment settings
 		(e.g., required LaTeX packages, etc.). We normally explicitly call
@@ -1672,7 +1753,10 @@
 		
 	<!-- Generate a LaTeX \input{} macro. -->
 	<template name="latex-input" match="latex-input">
-		<latex>\input{<xsl:value-of select="."/>}</latex>
+		<latex>
+			<xsl:message>Use of latex-input is deprecated. Please use include-document instead.</xsl:message>
+			\input{<xsl:value-of select="."/>}
+		</latex>
 	</template>
 
 	
