[epub, mobi] - xsl output impovements required for better annotation visual renderin...

[librarian.git] / librarian / mobi.py

diff --git a/librarian/mobi.py b/librarian/mobi.py
index 1e7569b..3c4c949 100644 (file)
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -9,7 +9,7 @@ import subprocess
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile

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

 from librarian import get_resource
 
 
 from librarian import get_resource
 
 


@@ -19,7 +19,7 @@ def transform(wldoc, verbose=False,
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)

-    cover: a cover.Cover object
+    cover: a cover.Cover factory overriding default

     flags: less-advertising,
     """
 
     flags: less-advertising,
     """
 


@@ -29,12 +29,12 @@ def transform(wldoc, verbose=False,
 
     # provide a cover by default
     if not cover:
 
     # provide a cover by default
     if not cover:

-        cover = WLCover
+        cover = DefaultEbookCover

     cover_file = NamedTemporaryFile(suffix='.png', delete=False)
     cover_file = NamedTemporaryFile(suffix='.png', delete=False)

-    c = cover(book_info)
-    c.save(cover_file)
+    bound_cover = cover(book_info)
+    bound_cover.save(cover_file)

 
 

-    if 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:
         if document.book_info.cover_by:
             document.edoc.getroot().set('data-cover-by', document.book_info.cover_by)
         if document.book_info.cover_source:


@@ -42,9 +42,9 @@ def transform(wldoc, verbose=False,
 
     if not flags:
         flags = []
 
     if not flags:
         flags = []

-    flags = list(flags) + ['without-fonts']
+    flags = list(flags) + ['with-full-fonts']

     epub = document.as_epub(verbose=verbose, sample=sample, html_toc=True,
     epub = document.as_epub(verbose=verbose, sample=sample, html_toc=True,

-            flags=flags, style=get_resource('mobi/style.css'))
+            flags=flags, style=get_resource('epub/style.css'))

 
     if verbose:
         kwargs = {}
 
     if verbose:
         kwargs = {}


@@ -55,6 +55,6 @@ def transform(wldoc, verbose=False,
     output_file = NamedTemporaryFile(prefix='librarian', suffix='.mobi', delete=False)
     output_file.close()
     subprocess.check_call(['ebook-convert', epub.get_filename(), output_file.name,
     output_file = NamedTemporaryFile(prefix='librarian', suffix='.mobi', delete=False)
     output_file.close()
     subprocess.check_call(['ebook-convert', epub.get_filename(), output_file.name,

-            '--no-inline-toc', '--cover=%s' % cover_file.name], **kwargs)
+            '--no-inline-toc', '--mobi-file-type=both', '--subset-embedded-fonts', '--mobi-ignore-margins', '--cover=%s' % cover_file.name], **kwargs)

     os.unlink(cover_file.name)
     os.unlink(cover_file.name)

-    return OutputFile.from_filename(output_file.name)
\ No newline at end of file
+    return OutputFile.from_filename(output_file.name)