merged a conflict in dcparser fields

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

diff --git a/librarian/epub/xsltAnnotations.xsl b/librarian/epub/xsltAnnotations.xsl
index bc5693e..f3e6443 100644 (file)
--- a/librarian/epub/xsltAnnotations.xsl
+++ b/librarian/epub/xsltAnnotations.xsl
@@ -27,17 +27,18 @@
   </xsl:template>
 
   <xsl:template match="text()" >
   </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">
   </xsl:template>
 
   <xsl:template match="pa|pe|pr|pt" mode="przypis">

-    <div xmlns="http://www.w3.org/1999/xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml" class="annotation">

       <p id="annotation-{@number}" xmlns="http://www.w3.org/1999/xhtml"></p>
       <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">
+      <a class="annotation-anchor" href="part{@part}.html#anchor-{@number}" xmlns="http://www.w3.org/1999/xhtml">

         [<xsl:value-of select="@number" />]
       </a>
         [<xsl:value-of select="@number" />]
       </a>

-      <p xmlns="http://www.w3.org/1999/xhtml">
+      <p class="annotation-body" xmlns="http://www.w3.org/1999/xhtml">

         <xsl:apply-templates />
         <xsl:apply-templates />

+        <xsl:if test="name()='pa'"> [przypis autorski]</xsl:if>

       </p>
     </div>
   </xsl:template>
       </p>
     </div>
   </xsl:template>


@@ -74,4 +75,4 @@
     </p>
   </xsl:template>
 
     </p>
   </xsl:template>
 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>