converters interface changed: WLDocument in, OutputFile out

[librarian.git] / scripts / book2pdf

diff --git a/scripts/book2pdf b/scripts/book2pdf
index a4382fe..171264b 100755 (executable)
--- a/scripts/book2pdf
+++ b/scripts/book2pdf
@@ -2,11 +2,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # -*- coding: utf-8 -*-
 #
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.

-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.  
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.

 #
 import os.path
 from optparse import OptionParser
 #
 import os.path
 from optparse import OptionParser

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

 
 if __name__ == '__main__':
     usage = """Usage: %prog [options] SOURCE [SOURCE...]
 
 if __name__ == '__main__':
     usage = """Usage: %prog [options] SOURCE [SOURCE...]


@@ -23,31 +26,36 @@ if __name__ == '__main__':
                       help='specifies the output file')
     parser.add_option('-O', '--output-dir', dest='output_dir', metavar='DIR',
                       help='specifies the directory for output')
                       help='specifies the output file')
     parser.add_option('-O', '--output-dir', dest='output_dir', metavar='DIR',
                       help='specifies the directory for output')

+    parser.add_option('-m', '--morefloats', dest='morefloats', metavar='old/new/none',
+                      help='force morefloats in old (<1.0c), new (>=1.0c) or none')

     (options, args) = parser.parse_args()
 
     if len(args) < 1:
         parser.print_help()
         exit(1)
 
     (options, args) = parser.parse_args()
 
     if len(args) < 1:
         parser.print_help()
         exit(1)
 

+    if options.output_dir and options.output_file:
+        raise ValueError("Either --output-dir or --output file should be specified")
+

     try:
         for main_input in args:
     try:
         for main_input in args:

-            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
+            output_file, output_dir = options.output_file, options.output_dir
+            if not (options.output_file or options.output_dir):
+                output_file = os.path.splitext(main_input)[0] + '.pdf'

             else:
             else:

-                output_dir = path
+                output_file = None
+
+            doc = WLDocument.from_file(main_input, provider=provider)
+            pdf = doc.as_pdf(save_tex=options.save_tex,
+                        morefloats=options.morefloats)

 
 

-            pdf.transform(provider, file_path=main_input, output_file=output_file, output_dir=output_dir, make_dir=options.make_dir, verbose=options.verbose, save_tex=options.save_tex)
+            doc.save_output_file(pdf,
+                output_file, options.output_dir, options.make_dir, 'pdf')

     except ParseError, e:
     except ParseError, e:

-        print '%(file)s:%(name)s:%(message)s' % {
+        print '%(file)s:%(name)s:%(message)s; use -v to see more output' % {

             'file': main_input,
             'name': e.__class__.__name__,
             'file': main_input,
             'name': e.__class__.__name__,

-            'message': e.message
+            'message': e

         }
         }