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

diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in
new file mode 100644 (file)
index 0000000..4f0a023
--- /dev/null
+++ b/Documentation/footer.html.in
@@ -0,0 +1,27 @@
+<!if this file ./Documentation/footer.html.in is present, it is included>
+<!automatically by add-html-footer, and replaces the simple standard footer>
+<!substitutions: package.Name, package.Name, ENV:WEBMASTER, ENV:WEBMASTER>
+<hr>
+Return to <a href=%s>%s's home page</a>.
+<p>
+Please send GNU LilyPond questions and comments to 
+
+<a href="mailto:gnu-music-discuss@gnu.org">
+<em>gnu-music-discuss@gnu.org</em></a>.
+<p>
+
+Please send comments on these web pages to 
+
+<a href="mailto:%s"><em>%s</em></a>,
+send other FSF &amp; GNU inquiries and questions to 
+
+<a href="mailto:gnu@gnu.org"><amp>gnu@gnu.org</em></a>.<p>
+<p>
+<!Copyright (C) 1998 Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA  02111,  USA>
+<!hmm, is this ok?>
+Copyright (c) 1997, 1998 Han-Wen Nienhuys and Jan Nieuwenhuizen.
+<p>
+Verbatim copying and distribution of this entire article is 
+permitted in any medium, provided this notice is preserved.<p>
+

diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo
index bf386aa4b421c78924185bf95a5f6665c83c58cb..11eb7166ed83119ec26c682ab240e5861ac09965 100644 (file)
--- 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(<font size=4><strong>)))
-DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand(</strong><font size=3>)))
+DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand(</strong></font>)))
 redef(htmlnewfile)(0)()
 setchapterstring()
 

diff --git a/NEWS b/NEWS
index f6d280dee00771268f3c90384359b789100336e4..335084b95827e0cb320cbcd55a12e884fc4f336f 100644 (file)
--- 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 c69d99a3b97bac1a49175c54a0e20eb8ced86de6..22341bb7ed3bb8c5f894f9c63a6f387b3440683b 100644 (file)
--- 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 e8a858a0c9b3fa6d065b0f257ca134be606bdbb4..669a319ac3e57f932ad46e240539f889d9ba522f 100644 (file)
--- 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<hr>Please take me <a href=%s>back to the index</a>\n\
+of %s<!%s%s>\n'
+builtstr = '\n<hr><font size=-1>\n\
+This page was built from %s-%s by\
+<address><br>%s &lt<a href=mailto:%s>%s</a>&gt, at %s.</address><p></font>' 
+
 (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<hr>Please take me <a href=%s>back to the index</a>\n\
-of ' + package.Name + '\n'
-builtstr = '\n<hr><font size=-1>\n\
-This page was built  from ' + package.name + '-%s by <p>\n\
-<address><br>%s &lt<a href=mailto:%s>%s</a>&gt</address>\n\
-<p></font>' 
-
 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 68c7abdc67ab7e9689b39a4582586bce063b24f7..a1b8bab54649316c9c5def950cd5e53beb9c4a40 100755 (executable)
--- 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):