From 5a06674986e9e4456f3f0061f5b25b59215343f4 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:25:58 +0000
Subject: [PATCH] lilypond-1.2.7

---
 stepmake/bin/add-html-footer.py               | 234 ++++++++++--------
 stepmake/bin/ls-latex.py                      |   7 +-
 stepmake/stepmake/yolily-topdoc-targets.make  |   2 -
 .../stepmake/yolily-toplevel-targets.make     |   4 +-
 4 files changed, 139 insertions(+), 108 deletions(-)

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 1eb654a685..1ab9987e84 100644
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -3,10 +3,7 @@
 """
 Print a nice footer.  add the top of the ChangeLog file (up to the ********)
 """
-
-program_name = 'add-html-footer'
-version = '0.1'
-
+import re
 import sys
 import os
 import time
@@ -16,135 +13,168 @@ import __main__
 
 fullname = "unknown"
 changelog_file = ''
-
 index_file=''
 banner_file = ''
 changelog_file=''
 changes =''
-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>' 
+package_version = ''
+
+mail_address = '(address unknown)'
+try:
+	mail_address= os.environ['MAILADDRESS']
+except KeyError:
+	pass
 
-(options, files) = getopt.getopt(sys.argv[1:], 'c:hp:', ['changelog=', 'help', 'news=', 'index=', 'package=']) 
+
+webmaster= ''
+try:
+	webmaster= os.environ['WEBMASTER']
+except KeyError:
+	pass
+
+
+
+footer_fn = ''
+footer = r"""<hr>Please take me <a href=%s>back to the index</a>
+of %s
+<!-- package name %s>
+ <!-- webmaster fields. %s %s>
+"""
+
+builtstr = r"""<hr><font size=-1>
+This page was built from %s-%s by 
+<address><br>%s &lt<a href=mailto:%s>%s</a>&gt,  %s.</address><p></font>"""
+
+package_name = ''
+
+(options, files) = getopt.getopt(sys.argv[1:], 'c:hp:', [
+	'name=', 'footer=', 'version=',
+	'changelog=', 'help', 'news=', 'index=']) 
 
 def gulp_file(f):
 	try:
-		i = open(f)
-		i.seek (0, 2)
-		n = i.tell ()
-		i.seek (0,0)
+			i = open(f)
+			i.seek (0, 2)
+			n = i.tell ()
+			i.seek (0,0)
 	except:
-		sys.stderr.write ("can't open file: %s\n" % f)
-		return ''
+			sys.stderr.write ("can't open file: %s\n" % f)
+			return ''
 	s = i.read (n)
 	if len (s) <= 0:
-		sys.stderr.write ("gulped emty file: %s\n" % f)
+			sys.stderr.write ("gulped empty file: %s\n" % f)
 	i.close ()
 	return s
 
 def help ():
-    sys.stdout.write (r"""Usage: add-html-footer [OPTION]... HTML-FILE
+	sys.stdout.write (r"""Usage: add-html-footer [OPTION]... HTML-FILE
 Add a nice footer, add the top of the ChangLog file (up to the ********)
 Options:
-  -h, --help             print this help
-  -p, --package          package name (ugh. Junkme.)
-  """)
-    sys.exit (0)
+-h, --help			 print this help
+--version               package version
+--name				 package_name
+--footer			   footer file.
+""")
+	sys.exit (0)
 
 for opt in options:
-    o = opt[0]
-    a = opt[1]
-    if o == '--news' or o == '--changelog' or o == '-c':
-	changelog_file = a
-    elif o == '--index':
-	index_file = a
-    elif o == '-h' or o == '--help':
-    	help ()
-    elif o == '-p' or o == '--package':
-	topdir = a
-
-sys.path.append (topdir + '/stepmake/bin')
-from packagepython import *
-package = Package (topdir)
-packager = Packager ()
-
-if package.NAME == 'LILYPOND':
-    package.Name = 'GNU LilyPond'
-
+	o = opt[0]
+	a = opt[1]
+	if o == '--news' or o == '--changelog' or o == '-c':
+		changelog_file = a
+	elif o == '--index':
+		index_file = a
+	elif o == '--footer':
+		footer_fn = a
+	elif o == '--name':
+		package_name = a
+	elif o == '-h' or o == '--help':
+		help ()
+	elif o == '--version':
+		package_version = a
+	else:
+		raise 'unknown opt ', o
 def set_vars():
-    os.environ["CONFIGSUFFIX"] = 'www';
-    if os.name == 'nt':
-        import ntpwd
-        pw = ntpwd.getpwname(os.environ['USERNAME'])
-    else:
-        import pwd
-        pw = pwd.getpwuid (os.getuid());
-
-    __main__.fullname=pw[4]
+	os.environ["CONFIGSUFFIX"] = 'www';
+	if os.name == 'nt':
+		import ntpwd
+		pw = ntpwd.getpwname(os.environ['USERNAME'])
+	else:
+		import pwd
+		pw = pwd.getpwuid (os.getuid());
 
+	f =pw[4]
+	f = string.split (f, ',')[0]
+	__main__.fullname=f 
 set_vars ()
 
+
 def footstr(index):
-    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
+	ft = __main__.footer
+
+	if footer_fn:
+		try:
+			ft = open (footer_fn).read ()
+		except:
+			raise 'oops: ' , footer_fn
+
+
+	s = ft % (index, package_name, package_name, webmaster, webmaster)
+	s = s + builtstr % (package_name, package_version, fullname,
+			    mail_address, mail_address, 
+			    time.strftime ('%c %Z', time.localtime (time.time ())))
+	return s
 
 banner = footstr (index_file)
 banner_id = '<! banner_id >'
 
 
 if changelog_file:
-    changes = gulp_file (changelog_file)
-    i = regex.search ('^\*\*', changes)
-    changes = changes[:i]
-    
-def check_tag (tag, sub, s, bottom):
-    tag = string.lower (tag)
-    TAG = string.upper (tag)
-    s = regsub.sub (tag, TAG, s)
-    i = regex.search (TAG, s)
-    if i < 0:
-        if bottom:
-	    s = s + sub + '\n'
+	changes = gulp_file (changelog_file)
+	m = re.search ('^\*\*', changes)
+	if m:
+		changes = changes[:m.start (0)]
+
+
+
+def do_file (s):
+	if changelog_file:
+		s = re.sub ('top_of_ChangeLog', '<XMP>\n'+ changes  + '\n</XMP>\n', s)
+
+
+	if re.search (banner_id, s) == None:
+		s = banner_id + s
+	else:
+		return s
+
+	s = re.sub ('(?i)<body>', '<BODY BGCOLOR=WHITE><FONT COLOR=BLACK>', s)
+	# do title.
+	#s = check_tag ('<body', '', s, 0)
+	if re.search ('(?i)</body', s):
+		s = re.sub ('(?i)</body>', banner + '</BODY>', s)
+	elif re.search ('(?i)</html', s):		
+		s = re.sub ('(?i)</html>', banner + '</HTML>', s)
 	else:
-	    s = sub + '\n' + s
-    return s
-    
+		s = s + banner
+
+	return s
+
 for f in files:
-    s = gulp_file (f)
-
-    if changelog_file:
-	s = regsub.sub ('top_of_ChangeLog', '<XMP>\n'+ changes  + '\n</XMP>\n', s)
-
-    s = check_tag ('<body', '', s, 0)
-    if regex.search ('<BODY', s) == -1:
-	s = '<BODY>\n' + s
-    s = regsub.sub ('<BODY>', '<BODY BGCOLOR=WHITE><FONT COLOR=BLACK>', s)
-    if regex.search (banner_id, s) == -1:
-	s = regsub.sub ('</body>', '</BODY>', s)
-	s = regsub.sub ('</BODY>', banner_id  + banner + '</BODY>', s)
-    else:
-	s = check_tag ('</body>', '</BODY>', s, 1)
-
-    title = '<HEAD><TITLE>' \
-	+ package.Name + ' -- ' + os.path.basename (os.path.splitext(f)[0]) \
-	+ '</TITLE></HEAD>'
-    s = check_tag ('<title>', title, s, 0)
-
-    s = check_tag ('<html', '', s, 0)
-    if regex.search ('<HTML', s) == -1:
-	s = '<HTML>\n' + s
-    s = check_tag ('</html>', '</HTML>', s, 1)
-
-    dump_file (f, s)
+	s = gulp_file (f)
+	s = do_file (s)
+	open (f, 'w').write (s)
+
+if 0:
+	title = '<HEAD><TITLE>' \
+		+ package_name + ' -- ' + os.path.basename (os.path.splitext(f)[0]) \
+		+ '</TITLE></HEAD>'
+	s = check_tag ('<title>', title, s, 0)
+
+	s = check_tag ('<html', '', s, 0)
+	if regex.search ('<HTML', s) == -1:
+		s = '<HTML>\n' + s
+	s = check_tag ('</html>', '</HTML>', s, 1)
+
+	dump_file (f, s)
 
 
diff --git a/stepmake/bin/ls-latex.py b/stepmake/bin/ls-latex.py
index a2bbda225b..bf170fba55 100644
--- a/stepmake/bin/ls-latex.py
+++ b/stepmake/bin/ls-latex.py
@@ -143,7 +143,10 @@ for opt in options:
 
 l = sys.stdout
 
-l.write ('<html><title>%s</title><h1> %s</h1><ul>\n' % (title, title))
+l.write (r"""<html><title>%s</title>
+<body>
+<h1> %s</h1><ul>
+""" % (title, title))
 
 
 for x in files:
@@ -161,5 +164,5 @@ for x in files:
 	head.title = head.filename
     print_html_head (l, pre, head)
 
-l.write ('</ul></html>')
+l.write ('</ul></body></html>')
 
diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make
index 612d1c6b64..61009bb86e 100644
--- a/stepmake/stepmake/yolily-topdoc-targets.make
+++ b/stepmake/stepmake/yolily-topdoc-targets.make
@@ -7,12 +7,10 @@ $(outdir)/%.html: %.yo
 	$(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@.in $<
 	$(sed-version) < $@.in > $@
 	rm -f $@.in
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --changelog=$(depth)/CHANGES $@
 
 local-WWW:
 	-cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
 
-
 copy-to-top: 
 	$(foreach i, $(TO_TOP_FILES), \
 	  cp $(i) $(depth)/ && ) true
diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make
index 64e5d4960c..278d406382 100644
--- a/stepmake/stepmake/yolily-toplevel-targets.make
+++ b/stepmake/stepmake/yolily-toplevel-targets.make
@@ -16,9 +16,9 @@ htmldoc:
 	$(MAKE) CONFIGSUFFIX='www' local-WWW
 	$(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
 	rm -f `find . -name \*.html~ -print`
+	$(footify)
 	find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
-	-ln -f $(patch-dir)/$(distname).diff.gz out-www
-	-ln -f $(depth)/$(distname).diff.gz out-www
+
 	tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.png out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
 
 localclean:
-- 
2.39.5