]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.3.141.jcn2
authorJan Nieuwenhuizen <janneke@gnu.org>
Fri, 23 Mar 2001 16:26:21 +0000 (17:26 +0100)
committerJan Nieuwenhuizen <janneke@gnu.org>
Fri, 23 Mar 2001 16:26:21 +0000 (17:26 +0100)
1.3.141.jcn2
============

* Setup for new mup converter, based on pmx2ly.

* Bugfix: lilypond-book: accept \documentclass{article}.

CHANGES
VERSION
scripts/lilypond-book.py
scripts/mup2ly.py
scripts/update-lily.py

diff --git a/CHANGES b/CHANGES
index 05c14850a9e481fab3435fcf271a04f36a376bbd..2bb1994a46a46c4b5fdefe90bc2f41c8e69ed3e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3.141.jcn2
+============
+
+* Setup for new mup converter, based on pmx2ly.
+
+* Bugfix: lilypond-book: accept \documentclass{article}.
+
 1.3.141.jcn1
 ============
 
diff --git a/VERSION b/VERSION
index 32adce85b8629169d904482c7c527a094631c091..1eeef491e1fdc48b08dcfc889ac9a1b46ed2e133 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=141
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index c452e05843c1ca2ffc86ab58e41daf11c4ad9677..dfaf288dbb302a3ad8063b9f2fc54995b24245fe 100644 (file)
@@ -563,7 +563,10 @@ def scan_latex_preamble(chunks):
                        idx = idx + 1
                        continue
                m = get_re ('header').match(chunks[idx][1])
-               options = re.split (',[\n \t]*', m.group(1)[1:-1])
+               if m.group (1):
+                       options = re.split (',[\n \t]*', m.group(1)[1:-1])
+               else:
+                       options = []
                for o in options:
                        if o == 'landscape':
                                paperguru.m_landscape = 1
index 0ffa3a9bcf6d0f02e8be1cb68f7bdc9789eaae0a..7011a7b1e459df15f33d7dad964a940885e67894 100644 (file)
 #!@PYTHON@
-
-# mup-to-ly.py -- 
+# mup2ly.py -- mup input converter
 # 
 # source file of the GNU LilyPond music typesetter
-# 
-# (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
-
-# TODO: regex -> re.
+#
+# (c) 2001
 
-name = 'mup2ly'
-version = '0.1'
+'''
+TODO:
+'''
 
 import os
+import fnmatch
+import stat
+import string
+import re
+import getopt
 import sys
+import __main__
+import operator
+import tempfile
 
-import getopt
-from string import *
-import regex
-import regsub
-import time
 
-def program_id ():
-    return name + ' version ' + version;
+sys.path.append ('@datadir@/python')
+import gettext
+gettext.bindtextdomain ('lilypond', '@localedir@')
+gettext.textdomain('lilypond')
+_ = gettext.gettext
+
+
+program_name = 'mup2ly'
+help_summary = _("Convert mup to ly")
+output = 0
+
+# lily_py.py -- options and stuff
+# 
+# source file of the GNU LilyPond music typesetter
+
+# BEGIN Library for these?
+# cut-n-paste from ly2dvi
+
+program_version = '@TOPLEVEL_VERSION@'
+if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
+       program_version = '1.3.142'
+
+
+original_dir = os.getcwd ()
+temp_dir = '%s.dir' % program_name
+keep_temp_dir_p = 0
+verbose_p = 0
 
 def identify ():
