From: Jan Szejko <janek37@gmail.com>
Date: Wed, 8 Mar 2017 12:29:04 +0000 (+0100)
Subject: publisher info in generated files (except fb2)
X-Git-Tag: 1.7~62
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/2ea20e32dd822ece8a2df9693da42cfdaffcbc72?ds=sidebyside

publisher info in generated files (except fb2)
---

diff --git a/librarian/epub/xsltLast.xsl b/librarian/epub/xsltLast.xsl
index 34d42f7..67bea8e 100644
--- a/librarian/epub/xsltLast.xsl
+++ b/librarian/epub/xsltLast.xsl
@@ -57,6 +57,16 @@
             <p class="info">Tekst opracowany na podstawie: <xsl:value-of select="//dc:source" /></p>
           </xsl:if>
 
+          <xsl:if test=".//dc:publisher">
+            <p class="info">
+              Wydawca:
+              <xsl:for-each select="//dc:publisher/text()">
+                <xsl:value-of select="."/>
+                <xsl:if test="not(position() = last())">, </xsl:if>
+              </xsl:for-each>
+            </p>
+          </xsl:if>
+
           <xsl:if test="//dc:description" >
             <p class="info"><xsl:value-of select="//dc:description" /></p>
           </xsl:if>
diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index ac7507a..82098ec 100644
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -259,6 +259,8 @@ Letters={SmallCaps,UppercaseSmallCaps}
     \vspace{.6em}
     \sourceinfo
 
+    \publisherinfo
+
     \description
     \vspace{.6em}
 
diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index 652a081..ecde99c 100644
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -191,6 +191,17 @@
                 Tekst opracowany na podstawie: <TeXML escape="1"><xsl:apply-templates select=".//dc:source" mode="inline" /></TeXML>
                 \vspace{.6em}
             </xsl:if>}
+        \def\publisherinfo{
+            <xsl:if test=".//dc:publisher">
+                Wydawca:
+                <TeXML escape="1">
+                    <xsl:for-each select="//dc:publisher/text()">
+                        <xsl:value-of select="."/>
+                        <xsl:if test="not(position() = last())">, </xsl:if>
+                    </xsl:for-each>
+                </TeXML>
+                \vspace{.6em}
+            </xsl:if>}
         \def\description{<TeXML escape="1"><xsl:apply-templates select=".//dc:description" mode="inline" /></TeXML>}
     </TeXML>
 </xsl:template>
diff --git a/librarian/text.py b/librarian/text.py
index 0eb7b59..e19716e 100644
--- a/librarian/text.py
+++ b/librarian/text.py
@@ -24,7 +24,7 @@ Wersja lektury w opracowaniu merytorycznym i krytycznym (przypisy i motywy) dost
 
 Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Nowoczesna Polska.
 
-%(license_description)s.%(source)s
+%(license_description)s.%(source)s%(publisher)s
 
 %(description)s%(contributors)s%(funders)s
 """
@@ -84,6 +84,7 @@ def transform(wldoc, flags=None, **options):
             funders = ', '.join(parsed_dc.funders)
             if funders:
                 funders = u"\n\nPublikację ufundowali i ufundowały: %s." % funders
+            publisher = '\n\nWydawca: ' + ', '.join(parsed_dc.publisher)
         else:
             description = 'Publikacja zrealizowana w ramach projektu Wolne Lektury (http://wolnelektury.pl).'
             url = '*' * 10
@@ -91,6 +92,7 @@ def transform(wldoc, flags=None, **options):
             source = ""
             contributors = ""
             funders = ""
+            publisher = ""
         result = (TEMPLATE % {
             'description': description,
             'url': url,
@@ -99,6 +101,7 @@ def transform(wldoc, flags=None, **options):
             'source': source,
             'contributors': contributors,
             'funders': funders,
+            'publisher': publisher,
         }).encode('utf-8')
     else:
         result = unicode(result).encode('utf-8')