release: 1.1.55

107 files changed, 1273 insertions, 1983 deletions

diff --git a/Documentation/BLURB.in b/Documentation/BLURB.in
index a861e52e33..0833dd214e 100644
--- a/Documentation/BLURB.in
+++ b/Documentation/BLURB.in
@@ -1,6 +1,4 @@
-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, named chords, transposing, formatting scores, 
-part extraction.  It includes a nice font of musical symbols.
+
+LilyPond is the GNU Project music typesetter. It transforms a musical
+description file into beautiful sheet music.
+
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index c7dbe8373f..395991e53a 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -3,7 +3,7 @@
 depth = ..
 
 NAME = documentation
-SUBDIRS=man tex pictures topdocs ntweb
+SUBDIRS=man tex metadoc bibliography pictures topdocs ntweb
 STEPMAKE_TEMPLATES=documentation 
 README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1 AIMS
 INFO_FILES = $(wildcard $(outdir)/$(package).info*)
diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
new file mode 100644
index 0000000000..6e8a382f62
--- /dev/null
+++ b/Documentation/bibliography/GNUmakefile
@@ -0,0 +1,75 @@
+# Documentation/tex/Makefile
+
+depth=../..
+
+DATA_FILES = $(wildcard *.data)
+datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
+TEX_FILES = $(wildcard *.tex)
+DOC_FILES = $(wildcard *.doc)
+DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
+OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+
+# just include me
+YO_URG_FILES = $(wildcard *.yo-urg)
+
+OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
+OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
+EL_FILES = $(wildcard *.el)
+BIB_FILES= $(wildcard *.bib)
+EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) 
+HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
+PS_FILES = $(DVI_FILES:.dvi=.ps)
+
+STEPMAKE_TEMPLATES=tex documentation
+LOCALSTEPMAKE_TEMPLATES=lilypond mudela
+
+export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)
+include $(depth)/make/stepmake.make 
+
+
+
+
+
+
+dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+
+ps: $(PS_FILES)
+
+# urg
+default:
+
+GENHTMLS = engraving colorado  computer-notation
+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) $@
+
+$(outdir)/%.tex: %.data $(depth)/VERSION
+	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -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' \
+	  $(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 $< $@
+
+# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
+$(outdir)/%.html: %.bib
+	-bib2html $< $@
+
+# Yeah right: 
+# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
+
+#out/%: $(outdir)/%
+#	cp -f $< $@
+
+locamlclean:
+	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
diff --git a/Documentation/tex/colorado.bib b/Documentation/bibliography/colorado.bib
index 6d7cf51200..6d7cf51200 100644
--- a/Documentation/tex/colorado.bib
+++ b/Documentation/bibliography/colorado.bib
diff --git a/Documentation/tex/computer-notation.bib b/Documentation/bibliography/computer-notation.bib
index dc91216269..faf176c99c 100644
--- a/Documentation/tex/computer-notation.bib
+++ b/Documentation/bibliography/computer-notation.bib
@@ -511,7 +511,7 @@ surprising that LilyPond is more mature.
   note = {Webpages about engraving (designed with finale users in mind) (sic) HWN},
   institution = {The University of Colorado},
   title ={The University of Colorado Music Engraving page.},
-  HTML={http://obenamots.cc.colorado.edu/Musicpress/engraving.html},
+  HTML={http://www.cc.colorado.edu/Dept/MU/Musicpress/},
   year={1996}
 }
 
diff --git a/Documentation/tex/engraving.bib b/Documentation/bibliography/engraving.bib
index bfa65238d3..bfa65238d3 100644
--- a/Documentation/tex/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
diff --git a/Documentation/index.yo b/Documentation/index.yo
index 6f11bcad7c..ca106c5d6e 100644
--- a/Documentation/index.yo
+++ b/Documentation/index.yo
@@ -41,8 +41,10 @@ nsubsect(Documentation: manuals)
 
 itemize(
 it()url(Mudela)(../tex/DOEXPAND(outdir)/tutorial.html)
-it()url(TeX documents about LilyPond)(../tex/DOEXPAND(outdir)/index.html)
+it()url(User documentation)(../tex/DOEXPAND(outdir)/index.html)
+it()url(Hacker documentation)(../metadoc/DOEXPAND(outdir)/index.html)
 it()url(Manual pages)(../man/DOEXPAND(outdir)/index.html)
+it()url(Bibliography)(../bibliography/DOEXPAND(outdir)/vocabulary.html)
 it()url(Musical vocabulary)(../tex/DOEXPAND(outdir)/vocabulary.html)
 )
 
diff --git a/Documentation/man/mi2mu.yo b/Documentation/man/midi2ly.yo
index 7a0abb6fee..11ee01c806 100644
--- a/Documentation/man/mi2mu.yo
+++ b/Documentation/man/midi2ly.yo
@@ -6,20 +6,20 @@ COMMENT(
 manpage(LilyPond)
        (1)
 	(1998)
-       (Mi2mu)
+       (midi2ly)
        (The LilyPond package)
 
-metalC(Automatically generated by yodl(1) from mi2mu.yo.)
+metalC(Automatically generated by yodl(1) from midi2ly.yo.)
 
-manpagename(Mi2mu)(convert MIDI to bf(mudela)(5))
+manpagename(midi2ly)(convert MIDI to bf(mudela)(5))
 
 manpagedescription()
-Mi2mu translates a MIDI input file to Mudela (GNU LilyPond source
-format).  Mi2mu is part of the GNU LilyPond music typesetting package.
+midi2ly translates a MIDI input file to Mudela (GNU LilyPond source
+format).  midi2ly is part of the GNU LilyPond music typesetting package.
 
 manpagessynopsis()
 
-	mi2mu [options] midi-file
+	midi2ly [options] midi-file
 
 manpageoptions()
 
@@ -48,17 +48,17 @@ dit(-s, --smallest=N,)
 dit(-v, --verbose,)
     Be verbose.
 dit(-w, --warranty,)
-    Show the warranty with which mi2mu comes. (It comes with bf(NO WARRANTY)!)
+    Show the warranty with which midi2ly comes. (It comes with bf(NO WARRANTY)!)
 dit(-x, --no-double-dots,)
     Assume no double dotted notes.
 )
 
 manpagesection(DISCLAIMER)
 
-Mi2mu is copyright 1996, 1997 by its authors. Mi2mu is distributed 
+midi2ly is copyright 1996, 1997 by its authors. midi2ly is distributed 
 as part of GNU LilyPond, under the terms of the GNU General Public
-License.  Mi2mu is provided without any warranty what so ever.
-Mi2mu may be freely distributed.  For further information consult
+License.  midi2ly is provided without any warranty what so ever.
+midi2ly may be freely distributed.  For further information consult
 the GNU General Public License, from the file file(COPYING).
 
 manpageseealso()
diff --git a/Documentation/man/out/mi2mu.1 b/Documentation/man/out/midi2ly.1
index 12c08fd13f..e875fd6ba8 100644
--- a/Documentation/man/out/mi2mu.1
+++ b/Documentation/man/out/midi2ly.1
@@ -1,16 +1,16 @@
-.TH "LilyPond" "1" "1998" "Mi2mu" "The LilyPond package" 
+.TH "LilyPond" "1" "1998" "midi2ly" "The LilyPond package" 
 .PP 
 .PP 
 .SH "NAME" 
-Mi2mu \- convert MIDI to \fBmudela\fP(5)
+midi2ly \- convert MIDI to \fBmudela\fP(5)
 .PP 
 .SH "DESCRIPTION" 
-Mi2mu translates a MIDI input file to Mudela (GNU LilyPond source
-format)\&.  Mi2mu is part of the GNU LilyPond music typesetting package\&.
+midi2ly translates a MIDI input file to Mudela (GNU LilyPond source
+format)\&.  midi2ly is part of the GNU LilyPond music typesetting package\&.
 .PP 
 manpagessynopsis()
 .PP 
-mi2mu [options] midi-file
+midi2ly [options] midi-file
 .PP 
 .SH "OPTIONS" 
 .PP 
@@ -38,16 +38,16 @@ Assume no shorter (reciprocal) durations than N\&.
 .IP "-v, --verbose," 
 Be verbose\&.
 .IP "-w, --warranty," 
-Show the warranty with which mi2mu comes\&. (It comes with \fBNO WARRANTY\fP!)
+Show the warranty with which midi2ly comes\&. (It comes with \fBNO WARRANTY\fP!)
 .IP "-x, --no-double-dots," 
 Assume no double dotted notes\&.
 .PP 
 .SH "DISCLAIMER" 
 .PP 
-Mi2mu is copyright 1996, 1997 by its authors\&. Mi2mu is distributed 
+midi2ly is copyright 1996, 1997 by its authors\&. midi2ly is distributed 
 as part of GNU LilyPond, under the terms of the GNU General Public
-License\&.  Mi2mu is provided without any warranty what so ever\&.
-Mi2mu may be freely distributed\&.  For further information consult
+License\&.  midi2ly is provided without any warranty what so ever\&.
+midi2ly may be freely distributed\&.  For further information consult
 the GNU General Public License, from the file \fBCOPYING\fP\&.
 .PP 
 .SH "SEE ALSO" 
diff --git a/Documentation/metadoc/GNUmakefile b/Documentation/metadoc/GNUmakefile
new file mode 100644
index 0000000000..6e8a382f62
--- /dev/null
+++ b/Documentation/metadoc/GNUmakefile
@@ -0,0 +1,75 @@
+# Documentation/tex/Makefile
+
+depth=../..
+
+DATA_FILES = $(wildcard *.data)
+datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
+TEX_FILES = $(wildcard *.tex)
+DOC_FILES = $(wildcard *.doc)
+DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
+OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+
+# just include me
+YO_URG_FILES = $(wildcard *.yo-urg)
+
+OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
+OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
+EL_FILES = $(wildcard *.el)
+BIB_FILES= $(wildcard *.bib)
+EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) 
+HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
+PS_FILES = $(DVI_FILES:.dvi=.ps)
+
+STEPMAKE_TEMPLATES=tex documentation
+LOCALSTEPMAKE_TEMPLATES=lilypond mudela
+
+export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)
+include $(depth)/make/stepmake.make 
+
+
+
+
+
+
+dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+
+ps: $(PS_FILES)
+
+# urg
+default:
+
+GENHTMLS = engraving colorado  computer-notation
+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) $@
+
+$(outdir)/%.tex: %.data $(depth)/VERSION
+	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -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' \
+	  $(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 $< $@
+
+# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
+$(outdir)/%.html: %.bib
+	-bib2html $< $@
+
+# Yeah right: 
+# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
+
+#out/%: $(outdir)/%
+#	cp -f $< $@
+
+locamlclean:
+	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
diff --git a/Documentation/tex/fonts.doc b/Documentation/metadoc/fonts.doc
index 287dde49b1..287dde49b1 100644
--- a/Documentation/tex/fonts.doc
+++ b/Documentation/metadoc/fonts.doc
diff --git a/Documentation/tex/lilypond-overview.doc b/Documentation/metadoc/lilypond-overview.doc
index 4aa1e759bd..4aa1e759bd 100644
--- a/Documentation/tex/lilypond-overview.doc
+++ b/Documentation/metadoc/lilypond-overview.doc
diff --git a/Documentation/tex/musicnotes.sty b/Documentation/metadoc/musicnotes.sty
index bc4a69f543..bc4a69f543 100644
--- a/Documentation/tex/musicnotes.sty
+++ b/Documentation/metadoc/musicnotes.sty
diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo
index 855b4aef8a..1c7f252385 100644
--- a/Documentation/ntweb/index.yo
+++ b/Documentation/ntweb/index.yo
@@ -18,12 +18,67 @@ clearpage()
 
 subsect(NEWS) label(news)
 
-I have made my first attempt at distributing lilypond as a self
-extracting executable for Windows NT 4.0 and Windows 95.  The
-executable will extract the distribution in the directory specified by
-the user and create em(lilypond-@TOPLEVEL_VERSION@\lily.bat).  This
-batch file initializes the LilyPond environment and fires up a Command
-Prompt.  From this Command Prompt you may run:
+The FAT16, FAT32, and NTFS file system problems have been corrected.
+I have tested various installations that are known to be operational.
+The following configurations that have been tested. 
+
+description(
+ dit(Windows NT)
+ description(
+  dit(Installed on NTFS)
+  itemize(
+    it()Runs from NTFS partion
+    it()Runs from FAT16 partion
+  )
+  dit(Installed on FAT16)
+  itemize(
+    it()Runs from NTFS partion
+    it()Runs from FAT16 partion
+  )
+ )
+)
+
+description(
+ dit(Windows 95)
+ description(
+  dit(Installed on FAT16)
+  itemize(
+    it()Runs from FAT16 partion
+    it()Runs from FAT32 partion
+  )
+  dit(Installed on FAT32)
+  itemize(
+    it()Runs from FAT16 partion
+    it()Runs from FAT32 partion
+  )
+ )
+)
+  
+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
@@ -33,6 +88,13 @@ itemize(
     it()mi2mu
 )
 
+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).
+
 I have also converted the Manual Pages for the above tools to HTML for
 easy browsing.  This release has been tested on Windows NT 4.0sp3 and
 Windows 95 and found to be operational.  If you have any troubles and
@@ -77,7 +139,10 @@ clearpage()
 subsect(Download) label(download)
 
 itemize(
-    it()url(lilypond-@TOPLEVEL_VERSION@)(lily1123jbr1.exe)
+    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)
@@ -127,11 +192,7 @@ 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()Execute lilypond-@TOPLEVEL_VERSION@\lily.bat nl()
-NOTE: If you get an em(out of environment memory error), simply increase
-the environment memory by selecting
-em(lilypond-@TOPLEVEL_VERSION@\lily.bat) Properties/Memory and increase
-the available environment memory to 1024.
+  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()
diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index 496c0b7571..ce19dc689c 100644
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -7,23 +7,20 @@ datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
 TEX_FILES = $(wildcard *.tex)
 DOC_FILES = $(wildcard *.doc)
 DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
-OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
 
 # just include me
 YO_URG_FILES = $(wildcard *.yo-urg)
 
 OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
 OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
-EL_FILES = $(wildcard *.el)
-BIB_FILES= $(wildcard *.bib)
-EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) testje.fly
+
+EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) testje.fly
 HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
 PS_FILES = $(DVI_FILES:.dvi=.ps)
 
 STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
 
-export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)
 include $(depth)/make/stepmake.make 
 
 
@@ -31,7 +28,7 @@ include $(depth)/make/stepmake.make
 
 
 
-dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+dvi: $(DVI_FILES)
 
 ps: $(PS_FILES)
 
@@ -55,7 +52,7 @@ $(outdir)/glossary.dvi: $(outdir)/glossary-table.tex
 $(outdir)/glossary.html: $(outdir)/glossary-table.html
 
 
-local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
+local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz)  $(datafiles)
 	$(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \
 	  $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\
 	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
@@ -64,10 +61,6 @@ local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz)
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
-# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
-$(outdir)/%.html: %.bib
-	-bib2html $< $@
-
 # Yeah right: 
 # make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
 
