Generated by jan@digicash.com using package-diff 0.62,
From = lilypond-1.0.4, To = lilypond-1.0.5

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.0.5.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure 
and possibly make outdirs.

--state
1.0.4.jcn1
1.0.5
++state
diff -urN ../lilypond-1.0.4/Documentation/GNUmakefile ./Documentation/GNUmakefile
--- ../lilypond-1.0.4/Documentation/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./Documentation/GNUmakefile	Tue Aug 25 23:28:09 1998
@@ -6,17 +6,16 @@
 SUBDIRS=man tex pictures topdocs ntweb
 STEPMAKE_TEMPLATES=documentation 
 README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1
+INFO_FILES = $(outdir)/$(package).info $(wildcard $(outdir)/$(package).info-*)
+# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo
 
 EXTRA_DIST_FILES = gnu-music-history TODO 
 
 BLURBS=BLURB COPERTINA FLAPTEKST
-OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
 
 include $(depth)/make/stepmake.make 
 
 default: do-doc
 
-# INFO_FILES = $(outdir)/$(package).info
-
-texinfo: $(OUTTEXINFO_FILES)
+texinfo: $(outdir)/$(package).info
 
diff -urN ../lilypond-1.0.4/Documentation/man/GNUmakefile ./Documentation/man/GNUmakefile
--- ../lilypond-1.0.4/Documentation/man/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./Documentation/man/GNUmakefile	Tue Aug 25 11:11:11 1998
@@ -7,17 +7,11 @@
 MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(TEXINFO_FILES) .texinfo)))
 MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES) .yo)))
 
-OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
-
 OUT_DIST_FILES += $(MANGROFF)
 
 include $(depth)/make/stepmake.make 
 
 default: $(MANGROFF)
-
-texinfo: $(OUTTEXINFO_FILES)
-
-
 
 INSTALLATION_OUT_FILES=$(MANGROFF)
 INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION)
diff -urN ../lilypond-1.0.4/Documentation/man/convert-mudela.yo ./Documentation/man/convert-mudela.yo
--- ../lilypond-1.0.4/Documentation/man/convert-mudela.yo	Fri Jul 31 00:04:07 1998
+++ ./Documentation/man/convert-mudela.yo	Tue Aug 25 14:00:50 1998
@@ -12,24 +12,16 @@
 
 metalC(Automatically generated by yodl(1) from convert-mudela.yo.)
 
-node(Programs)(convert-mudela)(Invoking convert-mudela)(Programs)
 manpagename(convert-mudela)(convert-mudela to newer versions)
 
 convert-mudela sequentially applies different mudela-conversions to
 upgrade a Mudela input file.
 
-menu(
-mit(Invoking convert-mudela)(      Command options supported by file(convert-mudela))
-mit(Bugs convert-mudela)(          Bugs)
-mit(Author convert-mudela)(        Author)
-)
-
 manpagedescription()
 
 Upgrade a Mudela input file from FROM_PATCHLEVEL to TO_PATCHLEVEL.
 If no files are given, the standard input and output are used.
 
-node(convert-mudela)(Invoking convert-mudela)(Bugs convert-mudela)(convert-mudela)
 manpagesynopsis()
 
         convert-mudela [options] [files]
@@ -50,7 +42,6 @@
     available version.  
 )
 
-node(Invoking convert-mudela)(Bugs convert-mudela)(Author convert-mudela)(convert-mudela)
 manpagesection(BUGS)
 
 Not all language changes are handled. Multiple output options won't
@@ -60,7 +51,6 @@
 url(python)(http://www.python.org).
 
 
-node(Bugs convert-mudela)(Author convert-mudela)(LilyPond)(convert-mudela)
 manpageauthor()
 
 nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), lurl(http://www.cs.uu.nl/people/hanwen)
diff -urN ../lilypond-1.0.4/Documentation/man/lilypond.yo ./Documentation/man/lilypond.yo
--- ../lilypond-1.0.4/Documentation/man/lilypond.yo	Thu Aug 13 22:25:42 1998
+++ ./Documentation/man/lilypond.yo	Tue Aug 25 14:01:13 1998
@@ -3,6 +3,7 @@
 COMMENT(
 	(PIPETHROUGH(echo -n `date '+%d/%b/%y'|tr '[a-z]' '[A-Z]'`)())
 )
+
 manpage(LilyPond)
        (1)
 	(1998)
@@ -14,30 +15,12 @@
 manpagename(LilyPond)(the GNU Music Typesetter)
 cindex(LilyPond)
 
-COMMENT(nodes and menus by hand, for now)
-node(Author convert-mudela)(LilyPond)(Invoking LilyPond)(Programs)
-menu(
-mit(Invoking LilyPond)(           Command options supported by file(LilyPond))
-mit(Disclaimer LilyPond)(         Disclaimer)
-mit(Features LilyPond)(           Features)
-mit(Problems LilyPond)(           Problems)
-mit(Files LilyPond)(              Files)
-mit(Environment LilyPond)(        Environment)
-mit(Bugs LilyPond)(               Bugs)
-mit(See Also LilyPond)(           See Also)
-mit(Remarks LilyPond)(            Remarks)
-mit(History LilyPond)(            History)
-mit(Author LilyPond)(             Author)
-)
-
-node(LilyPond)(Invoking LilyPond)(Features LilyPond)(LilyPond)
-
 manpagesynopsis()
         bf(lilypond) [OPTION]... [MUDELA-FILE]...
 
 manpagedescription()
 
-verbinclude(../BLURB.in)
+includefile(../BLURB.in)
 
 manpageoptions()
 description(
@@ -72,7 +55,6 @@
     converting absolute octave mode stuff to relative octaves.
 )
 
-node(Invoking LilyPond)(Features LilyPond)(Disclaimer LilyPond)(LilyPond)
 manpagesection(FEATURES)
 
 This is an overview of the features that GNU LilyPond supports.  For
@@ -96,7 +78,6 @@
 it()Clef changes, meter changes, cadenza-mode, key changes, repeat bars.
 )
 
-node(Features LilyPond)(Disclaimer LilyPond)(Problems LilyPond)(LilyPond)
 manpagesection(DISCLAIMER)
 
 GNU LilyPond is copyright 1996-1998 by its authors.  GNU LilyPond is
@@ -105,7 +86,6 @@
 GNU LilyPond may be freely distributed.  For further information consult 
 the GNU General Public License, from the file file(COPYING).
 
-node(Disclaimer LilyPond)(Problems LilyPond)(Files LilyPond)(LilyPond)
 manpagesection(PROBLEMS)
 
 There is an extensive list of todoes and bugs.  See file(TODO).  If you
@@ -128,7 +108,6 @@
     to this mailinglist).
 )
 
-node(Problems LilyPond)(Files LilyPond)(Environment LilyPond)(LilyPond)
 manpagefiles()
 description(
 dit(file(init.ly)) 
@@ -136,7 +115,6 @@
     includes files from the directory file(init/).
 )
 
-node(Files LilyPond)(Environment LilyPond)(Bugs LilyPond)(LilyPond)
 manspagesection(environment)
 
 description(
@@ -147,12 +125,10 @@
     selects the language for the warning messages of LilyPond.
 )
 
-node(Environment LilyPond)(Bugs LilyPond)(See Also LilyPond)(LilyPond)
 manpagebugs()
 
 Lots of them.  See file(TODO) and file(BUGS)
 
