X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/cec81dc04a23808077505265a3f8bb0e9b6053cb..3cae7a60cf91b6e2b84628c5f3b4b2df77eda5d6:/librarian/fb2/poems.xslt

diff --git a/librarian/fb2/poems.xslt b/librarian/fb2/poems.xslt
index a9ef901..257795b 100644
--- a/librarian/fb2/poems.xslt
+++ b/librarian/fb2/poems.xslt
@@ -14,48 +14,30 @@
 	<!-- poems -->
 
 	<!-- match poem citations -->
-	<xsl:template mode="paras" match="poezja_cyt">
+	<xsl:template mode="para" match="poezja_cyt">
 		<cite>
 			<poem>
-				<xsl:apply-templates mode="poem"/>
+				<xsl:apply-templates mode="para"/>
 			</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 -->
-	<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="."/>
-			</xsl:call-template>
+			<xsl:apply-templates mode="poem"/>
 		</stanza>
 	</xsl:template>
 
-	<!-- split into verses -->
-	<xsl:template name="split-poem">
-		<xsl:param name="list"></xsl:param>
-
-		<xsl:if test="$list != ''">
-			<xsl:variable name="before"
-				select="substring-before(concat($list, '/'), '/')"/>
-			<xsl:variable name="after"
-				select="substring-after($list, '/')"/>
+	<xsl:template mode="inline" match="strofa">
+		<xsl:apply-templates select="." mode="para"/>
+	</xsl:template>
 
-			<v>
-				<xsl:value-of select="$before"/>
-			</v>
+	<!-- XXX: it should be done elsewhere but our cheap verse splitting
+		puts it here -->
+	<xsl:template match="motyw" mode="poem"/>
 
-			<xsl:call-template name="split-poem">
-				<xsl:with-param name="list" select="$after"/>
-			</xsl:call-template>
-		</xsl:if>
+	<xsl:template mode="poem" match="wers_normalny|wers_cd|wers_wciety|wers_akap|wers_do_prawej">
+		<v><xsl:apply-templates mode="inline"/></v>
 	</xsl:template>
 </xsl:stylesheet>