X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e459e4567cc578abd5d7e02e70a01ec9464f474d..afdb8fd05511c5280e8ee251389cb893786eb810:/platforma/static/xsl/html2wl_client.xsl?ds=inline

diff --git a/platforma/static/xsl/html2wl_client.xsl b/platforma/static/xsl/html2wl_client.xsl
old mode 100755
new mode 100644
index 3ee2f9ef..d2a25af9
--- 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/"
 >
 
-    <xsl:output method="xml" encoding="utf-8" indent="yes" omit-xml-declaration="yes" />
+    <xsl:output method="xml" encoding="utf-8" indent="no" omit-xml-declaration="yes" />
     <!--
         Ten dokument definiuję przekształcenie odwrotne do wl2html
     -->
@@ -22,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>
 
@@ -32,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']">
@@ -71,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']">