X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmup2ly.py;h=59810972eef2830d40f36e1ee7fbc6f7dd5fd32b;hb=375cfa82ebf137c11a76cfa3fa010edc8975d135;hp=2630c4931d9ab2b9b19fb0dd40f22907e161968e;hpb=e66d322479c5d24e774ed690b6ce36e1040b0de4;p=lilypond.git

diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py
index 2630c4931d..59810972ee 100644
--- a/scripts/mup2ly.py
+++ b/scripts/mup2ly.py
@@ -47,7 +47,7 @@ else:
 sys.path.append (os.path.join (datadir, 'python'))
 sys.path.append (os.path.join (datadir, 'python/out'))
 
-program_name = 'mup2ly'
+program_name = sys.argv[0]
 program_version = '@TOPLEVEL_VERSION@'
 original_dir = os.getcwd ()
 temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
@@ -67,15 +67,15 @@ except:
 
 
 program_name = 'mup2ly'
-help_summary = _ ("Convert mup to LilyPond source")
+help_summary = _ ("Convert mup to LilyPond source.")
 
 option_definitions = [
 	('', 'd', 'debug', _ ("debug")),
 	('NAME[=EXP]', 'D', 'define', _ ("define macro NAME [optional expansion EXP]")),
-	('', 'h', 'help', _ ("this help")),
+	('', 'h', 'help', _ ("print this help")),
 	('FILE', 'o', 'output', _ ("write output to FILE")),
 	('', 'E', 'pre-process', _ ("only pre-process")),
-	('', 'V', 'verbose', _ ("verbose")),
+	('', 'V', 'verbose', _ ("be verbose")),
 	('', 'v', 'version', _ ("print version number")),
 	('', 'w', 'warranty', _ ("show warranty and copyright")),
 	]
@@ -86,28 +86,6 @@ option_definitions = [
 # 
 # source file of the GNU LilyPond music typesetter
 
-# Handle bug in Python 1.6-2.1
-#
-# there are recursion limits for some patterns in Python 1.6 til 2.1. 
-# fix this by importing pre instead. Fix by Mats.
-
-# todo: should check Python version first.
-try:
-	import pre
-	re = pre
-	del pre
-except ImportError:
-	import re
-
-# Attempt to fix problems with limited stack size set by Python!
-# Sets unlimited stack size. Note that the resource module only
-# is available on UNIX.
-try:
-       import resource
-       resource.setrlimit (resource.RLIMIT_STACK, (-1, -1))
-except:
-       pass
-
 try:
 	import gettext
 	gettext.bindtextdomain ('lilypond', localedir)
@@ -127,14 +105,13 @@ def identify ():
 def warranty ():
 	identify ()
 	sys.stdout.write ('\n')
-	sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002'))
+	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):
@@ -183,9 +160,9 @@ def option_help_str (o):
 	if o[1]:
 		sh = '-%s' % o[1]
 
-	sep = ' '
+	sep = '  '
 	if o[1] and o[2]:
-		sep = ','
+		sep = ', '
 		
 	long = ''
 	if o[2]:
@@ -217,7 +194,7 @@ def options_help_str (opts):
 	return str
 
 def help ():
-	ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name),
+	ls = [(_ ("Usage: %s [OPTIONS]... FILE") % program_name),
 		('\n\n'),
 		(help_summary),
 		('\n\n'),
@@ -225,7 +202,7 @@ def help ():
 		('\n'),
 		(options_help_str (option_definitions)),
 		('\n\n'),
-		(_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+		(_ ("Report bugs to %s.") % 'bug-lilypond@gnu.org'),
 		('\n')]
 	map (sys.stdout.write, ls)
 	
@@ -290,23 +267,6 @@ def cp_to_dir (pattern, dir):
 	map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files)
 
 
-# Python < 1.5.2 compatibility
-#
-# On most platforms, this is equivalent to
-#`normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
-if os.path.__dict__.has_key ('abspath'):
-	abspath = os.path.abspath
-else:
-	def abspath (path):
-		return os.path.normpath (os.path.join (os.getcwd (), path))
-
-if os.__dict__.has_key ('makedirs'):
-	makedirs = os.makedirs
-else:
-	def makedirs (dir, mode=0777):
-		system ('mkdir -p %s' % dir)
-
-
 def mkdir_p (dir, mode=0777):
 	if not os.path.isdir (dir):
 		makedirs (dir, mode)
@@ -525,7 +485,7 @@ class Voice:
 		str = str  + ln
 		id = self.idstring ()
 			
-		str = '''%s = \\context Voice = %s \\notes {
+		str = '''%s = \\context Voice = %s {
 %s
 }
 
@@ -567,9 +527,9 @@ class Key:
 		if self.sharps and self.flats:
 			k = '\\keysignature %s ' % 'TODO'
 		elif self.sharps:
-			k = '\\notes\\key %s \major' % key_sharps[self.sharps]
+			k = '\\key %s \major' % key_sharps[self.sharps]
 		elif self.flats:
-			k = '\\notes\\key %s \major' % key_flats[self.flats]
+			k = '\\key %s \major' % key_flats[self.flats]
 		return k
 
 class Time:
@@ -638,8 +598,8 @@ class Staff:
 				str = str + v.dump()
 				refs = refs + '\n  \\' + v.idstring ()
 		str = str + '''
-%s = \context Staff = %s <%s
->
+%s = \context Staff = %s <<%s
+>>
 
 ''' % (self.idstring (), self.idstring (), refs)
 		return str
@@ -727,7 +687,7 @@ class Chord:
 		str = self.note_prefix +str  + self.note_suffix
 		
 		if len (self.pitches) > 1:
-			str = '<<%s>>' % str
+			str = '<%s>' % str
 		elif self.multimeasure:
 			str = 'R'
 		elif len (self.pitches) == 0:
@@ -1100,9 +1060,9 @@ class Parser:
 		str = str + '''
 
 \score {
-  <%s
-  >
-  \paper {}
+  <<%s
+  >>
+  \layout {}
   \midi {}
 }
 ''' % refs 
@@ -1291,12 +1251,13 @@ if not files:
 	files = ['-']
 	
 for f in files:
-
+	h = None
 	if f == '-':
 		h = sys.stdin
 	elif f and not os.path.isfile (f):
 		f = strip_extension (f, '.mup') + '.mup'
-		h = open (f)
+		
+	h = open (f)
 	progress ( _("Processing `%s'..." % f))
 	raw_lines = h.readlines ()
 	p = Pre_processor (raw_lines)