X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Flys-to-tely.py;h=e2df5a6bc3fbb2f282d755bd54f17a7f1fa8d8d3;hb=91708b30fba67f8fd589980e03ff420c26473a5a;hp=55becc827578c9e2bf7f1ed3562934422c4dddcb;hpb=b008966a8de740291c9535d88d9c66691b1c0654;p=lilypond.git

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
index 55becc8275..e2df5a6bc3 100644
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -4,97 +4,110 @@
 '''
 TODO:
 
-  * Add @nodes, plit at sections?
-  * Less kludged first introduction file
-  * include *.texi files for text at start of section?
+ * Add @nodes, split at sections?
 
 '''
 
 
 import sys
 import os
-import string 
 import getopt
 
 program_name = 'lys-to-tely'
 
+include_snippets = '@lysnippets'
+fragment_options = 'printfilename,texidoc'
+
 def help ():
-	sys.stdout.write (r"""Usage: lys-to-tely [OPTION]... LY-FILE...
+    sys.stdout.write (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 tely doc title TITLE
-""")
-	sys.exit (0)
-
-(options, files) = getopt.getopt(sys.argv[1:], 'hn:t:', [
-	'help', 'name=', 'title='])
-
-name="ly-doc"
-title="Ly Doc"
-for opt in options:
-	o = opt[0]
-	a = opt[1]
-	if o == '-h' or o == '--help':
-		help ()
-	elif o == '-n' or o == '--name':
-		name = a
-	elif o == '-t' or o == '--title':
-		title = a
-	else:
-		raise 'unknown opt ', o
-
-def strip_extension (f, ext):
-	(p, e) = os.path.splitext (f)
-	if e == ext:
-		e = ''
-	return p + e
+ -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 ())
+    sys.exit (0)
+
+(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
+
+@documentencoding utf-8
+@iftex
+@afourpaper
+@end iftex
 
-if files:
-	dir = os.path.dirname (name)
-	if not dir:
-		dir = "."
-	name = strip_extension (os.path.basename (name), ".tely")
-
-	s = '''\input texinfo
-@setfilename %s.info
-@settitle %s
 @finalout @c we do not want black boxes.
 
 @c fool ls-latex
 @ignore
 @author Han-Wen Nienhuys and Jan Nieuwenhuizen
-@title %s
+@title %%(title)s
 @end ignore
 
 @node Top, , , (dir)
-''' % (name, title, title)
 
-	def name2line (n):
-		# UGR
-		s = r"""
+%s
+
+@bye
+''' % include_snippets
+
+for opt in options:
+    o = opt[0]
+    a = opt[1]
+    if o == '-h' or o == '--help':
+        help ()
+    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 Exception ('unknown option: ' + o)
+
+def name2line (n):
+    s = r"""
 @ifhtml
 @html
-<A NAME="%s">
+<a name="%s"></a>
 @end html
 @end ifhtml
-""" % n
-		
-		s += "@lilypondfile[printfilename]{%s}" % n
-		return s
-	files.sort ()
-	s = s + string.join (map (lambda x: name2line (x), files), "\n")
-	s = s + '\n@bye\n'
-	f = "%s/%s.tely" % (dir, name)
-	sys.stderr.write ("%s: writing %s..." % (program_name, f))
-	h = open (f, "w")
-	h.write (s)
-	h.close ()
-	sys.stderr.write ('\n')
-else:
-	# not Unix philosophy, but hey, at least we notice when
-	# we don't distribute any .ly files.
-	sys.stderr.write ("No files specified. Doing nothing")
 
+@lilypondfile[%s]{%s}
+""" % (os.path.basename (n), fragment_options, n)
+    return s
+
+if files:
+    dir = os.path.dirname (name) or "."
+# don't strip .tely extension, input/lsr uses .itely
+    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)
+    sys.stderr.write ("%s: writing %s..." % (program_name, f))
+    h = open (f, "w")
+    h.write (s)
+    h.close ()
+    sys.stderr.write ('\n')
+else:
+    # not Unix philosophy, but hey, at least we notice when
+    # we don't distribute any .ly files.
+    sys.stderr.write ("No files specified. Doing nothing")