* scripts/musedata2ly.py (): idem

[lilypond.git] / scripts / pmx2ly.py

diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py
index 412906db09cefafd35d2115a870553b01b315569..c462713be9350feef777773315d948eba58ec76d 100644 (file)
--- a/scripts/pmx2ly.py
+++ b/scripts/pmx2ly.py
@@ -135,11 +135,12 @@ class Slur:
                e= self.end_chord
 
                if e and s:
-                       s.note_suffix = s.note_suffix + '('
-                       e.note_prefix = ')' + e.note_prefix
+                       s.note_suffix = s.note_suffix + '-('
+                       e.note_prefix = e.note_suffix + '-)' 
                else:
                        sys.stderr.write ("\nOrphaned slur")
-                       
+
+
 class Voice:
        def __init__ (self):
                self.entries = []
@@ -337,18 +338,18 @@ class Chord:
                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 = str + pitch_to_lily_string (p) 
 
-               str = self.note_prefix +str  + self.note_suffix
-               
                if len (self.pitches) > 1:
-                       str = '<%s>' % str
+                       str = '<<%s>>' % str
                elif len (self.pitches) == 0:
-                       str = 'r' + sd
+                       str = 'r'
+
+               str = str + sd
+               for s in self.scripts:
+                       str = str + '-' + s
 
+               str = self.note_prefix + str + self.note_suffix
                str = self.chord_prefix + str + self.chord_suffix
                
                return str