From 76014fe170f4217374f4726d54c2a46c60f73e67 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 14 Sep 1999 17:05:22 +0200
Subject: [PATCH] release: 1.2.7

---
 BUGS                                          |  22 +-
 CHANGES                                       |   4 +
 Documentation/GNUmakefile                     |   5 +
 Documentation/bibliography/GNUmakefile        |   9 +-
 Documentation/footer.html.in                  |  35 ++-
 Documentation/index.texi                      |  12 +-
 Documentation/metadoc/GNUmakefile             |   4 +-
 Documentation/ntweb/GNUmakefile               |   5 +-
 Documentation/ntweb/index.texi                | 214 +++++++++++++++
 Documentation/ntweb/index.yo                  | 227 ----------------
 Documentation/tex/GNUmakefile                 |   2 -
 Documentation/topdocs/INSTALL.texi            |  79 ++----
 Documentation/topdocs/index.tely              |  20 +-
 VERSION                                       |   2 +-
 aclocal.m4                                    |   4 -
 input/bugs/choral.ly                          | 243 ------------------
 lily/GNUmakefile                              |   2 +-
 lily/bezier.cc                                |  24 +-
 lily/bow.cc                                   |  13 +-
 lily/debug.cc                                 |  10 +-
 lily/global-translator.cc                     |   4 +-
 lily/include/debug.hh                         |   6 +-
 lily/include/simple-spacer.hh                 |  18 ++
 lily/midi-item.cc                             |   4 +-
 lily/midi-stream.cc                           |   2 +-
 lily/my-lily-lexer.cc                         |   4 +-
 lily/my-lily-parser.cc                        |   2 +-
 lily/out/lilypond.1                           |  83 ------
 lily/paper-outputter.cc                       |   2 +-
 lily/score-element.cc                         |   2 +-
 lily/scores.cc                                |   2 +-
 lily/simple-spacer.cc                         |  10 +
 ly/auto-beam-settings.ly                      |   3 +
 make/generic-vars.make                        |   2 +
 make/mutopia-rules.make                       |   2 +-
 make/mutopia-targets.make                     |   1 -
 make/out/lilypond.lsm                         |   8 +-
 make/out/lilypond.spec                        |   4 +-
 make/toplevel.make.in                         |   5 +
 midi2ly/out/midi2ly.1                         |  72 ------
 scripts/ly2dvi.py                             |  11 +-
 scripts/out/abc2ly.1                          |  32 ---
 scripts/out/convert-mudela.1                  |  49 ----
 scripts/out/ly2dvi.1                          |  76 ------
 scripts/out/mudela-book.1                     |  59 -----
 stepmake/aclocal.m4                           |   4 -
 stepmake/bin/add-html-footer.py               | 234 +++++++++--------
 stepmake/bin/ls-latex.py                      |   7 +-
 stepmake/bin/text2html.py                     |  21 ++
 stepmake/bin/text2html.sh                     |  17 --
 stepmake/stepmake/documentation-rules.make    |   1 -
 stepmake/stepmake/documentation-targets.make  |  23 +-
 stepmake/stepmake/documentation-vars.make     |   4 +-
 stepmake/stepmake/generic-targets.make        |   6 -
 stepmake/stepmake/help2man-targets.make       |   1 -
 stepmake/stepmake/help2man-vars.make          |   3 +-
 stepmake/stepmake/pod-rules.make              |   1 -
 stepmake/stepmake/texinfo-rules.make          |   1 -
 stepmake/stepmake/toplevel-targets.make       |   1 -
 stepmake/stepmake/yodl-rules.make             |   1 -
 stepmake/stepmake/yolily-topdoc-targets.make  |   2 -
 .../stepmake/yolily-toplevel-targets.make     |   4 +-
 stepmake/stepmake/yolily-toplevel-vars.make   |   4 +-
 63 files changed, 562 insertions(+), 1172 deletions(-)
 create mode 100644 Documentation/ntweb/index.texi
 delete mode 100644 Documentation/ntweb/index.yo
 delete mode 100644 input/bugs/choral.ly
 create mode 100644 lily/include/simple-spacer.hh
 delete mode 100644 lily/out/lilypond.1
 create mode 100644 lily/simple-spacer.cc
 delete mode 100644 midi2ly/out/midi2ly.1
 delete mode 100644 scripts/out/abc2ly.1
 delete mode 100644 scripts/out/convert-mudela.1
 delete mode 100644 scripts/out/ly2dvi.1
 delete mode 100644 scripts/out/mudela-book.1
 create mode 100644 stepmake/bin/text2html.py
 delete mode 100644 stepmake/bin/text2html.sh

diff --git a/BUGS b/BUGS
index cebc3c73e6..8fb51c7c21 100644
--- a/BUGS
+++ b/BUGS
@@ -5,6 +5,8 @@ Send bug reports to bug-gnu-music@gnu.org.  For help and questions use
 help-gnu-music@gnu.org and gnu-music-discuss@gnu.org.  Please consult
 the faq before mailing your problems.
 
+
+
 ********
 
 [LinuxPPC-R5, egcs-1.1.2-12c]
@@ -25,12 +27,17 @@ is buggy; you should upgrade:
 All compiling with -O2 is suspect, in particular guile-1.3, and
 Lily herself will break.
 
+
 [Linux i386]
 
 A binary RPM of Guile 1.3 has been distributed from the LilyPond ftp
 site.  This binary was made in RedHat 5.x, and it will fail if this
 RPM is used with RedHat 6.x.
 
+[GUILE 1.3.2]
+
+Guile 1.3.2 is buggy in several respects. Do not use it for LilyPond.
+
 [LinuxPPC, egcs-1.1b]
 
 Lilypond 1.1.35-1.1.51,...:  Wierd errors in guile scm_gc_mark ()
@@ -78,18 +85,3 @@ This behaviour has been observed with machines that have old libg++
 versions (LinuxPPC feb '98, RedHat 4.x).  
 
 
-
-[Linux Intel]
-
-A problem resembling the previous: usage of libg++.2.8.x with the
-wrong version of libc results in a coredump from the scanner while
-reading the init files.  Stacktrace:
-
-	ios::eof (this=0x0)
-	
-	yyFlexLexer::LexerInput (this=0x8294848, buf=0x82955f0 "", max_size=8192)
-	yyFlexLexer::yy_get_next_buffer (this=0x8294848)
-	My_lily_lexer::yylex (this=0x8294848) 
-
-Fix: follow the install instructions of libg++: match the right
-library versions.
diff --git a/CHANGES b/CHANGES
index ef3c27c998..a7582d04ce 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+pl 6.uu1
+	- website fixes.
+
 pl 5.hwn1
 	- more .texi; yodl completely removed.
 	- rm'd several doc stuff: engraving.yo, gnu-page.yo, translated blurbs (leave it to translation project)
@@ -12,6 +15,7 @@ pl 5.jcn1
 	- website/doco fixes
 	- bf: package-diff.py
 
+************
 
 pl 4.hwn1
 	- bf: repeats.
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ac24fa99c9..e8d8df44ff 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -5,6 +5,7 @@ depth = ..
 NAME = documentation
 SUBDIRS= tex metadoc bibliography pictures topdocs ntweb
 STEPMAKE_TEMPLATES=documentation  texinfo
+
 README_TOP_FILES=NEWS DEDICATION TODO  AIMS
 INFO_FILES = $(wildcard $(outdir)/$(package).info*)
 EXTRA_DIST_FILES = COPYRIGHT 
@@ -19,3 +20,7 @@ default: do-doc
 
 info: $(outdir)/$(package).info
 
+local-WWW: copy-for-me
+
+copy-for-me:
+	$(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true
diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 6e8a382f62..094ec07522 100644
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -44,19 +44,18 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 #urg should generalise and move Lilypond -> StepMake
 # URG.  Lilypond specific. Move out. 
 $(outdir)/%.html: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
+	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' -o $@ $<
+	$(PYTHON) $(step-bindir)/add-html-footer.py  $@
 
 $(outdir)/%.tex: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ --latex $<
+	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
'  -o $@ --latex $<
 
 
 
 local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
-	$(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \
+	$(PYTHON) $(step-bindir)/ls-latex.py  --title 'LaTeX documents about design and implementation of LilyPond' \
 	  $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\
 	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-	  $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in
index 3797a9c564..dd1b299fbc 100644
--- a/Documentation/footer.html.in
+++ b/Documentation/footer.html.in
@@ -1,27 +1,40 @@
-<!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>
+<!--
+
+if this file ./Documentation/footer.html.in is present, it is included
+
+automatically by add-html-footer, and replaces the simple standard
+footer substitutions:
+
+ * index,
+ * 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 
-
+<!-- back to idx. %s > 
 <a href="mailto:gnu-music-discuss@gnu.org">
 <em>gnu-music-discuss@gnu.org</em></a>.
 <p>
 
+<!-- package %s %s >
+
 Please send comments on these web pages to 
+<a href="mailto:%s"><em>%s</em></a>
+
 
-<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, 1999 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/index.texi b/Documentation/index.texi
index d1610b4ef7..ae0c05b159 100644
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -32,11 +32,9 @@ version this was.
 @unnumberedsubsec Why: Background Information
 
 @itemize @bullet
-@item  @uref{AIMS.html,Why?}
-@item @uref{../pictures/out-www/lelieblond.png,The lilypond
-  logo (Big, format: .png)}
-@item @uref{../pictures/out-www/lelie_logo.png,The lilypond
-  logo (medium size, format: .png)}
+@item  @uref{AIMS.txt,Why?}
+@item @uref{../pictures/out-www/lelieblond.png,The logo} large size}
+@item @uref{../pictures/out-www/lelie_logo.png,The logo} medium size}
 @end itemize
 
 @unnumberedsubsec Documentation: manuals
@@ -52,8 +50,8 @@ version this was.
 @unnumberedsubsec The program
 
 @itemize @bullet
-@item @uref{TODO.html,The TODO list}
-@item @uref{NEWS.html,The Change log}
+@item @uref{TODO.txt,The TODO list}
+@item @uref{CHANGES.txt,The Change log}
 @item @uref{internals.html,About internal structures}
 @item @uref{CodingStyle.html,The coding standards of the lilypond project}
 @item @uref{../topdocs/out-www/AUTHORS.html,The Authors}
diff --git a/Documentation/metadoc/GNUmakefile b/Documentation/metadoc/GNUmakefile
index 2df6d42828..d40a30064f 100644
--- a/Documentation/metadoc/GNUmakefile
+++ b/Documentation/metadoc/GNUmakefile
@@ -44,7 +44,6 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 # URG.  Lilypond specific. Move out. 
 $(outdir)/%.html: %.data $(depth)/VERSION
 	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
 
 $(outdir)/%.tex: %.data $(depth)/VERSION
 	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ --latex $<
@@ -52,10 +51,9 @@ $(outdir)/%.tex: %.data $(depth)/VERSION
 
 
 local-WWW-donotdoit: $(HTML_FILES) $(OUTTEX_FILES:.doc=.ps.gz)  $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) ps