-node(Bugs LilyPond)(See Also LilyPond)(Remarks LilyPond)(LilyPond)
 manpageseealso()
 
 description(
@@ -199,13 +175,11 @@
 Announces of new versions will be sent to info-gnu-music and
 gnu-music-discuss.
 
-node(See Also LilyPond)(Remarks LilyPond)(History LilyPond)(LilyPond)
 manpagesection(REMARKS)
 
 GNU LilyPond has no connection with the music package Rosegarden, other
 than the names being similar (:-)
 
-node(Remarks LilyPond)(History LilyPond)(Author LilyPond)(LilyPond)
 manpagesection(HISTORY)
 cindex(History)
 
@@ -236,7 +210,6 @@
 scale release (0.1) was done after approximately 78 patchlevels on
 August 1, 1997.
 
-node(History LilyPond)(Author LilyPond)(Ly2dvi)(LilyPond)
 manpageauthor()
 cindex(Author)
 
diff -urN ../lilypond-1.0.4/Documentation/man/ly2dvi.yo ./Documentation/man/ly2dvi.yo
--- ../lilypond-1.0.4/Documentation/man/ly2dvi.yo	Tue Aug 11 00:44:38 1998
+++ ./Documentation/man/ly2dvi.yo	Tue Aug 25 14:01:31 1998
@@ -7,20 +7,8 @@
 
 metalC(Automatically generated by yodl(1) from ly2dvi.yo.)
 
-node(Author LilyPond)(Ly2dvi)(Invoking Ly2dvi)(Programs)
 manpagename(Ly2dvi)(convert mudela to DVI)
 
-menu(
-mit(Invoking Ly2dvi)(              Command options supported by file(Ly2dvi))
-mit(Features Ly2dvi)(              Features)
-mit(Environment Ly2dvi)(           Environment)
-mit(Files Ly2dvi)(                 Files)
-mit(See Also Ly2dvi)(              See Also)
-mit(Bugs Ly2dvi)(                  Bugs)
-mit(Remarks Ly2dvi)(               Remarks)
-mit(Author Ly2dvi)(                Author)
-)
-
 manpagedescription()
 ly2dvi is a shell script which creates input file for LaTeX,
 based on information from the output files from lilypond.
@@ -31,7 +19,6 @@
 in the output (TeX) files, and latex is finally run to create
 one or more DVI files.
 
-node(Ly2dvi)(Invoking Ly2dvi)(Features Ly2dvi)(Ly2dvi)
 manpagesynopsis()
 
         ly2dvi [options] inputfile[.ly] [....]
@@ -84,7 +71,6 @@
     DVI file for each.
 )
 
-node(Invoking Ly2dvi)(Features Ly2dvi)(Environment Ly2dvi)(Ly2dvi)
 manpagesection(Features)
 
 ly2dvi responds to several parameters specified in the mudela
@@ -103,7 +89,6 @@
     Specify name of papersize.
 )
 
-node(Features Ly2dvi)(Environment Ly2dvi)(Files Ly2dvi)(Ly2dvi)
 manpagesection(Environment)
 
 description(
@@ -113,7 +98,6 @@
     Temporary directory name. Default is /tmp
 )
 
-node(Environment Ly2dvi)(Files Ly2dvi)(See Also Ly2dvi)(Ly2dvi)
 manpagesection(Files)
 
 file(titledefs.tex) is inspected for definitions used to extract
@@ -160,12 +144,10 @@
     Specify paperwidth (points - an inch is 72.27, a cm is 28.453 points).
 )
 
-node(Files Ly2dvi)(See Also Ly2dvi)(Bugs Ly2dvi)(Ly2dvi)
 manpagesection(See Also)
 
 lilypond(1), tex(1), latex(1)
 
-node(See Also Ly2dvi)(Bugs Ly2dvi)(Remarks Ly2dvi)(Ly2dvi)
 manpagesection(Bugs)
 
 If you have found a bug, you should send a bugreport.
@@ -179,7 +161,6 @@
     to this mailinglist).
 )
 
-node(Bugs Ly2dvi)(Remarks Ly2dvi)(Author Ly2dvi)(Ly2dvi)
 manpagesection(Remarks)
 
 Many papersizes are now supported. Information on other sizes
@@ -192,7 +173,6 @@
 archE, b0, b1, b2, b3, b4, b5, flsa, flse, halfletter, ledger, legal,
 letter, note
 
-node(Remarks Ly2dvi)(Author Ly2dvi)(Mi2mu)(Ly2dvi)
 manpageauthor()
 
 nemail(Jan Arne Fagertun)(Jan.A.Fagertun@energy.sintef.no), lurl(http://www.termo.unit.no/mtf/people/janaf/)
diff -urN ../lilypond-1.0.4/Documentation/man/mi2mu.yo ./Documentation/man/mi2mu.yo
--- ../lilypond-1.0.4/Documentation/man/mi2mu.yo	Thu Aug 13 22:25:42 1998
+++ ./Documentation/man/mi2mu.yo	Tue Aug 25 14:01:45 1998
@@ -11,21 +11,12 @@
 
 metalC(Automatically generated by yodl(1) from mi2mu.yo.)
 
-node(Author Ly2dvi)(Mi2mu)(Invoking Mi2mu)(Programs)
-
 manpagename(Mi2mu)(convert MIDI to bf(mudela)(5))
 
-menu(
-mit(Invoking Mi2mu)(               Command options supported by file(Mi2mu))
-mit(Disclaimer Mi2mu)(             Disclaimer)
-mit(Author Mi2mu)(                 Author)
-)
-
 manpagedescription()
 Mi2mu translates a MIDI input file to Mudela (GNU LilyPond source
 format).  Mi2mu is part of the GNU LilyPond music typesetting package.
 
-node(Mi2mu)(Invoking Mi2mu)(Disclaimer Mi2mu)(Mi2mu)
 manpagessynopsis()
 
 	mi2mu [options] midi-file
@@ -62,7 +53,6 @@
     Assume no double dotted notes.
 )
 
-node(Invoking Mi2mu)(Disclaimer Mi2mu)(Author Mi2mu)(Mi2mu)
 manpagesection(DISCLAIMER)
 
 Mi2mu is copyright 1996, 1997 by its authors. Mi2mu is distributed 
@@ -80,7 +70,6 @@
     On the input format. This is a LilyPond-enhanced LaTeX document.
 )
 
-node(Disclaimer Mi2mu)(Author Mi2mu)(mudela-book)(Mi2mu)
 manpageauthor()
 
 Please consult the documentation file file(AUTHORS) for more detailed
diff -urN ../lilypond-1.0.4/Documentation/man/mudela-book.yo ./Documentation/man/mudela-book.yo
--- ../lilypond-1.0.4/Documentation/man/mudela-book.yo	Fri Jul 31 00:04:07 1998
+++ ./Documentation/man/mudela-book.yo	Tue Aug 25 14:01:57 1998
@@ -11,16 +11,8 @@
 
 metalC(Automatically generated by yodl(1) from mudela-book.yo.)
 
-node(Author Mi2mu)(mudela-book)(Invoking mudela-book)(Programs)
-
 manpagename(mudela-book)(integrate LaTeX and mudela)
 
-menu(
-mit(Invoking mudela-book)(Command options supported by file(mudela-book))
-mit(Bugs mudela-book)(Bugs)
-mit(Author mudela-book)(Author)
-)
-
 manpagedescription() file(mudela-book) is a script that helps
 integrating mudela and LaTeX().  mudela-book runs LilyPond on
 fragments of mudela in your source file, and includes the results into
@@ -48,7 +40,6 @@
     CONTENTS is copied into the TeX source enclosed in a verbatim block.
 )
 
-node(mudela-book)(Invoking mudela-book)(Bugs mudela-book)(mudela-book)
 manpagesection(Synopsis)
 
 description(
@@ -62,13 +53,11 @@
 	print a short help message
 )
 
