Change extract_annotations return value.

[librarian.git] / librarian / book2anything.py

diff --git a/librarian/book2anything.py b/librarian/book2anything.py
index 0a8e736..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')


@@ -102,11 +96,9 @@ class Book2Anything(object):
                     if flag.value(options)]
         if transform_flags:
             transform_args['flags'] = transform_flags
                     if flag.value(options)]
         if transform_flags:
             transform_args['flags'] = transform_flags

+        if options.verbose:
+            transform_args['verbose'] = True

         # Add cover support, if any.
         # Add cover support, if any.

-        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

         if cls.uses_cover:
             if options.image_cache:
                 def cover_class(*args, **kwargs):
         if cls.uses_cover:
             if options.image_cache:
                 def cover_class(*args, **kwargs):