X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmidi2ly.py;h=2d7c22c37552a6b7def8274663fce6c3673794f3;hb=2a6f7d1f45438eae0b46636d43da07b36db53273;hp=1130a0a12d4ca5d9df719feaa83522b9517b4204;hpb=f23a0d9dcda87d3f6f072fba3addeae941cce4aa;p=lilypond.git

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 1130a0a12d..2d7c22c375 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1998--2005  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--2004'))
+	sys.stdout.write (_ ('Copyright (c) %s by') % ' 2001--2005')
 	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):
@@ -504,10 +503,9 @@ class Key:
 
 		s = ''
 		if self.sharps and self.flats:
-			s = '\\keysignature %s ' % 'TODO'
+                        pass
 		else:
-			
-			if self.flats:
+                        if self.flats:
 				k = (ord ('cfbeadg'[self.flats % 7]) - ord ('a') - 2 -2 * self.minor + 7) % 7
 			else:
 				k = (ord ('cgdaebf'[self.sharps % 7]) - ord ('a') - 2 -2 * self.minor + 7) % 7
@@ -892,16 +890,15 @@ def dump_track (channels, n):
 
 		if item and item.__class__ == Note:
 			skip = 's'
-			s = s + '%s = \\notes' % (track + channel)
+			s = s + '%s = ' % (track + channel)
 			if not absolute_p:
 				s = s + '\\relative c '
 		elif item and item.__class__ == Text:
 			skip = '" "'
-			s = s + '%s = \\lyrics ' % (track + channel)
+			s = s + '%s = \\lyricmode ' % (track + channel)
 		else:
 			skip = '\\skip '
-			# must be in \notes mode for parsing \skip
-			s = s + '%s = \\notes ' % (track + channel)
+			s = s + '%s =  ' % (track + channel)
 		s = s + '{\n'
 		s = s + '  ' + dump_channel (channels[i][0], skip)
 		s = s + '}\n\n'
@@ -984,8 +981,9 @@ def convert_midi (f, o):
 
 	tag = '%% Lily was here -- automatically converted by %s from %s' % ( program_name, f)
 
+        
 	s = ''
-	s = tag + '\n\n'
+	s = tag + '\n\\version "2.3.25"\n\n'
 	for i in range (len (tracks)):
 		s = s + dump_track (tracks[i], i)
 
@@ -1085,7 +1083,6 @@ if not files or files[0] == '-':
 
 
 for f in files:
-
 	g = f
 	g = strip_extension (g, '.midi')
 	g = strip_extension (g, '.mid')