X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a2f8ee881d66601e9cb714069dc88d3ed9703db6..d051252ae9d76d0dfa675590214726963bca7cbb:/librarian/xslt/book2txt.xslt

diff --git a/librarian/xslt/book2txt.xslt b/librarian/xslt/book2txt.xslt
old mode 100755
new mode 100644
index 604b8bd..f41d154
--- a/librarian/xslt/book2txt.xslt
+++ b/librarian/xslt/book2txt.xslt
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- 
+
    This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
    Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
-  
+
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:wl="http://wolnelektury.pl/functions"
@@ -18,7 +18,7 @@
 <!-- = (can contain block tags, paragraph tags, standalone tags and special tags) = -->
 <!-- ============================================================================== -->
 <xsl:template match="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny">
-<xsl:if test="nazwa_utworu">
+<xsl:if test="not (../@raw-text) and nazwa_utworu">
     <xsl:apply-templates select="autor_utworu|dzielo_nadrzedne|nazwa_utworu|podtytul" mode="header" />
     <xsl:call-template name="translators" />
     <xsl:text>
@@ -39,6 +39,10 @@
 <xsl:apply-templates />
 </xsl:template>
 
+<xsl:template match="ramka">
+<xsl:apply-templates />
+</xsl:template>
+
 <xsl:template match="lista_osob">
 <xsl:text>
 
@@ -152,7 +156,7 @@
     <xsl:apply-templates select="*|text()" mode="inline" />
 </xsl:variable>
 <xsl:text>
-    
+
 / </xsl:text><xsl:value-of select="wl:wrap_words(wl:strip($content), $wrapping)" /><xsl:text> /</xsl:text>
 </xsl:template>
 
@@ -176,16 +180,16 @@
 <xsl:text>
 </xsl:text>
     <xsl:choose>
-        <xsl:when test="count(br) > 0">     
+        <xsl:when test="count(br) > 0">
             <xsl:call-template name="verse">
                 <xsl:with-param name="verse-content" select="br[1]/preceding-sibling::text() | br[1]/preceding-sibling::node()" />
                 <xsl:with-param name="verse-type" select="br[1]/preceding-sibling::*[name() = 'wers_wciety' or name() = 'wers_akap' or name() = 'wers_cd'][1]" />
-            </xsl:call-template>    
+            </xsl:call-template>
             <xsl:for-each select="br">		
     			<!-- Each BR tag "consumes" text after it -->
                 <xsl:variable name="lnum" select="count(preceding-sibling::br)" />
                 <xsl:call-template name="verse">
-                    <xsl:with-param name="verse-content" 
+                    <xsl:with-param name="verse-content"
                         select="following-sibling::text()[count(preceding-sibling::br) = $lnum+1] | following-sibling::node()[count(preceding-sibling::br) = $lnum+1]" />
                     <xsl:with-param name="verse-type" select="following-sibling::*[count(preceding-sibling::br) = $lnum+1 and (name() = 'wers_wciety' or name() = 'wers_akap' or name() = 'wers_cd')][1]" />
                 </xsl:call-template>
@@ -195,7 +199,7 @@
             <xsl:call-template name="verse">
                 <xsl:with-param name="verse-content" select="text() | node()" />
                 <xsl:with-param name="verse-type" select="wers_wciety|wers_akap|wers_cd[1]" />
-             </xsl:call-template>           
+             </xsl:call-template>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>