Minor fixes.

diff --git a/librarian/book2anything.py b/librarian/book2anything.py
index 7ae6178..20cae8f 100755 (executable)
--- a/librarian/book2anything.py
+++ b/librarian/book2anything.py
@@ -56,12 +56,6 @@ class Book2Anything(object):
         parser.add_option('-v', '--verbose', 
                 action='store_true', dest='verbose', default=False,
                 help='print status messages to stdout')
         parser.add_option('-v', '--verbose', 
                 action='store_true', dest='verbose', default=False,
                 help='print status messages to stdout')

-        parser.add_option('-t', '--html-toc', 
-                action='store_true', dest='html_toc', default=False,
-                help='with inline html toc [book2epub only]')
-        parser.add_option('-k', '--use-kindlegen', 
-                action='store_true', dest='use_kindlegen', default=False,
-                help='use kindlegen tool [book2mobi only]')

         parser.add_option('-d', '--make-dir',
                 action='store_true', dest='make_dir', default=False,
                 help='create a directory for author and put the output file in it')
         parser.add_option('-d', '--make-dir',
                 action='store_true', dest='make_dir', default=False,
                 help='create a directory for author and put the output file in it')


@@ -103,11 +97,7 @@ class Book2Anything(object):
         if transform_flags:
             transform_args['flags'] = transform_flags
         if options.verbose:
         if transform_flags:
             transform_args['flags'] = transform_flags
         if options.verbose:

-            transform_args['verbose'] = True        
-        if options.html_toc and cls.ext == 'epub':
-            transform_args['html_toc'] = True
-        if options.use_kindlegen and cls.ext == 'mobi':
-            transform_args['use_kindlegen'] = True
+            transform_args['verbose'] = True

         # Add cover support, if any.
         if cls.uses_cover:
             if options.image_cache:
         # Add cover support, if any.
         if cls.uses_cover:
             if options.image_cache:

diff --git a/librarian/epub/style.css b/librarian/epub/style.css
index 6225c7a..1f5d11b 100644 (file)
--- a/librarian/epub/style.css
+++ b/librarian/epub/style.css
@@ -135,7 +135,7 @@ p
 {
     line-height: 0;
     font-size: 0.7em;
 {
     line-height: 0;
     font-size: 0.7em;

-}   
+}

 
 /* =================== */
 /* = Custom elements = */
 
 /* =================== */
 /* = Custom elements = */

diff --git a/librarian/mobi.py b/librarian/mobi.py
index b30c1fe..a0e463a 100644 (file)
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -10,8 +10,6 @@ import subprocess
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile

-from librarian.cover import DefaultEbookCover
-from librarian import get_resource

 
 
 def transform(wldoc, verbose=False, sample=None, cover=None,
 
 
 def transform(wldoc, verbose=False, sample=None, cover=None,


@@ -26,14 +24,9 @@ def transform(wldoc, verbose=False, sample=None, cover=None,
 
     document = deepcopy(wldoc)
     del wldoc
 
     document = deepcopy(wldoc)
     del wldoc

-    book_info = document.book_info
-
-    if not flags:
-        flags = []
-    flags = list(flags)

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

-                            html_toc=True, cover=True, flags=flags)
+                            html_toc=True, cover=cover or True, flags=flags)

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

diff --git a/scripts/book2epub b/scripts/book2epub
index 01ca79a..7a7a41d 100755 (executable)
--- a/scripts/book2epub
+++ b/scripts/book2epub
@@ -17,6 +17,11 @@ class Book2Epub(Book2Anything):
                 action='store_true', default=False,
                 help='mark the output as a working copy')
         ]
                 action='store_true', default=False,
                 help='mark the output as a working copy')
         ]

+    transform_options = [
+        Option('-t', '--html-toc',
+                action='store_true', dest='html_toc', default=False,
+                help='with inline html toc')
+        ]

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

diff --git a/scripts/book2mobi b/scripts/book2mobi
index f477a83..b283309 100755 (executable)
--- a/scripts/book2mobi
+++ b/scripts/book2mobi
@@ -4,7 +4,7 @@
 # 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.
 #

-from librarian.book2anything import Book2Anything
+from librarian.book2anything import Book2Anything, Option

 
 
 class Book2Mobi(Book2Anything):
 
 
 class Book2Mobi(Book2Anything):


@@ -14,6 +14,12 @@ class Book2Mobi(Book2Anything):
     cover_optional = False
     uses_provider = True
 
     cover_optional = False
     uses_provider = True
 

+    transform_options = [
+        Option('-k', '--use-kindlegen',
+                action='store_true', dest='use_kindlegen', default=False,
+                help='use kindlegen tool instead of Calibre')
+        ]
+

 
 if __name__ == '__main__':
     Book2Mobi.run()
 
 if __name__ == '__main__':
     Book2Mobi.run()