allow strofa inside table + fix table border in html/epub + fix empty verses in epub

[librarian.git] / librarian / xslt / book2html.xslt

diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt
index cde280e..4b6c72a 100644 (file)
--- a/librarian/xslt/book2html.xslt
+++ b/librarian/xslt/book2html.xslt
@@ -193,6 +193,10 @@
     </p>
 </xsl:template>
 
+<xsl:template match="strofa" mode="inline">
+    <xsl:apply-templates select="." />
+</xsl:template>
+
 <xsl:template match="strofa">
     <div class="stanza">
       <xsl:call-template name="section-anchor"/>
@@ -200,7 +204,7 @@
             <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:with-param name="verse-type" select="br[1]/preceding-sibling::*[name() = 'wers_wciety' or name() = 'wers_akap' or name() = 'wers_cd' or name() = 'wers_do_prawej'][1]" />
                 </xsl:call-template>
                 <xsl:for-each select="br">             
                                <!-- Each BR tag "consumes" text after it -->
@@ -208,14 +212,14 @@
                     <xsl:call-template name="verse">
                         <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: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' or name() = 'wers_do_prawej')][1]" />
                     </xsl:call-template>
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
                 <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:with-param name="verse-type" select="wers_wciety|wers_akap|wers_cd|wers_do_prawej[1]" />
                  </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>
@@ -243,6 +247,9 @@
             <xsl:when test="name($verse-type) = 'wers_cd'">
                 <xsl:attribute name="style">padding-left: 12em</xsl:attribute>
             </xsl:when>
+            <xsl:when test="name($verse-type) = 'wers_do_prawej'">
+                <xsl:attribute name="style">text-align: right</xsl:attribute>
+            </xsl:when>
         </xsl:choose>
         <xsl:apply-templates select="$verse-content" mode="inline" />
     </p>
@@ -252,8 +259,15 @@
     <p class="motto_podpis"><xsl:apply-templates mode="inline" /></p>
 </xsl:template>
 
-<xsl:template match="tabela">
-    <table><xsl:apply-templates /></table>
+<xsl:template match="tabela|tabelka">
+    <xsl:choose>
+        <xsl:when test="@ramka = '1'">
+            <table class="border"><xsl:apply-templates /></table>
+        </xsl:when>
+        <xsl:otherwise>
+            <table><xsl:apply-templates /></table>
+        </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>
 <xsl:template match="wiersz">
     <tr><xsl:apply-templates /></tr>
@@ -300,6 +314,14 @@
     <em class="author-emphasis"><xsl:apply-templates mode="inline" /></em>
 </xsl:template>
 
+<xsl:template match="wieksze_odstepy" mode="inline">
+    <em class="wieksze-odstepy"><xsl:apply-templates mode="inline" /></em>
+</xsl:template>
+
+<xsl:template match="indeks_dolny" mode="inline">
+    <sub><xsl:apply-templates mode="inline" /></sub>
+</xsl:template>
+
 <xsl:template match="osoba" mode="inline">
     <em class="person"><xsl:apply-templates mode="inline" /></em>
 </xsl:template>