-node(Invoking mudela-book)(Bugs mudela-book)(Author mudela-book)(mudela-book)
 manpagebugs()
   
 Doesn't handle incorrect input sanely.   mudela-book is written in
 python, so you have install url(python)(http://www.python.org).
   
-node(Bugs mudela-book)(Author mudela-book)(Mutopia)(mudela-book)
 manpageauthor()
 
 nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), lurl(http://www.cs.uu.nl/people/hanwen)
diff -urN ../lilypond-1.0.4/Documentation/mutopia.yo ./Documentation/mutopia.yo
--- ../lilypond-1.0.4/Documentation/mutopia.yo	Sun Jul 12 23:49:09 1998
+++ ./Documentation/mutopia.yo	Tue Aug 25 13:59:41 1998
@@ -1,5 +1,3 @@
-node(Author mudela-book)(Mutopia)(Concept Index)(Top)
-
 article(Mutopia project - manifesto)(HWN and JCN)()
 
 This is some random ranting about the Mutopia project, aka "Music To
diff -urN ../lilypond-1.0.4/Documentation/ntweb/GNUmakefile ./Documentation/ntweb/GNUmakefile
--- ../lilypond-1.0.4/Documentation/ntweb/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./Documentation/ntweb/GNUmakefile	Tue Aug 25 10:18:48 1998
@@ -8,5 +8,12 @@
 
 default: do-doc 
 
+$(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=index.html --news=$(depth)/NEWS $@
+
 local-WWW:
 
diff -urN ../lilypond-1.0.4/Documentation/ntweb/index.yo ./Documentation/ntweb/index.yo
--- ../lilypond-1.0.4/Documentation/ntweb/index.yo	Mon Aug 24 22:18:52 1998
+++ ./Documentation/ntweb/index.yo	Wed Aug 26 08:41:32 1998
@@ -1,29 +1,26 @@
 mailto(daboys@bga.com)
 article(LilyPond Windows NT 4.0 Distribution)(nemail(Jeffrey B. Reed)(daboys@bga.com))(label(contents))
-sect(Windows NT Distribution)
+sect(Windows NT Binary Distribution)
 
 subsect(Introduction) label(introduction)
 
-This web page is dedicated to the distrubution of LilyPond for Windows
-NT 4.0. This package is covered under the GNU General Public License
-and all of the source and documentation are available on the official
-url(LilyPond
-Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html).
-
-LilyPond is the GNU Project music typesetter. This program can print
-beautiful sheet music from a music definition file. It can also play
-mechanical performances to a MIDI file. Features include multiple
-staffs, meters, clefs, keys, lyrics, versatile input language,
-cadenzas, beams, slurs, triplets, formatting scores, part
-extraction. It includes a nice font of musical symbols.
+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 and documentation are 
+available on the official 
+url(LilyPond Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html).
+
+includefile(../BLURB.in)
 
 link(Back to top)(contents)
 clearpage()
 
 
 subsect(NEWS) label(news)
-
-Version 1.0.3 is available
+This is what the version @TOPLEVEL_VERSION@ brings:
+verb(
+top_of_NEWS
+)
 
 link(Back to top)(contents)
 clearpage()
@@ -52,8 +49,18 @@
 
 subsect(Download) label(download)
 
+COMMENT(
+    i'd really like the name to represent the fact that this is a
+    binary distribution, but i don't want to break the webpage.
+
+    something like
+	it()lurl(lilypond-@TOPLEVEL_VERSION@.exe.zip), or
+	it()lurl(lilypond-@TOPLEVEL_VERSION@-bin.zip)
+    whatever...
+)
+   
 itemize(
-    it()lurl(lilypond-1.0.3.zip)
+    it()lurl(lilypond-@TOPLEVEL_VERSION@.zip)
 )
 
 link(Back to top)(contents)
@@ -68,14 +75,17 @@
   it()Set your path variable for lilypond and TeX 
   description(
     dit(batch file)
-      In a batch file you can add the following entry: nl()
-      bf(set path=%path%em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin)
-    dit(Windows Environment)
+      In a batch file you can add the following entries: nl()
+      bf(set LILYPOND=em(LilyPond-dir)) nl()
+      bf(set path=%path%%LILYPOND%\bin;em(MiKTeX-dir)\miktex\bin) nl()
+      bf(set TEXINPUTS=%LILYPOND%\texmf\tex\lilypond;;) nl()
+      bf(set MFINPUTS=%LILYPOND%\texmf\mf\public\lilypond;;) nl()
+COMMENT(    dit(Windows Environment)
       In the Windows environment you can select
       properties menu of the My Computer icon. Click on
       the environment tag and add the following to the user
       variables path entry. nl()
-      bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin)
+      bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin))
    ) nl()
    it() The first installation of LilyPond also requires these
         additional steps:
@@ -108,6 +118,16 @@
 
 
 subsect(Running LilyPond) label(running)
+
+itemize(
+  it()Take a look at url(angles.ly)(angles.ly)
+  it()Save angles.ly to your local disk
+  it()From a Command Prompt run: nl()
+  bf(ly2dvi.py angles.ly) nl()
+  bf(dvips angles.dvi) nl()
+  bf(cmd /c angles.ps) nl()
+)
+
 link(Back to top)(contents)
 clearpage()
 
@@ -125,3 +145,4 @@
 
 link(Back to top)(contents)
 clearpage()
+
diff -urN ../lilypond-1.0.4/Documentation/programs.yo ./Documentation/programs.yo
--- ../lilypond-1.0.4/Documentation/programs.yo	Thu Jan  1 01:00:00 1970
+++ ./Documentation/programs.yo	Tue Aug 25 23:22:04 1998
@@ -0,0 +1,21 @@
+COMMENT(
+URG
+don't try to make html from this
+)
+whentexinfo(
+nodetext(Your Softs.)
+chapter(Programs)
+
+COMMENT(prepare for texinfoing manpages)
+redef(manpage)(5)()
+redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpageauthor)(0)(sect(Authors))
+redef(manpagesection)(1)(sect(ARG1))
+
+redef(includefile)(1)(INCLUDEFILE(man/ARG1))
+includefile(convert-mudela.yo)
+includefile(lilypond.yo)
+includefile(ly2dvi.yo)
+includefile(mi2mu.yo)
+includefile(mudela-book.yo)
+)
diff -urN ../lilypond-1.0.4/Documentation/tex/tutorial.yo ./Documentation/tex/tutorial.yo
--- ../lilypond-1.0.4/Documentation/tex/tutorial.yo	Thu Aug 13 23:02:23 1998
+++ ./Documentation/tex/tutorial.yo	Tue Aug 25 14:22:33 1998
@@ -78,7 +78,7 @@
 should consult bind(Appendix)ref(glossary): it contains a glossary 
 of musical terms along with translations in some other languages.
 
-If you want to try the examples given here, you should have look a 
+If you want to try the examples given here, you should have a 
 look at bind(Section)ref(sec:running-lilypond) first.
 
 sect(Music copying, music definition and music entry)