-	$(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \
+	$(PYTHON) $(step-bindir)/ls-latex.py --title 'LaTeX documents about design and implementation of LilyPond' \
 	  $(TELY_FILES)  $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\
 	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-	  $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile
index f2c4dd09c7..2afee0f190 100644
--- a/Documentation/ntweb/GNUmakefile
+++ b/Documentation/ntweb/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ../..
 
-STEPMAKE_TEMPLATES=documentation
+STEPMAKE_TEMPLATES=documentation texinfo
 TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
 PLAIN_FILES=angels.ly guile.patch
 
@@ -15,9 +15,6 @@ $(outdir)/%.html: %.yo
 	$(sed-version) < $< > $<.out
 	$(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<.out
 	rm -f $<.out
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) \
-	--index=http://www.cs.ruu.nl/people/hanwen/lilypond/index.html \
-	--news=$(depth)/NEWS $@
 
 dist-plain: 
 	cp $(PLAIN_FILES) $(outdir)
diff --git a/Documentation/ntweb/index.texi b/Documentation/ntweb/index.texi
new file mode 100644
index 0000000000..4880b8492c
--- /dev/null
+++ b/Documentation/ntweb/index.texi
@@ -0,0 +1,214 @@
+\input texinfo @c -*-texinfo-*-
+@setfilename index.info
+@settitle LilyPond Windows NT 4-0/95 Distribution
+
+@chapter LilyPond Windows NT 4.0/95 Distribution
+
+This page documents the NT port of LilyPond.  It reflects  the latest
+version of lilypond that was ported.
+
+@section Windows NT/95 Binary Distribution
+
+
+This page is dedicated to the distribution of precompiled and
+preformatted LilyPond binaries for Windows NT 4.0 .  This package is
+covered under the GNU General Public License and all of the source is
+available on the official
+@uref{http://www.cs.ruu.nl/people/hanwen/lilypond/index.html,LilyPond
+Homepage}.  A full set of
+@uref{http://www.cs.ruu.nl/people/hanwen/lilypond/Documentation/tex/out-www/index.html,documentation}
+in various formats is also available.
+
+
+    LilyPond is a music typesetter.  It produces beautiful sheet music
+using a high level description file as input.  LilyPond is part of 
+the GNU Project.
+
+
+
+
+@table @samp
+ @item BUG FIXES
+  @itemize @bullet
+   @item
+      @code{os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile)  
+        os.error: (2, 'No such file or directory')}
+        This problem was reported by many and thoroughly debugged by
+	Wolf Lother.  We have abandoned the use of @code{os.getpid()}, which
+	for one reason or another resulted in negative numbers on
+	windows 95, in favor of the tempfile module.  We have also
+        attempted to use only one '.' in naming temporary files.
+  @end itemize
+@end table
+
+@table @samp
+ @item NOTES
+  @itemize @bullet  
+   @item  We have had preliminary reports that the Windows 95
+        installation works on Windows 98.  Many thanks to Christian
+        Mondrup. 
+
+   @item  Please use the Add/Remove program control panel entry to
+        unistall your current version of Lilypond before you attempt to
+	install this one.
+
+   @item  If you are upgrading from a previous version of lilypond you will most
+	likely need to flush your font cache.  I generally just toss
+	@file{D:\localtexmf\fonts\tfm\public\ehrhardt} and
+	@file{D:\localtexmf\fonts\pk\ljfour\public\ehrhardt} in the Recyle
+	Bin. Your local font directory may be different, please refer to your
+	local installation of @code{TeX}.
+
+   @item  The FAT16, FAT32, and NTFS file system problems have been
+	corrected.  I have tested various installations that are known
+	to be operational.  
+  @end itemize 
+@end table
+  
+The installer was created with
+@uref{http://www.gentee.com/,CreateInstall}.  This is a shareware
+application that has capabilities close to the high dollar installers
+@strong{InstallShield}, @strong{Install Vise}, and @strong{WiseInstaller}.
+@strong{CreateInstall} does cost $38 to register which is probably going to
+be frowned upon, but I was unable to find a freeware install builder
+that was suitable.  The self extracting distribution currently:
+
+@itemize @bullet
+ @item  Installs the lilypond distribution on any valid file system.
+ @item  Optionally creates a @emph{Lilypond} shortcut group on your start
+      menu with the following shortcuts.
+  @itemize @bullet
+   @item  @strong{lilyshell}
+   @item  @strong{uninstall}
+  @end itemize
+ @item  Allows unistall through the Add/Remove Program interface on the
+      control panel.
+ @item  The @strong{lilyshell} uses the /E and /K switches to extend the
+      environment size and initialize the shell environment.
+ @item  It has the look and feel of a real Windows installer
+@end itemize
+
+The @strong{lilyshell} shortcut initializes the environment so you can
+generate music from a MSDOS prompt with commands like:
+
+@itemize @bullet
+    @item ly2dvi
+    @item convert-mudela
+    @item mudela-book
+    @item lilypond
+    @item midi2ly
+@end itemize
+
+This release has been tested on Windows NT 4.0sp3 and Windows 95 and
+found to be operational.  If you have any troubles and or comments
+please do not hesitate to drop me a line 
+@uref{mailto:daboys@@austin.rr.com,Jeffrey B. Reed}.
+
+
+
+@itemize @bullet
+
+  @item  Using any text that contains '@{@}' for the value of the any
+       valid mudela @strong{header} construct will cause @strong{ly2dvi} to
+       fail.  A work around for the @strong{latexheaders} construct is to
+       create a @strong{TeX} file and set @strong{latexheaders} to "\input
+       foo.tex". 
+@end itemize
+
+
+
+
+LilyPond uses the @code{TeX} package as its rendering engine. @code{TeX}
+represents the state-of-the-art in computer typesetting. It is used to
+generate documentation, article, and book quality output. It is an
+assume tool to have in your toolbox.
+
+LilyPond uses a @code{Python} script named @code{ly2dvi} to render a
+professional quality music score. @code{Python} is an interpreted,
+interactive, object-oriented programming language.  It is often
+compared to @code{Tcl}, @code{Perl}, @code{Scheme} or @code{Java}.
+
+Gsview is used to display and print the music scores created by
+LilyPond.
+
+@itemize @bullet
+    @item @uref{http://www.snafu.de/~cschenk/miktex/,code(MiKTeX)}. Versions
+        1.10b, 1.11, and 1.20b are known to work.
+    @item @uref{http://www.python.org,code(Python)}. Version 1.5.1 and
+	possibly 1.5 work.
+    @item @uref{http://www.cs.wisc.edu/~ghost/gsview/index.html,code(gsview)}. 
+	Version 5.10 is known to work.
+@end itemize
+
+
+
+
+@itemize @bullet
+    @item Windows 95
+        @uref{lilypond-VERSION-95.exe,lilypond-VERSION-95}
+    @item Windows NT 4.0
+        @uref{lilypond-VERSION-nt.exe,lilypond-VERSION-nt}
+@end itemize
+
+
+
+
+@itemize @bullet
+ the distribution.
+  @item run downloaded executable.  
+  @item  The first installation of LilyPond also requires these
+        additional steps:
+     @table @samp
+       @item LaTeX geometry package
+       @itemize @bullet
+         @item @uref{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/supported/geometry.zip,download} the zip file to @code{\Temp}.
+         @item Extract the zip file into the LaTeX package area of
+             @code{MiKTeX}. This will be @strong{@emph{MiKTeX-dir}\tex\latex}
+         @item From a Command Prompt change directory into geometry
+             directory that was just extracted.
+         @item In the geometry directory type @strong{latex geometry.ins}
+       @end itemize 
+       @item Miscellaneous fonts
+       @itemize @bullet
+         @item In your favorite editor create a file named
+             @code{cmbx14.mf}. Add the following lines:  
+             @strong{design_size=14.4; }  
+             @strong{input b-cmbx;}
+         @item From a Command Prompt copy cmbx14.mf to the public font
+             area of MiKTeX:  
+             @strong{copy cmbx14.mf @emph{MiKTeX-dir}\fonts\source\public\cm\base}
+        @end itemize
+	@item NOTE 
+	MiKTeX-1.11 localtexmf configurations should use
+        @strong{@emph{localtexmf-dir}} in place of @strong{@emph{MiKTeX-dir}}.
+      @end table  
+ instructions below
+@end itemize
+
+
+
+
+@itemize @bullet
+  @item Take a look at @uref{angels.ly,angels.ly}
+  @item Save angels.ly to your local disk
+  @item Select the @strong{lilyshell} shortcut from the @emph{Lilypond} group  
+  @item  From a LilyPond Command Prompt run:  
+  @strong{ly2dvi angels.ly}  
+  @strong{dvips angels.dvi}  
+  @strong{start angels.ps}  
+@end itemize
+
+
+
+
+@itemize @bullet
+  @item @uref{http://www.cs.ruu.nl/people/hanwen/lilypond/index.html,LilyPond Homepage}
+  @item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,LilyPond Ftp Site}
+  @item @uref{http://jab.org/mail/gnu-music-discuss@@gnu.org/,gnu-music-discuss mail archive}
+  @item Please feel free to mail us at @uref{mailto:gnu-music-discuss@@gnu.org,gnu-music-discuss}
+@end itemize
+
+
+
+
+@bye
diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo
deleted file mode 100644
index e785f72b8f..0000000000
--- a/Documentation/ntweb/index.yo
+++ /dev/null
@@ -1,227 +0,0 @@
-mailto(daboys@austin.rr.com)
-article(LilyPond Windows NT 4.0/95 Distribution)(nemail(Jeffrey B. Reed)(daboys@austin.rr.com))(label(contents))
-sect(Windows NT/95 Binary Distribution)
-
-subsect(Introduction) label(introduction)
-
-This page is dedicated to the distribution of precompiled and
-preformatted LilyPond binaries for Windows NT 4.0 .  This package is
-covered under the GNU General Public License and all of the source is
-available on the official 
-url(LilyPond Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html).
-A full set of url(documentation)(http://www.cs.ruu.nl/people/hanwen/lilypond/Documentation/tex/out-www/index.html) in various formats is also available.
-
-includefile(../BLURB.in)
-
-link(Back to top)(contents)
-clearpage()
-
-subsect(NEWS) label(news)
-
-description(
- dit(BUG FIXES)
-  itemize(
-   it() os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile) nl()
-        os.error: (2, 'No such file or directory') nl()
-        This problem was reported by many and thoroughly debugged by
-	Wolf Lother.  We have abandoned the use of os.getpid(), which
-	for one reason or another resulted in negative numbers on
-	windows 95, in favor of the tempfile module.  We have also
-        attempted to use only one '.' in naming temporary files.
-  )
-)
-
-description(
- dit(NOTES)
-  itemize(  
-   it() We have had preliminary reports that the Windows 95
-        installation works on Windows 98.  Many thanks to Christian
-        Mondrup. 
-
-   it() Please use the Add/Remove program control panel entry to
-        unistall your current version of Lilypond before you attempt to
-	install this one.
-
-   it() If you are upgrading from a previous version of lilypond you will most
-	likely need to flush your font cache.  I generally just toss
-	file(D:\localtexmf\fonts\tfm\public\ehrhardt) and
-	file(D:\localtexmf\fonts\pk\ljfour\public\ehrhardt) in the Recyle
-	Bin. Your local font directory may be different, please refer to your
-	local installation of code(TeX).
-
-   it() The FAT16, FAT32, and NTFS file system problems have been
-	corrected.  I have tested various installations that are known
-	to be operational.  
-  ) 
-)
-  
-The installer was created with
-url(CreateInstall)(http://www.gentee.com/).  This is a shareware
-application that has capabilities close to the high dollar installers
-bf(InstallShield), bf(Install Vise), and bf(WiseInstaller).
-bf(CreateInstall) does cost $38 to register which is probably going to
-be frowned upon, but I was unable to find a freeware install builder
-that was suitable.  The self extracting distribution currently:
-
-itemize(
- it() Installs the lilypond distribution on any valid file system.
- it() Optionally creates a em(Lilypond) shortcut group on your start
-      menu with the following shortcuts.
-  itemize(
-   it() bf(lilyshell)
-   it() bf(uninstall)
-  )
- it() Allows unistall through the Add/Remove Program interface on the
-      control panel.
- it() The bf(lilyshell) uses the /E and /K switches to extend the
-      environment size and initialize the shell environment.
- it() It has the look and feel of a real Windows installer
-)
-
-The bf(lilyshell) shortcut initializes the environment so you can
-generate music from a MSDOS prompt with commands like:
-
-itemize(
-    it()ly2dvi
-    it()convert-mudela
-    it()mudela-book
-    it()lilypond
-    it()midi2ly
-)
-
-This release has been tested on Windows NT 4.0sp3 and Windows 95 and
-found to be operational.  If you have any troubles and or comments
-please do not hesitate to drop me a line 
-url(Jeffrey B. Reed)(mailto:daboys@austin.rr.com).
-
-This is what the version @TOPLEVEL_VERSION@ brings:
-
-verb(
-top_of_NEWS
-)
-
-link(Back to top)(contents)
-clearpage()
-
-subsect(BUGS) label(news)
-itemize(
-
-  it() Using any text that contains '{}' for the value of the any
-       valid mudela bf(header) construct will cause bf(ly2dvi) to
-       fail.  A work around for the bf(latexheaders) construct is to
-       create a bf(TeX) file and set bf(latexheaders) to "\input
-       foo.tex". 
-)
-
-link(Back to top)(contents)
-clearpage()
-
-subsect(Required Packages) label(packages)
-
-LilyPond uses the code(TeX) package as its rendering engine. code(TeX)
-represents the state-of-the-art in computer typesetting. It is used to
-generate documentation, article, and book quality output. It is an
-assume tool to have in your toolbox.
-
-LilyPond uses a code(Python) script named code(ly2dvi) to render a
-professional quality music score. code(Python) is an interpreted,
-interactive, object-oriented programming language.  It is often
-compared to code(Tcl), code(Perl), code(Scheme) or code(Java).
-
-Gsview is used to display and print the music scores created by
-LilyPond.
-
-itemize(
-    it()url(code(MiKTeX))(http://www.snafu.de/~cschenk/miktex/). Versions
-        1.10b, 1.11, and 1.20b are known to work.
-    it()url(code(Python))(http://www.python.org). Version 1.5.1 and
-	possibly 1.5 work.
-    it()url(code(gsview))(http://www.cs.wisc.edu/~ghost/gsview/index.html). 
-	Version 5.10 is known to work.
-)
-
-link(Back to top)(contents)
-clearpage()
-
-
-subsect(Download) label(download)
-
-itemize(
-    it()Windows 95
-        url(lilypond-@TOPLEVEL_VERSION@-95)(lilypond-@TOPLEVEL_VERSION@-95.exe)
-    it()Windows NT 4.0
-        url(lilypond-@TOPLEVEL_VERSION@-nt)(lilypond-@TOPLEVEL_VERSION@-nt.exe)
-)
-
-link(Back to top)(contents)
-clearpage()
-
-
-subsect(Installation) label(installation)
-
-itemize(
-  it()link(Download)(download) the distribution.
-  it()run downloaded executable. nl()
-  it() The first installation of LilyPond also requires these
-        additional steps:
-     description(
-       dit(LaTeX geometry package)
-       itemize(
-         it()url(download)(ftp://ctan.tug.org/tex-archive/macros/latex/contrib/supported/geometry.zip) the zip file to code(\Temp).
-         it()Extract the zip file into the LaTeX package area of
-             code(MiKTeX). This will be bf(em(MiKTeX-dir)\tex\latex)
-         it()From a Command Prompt change directory into geometry
-             directory that was just extracted.
-         it()In the geometry directory type bf(latex geometry.ins)
-       ) nl()
-       dit(Miscellaneous fonts)
-       itemize(
-         it()In your favorite editor create a file named
-             code(cmbx14.mf). Add the following lines: nl()
-             bf(design_size=14.4; ) nl()
-             bf(input b-cmbx;)
-         it()From a Command Prompt copy cmbx14.mf to the public font
-             area of MiKTeX: nl()
-             bf(copy cmbx14.mf em(MiKTeX-dir)\fonts\source\public\cm\base)
-        )
-	dit(NOTE) 
-	MiKTeX-1.11 localtexmf configurations should use
-        bf(em(localtexmf-dir)) in place of bf(em(MiKTeX-dir)).
-      ) nl()
-  it()See the link(Running)(running) instructions below
-)
-
-link(Back to top)(contents)
-clearpage()
-
-
-subsect(Running LilyPond) label(running)
-
-itemize(
-  it()Take a look at url(angels.ly)(angels.ly)
-  it()Save angels.ly to your local disk
-  it()Select the bf(lilyshell) shortcut from the em(Lilypond) group nl()
-  it() From a LilyPond Command Prompt run: nl()
-  bf(ly2dvi angels.ly) nl()
-  bf(dvips angels.dvi) nl()
-  bf(start angels.ps) nl()
-)
-
-link(Back to top)(contents)
-clearpage()
-
-subsect(LilyPond resources) label(resources)
-
-itemize(
-  it()url(LilyPond Homepage)
-	(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html)
-  it()url(LilyPond Ftp Site)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/)
-  it()url(gnu-music-discuss mail archive)
-	(http://jab.org/mail/gnu-music-discuss@gnu.org/)
-  it()Please feel free to mail us at url(gnu-music-discuss)
-	(mailto:gnu-music-discuss@gnu.org)
-)
-
-link(Back to top)(contents)
-clearpage()
-
diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index 7dbeadc3f8..93174baed7 100644
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -42,7 +42,6 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 # URG.  Lilypond specific. Move out. 
 $(outdir)/%.html: %.data $(depth)/VERSION
 	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
 
 $(outdir)/%.latex: %.data $(depth)/VERSION
 	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
'  -o $@ --format=latex $<
@@ -55,7 +54,6 @@ local-WWW: $(HTML_FILES)   $(datafiles) $(PS_GZ_FILES)
 	$(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation about LilyPond' \
 	   $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
 	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-	  $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 3ee7823855..2888554930 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -9,28 +9,10 @@
 @end menu
 
 
-@node INSTALL - compiling and installing GNU LilyPond, abstract, , Top
-@menu
-* abstract::                      abstract
-* obtaining::                     obtaining
-* PREREQUISITES::                 PREREQUISITES
-* running::                       running
-* WEBSITE::                       WEBSITE
-* CONFIGURING and COMPILING::     CONFIGURING and COMPILING
-* CONFIGURING FOR MULTIPLE PLATFORMS::CONFIGURING FOR MULTIPLE PLATFORMS
-* INSTALLING::                    INSTALLING
-* REDHAT LINUX::                  REDHAT LINUX
-* DEBIAN GNU/LINUX::              DEBIAN GNU/LINUX
-* WINDOWS NT/95::                 WINDOWS NT/95
-* w32::                           w32
-* BUGS::                          BUGS
-* AUTHORS::                       AUTHORS
-@end menu
 @chapter INSTALL - compiling and installing GNU LilyPond
 
 
-@node abstract, obtaining, INSTALL - compiling and installing GNU LilyPond, INSTALL - compiling and installing GNU LilyPond
-@section abstract
+@section Abstract
 
 TODO: document xdeltas
 
@@ -41,8 +23,7 @@ e.g. when doing development, you might want to check out the
 variables and symlinks, which comes in handly when you have to compile 
 LilyPond more often.  
 
-@node obtaining, PREREQUISITES, abstract, INSTALL - compiling and installing GNU LilyPond
-@section obtaining
+@section Obtaining
 
 You can get the latest version of LilyPond at
 @url{ ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}.  Refer to the links
@@ -51,8 +32,7 @@ document for mirror sites.
 @emph{If you upgrade by patching do remember to rerun autoconf after
 applying the patch}.
 
-@node PREREQUISITES, running, obtaining, INSTALL - compiling and installing GNU LilyPond
-@section PREREQUISITES
+@section Prerequisites
 
 For compilation you need:
 
@@ -99,8 +79,7 @@ note  that  tetex-0.4pl8 (included with Redhat 5.x) does not include
 
 @end itemize
 
-@node running, WEBSITE, PREREQUISITES, INSTALL - compiling and installing GNU LilyPond
-@section running
+@section Running
 
 GNU LilyPond does use a lot of resources. For operation you need the
 following software
@@ -132,8 +111,7 @@ the proper paths for the bourne and C-shell respectively are generated in
 LilyPond is a hiddeously big, slow and bloated program.  A fast CPU
 and plenty of RAM is recommended for comfortable use.
 
-@node WEBSITE, CONFIGURING and COMPILING, running, INSTALL - compiling and installing GNU LilyPond
-@section WEBSITE
+@section Website
 
 The website is the most convenient form to use for reading the
 documentation on-line documentation. It is made by entering @example 
@@ -188,8 +166,7 @@ hypertextified bibliography.
 You also have to install @file{buildscripts/out/ps-to-gifs} in a
 directory that is in the path.
 
-@node CONFIGURING and COMPILING, CONFIGURING FOR MULTIPLE PLATFORMS, WEBSITE, INSTALL - compiling and installing GNU LilyPond
-@section CONFIGURING and COMPILING
+@section configuring and compiling
 
 to install GNU LilyPond, simply type:
 @example 
@@ -231,8 +208,8 @@ adjust your environment variables to your taste:
 @code{CPPFLAGS} are the preprocessor flags. 
 
 The configure script is Cygnus configure, and it will accept
-@strong{--help}. If you are not root, you will probably have to make it
-with a different @strong{--prefix} option.  Our favourite location is
+@code{--help}. If you are not root, you will probably have to make it
+with a different @code{--prefix} option.  Our favourite location is
 
 @example 
 
@@ -254,20 +231,20 @@ Since GNU LilyPond currently is beta, you are advised to also use
 Options to configure include:
 
 @table @samp
-@item @strong{--enable-printing}
-    Enable debugging print routines (lilypond @strong{-D} option)
-@item @strong{--enable-optimise}
-    Set maximum optimisation: compile with @strong{-O2}.  This can be
+@item @code{--enable-printing}
+    Enable debugging print routines (lilypond @code{-D} option)
+@item @code{--enable-optimise}
+    Set maximum optimisation: compile with @code{-O2}.  This can be
 unreliable on some compiler/platform combinations (eg, DEC Alpha and PPC)
-@item @strong{--enable-profiling}
+@item @code{--enable-profiling}
     Compile with support for profiling.
-@item @strong{--enable-config}
+@item @code{--enable-config}
     Output to a different configuration file.  Needed for multi-platform
     builds
 @end table
 
 All options are documented in the @file{configure} help
-The option @strong{--enable-optimise} is recommended for Real Life usage.
+The option @code{--enable-optimise} is recommended for Real Life usage.
 
 If you do
 
@@ -281,11 +258,10 @@ everything will be compiled, but nothing will be installed.  The
 resulting binaries can be found in the subdirectories @file{out/} (which
 contain all files generated during compilation).
 
-@node CONFIGURING FOR MULTIPLE PLATFORMS, INSTALLING, CONFIGURING and COMPILING, INSTALL - compiling and installing GNU LilyPond
-@section CONFIGURING FOR MULTIPLE PLATFORMS
+@section configuring for multiple platforms
 
 If you want to compile LilyPond with different configuration settings,
-then, you can use the @strong{--enable-config} option.  Example: suppose I
+then, you can use the @code{--enable-config} option.  Example: suppose I
 want to build with and   without profiling.  Then I'd use the
 following for the normal build, 
 
@@ -308,10 +284,9 @@ and for the profiling version, I specify a different configuration.
 @end example 
 
 
-@node INSTALLING, REDHAT LINUX, CONFIGURING FOR MULTIPLE PLATFORMS, INSTALL - compiling and installing GNU LilyPond
-@section INSTALLING
+@section Installing
 
-If you have done a successful @code{make}, then a simple
+if you have done a successful @code{make}, then a simple
 
 @example 
 
@@ -335,8 +310,7 @@ provided to do the work for you, see @file{bin/clean-fonts.sh}.
 @item  On PPC you need at least EGCS-1.1.2f.
 @end itemize
 
-@node REDHAT LINUX, DEBIAN GNU/LINUX, INSTALLING, INSTALL - compiling and installing GNU LilyPond
-@section REDHAT LINUX
+@section Redhat linux
 
 RedHat Linux users can compile an RPM. A spec file is in
 @file{make/out/lilypond.spec}, it is distributed along with the
@@ -365,30 +339,25 @@ in addition to the those needed for running:
 @item texinfo
 @end itemize
 
-@node DEBIAN GNU/LINUX, WINDOWS NT/95, REDHAT LINUX, INSTALL - compiling and installing GNU LilyPond
-@section DEBIAN GNU/LINUX
+@section Debian GNU/linux
 
 A Debian package is also available; contact Anthony Fok
 @email{foka@@debian.org}.  The build scripts are in the subdirectory
 @file{debian/}.
 
-@node WINDOWS NT/95, w32, DEBIAN GNU/LINUX, INSTALL - compiling and installing GNU LilyPond
-@section WINDOWS NT/95
-@node w32, BUGS, WINDOWS NT/95, INSTALL - compiling and installing GNU LilyPond
+@section Windows NT/95
 
 
 Separate instructions on building for W32 are available
 @url{../../outdir/README-W32.html}.
 
-@node BUGS, AUTHORS, w32, INSTALL - compiling and installing GNU LilyPond
-@section BUGS
+@section Bugs
 
 Send bug reports to bug-gnu-music@@gnu.org.  For help and questions use
 help-gnu-music@@gnu.org and gnu-music-discuss@@gnu.org.  Please consult
 the faq before mailing your problems.
 
-@node AUTHORS, Top, BUGS, INSTALL - compiling and installing GNU LilyPond
-@section AUTHORS
+@section Authors
 
 @email{hanwen@@cs.uu.nl, Han-Wen Nienhuys}
 
diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index 97cb864d59..c944f2c2c5 100644
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -9,13 +9,15 @@
 
 @unnumbered LilyPond -- The @uref{http://www.fsf.org/gnu/gnu-history.html,GNU Project} Music Typesetter
 
-@center
+@c something breaks on 3.12 f
+
+@c @center
 @quotation
 @mudela[fragment]
 	\relative c'' { \key es; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 }
 @end mudela 
 @end quotation
-@end center
+@c @end center
 
 @c include BLURB?
 
@@ -66,6 +68,7 @@ has the development pages.
 @item @uref{http://home.austin.rr.com/jbr/jeff/lilypond/} Jeff's Windows NT Distribution site
 @end itemize
 
+@ignore
 @unnumberedsec NEWS
     
 
@@ -75,6 +78,7 @@ This is what the latest version brings:
 top_of_NEWS
  
 @end example 
+@end ignore
 
 @unnumberedsec Download
 
@@ -99,12 +103,12 @@ Sorry for poor look they have: we want to be hacking at LilyPond, and
 not at the webpages.  If you want to volunteer for making shazzy
 webpages, then please mail us!
 
-Note: These pages are created from the latest @strong{development snapshots}
-of LilyPond, specifically, this page was made from LilyPond
-(fixme-version).tar.gz
+Note: These pages are created from the latest @strong{development
+snapshots} of LilyPond, or even from an unreleased development version.
+The version of this webpage is printed at the bottom.
+
+
+
 
-Note: the pages may have been created from an unreleased development
-version.  Please have patience, all changes will appear in the
-official version.
 
 @bye
diff --git a/VERSION b/VERSION
index 6aaffd6101..061bf0a5ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
-PATCH_LEVEL=6
+PATCH_LEVEL=7
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/aclocal.m4 b/aclocal.m4
index a7127718d8..1bbc0f1cc9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,9 +1,5 @@
 dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
diff --git a/input/bugs/choral.ly b/input/bugs/choral.ly
deleted file mode 100644
index 178c5ce0fa..0000000000
--- a/input/bugs/choral.ly
+++ /dev/null
@@ -1,243 +0,0 @@
-
-\include "deutsch.ly"
-
-global = \notes {
-	\time 2/2; \partial 2*1;
-	\key g;
-
-	s2 | s1 | s1 |
-	\time 3/2;
-	s1. | s1. |
-	\time 2/2;
-	s1 | s1 | s1 | s2
-
-	s2 | s1 | s1 |
-	\time 3/2;
-	s1. | s1. |
-	\time 2/2;
-	s1 | s1
-	\time 3/2;
-	s1. \bar "||";
-
-	s1. | s1. | s1. | s1. |
-	s1. | s1. | s1. | s1. \bar "||";
-
-	\key es;
-	s1. | s1. | s1. | s1. |
-	s1. | s1. | s1. | s1 \bar "||";
-
-	\key g;
-	s2 |
-	\time 2/2;
-	s1 | s1 |
-	\time 3/2;
-	s1. | s1. |
-	\time 2/2;
-	s1 | s1 | s1 | s2
-
-	s2 | s1 | s1 |
-	\time 3/2;
-	s1. | s1. |
-	\time 2/2;
-	s1 | s1 | s1 \bar "|.";
-}
-
-themeMelody = \notes \relative c'' {
-	g2 | g d' | h a |
-	g fis g | a ~ a \breathe b |
-	d b | a a | g ~ g ~ | g \breathe
-
-	g2 | g d' | h a |
-	g fis g | a ~ a \breathe b |
-	d b |
-}
-
-themeBeforeBreak1EndMelody = \notes \relative  c'' {
-	 a2 a | g ~ g ~ g4 r4
-}
-
-themeFinalEndMelody = \notes \relative  c'' {
-	 a2 a ~ | a1^\fermata
-}
-
-themeRightHand = \notes \relative c' {
-	d2 | c <e g> | <e g> <d fis> | d2 es es4 c4 |
-	<d1 e1> <d2 f2> | <g2 b2> f2 | <cis2 e2> <e2 g2> |
-	<d2 f2> <c4 f4> cis4 | <dis2 fis2>
-
-	<c2 e2> | <c e> <e g> | <e g> <d fis> | d2 es es4 c4 |
-	<d1 e1> <d2 f2> | <g2 b2> f2 |
-}
-
-themeBeforeBreak1EndRightHand = \notes \relative c' {
-	 <cis2 e2> <e2 g2> | <d2 f2> <c4 f4> cis4 <dis4 fis4> r4 |
-}
-
-themeFinalEndRightHand = \notes \relative c' {
-	 <cis2 e2> <e2 g2> | <d1 f1>
-}
-
-themeLeftHand =	\notes \relative c {
-	< \context Voice = one { \stemup
-		h'2 | h c | cis c | a4 c c2 b4 a ~ | a1 \breathe
-		b2 | e d | h cis | b a | h \breathe
-
-		g | a c | cis c | a4 c c2 b4 a ~ | a1 \breathe
-		b2 | e d |
-	  }
-          \context Voice = two { \stemdown
-		<d,2 g> | <f a> g ~ | g c | g a g | <a,1 fis'>
-		<d2 g> | <g b> <f a> | a a | g a | h
-
-		g | g g ~ | g c | g a g | <a,1 fis'>
-		<d2 g> | <g b> <f a> |
-	  }
-	>
-}
-
-themeBeforeBreak1EndLeftHand = \notes \relative c' {
-	 <a2 h2> <a2 cis2> | <g2 b2> a2 h4 r4 |
-}
-
-themeFinalEndLeftHand = \notes \relative c' {
-	 <a2 h2> <a2 cis2> | <g1 b1>
-}
-
-themePedal = \notes \relative c' {
-	g4 fis | f2 c | a' d, |
-	h c es | d ~ d \breathe b |
-	e, g | a a | d, f4 a | h2 \breathe
-
-	c2 | e2 c | a' d, |
-	h c es | d ~ d \breathe b |
-	e, g |
-}
-
-themeBeforeBreak1EndPedal = \notes \relative c {
-	a2 a | d,2 f4 a h4 r4 |
-}
-
-themeFinalEndPedal = \notes \relative c {
-	a2 a | d,1_\fermata
-}
-
-break1Melody = \notes \relative c'' {
-	g4( fis e fis d' h | )a1. |
-	g4( es g b es g | <fis1. )a1.> |
-	b,2 g es | d1. |
-	b'2 g d' | a1 r2 |
-}
-
-break1RightHand = \notes \relative c' {
-	e1. | g4( fis e fis g fis |
-	)es1. | dis'2 d4 c b a \breathe |
-	s1. | s1. |
-	es1 <es2 g2> | <dis1 fis1 > r2 |
-}
-
-break1LeftHand = \notes \relative c {
-	<
-		\context Voice = oben {
-			\stemup
-			c'1. | d2. c4 h a | b1. | d1. |
-		}
-		\context Voice = unten {
-			\stemdown
-			<c,1. g'1.> | <d1. a'1.> | <es1. g1.> | d2. e4 fis d |
-		}
-	>
-	r4 b2( g4 b c | d c b g fis d |
-	<)es1 c'1> <c2 c'2> | <h1 h'1> r2 |
-}
-
-break2RightHand = \notes \relative c'' {
-	g8 r8 c,8 r8 <fis8 g8> r8 c r g' r c, r |
-	<fis8 g8> r  c r  b' r  es, r  <es g> r  es  r |
-	b' r es, r <es g> r es r d' r <d, g> r |
-	d' r f, r <f b> r f r d' r <fis, a> r |
-	d' r g, r <g b> r g r d' r g, r |
-	es' r g, r <g b> r g b es r <a, c> r |
-	d8 r b r d8 f d b a4-. <a-. cis-.> |
-	<fis1 a d1> \breathe
-}
-
-break2LeftHand = \notes \relative c' {
-	r8 g r g r g r g r g r g |
-	r8 g r g r b r b r b r b |
-	r c r c r c r c r h r h |
-	r d r d r d r d r d r d |
-	r d r d r d r d r c r c |
-	r <b es> r <b es> r <b es> r <g es'> r f' r <a, f'> |
-	r <b f'> r <b f'> r4 <g4-. f'-.> <a4-. e'-.> <a-. e'-.> |
-	<d,1 d'1> \breathe
-}
-
-break2Pedal = \notes \relative c {
-	c2 c g' | es1 d2 | c1 h2 |
-	b1 d2 \breathe | g2 g f2 | es1 f2 |
-	b,2 g a | d1 \breathe
-}
-
-\score {
-	<
-		\context PianoStaff <
-			\property PianoStaff.instrument = "Manual"
-			\context Staff = treble <
-				\global
-				\context Voice = melody {
-					\stemup \themeMelody \themeBeforeBreak1EndMelody
-					\break1Melody
-					\stemboth \break2RightHand
-					\stemup \themeMelody \themeFinalEndMelody
-				}
-				\context Voice = righthand {
-					\stemdown \themeRightHand \themeBeforeBreak1EndRightHand
-					\break1RightHand
-					\notes {
-						s1. | s1. | s1. | s1. |
-						s1. | s1. | s1. | s1
-					}
-					\themeRightHand \themeFinalEndRightHand
-				}
-			>
-			\context Staff = bass <
-				\clef "bass";
-				\global
-				\context Voice = lefthand {
-					\themeLeftHand \themeBeforeBreak1EndLeftHand
-					\break1LeftHand
-					\break2LeftHand
-					\themeLeftHand \themeFinalEndLeftHand
-				}
-			>
-		>
-		\context Staff = pedal {
-			\property Staff.instrument = "Pedal"
-			\clef "bass";
-			<
-				\global
-				\context Voice = pedal {
-					\themePedal \themeBeforeBreak1EndPedal
-					\notes {
-						R1. R1. R1. R1. R1. R1. R1. R1.
-					}
-					\break2Pedal
-					\themePedal \themeFinalEndPedal
-				}
-			>
-		}
-	>
-
-	\header {
-		tagline = "";
-	}
-
-	\paper {
-		linewidth = 18.8 \cm;
-		textheight = 28.0 \cm;
-
-		\translator { \OrchestralScoreContext }
-%		\translator { \StaffContext \consists "Staff_margin_engraver"; }
-%		\translator { \PianoStaffContext \consists "Staff_margin_engraver"; }
-	}
-}
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index b40f17484d..638a618ace 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -20,7 +20,7 @@ $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
 $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
-$(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh
+$(outdir)/main.o: $(outdir)/BLURB.hh 
 
 
 
diff --git a/lily/bezier.cc b/lily/bezier.cc
index 1e78566783..a73576cfd1 100644
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -16,7 +16,7 @@
 #include "paper-def.hh"
 #include "debug.hh"
 #include "main.hh"
-#define BEZIER_BOW_DOUT if (check_debug && !monitor->silent_b ("Bezier_bow")) cout
+#define BEZIER_BOW_DOUT if (check_debug && !lily_monitor->silent_b ("Bezier_bow")) cout
 #else
 #define BEZIER_BOW_DOUT cerr
 #endif
@@ -31,6 +31,12 @@
 
  */
 
+
+/*
+  UGH. Clean up debugging junk.
+  */
+
+
 void
 Curve::flipy ()
 {
@@ -99,7 +105,7 @@ void
 Bezier::print () const
 {
 #ifndef NPRINT
-  if (check_debug && !monitor->silent_b ("Bezier_controls"))
+  if (check_debug && !lily_monitor->silent_b ("Bezier_controls"))
     {
       if (control_[1].length ())
         {
@@ -240,9 +246,9 @@ void
 Bezier_bow::calc ()
 {
 #ifndef NPRINT
-//  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
-  if (check_debug && !(monitor->silent_b ("Bezier_controls")
-    && monitor->silent_b ("Bezier_bow_controls")))
+//  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !(lily_monitor->silent_b ("Bezier_controls")
+    && lily_monitor->silent_b ("Bezier_bow_controls")))
     {
       cout << "Before transform*********\n";
       print ();
@@ -269,9 +275,9 @@ Bezier_bow::calc ()
   print ();
   transform_back ();
 #ifndef NPRINT
-//  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
-  if (check_debug && !(monitor->silent_b ("Bezier_controls")
-    && monitor->silent_b ("Bezier_bow_controls")))
+//  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !(lily_monitor->silent_b ("Bezier_controls")
+    && lily_monitor->silent_b ("Bezier_bow_controls")))
     {
       cout << "After transform*********\n";
       print ();
@@ -544,7 +550,7 @@ Bezier_bow::print () const
 {
 #ifndef NPRINT
   Bezier::print ();
-  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
     {
       cout << "Bezier_bow\n";
       cout << "Encompass: ";
diff --git a/lily/bow.cc b/lily/bow.cc
index a72e2fe433..f3c4e59eeb 100644
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -26,7 +26,7 @@ Bow::do_brew_molecule_p () const
 {
   Real thick = paper_l ()->get_var ("slur_thickness");
   Array<Offset> c = get_controls ();
-  Real dy = c[3].y () - c[0].y ();
+
   Molecule a;
 
   SCM d =  get_elt_property (dashed_scm_sym);
@@ -35,17 +35,6 @@ Bow::do_brew_molecule_p () const
   else
     a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
 
-  if (check_debug && !monitor->silent_b ("Bow"))
-    {
-      static int i = 1;
-      cout << "******" << i++ << "******" << endl;
-      cout << "c0.y: " << c[0].y () << endl;
-      cout << "c3.y: " << c[3].y () << endl;
-      cout << "dy: " << dy << endl;
-      cout << "dy_f_l: " << dy_f_drul_[LEFT] << endl;
-      cout << "dy_f_r: " << dy_f_drul_[RIGHT] << endl;
-      cout << "dy_f: " << dy_f_drul_[RIGHT] - dy_f_drul_[LEFT] << endl;
-    }
   return new Molecule (a); 
 }
 
diff --git a/lily/debug.cc b/lily/debug.cc
index 200af4ec32..3534df6710 100644
--- a/lily/debug.cc
+++ b/lily/debug.cc
@@ -21,7 +21,7 @@
 #include "misc.hh"
 #include "main.hh"
 
-Dstream *monitor=0;
+Dstream *lily_monitor=0;
 ostream * nulldev =0;
 
 
@@ -30,12 +30,12 @@ struct _Dinit {
   _Dinit()
     {
 	nulldev = new ofstream ("/dev/null");
-	monitor = new Dstream (&cout,".dstreamrc");
+	lily_monitor = new Dstream (&cout,".dstreamrc");
     }
   ~_Dinit()
     {
 	delete nulldev;
-	delete monitor;
+	delete lily_monitor;
     }
 } dinit;
 
@@ -65,7 +65,7 @@ debug_init()
   // libg++ 2.8.0 doesn't have set_new_handler
   // set_new_handler (&mynewhandler);
 #endif
-  set_flower_debug (*monitor, check_debug);
+  set_flower_debug (*lily_monitor, check_debug);
 
   signal (SIGFPE, float_handler);
 }
@@ -132,7 +132,7 @@ void
 set_debug (bool b)
 {
   check_debug =b;
-  set_flower_debug (*monitor, check_debug);
+  set_flower_debug (*lily_monitor, check_debug);
 #ifdef MEMORY_PARANOID
   if (check_malloc_b)
     if (mcheck (0))
diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index aa7178f079..8afb577160 100644
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -86,14 +86,14 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
 	{
 	  w = iter->next_moment();
 	  DOUT << "proccing: " << w << '\n';
-	  if (!monitor->silent_b ("walking"))
+	  if (!lily_monitor->silent_b ("walking"))
 	    iter->print();
 	}
       
       modify_next (w);
       prepare (w);
       
-      if (!monitor->silent_b ("walking"))
+      if (!lily_monitor->silent_b ("walking"))
 	print();
 
       iter->process_and_next (w);
diff --git a/lily/include/debug.hh b/lily/include/debug.hh
index aca896309d..d8a5d47294 100644
--- a/lily/include/debug.hh
+++ b/lily/include/debug.hh
@@ -22,15 +22,15 @@ extern ostream &warnout ;
 extern ostream *mlog;
 
 // debugging
-extern Dstream *monitor; // monitor
+extern Dstream *lily_monitor; // monitor
 
 #ifdef NPRINT
 /** 
   Global debug output. Compare with cin, cout, cerr, DOUT is DEBUG OUTPUT
  */
-#define DOUT if (0) *monitor	// clever hack 
+#define DOUT if (0) *lily_monitor	// clever hack 
 #else
-#define DOUT if (check_debug) monitor->identify_as (__PRETTY_FUNCTION__)
+#define DOUT if (check_debug) lily_monitor->identify_as (__PRETTY_FUNCTION__)
 #endif
 
 extern bool check_debug;
diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
new file mode 100644
index 0000000000..c122c64e2c
--- /dev/null
+++ b/lily/include/simple-spacer.hh
@@ -0,0 +1,18 @@
+/*   
+  simple-spacer.hh -- declare Simple_spacer
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+#ifndef SIMPLE_SPACER_HH
+#define SIMPLE_SPACER_HH
+
+class Simple_spacer {
+
+};
+
+#endif /* SIMPLE_SPACER_HH */
+
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 39883f8328..8301c8a5bc 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -544,12 +544,12 @@ String
 Midi_track::data_str () const
 {
   String str = Midi_chunk::data_str ();
-  if (check_debug && !monitor->silent_b ("Midistrings"))
+  if (check_debug && !lily_monitor->silent_b ("Midistrings"))
     str += "\n";
   for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
       str += i->car_->str ();
-      if (check_debug && !monitor->silent_b ("Midistrings"))
+      if (check_debug && !lily_monitor->silent_b ("Midistrings"))
         str += "\n";
     }
   return str;
diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index ba8f161a95..373d49569a 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -44,7 +44,7 @@ Midi_stream::operator << (Midi_item const& midi_c_r)
 {
 //    *this <<midi_c_r.str (); 
   String str = midi_c_r.str ();
-  if (check_debug && !monitor->silent_b ("Midistrings")) 
+  if (check_debug && !lily_monitor->silent_b ("Midistrings")) 
     {
     str = String_convert::bin2hex_str (str) + "\n";
     // ugh, should have separate debugging output with Midi*::print routines
diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 2bf4d1120c..c1051d6019 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -109,9 +109,9 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  if (!monitor->silent_b ("InitDeclarations") && check_debug)
+  if (!lily_monitor->silent_b ("InitDeclarations") && check_debug)
     print_declarations (true);
-  if (!monitor->silent_b ("InitLexer") && check_debug)
+  if (!lily_monitor->silent_b ("InitLexer") && check_debug)
     set_debug (1);
 
 
diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 61f52df13f..de8b7c66bd 100644
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -60,7 +60,7 @@ My_lily_parser::parse_file (String init, String s)
   *mlog << _ ("Parsing...");
 
   init_parse_b_ = false;
-  set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+  set_yydebug (!lily_monitor->silent_b ("Parser") && check_debug);
   lexer_p_->new_input (init, source_l_);
   do_yyparse ();
 
diff --git a/lily/out/lilypond.1 b/lily/out/lilypond.1
deleted file mode 100644
index fe5bf8bba4..0000000000
--- a/lily/out/lilypond.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH LILYPOND "1" "September 1999" "GNU LilyPond 1.2.6." FSF
-.SH NAME
-LilyPond \- manual page for LilyPond 1.2.6.
-.SH SYNOPSIS
-.B LilyPond
-[\fIOPTION\fR]... [\fIFILE\fR]...
-.SH DESCRIPTION
-.PP
-Typeset music and or play MIDI from FILE.
-.PP
-LilyPond is a music typesetter.  It produces beautiful sheet music
-using a high level description file as input.  LilyPond is part of 
-the GNU Project.
-.SH OPTIONS
-.TP
-\fB\-o\fR,--output=BASENAME
-write output to BASENAME[-x].extension
-.TP
-\fB\-w\fR,--warranty
-show warranty and copyright
-.TP
-\fB\-h\fR,--help
-this help
-.TP
-\fB\-t\fR,--test
-switch on experimental features
-.TP
-\fB\-d\fR,--debug
-enable debugging output
-.TP
-\fB\-i\fR,--init=FILE
-use FILE as init file
-.TP
-\fB\-I\fR,--include=DIR
-add DIR to search path
-.TP
-\fB\-m\fR,--no-paper
-produce midi output only
-.TP
-\fB\-M\fR,--dependencies
-write Makefile dependencies for every input file
-.TP
-\fB\-T\fR,--no-timestamps
-don't timestamp the output
-.TP
-\fB\-Q\fR,--find-old-relative
-show all changes in relative syntax
-.TP
-\fB\-V\fR,--ignore-version
-ignore mudela version
-.TP
-\fB\-v\fR,--version
-print version number
-.TP
-\fB\-f\fR,--output-format=EXT
-use output format EXT
-.TP
-\fB\-s\fR,--safe
-inhibit file output naming and exporting
-.PP
-This binary was compiled with the following options: datadir =/users/hanwen/usr/share/lilypond
-localedir =/users/hanwen/usr/share/locale
-.SH "REPORTING BUGS"
-Report bugs to bug-gnu-music@gnu.org
-Oldest supported input version: 1.1.52
-.SH "SEE ALSO"
-The full documentation for
-.B LilyPond
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B LilyPond
-programs are properly installed at your site, the command
-.IP
-.B info LilyPond
-.PP
-should give you access to the complete manual.
-.PP
-This is free software.  It is covered by the GNU General Public License,and you are welcome to change it and/or distribute copies of it undercertain conditions.  Invoke as `lilypond --warranty' for more information.
-.SH COPYRIGHT
-Copyright \(co 1996--1999 byHan-Wen Nienhuys <hanwen@cs.uu.nl>
-Jan Nieuwenhuizen <janneke@gnu.org>
diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 07fe0330b9..e0565ab7b0 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -85,7 +85,7 @@ Paper_outputter::output_header ()
 
 #ifndef NPRINT
   DOUT << "output_header\n";
-  if (check_debug && !monitor->silent_b ("Guile"))
+  if (check_debug && !lily_monitor->silent_b ("Guile"))
     {
       gh_display (args_scm); gh_newline ();
     }
diff --git a/lily/score-element.cc b/lily/score-element.cc
index 2dab6212bc..d8f254175c 100644
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -138,7 +138,7 @@ Score_element::print() const
 {
 #ifndef NPRINT
   DOUT << classname(this) << "{\n";
-  if (check_debug && !monitor->silent_b ("Score_element"))
+  if (check_debug && !lily_monitor->silent_b ("Score_element"))
     ly_display_scm (element_property_alist_);
   DOUT << "dependencies: " << dependency_size();
   if (original_l_)
diff --git a/lily/scores.cc b/lily/scores.cc
index 5d97d4fef5..23f85ce5bc 100644
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -81,7 +81,7 @@ do_scores()
 	}
       else
 	{
-	  if (!monitor->silent_b ("do_scores"))
+	  if (!lily_monitor->silent_b ("do_scores"))
 	      is_p->print ();
 	  is_p->process();
 	}
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
new file mode 100644
index 0000000000..3616155b02
--- /dev/null
+++ b/lily/simple-spacer.cc
@@ -0,0 +1,10 @@
+/*   
+  simple-spacer.cc --  implement Simple_spacer
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+
diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly
index dfdd44297e..71b2c55cab 100644
--- a/ly/auto-beam-settings.ly
+++ b/ly/auto-beam-settings.ly
@@ -42,6 +42,7 @@ time3_8beamAutoEnd = "3/8";
 
 time4_4beamAutoEnd = "1/2";
 time4_4beamAutoEnd_12 = "1/4";
+time4_4beamAutoEnd_16 = "1/4";
 time4_4beamAutoEnd_32 = "1/8";
 
 time4_8beamAutoEnd = "1/4";
@@ -62,6 +63,8 @@ time12_8beamAutoEnd = "3/8";
 time12_8beamAutoEnd_16 = "3/8";
 time12_8beamAutoEnd_32 = "1/8";
 
+
+
 %{
 
 Users may override in most cases, simply by issuing
diff --git a/make/generic-vars.make b/make/generic-vars.make
index 8c90d01de8..207156e1d7 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -59,3 +59,5 @@ INSTALL_DIST_FILES = \
 
 INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))
 
+
+
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index e27626f40c..8fbb0c1d96 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -26,7 +26,7 @@ $(outdir)/%.ly: %.abc
 $(outdir)/%.dvi: $(outdir)/%.ly
 	$(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
 	-mv $(basename $(<F)).midi $(outdir)
-	
+
 # don't junk intermediate .dvi files.  They're easier to view than
 # .ps or .gif
 .PRECIOUS: $(outdir)/%.dvi
diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 11b4a35299..5080ace0e4 100644
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -5,7 +5,6 @@ all: $(OUT_FILES)
 
 local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
 	(cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html
 	echo $^ > $(depth)/wwwlist
 
 convert-mudela: local-convert-mudela
diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index cf9f2383f4..6285d3d72b 100644
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 1.2.6
-Entered-date: 03SEP99
+Version: 1.2.7
+Entered-date: 14SEP99
 Description: 
 LilyPond is a music typesetter.  It produces beautiful sheet music
 using a high level description file as input.  LilyPond is part of 
@@ -11,8 +11,8 @@ Author: hanwen@cs.uu.nl (Han-Wen Nienhuys)
 	janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	1000k lilypond-1.2.6.tar.gz 
+	1000k lilypond-1.2.7.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	1000k lilypond-1.2.6.tar.gz 
+	1000k lilypond-1.2.7.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 5398def9e0..d54aa38317 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.2.6
+Version: 1.2.7
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.2.6.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.2.7.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
diff --git a/make/toplevel.make.in b/make/toplevel.make.in
index c26bfe991e..8e7fde2a73 100644
--- a/make/toplevel.make.in
+++ b/make/toplevel.make.in
@@ -32,9 +32,11 @@ website: fonts htmldoc examples doc++
 fonts:
 	$(MAKE) -C $(depth)/mf 
 
+
 examples:
 	$(MAKE) CONFIGSUFFIX='www' -C input WWW
 	$(MAKE) CONFIGSUFFIX='www' -C mutopia WWW
+	$(footify)
 	tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz  `find input mutopia -type d -name 'out-www' -print`
 
 localinstall:
@@ -44,3 +46,6 @@ localinstall:
 
 local-WWW-clean:
 	$(depth)/buildscripts/out/clean-fonts
+
+footify:
+	$(footify)
diff --git a/midi2ly/out/midi2ly.1 b/midi2ly/out/midi2ly.1
deleted file mode 100644
index 38e8d991de..0000000000
--- a/midi2ly/out/midi2ly.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH MIDI2LY "1" "September 1999" "midi2ly 1.2.6." FSF
-.SH NAME
-midi2ly \- manual page for midi2ly 1.2.6.
-.SH SYNOPSIS
-.B midi2ly
-[\fIOPTION\fR]... [\fIFILE\fR]
-.SH DESCRIPTION
-.PP
-Translate midi-file to mudela
-.SH OPTIONS
-.TP
-\fB\-b\fR,--no-quantify
-write exact durations, e.g.: a4*385/384
-.TP
-\fB\-d\fR,--debug
-enable debugging output
-.TP
-\fB\-h\fR,--help
-this help
-.TP
-\fB\-k\fR,--key=ACC[:MINOR]
-set key: ACC +sharps/-flats; :1 minor
-.TP
-\fB\-n\fR,--no-silly
-assume no tuplets or double dots, smallest is 32
-.TP
-\fB\-o\fR,--output=FILE
-set FILE as default output
-.TP
-\fB\-p\fR,--no-tuplets
-assume no tuplets
-.TP
-\fB\-q\fR,--quiet
-be quiet
-.TP
-\fB\-s\fR,--smallest=DUR
-Set smallest duration (?)
-.TP
-\fB\-T\fR,--no-timestamps
-don't timestamp the output
-.TP
-\fB\-v\fR,--verbose
-be verbose
-.TP
-\fB\-w\fR,--warranty
-show warranty and copyright
-.TP
-\fB\-x\fR,--no-double-dots
-assume no double dotted notes
-.TP
-\fB\-V\fR,--version
-print version number
-.SH "REPORTING BUGS"
-Report bugs to bug-gnu-music@gnu.org
-.SH "SEE ALSO"
-The full documentation for
-.B midi2ly
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B midi2ly
-programs are properly installed at your site, the command
-.IP
-.B info midi2ly
-.PP
-should give you access to the complete manual.
-.PP
-This is free software.  It is covered by the GNU General Public License,and you are welcome to change it and/or distribute copies of it undercertain conditions.  Invoke as `midi2ly --warranty' for more information.
-.SH COPYRIGHT
-Copyright \(co 1996--1999 byHan-Wen Nienhuys <hanwen@cs.uu.nl>
-Jan Nieuwenhuizen <janneke@gnu.org>
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d3999a9834..e0682e5b23 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -1,5 +1,8 @@
 #!@PYTHON@
 
+
+# TODO: Rewrite this.  The control structure is too hairy.
+
 """
 =======================================================================
 LilyPond to dvi converter
@@ -468,7 +471,8 @@ class Properties:
         if os.environ.has_key('TMP'):
             this.__set('tmp',os.environ['TMP'],'environment')
 
-        
+
+    def read_titledefs (this):
 	fd=this.get_texfile_path ('titledefs.tex')
         mudefs=[]    
 
@@ -953,7 +957,7 @@ def identify ():
     sys.stderr.write (program_id () + '\n')
 
 def print_version ():
-    sys.stdout.write (program_id ())
+    sys.stdout.write (program_id () + '\n')
 
 def help ():
     sys.stdout.write (
@@ -1046,7 +1050,8 @@ def main():
 	    return 0
 	    
     identify()
-	    
+    Props.read_titledefs ()
+    
     if len(files):
         for file in files:
             infile.open(file)
diff --git a/scripts/out/abc2ly.1 b/scripts/out/abc2ly.1
deleted file mode 100644
index d1e430df47..0000000000
--- a/scripts/out/abc2ly.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH ABC2LY "1" "September 1999" "GNU lilypond 1.2.6" FSF
-.SH NAME
-abc2ly \- manual page for abc2ly 1.2.6
-.SH SYNOPSIS
-.B abc2ly
-[\fIOPTION\fR]...\fI ABC-FILE\fR
-.SH DESCRIPTION
-
-Convert ABC to Mudela.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-this help
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-set output filename to FILE
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-version information
-.SH "SEE ALSO"
-The full documentation for
-.B abc2ly
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B abc2ly
-programs are properly installed at your site, the command
-.IP
-.B info abc2ly
-.PP
-should give you access to the complete manual.
diff --git a/scripts/out/convert-mudela.1 b/scripts/out/convert-mudela.1
deleted file mode 100644
index 98cc4c0c0d..0000000000
--- a/scripts/out/convert-mudela.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH CONVERT-MUDELA "1" "September 1999" "GNU LilyPond 1.2.6" FSF
-.SH NAME
-convert-mudela \- manual page for convert-mudela 1.2.6
-.SH SYNOPSIS
-.B convert-mudela
-[\fIOPTION\fR]... [\fIFILE\fR]... 
-.SH DESCRIPTION
-.PP
-Try to convert to newer mudela-versions.  The version number of the
-input is guessed by default from \version directive
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help
-.TP
-\fB\-e\fR, \fB\-\-edit\fR
-in place edit
-.TP
-\fB\-f\fR, \fB\-\-from\fR=\fIVERSION\fR
-start from version
-.TP
-\fB\-s\fR, \fB\-\-show\-rules\fR
-print all rules.
-.TP
-\fB\-t\fR, \fB\-\-to\fR=\fIVERSION\fR
-target version
-.TP
-\fB\-\-version\fR
-print program version
-.SH "REPORTING BUGS"
-Report bugs to bugs-gnu-music@gnu.org
-.SH "SEE ALSO"
-The full documentation for
-.B convert-mudela
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B convert-mudela
-programs are properly installed at your site, the command
-.IP
-.B info convert-mudela
-.PP
-should give you access to the complete manual.
-.PP
-This is free software.  It is covered by the GNU General Public
-License, and you are welcome to change it and/or distribute copies of
-it under certain conditions.  invoke as `convert-mudela --warranty' for more
-information.
diff --git a/scripts/out/ly2dvi.1 b/scripts/out/ly2dvi.1
deleted file mode 100644
index 35b3a35a45..0000000000
--- a/scripts/out/ly2dvi.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH LY2DVI "1" "September 1999" "GNU lilypond 1.2.6" FSF
-.SH NAME
-ly2dvi \- manual page for ly2dvi 1.2.6
-.SH SYNOPSIS
-.B ly2dvi
-[\fIOPTION\fR]... [\fIFILE\fR]...
-.SH DESCRIPTION
-.PP
-Generate dvi file from mudela or lilypond output
-.SH OPTIONS
-.TP
-\fB\-D\fR,--debug
-increase verbosity
-.TP
-\fB\-F\fR,--headers=
-name of additional LaTeX headers file
-.TP
-\fB\-H\fR,--Height=
-set paper height (points) (see manual page)
-.TP
-\fB\-I\fR,--include=DIR
-add DIR to LilyPond's search path
-.TP
-\fB\-K\fR,--keeplilypond
-keep lilypond output files
-.TP
-\fB\-L\fR,--landscape
-set landscape orientation
-.TP
-\fB\-N\fR,--nonumber
-switch off page numbering
-.TP
-\fB\-O\fR,--orientation=
-set orientation (obsolete - use \fB\-L\fR instead)
-.TP
-\fB\-P\fR,--postscript
-generate postscript file
-.TP
-\fB\-W\fR,--Width=
-set paper width (points) (see manual page)
-.TP
-\fB\-M\fR,--dependencies
-tell lilypond make a dependencies file
-.TP
-\fB\-h\fR,--help
-this help text
-.TP
-\fB\-k\fR,--keeply2dvi
-keep ly2dvi output files
-.TP
-\fB\-l\fR,--language=
-give LaTeX language (babel)
-.TP
-\fB\-o\fR,--output=
-set output directory
-.TP
-\fB\-p\fR,--papersize=
-give LaTeX papersize (eg. a4)
-.TP
-\fB\-s\fR,--separate
-run all files separately through LaTeX
-.PP
-files may be (a mix of) input to or output from lilypond(1)
-.SH "SEE ALSO"
-The full documentation for
-.B ly2dvi
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ly2dvi
-programs are properly installed at your site, the command
-.IP
-.B info ly2dvi
-.PP
-should give you access to the complete manual.
diff --git a/scripts/out/mudela-book.1 b/scripts/out/mudela-book.1
deleted file mode 100644
index 3fedded527..0000000000
--- a/scripts/out/mudela-book.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.012.
-.TH MUDELA-BOOK "1" "September 1999" "GNU LilyPond 1.2.6" FSF
-.SH NAME
-mudela-book \- manual page for mudela-book 1.2.6
-.SH SYNOPSIS
-.B mudela-book
-[\fIoptions\fR]\fI FILE\fR
-.SH DESCRIPTION
-.PP
-Generate hybrid LaTeX input from Latex + mudela
-Options:
-.TP
-\fB\-\-default\-mudela\-fontsize\fR=\fIDIM\fR
-default fontsize for music.  DIM is assumed to in points
-.TP
-\fB\-f\fR,--format=EXT
-set format.  EXT is one of texi and latex.
-.TP
-\fB\-h\fR,--help
-print help
-.TP
-\fB\-I\fR,--include=DIR
-include path
-.TP
-\fB\-\-init\fR
-mudela-book initfile
-.TP
-\fB\-\-force\-verbatim\fR
-make all mudela verbatim
-.TP
-\fB\-M\fR,--dependencies
-write dependencies
-.TP
-\fB\-n\fR,--no-lily
-don't run lilypond
-.TP
-\fB\-o\fR,--outname=FILE
-prefix for filenames
-.TP
-\fB\-v\fR,--version
-print version information
-.PP
-Warning all output is written in the CURRENT directory
-.SH "REPORTING BUGS"
-Report bugs to bug-gnu-music@gnu.org.
-Written by Tom Cato Amundsen <tomcato@xoommail.com> and
-Han-Wen Nienhuys <hanwen@cs.uu.nl>
-.SH "SEE ALSO"
-The full documentation for
-.B mudela-book
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B mudela-book
-programs are properly installed at your site, the command
-.IP
-.B info mudela-book
-.PP
-should give you access to the complete manual.
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c71271fe54..03d82fc7c7 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1,7 +1,3 @@
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
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/bin/text2html.py b/stepmake/bin/text2html.py
new file mode 100644
index 0000000000..a4ad6ea124
--- /dev/null
+++ b/stepmake/bin/text2html.py
@@ -0,0 +1,21 @@
+#@PYTHON@
+import os
+import string
+import sys
+
+for a in sys.argv[1:]:
+	outfile = os.path.basename (os.path.splitext(a)[0]) + '.html'
+	
+	try:
+	    os.unlink(outfile)
+	except:
+	    pass
+
+	s = r"""
+<body>
+<xmp>%s
+</xmp>
+</body>""" % open (a).read ()
+	open (outfile, 'w').write (s)
+
+
diff --git a/stepmake/bin/text2html.sh b/stepmake/bin/text2html.sh
deleted file mode 100644
index 0547aaeb8d..0000000000
--- a/stepmake/bin/text2html.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# text2html.sh
-
-if [ $# -ne 2 ]; then
-	echo "Usage: text2html TEXT-FILE HTML-FILENAME"
-	exit 2
-fi
-
-infile=$1
-outfile=$2
-rm -f $outfile
-echo "<body>" > $outfile
-echo "<xmp>" >> $outfile
-cat $infile >> $outfile
-echo "</xmp>" >> $outfile
-echo "</body>" >> $outfile
-
diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index 2f32642a65..534db01acb 100644
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -15,7 +15,6 @@ $(outdir)/%.png: %.xpm
 $(outdir)/%.txt: $(outdir)/%.1
 	troff -man -Tascii $< | grotty -b -u -o > $@
 
-
 include $(stepdir)/yodl-rules.make
 include $(stepdir)/texinfo-rules.make
 
diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index d5f7c50f31..d02041f4d2 100644
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -3,32 +3,19 @@ default:
 
 do-doc: $(OUTTXT_FILES) 
 
-# ugh. FIXME
-ifeq ($(strip $(README_TOP_FILES)),)
-readme-top_FILES-html:
-readme-top_FILES-txt:
-else
-
-readme-top_FILES-txt:
-	$(foreach i, $(README_TOP_FILES), \
-	  cp $(depth)/$(i) $(outdir)/$(i).txt && ) true
-
-readme-top_FILES-html:
-	$(foreach i, $(README_TOP_FILES), \
-	  $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \
-	  $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true
-endif
 
-local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
+local-WWW: $(OUTHTML_FILES)
 	echo $^ > $(depth)/wwwlist
 
 doc: do-doc
 
+
+# what to do here?
+ifeq (a,b) 
+
 $(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES)
 	$(MAKEINFO) --force -o $@ $(outdir)/topinfo.texinfo
 
-# what to do here?
-ifneq ($(strip $(INFO_FILES)),)
 
 INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-out.sub.make $@
 
diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index 0cf6a9a022..a4e84683e1 100644
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -15,8 +15,8 @@ OUTTEXINFO_FILES = $(addprefix $(outdir)/,$(TEXINFO_FILES))
 #
 ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES)
 OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
-OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES)
-# OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
+OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html)
+
 OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES)))
 OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES)))
 
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 4a2a70dbc4..327e1e9207 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -92,16 +92,10 @@ doc++:
 	(cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
 
 
-
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
-#	echo topdir=$(topdir)
-#	echo distdir=$(distdir)
-#	echo locladir=$(localdir)
 	mkdir -p $(distdir)/$(localdir)
 	$(LN) $(DIST_FILES) $(distdir)/$(localdir)
 
-#UGH UGH . make ifdef doesn't mix with string substitution semantics (late expansion vs. early expansion)
-# 
 	case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
 		$(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \
 	esac
diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make
index 422357acee..02c49f2584 100644
--- a/stepmake/stepmake/help2man-targets.make
+++ b/stepmake/stepmake/help2man-targets.make
@@ -10,7 +10,6 @@ man: $(HELP2MAN_GROFFS)
 
 localuninstall: uninstall-help2man
 
-
 uninstall-help2man:
 	$(foreach a, $(notdir $(MANGROFFS)), rm -f $(a) && ) true
 
diff --git a/stepmake/stepmake/help2man-vars.make b/stepmake/stepmake/help2man-vars.make
index 4d9b9c9854..6ae6dd819e 100644
--- a/stepmake/stepmake/help2man-vars.make
+++ b/stepmake/stepmake/help2man-vars.make
@@ -1,4 +1,5 @@
 
 HELP2MAN_GROFFS = $(addsuffix .1, $(addprefix $(outdir)/, $(HELP2MAN_EXECS)))
 
-OUT_DIST_FILES += $(HELP2MAN_GROFFS) 
+# triggers recompilations.  Ugh.
+OUT_DIST_FILES +=  # $(wildcard $(outdir)/*.1) 
diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make
index dd5b7ccd3d..252a9d6227 100644
--- a/stepmake/stepmake/pod-rules.make
+++ b/stepmake/stepmake/pod-rules.make
@@ -16,7 +16,6 @@ do_pod2html=$($(POD2HTML_VERSION))
 
 $(outdir)/%.html: $(outdir)/%.pod $(depth)/VERSION
 	$(do_pod2html) 
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
 
 $(outdir)/%.pod: %.pod
 	cp $< $@
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 9ce1c1ccf4..cdda14839a 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -7,7 +7,6 @@ $(outdir)/%.info: $(outdir)/%.texi
 
 $(outdir)/%.html:	$(outdir)/%.texi
 	-makeinfo --force --output=$@ --html --no-headers $< 
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $@ $(wildcard $(basename $@)[0-9][0-9].html)
 
 $(outdir)/%.dvi:	$(outdir)/%.texi
 # --clean only in >= 3.12s
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index daf0e7c8da..faf6124c8f 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -24,7 +24,6 @@ local-WWW: #index.html
 
 index.html: check-top-web NEWS
 	$(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=Documentation/top-docs/out-www/index.html $@
 
 WWW-clean: local-WWW-clean
 	$(MAKE) CONFIGSUFFIX='www' clean
diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make
index 3c0099560c..e5b81ef713 100644
--- a/stepmake/stepmake/yodl-rules.make
+++ b/stepmake/stepmake/yodl-rules.make
@@ -13,7 +13,6 @@ $(outdir)/%.7: %.yo
 
 $(outdir)/%.html: %.yo
 	$(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $@ $(wildcard $(basename $@)[0-9][0-9].html)
 
 $(outdir)/%.latex: %.yo
 	$(YODL2LATEX) -doutdir=$(outdir) --live-data=3 -o $@ $<
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:
diff --git a/stepmake/stepmake/yolily-toplevel-vars.make b/stepmake/stepmake/yolily-toplevel-vars.make
index 063229a4c4..8d4dd0c13c 100644
--- a/stepmake/stepmake/yolily-toplevel-vars.make
+++ b/stepmake/stepmake/yolily-toplevel-vars.make
@@ -1,5 +1,5 @@
 # -*-Makefile-*-
 # title	   Yolily_Toplevel_vars.make
 
-#empty 
-
+footify=$(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) \
+		--footer Documentation/footer.html.in `$(FIND) . -name '*.html' -print`
-- 
2.39.2