Changed scripts/* to use sys.argv[0]

[lilypond.git] / scripts / midi2ly.py

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 0ab2f9203f113481522654b10370f6bee8a05329..e8244decf5da73a77a38e5630ab208dcd963fd88 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c)  1998--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1998--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -80,7 +80,7 @@ except:
        def _ (s):
                return s
 
-program_name = 'midi2ly'
+program_name = sys.argv[0]
 program_version = '@TOPLEVEL_VERSION@'
 
 errorport = sys.stderr
@@ -133,14 +133,13 @@ def identify ():
 def warranty ():
        identify ()
        sys.stdout.write ('\n')
-       sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2003'))
+       sys.stdout.write (_ ('Copyright (c) %s by') % ' 2001--2004')
        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\n')
+       sys.stdout.write (_ ("Distributed under terms of the GNU General Public License."))
+        sys.stdout.write (_ ("It comes with NO WARRANTY."))
        sys.stdout.write ('\n')
 
 def progress (s):
@@ -785,14 +784,14 @@ def dump_chord (ch):
                s = s + dump (notes[0])
        elif len (notes) > 1:
                global reference_note
-               s = s + '<<'
+               s = s + '<'
                s = s + notes[0].dump (dump_dur = 0)
                r = reference_note
                for i in notes[1:]:
                        s = s + i.dump (dump_dur = 0 )
-               s = s + '>>'
+               s = s + '>'
 
-               s = s + notes[0].duration.dump()
+               s = s + notes[0].duration.dump() + ' '
                reference_note = r
        return s
 
@@ -906,7 +905,7 @@ def dump_track (channels, n):
                s = s + '  ' + dump_channel (channels[i][0], skip)
                s = s + '}\n\n'
 
-       s = s + '%s = <\n' % track
+       s = s + '%s = <<\n' % track
 
        if clef.type != 2:
                s = s + clef.dump () + '\n'
@@ -920,7 +919,7 @@ def dump_track (channels, n):
                else:
                        s = s + '  \\context Voice = %s \\%s\n' % (channel,
                                                                   track + channel)
-       s = s + '>\n\n'
+       s = s + '>>\n\n'
        return s
 
 def thread_first_item (thread):
@@ -989,7 +988,7 @@ def convert_midi (f, o):
        for i in range (len (tracks)):
                s = s + dump_track (tracks[i], i)
 
-       s = s + '\n\\score {\n  <\n'
+       s = s + '\n\\score {\n  <<\n'
        for i in range (len (tracks)):
                track = track_name (i)
                item = track_first_item (tracks[i])
@@ -997,7 +996,7 @@ def convert_midi (f, o):
                        s = s + '    \\context Staff=%s \\%s\n' % (track, track)
                elif item and item.__class__ == Text:
                        s = s + '    \\context Lyrics=%s \\%s\n' % (track, track)
-       s = s + '  >\n}\n'
+       s = s + '  >>\n}\n'
 
        progress (_ ("%s output to `%s'...") % ('LY', o))