diff options
| -rw-r--r-- | screenplain/export/html.py (renamed from screenplain/export/annotated_html.py) | 2 | ||||
| -rw-r--r-- | screenplain/main.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/screenplain/export/annotated_html.py b/screenplain/export/html.py index 0084b8a..c247415 100644 --- a/screenplain/export/annotated_html.py +++ b/screenplain/export/html.py @@ -61,7 +61,7 @@ def format_dual(dual): ) -def to_annotated_html(screenplay, out): +def convert(screenplay, out, annotated=False): for para in screenplay: classname = types.get(type(para)) if isinstance(para, Dialog): diff --git a/screenplain/main.py b/screenplain/main.py index 0ae37cd..2e7ee77 100644 --- a/screenplain/main.py +++ b/screenplain/main.py @@ -8,7 +8,7 @@ from optparse import OptionParser from screenplain.parsers.spmd import parse output_formats = ( - 'text', 'pdf', 'fdx', 'annotated_html' + 'text', 'pdf', 'fdx', 'html' ) usage = 'Usage: %prog [options] input-file output-file' @@ -32,6 +32,8 @@ def main(args): options.output_format = 'pdf' elif output_file.endswith('.fdx'): options.output_format = 'fdx' + elif output_file.endswith('.html'): + options.output_format = 'html' else: options.output_format = 'text' @@ -55,9 +57,9 @@ def main(args): elif options.output_format == 'fdx': from screenplain.export.fdx import to_fdx to_fdx(screenplay, output) - elif options.output_format == 'annotated_html': - from screenplain.export.annotated_html import to_annotated_html - to_annotated_html(screenplay, output) + elif options.output_format == 'html': + from screenplain.export.html import convert + convert(screenplay, output) finally: output.close() |