FB2: use mode=para for poems -- simplify.

diff --git a/librarian/fb2/fb2.xslt b/librarian/fb2/fb2.xslt
index 3a7b522..915bad4 100644 (file)
--- a/librarian/fb2/fb2.xslt
+++ b/librarian/fb2/fb2.xslt
@@ -48,7 +48,7 @@
                                <xsl:choose>
                                        <xsl:when test="local-name() = 'liryka_l'">
                                                <poem>
                                <xsl:choose>
                                        <xsl:when test="local-name() = 'liryka_l'">
                                                <poem>

-                                                       <xsl:apply-templates mode="poem"/>
+                                                       <xsl:apply-templates mode="para"/>

                                                </poem>
                                        </xsl:when>
 
                                                </poem>
                                        </xsl:when>
 

diff --git a/librarian/fb2/poems.xslt b/librarian/fb2/poems.xslt
index 77716e3..d276ebf 100644 (file)
--- a/librarian/fb2/poems.xslt
+++ b/librarian/fb2/poems.xslt
@@ -14,24 +14,16 @@
        <!-- poems -->
 
        <!-- match poem citations -->
        <!-- poems -->
 
        <!-- match poem citations -->

-       <xsl:template mode="paras" match="poezja_cyt">
+       <xsl:template mode="para" match="poezja_cyt">

                <cite>
                        <poem>
                <cite>
                        <poem>

-                               <xsl:apply-templates mode="poem"/>
+                               <xsl:apply-templates mode="para"/>

                        </poem>
                </cite>
        </xsl:template>
                        </poem>
                </cite>
        </xsl:template>

-       <!-- / XXX: fb2 doesn't allow <poem/> inside <p/> /
-       <xsl:template mode="inline" match="poezja_cyt">
-
-               <poem>
-                       <xsl:apply-templates mode="poem"/>
-               </poem>
-       </xsl:template>
-       -->

 
        <!-- regular poem elements -->
 
        <!-- regular poem elements -->

-       <xsl:template mode="poem" match="strofa">
+       <xsl:template mode="para" match="strofa">

                <stanza>
                        <xsl:call-template name="split-poem">
                                <xsl:with-param name="list" select="."/>
                <stanza>
                        <xsl:call-template name="split-poem">
                                <xsl:with-param name="list" select="."/>


@@ -58,6 +50,4 @@
                        </xsl:call-template>
                </xsl:if>
        </xsl:template>
                        </xsl:call-template>
                </xsl:if>
        </xsl:template>

-
-       <xsl:template match="text()" mode="poem"/>

 </xsl:stylesheet>
 </xsl:stylesheet>