diff --git a/format-master.xml b/format-master.xml
index 508ebf9..83f87fb 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -126,7 +126,7 @@
 	</template>
 	
 	<!--
-		Insert a space. Useful for the occaisional case where two
+		Insert a space. Useful for the occasional 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
@@ -139,15 +139,20 @@
 		this is what the LaTeX version of the markup produces.
 	-->
 	<template name="space" match="space">
-		<html><xsl:text> </xsl:text></html>
 		<latex><xsl:text>\ </xsl:text></latex>
+		<html><xsl:text> </xsl:text></html>
 	</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>
 	</template>
-
+	
+	<template name="thin-space" match="thin-space|thinspace">
+		<latex>\,</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;thinsp;</xsl:text></html>
+	</template>
+	
 	<!--
 		Technically we don't need to disable output escaping for all of
 		these, but it's probably better to code them all consistently,
@@ -2440,8 +2445,7 @@
 	
 	<!-- Digit grouping separator character for large numbers.  SI conventions say this should be a space (but we could make it a comma if desired). -->
 	<template name="digit-group-separator" match="digit-group-separator|digitsep">
-		<html><xsl:call-template name="non-breaking-space" /></html>
-		<latex><xsl:text>\,</xsl:text></latex>
+		<common><xsl:call-template name="thin-space" /></common>
 	</template>
 
 	<!-- Mathematical super- and subscript. -->
