#961: full info in all formats;

[librarian.git] / scripts / book2pdf

diff --git a/scripts/book2pdf b/scripts/book2pdf
index a4382fe..fd69970 100755 (executable)
--- a/scripts/book2pdf
+++ b/scripts/book2pdf
@@ -23,6 +23,8 @@ 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')
+    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:
@@ -30,13 +32,16 @@ if __name__ == '__main__':
         exit(1)
 
     try:
+        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_dir = output_file = None
+            output_file = output_dir = None
             if options.output_dir:
                 output_dir = options.output_dir
             elif options.output_file:
@@ -44,9 +49,17 @@ if __name__ == '__main__':
             else:
                 output_dir = path
 
-            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)
+            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