Merge branch 'master' of git@stigma:platforma

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

diff --git a/platforma/static/xsl/html2wl_client.xsl b/platforma/static/xsl/html2wl_client.xsl
old mode 100755 (executable)
new mode 100644 (file)
index 3ee2f9e..d2a25af
--- a/platforma/static/xsl/html2wl_client.xsl
+++ b/platforma/static/xsl/html2wl_client.xsl
@@ -7,7 +7,7 @@
     xmlns:dc="http://purl.org/dc/elements/1.1/"\r
 >\r
 \r
-    <xsl:output method="xml" encoding="utf-8" indent="yes" omit-xml-declaration="yes" />\r
+    <xsl:output method="xml" encoding="utf-8" indent="no" omit-xml-declaration="yes" />\r
     <!--\r
         Ten dokument definiuję przekształcenie odwrotne do wl2html\r
     -->\r
@@ -22,7 +22,7 @@
     <xsl:template match="@*" priority="0" />\r
 \r
     <!-- Specjalne reguły dla przypisów -->\r
-    <xsl:template match="*[@x-annotation-box]">\r
+    <xsl:template match="*[@x-annotation-box]|*[@class='theme-text-list']">\r
         <xsl:apply-templates select="node()" />\r
     </xsl:template>\r
 \r
@@ -32,8 +32,12 @@
             <xsl:apply-templates select="node()" />\r
         </xsl:element>\r
     </xsl:template>   \r
+       \r
+       <xsl:template match="*[@x-node = 'out-of-flow-text']">\r
+               <xsl:apply-templates select="child::node()" />\r
+       </xsl:template>\r
 \r
-    <xsl:template match="*[@x-node = 'out-of-flow-text']"><xsl:value-of select="@x-content" /></xsl:template>\r
+    <xsl:template match="*[@x-node = 'out-of-flow-text']/text()"><xsl:value-of select="." /></xsl:template>\r
 \r
     <!-- Specjalne reguły dla wersów -->\r
     <xsl:template match="*[@x-node = 'wers']">\r
@@ -71,9 +75,13 @@
             <xsl:apply-templates select="@*" />\r
             <xsl:apply-templates select="node()" />\r
         </xsl:element>\r
-    </xsl:template>\r
-\r
-    <xsl:template match="*[@X-NODE = 'out-of-flow-text']"><xsl:value-of select="@X-CONTENT" /></xsl:template>\r
+    </xsl:template>   \r
+       \r
+       <xsl:template match="*[@X-NODE = 'out-of-flow-text']" priority="1">\r
+               <xsl:apply-templates select="child::node()" />\r
+       </xsl:template>\r
+    \r
+    <xsl:template match="*[@X-NODE = 'out-of-flow-text']/text()"><xsl:value-of select="." /></xsl:template>\r
 \r
     <!-- Specjalne reguły dla wersów -->\r
     <xsl:template match="*[@X-NODE = 'wers']">\r