description (sponsor info) in lesson pdf

diff --git a/librarian/pdf.py b/librarian/pdf.py
index 2f5c209..c02e98c 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -81,7 +81,7 @@ def fix_hanging(doc):
     insert_tags(doc,
                 re.compile("(?<=\s\w)\s+"),
                 "nbsp",
     insert_tags(doc,
                 re.compile("(?<=\s\w)\s+"),
                 "nbsp",

-                exclude=[DCNS("identifier.url"), DCNS("rights.license")]
+                exclude=[DCNS("identifier.url"), DCNS("rights.license"), DCNS("title"), DCNS("description")]

                 )
 
 
                 )
 
 

diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 408b18d..aa4dc1d 100644 (file)
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -29,7 +29,7 @@ def escape(really):
         def _wrap(*args, **kw):
             value = f(*args, **kw)
 
         def _wrap(*args, **kw):
             value = f(*args, **kw)
 

-            prefix = (u'<TeXML escape="%d">' % (really and 1 or 0))
+            prefix = (u'<TeXML escape="%d">' % (1 if really else 0))

             postfix = u'</TeXML>'
             if isinstance(value, list):
                 import pdb
             postfix = u'</TeXML>'
             if isinstance(value, list):
                 import pdb


@@ -108,10 +108,14 @@ class EduModule(Xmill):
             authors = getattr(dc, "authors_%s" % which)
         return u', '.join(author.readable() for author in authors if author)
 
             authors = getattr(dc, "authors_%s" % which)
         return u', '.join(author.readable() for author in authors if author)
 

-    @escape(1)
+    @escape(True)

     def get_title(self, element):
         return self.get_dc(element, 'title', True)
 
     def get_title(self, element):
         return self.get_dc(element, 'title', True)
 

+    @escape(True)
+    def get_description(self, element):
+        return self.get_dc(element, 'description', single=True)
+

     def handle_utwor(self, element):
         lines = [
             u'''
     def handle_utwor(self, element):
         lines = [
             u'''


@@ -130,6 +134,7 @@ class EduModule(Xmill):
             u'''\\def\\authorsexpert{%s}''' % self.get_authors(element, 'expert'),
             u'''\\def\\authorsscenario{%s}''' % self.get_authors(element, 'scenario'),
             u'''\\def\\authorstextbook{%s}''' % self.get_authors(element, 'textbook'),
             u'''\\def\\authorsexpert{%s}''' % self.get_authors(element, 'expert'),
             u'''\\def\\authorsscenario{%s}''' % self.get_authors(element, 'scenario'),
             u'''\\def\\authorstextbook{%s}''' % self.get_authors(element, 'textbook'),

+            u'''\\def\\description{%s}''' % self.get_description(element),

 
             u'''\\author{\\authors}''',
             u'''\\title{%s}''' % self.get_title(element),
 
             u'''\\author{\\authors}''',
             u'''\\title{%s}''' % self.get_title(element),


@@ -140,14 +145,14 @@ class EduModule(Xmill):
 
         return u"".join(filter(None, lines)), u'</TeXML>'
 
 
         return u"".join(filter(None, lines)), u'</TeXML>'
 

-    @escape(1)
+    @escape(True)

     def handle_powiesc(self, element):
         return u"""
     <env name="document">
     <cmd name="maketitle"/>
     """, """<cmd name="editorialsection" /></env>"""
 
     def handle_powiesc(self, element):
         return u"""
     <env name="document">
     <cmd name="maketitle"/>
     """, """<cmd name="editorialsection" /></env>"""
 

-    @escape(1)
+    @escape(True)

     def handle_texcommand(self, element):
         cmd = functions.texcommand(element.tag)
         return u'<TeXML escape="1"><cmd name="%s"><parm>' % cmd, u'</parm></cmd></TeXML>'
     def handle_texcommand(self, element):
         cmd = functions.texcommand(element.tag)
         return u'<TeXML escape="1"><cmd name="%s"><parm>' % cmd, u'</parm></cmd></TeXML>'


@@ -386,11 +391,11 @@ class EduModule(Xmill):
 <cmd name="begin"><parm>tabular</parm><parm>%s</parm></cmd>
     ''' % ('l' * max_col), u'''<cmd name="end"><parm>tabular</parm></cmd>'''
 
 <cmd name="begin"><parm>tabular</parm><parm>%s</parm></cmd>
     ''' % ('l' * max_col), u'''<cmd name="end"><parm>tabular</parm></cmd>'''
 

-    @escape(1)
+    @escape(True)

     def handle_wiersz(self, element):
         return u"", u'<ctrl ch="\\"/>'
 
     def handle_wiersz(self, element):
         return u"", u'<ctrl ch="\\"/>'
 

-    @escape(1)
+    @escape(True)

     def handle_kol(self, element):
         if element.getnext() is not None:
             return u"", u'<spec cat="align" />'
     def handle_kol(self, element):
         if element.getnext() is not None:
             return u"", u'<spec cat="align" />'

diff --git a/librarian/res/styles/edumed/pdf/edumed.sty b/librarian/res/styles/edumed/pdf/edumed.sty
index b25a99d..dc856d1 100644 (file)
--- a/librarian/res/styles/edumed/pdf/edumed.sty
+++ b/librarian/res/styles/edumed/pdf/edumed.sty
@@ -68,6 +68,9 @@ Materiał pochodzi z serwisu \href{http://edukacjamedialna.edu.pl}{edukacjamedia
 \vspace{.6em}
 Źródło: \href{\bookurl}{\bookurl}.
 
 \vspace{.6em}
 Źródło: \href{\bookurl}{\bookurl}.
 

+\vspace{.6em}
+\description
+

     \color{black}
   }
   \end{figure}
     \color{black}
   }
   \end{figure}