Merge remote-tracking branch 'upstream/master'

[librarian.git] / librarian / epub / xsltAnnotations.xsl

diff --git a/librarian/epub/xsltAnnotations.xsl b/librarian/epub/xsltAnnotations.xsl
index bc5693e..7d270b4 100644 (file)
--- a/librarian/epub/xsltAnnotations.xsl
+++ b/librarian/epub/xsltAnnotations.xsl
@@ -27,19 +27,12 @@
   </xsl:template>
 
   <xsl:template match="text()" >
-    <xsl:value-of select="." disable-output-escaping="yes"/>
+    <xsl:value-of select="." />
   </xsl:template>
 
   <xsl:template match="pa|pe|pr|pt" mode="przypis">
-    <div xmlns="http://www.w3.org/1999/xhtml">
-      <p id="annotation-{@number}" xmlns="http://www.w3.org/1999/xhtml"></p>
-      <a class="annotation" href="part{@part}.html#anchor-{@number}" xmlns="http://www.w3.org/1999/xhtml">
-        [<xsl:value-of select="@number" />]
-      </a>
-      <p xmlns="http://www.w3.org/1999/xhtml">
-        <xsl:apply-templates />
-      </p>
-    </div>
+    <p id="annotation-{@number}" class="annotation" xmlns="http://www.w3.org/1999/xhtml"><a href="part{@part}.html#anchor-{@number}" xmlns="http://www.w3.org/1999/xhtml"><xsl:value-of select="@number" /></a>. <xsl:apply-templates /><xsl:if test="name()='pa'"> [przypis autorski]</xsl:if></p>
+    <xsl:text>&#xa;</xsl:text>
   </xsl:template>
 
   <xsl:template match="slowo_obce">
@@ -74,4 +67,4 @@
     </p>
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>