Merge branch 'master' into lilypond/translation

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index e38f69c3192013a929feee53c641e33a26fcd046..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
@@ -238,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'
 
@@ -247,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