fix author name

diff --git a/librarian/epub.py b/librarian/epub.py
index 52294dd..e992f40 100644 (file)
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -20,6 +20,10 @@ sys.path.append('..') # for running from working copy
 from librarian import XMLNamespace, RDFNS, DCNS, WLNS, NCXNS, OPFNS, NoDublinCore
 from librarian.dcparser import BookInfo
 
 from librarian import XMLNamespace, RDFNS, DCNS, WLNS, NCXNS, OPFNS, NoDublinCore
 from librarian.dcparser import BookInfo
 

+from librarian import functions
+
+functions.reg_person_name()
+

 
 def inner_xml(node):
     """ returns node's text and children as a string
 
 def inner_xml(node):
     """ returns node's text and children as a string

diff --git a/librarian/epub/xsltTitle.xsl b/librarian/epub/xsltTitle.xsl
index c69db26..3b24c76 100644 (file)
--- a/librarian/epub/xsltTitle.xsl
+++ b/librarian/epub/xsltTitle.xsl
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dc="http://purl.org/dc/elements/1.1/">\r
+<xsl:stylesheet version="1.0" \r
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+    xmlns:dc="http://purl.org/dc/elements/1.1/"\r
+    xmlns:wl="http://wolnelektury.pl/functions">\r

   <xsl:output method="html" version="1.0" encoding="utf-8" />\r
   <xsl:output doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" />\r
   <xsl:output doctype-public="-//W3C//DTD XHTML 1.1//EN" />\r
   <xsl:output method="html" version="1.0" encoding="utf-8" />\r
   <xsl:output doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" />\r
   <xsl:output doctype-public="-//W3C//DTD XHTML 1.1//EN" />\r


@@ -18,10 +21,12 @@
           <div class='title-page'>\r
             <xsl:choose>\r
               <xsl:when test="//autor_utworu | //nazwa_utworu">\r
           <div class='title-page'>\r
             <xsl:choose>\r
               <xsl:when test="//autor_utworu | //nazwa_utworu">\r

-                <xsl:apply-templates select="//autor_utworu | //nazwa_utworu | //podtytul | //dzielo_nadrzedne" mode="poczatek"/>\r
+                <xsl:apply-templates select="//autor_utworu" mode="poczatek"/>\r
+                <xsl:apply-templates select="//nazwa_utworu | //podtytul | //dzielo_nadrzedne" mode="poczatek"/>\r

               </xsl:when>\r
               <xsl:otherwise>\r
               </xsl:when>\r
               <xsl:otherwise>\r

-                <xsl:apply-templates select="//dc:creator | //dc:title | //podtytul | //dzielo_nadrzedne" mode="poczatek"/>\r
+                <xsl:apply-templates select="//dc:creator" mode="poczatek"/>\r
+                <xsl:apply-templates select="//dc:title | //podtytul | //dzielo_nadrzedne" mode="poczatek"/>\r

               </xsl:otherwise>\r
             </xsl:choose>\r
           </div>\r
               </xsl:otherwise>\r
             </xsl:choose>\r
           </div>\r


@@ -48,6 +53,12 @@
     </div>\r
   </xsl:template>\r
 \r
     </div>\r
   </xsl:template>\r
 \r

+  <xsl:template match="dc:creator/text()">\r
+    <div class="author" xmlns="http://www.w3.org/1999/xhtml">\r
+      <xsl:value-of select="wl:person_name(.)" />\r
+    </div>\r
+  </xsl:template>\r
+\r

   <xsl:template match="autor_utworu" mode="poczatek">\r
     <div class="author" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
   <xsl:template match="autor_utworu" mode="poczatek">\r
     <div class="author" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r