diff -urN ../lilypond-1.0.4/Documentation/topinfo.yo ./Documentation/topinfo.yo
--- ../lilypond-1.0.4/Documentation/topinfo.yo	Sun Jul 12 23:59:15 1998
+++ ./Documentation/topinfo.yo	Tue Aug 25 23:20:47 1998
@@ -1,37 +1,36 @@
-
-node()(Top)(Copying)((dir))
-
-menu(
-mit(Copying)(                      Your rights.)
-mit(Programs)(                     Your softs.)
-mit(Mutopia)(                      Your music.)
-mit(Concept Index)(                Your index.)
+COMMENT(
+URG
+don't try to make html from this
 )
-
-node(Top)(Copying)(Programs)(Top)
-chapter(COPYING)
+whentexinfo(
+nodetext(Your Rights.)
+chapter(Copying)
 LilyPond is Free Software.  See file(COPYING) for details.
 
-node(Copying)(Programs)(convert-mudela)(Top)
-menu(
-mit(convert-mudela)(               Convert Mudela)
-mit(LilyPond)(                     The GNU Music Typsetter herself)
-mit(Ly2dvi)(                       Lilypond Frontend)
-mit(Mi2mu)(                        MIDI input)
-mit(mudela-book)(                  Integrate LaTeX and mudela)
-)
 
-whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/convert-mudela.texinfo))
-whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/lilypond.texinfo))
-whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/ly2dvi.texinfo))
-whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/mi2mu.texinfo))
-whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/mudela-book.texinfo))
-whentexinfo(texinfocommand(@include DOEXPAND(outdir)/mutopia.texinfo))
+COMMENT(prepare for texinfoing manpages)
+redef(manpage)(5)()
+redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpageauthor)(0)(sect(Authors))
+redef(manpagesection)(1)(sect(ARG1))
+
+COMMENT(redef(includefile)(1)(INCLUDEFILE(man/ARG1)))
+includefile(programs.yo)
+
+COMMENT(prepare for texinfoing articles)
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial))
+
+redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
+includefile(tutorial.yo)
+
+COMMENT(prepare for texinfoing articles)
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia))
+redef(includefile)(1)(INCLUDEFILE(ARG1))
+includefile(mutopia.yo)
 
 nchapter(Concept Index)
-node(Mutopia)(Concept Index)()(Top)
 COMMENT( urg makeindex())
-printndex()
-
-whentexinfo(texinfocommand(@bye))
-
+printindex()
+)
diff -urN ../lilypond-1.0.4/NEWS ./NEWS
--- ../lilypond-1.0.4/NEWS	Mon Aug 24 22:18:52 1998
+++ ./NEWS	Wed Aug 26 08:38:35 1998
@@ -1,3 +1,25 @@
+pl 5
+
+pl 4.jcn1
+	- texinfo docs, lots of yodl TODO
+	- junked some makefiles
+	- ntweb: use BLURB
+	- bf: pletvisibility 
+	- adaptions for yodl-1.31.2's automatic texinfo conversion 
+	- reinclude of 1.jcn2:
+	  pl 1.jcn2
+		  - renamed -alto -> viola
+		  - bf: avant-gardish six preludes
+		  - bf: ly2dvi warnings
+
+pl 4.jbr1
+	- stepmake/stepmake/install-outfiles.sub.make: fixed typo
+	- scripts/GNUmakefile: add ly2dvi32 to installation list and fixed
+	  included executable-targets.make to facilate installation of scripts
+	- Documentation/ntweb: Fixes to nt web page and added topdoc like
+	  automation.
+
+*********
 pl 4
 pl 3.mb2
 	- Changed text script alignment: center -> left
diff -urN ../lilypond-1.0.4/TODO ./TODO
--- ../lilypond-1.0.4/TODO	Mon Aug 24 22:18:52 1998
+++ ./TODO	Wed Aug 26 08:38:57 1998
@@ -9,8 +9,9 @@
 
 	* add ex-dimension to feta-params.
 
-
 	* strip EXEs before installing
+
+	* zip target for binary windows dist (JBR)
 
 	* text continuationss
 
diff -urN ../lilypond-1.0.4/VERSION ./VERSION
--- ../lilypond-1.0.4/VERSION	Mon Aug 24 22:18:52 1998
+++ ./VERSION	Tue Aug 25 17:55:42 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=4
+PATCH_LEVEL=5
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.4/aclocal.m4 ./aclocal.m4
--- ../lilypond-1.0.4/aclocal.m4	Mon Aug 24 22:18:52 1998
+++ ./aclocal.m4	Tue Aug 25 17:29:11 1998
@@ -129,9 +129,9 @@
 AC_DEFUN(AC_STEPMAKE_END, [
     AC_OUTPUT($CONFIGFILE.make:config.make.in)
 
-    rm -f Makefile
-    cp make/toplevel.make.in ./Makefile
-    chmod 444 Makefile
+    rm -f GNUmakefile
+    cp make/toplevel.make.in ./GNUmakefile
+    chmod 444 GNUmakefile
 ])
 
 AC_DEFUN(AC_STEPMAKE_GXX, [
@@ -188,6 +188,12 @@
     # No versioning on directory names of sub-packages 
     stepmake=stepmake
     AC_SUBST(stepmake)
+
+    STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
+    if test "x$STATE_VECTOR" != "x"; then
+    	STATE_VECTOR="\$(depth)/$STATE_VECTOR"
+    fi
+    AC_SUBST(STATE_VECTOR)
 
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
diff -urN ../lilypond-1.0.4/config.make.in ./config.make.in
--- ../lilypond-1.0.4/config.make.in	Thu Aug 13 22:25:33 1998
+++ ./config.make.in	Tue Aug 25 10:43:38 1998
@@ -15,6 +15,7 @@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 stepmake = @stepmake@
+state-vector = @STATE_VECTOR@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO = @MAKEINFO@
 ICFLAGS = @ICFLAGS@
diff -urN ../lilypond-1.0.4/configure.in ./configure.in
--- ../lilypond-1.0.4/configure.in	Mon Aug 24 22:18:52 1998
+++ ./configure.in	Tue Aug 25 17:55:13 1998
@@ -51,7 +51,7 @@
 
 AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
 AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-    You should install Yodl 1.30.pre4 or better)
+    You should install Yodl 1.30.2 or better)
 
 AC_STEPMAKE_END
 
diff -urN ../lilypond-1.0.4/init/property.ly ./init/property.ly
--- ../lilypond-1.0.4/init/property.ly	Mon Aug 24 22:18:52 1998
+++ ./init/property.ly	Tue Aug 25 10:09:00 1998
@@ -14,7 +14,8 @@
 ydirection		1	force stem up		\stemup
 pletvisibility		0	show nothing
 pletvisibility		1 	show number
-pletvisibility		2 	show number, and bracket-if-no-beam
+pletvisibility		2 	show (number and bracket)-if-no-beam
+pletvisibility		3 	show number, and bracket-if-no-beam
 pletvisibility		4 	show number, and bracket
 
 slurdash		0	normal slurs
@@ -209,7 +210,7 @@
 	\property Voice.pletvisibility = 0
 }
 pleton = {
-	\property Voice.pletvisibility = 2
+	\property Voice.pletvisibility = 3
 }
 tiny  = {
 	\property Voice.fontsize= "-2"
@@ -250,7 +251,7 @@
 ecarg =  \melodic {
 	\property Voice.pletvisibility = 0
 	\]
-	\property Voice.pletvisibility = 2
+	\property Voice.pletvisibility = 3
 }
 %}
 
diff -urN ../lilypond-1.0.4/lily/VERSION ./lily/VERSION
--- ../lilypond-1.0.4/lily/VERSION	Mon Aug 24 22:18:52 1998
+++ ./lily/VERSION	Tue Aug 25 17:55:54 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=4
+PATCH_LEVEL=5
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.4/make/GNUmakefile ./make/GNUmakefile
--- ../lilypond-1.0.4/make/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./make/GNUmakefile	Tue Aug 25 23:00:11 1998
@@ -4,7 +4,9 @@
 STEPMAKE_TEMPLATES=makedir
 BLURBS=BLURB # COPERTINA FLAPTEKST
 
-include $(depth)/make/stepmake.make 
-
+# ifneq ($(strip $(state-vector)),)
+EXTRA_DIST_FILES = STATE-VECTOR
+# endif
 
