Revert "[epub, mobi] Fix for a problem with epubs, mobi in drama ebooks without acts"

[librarian.git] / librarian / pdf.py

diff --git a/librarian/pdf.py b/librarian/pdf.py
index b8aafdb..2154985 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -27,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()


@@ -198,21 +198,22 @@ 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)
         root = document.edoc.getroot()
 
         if cover:
             if cover is True:
         document = load_including_children(wldoc)
         root = document.edoc.getroot()
 
         if cover:
             if cover is True:

-                cover = WLCover
-            bound_cover = cover(document.book_info)
+                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:
             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 document.book_info.cover_by:
-                    root.set('data-cover-by', document.book_info.cover_by)
-                if 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',
                     root.set('data-cover-source',

-                            document.book_info.cover_source)
+                            book_info.cover_source)

         if flags:
             for flag in flags:
                 root.set('flag-' + flag, 'yes')
         if flags:
             for flag in flags:
                 root.set('flag-' + flag, 'yes')


@@ -230,6 +231,10 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None,
         # add editors info
         root.set('editors', u', '.join(sorted(
             editor.readable() for editor in document.editors())))
         # 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)