X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmidi2ly.py;h=e0a00ae170310a5a9d40a8d92a60f86b7db8a443;hb=891840d4b25b71e9caac50174077d6461bb5cc7f;hp=d8d51d667bb9eb520b9fb1f66f5b77443bca6202;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index d8d51d667b..e0a00ae170 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--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2010  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/>.
 
 
 '''
@@ -57,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 ():
@@ -65,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--2010',
+        '\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')
@@ -786,7 +801,7 @@ def convert_midi (in_file, out_file):
     global  duration_quant_clocks
     global allowed_tuplet_clocks
 
-    str = open (in_file).read ()
+    str = open (in_file, 'rb').read ()
     midi_dump = midi.parse (str)
     
     clocks_per_1 = midi_dump[0][1]
@@ -890,9 +905,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