X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmup2ly.py;h=e24f38ac183730236f823ef026d3cb6c7e3808c5;hb=30c886ed7719a722a55787f955de5b28cc99517c;hp=d4e4f4e2e06fc07b4bc02d25930d0e463485853a;hpb=e84722c88277938476af9545e666a3728d9fa284;p=lilypond.git diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index d4e4f4e2e0..e24f38ac18 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -34,39 +34,91 @@ import __main__ import operator import tempfile -# let's not yet clutter lily's po with this mup converter junk -def _ (s): - return s -#sys.path.append ('@datadir@/python') -#import gettext -#gettext.bindtextdomain ('lilypond', '@localedir@') -#gettext.textdomain('lilypond') -#_ = gettext.gettext +# if set, LILYPONDPREFIX must take prevalence +# if datadir is not set, we're doing a build and LILYPONDPREFIX +datadir = '@datadir@' +if os.environ.has_key ('LILYPONDPREFIX') \ + or '@datadir@' == '@' + 'datadir' + '@': + datadir = os.environ['LILYPONDPREFIX'] +else: + datadir = '@datadir@' +sys.path.append (os.path.join (datadir, 'python')) +sys.path.append (os.path.join (datadir, 'python/out')) +program_name = 'ly2dvi' +program_version = '@TOPLEVEL_VERSION@' +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 program_name = 'mup2ly' -help_summary = _("Convert mup to ly") -output = 0 +help_summary = _ ("Convert mup to LilyPond source") + +option_definitions = [ + ('', 'd', 'debug', _ ("debug")), + ('NAME[=EXP]', 'D', 'define', _ ("define macro NAME [optional expansion EXP]")), + ('', 'h', 'help', _ ("this help")), + ('FILE', 'o', 'output', _ ("write output to FILE")), + ('', 'E', 'pre-process', _ ("only pre-process")), + ('', 'V', 'verbose', _ ("verbose")), + ('', 'v', 'version', _ ("print version number")), + ('', 'w', 'warranty', _ ("show warranty and copyright")), + ] + -# lily_py.py -- options and stuff +################################################################ +# lilylib.py -- options and stuff # # source file of the GNU LilyPond music typesetter -# BEGIN Library for these? -# cut-n-paste from ly2dvi +# Handle bug in Python 1.6-2.1 +# +# there are recursion limits for some patterns in Python 1.6 til 2.1. +# fix this by importing pre instead. Fix by Mats. -program_version = '@TOPLEVEL_VERSION@' -if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.3.142' +# todo: should check Python version first. +try: + import pre + re = pre + del pre +except ImportError: + import re + +# 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 +try: + import gettext + gettext.bindtextdomain ('lilypond', localedir) + gettext.textdomain ('lilypond') + _ = gettext.gettext +except: + def _ (s): + return s -original_dir = os.getcwd () -temp_dir = '%s.dir' % program_name -keep_temp_dir_p = 0 -verbose_p = 0 +program_version = '@TOPLEVEL_VERSION@' +if program_version == '@' + 'TOPLEVEL_VERSION' + '@': + program_version = '1.5.54' def identify (): sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) @@ -74,7 +126,7 @@ def identify (): def warranty (): identify () sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) + sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002')) sys.stdout.write ('\n') sys.stdout.write (' Han-Wen Nienhuys') sys.stdout.write (' Jan Nieuwenhuizen') @@ -85,18 +137,27 @@ NO WARRANTY.''')) sys.stdout.write ('\n') def progress (s): - if s[-1] != '\n': - s = s + '\n' - sys.stderr.write (s) + errorport.write (s + '\n') def warning (s): - sys.stderr.write (_ ("warning: ") + s) - sys.stderr.write ('\n') + progress (_ ("warning: ") + s) + +def user_error (s, e=1): + errorport.write (program_name + ":" + _ ("error: ") + s + '\n') + sys.exit (e) - def error (s): - sys.stderr.write (_ ("error: ") + s) - sys.stderr.write ('\n') + '''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): @@ -155,20 +216,22 @@ def options_help_str (opts): return str def help (): - sys.stdout.write (_ ("Usage: %s [OPTION]... FILE") % program_name) - sys.stdout.write ('\n\n') - sys.stdout.write (help_summary) - sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Options:")) - sys.stdout.write ('\n') - sys.stdout.write (options_help_str (option_definitions)) - sys.stdout.write ('\n\n') - sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') - sys.stdout.write ('\n') - sys.exit (0) - - + 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) @@ -176,16 +239,28 @@ def setup_temp (): os.mkdir (temp_dir, 0777) except OSError: pass - + + return temp_dir + + +def system (cmd, ignore_error = 0, quiet =0): + """Run CMD. If IGNORE_ERROR is set, don't complain when CMD returns non zero. + + RETURN VALUE + + Exit status of CMD + """ -def system (cmd, ignore_error = 0): if verbose_p: progress (_ ("Invoking `%s\'") % cmd) + st = os.system (cmd) if st: - msg = ( _ ("error: ") + _ ("command exited with value %d") % st) + name = re.match ('[ \t]*([^ \t]*)', cmd).group (1) + msg = name + ': ' + _ ("command exited with value %d") % st if ignore_error: - sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ') + if not quiet: + warning (msg + ' ' + _ ("(ignored)") + ' ') else: error (msg) @@ -195,22 +270,9 @@ def system (cmd, ignore_error = 0): def cleanup_temp (): if not keep_temp_dir_p: if verbose_p: - progress (_ ('Cleaning up `%s\'') % temp_dir) - system ('rm -rf %s' % temp_dir) - + progress (_ ("Cleaning %s...") % temp_dir) + shutil.rmtree (temp_dir) -def set_setting (dict, key, val): - try: - val = string.atof (val) - except ValueError: - #warning (_ ("invalid value: %s") % `val`) - pass - - try: - dict[key].append (val) - except KeyError: - warning (_ ("no such setting: %s") % `key`) - dict[key] = [val] def strip_extension (f, ext): (p, e) = os.path.splitext (f) @@ -218,9 +280,58 @@ def strip_extension (f, ext): e = '' return p + e + +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) + + +# if set, LILYPONDPREFIX must take prevalence +# if datadir is not set, we're doing a build and LILYPONDPREFIX +datadir = '@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')) + +################################################################ # END Library +output = 0 + # # PMX cut and paste # @@ -441,7 +552,7 @@ class Clef: self.type = cl def dump (self): - return '\\clef %s;' % self.type + return '\\clef %s' % self.type key_sharps = ('c', 'g', 'd', 'a', 'e', 'b', 'fis') key_flats = ('BUG', 'f', 'bes', 'es', 'as', 'des', 'ges') @@ -453,11 +564,11 @@ class Key: def dump (self): if self.sharps and self.flats: - k = '\\keysignature %s ;' % 'TODO' + k = '\\keysignature %s ' % 'TODO' elif self.sharps: - k = '\\notes\\key %s \major;' % key_sharps[self.sharps] + k = '\\notes\\key %s \major' % key_sharps[self.sharps] elif self.flats: - k = '\\notes\\key %s \major;' % key_flats[self.flats] + k = '\\notes\\key %s \major' % key_flats[self.flats] return k class Time: @@ -465,7 +576,7 @@ class Time: self.frac = frac def dump (self): - return '\\time %d/%d;' % (self.frac[0], self.frac[1]) + return '\\time %d/%d' % (self.frac[0], self.frac[1]) clef_table = { @@ -888,7 +999,9 @@ class Parser: def parse_context_score (self, line): debug ('score: ' + line) line = string.lstrip (line) - #ugh, these should also be matche in context_staff + # ugh: these (and lots more) should also be parsed in + # context staff. we should have a class Staff_properties + # and parse/set all those. m = re.match ('^(time[ \t]*=[ \t]*([0-9]+)[ \t]*/[ \t]*([0-9]+))', line) if m: line = line[len (m.group (1)):] @@ -1040,6 +1153,8 @@ class Pre_processor: s = '' return s + # duh: mup is strictly line-based, except for `define', + # which is `@' terminated and may span several lines def process_macro_define (self, line): global macros # don't define new macros in unactive areas @@ -1104,18 +1219,6 @@ class Pre_processor: s = '' - -option_definitions = [ - ('', 'd', 'debug', _ ("debug")), - ('NAME[=EXP]', 'D', 'define', _ ("define macro NAME [optional expansion EXP]")), - ('', 'h', 'help', _ ("this help")), - ('FILE', 'o', 'output', _ ("write output to FILE")), - ('', 'E', 'pre-process', _ ("only pre-process")), - ('', 'V', 'verbose', _ ("verbose")), - ('', 'v', 'version', _ ("print version number")), - ('', 'w', 'warranty', _ ("show warranty and copyright")), - ] - debug_p = 0 only_pre_process_p = 0 def debug (s): @@ -1178,17 +1281,21 @@ for opt in options: # sys.stdout.flush () # handy emacs testing -if not files: - files = ['template.mup'] +# if not files: +# files = ['template.mup'] +if not files: + files = ['-'] + for f in files: - if f == '-': - f = '' - if f and not os.path.isfile (f): + if f == '-': + h = sys.stdin + elif f and not os.path.isfile (f): f = strip_extension (f, '.mup') + '.mup' - progress ( _("Processing %s..." % f)) - raw_lines = open (f).readlines () + h = open (f) + progress ( _("Processing `%s'..." % f)) + raw_lines = h.readlines () p = Pre_processor (raw_lines) if only_pre_process_p: if not output: @@ -1199,8 +1306,14 @@ for f in files: output = os.path.basename (re.sub ('(?i).mup$', '.ly', f)) if output == f: output = os.path.basename (f + '.ly') - - progress (_ ("Writing %s...") % output) + + if f == '-': + output = '-' + out_h = sys.stdout + else: + out_h = open (output, 'w') + + progress (_ ("Writing `%s'...") % output) tag = '%% Lily was here -- automatically converted by %s from %s' % ( program_name, f) if only_pre_process_p: @@ -1209,9 +1322,8 @@ for f in files: else: ly = tag + '\n\n' + e.dump () - o = open (output, 'w') - o.write (ly) - o.close () + out_h.write (ly) + out_h.close () if debug_p: print (ly)