X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4607903456ce2c96d5c40d72c603093ef02f5d29..514e98aeae05045d0086aae39960124a572e646f:/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
new mode 100644
index 726a404a..d2a25af9
--- a/platforma/static/xsl/html2wl_client.xsl
+++ b/platforma/static/xsl/html2wl_client.xsl
@@ -7,12 +7,11 @@
     xmlns:dc="http://purl.org/dc/elements/1.1/"
 >
 
-    <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+    <xsl:output method="xml" encoding="utf-8" indent="no" omit-xml-declaration="yes" />
     <!--
         Ten dokument definiuję przekształcenie odwrotne do wl2html
     -->
 
-
     <xsl:template match="comment()"><xsl:copy /></xsl:template>
 
     <!-- libxslt has fuck-ed prorities -->
@@ -23,7 +22,7 @@
     <xsl:template match="@*" priority="0" />
 
     <!-- Specjalne reguły dla przypisów -->
-    <xsl:template match="*[@x-annotation-box]">
+    <xsl:template match="*[@x-annotation-box]|*[@class='theme-text-list']">
         <xsl:apply-templates select="node()" />
     </xsl:template>
 
@@ -33,8 +32,12 @@
             <xsl:apply-templates select="node()" />
         </xsl:element>
     </xsl:template>   
+	
+	<xsl:template match="*[@x-node = 'out-of-flow-text']">
+		<xsl:apply-templates select="child::node()" />
+	</xsl:template>
 
-    <xsl:template match="*[@x-node = 'out-of-flow-text']"><xsl:value-of select="@x-content" /></xsl:template>
+    <xsl:template match="*[@x-node = 'out-of-flow-text']/text()"><xsl:value-of select="." /></xsl:template>
 
     <!-- Specjalne reguły dla wersów -->
     <xsl:template match="*[@x-node = 'wers']">
@@ -72,9 +75,13 @@
             <xsl:apply-templates select="@*" />
             <xsl:apply-templates select="node()" />
         </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="*[@X-NODE = 'out-of-flow-text']"><xsl:value-of select="@X-CONTENT" /></xsl:template>
+    </xsl:template>   
+	
+	<xsl:template match="*[@X-NODE = 'out-of-flow-text']" priority="1">
+		<xsl:apply-templates select="child::node()" />
+	</xsl:template>
+    
+    <xsl:template match="*[@X-NODE = 'out-of-flow-text']/text()"><xsl:value-of select="." /></xsl:template>
 
     <!-- Specjalne reguły dla wersów -->
     <xsl:template match="*[@X-NODE = 'wers']">
@@ -86,8 +93,8 @@
         <xsl:element name="{@X-NODE}" namespace="{@X-NS}"><xsl:apply-templates select="@*|node()" /></xsl:element>
         <xsl:if test="count(following-sibling::*[starts-with(@X-NODE, 'wers')]) > 0"><xsl:text>/&#x000a;</xsl:text></xsl:if>
     </xsl:template>
-
-    
-    
+        
     <xsl:template match="*" />
+        
+    
 </xsl:stylesheet>
\ No newline at end of file