From 9ed276197328c78e47f9e8fd0ba212d29990d162 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Thu, 24 Jun 2010 12:00:03 +0200 Subject: [PATCH] lys-to-tely: Allow the makefile to specify a different author than Han-Wen/Jan --- make/lysdoc-rules.make | 2 +- make/lysdoc-vars.make | 1 + scripts/build/lys-to-tely.py | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index cfaabe3355..5c38f7d4ab 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,2 +1,2 @@ $(outdir)/collated-files.tely: $(COLLATED_FILES) - $(LYS_TO_TELY) --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^ + $(LYS_TO_TELY) --name=$(outdir)/collated-files.tely --title="$(TITLE)" --author="$(AUTHOR)" $^ diff --git a/make/lysdoc-vars.make b/make/lysdoc-vars.make index 5cbc61717c..337460c3da 100644 --- a/make/lysdoc-vars.make +++ b/make/lysdoc-vars.make @@ -1,4 +1,5 @@ TITLE=LYs Doc +AUTHOR=Han-Wen Nienhuys and Jan Nieuwenhuizen ifeq ($(COLLATED_FILES),) diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py index 0eb12047e6..d503786e3e 100644 --- a/scripts/build/lys-to-tely.py +++ b/scripts/build/lys-to-tely.py @@ -27,6 +27,7 @@ Options: options -o, --output=NAME write tely doc to NAME -t, --title=TITLE set tely doc title TITLE + -a, --author=AUTHOR set tely author AUTHOR --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 @@ -38,10 +39,11 @@ def help (text): sys.exit (0) (options, files) = getopt.getopt (sys.argv[1:], 'f:hn:t:', - ['fragment-options=', 'help', 'name=', 'title=', 'template=']) + ['fragment-options=', 'help', 'name=', 'title=', 'author=', 'template=']) name = "ly-doc" title = "Ly Doc" +author = "Han-Wen Nienhuys and Jan Nieuwenhuizen" template = '''\input texinfo @setfilename %%(name)s.info @settitle %%(title)s @@ -55,7 +57,7 @@ template = '''\input texinfo @c fool ls-latex @ignore -@author Han-Wen Nienhuys and Jan Nieuwenhuizen +@author %%(author)s @title %%(title)s @end ignore @@ -71,14 +73,16 @@ for opt in options: o = opt[0] a = opt[1] if o == '-h' or o == '--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 + # 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 == '-a' or o == '--author': + author = a elif o == '-f' or o == '--fragment-options': fragment_options = a elif o == '--template': -- 2.39.5