+include $(depth)/make/stepmake.make 
 
diff -urN ../lilypond-1.0.4/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-1.0.4/make/STATE-VECTOR	Thu Jan  1 01:00:00 1970
+++ ./make/STATE-VECTOR	Tue Aug 25 17:55:46 1998
@@ -0,0 +1,68 @@
+0.1.76
+0.1.76.jcn1
+0.1.77
+0.1.77.uu1
+0.1.77.hwjc
+0.1.77.jcn1
+0.1.77.jcn2
+0.1.77.hwn1
+0.1.78
+0.1.78.hwn1
+0.1.78.jcn1
+0.1.78.jcn2
+0.1.79
+0.1.79.hwn1
+0.1.79.jcn2
+0.1.80
+0.1.80.jcn1
+0.1.80.eb1
+0.1.80.hwn1
+0.1.81
+0.1.81.jcn1
+0.1.81.jbr2
+0.1.81.jcn2
+0.1.81.jbr1
+0.1.81.jcn1
+0.1.81.hwn1
+0.1.81.hwn2
+0.1.82
+0.1.82.jcn1
+0.1.82.jcn2
+0.1.82.jcn3
+0.1.82.jcn4
+0.1.82.jcn5
+0.1.82.hwn1
+0.1.82.hwn2
+0.1.83
+0.1.83.hwn1
+0.1.83.jcn1
+0.1.83.uu1
+0.1.83.hwn1
+0.1.83.hwn2
+0.1.83.hwn3
+0.1.83.hwn4
+0.1.83.hwn5
+0.1.83.jcn4
+0.1.84
+0.1.84.jcn1
+0.1.84.hwn1
+0.1.84.jcn2
+0.1.84.hwn2
+0.1.84.jcn3
+0.1.84.hwn4
+0.1.85
+0.1.85.jcn1
+0.1.85.hwn1
+0.1.85.jcn2
+1.0.0
+1.0.0.hwn1
+1.0.0.hwn2
+1.0.1
+1.0.1.jbr1
+1.0.1.jcn2
+1.0.1.jbr2
+1.0.2
+1.0.2.hwn1
+1.0.3
+1.0.4.jcn1
+1.0.5
diff -urN ../lilypond-1.0.4/make/docrules.make ./make/docrules.make
--- ../lilypond-1.0.4/make/docrules.make	Mon Aug 24 22:18:52 1998
+++ ./make/docrules.make	Thu Jan  1 01:00:00 1970
@@ -1,3 +0,0 @@
-# Docrules.make
-
-include $(make-dir)/mudela_rules.make
diff -urN ../lilypond-1.0.4/make/lilypond.spec.in ./make/lilypond.spec.in
--- ../lilypond-1.0.4/make/lilypond.spec.in	Wed Aug 19 13:16:08 1998
+++ ./make/lilypond.spec.in	Tue Aug 25 17:21:52 1998
@@ -19,6 +19,7 @@
 %build
 ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/'
 make all
+make -C Documentation texinfo || true
 make htmldoc
 
 %install
@@ -51,6 +52,7 @@
 /usr/man/man1/mudela-book.1
 /usr/man/man1/ly2dvi.1
 /usr/man/man1/convert-mudela.1
+/usr/info/lilypond.info*
 /usr/lib/texmf/texmf/tex/generic/lilypond
 /usr/lib/texmf/texmf/fonts/source/public/lilypond
 /usr/share/lilypond/
diff -urN ../lilypond-1.0.4/make/mutopia.make ./make/mutopia.make
--- ../lilypond-1.0.4/make/mutopia.make	Mon Aug 24 22:18:52 1998
+++ ./make/mutopia.make	Thu Jan  1 01:00:00 1970
@@ -1,3 +0,0 @@
-# make/Mutopia.make
-
-
diff -urN ../lilypond-1.0.4/make/substitute.make ./make/substitute.make
--- ../lilypond-1.0.4/make/substitute.make	Mon Aug 24 22:18:52 1998
+++ ./make/substitute.make	Tue Aug 25 16:51:26 1998
@@ -2,6 +2,7 @@
 
 #guh
 include $(stepdir)/substitute-vars.make
