Updates to fret-diagrams

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

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
index a9186627d8a839674d6eff7e6bf50e62aca329a3..c9d698f92cea0764b2e608a7bda5c4b75b9f35a6 100644 (file)
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -12,33 +12,39 @@ TODO:
 import sys
 import os
 import getopt
+import re
 
 program_name = 'lys-to-tely'
-include_snippets = '@lysnippets'
 
-def help ():
-    sys.stdout.write (r"""Usage: %(program_name)s [OPTIONS]... LY-FILE...
+include_snippets = '@lysnippets'
+fragment_options = 'printfilename,texidoc'
+help_text = r"""Usage: %(program_name)s [OPTIONS]... LY-FILE...
 Construct tely doc from LY-FILEs.
 
 Options:
- -h, --help                print this help
- -o, --output=NAME         write tely doc to NAME
- -t, --title=TITLE         set tely doc title TITLE
-     --template=TEMPLATE   use TEMPLATE as Texinfo template file,
+ -h, --help                     print this help
+ -f, --fragment-options=OPTIONS use OPTIONS as lilypond-book fragment
+   options
+ -o, --output=NAME              write tely doc to NAME
+ -t, --title=TITLE              set tely doc title TITLE
+     --template=TEMPLATE        use TEMPLATE as Texinfo template file,
    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 ())
+   '%(include_snippets)s' to tell where to insert LY-FILEs.  When this
+   option is used, NAME and TITLE are ignored.
+"""
+
+def help (text):
+    sys.stdout.write ( text)
     sys.exit (0)
 
-(options, files) = getopt.getopt (sys.argv[1:], 'hn:t:',
-                     ['help', 'name=', 'title=', 'template='])
+(options, files) = getopt.getopt (sys.argv[1:], 'f:hn:t:',
+                     ['fragment-options=', 'help', 'name=', 'title=', 'template='])
 
 name = "ly-doc"
 title = "Ly Doc"
 template = '''\input texinfo
 @setfilename %%(name)s.info
-@settitle %%(name)s
+@settitle %%(title)s
 
 @documentencoding utf-8
 @iftex
@@ -54,6 +60,7 @@ template = '''\input texinfo
 @end ignore
 
 @node Top, , , (dir)
+@top %%(title)s
 
 %s
 
@@ -64,26 +71,38 @@ 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':
         title = a
+    elif o == '-f' or o == '--fragment-options':
+        fragment_options = a
     elif o == '--template':
         template = open (a, 'r').read ()
     else:
-        raise 'unknown opt ', o
+        raise Exception ('unknown option: ' + o)
+
+texi_file_re = re.compile ('.*\.i?te(ly|xi)$')
 
 def name2line (n):
-    # UGR
-    s = r"""
+    if texi_file_re.match (n):
+        # We have a texi include file, simply include it:
+        s = r"@include %s" % os.path.basename (n)
+    else:
+        # Assume it's a lilypond file -> create image etc.
+        s = r"""
 @ifhtml
 @html
-<A NAME="%s"></A>
+<a name="%s"></a>
 @end html
 @end ifhtml
 
-@lilypondfile[printfilename,texidoc]{%s}""" % (n, n)
+@lilypondfile[%s]{%s}
+""" % (os.path.basename (n), fragment_options, n)
     return s
 
 if files:
@@ -92,7 +111,6 @@ if files:
     name = os.path.basename (name)
     template = template % vars ()
 
-    files.sort ()
     s = "\n".join (map (name2line, files))
     s = template.replace (include_snippets, s, 1)
     f = "%s/%s" % (dir, name)