From a0fbca68222a24bf90c5ed308dd5f785871f4797 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 26 Nov 1998 01:21:13 +0100 Subject: [PATCH] patch::: 1.1.8.jcn3: website patsje pl 8.jcn3 - website: gnuisation of footers --- Generated by janneke@gnu.org using package-diff 0.62, >From = lilypond-1.1.8.jcn2, To = lilypond-1.1.8.jcn3 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.8.jcn3.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.8.jcn2 1.1.8.jcn3 ++state --- Documentation/footer.html.in | 27 +++++++++++++++++++++++++++ Documentation/topdocs/index.yo | 2 +- NEWS | 10 +++++++++- VERSION | 2 +- stepmake/bin/add-html-footer.py | 29 +++++++++++++++++++---------- stepmake/bin/packagepython.py | 5 +++++ 6 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 Documentation/footer.html.in diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in new file mode 100644 index 0000000000..4f0a023856 --- /dev/null +++ b/Documentation/footer.html.in @@ -0,0 +1,27 @@ + + + +
+Return to %s's home page. +

+Please send GNU LilyPond questions and comments to + + +gnu-music-discuss@gnu.org. +

+ +Please send comments on these web pages to + +%s, +send other FSF & GNU inquiries and questions to + +gnu@gnu.org.

+

+ + +Copyright (c) 1997, 1998 Han-Wen Nienhuys and Jan Nieuwenhuizen. +

+Verbatim copying and distribution of this entire article is +permitted in any medium, provided this notice is preserved.

+ diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo index bf386aa4b4..11eb7166ed 100644 --- a/Documentation/topdocs/index.yo +++ b/Documentation/topdocs/index.yo @@ -4,7 +4,7 @@ DEFINEMACRO(pic)(1)(url(ARG1)(DOEXPAND(docdir)/pictures/DOEXPAND(outdir)/ARG1.pn )) DEFINEMACRO(beginbold)(0)(whenhtml(htmlcommand())) -DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand())) +DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand())) redef(htmlnewfile)(0)() setchapterstring() diff --git a/NEWS b/NEWS index f6d280dee0..335084b958 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,12 @@ ---- ../lilypond-1.1.8.hwn2/NEWS Wed Nov 25 14:00:43 1998 +--- ../lilypond-1.1.8.jcn2/NEWS Tue Nov 24 20:37:55 1998 +++ b/NEWS Thu Nov 26 01:10:29 1998 +@@ -1,3 +1,6 @@ +pl 8.jcn3 + - website: gnuisation of footers + + pl 8.jcn2 + - input/test/vertical-text.ly: urg ydim of text chords + - bf: one set of |: :| volta per staff--- ../lilypond-1.1.8.hwn2/NEWS Wed Nov 25 14:00:43 1998 ++ b/NEWS Wed Nov 25 22:52:54 1998 @@ -1,3 +1,6 @@ pl 8.hwn3 diff --git a/VERSION b/VERSION index c69d99a3b9..22341bb7ed 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=8 -MY_PATCH_LEVEL=hwn3 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index e8a858a0c9..669a319ac3 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -9,6 +9,7 @@ version = '0.1' import sys import os +import time from string import * import getopt import __main__ @@ -20,6 +21,12 @@ index_file='' banner_file = '' news_file='' news ='' +footer = '\n

Please take me back to the index\n\ +of %s\n' +builtstr = '\n
\n\ +This page was built from %s-%s by\ +

%s <%s>, at %s.

' + (options, files) = getopt.getopt(sys.argv[1:], 'hp:', ['help', 'news=', 'index=', 'package=']) def help (): @@ -48,6 +55,9 @@ from packagepython import * package = Package (topdir) packager = Packager () +if package.NAME == 'LILYPOND': + package.Name = 'GNU LilyPond' + def set_vars(): os.environ["CONFIGSUFFIX"] = 'www'; if os.name == 'nt': @@ -61,17 +71,16 @@ def set_vars(): set_vars () -backstr = '\n

Please take me back to the index\n\ -of ' + package.Name + '\n' -builtstr = '\n
\n\ -This page was built from ' + package.name + '-%s by

\n\ -


%s <%s>
\n\ -

' - def footstr(index): - s = backstr % index - s = s + builtstr % (version_tuple_to_str (package.version), fullname, - packager.mail, packager.mail) + try: + footer = gulp_file (package.topdir + '/Documentation/footer.html.in') + except: + pass + s = footer % (index, package.Name, packager.webmaster, packager.webmaster) + s = s + builtstr % (package.Name, + version_tuple_to_str (package.version), fullname, + packager.mail, packager.mail, + time.strftime ('%c %Z', time.localtime (time.time ()))) return s banner = footstr (index_file) diff --git a/stepmake/bin/packagepython.py b/stepmake/bin/packagepython.py index 68c7abdc67..a1b8bab546 100755 --- a/stepmake/bin/packagepython.py +++ b/stepmake/bin/packagepython.py @@ -61,6 +61,11 @@ class Packager: except KeyError: m= '(address unknown)' self.mail= m + try: + m= os.environ['WEBMASTER'] + except KeyError: + m= self.mail + self.webmaster= m def full_version_tup(tup): -- 2.39.5