+include $(stepdir)/substitute-rules.make
 
 ATVARIABLES = \
   BASH\
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,49 +0,0 @@
-\header{
-filename =	 "allemande-alto.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Allemande";
-% opus =	 "BWV 1008";
-opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "allemande-urtext.ly";
-
-allemande_alto_global = \melodic{
-	\time 4/4;
-	\key f;
-	\partial 16;
-	\clef alto;
-	\skip 1*11;
-	s2. s8.
-	\bar ":|:";
-	\skip 1*11;
-	s2. s4 s8
-	\bar ":|";
-}
-
-allemande_alto_scripts = \melodic{
-}
-
-allemande_alto_staff = \type Staff <
-	\melodic \transpose c'' \$allemande
-	\$allemande_alto_global
-	\$allemande_alto_scripts
->
-
-\score{
-	\$allemande_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 45; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "allemande-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Allemande";
+%piece = "Allemande";
 % opus =	 "BWV 1008";
 opus =	 "";
 composer =	 "Johann Sebastian Bach (1685-1750)";
@@ -45,5 +45,6 @@
 	\$allemande_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 45; }
+	\header{ piece = "Allemande"; }
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % allemande-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,50 @@
+\header{
+filename =	 "allemande-viola.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Allemande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "allemande-urtext.ly";
+
+allemande_viola_global = \melodic{
+	\time 4/4;
+	\key f;
+	\partial 16;
+	\clef alto;
+	\skip 1*11;
+	s2. s8.
+	\bar ":|:";
+	\skip 1*11;
+	s2. s4 s8
+	\bar ":|";
+}
+
+allemande_viola_scripts = \melodic{
+}
+
+allemande_viola_staff = \type Staff <
+	\melodic \transpose c'' \$allemande
+	\$allemande_viola_global
+	\$allemande_viola_scripts
+>
+
+\score{
+	\$allemande_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 45; }
+	\header{ piece = "Allemande"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,49 +0,0 @@
-\header{
-filename =	 "courante-alto.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Courante";
-% opus =	 "BWV 1008";
-opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "courante-urtext.ly";
-
-courante_alto_global = \melodic{
-	\time 3/4;
-	\key f;
-	\partial 16;
-	\clef alto;
-	\skip 2.*15;
-	s2 s8.
-	\bar ":|:";
-	\skip 2.*15;
-	s2 s8.
-	\bar ":|";
-}
-
-courante_alto_scripts = \melodic{
-}
-
-courante_alto_staff = \type Staff <
-	\melodic \transpose c' \$courante
-	\$courante_alto_global
-	\$courante_alto_scripts
->
-
-\score{
-	\$courante_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 55; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "courante-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Courante";
+% piece = "Courante";
 % opus =	 "BWV 1008";
 opus =	 "";
 composer =	 "Johann Sebastian Bach (1685-1750)";
@@ -45,5 +45,6 @@
 	\$courante_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 55; }
+	\header{ piece = "Courante"; }
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % courante-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,50 @@
+\header{
+filename =	 "courante-viola.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Courante";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "courante-urtext.ly";
+
+courante_viola_global = \melodic{
+	\time 3/4;
+	\key f;
+	\partial 16;
+	\clef alto;
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|:";
+	\skip 2.*15;
+	s2 s8.
+	\bar ":|";
+}
+
+courante_viola_scripts = \melodic{
+}
+
+courante_viola_staff = \type Staff <
+	\melodic \transpose c' \$courante
+	\$courante_viola_global
+	\$courante_viola_scripts
+>
+
+\score{
+	\$courante_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 55; }
+	\header{ piece = "Courante"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,50 +0,0 @@
-\header{
-filename =	 "gigue-cello.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Pr\\'elude";		% duh
-% opus =	 "BWV 1008";
-opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "gigue-urtext.ly";
-
-gigue_cello_global = \melodic{
-	\time 3/8;
-	\key f;
-	\clef bass;
-	\partial 8
-	\skip 4.*31;
-	s4
-	\bar ":|:";
-	\skip 4.*44;
-	s4
-	\bar ":|";
-}
-
-gigue_cello_scripts = \melodic{
-}
-
-gigue_cello_staff = \type Staff <
-	\melodic \transpose c' \$gigue
-	\$gigue_cello_global
-	\$gigue_cello_scripts
->
-
-\score{
-	\$gigue_cello_staff
-	\include "scs-paper.ly";
-%broken
-	\midi{ \tempo 4 = 60; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "gigue-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Pr\\'elude";		% duh
+% piece = "Gigue";
 % opus =	 "BWV 1008";
 opus =	 "";
 composer =	 "Johann Sebastian Bach (1685-1750)";
@@ -45,5 +45,6 @@
 	\$gigue_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 60; }
+	\header{ piece = "Gigue"; }
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % gigue-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,51 @@
+\header{
+filename =	 "gigue-cello.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Gigue";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "gigue-urtext.ly";
+
+gigue_cello_global = \melodic{
+	\time 3/8;
+	\key f;
+	\clef bass;
+	\partial 8;
+	\skip 4.*31;
+	s4
+	\bar ":|:";
+	\skip 4.*44;
+	s4
+	\bar ":|";
+}
+
+gigue_cello_scripts = \melodic{
+}
+
+gigue_cello_staff = \type Staff <
+	\melodic \transpose c' \$gigue
+	\$gigue_cello_global
+	\$gigue_cello_scripts
+>
+
+\score{
+	\$gigue_cello_staff
+	\include "scs-paper.ly";
+%broken
+	\midi{ \tempo 4 = 60; }
+	\header{ piece = "Gigue"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,95 +0,0 @@
-\header{
-filename =	 "menuetto-alto.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Menuetto I";
-description =	 "Transcribed for Alto";
-source =	 "?";
-% opus =	 "BWV 1008 no. 5";
-opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "menuetto-urtext.ly";
-
-menuetto_i_alto_global = \melodic{
-	\time 3/4;
-	\key f;
-	\clef alto;
-	\skip 2.*8;
-	\bar ":|:";
-	\clef violin;
-	\skip 2.*1;
-	\slurdotted
-	\skip 2.*3;
-	\clef alto;
-	\skip 2.*11;
-	s2._"Fine"
-	\bar ":|";
-}
-
-menuetto_i_alto_scripts = \melodic{
-	s2.
-	s8^"~"^1_2_4 s8*5
-	s2.*5
-	s4 s-\upbow s-\downbow
-	s2.-\upbow
-	s2.*5
-	s2 s4-\upbow
-	s4-\downbow s2
-	s2.*1
-	s2^0 s4
-	s2.*1
-	s4-\downbow s4-\upbow
-}
-
-menuetto_i_alto_staff = \type Staff <
-	\melodic \transpose c' \$menuetto_i
-	\$menuetto_i_alto_global
-%	\$menuetto_i_alto_scripts
->
-
-\score{
-	\$menuetto_i_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 110; }
-}
-
-menuetto_ii_alto_global = \melodic{
-	\time 3/4;
-	\key D;
-	\clef alto;
-	\skip 2.*8;
-	\bar ":|:";
-	\skip 2.*1;
-	\slurdotted
-	\skip 2.*14;
-	s2._"Menuetto I da Capo"
-	\bar ":|";
-}
-
-menuetto_ii_alto_staff = \type Staff <
-	\melodic \transpose c' \$menuetto_ii
-	\$menuetto_ii_alto_global
-%	\$menuetto_ii_alto_scripts
->
-
-\header{
-piece = "Menuetto II";
-opus =	 "";
-}
-\score{
-	\$menuetto_ii_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 130; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "menuetto-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Menuetto I";
+%piece = "Menuetto I";
 source =	 "?";
 % opus =	 "BWV 1008 no. 5";
 opus =	 "";
@@ -63,6 +63,7 @@
 	\$menuetto_i_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 110; }
+	\header{ piece = "Menuetto I"; }
 }
 
 menuetto_ii_cello_global = \melodic{
@@ -84,13 +85,10 @@
 %	\$menuetto_ii_cello_scripts
 >
 
-\header{
-piece = "Menuetto II";
-opus =	 "";
-}
 \score{
 	\$menuetto_ii_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 130; }
+	\header{ piece = "Menuetto II"; }
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % menuetto-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 menuetto_i_a = \melodic \relative c {
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,93 @@
+\header{
+filename =	 "menuetto-viola.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Menuetto I";
+description =	 "Transcribed for Viola";
+source =	 "?";
+% opus =	 "BWV 1008 no. 5";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "menuetto-urtext.ly";
+
+menuetto_i_viola_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*8;
+	\bar ":|:";
+	\clef violin;
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*3;
+	\clef alto;
+	\skip 2.*11;
+	s2._"Fine"
+	\bar ":|";
+}
+
+menuetto_i_viola_scripts = \melodic{
+	s2.
+	s8^"~"^1_2_4 s8*5
+	s2.*5
+	s4 s-\upbow s-\downbow
+	s2.-\upbow
+	s2.*5
+	s2 s4-\upbow
+	s4-\downbow s2
+	s2.*1
+	s2^0 s4
+	s2.*1
+	s4-\downbow s4-\upbow
+}
+
+menuetto_i_viola_staff = \type Staff <
+	\melodic \transpose c' \$menuetto_i
+	\$menuetto_i_viola_global
+%	\$menuetto_i_viola_scripts
+>
+
+\score{
+	\$menuetto_i_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 110; }
+	\header{ piece = "Menuetto I"; }
+}
+
+menuetto_ii_viola_global = \melodic{
+	\time 3/4;
+	\key D;
+	\clef alto;
+	\skip 2.*8;
+	\bar ":|:";
+	\skip 2.*1;
+	\slurdotted
+	\skip 2.*14;
+	s2._"Menuetto I da Capo"
+	\bar ":|";
+}
+
+menuetto_ii_viola_staff = \type Staff <
+	\melodic \transpose c' \$menuetto_ii
+	\$menuetto_ii_viola_global
+%	\$menuetto_ii_viola_scripts
+>
+
+\score{
+	\$menuetto_ii_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 130; }
+	\header{ piece = "Menuetto II"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,44 +0,0 @@
-\header{
-filename =	 "prelude-alto.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Pr\\'elude";		% duh
-opus =	 "BWV 1008";
-% opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "prelude-urtext.ly";
-
-prelude_alto_global = \melodic{
-	\time 3/4;
-	\key f;
-	\clef alto;
-	\skip 2.*63;
-	\bar "|.";
-}
-
-prelude_alto_scripts = \melodic{
-}
-
-prelude_alto_staff = \type Staff <
-	\melodic \transpose c' \$prelude
-	\$prelude_alto_global
-	\$prelude_alto_scripts
->
-
-\score{
-	\$prelude_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 40; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "prelude-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Pr\\'elude";		% duh
+%piece = "Pr\\'elude";		% duh
 opus =	 "BWV 1008";
 % opus =	 "";
 composer =	 "Johann Sebastian Bach (1685-1750)";
@@ -40,5 +40,6 @@
 	\$prelude_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 40; }
+	\header{ piece = "Pr\\'elude"; }	
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % prelude-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % who is going to make a -violin.ly? 
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet see alto_scripts .
+But merging melodic and scripts doen't work too well yet see viola_scripts .
 %}
 
 % urg, Thread is gone, try Voice
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,45 @@
+\header{
+filename =	 "prelude-viola.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Pr\\'elude";		% duh
+opus =	 "BWV 1008";
+% opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "prelude-urtext.ly";
+
+prelude_viola_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*63;
+	\bar "|.";
+}
+
+prelude_viola_scripts = \melodic{
+}
+
+prelude_viola_staff = \type Staff <
+	\melodic \transpose c' \$prelude
+	\$prelude_viola_global
+	\$prelude_viola_scripts
+>
+
+\score{
+	\$prelude_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+	\header{ piece = "Pr\\'elude"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,46 +0,0 @@
-\header{
-filename =	 "sarabande-alto.ly";
-title =	 "Solo Cello Suites";
-subtitle = "Suite II";
-piece = "Sarabande";
-% opus =	 "BWV 1008";
-opus =	 "";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "sarabande-urtext.ly";
-
-sarabande_alto_global = \melodic{
-	\time 3/4;
-	\key f;
-	\clef alto;
-	\skip 2.*12;
-	\bar ":|:";
-	\skip 2.*16;
-	\bar ":|";
-}
-
-sarabande_alto_scripts = \melodic{
-}
-
-sarabande_alto_staff = \type Staff <
-	\melodic \transpose c' \$sarabande
-	\$sarabande_alto_global
-	\$sarabande_alto_scripts
->
-
-\score{
-	\$sarabande_alto_staff
-	\include "scs-paper.ly";
-	\midi{ \tempo 4 = 40; }
-}
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly	Mon Aug 24 22:25:17 1998
@@ -2,7 +2,7 @@
 filename =	 "sarabande-cello.ly";
 title =	 "Solo Cello Suites";
 subtitle = "Suite II";
-piece = "Sarabande";
+% piece = "Sarabande";
 % opus =	 "BWV 1008";
 opus =	 "";
 composer =	 "Johann Sebastian Bach (1685-1750)";
@@ -42,5 +42,6 @@
 	\$sarabande_cello_staff
 	\include "scs-paper.ly";
 	\midi{ \tempo 4 = 40; }
+	\header{ piece = "Sarabande"; }
 }
 
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly	Mon Aug 24 22:25:17 1998
@@ -1,10 +1,10 @@
 % sarabande-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,47 @@
+\header{
+filename =	 "sarabande-viola.ly";
+title =	 "Solo Cello Suites";
+subtitle = "Suite II";
+% piece = "Sarabande";
+% opus =	 "BWV 1008";
+opus =	 "";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "JCN";
+copyright =	 "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "sarabande-urtext.ly";
+
+sarabande_viola_global = \melodic{
+	\time 3/4;
+	\key f;
+	\clef alto;
+	\skip 2.*12;
+	\bar ":|:";
+	\skip 2.*16;
+	\bar ":|";
+}
+
+sarabande_viola_scripts = \melodic{
+}
+
+sarabande_viola_staff = \type Staff <
+	\melodic \transpose c' \$sarabande
+	\$sarabande_viola_global
+	\$sarabande_viola_scripts
+>
+
+\score{
+	\$sarabande_viola_staff
+	\include "scs-paper.ly";
+	\midi{ \tempo 4 = 40; }
+	\header{ piece = "Sarabande"; }
+}
+
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly	Mon Aug 24 22:18:52 1998
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly	Thu Jan  1 01:00:00 1970
@@ -1,7 +0,0 @@
-\header{
-instrument="Alto";
-}
-
-instrument="alto";
-\include "solo-cello-suite-ii.ly"
-
diff -urN ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly ./mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly
--- ../lilypond-1.0.4/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly	Thu Jan  1 01:00:00 1970
+++ ./mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly	Mon Aug 24 22:25:17 1998
@@ -0,0 +1,7 @@
+\header{
+instrument="Alto";
+}
+
+instrument="viola";
+\include "solo-cello-suite-ii.ly"
+
diff -urN ../lilypond-1.0.4/scripts/GNUmakefile ./scripts/GNUmakefile
--- ../lilypond-1.0.4/scripts/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./scripts/GNUmakefile	Tue Aug 25 10:18:48 1998
@@ -1,12 +1,12 @@
 # bin/Makefile
 
 depth = ..
-SEXECUTABLES=convert-mudela mudela-book ly2dvi
+SEXECUTABLES=convert-mudela mudela-book ly2dvi ly2dvi32
 STEPMAKE_TEMPLATES=script
 
 
 include $(depth)/make/stepmake.make 
 
-# include $(stepdir)/Executable_targets.make
+include $(stepdir)/executable-targets.make
 
 
diff -urN ../lilypond-1.0.4/scripts/ly2dvi.sh ./scripts/ly2dvi.sh
--- ../lilypond-1.0.4/scripts/ly2dvi.sh	Mon Aug 24 22:18:52 1998
+++ ./scripts/ly2dvi.sh	Mon Aug 24 22:25:17 1998
@@ -10,7 +10,7 @@
 #  Original LaTeX file made by Mats Bengtsson, 17/8 1997
 #
 
-VERSION="0.12"
+VERSION="0.12.jcn1"
 NAME=ly2dvi.sh
 IDENTIFICATION="$NAME $VERSION" 
 NOW=`date`
@@ -21,9 +21,11 @@
 
 # NEWS
 
+# 0.12.jcn1
+#  - mudelaDefs really fixed (sorry, PC)
+
 # 0.12
 #  - -S/--sourcedir switch
-#
 
 #
 #0.11.jcn3
@@ -636,19 +638,27 @@
 #
 mudelaDefs(){
 # Include \def\mudela-definitions
+# The aim here is to pick up the definition for the 
+# current file, then any other file.
 #
+mudelatmp=$TMP/mudelaDefs$$
+# Use `cat' to prevent filenames being prepended
+# 
+cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp
 for L in $MU_DEF
 do
-  for F in "$File" "$OF"
-  do
-    LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"`
-    [ "$LL" ] && {
-	  Echo "$1\\"$L'{'"$LL"'}%'                                >> $LatF
-	  break
-    }
-  done
+    # This converts \def\mudelatitle{fred}
+    # to \mudelatitle{fred} or to
+    # \def\mudelatitle{fred}
+    # and stops after the first one found.
+    sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{
+	s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p
+	q
+    }'  $mudelatmp  >> $LatF
 done
+rm -f $mudelatmp
 }
+#
 #
 startFile(){
 #
diff -urN ../lilypond-1.0.4/stepmake/NEWS ./stepmake/NEWS
--- ../lilypond-1.0.4/stepmake/NEWS	Mon Aug 24 22:18:52 1998
+++ ./stepmake/NEWS	Tue Aug 25 10:39:32 1998
@@ -1,3 +1,6 @@
+pl 46
+	- bf: versioning typo: topleveL_MAJOR
+	- bf: reincluded optional STATE-VECTOR
 pl 45
 	- Foo_rules.make -> foo-rules.make
 
diff -urN ../lilypond-1.0.4/stepmake/VERSION ./stepmake/VERSION
--- ../lilypond-1.0.4/stepmake/VERSION	Mon Aug 24 22:18:52 1998
+++ ./stepmake/VERSION	Mon Aug 24 22:38:32 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=42
+PATCH_LEVEL=46
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.4/stepmake/aclocal.m4 ./stepmake/aclocal.m4
--- ../lilypond-1.0.4/stepmake/aclocal.m4	Mon Aug 24 22:18:52 1998
+++ ./stepmake/aclocal.m4	Tue Aug 25 15:33:39 1998
@@ -129,9 +129,9 @@
 AC_DEFUN(AC_STEPMAKE_END, [
     AC_OUTPUT($CONFIGFILE.make:config.make.in)
 
-    rm -f Makefile
-    cp make/toplevel.make.in ./Makefile
-    chmod 444 Makefile
+    rm -f GNUmakefile
+    cp make/toplevel.make.in ./GNUmakefile
+    chmod 444 GNUmakefile
 ])
 
 AC_DEFUN(AC_STEPMAKE_GXX, [
@@ -188,6 +188,12 @@
     # No versioning on directory names of sub-packages 
     stepmake=stepmake
     AC_SUBST(stepmake)
+
+    STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
+    if test "x$STATE_VECTOR" != "x"; then
+    	STATE_VECTOR="\$(depth)/$STATE_VECTOR"
+    fi
+    AC_SUBST(STATE_VECTOR)
 
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
diff -urN ../lilypond-1.0.4/stepmake/config.make.in ./stepmake/config.make.in
--- ../lilypond-1.0.4/stepmake/config.make.in	Thu Aug 13 22:25:33 1998
+++ ./stepmake/config.make.in	Tue Aug 25 10:43:28 1998
@@ -15,6 +15,7 @@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 stepmake = @stepmake@
+state-vector = @STATE_VECTOR@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO = @MAKEINFO@
 ICFLAGS = @ICFLAGS@
diff -urN ../lilypond-1.0.4/stepmake/make/GNUmakefile ./stepmake/make/GNUmakefile
--- ../lilypond-1.0.4/stepmake/make/GNUmakefile	Mon Aug 24 22:18:52 1998
+++ ./stepmake/make/GNUmakefile	Tue Aug 25 22:55:58 1998
@@ -4,8 +4,10 @@
 STEPMAKE_TEMPLATES=makedir
 BLURBS=BLURB # COPERTINA FLAPTEKST
 
+ifneq ($(strip $(state-vector)),)
+EXTRA_DIST_FILES = STATE-VECTOR
+endif
 
 include $(depth)/make/stepmake.make 
-
 
 
diff -urN ../lilypond-1.0.4/stepmake/make/toplevel-version.make ./stepmake/make/toplevel-version.make
--- ../lilypond-1.0.4/stepmake/make/toplevel-version.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/make/toplevel-version.make	Tue Aug 25 10:38:57 1998
@@ -1,6 +1,6 @@
 
 include $(depth)/VERSION
-topleveL_MAJOR_VERSION:=$(MAJOR_VERSION)
+TOPLEVEL_MAJOR_VERSION:=$(MAJOR_VERSION)
 TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION)
 TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL)
 # use to send patches, always empty for released version:
diff -urN ../lilypond-1.0.4/stepmake/stepmake/documentation-targets.make ./stepmake/stepmake/documentation-targets.make
--- ../lilypond-1.0.4/stepmake/stepmake/documentation-targets.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/documentation-targets.make	Tue Aug 25 23:11:52 1998
@@ -29,7 +29,7 @@
 
 INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-outfiles.sub.make $@
 
-$(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES)
+$(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES)
 	$(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
 
 localinstall: # $(INFO_FILES)
diff -urN ../lilypond-1.0.4/stepmake/stepmake/documentation-vars.make ./stepmake/stepmake/documentation-vars.make
--- ../lilypond-1.0.4/stepmake/stepmake/documentation-vars.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/documentation-vars.make	Tue Aug 25 11:02:35 1998
@@ -17,7 +17,6 @@
 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)))
-# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
 OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES)))
 OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES)))
 
diff -urN ../lilypond-1.0.4/stepmake/stepmake/documentation.shared.make ./stepmake/stepmake/documentation.shared.make
--- ../lilypond-1.0.4/stepmake/stepmake/documentation.shared.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/documentation.shared.make	Thu Jan  1 01:00:00 1970
@@ -1,9 +0,0 @@
-# stepmake/documentation.shared.make
-# urg: stuff shared between yodl/lily/stepmake
-
-# could/should do this for bin/Makefile make/Makefile too
-
-### below here is shared between lily/yodl/Documentation and topdocs...
-
-include $(stepdir)/documentation_vars.make
-include $(stepdir)/documentation_rules.make
diff -urN ../lilypond-1.0.4/stepmake/stepmake/generic-targets.make ./stepmake/stepmake/generic-targets.make
--- ../lilypond-1.0.4/stepmake/stepmake/generic-targets.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/generic-targets.make	Tue Aug 25 10:30:59 1998
@@ -84,8 +84,12 @@
 	(cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
 
 
-
-
+update-state-vector:
+ifneq ($(strip $(state-vector)),)
+	if [ "`tail -1 $(state-vector)`" != "$(TOPLEVEL_VERSION)" ]; then\
+	  echo $(TOPLEVEL_VERSION) >> $(state-vector); \
+	fi
+endif
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
 	mkdir -p $(distdir)/$(localdir)
diff -urN ../lilypond-1.0.4/stepmake/stepmake/install-outfiles.sub.make ./stepmake/stepmake/install-outfiles.sub.make
--- ../lilypond-1.0.4/stepmake/stepmake/install-outfiles.sub.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/install-outfiles.sub.make	Tue Aug 25 10:18:48 1998
@@ -1,5 +1,5 @@
 # Initial_outfiles.sub.make
 
 include $(depth)/make/stepmake.make
-include $(stepdir)/install_outfiles.make
+include $(stepdir)/install-outfiles.make
 
diff -urN ../lilypond-1.0.4/stepmake/stepmake/texinfo-rules.make ./stepmake/stepmake/texinfo-rules.make
--- ../lilypond-1.0.4/stepmake/stepmake/texinfo-rules.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/texinfo-rules.make	Tue Aug 25 17:01:53 1998
@@ -15,9 +15,6 @@
 $(outdir)/%.1: %.texinfo
 	$(texi2man)
 
-# $(outdir)/%.info: %.texinfo
-# 	$(MAKEINFO) -o $@ $<
-
 $(outdir)/%.info: $(outdir)/%.texinfo
 	$(MAKEINFO) -o $@ $<
 
@@ -32,9 +29,6 @@
 $(outdir)/%.html: $(outdir)/%.texinfo
 	$(texi2html)
 	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
-
-$(outdir)/%.texinfo: %.texinfo
-	cp $< $@
 
 $(outdir)/%.1: $(outdir)/%.texinfo
 	-$(texi2man)
diff -urN ../lilypond-1.0.4/stepmake/stepmake/toplevel-targets.make ./stepmake/stepmake/toplevel-targets.make
--- ../lilypond-1.0.4/stepmake/stepmake/toplevel-targets.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/toplevel-targets.make	Tue Aug 25 10:29:40 1998
@@ -29,7 +29,8 @@
 WWW-clean:
 	$(MAKE) CONFIGSUFFIX='www' clean
 
-dist:	
+dist:
+	$(MAKE) update-state-vector
 	rm -rf $(distdir)
 	$(MAKE) local-dist $(distdir)
 	chmod -R a+r $(distdir)
diff -urN ../lilypond-1.0.4/stepmake/stepmake/yolily-topdoc-vars.make ./stepmake/stepmake/yolily-topdoc-vars.make
--- ../lilypond-1.0.4/stepmake/stepmake/yolily-topdoc-vars.make	Mon Aug 24 22:18:52 1998
+++ ./stepmake/stepmake/yolily-topdoc-vars.make	Tue Aug 25 17:09:49 1998
@@ -1,6 +1,4 @@
 # Yolily_topdoc_vars.make
 
-# INFO_FILES = $(outdir)/$(package).info
-
 TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
 
