Merge master into nested-bookparts

[lilypond.git] / buildscripts / lys-to-tely.py

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
old mode 100644 (file)
new mode 100755 (executable)
index e2df5a6..e74c714
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -17,9 +17,7 @@ program_name = 'lys-to-tely'
 
 include_snippets = '@lysnippets'
 fragment_options = 'printfilename,texidoc'
-
-def help ():
-    sys.stdout.write (r"""Usage: %(program_name)s [OPTIONS]... LY-FILE...
+help_text = r"""Usage: %(program_name)s [OPTIONS]... LY-FILE...
 Construct tely doc from LY-FILEs.
 
 Options:
@@ -32,7 +30,10 @@ Options:
    instead of standard template; TEMPLATE should contain a command
    '%(include_snippets)s' to tell where to insert LY-FILEs.  When this
    option is used, NAME and TITLE are ignored.
-""" % vars ())
+"""
+
+def help (text):
+    sys.stdout.write ( text)
     sys.exit (0)
 
 (options, files) = getopt.getopt (sys.argv[1:], 'f:hn:t:',
@@ -42,7 +43,7 @@ name = "ly-doc"
 title = "Ly Doc"
 template = '''\input texinfo
 @setfilename %%(name)s.info
-@settitle %%(name)s
+@settitle %%(title)s
 
 @documentencoding utf-8
 @iftex
@@ -58,6 +59,7 @@ template = '''\input texinfo
 @end ignore
 
 @node Top, , , (dir)
+@top %%(title)s
 
 %s
 
@@ -68,7 +70,10 @@ for opt in options:
     o = opt[0]
     a = opt[1]
     if o == '-h' or o == '--help':
-        help ()
+        # We can't use vars () inside a function, as that only contains all 
+        # local variables and none of the global variables! Thus we have to 
+        # generate the help text here and pass it to the function...
+        help (help_text % vars ())
     elif o == '-n' or o == '--name':
         name = a
     elif o == '-t' or o == '--title':