Tweak whitespace-preserving templates.

We don't want to add whitespace to span-level elements which were
empty to start with, which is normal for e.g. img elements.

Also, if an element contains _only_ whitespace, it was probably put
there on purpose so let's preserve it.

diff --git a/layouts/default.xsl b/layouts/default.xsl
index 5a01d79cfcf870176fbc94052b4fa7c1765f3a73..bfe9101a6bb4c55444dd5171d5b39366f566220a 100644 (file)
--- a/layouts/default.xsl
+++ b/layouts/default.xsl
@@ -81,7 +81,10 @@
   <xsl:call-template name='glue-preceding-span' />
   <xsl:copy>
     <xsl:apply-templates select='node()|@*' />
-    <xsl:text>&#x2060;</xsl:text> <!-- avoid breaking within a span element -->
+    <xsl:if test='*'>
+      <!-- avoid breaking within a span element -->
+      <xsl:text>&#x2060;</xsl:text>
+    </xsl:if>
   </xsl:copy>
 </xsl:template>
 
@@ -97,6 +100,8 @@
     </xsl:when>
     <!-- preserve anything under <pre> -->
     <xsl:when test='ancestor::xhtml:pre'><xsl:copy /></xsl:when>
+    <!-- preserve whitespace which is the only child node of an element -->
+    <xsl:when test='count(../node()) = 1'><xsl:copy /></xsl:when>
   </xsl:choose>
 </xsl:template>