release: 0.1.57

author: Han-Wen Nienhuys <hanwen@xs4all.nl> 1998-04-20 00:45:24 +0200
committer: Han-Wen Nienhuys <hanwen@xs4all.nl> 1998-04-20 00:45:24 +0200
commit: 63c9cee8ce190aaae4a5db3d2e200d35a570838d (patch)
tree: 0423f29dc1db8956a5207207669f3f81d33edcf2
parent: 4c5b1c14d1474af33002a4ba9e8584647c4ad8c0 (diff)
289 files changed, 4443 insertions, 21979 deletions
diff --git a/.dstreamrc b/.dstreamrc
index 82f615d66b..dedc100f50 100644
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -5,16 +5,16 @@ Dstream			1
 
 # yydebug
 InitParser		1
-Parser			0
+Parser			1
 InitDeclarations	1
 Declarations		1
 # FlexLexer debug
 InitLexer		1
 Lexer			1
 
-My_lily_lexer		0
+My_lily_lexer		1
 
-walking		0
+walking		1
 
 # flower lib
 File_path		1
@@ -22,73 +22,86 @@ Matrix			0
 Vector			0
 
 # lily
-Atom			1
-Bar			1
-Beam			1
-Change_iterator		1
-Chord			1
-Chord_iterator		1
-Clef_item		1
-Col_configuration	1
-Colinfo			1
-Colinfo			1
-Collision		1
-Engraver		1
-Engraver_group_engraver 1
-Group_change_req	1
-Head_column		1
-Idealspacing		1
+Atom			0
+Bar			0
+Beam			0
+Change_iterator		0
+Chord			0
+Chord_iterator		0
+Clef_item		0
+Col_configuration	0
+Colinfo			0
+Colinfo			0
+Collision		0
+Engraver		0
+Engraver_group_engraver 0
+Group_change_req	0
+Head_column		0
+Idealspacing		0
 Ineq_constrained_qp 	0
-Input_translator	1
-Item			1
-Key_item		1
-Lookup			1
-Line_spacer		1
-Melodic_req		1
-Midi_def		1
+Input_translator	0
+Item			0
+Key_item		0
+Lookup			0
+Line_spacer		0
+Melodic_req		0
+Midi_def		0
 Midistrings		0
 Mixed_qp		0
-Music			1
-Music_iterator		1
-Note_head		1
-Note_performer		1
-Note_req		1
+Music			0
+Music_iterator		0
+Note_head		0
+Note_performer		0
+Note_req		0
 Paper_score			1
-Paper_def		1
-Performer		1
-Performer_group_performer	1
+Paper_def		0
+Performer		0
+Performer_group_performer	0
 Request			0
-Request_iterator	1
-Rest_collision		1
-Rest_collision_engraver 1
-Rest_req		1
-Rhythmic_req		1
+Request_iterator	0
+Rest_collision		0
+Rest_collision_engraver 0
+Rest_req		0
+Rhythmic_req		0
 Score			1
 Score_column		0
 Score_elem		0
-Score_engraver		1
-Score_performer		1
-Script_column		1
-Script_def		1
-Script_req		1
-Slur			1
-Spacing_problem 	1
-Spanner			1
+Score_engraver		0
+Score_performer		0
+Script_column		0
+Script_def		0
+Script_req		0
+Slur			0
+Spacing_problem 	0
+Spanner			0
 Spring_spacer		0
-Staff			1
-Staff_commands		1
-Stem			1
-Stem			1
-Stem_req		1
-Symtable		1
-Symtables		1
+Staff			0
+Staff_commands		0
+Stem			0
+Stem			0
+Stem_req		0
+Symtable		0
+Symtables		0
 
-Text_def		1
-Text_req		1
-Time_description	1
-Voice			1
-Voice_iterator		1
+Text_def		0
+Text_req		0
+Time_description	0
+Voice			0
+Voice_iterator		0
 Word_wrap		0
-delete_identifiers	1
-parse_duration		1
-parse_pitchmod		1
+delete_identifiers	0
+parse_duration		0
+parse_pitchmod		0
+Translator_group	0
+Translator	 	0
+Music_output_def	0
+Graphical_element	0
+Axis_group_administration	0
+Horizontal_align_item	0
+Single_malt_grouping_item	0
+Note_column	0
+Rhythmic_head	0
+Paper_column	0
+Paper_column	0
+Staff_symbol	0
+Column_rod	0
diff --git a/AUTHORS b/AUTHORS.txt
index b749bae57b..c4e28e7233 100644
--- a/AUTHORS
+++ b/AUTHORS.txt
@@ -13,7 +13,7 @@ DESCRIPTION
 
 AUTHORS
        o Han-Wen Nienhuys <hanwen@cs.ruu.nl>,
-           http://www.stack.nl/~hanwen
+           http://www.cs.ruu.nl/people/hanwen
            Main author.
 
        o Jan Nieuwenhuizen <jan@digicash.com>,
@@ -39,7 +39,7 @@ CONTRIBUTORS
            mf/ital-*.mf (these were taken from the CM fonts)
 
        o Alexandre Oliva <oliva@dcc.unicamp.br>,
-           http://sunsite.unicamp.br/?
+           http://sunsite.unicamp.br/~oliva
            testing
 
        o Anthony Fok <foka@debian.org>,
@@ -61,7 +61,7 @@ CONTRIBUTORS
 
 
 
-11/Mar/98                LilyPond 0.1.48                        1
+6/Apr/98                 LilyPond 0.1.57                        1
 
 
 
@@ -127,6 +127,6 @@ AUTHORS(1)            LilyPond documentation           AUTHORS(1)
 
 
 
-11/Mar/98                LilyPond 0.1.48                        2
+6/Apr/98                 LilyPond 0.1.57                        2
 
 
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e1b28ead74..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-oeps: no more details than NEWS
diff --git a/Documentation/Makefile b/Documentation/Makefile
new file mode 100644
index 0000000000..f10afdbf80
--- /dev/null
+++ b/Documentation/Makefile
@@ -0,0 +1,71 @@
+# Documentation/Makefile
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = Documentation
+
+#
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Version.make
+include ./$(depth)/make/Files.make 
+include ./Rules.make
+#
+
+
+#
+DOCFILES = $(wildcard *.doc)
+OUTPODFILES = $(addprefix $(outdir)/,$(PODFILES))
+TEXTFILES = $(OUTPODFILES:.pod=.txt)
+GROFFFILES = $(OUTPODFILES:.pod=.1)
+HTMLFILES = $(OUTPODFILES:.pod=.html)
+DVIFILES = $(addprefix $(outdir)/, $(DOCFILES:.doc=.dvi))
+
+
+default: do-doc
+#
+# list of distribution files:
+#
+XPMS=$(wildcard *.xpm)
+giffiles=$(XPMS:.xpm=.gif)
+
+gifs: $(addprefix $(outdir)/, $(giffiles))
+
+
+EXTRA_DISTFILES = $(XPMS)  $(DOCFILES)  vocabulary-data vocabulary-forms.el fonts.tex automake.urgh
+
+# don't do DVI files. They can only be made if lily is installed
+do-doc: $(TEXTFILES)
+
+html: $(HTMLFILES)
+
+htmldist: html
+	$(lily_bindir)/make_website
+
+dvi: $(DVIFILES)
+
+# generic targets and rules:
+#
+include $(depth)/make/Targets.make
+include $(depth)/make/Rules.make
+
+MAN1FILES = lilypond convert-mudela mi2mu mudela-book
+MAN1GROFF = $(addprefix $(outdir)/, $(addsuffix .1,$(MAN1FILES)))
+
+localinstall: $(outdir)/lilypond.1
+	$(INSTALL) -d $(mandir)/man1
+	$(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
+
+
+localuninstall:
+	(cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
+
+
+
diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am
deleted file mode 100644
index 6ed22de202..0000000000
--- a/Documentation/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# Documentation/Makefile.am.wild
-
-DOCFILES = introduction.doc mudela-man.doc
-PODFILES = AUTHORS.pod CodingStyle.pod INSTALL.pod MANIFESTO.pod PATCHES.pod convert-mudela.pod faq.pod gnu-music.pod index.pod internals.pod language.pod lilypond.pod links.pod literature.pod ly2dvi.pod mi2mu.pod mudela-book.pod mutopia.pod other-packages.pod
-OUTPODFILES = $(PODFILES)
-TEXTFILES = $(OUTPODFILES:.pod=.txt)
-GROFFFILES = $(OUTPODFILES:.pod=.1)
-HTMLFILES = $(OUTPODFILES:.pod=.html)
-DVIFILES = $(DOCFILES:.doc=.dvi)
-
-XPMS = lelie_icon.xpm lelie_logo.xpm lelieblond.xpm
-giffiles = $(XPMS:.xpm=.gif)
-
-EXTRA_DIST = Makefile.am.wild Rules.make $(XPMS) $(DOCFILES) $(PODFILES) vocabulary-data vocabulary-forms.el fonts.tex
-
-MAN1FILES = lilypond convert-mudela mi2mu mudela-book ly2dvi
-MAN1GROFF = $(addsuffix .1,$(MAN1FILES))
-
-default: all $(TEXTFILES)
-
-%.1: %.pod
-	$(POD2MAN) --section=1 $*.pod > $@
-
-outdir = .
-
-install-data-hook: $(MAN1GROFF)
-	$(INSTALL) -d $(mandir)/man1
-	$(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
-
-uninstall-hook:
-	(cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
-
-html: $(HTMLFILES)
-
-clean-local:
-	-rm $(TEXTFILES) $(MAN1GROFF)
-
-include $(top_srcdir)/Documentation/Rules.make
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/Documentation/Makefile.am.wild b/Documentation/Makefile.am.wild
deleted file mode 100644
index aef47b08e2..0000000000
--- a/Documentation/Makefile.am.wild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Documentation/Makefile.am.wild
-
-DOCFILES = $(wildcard *.doc)
-PODFILES = $(wildcard *.pod)
-OUTPODFILES = $(PODFILES)
-TEXTFILES = $(OUTPODFILES:.pod=.txt)
-GROFFFILES = $(OUTPODFILES:.pod=.1)
-HTMLFILES = $(OUTPODFILES:.pod=.html)
-DVIFILES = $(DOCFILES:.doc=.dvi)
-
-XPMS = $(wildcard *.xpm)
-giffiles = $(XPMS:.xpm=.gif)
-
-EXTRA_DIST = Makefile.am.wild Rules.make $(XPMS) $(DOCFILES) $(PODFILES) vocabulary-data vocabulary-forms.el fonts.tex
-
-MAN1FILES = lilypond convert-mudela mi2mu mudela-book ly2dvi
-MAN1GROFF = $(addsuffix .1,$(MAN1FILES))
-
-default: all $(TEXTFILES)
-
-%.1: %.pod
-	$(POD2MAN) --section=1 $*.pod > $@
-
-outdir = .
-
-install-data-hook: $(MAN1GROFF)
-	$(INSTALL) -d $(mandir)/man1
-	$(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
-
-uninstall-hook:
-	(cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
-
-html: $(HTMLFILES)
-
-clean-local:
-	-rm $(TEXTFILES) $(MAN1GROFF)
-
-include $(top_srcdir)/Documentation/Rules.make
diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
deleted file mode 100644
index f37df44a9c..0000000000
--- a/Documentation/Makefile.in
+++ /dev/null
@@ -1,233 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# Documentation/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-DOCFILES = introduction.doc mudela-man.doc
-PODFILES = AUTHORS.pod CodingStyle.pod INSTALL.pod MANIFESTO.pod PATCHES.pod convert-mudela.pod faq.pod gnu-music.pod index.pod internals.pod language.pod lilypond.pod links.pod literature.pod ly2dvi.pod mi2mu.pod mudela-book.pod mutopia.pod other-packages.pod
-OUTPODFILES = $(PODFILES)
-TEXTFILES = $(OUTPODFILES:.pod=.txt)
-GROFFFILES = $(OUTPODFILES:.pod=.1)
-HTMLFILES = $(OUTPODFILES:.pod=.html)
-DVIFILES = $(DOCFILES:.doc=.dvi)
-
-XPMS = lelie_icon.xpm lelie_logo.xpm lelieblond.xpm
-giffiles = $(XPMS:.xpm=.gif)
-
-EXTRA_DIST = Makefile.am.wild Rules.make $(XPMS) $(DOCFILES) $(PODFILES) vocabulary-data vocabulary-forms.el fonts.tex
-
-MAN1FILES = lilypond convert-mudela mi2mu mudela-book ly2dvi
-MAN1GROFF = $(addsuffix .1,$(MAN1FILES))
-
-outdir = .
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Documentation/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = Documentation
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-	$(MAKE) install-data-hook
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean clean-local
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-default: all $(TEXTFILES)
-
-%.1: %.pod
-	$(POD2MAN) --section=1 $*.pod > $@
-
-install-data-hook: $(MAN1GROFF)
-	$(INSTALL) -d $(mandir)/man1
-	$(INSTALL) -m 644 $(MAN1GROFF) $(mandir)/man1
-
-uninstall-hook:
-	(cd  $(mandir)/man1/; rm -f $(MAN1GROFF))
-
-html: $(HTMLFILES)
-
-clean-local:
-	-rm $(TEXTFILES) $(MAN1GROFF)
-
-include $(top_srcdir)/Documentation/Rules.make
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Documentation/Rules.make b/Documentation/Rules.make
index b87154941d..fd0b391a2e 100644
--- a/Documentation/Rules.make
+++ b/Documentation/Rules.make
@@ -19,7 +19,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex
 	mv $(notdir $@) $(outdir)
 
 $(outdir)/%.mudtex: %.doc
-	$(depth)/$(bin)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $<
+	$(depth)/bin/out/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $<
 
 $(outdir)/%.txt: $(outdir)/%.1
 	troff -man -Tascii $< | grotty -b -u -o > $@
@@ -27,14 +27,14 @@ $(outdir)/%.txt: $(outdir)/%.1
 $(depth)/%.txt: $(outdir)/%.txt
 	cp $< $@
 
-#do_pod2html=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
-# do this for perl 5.003
+#  perl 5.003/4
 
-do_pod2html=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/
+POD2HTML5004=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
 
+POD2HTML5003=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/
 
-# do this for perl 5.004
-#	 $ make do_pod2html='$(pod2html) --infile $< --outfile=$@' html
+
+do_pod2html=$(POD2HTML5003)
 
 
 $(outdir)/%.html: %.pod $(depth)/VERSION
diff --git a/Documentation/automake.urgh b/Documentation/automake.urgh
new file mode 100644
index 0000000000..4d811d14e3
--- /dev/null
+++ b/Documentation/automake.urgh
@@ -0,0 +1,97 @@
+
+WHAT'S WRONG WITH AUTOMAKE?
+
+
+We have tried to use automake and found it to be inadequate for our
+needs for several reasons.  On the surface the shortcomings to
+automake may seem bugs or "not-yet-completed" features.  However, make
+itself is broken, and any tool built on top of make is broken as well.
+
+
+IRRITATIONS
+
+We'll start with the superficial irritations first:
+
+	- there is no intrinsic support for wildcarding; Adding
+support for wildcarding adds yet another layer to a top-heavy system.
+
+This may sound silly, but for a fast moving project, with 500
+sourcefiles, one does not want to administer a list of filenames by
+hand: files are created, deleted and moved very often, and wildcarding
+prevents that distributions miss files.
+
+
+	- Automake tries to cater for every taste of make.  But anyone
+who does more than the trivial (configure; make install) has to
+install automake and GNU make anyway.  Automake's universal make
+support is good for tools that have to be highly portable, but you
+have pay in ease of use and speed. 
+
+	- Automake is very much targeted at standard GNU packages that
+are written in C (or C++) and come with info-pages.  If you want to add
+dependencies from TeX or METAFONT files you are out of luck.  Ditto if
+you have weird file types (.pod), weird programming languages, etc.
+
+	- Dependency handling is unreliable in our experience. On
+several occasions we had unexplainable errors, that went away after
+doing a make distclean, and recompile.
+
+	- It is slower, much slower than a tailor made solution.  On
+JCNs machine this is a diffence of 800% (17 minutes in stead of 2) for
+every distribution made; this constitutes 45 minutes of irritation on
+a hacking-night.
+
+	- For a large project, a specialised Makefile system costs
+relatively little extra effort.  The extra effort pays itself back in speed
+and control.
+
+	- The Makefiles, Makefile.ins, and extensions constitute a
+huge amount of state.  We found it hard to reproduce bugs in automake
+(Strictly spoken they aren't bugs, as we haven't diagnosed because we
+couldn't reproduce them.)
+
+
+FUNDAMENTAL PROBLEMS
+
+Many of the fundamental problems can be traced back to flaws in make:
+
+	- make is not standardised.  The only decent implementation is
+GNU make, and GNU make is not widespread enough to require GNU make for
+compiling GNU tools.
+
+	- make does not have enough meta-ness: one cannot manipulate
+dependencies and rules in make: they cannot be put in variables,
+mapped at lists, etc.
+
+(In our tailor made system, we worked around this non-feature by using
+generic include files as a stopgap function call.)
+
+	- VPATH is a broken concept: programs should not think on
+their own; thinking is the programmer's job.  make should do exactly
+as it is told, and make should enable easy formulation of these
+commands commands.
+
+automake is tries to solve these problems by building on top of this
+broken tool: an extra layer of complexity is added, with
+self-modifying  Makefiles, and different Makefile versions for
+maintainer and user.
+
+
+CONCLUSIONS
+
+We could be called "cheap" for complaining about the above points,
+while not even filing decent bugreports.  The reality is that we
+ourselves are busy and that we don't find it amusing to hunt for and
+fix bugs in a fix (automake) for a broken tool (make).
+
+It should also be emphasised that we still think that automake is a
+good tool: it is excellent for small projects, and reasonable for big
+projects that are fully "standard."  However, for LilyPond, with its
+many sourcefiles and many different filetypes we found it unwieldy.
+
+We hope that some day a better replacement for make comes along, so
+that the gruesomeness of make and friends may die in oblivion.  (*)
+
+(*) I personally would like to enter a Makefile as functional program,
+whose execution caches function results on the disk as files.  But I
+shan't bother you further with my vaporware thoughts..
diff --git a/Documentation/faq.pod b/Documentation/faq.pod
index 5655c3fd07..9611c995d0 100644
--- a/Documentation/faq.pod
+++ b/Documentation/faq.pod
@@ -12,7 +12,7 @@ are meant to be relative to the source directory)
 Q: Wow, the webpages look really neat, but if I install the .exe file
 on my windows 3.11 machine, it doesn't work.
 
-A: The dos port is done with the cygnus W32 port of the GNU utils. It
+A: The DOS port is done with the cygnus W32 port of the GNU utils. It
 does I<not> work with windows 3.x; you need NT or w95 (this is not a
 recommendation, btw.  We recommend you use Unix, in particular, use
 GNU/Linux)
@@ -29,8 +29,8 @@ If the problem persists, then please mail me.
 Q: Some of your neat scripts fail, what directories do you use:
 
 A: [This only applies if you don't do C<make install>, and develop out
-of the source directory]
-I have a directory which contains all music related stuff,
+of the source directory] I have a directory which contains all music
+related stuff,
 
 	~/something/
 
@@ -306,6 +306,14 @@ Q: Why GPL?
 A: Yes.
 
 
+Q: Your make system does not adhere to GNU coding standards, could you
+please fix it?
+
+A: No.  We have evaluated the standard GNU combination for compiling
+programs (autoconf, automake, libtool) and found to be inadequate in
+several respects.  More detailed argumentation is included with
+LilyPond (see F<automake.urgh>)
+
 Q: Why do I need g++ >= 2.7?
 
 A: By using g++, GNU LilyPond is portable to all platforms which support
diff --git a/Documentation/introduction.doc b/Documentation/introduction.doc
deleted file mode 100644
index 64c81baf67..0000000000
--- a/Documentation/introduction.doc
+++ /dev/null
@@ -1,575 +0,0 @@
-% -*-latex-*-
-
-% this document should be run through the mudela-book script after lilypond
-% has been installed.  The rules have been precooked into the
-% Documentation/Rules.make file; do 
-%
-%   make out/introduction.dvi
-%
-% or
-%
-%   mudela-book --outdir=out/ --outname=introduction.mudtex introduction.doc
-%   latex '\nonstopmode \input out/introduction.mudtex'
-
-% Hoi Tim, hier staan wat 'enge' commando's (die dingen met een '\'
-% zoals \documentclass en \def\mudela...).
-% Daar moet je je niets van aantrekken, ga gewoon naar Introduction
-% en begin te tiepen.
-
-\documentclass{article}
-\usepackage{a4wide}
-\title{Introduction to GNU LilyPond}
-\author{Jan Nieuwenhuizen \& Han-Wen Nienhuys}
-\date{March 2, 1998}
-
-\def\file#1{\verb+#1+}
-
-% ugh: trick to get examples not generate par
-% these are for 16pt
-\def\mudelapaperlinewidth{-28.452756}%
-\def\mudelapaperindent{28.452756}%
-\def\mudelapaperrulethickness{0.400000}%
-\def\mudelapaperbarsize{16.000000}%
-\def\mudelapaperinterline{4.000000}%
-\def\mudelapapernotewidth{5.930000}%
-\def\mudelapaperwholewidth{8.640000}%
-\def\mudelapaperunitspace{22.000000}%
-\def\mudelapaperbasicspace{4.000000}%
-\def\mudelapapergeometric{0.000000}%
-\def\mudelapaperarithmetic_basicspace{2.000000}%
-\def\mudelapaperarithmetic_multiplier{4.800000}%
-\def\mudelapaperinterbeam{3.140000}%
-\def\mudelapapergourlay_energybound{100000.000000}%
-\def\mudelapapergourlay_maxmeasures{14.000000}%
-% huh?
-% \def\exampleheight{2\mudelapaperbarsize pt}
-\def\exampleheight{2cm}
-
-% ful of pars, needs the above
-\input lilyponddefs
-% generates par
-\musixsixteendefs
-\def\musixsixteendefs{}
-% generates par
-\turnOnPostScript%
-\def\turnOnPostScript{}
-% generates par
-\def\interscoreline{}
-% 
-
-\begin{document}
-\maketitle
-
-%\def\interexample{\hskip15mm$\Longrightarrow$\hskip15mm}
-%\def\interexample{\hbox to10mm{\hfill\hbox to0pt{\hss\vbox to\exampleheight{\vss$\Longrightarrow$\vss}\hss}\hfill}}
-\def\interexample{}
-\def\preexample{\par}
-\def\postexample{\par\medskip}
-
-\def\file#1{{\texttt{#1}}}
-\setcounter{secnumdepth}{-1}
-
-\emph{\Large ***Under construction***}
-
-\section{Introduction}
-This document is a gentle introduction to using LilyPond to typeset
-simple music.
-
-
-LilyPond is a so called ``batch'' program.  This means, that you use a
-texteditor (such as emacs or vi) to create an input file.  When you
-are done editing your input file, you run LilyPond.  If Lily
-finds any errors in your input file she\footnote{ If computer programs
-could have gender, we're sure that LilyPond is a female computer
-program, so we will refer to the program as a she. This gender-bending
-is not to tease you, dear reader.  We do it in real life as well. In
-the past two years LilyPond has become sort of a baby daughter to us,
-keeping us awake at night, but also providing lots of joy.  We hope
-you do not mind our little aberration from computer-manual tradition.
-% 
-% The name LilyPond is actually sort of a girl's name.  Can you guess which
-% one ?
-%
-} complain.  If everything is well, than she'll generate a file that
-you can process further to view or print it.
-
-To get you started we'll run down the full procedure for you once.   
-
-\begin{enumerate}
-\item
-Fire up your favourite editor (if you know none, try \texttt{joe silly.ly}),
-and key in the following text:
-\begin{verbatim}
-\score {
-  	<
-	\type Staff = aStaff \melodic { g'2 e'4 }
-	\type Lyrics = yell \lyric { Air2 ball!4 }
-	>
-}
-\end{verbatim}
-
-save your file as \file{silly.ly}.   As might have noticed, the input
-files to LilyPond have the extension \file{.ly}.
-
-\item
-Run LilyPond on your  newly created file: \verb+lilypond silly+.
-LilyPond will then print all kinds of mumbo jumbo that can safely
-ignored.
-You might see something like this:
-\begin{verbatim}
-GNU LilyPond 0.1.55/FlowerLib 1.1.39
-Parsing ... [/home/hanwen/musix/spacer/init/lily-init.ly[/home/hanwen/
-
-	... stuff left out here ...
-
-				Documentation/silly.ly]
-Interpreting music ...[1] (time: 0.04 seconds)
-Preprocessing elements... 
-Calculating column positions ... [2]
-Approximated: 1 lines, (with an average of 4.0 columns)
-Time: 0.01 seconds
-warning: Can not solve this casting problem exactly; revert to Word_wrap
-[2]Time: 0.00 seconds
-
-Postprocessing elements...
-TeX output to silly.tex ...
-\end{verbatim}
-  All has gone well; there were some warning but no errors.  The
-  output is a \file{TeX}\footnote{%
-    \file{TeX} is usually spelled as
-  \TeX.  It is batch program for typesetting text, developed by the
-  famous programmer and scientist Donald Knuth to typeset his famous The
-  Art of Computer Programming bookseries.  As you can see \TeX\ can be
-  adapted to do a lot more.  In fact, the document that you are
-  reading was also done with \TeX.} file, and it is called
-  \file{silly.tex}.
-\item
-  To do something useful with the output you have to run \TeX\ on it
-  first.  type \verb+tex silly+.  The output should resemble this:
-\begin{verbatim}
-This is TeX, Version 3.14159 (C version 6.1)
-(silly.tex
-Babel <v3.6h> and hyphenation patterns for american, dutch, loaded.
-(/home/hanwen/lib/texmf/tex/lilypond/lilyponddefs.tex
-(/home/hanwen/lib/texmf/tex/lilypond/dyndefs.tex)
-(/home/hanwen/lib/texmf/tex/lilypond/fetdefs.tex
-(/home/hanwen/lib/texmf/tex/lilypond/feta20.tex)
-(/home/hanwen/lib/texmf/tex/lilypond/lily-ps-defs.tex))) [1] )
-Output written on silly.dvi (1 page, 3084 bytes).
-Transcript written on silly.log.
-\end{verbatim}
-  The human translation is ``everything went OK, the result is one
-  page long, and I put it in \file{silly.dvi}''.  The \file{silly.dvi}
-  file is a description of how a piece of text looks when it is
-  printed.  You can view it, or print it.  If you are using a Unix
-  system equipped with X-Windows, issue the command \file{xdvi silly}
-  to view the result.  If this is not the case, consult your local
-  \TeX\ guru on printing and viewing DVI files.  What is in your
-  window should look like this:
-\begin{mudela}
-\score {
-  	<
-	\type Staff = aStaff \melodic { g'2 e'4 }
-	\type Lyrics = yell \lyric { Air2 ball!4 }
-	>
-}
-\end{mudela}
-\end{enumerate}
-
-The remainder of this document is not about \TeX, and mostly not even
-about LilyPond.  What you entered into your text editor in step~1. and
-fed to LilyPond is a special kind of file composed of notenames,
-special words and punctation.  The remainder of this document explains
-how to combine these elements to express a piece of music in the
-language that LilyPond understands.  So we try to explain how to use
-LilyPond, and not how LilyPond works; the input language of LilyPond
-is the subject of the document.  For want of a better name we call
-this language Mudela (short for Music Description Language).
-
-This document does not cover all of Mudela.  Due to technical details,
-the precise working of Mudela is coupled to the innards of LilyPond.
-If you really want to know all the details, your best bet would be to
-get the sources to LilyPond and read the parser and scanner
-source\footnote{ They are in \file{lilypond-x.y.z/lily/parser.y},
-\file{lilypond-x.y.z/lily/lexer.l}.  Of course, it would be even
-better if you would improve LilyPond and send the resulting diffs to
-us.  But that would a really different ballpark (And we
-haven't  started on the programming guide yet.)}
-
-In the following sections the basic elements of Mudela are presented.
-We don't want to bore you too much with details, so we will leave-out
-some red tape that's needed for a valid piece of Mudela: to be
-precise, we will write \verb+X Y Z+, when we really mean
-\begin{verbatim}
-\score {
-	\melodic { X Y Z }
-	\paper {}
-}
-\end{verbatim}
-Usually, we will also print the resulting fragment of music on the
-right just as it was produced by LilyPond.  
-
-For the remainder we will assume that you can carry out steps 1 to 4
-from the above instruction.  We will also assume that you know how
-music notation works, and that you are familiar with terms such as
-``note'', ``clef'', ``slur'' etc.
-
-\section{When you know the notes to print\ldots}
-
-The basic building block of music is the note.  You can have LilyPond
-print a note by specifying the pitch and the duration.  The pitch of
-the central C, also know as c$^1$ is written as \verb+c'+.  A quarter
-note duration is written as \verb+4+:
-\begin[fragment,verbatim,center]{mudela}
-c'4
-\end{mudela}
-The \verb+c'+ actually consists of two parts: one for the note name,
-and one part for the octave.  The number of apostrophes specifies the
-octave to use, and the letter which note name to use.  The duration of
-a note is specified as a number: a whole note is denoted by 1, the
-half note by 2, the quarter by 4, and so on.  This gives us already
-enough material to make simple songs:
-\begin[fragment,verbatim]{mudela}
-	c''4 d''4 e''4 c''4
-	e''4 f''4 g''2
-	g''8 a''8 g''8 f''8 e''4 c''4
-	c''4 g'4 c''2
-\end{mudela}
-
-You might wonder: ``what if I would 
-
-
-% \subsection{Durations}
-
-However, having only quarter notes may get a bit dull.
-Durations are entered as their reciproce values
-% a1 a2 a4 a a8 a a16 a a32 a a64 a a a a
-\begin[fragment,verbatim,center]{mudela}
-a1 a2 a4 a a8 a a16 a32 a64
-\end{mudela}
-note that you only have to specify
-the duration when it changes:
-Lily assumes a note has the same duration as the previous one.
-
-Now we can already write a little tune
-\begin[fragment,verbatim,center]{mudela}
-c d e c | c d e c | e f g2
-\end{mudela}
-As you'll probably have guessed,
-the vertical bar (pipe) \verb+|+ may be used to mark
-measures.
-
-In the scale shown above
-we left-out the last c note of the next octave.
-Postfixing the pitch with a quote \verb+'+
-produces a note by one octave higher
-\begin[fragment,verbatim,center]{mudela}
-c c' c''
-\end{mudela}
-
-Prefixing the pitch with a quote \verb+'+
-produces a note by one octave lower
-\begin[fragment,verbatim,center]{mudela}
-a 'a ''a
-\end{mudela}
-
-\section{Slurs and Ties}
-
-A tie connects two adjacent noteheads
-
-\begin[fragment,verbatim,center]{mudela}
-e' ~ e
-\end{mudela}
-
-Whereas a slur rather connects `chords', 
-and tries to avoid crossing stems
-
-\begin[fragment,verbatim,center]{mudela}
-e'( )e
-\end{mudela}
-
-And of course, such a (legato) slur can span several notes
-\begin[fragment,verbatim,center]{mudela}
-c( d e )f
-\end{mudela}
-
-\section{Beams and Plets}
-
-A beam is 
-\begin[fragment,verbatim,center]{mudela}
-[a8 a] [a16 a a a]
-\end{mudela}
-
-Here's a beamed triplet
-\begin[fragment,verbatim,center]{mudela}
-[/3 a8 a a]/1
-\end{mudela}
-
-a triplet without a beam
-\begin[fragment,verbatim,center]{mudela}
-\[/3 a4 a8\]
-\end{mudela}
-
-and a combination
-\begin[fragment,verbatim,center]{mudela}
-[/3 a8 a16 a] a8 \]
-\end{mudela}
-
-Abbreviations
-\begin[fragment,verbatim,center]{mudela}
-c1:16 [:16 e1 g]
-\end{mudela}
-
-\begin[fragment,verbatim,center]{mudela}
-c4:32 [:16 c8 d8]
-\end{mudela}
-
-\section{Notenames}
-
-Lily has predefined sets of notenames
-for various languages%
-\footnote{These are Dutch, English, German, Italian and Swedish.
-Simply include the language specific init file \file{<language.ly>}.}.
-The default set are the ones we like best are the Dutch notenames.
-
-A sharp is formed by adding \verb+is+
-\begin[fragment,verbatim,center]{mudela}
-cis dis eis fis gis ais bis
-\end{mudela}
-
-and a flat is formed by adding \verb+es+%
-%\footnote{Exceptions: \verb+es+ and \verb+as+.}
-\footnote{Exceptions: {\tt es} and {\tt as}.}
-\begin[fragment,verbatim,center]{mudela}
-ces des es fes ges as bes
-\end{mudela}
-
-With the obvious names for double sharps
-\begin[fragment,verbatim,center]{mudela}
-cisis disis eisis fisis gisis aisis bisis
-\end{mudela}
-
-and double flats
-\begin[fragment,verbatim,center]{mudela}
-ceses deses eses feses geses ases beses
-\end{mudela}
-See why we like-em?
-
-There are two special `notenames', the rest
-\begin[fragment,verbatim,center]{mudela}
-r16 [a a a]
-\end{mudela}
-
-and the space
-\begin[fragment,verbatim,center]{mudela}
-a2 s-"diminuendo" | a
-\end{mudela}
-
-
-\section{Commands}
-
-\begin[fragment,verbatim,center]{mudela}
-\clef "bass"; 'c
-\end{mudela}
-
-and a clef-change
-\begin[fragment,verbatim,center]{mudela}
-\clef "violin"; f' e' \clef "alto"; d' c'
-\end{mudela}
-
-\begin[fragment,verbatim,center]{mudela}
-\meter 3/4; c g g |
-\end{mudela}
-
-\begin[fragment,verbatim,center]{mudela}
-\key fis cis;
-'g 'a 'b cis d e fis g'
-\end{mudela}
-Note how Mudela allows you to 
-convey a musical message
-rather than forces you to produce a list of typesetting commands.
-If the music a \verb+cis+, you type a \verb+cis+.
-Depending on the key and context of the note
-Lily will determine what accidentals to typeset.
-
-A reminder accidental can be forced by
-using an exclamation mark \verb+!+
-on a pitch a reminder accidental
-\begin[fragment,verbatim,center]{mudela}
-cis d e cis | c! d e c |
-\end{mudela}
-
-\begin[fragment,verbatim,center]{mudela}
-\meter 2/4;
-\bar "|:"; c c \bar ":|:"; c c \bar ":|"; c c \bar "|."; 
-\end{mudela}
-
-\section{Chords and Voices}
-
-Here's a simple chord
-\begin[fragment,verbatim,center]{mudela}
-<c e g>
-\end{mudela}
-
-here are a few
-\begin[fragment,verbatim,center]{mudela}
-<
-	{ c()d()c }
-	{ e()f()e }
-	{ g()a()g }
->
-\end{mudela}
-
-and similarly voices
-\begin[fragment,verbatim,center]{mudela}
-<
-	{ \voiceone c g c g }
-	{ \voicetwo 'c2 'g2 }
->
-\end{mudela}
-
-
-\section{A complete example}
-%\label{se:complete}
-
-A Mudela file needs some red tape
-
-\begin[verbatim,center]{mudela}
-\score{
-	\melodic {
-		\octave c';
-		c d e c |
-		c d e c |
-		e f g2 |
-	}
-}
-\end{mudela}
-
-\section{Lyrics}
-
-\begin[verbatim,center]{mudela}
-\score{
-	< 
-		\melodic{ 
-			\octave c'; 
-			c d e c | c d e c |
-			e f g2 | e4 f g2
-			\bar "|.";
-		}
-		\type Lyrics \lyric{ 
-			Fr\`e-4 re Ja- que
-			Fr\`e- re Ja- que
-			Dor- mez vous?2
-			Dor-4 mez vous?2
-		}
-	>
-}
-\end{mudela}
-
-\section{Variables}
-
-
-\section{Ly2dvi}
-Check-out this handy little script 
-that not only may save you quite some keystrokes,
-but produces titles and takes care of
-margins and (hopefully) papersizes.
-See \file{ly2dvi (1)}.
-
-\end{document}
-
-% kut en peer.
-
-\begin{verbatim}
-
-% twinkle, v1
-\score {
-        \melodic { 
-                c4 c4 g4 g4 a4 a4 g2
-                f4 f4 e4 e4 d4 d4 c2
-        }
-        \paper {}
-} 
-\end{verbatim}
-
-there are a few things to note about this example:
-
-The braces are grouping characters. In general, in mudela data entry
-for a data section called ``foobar'' looks like this:
-
-\begin{verbatim}
-\foobar { ...... }
-\end{verbatim}
-
-To see if it actually works, we run it through LilyPond.  Invoke the
-command 
-\begin{verbatim}
-        lilypond twinkle.ly
-\end{verbatim}
-When LilyPond starts working it will produce various ``operator
-pacification'' messages, which you can safely ignore for now.  The run
-should have left a file called \file{lelie.tex} in your working
-directory.  You can process that file with \TeX, and it will look like
-this:
-
-\begin{mudela}
-\score {
-        \melodic { 
-                c4 c4 g4 g4 a4 a4 g2
-                f4 f4 e4 e4 d4 d4 c2
-        }
-        \paper {}
-} 
-\end{mudela}
-
-As you can see, this is the song that we wanted, albeit a little
-low-pitched.  You would probably want a version of the song which has
-all notes an octave higher.  This can be done by adding a
-\verb+\octave+ command to the source.  This sets the default octave
-for all notes.  Another convenience is the default duration: if you do
-not specify a duration with the notename, the last explicitly entered
-is used.  The improved version reads thus
-
-
-\begin[verbatim]{mudela}
-  % twinkle v2
-\score {
-        \melodic { 
-                \octave c';
-                c4 c g g a a g2
-                f4 f e e d d c2
-        }
-        \paper {}
-} 
-\end{mudela}
-
- 
-
-FIXME rewrite starting here.
-
-\begin[verbatim]{mudela}
-  \score {
-        \melodic {      % {...} is a voice
-        c'4 g'4         % c and g are pitches, 4 is the duration
-                        % (crotchet/quarter note)
-        c''4 ''c4       % c' is 1 octave up, 'c 1 down.
-        <c'4 g'4>       % <...> is a chord
-        }
-} 
-\end{mudela}
-
-
-\begin[fragment,verbatim]{mudela}
-  { c4 e4 g4 }
-\end{mudela} 
-
-Basics: the \verb+%+ introduces a comment. All music is inside a
-\verb+\score+ block which represents one movement, ie one contiguous
-block of music.  Voices are grouped by \verb+{+ and \verb+}+ and
-chords by \verb+<+ and \verb+>+.
-
-
-The \verb+\octave+ command controls the default pitch (octave). If you
-do not specify duration, the last one entered is used.  The
-\verb+\paper+ block contains parameters for spacing and dimensions.
-
diff --git a/Documentation/mudela.doc b/Documentation/mudela.doc
new file mode 100644
index 0000000000..8c95b4d1f6
--- /dev/null
+++ b/Documentation/mudela.doc
@@ -0,0 +1,1147 @@
+% -*-latex-*-
+
+% this document should be run through the mudela-book script after lilypond
+% has been installed.  The rules have been precooked into the
+% Documentation/Rules.make file; do 
+%
+%   make out/introduction.dvi
+%
+% or
+%
+%   mudela-book --outdir=out/ --outname=introduction.mudtex introduction.doc
+%   latex '\nonstopmode \input out/introduction.mudtex'
+
+% Hoi Tim, hier staan wat 'enge' commando's (die dingen met een '\'
+% zoals \documentclass en \def\mudela...).
+% Daar moet je je niets van aantrekken, ga gewoon naar Introduction
+% en begin te tiepen.
+
+\documentclass{report}
+\usepackage{a4wide}
+\title{Mudela}
+\author{Jan Nieuwenhuizen \& Han-Wen Nienhuys}
+\date{March 2, 1998}
+
+\def\file#1{\verb+#1+}
+
+% ugh: trick to get examples not generate par
+% these are for 16pt
+\def\mudelapaperlinewidth{-28.452756}%
+\def\mudelapaperindent{28.452756}%
+\def\mudelapaperrulethickness{0.400000}%
+\def\mudelapaperbarsize{16.000000}%
+\def\mudelapaperinterline{4.000000}%
+\def\mudelapapernotewidth{5.930000}%
+\def\mudelapaperwholewidth{8.640000}%
+\def\mudelapaperunitspace{22.000000}%
+\def\mudelapaperbasicspace{4.000000}%
+\def\mudelapapergeometric{0.000000}%
+\def\mudelapaperarithmetic_basicspace{2.000000}%
+\def\mudelapaperarithmetic_multiplier{4.800000}%
+\def\mudelapaperinterbeam{3.140000}%
+\def\mudelapapergourlay_energybound{100000.000000}%
+\def\mudelapapergourlay_maxmeasures{14.000000}%
+% huh?
+% \def\exampleheight{2\mudelapaperbarsize pt}
+\def\exampleheight{2cm}
+
+% ful of pars, needs the above
+\input lilyponddefs
+% generates par
+\musixsixteendefs
+\def\musixsixteendefs{}
+% generates par
+\turnOnPostScript%
+\def\turnOnPostScript{}
+% generates par
+\def\interscoreline{}
+% 
+
+\begin{document}
+\maketitle
+
+%\def\interexample{\hskip15mm$\Longrightarrow$\hskip15mm}
+%\def\interexample{\hbox to10mm{\hfill\hbox to0pt{\hss\vbox to\exampleheight{\vss$\Longrightarrow$\vss}\hss}\hfill}}
+\def\interexample{}
+\def\preexample{\par}
+\def\postexample{\par\medskip}
+
+\def\file#1{{\texttt{#1}}}
+\setcounter{secnumdepth}{-1}
+
+\chapter{A tutorial}
+
+\emph{\Large ***Under construction***}
+
+\section{Introduction}
+
+This chapter is a gentle introduction to using LilyPond to typeset
+simple music.
+
+LilyPond is a so called ``batch'' program.  This means, that you use a
+texteditor (such as emacs or vi) to create an input file.  When you
+are done editing your input file, you run LilyPond.  If Lily
+finds any errors in your input file she\footnote{ If computer programs
+could have gender, we're sure that LilyPond is a female computer
+program, so we will refer to the program as a she. This gender-bending
+is not to tease you, dear reader.  We do it in real life as well. In
+the past two years LilyPond has become sort of a baby daughter to us,
+keeping us awake at night, but also providing lots of joy.  We hope
+you do not mind our little aberration from computer-manual tradition.
+% 
+% The name LilyPond is actually sort of a girl's name.  Can you guess which
+% one ?
+%
+} complain.  If everything is well, than she'll generate a file that
+you can process further to view or print it.
+
+Using LilyPond to print or view some music is a procedure with four
+steps.  To get you started we'll run down the full procedure for you
+once.
+
+\begin{enumerate}
+\item
+Fire up your favourite editor (if you know none, try \texttt{joe silly.ly}),
+and key in the following text:
+\begin{verbatim}
+\score {
+  	<
+        \type Staff = aStaff \melodic { g'2 e'4 }
+        \type Lyrics = yell \lyric { Air2 ball!4 }
+        >
+}
+\end{verbatim}
+
+Save your file as \file{silly.ly}.  The input files for LilyPond have
+the default extension \file{.ly}.
+
+\item
+Run LilyPond on your newly created file: enter \verb+lilypond silly+.
+LilyPond will then print all kinds of mumbo jumbo that can safely
+ignored.  You might see something like this:
+\begin{verbatim}
+GNU LilyPond 0.1.55/FlowerLib 1.1.39
+Parsing ... [/home/hanwen/musix/spacer/init/lily-init.ly[/home/hanwen/
+
+        ... stuff left out here ...
+
+        			Documentation/silly.ly]
+Interpreting music ...[1] (time: 0.04 seconds)
+Preprocessing elements... 
+Calculating column positions ... [2]
+Approximated: 1 lines, (with an average of 4.0 columns)
+Time: 0.01 seconds
+warning: Can not solve this casting problem exactly; revert to Word_wrap
+[2]Time: 0.00 seconds
+
+Postprocessing elements...
+TeX output to silly.tex ...
+\end{verbatim}
+  All has gone well; there were some warning but no errors.  The
+  output is a \file{TeX}\footnote{%
+    \file{TeX} is usually spelled as
+  \TeX.  It is batch program for typesetting text, developed by the
+  famous programmer and scientist Donald Knuth to typeset his famous The
+  Art of Computer Programming bookseries.  As you can see \TeX\ can be
+  adapted to do a lot more.  In fact, the document that you are
+  reading was also done with \TeX.} file, and it is called
+  \file{silly.tex}.
+\item
+  To do something useful with the output you have to run \TeX\ on it
+  first.  type \verb+tex silly+.  The output should resemble this:
+\begin{verbatim}
+This is TeX, Version 3.14159 (C version 6.1)
+(silly.tex
+Babel <v3.6h> and hyphenation patterns for american, dutch, loaded.
+(/home/hanwen/lib/texmf/tex/lilypond/lilyponddefs.tex
+(/home/hanwen/lib/texmf/tex/lilypond/dyndefs.tex)
+(/home/hanwen/lib/texmf/tex/lilypond/fetdefs.tex
+(/home/hanwen/lib/texmf/tex/lilypond/feta20.tex)
+(/home/hanwen/lib/texmf/tex/lilypond/lily-ps-defs.tex))) [1] )
+Output written on silly.dvi (1 page, 3084 bytes).
+Transcript written on silly.log.
+\end{verbatim}
+  The human translation is ``everything went OK, the result is one
+  page long, and I put it in \file{silly.dvi}''.
+
+\item The \file{silly.dvi} file is a description of how a piece of
+text looks when it is printed.  You can view it, or print it.  If you
+are using a Unix system equipped with X-Windows, issue the command
+\file{xdvi silly} to view the result.  If this is not the case,
+consult your local \TeX\ guru on printing and viewing DVI files.  What
+is in your window should look like this:
+\begin{mudela}
+\score {
+  	<
+        \type Staff = aStaff \melodic { g'2 e'4 }
+        \type Lyrics = yell \lyric { Air2 ball!4 }
+        >
+}
+\end{mudela}
+\end{enumerate}
+
+The remainder of this document is not about \TeX, and mostly not even
+about LilyPond.  What you entered into your text editor in step~1. and
+fed to LilyPond is a special kind of file composed of notenames,
+special words and punctation.  The remainder of this document explains
+how to combine these elements to express a piece of music in the
+language that LilyPond understands.  So we try to explain how to use
+LilyPond, and not how LilyPond works; the input language of LilyPond
+is the subject of the document.  For want of a better name we call
+this language Mudela (short for Music Description Language).
+
+This document does not cover all of Mudela.  Due to technical details,
+the precise working of Mudela is coupled to the innards of LilyPond.
+If you really want to know all the details, your best bet would be to
+get the sources to LilyPond and read the parser and scanner
+source\footnote{ They are in \file{lilypond-x.y.z/lily/parser.y},
+\file{lilypond-x.y.z/lily/lexer.l}.  Of course, it would be even
+better if you would improve LilyPond and send the resulting diffs to
+us.  But that would a really different ballpark (And we
+haven't  started with the programming guide yet.)}
+
+In the following sections the basic elements of Mudela are presented.
+We don't want to bore you too much with details, so we will leave-out
+some red tape that's needed for a valid piece of Mudela: to be
+precise, we will write \verb+X Y Z+, when we really mean
+\begin{verbatim}
+\score {
+        \melodic { X Y Z }
+        \paper {}
+}
+\end{verbatim}
+Usually, we will also print the resulting fragment of music on the
+right just as it was produced by LilyPond.  
+
+For the remainder we will assume that you can carry out steps 1 to 4
+from the above instruction.  We will also assume that you know how
+music notation works, and that you are familiar with terms such as
+``note'', ``clef'', ``slur'' etc.
+
+\section{Music copying versus music definition}
+
+If you have done music copying before, then using LilyPond may seem
+awkward to you in the beginning.  The purpose of LilyPond is usually
+explained by the term ``music typesetter.''
+
+This may give the impression that the program lets you control
+precisely how the music is formatted.  This is not the case: not only
+does the program print musical symbols, LilyPond also tries to make
+esthetic decisions---to be precise, we programmed her to do what we
+find pretty.  You do not have complete control over what is happening.
+On the other hand, good engraving is a very complex trade, so it is a
+Good Thing that you do not have to worry about what is happening.
+
+Secondly, LilyPond operates on musical definitions.  This really is
+something different from graphical definitions.  If you copy music by
+hand from a printed score, you don't have to know what the score
+means; you just copy the symbols.  With LilyPond such a thing is not
+possible: we expect you to enter the meaning of the score, not the
+score itself.  If put more concretely: you do not enter ``black
+notehead without flag, fourth staff line'', but ``a quarter note,
+pitch $d^2$''.  LilyPond will figure out from the musical info what
+kind of graphic presentation is needed.
+
+This has some drawbacks: most notably, it is difficult to enter sheet
+music that you cannot read.  On the other hand, any piece of music
+that you enter can be played and transposed automatically.
+
+
+\section{When you know the notes to print\ldots}
+
+The basic building block of music is the note.  You can have LilyPond
+print a note by specifying its pitch and the duration.  The pitch of
+the central C, also know as c$^1$ is written as \verb+c'+.  A quarter
+note duration is written as \verb+4+.  So, to print quarter note with
+central C pitch, you enter the following
+\begin[fragment,verbatim,center]{mudela}
+c'4
+\end{mudela}
+The pitch \verb+c'+ actually consists of two parts: one for the note
+name, and one part for the octave.  The number of apostrophes
+specifies the octave to use, and the letter which note name to use.
+The note names simply are the letters \verb+a+ to \verb+g+.
+
+The duration of a note is specified as a number: a whole note is
+denoted by 1, the half note by 2, the quarter by 4, and so on.  Here
+are some random notes to show how it works
+\begin[fragment,verbatim]{mudela}
+'c8 c8 c'16 c''16 d''64 b'64 c1 c'4 d'4 e'4 f'4 g'4 a'4
+\end{mudela}
+
+This gives us already enough material to make simple songs:
+\begin[fragment,verbatim]{mudela}
+        c''4 d''4 e''4 c''4
+        e''4 f''4 g''2
+        g''8 a''8 g''8 f''8 e''4 c''4
+        c''4 g'4 c''2
+\end{mudela}
+
+There is only one part about pitches that we haven't told you:
+chromatically altered pitches.  The names ``a'' to ``g'' for typing
+pitches are convenient: they are short, pronounceable and they
+resemble the normal vocabulary for pitches.  Enter flats and sharps.
+In english there is no standard terse word for C sharp or C flat.  For
+this reason, we implemented a different, non-english convention for
+entering altered pitches, see table~\ref{notename-tab}: one makes a note sharp by adding the suffix
+--is to the name, one makes the a note flat by adding the suffix
+--es.  For a double sharp you simply add another --is suffix.  
+
+\begin{table}\caption{Note names}\label{notename-tab}
+\begin{tabular}{ll}
+english 	&LilyPond\\
+\hline\\
+c double flat	&ceses\\
+c flat		&ces\\
+c natural	&c\\
+c sharp		&cis\\
+c double sharp	&cisis\\
+\end{tabular}
+\end{table}
+
+Variations on this convention\footnote{LilyPond actually defaults to
+dutch notenames, with aes, aeses, ees and eeses added} are used in a
+number of germanic languages, notably dutch, german, swedish,
+norwegian.  If you are not comfortable with these names, you can make
+your own names.  Check out the example initialisation files.  A number
+of languages are included.
+
+\section{Hairy rhythms}
+
+\section{Handy input}
+
+% \subsection{Durations}
+
+However, having only quarter notes may get a bit dull.
+Durations are entered as their reciproce values
+% a1 a2 a4 a a8 a a16 a a32 a a64 a a a a
+\begin[fragment,verbatim,center]{mudela}
+a1 a2 a4 a a8 a a16 a32 a64
+\end{mudela}
+note that you only have to specify
+the duration when it changes:
+Lily assumes a note has the same duration as the previous one.
+
+Now we can already write a little tune
+\begin[fragment,verbatim,center]{mudela}
+c d e c | c d e c | e f g2
+\end{mudela}
+As you'll probably have guessed,
+the vertical bar (pipe) \verb+|+ may be used to mark
+measures.
+
+In the scale shown above
+we left-out the last c note of the next octave.
+Postfixing the pitch with a quote \verb+'+
+produces a note by one octave higher
+\begin[fragment,verbatim,center]{mudela}
+c c' c''
+\end{mudela}
+
+Prefixing the pitch with a quote \verb+'+
+produces a note by one octave lower
+\begin[fragment,verbatim,center]{mudela}
+a 'a ''a
+\end{mudela}
+
+\section{Slurs and Ties}
+
+A tie connects two adjacent noteheads
+
+\begin[fragment,verbatim,center]{mudela}
+e' ~ e
+\end{mudela}
+
+Whereas a slur rather connects `chords', 
+and tries to avoid crossing stems
+
+\begin[fragment,verbatim,center]{mudela}
+e'( )e
+\end{mudela}
+
+And of course, such a (legato) slur can span several notes
+\begin[fragment,verbatim,center]{mudela}
+c( d e )f
+\end{mudela}
+
+\section{Beams and Plets}
+
+A beam is 
+\begin[fragment,verbatim,center]{mudela}
+[a8 a] [a16 a a a]
+\end{mudela}
+
+Here's a beamed triplet
+\begin[fragment,verbatim,center]{mudela}
+[/3 a8 a a]/1
+\end{mudela}
+
+a triplet without a beam
+\begin[fragment,verbatim,center]{mudela}
+\[/3 a4 a8\]
+\end{mudela}
+
+and a combination
+\begin[fragment,verbatim,center]{mudela}
+[/3 a8 a16 a] a8 \]
+\end{mudela}
+
+Abbreviations
+\begin[fragment,verbatim,center]{mudela}
+c1:16 [:16 e1 g]
+\end{mudela}
+
+\begin[fragment,verbatim,center]{mudela}
+c4:32 [:16 c8 d8]
+\end{mudela}
+
+\section{Notenames}
+
+Lily has predefined sets of notenames
+for various languages%
+\footnote{These are Dutch, English, German, Italian and Swedish.
+Simply include the language specific init file \file{<language.ly>}.}.
+The default set are the ones we like best are the Dutch notenames.
+
+A sharp is formed by adding \verb+is+
+\begin[fragment,verbatim,center]{mudela}
+cis dis eis fis gis ais bis
+\end{mudela}
+
+and a flat is formed by adding \verb+es+%
+%\footnote{Exceptions: \verb+es+ and \verb+as+.}
+\footnote{Exceptions: {\tt es} and {\tt as}.}
+\begin[fragment,verbatim,center]{mudela}
+ces des es fes ges as bes
+\end{mudela}
+
+With the obvious names for double sharps
+\begin[fragment,verbatim,center]{mudela}
+cisis disis eisis fisis gisis aisis bisis
+\end{mudela}
+
+and double flats
+\begin[fragment,verbatim,center]{mudela}
+ceses deses eses feses geses ases beses
+\end{mudela}
+See why we like-em?
+
+There are two special `notenames', the rest
+\begin[fragment,verbatim,center]{mudela}
+r16 [a a a]
+\end{mudela}
+
+and the space
+\begin[fragment,verbatim,center]{mudela}
+a2 s-"diminuendo" | a
+\end{mudela}
+
+
+\section{Commands}
+
+\begin[fragment,verbatim,center]{mudela}
+\clef "bass"; 'c
+\end{mudela}
+
+and a clef-change
+\begin[fragment,verbatim,center]{mudela}
+\clef "violin"; f' e' \clef "alto"; d' c'
+\end{mudela}
+
+\begin[fragment,verbatim,center]{mudela}
+\meter 3/4; c g g |
+\end{mudela}
+
+\begin[fragment,verbatim,center]{mudela}
+\key fis cis;
+'g 'a 'b cis d e fis g'
+\end{mudela}
+Note how Mudela allows you to 
+convey a musical message
+rather than forces you to produce a list of typesetting commands.
+If the music a \verb+cis+, you type a \verb+cis+.
+Depending on the key and context of the note
+Lily will determine what accidentals to typeset.
+
+A reminder accidental can be forced by
+using an exclamation mark \verb+!+
+on a pitch a reminder accidental
+\begin[fragment,verbatim,center]{mudela}
+cis d e cis | c! d e c |
+\end{mudela}
+
+\begin[fragment,verbatim,center]{mudela}
+\meter 2/4;
+\bar "|:"; c c \bar ":|:"; c c \bar ":|"; c c \bar "|."; 
+\end{mudela}
+
+\section{Chords and Voices}
+
+Here's a simple chord
+\begin[fragment,verbatim,center]{mudela}
+<c e g>
+\end{mudela}
+
+here are a few
+\begin[fragment,verbatim,center]{mudela}
+<
+        { c()d()c }
+        { e()f()e }
+        { g()a()g }
+>
+\end{mudela}
+
+and similarly voices
+\begin[fragment,verbatim,center]{mudela}
+<
+        { \voiceone c g c g }
+        { \voicetwo 'c2 'g2 }
+>
+\end{mudela}
+
+
+\section{A complete example}
+%\label{se:complete}
+
+A Mudela file needs some red tape
+
+\begin[verbatim,center]{mudela}
+\score{
+        \melodic {
+        	\octave c';
+        	c d e c |
+        	c d e c |
+        	e f g2 |
+        }
+}
+\end{mudela}
+
+\section{Lyrics}
+
+\begin[verbatim,center]{mudela}
+\score{
+        < 
+        	\melodic{ 
+        		\octave c'; 
+        		c d e c | c d e c |
+        		e f g2 | e4 f g2
+        		\bar "|.";
+        	}
+        	\type Lyrics \lyric{ 
+        		Fr\`e-4 re Ja- que
+        		Fr\`e- re Ja- que
+        		Dor- mez vous?2
+        		Dor-4 mez vous?2
+        	}
+        >
+}
+\end{mudela}
+
+\section{Variables}
+
+
+\section{Ly2dvi}
+Check-out this handy little script 
+that not only may save you quite some keystrokes,
+but produces titles and takes care of
+margins and (hopefully) papersizes.
+See \file{ly2dvi (1)}.
+
+\chapter{Input format reference}
+
+October 8, 1997
+
+This document describes the the GNU LilyPond input format, which is an
+effective language for defining music.  We call this language (rather
+arrogantly) The Musical Definition Language or Mudela, for
+short.\footnote{If anybody comes up with a better name, we'd gladly
+  take this. Gourlay already uses Musical Description Language,
+  G-Sharp Score Definition Language.  ISO standard 10743 defines a
+  Standard Music Description Language.  We're not being original here}
+
+The first aim of Mudela is to define a piece of music, being complete
+from both from a musical typesetting, as from a musical performing
+point of view.
+
+The Musical Definition Language (Mudela), has a logical structure,
+making use of identifiers, that allows for flexible input, and
+definition reuse. See \file{MANIFESTO} for reasons and design considerations.
+
+The below included for explanatory purposes only (i.e., for a complete
+and up-to-date definition, see \file{lily/parser.y} and
+\file{lily/lexer.l}):
+
+As a related note, you should take a look at the examples and the init
+files, as this document does not cover every aspect of mudela yet, and
+may be out of date.\footnote{Ok, I am being pessimistic here.  This
+  just is a disclaimer.  Docs usually are written after the program
+  itself.}  This document intends to give an idea of how it works, it
+is not a guide on how to use it.  
+
+
+\section{Basic elements}
+
+\subsection{Files}
+
+The de-facto extension of Mudela is \file{.ly}. Files may be included by
+entering \verb+\include+ at the start of a line:
+
+\begin{verbatim}
+\include "a_file.ly"
+\end{verbatim}
+
+
+\subsection{Comments}
+
+Line comments are introduced by a
+\verb+%+. 
+Block comments are delimited
+by 
+\verb+%{+ 
+and
+\verb+%}+. 
+They do not nest.
+
+\subsection{Versions}
+
+Occasionally, small changes in syntax across different versions of
+Mudela might give syntax errors. To warn you about possible
+incompatibilities, you can specify the Mudela version for which the
+inputfile was written,
+\begin{verbatim}
+\version "0.0.50";
+\end{verbatim}
+
+A perl-script which tries to convert to newer versions
+(\file{convert-mudela}) is included in the LilyPond distribution.
+
+\subsection{Words}
+
+Keywords are preceded by a backslash: \verb+\+. They contain
+alphabetic characters only.
+
+Identifiers in their normal form consist start with a backslash, a
+alpha character, followed by alpha-numerics. Identifiers can contain
+any characters (except whitespace, 
+ and \verb+%+), if you use this construct:
+
+\begin{verbatim}
+\$i'm_a_weird!!!identifier
+\end{verbatim}
+
+(which is the identifier with the name
+\verb+i'm_a_weird!!!identifier+).  \verb+$+ Takes any sequence of
+characters which are not whitespace, \verb+$+ and \verb+%+.
+\verb+$i'm_a_weird!!!string+
+\def\foobar{$} % silly fontlock mode 
+
+\subsection{Nesting characters}
+
+Mudela uses the brace (\verb+{+ and \verb+}+) for most hierarchical
+structures.  For chords the \verb+<+ and the \verb+>+ are used as
+nesting braces.
+
+\subsection{Constants}
+
+Please note that -.5 is not a Real.
+
+\begin{verbatim}
+"I am a string"
+-1.2e3          % a real
+12              % an int
+\end{verbatim}
+
+        
+\subsection{Identifiers}
+
+When assigning identifiers you use
+
+\begin{verbatim}
+string = ...
+\end{verbatim}
+
+If you reuse identifiers, then the previous contents will be thrown
+away after the right hand is evaluated, eg
+\begin{verbatim}
+bla = \melodic { \bla }
+\end{verbatim}
+is legal
+
+When using identifiers they have to be escaped:
+
+\begin{verbatim}
+oboe = \melodic { ... }
+\score{ \melodic { \oboe }}
+\end{verbatim}
+
+The left-hand part of the assignment is really a string, so 
+\begin{verbatim}
+"Foo bar 4 2 " = \melodic { .. }
+\end{verbatim}
+
+is also a valid assignment (but you would have trouble referencing to it)
+
+
+\subsection{Hierarchical structures}
+
+The general structure consists of declarations:
+\begin{verbatim}
+IDENTIFIER = \TYPE{
+        <type specific data>
+}
+\end{verbatim}
+and instantiations:
+
+\begin{verbatim}
+\TYPE{ <type specific data> }
+\end{verbatim}
+
+(Currently, \verb+\score+ is the only type that can be instantiated
+at top level. Currently declarations can only be done at top level)
+
+Most instantiations that use an IDENTIFIER are specified as follows:
+
+\begin{verbatim}
+\TYPE{ IDENTIFIER [...] }
+\end{verbatim}
+
+Some exceptions on this rule have been made to prevent inputting
+Mudela becoming tedious
+
+
+\subsection{Modes:}
+
+To simplify different aspects of music definition (entering the notes
+and manipulating them) Mudela has a number of different input "modes":
+
+\begin{description}
+
+
+\item[Normal mode]
+
+At the start of parsing, Mudela assumes normal mode.
+In Normal mode, a word is looked up in the following order:
+\begin{description}
+\item{\verb+word+}    string
+\item{\verb|"string"|} string
+\item{\verb|\word|} keyword, identifier
+\end{description}
+In normal mode, a word is assumed to start with an alphabetic
+character, followed by alpha-numeric characters.
+
+\item[Note mode] Note mode is introduced by the keyword
+  \verb+\melodic+.  In Note mode, a word is looked up in the following
+  order:
+\begin{description}
+\item{\verb+word+} notename, string
+\item{\verb|"string"|} string
+\item{\verb|\word|} keyword, identifier
+\end{description}
+
+In Note mode a word is considered to have alphabetic characters only,
+so the underscore (\_) is illegal.  If you accidently mistype a
+notename, the parser will assume that you are entering a string (and
+it will most likely complain that you should be in \verb|\lyrics| mode to
+do lyrics)
+
+
+\item[Lyric mode] Lyrics mode (and thus Simple mudela) is introduced
+  by the keyword \verb+\lyrics+.  Because of the various control
+  characters that can appear in lyrics, eg, ``foreign language''
+  accents, the inputting a string containing these has been made very
+  easy.
+
+In Lyrics mode, a word is looked up in the following order:
+\begin{description}
+\item{\verb+word+}    string (thus a lyric)
+\item{\verb|"string"|} string
+\item{\verb|\word|} keyword, identifier
+\end{description}
+
+In Lyric mode every sequence of non-digit and non-white characters
+starting with an alphabetic character or the \_ is considered a word.
+
+\begin{verbatim}
+a&@&@&TSI|{[    % a word
+1THtrhortho     % not a "word"
+Leise Fl\"u\ss{}teren meine Sapfe       % 4 words
+_ _ _ _         % 4 words: 4 spaces
+\end{verbatim}
+\end{description}
+
+These modes are of a lexical nature. Normal and Note mode largely
+resemble each other, save the possibility of entering Reals, 
+meaning of \verb+_+ and the resolution of words
+
+\subsection{Notes}
+
+You enter a note by giving the name and the reciprocal of the duration:
+
+\begin[fragment,verbatim]{mudela}
+a'4     % Dutch names
+\end{mudela}
+
+is a A-1 pitched crotchet. The ' signifies an octave change.  A-1 is 440
+Hz concert-pitch. \verb+c'+ is also known as the central c. More examples:
+
+\begin[fragment,verbatim]{mudela}
+        'a      % 110
+        a       % 220
+        A       % 110, uppercase octavates down
+        a'      % 440
+        a''     % 880
+        'as4.*2/3
+\end{mudela}
+
+The last one  is an A flat, (just below 110 Hz concert-pitch). The \verb+*2/3+
+signifies that this note is part of a triplet (3 in stead of 2). The
+duration is one and a half quarter note (\verb+4.+) times 2/3.
+
+Notenames are just a special kind of identifiers, and can be declared
+for any language appropriate (see \file{init/dutch.ly}).  The default language
+for notenames is defined to be Dutch. In Dutch, the notenames are
+a,b,c,d,e,f and g. Sharps are formed by adding the extension "is",
+flats by adding ``es''
+
+\begin{verbatim}
+% double sharp
+cisis disis eisis fisis gisis aisis bisis
+% sharps
+cis dis eis fis gis ais bis
+% naturals
+c d e f g a b 
+% flats
+ces des es fes ges as bes
+% double flats
+ceses deses eses feses geses ases beses
+\end{verbatim}
+
+Rests are named r or s
+\begin{verbatim}
+r       % print a rest
+s       % a "space" rest, nothing is printed.
+\end{verbatim}
+
+These notenames along with duration are enough material to construct
+simple melodies:
+
+\begin[verbatim,fragment]{mudela}
+\octave c';
+c4 c4 g4 g4 a4 a4 g2
+f4 f4 e4 e4 d4 d4 c2
+\end{mudela}
+
+Music is able to express more. generally speaking, the other
+'features' are either connected between notes (slurs, beams: spanning
+requests) or attached to notes (eg. accents). The former are
+implemented as START and STOP stop features and then attached to the note.
+
+\begin{description}
+\item{[ and ]}      start and stop a beam
+\item{( and )}      start and stop a slur
+\end{description}
+
+example: 
+\begin[verbatim,fragment]{mudela}
+  \octave c';
+  [c8 () d8 () e8  
+  e8(] [)g8 <c'8] e'8>              % NO nesting!
+  [2/3 c8 c8 c8]1/1       % a triplet
+\end{mudela}
+
+Please note that these two characters do \emph{not} necessarrily nest,
+they should be attached to the note.  For this reason, the construct
+\verb+[ <c4 c4>]+ will generate a parse error.
+  
+\subsection{Slurs and Ties}
+
+Ties connect the noteheads of adjacent notes. They are entered as follows:
+
+\begin[verbatim,fragment]{mudela}
+a'4 ~ a''4
+\end{mudela}
+
+Slurs connect whole chords, and try to avoid crossing stems. They are
+entered as follows:
+
+\begin[verbatim,fragment]{mudela}
+a'4(  )a''4
+\end{mudela}
+
+\subsection{Scripts}
+
+Symbols which can be put at either side (above or below) of a staff
+are entered as follows:
+\begin[verbatim,fragment]{mudela}
+        a-^     % marcato, direction: default
+        %a^-     % portato, direction: above note
+        a_.     % staccato, direction: below note
+        a^\fermata      % predefined identifier
+        c_"marcato"     % add a text
+        c^"marcato"
+        c-"marcato"
+\end{mudela}
+
+If you want to define your own scripts refer to \file{init/script.ly} for
+details.
+
+
+Dynamics can be put after the notename:
+\begin{verbatim}
+a4 \dynamic { 0 } % 0 = fff, 7 = ppp
+\end{verbatim}
+
+Mudela defines the following dynamic identifiers:
+
+\begin{verbatim}
+ppp pp p mp mf f ff fff sfz fz fp
+\end{verbatim}
+and the following abbreviations:
+\begin{verbatim}
+\<      %start crescendo
+\>      % start decrescendo
+\!      % end crescendo/decrescendo
+\end{verbatim}
+
+\subsection{Defaults}
+
+If omit the duration of a note, a default value is substituted. For
+this default value mudela uses the last duration explicitly entered.
+
+Thus the following inputs are  equivalent
+\begin{verbatim}
+c4 c4 c16 c16 c16 s16 c4 c16
+c4 c c16 c c c c4 c16
+\end{verbatim}
+
+If you are typing music which does not lie in the "small" and "large"
+octave, you can prevent having to type \verb+'+ all the time by using the
+\verb+\octave+ command: These two lines have the same pitch.
+\begin{verbatim}
+c'' d'' e'' c d e c d e
+\octave c''; c d e ''c ''d ''e \octave c; c d e
+\end{verbatim}
+
+By default the setting of \verb+\octave+ is 0.
+
+\subsection{Lyrics}
+
+Lyrics in Mudela resemble Simple mudela a lot, with notes substituted
+by text. 
+
+All syllables are entered separately, separated by whitespace 
+\begin{verbatim}
+Twin-4 kle4 twin-4 kle4 ... 
+\end{verbatim}
+
+Two syllables or words that compose a single
+duration entry are bound together using an underscore 
+\begin{verbatim}
+He_could4 not4
+\end{verbatim}
+
+\section{Composition: forming bigger structures}
+
+The previous examples tacitly assumed that a sequence of notes is
+printed in a left to right manner. This is not entirely correct, you
+will get the bigger picture in this section. 
+
+In mathematics you can form expressions by combining expressions,
+which are ultimately some kind of atom or terminal symbol.  The same
+goes for mudela: there are some basic building blocks, and by
+combining those you create complex music.
+
+You can combine music in three ways:
+\begin{itemize}
+\item If you enclose a sequence of music-elements in braces ( \verb+{+
+    and \verb+}+ ), then you form another kind of music called (Voice) with those pieces.
+  The duration of the Voice is the sum of the durations of its elements
+\begin{verbatim}
+{ c c g g a a g2 }      % twinkle twinkle
+{ { c c g g} { a a g2 } }
+\end{verbatim}
+\item You can stack music by enclosing a sequence of music elements
+  with \verb+<+ and \verb+>+. This is called a Chord.  The duration of a Chord is
+  the union of the durations of its elements Example:
+\begin{verbatim}
+<a4 {cis8 cis8} e'4>      % a-major chord
+\end{verbatim}
+\item 
+  You can form music by transposing music:
+\begin{verbatim}
+\transpose  
+                d       % from c to the d that's one octave down
+                { e4 f4 }       % the horizontal music
+\end{verbatim}
+\end{itemize}
+
+Of course you can also combine these three mechanisms.
+\begin{verbatim}
+{ c <c e> <c e g> <c e g \transpose d' dis > }  % 4 increasing chords
+\end{verbatim}
+
+The basic building block in Mudela is called Request. Examples of
+Requests are: Timing (such as Meter), Rhythmic, Melodic, Note (which is a combination of
+Rhythmic and Melodic), Musicscript (put an accent over a note or
+rest), etc.  For the actual up to date listing, you should consult the
+LilyPond source code: the Request types form a big class hierarchy.
+
+Normally you don't enter Requests directly, since that would be
+tedious.  Mudela has standard abbreviations for the most common
+combination of Requests. If you enter \verb+c4+, this is an
+abbreviation for:
+\begin{verbatim}
+Request_chord{
+  Note_req{
+    notename: 0 acc: 0 oct: -1
+    duration { 4}
+  }
+  Stem_req{
+    duration { 4}
+  }  
+}
+\end{verbatim}
+
+The \verb+Request_chord+ is a special kind of chord which only allows
+Requests as its elements.  The examples of the previous section were
+processed with \verb+{+ and \verb+}+ enclosing the input.
+
+\subsection{Durations}
+
+A duration always starts with the duration type (1,2,4 etc), and then
+any optional multipliers/dots.  Old fashioned durations can be entered
+as follows
+\begin{verbatim}
+'c\breve
+gis'\longa
+\end{verbatim}
+
+
+        
+\subsection{Meters/groupings}
+
+A meter has this form:
+\begin{verbatim}
+\meter 3/4 ;
+\end{verbatim}
+
+Rhythmic grouping is  a concept closely associated with this. For
+example, in a 5/8 meter, the counts are grouped 2+3. In mudela this is
+entered as
+\begin{verbatim}
+\grouping  8*2 8*3 ;
+\end{verbatim}
+You can start the piece with a partial measure, the command takes the
+same syntax as grouping: 
+\begin{verbatim}
+\partial 16*3 4;
+\end{verbatim}
+
+Make the piece start with a upstep [english translation?]
+lasting 1 3/4 quarter notes.
+
+These commands are also "voice elements", and constitute ``Music''
+(consisting of stuff with duration 0).
+
+
+\subsection{Voicegroups}
+
+
+[OUTDATED]
+
+If more than one "voice" is in a staff, then you have the option of
+putting the different voices into so called voicegroups: members of
+the same voicegroup share certain characteristics, among others:
+
+        - dynamics
+        - text
+        - beams and stems
+        - scripts
+
+For the actual list, see the init file \file{init/register.ly}
+
+Putting different musical lines in to the same voicegroup effectively
+makes LilyPond try to form chords of all those lines. Putting
+different musical lines in to different voicegroups effectively makes
+LilyPond try to set those lines as independently as possible. 
+
+[adsolete. Has to be fixed in lily]
+
+You can set the voicegroup of a voice with the command \verb+\group+, e.g.,
+
+\begin{verbatim}        
+        oboeI = \melodic { 
+                \group "oboes"; 
+                [e8 f8
+                \group "+solo";
+                [g16 a16 g16 fis16]
+                \group "-";
+                g8 f8
+        }
+        oboeII = \melodic { \group "oboes";
+                c8 d8]
+                e4
+                e8 d8
+        }
+        ///     ...
+
+        \staff { 
+                melodicregs \melodic{ oboeI }
+                \melodic { oboeII}
+}
+\end{verbatim}
+
+In this example, the two oboe voices share one staff and are initially
+in the voicegroup called "oboes". They will share beams, dynamics etc.
+After two quarter notes, oboeI "pushes" its group: a new voicegroup is
+created, called "oboes+solo". The \verb+\group "-"+ command makes the
+voice enter "oboes" again.
+
+Please do note that [] are voicegroup wide; the previous input is
+valid: the beam, started in oboeI, voicegroup "oboes" is also ended in
+voicegroup "oboes", albeit not in oboeI but oboeII
+
+This concept may seem contorted, but it allows you to set the separate
+oboe parts without changing the \verb+oboeI+ and \verb+oboeII+ (assuming that
+you edit the [] in the example.)
+
+The construct
+\begin{verbatim}
+< { .... } {......} >
+\end{verbatim}
+makes a chord (all horizontal parts are in the same voicegroup). The construct
+\begin{verbatim}
+\multi 2 < { ....} { .... } >
+\end{verbatim}
+creates horizontal parts which behave independently. You will have to
+set voicegroup features by hand (\verb+\stem+ and \verb+\hshift+. See examples)
+
+The construct
+\begin{verbatim}
+\multi 3 < { ....} { .... } >
+\end{verbatim}
+creates  a chord with each part in a different staff
+
+
+\subsection{Examples}
+
+Examples are included with the GNU LilyPond distribution. For the sake of
+maintenance no long examples are included in this document.
+
+
+\section{History}
+
+This language has a number of roots. First and foremost, GNU
+LilyPond's predecessor mpp was the inspiration of the Note-mode input.
+Secondly, the hierarchical structure looks a lot like Rayce's (Rayce
+is a raytracer that I've written as a hobby project. ), which in turn
+owes a lot to POVRay.
+
+Now, we know, musictypesetting and raytracing do not necessarily
+require the same input format, and we know that a lot more ways exist
+to convert music to ASCII, but we did give this language some
+thoughts. As always suggestions are appreciated.
+
+\end{document}
+
+
diff --git a/Documentation/out/dummy.dep b/Documentation/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/Documentation/out/dummy.dep
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index 088d3b294b..0000000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# GNUmakefile
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-#ugh
-biltdir=../build
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-SUBDIRS :=
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-wild-check:
diff --git a/INSTALL b/INSTALL.txt
index 27b5c95138..05998b7b4c 100644
--- a/INSTALL
+++ b/INSTALL.txt
@@ -33,12 +33,6 @@ PREREQUISITES
 
        o    GNU C++ version 2.7 or newer (yes, 2.8 is fine).
 
-       o    GNU make.
-
-       o    Flex (version 2.5.1 or newer).
-
-       o    Bison (version 1.25 or newer).
-
 RUNNING
        GNU LilyPond does use a lot of resources. For operation
        you need the following:
@@ -54,14 +48,20 @@ RECOMMENDED
        Although not strictly necessary, these are recommended to
        have.
 
-       o    Perl-5.  Most documentation was created with the
+       o    GNU make.
+
+       o    Flex (version 2.5.1 or newer).
+
+       o    Bison (version 1.25 or newer).  =item *
+
+            Perl-5.  Most documentation was created with the
             perl's Plain Old Documentation. (I use 5.003)
 
 
 
 
 
-13/Mar/98                LilyPond 0.1.48                        1
+20/Mar/98                LilyPond 0.1.57                        1
 
 
 
@@ -127,7 +127,7 @@ CONFIGURING and COMPILING
 
 
 
-13/Mar/98                LilyPond 0.1.48                        2
+20/Mar/98                LilyPond 0.1.57                        2
 
 
 
@@ -166,9 +166,6 @@ INSTALL(1)            LilyPond documentation           INSTALL(1)
        --enable-mf-dir
            Set the directory mf input is in (idem)
 
-       --enable-out-dir
-           Set the directory for machine generated output.
-
        All options are documented in the configure help The
        option --enable-optimise is recommended for Real Life
        usage.
@@ -182,56 +179,28 @@ INSTALL(1)            LilyPond documentation           INSTALL(1)
        subdirectories out/ (which contain all files generated
        during compilation).
 
-       Building for multiple hosts
-
-       LilyPond does not follow the GNU standards when it comes
-       to configuring and making Makefiles. In LilyPond, make
-       generates all output in output directories (called out/,
-       by default).  You can have multiple compiles from the same
-       source-tree, by overriding the setting for the output
-       directory.
-
-
-
-13/Mar/98                LilyPond 0.1.48                        3
-
-
-
+INSTALLING
+       If you have done a successful make, then a simple
 
+               make install
 
-INSTALL(1)            LilyPond documentation           INSTALL(1)
+       should do the trick.
 
+       If you are doing an upgrade, please remember to remove
+       obsolete .pk and .tfm files of the fonts.  A script has
+       been provided to do the work, see bin/clean-fonts.sh.
 
-       Example: on my system, I do debugging and lots compiling.
-       For this I use the configuration as follows:
 
-               configure --prefix=~ --enable-debugging --enable-printing --enable-checking
-               make all
 
-       and I want to do profiling. For that I use
 
-               configure --prefix=~ --enable-debugging --disable-printing\
-                       --disable-checking --enable-profiling --enable-optimise\
-                       --enable-out-dir=out-profile
+20/Mar/98                LilyPond 0.1.57                        3
 
-               make OUTDIR_NAME=out-profile all
 
-       These two commands build two entirely separate versions of
-       LilyPond. In Real Life, you would probably also want to
-       have two different prefixes. On my machine this is no
-       problem; I never do make install. My prefix dirs are
-       linked back to my source directory.
 
-INSTALLING
-       If you have done a successful make, then a simple
 
-               make install
 
-       should do the trick.
+INSTALL(1)            LilyPond documentation           INSTALL(1)
 
-       If you are doing an upgrade, please remember to remove
-       obsolete .pk and .tfm files of the fonts.  A script has
-       been provided to do the work, see bin/clean-fonts.sh.
 
 CAVEATS
        o    The -O2 option to gcc triggers a gcc bug on DEC Alpha
@@ -250,24 +219,6 @@ EXAMPLE
 
        This is what the output looks like over here:
 
-
-
-
-
-
-
-
-
-
-13/Mar/98                LilyPond 0.1.48                        4
-
-
-
-
-
-INSTALL(1)            LilyPond documentation           INSTALL(1)
-
-
                GNU LilyPond 0.0.78 #4/FlowerLib 1.1.24 #0
                Parsing ... [/home/hw/share/lilypond/init//
                        <..etc..>
@@ -305,6 +256,18 @@ WINDOWS NT/95
        http://www.cygnus.com/gnu-win32.
 
        To make GNU LilyPond under, brr, aargh, shudder...
+
+
+
+20/Mar/98                LilyPond 0.1.57                        4
+
+
+
+
+
+INSTALL(1)            LilyPond documentation           INSTALL(1)
+
+
        windows32, well, simply type:
 
                bash configure
@@ -323,17 +286,6 @@ MUSIXTEX
        them, but anyway, here are the installation instructions
        for those deprecated fonts.
 
-
-
-13/Mar/98                LilyPond 0.1.48                        5
-
-
-
-
-
-INSTALL(1)            LilyPond documentation           INSTALL(1)
-
-
        [obsolete] I use the MusixTeX fonts those found in
        MusixTeX T.73. Beware, the clef symbol seems to have
        changed its position in some versions, (notably Egler's,
@@ -369,6 +321,19 @@ INSTALL(1)            LilyPond documentation           INSTALL(1)
        the fonts, so you have to edit the definitions in
        tex/eglerdefs.tex.
 
+
+
+
+
+20/Mar/98                LilyPond 0.1.57                        5
+
+
+
+
+
+INSTALL(1)            LilyPond documentation           INSTALL(1)
+
+
 AUTHORS
        Han-Wen Nienhuys <hanwen@cs.ruu.nl>
 
@@ -391,6 +356,41 @@ AUTHORS
 
 
 
-13/Mar/98                LilyPond 0.1.48                        6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+20/Mar/98                LilyPond 0.1.57                        6
 
 
diff --git a/Makefile b/Makefile
new file mode 100755
index 0000000000..c058487bcb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,58 @@
+# -*-Makefile-*-
+########################################################
+# project  LilyPond -- the musical typesetter
+# title	   top level makefile for LilyPond  
+# file	   Makefile 
+#
+# Copyright (c) 1997 by    
+#   	Jan Nieuwenhuizen <jan@digicash.com>
+#	Han-Wen Nienhuys <hanwen@stack.nl>
+
+# subdir level:
+#
+depth = .
+#
+
+# identify module:
+#
+NAME = lilypond
+SUBDIRS = bin flower lib lily mf mi2mu debian\
+	Documentation init input tex make mutopia
+include VERSION
+#
+
+# descent order into subdirectories:
+#
+
+# list of distribution files:
+#
+SCRIPTS = configure configure.in aclocal.m4
+README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
+ COPYING ONEWS NEWS README TODO \
+ INSTALL.txt AUTHORS.txt PATCHES.txt
+EXTRA_DISTFILES = config.make.in config.hh.in .dstreamrc mudela-mode.el VERSION $(README_FILES) $(SCRIPTS) 
+
+# do not dist ./Makefile (is copied from make/Toplevel.make)
+DISTFILES:=$(EXTRA_DISTFILES)
+#
+
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Version.make
+include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+
+localdist: configure
+
+local-distclean: 
+	rm -f config.hh config.make Makefile config.cache config.status config.log
+
+Makefile: make/Toplevel.make.in
+	chmod +w $@
+	echo '# WARNING WARNING WARNING WARNING' > $@
+	echo '# do not edit! this is generated from make/Toplevel.make.in' >> $@
+	cat $< >> $@
+	chmod -w $@
+
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index fbae3ff7cc..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# title	   top level makefile for LilyPond  
-# file	   Makefile.am.wild
-
-SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\
- 	Documentation init input tex make mutopia
-
-SCHRIFTEN = configure configure.in install-sh aclocal.m4
-README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
- COPYING ONEWS NEWS README TODO \
- INSTALL AUTHORS PATCHES
-EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
-
-
-INSTALL:
-	rm -f INSTALL
-	ln `$(FIND) ./ -name INSTALL.txt -print | head -1` $@
-
-AUTHORS:
-	rm -f AUTHORS
-	ln `$(FIND) ./ -name AUTHORS.txt -print | head -1` $@
-
-PATCHES:
-	rm -f PATCHES
-	ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@
-
-
-# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
-# respect the directory
-distclean-local:
-	rm -f flower/config.hh
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/Makefile.am.wild b/Makefile.am.wild
deleted file mode 100644
index 97c5d507e1..0000000000
--- a/Makefile.am.wild
+++ /dev/null
@@ -1,40 +0,0 @@
-# title	   top level makefile for LilyPond  
-# file	   Makefile.am.wild
-
-SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\
- 	Documentation init input tex make mutopia
-
-SCHRIFTEN = configure configure.in install-sh aclocal.m4
-README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
- COPYING ONEWS NEWS README TODO \
- INSTALL AUTHORS PATCHES
-EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
-
-
-INSTALL:
-	rm -f INSTALL
-	ln `$(FIND) ./ -name INSTALL.txt -print | head -1` $@
-
-AUTHORS:
-	rm -f AUTHORS
-	ln `$(FIND) ./ -name AUTHORS.txt -print | head -1` $@
-
-PATCHES:
-	rm -f PATCHES
-	ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@
-
-
-# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
-# respect the directory
-distclean-local:
-	rm -f flower/config.hh
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index f3d78349d7..0000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,382 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# title	   top level makefile for LilyPond  
-# file	   Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\
- 	Documentation init input tex make mutopia
-
-SCHRIFTEN = configure configure.in install-sh aclocal.m4
-README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
- COPYING ONEWS NEWS README TODO \
- INSTALL AUTHORS PATCHES
-EXTRA_DIST = Makefile.am.wild GNUmakefile .dstreamrc mudela-mode.el acinclude.m4 VERSION $(README_FILES) $(SCHRIFTEN)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ./flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
-config.hh.in config.sub configure configure.in install-sh ltconfig \
-ltmain.sh missing mkinstalldirs stamp-h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.hh: stamp-h
-	@:
-stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=flower/config.hh:config.hh.in \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
-$(srcdir)/config.hh.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.hh
-
-maintainer-clean-hdr:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
-	-rm -rf $(distdir)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-am: Makefile
-
-install-exec: install-exec-recursive
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive
-	@:
-
-uninstall: uninstall-recursive
-
-all: all-recursive all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f config.status
-
-.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-am install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-INSTALL:
-	rm -f INSTALL
-	ln `$(FIND) ./ -name INSTALL.txt -print | head -1` $@
-
-AUTHORS:
-	rm -f AUTHORS
-	ln `$(FIND) ./ -name AUTHORS.txt -print | head -1` $@
-
-PATCHES:
-	rm -f PATCHES
-	ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@
-
-# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
-# respect the directory
-distclean-local:
-	rm -f flower/config.hh
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
index a196610bf7..5a442c3749 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,49 @@
+
+pl 57
+	- verneukeratificering van JCN code.
+	- lots of updates on our own makefile system.
+	- junked automake & documented it
+	- put rods into Spring_spacer too. Much cleaner
+	- bf: weird spacings (enge floats)
+	- bf: too many constraints added.
+	- smarter constraint check
+	- bf: table16 fontsize.
+
+	- 56.jcn1's empiric computer science.
+	- debian patches (AF)
+	- solaris/irix patches (AO)
+
+
+pl 56.jcn4
+	- reintruduced slope in bug [c8 c16 c16] in favour of stemlen bug...
+	- staff-side: accent half line higher
+	- reincluded silly los-toros latex file
+	- bf's: bezier.cc,bow.cc, mat.hh: rotate
+	- bf: bezier slur: handle broken slurs
+	- bf: beam
+	- dehairifications of bezier.cc
+
+pl 56.jcn3
+	- bf's: offset multiply, matrix rotate
+	- dropped los-toros latex file
+
+pl 56.jcn2
+	- even nicer excentric slurs; 
+	- input/slur-bug.ly
+	- los-toros with barnumbers ;-)
+	- nice version of height-ajust bezier slurs (see sleur.ly --test)
+	- bf's beam: 
+	  * slope in[c8 c16 c16]; 
+	  * allow no INTER position for normal quantising
+
+pl 56.jcn1
+	- bezier curves with raaklijnen
+
+pl 56.ag1
+        - `Makefile.am.wild's now should work correctly with VPATH (AG)
+
+************
+
 pl 56
 	- more dutch vocabulary
 	- Barnumber FAQ added
diff --git a/PATCHES b/PATCHES
deleted file mode 100644
index 286d0c3c47..0000000000
--- a/PATCHES
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-PATCHES(1)            LilyPond documentation           PATCHES(1)
-
-
-NAME
-       PATCHES - track and distribute your code changes
-
-DESCRIPTION
-       This page documents how to distribute your changes to GNU
-       LilyPond
-
-ABSTRACT
-       Distributing a change normally goes like this:
-
-       o    make your fix/add your code
-
-       o    generate a patch,
-
-       o    e-mail your patch to one of the mailing lists gnu-
-            music-discuss@gnu.org or bug-gnu-music@gnu.org (or if
-            you're a bit shy, to the maintainer).
-
-GENERATING A PATCH
-       In VERSION, set TOPLEVEL_MY_PATCH_LEVEL:
-
-           VERSION:
-               ...
-               TOPLEVEL_MY_PATCH_LEVEL = jcn1
-
-       In NEWS, enter a summary of changes:
-
-           NEWS:
-               pl 0.1.48.jcn1
-                       - added PATCHES.pod
-
-       Then, type something like
-
-           make-dist
-           mv out/lilypond-0.1.48.jcn1.tar.gz ../releases
-           make-patch
-
-       which leaves your patch as ./patch-0.1.48.jcn1.
-
-       or even simpler:
-
-           release
-
-           tar-ball: ../patches/patch-0.1.48.jcn1.gz
-           patch: ../patches/patch-0.1.48.jcn1.gz
-           updeet: ../test/updeet
-
-
-PREREQUISITES
-       For creating a patch you need
-
-       o    All items mentioned in INSTALL.  You're not going to
-            send a patch that you haven't even built, right?
-
-
-
-
-13/Mar/98                LilyPond 0.1.48                        1
-
-
-
-
-
-PATCHES(1)            LilyPond documentation           PATCHES(1)
-
-
-       o    GNU Diff
-
-       o    Python (version 1.4 or newer).  You can of course
-            make a patch by hand, which would go something like:
-
-                make distclean
-                cd ..
-                diff -urN lilypond-0.1.48 lilypond-0.1.48.jcn1 > patch-0.1.48.jcn1
-
-            but there are handy python scripts available.  If
-            you're doing development, you'll need Python for
-            other LilyPond scripts anyway.
-
-       o    The Lily directory structure, which looks like:
-
-                lilypond-0.1.48/
-                patches/
-                releases/
-                test/
-
-
-       If you're not very quick with sending your patch, there's
-       a good chance that an new release of LilyPond comes
-       available.  In such a case (and sometimes for other unkown
-       reasons :-), the maintainer will probably ask you to make
-       a new patch against the latest release.  Your best bet is
-       to download the latest release, and apply your patch
-       against this new source tree:
-
-           cd lilypond-0.1.49
-           zpatch -p0 -E < ../patches/patch-0.1.48.jcn1.gz
-
-       Then, make a patch as shown above.
-
-MAINTAINER
-       Han-Wen Nienhuys <hanwen@cs.ruu.nl>
-
-       Just keep on sending those patches!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-13/Mar/98                LilyPond 0.1.48                        2
-
-
diff --git a/PATCHES.txt b/PATCHES.txt
new file mode 100644
index 0000000000..b3775b62c8
--- /dev/null
+++ b/PATCHES.txt
@@ -0,0 +1,264 @@
+
+
+
+PATCHES(1)            LilyPond documentation           PATCHES(1)
+
+
+NAME
+       PATCHES - track and distribute your code changes
+
+DESCRIPTION
+       This page documents how to distribute your changes to GNU
+       LilyPond
+
+ABSTRACT
+       Distributing a change normally goes like this:
+
+       o    make your fix/add your code
+
+       o    generate a patch,
+
+       o    e-mail your patch to one of the mailing lists gnu-
+            music-discuss@gnu.org or bug-gnu-music@gnu.org (or if
+            you're a bit shy, to the maintainer).
+
+GENERATING A PATCH
+       In VERSION, set TOPLEVEL_MY_PATCH_LEVEL:
+
+           VERSION:
+               ...
+               TOPLEVEL_MY_PATCH_LEVEL = jcn1
+
+       In NEWS, enter a summary of changes:
+
+           NEWS:
+               pl 0.1.48.jcn1
+                       - added PATCHES.pod
+
+       Then, from the top of Lily's source tree, type
+
+           make distclean  # if you don't use --srcdir configure
+           make-patch
+
+       which leaves your patch as ./patch-0.1.48.jcn1.
+
+       If you didn't configure Lily using --srcdir, you can do:
+
+           release
+
+           tar-ball: ../patches/patch-0.1.48.jcn1.gz
+           patch: ../patches/patch-0.1.48.jcn1.gz
+           updeet: ../test/updeet
+
+
+PREREQUISITES
+       For creating a patch you need
+
+       o    All items mentioned in INSTALL.  You're not going to
+            send a patch that you haven't even built, right?
+
+
+
+
+
+2/Apr/98                 LilyPond 0.1.57                        1
+
+
+
+
+
+PATCHES(1)            LilyPond documentation           PATCHES(1)
+
+
+       o    GNU Diff
+
+       o    Python (version 1.4 or newer).  You can of course
+            make a patch by hand, which would go something like:
+
+                make distclean
+                cd ..
+                diff -urN lilypond-0.1.48 lilypond-0.1.48.jcn1 > patch-0.1.48.jcn1
+
+            but there are handy python scripts available.  If
+            you're doing development, you'll need Python for
+            other LilyPond scripts anyway.
+
+       o    The Lily directory structure, which looks like:
+
+                lilypond-0.1.48/
+                patches/
+                releases/
+                test/
+
+
+       If you're not very quick with sending your patch, there's
+       a good chance that an new release of LilyPond comes
+       available.  In such a case (and sometimes for other unkown
+       reasons :-), the maintainer will probably ask you to make
+       a new patch against the latest release.  Your best bet is
+       to download the latest release, and apply your patch
+       against this new source tree:
+
+           cd lilypond-0.1.49
+           zpatch -p0 -E < ../patches/patch-0.1.48.jcn1.gz
+
+       Then, make a patch as shown above.
+
+MAINTAINER
+       Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+
+       Just keep on sending those patches!  =head1 NAME
+
+       PATCHES - track and distribute your code changes
+
+DESCRIPTION
+       This page documents how to distribute your changes to GNU
+       LilyPond
+
+ABSTRACT
+       Distributing a change normally goes like this:
+
+       o    make your fix/add your code
+
+       o    generate a patch,
+
+       o    e-mail your patch to one of the mailing lists gnu-
+            music-discuss@gnu.org or bug-gnu-music@gnu.org (or if
+
+
+
+2/Apr/98                 LilyPond 0.1.57                        2
+
+
+
+
+
+PATCHES(1)            LilyPond documentation           PATCHES(1)
+
+
+            you're a bit shy, to the maintainer).
+
+GENERATING A PATCH
+       In VERSION, set TOPLEVEL_MY_PATCH_LEVEL:
+
+           VERSION:
+               ...
+               TOPLEVEL_MY_PATCH_LEVEL = jcn1
+
+       In NEWS, enter a summary of changes:
+
+           NEWS:
+               pl 0.1.48.jcn1
+                       - added PATCHES.pod
+
+       Then, type something like
+
+           make-dist
+           mv out/lilypond-0.1.48.jcn1.tar.gz ../releases
+           make-patch
+
+       which leaves your patch as ./patch-0.1.48.jcn1.
+
+       or even simpler:
+
+           release
+
+           tar-ball: ../patches/patch-0.1.48.jcn1.gz
+           patch: ../patches/patch-0.1.48.jcn1.gz
+           updeet: ../test/updeet
+
+
+PREREQUISITES
+       For creating a patch you need
+
+       o    All items mentioned in INSTALL.  You're not going to
+            send a patch that you haven't even built, right?
+
+       o    GNU Diff
+
+       o    Python (version 1.4 or newer).  You can of course
+            make a patch by hand, which would go something like:
+
+                make distclean
+                cd ..
+                diff -urN lilypond-0.1.48 lilypond-0.1.48.jcn1 > patch-0.1.48.jcn1
+
+            but there are handy python scripts available.  If
+            you're doing development, you'll need Python for
+            other LilyPond scripts anyway.
+
+       o    The Lily directory structure, which looks like:
+
+
+
+
+
+2/Apr/98                 LilyPond 0.1.57                        3
+
+
+
+
+
+PATCHES(1)            LilyPond documentation           PATCHES(1)
+
+
+                lilypond-0.1.48/
+                patches/
+                releases/
+                test/
+
+
+       If you're not very quick with sending your patch, there's
+       a good chance that an new release of LilyPond comes
+       available.  In such a case (and sometimes for other unkown
+       reasons :-), the maintainer will probably ask you to make
+       a new patch against the latest release.  Your best bet is
+       to download the latest release, and apply your patch
+       against this new source tree:
+
+           cd lilypond-0.1.49
+           zpatch -p0 -E < ../patches/patch-0.1.48.jcn1.gz
+
+       Then, make a patch as shown above.
+
+MAINTAINER
+       Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+
+       Just keep on sending those patches!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2/Apr/98                 LilyPond 0.1.57                        4
+
+
diff --git a/TODO b/TODO
index 4945d09179..27e0071ae7 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,13 @@ Most of the items are marked in the code as well, with full explanation.
 grep for TODO and ugh/ugr
 
 0.2:
+	* junk embedded mf
+
+	* shared lib
+
+	* ly2dvi seams to eat accents as in \'el\'egant
+
+	* libtoolize flowerlib
 
 	* bf: abbrevbeam? 
 
diff --git a/VERSION b/VERSION
index 80011142cc..e27a742c2c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,10 +1,8 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=56
+PATCH_LEVEL=57
 MY_PATCH_LEVEL=
 
-# now used as shell script in configure too
-# leave no spaces around the equal signs!
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 
 # the previous version was wrong.
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 2e34d910d5..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* @configure_input@ */
-#ifndef CONFIG_HH
-#define CONFIG_HH
-
-/* autoheader really wants this */
-#define PACKAGE
-
-/* undef to get lots of debugging stuff (see .dstream) */
-#define NPRINT
-
-/* undef to do checking */
-#undef NDEBUG
-
-/* define to inline string funcs */
-#undef STRINGS_UTILS_INLINED
-
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "/home/fred/lelie/current"
-
-/* the toplevel version string */
-#define TOPLEVEL_VERSION "0"
-
-/* the version string of the flower lib */
-#define FLOWER_VERSION "0"
-
-/* define if you have memmem */
-#define HAVE_MEMMEM 0
-
-/* define if you have snprintf */
-#define HAVE_SNPRINTF 0
-
-#endif
-
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index d6db5c9554..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-
-AC_DEFUN(AC_JUNK_ARGS, [
-])
-
-AC_DEFUN(AC_LILY_WARN, [
-    AC_MSG_WARN($1)
-    warn_b=yes
-])
-
-dnl should cache result.
-dnl should  look in $prefix first.
-dnl should probably assume TDS
-
-AC_DEFUN(AC_TEX_PREFIX, [
-    
-
-    AC_MSG_CHECKING(TeX/MF root dir directory)    
-
-    find_root_prefix="$prefix"
-    
-
-    test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix"
-    find_texpostfix="";
-    for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do
-	find_texprefix="$find_root_prefix$postfix"
-	if test -d $find_texprefix; then
-	    find_texpostfix=$postfix
-	    break;
-	fi
-    done
-    
-    if test "x$find_texpostfix" = x; then
-	find_texpostfix='/lib/texmf/tex'
-	AC_LILY_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
-    fi
-
-    find_texprefix="$find_root_prefix/$find_texpostfix"
-
-    # only assign if variablename not empty
-    if test x != "x[$]$1"; then
-    	$1='${prefix}'/"$find_texpostfix"
-    fi
-    AC_MSG_RESULT($find_texprefix)
-
-])
- 
-
-# find a directory inside a prefix, 
-# $1 the prefix (expanded version)
-# $2 variable to assign
-# $3 the directory name 
-# $4 description
-AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [
-    
-    AC_MSG_CHECKING($4 directory)    
-    find_dirdir=`(cd $1; 
-      $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')`
-    
-
-    if test "x$find_dirdir" = x; then
-       find_dirdir="/$3";
-       AC_LILY_WARN(Cannot determine $4 subdirectory. Please set from command-line)
-	true
-    fi
-    $2=$find_dirdir
-    AC_MSG_RESULT($1/$find_dirdir)
-])
-
-AC_DEFUN(AC_TEX_SUBDIR, [
-dnl    AC_REQUIRE([AC_TEX_PREFIX])
-    AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input)
-    $1="$TEXPREFIX/$$1"
-])
-
-AC_DEFUN(AC_MF_SUBDIR, [
-dnl     AC_REQUIRE([AC_TEX_PREFIX])
-    AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input)
-    $1="$TEXPREFIX/$$1"
-])
-
-AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
-	if test $1 = "error" 
-	then
-		AC_LILY_WARN(can't find $2. $3)
-	fi
-])
diff --git a/aclocal.m4 b/aclocal.m4
index de8271571a..a459924cb2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,14 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2
+dnl aclocal.m4 generated automatically by aclocal 1.3
+
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
 
 
 AC_DEFUN(AC_JUNK_ARGS, [
@@ -109,8 +119,8 @@ fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -118,7 +128,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 
 # serial 1
@@ -145,10 +155,21 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$@" = "X"; then
+   if test "[$]*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "[$]2" = conftestfile
    )
 then
@@ -415,6 +436,15 @@ AC_MSG_RESULT([$NM])
 AC_SUBST(NM)
 ])
 
+
+dnl AM_PROG_LEX
+dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+AC_DEFUN(AM_PROG_LEX,
+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
+AC_PROG_LEX
+AC_DECL_YYTEXT])
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
 AC_DEFUN(AM_CONFIG_HEADER,
diff --git a/bin/Makefile b/bin/Makefile
new file mode 100644
index 0000000000..3b2d36034d
--- /dev/null
+++ b/bin/Makefile
@@ -0,0 +1,13 @@
+# bin/Makefile
+
+depth = ..
+include $(depth)/make/Include.make
+
+# list of distribution files:
+EXTRA_DISTFILES =   install-sh config.sub config.guess ltconfig
+
+include $(depth)/make/Scripts.make
+
+EXECUTABLES=convert-mudela mudela-book
+
+include $(depth)/make/Executable.make
diff --git a/bin/Makefile.am b/bin/Makefile.am
deleted file mode 100755
index 60fb6d97ea..0000000000
--- a/bin/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# bin/Makefile
-
-# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in
-
-SLANG_SCHRIFTEN = flower.py lilypython.py
-PAREL_SCHRIFTEN = 
-IN_SCHRIFTEN = flower.py lilypython.py
-EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild
-
-clean-local:
-	-rm -f flower.pyc
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/bin/Makefile.am.wild b/bin/Makefile.am.wild
deleted file mode 100755
index aa13c4e515..0000000000
--- a/bin/Makefile.am.wild
+++ /dev/null
@@ -1,11 +0,0 @@
-# bin/Makefile
-
-# bin_SCRIPTS = $(wildcard *.in)
-
-SLANG_SCHRIFTEN = $(wildcard *.py)
-PAREL_SCHRIFTEN = $(wildcard *.pl)
-IN_SCHRIFTEN = $(wildcard *.py)
-EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild
-
-clean-local:
-	-rm -f flower.pyc
diff --git a/bin/Makefile.in b/bin/Makefile.in
deleted file mode 100644
index 92f8b1ccfa..0000000000
--- a/bin/Makefile.in
+++ /dev/null
@@ -1,257 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# bin/Makefile
-
-# bin_SCRIPTS = Makefile.in add-URLs.in clean-diaper.in clean-embeds.in clean-fonts.in conflily.in convert-mudela.in cvm.in find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in make-examples.in make-patch.in make-version.in make-website.in mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in show-latest.in
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SLANG_SCHRIFTEN = flower.py lilypython.py
-PAREL_SCHRIFTEN = 
-IN_SCHRIFTEN = flower.py lilypython.py
-EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl autowild
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES =  add-URLs clean-diaper clean-embeds clean-fonts \
-conflily convert-mudela cvm find-typenames foo genheader ly2dvi \
-make-docxx make-examples make-patch make-version make-website mf-deps \
-mf-to-table mudela-book ps-to-gifs release show-latest
-DIST_COMMON =  Makefile.am Makefile.in add-URLs.in clean-diaper.in \
-clean-embeds.in clean-fonts.in conflily.in convert-mudela.in cvm.in \
-find-typenames.in foo.in genheader.in ly2dvi.in make-docxx.in \
-make-examples.in make-patch.in make-version.in make-website.in \
-mf-deps.in mf-to-table.in mudela-book.in ps-to-gifs.in release.in \
-show-latest.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps bin/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-add-URLs: $(top_builddir)/config.status add-URLs.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-clean-diaper: $(top_builddir)/config.status clean-diaper.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-clean-embeds: $(top_builddir)/config.status clean-embeds.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-clean-fonts: $(top_builddir)/config.status clean-fonts.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-conflily: $(top_builddir)/config.status conflily.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-convert-mudela: $(top_builddir)/config.status convert-mudela.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-cvm: $(top_builddir)/config.status cvm.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-find-typenames: $(top_builddir)/config.status find-typenames.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-foo: $(top_builddir)/config.status foo.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-genheader: $(top_builddir)/config.status genheader.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-ly2dvi: $(top_builddir)/config.status ly2dvi.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-make-docxx: $(top_builddir)/config.status make-docxx.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-make-examples: $(top_builddir)/config.status make-examples.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-make-patch: $(top_builddir)/config.status make-patch.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-make-version: $(top_builddir)/config.status make-version.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-make-website: $(top_builddir)/config.status make-website.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-mf-deps: $(top_builddir)/config.status mf-deps.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-mf-to-table: $(top_builddir)/config.status mf-to-table.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-mudela-book: $(top_builddir)/config.status mudela-book.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-ps-to-gifs: $(top_builddir)/config.status ps-to-gifs.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-release: $(top_builddir)/config.status release.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-show-latest: $(top_builddir)/config.status show-latest.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bin
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean clean-local
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-clean-local:
-	-rm -f flower.pyc
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bin/add-URLs.in b/bin/add-URLs.sh
index a32e6f964b..a32e6f964b 100755
--- a/bin/add-URLs.in
+++ b/bin/add-URLs.sh
diff --git a/bin/autowild b/bin/autowild
deleted file mode 100755
index 0371058399..0000000000
--- a/bin/autowild
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# autowild
-# for those of you that have no wild-automake
-
-# ugh
-verbose=true
-if test x$1 = x-v; then
-	verbose=echo
-fi
-
-#ugh
-# PERL=@PERL@
-PERL=/usr/bin/perl
-PROGNAME=autowild #don't includee path; this messes up stuff
-WILD_MAKEFILES=$(find . -name \*.wild)
-for i in $WILD_MAKEFILES; do
-	dir=$(dirname $i)
-	wild=$(basename $i)
-	make=$(basename $i .wild)
-	TOPDIR=${LILYPOND_SOURCEDIR-`pwd`}
-	(cd $dir
-
-	$verbose -n "trying $dir/$make.. "
-	cat $wild | $PERL $TOPDIR/bin/wild-perl >> $make.NEW
-	if [ ! -f $make ]; then
-	    touch $make
-	fi
-
-	if cmp -s $make.NEW $make; then
-	    $verbose "autowild: $dir/$make didn't change"
-	    rm $make.NEW
-	else
-		mv $make.NEW $make
-		$verbose "autowild: creating $dir/$make"
-	fi
-	)
-done
-	
diff --git a/bin/clean-diaper.in b/bin/clean-diaper.sh
index 06be9040ae..06be9040ae 100755
--- a/bin/clean-diaper.in
+++ b/bin/clean-diaper.sh
diff --git a/bin/clean-embeds.in b/bin/clean-embeds.sh
index 1b53f85ecb..1b53f85ecb 100755
--- a/bin/clean-embeds.in
+++ b/bin/clean-embeds.sh
diff --git a/bin/clean-fonts.in b/bin/clean-fonts.sh
index 202a873584..202a873584 100755
--- a/bin/clean-fonts.in
+++ b/bin/clean-fonts.sh
diff --git a/config.guess b/bin/config.guess
index 413ed41c0f..413ed41c0f 100755
--- a/config.guess
+++ b/bin/config.guess
diff --git a/config.sub b/bin/config.sub
index 213a6d47d6..213a6d47d6 100755
--- a/config.sub
+++ b/bin/config.sub
diff --git a/bin/conflily.in b/bin/conflily.sh
index 2eab5a059e..2eab5a059e 100755
--- a/bin/conflily.in
+++ b/bin/conflily.sh
diff --git a/bin/convert-mudela.in b/bin/convert-mudela.pl
index 3be80d97da..3be80d97da 100755
--- a/bin/convert-mudela.in
+++ b/bin/convert-mudela.pl
diff --git a/bin/cvm.in b/bin/cvm.in
deleted file mode 100755
index 9654db9377..0000000000
--- a/bin/cvm.in
+++ /dev/null
@@ -1,318 +0,0 @@
-#!@PYTHON@ -w
-# -*-perl-*-
-
-version = "0.2";
-
-################################################################
-
-sub no_conv
-{
-}
- 
-sub convert_0_0_52_to_0_0_53
-{
-
-    s/include \"/$1\\include \"/g;
-}
-
-  
-sub convert_0_0_54_to_0_0_55
-{
-    s/%{/% {/g;
-}
-
-  
-sub convert_0_0_53_to_0_0_54
-{
-    print STDERR "Not smart enough to convert \\transpose\n"    if (/\\transpose/) ;
-}
-
-# we-re not at 58 yet, but this is at least one of the rules
-sub convert_0_0_55_to_0_0_56
-{
-    s/\"\|\|\"/\"|.\"/g;
-}
-
-sub convert_0_0_56_to_0_0_57
-{
-    s/\(([ \]\[|\t-\.>]|\\[<!>a-z]+)*\)/\~ $1/g;
-}
-
-sub convert_0_0_57_to_0_0_58
-{
-    s/\[ *([^\[\]]*)\] *([1-9]*) *\/ *([1-9]*)/[$2\/$3 $1]1\/1/g;
-}
-
-sub convert_0_0_58_to_0_0_59
-{
-    die "Not smart enough to convert 0.0.58 to 0.0.59\n";
-}
-
-sub convert_0_0_59_to_0_0_60
-{
-    s/(\\unitspace [0-9.mcptin\\ ]+|\\geometric [0-9.]+|\\width [0-9.mcp\\tin]+)/$1;/g;
-    s/(\\output \"[^\"]+\")/$1;/;
-    s/(\\tempo  [0-9: ]+)/$1;/;
-}
-
-sub convert_0_0_60_to_0_0_61
-{
-    s/(\\unitspace|\\geometric|\\width)/$1=/g;
-   
-}
-
-sub convert_0_1_0_to_0_1_1
-{
-    s/\\tempo (.*):(.*);/\\tempo $1 = $2;/g
-}
-
-sub convert_0_1_2_to_0_1_3
-{
-    s/\\stem *(\\up|1) *;/\\stemup/g;
-    s/\\stem *(\\down|-1) *;/\\stemdown/g;
-    s/\\stem *0 *;/\\stemboth/g;
-    s/\\hshift ([^;]+) *;/\\property Voice.hshift = $1/g;
-}
-
-my $header_b = 0;
-
-sub generic_conversion_scan
-{
-    if (/\\header *\{/)
-    {
-	$header_b = 1;
-    }
-    if ($header_b && /^ *\}/)
-    {
-	$header_b = 0;
-    }
-}
-sub convert_0_1_4_to_0_1_5
-{
-    s/([<{]) *\\id "Piano" (.+);/\\type Grandstaff = $3 $1/;    
-    s/([<{]) *\\id (.+) (.+);/\\type $2 = $3 $1/;
-}
-
-       
-sub convert_0_1_5_to_0_1_6
-{
-    s/< *\\multi (.*);/\\multi $1 </;
-}
-
-sub convert_0_1_6_to_0_1_7
-{
-    if ($header_b) 
-    {
-	s/^([a-zA-z]+)[ \t]+(.*)$/$1 =\t \"$2\";/;
-	s/^([ \t])+(.*)$/$1 \"$2\";/;
-    }
-}  
-
-sub convert_0_1_7_to_0_1_8
-{
-    s/\\plet *1 *\/ *1 *;/\\]/;    
-    s/\\plet *([1-9][0-9]*) *\/ *([2-9][0-9]*) *;/\\[$1\/$2/;    
-}  
-
-sub convert_0_1_8_to_0_1_9
-{
-# sticky plet shorthand...
-#  print "introduced plet and finger shorthands...\n";
-}
-
-###############################################################
-
-sub    last_conversion
-{
-    my @v = &versions;
-    return pop @v;
-}
-sub identify
-{
-    
-    print STDERR "This is convert-mudela " . $convert_mudela_version . 
-	" (up to mudela version ", last_conversion,	")\n";
-}
-  
-  
- sub usage
-  {
-     print STDERR "Usage: convert-mudela [options] [mudela-file]...\n"
-     . "Convert old mudela source from mudela-file or stdin\n\n"
-     . "Options:\n"
-     . "  -e, --edit             perform in-place conversion\n"
-     . "  -f, --from=PATHLEVEL   use source version 0.0.PATCHLEVEL\n"
-     . "  -h, --help             print this help\n"
-     . "  -o, --output=FILE      name output file\n"
-     . "  -s, --show-rules       print all known conversion rules\n"
-     . "  -t, --to=VERSION       convert to version VERSION\n"
-  }
-      
-
-my %minor_conversions = ("0.0.50" => \&no_conv,
- 			 "0.0.52" => \&convert_0_0_50_to_0_0_52,
-  			 "0.0.53" => \&convert_0_0_52_to_0_0_53,
-			 "0.0.54" => \&convert_0_0_53_to_0_0_54,
-			 "0.0.55" => \&convert_0_0_54_to_0_0_55,
-			 "0.0.56" => \&convert_0_0_55_to_0_0_56,
-			 "0.0.57" => \&convert_0_0_56_to_0_0_57,
-			 "0.0.58" => \&convert_0_0_57_to_0_0_58,
-			 "0.0.59" => \&convert_0_0_58_to_0_0_59,
-			 "0.0.60" => \&convert_0_0_59_to_0_0_60,
-			 "0.0.61" => \&convert_0_0_60_to_0_0_61,
-			 "0.1.1" => \&convert_0_1_0_to_0_1_1,
-			 "0.1.2" => \&no_conv,
-			 "0.1.3" => \&convert_0_1_2_to_0_1_3,
-			 "0.1.4" => \&no_conv,
-			 "0.1.5" => \&convert_0_1_4_to_0_1_5,
-			 "0.1.6" => \&convert_0_1_5_to_0_1_6
-			 ,"0.1.7" => \&convert_0_1_6_to_0_1_7
-			 ,"0.1.8" => \&convert_0_1_7_to_0_1_8
-			 ,"0.1.9" => \&convert_0_1_8_to_0_1_9
-			 );
-
- 
-
-sub versions 
-{
-    return (sort { cmpver; } (keys %minor_conversions));
-}
-
-
-sub show_rules
-{
-    my (@v) = versions;
-
-    print "Rules: ", join(", ", @v), "\n";
-    
-}
-
-sub do_conversion
-{
-    my ($from,$to) = @_;
-
-    my @applicable_conversion;
-    my @mudela_levels;
-    
-    my @v = versions;
-    foreach $ver (@v) {
-	if (version_compare($ver, $from) > 0 && version_compare($ver,$to) <= 0 ){ 
-	    push @applicable_conversion, $minor_conversions{$ver};
-	    push @mudela_levels, $ver;
-	}
-    }
-    
-    print STDERR "Applying following rules: ", join(", ", @mudela_levels) , "\n";
-
-    while (<INLY>) {
-	generic_conversion_scan;
-	foreach $subroutine (@applicable_conversion) {
-	
-	    &$subroutine;
-	    
-	}
-	version_string_conv $from, $to;
-	print OUTLY;
-    }
-}
-
-sub get_auto_from
-{
-    my ($fn)=@_;
-    my ($ver);
-    open INLY, $fn || die "Can't open";
-
-    while (<INLY>) {
-	s/^.*\\version \"([^\"]*)\".*$//;
-	if (defined ($1)) {
-	    print STDERR "Guessing version: ", $1, ".. ";
-	    $ver = $1;
-	    last;
-	}
-    }
-    if (!defined($ver)){
-	print STDERR "can't determine mudela version in $fn.\n";
-	my $u;
-	return $u;
-    }
-    close INLY;
-    return $ver;
-}   
-
-sub  set_files 
-{
-    $infile = "-";
-    $outfile = "-";
-    $outfile = $opt_output if (defined($opt_output));
-
-    if ($ARGV [0])  {
-	$infile = $ARGV[0];
-    } 
-    if (!(-f $infile) && !($infile =~ /\.ly$/s)) {
-	$infile .= ".ly";
-    }
-    if ($opt_edit && $infile ne "-") {
-	$opt_edit = 1;
-	$outfile = "$infile.NEW";
-	$infile = "$infile";
-    }
-    print STDERR "Input ", (($infile eq "-") ?"STDIN" : $infile), " .. ";
-
-}
-
-sub do_one_arg
-{
-    set_files;
-
-    local ($from_version, $to_version);
-    $from_version = $opt_from;
-    $to_version = $opt_to;
-    
-    ($from_version = get_auto_from $infile) unless defined($opt_from);
-    return if (!defined($from_version));
-    
-    ($to_version =  last_conversion) unless (defined($opt_to));
-
-    die "can't open \`$infile\'" unless open INLY,$infile ;
-    die "can't open \`$outfile\'" unless open OUTLY, ">$outfile";
-    
-    do_conversion $from_version, $to_version;
-    close INLY;
-    close OUTLY;
-
-    if ($opt_edit) {
-	rename $infile, "$infile~";
-	rename $outfile, "$infile";
-    }
-}
-
-## "main"
-
-identify;
-
-
-GetOptions ("help", "output=s", "from=i", "to=i", "minor=i", "edit", "show-rules");
-
-if ($opt_help) {
-    usage();
-    $opt_help = 0;	# to extinguish typo check.
-    exit 0;
-}
-
-if ($opt_show_rules) { 
-    show_rules ;
-    $opt_show_rules = 0;	# to extinguish typo check.
-    exit 0;
-}
-
-local ( $infile,$outfile);
-my $processed_one=0;
-
-while (defined($ARGV[0])) {
-    do_one_arg;
-    shift @ARGV;
-    $processed_one = 1;
-}
-do_one_arg unless ($processed_one);
-
-    
diff --git a/bin/find-typenames.in b/bin/find-typenames.pl
index 890f9cabd0..890f9cabd0 100755
--- a/bin/find-typenames.in
+++ b/bin/find-typenames.pl
diff --git a/bin/flower.py b/bin/flower.py
index e88631d1a2..46dfe0faf3 100755
--- a/bin/flower.py
+++ b/bin/flower.py
@@ -8,6 +8,8 @@
 # (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 # 
 
+import sys
+
 class File:
     """silly wrapper for Python file object."""
     def __init__ (self,nm, mode='r'):
diff --git a/bin/foo.in b/bin/foo.in
deleted file mode 100755
index 36ac3689b1..0000000000
--- a/bin/foo.in
+++ /dev/null
@@ -1 +0,0 @@
-#! /bin/bash
diff --git a/bin/genheader.in b/bin/genheader.in
deleted file mode 100755
index 9f16663bf7..0000000000
--- a/bin/genheader.in
+++ /dev/null
@@ -1,136 +0,0 @@
-#!@PYTHON@
-
-# 
-# genheader.py -- do headers (like these) 
-# 
-# source file of the GNU LilyPond music typesetter
-# 
-# (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-# 
-
-
-
-import posix
-import pwd
-import regex
-import regsub
-import string
-import sys
-import os
-import getopt
-import time
-
-class My_options:
-    def __init__(self):
-	self.commentify = None
-	self.add_hdr_def = 0
-	self.classname = ''
-
-my_options = My_options()
-
-def mail():
-    return os.environ['MAILADDRESS']
-
-def name():
-    return pwd.getpwuid(posix.getuid())[4]
-
-def c_commentify(str):
-    return  '/* ' + regsub.gsub('^','  ', str) + '\n */';
-
-def sh_commentify(str):
-    return regsub.gsub('^', '# ', str)
-
-def tex_commentify(str):
-    return regsub.gsub('^', '% ', str)
-
-def project_str():
-    cwd = posix.getcwd()
-    if regex.search('flower', cwd) <> -1:
-	PROJECT = "the Flower Library"
-    elif regex.search('mf$', cwd) <> -1:
-	PROJECT = "the Feta (defintively not an abbreviation for Font-En-Tja) music font"
-    else:
-	PROJECT = "the GNU LilyPond music typesetter"
-    return PROJECT
-
-def head_str(filename):
-    if my_options.add_hdr_def:
-	what = "declare " 
-    else:
-	what=" implement "
-
-
-    headstr = '\n%s -- %s\n\nsource file of %s\n\n(c) %d %s <%s>\n' \
-	      %(filename, what, project_str(), time.localtime (time.time ())[0], name(), mail())
-    return headstr
-
-
-def c_include(filename):
-    startdef= filename;
-    trans = string.maketrans( string.lowercase + '-.', string.uppercase + '__')
-    startdef = string.translate(filename, trans)
-
-   
-    headstr = "\n\n#ifndef %s\n#define %s\n" % (startdef, startdef)
-    terminatestr = "#endif /* %s */\n"  % (startdef);
-
-    return headstr+ '\n\n'+ terminatestr;
-
-
-
-
-
-(options, files) = getopt.getopt(sys.argv[1:], 'tcsh', ['class']) 
-
-for opt in options:
-    o = opt[0]
-    a = opt[1]
-    if o == '-c':
-	my_options.commentify = c_commentify
-    elif o == '-t':
-	my_options.commentify = tex_commentify
-    elif o == '-s':
-	my_options.commentify = sh_commentify
-    elif o == '-h':
-	my_options.add_hdr_def = 1
-    elif o == '--class':
-	my_options.classname = a
-
-
-
-#
-# FIXME:  should create xxx.cc and include/xxx.hh, with implement/declare Xxx
-# in  one run
-if my_options.classname:
-    pass
-	
-def do_file(nm):
-    s = my_options.commentify(head_str(nm)) 
-    if my_options.add_hdr_def:
-	s = s + c_include(nm)
-    return s
-
-
-def extension(ext,nm):
-    ext = '\\.' + ext
-    return regex.search(ext, nm) <> -1
-
-def c_extension(nm):
-    return extension('hh',nm) or extension('cc',nm) \
-	   or extension('icc', nm) or extension('tcc',nm)
-def select_commentification(nm):
-    if c_extension (nm):
-	return c_commentify
-    elif extension('py',nm) or extension('pl',nm) or extension('sh',nm):
-	return  sh_commentify
-    elif extension('mf',nm) or extension('tex',nm) or extension('ly',nm):
-	return tex_commentify
-    else: 
-	raise 'help'
-
-for nm in files:
-    if extension('hh', nm) or extension('icc', nm) or  extension('tcc', nm): 
-	my_options.add_hdr_def = 1
-    if my_options.commentify == None:
-	my_options.commentify = select_commentification(nm)
-    print do_file(nm)
diff --git a/install-sh b/bin/install-sh
index 398f7f861e..398f7f861e 100755
--- a/install-sh
+++ b/bin/install-sh
diff --git a/ltconfig b/bin/ltconfig
index 2347e69439..2347e69439 100644
--- a/ltconfig
+++ b/bin/ltconfig
diff --git a/ltmain.sh b/bin/ltmain.sh
index e9350b3fab..e9350b3fab 100644
--- a/ltmain.sh
+++ b/bin/ltmain.sh
diff --git a/bin/ly2dvi.in b/bin/ly2dvi.sh
index ac70e37209..ac70e37209 100755
--- a/bin/ly2dvi.in
+++ b/bin/ly2dvi.sh
diff --git a/bin/make-docxx.in b/bin/make-docxx.sh
index b274731309..b274731309 100755
--- a/bin/make-docxx.in
+++ b/bin/make-docxx.sh
diff --git a/bin/make-examples.in b/bin/make-examples.sh
index 620a28a7dd..620a28a7dd 100755
--- a/bin/make-examples.in
+++ b/bin/make-examples.sh
diff --git a/bin/make-patch.in b/bin/make-patch.py
index a2cbd77e7d..6600ec2e7d 100755
--- a/bin/make-patch.in
+++ b/bin/make-patch.py
@@ -19,7 +19,7 @@ import getopt
 import pipes
 
 
-mp_version = '0.5'
+mp_version = '0.3'
 
 class Options:
     def __init__(self):
@@ -34,15 +34,23 @@ def help():
 	'Generate a patch to go to this version.\n'
 	'  --from=FROM, -f FROM    old is FROM\n'
 	'  --to=TO, -t TO          to version TO\n'  
-	'  --dir=DIR, -d TO        directory\n'  
+	
 	)
 
 
 
 def untar(fn):
     # os.system('pwd');
-    sys.stderr.write('untarring ' + fn + '\n')
+    sys.stderr.write('untarring ' + fn)
+# can't seem to fix errors:
+# gzip: stdout: Broken pipe
+# tar: Child returned status 1
+#   os.system ('tar xzf ' + fn)
+#   sys.stderr.write('\n')
+# ugh, even this does not work, but one error message less :-)
     os.system ('gzip --quiet -dc ' + fn + '| tar xf - ')
+# so print soothing message:
+    sys.stderr.write('make-patch:ugh: Please ignore error: gzip: stdout: Broken pipe\n');
     sys.stderr.flush()
 
 
@@ -55,9 +63,7 @@ usage \n\
 Patches do not contain automatically generated files, \n\
 i.e. you should rerun configure\n\n'
 
-# ugh, how to get rid of .tex files generated by lily?
-pats = ['core', '*.lsm', 'configure', '*.P', '*.txt', 'feta[0-9][0-9]*.ly', 'feta[0-9][0-9]*.tex', '*.orig', '*.rej', '*bla*', 'x', '*.dvi', '*.aux', '*.log', '*.ps', '*.gif', '*.midi', 'lilypond.spec', 'Makefile.am', 'Makefile.in', 'lexer.cc', 'parser.cc', 'patch-*']
-
+pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec']
 def remove_automatic(dirnames):
     files = []
     files = files + multiple_find(pats, dirnames)
@@ -65,44 +71,47 @@ def remove_automatic(dirnames):
     for f in files:
 	os.remove(f)
 
-def makepatch(fromdir, todir, patfile_nm):
-
-    remove_automatic([fromdir, todir])
+def makepatch(fv, tv, patfile_nm):
+    import tempfile
+    prev_cwd = os.getcwd();
+    os.chdir ('/tmp')
+    untar(released_tarball(fv))
+    untar(released_tarball(tv))
+    remove_automatic([dirname(fv), dirname(tv)])
 
-    os.chdir(todir)
+    os.chdir(dirname(tv))
     
+    if not patfile_nm:
+	patfile_nm = '../patch-%s' % version_tuple_to_str(tv)
+
     f = open(patfile_nm, 'w')
     f.write(header %\
-	    (fromdir, todir, \
+	    (version_tuple_to_str(fv), version_tuple_to_str(tv), \
 	     os.path.basename(patfile_nm)))
     f.close()
 	    
     sys.stderr.write('diffing to %s... ' % patfile_nm)
-    os.system('pwd')
-    print ('diff -urN ../%s . >> %s' % (fromdir, patfile_nm))
-    os.system('diff -urN ../%s . >> %s' % (fromdir, patfile_nm))
-    os.system('gzip -9f %s' % patfile_nm)
-   
+    os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm))
+    #os.system('gzip -9f %s' % patfile_nm)
+    os.chdir('/tmp')
+
+    sys.stderr.write('cleaning ... ')
+    os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))
+    sys.stderr.write('\n')
+    os.chdir(prev_cwd)
+    
 def main():
-    os.environ['GZIP'] = '-q'
     sys.stderr.write('This is make-patch version %s\n' % mp_version)
     (cl_options, files) = getopt.getopt(sys.argv[1:], 
 					'hf:o:t:', ['output=', 'help', 'from=', 'to='])
     outfn = ''
-    srcdir = './'
-    from_b=0
-    to_b=0
     for opt in cl_options:
 	o = opt[0]
 	a = opt[1]
 	if o == '--from' or o == '-f':
 	     options.from_version = version_str_to_tuple(a)
-	     from_b=1
 	elif o == '--to' or o == '-t':
-	     options.to_version = version_str_to_tuple(a)
-	     to_b=1
-	elif o == '--dir' or o == '-d':
-	    srcdir = a;
+	    options.to_version = version_str_to_tuple(a)
 	elif o== '--help' or o == '-h':
 	    help()
 	    return 0;
@@ -115,54 +124,7 @@ def main():
 	pn = 'patch-%s' % version_tuple_to_str(options.to_version)
 	outfn =  os.path.join(os.getcwd(), pn)
 
-    import tempfile
-    prev_cwd = os.getcwd();
-
-    os.system('rm -rf /tmp/make-patch')
-    try:
-	os.mkdir ('/tmp/make-patch')
-    except:
-	pass
-	
-    fromdir = dirname(options.from_version)
-    todir =  dirname(options.to_version)
-
-    diffdir = ''
-    # always true, for now
-    if srcdir != '':
-	    diffdir = '/tmp/make-patch/' + 'lilypond-%s'\
-		% version_tuple_to_str(options.to_version)
-
-    if from_b != 0 or (from_b == 0 and to_b == 0):
-	os.chdir ('/tmp/make-patch')
-	untar(released_tarball(options.from_version))
-	os.chdir(prev_cwd)
-    else:
-    	fromdir = diffdir
-	sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n')
-	os.system('cp -pr %s %s' % (srcdir, diffdir))
-
-    if to_b != 0:
-	os.chdir ('/tmp/make-patch')
-	untar(released_tarball(options.to_version))
-	os.chdir(prev_cwd)
-    else:
-    	todir = diffdir
-	sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n')
-	os.system('cp -pr %s %s' % (srcdir, diffdir))
-
-    os.chdir(diffdir)
-    os.system('rm -f *.aux *.dvi *.midi *.log *.ps *.tex *.ly')
-    os.chdir ('/tmp/make-patch')
-
-    makepatch(fromdir, todir, outfn) 
-
-    os.chdir('/tmp/make-patch')
-    sys.stderr.write('cleaning ... ')
-    os.system('rm -fr %s %s' % (fromdir, todir))
-    sys.stderr.write('\n')
-    os.chdir(prev_cwd)
+    makepatch(options.from_version, options.to_version, outfn)
 
 if __name__ == '__main__':
     main()
-
diff --git a/bin/make-version.in b/bin/make-version.sh
index 3be14353cb..3be14353cb 100755
--- a/bin/make-version.in
+++ b/bin/make-version.sh
diff --git a/bin/make-website.in b/bin/make-website.py
index 2f636547a0..c6034aa822 100755
--- a/bin/make-website.in
+++ b/bin/make-website.py
@@ -187,7 +187,7 @@ def gen_list(inputs, filename):
     list.write( "</BODY></HTML>");
     list.close()
 
-texstuff = ["mudela-man", "introduction"]
+texstuff = ["mudela"]
 
 def gen_manuals():
     print 'generating TeX doco manuals'
@@ -226,7 +226,7 @@ def docxx_update():
     banner= open('/tmp/lilybanner.html', 'w');
     banner.write (footstr('../index.html'))
     banner.close ()
-    my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/make-docxx' % depth]);
+    my_system(['BANNEROPT=\"-B /tmp/lilybanner.html\" %s/bin/out/make-docxx' % depth]);
 #    os.unlink( "/tmp/lilybanner.html");
 
 def get_glob(exts):
@@ -290,11 +290,11 @@ def do_examples (examples, filename):
 def main():
     identify();
 
-    os.chdir (lilydirs.topdir + 'WWW')
+    os.chdir (lilydirs.topdir + 'Documentation')
     
-    my_system (['-rm ../WWW/*.pod ../WWW/*.xpm ../WWW/*.doc',
-		'ln ../Documentation/*.pod ../Documentation/*.doc ../Documentation/*.xpm .']);
-    os.chdir (lilydirs.topdir + 'WWW/out')
+#    my_system (['-rm ../WWW/*.pod ../WWW/*.xpm ../WWW/*.doc',
+#		'ln ../Documentation/*.pod ../Documentation/*.doc ../Documentation/*.xpm .']);
+    os.chdir (lilydirs.topdir + 'Documentation/out/')
     __main__.depth = "../../";
     __main__.include_path = map(lambda p: __main__.depth + '/' + 
 				p, __main__.include_path)
diff --git a/bin/mf-deps.in b/bin/mf-deps.py
index b259b59748..b259b59748 100755
--- a/bin/mf-deps.in
+++ b/bin/mf-deps.py
diff --git a/bin/mf-to-table.in b/bin/mf-to-table.py
index 08016d8128..e3827346ca 100755
--- a/bin/mf-to-table.in
+++ b/bin/mf-to-table.py
@@ -17,6 +17,7 @@ import sys
 import time
 
 
+
 lilypath =''
 try:
 	lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/'
@@ -35,15 +36,27 @@ from flower import *
 
 begin_autometric_re = regex.compile('@{')
 end_autometric_re = regex.compile('@}')
+include_re = regex.compile ('(\([a-zA-Z_0-9-]+\.mf\)')
 autometric_re = regex.compile('@{\(.*\)@}')
-version = '0.5'
+version = '0.6'
+postfixes = ['log', 'dvi', '2602gf', 'tfm']
 
 class Feta_file(File):
     """Read Feta metrics from a metafont log-file."""
+
+    def include_scan (self, line):
+	include_pos =  include_re.search (line)
+	while include_pos <> -1:
+	    self.dependencies.append (include_re.group (1))
+
+	    line = line[include_pos + 1:]
+	    include_pos =  include_re.search (line)
+
     def read_autometricline(self):
 	line = ''
 	while end_autometric_re.search(line) == -1 and not self.eof():
 	    suf = File.readline(self)
+	    self.include_scan (suf)
 	    if begin_autometric_re.search(line) == -1:
 		line = ''
 	    line = line + regsub.sub('\n','', suf)
@@ -64,6 +77,7 @@ class Feta_file(File):
 	return autometric_re.group(1);
     def __init__(self, nm):
 	File.__init__(self, nm)
+	self.dependencies = []
     def do_file(infile_nm):
 	infile = readline();
 
@@ -163,30 +177,45 @@ class Log_reader:
 	else:
 	    raise 'unknown label: ' + label
 
-
+    def writedeps (self, deps):
+	
+	filename = deps[0]
+	split = os.path.splitext(filename)	
+	basename=split[0];
+
+	targets =  map (lambda x,y = basename, z = self.outdir: z + '/' + y + '.' + x, postfixes)
+	depstring = reduce(lambda x,y: x + ' ' + y, deps) 
+	dependencies = map (lambda x, y=depstring: x + ': ' + y, targets)
+	for x in dependencies: 
+	    self.depfile.write (x + '\n')
+	
     def do_file(self,filenm):
-	self.lyfile.write('\n% input from ' + filenm + '\n')
-	self.texfile.write('\n% input from ' + filenm + '\n')
+	self.lyfile.write ('\n% input from ' + filenm + '\n')
+	self.texfile.write ('\n% input from ' + filenm + '\n')
 	feta = Feta_file(filenm)
 	while not feta.eof():
 	    line = feta.readline()
 	    self.output_label(line)
 	feta.close()
+	
+	self.writedeps (feta.dependencies)
 
-    def __init__(self, lyfile_nm, texfile_nm):	    
+    def __init__(self, lyfile_nm, texfile_nm, depfile_nm):	    
 	self.lyfile = Ly_file(lyfile_nm, 'w')
 	self.texfile = Indentable_file(texfile_nm, 'w')
-
+	self.depfile = File (depfile_nm, 'w')
 
 	headerstr = '%% Creator: %s\n%% Automatically generated on\n%% Do not edit' % \
 		   (program_id() )
 
 	self.lyfile.write(headerstr)
 	self.texfile.write(headerstr)
+	self.depfile.write ('# automatically generated by %s\n' % program_id ())
 
     def close(self):
 	self.lyfile.close()
 	self.texfile.close()
+	self.depfile.close ()
 
     def __del__(self):
 	self.close()
@@ -206,19 +235,28 @@ def help():
 		 + "Options:\n"
 		 + "  -h, --help             print this help\n"
 		 + "  -l, --ly=FILE          name output table\n"
+		 + "  -d, --dep=FILE         print dependency info to FILE\n"
+		 + "  -o, --outdir=DIR       prefix for dependency info\n"
 		 + "  -t, --tex=FILE         name output tex chardefs\n")
+    sys.exit (0)
 
 
 def main():
     identify()
     (options, files) = getopt.getopt(
-	sys.argv[1:], 'hl:t:', ['ly=', 'tex=', 'debug', 'help'])
+	sys.argv[1:], 'ho:l:t:d:', ['outdir=', 'dep=', 'ly=', 'tex=', 'debug', 'help'])
 
     lyfile_nm = texfile_nm = '';
+    depfile_nm = ''
+    outdir_prefix = '.'
     for opt in options:
 	o = opt[0]
 	a = opt[1]
-	if o == '--ly' or o == '-l':
+	if o == '--dep' or o == '-d':
+	    depfile_nm = a
+	elif o == '--outdir' or o == '-o':
+	    outdir_prefix = a
+	elif o == '--ly' or o == '-l':
 	    lyfile_nm = a
 	elif o == '--tex' or o == '-t':
 	    texfile_nm = a
@@ -227,9 +265,11 @@ def main():
 	elif o == '--debug':
 	    debug_b = 1
 	else:
+	    print o
 	    raise getopt.error
 
-    log_reader = Log_reader(lyfile_nm, texfile_nm)
+    log_reader = Log_reader(lyfile_nm, texfile_nm, depfile_nm)
+    log_reader.outdir = outdir_prefix
     for filenm in files:
 	log_reader.do_file(filenm)
     log_reader.close()
diff --git a/bin/mudela-book.in b/bin/mudela-book.pl
index 64983a4bb6..abb9366e02 100755
--- a/bin/mudela-book.in
+++ b/bin/mudela-book.pl
@@ -1,4 +1,4 @@
-##!@PERL@ -w
+#!@PERL@ -w
 # -*-Perl-*-
 my $mudcount = 0;
 my $mudela_b = 0;
@@ -97,6 +97,8 @@ sub open_mudela
     print BOOK "\\preexample%\n";
     if ($center_b) {
 	print BOOK "\\begin{minipage}[c]{.5\\textwidth}\n";
+	print MUDELA "default_paper = \\paper { \\paper_sixteen ";
+	print MUDELA "linewidth = 7.\\cm;}";
     }
     if ($verbatim_b) {
 	print BOOK "\\begin{verbatim}\n";
@@ -105,7 +107,8 @@ sub open_mudela
 	print MUDELA "\\score { \\melodic { ";
     } else {
 	print MUDELA "default_paper = \\paper { \\paper_sixteen ";
-	print MUDELA "linewidth = 7.\\cm;}";
+	print MUDELA "linewidth = 15.\\cm;}";
+
     }
 
 }
diff --git a/bin/out/dummy.dep b/bin/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bin/out/dummy.dep
diff --git a/bin/ps-to-gifs.in b/bin/ps-to-gifs.sh
index dc51988675..dc51988675 100755
--- a/bin/ps-to-gifs.in
+++ b/bin/ps-to-gifs.sh
diff --git a/bin/release.in b/bin/release.py
index 1ba3c6c87c..fa6a9c4035 100755
--- a/bin/release.in
+++ b/bin/release.py
@@ -19,23 +19,12 @@ os.chdir(lilydirs.topdir)
 os.system('make dist')
 cur_ver = lilydirs.version_tuple()
 print tarball(cur_ver)
-try:
-    os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
-except posix.error:
-    os.system('cp out/' + tarball(cur_ver)  + ' ' + released_tarball(cur_ver))
-    os.unlink('out/' + tarball (cur_ver))
-    
-os.chdir(lilydirs.groupdir + '/test')
+os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
+os.chdir('../test')
 os.system('pwd')
 os.system('rm ../test/*gz')
+os.link(released_tarball(cur_ver), tarball(cur_ver))
 
-#huh?
-#os.symlink(released_tarball(cur_ver), tarball(cur_ver))
-
-try:
-    os.link(released_tarball(cur_ver), tarball(cur_ver))
-except posix.error:
-    os.system('cp ' + released_tarball(cur_ver) + ' '+  tarball(cur_ver))
 
 # not a module, but a script (JCN)
 # makepatch.main()
diff --git a/bin/show-latest.in b/bin/show-latest.pl
index 1c3d14dd0e..1c3d14dd0e 100755
--- a/bin/show-latest.in
+++ b/bin/show-latest.pl
diff --git a/bin/wild-perl b/bin/wild-perl
deleted file mode 100755
index 5262425834..0000000000
--- a/bin/wild-perl
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- perl -*-
-##! @PERL@
-
-use Getopt::Long;
-GetOptions("top-srcdir:s");
-
-$my_topsrcdir = $opt_top_srcdir ? $opt_top_srcdir : "\$(top_srcdir)";
-
-@ignorestuff = ();
-
-sub ignore_query
-{
-    my ($testfile) = @_;
-    return !grep(/$testfile/, @ignorestuff);
-}
-
-print "# Generated automatically by wild-perl 0.1\n";
-
-
-while (<>) {
-	$line = $_;
-	if ($line =~ /^ *nowildcard: *(.*)$/) {
-	    $ignore = $1;
-	    @ignorelist = split (/ +/, $ignore);
-	    foreach $i (@ignorelist) {
-		print "# ignoring wildcards for \`$i\'\n";
-		push @ignorestuff, $i; # concat ? uh?
-		print "IGNORE_WILDCARDS=$ignore";
-	    }
-
-	    
-	} elsif ($line =~ /(.*)\$\(wildcard(.*)\)(.*)/) {
-	    $wild = $2;
-	    
-	    @expanded = glob ($wild);
-
-	    @expanded = grep {ignore_query($_);}  @expanded;
-	    
-	    print $1 . join (' ', @expanded) . $3 . "\n";
-	} else {
-	    print $line;
-	}
-}
-
-
-print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" .
-#    "\t\$(PERL) $my_topsrcdir/bin/wild-perl --top-srcdir=\"\$(real_topsrcdir)\" < \$< > \$@";
-    "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@\n";
-
diff --git a/config.hh.in b/config.hh.in
index 5f455e0ff7..31b8f322c7 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,25 +1,11 @@
-/* config.hh.in.  Generated automatically from configure.in by autoheader.  */
+/* @configure_input@ */
 
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#undef YYTEXT_POINTER
-
-/* autoheader really wants this */
-#define PACKAGE
-
-/* undef to get lots of debugging stuff (see .dstream) */
-#define NPRINT
-
-/* undef to do checking */
-#undef NDEBUG
-
-/* define to inline string funcs */
-#undef STRINGS_UTILS_INLINED
 
 /* default lilypond init and input dir */
-#define  DIR_DATADIR "/home/fred/lelie/current"
+#define  DIR_DATADIR "@DIR_DATADIR@"
 
-/* the toplevel version string */
-#define TOPLEVEL_VERSION "0"
+/* define if you have memmem */
+#define HAVE_MEMMEM 0
 
-/* the version string of the flower lib */
-#define FLOWER_VERSION "0"
+/* define if you have snprintf */
+#define HAVE_SNPRINTF 0
diff --git a/config.make.in b/config.make.in
new file mode 100644
index 0000000000..57fdbc39da
--- /dev/null
+++ b/config.make.in
@@ -0,0 +1,40 @@
+# -*-Makefile-*-
+
+# @configure_input@
+
+INSTALL = @INSTALL@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
+USER_LDFLAGS =
+
+CXX = @CXX@
+POD2HTML= @POD2HTML@
+POD2MAN = @POD2MAN@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
+libdir = @libdir@
+prefix = @prefix@
+TEXPREFIX = @TEXPREFIX@
+TEXDIR = @TEXDIR@
+TAR= @TAR@
+MFDIR = @MFDIR@
+mandir  =  @mandir@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+includedir = @includedir@
+datadir = @datadir@
+EXTRA_LIBES = @EXTRA_LIBES@
+RANLIB = @RANLIB@
+DEFS = @DEFS@
+#SET_MAKE = @SET_MAKE@
+DEFINES = @DEFS@ @DEFINES@
+FIND = @FIND@
+COMPILEINFO = @COMPILEINFO@
+BISON = @BISON@
+FLEX = @FLEX@
+LN = @LN@
+ZIP = @ZIP@
+PERL = @PERL@
+PYTHON = @PYTHON@
+OUTDIR_NAME = @OUTDIR_NAME@
+
+
diff --git a/configure b/configure
index a35d886401..1de68df503 100755
--- a/configure
+++ b/configure
@@ -12,16 +12,6 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-shared         build shared libraries [default=no]
-  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list"
-ac_help="$ac_help
-  --enable-static         build static libraries [default=yes]
-  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
   enable-printing         turn on debug printing. Default: off"
 ac_help="$ac_help
   enable-checking         set runtime checks (assert calls). Default: on"
@@ -546,14 +536,9 @@ else
 fi
 
 
-
-. $srcdir/VERSION
-FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
-if test x$MY_PATCH_LEVEL != x; then
-	FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
-fi
+ #ugh flower/out/
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in bin $srcdir/bin; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -565,295 +550,12 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+  { echo "configure: error: can not find install-sh or install.sh in bin $srcdir/bin" 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:586: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-
-PACKAGE=lilypond
-
-VERSION=$FULL_VERSION
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:655: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:702: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:715: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:728: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:741: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:754: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:767: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-. $srcdir/flower/VERSION
-FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
-
-# libtool.info ...
-# **Never** try to set library version numbers so that they correspond
-# to the release number of your package.  This is an abuse that only
-# fosters misunderstanding of the purpose of library versions.
-
-REVISION=$PATCH_LEVEL
-# CURRENT=$MINOR_VERSION
-CURRENT=`expr $MINOR_VERSION + 1`
-# AGE=$(expr $MAJOR_VERSION + 1)
-AGE=$MAJOR_VERSION
-
-
-
-
-# turn off shared libraries by default (may be enabled using --enable-shared)
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=no
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
 
 # Make sure we can run config.sub.
 if $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -861,7 +563,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:865: checking host system type" >&5
+echo "configure:567: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -881,394 +583,35 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:888: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:917: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:946: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 1004 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:1008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
 
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1033: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1057: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1097: checking for ld used by GCC" >&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | A-Za-z:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1115: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1118: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1154: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
+OUTDIR_NAME=out
+. $srcdir/VERSION
+FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+if test x$MY_PATCH_LEVEL != x; then
+	FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
 fi
 
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1170: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$NM" in
-/* | A-Za-z:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac
-fi
-
-NM="$ac_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
+. $srcdir/flower/VERSION
+FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
 
+# libtool.info ...
+# **Never** try to set library version numbers so that they correspond
+# to the release number of your package.  This is an abuse that only
+# fosters misunderstanding of the purpose of library versions.
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1207: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+REVISION=$PATCH_LEVEL
+# CURRENT=$MINOR_VERSION
+CURRENT=`expr $MINOR_VERSION + 1`
+# AGE=$(expr $MAJOR_VERSION + 1)
+AGE=$MAJOR_VERSION
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 1243 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-esac
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
+# turn off shared libraries by default (may be enabled using --enable-shared)
+#AM_DISABLE_SHARED
+#AM_PROG_LIBTOOL
 
 # ugh, automake: we want (and check for) bison
 for ac_prog in 'bison -y' byacc
@@ -1276,7 +619,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1280: checking for $ac_word" >&5
+echo "configure:623: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1307,207 +650,10 @@ test -n "$YACC" || YACC="yacc"
 
 
 # ugh, automake: we want (and check for) flex
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1314: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1347: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1355 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1390: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1405 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1422 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1451: checking lex output file root" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1472: checking whether yytext is a pointer" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $LEXLIB"
-cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
-#include "confdefs.h"
-`cat $LEX_OUTPUT_ROOT.c`
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_prog_lex_yytext_pointer=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"
-
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  cat >> confdefs.h <<\EOF
-#define YYTEXT_POINTER 1
-EOF
-
-fi
+# AC_PROG_LEX
+# urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
 
+# AC_DECL_YYTEXT
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
@@ -1653,7 +799,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1657: checking for $ac_word" >&5
+echo "configure:803: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1684,7 +830,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1688: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:834: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1694,11 +840,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1698 "configure"
+#line 844 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1718,12 +864,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1722: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:868: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1727: checking whether we are using GNU C++" >&5
+echo "configure:873: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1732,7 +878,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1747,7 +893,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1751: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:897: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1774,7 +920,35 @@ else
   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
 fi
 
-# AC_PROG_RANLIB
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:927: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1786,7 +960,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1790: checking for a BSD compatible install" >&5
+echo "configure:964: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1840,7 +1014,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1844: checking for $ac_word" >&5
+echo "configure:1018: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1874,7 +1048,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1878: checking for $ac_word" >&5
+echo "configure:1052: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1914,6 +1088,214 @@ test -n "$FIND" || FIND="error"
 	fi
 
 
+echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+echo "configure:1093: checking for 8-bit clean memcmp" >&5
+if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_memcmp_clean=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1101 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+
+main()
+{
+  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+}
+
+EOF
+if { (eval echo configure:1114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_memcmp_clean=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_memcmp_clean=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
+
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:1132: checking for vprintf" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1137 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vprintf(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char vprintf();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
+choke me
+#else
+vprintf();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:1187: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1192 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char _doprnt();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
+choke me
+#else
+_doprnt();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+for ac_func in memmem snprintf 
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1245: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1250 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 
 cat >> confdefs.h <<EOF
 #define TOPLEVEL_VERSION "${FULL_VERSION}"
@@ -1945,7 +1327,8 @@ absolute_builddir="`pwd`"
 
 
 
-# AC_SUBST(DEFINES)
+
+
 
 
 
@@ -1966,7 +1349,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1970: checking for $ac_word" >&5
+echo "configure:1353: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2000,7 +1383,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2004: checking for $ac_word" >&5
+echo "configure:1387: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2034,7 +1417,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2038: checking for $ac_word" >&5
+echo "configure:1421: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2066,7 +1449,7 @@ test -n "$MAKE" || MAKE="error"
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2070: checking for $ac_word" >&5
+echo "configure:1453: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2098,7 +1481,7 @@ fi
 # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2102: checking for $ac_word" >&5
+echo "configure:1485: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2132,7 +1515,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2136: checking for $ac_word" >&5
+echo "configure:1519: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2166,7 +1549,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2170: checking for $ac_word" >&5
+echo "configure:1553: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2202,7 +1585,7 @@ if test "x$TEXPREFIX" = xauto ; then
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6
-echo "configure:2206: checking TeX/MF root dir directory" >&5    
+echo "configure:1589: checking TeX/MF root dir directory" >&5    
 
     find_root_prefix="$prefix"
     
@@ -2243,7 +1626,7 @@ if test "x$MFDIR" = xauto; then
     
     
     echo $ac_n "checking MF input directory""... $ac_c" 1>&6
-echo "configure:2247: checking MF input directory" >&5    
+echo "configure:1630: checking MF input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')`
     
@@ -2268,7 +1651,7 @@ if test "x$TEXDIR" = xauto ; then
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6
-echo "configure:2272: checking TeX input directory" >&5    
+echo "configure:1655: checking TeX input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     
@@ -2373,18 +1756,19 @@ fi
 
 
 # ugh autoconf
-if $CXX --version | grep '2\.[78]' > /dev/null
+if $CXX --version | grep '2\.[78]' > /dev/null ||
+    $CXX --version | grep 'egcs' > /dev/null
 then
 	true
 else
 	
-    echo "configure: warning: can't find g++ 2.7 or 2.8" 1>&2
+    echo "configure: warning: can't find g++ 2.7" 1>&2
     warn_b=yes
 
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2388: checking how to run the C++ preprocessor" >&5
+echo "configure:1772: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2397,12 +1781,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 2401 "configure"
+#line 1785 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -2422,17 +1806,17 @@ echo "$ac_t""$CXXCPP" 1>&6
 
 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:2426: checking for FlexLexer.h" >&5
+echo "configure:1810: checking for FlexLexer.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2431 "configure"
+#line 1815 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2462,7 +1846,6 @@ touch stamp-h.in
 
 
 
-
 # first do Foobar/Makefile then Foobar/include/Makefile
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -2565,19 +1948,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "bin/Makefile flower/Makefile flower/include/Makefile
-	flowertest/Makefile lib/Makefile lib/include/Makefile 
-	lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
-	mi2mu/include/Makefile debian/Makefile Documentation/Makefile
-	init/Makefile input/Makefile tex/Makefile make/Makefile
-	mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile
-	test/Makefile Makefile 
-	bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
-	bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
-	bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
-	bin/make-patch bin/make-version bin/make-website bin/mf-deps 
-	bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
-	bin/show-latest flower/config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "config.make config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2607,41 +1978,25 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CURRENT@%$CURRENT%g
-s%@REVISION@%$REVISION%g
-s%@AGE@%$AGE%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@RANLIB@%$RANLIB%g
-s%@CC@%$CC%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@LN_S@%$LN_S%g
-s%@LIBTOOL@%$LIBTOOL%g
+s%@CURRENT@%$CURRENT%g
+s%@REVISION@%$REVISION%g
+s%@AGE@%$AGE%g
 s%@YACC@%$YACC%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
-s%@CPP@%$CPP%g
-s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
 s%@CXX@%$CXX%g
+s%@RANLIB@%$RANLIB%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@TAR@%$TAR%g
 s%@FIND@%$FIND%g
+s%@LIBOBJS@%$LIBOBJS%g
 s%@ICFLAGS@%$ICFLAGS%g
 s%@ILDFLAGS@%$ILDFLAGS%g
+s%@DEFINES@%$DEFINES%g
 s%@COMPILEINFO@%$COMPILEINFO%g
 s%@AUTOGENERATE@%$AUTOGENERATE%g
 s%@BISON@%$BISON%g
@@ -2656,6 +2011,7 @@ s%@MFDIR@%$MFDIR%g
 s%@DIR_DATADIR@%$DIR_DATADIR%g
 s%@absolute_builddir@%$absolute_builddir%g
 s%@EXTRA_LIBES@%$EXTRA_LIBES%g
+s%@OUTDIR_NAME@%$OUTDIR_NAME%g
 s%@MAKE@%$MAKE%g
 s%@POD2HTML@%$POD2HTML%g
 s%@POD2MAN@%$POD2MAN%g
@@ -2701,19 +2057,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"bin/Makefile flower/Makefile flower/include/Makefile
-	flowertest/Makefile lib/Makefile lib/include/Makefile 
-	lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
-	mi2mu/include/Makefile debian/Makefile Documentation/Makefile
-	init/Makefile input/Makefile tex/Makefile make/Makefile
-	mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile
-	test/Makefile Makefile 
-	bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
-	bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
-	bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
-	bin/make-patch bin/make-version bin/make-website bin/mf-deps 
-	bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
-	bin/show-latest"}
+CONFIG_FILES=\${CONFIG_FILES-"config.make"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2794,7 +2138,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="flower/config.hh:config.hh.in"
+  CONFIG_HEADERS="config.hh:config.hh.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -2882,10 +2226,8 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > flower/stamp-h
 
 exit 0
 EOF
@@ -2894,6 +2236,6 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
-# ugh
-chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest
-
+rm -f Makefile
+cp make/Toplevel.make.in ./Makefile
+chmod 555 Makefile
diff --git a/configure.in b/configure.in
index b6a41c2f66..8a85e74b77 100644
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,17 @@ dnl  Process this file with autoconf to produce a configure script.
 
 
 AC_INIT(flower/choleski.cc)
+AC_CONFIG_HEADER(config.hh:config.hh.in) #ugh flower/out/
+AC_CONFIG_AUX_DIR(bin)
+AC_CANONICAL_HOST
 
+OUTDIR_NAME=out
 . $srcdir/VERSION
 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
 if test x$MY_PATCH_LEVEL != x; then
 	FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
 fi
-AM_INIT_AUTOMAKE(lilypond, $FULL_VERSION)
+
 
 . $srcdir/flower/VERSION
 FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
@@ -29,16 +33,17 @@ AC_SUBST(REVISION)
 AC_SUBST(AGE)
 
 # turn off shared libraries by default (may be enabled using --enable-shared)
-AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
+#AM_DISABLE_SHARED
+#AM_PROG_LIBTOOL
 
 # ugh, automake: we want (and check for) bison
 AC_PROG_YACC
 
 # ugh, automake: we want (and check for) flex
-AC_PROG_LEX
+# AC_PROG_LEX
+# urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
 
-AC_DECL_YYTEXT
+# AC_DECL_YYTEXT
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
@@ -135,7 +140,7 @@ CXXFLAGS=$DEFINES
 LDFLAGS=$EXTRA_LIBES
 
 AC_PROG_CXX
-# AC_PROG_RANLIB
+AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_PROGS(TAR, tar, error)
 AC_CHECK_PROGS(FIND, find, error)
@@ -143,6 +148,9 @@ AC_CHECK_PROGS(FIND, find, error)
 dnl should check out -print
 AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir)
 
+AC_FUNC_MEMCMP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(memmem snprintf )
 
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
@@ -165,7 +173,8 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(CXX)
 AC_SUBST(ICFLAGS)
 AC_SUBST(ILDFLAGS)
-# AC_SUBST(DEFINES)
+AC_SUBST(DEFINES)
+AC_SUBST(RANLIB)
 AC_SUBST(COMPILEINFO)
 AC_SUBST(AUTOGENERATE)
 AC_SUBST(BISON)
@@ -180,7 +189,7 @@ AC_SUBST(MFDIR)
 AC_SUBST(DIR_DATADIR)
 AC_SUBST(absolute_builddir)
 AC_SUBST(EXTRA_LIBES)
-
+AC_SUBST(OUTDIR_NAME)
 AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
 AC_CHECK_PROGS(MAKE, make, error)
@@ -236,35 +245,25 @@ fi
 
 # ugh autoconf
 changequote(<<, >>)dnl
-if $CXX --version | grep '2\.[78]' > /dev/null
+if $CXX --version | grep '2\.[78]' > /dev/null ||
+    $CXX --version | grep 'egcs' > /dev/null
 changequote([, ])dnl
 then
 	true
 else
-	AC_LILY_WARN(can't find g++ 2.7 or 2.8)
+	AC_LILY_WARN(can't find g++ 2.7, 2.8 or egcs)
 fi
 
 AC_CHECK_HEADER(FlexLexer.h, true,
 	AC_LILY_WARN(can't find flex header. Please install Flex headers correctly))
 
 touch stamp-h.in
-AM_CONFIG_HEADER(flower/config.hh:config.hh.in)
+
+
 
 # first do Foobar/Makefile then Foobar/include/Makefile
-AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile
-	flowertest/Makefile lib/Makefile lib/include/Makefile 
-	lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
-	mi2mu/include/Makefile debian/Makefile Documentation/Makefile
-	init/Makefile input/Makefile tex/Makefile make/Makefile
-	mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile
-	test/Makefile Makefile 
-	bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
-	bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
-	bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
-	bin/make-patch bin/make-version bin/make-website bin/mf-deps 
-	bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
-	bin/show-latest)
-
-# ugh
-chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest
+AC_OUTPUT(config.make)
 
+rm -f Makefile
+cp make/Toplevel.make.in ./Makefile
+chmod 555 Makefile
diff --git a/debian/Makefile b/debian/Makefile
new file mode 100644
index 0000000000..531f1330c4
--- /dev/null
+++ b/debian/Makefile
@@ -0,0 +1,19 @@
+depth = ..
+
+NAME= debian
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
+#
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+#
+
+
+EXTRA_DISTFILES = README.Debian TODO changelog control copyright \
+	postinst postinst.old.sh postrm preinst rules watch
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index 2055f2b3fd..0000000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# debian/Makefile.am.wild
-
-EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
-	postinst postinst.old.sh postrm preinst rules watch
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/debian/Makefile.am.wild b/debian/Makefile.am.wild
deleted file mode 100644
index 1dc36d0e92..0000000000
--- a/debian/Makefile.am.wild
+++ /dev/null
@@ -1,5 +0,0 @@
-# debian/Makefile.am.wild
-
-EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
-	postinst postinst.old.sh postrm preinst rules watch
-
diff --git a/debian/Makefile.in b/debian/Makefile.in
deleted file mode 100644
index 28668c8eb5..0000000000
--- a/debian/Makefile.in
+++ /dev/null
@@ -1,199 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# debian/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
-	postinst postinst.old.sh postrm preinst rules watch
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps debian/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = debian
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/debian/changelog b/debian/changelog
index a7a0642d11..0f86127f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,33 @@
+lilypond (0.1.48-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 13 Mar 1998 22:15:11 -0800
+
+lilypond (0.1.46-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 27 Feb 1998 22:43:41 -0800
+
+lilypond (0.1.45-1) unstable; urgency=low
+
+  * New upstream "The Utrecht Release".
+  * Compiled on va.debian.org because egcs 1.0.1 on my computer
+    no longer comes with libg++.  :-(  But hey, va.debian.org
+    sure is fast!  <grin>
+  * Temporarily includes *.xpm instead of *.gif files because
+    the netpbm package is not installed on va.debian.org, and
+    also because it violates Policy 2.1.2.  Thanks to
+    James Troup <J.J.Troup@scm.brad.ac.uk> for bug report!  :-)
+    (Fixes Bug#18212)
+  * debian/rules: Added "dh_undocumented ly2dvi.1".
+
+ -- Anthony Fok <foka@debian.org>  Sat, 21 Feb 1998 01:37:57 -0700
+
 lilypond (0.1.44-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
 
  -- Anthony Fok <foka@debian.org>  Fri,  6 Feb 1998 22:07:39 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 16c78c5b47..9223c27f8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
     ftp://pcnov095.win.tue.nl/pub/lilypond/development/
-        lilypond-0.1.44.tar.gz
+        lilypond-0.1.48.tar.gz
 
 It is also available from:
     ftp://alpha.gnu.org/gnu/
diff --git a/debian/out/dummy.dep b/debian/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/debian/out/dummy.dep
diff --git a/debian/rules b/debian/rules
index b71ba55d43..c0a20793c3 100644
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ build-stamp:
 		--enable-printing --prefix=/usr --enable-optimise \
 		--enable-shared
 	$(MAKE) all
-	$(MAKE) -C Documentation gifs
 	touch build-stamp
 
 clean:
@@ -42,11 +41,11 @@ binary-arch: build
 	dh_installdirs usr/lib/texmf/doc usr/lib/emacs/site-lisp
 	ln -fs ../../../doc/lilypond debian/tmp/usr/lib/texmf/doc/lilypond
 	$(MAKE) prefix=`pwd`/debian/tmp/usr install
-	cp -av bin/out/ly2dvi debian/tmp/usr/bin
 	cp -av mudela-mode.el debian/tmp/usr/lib/emacs/site-lisp
 	dh_installdocs ANNOUNCE ANNOUNCE-0.1 README NEWS ONEWS DEDICATION \
 		BUGS TODO \
-		Documentation/*.doc Documentation/out/{*.txt,*.gif}
+		Documentation/*.{doc,xpm} Documentation/out/*.txt
+#		Documentation/*.doc Documentation/out/*.{txt,gif}
 	dh_installexamples input/{*.ly,TODO}
 	cp -aPv `find mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \
 		debian/tmp/usr/doc/lilypond/examples
diff --git a/flower/GNUmakefile b/flower/GNUmakefile
deleted file mode 100644
index 0119865800..0000000000
--- a/flower/GNUmakefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# flower/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../build/flower
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-# Makefile.am.wild: libflower_la_SOURCES = $(wildcard *.cc)
-CURRENT_libflower_la_SOURCES = $(wildcard *.cc)
-
-wild-check: check-flower-la-sources
-
-check-flower-la-sources:
-ifneq ($(libflower_la_SOURCES),$(CURRENT_libflower_la_SOURCES))
-	@echo \"$(libflower_la_SOURCES)\"
-	@echo \"$(CURRENT_libflower_la_SOURCES)\"
-	@echo  libflower_la_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/flower/Makefile b/flower/Makefile
new file mode 100644
index 0000000000..914663ff37
--- /dev/null
+++ b/flower/Makefile
@@ -0,0 +1,84 @@
+#
+# project  FlowerSoft C++ library
+# title	   top level makefile for FlowerLib
+# file	   flower/Makefile
+#
+# Copyright (c) 1997 by    
+#   	Jan Nieuwenhuizen <jan@digicash.com>
+#	Han-Wen Nienhuys <hanwen@stack.nl>
+#		...your sort order here, or how to comment-out a comment
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = flower
+MODULE_NAME = flower
+#
+# edit VERSION only
+include ./$(depth)/VERSION
+include ./$(depth)/flower/VERSION
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
+
+#include $(flowerout)/Flower-flags.make
+
+
+#
+# descent order into subdirectories:
+#
+SUBDIRS = include 
+#
+
+# list of distribution files:
+#
+SCRIPTS = 
+README_FILES = ONEWS NEWS README TODO
+EXTRA_DISTFILES= VERSION $(README_FILES) $(SCRIPTS)
+#Flower-flags.make.in
+# aclocal.m4 configure config.hh.in configure.in
+
+
+
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+#
+
+default: the-lib
+
+THE_LIB=$(outdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
+the-lib: $(THE_LIB) 
+
+# version:
+#
+
+localdist: 
+
+-include /dev/null $(DEPFILES)
+#
+
+localdistclean:
+	rm -f config.cache config.status config.log
+
+localinstall: $(LIBFLOWER)
+ifeq ($(LIB_SUFFIX),.so)
+	$(INSTALL) -d $(libdir)
+	$(INSTALL) $(LIBFLOWER).$(VERSION) $(libdir)
+	ln -s $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX).$(MAJOR_VERSION)
+	ln -s $(LIB_PREFIX)flower$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)flower$(LIB_SUFFIX)
+endif
+
+localuninstall:
+	rm -f $(libdir)/libflower.{so*,a}
+
+
+$(outdir)/flower-version.o: $(outdir)/version.hh
diff --git a/flower/Makefile.am b/flower/Makefile.am
deleted file mode 100644
index 952a5e89c2..0000000000
--- a/flower/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  FlowerSoft C++ library
-# title	   top level makefile for FlowerLib
-# file	   flower/Makefile.am.wild
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = libflower.la
-
-README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
-
-libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc
-
-libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-
-INCLUDES = -I$(top_srcdir)/flower/include
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/flower/Makefile.am.wild b/flower/Makefile.am.wild
deleted file mode 100644
index 869fb332b5..0000000000
--- a/flower/Makefile.am.wild
+++ /dev/null
@@ -1,34 +0,0 @@
-# project  FlowerSoft C++ library
-# title	   top level makefile for FlowerLib
-# file	   flower/Makefile.am.wild
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = libflower.la
-
-README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
-
-libflower_la_SOURCES = $(wildcard *.cc)
-
-libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-
-INCLUDES = -I$(top_srcdir)/flower/include
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
diff --git a/flower/Makefile.in b/flower/Makefile.in
deleted file mode 100644
index 5e7e42db60..0000000000
--- a/flower/Makefile.in
+++ /dev/null
@@ -1,531 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  FlowerSoft C++ library
-# title	   top level makefile for FlowerLib
-# file	   flower/Makefile.am.wild
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = libflower.la
-
-README_FILES = ONEWS NEWS README TODO VERSION
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(README_FILES)
-
-libflower_la_SOURCES = choleski.cc cpu-timer.cc data-file.cc diagonal-storage.cc dictionary.cc directed-graph.cc dstream.cc flower-debug.cc flower-version.cc full-storage.cc interval.cc lgetopt.cc libc-extension.cc matrix-debug.cc matrix-storage.cc matrix.cc nscalar.cc path.cc rational.cc scalar.cc string-convert.cc string.cc stringutil.cc text-db.cc text-stream.cc unionfind.cc vector.cc
-
-libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-
-INCLUDES = -I$(top_srcdir)/flower/include
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.hh
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-LIBS = @LIBS@
-libflower_la_LIBADD = 
-libflower_la_OBJECTS =  choleski.lo cpu-timer.lo data-file.lo \
-diagonal-storage.lo dictionary.lo directed-graph.lo dstream.lo \
-flower-debug.lo flower-version.lo full-storage.lo interval.lo \
-lgetopt.lo libc-extension.lo matrix-debug.lo matrix-storage.lo \
-matrix.lo nscalar.lo path.lo rational.lo scalar.lo string-convert.lo \
-string.lo stringutil.lo text-db.lo text-stream.lo unionfind.lo \
-vector.lo
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in NEWS TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-SOURCES = $(libflower_la_SOURCES)
-OBJECTS = $(libflower_la_OBJECTS)
-
-default: all
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libflower.la: $(libflower_la_OBJECTS) $(libflower_la_DEPENDENCIES)
-	$(CXXLINK) -rpath $(libdir) $(libflower_la_LDFLAGS) $(libflower_la_OBJECTS) $(libflower_la_LIBADD) $(LIBS)
-.cc.o:
-	$(CXXCOMPILE) -c $<
-.cc.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = flower
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-choleski.lo choleski.o: choleski.cc include/choleski.hh \
-	include/matrix.hh include/matrix-storage.hh include/varray.hh \
-	include/real.hh include/virtual-methods.hh include/vector.hh
-cpu-timer.lo cpu-timer.o: cpu-timer.cc include/cpu-timer.hh \
-	include/real.hh
-data-file.lo data-file.o: data-file.cc include/international.hh \
-	include/data-file.hh include/text-stream.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh include/compare.hh \
-	include/varray.hh
-diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \
-	include/diagonal-storage.hh include/full-storage.hh \
-	include/varray.hh include/matrix-storage.hh include/real.hh \
-	include/virtual-methods.hh
-dictionary.lo dictionary.o: dictionary.cc
-directed-graph.lo directed-graph.o: directed-graph.cc \
-	include/directed-graph.hh include/parray.hh include/varray.hh
-dstream.lo dstream.o: dstream.cc include/assoc.hh include/varray.hh \
-	include/dstream.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/scalar.hh \
-	include/text-db.hh include/data-file.hh include/text-stream.hh \
-	include/string-convert.hh include/assoc-iter.hh
-flower-debug.lo flower-debug.o: flower-debug.cc include/flower-debug.hh \
-	include/dstream.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh
-flower-version.lo flower-version.o: flower-version.cc config.hh
-full-storage.lo full-storage.o: full-storage.cc include/full-storage.hh \
-	include/varray.hh include/matrix-storage.hh include/real.hh \
-	include/virtual-methods.hh include/full-storage.icc
-interval.lo interval.o: interval.cc include/interval.hh \
-	include/fproto.hh include/real.hh include/compare.hh \
-	include/interval.tcc include/string.hh \
-	include/arithmetic-operator.hh include/string-handle.hh \
-	include/international.hh include/flower-debug.hh \
-	include/dstream.hh
-lgetopt.lo lgetopt.o: lgetopt.cc include/lgetopt.hh \
-	include/international.hh
-libc-extension.lo libc-extension.o: libc-extension.cc \
-	include/libc-extension.hh include/fproto.hh include/real.hh \
-	config.hh
-matrix-debug.lo matrix-debug.o: matrix-debug.cc include/flower-debug.hh \
-	include/dstream.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/matrix.hh \
-	include/matrix-storage.hh include/varray.hh \
-	include/virtual-methods.hh include/vector.hh
-matrix-storage.lo matrix-storage.o: matrix-storage.cc \
-	include/full-storage.hh include/varray.hh \
-	include/matrix-storage.hh include/real.hh \
-	include/virtual-methods.hh include/diagonal-storage.hh
-matrix.lo matrix.o: matrix.cc include/matrix.hh \
-	include/matrix-storage.hh include/varray.hh include/real.hh \
-	include/virtual-methods.hh include/vector.hh \
-	include/full-storage.hh include/diagonal-storage.hh
-nscalar.lo nscalar.o: nscalar.cc
-path.lo path.o: path.cc include/path.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/varray.hh \
-	include/flower-debug.hh include/dstream.hh
-rational.lo rational.o: rational.cc include/rational.hh \
-	include/compare.hh include/arithmetic-operator.hh \
-	include/fproto.hh include/real.hh include/string.hh \
-	include/string-handle.hh include/international.hh \
-	include/string-convert.hh include/libc-extension.hh config.hh
-scalar.lo scalar.o: scalar.cc include/scalar.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/rational.hh
-string-convert.lo string-convert.o: string-convert.cc \
-	include/libc-extension.hh include/fproto.hh include/real.hh \
-	config.hh include/string.hh include/arithmetic-operator.hh \
-	include/string-handle.hh include/international.hh \
-	include/compare.hh include/string-convert.hh \
-	include/rational.hh
-string.lo string.o: string.cc include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh \
-	include/libc-extension.hh config.hh include/string-convert.hh
-stringutil.lo stringutil.o: stringutil.cc include/string-handle.hh \
-	include/fproto.hh include/real.hh include/string-data.hh \
-	include/string.hh include/arithmetic-operator.hh \
-	include/international.hh include/compare.hh \
-	include/string-data.icc include/string-handle.icc \
-	include/string.icc
-text-db.lo text-db.o: text-db.cc include/text-db.hh include/data-file.hh \
-	include/text-stream.hh include/string.hh \
-	include/arithmetic-operator.hh include/fproto.hh \
-	include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/varray.hh
-text-stream.lo text-stream.o: text-stream.cc include/text-stream.hh \
-	include/string.hh include/arithmetic-operator.hh \
-	include/fproto.hh include/real.hh include/string-handle.hh \
-	include/international.hh include/compare.hh include/varray.hh
-unionfind.lo unionfind.o: unionfind.cc include/unionfind.hh \
-	include/varray.hh
-vector.lo vector.o: vector.cc include/vector.hh include/real.hh \
-	include/varray.hh
-
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-recursive-am: config.hh
-	$(MAKE) all-recursive
-
-all-am: Makefile $(LTLIBRARIES) config.hh
-
-install-exec-am: install-libLTLIBRARIES
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
-all: all-recursive-am all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(libdir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-
-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec-am uninstall-am \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/flower/NEWS b/flower/NEWS
index 351d36c051..749922590d 100644
--- a/flower/NEWS
+++ b/flower/NEWS
@@ -1,3 +1,6 @@
+pl 40
+	- do some Complex number stuff in Offset
+	- included axies, offset from lily
 
 pl 39
 	- fixes to Array
diff --git a/flower/VERSION b/flower/VERSION
index ff98ffea7a..0c19fcdf01 100644
--- a/flower/VERSION
+++ b/flower/VERSION
@@ -1,7 +1,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1
-PATCH_LEVEL=39
+PATCH_LEVEL=40
+
 # use to send patches, always empty for released version:
-# include separator: "-1" or ".a"
 #
 MY_PATCH_LEVEL=
diff --git a/lily/axis.cc b/flower/axis.cc
index ff8566988d..ff8566988d 100644
--- a/lily/axis.cc
+++ b/flower/axis.cc
diff --git a/flower/dstream.cc b/flower/dstream.cc
index f22365bf55..28f7a472aa 100644
--- a/flower/dstream.cc
+++ b/flower/dstream.cc
@@ -58,7 +58,7 @@ Dstream::identify_as (String name)
     idx = cl;
   else
     {
-      (*silent_assoc_p_)[idx] = false;
+      (*silent_assoc_p_)[idx] = default_silence_b_;
     }
   local_silence_b_ = (*silent_assoc_p_)[idx];
   if (current_classname_str_ != idx && !local_silence_b_)
@@ -138,6 +138,7 @@ Dstream::Dstream (ostream *r, char const * cfg_nm)
 {
   os_l_ = r;
   silent_assoc_p_ = new Assoc<String,bool>;
+  default_silence_b_ = false;
   indent_level_i_ = 0;
   if (!os_l_)
     return;
@@ -160,6 +161,8 @@ Dstream::Dstream (ostream *r, char const * cfg_nm)
     (*silent_assoc_p_)[r[0]] = (bool)(int)(Scalar (r[1]));
   }
 
+  if ((*silent_assoc_p_).elt_b ("Dstream_default_silence"))
+    default_silence_b_ = (*silent_assoc_p_)["Dstream_default_silence"];
 }
 
 
diff --git a/flower/flower-version.cc b/flower/flower-version.cc
index 344474cd1b..746deacb93 100644
--- a/flower/flower-version.cc
+++ b/flower/flower-version.cc
@@ -1,9 +1,9 @@
 #include <stdio.h>
 
-#include "config.hh"
+#include "version.hh"
 
-// static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
-static char *s = "FlowerLib " FLOWER_VERSION ;
+static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL "." MY_PATCH_LEVEL;
+//static char *s = "FlowerLib " FLOWER_VERSION ;
 
 
 char const * 
diff --git a/flower/include/GNUmakefile b/flower/include/GNUmakefile
deleted file mode 100644
index 4f60f373fd..0000000000
--- a/flower/include/GNUmakefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# flower/include/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../../build/flower/include
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-wild-check: check-noinst-headers
-
-check-noinst-headers:
-ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
-	@echo \"$(noinst_HEADERS)\"
-	@echo \"$(CURRENT_noinst_HEADERS)\"
-	@echo noinst_HEADERS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-        $(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/flower/include/Makefile b/flower/include/Makefile
new file mode 100644
index 0000000000..b7716f2676
--- /dev/null
+++ b/flower/include/Makefile
@@ -0,0 +1,19 @@
+# flower/lib/include/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Include.make
+include ./$(depth)/flower/VERSION
+
+# identify module:
+#
+MODULE_NAME = flower
+
+
+#
+
diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am
deleted file mode 100644
index e223c15d7e..0000000000
--- a/flower/include/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# flower/include/Makefile.am.wild
-
-noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/flower/include/Makefile.am.wild b/flower/include/Makefile.am.wild
deleted file mode 100644
index 9c1e9deff1..0000000000
--- a/flower/include/Makefile.am.wild
+++ /dev/null
@@ -1,14 +0,0 @@
-# flower/include/Makefile.am.wild
-
-noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in
deleted file mode 100644
index 5913ab932d..0000000000
--- a/flower/include/Makefile.in
+++ /dev/null
@@ -1,234 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# flower/include/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-noinst_HEADERS = acursor.hh arithmetic-operator.hh assoc-iter.hh assoc.hh choleski.hh compare.hh cpu-timer.hh cursor.hh data-file.hh diagonal-storage.hh dictionary-iter.hh dictionary.hh directed-graph.hh dstream.hh flower-debug.hh fproto.hh full-storage.hh handle.hh international.hh interval.hh iterate.hh lgetopt.hh libc-extension.hh link.hh list.hh matrix-storage.hh matrix.hh nscalar.hh parray.hh path.hh pcursor.hh plist.hh pointer.hh pqueue.hh priorities.hh rational.hh real.hh scalar.hh string-convert.hh string-data.hh string-handle.hh string.hh text-db.hh text-stream.hh timer.hh unionfind.hh varray.hh vector.hh virtual-methods.hh cursor.icc full-storage.icc link.icc list.icc plist.icc string-data.icc string-handle.icc string.icc cursor.tcc interval.tcc list.tcc pcursor.tcc plist.tcc pointer.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/include/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = flower/include
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile $(HEADERS)
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-tags mostlyclean-generic
-
-clean:  clean-tags clean-generic mostlyclean
-
-distclean:  distclean-tags distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lily/include/axes.hh b/flower/include/axes.hh
index b273f6b102..82e561eb9f 100644
--- a/lily/include/axes.hh
+++ b/flower/include/axes.hh
@@ -16,10 +16,14 @@ enum Axis {
     NO_AXES=2,
 };
 
+#ifndef STANDALONE
+
 #include "string.hh"		// ugh
 
 String axis_name_str (Axis);
 
+#endif // STANDALONE
+
 /**
   the operator ++ for Axis. 
  */
@@ -28,4 +32,5 @@ Axis incr(Axis &);
 //Axis operator++(Axis);
 
 
+
 #endif // AXES_HH
diff --git a/flower/include/config.hh b/flower/include/config.hh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/flower/include/config.hh
diff --git a/flower/include/dstream.hh b/flower/include/dstream.hh
index 752b78bca4..d9f896e434 100644
--- a/flower/include/dstream.hh
+++ b/flower/include/dstream.hh
@@ -34,31 +34,32 @@ struct Assoc;
   */
 class Dstream
 {
-    ostream *os_l_;
-    int indent_level_i_;
-    bool local_silence_b_;
-    String current_classname_str_;
-    void output (String s);
-    Assoc<String, bool> *silent_assoc_p_;
+  ostream *os_l_;
+  int indent_level_i_;
+  bool local_silence_b_;
+  bool default_silence_b_;
+  String current_classname_str_;
+  void output (String s);
+  Assoc<String, bool> *silent_assoc_p_;
 public:
-    void clear_silence();
-    bool silent_b (String) const;
+  void clear_silence();
+  bool silent_b (String) const;
     
-    /**
-      if rcfile == 0, then do not read any rc file.
-      */
-    Dstream (ostream *r, char const * rcfile);
-    virtual ~Dstream();
-    Dstream &identify_as (String s);
+  /**
+     if rcfile == 0, then do not read any rc file.
+  */
+  Dstream (ostream *r, char const * rcfile);
+  virtual ~Dstream();
+  Dstream &identify_as (String s);
 
-/** Output a string via the Dstream. This is the only output
- interface. It delegates all conversion to String class.  */
-    Dstream &operator << (String s);
-    /**
-      Output memory locations.
-     */
-    Dstream &operator << (void const *);
-    Dstream &operator << (char const *);
+  /** Output a string via the Dstream. This is the only output
+      interface. It delegates all conversion to String class.  */
+  Dstream &operator << (String s);
+  /**
+     Output memory locations.
+  */
+  Dstream &operator << (void const *);
+  Dstream &operator << (char const *);
 };
 #endif
 
diff --git a/flower/include/matrix-storage.hh b/flower/include/matrix-storage.hh
index 5027b6f555..a48f87050c 100644
--- a/flower/include/matrix-storage.hh
+++ b/flower/include/matrix-storage.hh
@@ -12,6 +12,8 @@
 
 #include "varray.hh"
 #include "real.hh"
+
+// oo, noo!
 #include "virtual-methods.hh"
 
 /** 
diff --git a/flower/include/matrix.hh b/flower/include/matrix.hh
index 6b5f773b2f..321aeaadcf 100644
--- a/flower/include/matrix.hh
+++ b/flower/include/matrix.hh
@@ -12,6 +12,7 @@
 
 #include "matrix-storage.hh"
 #include "vector.hh"
+#include "offset.hh"
 
 /**  a Real matrix.  This is a class for a nonsquare block of #Real#s.  The
     implementation of sparse matrices is done in the appropriate #smat#
@@ -112,7 +113,6 @@ public:
   /// set this to m1*m2.
   void set_product (Matrix const &m1, Matrix const &m2);
 
-
   Vector left_multiply (Vector const &) const;
     
   Matrix operator-() const;
diff --git a/flower/include/offset.hh b/flower/include/offset.hh
new file mode 100644
index 0000000000..03685c1a1a
--- /dev/null
+++ b/flower/include/offset.hh
@@ -0,0 +1,120 @@
+/*
+  offset.hh -- part of GNU LilyPond
+
+  (c) 1996,97 Han-Wen Nienhuys
+*/
+
+#ifndef OFFSET_HH
+#define OFFSET_HH
+
+#include "real.hh"
+#include "axes.hh"
+
+/** 2d vector
+    should change to Complex
+*/
+struct Offset {
+public:
+
+  Real coordinate_a_[NO_AXES];
+    
+  Real &y() { return coordinate_a_[Y_AXIS]; }
+  Real &x() { return coordinate_a_[X_AXIS]; }
+  Real y() const { return coordinate_a_[Y_AXIS]; }
+  Real x() const { return coordinate_a_[X_AXIS]; }
+    
+  Real &operator[](Axis i) {
+    return coordinate_a_[i];
+  }
+  Real operator[](Axis i) const{
+    return coordinate_a_[i];
+  }
+    
+  Offset& operator+=(Offset o) {
+    x()+=o.x ();
+    y()+=o.y ();
+    return *this;
+  }
+  Offset operator - () const {
+    Offset o = *this;
+    o.x () = - o.x ();
+    o.y () = - o.y ();
+    return *this;
+  }
+  Offset& operator-=(Offset o) {
+    x()-=o.x ();
+    y()-=o.y ();
+    return *this;
+  }
+  
+  Offset &scale (Offset o) {
+    x()*=o.x ();
+    y()*=o.y ();
+    return *this;
+  }
+  Offset &operator *=(Real a) {
+    y() *= a;
+    x() *= a;
+    return *this;
+  }
+      
+  Offset (Real ix , Real iy) {
+    x()=ix;
+    y()=iy;
+  }
+  Offset() {
+    x()=0.0;
+    y()=0.0;
+  }
+#ifndef STANDALONE
+  String str () const;
+#endif
+
+  void mirror (Axis);
+  Real  arg () const;
+  Real length () const;
+};
+
+Offset complex_multiply (Offset, Offset);
+Offset complex_exp (Offset);
+
+
+inline Offset
+operator* (Offset z1, Offset z2)
+{
+  return complex_multiply (z1,z2);
+}
+
+inline Offset
+operator+ (Offset o1, Offset const& o2)
+{
+  o1 += o2;
+  return o1;
+}
+
+inline Offset
+operator- (Offset o1, Offset const& o2)
+{
+  o1 -= o2;
+  return o1;
+}
+
+
+inline Offset
+operator* (Real o1, Offset o2)
+{
+  o2 *= o1;
+  return o2;
+}
+
+inline Offset
+operator* (Offset o1, Real o2)
+{
+  o1 *= o2;
+  return o1;
+}
+
+
+#endif // OFFSET_HH
+
+
diff --git a/flower/include/out/dummy.dep b/flower/include/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/flower/include/out/dummy.dep
diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index a18ff61b47..f44b468e85 100644
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -7,6 +7,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include "libc-extension.hh"
@@ -34,6 +35,7 @@ strnupr (char* start_l, int n)
   return start_l;
 }
 
+
 #if !HAVE_MEMMEM
 
 /** locate a substring. #memmem# finds the first occurrence of
diff --git a/flower/matrix-debug.cc b/flower/matrix-debug.cc
index 81aa05f39c..762da9e0a8 100644
--- a/flower/matrix-debug.cc
+++ b/flower/matrix-debug.cc
@@ -20,11 +20,11 @@ Matrix::operator String() const
   s=String ("matrix { (")  + dat->name() + ")\n";
   for (int i=0; i< rows(); i++)
     {
-	for (int j = 0; j < cols(); j++) 
-	  {
-	    s+= String (stor_c_l->elem (i,j), "%6f ");
-	  }
-	s+="\n";
+      for (int j = 0; j < cols(); j++) 
+	{
+	  s+= String (stor_c_l->elem (i,j), "%6f ");
+	}
+      s+="\n";
     }
   s+="}\n";
 #endif
@@ -44,10 +44,10 @@ Vector::operator String() const
 {
   String s;
 #ifndef NPRINT
-  s="vector [";
+  s=String ("vector (") + dim () + ") [";
   for (int i=0; i < dim(); i++) 
     {
-	s += String (dat[i], "%6f") + String (' ');
+      s += String (dat[i], "%6f") + String (' ');
     }
   s+="]";
 #endif
diff --git a/flower/offset.cc b/flower/offset.cc
new file mode 100644
index 0000000000..ba1fee0075
--- /dev/null
+++ b/flower/offset.cc
@@ -0,0 +1,61 @@
+/*
+  offset.cc -- implement Offset
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+#include <math.h>
+
+#include "string.hh"
+#include "offset.hh"
+
+
+String
+Offset::str () const
+{
+  String s;
+  s = String("(") + coordinate_a_[X_AXIS] + ", " + coordinate_a_[Y_AXIS] + ")";
+  return s;
+}
+
+
+Offset
+complex_multiply (Offset z1, Offset z2)
+{
+  Offset z;
+  z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
+  z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] - z1[Y_AXIS] * z2[X_AXIS];
+  return z;
+}
+
+Offset
+complex_exp (Offset o)
+{
+  Real s = sin (o[Y_AXIS]);
+  Real c = cos (o[Y_AXIS]);
+  
+  Real r = exp (o[X_AXIS]);
+
+  return Offset(r*c, r*s);
+}
+
+Real
+Offset::arg () const
+{
+  return atan2 (y (), x());
+}
+
+/**
+   euclidian vector length / complex modulus
+ */
+Real
+Offset::length () const
+{
+  return sqrt (sqr (x()) + sqr (y()));
+}
+void
+Offset::mirror (Axis a)
+{
+  coordinate_a_[a] = - coordinate_a_[a];
+}
diff --git a/flower/out/dummy.dep b/flower/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/flower/out/dummy.dep
diff --git a/flowertest/GNUmakefile b/flowertest/GNUmakefile
deleted file mode 100644
index c588cc6fbc..0000000000
--- a/flowertest/GNUmakefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# flowertest/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../flowertest
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: test_SOURCES = $(wildcard *.cc)
-CURRENT_test_SOURCES = $(wildcard *.cc)
-# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh)
-CURRENT_noinst_HEADERS = $(wildcard *.hh)
-
-wild-check: check-extra-sources check-noinst-headers
-
-check-test-sources:
-ifneq ($(test_SOURCES),$(CURRENT_test_SOURCES))
-	@echo \"$(test_SOURCES)\"
-	@echo \"$(CURRENT_test_SOURCES)\"
-	@echo  test_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
-check-noinst-headers:
-ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
-	@echo \"$(noinst_HEADERS)\"
-	@echo \"$(CURRENT_noinst_HEADERS)\"
-	@echo  noinst_HEADERS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
-all:
diff --git a/flowertest/Makefile.am b/flowertest/Makefile.am
deleted file mode 100644
index 240a54cfe4..0000000000
--- a/flowertest/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for flowertest
-# file	   flowertest/Makefile.am.wild
-
-bin_PROGRAMS = test
-
-TESTS = $(top_srcdir)/flowertest/check.sh
-
-test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
-
-EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
-
-noinst_HEADERS = flower-test.hh
-
-INCLUDES = -I$(top_srcdir)/flower/include
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/flowertest/Makefile.am.wild b/flowertest/Makefile.am.wild
deleted file mode 100644
index abbf5ddfd8..0000000000
--- a/flowertest/Makefile.am.wild
+++ /dev/null
@@ -1,24 +0,0 @@
-# project  LilyPond -- the musical typesetter
-# title	   makefile for flowertest
-# file	   flowertest/Makefile.am.wild
-
-bin_PROGRAMS = test
-
-TESTS = $(top_srcdir)/flowertest/check.sh
-
-test_SOURCES = $(wildcard *.cc)
-
-test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
-
-EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
-
-noinst_HEADERS = $(wildcard *.hh)
-
-INCLUDES = -I$(top_srcdir)/flower/include
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/flowertest/Makefile.in b/flowertest/Makefile.in
deleted file mode 100644
index 366c29f8a2..0000000000
--- a/flowertest/Makefile.in
+++ /dev/null
@@ -1,391 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for flowertest
-# file	   flowertest/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-bin_PROGRAMS = test
-
-TESTS = $(top_srcdir)/flowertest/check.sh
-
-test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
-
-test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
-
-EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
-
-noinst_HEADERS = flower-test.hh
-
-INCLUDES = -I$(top_srcdir)/flower/include
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
-LIBS = @LIBS@
-test_OBJECTS =  main.o mat-test.o pqtest.o rattest.o stringtest.o
-test_DEPENDENCIES =  $(top_builddir)/flower/libflower.la
-test_LDFLAGS = 
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-SOURCES = $(test_SOURCES)
-OBJECTS = $(test_OBJECTS)
-
-default: all
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flowertest/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-test: $(test_OBJECTS) $(test_DEPENDENCIES)
-	@rm -f test
-	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-.cc.o:
-	$(CXXCOMPILE) -c $<
-.cc.lo:
-	$(LTCXXCOMPILE) -c $<
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = flowertest
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-main.o: main.cc flower-test.hh ../flower/include/varray.hh
-mat-test.o: mat-test.cc ../flower/include/matrix.hh \
-	../flower/include/matrix-storage.hh ../flower/include/varray.hh \
-	../flower/include/real.hh ../flower/include/virtual-methods.hh \
-	../flower/include/vector.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	flower-test.hh ../flower/include/choleski.hh
-pqtest.o: pqtest.cc flower-test.hh ../flower/include/pqueue.hh \
-	../flower/include/varray.hh
-rattest.o: rattest.cc ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	flower-test.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh
-stringtest.o: stringtest.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/varray.hh ../flower/include/string-convert.hh \
-	flower-test.hh
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; \
-	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f $$tst; then dir=.; \
-	  else dir="$(srcdir)"; fi; \
-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
-	    all=`expr $$all + 1`; \
-	    echo "PASS: $$tst"; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    failed=`expr $$failed + 1`; \
-	    echo "FAIL: $$tst"; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  banner="All $$all tests passed"; \
-	else \
-	  banner="$$failed of $$all tests failed"; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
-info:
-dvi:
-check: all
-	$(MAKE) check-TESTS
-installcheck:
-install-exec: install-binPROGRAMS
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-binPROGRAMS
-
-all: Makefile $(PROGRAMS) $(HEADERS)
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-	$(mkinstalldirs)  $(bindir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-clean:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean
-
-distclean:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-		distclean-tags distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
-		maintainer-clean-libtool maintainer-clean-tags \
-		maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
-clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
-install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \
-info dvi installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/flowertest/check.sh b/flowertest/check.sh
deleted file mode 100644
index 31406738de..0000000000
--- a/flowertest/check.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-./test > result.test
-# ugh
-cmp result.test $LILYPOND_SOURCEDIR/flowertest/result
-exit $?
-
diff --git a/flowertest/flower-test.hh b/flowertest/flower-test.hh
deleted file mode 100644
index b5bde0f420..0000000000
--- a/flowertest/flower-test.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  flower-test.hh -- declare 
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#ifndef FLOWER_TEST_HH
-#define FLOWER_TEST_HH
-#include <iostream.h>
-
-#define ADD_TEST(f) \
-struct f ## Init {\
-    f ## Init () { reg_test(f); }\
-} f ## init\
-
-typedef void (*fptr)(void);
-
-void reg_test (fptr f);
-
-#endif // FLOWER_TEST_HH
-/*
-  flower-test.hh -- declare 
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#ifndef FLOWER_TEST_HH
-#define FLOWER_TEST_HH
-#include <iostream.h>
-
-#define ADD_TEST(f) \
-struct f ## Init {\
-    f ## Init () { reg_test(f); }\
-} f ## init\
-
-typedef void (*fptr)(void);
-
-void reg_test (fptr f);
-
-#endif // FLOWER_TEST_HH
diff --git a/flowertest/main.cc b/flowertest/main.cc
deleted file mode 100644
index 26aaf3cff9..0000000000
--- a/flowertest/main.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "flower-test.hh"
-#include "varray.hh"
-
-Array< fptr > *test_arr_p;
-
-void reg_test (fptr f)
-{
- if (!test_arr_p)
-  test_arr_p = new Array<fptr>;
- test_arr_p->push (f);
-}
-
-int
-main ()
-{
- if (test_arr_p)
-   {
-     for (int i=0; i < test_arr_p->size (); i++)
-       (*test_arr_p)[i] ();
-   }
-}
diff --git a/flowertest/mat-test.cc b/flowertest/mat-test.cc
deleted file mode 100644
index 1ad7af49ce..0000000000
--- a/flowertest/mat-test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  mat-test.cc -- test Matrix
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include <iostream.h>
-#include "matrix.hh"
-#include "string.hh"
-#include "flower-test.hh"
-#include "choleski.hh"
-
-void
-matrix()
-{
-  int N=10;
-  Matrix m(N,N), q(N,N);
-  Vector v(N);
-
-  for (int i=0; i < N; i++) {
-    v(i) =i;
-    for (int j=0; j < N; j++) {
-      m(i,j) = i+j;
-      q(i,j) = (abs(i-j) > 3) ?0 :i-j;
-    }
-  }
-
-  cout << "v: " << String(v);
-  cout << "m: " <<  String(m );
-  cout << "q: " <<  String(q);
-  cout << "m*q; " <<  String(m*q);
-  cout << "m*m: " <<  String(m*m);
-  m.OK();
-  cout << "m: " <<  String(m);
-  cout << "q.band " << q.band_i() << endl; 
-  q.try_set_band();
-  cout << "q(B): " << q;
-  q.OK();
-  Matrix sum(q+q);
-  cout << "q + q " << sum;
-  q.OK();
-  cout << "q*q: " << q*q;
-  q.OK();
-
-  Matrix hilbert(N,N), h2(hilbert);
-  for (int i=0; i < N; i++) {
-    for (int j=0; j < N; j++) {
-      hilbert(i,j) = 1/Real(i+j+1);
-      h2 (i,j) = (abs(i-j) > 3) ?0 : hilbert(i,j);
-    }
-  }
-  h2.try_set_band();
-  Choleski_decomposition ch(h2);
-  cout << "red Hilbert  " <<  h2;
-  cout << "choleski " << ch.L;
-  Matrix T =ch.L.transposed();
-  cout << "L^T " <<  T;
-  cout << "L * L^T" << ch.L * T;
-  cout << "H2^{-1} * H2" << h2 * ch.inverse();
-}
-
-ADD_TEST(matrix);
diff --git a/flowertest/pqtest.cc b/flowertest/pqtest.cc
deleted file mode 100644
index ea28bcb0fa..0000000000
--- a/flowertest/pqtest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "flower-test.hh"
-#include "pqueue.hh"
-#include <stdlib.h>
-
-int compare (int i, int j)
-{
-  return i-j;
-}
-
-void
-pqtest ()
-{
-  PQueue<int> pq;
-
-  for  (int i=0; i < 10; i++) {
-    int r = rand ()/10000;
-    pq.insert (r);
-    cout << "adding: " << r<< endl;
-  }
-  while  (pq.size ()) {
-    cout << "getting : "<< flush;
-    cout << pq.get () << "\n";
-  }
-}
-
-ADD_TEST (pqtest);
diff --git a/flowertest/rattest.cc b/flowertest/rattest.cc
deleted file mode 100644
index 64cc51e5f4..0000000000
--- a/flowertest/rattest.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <iostream.h>
-#include "rational.hh"
-#include "flower-test.hh"
-#include "string.hh"
-
-
-#define EXP_PRINT(a) #a << ": " << (a) << "\n"
-
-void
-rattest ()
-{
-  Rational r (1,4);
-  Rational q(1,2);
-  Rational s(6,4);
-  Rational i;
-  i.set_infinite (1);
-
-  cout << r << " " << s << " " << q << "\n";
-  cout << r + q << " " << (s * q + s) << " " << (q / r) << "\n";
-  cout << i;
-  cout << "inf * r" << i * r << "inf * inf " << i * i << "inf + r" << i + r;
-  cout << EXP_PRINT(-i);
-  cout << EXP_PRINT(i >? -i) << EXP_PRINT(i >? r);
-  cout << EXP_PRINT(i <? r) ;
-  Rational one(1);
-  cout << EXP_PRINT(one/Rational (4));
-  cout << EXP_PRINT(one + one/Rational (4));
-  Rational nul (0,1);
-  Rational kwart (1,4);
-  nul += kwart;
-  cout << EXP_PRINT(nul);
-  nul -= Rational (2) * kwart;
-  cout << EXP_PRINT(nul);
-
-  cout << EXP_PRINT(Rational (1,128)  + Rational (1919,128));
-
-}
-
-ADD_TEST (rattest);
diff --git a/flowertest/result b/flowertest/result
deleted file mode 100644
index 98c6ca274c..0000000000
--- a/flowertest/result
+++ /dev/null
@@ -1,230 +0,0 @@
-constructors
-hai
-10
-0.0132
-
-c
-cmp ('', '/'): 1
-compares: 
-
-a
-abc
-abcd
-zxy
-hay = "foobarbazblub" len=13
-index_i ('b') b= 3
-last_index_i ('b') b= 12
-index_i ("bar"): 3
-index_any ("bar"): b: 3
- left_str (-1): 
- right_str (-1): 
- left_str (0): 
- right_str (0): 
- left_str (1): h
- right_str (1): i
- left_str (2): ha
- right_str (2): ai
- left_str (3): hai
- right_str (3): hai
- left_str (4): hai
- right_str (4): hai
-blonde haren
-mid (2,6)=onde h
-nomid (2,6)=blaren
-hai
-left
-hai daar
-Hallo daaR!
-up: HALLO DAAR! down: hallo daar!
-`Hallo daaR!' is not empty
-`' is empty
-ff
--1:ff
-1/4 3/2 1/2
-3/4 9/4 2
-infinityinf * rinfinityinf * inf infinityinf + rinfinity-i: -infinity
-i >? -i: infinity
-i >? r: infinity
-i <? r: 1/4
-one/Rational (4): 1/4
-one + one/Rational (4): 5/4
-nul: 1/4
-nul: -1/4
-Rational (1,128) + Rational (1919,128): 15
-adding: 180428
-adding: 84693
-adding: 168169
-adding: 171463
-adding: 195774
-adding: 42423
-adding: 71988
-adding: 164976
-adding: 59651
-adding: 118964
-getting : 42423
-getting : 59651
-getting : 71988
-getting : 84693
-getting : 118964
-getting : 164976
-getting : 168169
-getting : 171463
-getting : 180428
-getting : 195774
-v: vector [0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 ]m: matrix { (Full_storage)
-0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 
-1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 
-2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 
-3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 
-4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 
-5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 
-6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 
-7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 
-8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 
-9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 18.000000 
-}
-q: matrix { (Full_storage)
-0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 
-3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 
-0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 
-0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 
-0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 
-0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 
-}
-m*q; matrix { (Full_storage)
-14.000000 20.000000 25.000000 28.000000 28.000000 28.000000 28.000000 -2.000000 -25.000000 -40.000000 
-20.000000 25.000000 28.000000 28.000000 28.000000 28.000000 28.000000 -5.000000 -30.000000 -46.000000 
-26.000000 30.000000 31.000000 28.000000 28.000000 28.000000 28.000000 -8.000000 -35.000000 -52.000000 
-32.000000 35.000000 34.000000 28.000000 28.000000 28.000000 28.000000 -11.000000 -40.000000 -58.000000 
-38.000000 40.000000 37.000000 28.000000 28.000000 28.000000 28.000000 -14.000000 -45.000000 -64.000000 
-44.000000 45.000000 40.000000 28.000000 28.000000 28.000000 28.000000 -17.000000 -50.000000 -70.000000 
-50.000000 50.000000 43.000000 28.000000 28.000000 28.000000 28.000000 -20.000000 -55.000000 -76.000000 
-56.000000 55.000000 46.000000 28.000000 28.000000 28.000000 28.000000 -23.000000 -60.000000 -82.000000 
-62.000000 60.000000 49.000000 28.000000 28.000000 28.000000 28.000000 -26.000000 -65.000000 -88.000000 
-68.000000 65.000000 52.000000 28.000000 28.000000 28.000000 28.000000 -29.000000 -70.000000 -94.000000 
-}
-m*m: matrix { (Full_storage)
-285.000000 330.000000 375.000000 420.000000 465.000000 510.000000 555.000000 600.000000 645.000000 690.000000 
-330.000000 385.000000 440.000000 495.000000 550.000000 605.000000 660.000000 715.000000 770.000000 825.000000 
-375.000000 440.000000 505.000000 570.000000 635.000000 700.000000 765.000000 830.000000 895.000000 960.000000 
-420.000000 495.000000 570.000000 645.000000 720.000000 795.000000 870.000000 945.000000 1020.000000 1095.000000 
-465.000000 550.000000 635.000000 720.000000 805.000000 890.000000 975.000000 1060.000000 1145.000000 1230.000000 
-510.000000 605.000000 700.000000 795.000000 890.000000 985.000000 1080.000000 1175.000000 1270.000000 1365.000000 
-555.000000 660.000000 765.000000 870.000000 975.000000 1080.000000 1185.000000 1290.000000 1395.000000 1500.000000 
-600.000000 715.000000 830.000000 945.000000 1060.000000 1175.000000 1290.000000 1405.000000 1520.000000 1635.000000 
-645.000000 770.000000 895.000000 1020.000000 1145.000000 1270.000000 1395.000000 1520.000000 1645.000000 1770.000000 
-690.000000 825.000000 960.000000 1095.000000 1230.000000 1365.000000 1500.000000 1635.000000 1770.000000 1905.000000 
-}
-m: matrix { (Full_storage)
-0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 
-1.000000 2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 
-2.000000 3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 
-3.000000 4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 
-4.000000 5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 
-5.000000 6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 
-6.000000 7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 
-7.000000 8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 
-8.000000 9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 
-9.000000 10.000000 11.000000 12.000000 13.000000 14.000000 15.000000 16.000000 17.000000 18.000000 
-}
-q.band 3
-q(B): matrix { (Diagonal_storage)
-0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 0.000000 
-3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 0.000000 
-0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 0.000000 
-0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 0.000000 
-0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 -3.000000 
-0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 -2.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 -1.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 3.000000 2.000000 1.000000 0.000000 
-}
-q + q matrix { (Diagonal_storage)
-0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 0.000000 
-6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 0.000000 
-0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 0.000000 
-0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 0.000000 
-0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 -6.000000 
-0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 -4.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 -2.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 6.000000 4.000000 2.000000 0.000000 
-}
-q*q: matrix { (Full_storage)
--14.000000 -8.000000 -2.000000 4.000000 10.000000 12.000000 9.000000 0.000000 0.000000 0.000000 
--8.000000 -15.000000 -10.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 0.000000 0.000000 
--2.000000 -10.000000 -19.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 0.000000 
-4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 9.000000 
-10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 12.000000 
-12.000000 10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 10.000000 
-9.000000 12.000000 10.000000 4.000000 -5.000000 -16.000000 -28.000000 -16.000000 -5.000000 4.000000 
-0.000000 9.000000 12.000000 10.000000 4.000000 -5.000000 -16.000000 -19.000000 -10.000000 -2.000000 
-0.000000 0.000000 9.000000 12.000000 10.000000 4.000000 -5.000000 -10.000000 -15.000000 -8.000000 
-0.000000 0.000000 0.000000 9.000000 12.000000 10.000000 4.000000 -2.000000 -8.000000 -14.000000 
-}
-red Hilbert  matrix { (Diagonal_storage)
-1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.500000 0.333333 0.250000 0.200000 0.166667 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.333333 0.250000 0.200000 0.166667 0.142857 0.125000 0.000000 0.000000 0.000000 0.000000 
-0.250000 0.200000 0.166667 0.142857 0.125000 0.111111 0.100000 0.000000 0.000000 0.000000 
-0.000000 0.166667 0.142857 0.125000 0.111111 0.100000 0.090909 0.083333 0.000000 0.000000 
-0.000000 0.000000 0.125000 0.111111 0.100000 0.090909 0.083333 0.076923 0.071429 0.000000 
-0.000000 0.000000 0.000000 0.100000 0.090909 0.083333 0.076923 0.071429 0.066667 0.062500 
-0.000000 0.000000 0.000000 0.000000 0.083333 0.076923 0.071429 0.066667 0.062500 0.058824 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.071429 0.066667 0.062500 0.058824 0.055556 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.062500 0.058824 0.055556 0.052632 
-}
-choleski matrix { (Diagonal_storage)
-1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.500000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.333333 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.250000 0.900000 1.500000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 2.000000 -4.285714 30.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 22.500000 -213.888889 -4.533714 1.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 280.000000 4.505388 -1.431002 1.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 -0.129061 -0.078559 -0.117004 1.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 -0.012340 -0.056993 0.571666 1.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.021092 0.430265 1.115863 1.000000 
-}
-L^T matrix { (Diagonal_storage)
-1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 1.000000 1.000000 0.900000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 1.000000 1.500000 -4.285714 22.500000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 1.000000 30.000000 -213.888889 280.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 1.000000 -4.533714 4.505388 -0.129061 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 -1.431002 -0.078559 -0.012340 0.000000 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 -0.117004 -0.056993 -0.021092 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.571666 0.430265 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 1.115863 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 
-}
-L * L^Tmatrix { (Full_storage)
-1.000000 0.500000 0.333333 0.250000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.500000 1.250000 1.166667 1.025000 2.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.333333 1.166667 2.111111 2.483333 -2.285714 22.500000 0.000000 0.000000 0.000000 0.000000 
-0.250000 1.025000 2.483333 4.122500 25.371429 -180.138889 280.000000 0.000000 0.000000 0.000000 
-0.000000 2.000000 -2.285714 25.371429 923.367347 -6517.628952 8404.505387 -0.129061 0.000000 0.000000 
-0.000000 0.000000 22.500000 -180.138889 -6517.628952 46276.261351 -59910.746028 0.506565 -0.012340 0.000000 
-0.000000 0.000000 0.000000 280.000000 8404.505387 -59910.746028 78423.346283 -0.586054 -0.039335 -0.021092 
-0.000000 0.000000 0.000000 0.000000 -0.129061 0.506565 -0.586054 1.036518 0.579304 0.432733 
-0.000000 0.000000 0.000000 0.000000 0.000000 -0.012340 -0.039335 0.579304 1.330202 1.363033 
-0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.021092 0.432733 1.363033 2.430723 
-}
-H2^{-1} * H2matrix { (Full_storage)
-1.000000 0.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
-0.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
-0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.000000 0.000000 
-0.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 -0.000000 0.000000 -0.000000 0.000000 
--0.000000 0.000000 -0.000000 0.000000 1.000000 -0.000000 -0.000000 0.000000 -0.000000 0.000000 
--0.000000 0.000000 -0.000000 0.000000 -0.000000 1.000000 -0.000000 -0.000000 0.000000 -0.000000 
-0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 1.000000 0.000000 0.000000 0.000000 
--0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 1.000000 -0.000000 0.000000 
--0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 0.000000 1.000000 0.000000 
--0.000000 -0.000000 0.000000 0.000000 -0.000000 -0.000000 -0.000000 0.000000 -0.000000 1.000000 
-}
diff --git a/flowertest/stringtest.cc b/flowertest/stringtest.cc
deleted file mode 100644
index 4597ff3b85..0000000000
--- a/flowertest/stringtest.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-  stupid test program to verify stringlib
-  stringtest.cc
-  */
-#include "string.hh"
-#include "varray.hh"
-#include "string-convert.hh"
-#include "flower-test.hh"
-
-void
-ctors ()
-{
-  cout << "constructors"<<endl;
-  {
-    String str ("hai");
-    cout << str << endl;
-  }
-  {
-    String fromi (10);
-    cout << fromi<< endl;
-  }
-  {String fromf (1.32e-2, "%g");
-  cout << fromf<< endl;
-  }
-  {
-    String def;
-    cout << def << endl;
-  }
-  {
-    String fromc ('c');
-    cout << fromc<< endl;       
-  }
-}
-void
-cmp ()
-{
-  
-  String path  = "";
-  String sep ('/');
-  String right(path.right_str (1));
-  cout << "cmp ('', '/'): " << String::compare_i (sep,right) << endl;
-  
-  Array<String> a;
-  a.push ("abcd");
-  a.push ("zxy");
-  a.push ("abc");
-  a.push ("");
-  a.push  ("a");
-  a.sort (String::compare_i);
-  cout << "compares: "<<endl;
-  for  (int i=0; i < a.size (); i++)
-    cout << a[i] << endl;
-}
-
-
-void
-searching ()
-{
-  String hay = "foobarbazblub";
-
-  char c =   'b';
-  String cstr =c;
-  String set = "bar";
-  cout << "hay = \"" << hay << "\" len="<< hay.length_i ()<<endl;
-  cout << "index_i ('"<< c<<"') " << c << "= " << hay.index_i (c) <<endl;
-  cout << "last_index_i ('"<< c<<"') " << c << "= " << hay.index_last_i (c) <<endl;    
-  //    cout << "last index of cstr " << c << ": " << hay.index_last_i (cstr) <<endl;    
-  //    cout << "index_last_i (\""<<set<<"\"): " << hay.index_last_i (set) <<endl;
-  cout << "index_i (\""<<set<<"\"): " << hay.index_i (set) <<endl;    
-  cout << "index_any (\"" << set << "\"): " << cstr << ": " << hay.index_any_i (cstr) <<endl;
-
-    
-    
-}
-
-
-void
-kutenpeer ()
-{
-  String str ("hai");
-  for  (int i=-1; i < str.length_i ()+2; i++) {
-    cout<<" left_str (" << i<<"): " << str.left_str (i) << endl;
-    cout<<" right_str ("<<i<<"): " << str.right_str (i) << endl;
-  }
-  str = "blonde haren";
-  cout << str<<endl;
-  cout << "mid (2,6)="<<str.cut (2,6)<<endl;
-  cout << "nomid (2,6)="<<str.nomid_str (2,6)<<endl;
-}
-
-bool
-test_empty_b (String str)
-{
-  cout << "`" << str << "' is ";
-
-  if  (str == String ("")) {
-    cout << "empty" << endl;
-    return true;
-  }
-
-  cout << "not empty" << endl;
-  return false;
-}
-
-void
-stringtest ()
-{
-  ctors ();
-  cmp ();
-  searching ();
-  kutenpeer ();
-  String str ("hai");
-  cout <<  str << endl;
-  cout << "left" << endl;
-  str += " daar";
-  cout << str << endl;
-
-  //    str = String ("Hallo") + " daaR" + '!'; // no go on doze-s gcc2.7.2?
-  str = String ("Hallo") + " daaR" + "!";
-  cout << str << endl;
-
-  cout << "up: " << str.upper_str () << " down: " << str.lower_str ()<<endl;
-    
-  if  (test_empty_b (str))
-    cout << "failed";
-
-  String fn = "";
-  if  (!test_empty_b (fn))
-    cout << "failed";
-
-    
-  fn = "";
-  fn += "";
-  delete fn.copy_byte_p ();
-  delete str.copy_byte_p ();
-
-  cout << String_convert::bin2hex_str (String ( (char)0xff)) << endl;
-  cout << "-1:" << String_convert::i2hex_str (-1, 2, '0');
-  cout << endl;
-
-}
-
-
-ADD_TEST (stringtest);
diff --git a/init/Makefile b/init/Makefile
new file mode 100644
index 0000000000..1422d5d2aa
--- /dev/null
+++ b/init/Makefile
@@ -0,0 +1,32 @@
+# init/Makefile
+
+
+# subdir level:
+#
+depth = ..
+#
+
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Include.make
+
+# list of distribution files:
+# 
+INIFILES = $(wildcard *.ly)
+DISTFILES = Makefile $(INIFILES)
+
+## we probably can make tex/*defs.tex and init/*.ly in one go...
+## moved to mf/Makefile
+FONT_FILES = $(wildcard $(depth)/mf/*[0-9].mf)
+TABLES = $(patsubst $(depth)/mf/%.mf,%.ly,$(FONT_FILES))
+
+
+localclean:
+	rm -f $(TABLES)
+
+
+INSTALLATION_DIR=$(datadir)/lilypond/
+INSTALLATION_FILES=$(INIFILES)
+
+include $(depth)/make/Installfiles.make
+
diff --git a/init/Makefile.am b/init/Makefile.am
deleted file mode 100644
index 358202c529..0000000000
--- a/init/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# init/Makefile.am.wild
-
-INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly
-EXTRA_DIST = Makefile.am.wild $(INIFILES)
-
-CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly
-
-FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-brackets16.mf ../mf/feta-brackets20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf
-TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES))
-
-# clean-local:
-# 	rm -f $(TABLES)
-
-install-data-local:
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init
-
-uninstall-local:
-	for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/init/Makefile.am.wild b/init/Makefile.am.wild
deleted file mode 100644
index 24936bd1b2..0000000000
--- a/init/Makefile.am.wild
+++ /dev/null
@@ -1,20 +0,0 @@
-# init/Makefile.am.wild
-
-INIFILES = $(wildcard *.ly)
-EXTRA_DIST = Makefile.am.wild $(INIFILES)
-
-CLEANFILES = $(wildcard feta*.ly)
-
-FONT_FILES = $(wildcard ../mf/*[0-9].mf)
-TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES))
-
-# clean-local:
-# 	rm -f $(TABLES)
-
-install-data-local:
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init
-
-uninstall-local:
-	for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
diff --git a/init/Makefile.in b/init/Makefile.in
deleted file mode 100644
index f9c684a5ee..0000000000
--- a/init/Makefile.in
+++ /dev/null
@@ -1,214 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# init/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly
-EXTRA_DIST = Makefile.am.wild $(INIFILES)
-
-CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly
-
-FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-brackets16.mf ../mf/feta-brackets20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf
-TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES))
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps init/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = init
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-local
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-local
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# clean-local:
-# 	rm -f $(TABLES)
-
-install-data-local:
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init
-
-uninstall-local:
-	for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/init/engraver.ly b/init/engraver.ly
index 427fb4c410..401b4d59ce 100644
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -3,39 +3,37 @@
 %
 
 Staff = \translator {
-	  \type "Engraver_group_engraver";
+	\type "Engraver_group_engraver";
 	defaultclef = violin;
 
-	  \consists "Bar_engraver";
-	  \consists "Clef_engraver";
-	  \consists "Key_engraver";
-	  \consists "Meter_engraver";
-	  \consists "Local_key_engraver";
-	  \consists "Staff_sym_engraver";
-	  \consists "Collision_engraver";
-	  \consists "Rest_collision_engraver";
-
+	\consists "Bar_engraver";
+	\consists "Clef_engraver";
+	\consists "Key_engraver";
+	\consists "Meter_engraver";
+	\consists "Local_key_engraver";
+	\consists "Staff_sym_engraver";
+	\consists "Collision_engraver";
+	\consists "Rest_collision_engraver";
 %{
-	  Uncomment to get bar numbers on single staff systems:
-	  
-	  The Bar_number_engraver puts a number over a staff created
-	  at the same level of hierarchy.  This why you have to add it
-	  here separately if you want to have numbers on single staff
-	  systems: The Bar_number_engraver in Score_engraver will only
-	  put numbers on bars that are Score ("system") wide.  Such
-	  bars are only created when the toplevel system has multiple
-	  children-staffs.
+	Uncomment to get bar numbers on single staff systems:
+	
+	The Bar_number_engraver puts a number over a staff created
+	at the same level of hierarchy.  This why you have to add it
+	here separately if you want to have numbers on single staff
+	systems: The Bar_number_engraver in Score_engraver will only
+	put numbers on bars that are Score ("system") wide.  Such
+	bars are only created when the toplevel system has multiple
+	children-staffs.
 
 %}
- %{
-
+%{
 	\consists "Bar_column_engraver";
 	\consists "Bar_number_engraver";
 %}
-	  	\consists "Separating_line_group_engraver";
-	  \consists "Line_group_engraver";
+	\consists "Separating_line_group_engraver";
+	\consists "Line_group_engraver";
 	  
-	  \accepts "Voice";
+	\accepts "Voice";
 }
 
 Rhythmic_staff = \translator
@@ -117,7 +115,7 @@ Score = \translator {
 	\type Score_engraver;
 
 	\consists "Timing_engraver";
-	% uncomment to bar numbers on a whoole system.
+	% uncomment to bar numbers on a whole system.
 %{
 	\consists "Bar_column_engraver";
 	\consists "Bar_number_engraver";
diff --git a/init/feta11.ly b/init/feta11.ly
index e168a29ea9..a27a789ab2 100644
--- a/init/feta11.ly
+++ b/init/feta11.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta11.log
+% input from out/feta11.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	4.12\pt	-1.72\pt	0.00\pt	
diff --git a/init/feta13.ly b/init/feta13.ly
index 95b304a524..19a706f59e 100644
--- a/init/feta13.ly
+++ b/init/feta13.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta13.log
+% input from out/feta13.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	4.88\pt	-2.03\pt	0.00\pt	
diff --git a/init/feta16.ly b/init/feta16.ly
index bd8655ac9f..bf4ec3ba59 100644
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta16.log
+% input from out/feta16.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	6.00\pt	-2.50\pt	0.00\pt	
diff --git a/init/feta19.ly b/init/feta19.ly
index a6d822225e..b5feea689e 100644
--- a/init/feta19.ly
+++ b/init/feta19.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta19.log
+% input from out/feta19.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	7.12\pt	-2.97\pt	0.00\pt	
diff --git a/init/feta20.ly b/init/feta20.ly
index ca0bac6deb..e48e6606f0 100644
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta20.log
+% input from out/feta20.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	7.50\pt	-3.12\pt	0.00\pt	
diff --git a/init/feta23.ly b/init/feta23.ly
index 37036963f7..9d05e404ed 100644
--- a/init/feta23.ly
+++ b/init/feta23.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta23.log
+% input from out/feta23.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	8.44\pt	-3.52\pt	0.00\pt	
diff --git a/init/feta26.ly b/init/feta26.ly
index 6afbde925b..2600e09740 100644
--- a/init/feta26.ly
+++ b/init/feta26.ly
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta26.log
+% input from out/feta26.log
 % name=\symboltables {
     "rests"	 = \table {
         "0"	"\\wholerest"	0.00\pt	9.75\pt	-4.06\pt	0.00\pt	
diff --git a/init/out/dummy.dep b/init/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/init/out/dummy.dep
diff --git a/init/table16.ly b/init/table16.ly
index 15dede987e..8ad75392b2 100644
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -14,7 +14,7 @@ table_sixteen=
 		"bold"	"\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
 		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
 		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	4.0\pt
-		"italic"	"\setitalic{%}"	0.0\pt	7.5\pt	0.0\pt	8.0\pt
+		"italic"	"\setitalic{%}"	0.0\pt	4.\pt	0.0\pt	8.0\pt
 		"large"	"\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	10.0\pt
 		"roman"	"\settext{%}"	0.0\pt	4.0\pt	0.0\pt	8.0\pt
      }
diff --git a/input/Makefile b/input/Makefile
new file mode 100644
index 0000000000..45c1320de0
--- /dev/null
+++ b/input/Makefile
@@ -0,0 +1,25 @@
+# input/Makefile
+
+# subdir level:
+#
+depth = ..
+#
+
+build = ./$(depth)/lily/$(outdir)/.build
+
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Include.make
+#
+
+# list of distribution files:
+# 
+LYFILES = $(wildcard *.ly)
+TEXFILES = $(wildcard *.tex)
+M4FILES = $(wildcard *.m4)
+DISTFILES = Makefile TODO $(LYFILES) $(TEXFILES) $(wildcard *.m4)
+#
+
+OUTFILES = $(addprefix $(outdir)/,$(M4FILES:%.m4=%))
+
+all: $(OUTFILES)
diff --git a/input/Makefile.am b/input/Makefile.am
deleted file mode 100644
index 095d3806a8..0000000000
--- a/input/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# input/Makefile.am.wild
-
-LYFILES = abbrev.ly beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly
-TEXFILES = dummy.tex
-M4FILES = dummy.m4
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/input/Makefile.am.wild b/input/Makefile.am.wild
deleted file mode 100644
index aad06e0335..0000000000
--- a/input/Makefile.am.wild
+++ /dev/null
@@ -1,11 +0,0 @@
-# input/Makefile.am.wild
-
-LYFILES = $(wildcard *.ly)
-TEXFILES = $(wildcard *.tex)
-M4FILES = $(wildcard *.m4)
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
diff --git a/input/Makefile.in b/input/Makefile.in
deleted file mode 100644
index a8f0150cdb..0000000000
--- a/input/Makefile.in
+++ /dev/null
@@ -1,205 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# input/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-LYFILES = abbrev.ly beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly
-TEXFILES = dummy.tex
-M4FILES = dummy.m4
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps input/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = input
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-default: all $(OUTFILES)
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/input/out/dummy.dep b/input/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/input/out/dummy.dep
diff --git a/input/sleur.ly b/input/sleur.ly
index 964e05a0ca..4ef5e88d91 100644
--- a/input/sleur.ly
+++ b/input/sleur.ly
@@ -58,12 +58,12 @@ blend = \melodic{
 	\stemdown; 
 %%	    \[4/5c8( c ''c c c\]1/1 c c c )c |
 	\[4/5c8( c ''f c c\]1/1 c c c )c |
+
 	\[4/5c8( c \stemup ''f \stemdown c c\]1/1 c c c )c |
 	\stemup; 
 	\octave c''; 
 	\[4/5c8( c f'' c c\]1/1 c c c )c |
 	\[4/5c8( c \stemdown f'' \stemup c c\]1/1 c c c )c |
-%	    \octave c''';
 	\stemboth;
 	c4( 'c16 'e 'g 'b d f a )'c16 c4 |
 	c4( 'c16 'e 'g 'b d f f )'c16 c4 |
diff --git a/input/slur-bug.ly b/input/slur-bug.ly
new file mode 100644
index 0000000000..6de3788161
--- /dev/null
+++ b/input/slur-bug.ly
@@ -0,0 +1,9 @@
+% bug
+% excentric slur can't handle this ...
+\score{
+	\melodic{
+		\octave c; 
+		\stemdown; 
+		\[4/5c8( c ''f c c\]1/1 c c c )c |
+	}
+}
diff --git a/input/twinkle.ly b/input/twinkle.ly
index f1349f9633..afefc91a2e 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -171,7 +171,7 @@ $grand_staff = \type Staff_group <
 	\paper{
 		% use a lot of space, to avoid clashing syllables
 %		arithmetic_multiplier = 8.\pt;
-%		gourlay_maxmeasures = 14.0;
+		gourlay_maxmeasures = 14.0;
 	}
 	\midi{ 
 		\tempo 4 = 120 ;
diff --git a/lib/GNUmakefile b/lib/GNUmakefile
deleted file mode 100644
index 18b8c08925..0000000000
--- a/lib/GNUmakefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# lib/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../build/lib
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-# Makefile.am.wild: liblily_la_SOURCES = $(wildcard *.cc)
-CURRENT_liblily_la_SOURCES = $(wildcard *.cc)
-
-wild-check: check-lily-la-sources
-
-check-lily-la-sources:
-ifneq ($(liblily_la_SOURCES),$(CURRENT_libflower_la_SOURCES))
-	@echo \"$(liblily_la_SOURCES)\"
-	@echo \"$(CURRENT_liblily_la_SOURCES)\"
-	@echo  liblily_la_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 0000000000..e1593fcd69
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,24 @@
+# subdir level:
+#
+depth = ..
+
+include ./$(depth)/make/Variables.make 
+include ./$(depth)/make/Files.make
+include ./$(depth)/make/Version.make 
+#
+
+NAME = lily
+SUBDIRS = include
+
+MODULE_CXXFLAGS += -D_REENTRANT
+MAINTARGET = $(LIBRARY)# huh?
+
+default:  $(LIBRARY)
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+
+
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index cc5cbdf376..0000000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for micro-lily-lib
-# file	   lib/Makefile 
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = liblily.la
-
-liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
-
-INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
-MODULE_CXXFLAGS += -D_REENTRANT
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-distclean-local:
-	-rm -rf .deps
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/lib/Makefile.am.wild b/lib/Makefile.am.wild
deleted file mode 100644
index 8526bd5784..0000000000
--- a/lib/Makefile.am.wild
+++ /dev/null
@@ -1,22 +0,0 @@
-# project  LilyPond -- the musical typesetter
-# title	   makefile for micro-lily-lib
-# file	   lib/Makefile 
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = liblily.la
-
-liblily_la_SOURCES = $(wildcard *.cc)
-
-INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
-MODULE_CXXFLAGS += -D_REENTRANT
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-distclean-local:
-	-rm -rf .deps
diff --git a/lib/Makefile.in b/lib/Makefile.in
deleted file mode 100644
index 38f347f9ae..0000000000
--- a/lib/Makefile.in
+++ /dev/null
@@ -1,528 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for micro-lily-lib
-# file	   lib/Makefile 
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = include
-
-lib_LTLIBRARIES = liblily.la
-
-liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
-
-INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
-LIBS = @LIBS@
-liblily_la_LDFLAGS = 
-liblily_la_LIBADD = 
-liblily_la_OBJECTS =  binary-source-file.lo duration-convert.lo \
-duration.lo input.lo mapped-file-storage.lo moment.lo plet.lo \
-simple-file-storage.lo source-file.lo source.lo template.lo warn.lo \
-windhoos-suck-suck-suck-thank-you-cygnus.lo
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-SOURCES = $(liblily_la_SOURCES)
-OBJECTS = $(liblily_la_OBJECTS)
-
-default: all
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-liblily.la: $(liblily_la_OBJECTS) $(liblily_la_DEPENDENCIES)
-	$(CXXLINK) -rpath $(libdir) $(liblily_la_LDFLAGS) $(liblily_la_OBJECTS) $(liblily_la_LIBADD) $(LIBS)
-.cc.o:
-	$(CXXCOMPILE) -c $<
-.cc.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = lib
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-binary-source-file.lo binary-source-file.o: binary-source-file.cc \
-	include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/source-file.hh \
-	include/binary-source-file.hh \
-	../flower/include/string-convert.hh
-duration-convert.lo duration-convert.o: duration-convert.cc \
-	include/duration-convert.hh include/duration.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh include/plet.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	include/warn.hh
-duration.lo duration.o: duration.cc include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/source-file.hh \
-	include/source.hh include/moment.hh \
-	../flower/include/rational.hh include/duration.hh \
-	include/plet.hh include/duration-convert.hh \
-	../flower/include/varray.hh
-input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/input.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/source.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/source-file.hh
-mapped-file-storage.lo mapped-file-storage.o: mapped-file-storage.cc
-moment.lo moment.o: moment.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/moment.hh ../flower/include/rational.hh
-plet.lo plet.o: plet.cc include/plet.hh include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh
-simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \
-	include/simple-file-storage.hh include/file-storage.hh \
-	include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/warn.hh
-source-file.lo source-file.o: source-file.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/proto.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/warn.hh \
-	include/windhoos-suck-suck-suck-thank-you-cygnus.hh \
-	include/source-file.hh include/simple-file-storage.hh \
-	include/file-storage.hh
-source.lo source.o: source.cc include/binary-source-file.hh \
-	include/source-file.hh include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/source.hh ../flower/include/path.hh \
-	../flower/include/varray.hh
-template.lo template.o: template.cc include/source-file.hh \
-	include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/plist.tcc ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/pcursor.tcc \
-	../flower/include/cursor.tcc ../flower/include/list.tcc
-warn.lo warn.o: warn.cc include/warn.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh
-windhoos-suck-suck-suck-thank-you-cygnus.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \
-	windhoos-suck-suck-suck-thank-you-cygnus.cc
-
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-am: Makefile $(LTLIBRARIES)
-
-install-exec-am: install-libLTLIBRARIES
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
-all: all-recursive all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(libdir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-
-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-am install-exec-am uninstall-am install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-MODULE_CXXFLAGS += -D_REENTRANT
-
-distclean-local:
-	-rm -rf .deps
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/include/GNUmakefile b/lib/include/GNUmakefile
deleted file mode 100644
index 59fa4cedaa..0000000000
--- a/lib/include/GNUmakefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# lib/include/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../../build/lib/include
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-# CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-CURRENT_noinst_HEADERS = $(wildcard *.hh)
-
-wild-check: check-noinst-headers
-
-check-noinst-headers:
-ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
-	@echo \"$(noinst_HEADERS)\"
-	@echo \"$(CURRENT_noinst_HEADERS)\"
-	@echo  noinst_HEADERS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/lib/include/Makefile b/lib/include/Makefile
new file mode 100644
index 0000000000..43a98084f3
--- /dev/null
+++ b/lib/include/Makefile
@@ -0,0 +1,17 @@
+# lib/include/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+
+# identify module:
+#
+MODULE_NAME = lilypond
+
+# generic stuff/Makefile
+#
+
+include ./$(depth)/make/Include.make
+
+
diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am
deleted file mode 100644
index 89cb06f55d..0000000000
--- a/lib/include/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# lib/include/Makefile
-
-noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/lib/include/Makefile.am.wild b/lib/include/Makefile.am.wild
deleted file mode 100644
index 9f406b5501..0000000000
--- a/lib/include/Makefile.am.wild
+++ /dev/null
@@ -1,14 +0,0 @@
-# lib/include/Makefile
-
-noinst_HEADERS = $(wildcard *.hh)
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in
deleted file mode 100644
index aa411ca030..0000000000
--- a/lib/include/Makefile.in
+++ /dev/null
@@ -1,234 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# lib/include/Makefile
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/include/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = lib/include
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile $(HEADERS)
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-tags mostlyclean-generic
-
-clean:  clean-tags clean-generic mostlyclean
-
-distclean:  distclean-tags distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib/include/out/dummy.dep b/lib/include/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/include/out/dummy.dep
diff --git a/lib/out/dummy.dep b/lib/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/out/dummy.dep
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
deleted file mode 100644
index 0a05b26849..0000000000
--- a/lily/GNUmakefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# lilypond/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../build/lily
-
-make-in-build: wild-check
-	echo exec $(MAKE) -C $(biltdir)
-	exec $(MAKE) -C $(biltdir)
-
-include $(biltdir)/Makefile
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-lexer.cc: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-parser.hh: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-parser.cc: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-#ugh OMIT_DEPENDENCIES does not seem to work
-.deps/lexer.P:
-	exec $(MAKE) -C $(biltdir) $@
-
-.deps/parser.P:
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-# Makefile.am.wild: lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
-# ugh
-CURRENT_lilypond_SOURCES = $(wildcard *.cc lexer.ll parser.yy)
-
-# ugh: stupid lexer.cc/parser.cc cluttering sourcedir!
-wild-check: check-lilypond-sources
-
-check-lilypond-sources:
-ifneq ($(lilypond_SOURCES),$(filter-out $(IGNORE_WILDCARDS), $(CURRENT_lilypond_SOURCES)))
-	@echo \"$(lilypond_SOURCES)\"
-	@echo \"$(CURRENT_lilypond_SOURCES)\"
-	@echo  lilypond_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/lily/Makefile b/lily/Makefile
new file mode 100644
index 0000000000..d94ae0d93a
--- /dev/null
+++ b/lily/Makefile
@@ -0,0 +1,48 @@
+# project  LilyPond -- the musical typesetter
+# title	   makefile for lilypond
+# file	   lily/Makefile 
+#
+# Copyright (c) 1997 by
+#   	Jan Nieuwenhuizen <jan@digicash.com>
+#	Han-Wen Nienhuys <hanwen@stack.nl>
+#
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = lilypond
+SUBDIRS = include
+
+
+# generic variables:
+include Stable.make
+include ./$(depth)/make/Variables.make
+include VERSION
+# list of distribution files:
+#
+EXTRA_DISTFILES = VERSION 
+MODULE_LIBDEPS= check-flower-deps check-lib-deps 
+MODULE_LIBES= -llily -lflower
+
+# main target of this module:
+#
+default: $(EXECUTABLE)
+include ./$(depth)/make/Files.make 
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+
+
+# force these: Make can't know these have to be generated in advance
+my-lily-lexer.cc: $(outdir)/parser.hh
+$(outdir)/lexer.cc: $(outdir)/parser.hh
+
+
+EXECUTABLES=lilypond
+include $(depth)/make/Executable.make
+
+$(outdir)/lily-version.o: $(outdir)/version.hh
+
diff --git a/lily/Makefile.am b/lily/Makefile.am
deleted file mode 100644
index 4a703de2ce..0000000000
--- a/lily/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter # title	   makefile for lilypond
-# file	   lily/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-SUBDIRS = include
-
-bin_PROGRAMS = lilypond
-
-# ignoring wildcards for `lexer.cc'
-IGNORE_WILDCARDS=lexer.cc parser.cc# ignoring wildcards for `parser.cc'
-IGNORE_WILDCARDS=lexer.cc parser.cc
-lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bezier.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc includable-lexer.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
-
-# howto do this? info is not all that clear...
-# OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
-
-noinst_HEADERS = parser.hh
-
-#lilypond_LDADD = -llily -lflower @LEXLIB@
-lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
-
-lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-
-INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
-
-# force these: Make can't know these have to be generated in advance
-my-lily-lexer.cc: parser.hh
-lexer.cc: parser.hh
-
-# ugh, autoconf assumes to get $(LEX_OUTPUT_ROOT).c ...
-.ll.cc:
-	@echo "must override autoconf; ignore warning"
-	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).cc $@
-#.yy.hh:
-parser.hh: parser.yy
-	$(BISON) -d $<
-	mv $<.tab.h $@
-	mv $<.tab.c $(shell basename $@ .hh).cc
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild
deleted file mode 100644
index 35e6cd2e65..0000000000
--- a/lily/Makefile.am.wild
+++ /dev/null
@@ -1,57 +0,0 @@
-# project  LilyPond -- the musical typesetter # title	   makefile for lilypond
-# file	   lily/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-SUBDIRS = include
-
-bin_PROGRAMS = lilypond
-
-nowildcard: lexer.cc parser.cc
-
-lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
-
-# howto do this? info is not all that clear...
-# OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
-
-noinst_HEADERS = parser.hh
-
-#lilypond_LDADD = -llily -lflower @LEXLIB@
-lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
-
-lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-
-INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
-
-# force these: Make can't know these have to be generated in advance
-my-lily-lexer.cc: parser.hh
-lexer.cc: parser.hh
-
-# ugh, autoconf assumes to get $(LEX_OUTPUT_ROOT).c ...
-.ll.cc:
-	@echo "must override autoconf; ignore warning"
-	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).cc $@
-#.yy.hh:
-parser.hh: parser.yy
-	$(BISON) -d $<
-	mv $<.tab.h $@
-	mv $<.tab.c $(shell basename $@ .hh).cc
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
diff --git a/lily/Makefile.in b/lily/Makefile.in
deleted file mode 100644
index 5d3fb49d2f..0000000000
--- a/lily/Makefile.in
+++ /dev/null
@@ -1,4791 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter # title	   makefile for lilypond
-# file	   lily/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = include
-
-bin_PROGRAMS = lilypond
-
-# ignoring wildcards for `lexer.cc'
-IGNORE_WILDCARDS=lexer.cc parser.cc# ignoring wildcards for `parser.cc'
-IGNORE_WILDCARDS=lexer.cc parser.cc
-lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bezier.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc includable-lexer.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
-
-# howto do this? info is not all that clear...
-# OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
-# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
-
-noinst_HEADERS = parser.hh
-
-#lilypond_LDADD = -llily -lflower @LEXLIB@
-lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
-
-lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-
-INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
-LIBS = @LIBS@
-lilypond_OBJECTS =  abbrev.o abbreviation-beam-engraver.o \
-abbreviation-beam.o atom.o audio-column.o audio-element.o audio-item.o \
-audio-staff.o axis-group-administration.o axis-group-element.o \
-axis-group-item.o axis-group-spanner.o axis.o bar-column-grav.o \
-bar-column.o bar-grav.o bar-number-grav.o bar.o beam-grav.o \
-beam-swallow-trans.o beam.o bezier.o bow.o boxes.o break-align-item.o \
-break.o change-iterator.o change-translator.o chord-iterator.o \
-clef-grav.o clef-item.o col-info.o colhpos.o collision-grav.o \
-collision.o command-request.o crescendo.o debug.o dimen.o \
-directional-spanner.o dot-column-grav.o dot-column.o dots.o \
-dynamic-grav.o engraver-group.o engraver.o general-script-def.o \
-global-translator.o gourlay-breaking.o graphical-element.o grouping.o \
-head-grav.o header.o horizontal-align-item.o horizontal-group-elem.o \
-horizontal-group-item.o horizontal-vertical-group-elem.o \
-horizontal-vertical-group-item.o idealspacing.o identifier.o \
-includable-lexer.o ineq-constrained-qp.o item.o key-grav.o key-item.o \
-key-performer.o key.o keyword.o leastsquares.o lexerinit.o \
-lily-version.o line-group-grav.o line-spacer.o linear-programming.o \
-local-key-grav.o local-key-item.o lookup.o lyric-grav.o \
-lyric-performer.o main.o meter-grav.o meter-performer.o meter.o \
-midi-def.o midi-item.o midi-stream.o midi-walker.o misc.o molecule.o \
-music-iterator.o music-list.o music-output-def.o music.o \
-musical-request.o my-lily-lexer.o my-lily-parser.o note-column.o \
-note-head.o note-performer.o note.o notename-table.o offset.o \
-outputter.o p-col.o p-score.o paper-def.o performance.o \
-performer-group-performer.o performer.o pitch-squash-grav.o \
-plet-engraver.o plet-spanner.o plet-swallow-engraver.o \
-priority-halign-grav.o property-iterator.o ps-plet.o qlp.o qlpsolve.o \
-request-iterator.o request.o rest-collision-grav.o rest-collision.o \
-rest-grav.o rest.o rhythmic-column-grav.o rhythmic-head.o rod.o \
-score-bar.o score-column.o score-elem-info.o score-elem.o score-grav.o \
-score-performer.o score-priority-grav.o score.o scoreline.o scores.o \
-script-column.o script-def.o script-grav.o script.o \
-separating-group-spanner.o separating-line-group-grav.o \
-single-malt-grouping-item.o slur-grav.o slur.o span-bar-grav.o \
-span-bar.o span-score-bar-grav.o span-score-bar.o spanner.o \
-spring-spacer.o staff-info.o staff-performer.o staff-side.o \
-staff-sym-grav.o staff-sym.o stem-grav.o stem-info.o stem.o \
-super-elem.o swallow-grav.o swallow-perf.o symtable.o template1.o \
-template2.o template3.o template4.o template5.o template6.o template7.o \
-template8.o tex-beam.o tex-slur.o tex-stream.o tex.o text-def.o \
-text-item.o text-spanner.o tie-grav.o tie.o time-description.o \
-timing-grav.o timing-translator.o translation-property.o \
-translator-ctors.o translator-group.o translator.o type-swallow-trans.o \
-version.o vertical-align-elem.o vertical-align-grav.o \
-vertical-align-spanner.o vertical-group-elem.o vertical-group-spanner.o \
-voice-iterator.o warn.o word-wrap.o lexer.o parser.o
-lilypond_DEPENDENCIES =  $(top_builddir)/lib/liblily.la \
-$(top_builddir)/flower/libflower.la
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LEXLIB = @LEXLIB@
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in lexer.cc parser.cc
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-SOURCES = $(lilypond_SOURCES)
-OBJECTS = $(lilypond_OBJECTS)
-
-default: all
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .ll .lo .o .s .yy
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lilypond: $(lilypond_OBJECTS) $(lilypond_DEPENDENCIES)
-	@rm -f lilypond
-	$(CXXLINK) $(lilypond_LDFLAGS) $(lilypond_OBJECTS) $(lilypond_LDADD) $(LIBS)
-.yy.cc:
-	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.cc
-	if test -f y.tab.h; then \
-	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-	else :; fi
-parser.hh: parser.cc
-
-.ll.cc:
-	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
-.cc.o:
-	$(CXXCOMPILE) -c $<
-.cc.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = lily
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/beam.hh include/directional-spanner.hh \
-	include/spanner.hh include/rod.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/lookup.hh include/atom.hh \
-	../flower/include/scalar.hh include/stem.hh include/molecule.hh \
-	include/dimen.hh
-abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \
-	../lib/include/duration-convert.hh ../lib/include/duration.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	include/time-description.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/abbreviation-beam-engraver.hh \
-	include/engraver.hh include/request.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/drul-array.hh \
-	include/stem.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/abbreviation-beam.hh include/beam.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/rod.hh include/musical-request.hh include/misc.hh \
-	include/grouping.hh
-abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/dimen.hh \
-	include/abbreviation-beam.hh include/beam.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/misc.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/scalar.hh \
-	include/grouping.hh include/minterval.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/atom.hh include/molecule.hh include/leastsquares.hh \
-	include/stem.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/lookup.hh \
-	include/stem-info.hh
-atom.o: atom.cc include/atom.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/tex.hh \
-	../flower/include/scalar.hh include/dimen.hh \
-	../flower/include/varray.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-audio-column.o: audio-column.cc include/audio-column.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/lily-proto.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/audio-item.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/audio-element.hh \
-	../flower/include/virtual-methods.hh include/performance.hh \
-	include/music-output.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-audio-element.o: audio-element.cc include/audio-element.hh \
-	../flower/include/virtual-methods.hh include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh
-audio-item.o: audio-item.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/audio-item.hh \
-	include/audio-element.hh ../flower/include/virtual-methods.hh \
-	include/midi-item.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../lib/include/moment.hh \
-	../flower/include/rational.hh include/request.hh \
-	../lib/include/input.hh include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/audio-column.hh
-audio-staff.o: audio-staff.cc include/audio-staff.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/lily-proto.hh include/audio-element.hh \
-	../flower/include/virtual-methods.hh include/audio-item.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/midi-item.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/midi-stream.hh include/midi-walker.hh \
-	../flower/include/pqueue.hh ../flower/include/varray.hh
-axis-group-administration.o: axis-group-administration.cc \
-	../flower/include/interval.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/compare.hh \
-	include/axis-group-administration.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-axis-group-element.o: axis-group-element.cc \
-	include/axis-group-element.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh
-axis-group-item.o: axis-group-item.cc include/axis-group-item.hh \
-	include/axis-group-element.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh
-axis-group-spanner.o: axis-group-spanner.cc \
-	include/axis-group-spanner.hh include/spanner.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-axis.o: axis.cc include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh
-bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/bar-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/script.hh include/staff-side.hh include/bar.hh
-bar-column.o: bar-column.cc include/bar.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/bar-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh
-bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/bar.hh include/item.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/command-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/time-description.hh \
-	include/engraver-group.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/translator-group.hh
-bar-number-grav.o: bar-number-grav.cc include/bar-number-grav.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/script.hh \
-	include/staff-side.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/text-def.hh include/general-script-def.hh \
-	include/command-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/bar.hh \
-	include/time-description.hh
-bar.o: bar.cc include/bar.hh include/item.hh include/boxes.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \
-	../lib/include/duration.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	include/time-description.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/beam-grav.hh \
-	include/engraver.hh include/request.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/drul-array.hh \
-	include/stem.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/beam.hh include/directional-spanner.hh \
-	include/spanner.hh include/rod.hh include/musical-request.hh \
-	include/grouping.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh
-beam-swallow-trans.o: beam-swallow-trans.cc \
-	include/type-swallow-trans.hh include/translator.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/musical-request.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh
-beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/dimen.hh \
-	include/beam.hh include/directional-spanner.hh \
-	include/spanner.hh include/abbreviation-beam.hh include/misc.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/scalar.hh include/grouping.hh \
-	include/minterval.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/atom.hh include/molecule.hh include/leastsquares.hh \
-	include/stem.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/lookup.hh \
-	include/stem-info.hh include/main.hh
-bezier.o: bezier.cc include/offset.hh ../flower/include/real.hh \
-	include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/bezier.hh include/lily-proto.hh ../lib/include/proto.hh \
-	include/dimen.hh include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/varray.hh \
-	../flower/include/interval.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh
-bow.o: bow.cc include/bow.hh include/directional-spanner.hh \
-	include/spanner.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/molecule.hh include/boxes.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh
-boxes.o: boxes.cc include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh
-break-align-item.o: break-align-item.cc include/break-align-item.hh \
-	include/horizontal-align-item.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh
-break.o: break.cc include/score-column.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/break.hh \
-	include/colhpos.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/line-spacer.hh \
-	../flower/include/vector.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/scoreline.hh include/spanner.hh include/p-score.hh \
-	include/music-output.hh ../flower/include/cpu-timer.hh
-change-iterator.o: change-iterator.cc include/change-iterator.hh \
-	include/music-iterator.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/varray.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/virtual-methods.hh \
-	include/translator-group.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/parray.hh \
-	../lib/include/input.hh include/change-translator.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-change-translator.o: change-translator.cc include/change-translator.hh \
-	include/music.hh ../flower/include/virtual-methods.hh \
-	../lib/include/input.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-chord-iterator.o: chord-iterator.cc include/translator-group.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/chord-iterator.hh \
-	include/music-iterator.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-list.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh
-clef-grav.o: clef-grav.cc include/bar.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/clef-grav.hh \
-	../flower/include/scalar.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh include/staff-info.hh \
-	include/translator.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/clef-item.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/command-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/time-description.hh
-clef-item.o: clef-item.cc include/clef-item.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-	include/clef-grav.hh include/engraver.hh include/request.hh \
-	../lib/include/input.hh include/music.hh include/minterval.hh \
-	include/score-elem-info.hh include/staff-info.hh \
-	include/translator.hh
-col-info.o: col-info.cc include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/col-info.hh \
-	../flower/include/pointer.hh ../flower/include/assoc.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/warn.hh ../flower/include/vector.hh \
-	include/line-spacer.hh ../flower/include/interval.hh
-collision-grav.o: collision-grav.cc include/note-column.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/collision-grav.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/collision.hh
-collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/collision.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/note-column.hh include/script-column.hh \
-	include/note-head.hh include/rhythmic-head.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh
-command-request.o: command-request.cc include/command-request.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/lily-proto.hh \
-	include/direction.hh ../flower/include/varray.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/musical-request.hh
-crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/direction.hh \
-	include/dimen.hh include/crescendo.hh include/staff-side.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/spanner.hh \
-	include/drul-array.hh include/rod.hh include/lookup.hh \
-	include/atom.hh ../flower/include/scalar.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/score-column.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh
-debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh ../flower/include/flower-debug.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/main.hh
-dimen.o: dimen.cc include/dimen.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh
-directional-spanner.o: directional-spanner.cc \
-	include/directional-spanner.hh include/spanner.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh
-dot-column-grav.o: dot-column-grav.cc
-dot-column.o: dot-column.cc include/dots.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/dot-column.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/rhythmic-head.hh
-dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh
-dynamic-grav.o: dynamic-grav.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/crescendo.hh \
-	include/staff-side.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/spanner.hh include/drul-array.hh include/rod.hh \
-	include/dynamic-grav.hh include/engraver.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../lib/include/input.hh include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/musical-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/text-item.hh include/text-def.hh \
-	include/general-script-def.hh include/item.hh include/boxes.hh \
-	include/lookup.hh include/atom.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/score-column.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/staff-sym.hh include/note-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh
-engraver-group.o: engraver-group.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/engraver-group.hh \
-	include/lily-proto.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh include/score-elem-info.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/p-score.hh include/colhpos.hh include/music-output.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh
-engraver.o: engraver.cc include/music-list.hh include/music.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/musical-request.hh \
-	include/request.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/engraver.hh ../flower/include/varray.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/engraver-group.hh \
-	include/translator-group.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-general-script-def.o: general-script-def.cc \
-	include/general-script-def.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/input.hh \
-	../flower/include/virtual-methods.hh include/direction.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/warn.hh include/atom.hh include/boxes.hh \
-	../flower/include/interval.hh include/offset.hh include/axes.hh
-global-translator.o: global-translator.cc include/global-translator.hh \
-	include/translator-group.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/rational.hh ../flower/include/pqueue.hh
-gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \
-	include/break.hh ../flower/include/varray.hh \
-	../flower/include/interval.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	include/colhpos.hh include/spring-spacer.hh \
-	include/line-spacer.hh ../flower/include/vector.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/col-info.hh ../flower/include/pointer.hh \
-	../flower/include/assoc.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/warn.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/p-score.hh \
-	include/music-output.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh
-graphical-element.o: graphical-element.cc include/graphical-element.hh \
-	include/offset.hh ../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	../flower/include/virtual-methods.hh \
-	include/axis-group-element.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/directed-graph.hh \
-	include/axis-group-administration.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/grouping.hh include/minterval.hh \
-	../flower/include/interval.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/varray.hh
-head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/head-grav.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/paper-def.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/musical-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/dots.hh
-header.o: header.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/dictionary-iter.hh \
-	../flower/include/assoc-iter.hh ../flower/include/assoc.hh \
-	../flower/include/varray.hh ../flower/include/dictionary.hh \
-	include/header.hh
-horizontal-align-item.o: horizontal-align-item.cc \
-	include/horizontal-align-item.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-horizontal-group-elem.o: horizontal-group-elem.cc \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh
-horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-group-elem.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/rod.hh
-idealspacing.o: idealspacing.cc include/idealspacing.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/paper-def.hh ../flower/include/interval.hh \
-	include/score.hh ../lib/include/input.hh \
-	../flower/include/parray.hh include/identifier.hh \
-	include/my-lily-lexer.hh include/includable-lexer.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/symtable.hh include/atom.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/lookup.hh ../flower/include/scalar.hh \
-	include/direction.hh include/script-def.hh \
-	include/general-script-def.hh include/request.hh \
-	include/music.hh include/minterval.hh include/translator.hh
-includable-lexer.o: includable-lexer.cc include/includable-lexer.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/varray.hh ../lib/include/proto.hh \
-	../lib/include/source-file.hh ../lib/include/source.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-ineq-constrained-qp.o: ineq-constrained-qp.cc \
-	include/ineq-constrained-qp.hh ../flower/include/matrix.hh \
-	../flower/include/matrix-storage.hh ../flower/include/varray.hh \
-	../flower/include/real.hh ../flower/include/virtual-methods.hh \
-	../flower/include/vector.hh include/qlpsolve.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh ../flower/include/choleski.hh
-item.o: item.cc include/p-score.hh include/colhpos.hh \
-	../flower/include/varray.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/parray.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/music-output.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/item.hh include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/direction.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/rod.hh include/spanner.hh
-key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/key.hh include/key-item.hh \
-	include/item.hh include/boxes.hh include/offset.hh \
-	include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/command-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/local-key-grav.hh \
-	include/musical-request.hh include/local-key-item.hh \
-	include/bar.hh include/time-description.hh
-key-item.o: key-item.cc include/key-item.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/key.hh ../flower/include/scalar.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh include/key-grav.hh \
-	include/engraver.hh include/request.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh include/staff-info.hh \
-	include/translator.hh
-key-performer.o: key-performer.cc include/key-performer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/performer.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/command-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/audio-item.hh include/audio-element.hh
-key.o: key.cc include/key.hh ../flower/include/varray.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh
-keyword.o: keyword.cc include/keyword.hh
-leastsquares.o: leastsquares.cc include/leastsquares.hh \
-	../flower/include/varray.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh
-lexer.o: lexer.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/string-convert.hh include/my-lily-lexer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/varray.hh include/includable-lexer.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/plet.hh \
-	../flower/include/interval.hh parser.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/parseconstruct.hh include/main.hh include/identifier.hh \
-	../lib/include/input.hh ../flower/include/virtual-methods.hh
-lexerinit.o: lexerinit.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/my-lily-lexer.hh \
-	include/lily-proto.hh ../flower/include/varray.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/includable-lexer.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/plet.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/main.hh \
-	../lib/include/source-file.hh ../lib/include/source.hh
-lily-version.o: lily-version.cc ../flower/config.hh
-line-group-grav.o: line-group-grav.cc include/staff-sym.hh \
-	include/spanner.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh \
-	include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/vertical-group-elem.hh include/command-request.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/bar.hh include/item.hh include/boxes.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/line-group-grav.hh \
-	include/engraver.hh include/score-elem-info.hh \
-	../flower/include/scalar.hh include/staff-info.hh \
-	include/translator.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-line-spacer.o: line-spacer.cc include/line-spacer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh ../flower/include/vector.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh
-linear-programming.o: linear-programming.cc
-local-key-grav.o: local-key-grav.cc include/musical-request.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/command-request.hh ../flower/include/varray.hh \
-	include/local-key-grav.hh include/engraver.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/key.hh \
-	include/local-key-item.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/key-grav.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/key-item.hh include/tie.hh include/bow.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/rod.hh include/note-head.hh include/rhythmic-head.hh \
-	include/time-description.hh include/engraver-group.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/translator-group.hh
-local-key-item.o: local-key-item.cc include/dimen.hh \
-	../flower/include/real.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/local-key-item.hh include/item.hh include/boxes.hh \
-	../flower/include/interval.hh include/offset.hh include/axes.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/scalar.hh include/lookup.hh include/atom.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/musical-request.hh include/request.hh \
-	../lib/include/input.hh include/music.hh include/minterval.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/note-head.hh include/rhythmic-head.hh include/misc.hh \
-	include/grouping.hh
-lookup.o: lookup.cc include/lookup.hh include/atom.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/scalar.hh \
-	include/direction.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/symtable.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/dimen.hh include/tex.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/main.hh
-lyric-grav.o: lyric-grav.cc include/lyric-engraver.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/musical-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/text-item.hh include/text-def.hh \
-	include/general-script-def.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/staff-side.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/lookup.hh include/atom.hh
-lyric-performer.o: lyric-performer.cc include/lyric-performer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/performer.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/text-def.hh \
-	include/general-script-def.hh include/musical-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/audio-item.hh include/audio-element.hh
-main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/lgetopt.hh include/misc.hh \
-	include/lily-proto.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/main.hh \
-	../flower/include/path.hh ../flower/config.hh \
-	../lib/include/source.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/my-lily-parser.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh ../lib/include/input.hh
-meter-grav.o: meter-grav.cc include/meter-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/time-description.hh \
-	include/grouping.hh include/meter.hh include/item.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/command-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/timing-grav.hh \
-	include/timing-translator.hh include/engraver-group.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/translator-group.hh
-meter-performer.o: meter-performer.cc include/meter-performer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/performer.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/command-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/audio-item.hh include/audio-element.hh
-meter.o: meter.cc ../flower/include/scalar.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/molecule.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/boxes.hh \
-	../flower/include/interval.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/meter.hh include/item.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh
-midi-def.o: midi-def.cc include/misc.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/midi-def.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/translator.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/performance.hh include/music-output.hh \
-	../flower/include/assoc-iter.hh include/score-performer.hh \
-	include/performer-group-performer.hh include/performer.hh \
-	include/request.hh include/music.hh include/direction.hh \
-	include/score-elem-info.hh include/staff-info.hh \
-	include/translator-group.hh include/global-translator.hh \
-	../flower/include/pqueue.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-midi-item.o: midi-item.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/lily-proto.hh \
-	../lib/include/warn.hh include/misc.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/scalar.hh \
-	include/grouping.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/varray.hh \
-	../flower/include/string-convert.hh include/command-request.hh \
-	include/request.hh ../flower/include/virtual-methods.hh \
-	../lib/include/input.hh include/music.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/musical-request.hh include/midi-item.hh \
-	include/midi-stream.hh include/audio-item.hh \
-	include/audio-element.hh
-midi-stream.o: midi-stream.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/string-convert.hh include/main.hh \
-	include/lily-proto.hh ../lib/include/proto.hh include/misc.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/scalar.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/midi-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/virtual-methods.hh include/midi-stream.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-midi-walker.o: midi-walker.cc include/midi-walker.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/pqueue.hh ../flower/include/varray.hh \
-	include/lily-proto.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	include/audio-column.hh include/audio-item.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/audio-element.hh \
-	../flower/include/virtual-methods.hh include/audio-staff.hh \
-	include/midi-item.hh include/midi-stream.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-misc.o: misc.cc include/item.hh include/boxes.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/misc.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/scalar.hh \
-	include/grouping.hh include/minterval.hh
-molecule.o: molecule.cc ../flower/include/interval.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/compare.hh include/dimen.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/molecule.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/atom.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/tex.hh ../flower/include/scalar.hh
-music-iterator.o: music-iterator.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/music-list.hh include/music.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/music-iterator.hh ../flower/include/varray.hh \
-	include/voice-iterator.hh include/property-iterator.hh \
-	include/chord-iterator.hh include/request-iterator.hh \
-	include/translator-group.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/parray.hh \
-	include/translation-property.hh include/change-iterator.hh \
-	include/change-translator.hh
-music-list.o: music-list.cc include/music.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/music-list.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc
-music-output-def.o: music-output-def.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/global-translator.hh include/translator-group.hh \
-	include/translator.hh ../flower/include/scalar.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	../flower/include/rational.hh ../flower/include/pqueue.hh \
-	../flower/include/dictionary-iter.hh \
-	../flower/include/assoc-iter.hh
-music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \
-	../lib/include/input.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/music-list.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-musical-request.o: musical-request.cc include/musical-request.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/misc.hh ../flower/include/scalar.hh include/grouping.hh \
-	../flower/include/varray.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/script-def.hh include/general-script-def.hh \
-	include/text-def.hh include/music-list.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-my-lily-lexer.o: my-lily-lexer.cc include/notename-table.hh \
-	../flower/include/pointer.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/varray.hh ../flower/include/interval.hh \
-	include/identifier.hh ../lib/include/input.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/assoc-iter.hh parser.hh include/keyword.hh \
-	include/my-lily-lexer.hh include/includable-lexer.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/plet.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh ../lib/include/source-file.hh \
-	include/parseconstruct.hh
-my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	../lib/include/input.hh include/my-lily-lexer.hh \
-	include/includable-lexer.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/main.hh include/music-list.hh include/music.hh \
-	../flower/include/virtual-methods.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/musical-request.hh \
-	include/request.hh include/direction.hh \
-	include/command-request.hh parser.hh include/header.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh
-note-column.o: note-column.cc include/dot-column.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/note-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/script.hh \
-	include/staff-side.hh include/note-head.hh \
-	include/rhythmic-head.hh include/stem.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rest.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-note-head.o: note-head.cc include/misc.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/dots.hh include/item.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/direction.hh include/note-head.hh \
-	include/rhythmic-head.hh include/dimen.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/paper-def.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh include/molecule.hh \
-	include/musical-request.hh include/request.hh \
-	../lib/include/input.hh include/music.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh
-note-performer.o: note-performer.cc include/note-performer.hh \
-	include/performer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/musical-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/audio-item.hh include/audio-element.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/includable-lexer.hh ../lib/include/duration.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../lib/include/plet.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/musical-request.hh include/request.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/command-request.hh include/music-list.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/identifier.hh include/text-def.hh \
-	include/general-script-def.hh include/parseconstruct.hh
-notename-table.o: notename-table.cc include/notename-table.hh \
-	../flower/include/pointer.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/varray.hh ../flower/include/pointer.tcc \
-	include/musical-request.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh
-offset.o: offset.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh
-outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/tex-stream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/boxes.hh \
-	../flower/include/interval.hh include/offset.hh include/axes.hh \
-	include/direction.hh ../flower/include/varray.hh \
-	include/dimen.hh include/tex.hh ../flower/include/scalar.hh
-p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-p-score.o: p-score.cc include/main.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/super-elem.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/lookup.hh include/atom.hh include/boxes.hh \
-	../flower/include/scalar.hh include/direction.hh \
-	include/spanner.hh include/drul-array.hh include/rod.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/scoreline.hh include/colhpos.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/p-score.hh include/music-output.hh \
-	include/tex-stream.hh include/header.hh include/word-wrap.hh \
-	include/break.hh include/gourlay-breaking.hh \
-	include/outputter.hh ../flower/include/list.tcc \
-	../flower/include/cursor.tcc
-paper-def.o: paper-def.cc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/misc.hh include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/scalar.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	include/paper-def.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/lookup.hh include/atom.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/dimen.hh \
-	../flower/include/assoc-iter.hh include/score-grav.hh \
-	include/engraver-group.hh ../flower/include/parray.hh \
-	include/score-elem-info.hh include/engraver.hh \
-	include/request.hh ../lib/include/input.hh include/music.hh \
-	include/staff-info.hh include/translator.hh \
-	include/translator-group.hh include/global-translator.hh \
-	../flower/include/pqueue.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh include/main.hh
-parser.o: parser.cc ../flower/include/scalar.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/translation-property.hh include/music.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh include/minterval.hh \
-	../flower/include/interval.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/lily-proto.hh \
-	include/script-def.hh include/general-script-def.hh \
-	include/direction.hh include/symtable.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/varray.hh include/atom.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/lookup.hh \
-	include/misc.hh include/grouping.hh include/my-lily-lexer.hh \
-	include/includable-lexer.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/midi-def.hh include/main.hh \
-	include/keyword.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/parseconstruct.hh include/dimen.hh \
-	include/identifier.hh include/command-request.hh \
-	include/request.hh include/musical-request.hh \
-	include/my-lily-parser.hh include/text-def.hh \
-	include/translator-group.hh include/translator.hh \
-	../flower/include/parray.hh include/score.hh \
-	include/music-list.hh include/header.hh \
-	../lib/include/duration-convert.hh include/change-translator.hh
-performance.o: performance.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh ../flower/include/string-convert.hh \
-	include/main.hh include/midi-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/midi-item.hh include/midi-stream.hh \
-	include/audio-column.hh include/audio-staff.hh \
-	include/audio-element.hh include/performance.hh \
-	include/music-output.hh include/score.hh \
-	../lib/include/input.hh ../flower/include/parray.hh
-performer-group-performer.o: performer-group-performer.cc \
-	include/performer-group-performer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/performer.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-performer.o: performer.cc include/performer-group-performer.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/performer.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-grav.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/note-head.hh \
-	include/rhythmic-head.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh
-plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/musical-request.hh include/lily-proto.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/plet-engraver.hh include/engraver.hh \
-	../flower/include/varray.hh include/score-elem-info.hh \
-	../flower/include/scalar.hh include/staff-info.hh \
-	include/translator.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/parray.hh \
-	include/drul-array.hh include/plet-spanner.hh include/bow.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/rod.hh include/text-def.hh \
-	include/general-script-def.hh include/beam.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/score-column.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/stem.hh \
-	include/molecule.hh
-plet-spanner.o: plet-spanner.cc include/atom.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/lookup.hh ../flower/include/scalar.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/drul-array.hh include/rod.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/plet-spanner.hh include/bow.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/stem.hh include/text-def.hh \
-	include/general-script-def.hh ../lib/include/input.hh
-plet-swallow-engraver.o: plet-swallow-engraver.cc \
-	include/musical-request.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/plet-swallow-engraver.hh include/swallow-grav.hh \
-	include/engraver.hh ../flower/include/varray.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh
-priority-halign-grav.o: priority-halign-grav.cc include/bar.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/break-align-item.hh \
-	include/horizontal-align-item.hh \
-	include/priority-halign-grav.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/score-priority-grav.hh
-property-iterator.o: property-iterator.cc include/property-iterator.hh \
-	include/music-iterator.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/varray.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/virtual-methods.hh \
-	include/translation-property.hh include/music.hh \
-	../lib/include/input.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/scalar.hh \
-	include/translator-group.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh
-ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/misc.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/lookup.hh include/atom.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/paper-def.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/string-convert.hh
-qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/qlp.hh \
-	include/ineq-constrained-qp.hh ../flower/include/matrix.hh \
-	../flower/include/matrix-storage.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/vector.hh
-qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.hh \
-	../flower/include/matrix.hh ../flower/include/matrix-storage.hh \
-	../flower/include/varray.hh ../flower/include/real.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/vector.hh include/qlpsolve.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh ../flower/include/choleski.hh
-request-iterator.o: request-iterator.cc include/translator-group.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/request-iterator.hh \
-	include/music-iterator.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-list.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/request.hh \
-	include/direction.hh
-request.o: request.cc include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/lily-proto.hh \
-	include/direction.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/rest-collision.hh \
-	include/item.hh include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/direction.hh include/rest-collision-grav.hh \
-	include/engraver.hh include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/collision.hh include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/note-column.hh include/script-column.hh
-rest-collision.o: rest-collision.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/rest-collision.hh \
-	include/item.hh include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/direction.hh include/note-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/stem.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/note-head.hh include/rhythmic-head.hh \
-	include/collision.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh
-rest-grav.o: rest-grav.cc include/rest-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/musical-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/dots.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/rest.hh include/rhythmic-head.hh
-rest.o: rest.cc include/molecule.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/direction.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/varray.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-	include/rest.hh include/rhythmic-head.hh include/item.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/dots.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh
-rhythmic-column-grav.o: rhythmic-column-grav.cc \
-	include/rhythmic-column-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/note-head.hh \
-	include/rhythmic-head.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/stem.hh include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/note-column.hh \
-	include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/script.hh include/staff-side.hh include/dot-column.hh \
-	include/horizontal-group-item.hh
-rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/lookup.hh include/atom.hh \
-	../flower/include/scalar.hh include/rest.hh include/dots.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh
-rod.o: rod.cc include/rod.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/direction.hh \
-	include/drul-array.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/single-malt-grouping-item.hh
-score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh
-score-column.o: score-column.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh \
-	include/score-column.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh
-score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/varray.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh
-score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/p-score.hh include/colhpos.hh \
-	../flower/include/varray.hh ../flower/include/parray.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/music-output.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/interval.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/atom.hh include/boxes.hh \
-	include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-	include/direction.hh include/molecule.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/tex.hh include/dimen.hh include/spanner.hh \
-	include/drul-array.hh include/rod.hh include/scoreline.hh \
-	include/item.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh
-score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh include/scoreline.hh \
-	include/colhpos.hh include/spanner.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/item.hh include/boxes.hh include/score-grav.hh \
-	include/engraver-group.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/score-elem-info.hh \
-	../flower/include/scalar.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh include/staff-info.hh \
-	include/translator.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/translator-group.hh \
-	include/global-translator.hh ../flower/include/pqueue.hh \
-	include/p-score.hh include/music-output.hh \
-	include/musical-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/score-column.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/command-request.hh include/paper-def.hh \
-	include/music-output-def.hh
-score-performer.o: score-performer.cc include/score-performer.hh \
-	include/performer-group-performer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/performer.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/global-translator.hh \
-	../flower/include/pqueue.hh include/midi-def.hh \
-	include/music-output-def.hh include/audio-column.hh \
-	include/audio-item.hh include/audio-element.hh \
-	include/performance.hh include/music-output.hh \
-	include/midi-stream.hh ../flower/include/string-convert.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/score.hh \
-	../lib/include/source-file.hh ../lib/include/source.hh \
-	include/audio-staff.hh
-score-priority-grav.o: score-priority-grav.cc \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/score-priority-grav.hh \
-	include/engraver.hh include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/assoc-iter.hh include/break-align-item.hh \
-	include/horizontal-align-item.hh
-score.o: score.cc include/score.hh ../flower/include/varray.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/input.hh \
-	../flower/include/parray.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/music-output.hh ../lib/include/source.hh \
-	../lib/include/source-file.hh include/music-iterator.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/global-translator.hh \
-	include/translator-group.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/pqueue.hh \
-	include/header.hh ../flower/include/cpu-timer.hh \
-	include/main.hh include/paper-def.hh
-scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \
-	../flower/include/varray.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/spanner.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/dimen.hh \
-	include/atom.hh include/boxes.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/p-score.hh include/music-output.hh
-scores.o: scores.cc include/main.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score.hh \
-	../flower/include/varray.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/input.hh \
-	../flower/include/parray.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/interval.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/header.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-script-column.o: script-column.cc include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/script.hh include/staff-side.hh \
-	include/note-head.hh include/rhythmic-head.hh include/stem.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/general-script-def.hh \
-	../lib/include/input.hh
-script-def.o: script-def.cc include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/script-def.hh \
-	include/general-script-def.hh ../lib/include/input.hh \
-	../flower/include/virtual-methods.hh include/direction.hh \
-	include/atom.hh include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/varray.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh ../flower/include/scalar.hh
-script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/script.hh \
-	include/staff-side.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/musical-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/stem.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/staff-sym.hh include/spanner.hh include/rod.hh \
-	include/general-script-def.hh
-script.o: script.cc include/script-def.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/general-script-def.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../lib/include/input.hh \
-	../flower/include/virtual-methods.hh include/direction.hh \
-	include/musical-request.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/paper-def.hh \
-	../flower/include/varray.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/script.hh include/staff-side.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/stem.hh include/molecule.hh include/lookup.hh \
-	include/atom.hh ../flower/include/scalar.hh
-separating-group-spanner.o: separating-group-spanner.cc \
-	include/separating-group-spanner.hh \
-	include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-	include/spanner.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/vertical-group-elem.hh \
-	include/single-malt-grouping-item.hh include/item.hh \
-	include/boxes.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-separating-line-group-grav.o: separating-line-group-grav.cc \
-	include/separating-line-group-grav.hh \
-	include/line-group-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/separating-group-spanner.hh \
-	include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-	include/spanner.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/drul-array.hh include/rod.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/vertical-group-elem.hh \
-	include/single-malt-grouping-item.hh include/item.hh \
-	include/boxes.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-single-malt-grouping-item.o: single-malt-grouping-item.cc \
-	include/single-malt-grouping-item.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/rod.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-slur-grav.o: slur-grav.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/musical-request.hh \
-	include/lily-proto.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/slur-grav.hh include/engraver.hh \
-	../flower/include/varray.hh include/score-elem-info.hh \
-	../flower/include/scalar.hh include/staff-info.hh \
-	include/translator.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/parray.hh \
-	include/slur.hh include/directional-spanner.hh \
-	include/spanner.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/drul-array.hh include/rod.hh include/bow.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/note-column.hh include/item.hh \
-	include/boxes.hh include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh
-slur.o: slur.cc include/slur.hh include/directional-spanner.hh \
-	include/spanner.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/bow.hh \
-	../flower/include/scalar.hh include/lookup.hh include/atom.hh \
-	include/boxes.hh include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/note-column.hh include/item.hh include/script-column.hh \
-	include/horizontal-vertical-group-item.hh \
-	include/axis-group-item.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/horizontal-vertical-group-elem.hh \
-	include/vertical-group-elem.hh include/horizontal-group-elem.hh \
-	include/stem.hh include/molecule.hh include/p-col.hh \
-	include/horizontal-group-item.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/bezier.hh
-span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.hh \
-	include/item.hh include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/span-bar-grav.hh \
-	include/engraver.hh include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/vertical-align-spanner.hh include/spanner.hh \
-	include/rod.hh include/vertical-align-elem.hh
-span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/span-bar.hh include/bar.hh include/item.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/lookup.hh include/atom.hh \
-	../flower/include/scalar.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/molecule.hh \
-	include/vertical-align-elem.hh
-span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \
-	include/span-bar.hh include/bar.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/score-bar.hh \
-	include/span-score-bar-grav.hh include/span-bar-grav.hh \
-	include/engraver.hh include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh
-span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \
-	include/span-bar.hh include/bar.hh include/item.hh \
-	include/boxes.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh include/score-bar.hh include/atom.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh ../flower/include/scalar.hh
-spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/spanner.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/p-score.hh \
-	include/colhpos.hh include/music-output.hh include/outputter.hh
-spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \
-	include/line-spacer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	../flower/include/vector.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/col-info.hh \
-	../flower/include/pointer.hh ../flower/include/assoc.hh \
-	include/colhpos.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/qlp.hh include/ineq-constrained-qp.hh \
-	../flower/include/matrix.hh ../flower/include/matrix-storage.hh \
-	../flower/include/unionfind.hh include/idealspacing.hh \
-	../flower/include/pointer.tcc include/score-column.hh \
-	include/paper-def.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh include/dimen.hh \
-	include/main.hh
-staff-info.o: staff-info.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/staff-info.hh \
-	include/lily-proto.hh include/score-column.hh \
-	../flower/include/varray.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh
-staff-performer.o: staff-performer.cc include/staff-performer.hh \
-	include/performer-group-performer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/performer.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/audio-column.hh include/audio-item.hh \
-	include/audio-element.hh include/audio-staff.hh
-staff-side.o: staff-side.cc ../flower/include/interval.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/compare.hh include/paper-def.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/varray.hh include/music-output-def.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/dimen.hh \
-	include/staff-side.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/staff-sym.hh include/spanner.hh \
-	include/drul-array.hh include/rod.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/staff-sym.hh \
-	include/spanner.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/drul-array.hh include/rod.hh include/score.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh
-staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/lookup.hh \
-	include/atom.hh include/boxes.hh ../flower/include/scalar.hh \
-	include/paper-def.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-output-def.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/molecule.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/dimen.hh
-stem-grav.o: stem-grav.cc include/stem-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/note-head.hh \
-	include/rhythmic-head.hh include/item.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/score-elem.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/stem.hh include/molecule.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/musical-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	../lib/include/duration-convert.hh include/misc.hh \
-	include/grouping.hh include/abbrev.hh
-stem-info.o: stem-info.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/dimen.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/scalar.hh \
-	include/grouping.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/varray.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/atom.hh include/boxes.hh \
-	include/offset.hh include/axes.hh include/stem.hh \
-	include/item.hh include/score-elem.hh \
-	../flower/include/parray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/paper-def.hh include/music-output-def.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/lookup.hh include/stem-info.hh
-stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	include/offset.hh include/axes.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/drul-array.hh \
-	include/direction.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/paper-def.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/note-head.hh \
-	include/rhythmic-head.hh include/lookup.hh include/atom.hh \
-	../flower/include/scalar.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/rod.hh include/misc.hh include/grouping.hh \
-	include/minterval.hh include/beam.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/rest.hh
-super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh include/scoreline.hh \
-	include/colhpos.hh include/spanner.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/p-score.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/music-output.hh include/outputter.hh
-swallow-grav.o: swallow-grav.cc include/swallow-grav.hh \
-	include/engraver.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh
-swallow-perf.o: swallow-perf.cc include/swallow-perf.hh \
-	include/performer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh
-symtable.o: symtable.cc include/misc.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/dimen.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	include/atom.hh include/boxes.hh include/offset.hh \
-	include/axes.hh ../flower/include/assoc.hh \
-	../flower/include/assoc-iter.hh include/symtable.hh \
-	../flower/include/dictionary.hh
-template1.o: template1.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/idealspacing.hh include/lily-proto.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/musical-request.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/spanner.hh ../flower/include/pcursor.tcc \
-	../flower/include/plist.tcc
-template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/varray.hh \
-	../flower/include/vector.hh ../flower/include/interval.hh \
-	../flower/include/compare.hh ../flower/include/pcursor.tcc \
-	../flower/include/pcursor.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/plist.tcc
-template3.o: template3.cc include/atom.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/direction.hh ../flower/include/pcursor.tcc \
-	../flower/include/plist.tcc
-template4.o: template4.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/pcursor.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/spanner.hh \
-	include/lily-proto.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/audio-column.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/audio-item.hh include/audio-element.hh \
-	include/audio-staff.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/p-score.hh \
-	include/colhpos.hh include/music-output.hh \
-	../flower/include/cursor.tcc ../flower/include/list.tcc \
-	../flower/include/pcursor.tcc ../flower/include/plist.tcc
-template5.o: template5.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/interval.tcc ../flower/include/interval.hh \
-	../flower/include/flower-debug.hh ../flower/include/dstream.hh
-template6.o: template6.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/pcursor.tcc ../flower/include/pcursor.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/plist.tcc include/translator.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/lily-proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh
-template7.o: template7.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/pcursor.tcc ../flower/include/pcursor.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/plist.tcc include/music-list.hh \
-	include/music.hh ../flower/include/virtual-methods.hh \
-	../lib/include/input.hh include/minterval.hh \
-	../flower/include/interval.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh include/music-iterator.hh \
-	../flower/include/varray.hh
-template8.o: template8.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/audio-item.hh \
-	include/lily-proto.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/audio-element.hh \
-	../flower/include/virtual-methods.hh include/audio-column.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/midi-item.hh ../flower/include/pcursor.tcc \
-	../flower/include/plist.tcc
-tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/direction.hh include/tex.hh ../flower/include/scalar.hh \
-	include/symtable.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/lookup.hh include/misc.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/grouping.hh include/minterval.hh include/paper-def.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/string-convert.hh include/main.hh
-tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/misc.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/scalar.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	../flower/include/varray.hh include/lookup.hh include/atom.hh \
-	include/boxes.hh include/offset.hh include/axes.hh \
-	include/direction.hh include/molecule.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/dimen.hh include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/paper-def.hh \
-	include/music-output-def.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/string-convert.hh
-tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-	include/main.hh include/lily-proto.hh ../lib/include/proto.hh \
-	include/tex-stream.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh
-tex.o: tex.cc include/dimen.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/tex.hh include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-	include/atom.hh include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/varray.hh
-text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../lib/include/warn.hh include/lookup.hh include/atom.hh \
-	include/boxes.hh ../flower/include/interval.hh \
-	include/offset.hh include/axes.hh ../flower/include/scalar.hh \
-	include/direction.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/varray.hh include/music-output-def.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/molecule.hh \
-	include/text-def.hh include/general-script-def.hh \
-	../lib/include/input.hh include/dimen.hh
-text-item.o: text-item.cc include/musical-request.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/request.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/paper-def.hh ../flower/include/varray.hh \
-	include/music-output-def.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/text-item.hh \
-	include/text-def.hh include/general-script-def.hh \
-	include/item.hh include/boxes.hh include/offset.hh \
-	include/axes.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/staff-side.hh include/stem.hh include/molecule.hh \
-	include/lookup.hh include/atom.hh ../flower/include/scalar.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-text-spanner.o: text-spanner.cc include/molecule.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/boxes.hh \
-	../flower/include/interval.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/direction.hh \
-	include/text-spanner.hh include/directional-spanner.hh \
-	include/spanner.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/drul-array.hh \
-	include/rod.hh include/text-def.hh \
-	include/general-script-def.hh ../lib/include/input.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music-output-def.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/atom.hh
-tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/varray.hh include/request.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	../flower/include/parray.hh include/tie.hh include/bow.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/drul-array.hh include/rod.hh include/note-head.hh \
-	include/rhythmic-head.hh include/item.hh include/boxes.hh \
-	include/musical-request.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/music-list.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/varray.hh ../flower/include/interval.hh \
-	include/music-output-def.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/tie.hh include/bow.hh \
-	include/directional-spanner.hh include/spanner.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/drul-array.hh include/direction.hh include/rod.hh \
-	include/note-head.hh include/rhythmic-head.hh include/item.hh \
-	include/boxes.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-time-description.o: time-description.cc include/time-description.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/varray.hh include/debug.hh \
-	../flower/include/dstream.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/warn.hh
-timing-grav.o: timing-grav.cc include/score-grav.hh \
-	include/engraver-group.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/translator-group.hh include/global-translator.hh \
-	../flower/include/pqueue.hh include/timing-grav.hh \
-	include/timing-translator.hh include/time-description.hh \
-	include/grouping.hh include/command-request.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh
-timing-translator.o: timing-translator.cc include/timing-translator.hh \
-	include/translator.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/time-description.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/grouping.hh \
-	include/minterval.hh ../flower/include/interval.hh \
-	include/command-request.hh include/request.hh include/music.hh \
-	include/direction.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/translator-group.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/global-translator.hh ../flower/include/pqueue.hh
-translation-property.o: translation-property.cc \
-	include/translation-property.hh include/music.hh \
-	../flower/include/virtual-methods.hh ../lib/include/input.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/minterval.hh \
-	../flower/include/interval.hh ../flower/include/compare.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh include/lily-proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/scalar.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-translator-ctors.o: translator-ctors.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/compare.hh ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/translator.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/lily-proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-translator-group.o: translator-group.cc include/music-output-def.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	include/translator-group.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/parray.hh \
-	../lib/include/input.hh include/debug.hh \
-	../flower/include/dstream.hh ../lib/include/warn.hh \
-	../flower/include/rational.hh
-translator.o: translator.cc include/translator.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/translator-group.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	../flower/include/dictionary-iter.hh \
-	../flower/include/assoc-iter.hh ../flower/include/rational.hh
-type-swallow-trans.o: type-swallow-trans.cc \
-	include/type-swallow-trans.hh include/translator.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	include/musical-request.hh include/request.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh include/direction.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh
-version.o: version.cc include/main.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh
-vertical-align-elem.o: vertical-align-elem.cc \
-	include/vertical-align-elem.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh
-vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/rod.hh \
-	include/vertical-align-grav.hh include/engraver.hh \
-	include/request.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/input.hh \
-	include/music.hh include/minterval.hh \
-	include/score-elem-info.hh ../flower/include/scalar.hh \
-	include/staff-info.hh include/translator.hh \
-	../flower/include/dictionary.hh ../flower/include/assoc.hh \
-	include/vertical-align-spanner.hh include/spanner.hh \
-	include/vertical-align-elem.hh include/vertical-group-elem.hh
-vertical-align-spanner.o: vertical-align-spanner.cc \
-	include/vertical-align-spanner.hh include/spanner.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh \
-	include/vertical-align-elem.hh
-vertical-group-elem.o: vertical-group-elem.cc \
-	include/vertical-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh \
-	../flower/include/real.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/interval.hh \
-	include/axis-group-administration.hh include/item.hh \
-	include/boxes.hh include/drul-array.hh include/direction.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh
-vertical-group-spanner.o: vertical-group-spanner.cc \
-	include/vertical-group-spanner.hh include/axis-group-spanner.hh \
-	include/spanner.hh include/lily-proto.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/score-elem.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	../flower/include/virtual-methods.hh \
-	../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/interval.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh \
-	include/axis-group-element.hh \
-	include/axis-group-administration.hh \
-	include/vertical-group-elem.hh include/item.hh include/boxes.hh \
-	include/p-col.hh include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-item.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-voice-iterator.o: voice-iterator.cc include/translator-group.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/lily-proto.hh ../lib/include/proto.hh \
-	../flower/include/virtual-methods.hh include/translator.hh \
-	../flower/include/scalar.hh ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh ../flower/include/varray.hh \
-	../flower/include/parray.hh ../lib/include/input.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/voice-iterator.hh \
-	include/music-iterator.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh include/music-list.hh \
-	include/music.hh include/minterval.hh \
-	../flower/include/interval.hh
-warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/debug.hh ../flower/include/dstream.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh include/lily-proto.hh \
-	../lib/include/warn.hh include/my-lily-lexer.hh \
-	../flower/include/varray.hh include/includable-lexer.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/plet.hh \
-	include/time-description.hh ../lib/include/source-file.hh \
-	../lib/include/source.hh include/main.hh \
-	../lib/include/input.hh
-word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \
-	../flower/include/varray.hh ../flower/include/interval.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/compare.hh include/lily-proto.hh \
-	../lib/include/proto.hh include/colhpos.hh include/paper-def.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/arithmetic-operator.hh \
-	include/music-output-def.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh \
-	../flower/include/virtual-methods.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../flower/include/dictionary.hh \
-	../flower/include/assoc.hh include/p-score.hh \
-	../flower/include/parray.hh include/music-output.hh \
-	include/debug.hh ../flower/include/dstream.hh \
-	../lib/include/warn.hh include/p-col.hh \
-	include/horizontal-group-item.hh \
-	include/horizontal-group-elem.hh include/axis-group-element.hh \
-	include/score-elem.hh ../flower/include/directed-graph.hh \
-	include/graphical-element.hh include/offset.hh include/axes.hh \
-	include/axis-group-administration.hh include/axis-group-item.hh \
-	include/item.hh include/boxes.hh include/drul-array.hh \
-	include/direction.hh include/rod.hh include/spring-spacer.hh \
-	include/line-spacer.hh ../flower/include/vector.hh \
-	include/col-info.hh ../flower/include/pointer.hh
-
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-am: Makefile $(PROGRAMS) $(HEADERS)
-
-install-exec-am: install-binPROGRAMS
-
-uninstall-am: uninstall-binPROGRAMS
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
-all: all-recursive all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(bindir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-		distclean-tags distclean-generic clean-am
-
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
-clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
-install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-am install-exec-am uninstall-am install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# force these: Make can't know these have to be generated in advance
-my-lily-lexer.cc: parser.hh
-lexer.cc: parser.hh
-
-# ugh, autoconf assumes to get $(LEX_OUTPUT_ROOT).c ...
-.ll.cc:
-	@echo "must override autoconf; ignore warning"
-	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).cc $@
-#.yy.hh:
-parser.hh: parser.yy
-	$(BISON) -d $<
-	mv $<.tab.h $@
-	mv $<.tab.c $(shell basename $@ .hh).cc
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-make-in-build:
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lily/VERSION b/lily/VERSION
index 57e4071c29..0523ff52f5 100644
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,4 +1,4 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 56
+PATCH_LEVEL = 57
 MY_PATCH_LEVEL =
diff --git a/lily/beam.cc b/lily/beam.cc
index a463ff233f..6ad3fe78c0 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -426,34 +426,36 @@ Beam::set_stemlens ()
    be more generous regarding beam position between stafflines
    */
   Real q = (yspan_f / interline_f - yspan_i) * interline_f;
-  if (q < interline_f / 3 - beam_thickness / 2)
+  if ((quantisation_ < NORMAL) && (q < interline_f / 3 - beam_thickness / 2))
     left_pos = (Pos) (left_pos | INTER);
 
+
   if (multiple_i_ > 1)
     left_pos = (Pos) (dir_ > 0 ? HANG : SIT);
 
-  // ugh, rounding problems!
+  // ugh, rounding problems! (enge floots)
   const Real EPSILON = interline_f / 10;
   do
     { 
       left_y_ += dy * dir_;
       quantise_left_y (left_pos, dy);
       dy = 0;
-      for (int j=0; j < stems_.size (); j++)
+      for (int i=0; i < stems_.size (); i++)
 	{
-	  Stem *s = stems_[j];
+	  Stem *s = stems_[i];
 	  if (s->transparent_b_)
 	    continue;
 
 	  Real x = s->hpos_f () - x0;
 	  s->set_stemend (left_y_ + slope_f_ * x);
 	  Real y = s->stem_length_f ();
-	  int mult = max (stems_[j]->beams_left_i_, stems_[j]->beams_right_i_);
-	  if (mult > 1)
+	  // duh: 
+	  int mult_i = stems_[i]->beams_left_i_ >? stems_[i]->beams_right_i_;
+	  if (mult_i > 1)
 	      // dim(y) = internote
-	      y -= (Real)(mult - 1) * interbeam_f / internote_f;
-	  if (y < MINIMUM_STEMLEN[mult])
-	    dy = dy >? (MINIMUM_STEMLEN[mult] - y);
+	      y -= (Real)(mult_i - 1) * interbeam_f / internote_f;
+	  if (y < MINIMUM_STEMLEN[mult_i])
+	    dy = dy >? (MINIMUM_STEMLEN[mult_i] - y);
 	}
     } while (abs (dy) > EPSILON);
 }
diff --git a/lily/bezier.cc b/lily/bezier.cc
index 657cfea0d7..27b8329fc2 100644
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -7,57 +7,109 @@
 */
 
 #include <math.h>
-#include "offset.hh"
 #include "bezier.hh"
+#include "direction.hh"
+
+#ifndef STANDALONE
+#include "direction.hh"
 #include "dimen.hh"
 #include "paper-def.hh"
+#include "debug.hh"
+#include "main.hh"
+#define SLUR_DOUT if (check_debug && !monitor->silent_b ("Slur")) cout
+#else
+#define SLUR_DOUT cerr
+#endif
+
+void
+Curve::flipy ()
+{
+  // ugh, Offset should have mirror funcs
+  for (int i = 0; i < size (); i++)
+    (*this)[i].mirror (Y_AXIS);
+}
+
+int
+Curve::largest_disturbing ()
+{
+  Real alpha = 0;
+  int j = 0;
+  for (int i = 1; i < size (); i++)
+    {
+      if ((*this)[i].y () > 0)
+        {
+	  Real phi = (*this)[i].y () / (*this)[i].x ();
+	  if (phi > alpha)
+	    {
+	      alpha = phi;
+	      j = i;
+	    }
+	}
+    }
+  return j;
+}
 
-Bezier::Bezier (int steps_i)
+void
+Curve::rotate (Real phi)
 {
-  steps_i_ = steps_i;
-  curve_ = new Offset [steps_i_ + 1];
+  Offset rot (complex_exp (Offset (0,phi)));
+
+  for (int i = 1; i < size (); i++)
+    (*this)[i] = complex_multiply (rot, (*this)[i]);
 }
 
-Bezier::~Bezier ()
+void
+Curve::translate (Offset o)
 {
-  delete[] curve_;
+  for (int i = 1; i < size (); i++)
+    (*this)[i] += o;
+}
+
+Bezier::Bezier (int steps)
+{
+  control_.set_size (4);
+  curve_.set_size (steps);
 }
 
 //from GNU gs3.33: ega.c
 void
-Bezier::calc (Offset control[4])
+Bezier::calc ()
 {       
-  Real dt = 1.0 / steps_i_;
-  Real cx = 3.0 * (control[1].x() - control[0].x());
-  Real bx = 3.0 * (control[2].x() - control[1].x()) - cx;
-  Real ax = control[3].x() - (control[0].x() + cx + bx);
-  Real cy = 3.0 * (control[1].y () - control[0].y ());
-  Real by = 3.0 * (control[2].y () - control[1].y ()) - cy; 
-  Real ay = control[3].y () - (control[0].y () + cy + by);
+  Real dt = 1.0 / curve_.size ();
+  Offset c = 3.0 * (control_[1] - control_[0]);
+  Offset b = 3.0 * (control_[2] - control_[1]) - c;
+  Offset a = control_[3] - (control_[0] + c + b);
   Real t = 0.0;
-  int i = 0;
-  while ( t <= 1.0 )
+  for (int i = 0; i < curve_.size (); i++ )
     {    
-      curve_[i].x() = ((ax * t + bx) * t + cx) * t + control[0].x();
-      curve_[i++].y () = ((ay * t + by) * t + cy) * t + control[0].y ();
+      curve_[i] = ((a * t + b) * t + c) * t + control_[0];
       t += dt;
     }
 }
 
+void
+Bezier::set (Array<Offset> points)
+{       
+  assert (points.size () == 4);
+  control_ = points;
+}
+
 Real
 Bezier::y (Real x)
 {
-  if (x <= curve_[0].x())
+  if (x <= curve_[0].x ())
     return curve_[0].y ();
-  for (int i = 1; i < steps_i_; i++ )
+  for (int i = 1; i < curve_.size (); i++ )
     {
-      if (x < curve_[i].x())
+      if (x < curve_[i].x ())
+	//           ^ ? see below   
 	{
-	  Real lin = (x - curve_[i-1].x()) / (curve_[i].x() - curve_[i-1].x());
-	  return curve_[i-1].y () + lin * (curve_[i].y () - curve_[i-1].y ());
+	  Real lin = (x - curve_[i-1].x ()) / (curve_[i] - curve_[i-1]).x ();
+	  //                     ^ ?
+	  return (curve_[i-1] + lin * (curve_[i] - curve_[i-1])).y ();
         }
     }
-  return curve_[steps_i_-1].y ();
+  return curve_[curve_.size ()-1].y ();
 }
 
 
@@ -65,9 +117,9 @@ Bezier_bow::Bezier_bow (Paper_def* paper_l)
   : Bezier(10)
 {
   paper_l_ = paper_l;
+  return_.set_size (4);
 }
 
-
 /* 
   from feta-sleur.ly
 
@@ -90,36 +142,306 @@ Bezier_bow::Bezier_bow (Paper_def* paper_l)
 */
 
 void
-Bezier_bow::calc (Real dx, Real dy, Real h, Real d)
+Bezier_bow::blow_fit ()
+{
+  Real dy1 = check_fit_f ();
+  if (!dy1)
+    return;
+
+  // be careful not to take too big step
+  Real f = 0.75;
+  Real h1 = dy1 * f;
+  control_[1].y () += h1; 
+  control_[2].y () += h1; 
+  return_[1].y () += h1; 
+  return_[2].y () += h1; 
+
+  Real dy2 = check_fit_f ();
+  if (!dy2)
+    return;
+
+#ifndef STANDALONE
+  Real epsilon = paper_l_->rule_thickness ();
+#else
+  Real epsilon = 1.5 * 0.4 PT;
+#endif
+  if (abs (dy2 - dy1) < epsilon)
+    return;
+  
+  /*
+    Assume 
+      dy = B (h) 
+    with 
+      B (h) = a * h + b;
+
+    Then we get for h : B (h) = 0
+
+     B(0)  = dy1 = a * 0 + b   =>   b = dy1
+     B(h1) = dy2 = a * h1 + b  =>   a * f * dy1 + b = dy2
+
+	 =>
+
+     a * dy1 / 2 + dy1 = dy2  =>  a = (dy2 - dy1) / (f * dy1)
+   */
+
+  Real a = (dy2 - dy1) / (f * dy1);
+  Real b = dy1;
+  Real h = -b / a;
+
+  control_[1].y () += -h1 +h; 
+  control_[2].y () = -h1 +h; 
+  return_[1].y () = -h1 +h;
+  return_[2].y () = -h1 +h; 
+}
+
+Real
+Bezier_bow::calc_f (Real height)
+{
+  transform ();
+  calc_default (height);
+  Bezier::calc ();
+  
+  Real dy = check_fit_f ();
+  calc_return (0, 0);
+
+  transform_controls_back ();
+  return dy;
+}
+
+void
+Bezier_bow::calc ()
 {
+  transform ();
+  calc_default (0);
+  Bezier::calc ();
+  
+  if (check_fit_bo ())
+    calc_return (0, 0);
+  else
+    {
+      calc_controls ();
+      blow_fit ();
+    }
+
+  transform_controls_back ();
+}
+
+void
+Bezier_bow::calc_return (Real begin_alpha, Real end_alpha)
+{
+#ifndef STANDALONE
+  Real thick = 1.8 * paper_l_->rule_thickness ();
+#else
+  Real thick = 10.0 * 1.8 * 0.4 PT;
+#endif
+  return_[0] = control_[3];
+
+  return_[1] = control_[2] - thick * complex_exp (Offset (0, 90 + end_alpha));
+  return_[2] = control_[1] - thick * complex_exp (Offset (0, 90 - begin_alpha));  
+  
+  /*
+  return_[1].x () = control_[2].x () - thick * cos (90 + end_alpha);
+  return_[1].y () = control_[2].y () - thick * sin (90 + end_alpha);
+  return_[2].x () = control_[1].x () - thick * cos (90 - begin_alpha);
+  return_[2].y () = control_[1].y () - thick * sin (90 - begin_alpha);
+  */
+  return_[3] = control_[0];
+}
+
+void
+Bezier_bow::calc_controls ()
+{
+  // ugh: tooo steep
+//  Real default_rc = atan (control_[1].y () / control_[1].x ());
+  
+  Offset ijk_p (control_[3].x () / 2, control_[1].y ());
+  SLUR_DOUT << "ijk: " << ijk_p.x () << ", " << ijk_p.y () << endl;
+
+  Real default_rc = ijk_p.y () / ijk_p.x ();
+
+  int begin_disturb = encompass_.largest_disturbing ();
+  Offset begin_p = begin_disturb ? Offset (encompass_[begin_disturb].x (), 
+    encompass_[begin_disturb].y ()) : ijk_p;
+  Real begin_rc = begin_p.y () / begin_p.x ();
+  if (default_rc > begin_rc)
+    {
+      begin_p = ijk_p;
+      begin_rc = default_rc;
+    }
+
   // ugh
+  Curve reversed;
+  reversed.set_size (encompass_.size ());
+  Real b = control_[3].x ();
+  for (int i = 0; i < encompass_.size (); i++ )
+    {
+      reversed[i] = Offset (b,0) - encompass_[encompass_.size () - i -1];
+      /*
+      reversed[i].x () = b - encompass_[encompass_.size () - i - 1].x ();
+      reversed[i].y () = encompass_[encompass_.size () - i - 1].y ();
+      */
+    }
+
+  int end_disturb = reversed.largest_disturbing ();
+  end_disturb = end_disturb ? encompass_.size () - end_disturb - 1 : 0;
+  Offset end_p = end_disturb ? Offset (encompass_[end_disturb].x (), 
+    encompass_[end_disturb].y ()) : ijk_p;
+  Real end_rc = end_p.y () / (control_[3].x () - end_p.x ());
+  if (default_rc > end_rc)
+    {
+      end_p = ijk_p;
+      end_rc = default_rc;
+    }
+  SLUR_DOUT << "begin " << begin_p.x () << ", " << begin_p.y () << endl;
+  SLUR_DOUT << "end " << end_p.x () << ", " << end_p.y () << endl;
+
+  Real height =control_[1].y (); 
+  for (int i = 0; i < encompass_.size (); i++ )
+    height = height >? encompass_[i].y ();
+
+  // emperic computer science:
+  //   * tangents somewhat steeper than minimal line
+  Real rc_correct = 2.4;
+
+  begin_rc *= rc_correct;
+  end_rc *= rc_correct;
+  Real rc1 = begin_rc;
+  Real rc2 = -end_rc;
+  
+  Real begin_alpha = atan (begin_rc);
+  Real end_alpha = atan (-end_rc);
+  Real theta = (begin_alpha - end_alpha) / 2;
+
+  // if we have two disturbing points, have height line through those...
+  /*
+    UGH UGH UGH! NEVER compare floats with == 
+   */
+  if (!((begin_p.x () == end_p.x ()) && (begin_p.y () == end_p.y ())))
+      theta = atan (end_p.y () - begin_p.y ()) / (end_p.x () - begin_p.x ());
+
+  Real rc3 = tan (theta);
+  // ugh: be less steep
+  rc3 /= 2*rc_correct;
+
+  Real c2 = -rc2 * control_[3].x ();
+  Real c3 = begin_p.y () > end_p.y () ? begin_p.y () 
+    - rc3 * begin_p.x () : end_p.y () - rc3 * end_p.x ();
+
+  SLUR_DOUT << "y1 = " << rc1 << " x + 0" << endl;
+  SLUR_DOUT << "y2 = " << rc2 << " x + " << c2 << endl;
+  SLUR_DOUT << "y3 = " << rc3 << " x + " << c3 << endl;
+  control_[1].x () = c3 / (rc1 - rc3);
+  control_[1].y () = rc1 * control_[1].x ();
+  control_[2].x () = (c3 - c2) / (rc2 - rc3);
+  SLUR_DOUT << "c2.x () = " << control_[2].x () << endl;
+  SLUR_DOUT << "(c3 - c2) = " << (c3 - c2) << endl;
+  SLUR_DOUT << "(rc2 - rc3) = " << (rc2 - rc3) << endl;
+  control_[2].y () = rc2 * control_[2].x () + c2;
+  SLUR_DOUT << "c2.y ()" << control_[2].y () << endl;
+
+  calc_return (begin_alpha, end_alpha);
+}
+
+bool
+Bezier_bow::check_fit_bo ()
+{
+  for (int i = 1; i < encompass_.size () - 1; i++)
+    if (encompass_[i].y () > y (encompass_[i].x ()))
+      return false;
+  return true;
+}
+
+Real
+Bezier_bow::check_fit_f ()
+{
+  Real dy = 0;
+  for (int i = 1; i < encompass_.size () - 1; i++)
+    dy = dy >? (encompass_[i].y () - y (encompass_[i].x ()));
+  return dy;
+}
+
+void
+Bezier_bow::set (Array<Offset> points, int dir)
+{
+  dir_ = dir;
+  encompass_ = points;
+}
+
+void
+Bezier_bow::transform ()
+{
+  origin_ = encompass_[0];
+  encompass_.translate (-origin_);
+
+  Offset delta = encompass_[encompass_.size () - 1] - encompass_[0];
+  /*
+  Real dx = encompass_[encompass_.size () - 1].x () - encompass_[0].x (); 
+  Real dy = encompass_[encompass_.size () - 1].y () - encompass_[0].y ();
+  */
+
+  alpha_ = delta.arg ();
+  encompass_.rotate (-alpha_);
+
+  if (dir_ == DOWN)
+    encompass_.flipy ();
+}
+
+void
+Bezier_bow::transform_controls_back ()
+{
+  // silly name; let's transform encompass back too
+  // to allow recalculation without re-set()ting encompass array
+  if (dir_ == DOWN)
+    {
+      control_.flipy ();
+      return_.flipy ();
+      encompass_.flipy ();
+    }
+
+  control_.rotate (alpha_);
+  control_.translate (origin_);
+
+  return_.rotate (alpha_);
+  return_.translate (origin_);
+
+  encompass_.rotate (alpha_);
+  encompass_.translate (origin_);
+}
+
+void
+Bezier_bow::calc_default (Real h)
+{
   Real pi = M_PI;
-  // ugh
+#ifndef STANDALONE
   Real staffsize_f = paper_l_->get_var ("barsize");
+#else
+  Real staffsize_f = 16 PT;
+#endif
+
   Real height_limit = staffsize_f;
   Real alpha = height_limit * pi / 2.0;
   Real ratio = 1.0/3.0;
   Real beta = 3.0/4.0 * pi * ratio/alpha;
 
-  Real b = sqrt (dx * dx + dy * dy);
+
+  Offset delta (encompass_[encompass_.size () - 1].x () - encompass_[0].x (), 0);
+
+  Real d = 1;
+
+  Real b = delta.length ();
   Real indent = 2.0/5.0 * alpha * atan (beta * b);
   // ugh, ugly height hack, see lily-ps-defs.tex
   Real height = (indent + h) * d;
  
-  Offset control[4];
-  control[0] = Offset(0, 0);
-  control[1] = Offset(indent, height);
-  control[2] = Offset(b - indent, height);
-  control[3] = Offset( b, 0 );
+//  Offset control[4] = {0, 0, indent, height, b - indent, height, b, 0 };
+  Array<Offset> control;
+  control.push (Offset (0, 0));
+  control.push (Offset (indent, height));
+  control.push (Offset (b - indent, height));
+  control.push (Offset (b, 0));
+  Bezier::set (control);
  
-  Real phi = dx ? atan (dy/dx) : sign (dy) * pi / 2.0;
-  Real sphi = sin (phi);
-  Real cphi = cos (phi);
-  for (int i = 1; i < 4; i++)
-    {
-      control[i].x() = cphi * control[i].x() - sphi * control[i].y ();
-      control[i].y () = sphi * control[i].x() + cphi * control[i].y ();
-    }
-  Bezier::calc (control);
+//  Real phi = dx ? atan (dy/dx) : sign (dy) * pi / 2.0;
+//  control.rotate (phi);
 }
 
diff --git a/lily/bow.cc b/lily/bow.cc
index 7f73df520c..9433f69a18 100644
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -30,12 +30,6 @@ Bow::center () const
   return Offset (w/2,dy );
 }
 
-Real
-Bow::height_f () const
-{
-  return 0;
-}
-
 Molecule*
 Bow::brew_molecule_p () const
 {
@@ -59,3 +53,9 @@ Bow::brew_molecule_p () const
   return output;
 }
 
+Real
+Bow::height_f () const
+{
+  return 0;
+}
+
diff --git a/lily/col-info.cc b/lily/col-info.cc
index 9fa43ef8d3..769bc5ed72 100644
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -19,6 +19,12 @@ Colinfo::print() const
     DOUT << "fixed at " << fixed_position()<<", ";
   assert (pcol_l_);
   DOUT << width_.str();
+  Direction d = LEFT;
+  do {
+    for (int i=0; i < rods_[d].size (); i++)
+      rods_[d][i].print ();
+  } while (flip (&d) != LEFT);
+  
   DOUT <<"}\n";
 #endif
 }
@@ -58,3 +64,9 @@ Colinfo::rank_i () const
 {
   return pcol_l_->rank_i ();
 }
+
+void
+Spacer_rod::print ()const
+{
+  DOUT << "Other " << other_idx_ << "dist = " << distance_f_ << '\n';
+}
diff --git a/lily/direction.cc b/lily/direction.cc
new file mode 100644
index 0000000000..a0e0e14a50
--- /dev/null
+++ b/lily/direction.cc
@@ -0,0 +1,25 @@
+
+/*   
+  direction.cc --  implement 
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  
+ */
+
+#include "direction.hh"
+
+String direction_str (Direction d, Axis a)
+{
+  if (!d)
+    return "center";
+  if (a == Y_AXIS)
+    {
+       return d == UP ? "up" : "down";
+    }
+  else if (a == X_AXIS)
+    {
+      return d == LEFT ? "left" : "right" ;
+    }
+}
diff --git a/lily/include/GNUmakefile b/lily/include/GNUmakefile
deleted file mode 100644
index bee7c9c5bc..0000000000
--- a/lily/include/GNUmakefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# lily/include/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-biltdir=../../../build/lily/include
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-wild-check: check-noinst-headers
-
-
-check-noinst-headers:
-ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
-	@echo \"$(noinst_HEADERS)\"
-	@echo \"$(CURRENT_noinst_HEADERS)\"
-	@echo  noinst_HEADERS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/lily/include/Makefile b/lily/include/Makefile
new file mode 100644
index 0000000000..da392fe30f
--- /dev/null
+++ b/lily/include/Makefile
@@ -0,0 +1,12 @@
+# lily/include/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+
+# identify module:
+#
+MODULE_NAME = lilypond
+include ./$(depth)/make/Include.make
+
diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am
deleted file mode 100644
index 84a3da5924..0000000000
--- a/lily/include/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# lily/include/Makefile.am.wild
-
-noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bezier.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh includable-lexer.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/lily/include/Makefile.am.wild b/lily/include/Makefile.am.wild
deleted file mode 100644
index e3d95d5172..0000000000
--- a/lily/include/Makefile.am.wild
+++ /dev/null
@@ -1,14 +0,0 @@
-# lily/include/Makefile.am.wild
-
-noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in
deleted file mode 100644
index 72f2113988..0000000000
--- a/lily/include/Makefile.in
+++ /dev/null
@@ -1,234 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# lily/include/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bezier.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh includable-lexer.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/include/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = lily/include
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile $(HEADERS)
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-tags mostlyclean-generic
-
-clean:  clean-tags clean-generic mostlyclean
-
-distclean:  distclean-tags distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 5f5c59d7b4..f5c871ed05 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -7,8 +7,12 @@
 #ifndef BEZIER_HH
 #define BEZIER_HH
 
+#ifndef STANDALONE
 #include "lily-proto.hh"
+#endif
+
 #include "real.hh"
+#include "curve.hh"
 
 /**
   Simple bezier curve
@@ -17,20 +21,21 @@ class Bezier
 {
 public:
   Bezier (int steps_i);
-  virtual ~Bezier ();
 
   /**
   Calculate bezier curve into Offset (x,y) array.
   */
-  void calc (Offset control[4]);
+  void calc ();
+
+  void set (Array<Offset> points);
 
   /**
   Return y that goes with x by interpolation.
   */
   Real y (Real x);
 
-  int steps_i_;
-  Offset* curve_;
+  Curve curve_;
+  Curve control_;
 };
 
 /**
@@ -44,9 +49,26 @@ public:
   /**
    Calculate bezier curve for bow from bow parameters.
    */
-  void calc (Real dx, Real dy, Real h, Real d);
+  void blow_fit ();
+  Real calc_f (Real height);
+  void calc ();
+  void calc_controls ();
+  void calc_default (Real h);
+  void calc_return (Real begin_alpha, Real end_alpha);
+  bool check_fit_bo ();
+  Real check_fit_f ();
+  void set (Array<Offset> points, int dir);
+  void transform ();
+  void transform_controls_back ();
+
   Paper_def* paper_l_;
+  Curve encompass_;
+  int dir_;
+  Real alpha_;
+  Offset origin_;
+  Curve return_;
 };
 
 
 #endif // BEZIER_HH
+
diff --git a/lily/include/bow.hh b/lily/include/bow.hh
index c2908836d5..88f96bc429 100644
--- a/lily/include/bow.hh
+++ b/lily/include/bow.hh
@@ -20,8 +20,9 @@ protected:
   Drul_array<Real> dy_f_drul_;
   Drul_array<Real> dx_f_drul_;
 
-  virtual Real height_f () const;
   virtual Molecule* brew_molecule_p () const;
+  virtual Real height_f () const;
+
 public:
   Bow();
   DECLARE_MY_RUNTIME_TYPEINFO;
diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 405712e99d..8e64f68d46 100644
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -13,17 +13,27 @@
 #include "lily-proto.hh"
 #include "pointer.hh"
 #include "interval.hh"
-#include "assoc.hh"
+#include "drul-array.hh"
+
+struct Spacer_rod {
+  Real distance_f_;
+  int other_idx_;
+  void print () const;
+};
+
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
   Paper_column *pcol_l_;
   P<Real> fixpos_p_;
-  Assoc<int, Real> min_dists_assoc_;
+
   Interval width_;
   int rank_i_;
   /// did some tricks to make this column come out.
   bool ugh_b_;		
+
+  Drul_array< Array<Spacer_rod> > rods_;
+  
   /* *************** */
   Colinfo();
   Colinfo (Paper_column *,Real const *);
diff --git a/lily/include/direction.hh b/lily/include/direction.hh
index 66abd5f379..358c482517 100644
--- a/lily/include/direction.hh
+++ b/lily/include/direction.hh
@@ -1,5 +1,5 @@
 /*
-  direction.hh -- declare 
+  direction.hh -- declare Direction
 
   source file of the GNU LilyPond music typesetter
 
@@ -10,6 +10,8 @@
 #ifndef DIRECTION_HH
 #define DIRECTION_HH
 
+#include "axes.hh"
+
 enum Direction 
 {
   UP=1,
@@ -36,5 +38,6 @@ flip (Direction *i) {
  */
 template<class T> minmax (Direction d, T, T);
 
+String direction_str (Direction, Axis);
 
 #endif // DIRECTION_HH
diff --git a/lily/include/ineq-constrained-qp.hh b/lily/include/ineq-constrained-qp.hh
index a7bd31693d..5cb5c43eb9 100644
--- a/lily/include/ineq-constrained-qp.hh
+++ b/lily/include/ineq-constrained-qp.hh
@@ -18,12 +18,12 @@
 class Ineq_constrained_qp {
     friend class Active_constraints;
 
-    Array<Vector> cons;
-    Array<Real> consrhs;
+    Array<Vector> cons_;
+    Array<Real> consrhs_;
 public:
-    Matrix quad;
-    Vector lin;
-    Real const_term;
+    Matrix quad_;
+    Vector lin_;
+    Real const_term_;
 
 
     /**
@@ -40,9 +40,7 @@ public:
     /**
       @return the number of variables in the problem
       */
-    int dim() const{
-	return lin.dim();
-    }
+    int dim() const;
 
     /**
       add a constraint
diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 9f7bb3f023..523a00b865 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -13,6 +13,7 @@
 #include "fproto.hh"
 #include "scalar.hh"
 #include "direction.hh"
+#include "curve.hh"
 
 /** handy interface to symbol table
  */
@@ -52,6 +53,7 @@ struct Lookup {
     
   Atom dots () const;
   Atom slur (Real &dy, Real &dx, Real ht, Direction dir) const;
+  Atom control_slur (Array<Offset> controls, Real dx, Real dy) const;
   Atom plet (Real &dy, Real &dx, Direction dir) const;
   Atom tex_slur (int dy, Real &dx, Direction dir) const;
   Atom ps_slur (Real dy, Real dx, Real ht, Real dir) const;
diff --git a/lily/include/main.hh b/lily/include/main.hh
index c966f37591..ce4cfe76a4 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -25,6 +25,7 @@ extern bool no_timestamps_global_b;
 extern int exit_status_i_;
 extern bool experimental_features_global_b;
 extern bool postscript_global_b;
+extern bool embedded_mf_global_b;
 
 extern String default_outname_base_global;
 extern String default_outname_suffix_global;
diff --git a/lily/include/offset.hh b/lily/include/offset.hh
deleted file mode 100644
index 9407570463..0000000000
--- a/lily/include/offset.hh
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  offset.hh -- part of GNU LilyPond
-
-  (c) 1996,97 Han-Wen Nienhuys
-*/
-
-#ifndef OFFSET_HH
-#define OFFSET_HH
-
-#include "real.hh"
-#include "axes.hh"
-
-
-/// 2d vector 
-struct Offset {
-  Real coordinate_a_[NO_AXES];
-    
-  Real &y() { return coordinate_a_[Y_AXIS]; }
-  Real &x() { return coordinate_a_[X_AXIS]; }
-  Real y() const { return coordinate_a_[Y_AXIS]; }
-  Real x() const { return coordinate_a_[X_AXIS]; }
-    
-  Real &operator[](Axis i) {
-    return coordinate_a_[i];
-  }
-  Real operator[](Axis i) const{
-    return coordinate_a_[i];
-  }
-  String str () const;
-    
-  Offset operator+=(Offset o) {
-    x()+=o.x ();
-    y()+=o.y ();
-    return *this;
-  }
-  Offset (Real ix , Real iy) {
-    x()=ix;
-    y()=iy;
-  }
-  Offset() {
-    x()=0.0;
-    y()=0.0;
-  }
-};
-
-inline Offset
-operator+ (Offset o1, Offset const& o2)
-{
-  o1 += o2;
-  return o1;
-}
-    
-#endif // OFFSET_HH
-
-
diff --git a/lily/include/out/dummy.dep b/lily/include/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lily/include/out/dummy.dep
diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index 6c018c5a9f..db985df6c5 100644
--- a/lily/include/qlpsolve.hh
+++ b/lily/include/qlpsolve.hh
@@ -37,8 +37,8 @@ class Active_constraints {
 public:
   String status() const;
     
-  Vector vec (int k) const { return opt->cons[k]; }
-  Real rhs (int k) const { return opt->consrhs[k]; }
+  Vector vec (int k) const { return opt->cons_[k]; }
+  Real rhs (int k) const { return opt->consrhs_[k]; }
     
 
   /** drop constraint. drop constraint k from the active set. k is the index of the
diff --git a/lily/include/slur-grav.hh b/lily/include/slur-grav.hh
index 3eb6e182dc..a27e051895 100644
--- a/lily/include/slur-grav.hh
+++ b/lily/include/slur-grav.hh
@@ -18,13 +18,13 @@ class Slur_engraver :public Engraver {
   Direction dir_;
 
 protected:
-
   virtual bool do_try_request (Request*);
   virtual void do_process_requests();
   virtual void acknowledge_element (Score_elem_info);
   virtual void do_pre_move_processing();
   virtual void do_post_move_processing();
   virtual void do_removal_processing ();
+
 public:
   TRANSLATOR_CLONE(Slur_engraver);
   Slur_engraver();
diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 8d2212b294..e3df46d0ae 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -11,6 +11,7 @@
 #include "lily-proto.hh"
 #include "parray.hh"
 #include "bow.hh"
+#include "curve.hh"
 
 /**
   A #Bow# which tries to drape itself around the stems too.
@@ -19,7 +20,12 @@ class Slur : public Bow {
 public:
   Link_array<Note_column> encompass_arr_;
   void add (Note_column*);
+
 protected:
+  virtual Molecule* brew_molecule_p () const;
+  Array<Offset> get_notes () const;
+  Array<Offset> get_controls () const;
+
   virtual void set_default_dir();
   virtual void do_post_processing();
   virtual void do_add_processing ();
diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index ffd59f5f68..27d2f15333 100644
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -16,6 +16,8 @@
 #include "colhpos.hh"
 #include "moment.hh"
 
+
+
 /** 
   Determine positions of columns connected by springs and held apart by rods.
   
@@ -45,9 +47,10 @@ class Spring_spacer : public Line_spacer {
   friend class Durations_iter;
     
   Pointer_list<Idealspacing *> ideal_p_list_;
-  Array<Colinfo> cols;
+  Array<Colinfo> cols_;
   Array<Colinfo> loose_col_arr_;
-    
+  Array<Spacer_rod> rods_;
+  
   /// mark column #i# as being loose.
   void loosen_column (int i);
   /// the index of #c# in #cols#
@@ -57,7 +60,7 @@ class Spring_spacer : public Line_spacer {
   Vector find_initial_solution() const;
 
   /// does #this# contain the column #w#? 
-  bool contains (Paper_column const *w);
+  bool contains_b (Paper_column const *w);
 
   /// make the energy function
   void make_matrices (Matrix &quad, Vector &lin,Real&) const;
diff --git a/lily/ineq-constrained-qp.cc b/lily/ineq-constrained-qp.cc
index f14697dbb6..f1cfebfdd2 100644
--- a/lily/ineq-constrained-qp.cc
+++ b/lily/ineq-constrained-qp.cc
@@ -9,6 +9,7 @@
 #include "qlpsolve.hh"
 #include "debug.hh"
 #include "choleski.hh"
+#include "main.hh"
 
 /*
   MAy be this also should go into a library
@@ -16,6 +17,7 @@
 
 const int MAXITER=100;		// qlpsolve.hh
 
+
 /*
   assume x (idx) == value, and adjust constraints, lin and quad accordingly
 
@@ -24,35 +26,35 @@ const int MAXITER=100;		// qlpsolve.hh
 void
 Ineq_constrained_qp::eliminate_var (int idx, Real value)
 {
-  Vector row (quad.row (idx));
+  Vector row (quad_.row (idx));
   row*= value;
 
-  quad.delete_row (idx);
+  quad_.delete_row (idx);
 
-  quad.delete_column (idx);
+  quad_.delete_column (idx);
 
-  lin.del (idx);
+  lin_.del (idx);
   row.del (idx);
-  lin +=row ;
+  lin_ +=row ;
 
-  for (int i=0; i < cons.size(); i++)
+  for (int i=0; i < cons_.size(); i++)
     {
-      consrhs[i] -= cons[i](idx) *value;
-      cons[i].del (idx);
+      consrhs_[i] -= cons_[i](idx) *value;
+      cons_[i].del (idx);
     }
 }
 
 void
 Ineq_constrained_qp::add_inequality_cons (Vector c, double r)
 {
-  cons.push (c);
-  consrhs.push (r);
+  cons_.push (c);
+  consrhs_.push (r);
 }
 
 Ineq_constrained_qp::Ineq_constrained_qp (int novars):
-  quad (novars),
-  lin (novars),
-  const_term (0.0)
+  quad_ (novars),
+  lin_ (novars),
+  const_term_ (0.0)
 {
 }
 
@@ -60,9 +62,9 @@ void
 Ineq_constrained_qp::OK() const
 {
 #if !defined (NDEBUG) && defined (PARANOID)
-  assert (cons.size() == consrhs.size ());
-  Matrix Qdif= quad - quad.transposed();
-  assert (Qdif.norm()/quad.norm () < EPS);
+  assert (cons_.size() == consrhs_.size ());
+  Matrix Qdif= quad_ - quad_.transposed();
+  assert (Qdif.norm()/quad_.norm () < EPS);
 #endif
 }
 
@@ -70,7 +72,7 @@ Ineq_constrained_qp::OK() const
 Real
 Ineq_constrained_qp::eval (Vector v)
 {
-  return v * quad * v + lin * v + const_term;
+  return v * quad_ * v + lin_ * v + const_term_;
 }
 
 
@@ -112,16 +114,16 @@ Ineq_constrained_qp::constraint_solve (Vector start) const
     return Vector (0);
 
   // experimental
-  if (quad.dim() > 10)
-    quad.try_set_band();
+  if (quad_.dim() > 10)
+    quad_.try_set_band();
 
   Active_constraints act (this);
   act.OK();
 
 
   Vector x (start);
-  Vector gradient=quad*x+lin;
-  //    Real fvalue = x*quad*x/2 + lin*x + const_term;
+  Vector gradient=quad_*x+lin_;
+  //    Real fvalue = x*quad_*x/2 + lin*x + const_term;
   // it's no use.
 
   Vector last_gradient (gradient);
@@ -129,6 +131,11 @@ Ineq_constrained_qp::constraint_solve (Vector start) const
 
   while (iterations++ < MAXITER)
     {
+      //#ifdef PARANOID
+      if (experimental_features_global_b)
+	assert_solution (x);
+      //#endif
+      
       Vector direction= - act.find_active_optimum (gradient);
 
       DOUT << "gradient "<< gradient<< "\ndirection " << direction<<"\n";
@@ -137,7 +144,8 @@ Ineq_constrained_qp::constraint_solve (Vector start) const
 	{
 	  DOUT << act.status() << '\n';
 
-	  Real minalf = infinity_f;
+	  Real unbounded_alfa = 1.0;
+	  Real minalf = unbounded_alfa;
 
 	  Inactive_iter minidx (act);
 
@@ -149,11 +157,23 @@ Ineq_constrained_qp::constraint_solve (Vector start) const
 
 	  for (Inactive_iter ia (act); ia.ok(); ia++)
 	    {
-
-	      if (ia.vec() * direction >= 0)
+	      Real dot = ia.vec() * direction;
+	      if (dot >= 0)
 		continue;
-	      Real alfa= - (ia.vec()*x - ia.rhs ())/
-		(ia.vec()*direction);
+
+	      
+	      Real numerator = ia.rhs () - ia.vec()*x;
+	      if (numerator >= 0)
+		{
+		  if (numerator > EPS)
+		    warning (String ("Ineq_constrained_qp::solve (): Constraint off by ") + numerator);
+		  minalf = -numerator;
+		  minidx = ia;
+		  break;
+		}
+
+	      Real alfa = numerator / dot;
+
 
 	      if (minalf > alfa)
 		{
@@ -161,12 +181,12 @@ Ineq_constrained_qp::constraint_solve (Vector start) const
 		  minalf = alfa;
 		}
 	    }
-	  Real unbounded_alfa = 1.0;
-	  Real optimal_step = min (minalf, unbounded_alfa);
+
+	  Real optimal_step = minalf;
 
 	  Vector deltax=direction * optimal_step;
 	  x += deltax;
-	  gradient += optimal_step * (quad * deltax);
+	  gradient += optimal_step * (quad_ * deltax);
 
 	  DOUT << "step = " << optimal_step<< " (|dx| = " <<
 	    deltax.norm() << ")\n";
@@ -213,13 +233,20 @@ Vector
 Ineq_constrained_qp::solve (Vector start) const
 {
   /* no hassle if no constraints*/
-  if (! cons.size())
+  if (! cons_.size())
     {
-      Choleski_decomposition chol (quad);
-      return - chol.solve (lin);
+      Choleski_decomposition chol (quad_);
+      return - chol.solve (lin_);
     }
   else
     {
       return constraint_solve (start);
     }
 }
+
+int
+Ineq_constrained_qp::dim () const
+{
+  return lin_.dim();
+}
+
diff --git a/lily/lexer.cc b/lily/lexer.cc
deleted file mode 100644
index f43cd5174d..0000000000
--- a/lily/lexer.cc
+++ /dev/null
@@ -1,2096 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-class istream;
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	istream* yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-#define yywrap() 1
-#define YY_SKIP_YYWRAP
-
-#define FLEX_DEBUG
-typedef unsigned char YY_CHAR;
-#define yytext_ptr yytext
-#define YY_INTERACTIVE
-
-#define FLEX_DEBUG
-
-#include <FlexLexer.h>
-int yyFlexLexer::yylex()
-	{
-	LexerError( "yyFlexLexer::yylex invoked but %option yyclass used" );
-	return 0;
-	}
-
-#define YY_DECL int My_lily_lexer::yylex()
-
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 47
-#define YY_END_OF_BUFFER 48
-static yyconst short int yy_accept[124] =
-    {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        8,    8,   48,   44,    7,    7,    1,   26,   18,   44,
-       41,   44,   44,   39,   36,   44,   40,   46,    7,    1,
-       13,   46,   34,   35,    7,    1,   31,   18,   35,   32,
-       34,   35,   25,   20,   23,   21,   44,   14,   28,   28,
-        1,   29,   30,    8,    8,    1,    9,    8,    7,   18,
-       16,    4,    5,    2,    0,    0,   38,   38,   39,   36,
-       45,   17,   37,   37,   13,   12,   34,   32,   34,   33,
-       42,   43,   33,   20,   24,   19,   21,   22,   22,   28,
-       27,    8,    8,    9,    9,   10,    6,    3,   38,   17,
-
-       15,   37,   37,   33,   33,   22,   22,   37,   33,   22,
-       37,   33,   22,   37,   33,   22,   37,   33,   22,   11,
-       11,   11,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    2,    2,    3,    4,
-        2,    3,    5,    2,    2,    2,    1,    1,    1,    1,
-        1,    1,    1,    2,    1,    2,    2,    2,    2,    1,
-        2,    3,    6,    7,    2,    8,    9,    2,   10,    2,
-        2,   11,    2,    2,   12,   13,    2,   14,   14,   14,
-       14,   14,   14,   14,   14,   14,   14,   15,    2,    2,
-       11,    2,    6,    2,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       17,   18,   19,   20,   21,   20,   16,   16,   22,   23,
-
-       24,   16,   16,   16,   25,   16,   16,   26,   16,   27,
-       16,   16,   16,   28,   28,   29,   30,   16,   16,   16,
-       16,   16,   31,    2,   32,    2,    2,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[33] =
-    {   0,
-        1,    1,    2,    3,    1,    1,    4,    1,    5,    6,
-        1,    1,    1,    7,    1,    8,    1,    4,    1,    1,
-        9,    8,    8,    8,    8,    8,   10,    8,   10,    8,
-        1,    1
-    } ;
-
-static yyconst short int yy_base[144] =
-    {   0,
-        0,    0,   30,   37,   46,    0,   78,    0,  107,  111,
-      115,  117,  409,  410,  124,  127,  410,  410,  129,  109,
-      410,  121,  394,  123,    0,  142,  410,  410,  135,  410,
-      400,  113,    0,  410,  138,  410,  410,  142,  144,  392,
-        0,  175,  410,  395,  390,  393,  200,  392,    0,    0,
-        0,  410,    0,  369,  368,  366,  142,    0,  149,  151,
-      410,  391,  410,  410,  350,  143,  330,  324,  146,    0,
-      410,  158,    0,  310,  329,  410,    0,  320,    0,    0,
-      410,  410,  299,  311,  305,  410,  304,    0,  283,    0,
-      410,  277,    0,  200,  201,  410,  286,  410,  217,  208,
-
-      410,    0,  199,    0,  198,    0,  196,  189,  188,  187,
-      149,  143,  133,  120,  100,   22,   19,   14,   12,    0,
-        0,    0,  410,  233,  243,  253,  263,  273,  277,  287,
-      297,  307,  312,  322,  329,  339,  349,  359,  369,  379,
-      383,  386,  389
-    } ;
-
-static yyconst short int yy_def[144] =
-    {   0,
-      123,    1,  124,  124,  123,    5,  123,    7,  125,  125,
-      126,  126,  123,  123,  123,  123,  123,  123,  127,  128,
-      123,  123,  123,  123,  129,  130,  123,  123,  123,  123,
-      131,  128,  132,  123,  123,  123,  123,  127,  128,  123,
-      132,  123,  123,  123,  123,  133,  130,  133,  134,  134,
-      134,  123,  135,  136,  136,  136,  137,  138,  123,  127,
-      123,  139,  123,  123,  123,  123,  123,  123,  123,  129,
-      123,  140,  141,  141,  131,  123,  132,  123,  132,  142,
-      123,  123,  142,  123,  123,  123,  133,  143,  143,  134,
-      123,  136,  138,  137,  137,  123,  139,  123,  123,  140,
-
-      123,  141,  141,  142,  142,  143,  143,  141,  142,  143,
-      141,  142,  143,  141,  142,  143,  141,  142,  143,  141,
-      142,  143,    0,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123
-    } ;
-
-static yyconst short int yy_nxt[443] =
-    {   0,
-       14,   14,   15,   16,   17,   14,   18,   19,   20,   14,
-       21,   22,   23,   24,   21,   25,   14,   26,   14,   14,
-       14,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       27,   27,   29,   16,   30,  122,   31,  121,   32,   29,
-       16,   30,  120,   31,  119,   32,   33,   34,   35,   16,
-       36,   33,   37,   38,   39,   33,   34,   33,   34,   40,
-       33,   41,   34,   42,   34,   34,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   34,   34,   14,   14,
-       15,   16,   17,   14,   43,   19,   20,   44,   14,   14,
-       14,   45,   14,   46,   14,   47,   14,   14,   14,   46,
-
-       46,   46,   46,   46,   46,   48,   46,   46,   14,   14,
-       50,   51,   63,   52,   50,   51,   63,   52,   55,   56,
-       55,   56,  118,   57,   53,   57,   59,   59,   53,   59,
-       59,   61,   61,   65,   66,   68,   69,   59,   59,   64,
-       59,   59,  117,   64,   61,   61,   58,   63,   58,   72,
-       95,   59,   59,   61,   61,   68,   66,   73,   68,   69,
-      101,  101,  116,   73,   73,   73,   74,   73,   73,   73,
-       73,   73,  115,   96,   64,   71,   71,   71,  114,   71,
-       71,   79,   72,   71,   79,   71,   71,   71,   71,   71,
-       80,   81,   71,   82,   79,   71,   80,   80,   80,   83,
-
-       80,   80,   80,   80,   80,   71,   71,   72,  123,   95,
-      101,  101,  113,  112,  111,   88,   81,  110,   82,  109,
-      108,   88,   88,   88,   89,   88,   88,   88,   88,   88,
-       99,  123,   96,   28,   28,   28,   28,   28,   28,   28,
-       28,   28,   28,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   54,   54,   54,   54,   54,   54,   54,
-       54,   54,   54,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   62,   62,   62,   62,   62,   62,   62,
-       62,   62,   62,   70,   70,   70,   70,   71,   71,   98,
-       71,   71,   71,   71,   71,   71,   71,   75,   75,   75,
-
-       75,   75,   75,   75,   75,   75,   75,   77,   93,  107,
-       77,   77,   77,   86,   77,   77,   77,   87,   85,   87,
-       84,   87,   90,   90,   90,  105,   90,   90,   90,   90,
-       90,   90,   91,   78,   91,   76,  103,   99,   91,   92,
-       92,   92,   92,   67,   92,   92,   92,   92,   92,   94,
-       94,   94,   94,   94,   94,   94,   94,   94,   94,   93,
-       93,   93,   93,   67,   93,   93,   93,   93,   93,   97,
-       97,   97,   97,   97,   97,   97,   97,   97,   97,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  102,
-      102,  102,  102,  104,   98,  104,  106,   93,  106,   93,
-
-       93,   86,   86,   85,   84,   78,   76,   67,  123,   13,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123
-    } ;
-
-static yyconst short int yy_chk[443] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    3,    3,    3,  119,    3,  118,    3,    4,
-        4,    4,  117,    4,  116,    4,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-
-        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        9,    9,   20,    9,   10,   10,   32,   10,   11,   11,
-       12,   12,  115,   11,    9,   12,   15,   15,   10,   16,
-       16,   19,   19,   22,   22,   24,   24,   29,   29,   20,
-       35,   35,  114,   32,   38,   38,   11,   39,   12,   26,
-       57,   59,   59,   60,   60,   66,   66,   26,   69,   69,
-       72,   72,  113,   26,   26,   26,   26,   26,   26,   26,
-       26,   26,  112,   57,   39,   42,   42,   42,  111,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-
-       42,   42,   42,   42,   42,   42,   42,   47,   94,   95,
-      100,  100,  110,  109,  108,   47,   47,  107,   47,  105,
-      103,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       99,   94,   95,  124,  124,  124,  124,  124,  124,  124,
-      124,  124,  124,  125,  125,  125,  125,  125,  125,  125,
-      125,  125,  125,  126,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  127,  127,  127,  127,  127,  127,  127,
-      127,  127,  127,  128,  128,  128,  128,  128,  128,  128,
-      128,  128,  128,  129,  129,  129,  129,  130,  130,   97,
-      130,  130,  130,  130,  130,  130,  130,  131,  131,  131,
-
-      131,  131,  131,  131,  131,  131,  131,  132,   92,   89,
-      132,  132,  132,   87,  132,  132,  132,  133,   85,  133,
-       84,  133,  134,  134,  134,   83,  134,  134,  134,  134,
-      134,  134,  135,   78,  135,   75,   74,   68,  135,  136,
-      136,  136,  136,   67,  136,  136,  136,  136,  136,  137,
-      137,  137,  137,  137,  137,  137,  137,  137,  137,  138,
-      138,  138,  138,   65,  138,  138,  138,  138,  138,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  140,
-      140,  140,  140,  140,  140,  140,  140,  140,  140,  141,
-      141,  141,  141,  142,   62,  142,  143,   56,  143,   55,
-
-       54,   48,   46,   45,   44,   40,   31,   23,   13,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  123
-    } ;
-
-static yyconst short int yy_rule_linenum[47] =
-    {   0,
-       94,   99,  102,  104,  106,  108,  110,  116,  118,  121,
-      133,  136,  143,  147,  153,  158,  163,  167,  172,  176,
-      184,  189,  193,  198,  203,  208,  212,  215,  218,  223,
-      230,  233,  237,  240,  255,  267,  270,  273,  282,  287,
-      292,  298,  302,  306,  310,  325
-    } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "lexer.ll"
-#define INITIAL 0
-#line 2 "lexer.ll"
-/*
-  lexer.l -- implement the Flex lexer
-
-  source file of the LilyPond music typesetter
-
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-/*
-  backup rules
-
-  after making a change to the lexer rules, run 
-      flex -b <this lexer file>
-  and make sure that 
-      lex.backup
-  contains no backup states, but only the reminder
-      Compressed tables always back up.
-  (don-t forget to rm lex.yy.cc :-)
- */
-
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include "string.hh"
-#include "string-convert.hh"
-#include "my-lily-lexer.hh"
-#include "varray.hh"
-#include "interval.hh"
-#include "parser.hh"
-#include "debug.hh"
-#include "parseconstruct.hh"
-#include "main.hh"
-#include "identifier.hh"
-void strip_trailing_white (String&);
-void strip_leading_white (String&);
-
-
-#define start_quote()	\
-	yy_push_state (quote);\
-	yylval.string = new String
-
-#define yylval (*(YYSTYPE*)lexval_l)
-
-#define YY_USER_ACTION	add_lexed_char (YYLeng ());
-#define YY_STACK_USED 1
-#define YY_NEVER_INTERACTIVE 1
-#define incl 1
-
-#define lyrics 2
-
-#define notes 3
-
-#define quote 4
-
-#define longcomment 5
-
-#line 546 "lex.yy.cc"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-#define ECHO LexerOutput( yytext, yyleng )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) LexerError( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yyFlexLexer::yylex()
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 91 "lexer.ll"
-
-
-
-#line 677 "lex.yy.cc"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = &cin;
-
-		if ( ! yyout )
-			yyout = &cout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 124 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 410 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		if ( yy_flex_debug )
-			{
-			if ( yy_act == 0 )
-				cerr << "--scanner backing up\n";
-			else if ( yy_act < 47 )
-				cerr << "--accepting rule at line " << yy_rule_linenum[yy_act] <<
-				         "(\"" << yytext << "\")\n";
-			else if ( yy_act == 47 )
-				cerr << "--accepting default rule (\"" << yytext << "\")\n";
-			else if ( yy_act == 48 )
-				cerr << "--(end of buffer or a NUL)\n";
-			else
-				cerr << "--EOF (start condition " << YY_START << ")\n";
-			}
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 94 "lexer.ll"
-{
-	// windows-suck-suck-suck
-}
-	YY_BREAK
-
-case 2:
-YY_RULE_SETUP
-#line 99 "lexer.ll"
-{
-	yy_push_state (longcomment);
-  }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 102 "lexer.ll"
-{
-  }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 104 "lexer.ll"
-{ // backup rule
-  }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 106 "lexer.ll"
-{
-  }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 108 "lexer.ll"
-{
-  }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 110 "lexer.ll"
-{
-
-  }
-	YY_BREAK
-
-
-case 8:
-YY_RULE_SETUP
-#line 116 "lexer.ll"
-{
-	}
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 118 "lexer.ll"
-{
-
-	}
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 121 "lexer.ll"
-{
-		yy_pop_state ();
-	}
-	YY_BREAK
-case YY_STATE_EOF(longcomment):
-#line 124 "lexer.ll"
-{
-		LexerError ("EOF found inside a comment");
-		if (! close_input ()) 
-		  yyterminate (); // can't move this, since it actually rets a YY_NULL
-	}
-	YY_BREAK
-
-case 11:
-YY_RULE_SETUP
-#line 133 "lexer.ll"
-{
-	yy_push_state (incl);
-}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 136 "lexer.ll"
-{ /* got the include file name */
-	String s (YYText ()+1);
-	s = s.left_str (s.length_i ()-1);
-	DOUT << "#include `" << s << "\'\n";
-	new_input (s,source_global_l);
-	yy_pop_state ();
-}
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 143 "lexer.ll"
-{ // backup rule
-	cerr << "missing end quote" << endl;
-	exit (1);
-}
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 147 "lexer.ll"
-{
-	const char *s = YYText ();
-	yylval.string = new String (s);	
-	DOUT << "rest:"<< yylval.string;
-	return RESTNAME;
-}
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 153 "lexer.ll"
-{
-	String s=YYText () + 2;
-	s=s.left_str (s.length_i () - 1);
-	return scan_escaped_word (s);
-}
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 158 "lexer.ll"
-{
-	String s=YYText () + 1;
-	s=s.left_str (s.length_i () - 1);
-	return scan_bare_word (s);
-}
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 163 "lexer.ll"
-{ // backup rule
-	cerr << "white expected" << endl;
-	exit (1);
-}
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 167 "lexer.ll"
-{ // backup rule
-	cerr << "white expected" << endl;
-	exit (1);
-}
-	YY_BREAK
-
-case 19:
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 172 "lexer.ll"
-{
-		post_quotes_b_ = true;
-		return scan_bare_word (YYText ());
-	}
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 176 "lexer.ll"
-{
-		yylval.i = YYLeng ();
-		if (post_quotes_b_) {
-			post_quotes_b_ = false;
-			return POST_QUOTES;
-		} else
-			return PRE_QUOTES;
-	}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 184 "lexer.ll"
-{
-		return scan_bare_word (YYText ());
-
-	}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 189 "lexer.ll"
-{
-		return scan_escaped_word (YYText ()+1);
-	}
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 193 "lexer.ll"
-{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
-		return DIGIT;
-	}
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 198 "lexer.ll"
-{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
-		return UNSIGNED;
-	}
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 203 "lexer.ll"
-{
-		start_quote ();
-	}
-	YY_BREAK
-
-case 26:
-YY_RULE_SETUP
-#line 208 "lexer.ll"
-{
-	start_quote ();
-}
-	YY_BREAK
-
-case 27:
-YY_RULE_SETUP
-#line 212 "lexer.ll"
-{
-		*yylval.string += escaped_char(YYText()[1]);
-	}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 215 "lexer.ll"
-{
-		*yylval.string += YYText ();
-	}
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 218 "lexer.ll"
-{
-		DOUT << "quoted string: `" << *yylval.string << "'\n";
-		yy_pop_state ();
-		return STRING;
-	}
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 223 "lexer.ll"
-{
-		*yylval.string += YYText ();
-	}
-	YY_BREAK
-
-
-case 31:
-YY_RULE_SETUP
-#line 230 "lexer.ll"
-{
-		start_quote ();
-	}
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 233 "lexer.ll"
-{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
-		return UNSIGNED;
-	}
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 237 "lexer.ll"
-{
-		return scan_escaped_word (YYText ()+1);
-	}
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 240 "lexer.ll"
-{
-		/* ugr. This sux. */
-		String s (YYText ()); 
-		int i = 0;
-               	while ((i=s.index_i ("_")) != -1) // change word binding "_" to " "
-			*(s.ch_l () + i) = ' ';
-		if ((i=s.index_i ("\\,")) != -1)   // change "\," to TeX's "\c "
-			{
-			*(s.ch_l () + i + 1) = 'c';
-			s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2);
-			}
-		yylval.string = new String (s);
-		DOUT << "lyric : `" << s << "'\n";
-		return STRING;
-	}
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 255 "lexer.ll"
-{
-		return yylval.c = YYText ()[0];
-	}
-	YY_BREAK
-
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(incl):
-case YY_STATE_EOF(lyrics):
-case YY_STATE_EOF(notes):
-case YY_STATE_EOF(quote):
-#line 260 "lexer.ll"
-{
-	DOUT << "<<eof>>";
-
-	if (! close_input ()) { 
- 	  yyterminate (); // can't move this, since it actually rets a YY_NULL
-	}
-}
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 267 "lexer.ll"
-{
-	return scan_bare_word (YYText ());
-}
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 270 "lexer.ll"
-{
-	return scan_escaped_word (YYText ()+1);
-}
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 273 "lexer.ll"
-{
-	Real r;
-	int cnv=sscanf (YYText (), "%lf", &r);
-	assert (cnv == 1);
-	DOUT  << "REAL" << r<<'\n';
-	yylval.real = r;
-	return REAL;
-}
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 282 "lexer.ll"
-{
-	yylval.i = String_convert::dec2_i (String (YYText ()));
-	return UNSIGNED;
-}
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 287 "lexer.ll"
-{
-
-	DOUT << "parens\n";
-	return YYText ()[0];
-}
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 292 "lexer.ll"
-{
-	char c = YYText ()[0];
-	DOUT << "misc char" <<c<<"\n";
-	return c;
-}
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 298 "lexer.ll"
-{
-	return yylval.i = PLET;
-}
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 302 "lexer.ll"
-{
-	return yylval.i = TELP;
-}
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 306 "lexer.ll"
-{
-	return yylval.c = YYText ()[0];
-}
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 310 "lexer.ll"
-{
-    char c= YYText ()[1];
-    yylval.c = c;
-    switch (c) {
-    case '>':
-	return E_BIGGER;
-    case '<':
-	return E_SMALLER;
-    case '!':
-	return E_EXCLAMATION;
-    default:
-	return E_CHAR;
-    }
-}
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 325 "lexer.ll"
-{
-	String msg= String ("illegal character: ") +String (YYText ()[0]);
-	LexerError (msg.ch_C ());
-	return YYText ()[0];
-}
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 331 "lexer.ll"
-YY_FATAL_ERROR( "flex scanner jammed" );
-	YY_BREAK
-#line 1192 "lex.yy.cc"
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
-	{
-	yyin = arg_yyin;
-	yyout = arg_yyout;
-	yy_c_buf_p = 0;
-	yy_init = 1;
-	yy_start = 0;
-	yy_flex_debug = 0;
-	yylineno = 1;	// this will only get updated if %option yylineno
-
-	yy_did_buffer_switch_on_eof = 0;
-
-	yy_looking_for_trail_begin = 0;
-	yy_more_flag = 0;
-	yy_more_len = 0;
-	yy_more_offset = yy_prev_more_offset = 0;
-
-	yy_start_stack_ptr = yy_start_stack_depth = 0;
-	yy_start_stack = 0;
-
-	yy_current_buffer = 0;
-
-#ifdef YY_USES_REJECT
-	yy_state_buf = new yy_state_type[YY_BUF_SIZE + 2];
-#else
-	yy_state_buf = 0;
-#endif
-	}
-
-yyFlexLexer::~yyFlexLexer()
-	{
-	delete yy_state_buf;
-	yy_delete_buffer( yy_current_buffer );
-	}
-
-void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
-	{
-	if ( new_in )
-		{
-		yy_delete_buffer( yy_current_buffer );
-		yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE ) );
-		}
-
-	if ( new_out )
-		yyout = new_out;
-	}
-
-#ifdef YY_INTERACTIVE
-int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
-#else
-int yyFlexLexer::LexerInput( char* buf, int max_size )
-#endif
-	{
-	if ( yyin->eof() || yyin->fail() )
-		return 0;
-
-#ifdef YY_INTERACTIVE
-	yyin->get( buf[0] );
-
-	if ( yyin->eof() )
-		return 0;
-
-	if ( yyin->bad() )
-		return -1;
-
-	return 1;
-
-#else
-	(void) yyin->read( buf, max_size );
-
-	if ( yyin->bad() )
-		return -1;
-	else
-		return yyin->gcount();
-#endif
-	}
-
-void yyFlexLexer::LexerOutput( const char* buf, int size )
-	{
-	(void) yyout->write( buf, size );
-	}
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-int yyFlexLexer::yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-yy_state_type yyFlexLexer::yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 2);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 124 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 2;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 124 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 123);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-void yyFlexLexer::yyunput( int c, register char* yy_bp )
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-
-
-int yyFlexLexer::yyinput()
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-
-	return c;
-	}
-
-
-void yyFlexLexer::yyrestart( istream* input_file )
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-void yyFlexLexer::yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-void yyFlexLexer::yy_load_buffer_state()
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-void yyFlexLexer::yy_delete_buffer( YY_BUFFER_STATE b )
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-extern "C" int isatty YY_PROTO(( int ));
-void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-	b->yy_is_interactive = 0;
-	}
-
-
-void yyFlexLexer::yy_flush_buffer( YY_BUFFER_STATE b )
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-void yyFlexLexer::yy_push_state( int new_state )
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-void yyFlexLexer::yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-int yyFlexLexer::yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-
-void yyFlexLexer::LexerError( yyconst char msg[] )
-	{
-	cerr << msg << '\n';
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 331 "lexer.ll"
-
-
-void
-My_lily_lexer::push_note_state ()
-{
-	yy_push_state (notes);
-}
-
-void
-My_lily_lexer::push_lyric_state ()
-{
-	yy_push_state (lyrics);
-}
-void
-My_lily_lexer::pop_state ()
-{
-	yy_pop_state ();
-}
-
-int
-My_lily_lexer::scan_escaped_word (String str)
-{	
-	DOUT << "\\word: `" << str<<"'\n";
-	int l = lookup_keyword (str);
-	if (l != -1) {
-		DOUT << "(keyword)\n";
-		return l;
-	}
-	Identifier * id = lookup_identifier (str);
-	if (id) {
-		DOUT << "(identifier)\n";
-		yylval.id = id;
-		return id->token_code_i_;
-	}
-	if (YYSTATE != notes) {
-		Melodic_req * mel_l = lookup_melodic_req_l (str);
-		if (mel_l) {
-		    DOUT << "(notename)\n";
-		    yylval.melreq = mel_l;
-		    return NOTENAME_ID;
-		}
-	}
-	String msg ("Unknown escaped string: `" + str + "'");	
-	LexerError (msg.ch_C ());
-	DOUT << "(string)";
-	String *sp = new String (str);
-	yylval.string=sp;
-	return STRING;
-}
-
-int
-My_lily_lexer::scan_bare_word (String str)
-{
-	DOUT << "word: `" << str<< "'\n";	
-	if (YYSTATE == notes){
-		Melodic_req * mel_l = lookup_melodic_req_l (str);
-		if (mel_l) {
-		    DOUT << "(notename)\n";
-		    yylval.melreq = mel_l;
-		    return NOTENAME_ID;
-		}
-	}
-
-	yylval.string=new String (str);
-	return STRING;
-}
-
-bool
-My_lily_lexer::note_state_b () const
-{
-	return YY_START == notes;
-}
-
-bool
-My_lily_lexer::lyric_state_b () const
-{
-	return YY_START == lyrics;
-}
-
-void
-strip_trailing_white (String&s)
-{
-	int i=0;
-	for (;  i < s.length_i (); i++) 
-		if (!isspace (s[i]))
-			break;
-
-	s = s.nomid_str (0, i);
-}
-
-void
-strip_leading_white (String&s)
-{
-	int i=s.length_i ();	
-	while (i--) 
-		if (!isspace (s[i]))
-			break;
-
-	s = s.left_str (i+1);
-}
diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index a5aace6974..b6a37c812b 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,9 +1,12 @@
 #include <stdio.h>
 
 #include "config.hh"
+#include "version.hh"
 
-// #define VERSION_SZ  MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL
-#define VERSION_SZ TOPLEVEL_VERSION
+ #define VERSION_SZ  MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL
+
+//#define VERSION_SZ TOPLEVEL_VERSION
+//#define VERSION_SZ "version"
 static char *s = "GNU LilyPond " VERSION_SZ ;
 
 
diff --git a/lily/main.cc b/lily/main.cc
index dc66e42aa2..4be0a9a367 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -26,6 +26,7 @@ Sources* source_global_l = 0;
 bool no_paper_global_b = false;
 bool no_timestamps_global_b = false;
 
+bool embedded_mf_global_b = false;
 bool experimental_features_global_b = false;
 bool postscript_global_b = true;
 int exit_status_i_;
@@ -77,7 +78,7 @@ usage ()
 #ifdef STRING_UTILS_INLINED
     "STRING_UTILS_INLINED "
 #endif
-    "datadir= " DIR_DATADIR
+        "datadir= " DIR_DATADIR
 
     "\n";
 
diff --git a/lily/offset.cc b/lily/offset.cc
deleted file mode 100644
index 105e7fb385..0000000000
--- a/lily/offset.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  offset.cc -- implement Offset
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include "string.hh"
-#include "offset.hh"
-
-String
-Offset::str () const
-{
-  String s;
-  s = String("(") + coordinate_a_[X_AXIS] + ", " + coordinate_a_[Y_AXIS] + ")";
-  return s;
-}
diff --git a/lily/out/dummy.dep b/lily/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lily/out/dummy.dep
diff --git a/lily/parser.cc b/lily/parser.cc
deleted file mode 100644
index 584b05711b..0000000000
--- a/lily/parser.cc
+++ /dev/null
@@ -1,2844 +0,0 @@
-
-/*  A Bison parser, made from parser.yy
- by  GNU Bison version 1.25
-  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define	ALIAS	258
-#define	BAR	259
-#define	BEAMPLET	260
-#define	MAEBTELP	261
-#define	BREAK	262
-#define	CADENZA	263
-#define	CLEAR	264
-#define	CLEF	265
-#define	CONTAINS	266
-#define	CONSISTS	267
-#define	ACCEPTS	268
-#define	CM_T	269
-#define	DURATION	270
-#define	ABSDYNAMIC	271
-#define	END	272
-#define	GROUPING	273
-#define	TRANSLATOR	274
-#define	HEADER	275
-#define	IN_T	276
-#define	LYRIC	277
-#define	KEY	278
-#define	MELODIC	279
-#define	MIDI	280
-#define	MELODIC_REQUEST	281
-#define	METER	282
-#define	MM_T	283
-#define	MULTI	284
-#define	NOTENAMES	285
-#define	OCTAVE	286
-#define	OUTPUT	287
-#define	PAPER	288
-#define	PARTIAL	289
-#define	PLET	290
-#define	TELP	291
-#define	PT_T	292
-#define	SCORE	293
-#define	SCRIPT	294
-#define	SHAPE	295
-#define	SKIP	296
-#define	SPANDYNAMIC	297
-#define	STAFF	298
-#define	START_T	299
-#define	SYMBOLTABLES	300
-#define	TABLE	301
-#define	TRANSPOSE	302
-#define	TEMPO	303
-#define	TYPE	304
-#define	TEXID	305
-#define	TEXTSTYLE	306
-#define	TITLE	307
-#define	PROPERTY	308
-#define	VERSION	309
-#define	E_EXCLAMATION	310
-#define	E_SMALLER	311
-#define	E_BIGGER	312
-#define	E_CHAR	313
-#define	DIGIT	314
-#define	NOTENAME_ID	315
-#define	DURATION_IDENTIFIER	316
-#define	IDENTIFIER	317
-#define	MELODIC_REQUEST_IDENTIFIER	318
-#define	MUSIC_IDENTIFIER	319
-#define	VOICE_IDENTIFIER	320
-#define	POST_REQUEST_IDENTIFIER	321
-#define	SCRIPT_IDENTIFIER	322
-#define	COMMAND_IDENTIFIER	323
-#define	REAL_IDENTIFIER	324
-#define	TRANS_IDENTIFIER	325
-#define	INT_IDENTIFIER	326
-#define	SCORE_IDENTIFIER	327
-#define	MIDI_IDENTIFIER	328
-#define	PAPER_IDENTIFIER	329
-#define	REQUEST_IDENTIFIER	330
-#define	REAL	331
-#define	RESTNAME	332
-#define	STRING	333
-#define	UNSIGNED	334
-#define	POST_QUOTES	335
-#define	PRE_QUOTES	336
-
-#line 1 "parser.yy"
- // -*-Fundamental-*-
-
-/*
-  parser.yy -- YACC -> C++ parser for mudela
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-           Jan Nieuwenhuizen <jan@digicash.com>
-*/
-
-#include <iostream.h>
-
-// mmm
-#define MUDELA_VERSION "0.1.9"
-
-#include "scalar.hh"
-#include "translation-property.hh"
-#include "script-def.hh"
-#include "symtable.hh"
-#include "lookup.hh"
-#include "misc.hh"
-#include "my-lily-lexer.hh"
-#include "paper-def.hh"
-#include "midi-def.hh"
-#include "main.hh"
-#include "keyword.hh"
-#include "debug.hh"
-#include "parseconstruct.hh"
-#include "dimen.hh"
-#include "identifier.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
-#include "my-lily-parser.hh"
-#include "text-def.hh"
-#include "translator-group.hh"
-#include "score.hh"
-#include "music-list.hh"
-#include "header.hh"
-#include "duration-convert.hh"
-#include "change-translator.hh"
-
-// needed for bison.simple's malloc() and free()
-#include <malloc.h>
-
-int const GUESS_PLET = 5;
-int guess_plet_a[GUESS_PLET] =
-{ 
-  1,
-  3,
-  2,
-  3,
-  4
-};
-
-#ifndef NDEBUG
-#define YYDEBUG 1
-#endif
-
-#define YYERROR_VERBOSE 1
-
-#define YYPARSE_PARAM my_lily_parser_l
-#define YYLEX_PARAM my_lily_parser_l
-#define THIS ((My_lily_parser *) my_lily_parser_l)
-
-#define yyerror THIS->parser_error
-
-
-#line 71 "parser.yy"
-typedef union {
-    Array<Interval>* intarr;
-    Array<Melodic_req*> *melreqvec;/* should clean up naming */
-    Array<String> * strvec;
-    Array<int> *intvec;
-    Box *box;
-    Chord * chord;
-    Duration *duration;
-    Identifier *id;
-    Translator* trans;
-    Music *music;
-    Music_list *musiclist;
-    Score *score;
-    Header *header;
-    Interval *interval;
-    Lookup*lookup;
-    Melodic_req * melreq;
-    Musical_req* musreq;
-    Music_output_def * outputdef;
-    Midi_def* midi;
-    Moment *moment;
-    Note_req *notereq;
-    Paper_def *paper;
-    Real real;
-    Request * request;
-    General_script_def * script;
-    Scalar *scalar;
-    String *string;
-    Atom * symbol;
-    Symtable * symtable;
-    Symtables * symtables;
-    Text_def * textdef;
-    Tempo_req *tempo;
-    char c;
-    const char *consstr;
-    int i;
-    int pair[2];
-    int ii[10];
-} YYSTYPE;
-#line 110 "parser.yy"
-
-
-int
-yylex (YYSTYPE *s,  void * v_l)
-{
-	My_lily_parser	 *pars_l = (My_lily_parser*) v_l;
-	My_lily_lexer * lex_l = pars_l->lexer_p_;
-
-	lex_l->lexval_l = (void*) s;
-	return lex_l->yylex ();
-}
-
-
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define	YYFINAL		353
-#define	YYFLAG		-32768
-#define	YYNTBASE	104
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 336 ? yytranslate[x] : 191)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    92,     2,     2,     2,     2,     2,     2,    95,
-    98,    86,   100,     2,   101,    87,    91,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    97,    82,    88,
-    85,    89,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-    96,     2,    93,    99,   103,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   102,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    83,    90,    84,    94,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     2,     3,     4,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-    26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-    36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-    46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-    66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-    76,    77,    78,    79,    80,    81
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     1,     4,     7,    10,    13,    16,    19,    23,    28,
-    29,    32,    37,    38,    44,    49,    50,    53,    54,    59,
-    61,    63,    65,    67,    69,    71,    73,    75,    77,    79,
-    81,    83,    88,    90,    94,   100,   105,   110,   111,   117,
-   118,   120,   123,   126,   129,   132,   134,   136,   137,   142,
-   147,   148,   150,   155,   158,   164,   170,   175,   181,   184,
-   185,   189,   194,   195,   200,   205,   209,   212,   217,   221,
-   222,   225,   227,   231,   237,   239,   241,   243,   245,   248,
-   249,   253,   254,   258,   260,   262,   267,   274,   276,   278,
-   282,   286,   287,   290,   294,   298,   300,   303,   305,   307,
-   309,   311,   314,   316,   318,   321,   323,   328,   331,   333,
-   336,   339,   342,   345,   348,   349,   352,   355,   357,   359,
-   361,   363,   365,   367,   370,   373,   375,   378,   385,   391,
-   396,   402,   406,   409,   412,   414,   417,   419,   421,   423,
-   425,   427,   429,   433,   436,   439,   441,   443,   445,   447,
-   449,   454,   461,   464,   466,   468,   470,   472,   474,   476,
-   478,   480,   482,   484,   486,   488,   490,   492,   494,   496,
-   498,   500,   501,   504,   507,   510,   511,   515,   518,   519,
-   522,   524,   527,   528,   530,   532,   534,   536,   538,   541,
-   545,   549,   551,   554,   557,   560,   563,   564,   567,   569,
-   571,   573,   576,   578,   580,   582,   585,   587,   589,   591,
-   593,   598,   599,   601,   605,   610,   615,   616,   620,   623,
-   625,   628
-};
-
-static const short yyrhs[] = {    -1,
-   104,   109,     0,   104,   116,     0,   104,   111,     0,   104,
-     1,     0,   104,   105,     0,   104,   106,     0,    54,    78,
-    82,     0,    30,    83,   107,    84,     0,     0,   107,     9,
-     0,   107,    78,    85,   149,     0,     0,   108,    78,    85,
-   110,    82,     0,    20,    83,   108,    84,     0,     0,   110,
-    78,     0,     0,    78,   112,    85,   113,     0,   116,     0,
-   121,     0,   124,     0,   158,     0,   129,     0,   184,     0,
-   181,     0,   180,     0,   146,     0,   149,     0,   114,     0,
-   150,     0,    19,    83,   115,    84,     0,    70,     0,    49,
-    78,    82,     0,   115,    78,    85,   134,    82,     0,   115,
-    12,    78,    82,     0,   115,    13,    78,    82,     0,     0,
-    38,   117,    83,   118,    84,     0,     0,    72,     0,   118,
-   109,     0,   118,   129,     0,   118,   119,     0,   118,     1,
-     0,   121,     0,   124,     0,     0,   120,   180,    86,   180,
-     0,    33,    83,   122,    84,     0,     0,    74,     0,   122,
-    32,    78,    82,     0,   122,   184,     0,   122,    78,    85,
-   182,    82,     0,   122,    78,    85,   181,    82,     0,   122,
-    78,    85,   114,     0,   122,    40,    85,   123,    82,     0,
-   122,     1,     0,     0,   123,   182,   182,     0,    25,    83,
-   125,    84,     0,     0,   125,    78,    85,   114,     0,   125,
-    32,    78,    82,     0,   125,   126,    82,     0,   125,     1,
-     0,    48,   172,    85,   179,     0,    83,   128,    84,     0,
-     0,   128,   129,     0,   138,     0,    49,    78,   129,     0,
-    49,    78,    85,    78,   129,     0,   127,     0,   135,     0,
-   137,     0,    64,     0,    64,    82,     0,     0,    24,   130,
-   129,     0,     0,    22,   131,   129,     0,   133,     0,   132,
-     0,    19,    78,    85,    78,     0,    53,    78,    87,    78,
-    85,   134,     0,    78,     0,   180,     0,    88,   136,    89,
-     0,    29,   179,   135,     0,     0,   136,   129,     0,    47,
-   147,   129,     0,   167,   139,   144,     0,   140,     0,   168,
-    82,     0,   176,     0,   177,     0,   141,     0,   142,     0,
-   143,    82,     0,    90,     0,    68,     0,     4,    78,     0,
-     7,     0,    27,   179,    91,   179,     0,    41,   170,     0,
-   126,     0,     8,   179,     0,    34,   170,     0,    10,    78,
-     0,    23,   178,     0,    18,   120,     0,     0,   144,   145,
-     0,   144,   154,     0,   160,     0,   146,     0,    66,     0,
-   151,     0,   175,     0,    60,     0,   147,    80,     0,    81,
-   147,     0,   147,     0,   148,    92,     0,    26,    83,   180,
-   180,   180,    84,     0,    15,    83,   180,   179,    84,     0,
-    16,    83,   179,    84,     0,    42,    83,   180,   180,    84,
-     0,   179,    91,   179,     0,    91,   179,     0,    93,   152,
-     0,    36,     0,    36,   152,     0,    94,     0,    95,     0,
-    93,     0,    56,     0,    57,     0,   153,     0,    96,    97,
-   179,     0,    96,   152,     0,    35,   152,     0,    55,     0,
-    98,     0,    96,     0,   155,     0,   156,     0,    39,    83,
-   159,    84,     0,    78,   180,   180,   180,   180,   180,     0,
-   166,   161,     0,   162,     0,   165,     0,   163,     0,    78,
-     0,    59,     0,    99,     0,   100,     0,   101,     0,    90,
-     0,   102,     0,    89,     0,    87,     0,    67,     0,   158,
-     0,   164,     0,   103,     0,    99,     0,   101,     0,     0,
-   167,   157,     0,    15,    78,     0,    15,   172,     0,     0,
-    31,   169,   147,     0,    51,    78,     0,     0,   170,   174,
-     0,    87,     0,   171,    87,     0,     0,   171,     0,   174,
-     0,   172,     0,   179,     0,    61,     0,   174,    87,     0,
-   174,    86,   179,     0,   174,    91,   179,     0,    97,     0,
-    97,   179,     0,   148,   173,     0,    77,   173,     0,   162,
-   173,     0,     0,   178,    60,     0,    79,     0,    59,     0,
-   179,     0,   101,   179,     0,    71,     0,    76,     0,    69,
-     0,   181,   183,     0,    14,     0,    21,     0,    28,     0,
-    37,     0,    45,    83,   185,    84,     0,     0,    62,     0,
-   185,    50,    78,     0,   185,    78,    85,   186,     0,    46,
-    83,   187,    84,     0,     0,   187,    78,   188,     0,    78,
-   189,     0,    78,     0,   190,   190,     0,   182,   182,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   261,   262,   266,   269,   270,   271,   272,   275,   288,   291,
-   294,   297,   303,   307,   314,   321,   325,   334,   338,   345,
-   350,   354,   358,   362,   366,   370,   374,   377,   380,   384,
-   387,   394,   399,   404,   409,   414,   418,   427,   431,   445,
-   448,   451,   454,   459,   462,   467,   471,   476,   478,   487,
-   492,   496,   499,   503,   504,   507,   510,   514,   518,   523,
-   527,   534,   540,   543,   547,   551,   555,   560,   573,   579,
-   584,   589,   591,   596,   603,   604,   605,   606,   607,   608,
-   611,   613,   616,   617,   618,   621,   634,   648,   650,   654,
-   656,   662,   668,   673,   686,   691,   692,   695,   697,   700,
-   710,   712,   715,   719,   724,   729,   734,   739,   747,   750,
-   753,   757,   761,   767,   772,   781,   785,   794,   796,   799,
-   803,   806,   818,   823,   826,   832,   838,   844,   853,   861,
-   867,   875,   880,   888,   896,   903,   912,   916,   919,   922,
-   925,   928,   932,   944,   952,   961,   965,   968,   971,   973,
-   979,   983,   992,  1003,  1008,  1012,  1018,  1029,  1039,  1041,
-  1042,  1043,  1044,  1045,  1046,  1051,  1053,  1054,  1060,  1062,
-  1063,  1066,  1069,  1078,  1083,  1087,  1097,  1101,  1107,  1111,
-  1116,  1118,  1121,  1125,  1129,  1135,  1141,  1151,  1154,  1157,
-  1160,  1166,  1170,  1180,  1188,  1194,  1206,  1209,  1214,  1218,
-  1222,  1226,  1229,  1236,  1240,  1249,  1254,  1255,  1256,  1257,
-  1263,  1267,  1271,  1274,  1278,  1284,  1288,  1290,  1297,  1303,
-  1310,  1318
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","ALIAS",
-"BAR","BEAMPLET","MAEBTELP","BREAK","CADENZA","CLEAR","CLEF","CONTAINS","CONSISTS",
-"ACCEPTS","CM_T","DURATION","ABSDYNAMIC","END","GROUPING","TRANSLATOR","HEADER",
-"IN_T","LYRIC","KEY","MELODIC","MIDI","MELODIC_REQUEST","METER","MM_T","MULTI",
-"NOTENAMES","OCTAVE","OUTPUT","PAPER","PARTIAL","PLET","TELP","PT_T","SCORE",
-"SCRIPT","SHAPE","SKIP","SPANDYNAMIC","STAFF","START_T","SYMBOLTABLES","TABLE",
-"TRANSPOSE","TEMPO","TYPE","TEXID","TEXTSTYLE","TITLE","PROPERTY","VERSION",
-"E_EXCLAMATION","E_SMALLER","E_BIGGER","E_CHAR","DIGIT","NOTENAME_ID","DURATION_IDENTIFIER",
-"IDENTIFIER","MELODIC_REQUEST_IDENTIFIER","MUSIC_IDENTIFIER","VOICE_IDENTIFIER",
-"POST_REQUEST_IDENTIFIER","SCRIPT_IDENTIFIER","COMMAND_IDENTIFIER","REAL_IDENTIFIER",
-"TRANS_IDENTIFIER","INT_IDENTIFIER","SCORE_IDENTIFIER","MIDI_IDENTIFIER","PAPER_IDENTIFIER",
-"REQUEST_IDENTIFIER","REAL","RESTNAME","STRING","UNSIGNED","POST_QUOTES","PRE_QUOTES",
-"';'","'{'","'}'","'='","'*'","'.'","'<'","'>'","'|'","'/'","'!'","']'","'~'",
-"'('","'['","':'","')'","'^'","'+'","'-'","'o'","'_'","mudela","check_version",
-"add_notenames","notenames_body","mudela_header_body","mudela_header","concat_strings",
-"add_declaration","@1","identifier_init","translator_spec","translator_spec_body",
-"score_block","@2","score_body","output_def","intastint_list","paper_block",
-"paper_body","shape_array","midi_block","midi_body","tempo_request","Voice",
-"Voice_body","Music","@3","@4","translator_change","property_def","scalar","Chord",
-"Chord_body","transposed_music","full_element","simple_element","command_elt",
-"command_req","abbrev_command_req","verbose_command_req","post_requests","structured_post_request",
-"post_request","steno_melodic_req","steno_note_req","melodic_request","explicit_duration",
-"dynamic_req","plet_fraction","close_plet_parens","close_request_parens","open_abbrev_parens",
-"open_plet_parens","open_request_parens","script_definition","script_body","script_req",
-"gen_script_def","text_def","finger","script_abbreviation","mudela_script","script_dir",
-"pre_requests","voice_command","@5","duration_length","dots","entered_notemode_duration",
-"notemode_duration","explicit_steno_duration","abbrev_type","music_elt","lyrics_elt",
-"pitch_list","unsigned","int","real","dim","unit","symtables","symtables_body",
-"symtable","symtable_body","symboldef","box","dinterval", NULL
-};
-#endif
-
-static const short yyr1[] = {     0,
-   104,   104,   104,   104,   104,   104,   104,   105,   106,   107,
-   107,   107,   108,   108,   109,   110,   110,   112,   111,   113,
-   113,   113,   113,   113,   113,   113,   113,   113,   113,   113,
-   113,   114,   115,   115,   115,   115,   115,   117,   116,   118,
-   118,   118,   118,   118,   118,   119,   119,   120,   120,   121,
-   122,   122,   122,   122,   122,   122,   122,   122,   122,   123,
-   123,   124,   125,   125,   125,   125,   125,   126,   127,   128,
-   128,   129,   129,   129,   129,   129,   129,   129,   129,   130,
-   129,   131,   129,   129,   129,   132,   133,   134,   134,   135,
-   135,   136,   136,   137,   138,   138,   138,   139,   139,   140,
-   141,   141,   142,   142,   143,   143,   143,   143,   143,   143,
-   143,   143,   143,   143,   144,   144,   144,   145,   145,   146,
-   146,   146,   147,   147,   147,   148,   148,   149,   150,   151,
-   151,   152,   152,   153,   153,   153,   154,   154,   154,   154,
-   154,   154,   155,   156,   156,   157,   157,   157,   157,   157,
-   158,   159,   160,   161,   161,   161,   162,   163,   164,   164,
-   164,   164,   164,   164,   164,   165,   165,   165,   166,   166,
-   166,   167,   167,   168,   168,   169,   168,   168,   170,   170,
-   171,   171,   172,   172,   172,   173,   174,   174,   174,   174,
-   174,   175,   175,   176,   176,   177,   178,   178,   179,   179,
-   180,   180,   180,   181,   181,   182,   183,   183,   183,   183,
-   184,   185,   185,   185,   185,   186,   187,   187,   188,   188,
-   189,   190
-};
-
-static const short yyr2[] = {     0,
-     0,     2,     2,     2,     2,     2,     2,     3,     4,     0,
-     2,     4,     0,     5,     4,     0,     2,     0,     4,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     4,     1,     3,     5,     4,     4,     0,     5,     0,
-     1,     2,     2,     2,     2,     1,     1,     0,     4,     4,
-     0,     1,     4,     2,     5,     5,     4,     5,     2,     0,
-     3,     4,     0,     4,     4,     3,     2,     4,     3,     0,
-     2,     1,     3,     5,     1,     1,     1,     1,     2,     0,
-     3,     0,     3,     1,     1,     4,     6,     1,     1,     3,
-     3,     0,     2,     3,     3,     1,     2,     1,     1,     1,
-     1,     2,     1,     1,     2,     1,     4,     2,     1,     2,
-     2,     2,     2,     2,     0,     2,     2,     1,     1,     1,
-     1,     1,     1,     2,     2,     1,     2,     6,     5,     4,
-     5,     3,     2,     2,     1,     2,     1,     1,     1,     1,
-     1,     1,     3,     2,     2,     1,     1,     1,     1,     1,
-     4,     6,     2,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     0,     2,     2,     2,     0,     3,     2,     0,     2,
-     1,     2,     0,     1,     1,     1,     1,     1,     2,     3,
-     3,     1,     2,     2,     2,     2,     0,     2,     1,     1,
-     1,     2,     1,     1,     1,     2,     1,     1,     1,     1,
-     4,     0,     1,     3,     4,     4,     0,     3,     2,     1,
-     2,     2
-};
-
-static const short yydefact[] = {     1,
-     0,     5,     0,     0,    38,     0,    18,     6,     7,     2,
-     4,     3,    13,    10,     0,     0,     0,     0,     0,    40,
-     8,   172,     0,    15,    11,     0,     9,    41,     0,     0,
-   106,     0,     0,   183,     0,    48,     0,    82,   197,    80,
-     0,     0,     0,     0,   176,     0,   179,     0,   179,     0,
-     0,     0,   183,     0,     0,     0,   200,    78,   120,   104,
-   205,   203,   204,   199,    70,    92,   103,   192,     0,    19,
-    30,    20,    21,    22,   109,    75,    24,    85,    84,    76,
-    77,    72,    96,   100,   101,     0,    28,    29,    31,   121,
-    23,     0,     0,   122,   201,    27,    26,    25,    16,     0,
-    45,   183,     0,    39,    42,    44,    46,    47,    43,   105,
-   110,   112,   188,   174,     0,   181,   184,   175,   185,   187,
-     0,   114,     0,     0,   172,   113,   172,    63,     0,     0,
-     0,     0,    51,   111,     0,   108,     0,   212,   123,     0,
-   172,     0,   172,   178,     0,    79,   172,   172,   193,   202,
-   102,     0,   146,   183,   157,   148,   147,   115,   126,   183,
-   149,   150,   173,   183,    98,    99,    97,     0,    12,     0,
-   182,     0,   189,     0,     0,     0,     0,     0,    33,     0,
-    83,   198,    81,     0,     0,     0,    91,   177,    52,     0,
-   180,     0,     0,     0,   213,     0,   125,   124,    94,     0,
-     0,    73,     0,    69,    71,    90,    93,     0,   145,     0,
-   186,   195,     0,   144,    95,   127,   194,   196,    17,    14,
-     0,   190,   191,   130,     0,    86,     0,     0,     0,     0,
-    32,    67,     0,     0,    62,     0,     0,   107,    59,     0,
-     0,     0,    50,    54,     0,   151,     0,     0,     0,   211,
-    68,   172,     0,   133,     0,   143,   135,   140,   141,   139,
-   137,   138,   170,   171,   169,   116,   119,   142,   117,   118,
-     0,   129,    49,    34,     0,     0,     0,     0,     0,    66,
-     0,     0,    60,     0,     0,   131,   214,     0,    74,     0,
-   132,   136,   134,   158,   166,   165,   164,   162,   159,   160,
-   161,   163,   167,   153,   154,   156,   168,   155,    36,    37,
-    88,     0,    89,    65,     0,    64,   128,    53,     0,    57,
-     0,     0,     0,     0,   215,    87,    35,    58,     0,     0,
-   207,   208,   209,   210,    56,   206,    55,     0,   217,    61,
-   152,     0,     0,   216,   220,   218,     0,   219,     0,   222,
-   221,     0,     0
-};
-
-static const short yydefgoto[] = {     1,
-     8,     9,    19,    18,    10,   168,    11,    17,    70,    71,
-   180,    12,    15,    29,   106,   122,    73,   190,   319,    74,
-   184,    75,    76,   147,    77,   127,   125,    78,    79,   312,
-    80,   148,    81,    82,   158,    83,    84,    85,    86,   215,
-   266,    87,   141,   160,    88,    89,    90,   209,   268,   269,
-   161,   162,   163,    91,   193,   270,   304,   164,   306,   307,
-   308,   271,    92,    93,   132,   134,   117,   211,   212,   119,
-    94,   165,   166,   126,    95,   313,   329,   347,   336,    98,
-   196,   325,   342,   346,   348,   349
-};
-
-static const short yypact[] = {-32768,
-    19,-32768,   -66,   -47,-32768,   -18,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,   -14,    -6,    28,    50,    -4,    12,
--32768,   243,    46,-32768,-32768,    53,-32768,-32768,   328,    62,
--32768,    51,    71,   134,    68,-32768,   -52,-32768,-32768,-32768,
-    91,    92,    51,    51,-32768,    97,-32768,   100,-32768,   114,
-   118,   -46,   141,   126,   127,   128,-32768,    54,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,    51,    51,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   132,-32768,-32768,-32768,-32768,
--32768,   113,   136,-32768,-32768,-32768,-32768,-32768,-32768,   170,
--32768,   120,   138,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,   107,-32768,   123,-32768,   101,-32768,
-    51,   107,   137,     7,   608,   159,   608,-32768,   107,   142,
-   -23,   -46,   151,   -36,   149,   -36,   107,   168,-32768,   -46,
-   413,   147,   461,-32768,   148,-32768,   509,   557,-32768,-32768,
--32768,    73,-32768,   141,-32768,   -27,-32768,-32768,   154,    58,
--32768,-32768,-32768,   141,-32768,-32768,-32768,    20,-32768,    51,
--32768,    51,-32768,    51,   152,   153,   160,   162,-32768,    34,
--32768,-32768,-32768,    10,   107,    51,-32768,   154,-32768,     8,
-   101,   107,   157,   107,-32768,   -17,   154,-32768,-32768,    51,
-   164,-32768,   165,-32768,-32768,-32768,-32768,    51,-32768,   146,
--32768,-32768,    51,-32768,   -12,-32768,-32768,-32768,-32768,-32768,
-   161,-32768,-32768,-32768,   107,-32768,   166,   171,   174,   169,
--32768,-32768,   177,   172,-32768,   178,   107,-32768,-32768,   193,
-   188,   190,-32768,-32768,   107,-32768,   194,   201,   195,-32768,
--32768,   608,   198,-32768,    51,-32768,    73,-32768,-32768,    73,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-    57,-32768,-32768,-32768,   204,   205,    83,   207,   225,-32768,
-   209,   213,-32768,    -1,   107,-32768,-32768,   200,-32768,    83,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   215,-32768,-32768,   173,-32768,-32768,-32768,   -10,-32768,
-    13,   216,   107,   217,-32768,-32768,-32768,-32768,   139,   -48,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,   107,-32768,-32768,
--32768,    87,   221,-32768,   -48,-32768,   -48,-32768,   -48,-32768,
--32768,   303,-32768
-};
-
-static const short yypgoto[] = {-32768,
--32768,-32768,-32768,-32768,   275,-32768,-32768,-32768,-32768,  -170,
--32768,   283,-32768,-32768,-32768,-32768,   277,-32768,-32768,   279,
--32768,   129,-32768,-32768,   -21,-32768,-32768,-32768,-32768,    27,
-   179,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   103,   -77,-32768,   220,-32768,-32768,  -149,-32768,-32768,
--32768,-32768,-32768,    44,-32768,-32768,-32768,    52,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   272,-32768,   -24,    25,   -35,
--32768,-32768,-32768,-32768,   -31,   -22,   -20,  -268,-32768,   135,
--32768,-32768,-32768,-32768,-32768,   -25
-};
-
-
-#define	YYLAST		698
-
-
-static const short yytable[] = {    96,
-   111,    97,   120,    35,    25,    44,   214,   109,   239,   118,
-   232,   130,   131,   139,   159,   322,    13,   315,   352,     2,
-    61,   120,    57,   257,   113,   123,   331,    63,   142,    50,
-   124,    57,   248,   332,   140,    14,   149,   150,     3,   240,
-   333,   233,    64,   258,   259,   228,   229,   241,     4,   334,
-   330,    64,    51,    59,   188,   178,     5,    53,    61,    16,
-   249,   340,   197,   208,    66,    63,   250,    61,    20,   213,
-   120,   328,     6,    26,    63,    21,   179,   118,   350,    27,
-   260,   261,   262,    28,    68,   242,   263,   234,   264,   175,
-   265,   243,   170,   235,   335,    48,     7,   219,   191,   176,
-   191,   220,   120,   181,   120,   183,   185,   292,   316,    57,
-   293,   230,    22,   320,   194,   294,    57,   231,   113,   199,
-   210,   202,   120,   295,   210,   205,   207,    23,   120,    64,
-    99,    57,   120,    24,   155,   146,    64,   100,   221,   110,
-   222,    57,   223,   296,   116,   297,   298,   152,   112,   216,
-   121,    64,   331,    62,   238,   299,   300,   301,   302,   332,
-   311,    64,   237,   208,   343,    57,   333,   153,   251,   245,
-   344,   247,   139,   128,   129,   334,   254,    62,    57,   133,
-   113,   256,   135,    69,   217,    64,   172,   173,   218,   154,
-   155,   174,    57,   140,   113,    42,   137,   114,    64,    57,
-   138,   113,   273,   143,   144,   145,   116,    69,   156,   171,
-   157,   114,    64,   151,   281,   123,   115,   167,   182,    64,
-   116,   177,   285,   291,   189,   210,   192,   116,   210,   195,
-   289,   200,   186,   198,   203,   224,   255,   226,   225,   227,
-   246,   252,   253,   315,   272,   324,    30,   274,   275,    31,
-    32,   276,    33,   277,   278,   124,   279,    34,    35,   280,
-    36,    37,   323,   321,    38,    39,    40,    41,    42,    43,
-   282,    44,   283,    45,   284,    46,    47,   286,   287,   288,
-     5,    48,   290,    49,    50,   309,   310,    51,   314,    52,
-    53,    54,   317,    55,   318,    56,   327,   337,   345,   339,
-   338,    57,   353,   105,    72,   107,    58,   108,    59,   187,
-    60,    61,   236,    62,   303,   341,   326,   267,    63,   169,
-   136,    64,   305,   351,   244,    65,     0,     0,   101,     0,
-    66,    30,    67,     0,    31,    32,     0,    33,     0,    68,
-     0,     0,   102,    69,     0,    36,   103,     3,     0,    38,
-    39,    40,    41,     0,    43,     0,    44,     0,    45,     0,
-    46,    47,  -172,     0,     0,     0,     0,     0,    49,     0,
-     0,     0,     0,     0,    52,    53,    54,     0,    55,     0,
-    56,     0,  -172,     0,     0,     0,     0,  -172,     0,     0,
-     0,    58,     0,     0,     0,    60,     0,     0,     0,     0,
-     0,     0,     0,     0,  -172,  -172,     0,     0,  -172,     0,
-    65,   104,     0,     0,     0,    66,    30,    67,     0,    31,
-    32,     0,    33,  -172,     0,  -172,     0,   102,     0,     0,
-    36,   103,     0,     0,    38,    39,    40,     0,     0,    43,
-     0,    44,     0,    45,     0,     0,    47,     0,     0,     0,
-     0,     0,     0,    49,     0,     0,     0,     0,     0,    52,
-    53,    54,     0,    55,    30,    56,     0,    31,    32,     0,
-    33,     0,     0,     0,     0,   102,    58,     0,    36,   103,
-    60,     0,    38,    39,    40,     0,     0,    43,     0,    44,
-     0,    45,   198,     0,    47,    65,     0,     0,     0,     0,
-    66,    49,    67,     0,     0,     0,     0,    52,    53,    54,
-     0,    55,    30,    56,     0,    31,    32,     0,    33,     0,
-     0,     0,     0,   102,    58,     0,    36,   103,    60,     0,
-    38,    39,    40,     0,     0,    43,     0,    44,     0,    45,
-     0,     0,    47,    65,     0,   201,     0,     0,    66,    49,
-    67,     0,     0,     0,     0,    52,    53,    54,     0,    55,
-    30,    56,     0,    31,    32,     0,    33,     0,     0,     0,
-     0,   102,    58,     0,    36,   103,    60,     0,    38,    39,
-    40,     0,     0,    43,     0,    44,     0,    45,     0,     0,
-    47,    65,   204,     0,     0,     0,    66,    49,    67,     0,
-     0,     0,     0,    52,    53,    54,     0,    55,     0,    56,
-     0,    30,     0,     0,    31,    32,     0,    33,     0,     0,
-    58,     0,   102,     0,    60,    36,   103,     0,     0,    38,
-    39,    40,     0,     0,    43,     0,    44,     0,    45,    65,
-     0,    47,     0,     0,    66,   206,    67,     0,    49,     0,
-     0,     0,     0,     0,    52,    53,    54,     0,    55,     0,
-    56,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    58,     0,     0,     0,    60,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    65,     0,     0,     0,     0,    66,     0,    67
-};
-
-static const short yycheck[] = {    22,
-    32,    22,    34,    16,     9,    29,   156,    29,     1,    34,
-     1,    43,    44,    60,    92,   284,    83,    19,     0,     1,
-    69,    53,    59,    36,    61,    78,    14,    76,    53,    42,
-    83,    59,    50,    21,    81,    83,    68,    69,    20,    32,
-    28,    32,    79,    56,    57,    12,    13,    40,    30,    37,
-   319,    79,    45,    66,   132,    49,    38,    48,    69,    78,
-    78,   330,   140,    91,    88,    76,    84,    69,    83,    97,
-   102,    82,    54,    78,    76,    82,    70,   102,   347,    84,
-    93,    94,    95,    72,    97,    78,    99,    78,   101,   121,
-   103,    84,   115,    84,    82,    39,    78,    78,   134,   122,
-   136,    82,   134,   125,   136,   127,   129,   257,   279,    59,
-   260,    78,    85,   284,   137,    59,    59,    84,    61,   141,
-   152,   143,   154,    67,   156,   147,   148,    78,   160,    79,
-    85,    59,   164,    84,    78,    82,    79,    85,   170,    78,
-   172,    59,   174,    87,    87,    89,    90,    35,    78,    92,
-    83,    79,    14,    71,   186,    99,   100,   101,   102,    21,
-    78,    79,   185,    91,    78,    59,    28,    55,   200,   192,
-    84,   194,    60,    83,    83,    37,   208,    71,    59,    83,
-    61,   213,    83,   101,   160,    79,    86,    87,   164,    77,
-    78,    91,    59,    81,    61,    26,    83,    78,    79,    59,
-    83,    61,   225,    78,    78,    78,    87,   101,    96,    87,
-    98,    78,    79,    82,   237,    78,    83,    82,    60,    79,
-    87,    85,   245,   255,    74,   257,    78,    87,   260,    62,
-   252,    85,    91,    80,    87,    84,    91,    78,    86,    78,
-    84,    78,    78,    19,    84,    46,     4,    82,    78,     7,
-     8,    78,    10,    85,    78,    83,    85,    15,    16,    82,
-    18,    19,   285,   284,    22,    23,    24,    25,    26,    27,
-    78,    29,    85,    31,    85,    33,    34,    84,    78,    85,
-    38,    39,    85,    41,    42,    82,    82,    45,    82,    47,
-    48,    49,    84,    51,    82,    53,    82,    82,    78,    83,
-   323,    59,     0,    29,    22,    29,    64,    29,    66,   131,
-    68,    69,   184,    71,   271,   338,   290,   215,    76,   100,
-    49,    79,   271,   349,   190,    83,    -1,    -1,     1,    -1,
-    88,     4,    90,    -1,     7,     8,    -1,    10,    -1,    97,
-    -1,    -1,    15,   101,    -1,    18,    19,    20,    -1,    22,
-    23,    24,    25,    -1,    27,    -1,    29,    -1,    31,    -1,
-    33,    34,    35,    -1,    -1,    -1,    -1,    -1,    41,    -1,
-    -1,    -1,    -1,    -1,    47,    48,    49,    -1,    51,    -1,
-    53,    -1,    55,    -1,    -1,    -1,    -1,    60,    -1,    -1,
-    -1,    64,    -1,    -1,    -1,    68,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    77,    78,    -1,    -1,    81,    -1,
-    83,    84,    -1,    -1,    -1,    88,     4,    90,    -1,     7,
-     8,    -1,    10,    96,    -1,    98,    -1,    15,    -1,    -1,
-    18,    19,    -1,    -1,    22,    23,    24,    -1,    -1,    27,
-    -1,    29,    -1,    31,    -1,    -1,    34,    -1,    -1,    -1,
-    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,    47,
-    48,    49,    -1,    51,     4,    53,    -1,     7,     8,    -1,
-    10,    -1,    -1,    -1,    -1,    15,    64,    -1,    18,    19,
-    68,    -1,    22,    23,    24,    -1,    -1,    27,    -1,    29,
-    -1,    31,    80,    -1,    34,    83,    -1,    -1,    -1,    -1,
-    88,    41,    90,    -1,    -1,    -1,    -1,    47,    48,    49,
-    -1,    51,     4,    53,    -1,     7,     8,    -1,    10,    -1,
-    -1,    -1,    -1,    15,    64,    -1,    18,    19,    68,    -1,
-    22,    23,    24,    -1,    -1,    27,    -1,    29,    -1,    31,
-    -1,    -1,    34,    83,    -1,    85,    -1,    -1,    88,    41,
-    90,    -1,    -1,    -1,    -1,    47,    48,    49,    -1,    51,
-     4,    53,    -1,     7,     8,    -1,    10,    -1,    -1,    -1,
-    -1,    15,    64,    -1,    18,    19,    68,    -1,    22,    23,
-    24,    -1,    -1,    27,    -1,    29,    -1,    31,    -1,    -1,
-    34,    83,    84,    -1,    -1,    -1,    88,    41,    90,    -1,
-    -1,    -1,    -1,    47,    48,    49,    -1,    51,    -1,    53,
-    -1,     4,    -1,    -1,     7,     8,    -1,    10,    -1,    -1,
-    64,    -1,    15,    -1,    68,    18,    19,    -1,    -1,    22,
-    23,    24,    -1,    -1,    27,    -1,    29,    -1,    31,    83,
-    -1,    34,    -1,    -1,    88,    89,    90,    -1,    41,    -1,
-    -1,    -1,    -1,    -1,    47,    48,    49,    -1,    51,    -1,
-    53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    64,    -1,    -1,    -1,    68,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    83,    -1,    -1,    -1,    -1,    88,    -1,    90
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-#ifndef alloca
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
-#include <alloca.h>
-#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
-#include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-#include <malloc.h>
- #pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
-#endif /* __hpux */
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc.  */
-#endif /* not GNU C.  */
-#endif /* alloca not defined.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	return(0)
-#define YYABORT 	return(1)
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, int count)
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 196 "/usr/lib/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 2:
-#line 262 "parser.yy"
-{
-		delete THIS->default_header_p_ ;
-		THIS->default_header_p_ = yyvsp[0].header;
-	;
-    break;}
-case 3:
-#line 266 "parser.yy"
-{
-		add_score (yyvsp[0].score);
-	;
-    break;}
-case 4:
-#line 269 "parser.yy"
-{ ;
-    break;}
-case 6:
-#line 271 "parser.yy"
-{ ;
-    break;}
-case 7:
-#line 272 "parser.yy"
-{ ;
-    break;}
-case 8:
-#line 276 "parser.yy"
-{
-		if (String (*yyvsp[-1].string) != MUDELA_VERSION) {
-			if (THIS->ignore_version_b_) {
-				THIS->here_input ().error ("Incorrect mudela version");
-			} else {
-				THIS->fatal_error_i_ = 1;
-				THIS->parser_error ("Incorrect mudela version");
-			}
-		}
-	;
-    break;}
-case 10:
-#line 292 "parser.yy"
-{
-	;
-    break;}
-case 11:
-#line 294 "parser.yy"
-{
-		THIS->clear_notenames ();
-	;
-    break;}
-case 12:
-#line 297 "parser.yy"
-{
-		THIS->add_notename (*yyvsp[-2].string, yyvsp[0].melreq);
-		delete yyvsp[-2].string;
-	;
-    break;}
-case 13:
-#line 304 "parser.yy"
-{
-		yyval.header = new Header;
-	;
-    break;}
-case 14:
-#line 307 "parser.yy"
-{
-		(*yyval.header)[*yyvsp[-3].string] = *yyvsp[-1].string;
-		delete yyvsp[-3].string;
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 15:
-#line 315 "parser.yy"
-{
-		yyval.header = yyvsp[-1].header;
-	;
-    break;}
-case 16:
-#line 322 "parser.yy"
-{
-		yyval.string = new String;
-	;
-    break;}
-case 17:
-#line 325 "parser.yy"
-{
-		*yyval.string += *yyvsp[0].string;
-	;
-    break;}
-case 18:
-#line 335 "parser.yy"
-{
-		THIS->remember_spot ();
-	;
-    break;}
-case 19:
-#line 338 "parser.yy"
-{
-	    THIS->lexer_p_->set_identifier (*yyvsp[-3].string, yyvsp[0].id);
-	    yyvsp[0].id->init_b_ = THIS->init_parse_b_;
-	    yyvsp[0].id->set_spot (THIS->pop_spot ());
-	;
-    break;}
-case 20:
-#line 346 "parser.yy"
-{
-		yyval.id = new Score_id (yyvsp[0].score, SCORE_IDENTIFIER);
-
-	;
-    break;}
-case 21:
-#line 350 "parser.yy"
-{
-		yyval.id = new Paper_def_id (yyvsp[0].paper, PAPER_IDENTIFIER);
-
-	;
-    break;}
-case 22:
-#line 354 "parser.yy"
-{
-		yyval.id = new Midi_def_id (yyvsp[0].midi, MIDI_IDENTIFIER);
-
-	;
-    break;}
-case 23:
-#line 358 "parser.yy"
-{
-		yyval.id = new Script_id (yyvsp[0].script, SCRIPT_IDENTIFIER);
-
-	;
-    break;}
-case 24:
-#line 362 "parser.yy"
-{
-		yyval.id = new Music_id (yyvsp[0].music, MUSIC_IDENTIFIER);
-
-	;
-    break;}
-case 25:
-#line 366 "parser.yy"
-{
-		yyval.id = new Lookup_id (yyvsp[0].lookup, IDENTIFIER);
-
-	;
-    break;}
-case 26:
-#line 370 "parser.yy"
-{
-		yyval.id = new Real_id (new Real (yyvsp[0].real), REAL_IDENTIFIER);
-
-	;
-    break;}
-case 27:
-#line 374 "parser.yy"
-{
-		yyval.id = new Int_id (new int (yyvsp[0].i), INT_IDENTIFIER);
-	;
-    break;}
-case 28:
-#line 377 "parser.yy"
-{
-		yyval.id = new Request_id (yyvsp[0].request, POST_REQUEST_IDENTIFIER);
-	;
-    break;}
-case 29:
-#line 380 "parser.yy"
-{
-		yyval.id = new Request_id (yyvsp[0].melreq, MELODIC_REQUEST_IDENTIFIER);
-
-	;
-    break;}
-case 30:
-#line 384 "parser.yy"
-{
-		yyval.id = new Translator_id (yyvsp[0].trans, TRANS_IDENTIFIER);
-	;
-    break;}
-case 31:
-#line 387 "parser.yy"
-{
-		yyval.id = new Duration_id (yyvsp[0].duration, DURATION_IDENTIFIER);
-	;
-    break;}
-case 32:
-#line 396 "parser.yy"
-{ yyval.trans = yyvsp[-1].trans; ;
-    break;}
-case 33:
-#line 400 "parser.yy"
-{
-		yyval.trans = yyvsp[0].id->translator ();
-		yyval.trans-> set_spot (THIS->here_input ());
-	;
-    break;}
-case 34:
-#line 404 "parser.yy"
-{
-		yyval.trans = get_translator_l (*yyvsp[-1].string)->clone ();
-		yyval.trans->set_spot (THIS->here_input ());
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 35:
-#line 409 "parser.yy"
-{
-		yyval.trans-> set_property (*yyvsp[-3].string, *yyvsp[-1].scalar);
-		delete yyvsp[-3].string;
-		delete yyvsp[-1].scalar;
-	;
-    break;}
-case 36:
-#line 414 "parser.yy"
-{
-		yyval.trans->group_l ()->consists_str_arr_.push (*yyvsp[-1].string);
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 37:
-#line 418 "parser.yy"
-{
-		yyval.trans->group_l ()->accepts_str_arr_.push (*yyvsp[-1].string);
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 38:
-#line 428 "parser.yy"
-{ THIS->remember_spot ();
-		THIS->error_level_i_ =0;
-	;
-    break;}
-case 39:
-#line 431 "parser.yy"
-{
-		yyval.score = yyvsp[-1].score;
-		yyval.score->set_spot (THIS->pop_spot ());
-		if (!yyval.score->def_p_arr_.size ())
-			yyval.score->add (THIS->default_paper ());
-
-		/* handle error levels. */
-		yyval.score->errorlevel_i_ = THIS->error_level_i_;
-		THIS->error_level_i_ = 0;
-		if (!yyval.score->header_p_ && THIS->default_header_p_)
-			yyval.score->header_p_ = new Header (*THIS->default_header_p_);
-	;
-    break;}
-case 40:
-#line 445 "parser.yy"
-{
-		yyval.score = new Score;
-	;
-    break;}
-case 41:
-#line 448 "parser.yy"
-{
-		yyval.score = yyvsp[0].id->score ();
-	;
-    break;}
-case 42:
-#line 451 "parser.yy"
-{
-		yyval.score->header_p_ = yyvsp[0].header;
-	;
-    break;}
-case 43:
-#line 454 "parser.yy"
-{
-		if (yyval.score->music_p_)
-			yyvsp[0].music->warning ("More than one music block");	
-		yyval.score->music_p_ = yyvsp[0].music;
-	;
-    break;}
-case 44:
-#line 459 "parser.yy"
-{
-		yyval.score->add (yyvsp[0].outputdef);
-	;
-    break;}
-case 45:
-#line 462 "parser.yy"
-{
-
-	;
-    break;}
-case 46:
-#line 468 "parser.yy"
-{
-		yyval.outputdef = yyvsp[0].paper;
-	;
-    break;}
-case 47:
-#line 471 "parser.yy"
-{
-		yyval.outputdef= yyvsp[0].midi;
-	;
-    break;}
-case 48:
-#line 477 "parser.yy"
-{ yyval.intvec =new Array<int>; ;
-    break;}
-case 49:
-#line 478 "parser.yy"
-{
-		yyval.intvec->push (yyvsp[-2].i); yyval.intvec->push (yyvsp[0].i);
-	;
-    break;}
-case 50:
-#line 489 "parser.yy"
-{ yyval.paper = yyvsp[-1].paper; ;
-    break;}
-case 51:
-#line 493 "parser.yy"
-{
-		yyval.paper = THIS->default_paper ();
-	;
-    break;}
-case 52:
-#line 496 "parser.yy"
-{
-		yyval.paper = yyvsp[0].id->paperdef ();
-	;
-    break;}
-case 53:
-#line 499 "parser.yy"
-{ 
-		yyval.paper->outfile_str_ = *yyvsp[-1].string;
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 54:
-#line 503 "parser.yy"
-{ yyval.paper->set (yyvsp[0].lookup); ;
-    break;}
-case 55:
-#line 504 "parser.yy"
-{
-		yyval.paper->set_var (*yyvsp[-3].string, yyvsp[-1].real);
-	;
-    break;}
-case 56:
-#line 507 "parser.yy"
-{
-		yyval.paper->set_var (*yyvsp[-3].string, yyvsp[-1].real);
-	;
-    break;}
-case 57:
-#line 510 "parser.yy"
-{
-		yyval.paper-> assign_translator (*yyvsp[-2].string, yyvsp[0].trans);
-		delete yyvsp[-2].string;
-	;
-    break;}
-case 58:
-#line 514 "parser.yy"
-{
-		yyval.paper->shape_int_a_ = *yyvsp[-1].intarr;
-		delete yyvsp[-1].intarr;
-	;
-    break;}
-case 59:
-#line 518 "parser.yy"
-{
-
-	;
-    break;}
-case 60:
-#line 524 "parser.yy"
-{
-		yyval.intarr = new Array<Interval>;
-	;
-    break;}
-case 61:
-#line 527 "parser.yy"
-{
-		yyval.intarr->push(Interval(yyvsp[-1].real, yyvsp[-1].real + yyvsp[0].real));
-	;
-    break;}
-case 62:
-#line 537 "parser.yy"
-{ yyval.midi = yyvsp[-1].midi; ;
-    break;}
-case 63:
-#line 540 "parser.yy"
-{
-		yyval.midi = THIS->default_midi ();
-	;
-    break;}
-case 64:
-#line 543 "parser.yy"
-{
-		yyval.midi-> assign_translator (*yyvsp[-2].string, yyvsp[0].trans);
-		delete yyvsp[-2].string;
-	;
-    break;}
-case 65:
-#line 547 "parser.yy"
-{
-		yyval.midi->outfile_str_ = *yyvsp[-1].string;
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 66:
-#line 551 "parser.yy"
-{
-		yyval.midi->set_tempo (yyvsp[-1].tempo->dur_.length (), yyvsp[-1].tempo->metronome_i_);
-		delete yyvsp[-1].tempo;
-	;
-    break;}
-case 67:
-#line 555 "parser.yy"
-{
-
-	;
-    break;}
-case 68:
-#line 561 "parser.yy"
-{
-		yyval.tempo = new Tempo_req;
-		yyval.tempo->dur_ = *yyvsp[-2].duration;
-		delete yyvsp[-2].duration;
-		yyval.tempo-> metronome_i_ = yyvsp[0].i;
-	;
-    break;}
-case 69:
-#line 574 "parser.yy"
-{
-		yyval.musiclist = yyvsp[-1].musiclist;
-	;
-    break;}
-case 70:
-#line 580 "parser.yy"
-{
-		yyval.musiclist = new Voice;
-		yyval.musiclist->set_spot (THIS->here_input ());
-	;
-    break;}
-case 71:
-#line 584 "parser.yy"
-{
-		yyval.musiclist->add (yyvsp[0].music);
-	;
-    break;}
-case 72:
-#line 590 "parser.yy"
-{ yyval.music = yyvsp[0].music; ;
-    break;}
-case 73:
-#line 591 "parser.yy"
-{
-		yyval.music = yyvsp[0].music;
-		yyval.music->translator_type_str_ = *yyvsp[-1].string;
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 74:
-#line 596 "parser.yy"
-{
-		yyval.music = yyvsp[0].music;
-		yyval.music->translator_type_str_ = *yyvsp[-3].string;
-		yyval.music->translator_id_str_ = *yyvsp[-1].string;
-		delete yyvsp[-3].string;
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 75:
-#line 603 "parser.yy"
-{ yyval.music = yyvsp[0].musiclist; ;
-    break;}
-case 76:
-#line 604 "parser.yy"
-{ yyval.music = yyvsp[0].chord; ;
-    break;}
-case 77:
-#line 605 "parser.yy"
-{ yyval.music = yyvsp[0].music; ;
-    break;}
-case 78:
-#line 606 "parser.yy"
-{ yyval.music = yyvsp[0].id->music (); ;
-    break;}
-case 79:
-#line 607 "parser.yy"
-{ yyval.music = yyvsp[-1].id->music (); ;
-    break;}
-case 80:
-#line 609 "parser.yy"
-{ THIS->lexer_p_->push_note_state (); ;
-    break;}
-case 81:
-#line 611 "parser.yy"
-{ yyval.music=yyvsp[0].music; THIS->lexer_p_->pop_state (); ;
-    break;}
-case 82:
-#line 614 "parser.yy"
-{ THIS->lexer_p_->push_lyric_state (); ;
-    break;}
-case 83:
-#line 616 "parser.yy"
-{ yyval.music = yyvsp[0].music; THIS->lexer_p_->pop_state (); ;
-    break;}
-case 86:
-#line 622 "parser.yy"
-{
-		Change_translator * t = new Change_translator;
-		t-> change_to_type_str_ = *yyvsp[-2].string;
-		t-> change_to_id_str_ = *yyvsp[0].string;
-
-		yyval.music = t;
-		yyval.music->set_spot (THIS->here_input ());
-		delete yyvsp[-2].string;
-		delete yyvsp[0].string;
-	;
-    break;}
-case 87:
-#line 635 "parser.yy"
-{
-		Translation_property *t = new Translation_property;
-		t-> translator_type_str_ = *yyvsp[-4].string;
-		t-> var_str_ = *yyvsp[-2].string;
-		t-> value_ = *yyvsp[0].scalar;
-		yyval.music = t;
-		yyval.music->set_spot (THIS->here_input ());
-		delete yyvsp[-4].string;
-		delete yyvsp[-2].string;
-		delete yyvsp[0].scalar;
-	;
-    break;}
-case 88:
-#line 649 "parser.yy"
-{ yyval.scalar = new Scalar (*yyvsp[0].string); delete yyvsp[0].string; ;
-    break;}
-case 89:
-#line 650 "parser.yy"
-{ yyval.scalar = new Scalar (yyvsp[0].i); ;
-    break;}
-case 90:
-#line 655 "parser.yy"
-{ yyval.chord  = yyvsp[-1].chord; ;
-    break;}
-case 91:
-#line 656 "parser.yy"
-{
-		yyval.chord = yyvsp[0].chord;
-		yyval.chord->multi_level_i_=yyvsp[-1].i;
-	;
-    break;}
-case 92:
-#line 663 "parser.yy"
-{
-		yyval.chord = new Chord;
-		yyval.chord-> multi_level_i_ = 1;
-		yyval.chord->set_spot (THIS->here_input ());
-	;
-    break;}
-case 93:
-#line 668 "parser.yy"
-{
-		yyval.chord->add (yyvsp[0].music);
-	;
-    break;}
-case 94:
-#line 674 "parser.yy"
-{
-		yyval.music = yyvsp[0].music;
-		yyval.music -> transpose (yyvsp[-1].melreq);
-
-		delete yyvsp[-1].melreq;
-	;
-    break;}
-case 95:
-#line 687 "parser.yy"
-{
-	 	THIS->add_requests ((Chord*)yyvsp[-1].music);//ugh
- 		yyval.music = yyvsp[-1].music;
-	;
-    break;}
-case 97:
-#line 692 "parser.yy"
-{ yyval.music = 0; ;
-    break;}
-case 100:
-#line 701 "parser.yy"
-{
-		yyval.music = new Request_chord;
-		yyval.music-> set_spot (THIS->here_input ());
-		yyvsp[0].request-> set_spot (THIS->here_input ());
-		((Chord*)yyval.music) ->add (yyvsp[0].request);//ugh
-
-	;
-    break;}
-case 102:
-#line 712 "parser.yy"
-{ yyval.request = yyvsp[-1].request; ;
-    break;}
-case 103:
-#line 716 "parser.yy"
-{
-		yyval.request = new Barcheck_req;
-	;
-    break;}
-case 104:
-#line 719 "parser.yy"
-{
-		yyval.request = yyvsp[0].id->request ();
-	;
-    break;}
-case 105:
-#line 725 "parser.yy"
-{
-		yyval.request = new Bar_req (*yyvsp[0].string);
-		delete yyvsp[0].string;
-	;
-    break;}
-case 106:
-#line 729 "parser.yy"
-{
-		Break_force_req * f = new Break_force_req;
-		f-> set_spot (THIS->here_input ());
-		yyval.request = f;
-	;
-    break;}
-case 107:
-#line 734 "parser.yy"
-{
-		Meter_change_req *m = new Meter_change_req;
-		m->set (yyvsp[-2].i,yyvsp[0].i);
-		yyval.request = m;
-	;
-    break;}
-case 108:
-#line 739 "parser.yy"
-{
-		Skip_req * skip_p = new Skip_req;
-		skip_p->duration_.set_plet (yyvsp[0].moment->num (),
-			yyvsp[0].moment->den ());
-
-		delete yyvsp[0].moment;
-		yyval.request = skip_p;
-	;
-    break;}
-case 109:
-#line 747 "parser.yy"
-{
-		yyval.request = yyvsp[0].tempo;
-	;
-    break;}
-case 110:
-#line 750 "parser.yy"
-{
-		yyval.request = new Cadenza_req (yyvsp[0].i);
-	;
-    break;}
-case 111:
-#line 753 "parser.yy"
-{
-		yyval.request = new Partial_measure_req (*yyvsp[0].moment);
-		delete yyvsp[0].moment;
-	;
-    break;}
-case 112:
-#line 757 "parser.yy"
-{
-		yyval.request = new Clef_change_req (*yyvsp[0].string);
-		delete yyvsp[0].string;
-	;
-    break;}
-case 113:
-#line 761 "parser.yy"
-{
-		Key_change_req *key_p= new Key_change_req;
-		key_p->melodic_p_arr_ = *yyvsp[0].melreqvec;
-		yyval.request = key_p;
-		delete yyvsp[0].melreqvec;
-	;
-    break;}
-case 114:
-#line 767 "parser.yy"
-{
-		yyval.request = get_grouping_req (*yyvsp[0].intvec); delete yyvsp[0].intvec;
-	;
-    break;}
-case 115:
-#line 773 "parser.yy"
-{
-		/* something silly happened.  Junk this stuff*/
-		if (!THIS->post_reqs.empty ())
-		{
-			warning ("Junking post-requests");
-			THIS->post_reqs.clear ();
-		}
-	;
-    break;}
-case 116:
-#line 781 "parser.yy"
-{
-		yyvsp[0].request->set_spot (THIS->here_input ());
-		THIS->post_reqs.push (yyvsp[0].request);
-	;
-    break;}
-case 117:
-#line 785 "parser.yy"
-{
-		Array<Request*>& r = *THIS->get_parens_request (yyvsp[0].i);
-		for (int i = 0; i < r.size (); i++ )
-			r[i]->set_spot (THIS->here_input ());
-		THIS->post_reqs.concat (r);
-		delete &r;
-	;
-    break;}
-case 120:
-#line 800 "parser.yy"
-{
-		yyval.request = (Request*)yyvsp[0].id->request ();
-	;
-    break;}
-case 121:
-#line 803 "parser.yy"
-{
-		yyval.request = yyvsp[0].request;
-	;
-    break;}
-case 122:
-#line 806 "parser.yy"
-{
-		Abbreviation_req* a = new Abbreviation_req;
-		a->type_i_ = yyvsp[0].i;
-		yyval.request = a;
-	;
-    break;}
-case 123:
-#line 819 "parser.yy"
-{
-		yyval.melreq = yyvsp[0].melreq->clone ()->musical ()->melodic ();
-		yyval.melreq->octave_i_ += THIS->default_octave_i_;
-	;
-    break;}
-case 124:
-#line 823 "parser.yy"
-{
-		yyval.melreq-> octave_i_ += yyvsp[0].i;
-	;
-    break;}
-case 125:
-#line 826 "parser.yy"
-{
-		yyval.melreq = yyvsp[0].melreq;
-		yyvsp[0].melreq-> octave_i_ -= yyvsp[-1].i;
-	;
-    break;}
-case 126:
-#line 833 "parser.yy"
-{
-		yyval.notereq = new Note_req;
-		* (Melodic_req *) yyval.notereq = *yyvsp[0].melreq;
-		delete yyvsp[0].melreq;
-	;
-    break;}
-case 127:
-#line 838 "parser.yy"
-{
-		yyval.notereq->forceacc_b_ = ! yyval.notereq->forceacc_b_;
-	;
-    break;}
-case 128:
-#line 845 "parser.yy"
-{/* ugh */
-		yyval.melreq = new Melodic_req;
-		yyval.melreq->octave_i_ = yyvsp[-3].i;
-		yyval.melreq->notename_i_ = yyvsp[-2].i;
-		yyval.melreq->accidental_i_ = yyvsp[-1].i;
-	;
-    break;}
-case 129:
-#line 854 "parser.yy"
-{
-		yyval.duration = new Duration;
-		yyval.duration-> durlog_i_ = yyvsp[-2].i;
-		yyval.duration-> dots_i_ = yyvsp[-1].i;
-	;
-    break;}
-case 130:
-#line 862 "parser.yy"
-{
-		Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
-		ad_p ->loudness_ = (Dynamic_req::Loudness)yyvsp[-1].i;
-		yyval.request =ad_p;
-	;
-    break;}
-case 131:
-#line 867 "parser.yy"
-{
-		Span_dynamic_req * sp_p = new Span_dynamic_req;
-		sp_p->spantype = (Span_req::Spantype)yyvsp[-1].i;
-		sp_p-> dynamic_dir_  = (Direction)yyvsp[-2].i;
-		yyval.request = sp_p;
-	;
-    break;}
-case 132:
-#line 876 "parser.yy"
-{
-		yyval.pair[0] = yyvsp[-2].i;
-		yyval.pair[1] = yyvsp[0].i;
-	;
-    break;}
-case 133:
-#line 881 "parser.yy"
-{
-		int num = yyvsp[0].i >? 1;
-		yyval.pair[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
-		yyval.pair[1] = num;
-	;
-    break;}
-case 134:
-#line 889 "parser.yy"
-{
-		yyval.i = MAEBTELP;
-		THIS->plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->plet_.iso_i_ = yyvsp[0].pair[0];
-		THIS->default_duration_.plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->default_duration_.plet_.iso_i_ = yyvsp[0].pair[0];
-	;
-    break;}
-case 135:
-#line 896 "parser.yy"
-{
-		yyval.i = TELP;
-		THIS->plet_.type_i_ = 1;
-		THIS->plet_.iso_i_ = 1;
-		THIS->default_duration_.plet_.iso_i_ = 1;
-		THIS->default_duration_.plet_.type_i_ = 1;
-	;
-    break;}
-case 136:
-#line 903 "parser.yy"
-{
-		yyval.i = TELP;
-		THIS->plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->plet_.iso_i_ = yyvsp[0].pair[0];
-		THIS->default_duration_.plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->default_duration_.plet_.iso_i_ = yyvsp[0].pair[0];
-	;
-    break;}
-case 137:
-#line 913 "parser.yy"
-{
-		yyval.i = '~';
-	;
-    break;}
-case 138:
-#line 916 "parser.yy"
-{
-		yyval.i='(';
-	;
-    break;}
-case 139:
-#line 919 "parser.yy"
-{
-		yyval.i = ']';
-	;
-    break;}
-case 140:
-#line 922 "parser.yy"
-{
-		yyval.i = '<';
-	;
-    break;}
-case 141:
-#line 925 "parser.yy"
-{
-		yyval.i = '>';
-	;
-    break;}
-case 142:
-#line 928 "parser.yy"
-{
-	;
-    break;}
-case 143:
-#line 933 "parser.yy"
-{
-		yyval.c = '[';
-		if (!Duration::duration_type_b (yyvsp[0].i))
-			THIS->parser_error ("1:Not a duration");
-		else if (yyvsp[0].i < 8)
-			THIS->parser_error ("Can't abbreviate");
-		else
-			THIS->set_abbrev_beam (yyvsp[0].i);
-	;
-    break;}
-case 144:
-#line 945 "parser.yy"
-{
-		yyval.i = BEAMPLET;
-		THIS->plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->plet_.iso_i_ = yyvsp[0].pair[0];
-		THIS->default_duration_.plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->default_duration_.plet_.iso_i_ = yyvsp[0].pair[0];
-	;
-    break;}
-case 145:
-#line 952 "parser.yy"
-{
-		yyval.i = PLET;
-		THIS->plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->plet_.iso_i_ = yyvsp[0].pair[0];
-		THIS->default_duration_.plet_.type_i_ = yyvsp[0].pair[1];
-		THIS->default_duration_.plet_.iso_i_ = yyvsp[0].pair[0];
-	;
-    break;}
-case 146:
-#line 962 "parser.yy"
-{
-		yyval.i = '!';
-	;
-    break;}
-case 147:
-#line 965 "parser.yy"
-{
-		yyval.i=')';
-	;
-    break;}
-case 148:
-#line 968 "parser.yy"
-{
-		yyval.i='[';
-	;
-    break;}
-case 149:
-#line 971 "parser.yy"
-{
-	;
-    break;}
-case 150:
-#line 973 "parser.yy"
-{
-	;
-    break;}
-case 151:
-#line 980 "parser.yy"
-{ yyval.script = yyvsp[-1].script; ;
-    break;}
-case 152:
-#line 984 "parser.yy"
-{
-		Script_def *s = new Script_def;
-		s->set_from_input (*yyvsp[-5].string,yyvsp[-4].i, yyvsp[-3].i,yyvsp[-2].i,yyvsp[-1].i, yyvsp[0].i);
-		yyval.script  = s;
-		delete yyvsp[-5].string;
-	;
-    break;}
-case 153:
-#line 993 "parser.yy"
-{
-		Musical_script_req *m = new Musical_script_req;
-		yyval.request = m;
-		m->scriptdef_p_ = yyvsp[0].script;
-		m->set_spot (THIS->here_input ());
-		if (!m->dir_)
-		  m->dir_  = (Direction)yyvsp[-1].i;
-	;
-    break;}
-case 154:
-#line 1004 "parser.yy"
-{ 
-		yyval.script = yyvsp[0].textdef;
-		((Text_def*) yyval.script)->align_i_ = CENTER; /* UGH */
-	;
-    break;}
-case 155:
-#line 1008 "parser.yy"
-{ 
-		yyval.script = yyvsp[0].script;
-		yyval.script-> set_spot (THIS->here_input ());
-	;
-    break;}
-case 156:
-#line 1012 "parser.yy"
-{
-		yyval.script = yyvsp[0].textdef;
-		((Text_def*)yyval.script)->align_i_ = CENTER;
-	;
-    break;}
-case 157:
-#line 1019 "parser.yy"
-{
-		Text_def *t  = new Text_def;
-		yyval.textdef = t;
-		t->text_str_ = *yyvsp[0].string;
-		delete yyvsp[0].string;
-		t->style_str_ = THIS->textstyle_str_;
-		yyval.textdef->set_spot (THIS->here_input ());
-	;
-    break;}
-case 158:
-#line 1030 "parser.yy"
-{
-		Text_def* t  = new Text_def;
-		yyval.textdef = t;
-		t->text_str_ = String (yyvsp[0].i);
-		t->style_str_ = "finger";
-		yyval.textdef->set_spot (THIS->here_input ());
-	;
-    break;}
-case 159:
-#line 1040 "parser.yy"
-{ yyval.string = get_scriptdef ('^'); ;
-    break;}
-case 160:
-#line 1041 "parser.yy"
-{ yyval.string = get_scriptdef ('+'); ;
-    break;}
-case 161:
-#line 1042 "parser.yy"
-{ yyval.string = get_scriptdef ('-'); ;
-    break;}
-case 162:
-#line 1043 "parser.yy"
-{ yyval.string = get_scriptdef ('|'); ;
-    break;}
-case 163:
-#line 1044 "parser.yy"
-{ yyval.string = get_scriptdef ('o'); ;
-    break;}
-case 164:
-#line 1045 "parser.yy"
-{ yyval.string = get_scriptdef ('>'); ;
-    break;}
-case 165:
-#line 1046 "parser.yy"
-{
-		yyval.string = get_scriptdef ('.');
-	;
-    break;}
-case 166:
-#line 1052 "parser.yy"
-{ yyval.script = yyvsp[0].id->script (); ;
-    break;}
-case 167:
-#line 1053 "parser.yy"
-{ yyval.script = yyvsp[0].script; ;
-    break;}
-case 168:
-#line 1054 "parser.yy"
-{
-		yyval.script = THIS->lexer_p_->lookup_identifier (*yyvsp[0].string)->script ();
-		delete yyvsp[0].string;
-	;
-    break;}
-case 169:
-#line 1061 "parser.yy"
-{ yyval.i = -1; ;
-    break;}
-case 170:
-#line 1062 "parser.yy"
-{ yyval.i = 1; ;
-    break;}
-case 171:
-#line 1063 "parser.yy"
-{ yyval.i = 0; ;
-    break;}
-case 172:
-#line 1067 "parser.yy"
-{
-	;
-    break;}
-case 173:
-#line 1069 "parser.yy"
-{
-		Array<Request*>& r = *THIS->get_parens_request (yyvsp[0].i);
-		for (int i = 0; i < r.size (); i++ )
-			r[i]->set_spot (THIS->here_input ());
-		THIS->pre_reqs.concat (r);
-		delete &r;
-	;
-    break;}
-case 174:
-#line 1079 "parser.yy"
-{
-		THIS->set_duration_mode (*yyvsp[0].string);
-		delete yyvsp[0].string;
-	;
-    break;}
-case 175:
-#line 1083 "parser.yy"
-{
-		THIS->set_default_duration (yyvsp[0].duration);
-		delete yyvsp[0].duration;
-	;
-    break;}
-case 176:
-#line 1087 "parser.yy"
-{
-		/*
-			This is weird, but default_octave_i_
-			is used in steno_note_req too
-
-			c' -> default_octave_i_ == 1
-		*/
-		/* why can't we have \oct 0 iso \oct{c'}*/
-		THIS->default_octave_i_ = 1; ;
-    break;}
-case 177:
-#line 1097 "parser.yy"
-{
-		THIS->default_octave_i_ = yyvsp[0].melreq->octave_i_;
-		delete yyvsp[0].melreq;
-	;
-    break;}
-case 178:
-#line 1101 "parser.yy"
-{
-		THIS->textstyle_str_ = *yyvsp[0].string;
-		delete yyvsp[0].string;
-	;
-    break;}
-case 179:
-#line 1108 "parser.yy"
-{
-		yyval.moment = new Moment (0,1);
-	;
-    break;}
-case 180:
-#line 1111 "parser.yy"
-{
-		*yyval.moment += yyvsp[0].duration->length ();
-	;
-    break;}
-case 181:
-#line 1117 "parser.yy"
-{ yyval.i = 1; ;
-    break;}
-case 182:
-#line 1118 "parser.yy"
-{ yyval.i ++; ;
-    break;}
-case 183:
-#line 1122 "parser.yy"
-{
-		yyval.duration = new Duration (THIS->default_duration_);
-	;
-    break;}
-case 184:
-#line 1125 "parser.yy"
-{
-		yyval.duration = new Duration (THIS->default_duration_);
-		yyval.duration->dots_i_  = yyvsp[0].i;
-	;
-    break;}
-case 185:
-#line 1129 "parser.yy"
-{
-		THIS->set_last_duration (yyvsp[0].duration);
-		yyval.duration = yyvsp[0].duration;
-	;
-    break;}
-case 186:
-#line 1136 "parser.yy"
-{
-		yyval.duration = yyvsp[0].duration;
-	;
-    break;}
-case 187:
-#line 1142 "parser.yy"
-{
-		yyval.duration = new Duration;
-		if (!Duration::duration_type_b (yyvsp[0].i))
-			THIS->parser_error ("2:Not a duration");
-		else {
-			yyval.duration->durlog_i_ = Duration_convert::i2_type (yyvsp[0].i);
-			yyval.duration->set_plet (THIS->default_duration_);
-		     }
-	;
-    break;}
-case 188:
-#line 1151 "parser.yy"
-{
-		yyval.duration = yyvsp[0].id->duration ();
-	;
-    break;}
-case 189:
-#line 1154 "parser.yy"
-{
-		yyval.duration->dots_i_ ++;
-	;
-    break;}
-case 190:
-#line 1157 "parser.yy"
-{
-		yyval.duration->plet_.iso_i_ = yyvsp[0].i;
-	;
-    break;}
-case 191:
-#line 1160 "parser.yy"
-{
-		yyval.duration->plet_.type_i_ = yyvsp[0].i;
-	;
-    break;}
-case 192:
-#line 1167 "parser.yy"
-{
-		yyval.i =0;
-	;
-    break;}
-case 193:
-#line 1170 "parser.yy"
-{
-		if (!Duration::duration_type_b (yyvsp[0].i))
-			THIS->parser_error ("3:Not a duration");
-		else if (yyvsp[0].i < 8)
-			THIS->parser_error ("Can't abbreviate");
-		yyval.i = yyvsp[0].i;
-	;
-    break;}
-case 194:
-#line 1181 "parser.yy"
-{
-		if (!THIS->lexer_p_->note_state_b ())
-			THIS->parser_error ("have to be in Note mode for notes");
-		yyvsp[-1].notereq->set_duration (*yyvsp[0].duration);
-		int durlog_i = yyvsp[0].duration->durlog_i_;
-		yyval.music = THIS->get_note_element (yyvsp[-1].notereq, yyvsp[0].duration);
-	;
-    break;}
-case 195:
-#line 1188 "parser.yy"
-{
-		yyval.music = THIS->get_rest_element (*yyvsp[-1].string, yyvsp[0].duration);
-		delete yyvsp[-1].string;
-	;
-    break;}
-case 196:
-#line 1195 "parser.yy"
-{
-	/* this sux! text-def should be feature of lyric-engraver. */
-		if (!THIS->lexer_p_->lyric_state_b ())
-			THIS->parser_error ("Have to be in Lyric mode for lyrics");
-		yyval.music = THIS->get_word_element (yyvsp[-1].textdef, yyvsp[0].duration);
-
-	;
-    break;}
-case 197:
-#line 1206 "parser.yy"
-{
-		yyval.melreqvec = new Array<Melodic_req*>;
-	;
-    break;}
-case 198:
-#line 1209 "parser.yy"
-{
-		yyval.melreqvec->push (yyvsp[0].melreq->clone ()->musical ()->melodic ());
-	;
-    break;}
-case 199:
-#line 1215 "parser.yy"
-{
-		yyval.i = yyvsp[0].i;
-	;
-    break;}
-case 200:
-#line 1218 "parser.yy"
-{
-		yyval.i = yyvsp[0].i;
-	;
-    break;}
-case 201:
-#line 1223 "parser.yy"
-{
-		yyval.i = yyvsp[0].i;
-	;
-    break;}
-case 202:
-#line 1226 "parser.yy"
-{
-		yyval.i = -yyvsp[0].i;
-	;
-    break;}
-case 203:
-#line 1229 "parser.yy"
-{
-		int *i_p = yyvsp[0].id->intid ();
-		yyval.i = *i_p;
-		delete i_p;
-	;
-    break;}
-case 204:
-#line 1237 "parser.yy"
-{
-		yyval.real = yyvsp[0].real;
-	;
-    break;}
-case 205:
-#line 1240 "parser.yy"
-{
-		Real *r_p = yyvsp[0].id->real ();
-		yyval.real = * r_p;
-		delete r_p;
-	;
-    break;}
-case 206:
-#line 1250 "parser.yy"
-{ yyval.real = yyvsp[-1].real*yyvsp[0].real; ;
-    break;}
-case 207:
-#line 1254 "parser.yy"
-{ yyval.real = 1 CM; ;
-    break;}
-case 208:
-#line 1255 "parser.yy"
-{ yyval.real = 1 INCH; ;
-    break;}
-case 209:
-#line 1256 "parser.yy"
-{ yyval.real = 1 MM; ;
-    break;}
-case 210:
-#line 1257 "parser.yy"
-{ yyval.real = 1 PT; ;
-    break;}
-case 211:
-#line 1264 "parser.yy"
-{ yyval.lookup = yyvsp[-1].lookup; ;
-    break;}
-case 212:
-#line 1268 "parser.yy"
-{
-		yyval.lookup = new Lookup;
-	;
-    break;}
-case 213:
-#line 1271 "parser.yy"
-{
-		yyval.lookup = yyvsp[0].id->lookup ();
-	;
-    break;}
-case 214:
-#line 1274 "parser.yy"
-{
-		yyval.lookup->texsetting = *yyvsp[0].string;
-		delete yyvsp[0].string;
-	;
-    break;}
-case 215:
-#line 1278 "parser.yy"
-{
-		yyval.lookup->add (*yyvsp[-2].string, yyvsp[0].symtable);
-		delete yyvsp[-2].string;
-	;
-    break;}
-case 216:
-#line 1285 "parser.yy"
-{ yyval.symtable = yyvsp[-1].symtable; ;
-    break;}
-case 217:
-#line 1289 "parser.yy"
-{ yyval.symtable = new Symtable; ;
-    break;}
-case 218:
-#line 1290 "parser.yy"
-{
-		yyval.symtable->add (*yyvsp[-1].string, *yyvsp[0].symbol);
-		delete yyvsp[-1].string;
-		delete yyvsp[0].symbol;
-	;
-    break;}
-case 219:
-#line 1298 "parser.yy"
-{
-		yyval.symbol = new Atom (*yyvsp[-1].string, *yyvsp[0].box);
-		delete yyvsp[-1].string;
-		delete yyvsp[0].box;
-	;
-    break;}
-case 220:
-#line 1303 "parser.yy"
-{
-		Box b (Interval (0,0), Interval (0,0));
-		yyval.symbol = new Atom (*yyvsp[0].string, b);
-		delete yyvsp[0].string;
-	;
-    break;}
-case 221:
-#line 1311 "parser.yy"
-{
-		yyval.box = new Box (*yyvsp[-1].interval, *yyvsp[0].interval);
-		delete yyvsp[-1].interval;
-		delete yyvsp[0].interval;
-	;
-    break;}
-case 222:
-#line 1318 "parser.yy"
-{
-		yyval.interval = new Interval (yyvsp[-1].real, yyvsp[0].real);
-	;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/lib/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-}
-#line 1323 "parser.yy"
-
-
-void
-My_lily_parser::set_yydebug (bool b)
-{
-#ifdef YYDEBUG
-	yydebug = b;
-#endif
-}
-void
-My_lily_parser::do_yyparse ()
-{
-	yyparse ((void*)this);
-}
-
-Paper_def*
-My_lily_parser::default_paper ()
-{
-	Identifier *id = lexer_p_->lookup_identifier ("default_paper");
-	return id ? id->paperdef () : new Paper_def ;
-}
-
-Midi_def*
-My_lily_parser::default_midi ()
-{
-	Identifier *id = lexer_p_->lookup_identifier ("default_midi");
-	return id ? id->mididef () : new Midi_def ;
-}
-
diff --git a/lily/qlp.cc b/lily/qlp.cc
index 7a99cc639f..635cba40a0 100644
--- a/lily/qlp.cc
+++ b/lily/qlp.cc
@@ -9,6 +9,7 @@
 #include "debug.hh"
 #include "qlp.hh"
 
+
 void
 Mixed_qp::add_equality_cons (Vector , double)
 {
@@ -57,9 +58,9 @@ void
 Ineq_constrained_qp::assert_solution (Vector sol) const
 {
   Array<int> binding;
-  for (int i=0; i < cons.size(); i++) 
+  for (int i=0; i < cons_.size(); i++) 
     {
-      Real R=cons[i] * sol- consrhs[i];
+      Real R=cons_[i] * sol- consrhs_[i];
       assert (R> -EPS);
       if (R < EPS)
 	binding.push (i);
@@ -72,12 +73,12 @@ void
 Ineq_constrained_qp::print() const
 {
 #ifndef NPRINT
-  DOUT << "Quad " << quad;
-  DOUT << "lin " << lin <<"\n"
-       << "const " << const_term<<"\n";
-  for (int i=0; i < cons.size(); i++) 
+  DOUT << "Quad " << quad_;
+  DOUT << "lin " << lin_ <<"\n"
+       << "const " << const_term_<<"\n";
+  for (int i=0; i < cons_.size(); i++) 
     {
-      DOUT << "constraint["<<i<<"]: " << cons[i] << " >= " << consrhs[i];
+      DOUT << "constraint["<<i<<"]: " << cons_[i] << " >= " << consrhs_[i];
       DOUT << "\n";
     }
 #endif
diff --git a/lily/qlpsolve.cc b/lily/qlpsolve.cc
index 7baa0a1a4a..3d45207eab 100644
--- a/lily/qlpsolve.cc
+++ b/lily/qlpsolve.cc
@@ -41,12 +41,12 @@ Active_constraints::OK()
 #ifndef NDEBUG
   H.OK();
   A.OK();
-  assert (active.size() +inactive.size () == opt->cons.size ());
+  assert (active.size() +inactive.size () == opt->cons_.size ());
   assert (H.dim() == opt->dim ());
   assert (active.size() == A.rows ());
   Array<int> allcons;
 
-  for (int i=0; i < opt->cons.size(); i++)
+  for (int i=0; i < opt->cons_.size(); i++)
     allcons.push (0);
   for (int i=0; i < active.size(); i++)
     {
@@ -79,7 +79,7 @@ Active_constraints::add (int k)
   inactive.swap (k,inactive.size()-1);
   inactive.pop();
 
-  Vector a (opt->cons[cidx]);
+  Vector a (opt->cons_[cidx]);
   // update of matrices
   Vector Ha = H*a;
   Real aHa = a*Ha;
@@ -123,10 +123,10 @@ Active_constraints::drop (int k)
       /*
 
        */
-      Real q = a*opt->quad*a;
+      Real q = a*opt->quad_*a;
       Matrix aaq (a,a/q);
       H += aaq;
-      A -= A*opt->quad*aaq;
+      A -= A*opt->quad_*aaq;
     }else
       WARN << _("degenerate constraints");
 #ifndef NDEBUG
@@ -143,9 +143,9 @@ Active_constraints::Active_constraints (Ineq_constrained_qp const *op)
 	  H(op->dim()),
 	  opt (op)
 {
-  for (int i=0; i < op->cons.size(); i++)
+  for (int i=0; i < op->cons_.size(); i++)
     inactive.push (i);
-  Choleski_decomposition chol (op->quad);
+  Choleski_decomposition chol (op->quad_);
 
   /*
     ugh.
diff --git a/lily/slur.cc b/lily/slur.cc
index 7ad52ce6d2..fcc57eab1d 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -23,6 +23,9 @@
 #include "debug.hh"
 #include "boxes.hh"
 #include "bezier.hh"
+#include "main.hh"
+
+IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
 
 void
 Slur::add (Note_column*n)
@@ -111,7 +114,7 @@ Slur::do_post_processing ()
  
   do 
     {
-      if  (extrema[d] != spanned_drul_[d]) 
+      if (extrema[d] != spanned_drul_[d]) 
 	{
 	  dx_f_drul_[d] = -d 
 	    *(spanned_drul_[d]->width ().length () -0.5*nw_f);
@@ -120,7 +123,11 @@ Slur::do_post_processing ()
         {
 	  dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_->height ()[dir_]);
 	  /* normal slur from notehead centre to notehead centre, minus gap */
-	  dx_f_drul_[d] += -d * gap_f;
+	  // ugh: diff between old and new slurs
+	  if (!experimental_features_global_b)
+	    dx_f_drul_[d] += -d * gap_f;
+	  else
+	    dx_f_drul_[d] += 0.5 * nw_f - d * gap_f;
 	}
       else 
         {
@@ -131,118 +138,164 @@ Slur::do_post_processing ()
   while (flip(&d) != LEFT);
 }
 
-static Real
-pos_correct (Real x, Real dx, Real dy)
+Real
+Slur::height_f () const
 {
+  Bezier_bow bow (paper ());
+  Array<Offset> notes = get_notes ();
+  bow.set (notes, dir_);
+
+  Real height = 0;
+  Real dy1 = bow.calc_f (height);
+  if (!dy1)
+    return height;
+
+  height = dy1;
+  bow.set (notes, dir_);
+  Real dy2 = bow.calc_f (height);
+  if (!dy2)
+    return height;
+
+  if (abs (dy2 - dy1) < paper ()->rule_thickness ())
+    return height;
+  
   /*
-    guess how much we can safely increase 'h'
-    parameter of bow without taking too large
-    or too many steps.
-    empiric computer science
+    Assume 
+      dy = B (h) 
+    with 
+      B (h) = a * h + b;
+
+    Then we get for height = h{dy=0}
    */
-//  return (1.0 + 2.0 * x / dx) / 4.0;
-  return 1.0;
+  Real a = (dy2 - dy1) / dy1;
+  Real b = dy1;
+  height = -b / a;
+    
+  if (check_debug && !monitor->silent_b ("Slur")) 
+    { 
+      cout << "************" << endl;
+      cout << "dy1: " << dy1 << endl;
+      cout << "dy2: " << dy2 << endl;
+      cout << "a: " << a << endl;
+      cout << "b: " << b << endl;
+      cout << "h: " << height << endl;
+    }
+
+  return height;
 }
 
-Real
-Slur::height_f () const
+Molecule*
+Slur::brew_molecule_p () const
 {
-  return 0.0;
+  if (!experimental_features_global_b)
+    return Bow::brew_molecule_p ();
+
+  Molecule* mol_p = new Molecule;
   
+  Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+  
+  Real dx_f = width ().length ();
+  dx_f += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+  
+  Atom a = paper ()->lookup_l ()->control_slur (get_controls (), dx_f, dy_f);
+
+  Real interline_f = paper ()->interline_f ();
+  Real gap_f = interline_f / 2; // 5;
+  Real nw_f = paper ()->note_width ();
+  a.translate (Offset (dx_f + 0.5 * nw_f + gap_f, dy_f + dy_f_drul_[LEFT]));
+  mol_p->add (a);
+  return mol_p;
+}
+
+Array<Offset>
+Slur::get_notes () const
+{
   Real interline = paper ()->interline_f ();
   Real notewidth = paper ()->note_width ();
   Real internote = interline / 2;
 
-  /*
-   having the correct (i.e. exactly the same as the ps stuff)
-   x,y coordinates is essential.
-   getting them is quite a mess, currently.
-   */
-
-  Stem* left_stem =encompass_arr_[0]->stem_l_; 
+  Stem* left_stem = encompass_arr_[0]->stem_l_;
   Real left_x = left_stem->hpos_f ();
   // ugh, do bow corrections (see brew_mol)
   left_x += dx_f_drul_[LEFT] + 0.5 * notewidth;
 
-//  Real left_y = left_stem->dir_ == dir_ ? left_stem->stem_end_f () + dir_
-//    : left_stem->stem_begin_f () + 0.5 * dir_;
-//  left_y *= internote;
-  // ugh, do bow corrections (see brew_mol)
-//  left_y = dy_f_drul_[LEFT];
-
   // ugh, do bow corrections (see brew_mol)
   Real left_y = dy_f_drul_[LEFT];
-
   // ugh, where does this asymmetry come from?
   if (dir_ == DOWN)
     left_y -= dir_ * internote;
 
-  Real dx = width ().length ();
-  Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
-  Real centre_x = dx / 2;
-
-
-  // ugh, need staffheight for bow damping
-  Bezier_bow b (paper ());
-
-  if (check_debug && !monitor->silent_b ("Slur"))
+  /*
+    urg, corrections for broken slurs: extra begin or end position 
+   */
+  int first = 0;
+  int n = encompass_arr_.size ();
+  if (encompass_arr_[0] != spanned_drul_[LEFT])
     {
-      cout << "*****************" << endl;
-      cout << "dir: " << (int)dir_ << endl;
-      cout << "dx: " << dx << endl;
-      cout << "dy: " << dy << endl;
-      cout << "centre: " << centre_x << endl;
-      for (int i = 0; i < encompass_arr_.size (); i++)
-	cout << "i: " << i << " x: " 
-	    << encompass_arr_[i]->stem_l_->hpos_f () - left_x << endl;
+      n += 1;
+      first = 1;
+      left_x = spanned_drul_[LEFT]->width ().length ();
+      left_y = 0;
     }
-  Real height = 0;
-  Real dh = 0;
-  do
-    {
-      height += dh;
-      dh = 0;
-      b.calc (dx, dy, height, dir_);
-      
-      if (check_debug && !monitor->silent_b ("Slur"))
-        cout << "----" << endl;
-      for (int i = 1; i < encompass_arr_.size () - 1; i++) 
-	{
-	  Stem* stem = encompass_arr_[i]->stem_l_;
-	  /* 
-	    set x to middle of notehead or on exact x position of stem,
-	    according to slur direction
-	   */
-	  Real x = stem->hpos_f () - left_x + notewidth / 2;
-	  if (stem->dir_ != dir_)
-	    x += notewidth / 2;
-	  else if (stem->dir_ == UP)
-	    x += notewidth;
-	  Real y = stem->dir_ == dir_ ? stem->stem_end_f ()
-	    : stem->stem_begin_f () + 1.5 * dir_;
-
-	  /*
-	    leave a gap: slur mustn't touch head/stem
-	   */
-	  y += 2.5 * dir_;
-	  y *= internote;
-	  y -= left_y;
-
-	  Real shift = dir_ * (y - b.y (x));
+  if (encompass_arr_.top () != spanned_drul_[RIGHT])
+      n += 1;
 
-	  if (check_debug && !monitor->silent_b ("Slur"))
-	    {
-	      cout << "x: " << x << " (" << abs (centre_x - x) << ")" << endl;
-	      cout << "y: " << y << ", curve: " << b.y (x) << endl;
-	      cout << "shift: " << shift << endl;
-	    }
+  Array<Offset> notes;
+  notes.set_size (n);
 
-	  if (shift > 0.1 * internote)
-	    dh = dh >? shift * pos_correct (abs (centre_x - x), dx, dy);
-	}
-    } while (dh);
+  Real dx = width ().length ();
+  dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+  dx = dx <? 1000;
+  dx = dx >? 2 * interline;
+    
+  Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+  if (abs (dy) > 1000)
+    dy = sign (dy) * 1000;
+
+  notes[0].x () = 0;
+  notes[0].y () = 0;
+  notes[n - 1].x () = dx;
+  notes[n - 1].y () = dy;
+  for (int i = 1; i < n - 1; i++)
+    {
+      Stem* stem = encompass_arr_[i - first]->stem_l_;
+      /* 
+	set x to middle of notehead or on exact x position of stem,
+	according to slur direction
+	   */
+      Real x = stem->hpos_f () - left_x + notewidth / 2;
+      if (stem->dir_ != dir_)
+	x += notewidth / 2;
+      else if (stem->dir_ == UP)
+	x += notewidth;
+      Real y = stem->dir_ == dir_ ? stem->stem_end_f ()
+	: stem->stem_begin_f () + 2.5 * dir_;
+
+      /*
+	leave a gap: slur mustn't touch head/stem
+       */
+      y += 2.5 * dir_;
+      y *= internote;
+      y -= left_y;
+
+      notes[i].x () = x;
+      notes[i].y () = y;
+    }
+  return notes;
+}
 
-  return height;
+Array<Offset>
+Slur::get_controls () const
+{
+  Bezier_bow b (paper ());
+  b.set (get_notes (), dir_);
+  b.calc ();
+  Array<Offset> controls;
+  controls.set_size (8);
+  for (int i = 0; i < 4; i++)
+    controls[i] = b.control_[i];
+  for (int i = 0; i < 4; i++)
+    controls[i + 4] = b.return_[i];
+  return controls;
 }
 
-IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
diff --git a/lily/spring-spacer.cc b/lily/spring-spacer.cc
index c57eaf0927..e513e27407 100644
--- a/lily/spring-spacer.cc
+++ b/lily/spring-spacer.cc
@@ -31,17 +31,17 @@ Spring_spacer::default_solution() const
 Score_column*
 Spring_spacer::scol_l (int i)
 {
-  return (Score_column*)cols[i].pcol_l_;
+  return (Score_column*)cols_[i].pcol_l_;
 }
 
 const Real COLFUDGE=1e-3;
 template class P<Real>;		// ugh.
 
 bool
-Spring_spacer::contains (Paper_column const *w)
+Spring_spacer::contains_b (Paper_column const *w)
 {
-  for (int i=0; i< cols.size(); i++)
-    if (cols[i].pcol_l_ == w)
+  for (int i=0; i< cols_.size(); i++)
+    if (cols_[i].pcol_l_ == w)
       return true;
   return false;
 }
@@ -51,8 +51,8 @@ void
 Spring_spacer::OK() const
 {
 #ifndef NDEBUG
-  for (int i = 1; i < cols.size(); i++)
-    assert (cols[i].rank_i_ > cols[i-1].rank_i_);
+  for (int i = 1; i < cols_.size(); i++)
+    assert (cols_[i].rank_i_ > cols_[i-1].rank_i_);
   for (int i = 1; i < loose_col_arr_.size(); i++)
     assert (loose_col_arr_[i].rank_i_ > loose_col_arr_[i-1].rank_i_);
 #endif
@@ -64,19 +64,19 @@ Spring_spacer::OK() const
 void
 Spring_spacer::handle_loose_cols()
 {
-  Union_find connected (cols.size());
+  Union_find connected (cols_.size());
   Array<int> fixed;
   for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++)
     {
       connected.connect (i->left_i_,i->right_i_);
     }
-  for (int i = 0; i < cols.size(); i++)
-    if (cols[i].fixed_b())
+  for (int i = 0; i < cols_.size(); i++)
+    if (cols_[i].fixed_b())
       fixed.push (i);
   for (int i=1; i < fixed.size(); i++)
     connected.connect (fixed[i-1], fixed[i]);
 
-  for (int i = cols.size(); i--;)
+  for (int i = cols_.size(); i--;)
     {
       if (! connected.equiv (fixed[0], i))
 	{
@@ -99,16 +99,16 @@ Spring_spacer::position_loose_cols (Vector &sol_vec) const
     return ;
   assert (sol_vec.dim());
   Array<bool> fix_b_arr;
-  fix_b_arr.set_size (cols.size() + loose_col_arr_.size ());
+  fix_b_arr.set_size (cols_.size() + loose_col_arr_.size ());
   Real utter_right_f=-infinity_f;
   Real utter_left_f =infinity_f;
   for (int i=0; i < loose_col_arr_.size(); i++)
     {
       fix_b_arr[loose_col_arr_[i].rank_i_] = false;
     }
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
-      int r= cols[i].rank_i_;
+      int r= cols_[i].rank_i_;
       fix_b_arr[r] = true;
       utter_right_f = utter_right_f >? sol_vec (i);
       utter_left_f = utter_left_f <? sol_vec (i);
@@ -120,7 +120,7 @@ Spring_spacer::position_loose_cols (Vector &sol_vec) const
     {
       if (fix_b_arr[i])
 	{
-	  assert (cols[j].rank_i_ == i);
+	  assert (cols_[j].rank_i_ == i);
 	  v (i) = sol_vec (j++);
 	}
       else
@@ -129,8 +129,8 @@ Spring_spacer::position_loose_cols (Vector &sol_vec) const
 	    (j>0) ?sol_vec (j-1) : utter_left_f;
 	  Real right_pos_f =
 	    (j < sol_vec.dim()) ? sol_vec (j) : utter_right_f;
-	  int left_rank = (j>0) ? cols[j-1].rank_i_ : 0;
-	  int right_rank = (j<sol_vec.dim()) ? cols[j].rank_i_ : sol_vec.dim ();
+	  int left_rank = (j>0) ? cols_[j-1].rank_i_ : 0;
+	  int right_rank = (j<sol_vec.dim()) ? cols_[j].rank_i_ : sol_vec.dim ();
 
 	  int d_r = right_rank - left_rank;
 	  Colinfo loose=loose_col_arr_[k++];
@@ -148,28 +148,26 @@ bool
 Spring_spacer::check_constraints (Vector v) const
 {
   int dim=v.dim();
-  assert (dim == cols.size());
+  assert (dim == cols_.size());
   DOUT << "checking " << v;
   for (int i=0; i < dim; i++)
     {
-      if (cols[i].fixed_b() &&
-	  abs (cols[i].fixed_position() - v (i)) > COLFUDGE)
+      if (cols_[i].fixed_b() &&
+	  abs (cols_[i].fixed_position() - v (i)) > COLFUDGE)
 	{
 	  DOUT << "Fixpos broken\n";
 	  return false;
 	}
-      Array<Column_rod> &rods (cols[i].pcol_l_->minimal_dists_arr_drul_[RIGHT]);
+      Array<Spacer_rod> const &rods (cols_[i].rods_[RIGHT]);
       for (int j =0; j < rods.size (); j++)
 	{
-	  int delta_idx=  rods[j].other_l_->rank_i () - cols[i].rank_i ();
-	  if (i + delta_idx >= dim )
-	    break;
-	  if (rods[j].other_l_ != cols[i + delta_idx].pcol_l_)
-	    continue;
-	  if (v (i + delta_idx) - v (i) < rods[j].distance_f_)
+	  int other =rods[j].other_idx_;
+	  Real diff =v (other) - v (i) ;
+	  if (COLFUDGE +diff <  rods[j].distance_f_)
 	    {
-	      DOUT << "v (i + delta_idx) - v (i) too small: i, delta_idx: "
-		   << i << " " << delta_idx;
+	      DOUT << "i, other_i: " << i << "  " << other << "\n";
+	      DOUT << "dist, minimal = " << diff <<" "
+		   << rods[j].distance_f_<<'\n';
 	      return false;
 	    }
 	}
@@ -187,7 +185,6 @@ Spring_spacer::try_initial_solution() const
   if (!try_initial_solution_and_tell (v))
     {
       warning ("I'm too fat; call Oprah");
-      DOUT << "tried solution: " << v;
     }
   return v;
 
@@ -196,33 +193,25 @@ Spring_spacer::try_initial_solution() const
 bool
 Spring_spacer::try_initial_solution_and_tell (Vector &v) const
 {
-  int dim=cols.size();
+  int dim=cols_.size();
   bool succeeded = true;
   Vector initsol (dim);
+
+  assert (cols_[0].fixed_b ());
+  DOUT << "fixpos 0 " << cols_[0].fixed_position ();
   for (int i=0; i < dim; i++)
     {
-      int first_rank = cols[0].rank_i ();
-      int last_rank = cols.top ().rank_i ();
-
-      Real min_x = i ?  initsol (i-1) : 0.0;
-      for (int j=0; j < cols[i].pcol_l_->minimal_dists_arr_drul_[LEFT].size (); j++)
+      Real min_x = i ?  initsol (i-1) : cols_[0].fixed_position ();
+      Array<Spacer_rod> const &sr_arr(cols_[i].rods_[LEFT]);
+      for (int j=0; j < sr_arr.size (); j++)
 	{
-	  Column_rod cr (cols[i].pcol_l_->minimal_dists_arr_drul_[LEFT] [j]);
-	  if (cr.other_l_->rank_i () < first_rank)
-	    break;
-
-	  int idx = cr.other_l_->rank_i () - first_rank;
-	  assert (i > idx && idx >= 0);
-	  if (cr.other_l_->break_status_i_ !=  cols[idx].pcol_l_->break_status_i_ )
-	    continue;
-	  
-	  min_x = min_x >? (initsol (idx) + cr.distance_f_);
+	  min_x = min_x >? (initsol (sr_arr[j].other_idx_) + sr_arr[j].distance_f_);
 	}
       initsol (i) = min_x;
       
-      if (cols[i].fixed_b())
+      if (cols_[i].fixed_b())
 	{
-	  initsol (i)=cols[i].fixed_position();
+	  initsol (i)=cols_[i].fixed_position();
 	  if (initsol (i) < min_x )
 	    {
 	      DOUT << "failing: init, min : " << initsol (i) << " " << min_x << "\n";
@@ -233,6 +222,9 @@ Spring_spacer::try_initial_solution_and_tell (Vector &v) const
     }
   v = initsol;
   
+  DOUT << "tried and told solution: " << v;
+  if (!succeeded)
+    DOUT << "(failed)\n";
   return succeeded;
 }
 
@@ -266,37 +258,28 @@ Spring_spacer::make_matrices (Matrix &quad, Vector &lin, Real &c) const
 void
 Spring_spacer::set_fixed_cols (Mixed_qp &qp) const
 {
-  for (int j=0; j < cols.size(); j++)
-    if (cols[j].fixed_b())
-      qp.add_fixed_var (j,cols[j].fixed_position());
+  for (int j=0; j < cols_.size(); j++)
+    if (cols_[j].fixed_b())
+      qp.add_fixed_var (j,cols_[j].fixed_position());
 } 
 
 // put the constraints into the LP problem
 void
 Spring_spacer::make_constraints (Mixed_qp& lp) const
 {
-  int dim=cols.size();
-  int last_rank = cols.top ().pcol_l_->rank_i ();
+  int dim=cols_.size();
+  int last_rank = cols_.top ().pcol_l_->rank_i ();
   
   for (int j=0; j < dim -1; j++)
     {
-      Paper_column* lc = cols[j].pcol_l_;
-      int my_rank = lc->rank_i();
-      for (int i = 0; i < lc->minimal_dists_arr_drul_[RIGHT].size (); i++)
+      Array<Spacer_rod> const&rod_arr (cols_[j].rods_[RIGHT]);
+      for (int i = 0; i < rod_arr.size (); i++)
 	{
 	  Vector c1(dim);
-	  Column_rod & cr = lc->minimal_dists_arr_drul_[RIGHT][i];
-	  int right_rank = cr.other_l_->rank_i ();
-
-
-	  if (right_rank > last_rank)
-	    break;
-	      
-	  int right_idx = right_rank - my_rank + j;
-	  c1(right_idx)=1.0 ;
+	  c1(rod_arr[i].other_idx_)=1.0 ;
 	  c1(j)=-1.0 ;
 
-	  lp.add_inequality_cons (c1, cr.distance_f_);
+	  lp.add_inequality_cons (c1, rod_arr[i].distance_f_);
 	}
     }
 }
@@ -316,11 +299,11 @@ Spring_spacer::calculate_energy_f (Vector solution) const
 void
 Spring_spacer::lower_bound_solution (Col_hpositions*positions) const
 {
-  Mixed_qp lp (cols.size());
-  make_matrices (lp.quad,lp.lin, lp.const_term);
+  Mixed_qp lp (cols_.size());
+  make_matrices (lp.quad_,lp.lin_, lp.const_term_);
   set_fixed_cols (lp);
 
-  Vector start (cols.size());
+  Vector start (cols_.size());
   start.fill (0.0);
   Vector solution_vec (lp.solve (start));
 
@@ -333,18 +316,20 @@ Spring_spacer::lower_bound_solution (Col_hpositions*positions) const
 void
 Spring_spacer::solve (Col_hpositions*positions) const
 {
-  Vector solution_try (try_initial_solution());
-  
-  if  (check_constraints (solution_try))
+
+  DOUT << "Spring_spacer::solve ()...";
+  Vector solution_try;
+
+  bool constraint_satisfaction = try_initial_solution_and_tell (solution_try); 
+  if  (constraint_satisfaction)
     {
-      Mixed_qp lp (cols.size());
-      make_matrices (lp.quad,lp.lin, lp.const_term);
+      Mixed_qp lp (cols_.size());
+      make_matrices (lp.quad_,lp.lin_, lp.const_term_);
       make_constraints (lp);
       set_fixed_cols (lp);
 
       Vector solution_vec (lp.solve (solution_try));
 
-
       positions->satisfies_constraints_b_ = check_constraints (solution_vec);
       if (!positions->satisfies_constraints_b_)
 	{
@@ -359,6 +344,7 @@ Spring_spacer::solve (Col_hpositions*positions) const
     {
       positions->set_stupid_solution (solution_try);
     }
+  DOUT << "Finished Spring_spacer::solve ()...";
 }
 
 /**
@@ -368,22 +354,40 @@ void
 Spring_spacer::add_column (Paper_column  *col, bool fixed, Real fixpos)
 {
   Colinfo c (col,(fixed)? &fixpos :  0);
-  if (cols.size())
-    c.rank_i_ = cols.top().rank_i_+1;
-  else
-    c.rank_i_ = 0;
-  cols.push (c);
-
+  int this_rank =  cols_.size();
+  c.rank_i_ = this_rank;
+  
+  for (int i=0; i < col->minimal_dists_arr_drul_[LEFT].size (); i++)
+    {
+      Column_rod &cr = col->minimal_dists_arr_drul_[LEFT][i];
+      int left_idx = cr.other_l_->rank_i () - cols_[0].pcol_l_->rank_i ();
+      if (left_idx < 0)
+	continue;
+
+      if (cols_[left_idx].pcol_l_ != cr.other_l_)
+	continue;
+
+      Spacer_rod l_rod;
+      l_rod.distance_f_ = cr.distance_f_;
+      l_rod.other_idx_ = left_idx;
+      c.rods_[LEFT].push (l_rod);
+
+      Spacer_rod r_rod;
+      r_rod.distance_f_ = cr.distance_f_;
+      r_rod.other_idx_ = this_rank;
+      cols_[left_idx].rods_[RIGHT].push (r_rod);
+    }
   
+  cols_.push (c);
 }
 
 Line_of_cols
 Spring_spacer::error_pcol_l_arr() const
 {
   Array<Paper_column*> retval;
-  for (int i=0; i< cols.size(); i++)
-    if (cols[i].ugh_b_)
-      retval.push (cols[i].pcol_l_);
+  for (int i=0; i< cols_.size(); i++)
+    if (cols_[i].ugh_b_)
+      retval.push (cols_[i].pcol_l_);
   for (int i=0;  i < loose_col_arr_.size(); i++)
     {
       retval.push (loose_col_arr_[i].pcol_l_);
@@ -394,7 +398,7 @@ Spring_spacer::error_pcol_l_arr() const
 void
 Spring_spacer::loosen_column (int i)
 {
-  Colinfo c=cols.get (i);
+  Colinfo c=cols_.get (i);
   for (PCursor<Idealspacing*> j (ideal_p_list_.top()); j.ok (); j++)
     {
       if (j->left_i_ == i|| j->right_i_ == i)
@@ -418,10 +422,10 @@ void
 Spring_spacer::print() const
 {
 #ifndef NPRINT
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
       DOUT << "col " << i<<' ';
-      cols[i].print();
+      cols_[i].print();
     }
   for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++)
     {
@@ -453,9 +457,11 @@ Spring_spacer::connect (int i, int j, Real d, Real h)
 void
 Spring_spacer::prepare()
 {
+  DOUT << "Preparing..";
   calc_idealspacing();
   handle_loose_cols();
   print();
+  DOUT << "finished preparing.\n";
 }
 
 Line_spacer*
@@ -472,7 +478,7 @@ void
 Spring_spacer::get_ruling_durations(Array<Moment> &shortest_playing_arr,
 				    Array<Moment> &context_shortest_arr)
 {
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
       scol_l (i)->preprocess();
       scol_l (i)->print ();
@@ -480,9 +486,9 @@ Spring_spacer::get_ruling_durations(Array<Moment> &shortest_playing_arr,
   int start_context_i=0;
   Moment context_shortest;
   context_shortest.set_infinite (1);
-  context_shortest_arr.set_size(cols.size());
+  context_shortest_arr.set_size(cols_.size());
 
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
       Moment now = scol_l (i)->when();
       Moment shortest_playing;
@@ -556,7 +562,7 @@ Spring_spacer::calc_idealspacing()
 
   Array<Real> ideal_arr_;
   Array<Real> hooke_arr_;
-  for (int i=0; i < cols.size() - 1; i++){
+  for (int i=0; i < cols_.size() - 1; i++){
     ideal_arr_.push (-1.0);
     hooke_arr_.push (1.0);
   }
@@ -564,11 +570,11 @@ Spring_spacer::calc_idealspacing()
   /* 
      First do all non-musical columns
   */
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
-      if (!scol_l (i)->musical_b() && i+1 < cols.size())
+      if (!scol_l (i)->musical_b() && i+1 < cols_.size())
 	{
-	  Real symbol_distance =cols[i].width_[RIGHT] + 2 PT;
+	  Real symbol_distance =cols_[i].width_[RIGHT] + 2 PT;
 	  Real durational_distance = 0;
 
 	  
@@ -580,7 +586,7 @@ Spring_spacer::calc_idealspacing()
 	  */
 	  if (delta_t)
 	    durational_distance =  paper_l()->duration_to_dist (delta_t,k);
-	  symbol_distance += -cols[i+1].width_[LEFT];
+	  symbol_distance += -cols_[i+1].width_[LEFT];
  
 
 	  ideal_arr_[i] = symbol_distance >? durational_distance;
@@ -591,7 +597,7 @@ Spring_spacer::calc_idealspacing()
   /* 
      Then musicals
   */
-  for (int i=0; i < cols.size(); i++)
+  for (int i=0; i < cols_.size(); i++)
     {
       if (scol_l (i)->musical_b())
 	{
@@ -644,7 +650,7 @@ Spring_spacer::calc_idealspacing()
 	  if (i && scol_l (i - 1)->breakable_b_)
 	    {
 	      // fixed: probably should set minimum (rod/spring)?
-	      cols[i-1].width_[RIGHT] += interline_f;
+	      cols_[i-1].width_[RIGHT] += interline_f;
 	      // should adjust dist too?
 	      ideal_arr_[i-1] = ideal_arr_[i-1] >? interline_f;
 	    }
@@ -652,7 +658,7 @@ Spring_spacer::calc_idealspacing()
 	  /* 
 	     last musical column of bar
 	  */
-	  if (i + 1 < cols.size () && scol_l(i+1)->breakable_b_)
+	  if (i + 1 < cols_.size () && scol_l(i+1)->breakable_b_)
 	    {
 	      // hmm, how bout?
 	      dist = dist >? interline_f;
@@ -664,20 +670,20 @@ Spring_spacer::calc_idealspacing()
 		but this seems to be fixed now :-)
 	      */
 	      // set minimum rod 
-	      cols[i].width_[RIGHT] += interline_f;
+	      cols_[i].width_[RIGHT] += interline_f;
 	    }
 
 	  // ugh, do we need this?
-	  if (i < cols.size () - 1 && !scol_l (i + 1)->musical_b ())
+	  if (i < cols_.size () - 1 && !scol_l (i + 1)->musical_b ())
 	    {
-	      Real minimum = -cols[i + 1].width_[LEFT] + cols[i].width_[RIGHT]
+	      Real minimum = -cols_[i + 1].width_[LEFT] + cols_[i].width_[RIGHT]
 		+ interline_f / 2;
 	      dist = dist >? minimum;
 	    }
 
           // ugh: never let columns touch... try to set over here...
 	  // ugh: use j iso i triggers ice in gcc-2.7.2.3 
-          cols[i].width_[LEFT] -= nw_f / 4;
+          cols_[i].width_[LEFT] -= nw_f / 4;
 	  ideal_arr_[i] = dist;
 	}
     }
diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 0e8b9c7cde..99476a6206 100644
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -69,7 +69,7 @@ Staff_side::get_position_f () const
   Interval v = support_height();
 
   // ugh, dim[y] = PT over here
-  y = v[dir_] + 1 * dir_ * inter_f;
+  y = v[dir_] + 2 * dir_ * inter_f;
 
   int y_i = (int)rint (y / inter_f);
   // ugh: 5 -> staff_lines
diff --git a/lily/template1.cc b/lily/template1.cc
index 857b1367d6..3eee319eae 100644
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -13,6 +13,7 @@
 #include "item.hh"
 #include "musical-request.hh"
 #include "spanner.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
diff --git a/lily/template2.cc b/lily/template2.cc
index c3432de3c3..6aaeba4633 100644
--- a/lily/template2.cc
+++ b/lily/template2.cc
@@ -7,6 +7,7 @@
 */
 
 #include "line-spacer.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
diff --git a/lily/template3.cc b/lily/template3.cc
index 676f4b98d7..672a7b2c24 100644
--- a/lily/template3.cc
+++ b/lily/template3.cc
@@ -8,6 +8,7 @@
 
 #include "atom.hh"
 #include "molecule.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
diff --git a/lily/template6.cc b/lily/template6.cc
index 3785014d69..e61f614312 100644
--- a/lily/template6.cc
+++ b/lily/template6.cc
@@ -1,4 +1,5 @@
 #include "proto.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 #include "translator.hh"
diff --git a/lily/template7.cc b/lily/template7.cc
index 868573a374..e430260907 100644
--- a/lily/template7.cc
+++ b/lily/template7.cc
@@ -7,6 +7,7 @@
 */
 
 #include "proto.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.hh"
 #include "plist.tcc"
diff --git a/lily/template8.cc b/lily/template8.cc
index 18d45e3b5e..0f27440cff 100644
--- a/lily/template8.cc
+++ b/lily/template8.cc
@@ -11,6 +11,7 @@
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "midi-item.hh"
+#include "cursor.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc
index f13ab2e94d..6283f753ce 100644
--- a/lily/tex-beam.cc
+++ b/lily/tex-beam.cc
@@ -99,7 +99,9 @@ Lookup::ps_beam (Real slope, Real width, Real y_thickness)const
   mf += "}\n";
 
   Atom s;
-  s.tex_ = ps + mf;
+  s.tex_ = ps;
+  if (embedded_mf_global_b)
+    s.tex_ += mf;
   
   return s;
 }
diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index 90f8860c71..ab86f271fa 100644
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -15,7 +15,7 @@
 #include "debug.hh"
 #include "paper-def.hh"
 #include "string-convert.hh"
-
+#include "main.hh"
 
 static char
 direction_char (Direction y_sign)
@@ -173,7 +173,9 @@ Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const
   mf += "}\n";
 
   Atom s;
-  s.tex_ = ps + mf;
+  s.tex_ = ps;
+  if (embedded_mf_global_b)
+    s.tex_ += mf;
   return s;
 }
 
@@ -308,3 +310,32 @@ Lookup::slur  (Real &dy_f , Real &dx, Real ht, Direction dir) const
   s.dim_[Y_AXIS] = Interval (0 <? dy_f,  0 >? dy_f);
   return s;
 }
+
+Atom
+Lookup::control_slur (Array<Offset> controls, Real dx, Real dy) const
+{
+  assert (postscript_global_b);
+  assert (controls.size () == 8);
+
+  String ps = "\\embeddedps{\n";
+  
+  for (int i = 1; i < 4; i++)
+    ps += String_convert::double_str (controls[i].x ()) + " "
+      + String_convert::double_str (controls[i].y ()) + " ";
+
+  for (int i = 5; i < 8; i++)
+//    ps += String_convert::double_str (controls[i].x () + controls[0].x () - controls[3].x ()) + " "
+//      + String_convert::double_str (controls[i].y () - controls[0].y () + controls[3].y ()) + " ";
+    ps += String_convert::double_str (controls[i].x () - dx) + " "
+      + String_convert::double_str (controls[i].y () - dy) + " ";
+
+  ps += " draw_control_slur}";
+
+  Atom s;
+  s.tex_ = ps;
+  
+  s.dim_[X_AXIS] = Interval (0, dx);
+  s.dim_[Y_AXIS] = Interval (0 <? dy,  0 >? dy);
+  return s;
+}
+
diff --git a/make/Executable.make b/make/Executable.make
new file mode 100644
index 0000000000..69894dd1b3
--- /dev/null
+++ b/make/Executable.make
@@ -0,0 +1,15 @@
+localinstall: installexe
+
+localuninstall: uninstallexe
+
+installexe: all
+	$(INSTALL) -d $(bindir)
+	for a in $(EXECUTABLES); do \
+		$(INSTALL) -m 755 $(outdir)/$$a $(bindir); \
+	done	
+
+uninstallexe:
+	for a in $(EXECUTABLES); do \
+		rm -f $(bindir)/$$a; \
+	done	
+
diff --git a/make/Files.make b/make/Files.make
index ee10f99371..87baac4272 100644
--- a/make/Files.make
+++ b/make/Files.make
@@ -17,7 +17,7 @@ TCCFILES = $(wildcard *.tcc)
 # list of other source files:
 #
 
-EXTRA_SOURCE_FILES = $(wildcard *.y *.l)
+EXTRA_SOURCE_FILES = $(wildcard *.yy *.ll)
 
 #
 PODFILES = $(wildcard *.pod)
@@ -30,6 +30,5 @@ ALL_SOURCES=$(HHFILES) $(CCFILES) $(EXTRA_SOURCE_FILES) $(INLFILES) \
 
 DEPFILES = $(wildcard $(depdir)/*.dep)
 
-build = $(outdir)/.build
 
 all-tag-sources=$(CCFILES) $(HHFILES) $(TCCFILES)
diff --git a/make/Initial.make b/make/Initial.make
index f2f5f9aecb..32522907eb 100644
--- a/make/Initial.make
+++ b/make/Initial.make
@@ -20,7 +20,6 @@ MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION)
 PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL)
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL)
-build = ./$(depth)/lily/$(outdir)/.build
 #
 
 # generic variables:
diff --git a/make/Installfiles.make b/make/Installfiles.make
new file mode 100644
index 0000000000..52ee9919be
--- /dev/null
+++ b/make/Installfiles.make
@@ -0,0 +1,16 @@
+
+
+
+localinstall: localinstall-files
+
+localinstall-files:
+	$(INSTALL) -d $(INSTALLATION_DIR)
+	$(INSTALL) -m 644 $(INSTALLATION_FILES) $(INSTALLATION_DIR)
+
+localuninstall: localuninstall-files
+
+localuninstall-files:
+	for i in $(INSTALLATION_FILES) ; do \
+		rm -f $(INSTALLATION_DIR)/$$i; \
+	done
+	-rmdir $(INSTALLATION_DIR)
diff --git a/make/Makefile b/make/Makefile
new file mode 100644
index 0000000000..98f9b9d90f
--- /dev/null
+++ b/make/Makefile
@@ -0,0 +1,61 @@
+#
+# project  LilyPond -- the musical typesetter
+# title	   zucht
+# file	   make/Makefile 
+#
+# Copyright (c) 1997 by    
+#   	Jan Nieuwenhuizen <jan@digicash.com>
+#	Han-Wen Nienhuys <hanwen@stack.nl>
+#		...your sort order here, or how to comment-out a comment
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = make
+SUBDIRS = 
+
+# list of distribution files:
+
+# two outdir files are distributed, since they make sense to have without running 
+# configure and make.
+IN_FILES = $(wildcard *.in)
+EXTRA_DISTFILES = $(IN_FILES) $(outdir)/lilypond.spec $(outdir)/lilypond.lsm $(outdir)/lelievijver.lsm
+#
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
+#
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+#
+
+spec: $(outdir)/lilypond.spec
+
+rpmdocs=$(addprefix Documentation/out/, $(notdir $(shell ls $(depth)/Documentation/$(outdir)/*.txt)))\
+	BUGS TODO NEWS DEDICATION ANNOUNCE README
+rpmmudocs=$(addprefix Documentation/, $(notdir $(shell ls $(depth)/Documentation/*.doc)))
+rpmdvis=$(rpmmudocs:.doc=.dvi)
+rpmexamples= $(addprefix input/, $(notdir $(shell ls $(depth)/input/*.{ly,tex})))
+
+
+date = $(shell date '+%d%b%y'|tr a-z A-Z)
+sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
+sed-date=sed 's!@DATE@!${date}!g'
+sed-examples = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
+sed-docs=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
+
+$(outdir)/lilypond.spec: lilypond.spec.in $(depth)/VERSION
+	cat $< | $(sed-version) | $(sed-docs) | $(sed-examples) > $@
+
+$(outdir)/%.lsm: %.lsm.in $(depth)/VERSION
+	cat $< | $(sed-version) | $(sed-date) > $@
+
diff --git a/make/Makefile.am b/make/Makefile.am
deleted file mode 100644
index 863e8dc713..0000000000
--- a/make/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   zucht
-# file	   make/Makefile.am.dist
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-IN_FILES = Configure_variables.make.in Makefile.in Toplevel.make.in lelievijver.lsm.in lilypond.lsm.in lilypond.spec.in
-MAKE_FILES = Files.make Include.make Initial.make Rules.make Targets.make Template.make User.make Variables.make Version.make
-EXTRA_DIST = Makefile.am.wild $(IN_FILES) $(MAKE_FILES) lilypond.spec lilypond.lsm lelievijver.lsm
-
-spec: $(outdir)/lilypond.spec
-
-rpmdocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/$(outdir)/*.txt)))\
-	BUGS TODO NEWS DEDICATION ANNOUNCE README
-rpmmudocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/*.doc)))
-rpmdvis = $(rpmmudocs:.doc=.dvi)
-rpmexamples = $(addprefix input/, $(notdir $(shell ls ../input/*.{ly,tex})))
-
-date = $(shell date '+%d%b%y'|tr a-z A-Z)
-
-SED_VERSION= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-SED_DATE=sed 's!@DATE@!${date}!g'
-SED_EXAMPLES = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
-SED_DOCS=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
-
-lilypond.spec: lilypond.spec.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DOCS) | $(SED_EXAMPLES) > $@
-
-%.lsm: %.lsm.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DATE) > $@
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/make/Makefile.am.wild b/make/Makefile.am.wild
deleted file mode 100644
index fe82501a60..0000000000
--- a/make/Makefile.am.wild
+++ /dev/null
@@ -1,34 +0,0 @@
-# project  LilyPond -- the musical typesetter
-# title	   zucht
-# file	   make/Makefile.am.dist
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-IN_FILES = $(wildcard *.in)
-MAKE_FILES = $(wildcard *.make)
-EXTRA_DIST = Makefile.am.wild $(IN_FILES) $(MAKE_FILES) lilypond.spec lilypond.lsm lelievijver.lsm
-
-spec: $(outdir)/lilypond.spec
-
-rpmdocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/$(outdir)/*.txt)))\
-	BUGS TODO NEWS DEDICATION ANNOUNCE README
-rpmmudocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/*.doc)))
-rpmdvis = $(rpmmudocs:.doc=.dvi)
-rpmexamples = $(addprefix input/, $(notdir $(shell ls ../input/*.{ly,tex})))
-
-date = $(shell date '+%d%b%y'|tr a-z A-Z)
-
-SED_VERSION= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-SED_DATE=sed 's!@DATE@!${date}!g'
-SED_EXAMPLES = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
-SED_DOCS=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
-
-lilypond.spec: lilypond.spec.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DOCS) | $(SED_EXAMPLES) > $@
-
-%.lsm: %.lsm.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DATE) > $@
-
diff --git a/make/Makefile.in b/make/Makefile.in
deleted file mode 100644
index 43102d5709..0000000000
--- a/make/Makefile.in
+++ /dev/null
@@ -1,228 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   zucht
-# file	   make/Makefile.am.dist
-#
-# Copyright (c) 1997 by    
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-#		...your sort order here, or how to comment-out a comment
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-IN_FILES = Configure_variables.make.in Makefile.in Toplevel.make.in lelievijver.lsm.in lilypond.lsm.in lilypond.spec.in
-MAKE_FILES = Files.make Include.make Initial.make Rules.make Targets.make Template.make User.make Variables.make Version.make
-EXTRA_DIST = Makefile.am.wild $(IN_FILES) $(MAKE_FILES) lilypond.spec lilypond.lsm lelievijver.lsm
-
-rpmdocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/$(outdir)/*.txt)))\
-	BUGS TODO NEWS DEDICATION ANNOUNCE README
-rpmmudocs = $(addprefix Documentation/, $(notdir $(shell ls ../Documentation/*.doc)))
-rpmdvis = $(rpmmudocs:.doc=.dvi)
-rpmexamples = $(addprefix input/, $(notdir $(shell ls ../input/*.{ly,tex})))
-
-date = $(shell date '+%d%b%y'|tr a-z A-Z)
-
-SED_VERSION= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-SED_DATE=sed 's!@DATE@!${date}!g'
-SED_EXAMPLES = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
-SED_DOCS=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps make/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = make
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-spec: $(outdir)/lilypond.spec
-
-lilypond.spec: lilypond.spec.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DOCS) | $(SED_EXAMPLES) > $@
-
-%.lsm: %.lsm.in ../VERSION
-	cat $< | $(SED_VERSION) | $(SED_DATE) > $@
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/make/Mutopia.make b/make/Mutopia.make
new file mode 100644
index 0000000000..ec12e0599a
--- /dev/null
+++ b/make/Mutopia.make
@@ -0,0 +1,14 @@
+# list of distribution files:
+# 
+
+include $(depth)/make/Include.make
+LYFILES = $(wildcard *.ly)
+TEXFILES = $(wildcard *.tex)
+M4FILES = $(wildcard *.m4)
+DISTFILES = Makefile $(LYFILES) $(TEXFILES) $(wildcard *.m4)
+#
+
+OUTFILES = $(addprefix $(outdir)/,$(M4FILES:%.m4=%))
+
+all: $(OUTFILES)
+
diff --git a/make/Rules.make b/make/Rules.make
index c22e80abb8..f886422b03 100644
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -21,16 +21,16 @@ $(outdir)/%.o: %.cc
 $(outdir)/%.o: $(outdir)/%.cc
 	$(DO_CXX_COMPILE)
 
-$(outdir)/%.cc: %.y
+$(outdir)/%.cc: %.yy
 	$(BISON) $<
-	mv $(shell basename $@ .cc ).tab.c $@
+	mv $<.tab.c $@
 
-$(outdir)/%.hh: %.y
+$(outdir)/%.hh: %.yy
 	$(BISON) -d $<
-	mv $(shell basename $@ .hh ).tab.h $@
-	mv $(shell basename $@ .hh ).tab.c $(outdir)/$(shell basename $@ .hh).cc
+	mv $<.tab.h $@
+	mv $<.tab.c $(outdir)/$(shell basename $@ .hh).cc
 
-$(outdir)/%.cc: %.l
+$(outdir)/%.cc: %.ll
 	$(FLEX) -Cfe -p -p -t $< > $@
 # could be faster:
 #	$(FLEX) -8 -Cf -t $< > $@
@@ -45,12 +45,6 @@ $(outdir)/%: %.m4
 	touch $@
 
 
-# build and config stuff: (could make this generic default rule...)
-#
-%/.build:
-	echo 0 > $@
-
-
 $(depth)/%.txt: check-doc-deps
 	rm -f $@
 	ln `find ${depth}/Documentation -name $@ -print|head -1 ` .
diff --git a/make/Scripts.make b/make/Scripts.make
new file mode 100644
index 0000000000..151afe16a2
--- /dev/null
+++ b/make/Scripts.make
@@ -0,0 +1,28 @@
+
+
+PERL_SCRIPTS_IN = $(wildcard *.pl)
+PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=))
+SH_SCRIPTS_IN = $(wildcard *.sh)
+SH_SCRIPTS = $(addprefix $(outdir)/, $(SH_SCRIPTS_IN:.sh=))
+PYTHON_SCRIPTS_IN = $(wildcard *.py)
+PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=))
+ALL_SCRIPTS_IN = $(SH_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN)
+EXTRA_DISTFILES += $(ALL_SCRIPTS_IN)
+
+all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SH_SCRIPTS)
+
+$(outdir)/%: %.pl
+	sed 's!@PERL@!$(PERL)!' < $< > $@
+	chmod 755 $@
+
+#FIXME.  Check for bash?
+$(outdir)/%: %.sh
+	sed 's!@SH@!$(SHELL)!' < $< > $@
+	chmod 755 $@
+
+$(outdir)/%: %.py
+	sed 's!@PYTHON@!$(PYTHON)!' < $< > $@
+	chmod 755 $@
+
+
+
diff --git a/make/Targets.make b/make/Targets.make
index 20a1558b96..c65d9f8619 100644
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -30,10 +30,8 @@ endif
 # dependency list of executable:
 #
 
-$(EXECUTABLE): $(build) $(OFILES) $(outdir)/version.hh
+$(EXECUTABLE):  $(OFILES) $(outdir)/version.hh
 	$(MAKE) $(MODULE_LIBDEPS) 
-	$(INCREASE_BUILD)
-	$(MAKE) -S $(OFILES)  $(SILENT_LOG)
 ifdef STABLEOBS
 	$(DO_STRIP) $(STABLEOBS)
 endif
@@ -41,22 +39,14 @@ endif
 
 exe: $(EXECUTABLE)
 
-$(build): $(depth)/VERSION
-	echo 0 > $@
 
 # dependency list of library:
 #
-LIBRARY = $(outdir)/$(LIB_PREFIX)$(NAME).a
-$(LIBRARY): $(build) $(OFILES)
-	$(INCREASE_BUILD)
-	$(MAKE) $(OFILES)  $(SILENT_LOG)
+$(LIBRARY):  $(OFILES)
 	$(AR_COMMAND) $(OFILES)
 	$(RANLIB_COMMAND)
 
-SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so
-$(SHAREDLIBRARY):  $(build) $(OFILES) $(MODULE_LIBDEPS)
-	$(INCREASE_BUILD)
-	$(MAKE) $(OFILES)  $(SILENT_LOG)
+$(SHAREDLIBRARY):   $(OFILES) $(MODULE_LIBDEPS)
 	$(LD_COMMAND) $(OFILES) -o $@.$(VERSION)
 	rm -f $@
 	ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
@@ -66,18 +56,24 @@ $(SHAREDLIBRARY):  $(build) $(OFILES) $(MODULE_LIBDEPS)
 lib: $(LIBRARY)
 #
 
+
+make-all-outdirs: make-outdir
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i make-all-outdirs; done
+
+make-outdir:
+	-mkdir $(OUTDIR_NAME)
+
 # be careful about deletion.
 clean: localclean
-	rm -f core 
-ifdef EXECUTABLE
-	rm -f $(EXECUTABLE)
-endif
-ifdef OFILES
-	rm -f $(OFILES)
-endif
-ifdef DEPFILES
-	rm -f $(DEPFILES)
+	rm -f $(outdir)/*
+	touch $(outdir)/dummy.dep
+ifdef SUBDIRS
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
 endif
+
+distclean: subdir-distclean local-distclean
+
+subdir-distclean:
 ifdef SUBDIRS
 	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
 endif
@@ -111,12 +107,13 @@ dos:
 # target help:
 #
 help:
+	@echo "Makefile for LilyPond $(TOPLEVEL_VERSION)"
 	@echo "Usage:"
 	@echo "	$(MAKE) ["VARIABLE=value" ...] [target]"
 	@echo
 	@echo "targets:"
 	@echo "	all clean config dist distclean doc doc++"
-	@echo "	exe help lib moduledist TAGS"
+	@echo "	exe help lib TAGS"
 	@echo "	dos:	xcomplile to dos"
 	@echo "	windows32: native cygnus-gnu compile" 
 #
@@ -127,6 +124,7 @@ doc:
 
 # ugh. should generate in out/
 dist:
+	rm -rf $(distdir)
 	-mkdir $(distdir)
 	$(MAKE) localdist
 	chmod -R a+r $(distdir)
@@ -167,18 +165,6 @@ ifdef SUBDIRS
 		$(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done
 endif
 
-moduledist:
-	-mkdir $(module-distdir)
-	$(MAKE) localmoduledist
-	(cd $(depth)/$(outdir); $(TAR) cfz $(MODULE_DIST_NAME).tar.gz $(MODULE_DIST_NAME))
-	rm -rf $(module-distdir)/ 
-
-localmoduledist:
-	$(LN) $(DISTFILES) $(module-distdir)/$(localdir)
-ifdef SUBDIRS
-	set -e; for i in $(SUBDIRS); do mkdir $(module-distdir)/$(localdir)/$$i; done
-	set -e; for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localmoduledist; done
-endif
 
 TAGS:$(all-tag-sources)
 ifdef all-tag-sources
@@ -204,6 +190,8 @@ configure: configure.in aclocal.m4
 
 localclean:
 
+local-distclean:
+
 install-strip:
 	$(MAKE) INSTALL="$(INSTALL) -s" install
 
@@ -255,12 +243,6 @@ check-mf-deps:
 
 
 
-installexe:
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) -m 755 $(EXECUTABLES) $(bindir)
-
-uninstallexe:
-	for a in $(EXECUTABLES); do rm -f $(bindir)/`basename $$a`; done
 
 ifneq ($(DEPFILES),)
 include $(DEPFILES)
diff --git a/make/Template.make b/make/Template.make
index 4c8a67f14f..501aeab9df 100644
--- a/make/Template.make
+++ b/make/Template.make
@@ -24,10 +24,6 @@ include ./$(depth)/make/Variables.make
 #
 NAME = ...
 MODULE_NAME = 
-include ./$(depth)/$(NAME)/VERSION
-
-build = $(outdir)/.build #????!
-#
 
 # descent order into subdirectories:
 #
@@ -68,8 +64,4 @@ include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
 #
 
-# auto dependencies:
-#
--include $(DEPFILES)
-#
 
diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index ac3e42ec28..c058487bcb 100644
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -1,5 +1,4 @@
 # -*-Makefile-*-
-# @configure_input@
 ########################################################
 # project  LilyPond -- the musical typesetter
 # title	   top level makefile for LilyPond  
@@ -17,60 +16,41 @@ depth = .
 # identify module:
 #
 NAME = lilypond
+SUBDIRS = bin flower lib lily mf mi2mu debian\
+	Documentation init input tex make mutopia
 include VERSION
-include ./$(depth)/make/Version.make
-
-# generic variables:
-#
-include ./$(depth)/make/Variables.make 
 #
 
 # descent order into subdirectories:
 #
-SUBDIRS = bin flower lib lily mf mi2mu debian\
-	Documentation init input tex make mutopia
-#
 
 # list of distribution files:
 #
-SCRIPTS = configure configure.in install-sh aclocal.m4
+SCRIPTS = configure configure.in aclocal.m4
 README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
  COPYING ONEWS NEWS README TODO \
  INSTALL.txt AUTHORS.txt PATCHES.txt
-EXTRA_DISTFILES = .dstreamrc mudela-mode.el VERSION $(README_FILES) $(SCRIPTS) $(SYMLINKS)
+EXTRA_DISTFILES = config.make.in config.hh.in .dstreamrc mudela-mode.el VERSION $(README_FILES) $(SCRIPTS) 
 
 # do not dist ./Makefile (is copied from make/Toplevel.make)
-DISTFILES:=$(EXTRA_DISTFILES)# Makefile $(ALL_SOURCES)
+DISTFILES:=$(EXTRA_DISTFILES)
 #
 
 
 # generic targets and rules:
 #
+include ./$(depth)/make/Version.make
+include ./$(depth)/make/Variables.make 
 include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
-#
 
 localdist: configure
 
-INSTALL.txt: check-doc-deps check-mf-deps
-	rm -f INSTALL.txt
-	ln `$(FIND) ./ -name INSTALL.txt -print |head -1` .
-
-# all machine generated junk resides in out/
-distclean: 
-	set -e; for i in `find . -type d -name 'out' -print`; do \
-		rm -f $$i/* $$i/.build; done		
-	rm -rf *-build-dir
-	( cd flower && rm -f config.cache config.status config.log )
-	rm -f Makefile config.cache config.status config.log
-
-
-
-localclean:
-	rm -f core config.cache config.log config.status 
-	rm -f $(outdir)/*.{class,html,gif}
+local-distclean: 
+	rm -f config.hh config.make Makefile config.cache config.status config.log
 
 Makefile: make/Toplevel.make.in
+	chmod +w $@
 	echo '# WARNING WARNING WARNING WARNING' > $@
 	echo '# do not edit! this is generated from make/Toplevel.make.in' >> $@
 	cat $< >> $@
diff --git a/make/Toplevel_version.make b/make/Toplevel_version.make
new file mode 100644
index 0000000000..4e3ffb6c94
--- /dev/null
+++ b/make/Toplevel_version.make
@@ -0,0 +1,7 @@
+
+include $(depth)/VERSION
+TOPLEVEL_MAJOR_VERSION :=$(MAJOR_VERSION)
+TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION)
+TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL)
+# use to send patches, always empty for released version:
+TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL)
diff --git a/make/Variables.make b/make/Variables.make
index cab4ed184b..b6c04face1 100644
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -16,7 +16,7 @@
 
 # toplevel version info, might be handy?
 #
-include $(depth)/VERSION
+include $(depth)/make/Toplevel_version.make
 
 
 ifeq (0,${MAKELEVEL})
@@ -36,7 +36,6 @@ outdir=$(OUTDIR_NAME)
 # derived names
 lily_bindir = $(depth)/bin
 distdir = $(depth)/$(outdir)/$(DIST_NAME)
-module-distdir = $(depth)/$(MODULE_DIST_NAME)
 depdir = $(outdir)
 
 flowerout = $(buildprefix)/flower/$(OUTDIR_NAME)
@@ -60,7 +59,11 @@ include-flower = $(depth)/flower/include
 rpm-sources = ${HOME}/rpms/SOURCES
 #
 
-#include $(makeout)/Configure_variables.make
+ifndef configuration
+configuration=config
+endif
+
+include $(depth)/$(configuration).make
 
 # user settings:
 #
@@ -68,9 +71,6 @@ include $(depth)/make/User.make
 #
 #
 # need to be defined in local Makefiles:
-# build = ./$(depth)/lily/$(outdir)/.build ######## UGR!
-BUILD = $(shell cat $(build))
-INCREASE_BUILD = echo `expr \`cat $(build)\` + 1` > .b; mv .b $(build)
 #
 FOOBAR = 
 # the version:
@@ -90,10 +90,8 @@ endif
 #
 
 
-# module and top level dist:
 #
 # fix naming, use TOPLEVEL_ prefix _or_ MODULE?
-MODULE_DIST_NAME = $(MODULE_NAME)-$(VERSION)
 DIST_NAME = lilypond-$(TOPLEVEL_VERSION)
 NO_DOOS_DIST = bin flower lib lily make mi2mu out
 #
@@ -103,8 +101,8 @@ NO_DOOS_DIST = bin flower lib lily make mi2mu out
 SOURCE_FILES = $(CCFILES) $(EXTRA_SOURCE_FILES)
 OFILEC = $(SOURCE_FILES:.c=.o)
 OFILECC = $(OFILEC:.cc=.o)
-OFILEL = $(OFILECC:.l=.o)
-OFILEY = $(OFILEL:.y=.o)
+OFILEL = $(OFILECC:.ll=.o)
+OFILEY = $(OFILEL:.yy=.o)
 OFILES = $(addprefix $(outdir)/,$(OFILEY))
 #
 
@@ -150,7 +148,7 @@ CFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS)
 EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
 
 CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
-INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
+INCLUDES = -I$(depth) -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
 CXX_OUTPUT_OPTION = $< -o $@
 LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/$(OUTDIR_NAME) -L$(depth)/flower/$(OUTDIR_NAME)
 LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES)  -lstdc++ # need lg++ for win32, really!
@@ -206,7 +204,8 @@ ifndef LIB_SUFFIX
 LIB_SUFFIX = .a
 endif
 
-LIBRARY = $(LIB_PREFIX)$(NAME)$(LIB_SUFFIX)
+LIBRARY = $(outdir)/$(LIB_PREFIX)$(NAME).a
+SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so
 #
 
 #replace to do stripping of certain objects
diff --git a/make/Version.make b/make/Version.make
index 9ee357173b..35857ac257 100644
--- a/make/Version.make
+++ b/make/Version.make
@@ -4,4 +4,3 @@ MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION)
 PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL)
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL)
-build = $(outdir)/.build
diff --git a/make/header-directory.make b/make/header-directory.make
new file mode 100644
index 0000000000..9017ad8327
--- /dev/null
+++ b/make/header-directory.make
@@ -0,0 +1,4 @@
+# identify module:
+#
+include ./$(depth)/make/Include.make
+
diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
index 163a8c9086..067c6612b1 100644
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
-Versie: 
-Inschrijf datum: 14APR98
+Versie: 0.1.57
+Inschrijf datum: 19APR98
 Beschrijving: LilyPond is de muziek typesetter van het GNU Project.  
 		Het programma genereert muziek in zichtbare of 
 		hoorbare vorm uit uit een muzikale definitie file: 
@@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
 	jan@digicash.com (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-	395k lilypond-.tar.gz 
+	395k lilypond-0.1.57.tar.gz 
 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
-	395k lilypond-.tar.gz 
+	395k lilypond-0.1.57.tar.gz 
 Copi"eer politie: GPL
 End
diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index ce7fa38a65..43f26e11cb 100644
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 
-Entered-date: 14APR98
+Version: 0.1.57
+Entered-date: 19APR98
 Description: LilyPond is the GNU Project music typesetter.  The program
 		generates visual or auditive output from a music 
 		definition file: it can typeset formatted sheet music 
@@ -15,8 +15,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
 	jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	470k lilypond-.tar.gz 
+	470k lilypond-0.1.57.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-	470k lilypond-.tar.gz 
+	470k lilypond-0.1.57.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/lilypond.spec b/make/lilypond.spec
index 6e3752d91b..17a85ac5fc 100644
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 
+Version: 0.1.57
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-.tar.gz
+Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.57.tar.gz
 Summary: A program for typesetting music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
@@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc Documentation/AUTHORS.txt Documentation/CodingStyle.txt Documentation/INSTALL.txt Documentation/MANIFESTO.txt Documentation/PATCHES.txt Documentation/convert-mudela.txt Documentation/faq.txt Documentation/gnu-music.txt Documentation/index.txt Documentation/internals.txt Documentation/language.txt Documentation/lilypond.txt Documentation/links.txt Documentation/literature.txt Documentation/ly2dvi.txt Documentation/mi2mu.txt Documentation/mudela-book.txt Documentation/mutopia.txt Documentation/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README
-%doc input/abbrev.ly input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-man.doc 
+%doc Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/PATCHES.txt Documentation/out/convert-mudela.txt Documentation/out/faq.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/lilypond.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/ly2dvi.txt Documentation/out/mi2mu.txt Documentation/out/mudela-book.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README
+%doc input/abbrev.ly input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slur-bug.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/mudela-man.doc Documentation/mudela.doc 
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book
diff --git a/make/out/dummy.dep b/make/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/make/out/dummy.dep
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
deleted file mode 100644
index 00e7046028..0000000000
--- a/mf/GNUmakefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# mf/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-#ugh
-biltdir=../../build/mf
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-# Makefile.am.wild: mi2mu_SOURCES = $(wildcard *.cc)
-# CURRENT_mi2mu_SOURCES = $(wildcard *.cc)
-
-wild-check: 
-
diff --git a/mf/Makefile b/mf/Makefile
new file mode 100644
index 0000000000..7be593edd5
--- /dev/null
+++ b/mf/Makefile
@@ -0,0 +1,51 @@
+# mf/Makefile
+
+# subdir level:
+#
+depth = ..
+#
+#
+include ./$(depth)/make/Include.make
+#
+
+# list of distribution files:
+# 
+TEXFILES = $(wildcard *.tex)
+MFFILES = $(wildcard *.mf)
+EXTRA_DISTFILES =   TODO README  $(MFFILES)
+#
+lyout = $(depth)/init
+texout = $(depth)/tex
+
+FONT_FILES = $(wildcard *[0-9].mf)
+FET_FILES = $(wildcard feta[0-9]*.mf)
+
+LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
+LOGFILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
+TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
+#
+
+default: $(LYTABLES) $(TEXTABLES) $(LOGFILES)
+
+localclean:
+	rm -f $(LYTABLES) $(TEXTABLES)
+
+$(outdir)/%.dvi: %.mf
+	mf $<
+	gftodvi  $(basename $<)
+	mv   $(basename $<).dvi $(outdir)
+	rm $(basename $<).*gf
+
+$(outdir)/%.log: %.mf
+	mf $<
+	mv $(@F) $@
+	rm $(basename $< ).*gf
+
+$(lyout)/%.ly $(texout)/%.tex $(outdir)/%.dep: $(outdir)/%.log
+	$(PYTHON) $(depth)/bin/mf-to-table.py --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
+
+
+INSTALLATION_DIR=$(MFDIR)/public/lilypond
+INSTALLATION_FILES=$(MFFILES)
+
+include $(depth)/make/Installfiles.make
diff --git a/mf/Makefile.am b/mf/Makefile.am
deleted file mode 100644
index 26f66e0e44..0000000000
--- a/mf/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# mf/Makefile.am.wild
-
-# subdir level:
-#
-depth = ..
-#
-#
-# include ./$(depth)/make/Include.make
-outdir = .
-#
-
-TEXFILES = dimen.tex dyn.tex
-MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-haak.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf
-MFDEPS = $(outdir)/mf.dep
-EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO 
-
-FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
-FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
-
-lyout = $(top_builddir)/init
-texout = $(top_builddir)/tex
-LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
-TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
-
-export top_srcdir
-
-all-local: $(LYTABLES) $(TEXTABLES)
-
-dist-hook: $(LYTABLES) $(TEXTABLES)
-
-clean-local:
-	-rm -f $(LYTABLES) $(TEXTABLES)
-	-rm -f *.log
-
-distclean-local:
-	-rm -f $(MFDEPS)
-
-install-data-local:
-	$(INSTALL) -d $(MFDIR)/public/lilypond
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(MFFILES) $(MFDIR)/public/lilypond/
-	$(INSTALL) -m 644 $(TEXTABLES) $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(LYTABLES) $(datadir)/lilypond/init/
-
-uninstall-local:
-	for i in $(MFFILES) ; do rm -f $(MFDIR)/public/lilypond/$$i; done
-	for i in $(TEXTABLES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	for i in $LYTABLES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(MFDIR)/public/lilypond
-	-rmdir $(TEXDIR)/lilypond
-	-rmdir $(datadir)/lilypond/init
-	-rmdir $(datadir)/lilypond
-
-include $(srcdir)/Rules.make
-
-# dependencies:
-#
-include $(MFDEPS)
-#
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mf/Makefile.am.wild b/mf/Makefile.am.wild
deleted file mode 100644
index 6d5f461c5a..0000000000
--- a/mf/Makefile.am.wild
+++ /dev/null
@@ -1,60 +0,0 @@
-# mf/Makefile.am.wild
-
-# subdir level:
-#
-depth = ..
-#
-#
-# include ./$(depth)/make/Include.make
-outdir = .
-#
-
-TEXFILES = $(wildcard *.tex)
-MFFILES = $(wildcard *.mf)
-MFDEPS = $(outdir)/mf.dep
-EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO 
-
-FONT_FILES = $(wildcard *[0-9].mf)
-FET_FILES = $(wildcard feta[0-9]*.mf)
-
-lyout = $(top_builddir)/init
-texout = $(top_builddir)/tex
-LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
-TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
-
-export top_srcdir
-
-all-local: $(LYTABLES) $(TEXTABLES)
-
-dist-hook: $(LYTABLES) $(TEXTABLES)
-
-clean-local:
-	-rm -f $(LYTABLES) $(TEXTABLES)
-	-rm -f *.log
-
-distclean-local:
-	-rm -f $(MFDEPS)
-
-install-data-local:
-	$(INSTALL) -d $(MFDIR)/public/lilypond
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(MFFILES) $(MFDIR)/public/lilypond/
-	$(INSTALL) -m 644 $(TEXTABLES) $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(LYTABLES) $(datadir)/lilypond/init/
-
-uninstall-local:
-	for i in $(MFFILES) ; do rm -f $(MFDIR)/public/lilypond/$$i; done
-	for i in $(TEXTABLES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	for i in $LYTABLES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(MFDIR)/public/lilypond
-	-rmdir $(TEXDIR)/lilypond
-	-rmdir $(datadir)/lilypond/init
-	-rmdir $(datadir)/lilypond
-
-include $(srcdir)/Rules.make
-
-# dependencies:
-#
-include $(MFDEPS)
-#
diff --git a/mf/Makefile.in b/mf/Makefile.in
deleted file mode 100644
index 506a321885..0000000000
--- a/mf/Makefile.in
+++ /dev/null
@@ -1,256 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# mf/Makefile.am.wild
-
-# subdir level:
-#
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-depth = ..
-#
-#
-# include ./$(depth)/make/Include.make
-outdir = .
-#
-
-TEXFILES = dimen.tex dyn.tex
-MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-haak.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf
-MFDEPS = $(outdir)/mf.dep
-EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO 
-
-FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
-FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf
-
-lyout = $(top_builddir)/init
-texout = $(top_builddir)/tex
-LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
-TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mf/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mf
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-local
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-local
-
-all: Makefile all-local
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean clean-local
-
-distclean:  distclean-generic clean distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-export top_srcdir
-
-all-local: $(LYTABLES) $(TEXTABLES)
-
-dist-hook: $(LYTABLES) $(TEXTABLES)
-
-clean-local:
-	-rm -f $(LYTABLES) $(TEXTABLES)
-	-rm -f *.log
-
-distclean-local:
-	-rm -f $(MFDEPS)
-
-install-data-local:
-	$(INSTALL) -d $(MFDIR)/public/lilypond
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -d $(datadir)/lilypond/init
-	$(INSTALL) -m 644 $(MFFILES) $(MFDIR)/public/lilypond/
-	$(INSTALL) -m 644 $(TEXTABLES) $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(LYTABLES) $(datadir)/lilypond/init/
-
-uninstall-local:
-	for i in $(MFFILES) ; do rm -f $(MFDIR)/public/lilypond/$$i; done
-	for i in $(TEXTABLES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	for i in $LYTABLES) ; do rm -f $(datadir)/lilypond/init/$$i; done
-	-rmdir $(MFDIR)/public/lilypond
-	-rmdir $(TEXDIR)/lilypond
-	-rmdir $(datadir)/lilypond/init
-	-rmdir $(datadir)/lilypond
-
-include $(srcdir)/Rules.make
-
-# dependencies:
-#
-include $(MFDEPS)
-#
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mf/dimen.tex b/mf/dimen.tex
deleted file mode 100644
index 8ab57c66f6..0000000000
--- a/mf/dimen.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-%
-% A tex file to help determine dims.
-%
-
-\font\black=black
-%\font\taupin=musix16
-
-%\font\vet=vette-beams16
-%\font\slurs=xslhd16
-%\font\specfont=musixspx
-%\font\egler=opus16
-\font\nummertjes=feta-nummer10
-%\def\thefont{\egler}
-%\def\thefont{\specfont}
-\def\thefont{\nummertjes}
-
-\def\mb#1{{\thefont\char#1}}
-
-\newdimen\wid
-\newdimen\inc
-\newdimen\here
-\def\hruler#1{%
-        \wid=#1pt
-        \inc=\wid
-        \divide\inc by #1
-        \divide\wid by 2
-        \here=-\wid
-        \loop\ifdim\here<\wid\advance\here by\inc
-                \hbox to0pt{\kern\here\vrule width0.05pt height 1pt depth 1pt\hss}%
-        \repeat%
-}
-
-\def\vruler#1{%
-        \wid=#1pt
-        \inc=\wid
-        \divide\inc by #1
-        \divide\wid by 2
-        \here=-\wid
-        \loop\ifdim\here<\wid\advance\here by\inc
-                \hbox to0pt{\vbox to0pt{\vss\hrule width2pt height 0.05pt\kern\here}\hss}%
-        \repeat%
-}
-\def\twhrul{\hbox to 0pt{\hbox{\hruler{20}%
-        \vrule width0.1pt height 2pt depth 2pt}}}
-\def\twvrul{\vbox to0pt{\vss\hbox to0pt{\hss\vruler{12}}\vss}%
-        \kern-1pt\vrule width4pt height 0.1pt}%
-        
- 
-\def\doitem#1{
-        #1%
-        \vbox to12pt{\vfill\hbox to0pt{\qquad\kern-1pt\twvrul\hss}}%
-        \hbox to50pt{\qquad\twhrul\mb{#1}\hss}%
-        \setbox0=\hbox{\mb{#1}} width \the\wd0\ depth \the\dp0 \ height \the\ht0}
-
-\newcount\n
-%\def\charn{\n=-1
-\def\charn{\n=47
-%        \loop\ifnum\n<255\advance\n by1
-%        \loop\ifnum\n<10\advance\n by1
-        \loop\ifnum\n<58\advance\n by1
-        \doitem{\number\n}\endgraf\repeat}
-
-
-        \charn
-
-\bye
diff --git a/mf/dyn.tex b/mf/dyn.tex
deleted file mode 100644
index 1c2a2e464b..0000000000
--- a/mf/dyn.tex
+++ /dev/null
@@ -1,40 +0,0 @@
-% dyn.tex
-% A tex file to help view dynamic letters
-%
-
-\font\dynfont=feta-din10 scaled \magstep2
-\def\thefont{\dynfont}
-
-\def\mb#1{{\thefont\char#1}}
-
-\def\doitem#1{
-        #1%
-%        \vbox to12pt{\vfill\hbox to0pt{\qquad\kern-1pt\twvrul\hss}}%
-%        \hbox to50pt{\qquad\twhrul\mb{#1}\hss}%
-        \hbox to 30pt{\qquad\mb{#1}\hss}
-	\setbox0=\hbox{\mb{#1}} width \the\wd0\ depth \the\dp0 \ height \the\ht0}
-
-\newcount\n
-\def\charn{\n=-1
-        \loop\ifnum\n<5\advance\n by1
-        \doitem{\number\n}\endgraf\repeat}
-
-        \charn
-
-\input dyndefs
-
-\hbox{\dynp}
-\hbox{\dynpp}
-\hbox{\dynppp}
-\hbox{\dynmp}
-\hbox{\dynmf}
-\hbox{\dynff}
-\hbox{\dynf}
-\hbox{\dynfff}
-\hbox{\dynfp}
-\hbox{\dynsf}
-\hbox{\dynsfz}
-\hbox{\dynfz}
-\hbox{\dynrf}
-
-\bye
diff --git a/mf/out/dummy.dep b/mf/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mf/out/dummy.dep
diff --git a/mi2mu/GNUmakefile b/mi2mu/GNUmakefile
deleted file mode 100644
index 8e21cc5b4a..0000000000
--- a/mi2mu/GNUmakefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# mi2mu/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-#ugh
-biltdir=../../build/mi2mu
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
-
-endif
-
-# Makefile.am.wild: mi2mu_SOURCES = $(wildcard *.cc)
-CURRENT_mi2mu_SOURCES = $(wildcard *.cc)
-
-wild-check: check-mi2mu-sources
-
-check-mi2mu-sources:
-ifneq ($(mi2mu_SOURCES),$(CURRENT_mi2mu_SOURCES))
-	@echo \"$(mi2mu_SOURCES)\"
-	@echo \"$(CURRENT_mi2mu_SOURCES)\"
-	@echo  mi2mu_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/mi2mu/Makefile b/mi2mu/Makefile
new file mode 100644
index 0000000000..02509c2313
--- /dev/null
+++ b/mi2mu/Makefile
@@ -0,0 +1,72 @@
+#
+# project  LilyPond -- the musical typesetter
+# title	   makefile for mi2mu
+# file	   mi2mu/Makefile 
+#
+# Copyright (c) 1997 by
+#   	Jan Nieuwenhuizen <jan@digicash.com>
+#	Han-Wen Nienhuys <hanwen@stack.nl>
+#
+
+# subdir level:
+#
+depth = ..
+#
+
+NAME = mi2mu
+MODULE_NAME = mi2mu
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make
+include ./$(depth)/make/Files.make 
+#
+
+# identify module:
+#
+include $(mi2mu-dir)/VERSION
+build = $(mi2mu-dir)/$(outdir)/.build
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = include
+#
+
+# to be remade each build:
+#
+VERSION_DEPENDENCY = $(mi2mu-version)
+#
+
+
+# list of distribution files:
+#
+EXTRA_DISTFILES = VERSION TODO
+#
+
+# list of custom libraries:
+#
+MODULE_LIBDEPS=check-flower-deps check-lib-deps
+MODULE_LIBES=-llily -lflower
+#
+
+
+default: $(EXECUTABLE)
+
+#
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+#
+
+# explicit dependencies: (how to do auto?)
+#
+midi-lexer.l:	$(outdir)/midi-parser.hh
+
+$(outdir)/mi2mu-version.o: $(outdir)/version.hh
+
+EXECUTABLES=mi2mu
+
+include $(depth)/make/Executable.make
diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am
deleted file mode 100644
index 594ebdfff8..0000000000
--- a/mi2mu/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for mi2mu
-# file	   mi2mu/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-
-SUBDIRS = include
-
-bin_PROGRAMS = mi2mu
-
-mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template9.cc version.cc
-
-# ugh -lfl bo lib/FlexLexer stuff
-#mi2mu_LDADD = -llily -lflower -lfl
-
-# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
- 
-INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild
deleted file mode 100644
index 1330e7dfdb..0000000000
--- a/mi2mu/Makefile.am.wild
+++ /dev/null
@@ -1,33 +0,0 @@
-# project  LilyPond -- the musical typesetter
-# title	   makefile for mi2mu
-# file	   mi2mu/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-
-SUBDIRS = include
-
-bin_PROGRAMS = mi2mu
-
-mi2mu_SOURCES = $(wildcard *.cc)
-
-# ugh -lfl bo lib/FlexLexer stuff
-#mi2mu_LDADD = -llily -lflower -lfl
-
-# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
- 
-INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in
deleted file mode 100644
index 053e0de379..0000000000
--- a/mi2mu/Makefile.in
+++ /dev/null
@@ -1,608 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for mi2mu
-# file	   mi2mu/Makefile.am.wild
-#
-# Copyright (c) 1997 by
-#   	Jan Nieuwenhuizen <jan@digicash.com>
-#	Han-Wen Nienhuys <hanwen@stack.nl>
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = include
-
-bin_PROGRAMS = mi2mu
-
-mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template9.cc version.cc
-
-# ugh -lfl bo lib/FlexLexer stuff
-#mi2mu_LDADD = -llily -lflower -lfl
-
-# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
-mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
-
-INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../flower
-LIBS = @LIBS@
-mi2mu_OBJECTS =  main.o mi2mu-version.o midi-parser.o \
-midi-score-parser.o midi-track-parser.o mudela-column.o mudela-item.o \
-mudela-score.o mudela-staff.o mudela-stream.o mudela-voice.o \
-template9.o version.o
-mi2mu_DEPENDENCIES =  $(top_builddir)/lib/liblily.la \
-$(top_builddir)/flower/libflower.la
-mi2mu_LDFLAGS = 
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-SOURCES = $(mi2mu_SOURCES)
-OBJECTS = $(mi2mu_OBJECTS)
-
-default: all
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-mi2mu: $(mi2mu_OBJECTS) $(mi2mu_DEPENDENCIES)
-	@rm -f mi2mu
-	$(CXXLINK) $(mi2mu_LDFLAGS) $(mi2mu_OBJECTS) $(mi2mu_LDADD) $(LIBS)
-.cc.o:
-	$(CXXCOMPILE) -c $<
-.cc.lo:
-	$(LTCXXCOMPILE) -c $<
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mi2mu
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-main.o: main.cc ../flower/include/string-convert.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../flower/include/lgetopt.hh ../flower/include/path.hh \
-	../flower/include/varray.hh ../lib/include/duration-convert.hh \
-	../lib/include/duration.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/plet.hh \
-	../lib/include/source.hh ../lib/include/proto.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/mi2mu-global.hh include/midi-score-parser.hh \
-	include/midi-parser.hh include/mi2mu-proto.hh \
-	../flower/include/parray.hh include/mudela-item.hh \
-	include/mudela-score.hh
-mi2mu-version.o: mi2mu-version.cc ../flower/config.hh
-midi-parser.o: midi-parser.cc ../flower/include/string-convert.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/source-file.hh ../lib/include/proto.hh \
-	include/mi2mu-global.hh include/midi-parser.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	include/mi2mu-proto.hh
-midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../lib/include/source-file.hh ../lib/include/proto.hh \
-	../flower/include/string.hh ../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/source.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/mi2mu-global.hh include/midi-score-parser.hh \
-	include/midi-parser.hh include/mi2mu-proto.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	include/midi-track-parser.hh include/mudela-item.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	include/mudela-score.hh
-midi-track-parser.o: midi-track-parser.cc \
-	../flower/include/string-convert.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/mi2mu-global.hh ../lib/include/proto.hh \
-	include/midi-track-parser.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc ../lib/include/moment.hh \
-	../flower/include/rational.hh include/mi2mu-proto.hh \
-	include/midi-parser.hh include/mudela-column.hh \
-	include/mudela-item.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/mudela-score.hh \
-	../flower/include/parray.hh ../flower/include/varray.hh \
-	include/mudela-staff.hh
-mudela-column.o: mudela-column.cc include/mudela-column.hh \
-	../lib/include/proto.hh ../flower/include/fproto.hh \
-	../flower/include/real.hh include/mi2mu-proto.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc
-mudela-item.o: mudela-item.cc include/mi2mu-global.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/proto.hh ../flower/include/string-convert.hh \
-	../lib/include/duration-convert.hh ../lib/include/duration.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../lib/include/plet.hh ../flower/include/varray.hh \
-	include/mudela-column.hh include/mi2mu-proto.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/mudela-item.hh include/mudela-stream.hh \
-	include/mudela-score.hh ../flower/include/parray.hh
-mudela-score.o: mudela-score.cc ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../lib/include/duration.hh ../lib/include/plet.hh \
-	../lib/include/duration-convert.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	include/mi2mu-global.hh ../lib/include/proto.hh \
-	include/mudela-column.hh include/mi2mu-proto.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/mudela-item.hh include/mudela-score.hh \
-	../flower/include/parray.hh include/mudela-staff.hh \
-	include/mudela-stream.hh ../flower/include/list.tcc \
-	../flower/include/cursor.tcc
-mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \
-	../flower/include/rational.hh ../flower/include/compare.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../lib/include/duration-convert.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh ../flower/include/string.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/varray.hh \
-	../flower/include/string-convert.hh include/mi2mu-proto.hh \
-	include/mi2mu-global.hh ../lib/include/proto.hh \
-	include/mudela-column.hh ../flower/include/plist.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/pcursor.hh \
-	../flower/include/cursor.icc ../flower/include/iterate.hh \
-	../flower/include/plist.icc include/mudela-item.hh \
-	include/mudela-staff.hh include/mudela-stream.hh \
-	include/mudela-voice.hh include/mudela-score.hh \
-	../flower/include/parray.hh
-mudela-stream.o: mudela-stream.cc include/mi2mu-global.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	../lib/include/proto.hh include/mudela-item.hh \
-	include/mi2mu-proto.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/mudela-stream.hh
-mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh \
-	include/mi2mu-global.hh ../lib/include/proto.hh \
-	include/mudela-column.hh include/mi2mu-proto.hh \
-	../lib/include/moment.hh ../flower/include/rational.hh \
-	../flower/include/plist.hh ../flower/include/list.hh \
-	../flower/include/list.icc ../flower/include/cursor.hh \
-	../flower/include/link.hh ../flower/include/link.icc \
-	../flower/include/pcursor.hh ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/plist.icc \
-	include/mudela-item.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/mudela-staff.hh \
-	include/mudela-stream.hh include/mudela-voice.hh
-template9.o: template9.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/list.hh ../flower/include/list.icc \
-	../flower/include/cursor.hh ../flower/include/link.hh \
-	../flower/include/link.icc ../flower/include/compare.hh \
-	../flower/include/pcursor.hh ../flower/include/plist.hh \
-	../flower/include/plist.icc ../flower/include/cursor.icc \
-	../flower/include/iterate.hh ../flower/include/list.tcc \
-	../flower/include/cursor.tcc include/mudela-item.hh \
-	include/mi2mu-proto.hh ../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../lib/include/moment.hh \
-	../flower/include/rational.hh ../lib/include/duration.hh \
-	../lib/include/plet.hh include/mudela-column.hh \
-	include/mudela-staff.hh include/mudela-voice.hh \
-	include/mudela-score.hh ../flower/include/parray.hh \
-	../flower/include/varray.hh ../flower/include/pcursor.tcc \
-	../flower/include/plist.tcc
-version.o: version.cc ../lib/include/proto.hh \
-	../flower/include/fproto.hh ../flower/include/real.hh \
-	../flower/include/string.hh \
-	../flower/include/arithmetic-operator.hh \
-	../flower/include/string-handle.hh \
-	../flower/include/international.hh ../flower/include/compare.hh
-
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-am: Makefile $(PROGRAMS)
-
-install-exec-am: install-binPROGRAMS
-
-uninstall-am: uninstall-binPROGRAMS
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
-all: all-recursive all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(bindir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-		distclean-tags distclean-generic clean-am
-
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am distclean-local
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
-clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
-install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-am install-exec-am uninstall-am install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-distclean-local:
-	-rm -rf .deps
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mi2mu/include/GNUmakefile b/mi2mu/include/GNUmakefile
deleted file mode 100644
index a3f707a0e3..0000000000
--- a/mi2mu/include/GNUmakefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# mi2mu/include/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../../../build/mi2mu/include
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-CURRENT_noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-wild-check: check-noinst-headers
-
-check-noinst-headers:
-ifneq ($(noinst_HEADERS),$(CURRENT_noinst_HEADERS))
-	@echo \"$(noinst_HEADERS)\"
-	@echo \"$(CURRENT_noinst_HEADERS)\"
-	@echo  noinst_HEADERS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/mi2mu/include/Makefile b/mi2mu/include/Makefile
new file mode 100644
index 0000000000..1cfdc7b22a
--- /dev/null
+++ b/mi2mu/include/Makefile
@@ -0,0 +1,17 @@
+# lib/include/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+
+# identify module:
+#
+MODULE_NAME = lilypond
+#
+
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Include.make
+#
+
diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am
deleted file mode 100644
index e5a3775a65..0000000000
--- a/mi2mu/include/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# mi2mu/include/Makefile.am.wild
-
-noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mi2mu/include/Makefile.am.wild b/mi2mu/include/Makefile.am.wild
deleted file mode 100644
index d03dd28817..0000000000
--- a/mi2mu/include/Makefile.am.wild
+++ /dev/null
@@ -1,14 +0,0 @@
-# mi2mu/include/Makefile.am.wild
-
-noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in
deleted file mode 100644
index e323017787..0000000000
--- a/mi2mu/include/Makefile.in
+++ /dev/null
@@ -1,234 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# mi2mu/include/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-noinst_HEADERS = mi2mu-global.hh mi2mu-proto.hh midi-parser.hh midi-score-parser.hh midi-track-parser.hh mudela-column.hh mudela-item.hh mudela-score.hh mudela-staff.hh mudela-stream.hh mudela-voice.hh dummy.icc dummy.tcc
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/include/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mi2mu/include
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile $(HEADERS)
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-tags mostlyclean-generic
-
-clean:  clean-tags clean-generic mostlyclean
-
-distclean:  distclean-tags distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-tags maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-# all-am: Makefile $(PROGRAMS) wild-check
-# ugh, automake doesn't generate the all-am target here...
-all: Makefile $(HEADERS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mi2mu/include/out/dummy.dep b/mi2mu/include/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mi2mu/include/out/dummy.dep
diff --git a/mi2mu/mi2mu-version.cc b/mi2mu/mi2mu-version.cc
index e008ad3e7b..55946e5470 100644
--- a/mi2mu/mi2mu-version.cc
+++ b/mi2mu/mi2mu-version.cc
@@ -9,18 +9,12 @@
 
 // static char *s = "mi2mu " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
 //urg
-static char *s = "mi2mu " TOPLEVEL_VERSION " #%d";
+//static char *s = "mi2mu " TOPLEVEL_VERSION " #%d";
+static char *s = "mi2mu FIXME " ;
 
-static const int build=
-//#include ".build"
-0
-;
 
 const char * 
 mi2mu_version_sz()
-{
-  static char v[1024];
-  sprintf(v, s, build);
-  return v;
+{  return s;
 }
 
diff --git a/mi2mu/out/dummy.dep b/mi2mu/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mi2mu/out/dummy.dep
diff --git a/missing b/missing
deleted file mode 100644
index 8b13789179..0000000000
--- a/missing
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100644
index 8b13789179..0000000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/Makefile
new file mode 100644
index 0000000000..40ce58e198
--- /dev/null
+++ b/mutopia/Coriolan/Makefile
@@ -0,0 +1,9 @@
+# mutopia/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Mutopia.make
diff --git a/mutopia/Coriolan/Makefile.am b/mutopia/Coriolan/Makefile.am
deleted file mode 100644
index 933f83419b..0000000000
--- a/mutopia/Coriolan/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# mutopia/Coriolan/Makefile.am.wild
-
-LYFILES = clarinetti-part.ly clarinetti.ly clarinetto-1.ly clarinetto-2.ly contrabasso.ly coriolan.ly corni-part.ly corni.ly corno-1.ly corno-2.ly fagotti-part.ly fagotti.ly fagotto-1.ly fagotto-2.ly flauti-part.ly flauti.ly flauto-1.ly flauto-2.ly global.ly oboe-1.ly oboe-2.ly oboi-part.ly oboi.ly timpani.ly trombe-part.ly trombe.ly trombo-1.ly trombo-2.ly viola.ly violino-1.ly violino-2.ly violoncello.ly
-TEXFILES = 
-M4FILES = 
-EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mutopia/Coriolan/Makefile.am.wild b/mutopia/Coriolan/Makefile.am.wild
deleted file mode 100644
index d761af4a6c..0000000000
--- a/mutopia/Coriolan/Makefile.am.wild
+++ /dev/null
@@ -1,11 +0,0 @@
-# mutopia/Coriolan/Makefile.am.wild
-
-LYFILES = $(wildcard *.ly)
-TEXFILES = $(wildcard *.tex)
-M4FILES = $(wildcard *.m4)
-EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
diff --git a/mutopia/Coriolan/Makefile.in b/mutopia/Coriolan/Makefile.in
deleted file mode 100644
index 86470d93f7..0000000000
--- a/mutopia/Coriolan/Makefile.in
+++ /dev/null
@@ -1,205 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# mutopia/Coriolan/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-LYFILES = clarinetti-part.ly clarinetti.ly clarinetto-1.ly clarinetto-2.ly contrabasso.ly coriolan.ly corni-part.ly corni.ly corno-1.ly corno-2.ly fagotti-part.ly fagotti.ly fagotto-1.ly fagotto-2.ly flauti-part.ly flauti.ly flauto-1.ly flauto-2.ly global.ly oboe-1.ly oboe-2.ly oboi-part.ly oboi.ly timpani.ly trombe-part.ly trombe.ly trombo-1.ly trombo-2.ly viola.ly violino-1.ly violino-2.ly violoncello.ly
-TEXFILES = 
-M4FILES = 
-EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mutopia/Coriolan/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mutopia/Coriolan
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-default: all $(OUTFILES)
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mutopia/Coriolan/TODO b/mutopia/Coriolan/TODO
deleted file mode 100644
index 183509da82..0000000000
--- a/mutopia/Coriolan/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-coriolan/TODO
-
-	* complete all parts
-
-	* make a macro/framework/something for symphonies
-
-	* staff-group bracket
-
-	* chords/divisi; one stem/two stems...
-
diff --git a/mutopia/Coriolan/music b/mutopia/Coriolan/music
deleted file mode 100644
index 240986b5c8..0000000000
--- a/mutopia/Coriolan/music
+++ /dev/null
@@ -1,18 +0,0 @@
-flauto-1.ly
-flauto-2.ly
-oboe-1.ly
-oboe-2.ly
-clarinetto-1.ly
-clarinetto-2.ly
-fagotto-1.ly
-fagotto-2.ly
-corno-1.ly
-corno-2.ly
-trombo-1.ly
-trombo-2.ly
-timpani.ly
-violino-1.ly
-violino-2.ly
-viola.ly
-violoncello.ly
-contrabasso.ly
diff --git a/mutopia/J.S.Bach/Makefile b/mutopia/J.S.Bach/Makefile
new file mode 100644
index 0000000000..018f98af67
--- /dev/null
+++ b/mutopia/J.S.Bach/Makefile
@@ -0,0 +1,16 @@
+# mutopia/J.S.Bach/Makefile
+
+# subdir level:
+#
+depth = ../..
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = 
+# 
+
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Mutopia.make
+#
diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am
deleted file mode 100644
index ae4b8fac30..0000000000
--- a/mutopia/J.S.Bach/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# mutopia/J.S.Bach/Makefile.am.wild
-
-LYFILES = preludes-1.ly preludes-2.ly preludes-4.ly preludes-5.ly preludes-6.ly scsii-menuetto.ly wtk1-fugue1.ly wtk1-fugue2.ly wtk1-prelude1.ly
-TEXFILES = preludes.tex
-M4FILES = preludes-3.ly.m4 wtk1-prelude2.ly.m4
-EXTRA_DIST = Makefile.am.wild $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
-# ugh
-M4 = m4
-
-%.ly: $(srcdir)/%.ly.m4
-	$(M4) $< > $@
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mutopia/J.S.Bach/Makefile.am.wild b/mutopia/J.S.Bach/Makefile.am.wild
deleted file mode 100644
index 630d2c35be..0000000000
--- a/mutopia/J.S.Bach/Makefile.am.wild
+++ /dev/null
@@ -1,17 +0,0 @@
-# mutopia/J.S.Bach/Makefile.am.wild
-
-LYFILES = $(wildcard *.ly)
-TEXFILES = $(wildcard *.tex)
-M4FILES = $(wildcard *.m4)
-EXTRA_DIST = Makefile.am.wild $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-
-# ugh
-M4 = m4
-
-%.ly: $(srcdir)/%.ly.m4
-	$(M4) $< > $@
-
diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in
deleted file mode 100644
index ef9808fd89..0000000000
--- a/mutopia/J.S.Bach/Makefile.in
+++ /dev/null
@@ -1,211 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# mutopia/J.S.Bach/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-LYFILES = preludes-1.ly preludes-2.ly preludes-4.ly preludes-5.ly preludes-6.ly scsii-menuetto.ly wtk1-fugue1.ly wtk1-fugue2.ly wtk1-prelude1.ly
-TEXFILES = preludes.tex
-M4FILES = preludes-3.ly.m4 wtk1-prelude2.ly.m4
-EXTRA_DIST = Makefile.am.wild $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-# ugh
-M4 = m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mutopia/J.S.Bach/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mutopia/J.S.Bach
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-default: all $(OUTFILES)
-
-%.ly: $(srcdir)/%.ly.m4
-	$(M4) $< > $@
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mutopia/J.S.Bach/out/dummy.dep b/mutopia/J.S.Bach/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mutopia/J.S.Bach/out/dummy.dep
diff --git a/mutopia/J.S.Bach/preludes.tex b/mutopia/J.S.Bach/preludes.tex
index 6bed0be4d8..b1680f9d3a 100644
--- a/mutopia/J.S.Bach/preludes.tex
+++ b/mutopia/J.S.Bach/preludes.tex
@@ -1,18 +1,28 @@
 \documentclass{article}         %UGH
 \usepackage{a4}
 
+% UGH UGH
 \advance\oddsidemargin-30mm
 \evensidemargin\oddsidemargin
 % ugh, centre
 \advance\textwidth60mm
-\hsize210mm
-\vsize269mm
-\advance\topmargin-25mm
-\advance\textheight50mm
-\pagestyle{empty}
+\advance\topmargin-20mm
+\addtolength{\textheight}{40mm}
+\footskip5mm
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}
 
 \input titledefs
-        
 \input lilyponddefs
 \def\interscoreline{\vskip2mm}
 %ugh
diff --git a/mutopia/Makefile b/mutopia/Makefile
new file mode 100644
index 0000000000..0137e29946
--- /dev/null
+++ b/mutopia/Makefile
@@ -0,0 +1,15 @@
+# mutopia/Makefile
+
+# subdir level:
+#
+depth = ..
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = J.S.Bach Coriolan
+EXTRA_DISTFILES +=  TODO
+#
+# generic stuff/Makefile
+#
+include ./$(depth)/make/Mutopia.make
diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am
deleted file mode 100644
index 6271bc118a..0000000000
--- a/mutopia/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# mutopia/Makefile.am.wild
-
-SUBDIRS = J.S.Bach Coriolan
-
-LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
-TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex
-M4FILES = dummy.m4
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/mutopia/Makefile.am.wild b/mutopia/Makefile.am.wild
deleted file mode 100644
index 01a7a8ce12..0000000000
--- a/mutopia/Makefile.am.wild
+++ /dev/null
@@ -1,12 +0,0 @@
-# mutopia/Makefile.am.wild
-
-SUBDIRS = J.S.Bach Coriolan
-
-LYFILES = $(wildcard *.ly)
-TEXFILES = $(wildcard *.tex)
-M4FILES = $(wildcard *.m4)
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-
-default: all $(OUTFILES)
diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in
deleted file mode 100644
index c03acaf8c4..0000000000
--- a/mutopia/Makefile.in
+++ /dev/null
@@ -1,293 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# mutopia/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-SUBDIRS = J.S.Bach Coriolan
-
-LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
-TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex
-M4FILES = dummy.m4
-EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES)
-
-OUTFILES = $(M4FILES:%.m4=%)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in TODO
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mutopia/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	done; \
-	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
-	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = mutopia
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	    || exit 1; \
-	done
-info: info-recursive
-dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
-installcheck: installcheck-recursive
-all-am: Makefile
-
-install-exec: install-exec-recursive
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
-
-install: install-recursive
-	@:
-
-uninstall: uninstall-recursive
-
-all: all-recursive all-am
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs: installdirs-recursive
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-distclean-am:  distclean-tags distclean-generic clean-am
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-am install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-default: all $(OUTFILES)
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mutopia/TODO b/mutopia/TODO
deleted file mode 100644
index 7239bc104c..0000000000
--- a/mutopia/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-	- more composers > 70y +
-	- (more) free composers
-	- beethoven's coriolan
diff --git a/mutopia/los-toros-oboe-16.tex b/mutopia/los-toros-oboe-16.tex
new file mode 100644
index 0000000000..98973e2e4b
--- /dev/null
+++ b/mutopia/los-toros-oboe-16.tex
@@ -0,0 +1,38 @@
+\documentclass{article}         %UGH
+
+\usepackage{a4}
+
+% UGH UGH
+% ugh, centre
+\advance\oddsidemargin-30mm
+\evensidemargin\oddsidemargin
+\advance\textwidth60mm
+\advance\topmargin-20mm
+\addtolength{\textheight}{40mm}
+\footskip5mm
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}
+
+
+\begin{document}
+\input lilyponddefs
+\input titledefs
+\def\interscoreline{\vskip3mm}
+\title{La Feria\normalsize\\[2ex]Los Toros}
+\composer{Paul Lac\^ome d'Estalenx (1838-1920)}
+%\instrument{} % heu
+%#%\tempo{M\"a\ss ig}
+\makelilytitle
+\input{los-toros-oboe-1.tex}
+\end{document}
+
diff --git a/mutopia/los-toros-oboe-20.tex b/mutopia/los-toros-oboe-20.tex
index 910651a6f5..555a046d0d 100644
--- a/mutopia/los-toros-oboe-20.tex
+++ b/mutopia/los-toros-oboe-20.tex
@@ -1,15 +1,29 @@
 \documentclass{article}         %UGH
+
 \usepackage{a4}
 
-%
 % UGH UGH
-\advance\oddsidemargin-30mm
+\advance\oddsidemargin-25mm
 \evensidemargin\oddsidemargin
 % ugh, centre
-\advance\textwidth60mm
+\advance\textwidth40mm
 \advance\topmargin-20mm
 \addtolength{\textheight}{40mm}
-\pagestyle{empty}
+\footskip5mm
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}
+
+
 \begin{document}
 \input lilyponddefs
 \input titledefs
@@ -20,5 +34,6 @@
 %#%\tempo{M\"a\ss ig}
 \makelilytitle
 \input{los-toros-oboe.tex}
-%\input lelie.tex
+% \input{los-toros-oboe-1.tex}
 \end{document}
+
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index faafa951fb..822a0b27d9 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -1,12 +1,16 @@
 \header{
 filename =	 "los-toros-oboe.ly";
-title =	         "Los Toros";
+title =	         "La Feria\normalsize\\[2ex]Los Toros";
 opus =	         "";
-composer =	 "Paul Lac\^ome d'Estalenx (1838-1920)";
+composer =	 "Paul Lac\\^ome d'Estalenx (1838-1920)";
 enteredby =	 "jcn";
 copyright =	 "public domain";
 } 
 
+%{
+Silly latex file dropped; use ly2dvi
+%}
+
 \include "paper20.ly"
 
 hoboonestart = \melodic{
@@ -177,9 +181,10 @@ hoboonelast = \melodic{
 	[bes16-. bes-. bes-. bes-.] [bes8-. ces'->] |
 	[bes'16-.\ff bes'-. bes'-. bes'-.] [bes'8-. ces''16->] r16^"court"-\fermata |
 	% ugh: eight measures rest (ugh: r1 -> four beats...)
+	% eiht measures rest..
 	\textstyle "bold";
 %	r2^"Un peu plus lent et \\'el\\'egant"
-	r2
+	r2^"\\fetanummer8"
 	r4 r8\p bes |
 	g2->^"Un peu plus lent et \\'el\\'egant" ~ |
 	\textstyle "italic";
@@ -282,58 +287,60 @@ $staff_hoboone = \type Staff = hoboonestaff <
 
 a4 = \paper{
 	\paper_twenty
-	linewidth= 165.\mm;
+	linewidth= 185.\mm;
 	gourlay_maxmeasures = 10.0;
-	Score = \translator {
-		\type Score_engraver;
-
-		\consists "Timing_engraver";
-		\consists "Bar_column_engraver";
-		\consists "Bar_number_engraver";
-
-		\consists "Span_score_bar_engraver";
-		\consists "Score_priority_engraver";
-		\consists "Priority_horizontal_align_engraver";
-		\consists "Vertical_align_engraver";
-
+	Staff = \translator {
+		\type "Engraver_group_engraver";
+		defaultclef = violin;
 
-		\accepts "Staff_group";
-		\accepts "Staff";
-		\accepts "Rhythmic_staff";	
-		\accepts "Lyrics";
-		\accepts "Grandstaff";
+		\consists "Bar_engraver";
+		\consists "Clef_engraver";
+		\consists "Key_engraver";
+		\consists "Meter_engraver";
+		\consists "Local_key_engraver";
+		\consists "Staff_sym_engraver";
+		\consists "Collision_engraver";
+		\consists "Rest_collision_engraver";
+% not yet: multibar rest
+%		\consists "Bar_column_engraver";
+%		\consists "Bar_number_engraver";
+		\consists "Separating_line_group_engraver";
+		\consists "Line_group_engraver";
+		  
+		\accepts "Voice";
 	}
 }
 
 a4sixteen = \paper{
-	linewidth= 165.\mm;
-	Score = \translator {
-		\type Score_engraver;
-
-		\consists "Timing_engraver";
-		\consists "Bar_column_engraver";
-		\consists "Bar_number_engraver";
-
-		\consists "Span_score_bar_engraver";
-		\consists "Score_priority_engraver";
-		\consists "Priority_horizontal_align_engraver";
-		\consists "Vertical_align_engraver";
-
+	linewidth= 193.\mm;
+	Staff = \translator {
+		\type "Engraver_group_engraver";
+		defaultclef = violin;
 
-		\accepts "Staff_group";
-		\accepts "Staff";
-		\accepts "Rhythmic_staff";	
-		\accepts "Lyrics";
-		\accepts "Grandstaff";
+		\consists "Bar_engraver";
+		\consists "Clef_engraver";
+		\consists "Key_engraver";
+		\consists "Meter_engraver";
+		\consists "Local_key_engraver";
+		\consists "Staff_sym_engraver";
+		\consists "Collision_engraver";
+		\consists "Rest_collision_engraver";
+% not yet: multibar rest
+%		\consists "Bar_column_engraver";
+%		\consists "Bar_number_engraver";
+		\consists "Separating_line_group_engraver";
+		\consists "Line_group_engraver";
+		  
+		\accepts "Voice";
 	}
 }
 
 \score{
 	\$staff_hoboone
 	\paper{ \a4 }
-%	\paper{ \a4sixteen }
 	\midi{
 		\tempo 4 = 80;
 	}
+	\paper{ \a4sixteen }
 }
 
diff --git a/mutopia/out/dummy.dep b/mutopia/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mutopia/out/dummy.dep
diff --git a/mutopia/standchen-16.tex b/mutopia/standchen-16.tex
index e22d627ae9..21ef2cf758 100644
--- a/mutopia/standchen-16.tex
+++ b/mutopia/standchen-16.tex
@@ -1,8 +1,22 @@
 \documentclass{article}         %UGH
 \usepackage{a4}
+
 \advance\oddsidemargin-15mm
 \evensidemargin\oddsidemargin
 \advance\textwidth30mm
+\footskip5mm
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}
 
 \input titledefs
 %\pagestyle{empty}
@@ -14,5 +28,5 @@
 %#%\tempo{M\"a\ss ig}
 \makelilytitle
 \input{standchen-16.out}
-%\input lelie.tex
 \end{document}
+
diff --git a/mutopia/standchen-20.tex b/mutopia/standchen-20.tex
index ed2f7e9bc5..4ee0201a27 100644
--- a/mutopia/standchen-20.tex
+++ b/mutopia/standchen-20.tex
@@ -1,14 +1,28 @@
 \documentclass{article}         %UGH
 \usepackage{a4}
 
-%
 % UGH UGH
 \advance\oddsidemargin-30mm
 \evensidemargin\oddsidemargin
 % ugh, centre
 \advance\textwidth60mm
-\addtolength{\textheight}{20mm}
-\pagestyle{empty}
+\advance\topmargin-20mm
+\addtolength{\textheight}{40mm}
+\footskip5mm
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}
+
+
 \begin{document}
 \input lilyponddefs
 \input titledefs
@@ -19,5 +33,5 @@
 %#%\tempo{M\"a\ss ig}
 \makelilytitle
 \input{standchen-20.out}
-%\input lelie.tex
 \end{document}
+
diff --git a/out/dummy.dep b/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/out/dummy.dep
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index 9788f70238..0000000000
--- a/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/test/GNUmakefile b/test/GNUmakefile
deleted file mode 100644
index 65b8488c06..0000000000
--- a/test/GNUmakefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# test/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
-
-# automake/wild-make should generate this file from Makefile.am.wild
-
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
-
-include Makefile
-
-biltdir=.
-
-else
-
-#ugh
-biltdir=../flowertest
-
-make-in-build: wild-check
-	exec $(MAKE) -C $(biltdir)
-
-# include Makefile
-include $(biltdir)/Makefile
-
-endif
-
-# Makefile.am.wild: TEST_SCRIPTS = $(wildcard *.sh)
-CURRENT_TEST_SCRIPTS = $(wildcard *.sh)
-
-wild-check: check-test-scripts
-
-check-test-scripts:
-ifneq ($(TEST_SCRIPTS),$(CURRENT_TEST_SCRIPTS))
-	@echo \"$(TEST_SCRIPTS)\"
-	@echo \"$(CURRENT_TEST_SCRIPTS)\"
-	@echo  TEST_SCRIPTS changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
-endif
-
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 88f709d5da..0000000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for test
-# file	   test/Makefile.am.wild
-
-TEST_SCHRIFTEN = check-lily-midi.sh check-lily-paper.sh check-mi2mu.sh
-
-# ugh ugh
-TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh
-
-INPUTS = test.midi
-
-RESULTS = ok.midi ok.tex ok.ly
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS)
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/test/Makefile.am.wild b/test/Makefile.am.wild
deleted file mode 100644
index 7d7fdcb0cd..0000000000
--- a/test/Makefile.am.wild
+++ /dev/null
@@ -1,21 +0,0 @@
-# project  LilyPond -- the musical typesetter
-# title	   makefile for test
-# file	   test/Makefile.am.wild
-
-TEST_SCHRIFTEN = $(wildcard *.sh)
-
-# ugh ugh
-TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh
-
-INPUTS = test.midi
-
-RESULTS = ok.midi ok.tex ok.ly
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS)
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
diff --git a/test/Makefile.in b/test/Makefile.in
deleted file mode 100644
index 3c032b6410..0000000000
--- a/test/Makefile.in
+++ /dev/null
@@ -1,240 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# project  LilyPond -- the musical typesetter
-# title	   makefile for test
-# file	   test/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-TEST_SCHRIFTEN = check-lily-midi.sh check-lily-paper.sh check-mi2mu.sh
-
-# ugh ugh
-TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh
-
-INPUTS = test.midi
-
-RESULTS = ok.midi ok.tex ok.ly
-
-EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = test
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-check-TESTS: $(TESTS)
-	@failed=0; all=0; \
-	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f $$tst; then dir=.; \
-	  else dir="$(srcdir)"; fi; \
-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
-	    all=`expr $$all + 1`; \
-	    echo "PASS: $$tst"; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    failed=`expr $$failed + 1`; \
-	    echo "FAIL: $$tst"; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  banner="All $$all tests passed"; \
-	else \
-	  banner="$$failed of $$all tests failed"; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
-info:
-dvi:
-check: all
-	$(MAKE) check-TESTS
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir check-TESTS info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# override default target for all-am: to get an extra dependency
-all-am: Makefile $(PROGRAMS) wild-check
-
-# dummy target for non-GNU makes; is overridden in GNUmakefile
-wild-check:
-
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/check-lily-midi.sh b/test/check-lily-midi.sh
deleted file mode 100644
index 6ce2758490..0000000000
--- a/test/check-lily-midi.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# check-lily-midi.sh
-
-# out=check-lily.midi
-# ugh -o is broken
-out=lelie.midi
-ok=$LILYPOND_SOURCEDIR/test/ok.midi
-cat <<EOF | lilypond -T -o $out
-\score{
-	\melodic{
-		c d e f g a b c'
-	}
-	\midi{}
-}
-EOF
-
-# ugh
-cmp $out $ok
-exit $?
-
diff --git a/test/check-lily-paper.sh b/test/check-lily-paper.sh
deleted file mode 100644
index 1829154a4f..0000000000
--- a/test/check-lily-paper.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# check-lily-paper.sh
-
-# out=check-lily.tex
-# ugh -o is broken
-out=lelie.tex
-ok=$LILYPOND_SOURCEDIR/test/ok.tex
-cat <<EOF | lilypond -T # -o $out
-\score{
-	\melodic{
-		c d e f g a b c'
-	}
-	\paper{}
-}
-EOF
-
-# ugh
-diff $out $ok
-exit $?
-
diff --git a/test/check-mi2mu.sh b/test/check-mi2mu.sh
deleted file mode 100644
index b445a0373a..0000000000
--- a/test/check-mi2mu.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-out=check-mi2mu.ly
-# out=check-lily.midi
-# ugh -o is broken
-out=test.midi.ly
-ok=$LILYPOND_SOURCEDIR/test/ok.ly
-mi2mu -T $LILYPOND_SOURCEDIR/test/test.midi # -o $out
-
-# ugh
-diff $out $ok
-exit $?
-
diff --git a/test/ok.ly b/test/ok.ly
deleted file mode 100644
index c8b050f494..0000000000
--- a/test/ok.ly
+++ /dev/null
@@ -1,41 +0,0 @@
-% Creator: GNU LilyPond
-% Automatically generated.
-% from input file: /home/fred/lelie/current/test/test.midi
-
-\version "0.1.9";
-$Track_0 = \melodic{
-	% midi copyright:
-	% instrument:
-	\duration 4;
-	% Creator: GNU LilyPond
-
-	 % Automatically generated.
-
-	 % from musical definition: : 1
-	 % Track 0
-	 \tempo 4=60;
-	 
-} % Track 0
-
-$track1 = \melodic{
-	% midi copyright:
-	% instrument:piano
-	\duration 4;
-
-	% piano
-	 \tempo 4=60;
-	 c4  d4  e4  f4  |
-	% 2
-	g4  a4  b4  c'4  
-
-} % track1
-
-\score{
-	\multi 3 < \type Staff
-			< \melodic{ \$track1 } >
-	>
-	\paper{}
-	\midi{
-		\tempo 4=60;
-		 }
-}
diff --git a/test/ok.midi b/test/ok.midi
deleted file mode 100644
index 08f8f59bcd..0000000000
--- a/test/ok.midi
+++ /dev/null
diff --git a/test/ok.tex b/test/ok.tex
deleted file mode 100644
index c75af774b2..0000000000
--- a/test/ok.tex
+++ /dev/null
@@ -1,283 +0,0 @@
-% Creator: GNU LilyPond
-% Automatically generated.
-% outputting Score, defined at: : 1
-\def\LilyIdString{Lily was here, 0.1.52.jcn6}%
-%
- \def\mudelapaperlinewidth{441.017717}%
-%
-\def\mudelapaperindent{28.452756}%
-%
-\def\mudelapaperrulethickness{0.400000}%
-%
-\def\mudelapaperbarsize{16.000000}%
-%
-\def\mudelapaperinterline{4.000000}%
-%
-\def\mudelapapernotewidth{5.930000}%
-%
-\def\mudelapaperwholewidth{8.640000}%
-%
-\def\mudelapaperunitspace{22.000000}%
-%
-\def\mudelapaperbasicspace{4.000000}%
-%
-\def\mudelapapergeometric{0.000000}%
-%
-\def\mudelapaperarithmetic_basicspace{2.000000}%
-%
-\def\mudelapaperarithmetic_multiplier{4.800000}%
-%
-\def\mudelapaperinterbeam{3.140000}%
-%
-\def\mudelapapergourlay_energybound{100000.000000}%
-%
-\def\mudelapapergourlay_maxmeasures{14.000000}%
-%
-\def\mudelapapercastingalgorithm{1.000000}%
-%
-\input lilyponddefs \musixsixteendefs%(Tex id)
-\turnOnPostScript%
-\hbox{%<- line of score
-\placebox{-16.000pt }%
- {79.326pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-25.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {79.326pt }%
- {\placebox{-26.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-24.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-20.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {120.670pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-23.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {120.670pt }%
- {\placebox{-24.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-24.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-20.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {162.013pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-21.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {162.013pt }%
- {\placebox{-22.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-20.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {203.357pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-19.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {203.357pt }%
- {\placebox{-20.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-20.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {244.700pt }%
- {\placebox{0.000pt }%
-  {0.000pt }%
-  {\maatstreep{16.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {275.644pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-17.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {275.644pt }%
- {\placebox{-18.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {316.987pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-15.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {316.987pt }%
- {\placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-16.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {358.331pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-13.039pt }%
-   {0.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {358.331pt }%
- {\placebox{-14.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {399.674pt }%
- {\placebox{0.000pt }%
-  {5.080pt }%
-  {\stem{-11.039pt }%
-   {2.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {399.674pt }%
- {\placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartball}%
-  \placebox{-12.000pt }%
-  {0.000pt }%
-  {\quartledger}%
-  }%
- \placebox{-16.000pt }%
- {50.383pt }%
- {\placebox{0.000pt }%
-  {0.000pt }%
-  {}%
-  }%
- \placebox{-16.000pt }%
- {31.943pt }%
- {\placebox{-4.000pt }%
-  {0.000pt }%
-  {\violinclef}%
-  }%
- \placebox{-16.000pt }%
- {28.453pt }%
- {\placebox{8.000pt }%
-  {0.000pt }%
-  {\rulesym{0.400pt }%
-   {412.565pt }%
-   }%
-  \placebox{4.000pt }%
-  {0.000pt }%
-  {\rulesym{0.400pt }%
-   {412.565pt }%
-   }%
-  \placebox{0.000pt }%
-  {0.000pt }%
-  {\rulesym{0.400pt }%
-   {412.565pt }%
-   }%
-  \placebox{-4.000pt }%
-  {0.000pt }%
-  {\rulesym{0.400pt }%
-   {412.565pt }%
-   }%
-  \placebox{-8.000pt }%
-  {0.000pt }%
-  {\rulesym{0.400pt }%
-   {412.565pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {440.378pt }%
- {\placebox{0.000pt }%
-  {0.000pt }%
-  {\maatstreep{16.000pt }%
-   }%
-  }%
- \placebox{-16.000pt }%
- {28.453pt }%
- {\placebox{0.000pt }%
-  {0.000pt }%
-  {\hbox{}%
-   }%
-  }%
- \placebox{0.000pt }%
- {28.453pt }%
- {\placebox{0.000pt }%
-  {0.000pt }%
-  {\hbox{}%
-   }%
-  }%
- }%
-\interscoreline%
-\EndLilyPondOutput
diff --git a/test/test.midi b/test/test.midi
deleted file mode 100644
index 08f8f59bcd..0000000000
--- a/test/test.midi
+++ /dev/null
diff --git a/tex/Makefile b/tex/Makefile
new file mode 100644
index 0000000000..9a7713e43d
--- /dev/null
+++ b/tex/Makefile
@@ -0,0 +1,20 @@
+# tex/Makefile
+
+# subdir level:
+#
+depth = ..
+#
+#
+include ./$(depth)/make/Include.make
+#
+
+# list of distribution files:
+# 
+TEXFILES = $(wildcard *.tex)
+DISTFILES = Makefile $(TEXFILES)
+#
+
+INSTALLATION_DIR=$(TEXDIR)/lilypond
+INSTALLATION_FILES=$(TEXFILES)
+
+include $(depth)/make/Installfiles.make
diff --git a/tex/Makefile.am b/tex/Makefile.am
deleted file mode 100644
index 45f390982f..0000000000
--- a/tex/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated automatically by wild-perl 0.1
-# tex/Makefile.am.wild
-
-TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex
-EXTRA_DIST = Makefile.am.wild $(TEXFILES)
-
-CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex
-
-install-data-local:
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/
-
-uninstall-local:
-	for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	-rmdir $(TEXDIR)/lilypond/
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
diff --git a/tex/Makefile.am.wild b/tex/Makefile.am.wild
deleted file mode 100644
index f9e538d140..0000000000
--- a/tex/Makefile.am.wild
+++ /dev/null
@@ -1,14 +0,0 @@
-# tex/Makefile.am.wild
-
-TEXFILES = $(wildcard *.tex)
-EXTRA_DIST = Makefile.am.wild $(TEXFILES)
-
-CLEANFILES = $(wildcard feta*.tex)
-
-install-data-local:
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/
-
-uninstall-local:
-	for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	-rmdir $(TEXDIR)/lilypond/
diff --git a/tex/Makefile.in b/tex/Makefile.in
deleted file mode 100644
index c50d1b2eec..0000000000
--- a/tex/Makefile.in
+++ /dev/null
@@ -1,208 +0,0 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generated automatically by wild-perl 0.1
-# tex/Makefile.am.wild
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AGE = @AGE@
-AUTOGENERATE = @AUTOGENERATE@
-BISON = @BISON@
-CC = @CC@
-COMPILEINFO = @COMPILEINFO@
-CPPFLAGS = @CPPFLAGS@
-CURRENT = @CURRENT@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DIR_DATADIR = @DIR_DATADIR@
-EXTRA_LIBES = @EXTRA_LIBES@
-FIND = @FIND@
-FLEX = @FLEX@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
-MAKE = @MAKE@
-MAKEINFO = @MAKEINFO@
-MFDIR = @MFDIR@
-NM = @NM@
-PACKAGE = @PACKAGE@
-PERL = @PERL@
-POD2HTML = @POD2HTML@
-POD2MAN = @POD2MAN@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-REVISION = @REVISION@
-TAR = @TAR@
-TEXDIR = @TEXDIR@
-TEXPREFIX = @TEXPREFIX@
-VERSION = @VERSION@
-YACC = @YACC@
-ZIP = @ZIP@
-absolute_builddir = @absolute_builddir@
-
-TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex
-EXTRA_DIST = Makefile.am.wild $(TEXFILES)
-
-CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../flower/config.hh
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
-default: all
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tex/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = tex
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-local
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-local
-
-all: Makefile
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
-
-clean:  clean-generic mostlyclean
-
-distclean:  distclean-generic clean
-	-rm -f config.status
-	-rm -f libtool
-
-maintainer-clean:  maintainer-clean-generic distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-install-data-local:
-	$(INSTALL) -d $(TEXDIR)/lilypond
-	$(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/
-
-uninstall-local:
-	for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
-	-rmdir $(TEXDIR)/lilypond/
-$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-	$(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/tex/feta11.tex b/tex/feta11.tex
index 000928bb16..33ca5ccd3b 100644
--- a/tex/feta11.tex
+++ b/tex/feta11.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta11.log
+% input from out/feta11.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta13.tex b/tex/feta13.tex
index b6243d57c0..5c604206db 100644
--- a/tex/feta13.tex
+++ b/tex/feta13.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta13.log
+% input from out/feta13.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta16.tex b/tex/feta16.tex
index 7eda188ab9..e4cac0fa9b 100644
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta16.log
+% input from out/feta16.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta19.tex b/tex/feta19.tex
index a98b36dff0..b236739fe0 100644
--- a/tex/feta19.tex
+++ b/tex/feta19.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta19.log
+% input from out/feta19.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta20.tex b/tex/feta20.tex
index 973c4a946a..42e4a210b8 100644
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta20.log
+% input from out/feta20.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta23.tex b/tex/feta23.tex
index 56e72d5e5e..bbf2717abd 100644
--- a/tex/feta23.tex
+++ b/tex/feta23.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta23.log
+% input from out/feta23.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/feta26.tex b/tex/feta26.tex
index 1090ffaf6f..501e32787e 100644
--- a/tex/feta26.tex
+++ b/tex/feta26.tex
@@ -1,7 +1,7 @@
-% Creator: mf-to-table.py version 0.5
+% Creator: mf-to-table.py version 0.6
 % Automatically generated on
 % Do not edit
-% input from ../mf/feta26.log
+% input from out/feta26.log
 % name
 % rests
 \fetdef\wholerest{0}
diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index d8b40c22fe..2610706399 100644
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -156,9 +156,19 @@ def
                 fill
         grestore
         stroke
- } bind def}}
-
-
+ } bind def
+ /draw_control_slur
+ {
+        staffrulethickness setlinewidth
+        0 0 moveto
+        rcurveto        
+        rcurveto
+        gsave
+	fill
+        grestore
+        stroke
+ } bind def
+}}
 
 
 \def\turnOnExperimentalFeatures{%
diff --git a/tex/out/dummy.dep b/tex/out/dummy.dep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tex/out/dummy.dep
author	Han-Wen Nienhuys <hanwen@xs4all.nl>	1998-04-20 00:45:24 +0200
committer	Han-Wen Nienhuys <hanwen@xs4all.nl>	1998-04-20 00:45:24 +0200
commit	63c9cee8ce190aaae4a5db3d2e200d35a570838d (patch)
tree	0423f29dc1db8956a5207207669f3f81d33edcf2
parent	4c5b1c14d1474af33002a4ba9e8584647c4ad8c0 (diff)