diff --git a/format-master.xml b/format-master.xml
index ba4964f..f9ee6be 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -106,6 +106,22 @@
 		<latex>\newpage</latex>
 	</template>
 	
+	<!--
+		Insert a space. Useful for the occaisional case where two
+		elements occur next to each other with only a space separating
+		them (e.g., an <emph> immediately following a <quote>), and the
+		space gets gobbled by XSLT, producing leading to non-separated
+		words in the output. It doesn't seem very consistent as to when
+		it does and doesn't happen, unfortunately, but when it does
+		happen, inserting a <space/> will fix the problem.
+
+		This is analogous to putting a \ at the end of macros in LaTeX
+		to ensure that spaces after the macro aren't gobbled.
+	-->
+	<template name="space" match="space">
+		<common><xsl:text> </xsl:text></common>
+	</template>
+
 	<template name="non-breaking-space" match="non-breaking-space|nbsp">
 		<latex>~</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></html>
@@ -218,37 +234,30 @@
 	
 	<!-- Special styles -->
 	<template name="emph" match="emph">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\emph{<xsl:apply-templates/>}</latex>
 		<html><EM><xsl:apply-templates/></EM></html>
 	</template>
 	<template name="italic" match="italic">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\textit{<xsl:apply-templates/>}</latex>
 		<html><I><xsl:apply-templates/></I></html>
 	</template>
 	<template name="strong" match="strong">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\textbf{<xsl:apply-templates/>}</latex>
 		<html><STRONG><xsl:apply-templates/></STRONG></html>
 	</template>
 	<template name="bold" match="bold">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\textbf{<xsl:apply-templates/>}</latex>
 		<html><B><xsl:apply-templates/></B></html>
 	</template>
 	<template name="underline" match="underline">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\underline{<xsl:apply-templates/>}</latex>
 		<html><U><xsl:apply-templates/></U></html>
 	</template>
 	<template name="term" match="term">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\term{<xsl:apply-templates/>}</latex>
 		<html><I CLASS="term"><xsl:apply-templates/></I></html>
 	</template>
 	<template name="foreign" match="foreign">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\foreign{<xsl:apply-templates/>}</latex>
 		<html><I CLASS="foreign"><xsl:apply-templates/></I></html>
 	</template>
@@ -256,19 +265,16 @@
 		<!-- <latex>\code{<xsl:apply-templates/>}</latex> -->
 		<!-- Using \verb is quite handy because things like underscores don't bother it.  However, it seems it can't be used inside hyperlinks.   Maybe create another template that just does a \texttt on the contents? -->
 		<!-- OK, but then we need an <underscore> element to stop them from freaking LaTeX out. -->
-		<common><xsl:text> </xsl:text></common>
 		<latex>\verb+<xsl:apply-templates/>+</latex>
 		<html><CODE><xsl:apply-templates/></CODE></html>
 	</template>
 
 	<template name="typewriter" match="typewriter|monospace|tt">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\texttt{<xsl:apply-templates/>}</latex>
 		<html><TT><xsl:apply-templates/></TT></html>
 	</template>
 	
 	<template name="sans-serif" match="sans-serif|sans|ss|sf">
-		<common><xsl:text> </xsl:text></common>
 		<latex>\textsf{<xsl:apply-templates/>}</latex>
 		<html><FONT FACE="sans-serif"><xsl:apply-templates/></FONT></html>
 	</template>
@@ -2017,7 +2023,6 @@
 	-->
 	<template name="paper" match="paper">
 		<common>
-			<xsl:text> </xsl:text>
 			<xsl:apply-templates select="subject-code"/>
 			<xsl:text> </xsl:text>
 			<xsl:apply-templates select="paper-number"/>
