X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fly2dvi.py;h=c837dcb3976be435c99302c540397e212acf50f9;hb=b4139c2fb2ec738a17ee1157edf23e8ea56ed560;hp=f1c795ba082b3fd4ebf4d0e4e4c28fcf40e25a0b;hpb=2fc177dc2401903f604f4520c7b59e1544046ed5;p=lilypond.git diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index f1c795ba08..c837dcb397 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -1,7 +1,14 @@ #!@PYTHON@ - -# Run lilypond, latex, dvips. # +# ly2dvi.py -- Run LilyPond, add titles to bare score, generate printable +# document +# Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1998--2003 Han-Wen Nienhuys +# Jan Nieuwenhuizen + # This is the third incarnation of ly2dvi. # # Earlier incarnations of ly2dvi were written by @@ -9,16 +16,10 @@ # Jan Arne Fagertun (Bourne shell script) # - -# -# TODO: should allow to set a central pk cache directory from the command line. -# TODO: should allow to switch off pk cache. -# - -# # Note: gettext work best if we use ' for docstrings and " # for gettextable strings. -# --> DO NOT USE """ for docstrings. +# --> DO NOT USE ''' for docstrings. + ''' TODO: @@ -31,11 +32,12 @@ TODO: default: create dvi only na: create tex, latex and dvi -P: create dvi and ps + -p: create pdf na: * create ps only etc. - for foo.ly, rename ly2dvi.dir to out-ly2dvi, foo.ly2dvi, foo.dir ? + * for foo.ly, rename ly2dvi.dir to out-ly2dvi, foo.ly2dvi, foo.dir ? * move versatile taglines, @@ -44,7 +46,8 @@ TODO: endfooter=\tagline -> 'lily was here ' } - lilytagline (->lily was here), usertagline, copyright etc. + lilytagline (->lily was here), usertagline, copyright, lily-version + etc. * head/header tagline/endfooter @@ -52,271 +55,123 @@ TODO: from lilypond .tex *and* header output. * multiple \score blocks? + + * Introduce verbosity levels + 0 = QUIET: mute all command output, no ly2dvi progress + 1 = BRIEF: mute all command output, only ly2dvi progress + 2a = NORMAL: show only LilyPond command output, show ly2dvi progress + 2b = NORMAL: show command output, show ly2dvi progress + 3 = VERBOSE: show command output, run lilypond --verbose + 4 = DEBUGGING: show all command output, run lilypond --verbose, print + environment and all kinds of client side debugging stuff + + Currently, we only have 1 and 4, but we kludge to have 2a and 4. ''' - - - - -import os +import operator import stat import string -import re -import getopt -import sys -import shutil -import __main__ -import operator -import tempfile import traceback - - -################################################################ -# lilylib.py -- options and stuff -# -# source file of the GNU LilyPond music typesetter - -try: - import gettext - gettext.bindtextdomain ('lilypond', localedir) - gettext.textdomain ('lilypond') - _ = gettext.gettext -except: - def _ (s): - return s - -program_version = '@TOPLEVEL_VERSION@' -if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.5.17' - -def identify (): - sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) - -def warranty (): - identify () - sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002')) - sys.stdout.write ('\n') - sys.stdout.write (' Han-Wen Nienhuys') - sys.stdout.write (' Jan Nieuwenhuizen') - sys.stdout.write ('\n') - sys.stdout.write (_ (r''' -Distributed under terms of the GNU General Public License. It comes with -NO WARRANTY.''')) - sys.stdout.write ('\n') - -def progress (s): - errorport.write (s + '\n') - -def warning (s): - progress (_ ("warning: ") + s) - -def user_error (s, e=1): - errorport.write (program_name + ":" + _ ("error: ") + s + '\n') - sys.exit (e) - -def error (s): - - - '''Report the error S. Exit by raising an exception. Please - do not abuse by trying to catch this error. If you do not want - a stack trace, write to the output directly. - - RETURN VALUE - - None - - ''' - - progress (_ ("error: ") + s) - raise _ ("Exiting ... ") - -def getopt_args (opts): - '''Construct arguments (LONG, SHORT) for getopt from list of options.''' - short = '' - long = [] - for o in opts: - if o[1]: - short = short + o[1] - if o[0]: - short = short + ':' - if o[2]: - l = o[2] - if o[0]: - l = l + '=' - long.append (l) - return (short, long) - -def option_help_str (o): - '''Transform one option description (4-tuple ) into neatly formatted string''' - sh = ' ' - if o[1]: - sh = '-%s' % o[1] - - sep = ' ' - if o[1] and o[2]: - sep = ',' - - long = '' - if o[2]: - long= '--%s' % o[2] - - arg = '' - if o[0]: - if o[2]: - arg = '=' - arg = arg + o[0] - return ' ' + sh + sep + long + arg - - -def options_help_str (opts): - '''Convert a list of options into a neatly formatted string''' - w = 0 - strs =[] - helps = [] - - for o in opts: - s = option_help_str (o) - strs.append ((s, o[3])) - if len (s) > w: - w = len (s) - - str = '' - for s in strs: - str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1]) - return str - -def help (): - ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name), - ('\n\n'), - (help_summary), - ('\n\n'), - (_ ("Options:")), - ('\n'), - (options_help_str (option_definitions)), - ('\n\n'), - (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'), - ('\n')] - map (sys.stdout.write, ls) - -def setup_temp (): - """ - Create a temporary directory, and return its name. - """ - global temp_dir - if not keep_temp_dir_p: - temp_dir = tempfile.mktemp (program_name) - try: - os.mkdir (temp_dir, 0777) - except OSError: - pass - - return temp_dir - - -def system (cmd, ignore_error = 0): - """Run CMD. If IGNORE_ERROR is set, don't complain when CMD returns non zero. - - RETURN VALUE - - Exit status of CMD - """ - - if verbose_p: - progress (_ ("Invoking `%s\'") % cmd) - st = os.system (cmd) - if st: - name = re.match ('[ \t]*([^ \t]*)', cmd).group (1) - msg = name + ': ' + _ ("command exited with value %d") % st - if ignore_error: - warning (msg + ' ' + _ ("(ignored)") + ' ') - else: - error (msg) - - return st - - -def cleanup_temp (): - if not keep_temp_dir_p: - if verbose_p: - progress (_ ("Cleaning %s...") % temp_dir) - shutil.rmtree (temp_dir) - - -def strip_extension (f, ext): - (p, e) = os.path.splitext (f) - if e == ext: - e = '' - return p + e +import glob ################################################################ -# END Library - - - - - - -# if set, LILYPONDPREFIX must take prevalence -# if datadir is not set, we're doing a build and LILYPONDPREFIX -datadir = '@datadir@' - - +# Users of python modules should include this snippet +# and customize variables below. + +# We'll suffer this path init stuff as long as we don't install our +# python packages in /lib/pythonx.y (and don't kludge around +# it as we do with teTeX on Red Hat Linux: set some environment var +# (PYTHONPATH) in profile) + +# If set, LILYPONDPREFIX must take prevalence +# if datadir is not set, we're doing a build and LILYPONDPREFIX +import getopt, os, sys +datadir = '@local_lilypond_datadir@' +if not os.path.isdir (datadir): + datadir = '@lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX') : datadir = os.environ['LILYPONDPREFIX'] -else: - datadir = '@datadir@' + while datadir[-1] == os.sep: + datadir= datadir[:-1] +sys.path.insert (0, os.path.join (datadir, 'python')) -while datadir[-1] == os.sep: - datadir= datadir[:-1] +# Customize these +#if __name__ == '__main__': -program_name = 'ly2dvi' +import lilylib as ly +global _;_=ly._ +global re;re = ly.re +# lilylib globals +program_name = 'ly2dvi' +verbose_p = 0 +pseudo_filter_p = 0 original_dir = os.getcwd () temp_dir = os.path.join (original_dir, '%s.dir' % program_name) -errorport = sys.stderr keep_temp_dir_p = 0 -verbose_p = 0 - -try: - import gettext - gettext.bindtextdomain ('lilypond', '@localedir@') - gettext.textdomain ('lilypond') - _ = gettext.gettext -except: - def _ (s): - return s - -# Attempt to fix problems with limited stack size set by Python! -# Sets unlimited stack size. Note that the resource module only -# is available on UNIX. -try: - import resource - resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) -except: - pass +preview_resolution = 90 +debug_p = 0 -help_summary = _ ("Generate .dvi with LaTeX for LilyPond") +## FIXME +## ly2dvi: silly name? +## do -P or -p by default? +##help_summary = _ ("Run LilyPond using LaTeX for titling") +help_summary = _ ("Run LilyPond, add titles, generate printable document") +copyright = ('Han-Wen Nienhuys /dev/null 2> /dev/null' - progress ( _("Running %s...") % 'LilyPond') - else: + global verbose_p + if verbose_p: opts = opts + ' --verbose' - # for better debugging! - print_environment () - print opts, fs - system ('lilypond %s %s ' % (opts, fs)) + if debug_p: + ly.print_environment () + + cmd = string.join ((lilypond_binary, opts, fs)) + status = ly.system (cmd, ignore_error = 1, progress_p = 1) + signal = 0x0f & status + exit_status = status >> 8 + + # 2 == user interrupt. + if signal and signal != 2: + sys.stderr.write ('\n\n') + ly.error (_ ("LilyPond crashed (signal %d).") % signal) + ly.error (_ ("Please submit a bug report to bug-lilypond@gnu.org")) + ly.exit (status) + + if status: + sys.stderr.write ('\n') + if len (files) == 1: + ly.error (_ ("LilyPond failed on input file %s (exit status %d)") % (files[0], exit_status)) + ly.exit (status) + else: + ly.error (_ ("LilyPond failed on an input file (exit status %d)") % exit_status) + ly.error (_ ("Continuing...")) + global lilypond_error_p + lilypond_error_p = 1 + def analyse_lilypond_output (filename, extra): # urg '''Grep FILENAME for interesting stuff, and put relevant info into EXTRA.''' - filename = filename+'.tex' - progress (_ ("Analyzing %s...") % filename) + filename = filename + tex_extension + ly.progress (_ ("Analyzing %s...") % filename) s = open (filename).read () # search only the first 10k @@ -451,33 +302,35 @@ def analyse_lilypond_output (filename, extra): m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}'%x, s) if m: set_setting (extra, x, m.group (1)) + ly.progress ('\n') def find_tex_files_for_base (base, extra): - - """ + ''' Find the \header fields dumped from BASE. - """ + ''' headerfiles = {} for f in layout_fields: - if os.path.exists (base + '.' + f): - headerfiles[f] = base+'.'+f + fn = base + '.' + f + if os.path.exists (fn): + headerfiles[f] = fn if os.path.exists (base +'.dep'): dependency_files.append (base + '.dep') for f in extra_fields: - if os.path.exists (base + '.' + f): - extra[f].append (open (base + '.' + f).read ()) + fn =base + '.' + f + if os.path.exists (fn): + extra[f].append (open (fn).read ()) - return (base +'.tex',headerfiles) + return (base + tex_extension, headerfiles) def find_tex_files (files, extra): - """ + ''' Find all .tex files whose prefixes start with some name in FILES. - """ + ''' tfiles = [] @@ -485,11 +338,11 @@ def find_tex_files (files, extra): x = 0 while 1: fname = os.path.basename (f) - fname = strip_extension (fname, '.ly') + fname = ly.strip_extension (fname, '.ly') if x: fname = fname + '-%d' % x - if os.path.exists (fname + '.tex'): + if os.path.exists (fname + tex_extension): tfiles.append (find_tex_files_for_base (fname, extra)) analyse_lilypond_output (fname, extra) else: @@ -498,7 +351,7 @@ def find_tex_files (files, extra): x = x + 1 if not x: fstr = string.join (files, ', ') - warning (_ ("no lilypond output found for %s") % fstr) + ly.warning (_ ("no LilyPond output found for `%s'") % fstr) return tfiles def one_latex_definition (defn, first): @@ -521,26 +374,27 @@ def one_latex_definition (defn, first): ly_paper_to_latexpaper = { - 'a4' : 'a4paper', 'letter' : 'letterpaper', + 'a3' : 'a3paper', + 'a4' : 'a4paper', + 'a5' : 'a5paper', + 'a6' : 'a6paper', } -def global_latex_definition (tfiles, extra): - - '''construct preamble from EXTRA, dump Latex stuff for each -lily output file in TFILES after that, and return the Latex file constructed. ''' - - +#TODO: should set textheight (enlarge) depending on papersize. +def global_latex_preamble (extra): + '''construct preamble from EXTRA,''' s = "" s = s + '% generation tag\n' options = '' + if extra['papersize']: try: - options = '%s' % ly_paper_to_latexpaper[extra['papersize'][0]] + options = ly_paper_to_latexpaper[extra['papersize'][0]] except KeyError: - warning (_ ("invalid value: %s") % `extra['papersize'][0]`) + ly.warning (_ ("invalid value: `%s'") % `extra['papersize'][0]`) pass if extra['latexoptions']: @@ -549,7 +403,7 @@ lily output file in TFILES after that, and return the Latex file constructed. ' s = s + '\\documentclass[%s]{article}\n' % options if extra['language']: - s = s + r'\usepackage[%s]{babel}\n' % extra['language'][-1] + s = s + r'\usepackage[%s]{babel}' % extra['language'][-1] + '\n' s = s + '\\usepackage{%s}\n' \ @@ -559,22 +413,24 @@ lily output file in TFILES after that, and return the Latex file constructed. ' s = s + '\\include{%s}\n' \ % string.join (extra['latexheaders'], '}\n\\include{') + unit = extra['unit'][-1] + textheight = '' if extra['textheight']: - textheight = ',textheight=%fpt' % extra['textheight'][0] + textheight = ',textheight=%f%s' % (extra['textheight'][0], unit) orientation = 'portrait' if extra['orientation']: orientation = extra['orientation'][0] - # set sane geometry width (a4-width) for linewidth = -1. + # set sane geometry width (a4-width) for linewidth = -1. maxlw = max (extra['linewidth'] + [-1]) if maxlw < 0: # who the hell is 597 ? linewidth = '597pt' else: - linewidth = maxlw - s = s + '\geometry{width=%smm%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation) + linewidth = '%d%s' % (maxlw, unit) + s = s + '\geometry{width=%s%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation) if extra['latexoptions']: s = s + '\geometry{twosideshift=4mm}\n' @@ -585,12 +441,22 @@ lily output file in TFILES after that, and return the Latex file constructed. ' ''' if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no': - s = s + '\setcounter{page}{%s}\n' % (extra['pagenumber'][-1]) + s = s + '\setcounter{page}{%d}\n' % (extra['pagenumber'][-1]) s = s + '\\pagestyle{plain}\n' else: s = s + '\\pagestyle{empty}\n' - s = s + '\\begin{document}\n' + + return s + + +def global_latex_definition (tfiles, extra): + '''construct preamble from EXTRA, dump Latex stuff for each +lily output file in TFILES after that, and return the Latex file constructed. ''' + + + s = global_latex_preamble (extra) + '\\begin{document}\n' + s = s + '\\parindent 0pt\n' s = s + '\\thispagestyle{firstpage}\n' first = 1 @@ -606,13 +472,14 @@ lily output file in TFILES after that, and return the Latex file constructed. ' def run_latex (files, outbase, extra): - """Construct latex file, for FILES and EXTRA, dump it into + '''Construct latex file, for FILES and EXTRA, dump it into OUTBASE.latex. Run LaTeX on it. RETURN VALUE None - """ + ''' + latex_fn = outbase + '.latex' wfs = find_tex_files (files, extra) @@ -622,24 +489,61 @@ None f.write (s) f.close () - cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn + cmd = latex_cmd + ' \\\\nonstopmode \\\\input %s' % latex_fn + # Ugh. (La)TeX writes progress and error messages on stdout + # Redirect to stderr + cmd += ' 1>/dev/stderr' + status = ly.system (cmd, ignore_error = 1) + signal = 0xf & status + exit_status = status >> 8 + + if exit_status: - if not verbose_p: - progress ( _("Running %s...") % 'LaTeX') - cmd = cmd + ' 1> /dev/null 2> /dev/null' + logstr = '' + try: + logstr = open (outbase + '.log').read () + m = re.search ("\n!", logstr) + start = m.start (0) + logstr = logstr[start:start+200] + except: + pass + + ly.error (_ ("LaTeX failed on the output file.")) + ly.error (_ ("The error log is as follows:")) + sys.stderr.write (logstr + '\n') + ly.exit (1) + + if preview_p: + # 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) - system (cmd) def run_dvips (outbase, extra): - """Run dvips using the correct options taken from EXTRA, + '''Run dvips using the correct options taken from EXTRA, leaving a PS file in OUTBASE.ps RETURN VALUE None. -""" +''' opts = '' if extra['papersize']: opts = opts + ' -t%s' % extra['papersize'][0] @@ -647,14 +551,38 @@ None. if extra['orientation'] and extra['orientation'][0] == 'landscape': opts = opts + ' -tlandscape' + + if 'PDF' in targets: + where = ly.read_pipe ('kpsewhich feta20.pfa').strip() + + pfa_file = None + if where: + try: + pfa_file = open (where, 'r') + except IOError: + pass + + if pfa_file: + opts = opts + ' -Ppdf -G0 -u +lilypond.map' + else: + ly.warning (_ ('''Trying create PDF, but no PFA fonts found. +Using bitmap fonts instead. This will look bad.''')) + cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi') - - if not verbose_p: - progress ( _("Running %s...") % 'dvips') - cmd = cmd + ' 1> /dev/null 2> /dev/null' + ly.system (cmd) + + if preview_p: + 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) + ly.system (cmd) - system (cmd) - def generate_dependency_file (depfile, outname): df = open (depfile, 'w') df.write (outname + ':' ) @@ -684,9 +612,8 @@ def find_pfa_fonts (name): s = open (name).read () if s[:len (PS)] != PS: # no ps header? - errorport.write (_( "error: ") + _ ("not a PostScript file: `%s\'" % name)) - errorport.write ('\n') - sys.exit (1) + ly.error (_ ("not a PostScript file: `%s\'" % name)) + ly.exit (1) here = 0 m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL) pfa = [] @@ -696,26 +623,66 @@ def find_pfa_fonts (name): m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL) return pfa + +def make_html_menu_file (html_file, files_found): + exts = { + 'pdf' : "Print (PDF, %s)", + 'ps.gz' : "Print (gzipped PostScript, %s)", + 'png' : "View (PNG, %s)", + 'midi' : "Listen (MIDI, %s)", + 'ly' : "View source code (%s)", + } + html_str = '' + + pages = filter (lambda x : re.search ('page[0-9]+.png', x), + files_found) + rest = filter (lambda x : not re.search ('page[0-9]+.png', x), + files_found) + + preview = filter (lambda x: re.search ('.png$', x), rest) + if preview: + html_str = '' % preview[0] + + for p in pages: + page = re.sub ('.*page([0-9])+.*', 'View page \\1 (PNG picture, %s)\n', p) + page = page % 'unknown size' + + html_str += '
  • %s' % (p, page) + + + for e in ['pdf', 'ps.gz', 'midi', 'ly']: + fs = filter (lambda x: re.search ('.%s$' % e, x), rest) + for f in fs: + entry = exts[e] % 'unknown size' # todo + html_str += '
  • %s\n\n' % (f, entry) + + html_str += "\n\n
    • " + ly.progress (_("Writing HTML menu `%s'") % html_file) + ly.progress ('\n') + open (html_file, 'w').write (html_str) -(sh, long) = getopt_args (option_definitions) +################################################################ +## MAIN +################################################################ + +(sh, long) = ly.getopt_args (option_definitions) try: - (options, files) = getopt.getopt(sys.argv[1:], sh, long) + (options, files) = getopt.getopt (sys.argv[1:], sh, long) except getopt.error, s: - errorport.write ('\n') - errorport.write (_ ("error: ") + _ ("getopt says: `%s\'" % s)) - errorport.write ('\n') - errorport.write ('\n') - help () - sys.exit (2) + sys.stderr.write ('\n') + ly.error (_ ("getopt says: `%s\'" % s)) + sys.stderr.write ('\n') + ly.help () + ly.exit (2) -for opt in options: +for opt in options: o = opt[0] a = opt[1] if 0: pass elif o == '--help' or o == '-h': - help () + ly.help () sys.exit (0) elif o == '--find-pfa' or o == '-f': fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a)) @@ -727,14 +694,25 @@ for opt in options: elif o == '--include' or o == '-I': include_path.append (a) elif o == '--postscript' or o == '-P': - targets['PS'] = 0 + targets.append ('PS') + elif o == '--pdf' or o == '-p': + targets.append ('PS') + targets.append ('PDF') elif o == '--keep' or o == '-k': keep_temp_dir_p = 1 + elif o == '--debug': + verbose_p = 1 + debug_p = 1 elif o == '--no-lily': lily_p = 0 + elif o == '--preview': + preview_p = 1 + if 'PNG' not in targets: + targets.append ('PNG') + elif o == '--preview-resolution': + preview_resolution = string.atoi (a) elif o == '--no-paper' or o == '-m': - targets = {} - targets['MIDI'] = 0 + targets = ['MIDI'] paper_p = 0 elif o == '--output' or o == '-o': output_name = a @@ -746,52 +724,65 @@ for opt in options: elif o == '--verbose' or o == '-V': verbose_p = 1 elif o == '--version' or o == '-v': - identify () + ly.identify (sys.stdout) sys.exit (0) + elif o == '--pdftex': + latex_cmd = 'pdflatex' + targets.remove('DVI') + targets.append('PDFTEX') + pdftex_p = 1 + tex_extension = '.pdftex' elif o == '--warranty' or o == '-w': - status = system ('lilypond -w', ignore_error = 1) + status = os.system ('%s -w' % lilypond_binary) if status: - warranty () - + ly.warranty () sys.exit (0) + elif o == '--html': + html_p = 1 + elif o == '--png': + page_images_p = 1 + if 'PNG' not in targets: + targets.append ('PNG') + elif o == '--psgz': + targets.append ('PS.GZ') + else: + unimplemented_option () # signal programming error +# Don't convert input files to abspath, rather prepend '.' to include +# path. +include_path.insert (0, '.') -def cp_to_dir (pattern, dir): - "Copy files matching re PATTERN from cwd to DIR" - # Duh. Python style portable: cp *.EXT OUTDIR - # system ('cp *.%s %s' % (ext, outdir), 1) - files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.')) - map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files) - -# Python < 1.5.2 compatibility -# -# On most platforms, this is equivalent to -#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2* -if os.path.__dict__.has_key ('abspath'): - abspath = os.path.abspath -else: - def abspath (path): - return os.path.normpath (os.path.join (os.getcwd (), path)) - -if os.__dict__.has_key ('makedirs'): - makedirs = os.makedirs -else: - def makedirs (dir, mode=0777): - system ('mkdir -p %s' % dir) - -def mkdir_p (dir, mode=0777): - if not os.path.isdir (dir): - makedirs (dir, mode) - -include_path = map (abspath, include_path) - -original_output = output_name +# As a neat trick, add directory part of first input file +# to include path. That way you can do without the clumsy -I in: +# ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +if files and files[0] != '-' and os.path.dirname (files[0]) != '.': + include_path.append (os.path.dirname (files[0])) + +include_path = map (ly.abspath, include_path) -if files and files[0] != '-': +if files and (files[0] == '-' or output_name == '-'): + if len (files) == 1: + pseudo_filter_p = 1 + output_name = 'lelie' + if verbose_p: + ly.progress (_ ("pseudo filter") + '\n') + else: + ly.help () + ly.error (_ ("pseudo filter only for single input file")) + ly.exit (2) + +if not files: + ly.help () + ly.error (_ ("no files specified on command line")) + ly.exit (2) + +if 1: + ly.identify (sys.stderr) + original_output = output_name # Ugh, maybe make a setup () function - files = map (lambda x: strip_extension (x, '.ly'), files) + files = map (lambda x: ly.strip_extension (x, '.ly'), files) # hmmm. Wish I'd 've written comments when I wrote this. # now it looks complicated. @@ -799,21 +790,22 @@ if files and files[0] != '-': (outdir, outbase) = ('','') if not output_name: outbase = os.path.basename (files[0]) - outdir = abspath('.') + outdir = ly.abspath ('.') elif output_name[-1] == os.sep: - outdir = abspath (output_name) + outdir = ly.abspath (output_name) outbase = os.path.basename (files[0]) else: - (outdir, outbase) = os.path.split (abspath (output_name)) + (outdir, outbase) = os.path.split (ly.abspath (output_name)) - for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'): - output_name = strip_extension (output_name, i) - outbase = strip_extension (outbase, i) - files = map (abspath, files) + for i in ('.dvi', '.latex', '.ly', '.ps', '.tex', '.pdftex'): + output_name = ly.strip_extension (output_name, i) + outbase = ly.strip_extension (outbase, i) for i in files[:] + [output_name]: if string.find (i, ' ') >= 0: - user_error (_ ("filename should not contain spaces: `%s'") % i) + ly.error (_ ("filename should not contain spaces: `%s'") % + i) + ly.exit (1) if os.path.dirname (output_name) != '.': dep_prefix = os.path.dirname (output_name) @@ -821,88 +813,165 @@ if files and files[0] != '-': dep_prefix = 0 reldir = os.path.dirname (output_name) - if outdir != '.' and (track_dependencies_p or targets.keys ()): - mkdir_p (outdir, 0777) + if outdir != '.' and (track_dependencies_p or targets): + ly.mkdir_p (outdir, 0777) - setup_environment () - tmpdir = setup_temp () - if cache_pks_p : - os.chdir (outdir) - cp_to_dir (PK_PATTERN, tmpdir) + tmpdir = ly.setup_temp () + ly.setup_environment () # to be sure, add tmpdir *in front* of inclusion path. #os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS'] os.chdir (tmpdir) - + + # We catch all exceptions, because we need to do stuff at exit: + # * copy any successfully generated stuff from tempdir and + # notify user of that + # * cleanout tempdir if lily_p: try: - run_lilypond (files, outbase, dep_prefix) + run_lilypond (files, dep_prefix) except: + ### ARGH. This also catches python programming errors. + ### this should only catch lilypond nonzero exit status + ### --hwn + + # TODO: friendly message about LilyPond setup/failing? # - # TODO: lilypond should fail with different - # error codes for: - # - guile setup/startup failure - # - font setup failure - # - init.ly setup failure - # - parse error in .ly - # - unexpected: assert/core dump - targets = {} - traceback.print_exc () - - if targets.has_key ('DVI') or targets.has_key ('PS'): + targets = [] + if verbose_p: + traceback.print_exc () + else: + ly.warning (_("Running LilyPond failed. Rerun with --verbose for a trace.")) + + # Our LilyPond pseudo filter always outputs to 'lelie' + # have subsequent stages and use 'lelie' output. + if pseudo_filter_p: + files[0] = 'lelie' + + if 'PS.GZ' in targets: + targets.append ('PS') + + if 'PNG' in targets and 'PS' not in targets: + targets.append ('PS') + if 'PS' in targets and 'DVI' not in targets: + targets.append('DVI') + + if 'DVI' in targets: try: run_latex (files, outbase, extra_init) # unless: add --tex, or --latex? - del targets['TEX'] - del targets['LATEX'] + targets.remove ('TEX') + targets.remove('LATEX') except: # TODO: friendly message about TeX/LaTeX setup, # trying to run tex/latex by hand - if targets.has_key ('DVI'): - del targets['DVI'] - if targets.has_key ('PS'): - del targets['PS'] - traceback.print_exc () - - if targets.has_key ('PS'): + if 'DVI' in targets: + targets.remove ('DVI') + if 'PS' in targets: + targets.remove ('PS') + if verbose_p: + traceback.print_exc () + + if 'PS' in targets: try: run_dvips (outbase, extra_init) + except: - if targets.has_key ('PS'): - del targets['PS'] - traceback.print_exc () + if 'PS' in targets: + targets.remove ('PS') + if verbose_p: + traceback.print_exc () + else: + ly.warning (_("Failed to make PS file. Rerun with --verbose for a trace.")) + + if preview_p: + 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: + run_latex (files, outbase, extra_init) + # unless: add --tex, or --latex? + targets.remove ('TEX') + targets.remove ('LATEX') + targets.remove ('PDFTEX') + if 'PDF' not in targets: + targets.append('PDF') + except: + # TODO: friendly message about TeX/LaTeX setup, + # trying to run tex/latex by hand + if 'PDFTEX' in targets: + targets.remove ('PDFTEX') + if 'PDF' in targets: + targets.remove ('PDF') + if 'PS' in targets: + targets.remove ('PS') + if verbose_p: + traceback.print_exc () + else: + ly.warning (_("Running LaTeX falied. Rerun with --verbose for a trace.")) + + if page_images_p: + ly.make_ps_images (outbase) # add DEP to targets? if track_dependencies_p: depfile = os.path.join (outdir, outbase + '.dep') generate_dependency_file (depfile, depfile) if os.path.isfile (depfile): - progress (_ ("dependencies output to `%s'...") % depfile) + ly.progress (_ ("dependencies output to `%s'...") % + depfile) + ly.progress ('\n') + + if pseudo_filter_p: + main_target = 0 + for i in 'PDF', 'PS', 'PNG', 'DVI', 'LATEX': + if i in targets: + main_target = i + break + + ly.progress (_ ("%s output to ...") % i) + outname = outbase + '.' + string.lower (main_target) + if os.path.isfile (outname): + sys.stdout.write (open (outname).read ()) + elif verbose_p: + ly.warning (_ ("can't find file: `%s'") % outname) + targets = [] + ly.progress ('\n') + + if 'PS.GZ' in targets: + ly.system ("gzip *.ps") + targets.remove ('PS') # Hmm, if this were a function, we could call it the except: clauses - for i in targets.keys (): + files_found = [] + for i in targets: ext = string.lower (i) - cp_to_dir ('.*\.%s$' % ext, outdir) - outname = outbase + '.' + string.lower (i) - abs = os.path.join (outdir, outname) - if reldir != '.': - outname = os.path.join (reldir, outname) - if os.path.isfile (abs): - progress (_ ("%s output to `%s'...") % (i, outname)) + + pattern = '%s.%s' % (outbase, ext) + if i == 'PNG': + pattern = '*.png' + ls = glob.glob (pattern) + files_found += ls + ly.cp_to_dir ('.*\.%s$' % ext, outdir) + + + if ls: + names = string.join (map (lambda x: "`%s'" % x, ls)) + ly.progress (_ ("%s output to %s...") % (i, names)) + ly.progress ('\n') elif verbose_p: - warning (_ ("can't find file: `%s'") % outname) - - if cache_pks_p: - cp_to_dir (PK_PATTERN, outdir) - - os.chdir (original_dir) - cleanup_temp () - -else: - # FIXME: read from stdin when files[0] = '-' - help () - user_error (_ ("no files specified on command line."), 2) + ly.warning (_ ("can't find file: `%s'") % outname) + if html_p: + make_html_menu_file (os.path.join (outdir, outbase + ".html"), + files_found) + os.chdir (original_dir) + ly.cleanup_temp () + sys.exit (lilypond_error_p)