-    sys.stdout.write (program_id () + '\n')
+       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'))
+       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):
+       sys.stderr.write (s + '\n')
+
+def warning (s):
+       sys.stderr.write (_ ("warning: ") + s)
+       sys.stderr.write ('\n')
+       
+               
+def error (s):
+       sys.stderr.write (_ ("error: ") + s)
+       sys.stderr.write ('\n')
+       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 ():
-    sys.stdout.write ("Usage: %s [options] [files]\n"
-                      "Convert mup to ly\n\n"
-                      + "Options:\n"
-                      + "  -h, --help             print this help\n"
-                      % (program_name)
-                     )
-    sys.exit (0)
-
-identify ()
-(options, files) = getopt.getopt (
-    sys.argv[1:], 'hp:', ['help', 'package'])
-for opt in options:
-    o = opt[0]
-    a = opt[1]
-    if o== '--help' or o == '-h':
-       help ()
-    elif o == '-p' or o == '--package':
-       topdir = a
-    else:
-       print o
-       raise getopt.error
-
-def gulp_file (f):
-       sys.stderr.write ('[%s' % f)
+       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)
+
+
+def setup_temp ():
+       global temp_dir
+       if not keep_temp_dir_p:
+               temp_dir = tempfile.mktemp (program_name)
+       try:
+               os.mkdir (temp_dir, 0777)
+       except OSError:
+               pass
+               
+       
+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)
+               if ignore_error:
+                       sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ')
+               else:
+                       error (msg)
+
+       return st
+
+
+def cleanup_temp ():
+       if not keep_temp_dir_p:
+               if verbose_p:
+                       progress (_ ('Cleaning up `%s\'') % temp_dir)
+               system ('rm -rf %s' % temp_dir)
+
+
+def set_setting (dict, key, val):
        try:
-               i = open (f)
-               i.seek (0, 2)
-               n = i.tell ()
-               i.seek (0,0)
-       except:
-               sys.stderr.write ('can\'t open file %s\n ' % f)
-               return ''
-       s = i.read (n)
-       sys.stderr.write (']')
-       if len (s) <= 0:
-               sys.stderr.write ('gulped empty file: %s\n'% f)
-       return s
-
-def line_to_ly (s):
-       notes = ""
-       o = 0
-       i = regex.search (";", s)
-       last_name = "c"
-       last_duration = "4"
-       while i >= 0:
-               note = s[o:o+i]
-               o = o + i
-               i = regex.search (";", s[o+1:])
-               if i >= 0 :
-                       o = o + 1
-               name = regsub.gsub ("[0-9<>\.&]*", "", note)
-               duration = regsub.gsub ("[a-z+<>#+&\-]*", "", note)
-               duration = regsub.gsub (" ", "", duration)
-               if name:
-                       last_name = name
+               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]
+
+# END Library
+
+
+#
+# PMX cut and paste
+#
+
+def encodeint (i):
+       return chr ( i  + ord ('A'))
+
+       
+actab = {-2: 'eses', -1: 'es', 0 : '', 1: 'is', 2:'isis'}
+
+def pitch_to_lily_string (tup):
+       (o,n,a) = tup
+
+       nm = chr((n + 2) % 7 + ord ('a'))
+       nm = nm + actab[a]
+       if o > 0:
+               nm = nm + "'" * o
+       elif o < 0:
+               nm = nm + "," * -o
+       return nm
+
+def gcd (a,b):
+       if b == 0:
+               return a
+       c = a
+       while c: 
+               c = a % b
+               a = b
+               b = c
+       return a
+
+def rat_simplify (r):
+       (n,d) = r
+       if d < 0:
+               d = -d
+               n = -n
+       if n == 0:
+               return (0,1)
+       else:
+               g = gcd (n, d)
+               return (n/g, d/g)
+       
+def rat_multiply (a,b):
+       (x,y) = a
+       (p,q) = b
+
+       return rat_simplify ((x*p, y*q))
+
+def rat_divide (a,b):
+       (p,q) = b
+       return rat_multiply (a, (q,p))
+
+tuplet_table = {
+       2: 3,
+       3: 2,
+       5: 4
+}
+
+
+def rat_add (a,b):
+       (x,y) = a
+       (p,q) = b
+
+       return rat_simplify ((x*q + p*y, y*q))
+
+def rat_neg (a):
+       (p,q) = a
+       return (-p,q)
+
+
+def rat_larger (a,b):
+       return rat_subtract (a, b )[0] > 0
+
+def rat_subtract (a,b ):
+       return rat_add (a, rat_neg (b))
+
+def rat_to_duration (frac):
+       log = 1
+       d = (1,1)
+       while rat_larger (d, frac):
+               d = rat_multiply (d, (1,2))
+               log = log << 1
+
+       frac = rat_subtract (frac, d)
+       dots = 0
+       if frac == rat_multiply (d, (1,2)):
+               dots = 1
+       elif frac == rat_multiply (d, (3,4)):
+               dots = 2
+       return (log, dots)      
+
+
+class Barcheck :
+       def __init__ (self):
+               pass
+       def dump (self):
+               return '|\n'
+
+
+class Meter :
+       def __init__ (self,nums):
+               self.nums = nums
+       def dump (self):
+               return ' %{ FIXME: meter change %} '
+               
+class Beam:
+       def __init__ (self, ch):
+               self.char = ch
+       def dump (self):
+               return self.char
+
+class Slur:
+       def __init__ (self,id):
+               self.id = id
+               self.start_chord = None
+               self.end_chord = None
+       def calculate (self):
+               s =self.start_chord
+               e= self.end_chord
+
+               if e and s:
+                       s.note_suffix = s.note_suffix + '('
+                       e.note_prefix = ')' + e.note_prefix
                else:
-                       name = last_name
-               name = lstrip (name)
-               name = rstrip (name)
-               if name == "ms":
-                       name = "s"
-                       duration = 1
-               if duration:
-                       last_duration = duration
+                       sys.stderr.write ("\nOrphaned slur")
+                       
+class Voice:
+       def __init__ (self):
+               self.entries = []
+               self.chords = []
+               self.staff = None
+               self.current_slurs = []
+               self.slurs = []
+       def toggle_slur (self, id):
+               
+               for s in self.current_slurs:
+                       if s.id == id:
+                               self.current_slurs.remove (s)
+                               s.end_chord = self.chords[-1]
+                               return
+               s = Slur (id)
+               s.start_chord = self.chords[-1]
+               self.current_slurs.append (s)
+               self.slurs.append (s)
+               
+       def last_chord (self):
+               return self.chords[-1]
+       def add_chord (self, ch):
+               self.chords.append (ch)
+               self.entries.append (ch)
+       def add_nonchord (self, nch):
+               self.entries.append (nch)
+
+       def idstring (self):
+               return 'staff%svoice%s ' % (encodeint (self.staff.number) , encodeint(self.number))
+       def dump (self):
+               str = ''
+               ln = ''
+               for e in self.entries:
+                       next = ' ' + e.dump ()
+                       if next[-1] == '\n':
+                               str  = str + ln + next
+                               ln = ''
+                               continue
+                       
+                       if len (ln) +len (next) > 72:
+                               str = str+ ln + '\n'
+                               ln = ''
+                       ln = ln + next
+                       
+                       
+               str = str  + ln
+               id = self.idstring ()
+                       
+               str = '%s =  \\notes { \n %s }\n '% (id, str)
+               return str
+       def calculate_graces (self):
+               lastgr = 0
+               lastc = None
+               for c in self.chords:
+                       if c.grace and  not lastgr:
+                               c.chord_prefix = c.chord_prefix + '\\grace { '
+                       elif not c.grace and lastgr:
+                               lastc.chord_suffix = lastc.chord_suffix + ' } '
+                       lastgr = c.grace
+                       lastc = c
+       def calculate (self):
+               self.calculate_graces ()
+               for s in self.slurs:
+                       s.calculate ()
+
+class Clef:
+       def __init__ (self, cl):
+               self.type = cl
+       def dump(self):
+               return '\\clef %s;' % self.type
+
+clef_table = {
+       'b':'bass'  ,
+       'r':'baritone',
+       'n':'tenor',
+       'a':'alto',
+       'm':'mezzosoprano',
+       's':'soprano',
+       't':'treble',
+       'f':'frenchviolin',
+       } 
+class Staff:
+       def __init__ (self): 
+               self.voices = (Voice (), Voice())
+               self.clef = None
+               self.instrument = 0
+               self.voice_idx = 0
+               self.number = None
+               
+               i = 0
+               for v  in self.voices:
+                       v.staff = self
+                       v.number = i
+                       i = i+1
+       def set_clef (self, letter):
+               clstr = clef_table[letter]
+               self.voices[0].add_nonchord (Clef (clstr))
+               
+       def current_voice (self):
+               return self.voices[self.voice_idx]
+       def next_voice (self):
+               self.voice_idx = (self.voice_idx + 1)%len (self.voices)
+
+       def calculate (self):
+               for v in self.voices:
+                       v.calculate ()
+       def idstring (self):
+               return 'staff%s' % encodeint (self.number)
+       def dump (self):
+               str = ''
+
+               refs = ''
+               for v in self.voices:
+                       str = str + v.dump()
+                       refs = refs + '\\' + v.idstring ()+  ' '
+               
+               str = str + '\n\n%s = \\context Staff = %s \n  < \n %s >\n\n\n'% (self.idstring (), self.idstring (), refs)
+               return str
+
+class Tuplet:
+       def __init__ (self, number, base, dots):
+               self.chords = []
+               self.number = number
+               self.replaces = tuplet_table[number]
+               self.base = base
+               self.dots = dots
+               
+               length = (1,base)
+               if dots == 1:
+                       length = rat_multiply (length, (3,2))
+               elif dots == 2:
+                       length = rat_multiply (length, (7,4))
+
+               length = rat_multiply (length, (1,self.replaces))
+
+               (nb,nd) =rat_to_duration (length)
+
+               self.note_base = nb
+               self.note_dots = nd
+
+       def add_chord (self, ch):
+               ch.dots = self.note_dots
+               ch.basic_duration = self.note_base
+               self.chords.append (ch)
+
+               if len (self.chords) == 1:
+                       ch.chord_prefix = '\\times %d/%d { ' % (self.replaces, self.number)
+               elif len (self.chords) == self.number:
+                       ch.chord_suffix = ' }' 
+               
+class Chord:
+       def __init__ (self):
+               self.pitches = []
+               self.multimeasure = 0
+               self.dots = 0
+               self.basic_duration = 0
+               self.scripts = []
+               self.grace = 0
+               self.chord_prefix = ''
+               self.chord_suffix = ''
+               self.note_prefix = ''
+               self.note_suffix = ''
+               
+       def dump (self):
+               str = ''
+
+               sd = ''
+               if self.basic_duration == 0.5:
+                       sd = '\\breve'
+               else:
+                       sd = '%d' % self.basic_duration
+               sd = sd + '.' * self.dots 
+               for p in self.pitches:
+                       if str:
+                               str = str + ' ' 
+                       str = str + pitch_to_lily_string (p) + sd
+
+               for s in self.scripts:
+                       str = str + '-' + s
+
+               str = self.note_prefix +str  + self.note_suffix
+               
+               if len (self.pitches) > 1:
+                       str = '<%s>' % str
+               elif self.multimeasure:
+                       str = 'R' + sd
+               elif len (self.pitches) == 0:
+                       str = 'r' + sd
+
+               str = self.chord_prefix + str + self.chord_suffix
+               
+               return str
+               
+SPACE=' \t\n'
+DIGITS ='0123456789'
+basicdur_table = {
+       9: 0.5,
+       0: 0 ,
+       2: 2 ,
+       4: 4 ,
+       8: 8 ,
+       1: 16,
+       3: 32,
+       6: 64
+       }
+
+
+ornament_table = {
+       't': '\\prall',
+       'm': '\\mordent',
+       'x': '"x"',
+       '+': '+',
+       'u': '"pizz"',
+       'p': '|',
+       '(': '"paren"',
+       ')': '"paren"',
+       'g': '"segno"',
+       '.': '.',
+       'fd': '\\fermata',
+       'f': '\\fermata',
+       '_': '-',
+       'T': '\\trill',
+       '>': '>',
+       '^': '^',
+       }
+
+# http://www.arkkra.com/doc/uguide/contexts.html
+
+contexts = [
+       'header', 
+       'footer', 
+       'header2', 
+       'footer2', 
+       'score', 
+       'staff',
+       'voice',
+       'grids', 
+       'music',
+       ] 
+
+class Parser:
+       def __init__ (self, filename):
+               self.parse_function = self.parse_context_music
+               self.staffs = []
+               self.forced_duration = None
+               self.last_name = 0
+               self.last_oct = 0               
+               self.tuplets_expected = 0
+               self.tuplets = []
+               self.last_basic_duration = 4
+
+               self.parse (filename)
+               
+       def set_staffs (self, number):
+               self.staffs = map (lambda x: Staff (), range (0, number))
+               
+               self.staff_idx = 0
+
+               i =0
+               for s in self.staffs:
+                       s.number = i
+                       i = i+1
+                       
+       def current_staff (self):
+               return self.staffs[self.staff_idx]
+
+       def current_voice (self):
+               return self.current_staff ().current_voice ()
+       
+       def next_staff (self):
+               self.staff_idx = (self.staff_idx + 1)% len (self.staffs)
+               
+       def parse_note (self, line):
+               name = line[0]
+               alteration = 0
+               line = line[1:]
+               while line:
+                       if line[0] == '#':
+                               alteration = alteration + 1
+                       elif line[0] == '&':
+                               alteration = alteration - 1
+                       line = line[1:]
+                       # shortcut
+                       line = 0
+               return (oct, name, alteration)
+       
+                       
+       def parse_chord (self, line):
+               line = string.strip (line)
+               ch = Chord ()
+               if not line:
+                       ch = self.current_voice ().last_chord ()
+               else:
+                       m = re.match ('([0-9]+)([.]*)', line)
+                       if m:
+                               ch.basic_duration = string.atoi (m.group (1))
+                               line = line[len (m.group (1))-1:]
+                               if m.group (2):
+                                       ch.basic_duration = len (m.group (2))
+                                       line = line[len (m.group (1))-1:]
+                               line = string.strip (line)
+                       m = re.match ('([0-9]+)([.]*)', line)
+                       while line:
+                               c = line[0]
+                               if line[:1] == 'mr':
+                                       ch.multimeasure = 1
+                                       line = 0
+                               elif c in 'abcdefgrs':
+                                       pitch = parse_note (line)
+                                       ch.add_pitches (pitch)
+                                       line = 0
+                               else:
+                                       progress ( _("skipping: %s") % line)
+                                       line = 0
+               self.current_voice ().add_chord (ch)
+
+       def parse_voice (self, line):
+               chords = string.split (line, ';')
+               map (self.parse_chord, chords)
+
+       def init_context_header (self, line):
+               self.parse_function = self.parse_context_header
+                                       
+       def parse_context_header (self, line):
+               sys.stderr.write ('header: ' + line)
+
+       def init_context_footer (self, line):
+               self.parse_function = self.parse_context_footer
+
+       def parse_context_footer (self, line):
+               sys.stderr.write ('footer: ' + line)
+
+       def init_context_header2 (self, line):
+               self.parse_function = self.parse_context_header2
+
+       def parse_context_header2 (self, line):
+               sys.stderr.write ('header2: ' + line)
+
+       def init_context_footer2 (self, line):
+               self.parse_function = self.parse_context_footer2
+
+       def parse_context_footer2 (self, line):
+               sys.stderr.write ('footer2: ' + line)
+
+       def init_context_score (self, line):
+               self.parse_function = self.parse_context_score
+
+       def parse_context_score (self, line):
+               sys.stderr.write ('score: ' + line)
+
+       def init_context_staff (self, line):
+               self.parse_function = self.parse_context_staff
+
+       def parse_context_staff (self, line):
+               sys.stderr.write ('staff: ' + line)
+
+       def init_context_voice (self, line):
+               self.parse_function = self.parse_context_voice
+
+       def parse_context_voice (self, line):
+               sys.stderr.write ('voice: ' + line)
+
+       def init_context_grids (self, line):
+               self.parse_function = self.parse_context_line
+
+       def parse_context_grids (self, line):
+               sys.stderr.write ('grids: ' + line)
+
+       def init_context_music (self, line):
+               self.parse_function = self.parse_context_music
+
+       def parse_context_music (self, line):
+               sys.stderr.write ('music: ' + line)
+               m = re.match ('^([0-9]+):([0-9]*) ', line)
+               if m:
+                       self.staff_idx = string.atoi (m.group (1))
+                       line = line[len (m.group (1)):]
+                       if m.group (2):
+                               self.current_staff ().voice_idx = string.atoi (m.group (2)) - 1
+                               line = line[len (m.group (2))-1:]
+                       else:
+                               self.current_staff ().voice_idx = 0
+                       self.parse_voice (line)
                else:
-                       duration = last_duration
-               name = regsub.sub ("#", "is", name)
-               name = regsub.sub ("+", "'", name)
-               name = regsub.sub ("-", ",", name)
-               #name = regsub.sub ("ms", "s1", name)
-               notes = notes + " %s%s" % (name, duration)
-       return notes
-
-def get_voice (staff, s, staffs):
-       voice = len (staffs[staff-1]) + 1
-       tag = "^%d [0-9-]*%d[0-9-]*:" % (staff, voice)
-       notes = ""
-       o = 0
-       i = regex.search (tag, s)
-       while i >= 0:
-               o = o + i
-               n = regex.search ("$", s[o:])
-               line = s[o:o+n]
-               line = regsub.sub (tag, "", line)
-               line = line_to_ly (line)
-               notes = notes + line
-               i = regex.search (tag, s[o+n:])
-               if i >= 0:
-                       i = i + n
-       if notes != "":
-               sys.stderr.write ('%d ' % voice)
-               staffs[staff-1].append (notes)
-       return notes != ""
-
-def get_staff (s, staffs):
-       staff=len (staffs)
-       i=1
-       sys.stderr.write ('Staff %d ( ' % staff)
-       while i: 
-               i = get_voice (staff, s, staffs)
-               if not i:
-                       sys.stderr.write (')\n')
-                       staffs.append ([])
-                       staff = staff + 1
-                       sys.stderr.write ('Staff %d ( ' % staff)
-                       i = get_voice (staff, s, staffs)
-                       if not i:
-                               del staffs[staff-1]
-       return 0
+                       progress ( _("skipping: %s") % line)
+       
+       def parse (self, file):
+               # shortcut: set to official mup maximum (duh)
+               # self.set_staffs (40)
+               lines = open (file).readlines ()
+               for line in lines:
+                       m = re.match ('^([a-z2]+)', line)
+                       
+                       if m:
+                               word = m.group (1)
+                               if word in contexts:
+                                       eval ('self.init_context_%s (line)' % word)
+                                       continue
+                       else:
+                               self.parse_function (line)
+                               
+               for c in self.staffs:
+                       c.calculate ()
+
+       def dump (self):
+               str = ''
+
+               refs = ''
+               for s in self.staffs:
+                       str = str +  s.dump ()
+                       refs = '\\' + s.idstring() + refs
+
+               str = str + "\n\n\\score { <\n %s\n > }" % refs 
+               return str
+
+               
+option_definitions = [
+       ('', 'h', 'help', _ ("this help")),
+       ('FILE', 'o', 'output', _ ("write output to FILE")),
+       ('', 'V', 'verbose', _ ("verbose")),
+       ('', 'v', 'version', _ ("print version number")),
+       ('', 'w', 'warranty', _ ("show warranty and copyright")),
+       ]
+
+
+
+(sh, long) = getopt_args (__main__.option_definitions)
+try:
+       (options, files) = getopt.getopt (sys.argv[1:], sh, long)
+except:
+       help ()
+       sys.exit (2)
+
+
+for opt in options:
+       o = opt[0]
+       a = opt[1]
+       if o== '--help' or o == '-h':
+               help ()
+               sys.exit (0)
+       if o == '--version' or o == '-v':
+               identify ()
+               sys.exit (0)
+       if o == '--output' or o == '-o':
+               output = a
+       else:
+               print o
+               raise getopt.error
+
+# writes to stdout for help2man
+# don't call 
+# identify ()
+# sys.stdout.flush ()
+
+# handy emacs testing
+if not files:
+       files = ['template.mup']
+
+for f in files:
+       if f == '-':
+               f = ''
+
+       progress ( _("Processing %s..." % f))
+       e = Parser (f)
+       if not output:
+               output = os.path.basename (re.sub ('(?i).mup$', '.ly', f))
+               
+       if output == f:
+               output = os.path.basename (f + '.ly')
+               
+       progress (_ ("Writing %s...") % output)
+
+       tag = '%% Lily was here -- automatically converted by %s from %s' % ( program_name, f)
+       ly = tag + e.dump ()
+
+       o = open (output, 'w')
+       o.write (ly)
+       o.close ()
+       print ly
        
