Paragraphs formatting improvements

[librarian.git] / librarian / pdf.py

diff --git a/librarian/pdf.py b/librarian/pdf.py
index 3c83cad..2154985 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -3,6 +3,12 @@
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+"""PDF creation library.
+
+Creates one big XML from the book and its children, converts it to LaTeX
+with TeXML, then runs it by XeLaTeX.
+
+"""

 from __future__ import with_statement
 import os
 import os.path
 from __future__ import with_statement
 import os
 import os.path


@@ -21,7 +27,7 @@ from librarian.dcparser import Person
 from librarian.parser import WLDocument
 from librarian import ParseError, DCNS, get_resource, OutputFile
 from librarian import functions
 from librarian.parser import WLDocument
 from librarian import ParseError, DCNS, get_resource, OutputFile
 from librarian import functions

-from librarian.cover import WLCover
+from librarian.cover import DefaultEbookCover

 
 
 functions.reg_substitute_entities()
 
 
 functions.reg_substitute_entities()


@@ -135,9 +141,13 @@ def hack_motifs(doc):
 
 
 def parse_creator(doc):
 
 
 def parse_creator(doc):

-    """ find all dc:creator and dc.contributor tags and add *_parsed versions with forenames first """
+    """Generates readable versions of creator and translator tags.
+
+    Finds all dc:creator and dc.contributor.translator tags
+    and adds *_parsed versions with forenames first.
+    """

     for person in doc.xpath("|".join('//dc:'+(tag) for tag in (
     for person in doc.xpath("|".join('//dc:'+(tag) for tag in (

-                    'creator', 'contributor.translator', 'contributor.editor', 'contributor.technical_editor')),
+                    'creator', 'contributor.translator')),

                     namespaces = {'dc': str(DCNS)})[::-1]:
         if not person.text:
             continue
                     namespaces = {'dc': str(DCNS)})[::-1]:
         if not person.text:
             continue


@@ -188,32 +198,43 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None,
 
     # Parse XSLT
     try:
 
     # Parse XSLT
     try:

+        book_info = wldoc.book_info

         document = load_including_children(wldoc)
         document = load_including_children(wldoc)

+        root = document.edoc.getroot()

 
         if cover:
             if cover is True:
 
         if cover:
             if cover is True:

-                cover = WLCover
-            bound_cover = cover(document.book_info)
-            document.edoc.getroot().set('data-cover-width', str(bound_cover.width))
-            document.edoc.getroot().set('data-cover-height', str(bound_cover.height))
+                cover = DefaultEbookCover
+            bound_cover = cover(book_info)
+            root.set('data-cover-width', str(bound_cover.width))
+            root.set('data-cover-height', str(bound_cover.height))

             if bound_cover.uses_dc_cover:
             if bound_cover.uses_dc_cover:

-                if document.book_info.cover_by:
-                    document.edoc.getroot().set('data-cover-by', document.book_info.cover_by)
-                if document.book_info.cover_source:
-                    document.edoc.getroot().set('data-cover-source', document.book_info.cover_source)
+                if book_info.cover_by:
+                    root.set('data-cover-by', book_info.cover_by)
+                if book_info.cover_source:
+                    root.set('data-cover-source',
+                            book_info.cover_source)

         if flags:
             for flag in flags:
         if flags:
             for flag in flags:

-                document.edoc.getroot().set('flag-' + flag, 'yes')
+                root.set('flag-' + flag, 'yes')

 
         # check for LaTeX packages
         if morefloats:
 
         # check for LaTeX packages
         if morefloats:

-            document.edoc.getroot().set('morefloats', morefloats.lower())
+            root.set('morefloats', morefloats.lower())

         elif package_available('morefloats', 'maxfloats=19'):
         elif package_available('morefloats', 'maxfloats=19'):

-            document.edoc.getroot().set('morefloats', 'new')
+            root.set('morefloats', 'new')

 
         # add customizations
         if customizations is not None:
 
         # add customizations
         if customizations is not None:

-            document.edoc.getroot().set('customizations', u','.join(customizations))
+            root.set('customizations', u','.join(customizations))
+
+        # add editors info
+        root.set('editors', u', '.join(sorted(
+            editor.readable() for editor in document.editors())))
+        if document.book_info.funders:
+            root.set('funders', u', '.join(document.book_info.funders))
+        if document.book_info.thanks:
+            root.set('thanks', document.book_info.thanks)

 
         # hack the tree
         move_motifs_inside(document.edoc)
 
         # hack the tree
         move_motifs_inside(document.edoc)


@@ -294,7 +315,8 @@ def load_including_children(wldoc=None, provider=None, uri=None):
 
     text = re.sub(ur"([\u0400-\u04ff]+)", ur"<alien>\1</alien>", text)
 
 
     text = re.sub(ur"([\u0400-\u04ff]+)", ur"<alien>\1</alien>", text)
 

-    document = WLDocument.from_string(text, parse_dublincore=True)
+    document = WLDocument.from_string(text,
+                parse_dublincore=True, provider=provider)

     document.swap_endlines()
 
     for child_uri in document.book_info.parts:
     document.swap_endlines()
 
     for child_uri in document.book_info.parts: