X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Flilylib.py;h=a911cac23f0a2f8bdc77503a0e0c886becc7fa6f;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=0f33ed4a2cde2bf5b7e147ae0366afa249bf275c;hpb=49fbcc8b526edcad8a0650e9d7870b647c43d698;p=lilypond.git

diff --git a/python/lilylib.py b/python/lilylib.py
index 0f33ed4a2c..a911cac23f 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -1,6 +1,6 @@
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -40,9 +40,14 @@ try:
     import gettext
     t = gettext.translation ('lilypond', localedir)
     _ = t.ugettext
+    ungettext = t.ungettext
 except:
     def _ (s):
         return s
+    def ungettext (s, p, n):
+        if n == 1:
+            return s
+        return p
 underscore = _
 
 # Urg, Python 2.4 does not define stderr/stdout encoding
@@ -115,10 +120,12 @@ def is_verbose ():
 def stderr_write (s):
     encoded_write (sys.stderr, s)
 
-def print_logmessage (level, s, fullmessage = True):
+def print_logmessage (level, s, fullmessage = True, newline = True):
     if (is_loglevel (level)):
         if fullmessage:
             stderr_write (program_name + ": " + s + '\n')
+        elif newline:
+            stderr_write (s + '\n')
         else:
             stderr_write (s)
 
@@ -131,11 +138,11 @@ def warning (s):
 def basic_progress (s):
     print_logmessage ("BASIC", s);
 
-def progress (s, fullmessage = False):
-    print_logmessage ("PROGRESS", s, fullmessage);
+def progress (s, fullmessage = False, newline = True):
+    print_logmessage ("PROGRESS", s, fullmessage, newline);
 
-def debug_output (s, fullmessage = False):
-    print_logmessage ("DEBUG", s, fullmessage);
+def debug_output (s, fullmessage = False, newline = True):
+    print_logmessage ("DEBUG", s, fullmessage, newline);
 
 
 
@@ -147,11 +154,12 @@ please read 'Setup for MacOS X' in Application Usage.")
         os.system ("open http://python.org/download/")
         sys.exit (2)
 
-# Modified version of the commands.mkarg(x), which always uses
-# double quotes (since Windows can't handle the single quotes:
+# A modified version of the commands.mkarg(x) that always uses
+# double quotes (since Windows can't handle the single quotes)
+# and escapes the characters \, $, ", and ` for unix shells.
 def mkarg(x):
     if os.name == 'nt':
-        return x
+        return ' "%s"' % x
     s = ' "'
     for c in x:
         if c in '\\$"`':
@@ -179,7 +187,7 @@ def subprocess_system (cmd,
     error_log_file = ''
 
     if redirect_output:
-        progress (_ ("Processing %s.ly \n") % log_file)
+        progress (_ ("Processing %s.ly") % log_file)
     else:
         if be_verbose:
             show_progress = 1
@@ -327,8 +335,15 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
     def format_description(self, description):
         return description
 
+class NonEmptyOptionParser (optparse.OptionParser):
+    "A subclass of OptionParser that gobbles empty string arguments."
+
+    def parse_args (self, args=None, values=None):
+        options, args = optparse.OptionParser.parse_args (self, args, values)
+        return options, filter (None, args)
+
 def get_option_parser (*args, **kwargs):
-    p = optparse.OptionParser (*args, **kwargs)
+    p = NonEmptyOptionParser (*args, **kwargs)
     p.formatter = NonDentedHeadingFormatter ()
     p.formatter.set_parser (p)
     return p