-staffs=[[]]
-mup=files[0]
-ly = os.path.basename (os.path.splitext (mup)[0]) + ".ly"
-s = gulp_file (mup)
-sys.stderr.write ('\n')
-i=1
-while i:
-       i=get_staff (s, staffs)
-sys.stderr.write ('\n')
-sys.stderr.write ('Ly output to: %s...' % ly)
-lyfile = open (ly, "w")
-for i in range (len (staffs)):
-       for v in range (len (staffs[i])):
-               lyfile.write ("$staff%d_voice_%d = \\notes {\n %s\n}\n\n" % (i+1, v+1, staffs[i][v]))
-lyfile.write ("\\score{\n")
-lyfile.write ("\\notes <\n")
-for i in range (len (staffs)):
-       lyfile.write ("\\context Staff=staff%s <\n" % chr(ord('A')+i))
-       for v in range (len (staffs[i])):
-               lyfile.write ("{ \\$staff%d_voice_%d } " % (i+1, v+1))
-       lyfile.write ("\n>\n")
-lyfile.write (">\n")
-lyfile.write ("\n}")
-lyfile.close ()
-sys.stderr.write ('\n')
index 7214a5cda066ec438a4dc6b502f6c01b8dcd3d3a..dccf7b68f38b9ebacd6c699ed2976f39087274ce 100644 (file)
@@ -38,6 +38,7 @@ program_name = 'build-lily'
 package_name = 'lilypond'
 help_summary = _("Fetch and rebuild from latest source package")
 build_root = os.environ ['HOME'] + '/usr/src'
