Store scoring info in 'annotation, and always print debug info if

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index 9915cd72298f280370361a2ccc8c9fb02f582db3..3bf77f6f44c5a439cfaf799e24d76275d685390e 100644 (file)
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@ import re
 import shutil
 import sys
 import optparse
-import locale
 
 ################################################################
 # Users of python modules should include this snippet
@@ -49,20 +48,41 @@ underscore = _
 # Maybe guess encoding from LANG/LC_ALL/LC_CTYPE?
 
 def encoded_write(f, s):
-    f.write (s
-      .decode (sys.stderr.encoding or locale.getdefaultlocale()[1])
-      .encode (f.encoding or 'utf_8'))
+    f.write (s.encode (f.encoding or 'utf_8'))
 
 # ugh, Python 2.5 optparse requires Unicode strings in some argument
 # functions, and refuse them in some other places
 def display_encode (s):
     return s.encode (sys.stderr.encoding or 'utf_8')
 
+# Lilylib globals.
+program_version = '@TOPLEVEL_VERSION@'
+program_name = os.path.basename (sys.argv[0])
+
+
+# Check if program_version contains @ characters. This will be the case if
+# the .py file is called directly while building the lilypond documentation.
+# If so, try to check for the env var LILYPOND_VERSION, which is set by our
+# makefiles and use its value.
+at_re = re.compile (r'@')
+if at_re.match (program_version):
+    if os.environ.has_key('LILYPOND_VERSION'):
+        program_version = os.environ['LILYPOND_VERSION']
+    else:
+        program_version = "unknown"
+
 def stderr_write (s):
     encoded_write (sys.stderr, s)
 
+def warning (s):
+    stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n')
+
+def error (s):
+    stderr_write (program_name + ": " + _ ("error: %s") % s + '\n')
+
 progress = stderr_write
 
+
 def require_python_version ():
     if sys.hexversion < 0x02040000:
         stderr_write ("Python 2.4 or newer is required to run this program.\n\
@@ -218,6 +238,17 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
                               " ".join (option._long_opts),
                               metavar)
 
+    # Only use one level of indentation (even for groups and nested groups),
+    # since we don't indent the headeings, either
+    def indent(self):
+        self.current_indent = self.indent_increment
+        self.level += 1
+    def dedent(self):
+        self.level -= 1
+        if self.level <= 0:
+            self.current_indent = ''
+            self.level = 0;
+
     def format_usage(self, usage):
         return _("Usage: %s") % usage + '\n'
 
@@ -227,4 +258,5 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
 def get_option_parser (*args, **kwargs):
     p = optparse.OptionParser (*args, **kwargs)
     p.formatter = NonDentedHeadingFormatter ()
+    p.formatter.set_parser (p)
     return p