X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/09dded3d8606e8e4406fffcf477ceb4a1c97fee2..a968d90d15f1d18dc95fc3da80d8f3220c6ddf80:/scripts/book2pdf

diff --git a/scripts/book2pdf b/scripts/book2pdf
index 6589746..fd69970 100755
--- a/scripts/book2pdf
+++ b/scripts/book2pdf
@@ -9,7 +9,9 @@ from optparse import OptionParser
 from librarian import pdf, DirDocProvider, ParseError
 
 if __name__ == '__main__':
-    usage = "usage: %prog [options] <input_file> [output_file]"
+    usage = """Usage: %prog [options] SOURCE [SOURCE...]
+    Convert SOURCE files to PDF format."""
+
     parser = OptionParser(usage)
     parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False,
                       help='make lots of noise and revert to default interaction in LaTeX')
@@ -17,23 +19,47 @@ if __name__ == '__main__':
                       help='create a directory for author and put the PDF in it')
     parser.add_option('-t', '--save-tex', dest='save_tex', metavar='FILE',
                       help='path to save the intermediary LaTeX file to')
+    parser.add_option('-o', '--output-file', dest='output_file', metavar='FILE',
+                      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 not 1 <= len(args) <= 2:
+    if len(args) < 1:
         parser.print_help()
         exit(1)
 
-    main_input = args[0]
-    basepath, ext = os.path.splitext(main_input)
-    path, slug = os.path.realpath(basepath).rsplit('/', 1)
-    provider = DirDocProvider(path)
     try:
-        if len(args) > 1:
-            pdf.transform(provider, slug, output_file=args[1], verbose=options.verbose, save_tex=options.save_tex)
-        else:
-            pdf.transform(provider, slug, output_dir=path, make_dir=options.make_dir, verbose=options.verbose, save_tex=options.save_tex)
+        if options.output_dir and options.output_file:
+            raise ValueError("Either --output-dir or --output file should be specified")
+
+        for main_input in args:
+            if options.verbose:
+                print main_input
+            path, fname = os.path.realpath(main_input).rsplit('/', 1)
+            provider = DirDocProvider(path)
+
+            output_file = output_dir = None
+            if options.output_dir:
+                output_dir = options.output_dir
+            elif options.output_file:
+                output_file = options.output_file
+            else:
+                output_dir = path
+
+            pdf.transform(provider, 
+                file_path=main_input, 
+                output_file=output_file, 
+                output_dir=output_dir,
+                verbose=options.verbose,
+                make_dir=options.make_dir,
+                save_tex=options.save_tex,
+                morefloats=options.morefloats
+                )
     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__,
             'message': e.message