FB2: use mode=para for poems -- simplify.

[librarian.git] / scripts / book2html

diff --git a/scripts/book2html b/scripts/book2html
index f42c0ff..8adeb38 100755 (executable)
--- a/scripts/book2html
+++ b/scripts/book2html
@@ -7,7 +7,8 @@
 import os
 import optparse
 
 import os
 import optparse
 

-from librarian import html, ParseError
+from librarian import ParseError
+from librarian.parser import WLDocument

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


@@ -21,6 +22,8 @@ if __name__ == '__main__':
         help='print status messages to stdout')
     parser.add_option('-i', '--ignore-dublin-core', action='store_false', dest='parse_dublincore', default=True,
         help='don\'t try to parse dublin core metadata')
         help='print status messages to stdout')
     parser.add_option('-i', '--ignore-dublin-core', action='store_false', dest='parse_dublincore', default=True,
         help='don\'t try to parse dublin core metadata')

+    parser.add_option('-r', '--raw', action='store_false', dest='full_page', default=True,
+        help='outpu raw text for use in templates')

 
     options, input_filenames = parser.parse_args()
 
 
     options, input_filenames = parser.parse_args()
 


@@ -35,12 +38,16 @@ if __name__ == '__main__':
 
         output_filename = os.path.splitext(input_filename)[0] + '.html'
         try:
 
         output_filename = os.path.splitext(input_filename)[0] + '.html'
         try:

-            html.transform(input_filename, output_filename, parse_dublincore=options.parse_dublincore, flags=('full-page',))
+            doc = WLDocument.from_file(input_filename,
+                parse_dublincore=options.parse_dublincore)
+            flags = ('full-page',) if options.full_page else None
+            html = doc.as_html(flags=flags)
+            doc.save_output_file(html, output_path=output_filename)

         except ParseError, e:
             print '%(file)s:%(name)s:%(message)s' % {
                 'file': input_filename,
                 'name': e.__class__.__name__,
         except ParseError, e:
             print '%(file)s:%(name)s:%(message)s' % {
                 'file': input_filename,
                 'name': e.__class__.__name__,

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

             }
         except IOError, e:
             print '%(file)s:%(name)s:%(message)s' % {
             }
         except IOError, e:
             print '%(file)s:%(name)s:%(message)s' % {


@@ -52,7 +59,7 @@ if __name__ == '__main__':
             print '%(file)s:%(etype)s:%(message)s' % {
                 'file': input_filename,
                 'etype': e.__class__.__name__,
             print '%(file)s:%(etype)s:%(message)s' % {
                 'file': input_filename,
                 'etype': e.__class__.__name__,

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

             }
             raise
 
             }
             raise