FB2: fix whitespace around footnotes.

[librarian.git] / scripts / book2epub

diff --git a/scripts/book2epub b/scripts/book2epub
index 9adf4b4..04e4515 100755 (executable)
--- a/scripts/book2epub
+++ b/scripts/book2epub
@@ -7,7 +7,8 @@
 import os.path
 import optparse
 
 import os.path
 import optparse
 

-from librarian import epub, DirDocProvider, ParseError
+from librarian import DirDocProvider, ParseError
+from librarian.parser import WLDocument

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


@@ -19,6 +20,10 @@ if __name__ == '__main__':
 
     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('-c', '--with-cover', action='store_true', dest='with_cover', default=False,
+                      help='create default cover')
+    parser.add_option('-w', '--working-copy', action='store_true', dest='working_copy', default=False,
+                      help='mark the output as a working copy')

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


@@ -32,23 +37,29 @@ if __name__ == '__main__':
         parser.print_help()
         exit(1)
 
         parser.print_help()
         exit(1)
 

+    flags = []
+    if options.working_copy:
+        flags.append('working-copy')
+

     # Do some real work
     try:
         for main_input in input_filenames:
             if options.verbose:
                 print main_input
     # Do some real work
     try:
         for main_input in input_filenames:
             if options.verbose:
                 print main_input

+

             path, fname = os.path.realpath(main_input).rsplit('/', 1)
             provider = DirDocProvider(path)
             path, fname = os.path.realpath(main_input).rsplit('/', 1)
             provider = DirDocProvider(path)

-
-            output_dir = output_file = None
-            if options.output_dir:
-                output_dir = options.output_dir
-            elif options.output_file:
-                output_file = options.output_file
+            if not (options.output_file or options.output_dir):
+                output_file = os.path.splitext(main_input)[0] + '.epub'

             else:
             else:

-                output_dir = path
+                output_file = None
+
+            doc = WLDocument.from_file(main_input, provider=provider)
+            epub = doc.as_epub(cover=options.with_cover, flags=flags)
+
+            doc.save_output_file(epub,
+                output_file, options.output_dir, options.make_dir, 'epub')

 
 

-            epub.transform(provider, file_path=main_input, output_dir=output_dir, output_file=output_file, make_dir=options.make_dir)

     except ParseError, e:
         print '%(file)s:%(name)s:%(message)s' % {
             'file': main_input,
     except ParseError, e:
         print '%(file)s:%(name)s:%(message)s' % {
             'file': main_input,