fixes #953: Leave users' whitespace alone. I'm serious!

[redakcja.git] / redakcja / static / xsl / wl2html_client.xsl

diff --git a/redakcja/static/xsl/wl2html_client.xsl b/redakcja/static/xsl/wl2html_client.xsl
index 4414b0a..e0c6d8b 100644 (file)
--- a/redakcja/static/xsl/wl2html_client.xsl
+++ b/redakcja/static/xsl/wl2html_client.xsl
@@ -728,7 +728,9 @@
         <!-- <xsl:value-of select="." /> -->
         <xsl:param name="mixed" />
         <xsl:choose>
         <!-- <xsl:value-of select="." /> -->
         <xsl:param name="mixed" />
         <xsl:choose>

-            <xsl:when test="normalize-space(.) = ''" />
+            <xsl:when test="normalize-space(.) = ''">
+                <xsl:value-of select="." />
+            </xsl:when>

             <xsl:when test="not($mixed)">
                <span x-node="out-of-flow-text" class="out-of-flow-text" x-editable="true">
                        <xsl:value-of select="." />
             <xsl:when test="not($mixed)">
                <span x-node="out-of-flow-text" class="out-of-flow-text" x-editable="true">
                        <xsl:value-of select="." />


@@ -753,14 +755,16 @@
        
        <!-- 
                Earlier versions of html2wl introduced a BUG, that 'causes "out-of-flow-text" tag to appear.
        
        <!-- 
                Earlier versions of html2wl introduced a BUG, that 'causes "out-of-flow-text" tag to appear.

-               Instead of marking it as "unknown", just pass thru it
+               Instead of marking it as "unknown", just pass thru it.
+               Keep a pass-thru span for out-of-flow box editing

        -->
        -->

-       <xsl:template match="out-of-flow-text">
-               <xsl:param name="mixed" />
-               <xsl:apply-templates select="child::node()">
-                <xsl:with-param name="mixed" select="$mixed" />
-            </xsl:apply-templates>
-       </xsl:template> 
+    <xsl:template match="out-of-flow-text">
+        <span data-pass-thru="true">
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="false()" />
+            </xsl:apply-templates>        
+        </span>
+    </xsl:template>

 
     <xsl:template match="*">
         <span class="unknown-tag" x-node="{name()}">
 
     <xsl:template match="*">
         <span class="unknown-tag" x-node="{name()}">