Pokazywanie przypisów w odpowiednim miejscu i ustalenie dla nich minimalnych rozmiarów.

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

diff --git a/platforma/static/xsl/wl2html_client.xsl b/platforma/static/xsl/wl2html_client.xsl
index 517d59b..d9758ea 100755 (executable)
--- a/platforma/static/xsl/wl2html_client.xsl
+++ b/platforma/static/xsl/wl2html_client.xsl
@@ -7,9 +7,9 @@
     -->        
     <xsl:output method="xml" encoding="utf-8" indent="no" omit-xml-declaration="yes" />
 
     -->        
     <xsl:output method="xml" encoding="utf-8" indent="no" omit-xml-declaration="yes" />
 

-    <xsl:template match="/">
+    <!-- <xsl:template match="/">

         <xsl:apply-templates select="chunk|utwor" />
         <xsl:apply-templates select="chunk|utwor" />

-    </xsl:template>
+    </xsl:template> -->

 
     <!--
         Base tag for rendering a fragment of text
 
     <!--
         Base tag for rendering a fragment of text


@@ -27,7 +27,7 @@
     <xsl:template match="utwor">
         <div>
             <xsl:call-template name="standard-attributes" />
     <xsl:template match="utwor">
         <div>
             <xsl:call-template name="standard-attributes" />

-            <xsl:apply-templates select="child::*">
+            <xsl:apply-templates select="child::* | text()">

                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
         </div>
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
         </div>


@@ -680,7 +680,7 @@
                 <xsl:value-of select="substring-after(@id, 'm')" />
             </xsl:attribute>
             <xsl:call-template name="context-menu" />
                 <xsl:value-of select="substring-after(@id, 'm')" />
             </xsl:attribute>
             <xsl:call-template name="context-menu" />

-            <span class="theme-text-list"><xsl:value-of select="." /></span>
+            <span class="theme-text-list"><xsl:value-of select=".|node()" /></span>

         </span>
     </xsl:template>
 
         </span>
     </xsl:template>
 


@@ -701,11 +701,11 @@
     -->
 
     <xsl:template match="text()">
     -->
 
     <xsl:template match="text()">

+        <!-- <xsl:value-of select="." /> -->

         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />
         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />

-            <xsl:when test="not($mixed)"><span x-node="out-of-flow-text" class="out-of-flow-text"
-                    x-content="{.}"></span></xsl:when>
+            <xsl:when test="not($mixed)"><div x-node="out-of-flow-text" class="out-of-flow-text"><xsl:value-of select="." /></div></xsl:when>

             <xsl:otherwise><xsl:value-of select="." /></xsl:otherwise>
         </xsl:choose>
     </xsl:template>
             <xsl:otherwise><xsl:value-of select="." /></xsl:otherwise>
         </xsl:choose>
     </xsl:template>