diff --git a/Documentation/tex/feta20.sty b/Documentation/tex/feta20.sty
deleted file mode 100644
index 0dbfcf90cc..0000000000
--- a/Documentation/tex/feta20.sty
+++ /dev/null
@@ -1,146 +0,0 @@
-% Creator: mf-to-table.py version 0.7
-% Automatically generated on
-% Do not edit
-% input from out/feta20.log
-% name
-% rests
-\fetdef\wholerest{0}
-\fetdef\halfrest{1}
-\fetdef\outsidewholerest{2}
-\fetdef\outsidehalfrest{3}
-\fetdef\breverest{4}
-\fetdef\longarest{5}
-\fetdef\multirest{6}
-\fetdef\quartrest{7}
-\fetdef\eighthrest{8}
-\fetdef\sixteenthrest{9}
-\fetdef\thirtysecondrest{10}
-\fetdef\sixtyfourthrest{11}
-\fetdef\hundredtwentyeighthrest{12}
-
-% accidentals
-\fetdef\sharp{13}
-\fetdef\natural{14}
-\fetdef\flat{15}
-\fetdef\flatflat{16}
-\fetdef\sharpsharp{17}
-\fetdef\rightparen{18}
-\fetdef\leftparen{19}
-
-% dots
-\fetdef\dot{20}
-\fetdef\repeatcolon{21}
-
-% balls
-\fetdef\brevisball{22}
-\fetdef\brevisledger{23}
-\fetdef\longaball{24}
-\fetdef\longaledger{25}
-\fetdef\wholeball{26}
-\fetdef\wholeledger{27}
-\fetdef\halfball{28}
-\fetdef\halfledger{29}
-\fetdef\quartball{30}
-\fetdef\quartledger{31}
-
-% scripts
-\fetdef\ufermata{32}
-\fetdef\dfermata{33}
-\fetdef\thumb{34}
-\fetdef\sforzatoaccent{35}
-\fetdef\staccato{36}
-\fetdef\ustaccatissimo{37}
-\fetdef\dstaccatissimo{38}
-\fetdef\tenuto{39}
-\fetdef\umarcato{40}
-\fetdef\dmarcato{41}
-\fetdef\ouvert{42}
-\fetdef\plusstop{43}
-\fetdef\upbow{44}
-\fetdef\downbow{45}
-\fetdef\reverseturn{46}
-\fetdef\turn{47}
-\fetdef\trill{48}
-\fetdef\upedalheel{49}
-\fetdef\dpedalheel{50}
-\fetdef\upedaltoe{51}
-\fetdef\dpedaltoe{52}
-\fetdef\flageolet{53}
-\fetdef\trilelement{54}
-\fetdef\prall{55}
-\fetdef\mordent{56}
-\fetdef\prallprall{57}
-\fetdef\prallmordent{58}
-\fetdef\upprall{59}
-\fetdef\downprall{60}
-\fetdef\accDiscant{61}
-\fetdef\accDiscantF{62}
-\fetdef\accDiscantEh{63}
-\fetdef\accDiscantE{64}
-\fetdef\accDiscantFE{65}
-\fetdef\accDiscantFEh{66}
-\fetdef\accDiscantEE{67}
-\fetdef\accDiscantFEE{68}
-\fetdef\accDiscantEEE{69}
-\fetdef\accDiscantFEEE{70}
-\fetdef\accDiscantS{71}
-\fetdef\accDiscantFS{72}
-\fetdef\accDiscantES{73}
-\fetdef\accDiscantEhS{74}
-\fetdef\accDiscantFES{75}
-\fetdef\accDiscantFEhS{76}
-\fetdef\accDiscantEES{77}
-\fetdef\accDiscantFEES{78}
-\fetdef\accDiscantEEES{79}
-\fetdef\accDiscantFEEES{80}
-\fetdef\accDiscantSS{81}
-\fetdef\accDiscantESS{82}
-\fetdef\accDiscantEESS{83}
-\fetdef\accDiscantEEESS{84}
-\fetdef\accFreebass{85}
-\fetdef\accFreebassF{86}
-\fetdef\accFreebassE{87}
-\fetdef\accFreebassFE{88}
-\fetdef\accStdbass{89}
-\fetdef\accStdbassM{90}
-\fetdef\accStdbassBp{91}
-\fetdef\accStdbassT{92}
-\fetdef\accStdbassTp{93}
-\fetdef\accBayanbass{94}
-\fetdef\accBayanbassT{95}
-\fetdef\accBayanbassE{96}
-\fetdef\accBayanbassTE{97}
-\fetdef\accBayanbassEE{98}
-\fetdef\accBayanbassTEE{99}
-\fetdef\accSB{100}
-\fetdef\accBB{101}
-\fetdef\accOldEE{102}
-\fetdef\accOldEES{103}
-
-% flags
-\fetdef\eighthflag{104}
-\fetdef\sixteenthflag{105}
-\fetdef\thirtysecondflag{106}
-\fetdef\sixtyfourthflag{107}
-\fetdef\deighthflag{108}
-\fetdef\dsixteenthflag{109}
-\fetdef\dthirtysecondflag{110}
-\fetdef\dsixtyfourthflag{111}
-
-% clefs
-\fetdef\altoclef{112}
-\fetdef\caltoclef{113}
-\fetdef\bassclef{114}
-\fetdef\cbassclef{115}
-\fetdef\trebleclef{116}
-\fetdef\ctrebleclef{117}
-
-% timesig
-\fetdef\fourfourmeter{118}
-\fetdef\allabreve{119}
-\fetdef\oldfourfourmeter{120}
-\fetdef\oldallabreve{121}
-\fetdef\oldthreetwometer{122}
-\fetdef\oldsixfourmeter{123}
-\fetdef\oldninefourmeter{124}
-
diff --git a/Documentation/tex/glossary-forms.el b/Documentation/tex/glossary-forms.el
deleted file mode 100644
index 3ab4a48de2..0000000000
--- a/Documentation/tex/glossary-forms.el
+++ /dev/null
@@ -1,23 +0,0 @@
-; Music vocabularies are Copyright (C) 1993 Free Software Foundation, Inc.
-; Francois Pinard <pinard@iro.umontreal.ca>,
-; Neil Jerram <nj104@cus.cam.ac.uk>.
-; Forms by Han-Wen Nienhuys
-
-(setq forms-file "glossary-table.data")
-(setq forms-number-of-fields 7)
-(setq forms-read-only nil)                 ; to make sure
-(setq forms-field-sep "@")
-(setq forms-multi-line "\C-m")
-
-(setq forms-format-list
-      (list
-       "*** Musical vocabulary ***\n"
-       "\nItaliano:          " 6
-       "\nFrancais:          " 2
-       "\nUS English:        " 1
-       "\nDeutsch:           " 3
-       "\nBritish English:   " 4
-       "\nNederlands:        " 5
-       "\n\nExplanation\n\n" 7
-
-	))
diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib
deleted file mode 100644
index 8ff5024157..0000000000
--- a/Documentation/tex/other-packages.bib
+++ /dev/null
@@ -1,426 +0,0 @@
-%
-% TITLE=Software for printing music
-% AUTHOR=HWN
-%
-  
-@string(HWN = {Han-Wen Nienhuys})
-@string(JCN = {Jan  Nieuwenhuizen})
-  
-@misc{Rosegarden,
-  title = {Rosegarden},
-  HTML={http://www.bath.ac.uk/\~masjpf/rose.html},
-  author={Chris Cannam},
-  note={A Notation editor/Sequencer for X. Also outputs musictex.},
-}
-
-
-@misc{Capella,
-html={http://www.whc.de/contents.htm},
-note={score editor for windows}
-}
-
-@misc{ConcertWare,
-html={http://www.software.jumpmusic.com/HTML/Products/cwFAQ03.html}
-}
-@Misc{moods,
-  key =		 {moods},
-  title =	 {MOODS, Music Object Oriented Distributed System.},
-  html ={http://hpcn.dsi.unifi.it/~tinymoods/},
-
-note = { "With MOODS activity, the partners intend to exploit a strongly
-innovative idea: automating and managing the large information used by
-orchestras during rehearsals and public performance of concerts (e.g.,
-symphonic music), as well as for operas or ballets. "   
-} 
-
-}
-
-@Misc{mosaic,
-  title = {Mosaic},
-  note = {Macintosh DTP-notation program},
-  publisher={Mark of the Unicorn},
-  html={http://www.markoftheunicorn.com/english/software/mosaic/mosaic.html}
-}
-
-@Misc{graph_music_press,
-  title =	 {Graphire Music Press},
-  
-  publisher={Graphire Corporation} ,
-  html={http://www.graphire.com/},
-}
-
-
-
-@Misc{Allin,
-  author =	 {Thomas Allin},
-  title =	 {ALL IN theScore},
-  year =	 1998,
-  note =	 {beta version of a w32 score editor},
-  html={http://www.musiker.nu/thescore/},
-}
-
-@Manual{manus_writer,
-  title = {Manuscript Writer},
-  html= {http://ban.joh.cam.ac.uk/~ssb22/mwrhome/},
-  note = {Notation editor with braille support.},
-  author={Silas S. Brown},
-}
-
-@Misc{igor,
-  title = {Igor},
-  author = {Technoligor AB},
-  note = {Commercial music notation with bigwig supporters.},
-  html={http://www.igortech.pi.se/},
-}
-
-
-@Misc{songw,
-html={http://www.ars-nova.com},
-title={Songworks},
-publisher={Ars Nova},
-address={Box 637,Kirkland, Washington 98083},
-}
-
-@Manual{byrd:_night,
-html=                {http://www.musicwareinc.com/},
-  title = 	 {Nightingale},
-  author =	 {Donald Byrd},
-}
-
-@Misc{musys,
-  note = 	 {proprietary w32 package in dutch},
-  html ={http://home.wxs.nl/\~musys},
-}
-
-@Misc{bladmuziek,
-  title = 	 {Bladmuziek},
-  note = 	 {proprietary W32 package in dutch},
-  html={http://www.barsukoff.demon.nl},
-}
-
-@misc{CommonNotation,
-  title = {Common Notation},
-  HTML={http://www-ccrma.stanford.edu/CCRMA/Software/cmn/cmn.html},
-  note={A versatile lisp package. Part of the Common Music system. Input is in
-  Lisp.},
-  author={Bill Schottstaedt},
-}
-
-@misc{Vivace,
-  title = {Vivace},
-  author={Garrick Meeker},
-  HTML={http://www.calband.berkeley.edu/\~gmeeker/vivace},
-  note={A amateurish notation program for TclTk and X.},
-}
-  
-@misc{MPP,
-  title={mpp},
-  author=JCN # " and " # HWN,
-  note={A preprocessor to MusixTeX.
-  It is outdated by its successor,
-  LilyPond.  MPP is still available via the CTAN archive.},
-}
-  
-@misc{LilyPond,
-  title = {LilyPond},
-  HTML={http://www.cs.ruu.nl/people/hanwen/lilypond/index.html},
-  author=HWN # " and " # JCN,
-  note={The GNU Project music typesetter.  Designed as a batch program,
-  outputs to plain \TeX.
-  Added for completeness. You are currently reading her documentation.},
-}
-  
-@misc{Music,
-  title = {Music},
-  HTML={http://www.cs.nott.ac.uk/Department/Staff/ef/printing.html},
-  note={A TROFF preprocessor},
-  author={Eric Foxley},
-}
-  
-@misc{PMX,
-  title = {PMX},
-  HTML={http://www.gmd.de/Misc/Music/},
-  author={Don Simons},
-  note={A Preprocessor for MusiXTeX.  Developed for DOS, written in FORTRAN.
-  UNIX/C translation available.},
-}
-  
-@misc{M-Tx,
-  title = {M-Tx},
-  HTML={http://www.gmd.de/Misc/Music/},
-  author={Dirk Laurie},
-  note={A Predecessor of PMX.},
-}
-  
-@misc{Musictex,
-  title = {Musictex},
-  HTML={http://www.gmd.de/Misc/Music/},
-  author={ Daniel Taupin},
-  note={MusicTeX is a macro package for TeX to typeset polyphonic or
-  instrumental music.  It was originally written by Daniel Taupin.  
-  It includes a full-featured (but slightly unsightly) set of fonts.},
-}
-  
-@misc{musixtex1,
-  title = {MusiXTeX},
-  HTML={http://www.gmd.de/Misc/Music/},
-  author={Ross Mitchell and Andreas Egler},
-  note={A rewrite of MusicTeX.  After licensing quarrels, MusiXTeX has 
-  been split into two (both still non-GNU GPL licensed) branches.},
-}
-
-
-
-@Misc{opus,
-  title =	 {opus},
-html={http://www.sincrosoft.com}
-}
-
-@misc{musixtex2,
-  title = {MusiXTeX},
-  HTML={http://www.gmd.de/Misc/Music/},
-  author={Daniel Taupin},
-  note={Daniel Taupin now maintains the branch that still carries 
-  the name MusiXTeX.},
-}
-  
-@misc{OpusTeX,
-  title = {OpusTeX},
-  author={Andreas Egler},
-  HTML={http://www.inf.ethz.ch/personal/acherman/misc.html},
-  note={Andreas Egler's branch of MusiXTeX is now called OpusTeX.},
-}
-
-@misc{ABC2MTeX,
-  title = {ABC2MTeX},
-  HTML={http://www.gre.ac.uk/\~c.walshaw/abc},
-  author={Chris Walshaw},
-  note={A preprocessor to MusixTeX for transcribing folk and
-  traditional music.},
-}
-  
-  
-@misc{MuTeX,
-  author={Angelika Schofer and Andrea Steinbach.},
-  note={A TeX macro package for typesetting single-staff music.  With some 
-  fonts.  Juicy detail: It comes without license statement and both authors
-  and copyright holders have vanished from the face of the electronic earth,
-  yet it is the predecessor to MusicTeX.},
-  HTML={http://www.gmd.de/Misc/Music/mutex},
-}
-  
-@misc{scex,
-  title = {SceX},
-  HTML={http://www.ncc.up.pt/\~mig/SceX.html},
-  author={Miguel Filgueiras},
-  note={A preprocessor to MusixTeX. Source in prolog
-  available on request. (?)},
-}
-  
-@misc{calliope,
-  title = {Calliope},
-  author={William F. Clocksin},
-  HTML={http://www.cl.cam.ac.uk/users/wfc/},
-  note={A NeXT package. Requires the Adobe Sonata font},
-}
-  
-@misc{Scribe,
-  title = {Scribe},
-  HTML={http://adu1.adu.lattrobe.edu.au/Music/Scribe.html},
-  note={A formatter for medieval scores.},
-}
-
-@misc{Mup,
-  title = {Mup},
-author = {Arkkra Enterprises},
-  HTML={http://www.arkkra.com/},
-  note={A program which creates PS from a script input. Although it
-  comes with C source code, it is shareware.},
-  address = {P. O. Box 315 Warrenville, IL 60555},
-}
-  
-@misc{MusicEase,
-  title = {MusicEase},
-  author = {Gary M. Rader},
-  HTML = {http://mesa.colorado.edu/\~grader/musicez.html },
-  note = {Described in Computer vol 29(6). Shareware},
-}
-  
-@Misc{quickscore,
-  title = {QuickScore},
-  publisher={Sion Software},
-  html={http://www.infoserve.net/quickscore/pages.html} 
-}
-
-@misc{LIME,
-  title = {LIME},
-  HTML={http://datura.cerl.uiuc.edu/},
-  author={Lippold Haken and Dorothea Blostein},
-  note={Notation editor for W95 and Mac},
-}
-  
-@misc{Sibelius,
-  title = {Sibelius},
-  author={Sibelius Software Ltd.},
-  publisher={Sibelius Software Ltd.},
-  address={Cambridge, Great Britain},
-  HTML={http://www.sibelius.com/},
-  note={Notation editor originally on Acorn, nowadays on W32 and mac as well.}
-}
-
-@misc{schott-urw,
-  title={``EDV-Notensatz''},
-  note={URW's music-engraving system described by [Wanske].  (Although URW
-  used \~DM 1.000.000 while developing this, it didn't buy them a cute name),
-}
-}
-
-@misc{Finale,
-  title={Finale},
-  publisher={Coda music technology},
-  html={http://www.codamusic.com/},
-}
-
-
-@misc{score,
-  publisher={San Andreas Press},
-  title={Score},
-  author={Leland Smith},
-  HTML={http://www.ymusic.com/Score},
-
-  note={Werner Lemberg (sx0005@sx2.hrz.uni-dortmund.de) writes: I
-  consider SCORE as the best program for typesetting classical
-  music. [..]  the price is quite high (about US\$ 1000) [..]  It has
-  a graphical interface but to get all out of the program you have to
-  learn a 400 page manual almost by heart because you'll change most
-  features by inputting parameters (up to 20 for some items) on a
-  command line. Expect three months to master SCORE :-)},
-
-}
-  
-@misc{mozart,
-  title={Mozart},
-  HTML={http://www.mozart.co.uk/},
-  note={A shareware windows package  },
-  author={David Webber},
-}
-  
-    
-@misc{WolfGang,
-  title = {WolfGang},
-  author ={Etienne Darbellay},
-  HTML={http://www.unige.ch/lettres/armus/music/wolfgang.html},
-}
-  
-@misc{Amadeus,
-  title = {Amadeus},
-  note={Jerker Elsgard (Jerker.Elsgard@abc.se) writes: professional and
-  expensive (DM 4000,  --) engraving.  Designed as a batch program (like
-  LilyPond).  It is aimed at publishers. Its history is more than
-  fifteen years and Amadeus has been running under different Unix
-  clones.  It uses MIDI-keyboard input},
-}
-  
-@misc{muse,
-  title={A-R Music Engraving},
-author ={Thomas Hall},
-  publisher={A-R Editions, inc.},
-  note={Professional engraving on
-  Sun boxen.},
-}
-  
-@misc{MusiCopy,
-  title = {MusiCopy},
-  author={John S. Gourlay and others},
-  note={A project at Ohio State university, which was discontinued in
-  1987.  The technical reports that have resulted from MusiCopy can
-  still be obtained by writing to OSU department of Computer Science.},
-}
-  
-@misc{Berlioz,
-  title = {Berlioz},
-  HTML={http://www.berlioz.tm.fr/},
-author={Dominique Montel},
-  note={ Dominique Montel (a professional engraver) is now working
-  together with computer scientists on his own software for music
-  publishing  called "Berlioz".  It is proprietary and runs on W95/NT and Mac},
-}
-  
-@misc{Sonata,
-  title = {Sonata},
-  HTML={http://www.adobe.com/type/browser/F/F_SONA.html},
-  publisher={Adobe inc.},
-  author={Cleo Huggins},
-  note={The music font by Adobe},
-}
-  
-  
-@misc{Haskore,
-  title = {Haskore},
-  HTML={http://haskell.systemsz.cs.yale.edu/haskore/onlinetutorial/index.html},
-  author={Paul Hudak},
-  note={A programming system for music, based on Haskell, a functional
-  programming language.  It outputs MIDI, CSound, NeXTStep and MusicKit},
-}
-
-% html={http://www.passportdesigns.com},
-@misc{encore,
-  title = {Encore},
-   publisher= {Passport designs},
-}
-
-
-
-@Misc{hoos:_salier,
-  author =	 {Holger H. Hoos and Thomas Helbich},
-  title =	 {The Salieri project},
-
-note =		 {`The SALIERI System is an interactive software environment
-for structure oriented composition, manipulation and analysis of
-music.'},
-  html = {http://www.informatik.tu-darmstadt.de/AFS/CM/SALIERI/},
-}
-
-@Misc{emagic,
-  title = {emagic notator},
-  publisher={emagic, www.emagic.de},
-  html={http://www.mcc.ac.uk/\~emagic/SL/NOTATOR.HTM},
-  note = {A notation product from a company that now focuses on sequencing},
-}
-
-@Misc{mp,
-  author = 	 {Bernard Hill},
-  title = 	 {Music Publisher},
-  html={http://www.braeburn.co.uk/mp.htm},
-  publisher={Braeburn Software},
-  address={Selkirk, Scotland},
-  year = {1998},
-  note = {This is the W95 version of NoteWorthy.}
-}
-
-@misc{Noteworthy,
-  title={Noteworthy Composer},
-  HTML={http://www.ntworthy.com},
-  publisher={Noteworthy Artware inc.},
-  note = {Shareware.  Not affiliated with Braeburn Software's products.},
-  year = {1994}
-}
-
-
-@Misc{NoteWorthy-hill,
-  note = {NoteWorthy and their successors are graphical editors, that do
-not know about musical structure. Shareware. },
-  html={http://www.braeburn.co.uk/},
-  publisher={Braeburn Software},
-  address= {Selkirk, Scotland},
-  author = {Bernard Hill},
-  year = 1992,
-  title = {NoteWorthy}
-}
-
-
-@misc{Musicator,
-title={Musicator},
-html={http://www.musicator.com/welcome.htm}
-}
-
diff --git a/Documentation/tex/refman.yo b/Documentation/tex/reference-manual.yo
index 6328f112b1..e56c15ddfe 100644
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/reference-manual.yo
@@ -575,13 +575,13 @@ mudela()(
           c''-\open  c''-\flageolet  c''-\reverseturn 
           c''-\trill
           c''-\prall c''-\mordent c''-\prallprall  c''-\prallmordent
-          c''-\upprall c''-\downprall c''-\thumb c''-\segno c''-\wheel}
+          c''-\upprall c''-\downprall c''-\thumb c''-\segno c''-\coda}
   \context Lyrics \lyrics{  
         accent__ marcato__ staccatissimo__ fermata stopped__
         staccato__ tenuto__ upbow downbow__ lheel__ rheel__ ltoe
         rtoe__ turn__ open__ flageolet reverseturn__ trill__ prall__
         mordent prallprall__ prallmordent__ uprall__ downprall thumb 
-	segno wheel}
+	segno coda }
   >
   \paper{ linewidth = 5.875\in;          
           indent = 0.0;        }
diff --git a/Documentation/tex/testje.fly b/Documentation/tex/testje.fly
index f114e445eb..4c354406d3 100644
--- a/Documentation/tex/testje.fly
+++ b/Documentation/tex/testje.fly
@@ -1,2 +1,2 @@
-
+% We're testing \mudelafile here.
 c''4^"This! Is! A! Test!" d e 
diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index d160e7abc8..cad569fc22 100644
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -795,12 +795,11 @@ Example:
     \partial 4;
     [d'8 dis'] e' c''4 e'8 c''4 
   )
+)
 
-
-The commands described above aren't really music, but they can best be
-thought as as notes with no duration.  Since they are grammatically
-equivalent to notes, these commands can be used in the same places as
-notes.
+The commands described above do not music that you could hear, but
+within the language, they are "Music": they are grammatically
+equivalent to notes, so they can appear in the same places as notes.
 
 sect(Notation context)
 
diff --git a/NEWS b/NEWS
index b17aa62697..614d60fffa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+pl 53.jbr2
+        - Documentation/ntweb/index.html: Updated nt distribution web page
+
+pl 54.uu1
+	- bf: Stem lens for beams.
+	- move meta doco to Documentation/metadoc
+	- move .bibb to Documentation/bibliography
+	- rename mi2mu to midi2ly
+	- removed other-packages.bib to comply with GNU standards
+
+pl 54.jcn1
+	- mutopia/J.S.Bach/Duette 1&2
+
+pl 54.mb1
+        - Renamed \wheel to the \coda
+	- bf: correct gap in tuplet braces
+
+pl 53.hwn2
+	- move more parameters from PS/TeX to Lily.
+	- PS cleanup
+	- TeX cleanup.
+	- bf: also make (empty) bar at end of voltabracket.
+	- bf: don't put slur over rest. 
+
+
+pl 54.uu1
+	- debian updates (anthony fok).
+
+*************
+pl 54 (july, 8)
 pl 53.jbr1
 	- scripts/ly2dvi.py: A fix for the multitude of file systems supported
           by windows.  As long as the paths that the cygwin apps use are
diff --git a/TODO b/TODO
index 569bfdb5b8..a8215f7915 100644
--- a/TODO
+++ b/TODO
@@ -9,12 +9,16 @@ Most of the items are marked in the code as well
 Grep for TODO and ugh/ugr/urg.  
 
 .* BUGS
+. * sane strategy for extensions (assume .ly):
+02:22:24 appel ~/usr/src/lilypond$ lilypond foo
+GNU LilyPond 1.1.54.
+[/home/fred/usr/src/lilypond/scm/lily.scm]
+warning: can't find file: `init'
 . * indent = 0.0 with linewidth=-1.0
 . * music ending in grace notes.
 . * PostScript
-.  * ps/lily.ps see comments.
+.  * half notes in pfa
 . * didot / big point.
-. * fix singleStaffBracket
 . * check EGCS version
 . * input/test/stem-spacing.ly: 12/4 touches first note
 . * \shape 1st dim skipped? 
@@ -38,6 +42,8 @@ Grep for TODO and ugh/ugr/urg.
 . * tuplets that are written as "number : note", for example
    "3 : [image of a half note here]".  possible?
 
+. * filenames : junk lily.x 
+
 . * Matanya's tips: 
 .  * don't  shorten stems/staffs closer to each other.
 .  * accidentals closer to note head
@@ -46,6 +52,7 @@ Grep for TODO and ugh/ugr/urg.
 
 .* Cleanups needed
 . * \$ and $ identifier syntax in examples.
+. * bracket ps code.
 . * Key_engraver, Local_key_item
 . * Think of comprehensive solution for "if (grace_b == self_grace_b_)"
 . * Y dimension units: staffspace vs. Point
@@ -58,6 +65,7 @@ Grep for TODO and ugh/ugr/urg.
 . * parser
 
 .* TODO before 1.2
+. * rename midi2ly, abc2ly mup2ly
 . * Grace_slur_engraver.
 . * Break_req handling is silly (break_forbid () + \break fucks up.)
 . * Morally pure LilyPond.
@@ -244,6 +252,7 @@ touching it.
       Reading 4 bytes from 0xefffeca8 on the stack.
       Address 0xefffeca8 is 728 bytes below frame pointer in function 
 . * GNU diff 2.7: diff -rN does not see a new directory with empty file
+. * patch: don't touch timestamp if all patches fail.
 . * mf-to-table -> add space before ; in AFM output.  (-> check AFM
     spec. Is this a bug in afm2tfm?)
 . * check out GCC signatures?
diff --git a/VERSION b/VERSION
index ceae9e6172..294cc5ec43 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
-PATCH_LEVEL=54
+PATCH_LEVEL=55
 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 602d77213a..caee78ed68 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,6 +2,8 @@ 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/debian/GNUmakefile b/debian/GNUmakefile
index b49c007234..740dafc961 100644
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -9,7 +9,7 @@ at-dir = $(outdir)/
 at-ext =
 
 EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka
-CONF_FILES = changelog copyright preinst postinst postrm rules watch 
+CONF_FILES = changelog copyright doc-base preinst postinst postrm prerm rules watch 
 #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
 OUTCONF_FILES = $(OUTIN_FILES)
 OUT_DIST_FILES = $(OUTIN_FILES)
diff --git a/debian/README.Debian b/debian/README.Debian
index 320703b028..c257da906c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,6 +8,9 @@ Dear music lover:
   Hope you enjoy producing beautiful music scores with GNU LilyPond
   and other related packages!  ^_^
 
+  Note:
+    If you experience problems about missing EC fonts during the TeX run,
+    please make sure you have the tetex-extra package installed.
 
 Old LilyPond Fonts Issue:
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,8 +36,8 @@ Old LilyPond Fonts Issue:
 
   Nonetheless, GNU LilyPond now comes with the standard "feta" fonts,
   and they are already listed in the latest teTeX 0.9 / Web2C 7.2
-  /usr/lib/texmf/fontname/special.map file, so there shouldn't be any
+  /usr/share/texmf/fontname/special.map file, so there shouldn't be any
   more problems!  Enjoy!  :-)
 
 
-Anthony Fok <foka@debian.org>, Wed, 22 Apr 1998 03:37:00 -0600
+Anthony Fok <foka@debian.org>, Wed,  7 Jul 1999 15:19:48 -0600
diff --git a/debian/changelog b/debian/changelog
index 804e47bb20..81437d0d42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,35 @@
-lilypond (1.1.36-1) unstable; urgency=low
+lilypond (1.1.53-1) unstable; urgency=low
 
   * New upstream release.
+  * Partially upgraded to standards version 3.0.0:
+     - Updated copyright to point to /usr/share/common-licenses
+     - First step towards FHS-compliance: Man pages are now installed
+       under /usr/share/man.
+
+ -- Anthony Fok <foka@debian.org>  Wed,  7 Jul 1999 15:23:57 -0600
+
+lilypond (1.1.47-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 10 Jun 1999 18:10:13 -0600
+
+lilypond (1.1.42-1) unstable; urgency=low
+
+  * New upstream release.
+  * [postinst]: Runs "/usr/bin/mktexlsr /usr/share/texmf" to save time.
+  * [postrm]: Removed the unnecessary "/usr/bin/mktexlsr" call.
+  * The segfault problem has disappeared on my computer (running
+    the latest potato system).  Please test.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 11 May 1999 11:16:58 -0600
+
+lilypond (1.1.37-1) unstable; urgency=low
+
+  * New upstream release.
+  * Known problem: LilyPond simply segfaults under glibc 2.1 on my i386
+    system, and I don't know how to fix the problem yet.  I hope users of
+    other platforms have better luck.
   * [debian/rules]:
       - Make and install info files.
       - Removed "CC=egcc" because the default gcc on all platforms is
@@ -9,8 +38,13 @@ lilypond (1.1.36-1) unstable; urgency=low
       - Minor clean-ups.
   * Added debian/compress to make sure *.png are not compressed.
   * Added debian/doc-base and postinst/prerm for the LilyPond info files.
+  * s!usr/lib/texmf!usr/share/texmf!g and cleaned up old hacks
+    in {pre,post}{inst,rm} files due to tetex's new FHS-compliant
+    directory structure.
+  * [debian/control]: Now Depends/Recommends the latest FHS-compliant
+      tetex-{bin,base,extra} (>= 0.9.99031{0,1}-1) packages.
 
- -- Anthony Fok <foka@debian.org>  Sun, 21 Mar 1999 13:39:39 -0700
+ -- Anthony Fok <foka@debian.org>  Mon,  5 Apr 1999 20:43:30 -0600
 
 lilypond (1.1.31-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 52b35a3aca..39108826e8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,10 @@ Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
 Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
- 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, named chords, transposing, formatting scores, 
- part extraction.  It includes a nice font of musical symbols.
+ 
+ LilyPond is the GNU Project music typesetter. It transforms a musical
+ description file into beautiful sheet music.
+ 
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
diff --git a/debian/control.foka b/debian/control.foka
index 52b35a3aca..9161ab70bf 100644
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
-Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
diff --git a/debian/copyright b/debian/copyright
index dcd268aca5..9fcb608cd0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,10 @@ This package was Debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-      ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.36.tar.gz
+      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.53.tar.gz
+
+It is also available at:
+      ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.53.tar.gz
 
 For more information about GNU LilyPond, please visit:
       http://www.cs.uu.nl/~hanwen/lilypond/
@@ -46,4 +49,4 @@ GNU LilyPond under Debian GNU/Linux are also under the GNU General
 Public License (GPL) version 2 or later.  
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000000..13016d1aad
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,11 @@
+Document: lilypond
+Title: LilyPond, the GNU Project music typesetter
+Author: Various
+Abstract: This documentation describes LilyPond (the GNU Project music
+ typesetter), its language Mudela, and the Mutopia project, a.k.a.
+ "Music To the People."
+Section: Apps/Music
+
+Format: info
+Index: /usr/share/info/lilypond.info.gz
+Files: /usr/share/info/lilypond.info*
diff --git a/debian/out/control b/debian/out/control
index 52b35a3aca..39108826e8 100644
--- a/debian/out/control
+++ b/debian/out/control
@@ -10,12 +10,10 @@ Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
 Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
- 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, named chords, transposing, formatting scores, 
- part extraction.  It includes a nice font of musical symbols.
+ 
+ LilyPond is the GNU Project music typesetter. It transforms a musical
+ description file into beautiful sheet music.
+ 
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
diff --git a/debian/postinst b/debian/postinst
index ac8e261b95..8f096b4772 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,37 +1,29 @@
 #!/bin/sh
 #
 # postinst script for the Debian GNU/Linux lilypond package
-#
 #   by Anthony Fok <foka@debian.org>
 #   Initial release:  Sun, 26 Oct 1997 03:23:00 -0700
-#     Last modified:  Wed, 11 Nov 1998 22:59:49 -0700
+#     Last modified:  Wed,  7 Jul 1999 19:36:36 -0600
 
 set -e
 
 package=lilypond		# This is used for filenames!  Don't change it!
 pkg_name="GNU LilyPond"
 
-std_TEXMFMAIN=/usr/lib/texmf	# Debian's standard $TEXMFMAIN
+std_TEXMFMAIN=/usr/share/texmf	# Debian's standard $TEXMFMAIN
 
 TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
 : ${TEXMFMAIN:=$std_TEXMFMAIN}
 
-echo " Running /usr/bin/mktexlsr ..."
-/usr/bin/mktexlsr
+echo " Running /usr/bin/mktexlsr $TEXMFMAIN..."
+/usr/bin/mktexlsr $TEXMFMAIN
 
 install-info --description='LilyPond, the GNU Project music typesetter' \
 	--section "Music" "Music" \
-	--quiet /usr/info/lilypond.info.gz
+	--quiet /usr/share/info/lilypond.info.gz
 
 #DEBHELPER#
 
-# If we are the last package to use the old /usr/lib/texmf/doc,
-# we will create the symlink to /usr/doc/texmf.  :-)
-if rmdir /usr/lib/texmf/doc >/dev/null 2>&1
-then
-    ln -s /usr/doc/texmf /usr/lib/texmf/doc
-fi
-
 echo
 echo " $pkg_name configuration completed."
 echo " Please read /usr/doc/$package/README.Debian to get started."
diff --git a/debian/postrm b/debian/postrm
index 80e1d36c75..51f571a4f0 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -4,14 +4,14 @@
 #   by Anthony Fok <foka@debian.org>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
-#   Last modified:  Fri, 14 Aug 1998 00:07:07 -0600
+#   Last modified:  Tue, 11 May 1999 11:16:35 -0600
 
 set -e
 
 package=lilypond
 font_supplier=public
 font_typeface=lilypond
-std_TEXMFMAIN=/usr/lib/texmf
+std_TEXMFMAIN=/usr/share/texmf
 std_VARTEXFONTS=/var/spool/texmf
 
 #DEBHELPER#
@@ -32,7 +32,6 @@ case "$1" in
 	# Clear out the old TFM and PK files in case the fonts were modified
 	rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
 	rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
-	/usr/bin/mktexlsr
     ;;
 
     failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/preinst b/debian/preinst
index cf27f6b936..270b2db61d 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,14 +4,14 @@
 #   by Anthony Fok <foka@debian.org>
 #   This is free software; see the GNU General Public Licence
 #   version 2 or later for copying conditions.  There is NO warranty.
-#   Last modified:  Tue, 10 Nov 1998 23:47:00 -0700
+#   Last modified:  Mon,  5 Apr 1999 20:30:12 -0600
 
 set -e
 
 package=lilypond
 font_supplier=public
 font_typeface=lilypond
-std_TEXMFMAIN=/usr/lib/texmf
+std_TEXMFMAIN=/usr/share/texmf
 std_VARTEXFONTS=/var/spool/texmf
 
 #DEBHELPER#
@@ -36,15 +36,6 @@ case "$1" in
 	    rm -rf $VARTEXFONTS/tfm/$font_supplier/mf
 	    rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf
 	fi
-
-	# Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed
-        # to a symbolic directory.  Remove the old real directory to
-        # prevent problems during upgrade.
-	for i in $LILYTEXINPUTS $LILYMFINPUTS; do
-	    if [ -d $i -a ! -L $i ]; then
-		rm -rf $i
-	    fi
-	done
     ;;
 
     abort-upgrade)
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000000..0c665397e0
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+install-info --quiet --remove /usr/share/info/lilypond.info.gz
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 7a94ca326f..6dc4374714 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# Made with the aid of debhelper by by Joey Hess,
+# Made with the aid of debhelper by Joey Hess,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 #
 # This is free software; see the GNU General Public Licence
@@ -12,24 +12,31 @@ package = lilypond
 
 SHELL = /bin/sh
 r = debian/tmp
+TMP = `pwd`/debian/tmp
 d = usr/doc/$(package)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
 build: build-stamp
 build-stamp:
 	dh_testdir
 
 	./configure --disable-checking --disable-debugging \
 		--enable-printing --prefix=/usr --disable-optimise \
-		--enable-shared
+		--enable-shared \
+		--infodir='$${prefix}/share/info' \
+		--mandir='$${prefix}/share/man'
 	$(MAKE) all
 	$(MAKE) -C Documentation/pictures pngs
 
 	# Remove the "-" and the "-k" once the \times segfault
 	# bug is fixed.  (lilypond-1.1.31, 1999-02-17)
-	-$(MAKE) -k -C Documentation/tex dvi
+	# -$(MAKE) -k -C Documentation/tex dvi
+	-$(MAKE) -C Documentation/tex dvi
 	-$(MAKE) -C Documentation info
 
 	# $(MAKE) htmldoc
@@ -57,18 +64,18 @@ install-stamp: build-stamp
 	dh_installdirs usr/doc/texmf \
 		usr/lib/emacs/site-lisp \
 		usr/doc/$(package)/examples \
-		usr/lib/texmf/tex \
-		usr/lib/texmf/fonts/source/public \
-		usr/lib/texmf/fonts/afm/public \
-		usr/lib/texmf/fonts/tfm/public
+		usr/share/texmf/tex \
+		usr/share/texmf/fonts/source/public \
+		usr/share/texmf/fonts/afm/public \
+		usr/share/texmf/fonts/tfm/public
 	ln -fs ../lilypond $(r)/usr/doc/texmf/lilypond
 
-	$(MAKE) prefix=`pwd`/$(r)/usr install
+	$(MAKE) prefix=$(TMP)/usr install
 
-	ln -s ../../../share/lilypond/tex $(r)/usr/lib/texmf/tex/lilypond
-	ln -s ../../../../../share/lilypond/mf $(r)/usr/lib/texmf/fonts/source/public/lilypond
-	ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/afm/public/lilypond
-	ln -s ../../../../../share/lilypond/tfm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond
+	ln -s ../../lilypond/tex $(r)/usr/share/texmf/tex/lilypond
+	ln -s ../../../../lilypond/mf $(r)/usr/share/texmf/fonts/source/public/lilypond
+	ln -s ../../../../lilypond/afm $(r)/usr/share/texmf/fonts/afm/public/lilypond
+	ln -s ../../../../lilypond/tfm $(r)/usr/share/texmf/fonts/tfm/public/lilypond
 
 	touch install-stamp
 
@@ -80,8 +87,8 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp
-	dh_installdocs ANNOUNCE* NEWS-* DEDICATION \
-		BUGS TODO *.txt \
+	dh_installdocs AIMS ANNOUNCE* NEWS-* DEDICATION \
+		BUGS TASKS TODO *.txt \
 		Documentation/pictures/out/*.png \
 		Documentation/out/*.txt \
 		Documentation/tex/*.doc \
@@ -98,6 +105,7 @@ binary-arch: build install
 #	dh_installmanpages
 #	dh_undocumented
 	dh_installchangelogs -k NEWS
+	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
diff --git a/input/bugs/Overture.ly b/input/bugs/Overture.ly
deleted file mode 100644
index 93ba0bc43e..0000000000
--- a/input/bugs/Overture.ly
+++ /dev/null
@@ -1,245 +0,0 @@
-\header {
-title = "Parties sur les fleut Dous \\'a 3";
-composer = "Johann Christoph Faber";
-piece = "1.  Overture";
-}
-
-\version "1.1.52";
-
-global=\notes{
-	\time 2/2;
-	\key C;
-}
-
-treble=\notes\relative c''' {
-%1
-	g2 c4 g |
-	g4( [f8 )e] f2 |
-	f4( [e8 )d] e2 |
-	[e8( )f g f] e4.( )d8 |
-%5
-	d2 r8 g8 [a( )e] |
-	f2 r8 f8 [g( )d] |
-	e2( [)e8 e( d )c] |
-	d2( [)d8 d( c )b] |
-	g'4. g8 g4 a |
-%10
-% implied trill on d
-	d,4 e d4. c8 |
-	c8 [g' c( )b] a2 |
-	r8 a [d( )c] [b b( a )b] |
-	[c( )b a g] fis4 [g8 a] |
-	b2 [b8( )a g a] |
-%15
-	fis4. g8 g4 f |
-	r8 g8 [f( )g] e4.( )d8 |
-% Another implied trill
-	d4 e d4. c8 |
-	% \semibreve = \dottedminim
-	\time 3/4;
-	c4 g' g |
-	[g8( )f e f g a] |
-%20
-	g4 e r |
-	r2. |
-	r4 g g |
-	c [b8( )a g bes]  |
-	a4 f r |
-%25
-	r2. |
-	r4 a g |
-	a f e |
-	f [a8( )g f e] |
-	d4 g g |
-%30
-	g( )a b |
-	c e, d |
-	e f g |
-	a d, d |
-	d( )e f |
-%35
-	g r4 r |
-	r e f |
-	g( [a8 )g f e ] |
-	f4 e2 |
-	d4 g( )f |
-%40
-	e r4 r4 |
-	r g c |
-	[a8( g )f g f e] |
-	[ d8( )c d e f g ]|
-	[e ( ) f e( f g )a ]|
-%45
-% Implied trill and turn on the D
-	[f8( )e] d2 |
-	c4 r4 r4 |
-	e r4 r4 |
-	g( )a b |
-	c e, f |
-%50
-	g( [a8 )g f e] |
-	d4.( )g8 g4 |
-	[f8( )e] d4. c8 |
-	c2. \bar "|.";
-}
-
-tenor=\notes\relative c'' {
-	e2 g4 e |
-	c2( [)c8 c8( b )a] |
-	b2 c2 |
-	[c8()d e d] c4.( )b8 |
-%5
-	b4 [c8 d] e2 |
-	r8 c8 [d( )a] b2 |
-	c2 a2( |
-	[)a8 a8( g )f] g2 |
-	c2. c4|
-%10
-	b c c( )b |
-	c g' f2 |
-	r8 f [a a] [g e(] )f4 |
-	g e a, d |
-	g2. e4 |
-%15
-	d a [b8. c16 c8. d16] |
-	d2 c4.( )b8 |
-	b4 c c( )b |
-	% \semibreve = \dottedminim
-	\time 3/4;
-	c4 e e |
-	[e8( )d c d e f ]|
-%20
-	e4 c r |
-	r2. |
-	r4 e e |
-	a [g8( )f e g] |
-	f4 c r4 |
-%25
-	r2. |
-	r4 f e |
-	f a, g |
-	a [f'8( )e d c ] |
-	b4 e d |
-%30
-	e( )f d |
-	e c b |
-	c c e |
-	f b, a |
-	b( )c d |
-%35
-	e r4 r4 |
-	r c d |
-	e e e |
-	d d( )cis |
-	d e( )d |
-%40
-	c r4 r4 |
-	r4 e g |
-	[f8( e )d e d c ] |
-	[b8( )a b c d b] |
-	[c8 ( ) d c( d e )f] |
-%45
-	[d( )c] c4 b |
-	c r r
-	c r r |
-	e ( ) f d |
-	e c d |
-%50
-	e( [f8 )e d c] |
-	b4.( )e8 e4 |
-	[d8 ()c] c4 b |
-	c2. \bar "|.";
-}
-
-bass=\notes\relative c' {
-	c4 [c,8 d] e4.( [f16 )g] |
-	a2( [)a8 a( g )f] |
-	g2 [c,8 f g()a] |
-	c2 c, |
-%5
-	[g'8()f e d ] cis2 |
-	d4. d8 g4. g,8 |
-	[c8 g' c( )e, ] f2( |
-	[)f8 f( e )d] e2 |
-	e2. f4 |
-%10
-	g2 g, |
-	c r8 c [f()e] |
-	d2 g4 f |
-	[e8()d] c4 [d8()c b a]|
-	g4 a b c|
-%15
-	d2 [e8. c16 f8. d16] |
-	g2 c, |
-	f2 g |
-	% \semibreve = \dottedminim
-	\time 3/4;
-	c,4 r r |
-	r2. |
-%20
-	r4 c' a |
-	c e, g |
-	c, r r |
-	r2.
-	r4 f c |
-%25
-	f a, c |
-	f, r r |
-	r f' c |
-	f r r |
-	r c' g |
-%30
-	c f, g |
-	c, e g |
-	c, a' c |
-	f, g fis |
-	g e d |
-%35
-	c e g |
-	c, e d |
-	c cis cis |
-	d a' a, |
-	d r r |
-%40
-	r e g |
-	c, c' e, |
-	f2. |
-	g2. |
-	a4 [g8()f] e4 |
-%45
-	f g g, |
-	c e g |
-	c e, g |
-	c, f g |
-	c a [g8()f]
-%50
-	 e2 f4 |
-	 g4()f e |
-	  f g g, |
-	 c2. \bar "|.";
-}
-	
-
-\score{
-	\context StaffGroup <
-	      \context Staff =treble \notes {
-		    \property Staff.Instrument = "Treble" 
-		    \global \treble 
-	      }
-
-	      \context Staff =tenor \notes {
-	      	      \property Staff.Instrument = "Tenor"
-		      \global \tenor 
-	      }
-
-	      \context Staff =bass \notes {
-	      	      \property Staff.Instrument = "Bass"
-		      \global \clef "bass"; \bass
-	      }
-	>
-	\paper {
-		\translator { \BarNumberingStaffContext }
-	}
-}
-	
-
diff --git a/input/bugs/partial.ly b/input/bugs/partial.ly
deleted file mode 100644
index af915328a6..0000000000
--- a/input/bugs/partial.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\score{
-    \notes \relative c''{
-    	\time 4/4;
-	c4 c c c 
-	\partial 4*3;
-	c c c
-	\repeat 2 {
-	\partial 4;
-	c
-	c c c c
-	\partial 4*3;
-	c c c
-	}
-    }
-    \paper{  }
-}
diff --git a/input/bugs/rcol.fly b/input/bugs/rcol.fly
deleted file mode 100644
index e32064445c..0000000000
--- a/input/bugs/rcol.fly
+++ /dev/null
@@ -1,11 +0,0 @@
-\clef alto;
-\time 3/4;
-\key F;
-[bes'16 r r ges'][es r r ges][es r r ges] |
-[bes, r r d][bes r r d][bes r r d]|
-[bes r r es][bes r r es][bes r r es]|
-[bes r r d][bes r r d][bes r r d]|
-[cis r r g'][e r r g][e r r b']|
-[g r r bes][g r r bes][g r r bes] |
-[g r r a][e r r a][e r r a]|
-[d, r r gis][d r r gis][d r r gis]|
diff --git a/input/bugs/semirepeat.ly b/input/bugs/semirepeat.ly
deleted file mode 100644
index 70928d8a91..0000000000
--- a/input/bugs/semirepeat.ly
+++ /dev/null
@@ -1,5 +0,0 @@
-\score { \notes\context Staff\relative c'' {
-
-% less alts than body
-\repeat semi 4 { c^"4$\\times$ 2alt" d } \alternative { e f } \repeat "semi" 2 c4
-}}
diff --git a/input/bugs/slur-over-rest.ly b/input/bugs/slur-over-rest.ly
deleted file mode 100644
index 48f3238901..0000000000
--- a/input/bugs/slur-over-rest.ly
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\score{
-\notes \relative c{      r4-> r4-. r4^"foo" ( b'4  ) g''4
-}}
diff --git a/input/bugs/spacing.ly b/input/bugs/spacing.ly
index ddd2903abc..70d831405a 100644
--- a/input/bugs/spacing.ly
+++ b/input/bugs/spacing.ly
@@ -1,14 +1,7 @@
+
+%JAN: Dit is een autobiem bug.
 \score {
-    \notes \transpose c'' \context Staff { c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 c16 c32 c64 }
-    \paper {
-     \translator {
-       \StaffContext
-      % \remove "Staff_symbol_engraver";
-        \remove "Time_signature_engraver";
-        \remove "Bar_engraver";
-        \remove "Clef_engraver";
- }
-linewidth = -1.;
-    }}
+    \notes \transpose c'' \context Voice { c8 c16 c32 c64 }
+   }
 
 
diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 65d91f885b..474e9a9dd1 100644
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -14,7 +14,7 @@ FontBody=	\notes\transpose c''{
 		a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill|
 		a\fp-\reverseturn a4.\sf a4.\sfz |  a4\fz % a\rf
 		[c8-\prall c-\mordent] [a'-\prallmordent a'-\prallprall]
-		[c8-\upprall a'8-\downprall] [a'-\segno c-\wheel] |
+		[c8-\upprall a'8-\downprall] [a'-\segno c-\coda] |
 		[c \< d e f] [as' ges' f' e']
 		[cis' dis' c' des'] [cisis' disis' \! ceses' deses'] |
 		\clef "bass";
diff --git a/input/twinkle.ly b/input/twinkle.ly
index 168558215f..78a40f1a15 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -17,7 +17,7 @@ traditional song in various languages.
 
 %{
 Tested Features: lyrics, interleaving lyrics and staffs, repeats,
-	auto beaming, applying new rhythm on lyrics
+	auto beaming, applying new rhythm on lyrics, hyphens
 %}
 
 \version "1.1.52";
@@ -53,12 +53,12 @@ global = \notes {
 }
 
 tekst = \lyrics{ 
- 	Al- tijd is Kort- jak- je ziek, " "
-	midden "in de" week maar "'s zon-" dags  " " niet.
-	"'s Zon-" dags gaat ze naar de kerk, " "
-	met een boek vol zil- ver  " " werk. " "
-	Al- tijd is Kort- jak- je ziek, " "
-	midden  "in de" week maar "'s zon-" dags  " " niet.
+ 	Al -- tijd is Kort -- jak -- je ziek, " "
+	midden "in de" week maar "'s zon" -- dags  " " niet.
+	"'s Zon" -- dags gaat ze naar de kerk, " "
+	met een boek vol zil -- ver  " " werk. " "
+	Al -- tijd is Kort -- jak -- je ziek, " "
+	midden  "in de" week maar "'s zon" -- dags  " " niet.
 }
 
 
@@ -68,51 +68,51 @@ tekst. Mogen wij ook af en toe ergens op afgeven?
 %}
 
 hegedraagjetekst = \lyrics{ 
- 	Al- tijd zuigt Bill Gates mijn piek, " "
-	"\TeX" is slecht- ser dan mu-  " " ziek.
-	"'s Zon-" dags gaat het door een raam, " "
-	Weet dat ik me er- voor  " " schaam.
- 	Al- tijd zuigt Bill Gates mijn piek, " "
-	"\TeX" is slecht- ser dan mu-  " " ziek.
+ 	Al -- tijd zuigt Bill Gates mijn piek, " "
+	"\TeX" is slecht -- ser dan mu --  " " ziek.
+	"'s Zon" -- dags gaat het door een raam, " "
+	Weet dat ik me er -- voor  " " schaam.
+ 	Al -- tijd zuigt Bill Gates mijn piek, " "
+	"\TeX" is slecht -- ser dan mu --  " " ziek.
 }
 
 texte = \lyrics{ 
 	\property Lyrics . textStyle" =  "italic" 
 %	\property Lyrics . textStyle" =  "roman" 
- 	Ah! vous dir- ai- je ma- man " "
-	Ce qui cau- se mon tour-  " " ment
-	Pa- pa veut que je rai- son- ne
-	Comm' u- ne gran- de per- " " son- ne
-	Moi je dis que les bon- bons " "
-	Va- lent mieux que la rai-  " " son
+ 	Ah! vous dir -- ai -- je ma -- man " "
+	Ce qui cau -- se mon tour --  " " ment
+	Pa -- pa veut que je rai -- son -- ne
+	Comm' u -- ne gran -- de per -- " " son -- ne
+	Moi je dis que les bon -- bons " "
+	Va -- lent mieux que la rai --  " " son
 }
 
 texti = \lyrics{
 	\property "Lyrics"."textStyle" =  "roman"
-	Twin- kle, twin- kle, lit- tle star, " "
-	How I won- der what you  " " are.
-	Up a- bove the world so high, " "
-	Like a dia- mond in the  " " sky. " "
-	Twin- kle, twin- kle, lit- tle star, " "
-	How I won- der what you  " " are!
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are.
+	Up a -- bove the world so high, " "
+	Like a dia -- mond in the  " " sky. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
 }
 
 textii = \lyrics{
-	When the bla- zing sun is gone, " "
-	When he no- thing shines up-  " " on,
-	Then you show your lit- tle light, " "
-	Twin- kle, twin- kle, all the  " " night. " "
-	Twin- kle, twin- kle, lit- tle star, " "
-	How I won- der what you  " " are!
+	When the bla -- zing sun is gone, " "
+	When he no -- thing shines up --  " " on,
+	Then you show your lit -- tle light, " "
+	Twin -- kle, twin -- kle, all the  " " night. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
 }
 
 textiii = \lyrics{
-	Then the tra- veler in the dark " "
-	Thanks you for your ti- ny  " " spark;
+	Then the tra -- veler in the dark " "
+	Thanks you for your ti -- ny  " " spark;
 	He could not see which way to go,
-	If you did not twin- kle  " " so. " "
-	Twin- kle, twin- kle, lit- tle star, " "
-	How I won- der what you  " " are!
+	If you did not twin -- kle  " " so. " "
+	Twin -- kle, twin -- kle, lit -- tle star, " "
+	How I won -- der what you  " " are!
 }
 
 \score{
diff --git a/lily/bow.cc b/lily/bow.cc
index 6553412fa1..e5daab3c1b 100644
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -31,7 +31,7 @@ Bow::do_brew_molecule_p () const
 
   SCM d =  get_elt_property (dashed_scm_sym);
   if (d == SCM_BOOL_F)
-    a = lookup_l ()->slur (c);
+    a = lookup_l ()->slur (c, thick);
   else
     a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
 
diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 1dbe94e3e4..2401502c9c 100644
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -53,8 +53,9 @@ Crescendo::get_symbol () const
 
   bool continued = broken[Direction (-grow_dir_)];
   Real height = paper_l()->staffheight_f () / 6;
+  Real thick = paper_l ()->get_var ("crescendo_thickness");
 
-  return Molecule (lookup_l ()->hairpin (w_dim, height, grow_dir_ < 0, continued));
+  return Molecule (lookup_l ()->hairpin (w_dim, height, thick, grow_dir_ < 0, continued));
 }
 
 Molecule*
diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 1d1d96c369..b7fcda0706 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -38,13 +38,13 @@ public:
   Molecule ledger_line (Interval) const;
   Molecule fill (Box b) const;
   Molecule filledbox (Box b) const;  
-  Molecule hairpin (Real width, Real height, bool decresc, bool continued) const;
+  Molecule hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const;
   Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real interline, Direction dir) const;
   Molecule rest (int, bool outside, String) const;
   Molecule accordion (SCM arg, Real interline_f) const;
-  Molecule slur (Array<Offset> controls) const;
+  Molecule slur (Array<Offset> controls, Real thick) const;
   Molecule text (String style, String text, Paper_def*) const;
-  Molecule staff_brace (Real dy) const;
+  Molecule staff_brace (Real dy, int) const;
   Molecule staff_bracket (Real dy) const;
   Molecule volta (Real h, Real w,  Real thick,  bool last_b) const;
   Molecule special_time_signature (String, int,int, Paper_def*) const;
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 961a4b37c8..38412301cb 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -159,11 +159,13 @@ Lookup::bar (String str, Real h, Paper_def *paper_l) const
   if (str == "bracket")
     return staff_bracket (h);
   else if (str == "brace")
-    return staff_brace (h);
-  
+    {
+      Real staffht  = paper_l->get_var ("staffheight");
+      return staff_brace (h,staffht);
+    }
   Real kern = paper_l->get_var ("bar_kern");
   Real thinkern = paper_l->get_var ("bar_thinkern");
-  
+
   Molecule thin = simple_bar ("thin", h, paper_l);
   Molecule thick = simple_bar ("thick", h, paper_l);
   Molecule colon = afm_find ("dots-repeatcolon", paper_l);  
@@ -483,12 +485,13 @@ Lookup::time_signature (int num, int den, Paper_def *paper_l) const
 }
 
 Molecule
-Lookup::staff_brace (Real y) const
+Lookup::staff_brace (Real y, int staff_size) const
 {
   Molecule m;
   
   Atom at  (gh_list (pianobrace_scm_sym,
 		     gh_double2scm (y),
+		     gh_int2scm (staff_size),
 		     SCM_UNDEFINED
 		     ));
   
@@ -499,7 +502,7 @@ Lookup::staff_brace (Real y) const
 }
 
 Molecule
-Lookup::hairpin (Real width, Real height, bool decresc, bool continued) const
+Lookup::hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const
 {
   Molecule m;   
 
@@ -508,6 +511,7 @@ Lookup::hairpin (Real width, Real height, bool decresc, bool continued) const
 		     gh_double2scm (width),
 		     gh_double2scm (height),
 		     gh_double2scm (continued ? height/2 : 0.0),
+		     gh_double2scm (thick),
 		     SCM_UNDEFINED));
   m.dim_.x () = Interval (0, width);
   m.dim_.y () = Interval (-2*height, 2*height);
@@ -538,7 +542,7 @@ Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_
   Make a smooth curve along the points 
  */
 Molecule
-Lookup::slur (Array<Offset> controls) const
+Lookup::slur (Array<Offset> controls, Real linethick) const
 {
   Offset  delta_off = controls[3]- controls[0];
   Molecule m; 
@@ -552,6 +556,7 @@ Lookup::slur (Array<Offset> controls) const
 
   Atom at  (gh_list (ly_symbol ("bezier-sandwich"),
 		     ly_quote_scm (array_to_list (scontrols, 8)),
+		     gh_double2scm (linethick),
 		     SCM_UNDEFINED));
 
   m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index 5864e06527..9ca3649fe3 100644
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -23,14 +23,6 @@
 
 ADD_THIS_TRANSLATOR (Repeat_engraver);
 
-/*
-  Needs redesign?
-
-  -  Logic needs to be moved out of do_try_music(),
-  
-  - don't  try to do multiple repeated music.  Lets assume repeats  don't nest.
-  
- */
 bool
 Repeat_engraver::do_try_music (Music* m)
 {
@@ -155,6 +147,8 @@ Repeat_engraver::do_process_requests ()
 
 	      if (t != "stop")
 		bar_engraver_l->request_bar (t);
+	      else
+		bar_engraver_l->request_bar (""); 
 	    }
 	  else
 	    {
diff --git a/lily/slur.cc b/lily/slur.cc
index 504219f393..827e9a0222 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -38,10 +38,13 @@ void
 Slur::add_column (Note_column*n)
 {
   if (!n->head_l_arr_.size ())
-    warning (_ ("Putting slur over rest."));
-  encompass_arr_.push (n);
-  //  n->stem_l_->slur_l_ = this;
-  add_dependency (n);
+    warning (_ ("Putting slur over rest. Ignoring"));
+  else
+    {
+      encompass_arr_.push (n);
+      //  n->stem_l_->slur_l_ = this;
+      add_dependency (n);
+    }
 }
 
 Direction
diff --git a/lily/stem-info.cc b/lily/stem-info.cc
index 2993559a84..d945823d66 100644
--- a/lily/stem-info.cc
+++ b/lily/stem-info.cc
@@ -63,7 +63,7 @@ Stem_info::Stem_info (Stem*s, int mult)
   int stem_max = (int)rint(paper_l->get_var ("stem_max"));
   String type_str = grace_b ? "grace_" : "";
   Real min_stem_f = paper_l->get_var (type_str + "minimum_stem_length"
-				      + to_str (mult_i_ <? stem_max));
+				      + to_str (mult_i_ <? stem_max)) * internote_f;
   Real stem_f = paper_l->get_var (type_str + "stem_length"
 				  + to_str (mult_i_ <? stem_max))* internote_f;
 
diff --git a/ly/paper16.ly b/ly/paper16.ly
index 252795dd95..264691e068 100644
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -23,7 +23,7 @@ paper_sixteen = \paper {
 
      	arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
-	texsetting = "\\input lilyponddefs \\musixsixteendefs ";
+	texsetting = "\\input lilyponddefs ";
 	pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
 	scmsetting = "\"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\";\n";
 	scmsetting = "\"\\\\input lilyponddefs \\\\musixsixteendefs\";\n";
diff --git a/ly/paper20.ly b/ly/paper20.ly
index 25e85d7dc6..9159454699 100644
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -30,7 +30,7 @@ paper_twenty = \paper {
 
 	arithmetic_basicspace = 2.;
         arithmetic_multiplier = 6.\pt;
-	texsetting = "\\input lilyponddefs \\musixtwentydefs ";
+	texsetting = "\\input lilyponddefs ";
 	pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
 	% urg, debugging only
 	scmsetting = "\"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\";\n";
diff --git a/ly/params.ly b/ly/params.ly
index c224318fba..afc68d5ab7 100644
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -104,6 +104,8 @@ tie_slope_damping = 0.8;
 slur_thickness = 1.4 * \staffline;
 slur_height_limit = \staffheight;
 
+
+
 % slur_ratio = 0.3;
 % try bit flatter slurs
 slur_ratio = 0.25;
@@ -165,6 +167,7 @@ mmrest_x_minimum = 2.0*\staffheight;
 
 % chop off this much when next to pp / ff sign.
 crescendo_shorten = 4.0 * \interline;
+crescendo_thickness   = \staffline;
 
 % in internote.
 restcollision_minimum_dist = 3.0;
@@ -180,6 +183,8 @@ stemSpacingCorrection = 0.5*\interline;
 
 
 
+
+
 \include "engraver.ly";
 
 
diff --git a/ly/script.ly b/ly/script.ly
index cbd3225c8e..38f89853d2 100644
--- a/ly/script.ly
+++ b/ly/script.ly
@@ -44,4 +44,4 @@ prallmordent = \script "prallmordent"
 upprall = \script "upprall"
 downprall = \script "downprall"
 segno = \script "segno"
-wheel = \script "wheel"
\ No newline at end of file
+coda = \script "coda"
\ No newline at end of file
diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index c53adf4866..f42f35368a 100644
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -32,7 +32,7 @@ mkdir htmldocs
 tar -C htmldocs -xzf out/htmldoc.tar.gz
 #tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz
 
-strip lily/out/lilypond mi2mu/out/mi2mu
+strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT/usr" install
 # gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
 
@@ -66,8 +66,8 @@ fi
 /usr/bin/mudela-book
 /usr/bin/ly2dvi
 /usr/bin/lilypond
-/usr/bin/mi2mu
-/usr/man/man1/mi2mu.1
+/usr/bin/midi2ly
+/usr/man/man1/midi2ly.1
 /usr/man/man1/lilypond.1
 /usr/man/man1/mudela-book.1
 /usr/man/man1/ly2dvi.1
diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index 7ea9b25199..ba753587cf 100644
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
-Versie: 1.1.54
-Inschrijf datum: 08JUL99
+Versie: 1.1.55
+Inschrijf datum: 09JUL99
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
 	janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-	770k lilypond-1.1.54.tar.gz 
+	770k lilypond-1.1.55.tar.gz 
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	770k lilypond-1.1.54.tar.gz 
+	770k lilypond-1.1.55.tar.gz 
 Copi-eer voorwaarden: GPL
 End
diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 3d06342705..1a7e20b9a7 100644
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,21 +1,19 @@
 Begin3
 Title: LilyPond
-Version: 1.1.54
-Entered-date: 08JUL99
+Version: 1.1.55
+Entered-date: 09JUL99
 Description: 
-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, named chords, transposing, formatting scores, 
-part extraction.  It includes a nice font of musical symbols.
+
+LilyPond is the GNU Project music typesetter. It transforms a musical
+description file into beautiful sheet music.
+
 Keywords: music notation typesetting midi fonts engraving
 Author: hanwen@cs.ruu.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
-	770k lilypond-1.1.54.tar.gz 
+	770k lilypond-1.1.55.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	770k lilypond-1.1.54.tar.gz 
+	770k lilypond-1.1.55.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 0337c89dfc..11adbb60a4 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.1.54
+Version: 1.1.55
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.54.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.55.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>
@@ -13,12 +13,10 @@ Prereq: tetex
 
 %description 
 
-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, named chords, transposing, formatting scores, 
-part extraction.  It includes a nice font of musical symbols.
+
+LilyPond is the GNU Project music typesetter. It transforms a musical
+description file into beautiful sheet music.
+
 
 %prep
 %setup
@@ -38,7 +36,7 @@ mkdir htmldocs
 tar -C htmldocs -xzf out/htmldoc.tar.gz
 #tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz
 
-strip lily/out/lilypond mi2mu/out/mi2mu
+strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT/usr" install
 # gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
 
@@ -72,8 +70,8 @@ fi
 /usr/bin/mudela-book
 /usr/bin/ly2dvi
 /usr/bin/lilypond
-/usr/bin/mi2mu
-/usr/man/man1/mi2mu.1
+/usr/bin/midi2ly
+/usr/man/man1/midi2ly.1
 /usr/man/man1/lilypond.1
 /usr/man/man1/mudela-book.1
 /usr/man/man1/ly2dvi.1
diff --git a/make/toplevel.make.in b/make/toplevel.make.in
index a3e1fd036a..55c21d3ad1 100644
--- a/make/toplevel.make.in
+++ b/make/toplevel.make.in
@@ -8,7 +8,7 @@ depth = .
 
 # descent order into subdirectories:
 #
-SUBDIRS = scripts buildscripts  flower lib lily mf mi2mu po debian \
+SUBDIRS = scripts buildscripts  flower lib lily mf midi2ly po debian \
 	Documentation ly input tex make mutopia test intl stepmake\
 	ps  scm
 #
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 835a13c831..6f5a6c967f 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -666,31 +666,31 @@ fet_beginchar("Segno", "segno", "segno")
 fet_endchar;
 
 fet_beginchar("Coda", "coda", "coda")
-	save thin, thick, wheelwidth, wheelheight;
+	save thin, thick, codawidth, codaheight;
 	thin# = 1.2 stafflinethickness#;
 	thick# = 3.5 stafflinethickness#;
-	wheelwidth# = 2/3 interline#;
-	wheelheight# = 1 interline#;
-	define_pixels(thin, thick, wheelwidth, wheelheight);
+	codawidth# = 2/3 interline#;
+	codaheight# = 1 interline#;
+	define_pixels(thin, thick, codawidth, codaheight);
 
-	set_char_box(wheelwidth#+thick#, wheelwidth#+thick#,
-		wheelheight#+thick#, wheelheight#+thick#);
+	set_char_box(codawidth#+thick#, codawidth#+thick#,
+		codaheight#+thick#, codaheight#+thick#);
 
 	penpos1(thick,0);
 	penpos2(thin,-90);
 	penpos3(thick,180);
-	x1l=-wheelwidth;
-	y2l=wheelheight;
+	x1l=-codawidth;
+	y2l=codaheight;
 	y1=0;
 	x2=0;
 	z3 = - z1;
 	penlabels(1,2,3);
 
-	path halfwheel;
-	halfwheel := z1l{up} .. z2l{right} .. z3l{down} -- 
+	path halfcoda;
+	halfcoda := z1l{up} .. z2l{right} .. z3l{down} -- 
 		z3r{up} .. z2r{left} .. z1r{down} .. cycle;
-	fill halfwheel;
-	fill (halfwheel scaled -1);
+	fill halfcoda;
+	fill (halfcoda scaled -1);
 
 	pickup pencircle scaled thin;
 	draw (0,-h) -- (0,h);
diff --git a/mi2mu/GNUmakefile b/midi2ly/GNUmakefile
index 3432b24c85..de64e3e8bd 100644
--- a/mi2mu/GNUmakefile
+++ b/midi2ly/GNUmakefile
@@ -1,10 +1,10 @@
-# title	   makefile for mi2mu
-# file	   mi2mu/Makefile 
+# title	   makefile for midi2ly
+# file	   midi2ly/Makefile 
 
 depth = ..
 
-NAME = mi2mu
-MODULE_NAME = mi2mu
+NAME = midi2ly
+MODULE_NAME = midi2ly
 
 SUBDIRS = include
 EXTRA_DIST_FILES += TODO
@@ -18,5 +18,5 @@ include $(depth)/make/stepmake.make
 midi-lexer.l:	$(outdir)/midi-parser.hh
 
 
-$(outdir)/mi2mu-version.o: $(outdir)/version.hh
+$(outdir)/midi2ly-version.o: $(outdir)/version.hh
 
diff --git a/mi2mu/TODO b/midi2ly/TODO
index 2f0b77f11e..2f0b77f11e 100644
--- a/mi2mu/TODO
+++ b/midi2ly/TODO
diff --git a/mi2mu/include/GNUmakefile b/midi2ly/include/GNUmakefile
index 1a19230204..1a19230204 100644
--- a/mi2mu/include/GNUmakefile
+++ b/midi2ly/include/GNUmakefile
diff --git a/mi2mu/include/dummy.icc b/midi2ly/include/dummy.icc
index e69de29bb2..e69de29bb2 100644
--- a/mi2mu/include/dummy.icc
+++ b/midi2ly/include/dummy.icc
diff --git a/mi2mu/include/dummy.tcc b/midi2ly/include/dummy.tcc
index e69de29bb2..e69de29bb2 100644
--- a/mi2mu/include/dummy.tcc
+++ b/midi2ly/include/dummy.tcc
diff --git a/mi2mu/include/mi2mu-proto.hh b/midi2ly/include/mi2mu-proto.hh
index d8ad1368e4..d8ad1368e4 100644
--- a/mi2mu/include/mi2mu-proto.hh
+++ b/midi2ly/include/mi2mu-proto.hh
diff --git a/mi2mu/version.cc b/midi2ly/version.cc
index e9f2ed4e69..e9f2ed4e69 100644
--- a/mi2mu/version.cc
+++ b/midi2ly/version.cc
diff --git a/mutopia/J.S.Bach/Duette/GNUmakefile b/mutopia/J.S.Bach/Duette/GNUmakefile
new file mode 100644
index 0000000000..15abf8ab41
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/GNUmakefile
@@ -0,0 +1,12 @@
+# mutopia/J.S.Bach/Duette/GNUmakefile
+
+depth = ../../..
+
+SUBDIRS =
+EXTRA_DIST_FILES=
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+examples=
+
+include $(depth)/make/stepmake.make
+
diff --git a/mutopia/J.S.Bach/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly
index c5a8fb0f8a..849b54bf18 100644
--- a/mutopia/J.S.Bach/global-i.ly
+++ b/mutopia/J.S.Bach/Duette/global-i.ly
@@ -1,3 +1,5 @@
+\version "1.1.52";
+
 $global_i = \notes{
 	\time 12/8;
 	\key G;
diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly
new file mode 100644
index 0000000000..da22bed0ff
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/global-ii.ly
@@ -0,0 +1,5 @@
+$global_ii = \notes{
+	\time 4/4;
+	\property Staff.timeSignatureStyle = "C2/2"
+	\key a\minor;
+}
diff --git a/mutopia/J.S.Bach/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly
index c239761d3e..66451308b1 100644
--- a/mutopia/J.S.Bach/viola-i.ly
+++ b/mutopia/J.S.Bach/Duette/viola-i.ly
@@ -8,12 +8,15 @@ enteredby =	 "jcn";
 copyright =	 "Public Domain";
 }
 
+\version "1.1.52";
+
 \include "global-i.ly"
 \include "violoncello-i.ly";
 
 $viola_i_staff = \context Staff = viola <
-	\notes\transpose c'' \$violoncello_i
-	\clef alto;
-	\$global_i
+  \property Staff.instrument = "viola"
+  %\property Staff.instrument = "violin"
+  \notes\transpose c'' \$violoncello_i
+  \clef alto;
+  \$global_i
 >
-\version "1.1.52";
diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly
new file mode 100644
index 0000000000..5ccd1a9f72
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/viola-ii.ly
@@ -0,0 +1,21 @@
+\header{
+filename =	 "viola-ii.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\include "global-ii.ly"
+\include "violoncello-ii.ly";
+
+$viola_ii_staff = \context Staff = viola <
+  \property Staff.instrument = "viola"
+  %\property Staff.instrument = "violin"
+  \clef alto;
+  \$global_ii
+  \notes\transpose c'' \$violoncello_ii
+>
+\version "1.1.52";
diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly
new file mode 100644
index 0000000000..66df2cd2ca
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/viola-part.ly
@@ -0,0 +1,43 @@
+\header{
+filename =	 "viola-part.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\version "1.1.52";
+
+\include "global-i.ly"
+\include "viola-i.ly"
+
+%{
+\score{
+  \$viola_i_staff
+  \paper{
+    \translator { \BarNumberingStaffContext }
+  }
+  \midi{
+%urg real/duration
+%    \tempo 4. = 69;
+    \tempo 4 . = 50;
+  }
+}
+%}
+
+\include "global-ii.ly"
+\include "viola-ii.ly"
+
+\score{
+  \$viola_ii_staff
+  \paper{
+    castingalgorithm=0.0;
+    \translator { \BarNumberingStaffContext }
+    \translator { \ScoreContext skipBars = 1; }
+  }
+  \midi{
+    \tempo 2 = 96;
+  }
+}
diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly
new file mode 100644
index 0000000000..8ee946729f
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violino-i.ly
@@ -0,0 +1,88 @@
+\header{
+filename =	"violino-i.ly";
+title =		 "Vier Duette";
+description =	"Four duets for Violino and Violoncello (Viola)";
+opus =		"BWV";
+composer =	"Johann Sebastian Bach (1685-1750)";
+enteredby =	"jcn";
+copyright =	"Public Domain";
+}
+
+\version "1.1.52";
+
+$violino_i = \notes\relative c'' {
+  \property Voice.beamAutoEnd = "3/8"
+  %% should fix autobeamer: not only check shortest type's end in beam,
+  %%% but also the newly added type's end
+  \property Voice."beamAutoEnd_8" = "1/16"
+  %r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'8 |
+  r4 r8 g16(fis e)d b'8 a r r g16(fis e)d c'8 |
+  b r r d16(b)a g(e')c d(b)a g(c)a c(b)a g(a)fis |
+  g d(e fis g a )b d(c b c a )b g(a b c d )e g()fis e(d)cis |
+  a'd,(e fis g a )b a(g fis g e )fis a(g fis e )d 
+  %%cis d e fis <g8 { \grace a, } { \grace d, } >~|
+  cis d e fis <g8 a, d,>~|
+%5
+  %%<\grace a,16 \grace d, g'16 > e(fis)d cis d 
+  <g16 a, d,> e(fis)d cis d 
+  g,8 <f'4~g, g,> f16 d(e)c b c fis,!8 <e'4 fis,>~|
+  <e16 fis,> c(d)b a b e, b'(c)a g a d, a'(b)g fis g c, g'(a)fis e fis |
+  b,(d)e fis(g)a b(d)c b(a)g fis(g)a b(c)d e(a)g fis e d |
+  g d(e)fis g a b g(fis)g c, a' b, g'(fis)g a, c fis, g(a)b <c8( d, a>~|
+  <c d, a> )b r [d16(b a)g] e'8 d r r [c16(b a)g] g'8 | 
+%10
+  <fis a, d,> r r g16(fis)e d(b')g a(fis)e d(g)e g(fis)e d(e)cis |
+  <d4. d,>~<d16 d,> fis,(g e d)e <c'!4. d,>~<c16 d,> e,(fis d cis)d |
+  <b'4. g g,>~<b16 g g,> e,(dis)e fis g a8 b <c fis,>~ <c16 fis,> b(a)g fis e |
+  [dis e fis g] <a8 fis>~<a16 fis> fis(g)e d e b e(g)e dis e b e(g)e d e |
+  [cis d e fis] <g8 a,>~<g16 a,> e(fis)d cis d a d(fis)d cis d a d(fis)d c d |
+%15
+  [b c d e] <f8 g,>~<f16 g,> e(dis)e a e cis' a(gis)a dis a fis'8 [b,()a] |
+  g16 b(cis dis e fis )g b( a g fis e)dis cis( dis e fis g)a fis(e dis cis b |
+  )e g(fis)e a fis g b(a)g a fis g b(a)g fis e [dis()e fis()c] <a'8( b, fis b,>~|
+  <a b,> <)g b,> r [b,16(a g)fis] c'8 b r r [a16(g fis)e] e'8 |
+  dis8 r r e16 d(cis b g' e)fis d(cis b e cis)e d(cis b cis)ais |
+%20
+  <b4. d, g>~<b16 d,> ais( b d cis)e d8 [b()cis\prall] d [gis()b] |
+  <d,4. e,>~<d16 e,> gis,(a c! b)d <c8 e,> [a()b\prall] c [fis()a]|
+  <c,4. d,>~<c16 d,> a(b)g fis g e b'(c)a g a fis c'(d)b a b |
+  g d'(e)c b c a e'(s)d c d b8 <g'4 g, g,>~<g16 g,>c,(f! e d c |
+  )b c(f, a g f)e g(f e d c )g c(d e f g )a d(c)b a g |
+%25
+  c16 g a b c d e g(f)e f d e  c'(b)c a f g  c,(b)c <f8 g, g,>~|
+  <f16 g,> d(e)c b c fis8 a <c d, d,>~<c16 d, d,> c,(d)b a b e,8 <d'4 e,> ~|
+  <d16 e,> b(c)a gis a e' b(c)a g a fis' c(d)b a b g' d(e)c b c |
+  a' g(fis e d c)b d(c b a g)fis e'(d c b)a \breathe [g(fis e)d] b'8|
+  a r r r16 a, b c d(e)fis g a b c d [g,(fis e)d] c'8 | 
+%30
+  b r r r4 r8 r4 r8 d16 b(a g e')c|
+  d b(a g c a)b d(c f c a)b g(fis g a fis)g b(a g a fis|
+  )g e(d)c f d e g(f)e f d e f(g)a d, f e a(b)c e, g|
+  fis g(a)b e, g fis b(c)d fis, a g a(b)c fis, a g c(d)e g, b|
+  a g(a b c)d [c(b a)g] <f'8 g, g,> <e g, g,> r r d16(c b)a <g'8 a, d,> |
+%35
+  <fis a, d,> r r a16( fis e)d <c'8 a, d,> <b16 b, d, g,> g(a)b e,(g)c,
+  fis(g)a d,(fis|
+  )b, d(e)f b,(d)g, b(c)d g,(b)d, g(a)b d,(g)b, d(e)f b,(d|
+  )g,8 r r e'16(d c)b f'8 e r r g16(fis e)d c'8 |
+  <c4.\prall>~c16 b(a g)e' c()d b(a g)c a()c b(a)g
+  \context Staff<
+    %\context Voice { a16 f | g1. }
+    \context Voice { \property Voice.verticalDirection=1 a16 fis | g1. }
+    \context Voice=x { \property Voice.verticalDirection=-1 c,16 c | b1. }
+  >
+  \bar "|.";
+}
+
+\include "global-i.ly"
+
+$violino_i_staff = \context Staff = violino <
+  %urg
+  % \notes\property Voice.textStyle = "large" s4^"Moderato"
+  % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
+  % urg, timidity violino patches broken?
+  %\property Staff.instrument = "violin"
+  \property Staff.instrument = "viola"
+  \$violino_i
+  \$global_i
+>
diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly
new file mode 100644
index 0000000000..5cf92fde1d
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violino-ii.ly
@@ -0,0 +1,102 @@
+\header{
+filename =	"violino-ii.ly";
+title =		 "Vier Duette";
+description =	"Four duets for Violino and Violoncello (Viola)";
+opus =		"BWV";
+composer =	"Johann Sebastian Bach (1685-1750)";
+enteredby =	"jcn";
+copyright =	"Public Domain";
+}
+
+$violino_ii = \notes\relative c''{
+  R1*8 |
+  r2 e | 
+%10
+  fis a,|c8(b)a2 b8()cis|d e f2 e8()dis|e(b e)fis e(b e)g|
+  fis(b,fis')g fis(b,fis')a|
+%15
+  g(b,g')a g(b,g')b|fis(b,fis')g fis(b,fis')a|g fis e2 d4|cis bes'(a\prall)g|
+  bes, g'(f\prall)e|
+%20
+  g, e'(d\prall)cis|d8 g,(f)e d4 c'|b as'(g\prall)f|as, f'(e\prall)d|
+  f, d'(c\prall)b|
+%25
+  c8 f,(e)d c4 bes'(|)a8 g'(f)e f d a4~|a8 g(a)b g c e4| f,8(e'd)c d b f4~|
+  f8 e(f)g e g c4|
+%30
+  d,8(c'b)a b gis d4|d8 c(d)e c f e d|e4 a,2()gis4|a2 a'|c e,|
+%35
+  f8(e)d2 e8()fis|g a bes2 a8()gis|a(e a)b a(e a)c|b(e,b')c b(e,b')d|
+  c(e,c')d c(e,c')d|
+%40
+  b(e,b')c b(e,b')d| c(b)a2 gis4|a8()c b d c()b c a|e4 fis g fis8()e|fis4 gis a2~
+%45
+  a4 g8 fis g4 e~|e dis8 cis dis2\prall|e4 b' e2|e dis\prall|e4. d16(e f8)e d c|
+%50
+  b c d4. c8(b)a|gis a b4. a8(g)fis|gis()e gis a b()c d b|c()b a b c()d es c|
+  a b c4. b8(a)g|
+%55
+  fis g a4.g8(fis)e| fis()d fis g a()b c a|b()a g a b()c d b|c4 e()a, c(|
+  )fis, g8 a b4 g(|
+%60
+  )a c()fis, a(|)d, e8 fis g4 e(|)fis a()dis, fis(|)b, cis8 dis e2~|
+  e4 d8 cis d2~|
+%65
+  d4 e8 fis g2(|)g4 f8 e f2~|f4 g8 a bes2~|bes4 a8 gis a2~|
+  a gis\prall|
+%70
+  a e'|f a,|c8(b)a2 b8()cis|d e f2 e8()dis|e(b e)fis e(c)e g|
+%75
+  fis(b,fis')g fis(b,fis')a|g(b,g')a g(b,g')b|fis(b,fis')g fis(b,fis')a|
+  g\prall b,(e)fis g()a b()g|e f g4. f8(e)d|
+%80
+  cis d e4. d8(c)b|cis a cis d e()f g()e|f e d cis d4 c|b as'(g\prall)f|
+  as, f'(e\prall)d|
+%85
+  f, d'(c\prall)b| c8(g)c d c fis,(a)c|b(dis,)b' c b f,(b')d|
+  cis(a)cis dis e g,(c)e|d(f,)d' es d g,(d')f|
+%90
+  e(c)e fis g bes,(es)g|f(a,)f' g f bes,(d)f|e(gis,)e' f e a,(e')g|
+  f()g f e d()c b a|gis e()fis()g e gis a b|
+%95
+  c2 e,|f8 e(d)cis d e fis gis|a e a2 gis4(|)a b()c b8 a|b4()cis <d2 d,>~|
+%100
+  <d4 d,> c8 b c4 <a a,>~|<a a,> gis8 fis g2\prall|
+  <a2 e a,> <e' a,> <a a,> <a c,>|
+  %<a2 b, d4><gis\prall b,4 d>|
+  \context Staff<
+    \context Voice { 
+      \property Voice.verticalDirection=1
+      <a2 b,>gis\prall|a8 g f4~f8 e(d)cis|
+%105
+      d c bes4~bes8 a(gis)fis|gis4 e <e' a,><f a,>|
+      %c2 b()\grace a|
+      c2 b|
+      a1|
+    }
+    \context Voice=x { 
+      \property Voice.verticalDirection=-1
+      d,4 s<b4 d>s|<a2 d> s2|
+%105
+      <d g,> s2|s1|
+      %e2 d ()\grace c|
+      e2 d|
+      c1|
+    }
+  >
+  \bar "|.";
+}
+
+\include "global-ii.ly"
+
+$violino_ii_staff = \context Staff = violino <
+  %urg
+  % \notes\property Voice.textStyle = "large" s4^"Moderato"
+  % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
+  % urg, timidity violino patches broken?
+  %\property Staff.instrument = "violin"
+  \property Staff.instrument = "viola"
+  \$violino_ii
+  \$global_ii
+>
+\version "1.1.52";
diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly
new file mode 100644
index 0000000000..f53fc6ff25
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violino-part.ly
@@ -0,0 +1,43 @@
+\header{
+filename =	 "violino-part.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\version "1.1.52";
+
+\include "global-i.ly"
+\include "violino-i.ly"
+
+%{
+\score{
+  \$violino_i_staff
+  \paper{
+    \translator { \BarNumberingStaffContext }
+  }
+  \midi{
+%    \tempo 4. = 69;
+    \tempo 4 . = 50;
+  }
+}
+%}
+
+\include "global-ii.ly"
+\include "violino-ii.ly"
+
+\score{
+  \$violino_ii_staff
+  \paper{
+    \translator { \BarNumberingStaffContext }
+    castingalgorith=0;
+  }
+  \midi{
+%    \tempo 4. = 69;
+    \tempo 4 . = 50;
+  }
+}
+
diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly
new file mode 100644
index 0000000000..856c58db74
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violino-viola.ly
@@ -0,0 +1,52 @@
+\header{
+filename =	 "violino-viola.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\version "1.1.52";
+
+\include "violino-i.ly";
+\include "viola-i.ly";
+
+\score{
+  \context GrandStaff <
+    \$violino_i_staff
+    \$viola_i_staff
+  >
+  \paper{
+    \translator {
+      \OrchestralScoreContext
+    }
+  }
+  \midi{
+%urg real/duration
+%    \tempo 4. = 69;
+    \tempo 4 . = 50;
+  }
+}
+
+
+\include "violino-ii.ly";
+\include "viola-ii.ly";
+
+\score{
+  \context GrandStaff <
+    \$violino_ii_staff
+    \$viola_ii_staff
+  >
+  \paper{
+    \translator {
+      \OrchestralScoreContext
+    }
+  }
+  \midi{
+%    \tempo 2 = 96;
+    \tempo 2 = 75;
+  }
+}
+
diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly
new file mode 100644
index 0000000000..449f317748
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly
@@ -0,0 +1,50 @@
+\header{
+filename =	 "violino-violoncello.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\version "1.1.52";
+
+\include "violino-i.ly";
+\include "violoncello-i.ly";
+
+\score{
+  \context GrandStaff <
+    \$violino_i_staff
+    \$violoncello_i_staff
+  >
+  \paper{
+    \translator {
+      \OrchestralScoreContext
+    }
+  }
+  \midi{
+%urg, real/duration
+%    \tempo 4. = 69;
+    \tempo 4 . = 50;
+  }
+}
+
+\include "violino-ii.ly";
+\include "violoncello-ii.ly";
+
+\score{
+  \context GrandStaff <
+    \$violino_ii_staff
+    \$violoncello_ii_staff
+  >
+  \paper{
+    \translator {
+      \OrchestralScoreContext
+    }
+  }
+  \midi{
+    \tempo 2 = 96;
+  }
+}
+
diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly
new file mode 100644
index 0000000000..9b42424dad
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly
@@ -0,0 +1,71 @@
+\header{
+filename =	"violoncello-i.ly";
+title =		"Vier Duette";
+description =	"Four duets for Violino and Violoncello (Viola)";
+opus = 		"BWV";
+composer =	"Johann Sebastian Bach (1685-1750)";
+enteredby =	"jcn";
+copyright =	"Public Domain";
+}
+
+\version "1.1.52";
+
+$violoncello_i = \notes\relative c{
+  \property Voice.beamAutoEnd = "3/8"
+  g8()a d, g b()g d()fis a d a()fis |
+  g()d b' g b()c b()e fis g d()d, |
+  g r r [d'16(b a )g] e'8 d r r [c16(b a )b] g'8 |
+  fis r r g16 fis( e d b' g )a fis( e d g)e g fis( e d e)cis |
+%5
+  d8 d'()a b16 c(d)b g b c,8 c'()g a16 b(c)a fis a |
+  b,8()b' fis g a()e fis g()d e fis()d |
+  g r r g,16(fis e)d b'8 a r r g16(fis e )d c'8 |
+  b r r d16 b(a)g e' c d b(a)g c a c b(a)g a fis |
+  g d( e fis g a )b d(c b c )a b g(a b c b )e g( fis e d cis |
+%10
+  )a'16 d,( e fis g a)b a(g fis g e)fis a(g fis e d)cis d(e)fis g8~ |
+  g16 e(fis)d cis d b'4.~b16 d,(e)c b c a'4.~|
+  a16 fis(g)e dis e c'4.~c16 b(a)g fis e dis8(e)c |
+  b b'16(a g)fis e8 e,()fis g()b a g e()e' |
+  a,16 b(cis)d e cis d8 d,()e fis a()g fis d()d' |
+%15
+  g,16(a b)c! d b c8 c'()fis, a dis,()fis b,16 cis(dis e)fis d |
+  e8 e, r [e'16( dis cis)b] g'8 fis r r [e16(dis cis)b] a'8 |
+  g r r b16 g(fis)e c'! a b g(fis)e a fis a g(fis)e fis dis |
+  e b(cis dis)e fis g b(a)g a fis g e(fis)g a b cis e(dis)c b ais |
+  fis b,(cis)dis e fis g fis(e)d e cis d8()d, g' e fis()fis,|
+%20
+  b16 fis'(gis)ais b cis d cis(d)b ais b fis b(d)b ais b f b(d)b a b |
+  e, b'(e)d c b a b(c)a gis a e a(c)a gis a es a(c)a g a|
+  d, a'(d)c b a g8()g, b c a()c d()b d |
+  e c()e f g, f'~f16 e(f b, a)b e8()a f |
+  g g, r [c16(b a)g] e'8 d r r [c16(b a)g] f'8|
+%25
+  e r r g16 e(d)c a' f g e(d)c f d f e(d)c d b |
+  c8 c'()g a16 b(c)a g fis b8 b,()fis' gis16 a(b)g fis e |
+  a,8()a' b c b()c d()b d e [c()a]|
+  fis()d r [g16(fis e)d] b'8 a r r b16 d(c)b a g |
+  e e'(d)c b a [g(fis e)d] c'8 b r r r16 b, c d e fis |
+%30
+  g a(b c d)e d b(a g e')c d b(a g c)a b d(c b c)a|
+  b g(fis e a fis)g b(a g a fis)g b(a g c a)b g(fis e fis dis|
+  )e g(f)e a fis g e(d)c d c c8()c' b c a()c |
+  d,()d' cis d b()d e,()e' dis e c()e |
+  fis,()e d g [c,16(b a)g] c g'(a c b)d e8 [d,16(cis b)a]|
+%35
+  d a'(b cis d)e fis8 [g,16( fis e)d] g8()e c a d()d,|
+  g r r r16 d''(e)f b,(d)g, b(c)d g,(b)d, f(g)a d,(f|
+  )b, d(e)f b,(d)g,8 a()b c16 d(e f g a)b d(c b a)g|
+  fis [a(g)fis e d] g8()e c g'8 b, e c d d, |
+  g1.|
+  \bar "|.";
+}
+
+\include "global-i.ly"
+
+$violoncello_i_staff = \context Staff = violoncello <
+  \property Staff.instrument = "cello"
+  \$violoncello_i
+  \clef bass;
+  \$global_i
+>
diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly
new file mode 100644
index 0000000000..19f5dfacfa
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly
@@ -0,0 +1,78 @@
+\header{
+filename =	"violoncello-ii.ly";
+title =		"Vier Duette";
+description =	"Four duets for Violino and Violoncello (Viola)";
+opus = 		"BWV";
+composer =	"Johann Sebastian Bach (1685-1750)";
+enteredby =	"jcn";
+copyright =	"Public Domain";
+}
+
+\version "1.1.52";
+
+$violoncello_ii = \notes\relative c{
+  r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis|
+%5
+  a(e)a b a(e)a c|b(e,b')c b(e,b')d|c(e,c')d c(e,c')e|b(e,b')c b(e,b')d|
+  c(b)a2 gis4|
+%10
+  a8()c b d c()b c a|e4 fis g fis8()e|fis4 gis a2~|a4 g8(fis)g4 e~|
+  e dis8 cis dis2\prall|
+%15
+  e4 b' e2~|e dis\prall|e4 e,8()fis g a bes g|e f g4. f8(e)d|cis d e4.d8(cis)b|
+%20
+  cis()a cis d e()f g e|f()e d e f()g as f|d e f4. e8(d)c|b c d4. c8(b)a|
+  b()g b c d()e f d|
+%25
+  e()d c d e()f g e|f4 a()d, f(|)b, c8 d e4 c(|)d f()b, d(|)a a8 b c4 a(|
+%30
+  )b d()gis, b(|)e, fis8()gis a4 b|c2 e,|f8 e d4~d8 e(fis)gis|a e a2 gis4|
+%35
+  a b c b8()a|b4 c d2~|d4 c8 b c4 a~|a gis8 gis gis2\prall|a4 e' a2~|
+%40
+  a gis\prall|a e|f a,|c8(b)a2 b8 cis|d()e f2 e8()dis|
+%45
+  e(b e)fis e(b e)g|fis(b,fis')g fis(b,fis')a|g(b,g')a g(b,g')b|
+  fis(b,fis')g fis(b,fis')a|g(fis)e2 fis4|
+%50
+  gis f'!(e\prall)d |f, d'(c\prall)b|d, b'(a\prall)gis|a8 d,(c)b a4 g'|
+  fis es'(d\prall)c|
+%55
+  es, c'(b\prall)a|c, a'(g\prall)fis|g8 c,(b)a g4 f'(|)e8 e'(c)b c()a e4~|
+  e8 d e fis d()g b4|
+%60
+  c,8(b'a)g a()fis c4~|c8 b c d b()d g4|a,8(g'fis)e fis()dis a4~|
+  a8 g a b g d' e g|fis(ais,fis')g fis(b,fis')g|
+%65
+  gis(e gis)ais b(e,g)b|a(cis,a')bes a(d,a')c|b(g c)cis d f,(bes)d|
+  c e,(c')d c f,(a)c|b d,(b')c b e,(b')d|
+%70
+  c a(c)e c a()b gis(|)a c(b)d c b(c)a|e4 fis g fis8()e|fis4 gis a2~|
+  a4 g8 fis g4 e~|
+%75
+  e dis8 cis dis2\prall|e4 b' e2~|e dis\prall|e r4 d|cis bes(a\prall)g|
+%80
+  bes, g'(()f\prall)e|g, e'(()d\prall)cis|d8()a d e f g as f|d e f4.(e8 d)c|
+  b c d4.(c8 b)a|
+%85
+  b()g b c d()e b d|e4 e, a2~|a4 g8 fis g2~|g4 a8 b c2~|c4 bes8 a bes2~|
+%90
+  bes4 c8 d es2~|es4 d8 cis d2~|d cis\prall|d4 e f d|e d' c b|
+%95
+  a8()e a2 gis4\prall| a2 b|c e,|c8(e)d2 e8()fis|g a bes2 a8()gis|
+%100
+  a(e a)b a(e a)c| b(e,b')c b(e,b')d|c(e,c')d c(e,c')e|
+  b(e,b')c b(e,b')d| c(a b)cis d()e f g|
+%105
+  f e d cis d4 d,~|d c8 b c4 d|e d e e,|<e'1 a,>
+  \bar "|.";
+}
+
+\include "global-ii.ly"
+
+$violoncello_ii_staff = \context Staff = violoncello <
+  \property Staff.instrument = "cello"
+  \$violoncello_ii
+  \clef bass;
+  \$global_ii
+>
diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly
new file mode 100644
index 0000000000..bdac62748d
--- /dev/null
+++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly
@@ -0,0 +1,43 @@
+\header{
+filename =	 "violoncello-part.ly";
+title =	 	 "Vier Duette";
+description =	 "Four duets for Violino and Violoncello (Viola)";
+opus =           "BWV";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "Public Domain";
+}
+
+\version "1.1.52";
+
+\include "global-i.ly"
+\include "violoncello-i.ly"
+
+%{
+\score{
+  \$violoncello_i_staff
+  \paper{
+    \translator { \BarNumberingStaffContext }
+  }
+  \midi{
+%urg, real/duration
+%    \tempo 4. = 69;
+    \tempo 4 . = 69;
+  }
+}
+%}
+
+\include "global-ii.ly"
+\include "violoncello-ii.ly"
+
+\score{
+  \$violoncello_ii_staff
+  \paper{
+    castingalgorithm=0.;
+    \translator { \BarNumberingStaffContext }
+  }
+  \midi{
+    \tempo 2 = 96;
+  }
+}
+
diff --git a/mutopia/J.S.Bach/GNUmakefile b/mutopia/J.S.Bach/GNUmakefile
index c7e99a35d2..bb33ed42dd 100644
--- a/mutopia/J.S.Bach/GNUmakefile
+++ b/mutopia/J.S.Bach/GNUmakefile
@@ -1,8 +1,8 @@
-# mutopia/J.S.Bach/Makefile
+# mutopia/J.S.Bach/GNUmakefile
 
 depth = ../..
 
-SUBDIRS = Petites-Preludes Solo-Cello-Suites Cembalo-Partitas
+SUBDIRS = Petites-Preludes Solo-Cello-Suites Cembalo-Partitas Duette
 EXTRA_DIST_FILES=
 
 
diff --git a/mutopia/J.S.Bach/viola-part.ly b/mutopia/J.S.Bach/viola-part.ly
deleted file mode 100644
index a7fe1b4915..0000000000
--- a/mutopia/J.S.Bach/viola-part.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\header{
-filename =	 "viola-part.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-\include "global-i.ly"
-\include "viola-i.ly"
-
-\score{
-	\$viola_i_staff
-	\paper{
-		\translator { \BarNumberingStaffContext }
-	}
-	\midi{
-%urg
-%		\tempo 4. = 69;
-		\tempo 4 . = 69;
-	}
-}
-
diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly
deleted file mode 100644
index 1c4a2d1618..0000000000
--- a/mutopia/J.S.Bach/violino-i.ly
+++ /dev/null
@@ -1,40 +0,0 @@
-\header{
-filename =	 "violino-i.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-$violino_i = \notes\relative c'' {
-	r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'8 |
-	b r r [d16(b)a g(e')c][d(b)a g(c)a][c(b)a g(a)fis] |
-	[g d(e fis g a][)b d(c b c a][)b g(a b c d][)e g()fis e(d)cis] |
-	[a'd,(e fis g a][)b a(g fis g e][)fis a(g fis e )d]
-	% [cis d e fis <g8 a,\grace d,\grace>] ~ |
-	[cis d e fis <g8 a, d,>] ~ |
-	%[<g16 a,\grace d,\grace> e(fis)d cis d]
-	[<g16 a, d,> e(fis)d cis d] 
-	g,8 <f'4 ~ g, g,> [f16 d(e)c b c]
-	fis,8 <e'4 f,> ~ |
-	[<e16 f,> c(d)b a b][e, b'(c)a g a][d, a'(b)g fis g][c, g'(a)fis e fis] |
-	[b,(d)e fis(g)a][b(d)c b(a)g][fis(g)a b(c)d][e(a)g fis e d] |
-	[g d(e)fis g a][b g(fis)g c, a'][b, g'(fis)g a, c]
-	[fis, g(a)b <c8( d, a>] ~
-	[<c d, a> )b] r [d16(b a)g] e'8 d r r [c16(b a)g] g'8 | <fis a, d,>
-}
-
-\include "global-i.ly"
-
-$violino_i_staff = \context Staff = violino <
-	<
-		%urg
-		% \notes\property Voice.textStyle = "large" s4^"Moderato"
-		% \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
-		\$violino_i
-	>
-	\$global_i
->
-\version "1.1.52";
diff --git a/mutopia/J.S.Bach/violino-part.ly b/mutopia/J.S.Bach/violino-part.ly
deleted file mode 100644
index de5a179747..0000000000
--- a/mutopia/J.S.Bach/violino-part.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\header{
-filename =	 "violino-part.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-\include "global-i.ly"
-\include "violino-i.ly"
-
-\score{
-	\$violino_i_staff
-	\paper{
-		\translator { \BarNumberingStaffContext }
-	}
-	\midi{
-%urg
-%		\tempo 4. = 69;
-		\tempo 4 . = 69;
-	}
-}
-
diff --git a/mutopia/J.S.Bach/violino-viola.ly b/mutopia/J.S.Bach/violino-viola.ly
deleted file mode 100644
index e79ff409c0..0000000000
--- a/mutopia/J.S.Bach/violino-viola.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-\header{
-filename =	 "violino-viola.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-\include "violino-i.ly";
-\include "viola-i.ly";
-
-\score{
-	\context GrandStaff <
-		\$violino_i_staff
-		\$viola_i_staff
-	>
-	\paper{
-		\translator {
-%			\BarNumberingStaffContext
-%			\BarNumberingScoreContext
-			\OrchestralScoreContext
-		}
-	}
-	\midi{
-%urg
-%		\tempo 4. = 69;
-		\tempo 4 . = 69;
-	}
-}
-
-\version "1.1.52";
diff --git a/mutopia/J.S.Bach/violino-violoncello.ly b/mutopia/J.S.Bach/violino-violoncello.ly
deleted file mode 100644
index d7431f1dc9..0000000000
--- a/mutopia/J.S.Bach/violino-violoncello.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-\header{
-filename =	 "violino-violoncello.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-\include "violino-i.ly";
-\include "violoncello-i.ly";
-
-\score{
-	\context GrandStaff <
-		\$violino_i_staff
-		\$violoncello_i_staff
-	>
-	\paper{
-		\translator {
-%			\BarNumberingStaffContext
-%			\BarNumberingScoreContext
-			\OrchestralScoreContext
-		}
-	}
-	\midi{
-%urg
-%		\tempo 4. = 69;
-		\tempo 4 . = 69;
-	}
-}
-
-\version "1.1.52";
diff --git a/mutopia/J.S.Bach/violoncello-i.ly b/mutopia/J.S.Bach/violoncello-i.ly
deleted file mode 100644
index bae5e6dab9..0000000000
--- a/mutopia/J.S.Bach/violoncello-i.ly
+++ /dev/null
@@ -1,31 +0,0 @@
-\header{
-filename =	 "violoncello.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-$violoncello_i = \notes\relative c{
-	[g8()a d,][g b()g][d()fis a][d a()fis]|
-	[g()d b'][g b()c][b()e fis][g d()d,] |
-	g r r [d'16(b a )g] e'8 d r r [c16(b a )b]g'8 |
-	fis r r [g16 fis( e d b' g][)a fis( e d g)e][g fis( e d e)cis] |
-	[d8 d'()a][b16 c(d)b g b][c,8 c'()g][a16 b(c)a fis a] |
-	[b,8()b' fis][g a()e][fis g()d][e fis()d] |
-	g r r [g,16(fis e)d] b'8 a r r [g16(fis e )d]c'8 |
-	b r r [d16 b(a)g e' c][d b(a)g c a][c b(a)g a fis] |
-	[g d( e fis g a][)b d(c b c )a][b g(a b c b][)e g( fis e d cis] |
-	)a'16
-}
-
-\include "global-i.ly"
-
-$violoncello_i_staff = \context Staff = violoncello <
-	\$violoncello_i
-	\clef bass;
-	\$global_i
->
-\version "1.1.52";
diff --git a/mutopia/J.S.Bach/violoncello-part.ly b/mutopia/J.S.Bach/violoncello-part.ly
deleted file mode 100644
index bf1d8f0232..0000000000
--- a/mutopia/J.S.Bach/violoncello-part.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\header{
-filename =	 "violoncello-part.ly";
-title =	 	 "Vier Duette";
-description =	 "Four duets for Violino and Violoncello (Viola)";
-opus =           "BWV";
-composer =	 "Johann Sebastian Bach (1685-1750)";
-enteredby =	 "jcn";
-copyright =	 "Public Domain";
-}
-
-\include "global-i.ly"
-\include "violoncello-i.ly"
-
-\score{
-	\$violoncello_i_staff
-	\paper{
-		\translator { \BarNumberingStaffContext }
-	}
-	\midi{
-%urg
-%		\tempo 4. = 69;
-		\tempo 4 . = 69;
-	}
-}
-
diff --git a/ps/lily.ps b/ps/lily.ps
index 75991aa5f0..3eeb87484a 100644
--- a/ps/lily.ps
+++ b/ps/lily.ps
@@ -18,9 +18,9 @@
         closepath fill
 } bind def
 
-/draw_decrescendo % width height cons
+/draw_decrescendo %  width height cons thick
 {
-	stafflinethickness setlinewidth
+	setlinewidth
 	/cresc_cont exch def
 	/cresc_ht exch def
 	/cresc_wd exch def
@@ -33,9 +33,9 @@
 	stroke
 } bind def
 
-/draw_crescendo % width height cons
+/draw_crescendo % width height cons thick
 {
-	stafflinethickness setlinewidth
+	setlinewidth
 	/cresc_cont exch def
 	/cresc_ht exch def
 	/cresc_wd exch def
@@ -99,9 +99,9 @@
 } bind def
 
 % this is for drawing slurs.
-/draw_bezier_sandwich 
+/draw_bezier_sandwich  % thickness 
 {
-	stafflinethickness setlinewidth
+	setlinewidth
 	moveto
 	curveto
 	lineto
diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 9a369e9d51..6f2666422e 100644
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -3,13 +3,11 @@
 % hmm
 /setgray { 1 add } bind def
 
-% urg
-1 /stafflinethickness exch def
+/stafflinethickness  mudelapaperstaffline def
+/staffheight mudelapaperstaffheight def
 
 /xoffset 30 def
 /yoffset 700 def
-/staffrulethickness 1 def
-/staffheight 20 def
 
 /placebox
 {
@@ -22,151 +20,29 @@
 	grestore
 } bind def
 
-/setbold % '(' text ')'
-{
-	settext
-} bind def
- 
-/settext % '(' text ')'
-{
-	gsave
-	% urg
-	/Times-Roman findfont 12 scalefont setfont
-	show
-	grestore
-} bind def
-
-/setfinger % '(' text ')'
-{
-	gsave
-	% urg
-	/feta-nummer5 findfont 12 scalefont setfont
-	show
-	grestore
-} bind def
-
-/setitalic % '(' text ')'
-{
-	gsave
-	% urg
-	/Times-Italic findfont 12 scalefont setfont
-	show
-	grestore
-} bind def
-
-/vrule % width depth height
-{
-} bind def
-
-
 %
 % FIXME.  translate to middle of box.
 %
 
 /draw_box % breapth width depth height
 {
+	/h exch def
+	/d exch def
+	/w exch def
+	/b exch def
 	gsave
-	4 -1 roll
-	dup
-	neg 0 translate
-	4 -1 roll
-	add
-
-	setlinewidth
 
-	0 exch moveto
-	neg 0 exch lineto stroke
-
-	grestore
-} bind def
+	0 setlinewidth
+	b neg d neg rmoveto
+	b w add 0 rlineto
+	0 d h add rlineto
+	b w add neg 0 rlineto
+	closepath % 0 d h add neg rlineto
+	fill
 
-/extender % width
-{
-	gsave
-	0 0 moveto
-	stafflinethickness 0.8 mul setlinewidth
-	0 lineto stroke
 	grestore
 } bind def
 
-/widthbar % height width
-{
-	gsave
-	setlinewidth
-	2 div dup neg 0 exch moveto
-	0 exch lineto stroke
-	2 div
-	grestore
-} bind def
-
-/thickbar % height
-{
-	stafflinethickness 2 mul widthbar
-} bind def
-
-/thinbar % height
-{
-	stafflinethickness 1.6 mul widthbar
-} bind def
-
-/maatstreep % height
-{
-	thinbar
-} bind def
-
-/fatdoublebar
-{
-	thickbar
-} bind def
-
-/finishbar
-{
-	thickbar
-} bind def
-
-/generalmeter % num den
-{
-	pop pop
-} bind def
-
-/pianobrace % '(' char ')'
-{
-	gsave
-	/feta-braces20 findfont 12 scalefont setfont%
-	show
-	grestore
-} bind def
-
-/doublebar
-{
-	thinbar
-} bind def
-
-/repeatbar
-{
-	thickbar
-} bind def
-
-/repeatbarstartrepeat
-{
-	thickbar
-} bind def
-
-/startbar
-{
-	thickbar
-} bind def
-
-/startrepeat
-{
-	thickbar
-} bind def
-
-/stoprepeat
-{
-	thickbar
-} bind def
-
 /start_line
 { 
 	gsave
@@ -181,7 +57,7 @@
 	grestore
 	yoffset add /yoffset exch def
 	% urg...
-	yoffset staffheight 8 mul sub /yoffset exch def
+	yoffset mudelapaperstaffheight 8 mul sub /yoffset exch def
 } bind def
 
 /unknown { (U) setbold } bind def
diff --git a/scm/lily.scm b/scm/lily.scm
index dbc8381e43..003a92a639 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -206,19 +206,22 @@
     (embedded-ps ((ps-scm 'crescendo) w h cont)))
 
   (define (char i)
-    (string-append "\\show{" (inexact->string i 10) "}"))
+    (string-append "\\char" (inexact->string i 10) " "))
   
   (define (decrescendo w h cont)
     (embedded-ps ((ps-scm 'decrescendo) w h cont)))
 
+   ;This sets CTM so that you get to the currentpoint
+  ; by executing a 0 0 moveto
+       
   (define (embedded-ps s)
-    (string-append "\\embeddedps{" s "}"))
+    (string-append "\\special{ps: @beginspecial @setspecial " s " @endspecial}"))
 
   (define (end-output) 
     "\n\\EndLilyPondOutput")
   
   (define (experimental-on)
-    "\\turnOnExperimentalFeatures")
+    "")
 
   (define (font-switch i)
     (string-append
@@ -228,11 +231,19 @@
     (string-append
      "\\font" (font-switch i) "=" s "\n"))
 
-  (define (generalmeter num den)
-    (string-append 
-     "\\generalmeter{" (number->string (inexact->exact num)) "}{" (number->string (inexact->exact den)) "}"))
-
-  (define (header-end) "\\turnOnPostScript")
+  ;; UGH
+   
+  (define (header-end) (string-append
+"\\special{!"
+"/stafflinethickness \\mudelapaperstaffline0 def " ;may we burn in hell.
+"/interline \\mudelapaperinterline0 %\n def "
+"interline 3 div /bracket_b exch def "
+"interline 2 mul /bracket_w exch def "
+"stafflinethickness 2 mul /bracket_t exch def "
+"interline 1.5 mul /bracket_v exch def "
+"bracket_v /bracket_u exch def "
+"50 /bracket_alpha exch def "
+"1 setlinecap}"))
 
   (define (header creator generate) 
     (string-append
@@ -269,17 +280,17 @@
      "\\placebox{"
      (number->dim y) "}{" (number->dim x) "}{" s "}"))
 
-
-  ;;;; UGH! Junk \\bracefont !
-  (define (pianobrace y)
-    (define step 1.0)
-    (define minht (* 2 mudelapaperstaffheight))
-    (define maxht (* 7 minht))
-    (string-append
-     "{\\bracefont " (char (max
-			    0
-			    (/  (- (min y (- maxht step)) minht) step))) "}"))
-
+  ;;;;
+  (define (pianobrace y staffht)
+    (let* ((step 1.0)
+	   (minht (* 2 staffht))
+	   (maxht (* 7 minht))
+	   )
+      (string-append
+       (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))))
+       (char (max 0 (/  (- (min y (- maxht step)) minht) step))))
+      )
+    )
 
 
   (define (rulesym h w) 
@@ -290,8 +301,8 @@
      )
     )
 
-  (define (bezier-sandwich l)
-    (embedded-ps ((ps-scm 'bezier-sandwich) l)))
+  (define (bezier-sandwich l thick)
+    (embedded-ps ((ps-scm 'bezier-sandwich) l thick)))
 
 
   (define (start-line ht)
@@ -310,8 +321,6 @@
      "depth " (number->dim depth)
      "height " (number->dim height) " "))
 
-
-
   (define (text s)
     (string-append "\\hbox{" (output-tex-string s) "}"))
   
@@ -338,7 +347,6 @@
 	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
 	    (define header-end ,header-end)
 	    (define lily-def ,lily-def)
 	    (define header ,header) 
@@ -366,7 +374,6 @@
 	((eq? action-name 'experimental-on) experimental-on)
 	((eq? action-name 'font-def) font-def)
 	((eq? action-name 'font-switch) font-switch)
-	((eq? action-name 'generalmeter) generalmeter)
 	((eq? action-name 'header-end) header-end)
 	((eq? action-name 'lily-def) lily-def)
 	((eq? action-name 'header) header) 
@@ -432,9 +439,9 @@
   (define (char i)
     (invoke-char " show" i))
 
-  (define (crescendo w h cont)
+  (define (crescendo w h cont thick)
     (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
+     (numbers->string (list w h (inexact->exact cont) thick))
      " draw_crescendo"))
 
   (define (dashed-slur thick dash l)
@@ -446,9 +453,9 @@
      (number->string (* 2 thick))
      " ] 0 draw_dashed_slur"))
 
-  (define (decrescendo w h cont)
+  (define (decrescendo thick w h cont)
     (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
+     (numbers->string (list w h (inexact->exact cont) thick))
      " draw_decrescendo"))
 
 
@@ -471,17 +478,15 @@
   (define (font-switch i)
     (string-append (font i) " "))
 
-  (define (generalmeter num den)
-    (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter "))
-
   (define (header-end) "")
   (define (lily-def key val)
 
-     (if (string=? (substring  key 0 (string-length "mudelapaper") ) "mudelapaper")
+     (if (string=? (substring key 0 (min (string-length "mudelapaper") (string-length key))) "mudelapaper")
 	 (string-append "/" key " {" val "} bind def\n")
 	 (string-append "/" key " (" val ") def\n")
 	 )
      )
+
   (define (header creator generate) 
     (string-append
      "%!PS-Adobe-3.0\n"
@@ -498,19 +503,29 @@
   (define (placebox x y s) 
     (string-append 
      (number->string x) " " (number->string y) " {" s "} placebox "))
-  (define (pianobrace y)
-    ""
+
+  (define (pianobrace y staffht)
+    (let* ((step 1.0)
+	   (minht (* 2 staffht))
+	   (maxht (* 7 minht))
+	   )
+      (string-append
+       (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))))
+       (char (max 0 (/  (- (min y (- maxht step)) minht) step))))
+      )
     )
 
+
   (define (rulesym x y) 
     (string-append 
      (number->string x) " "
      (number->string y) " "
      " rulesym"))
 
-  (define (bezier-sandwich l)
+  (define (bezier-sandwich l thick)
     (string-append 
-     (apply string-append (map control->string l)) 
+     (apply string-append (map control->string l))
+     (number->string  thick)
      " draw_bezier_sandwich"))
 
   (define (start-line height)
@@ -561,7 +576,6 @@
 	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
 	    (define pianobrace ,pianobrace)
 	    (define header-end ,header-end)
 	    (define lily-def ,lily-def)
diff --git a/scm/script.scm b/scm/script.scm
index fbeeae8615..534cffef89 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -35,7 +35,7 @@
 	("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0))
 	("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0))
 	("segno" . ((feta . ("segno" . "segno")) #f 0 1 0))
-	("wheel" . ((feta . ("wheel" . "wheel")) #f 0 1 0)))
+	("coda" . ((feta . ("coda" . "coda")) #f 0 1 0)))
       script-alist)
       )
 
diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index f7a68585e1..2c66ec21a4 100644
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -362,6 +362,30 @@ if 1:
 			    'deprecate \\grouping')
 
 
+if 1:
+	def conv(lines):
+		newlines =[]
+		for x in lines:
+			x =  re.sub ('\\\\wheel','\\\\coda', x)
+			newlines.append (x)
+		return newlines
+
+	conversions.append ((1,1,55), conv,
+			    '\\wheel -> \\coda')
+
+
+if 1:
+	def conv(lines):
+		newlines =[]
+		for x in lines:
+			x =  re.sub ('\\\\wheel','\\\\coda', x)
+			newlines.append (x)
+		return newlines
+
+	conversions.append ((1,1,55), conv,
+			    '\\wheel -> \\coda')
+
+
 
 ############################
 	
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 25da9f8fce..ddc1138316 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -270,7 +270,6 @@ class TeXOutput:
         this.write(top)
         this.__mudelaDefs('')
         this.write("""\
-\\cmrtwenty% ugh
 \\makelilytitle
 """) 
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index d579266f49..602d77213a 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1,5 +1,7 @@
 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/release.py b/stepmake/bin/release.py
index 780a172284..d614eb5cd3 100755
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -73,7 +73,3 @@ rel_pn = package.patch_dir + pn
 os.rename(pn, rel_pn)
 os.link(rel_pn, pn)
 
-# urg; this includes lilypond*.gz into yodl ball
-# os.system('tar cf ' + package.nickname + ' *gz')
-os.system('set -x; tar cf ' + package.nickname + ' ' + package.name + '*gz')
-
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 6a627fe2d5..5f4602b707 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -5,7 +5,8 @@ local-dist: configure
 
 local-distclean: 
 	rm -f config.h config.hh config.make Makefile GNUmakefile \
-		config.cache config.status config.log index.html
+		config.cache config.status config.log index.html \
+		afm tfm cmtfm share/locale/*/LC_MESSAGES/lilypond.mo
 
 local-maintainerclean:
 	rm -f configure
diff --git a/tex/dyndefs.tex b/tex/dyndefs.tex
deleted file mode 100644
index 92362ae2a6..0000000000
--- a/tex/dyndefs.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-% dyndefs.tex
-%
-%
-%%UGHGUHGUGHGGUGH JUNK THIS!
-%% 
-%\let\dyn\dynfont
-\def\dyn{\dynfont}
-
-\chardef\dynaf = 101
-\chardef\dynnf = 102
-\chardef\dynnp = 112
-\chardef\dynnm = 109
-\chardef\dynnr = 114
-\chardef\dynns = 115
-\chardef\dynnz = 122
-
-\def\dynm{\raise .2ex\hbox{\dynnm}}
-\def\dynmm{\raise .1ex\hbox{\dynnm}}
-\def\dynr{\raise .2ex\hbox{\dynnr}}
-\def\dyns{\raise .15ex\hbox{\dynns}}
-\def\dynz{\raise .15ex\hbox{\dynnz}}
-
-\def\kdynf{\dynnf\kern -0.1em}
-\def\kdynp{\dynnp\kern -0.05em}
-
-\def\dynp{{\dyn\dynnp}}
-\def\dynpp{{\dyn\kdynp\dynnp}}
-\def\dynppp{{\dyn\kdynp\kdynp\dynnp}}
-\def\dynpppp{{\dyn\kdynp\kdynp\kdynp\dynnp}}
-\def\dynppppp{{\dyn\kdynp\kdynp\kdynp\kdynp\dynnp}}
-\def\dynpppppp{{\dyn\kdynp\kdynp\kdynp\kdynp\kdynp\dynnp}}
-\def\dynmp{{\dyn\dynmm\kern -0.07em\dynnp}}
-\def\dynmf{{\dyn\dynm\kern -0.14em\dynnf}}
-\def\dynf{{\dyn\dynaf}}
-\def\dynff{{\dyn\kdynf\dynnf}}
-\def\dynfff{{\dyn\kdynf\kdynf\dynnf}}
-\def\dynffff{{\dyn\kdynf\kdynf\kdynf\dynnf}}
-\def\dynfffff{{\dyn\kdynf\kdynf\kdynf\kdynf\dynnf}}
-\def\dynffffff{{\dyn\kdynf\kdynf\kdynf\kdynf\kdynf\dynnf}}
-
-\def\dynfp{{\dyn\dynnf\kern -0.04em\dynnp}}
-\def\dynsp{{\dyn\dyns\kern -0.13em\dynnp}}
-\def\dynspp{{\dyn\dyns\kern -0.13em\kdynp\dynnp}}
-\def\dynsf{{\dyn\dyns\kern -0.13em\dynnf}}
-\def\dynsff{{\dyn\dyns\kern -0.13em\kdynf\dynnf}}
-\def\dynsfz{{\dyn\dynsf\dynz}}
-\def\dynfz{{\dyn\dynnf\dynz}}
-\def\dynrf{{\dyn\dynr\kern -0.1em\dynnf}}
-\def\dynfz{{\dyn\dynr\kern -0.1em\dynnf\dynz}}
-
-\endinput
diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 8fca01e38f..730b17a85b 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,132 +1,3 @@
 % fetdefs.tex
 % encapsulating tex backend for auto-generated feta definitions
-
-\def\placebox#1#2#3{%
-        \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
-
-%
-%
-% UGH! JUNKME!
-%
-\def\fetsixteendefs{%
-  \font\fetasixteen = feta16
-  \font\fetanummersixteen = feta-nummer8
-  \font\dynfontsixteen = feta-din10 scaled \magstep 1
-  \font\bracefontsixteen = feta-braces16
-  \font\fingerfontsixteen = feta-nummer4
-  \font\markfontsixteen = feta-nummer10
-  \font\fetanummerjsixteen = feta-nummer5
-\def\currentsize{sixteen}
-}
-
-\def\fettwentydefs{%
-  \font\fetatwenty = feta20
-  \font\fetanummertwenty = feta-nummer10
-  \font\dynfonttwenty = feta-din10 scaled \magstep 2
-  \font\bracefonttwenty = feta-braces20
-  \font\fingerfonttwenty = feta-nummer5
-  \font\markfonttwenty = feta-nummer12
-  \font\fetanummerjtwenty = feta-nummer7
-\def\currentsize{twenty}
-}
-
-\def\fettwentysixdefs{%
-  \font\fetatwentysix = feta26
-  \font\fetanummertwentysix = feta-nummer12
-  \font\dynfonttwentysix = feta-din10 scaled \magstep 3
-  \font\bracefonttwentysix = feta-braces16
-  \font\fingerfonttwenty = feta-nummer7
-  \font\markfonttwentysix = feta-nummer14
-\def\currentsize{twentysix}
-}
-
-\def\fetthirteendefs{%
-  \font\fetathirteen = feta13
-  \font\fetanummerthirteen = feta-nummer5
-  \font\dynfontthirteen = feta-din10 scaled \magstep 0
-  \font\bracefontthirteen = feta-braces16
-  \font\fingerfontthirteen = feta-nummer3
-  \font\markfonttwentysix = feta-nummer8
-\def\currentsize{thirteen}
-}
-
-\def\fetelevendefs{%
-  \font\fetaeleven = feta11
-  \font\fetanummereleven = feta-nummer5
-  \font\dynfonteleven = feta-din10        % scaled \magstep-1
-  \font\bracefonteleven = feta-braces16
-  \font\fingerfonteleven = feta-nummer3
-  \font\markfonttwentysix = feta-nummer7
-  \def\currentsize{eleven}
-}
-
-\def\sixteenfonts{\fetsixteendefs\cmrsixteen}
-\def\twentyfonts{\fettwentydefs\cmrtwenty}
-\def\twentysixfonts{\fettwentysixdefs\cmrtwenty}
-\def\elevenfonts{\fetelevendefs\cmreleven}
-\def\thirteenfonts{\fetthirteendefs\cmrthirteen}
-
-\def\bracefont{\csname bracefont\currentsize\endcsname}
-\def\fetanummer{\csname fetanummer\currentsize\endcsname}
-\def\dynfont{\csname dynfont\currentsize\endcsname}
-\def\fingerfont{\csname fingerfont\currentsize\endcsname}
-\def\fetanummerj{\csname fetanummerj\currentsize\endcsname}
-\def\markfont{\csname markfont\currentsize\endcsname}
-
-%\sixteenfonts
-%\twentysixfonts
-%\twentyfonts
-%\elevenfonts
-%\thirteenfonts
-
-\def\switchfont#1{\def\currentsize{#1}\csname feta\currentsize\endcsname}
-
-\def\fetdef#1#2{%
-  \def#1{\hbox{\fetchar{#2}}}}
-\def\fetchar#1{\char#1}
-\def\show#1{\char#1}
-
-%\input feta16
-%\input feta20
-
-% stacked numbers; overrules def in lilyponddefs
-% widest num should be .40 balkheight
-% oeps: \meter 12/8;
-%
-% \allabreve, \threetwometer etc. have zero as the second parameter.
-
-\def\generalmeter#1#2{%
-  \ifnum #2 = 0\relax
-    \vbox to 0pt{%
-      \vss
-      \hbox to 0.45\staffheight{\hss \fetanummer #1\hss}%
-      \vss}%
-  \else
-    \vbox to 0pt{%
-      \vss
-      \hbox to 0.45\staffheight{\hss \fetanummer #1\hss}%
-      \nointerlineskip
-      \hbox to 0.45\staffheight{\hss \fetanummer #2\hss}%
-      \vss}%
-  \fi}
-
-\def\pianobrace#1{{\bracefont\char #1}}
-\def\staffbracket#1{{\centeralign{\bracketfont\char #1}}}
-
-\def\embeddedtex#1{}
-\def\embeddedps#1{}
-\def\embeddedmf#1#2{}
-\def\embedclose{}
-
-\input lily-ps-defs
-
-% uncomment to use runtime MF
-%
-% \input lily-mf-defs
-
-\def\EndLilyPondOutput{%
-  \embedclose
-  \csname bye\endcsname
-}
-
 \endinput
diff --git a/tex/lily-mf-defs.tex b/tex/lily-mf-defs.tex
deleted file mode 100644
index b30ba9fd5d..0000000000
--- a/tex/lily-mf-defs.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-\newcount\embedcount\embedcount=0
-\newwrite\checkexists
-\newwrite\embedfile
-\def\inputifexists#1{%
-        \openin\checkexists #1
-        \ifeof\checkexists
-                 \closein\checkexists
-        \else
-                \closein\checkexists
-                \input #1
-        \fi
-}
-
-\def\embedcountid{feta-embed}
-\inputifexists{\embedcountid.aux}
-%
-% let's not overwrite -- and be sure to create new
-\def\embedclose{%
-        \immediate\openout\embedfile=\embedcountid.aux
-        \immediate\write\embedfile{\embedcount=\the\embedcount}
-        \immediate\closeout\embedfile
-}
-
-
-% let's keep embedcount to see how many embedded mf's clutter your system
-\def\embeddedmf#1#2{%
-        \edef\embedid{#1}%
-        \immediate\openout\embedfile=\embedid.mf%
-        \global\advance\embedcount by 1%
-       \immediate\write\embedfile{\%Automatically generated by TeX (fetdefs.tex
-)}%
-       \immediate\write\embedfile{\%Do not edit}%
-        \immediate\write\embedfile{#2}%
-        \immediate\closeout\embedfile%
-        \font\expandafter\embedid\expandafter=\embedid%
-        \embedid\char0%
-}
- 
-
diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 57a8108ffe..e94d198869 100644
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -14,9 +14,6 @@
 % ``compiles'' operatorname binding in the body of foo, making
 % the code faster, and more reliable (less flexible)
 
-% transplant a TeX dimension into the PS output.
-\def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\the\csname #1\endcsname) deftexdimen}}
-
 {%
    \def\par{ }%         %Ugh.  Don't try this at home, kids!
    % neat file-include trick by Piet van Oostrum <piet@cs.uu.nl>
@@ -43,47 +40,3 @@
    \expandafter\special{! \includelilyps }
 }
 
-
-\special{!
-% PS helper: convert (0.2pt) to the token 0.2
-/settexdimen
-{
-        /thestring exch def
-        thestring 0 thestring length 2 sub
-        getinterval
-        token
-        pop exch pop 
-} def
-%
-/deftexdimen
-{
-        settexdimen
-        def     
-} def
-}
-
-\def\turnOnPostScript{%
-        \PSsetTeXdimen{stafflinethickness}
-        \PSsetTeXdimen{staffheight}
-        
-        % This sets CTM so that you get to the currentpoint
-        % by executing a 0 0 moveto
-        \def\embeddedps##1{%
-                \special{ps: @beginspecial @setspecial ##1 @endspecial}       
-        }
-        %
-
-        \special{! 
-/interline \mudelapaperinterline0  def % ugh.  Only works x.yyyy floats 
-interline 3 div /bracket_b exch def
-interline 2 mul /bracket_w exch def
-stafflinethickness 2 mul /bracket_t exch def
-interline 1.5 mul /bracket_v exch def
-bracket_v /bracket_u exch def
-50 /bracket_alpha exch def
-staffheight 4 div /interline exch def
-1 setlinecap}
-}
-
-\def\turnOnExperimentalFeatures{}
-
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 5ef348b4dd..77b02d7f7a 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -2,7 +2,7 @@
 %% include file for LilyPond
 %%
 %% this file defines various macros to accomodate lilypond output
-%% 
+%%
 %% let's not make par before endinput
 %
 % TeXbook ex 7.7
@@ -16,185 +16,20 @@
 \fi
 \SkipLilydefs
 %
-\ifundefined{mudelacopyright}
-        \def\mudelacopyright{\copyright\ \number\year}
-\fi
-\ifundefined{mudelatagline}
-        \def\mudelatagline{Lily was here}
-\fi
-\ifundefined{documentclass}
-        \input lilypond-plaintex
-\else
-        \input lilypond-latex
-\fi
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% macros to shorten other definitions
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\musicmathdef#1#2{\def#1{\musicmathchar{#2}}}
-\def\musicmathchar#1{\musicmathfont\char#1}
-
-\def\topalign#1{\vbox to 0pt{#1\vss}}
 \def\botalign#1{\vbox to 0pt{\vss #1}}
-
-\def\centeralign#1{\hbox to 0pt{\hss#1\hss}}
 \def\leftalign#1{\hbox to 0pt{#1\hss}}
-\def\rightalign#1{\hbox to 0pt{\hss#1}}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set up dimensions
-% mudela-book don't like this:
-%\parindent=0pt
-\newdimen\interlinedist
-
-\newcount\n                     %duh. meaningful identifiers.
-\newdimen\staffheight
-\newdimen\stafflinethickness
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% set fonts and primary dimensions
-
-%
-% TODO JUNK THIS
-%
-% ugh
-\def\cmrtwenty{
-        \font\smalltextfont=cmr8
-        \font\textmusic=cmmi12
-}
-\def\cmrsixteen{
-        \font\smalltextfont=cmr6
-        \font\textmusic=cmmi10
-        }
-\def\cmrthirteen{
-        \font\smalltextfont=cmr6
-        \font\textmusic=cmmi9
-        }
-\def\cmreleven{
-        \font\smalltextfont=cmr5
-        \font\textmusic=cmmi8
-        }
-%%%%%%%
-%
-\def\musixtwentydefs{
-      \twentyfonts
-      \csname cmrtwenty\texsuffix\endcsname
-      \musixcalc
-}
-
-\def\musixsixteendefs{
-        \sixteenfonts
-        \csname cmrsixteen\texsuffix\endcsname
-        \musixcalc
-        }
-\def\musixtwentysixdefs{
-      \csname cmrtwentysix\texsuffix\endcsname
-          \twentysixfonts
-         \musixcalc
-        }
-\def\musixthirteendefs{
-        \thirteenfonts
-        \csname cmrthirteen\texsuffix\endcsname
-       \musixcalc
-}
-\def\musixelevendefs{
-        \csname cmreleven\texsuffix\endcsname
-        \elevenfonts
-        \musixcalc
-}
-
-\def\textsharp{\raise.4ex\hbox{\textmusic\char"5D}}
-\def\textnatural{\raise.4ex\hbox{\textmusic\char"5C}}
-\def\textflat{\raise.2ex\hbox{\textmusic\char"5B}}
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% do derivative calcs
 
-% this has to be synced with the font definition
-\def\musixcalc{
 
-        \stafflinethickness=\mudelapaperrulethickness pt
-}
-
-
-
-% stacked horizontal lines 
+% stacked horizontal lines
 \def\interscoreline{\vskip 16pt}
-
-% big fat marks, if errors are detected.
-\def\columnerrormark{\placebox{-5pt}{0pt}{\bf C!}}
-\def\scorelineerrormark{\placebox{0pt}{-10pt}{\bf L!}}
-\def\errormark{{\bf E!}}
-\def\unknown{%
-  %{\bf u} %FIXME
-}
-
-\input fetdefs
-
-
-% ugh
-% see e.g. input/test/beam-pos.ly
-%
-% something's wrong with the aligment; sometimes all symbols
-% look to be placed a bit too high (there's an ugly fix for
-% the staccato-dot in script.cc)
-% but this varies from line to line: it seems that xdvi
-% does some rounding; i can't really check this from screen on i
-% 600x600 res.
-%
-\def\rulesym#1#2{\dimen0=#1     %obsolete
-        \vrule height .5\dimen0 depth .5\dimen0 width #2}
-\def\shiftedrulesym#1#2{\dimen0=#1%
-        \vrule height .7\dimen0 depth .3\dimen0 width #2}
-\def\tinyrulesym#1#2{\dimen0=#1%
-        \vrule height .1\dimen0 depth .1\dimen0 width #2}
-%would be nice for checking alignment
-\def\openrulesym#1#2{\dimen0=#1%
-        \vbox to \dimen0{\vss%
-        \hbox{\vrule height .1\dimen0 width #2}%
-        \hbox{\vrule height .2\dimen0 width 0pt}%
-        \hbox{\vrule height .4\dimen0 width #2}%
-        \hbox{\vrule height .2\dimen0 width 0pt}%
-        \hbox{\vrule height .1\dimen0 width #2}%
-        \vss}}
-%\let\rulesym\shiftedrulesym
-%\let\rulesym\tinyrulesym
-%\let\rulesym\openrulesym
-
-% the interline symbol. Redefine to remove it.
-\def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}}
-\def\lineseparator{\defaultlineseparator}
-\def\beauty{%
-        \par\vskip 10pt plus 30pt minus 10pt\par
-        \hskip -5pt\lineseparator
-        \par\vskip 10pt plus 30pt minus 10pt\par
-}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\placebox#1#2#3{%
+        \botalign{\hbox{\raise #1\leftalign{\kern #2{}#3}}}}%
+\input lily-ps-defs
+\def\EndLilyPondOutput{%
+  \csname bye\endcsname
+  }
+  
+  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  
 \def\postheader{}
-
-%
-% macros suck. \ifundefined{nolilyfooter} gives wierd errors from time
-%        to time.
-%
-
-%
-% Warning: the order is conceptually weird.  It says:
-
-% if not defined (``nolilyfooter''):
-%    do_footer ()
-% else 
-%    dont_do_footer ()
-%
-\ifx\csname nolilyfooter\endcsname\relax
-        \message{[footer defined]}%
-        \csname lilyfooter\texsuffix\endcsname%
-\else
-        \message{[footer empty]}
-        \csname%
-        nolilyfooter\texsuffix\endcsname
-\fi
+\noindent
diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 5cda54d789..07b806cbb8 100644
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -45,33 +45,33 @@
 \def\makelilytitle{%
   \begin{center}
         \bfseries
-        \ifx\mudelanull\thetitle\else\sethuge{\thetitle}\\ \fi
-        \ifx\mudelanull\thesubtitle\else\setLarge{\thesubtitle}\\ \fi
+        \ifx\mudelanull\thetitle\else{\huge\thetitle}\\ \fi
+        \ifx\mudelanull\thesubtitle\else{\Large\thesubtitle}\\ \fi
   \end{center}
   \bigskip
   % urg
   \edef\saveparskip{\parskip}\parskip-5mm
   \begin{minipage}[t]{0.45\textwidth}
-        \ifx\mudelanull\thepoet\else\settext{\thepoet}\\ \fi
-        \ifx\mudelanull\themetre\else\settext{\themetre}\\ \fi
+        \ifx\mudelanull\thepoet\else{\thepoet}\\ \fi
+        \ifx\mudelanull\themetre\else{\themetre}\\ \fi
   \end{minipage}\hspace*{\fill}
   \begin{minipage}[t]{0.45\textwidth}
       \begin{flushright}
-          \ifx\mudelanull\thecomposer\else\setlarge{\normalfont\scshape\thecomposer}\\ \fi
-          \ifx\mudelanull\theopus\else\settext{\theopus}\\ \fi
-          \ifx\mudelanull\thearranger\else\settext{\thearranger}\\ \fi
+          \ifx\mudelanull\thecomposer\else{\large\normalfont\scshape\thecomposer}\\ \fi
+          \ifx\mudelanull\theopus\else{\theopus}\\ \fi
+          \ifx\mudelanull\thearranger\else{\thearranger}\\ \fi
         \end{flushright}%
   \end{minipage}\par
   \parskip\saveparskip
-  {\center\setlarge{\theinstrument}\par}
-  {\flushleft\setLarge{\normalfont\scshape\thepiece}}
+  {\center{\large\theinstrument}\par}
+  {\flushleft{\large\normalfont\scshape\thepiece}}
   \leavevmode
 }
 \def\makelilypiecetitle
 {
   \bigskip
-  {\flushright\settext{\theopus}\par}
-  {\flushleft\setLarge{\normalfont\scshape\thepiece}}
+  {\flushright{\theopus}\par}
+  {\flushleft{\large\normalfont\scshape\thepiece}}
 }
 \endinput