+build_command = './configure; make web'
 release_dir = build_root + '/releases'
 patch_dir = build_root + '/patches'
 
@@ -226,6 +227,9 @@ def list_file (user, passwd, host, dir, file):
 
 list_ = list_file
 
+#
+# ugh: use ftp module.
+#
 def list_ftp (user, passwd, host, dir, file):
        if user == 'None':
                user = 'anonymous'
@@ -325,11 +329,11 @@ def build (p):
        os.chdir (build_root)
        system ('tar xzf %s/%s.tar.gz' % (release_dir, p))
        os.chdir (p)
-       return system ('./configure; make web')
+       return system (build_command)
 
 (sh, long) = getopt_args (__main__.option_definitions)
 try:
-       (options, files) = getopt.getopt(sys.argv[1:], sh, long)
+       (options, files) = getopt.getopt (sys.argv[1:], sh, long)
 except:
        help ()
        sys.exit (2)
@@ -363,29 +367,36 @@ if 1:
                progress (_ ("relax, %s is up to date" % package_name))
                sys.exit (0)
 
-       get_base = url[:string.rindex (url, '/')] + '/' + latest
+       get_base = url[:string.rindex (url, '/')] + '/'
        if os.path.isdir (patch_dir):
                os.chdir (patch_dir)
-               get = get_base + '.diff.tar.gz'
-               progress (_ ("fetching %s...") % get)
-               copy_url (get, '.')
+               if not os.path.isfile (latest + '.diff.gz'):
+                       get = get_base + latest + '.diff.gz'
+                       progress (_ ("fetching %s...") % get)
+                       copy_url (get, '.')
 
