Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / scripts / midi2ly.py

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 6ddc78ae71df89b232885bf982493179a1fc13a0..c57c788d51d042fdf0f2ca42ece26edf6fc8c328 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# (c) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -36,7 +36,6 @@ global _;_=ly._
 ## CONSTANTS
 
 
-output_name = ''
 LINE_BELL = 60
 scale_steps = [0, 2, 4, 5, 7, 9, 11]
 global_options = None
@@ -58,6 +57,9 @@ allowed_tuplet_clocks = []
 program_name = sys.argv[0]
 program_version = '@TOPLEVEL_VERSION@'
 
+authors = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+           'Han-Wen Nienhuys <hanwen@xs4all.nl>')
+
 errorport = sys.stderr
 
 def identify ():
@@ -66,17 +68,16 @@ def identify ():
 def warranty ():
     identify ()
     ly.encoded_write (sys.stdout, '''
-Copyright (c) %s by
+%s
 
- Han-Wen Nienhuys
- Jan Nieuwenhuizen
+  %s
 
 %s
 %s
-'''  ( '2001--2006',
-   _('Distributed under terms of the GNU General Public License.'),
-   _('It comes with NO WARRANTY.')))
-
+''' % ( _ ('Copyright (c) %s by') % '2001--2009',
+        '\n  '.join (authors),
+        _ ('Distributed under terms of the GNU General Public License.'),
+        _ ('It comes with NO WARRANTY.')))
 
 def progress (s):
     ly.encoded_write (errorport, s + '\n')
@@ -891,9 +892,10 @@ def get_option_parser ():
   $ midi2ly --key=-2:1 --duration-quant=32 --allow-tuplet=4*2/3 --allow-tuplet=2*4/3 foo.midi
 ''')
     p.add_option_group ('',
-                        description=(_ ('Report bugs via')
-                                     + ''' http://post.gmane.org/post.php'''
-                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
+                        description=(
+            _ ('Report bugs via %s')
+            % 'http://post.gmane.org/post.php'
+            '?group=gmane.comp.gnu.lilypond.bugs') + '\n')
     return p
 
 
@@ -947,16 +949,16 @@ def main():
         g = strip_extension (g, '.MID')
         (outdir, outbase) = ('','')
 
-        if not output_name:
+        if not global_options.output:
             outdir = '.'
             outbase = os.path.basename (g)
             o = os.path.join (outdir, outbase + '-midi.ly')
-        elif output_name[-1] == os.sep:
-            outdir = output_name
+        elif global_options.output[-1] == os.sep:
+            outdir = global_options.output
             outbase = os.path.basename (g)
             os.path.join (outdir, outbase + '-gen.ly')
         else:
-            o = output_name
+            o = global_options.output
             (outdir, outbase) = os.path.split (o)
 
         if outdir != '.' and outdir != '':