(An orchestral part): new

[lilypond.git] / scripts / ly2dvi.py

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 47b5e4e0187490bb1bf10193aaffae2a21a5ab5c..c837dcb3976be435c99302c540397e212acf50f9 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -1,4 +1,4 @@
-g#!@PYTHON@
+#!@PYTHON@
 #
 # ly2dvi.py -- Run LilyPond, add titles to bare score, generate printable
 #              document
@@ -6,7 +6,7 @@ g#!@PYTHON@
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1998--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c)  1998--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 # This is the third incarnation of ly2dvi.
@@ -184,7 +184,10 @@ extra_init = {
        'language' : [],
        'latexheaders' : [],
        'latexpackages' :  ['geometry'],
-       'latexoptions' : [],
+
+       # for geometry v3
+       'latexoptions' : ['compat2'],
+       
        'papersize' : [],
        'pagenumber' : [1],
        'textheight' : [], 
@@ -309,7 +312,7 @@ def find_tex_files_for_base (base, extra):
        headerfiles = {}
        for f in layout_fields:
                fn = base + '.' + f
-               if os.path.exists (fn)
+               if os.path.exists (fn):
                        headerfiles[f] = fn
 
        if os.path.exists (base  +'.dep'):
@@ -511,21 +514,25 @@ None
                ly.exit (1)
        
        if preview_p:
-               # make a preview by rendering only the 1st line.
-               preview_fn = outbase + '.preview.tex'
-               f = open (preview_fn, 'w')
-               wfs = find_tex_files (files, extra)
-               s = global_latex_definition (wfs, extra)
-
-               s = re.sub ('thispagestyle{firstpage}', r'''thispagestyle{empty}%
-\\def\\interscoreline{\\endinput}''',s ) 
-               s = re.sub ('thispagestyle{lastpage}', r'''thispagestyle{empty}%
-\\def\\interscoreline{\\endinput}''',s ) 
-               f.write (s)
-               f.close()
-               cmd = '%s \\\\nonstopmode \\\\input %s' % (latex_cmd, preview_fn)
-               ly.system (cmd)
-       
+               # make a preview by rendering only the 1st line
+               # of each score
+               for score in find_tex_files (files, extra):
+                       preview_base = ly.strip_extension (score[0], '.tex')
+                       preview_fn = preview_base + '.preview.tex'
+                       s = global_latex_definition ((score,), extra)
+                       s = re.sub ('thispagestyle{firstpage}',
+                                   r'''thispagestyle{empty}%
+                                   \\def\\interscoreline{\\endinput}''', s)
+                       s = re.sub ('thispagestyle{lastpage}',
+                                   r'''thispagestyle{empty}%
+                                   \\def\\interscoreline{\\endinput}''', s)
+                       f = open (preview_fn, 'w')
+                       f.write (s)
+                       f.close ()
+                       cmd = '%s \\\\nonstopmode \\\\input %s' \
+                             % (latex_cmd, preview_fn)
+                       ly.system (cmd)
+
 
 def run_dvips (outbase, extra):
 
@@ -565,8 +572,12 @@ Using bitmap fonts instead. This will look bad.'''))
        ly.system (cmd)
 
        if preview_p:
-               cmd = 'dvips -E -o%s %s' % ( outbase + '.preview.ps', outbase + '.preview.dvi')         
-               ly.system (cmd)
+               for score in find_tex_files (files, extra):
+                       preview_base = ly.strip_extension (score[0], '.tex')
+                       cmd = 'dvips -E -o%s %s' \
+                             % (preview_base + '.preview.ps',
+                                preview_base + '.preview.dvi')
+                       ly.system (cmd)
 
        if 'PDF' in targets:
                cmd = 'ps2pdf %s.ps %s.pdf' % (outbase , outbase)
@@ -647,6 +658,7 @@ def make_html_menu_file (html_file, files_found):
 
        html_str += "\n\n</li>"
        ly.progress (_("Writing HTML menu `%s'") % html_file)
+       ly.progress ('\n')
        open (html_file, 'w').write (html_str)
        
 ################################################################
@@ -874,7 +886,11 @@ if 1:
                                ly.warning (_("Failed to make PS file. Rerun with --verbose for a trace."))
 
        if preview_p:
-               ly.make_preview (outbase)
+               for score in find_tex_files (files, extra_init):
+                       preview_base = ly.strip_extension (score[0], '.tex')
+                       ly.make_ps_images (preview_base + '.preview.ps',
+                                          resolution=preview_resolution
+                                          )
 
        if 'PDFTEX' in targets:
                try:
@@ -900,7 +916,7 @@ if 1:
                                ly.warning (_("Running LaTeX falied. Rerun with --verbose for a trace."))
                                
        if page_images_p:
-               ly.make_page_images (outbase)
+               ly.make_ps_images (outbase)
 
        # add DEP to targets?
        if track_dependencies_p:
@@ -952,7 +968,8 @@ if 1:
                        ly.warning (_ ("can't find file: `%s'") % outname)
 
        if html_p:
-               make_html_menu_file (os.path.join (outdir, outbase + ".html"), files_found)
+               make_html_menu_file (os.path.join (outdir, outbase + ".html"),
+                                    files_found)
 
        os.chdir (original_dir)
        ly.cleanup_temp ()