X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmidi2ly.py;h=beb4cec7af0a8cded98d783531ebeefac2be2018;hb=39b56051c9b5ef81415100fecd7d8378b1e1e9ad;hp=4b5f2507aa4f424eacc10d4d7583398af9acbb23;hpb=62e13b5b5d434857e9987a8cf7c5c3b370f87e8c;p=lilypond.git

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 4b5f2507aa..beb4cec7af 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -1,11 +1,24 @@
 #!@TARGET_PYTHON@
 #
 # midi2ly.py -- LilyPond midi import script
-# 
-# source file of the GNU LilyPond music typesetter
+
+# This file is part of LilyPond, the GNU music typesetter.
 #
-# (c) 1998--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
+#
+# LilyPond is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# LilyPond is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 
 '''
@@ -36,7 +49,6 @@ global _;_=ly._
 ## CONSTANTS
 
 
-output_name = ''
 LINE_BELL = 60
 scale_steps = [0, 2, 4, 5, 7, 9, 11]
 global_options = None
@@ -58,6 +70,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 +81,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')
@@ -844,7 +858,7 @@ def convert_midi (in_file, out_file):
 
 def get_option_parser ():
     p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'midi2ly',
-                 description=_ ("Convert %s to LilyPond input.") % 'MIDI',
+                 description=_ ("Convert %s to LilyPond input.\n") % 'MIDI',
                  add_help_option=False)
 
     p.add_option ('-a', '--absolute-pitches',
@@ -888,13 +902,13 @@ def get_option_parser ():
 
     p.add_option_group (ly.display_encode (_ ("Examples")),
               description = r'''
-  midi2ly --key=-2:1 --duration-quant=32 \
-    --allow-tuplet=4*2/3 --allow-tuplet=2*4/3 foo.midi
+  $ midi2ly --key=-2:1 --duration-quant=32 --allow-tuplet=4*2/3 --allow-tuplet=2*4/3 foo.midi
 ''')
-    p.add_option_group (ly.display_encode (_ ('Bugs')),
-                        description=(_ ('Report bugs via')
-                                     + ''' http://post.gmane.org/post.php'''
-                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
+    p.add_option_group ('',
+                        description=(
+            _ ('Report bugs via %s')
+            % 'http://post.gmane.org/post.php'
+            '?group=gmane.comp.gnu.lilypond.bugs') + '\n')
     return p
 
 
@@ -948,16 +962,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 != '':