-       if not os.path.isdir (build_dir):
-               build_dir = temp_dir
+       if not os.path.isdir (build_root):
+               build_root = temp_dir
        if not os.path.isdir (release_dir):
                release_dir = temp_dir
                setup_temp ()
                
-       os.chdir (temp_dir)
-       get = get_base +  '.tar.gz'
-       progress (_ ("fetching %s...") % get)
-       copy_url (get, '.')
-       
+       os.chdir (release_dir)
+       if not os.path.isfile (latest + '.tar.gz'):
+               get = get_base + latest + '.tar.gz'
+               progress (_ ("fetching %s...") % get)
+               copy_url (get, '.')
+
+       build_command = 'echo hi'
        if not build (latest):
-               os.link ('%s/%s package_name' % (package_name, build_root, latest))
-               previous = 'hairy'
-               if os.path.isdir ('%s/%s' % (build_root, previous)):
-                       system ('rm -rf %s/%s' % (build_root, previous))
+               if os.path.isdir ('%s/%s' % (build_root, package_name)):
+                       os.chdir ('%s/%s' % (build_root, package_name))
+                       previous = os.getcwd ()
+                       os.chdir (build_root)
+                       system ('rm -f %s' % package_name)
+                       system ('echo rm -rf %s/%s' % (build_root, previous))
+                       
+               os.symlink ('%s/%s' % (build_root, latest),  package_name)
                
        os.chdir (original_dir)
        if release_dir != temp_dir: