diff --git a/xml2xslt.xsl b/xml2xslt.xsl
index 3cc8ff0..e736334 100755
--- a/xml2xslt.xsl
+++ b/xml2xslt.xsl
@@ -142,10 +142,15 @@
 				<xsl-out:param name="standalone">yes</xsl-out:param>
 				
 				<xsl-out:template name="latex-preamble">
+					<xsl-out:text>
 \usepackage{mathpazo} % mathpple is deprecated
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
-<xsl-out:apply-templates select="environment/latex-packages" />
+</xsl-out:text>
+
+					<xsl-out:apply-templates select="environment/latex-packages" />
+
+					<xsl-out:text>
 % Safer to specify the hyperref options directly rather than relying on
 % the default hyperref.cfg, as XeLaTeX seems to ignore it :(.
 \usepackage[	pdftex,%
@@ -156,6 +161,7 @@
 				breaklinks	]{hyperref}
 
 \renewcommand{\ttdefault}{blg}
+</xsl-out:text>
 				</xsl-out:template>
 				
 			</xsl:when>
@@ -172,12 +178,17 @@
 				<xsl-out:param name="standalone">yes</xsl-out:param>
 				
 				<xsl-out:template name="latex-preamble">
+					<xsl-out:text>
 \usepackage[no-math]{fontspec}
 \usepackage{mathspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 \usepackage{textcomp} % ???
-<xsl-out:apply-templates select="environment/latex-packages" />
+</xsl-out:text>
+
+					<xsl-out:apply-templates select="environment/latex-packages" />
+					
+					<xsl-out:text>
 % Safer to specify the hyperref options directly rather than relying on
 % the default hyperref.cfg, as XeLaTeX seems to ignore it :(.
 \usepackage[	xetex,%
@@ -191,6 +202,7 @@
 \setmainfont{TeX Gyre Pagella}
 \setmathsfont(Digits){TeX Gyre Pagella}
 \setmonofont[Scale=MatchLowercase]{Letter Gothic 12 Pitch}
+</xsl-out:text>
 				</xsl-out:template>
 				
 			</xsl:when>
@@ -299,6 +311,7 @@
 					<xsl-out:choose>
 
 						<xsl-out:when test="$standalone = 'yes'">
+							<xsl-out:text>
 % THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!
 
 \documentclass[12pt,a4paper]{article}
@@ -312,10 +325,13 @@
 \usepackage{siunitx}  % number and SI unit formatting
 \usepackage{listings} % nicely formatted code listings
 
-<xsl-out:call-template name="latex-preamble" />
+</xsl-out:text>
 
-<xsl-out:apply-templates select="environment/latex-commands" />
+							<xsl-out:call-template name="latex-preamble" />
 
+							<xsl-out:apply-templates select="environment/latex-commands" />
+
+							<xsl-out:text>
 \newenvironment{answer}{\par\vspace{0.5em}\itshape}{\normalfont\vspace{1.5em}}
 
 % Listings setup. We preload the most obviously like languages to speed things
@@ -324,26 +340,34 @@
 \lstset{basicstyle=\ttfamily,basewidth=0.5em,escapeinside={(@}{@)},
 	showspaces=false,showstringspaces=false}
 
-<xsl-out:apply-templates select="title" mode="preamble" />
-<xsl-out:apply-templates select="author" mode="preamble" />
-<xsl-out:apply-templates select="date" mode="preamble" />
+</xsl-out:text>
 
+							<xsl-out:apply-templates select="title" mode="preamble" />
+							<xsl-out:call-template name="newline-internal" />
+							<xsl-out:apply-templates select="author" mode="preamble" />
+							<xsl-out:call-template name="newline-internal" />
+							<xsl-out:apply-templates select="date" mode="preamble" />
+							<xsl-out:call-template name="newline-internal" />
+
+							<xsl-out:text>
 \begin{document}
 	\maketitle
 
-	<xsl-out:apply-templates />
+</xsl-out:text>
 
-	<!--
-		If you're having problems with the build date appearing in weird or annoying locations (usually because of floating items like tables and figures), set document/@auto-latex-build-date to "no". You can then use the build-date element to insert the build date wherever you like, if necessary. This really only applies to LaTeX documents. The behaviour of HTML documents is much more predictable because they don't have elements with "minds of their own", so the build date is guaranteed to always appear at the very end.
-	-->
-	<xsl-out:if test="not( @auto-latex-build-date ) or ( @auto-latex-build-date != 'no' )">
-	
-		<xsl-out:call-template name="build-date-internal">
-			<xsl-out:with-param name="format">long</xsl-out:with-param>
-			<xsl-out:with-param name="style">footer</xsl-out:with-param>
-		</xsl-out:call-template>
-\end{document}
-	</xsl-out:if>
+							<xsl-out:apply-templates />
+
+							<!--
+								If you're having problems with the build date appearing in weird or annoying locations (usually because of floating items like tables and figures), set document/@auto-latex-build-date to "no". You can then use the build-date element to insert the build date wherever you like, if necessary. This really only applies to LaTeX documents. The behaviour of HTML documents is much more predictable because they don't have elements with "minds of their own", so the build date is guaranteed to always appear at the very end.
+							-->
+							<xsl-out:if test="not( @auto-latex-build-date ) or ( @auto-latex-build-date != 'no' )">
+							
+								<xsl-out:call-template name="build-date-internal">
+									<xsl-out:with-param name="format">long</xsl-out:with-param>
+									<xsl-out:with-param name="style">footer</xsl-out:with-param>
+								</xsl-out:call-template>
+							</xsl-out:if>
+							<xsl-out:text>\end{document}</xsl-out:text>
 						</xsl-out:when>
 						<!-- Not standalone: -->
 						<xsl-out:otherwise>