* Another grand 2003 update.

[lilypond.git] / scripts / musedata2ly.py

diff --git a/scripts/musedata2ly.py b/scripts/musedata2ly.py
index 99d74fb764298e516d08a4bac2a29d3dd6b9b800..a1289d87a9d79aa79299323c2da09d7e0dc0998b 100644 (file)
--- a/scripts/musedata2ly.py
+++ b/scripts/musedata2ly.py
@@ -226,27 +226,22 @@ class Chord:
 
                sd = sd + '.' * self.dots
 
-               str = ')' * len (self.slurstart) + str
-               
                for p in self.pitches:
                        if str:
                                str = str + ' ' 
-                       str = str + pitch_to_lily_string (p) + sd
-               str = str + '(' * len (self.slurstart)
+                       str = str + pitch_to_lily_string (p) 
                
+               if len (self.pitches) > 1:
+                       str = '<<%s>>' % str
+               elif len (self.pitches) == 0:
+                       str = 'r'
 
+               str = str + sd + '-(' * len (self.slurstart) + '-)' * len (self.slurstart) 
                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 len (self.pitches) == 0:
-                       str = 'r' + sd
-
                str = self.chord_prefix + str + self.chord_suffix
-               
                return str
 
 class Measure_start:
@@ -563,7 +558,7 @@ This is free software.  It is covered by the GNU General Public License,
 and you are welcome to change it and/or distribute copies of it under
 certain conditions.  Invoke as `midi2ly --warranty' for more information.
 
-Copyright (c) 2000--2002 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Copyright (c)  2000--2003 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
 """ % version)
 def identify():
        sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))