From 51c60f298f38254add022ecc3df3c7c8a265b1b4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 17 Mar 1998 09:53:34 +0100 Subject: [PATCH] release: 0.1.55 --- .dstreamrc | 43 +- Documentation/Makefile.in | 42 +- Makefile.in | 92 +- NEWS | 14 + VERSION | 2 +- aclocal.m4 | 31 +- bin/Makefile.in | 42 +- configure | 232 +++-- debian/Makefile.in | 42 +- flower/Makefile.in | 159 ++- flower/include/Makefile.in | 59 +- flowertest/Makefile.in | 95 +- flowertest/check.sh | 0 init/Makefile.am | 6 +- init/Makefile.in | 48 +- init/engraver.ly | 1 + init/feta11.ly | 88 ++ init/feta13.ly | 88 ++ init/feta16.ly | 88 ++ init/feta19.ly | 88 ++ init/feta20.ly | 88 ++ init/feta23.ly | 88 ++ init/feta26.ly | 88 ++ init/table16.ly | 7 +- init/table20.ly | 7 +- input/Makefile.in | 42 +- input/scripts.ly | 10 + input/sleur.ly | 43 +- input/test-lyrics.ly | 2 +- lib/Makefile.in | 131 +-- lib/include/Makefile.in | 59 +- lily/Makefile.am | 2 +- lily/Makefile.in | 1386 ++++++++++++++------------- lily/bar.cc | 1 + lily/include/Makefile.am | 2 +- lily/include/Makefile.in | 61 +- lily/include/lookup.hh | 1 + lily/include/span-score-bar-grav.hh | 19 +- lily/include/span-score-bar.hh | 10 + lily/lookup.cc | 42 +- lily/script.cc | 4 +- lily/slur.cc | 133 ++- lily/span-score-bar-grav.cc | 26 +- lily/span-score-bar.cc | 13 + lily/staff-side.cc | 13 +- lily/staff-sym.cc | 3 +- lily/template6.cc | 1 + lily/template7.cc | 2 +- lily/tex-slur.cc | 5 +- make/Makefile.in | 42 +- make/lelievijver.lsm | 2 +- make/lilypond.lsm | 2 +- mf/Makefile.am | 4 +- mf/Makefile.in | 46 +- mf/feta-braces20.mf | 2 +- mf/feta-brackets16.mf | 18 + mf/feta-brackets20.mf | 16 + mf/feta-generic.mf | 4 +- mf/feta-haak.mf | 52 + mf/feta-slag.mf | 21 +- mf/feta-sleur.mf | 15 +- mi2mu/Makefile.in | 148 ++- mi2mu/include/Makefile.in | 59 +- mutopia/Coriolan/Makefile.in | 42 +- mutopia/Coriolan/coriolan.ly | 1 + mutopia/J.S.Bach/Makefile.in | 42 +- mutopia/J.S.Bach/preludes-1.ly | 6 +- mutopia/J.S.Bach/preludes-5.ly | 13 +- mutopia/Makefile.in | 75 +- mutopia/los-toros-oboe.ly | 61 +- mutopia/standchen.ly | 8 +- mutopia/standje.ly | 2 +- test/Makefile.in | 42 +- test/check-lily-midi.sh | 0 test/check-lily-paper.sh | 0 test/check-mi2mu.sh | 0 tex/Makefile.am | 4 +- tex/Makefile.in | 46 +- tex/feta11.tex | 87 ++ tex/feta13.tex | 87 ++ tex/feta16.tex | 87 ++ tex/feta19.tex | 87 ++ tex/feta20.tex | 87 ++ tex/feta23.tex | 87 ++ tex/feta26.tex | 87 ++ tex/fetdefs.tex | 6 + tex/lily-ps-defs.tex | 7 +- 87 files changed, 3166 insertions(+), 1778 deletions(-) mode change 100644 => 100755 flowertest/check.sh create mode 100644 init/feta11.ly create mode 100644 init/feta13.ly create mode 100644 init/feta16.ly create mode 100644 init/feta19.ly create mode 100644 init/feta20.ly create mode 100644 init/feta23.ly create mode 100644 init/feta26.ly create mode 100644 mf/feta-brackets16.mf create mode 100644 mf/feta-brackets20.mf create mode 100644 mf/feta-haak.mf mode change 100644 => 100755 test/check-lily-midi.sh mode change 100644 => 100755 test/check-lily-paper.sh mode change 100644 => 100755 test/check-mi2mu.sh create mode 100644 tex/feta11.tex create mode 100644 tex/feta13.tex create mode 100644 tex/feta16.tex create mode 100644 tex/feta19.tex create mode 100644 tex/feta20.tex create mode 100644 tex/feta23.tex create mode 100644 tex/feta26.tex diff --git a/.dstreamrc b/.dstreamrc index da36d7d722..f1a393d226 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -1,7 +1,7 @@ #This file controls which classes produce debugging output # class name silence? -Dstream 1 +Dstream 0 # yydebug InitParser 1 @@ -17,8 +17,8 @@ walking 11 # flower lib File_path 1 -Matrix 0 -Vector 0 +Matrix 1 +Vector 1 # lily Atom 1 @@ -29,6 +29,7 @@ Chord 1 Chord_iterator 1 Clef_item 1 Col_configuration 1 +Column_rod 1 Colinfo 1 Colinfo 1 Collision 1 @@ -37,7 +38,7 @@ Engraver_group_engraver 1 Group_change_req 1 Head_column 1 Idealspacing 1 -Ineq_constrained_qp 0 +Ineq_constrained_qp 1 Input_translator 1 Item 1 Key_item 1 @@ -45,36 +46,39 @@ Lookup 1 Line_spacer 1 Melodic_req 1 Midi_def 1 -Midistrings 0 -Mixed_qp 0 +Midistrings 1 +Mixed_qp 1 Music 1 Music_iterator 1 +Music_output_def 1 My_lily_lexer 1 Note_head 1 Note_performer 1 Note_req 1 -Paper_score 1 +Paper_column 1 +Paper_score 1 Paper_def 1 Performer 1 Performer_group_performer 1 -Request 0 +Request 1 Request_iterator 1 Rest_collision 1 Rest_collision_engraver 1 Rest_req 1 Rhythmic_req 1 +Rod 1 Score 1 -Score_column 0 -Score_elem 0 +Score_column 1 +Score_elem 1 Score_engraver 1 Score_performer 1 Script_column 1 Script_def 1 Script_req 1 -Slur 1 +Slur 0 Spacing_problem 1 Spanner 1 -Spring_spacer 0 +Spring_spacer 1 Staff 1 Staff_commands 1 Stem 1 @@ -88,7 +92,20 @@ Text_req 1 Time_description 1 Voice 1 Voice_iterator 1 -Word_wrap 0 +Word_wrap 1 delete_identifiers 1 parse_duration 1 parse_pitchmod 1 +Skip_req 1 +Translation_property 1 +Translator 1 +Engraver_group_engraver 1 +Translator_group 1 +Axis_group_administration 1 +Graphical_element 1 +Single_malt_grouping_item 1 +Graphical_element 1 +Note_column 1 +Graphical_element 1 +Rhythmic_head 1 +Horizontal_align_item 1 diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index 6621a79869..b2cb27a852 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # Documentation/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -176,26 +170,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/Makefile.in b/Makefile.in index f3d78349d7..ad8a6ffc9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # title top level makefile for LilyPond @@ -51,12 +45,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -139,7 +133,6 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI 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 \ @@ -155,7 +148,7 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - -rm -f config.hh + rm -f config.hh maintainer-clean-hdr: @@ -172,7 +165,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -182,9 +175,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -198,29 +189,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -231,7 +217,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -rm -rf $(distdir) + rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -244,20 +230,20 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - -rm -rf $(distdir) + 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) + rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) + rm -rf $(distdir) distdir: $(DISTFILES) - -rm -rf $(distdir) + rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ @@ -266,12 +252,12 @@ distdir: $(DISTFILES) || 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) \ + 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 @@ -300,19 +286,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -327,13 +313,13 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - -rm -f config.status - -rm -f libtool + 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 + rm -f config.status .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ maintainer-clean-hdr install-data-recursive uninstall-data-recursive \ diff --git a/NEWS b/NEWS index 59f27acf2d..1bf07beb1b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +pl 55 + - bezier check and ajust for slur height + - better slur height ajust + - DO chmod 755 *test/*sh + - bf: discretionary of || + - bf: scripts within staff + - NOT Grandstaff -> Grand_staff (yet?) + - bf: cresc. decresc. height lookup.cc,init/table* + - bf: staff-symbol (script placements) + - staff-group-bracket + - bf's preludes, los-toros + - nicer trills + - adjustment slur extend + pl 54 - bf dynamic_grav - bf accidentals with key change diff --git a/VERSION b/VERSION index 3729e0a8d1..5532217ea8 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=54 +PATCH_LEVEL=55 MY_PATCH_LEVEL= # now used as shell script in configure too diff --git a/aclocal.m4 b/aclocal.m4 index 3997befc4e..de8271571a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,14 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2f - -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. +dnl aclocal.m4 generated automatically by aclocal 1.2 AC_DEFUN(AC_JUNK_ARGS, [ @@ -119,8 +109,8 @@ fi ifelse([$3],, AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) +AM_SANITY_CHECK +AC_ARG_PROGRAM dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) @@ -128,7 +118,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_REQUIRE([AC_PROG_MAKE_SET])]) +AC_PROG_MAKE_SET]) # serial 1 @@ -155,21 +145,10 @@ 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 diff --git a/bin/Makefile.in b/bin/Makefile.in index 92f8b1ccfa..0c2bf5e6cb 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # bin/Makefile @@ -54,12 +48,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -216,26 +210,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/configure b/configure index cd49754075..a35d886401 100755 --- a/configure +++ b/configure @@ -634,8 +634,24 @@ 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 <> confdefs.h <&6 -echo "configure:639: checking whether build environment is sane" >&5 +echo "configure:655: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -646,21 +662,10 @@ 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". - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } - fi - test "$2" = conftestfile ) then @@ -691,54 +696,9 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:696: 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 - - -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 <> confdefs.h <&6 -echo "configure:742: checking for working aclocal" >&5 +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. @@ -751,7 +711,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:755: checking for working autoconf" >&5 +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. @@ -764,7 +724,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:768: checking for working automake" >&5 +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. @@ -777,7 +737,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:781: checking for working autoheader" >&5 +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. @@ -790,7 +750,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:794: checking for working makeinfo" >&5 +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. @@ -802,6 +762,32 @@ else 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 @@ -875,7 +861,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:879: checking host system type" >&5 +echo "configure:865: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -898,7 +884,7 @@ 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:902: checking for $ac_word" >&5 +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 @@ -927,7 +913,7 @@ 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:931: checking for $ac_word" >&5 +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 @@ -956,7 +942,7 @@ 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:960: checking for $ac_word" >&5 +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 @@ -1004,7 +990,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +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. @@ -1014,11 +1000,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +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 @@ -1038,12 +1024,12 @@ 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:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +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:1047: checking whether we are using GNU C" >&5 +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 @@ -1052,7 +1038,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +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 @@ -1067,7 +1053,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1071: checking whether ${CC-cc} accepts -g" >&5 +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 @@ -1107,7 +1093,7 @@ 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:1111: checking for ld used by GCC" >&5 +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. @@ -1125,10 +1111,10 @@ echo "configure:1111: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1129: checking for GNU ld" >&5 +echo "configure:1115: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1132: checking for non-GNU ld" >&5 +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 @@ -1164,7 +1150,7 @@ 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:1168: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -1180,7 +1166,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1184: checking for BSD-compatible nm" >&5 +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 @@ -1217,7 +1203,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1221: checking whether ln -s works" >&5 +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 @@ -1253,8 +1239,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1257 "configure"' > conftest.$ac_ext - if { (eval echo configure:1258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + 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" @@ -1290,7 +1276,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:1294: checking for $ac_word" >&5 +echo "configure:1280: 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 @@ -1324,7 +1310,7 @@ test -n "$YACC" || YACC="yacc" # 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:1328: checking for $ac_word" >&5 +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 @@ -1357,7 +1343,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1361: checking for yywrap in -l$ac_lib" >&5 +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 @@ -1365,7 +1351,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +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 @@ -1400,7 +1386,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1404: checking how to run the C preprocessor" >&5 +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= @@ -1415,13 +1401,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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 : @@ -1432,13 +1418,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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 : @@ -1461,7 +1447,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1465: checking lex output file root" >&5 +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 @@ -1482,7 +1468,7 @@ 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:1486: checking whether yytext is a pointer" >&5 +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 @@ -1494,14 +1480,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +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 @@ -1667,7 +1653,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:1671: checking for $ac_word" >&5 +echo "configure:1657: 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 @@ -1698,7 +1684,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1702: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1688: 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. @@ -1708,11 +1694,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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1702: \"$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 @@ -1732,12 +1718,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:1736: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1722: 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:1741: checking whether we are using GNU C++" >&5 +echo "configure:1727: 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 @@ -1746,7 +1732,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1750: \"$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:1736: \"$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 @@ -1761,7 +1747,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:1765: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1751: 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 @@ -1800,7 +1786,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:1804: checking for a BSD compatible install" >&5 +echo "configure:1790: 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 @@ -1854,7 +1840,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:1858: checking for $ac_word" >&5 +echo "configure:1844: 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 @@ -1888,7 +1874,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:1892: checking for $ac_word" >&5 +echo "configure:1878: 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 @@ -1980,7 +1966,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:1984: checking for $ac_word" >&5 +echo "configure:1970: 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 @@ -2014,7 +2000,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:2018: checking for $ac_word" >&5 +echo "configure:2004: 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 @@ -2048,7 +2034,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:2052: checking for $ac_word" >&5 +echo "configure:2038: 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 @@ -2080,7 +2066,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:2084: checking for $ac_word" >&5 +echo "configure:2070: 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 @@ -2112,7 +2098,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:2116: checking for $ac_word" >&5 +echo "configure:2102: 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 @@ -2146,7 +2132,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:2150: checking for $ac_word" >&5 +echo "configure:2136: 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 @@ -2180,7 +2166,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:2184: checking for $ac_word" >&5 +echo "configure:2170: 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 @@ -2216,7 +2202,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:2220: checking TeX/MF root dir directory" >&5 +echo "configure:2206: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -2257,7 +2243,7 @@ if test "x$MFDIR" = xauto; then echo $ac_n "checking MF input directory""... $ac_c" 1>&6 -echo "configure:2261: checking MF input directory" >&5 +echo "configure:2247: checking MF input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')` @@ -2282,7 +2268,7 @@ if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2286: checking TeX input directory" >&5 +echo "configure:2272: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2398,7 +2384,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2402: checking how to run the C++ preprocessor" >&5 +echo "configure:2388: 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 @@ -2411,12 +2397,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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -2436,17 +2422,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:2440: checking for FlexLexer.h" >&5 +echo "configure:2426: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* diff --git a/debian/Makefile.in b/debian/Makefile.in index 28668c8eb5..b04139b0a1 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # debian/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -160,26 +154,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/flower/Makefile.in b/flower/Makefile.in index 5e7e42db60..a46863270e 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library @@ -59,12 +53,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -150,7 +144,7 @@ OBJECTS = $(libflower_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .s +.SUFFIXES: .c .cc .lo .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/Makefile @@ -162,7 +156,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) distclean-libLTLIBRARIES: @@ -173,13 +167,13 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) $(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; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done @@ -187,36 +181,24 @@ uninstall-libLTLIBRARIES: .c.o: $(COMPILE) -c $< -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + rm -f *.lo clean-libtool: - -rm -rf .libs _libs + rm -rf .libs distclean-libtool: @@ -242,7 +224,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -252,9 +234,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -268,29 +248,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -305,117 +280,117 @@ distdir: $(DISTFILES) || 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; \ + 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 \ +choleski.o choleski.lo: 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 \ +cpu-timer.o cpu-timer.lo: cpu-timer.cc include/cpu-timer.hh \ include/real.hh -data-file.lo data-file.o: data-file.cc include/international.hh \ +data-file.o data-file.lo: 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 \ +diagonal-storage.o diagonal-storage.lo: 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 \ +dictionary.o dictionary.lo: dictionary.cc +directed-graph.o directed-graph.lo: 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 \ +dstream.o dstream.lo: 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 \ +flower-debug.o flower-debug.lo: 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 \ +flower-version.o flower-version.lo: flower-version.cc config.hh +full-storage.o full-storage.lo: 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 \ +interval.o interval.lo: 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 \ +lgetopt.o lgetopt.lo: lgetopt.cc include/lgetopt.hh \ include/international.hh -libc-extension.lo libc-extension.o: libc-extension.cc \ +libc-extension.o libc-extension.lo: 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 \ +matrix-debug.o matrix-debug.lo: 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 \ +matrix-storage.o matrix-storage.lo: 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 \ +matrix.o matrix.lo: 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 \ +nscalar.o nscalar.lo: nscalar.cc +path.o path.lo: 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 \ +rational.o rational.lo: 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 \ +scalar.o scalar.lo: 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 \ +string-convert.o string-convert.lo: 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 \ +string.o string.lo: 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 \ +stringutil.o stringutil.lo: 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 \ +text-db.o text-db.lo: 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 \ +text-stream.o text-stream.lo: 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 \ +unionfind.o unionfind.lo: unionfind.cc include/unionfind.hh \ include/varray.hh -vector.lo vector.o: vector.cc include/vector.hh include/real.hh \ +vector.o vector.lo: vector.cc include/vector.hh include/real.hh \ include/varray.hh info: info-recursive @@ -452,19 +427,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -486,8 +461,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in index 5913ab932d..5229770ab9 100644 --- a/flower/include/Makefile.in +++ b/flower/include/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # flower/include/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -127,26 +121,21 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -185,26 +174,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/flowertest/Makefile.in b/flowertest/Makefile.in index 366c29f8a2..a551555eff 100644 --- a/flowertest/Makefile.in +++ b/flowertest/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -54,12 +48,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -143,7 +137,7 @@ OBJECTS = $(test_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .s +.SUFFIXES: .c .cc .lo .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flowertest/Makefile @@ -155,7 +149,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -172,7 +166,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -180,36 +174,24 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + rm -f *.lo clean-libtool: - -rm -rf .libs _libs + rm -rf .libs distclean-libtool: @@ -225,26 +207,21 @@ test: $(test_OBJECTS) $(test_DEPENDENCIES) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -259,8 +236,8 @@ distdir: $(DISTFILES) || 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 \ +main.o main.lo: main.cc flower-test.hh ../flower/include/varray.hh +mat-test.o mat-test.lo: 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 \ @@ -268,16 +245,16 @@ mat-test.o: mat-test.cc ../flower/include/matrix.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 \ +pqtest.o pqtest.lo: pqtest.cc flower-test.hh ../flower/include/pqueue.hh \ ../flower/include/varray.hh -rattest.o: rattest.cc ../flower/include/rational.hh \ +rattest.o rattest.lo: 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 \ +stringtest.o stringtest.lo: stringtest.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -335,19 +312,19 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -357,8 +334,8 @@ clean: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \ distclean-tags distclean-generic clean - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ maintainer-clean-libtool maintainer-clean-tags \ diff --git a/flowertest/check.sh b/flowertest/check.sh old mode 100644 new mode 100755 diff --git a/init/Makefile.am b/init/Makefile.am index 1ee3ca1779..358202c529 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -1,12 +1,12 @@ # Generated automatically by wild-perl 0.1 # init/Makefile.am.wild -INIFILES = deutsch.ly dynamic.ly engraver.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 +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 = +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-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 +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: diff --git a/init/Makefile.in b/init/Makefile.in index aed89c6c9d..14b9e47e09 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # init/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -100,12 +94,12 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -INIFILES = deutsch.ly dynamic.ly engraver.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 +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 = +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-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 +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 @@ -165,26 +159,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/init/engraver.ly b/init/engraver.ly index f31288c87d..a1b51de4cb 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -69,6 +69,7 @@ Staff_group = \translator { \type "Engraver_group_engraver"; \consists "Span_bar_engraver"; \consists "Vertical_align_engraver"; + \consists "Staff_group_bar_engraver"; \consists "Line_group_engraver"; \accepts "Staff"; \accepts "Rhythmic_staff"; diff --git a/init/feta11.ly b/init/feta11.ly new file mode 100644 index 0000000000..744ff61814 --- /dev/null +++ b/init/feta11.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta11.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.12\pt -1.72\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.12\pt 0.00\pt 1.72\pt + "0o" "\\outsidewholerest" -1.72\pt 5.84\pt -1.72\pt 0.28\pt + "1o" "\\outsidehalfrest" -1.72\pt 5.84\pt -0.28\pt 1.72\pt + "2" "\\quartrest" 0.00\pt 2.97\pt 2.06\pt 9.90\pt + "3" "\\eighthrest" 0.00\pt 3.67\pt 2.75\pt 7.81\pt + "4" "\\sixteenthrest" 0.00\pt 4.27\pt 0.00\pt 7.81\pt + "5" "\\thirtysecondrest" 0.00\pt 4.81\pt 0.00\pt 10.56\pt + "6" "\\sixtyfourthrest" 0.00\pt 5.16\pt 0.00\pt 13.31\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 5.75\pt 0.00\pt 16.06\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.03\pt -4.12\pt 4.12\pt + "0" "\\natural" 0.00\pt 1.83\pt -4.12\pt 4.12\pt + "-1" "\\flat" -0.33\pt 2.20\pt -1.38\pt 5.50\pt + "-2" "\\flatflat" -0.33\pt 3.99\pt -1.38\pt 5.50\pt + "2" "\\sharpsharp" 0.00\pt 2.75\pt -1.38\pt 1.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.24\pt -0.62\pt 0.62\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.24\pt -1.38\pt 1.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-1l" "\\brevisledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "-2" "\\longaball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-2l" "\\longaledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "0" "\\wholeball" 0.00\pt 5.45\pt -1.51\pt 1.51\pt + "0l" "\\wholeledger" -1.36\pt 6.81\pt -0.28\pt 0.28\pt + "1" "\\halfball" 0.00\pt 3.79\pt -1.51\pt 1.51\pt + "1l" "\\halfledger" -0.95\pt 4.74\pt -0.28\pt 0.28\pt + "2" "\\quartball" 0.00\pt 3.63\pt -1.51\pt 1.51\pt + "2l" "\\quartledger" -0.91\pt 4.54\pt -0.28\pt 0.28\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -3.64\pt 3.64\pt -0.21\pt 3.99\pt + "dfermata" "\\dfermata" -3.64\pt 3.64\pt -3.99\pt 0.21\pt + "sforzato" "\\sforzatoaccent" -2.47\pt 2.47\pt -1.38\pt 1.38\pt + "staccato" "\\staccato" -0.41\pt 0.41\pt -0.41\pt 0.41\pt + "ustaccatissimo" "\\ustaccatissimo" -0.55\pt 0.55\pt -0.20\pt 2.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.55\pt 0.55\pt -2.75\pt 0.20\pt + "tenuto" "\\tenuto" -2.47\pt 2.47\pt -0.17\pt 0.17\pt + "umarcato" "\\umarcato" -1.38\pt 1.38\pt 0.00\pt 3.03\pt + "dmarcato" "\\dmarcato" -1.38\pt 1.38\pt -3.03\pt 0.00\pt + "open" "\\ouvert" -1.10\pt 1.10\pt -1.38\pt 1.38\pt + "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt + "upbow" "\\upbow" -1.79\pt 1.79\pt 0.00\pt 5.72\pt + "downbow" "\\downbow" -2.06\pt 2.06\pt 0.00\pt 3.67\pt + "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "trill" "\\trill" -2.75\pt 2.75\pt 0.00\pt 6.19\pt + "upedalheel" "\\upedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt + "dpedalheel" "\\dpedalheel" -1.38\pt 1.38\pt -1.83\pt 1.38\pt + "upedaltoe" "\\upedaltoe" -1.38\pt 1.38\pt 0.00\pt 4.12\pt + "dpedaltoe" "\\dpedaltoe" -1.38\pt 1.38\pt -4.12\pt 0.00\pt + "flageolet" "\\flageolet" -1.47\pt 1.47\pt -1.47\pt 1.47\pt + "trilelement" "\\trilelement" -1.83\pt 0.72\pt -1.38\pt 1.38\pt + "prall" "\\prall" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "mordent" "\\mordent" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "prallprall" "\\prallprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "prallmordent" "\\prallmordent" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "upprall" "\\upprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "downprall" "\\downprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.14\pt 3.39\pt -8.43\pt 0.14\pt + "u4" "\\sixteenthflag" -0.14\pt 3.39\pt -9.80\pt 0.14\pt + "u5" "\\thirtysecondflag" -0.14\pt 3.39\pt -11.87\pt 0.14\pt + "u6" "\\sixtyfourthflag" -0.14\pt 3.39\pt -14.62\pt 0.14\pt + "d3" "\\deighthflag" -0.14\pt 3.76\pt -0.14\pt 8.02\pt + "d4" "\\dsixteenthflag" -0.14\pt 3.76\pt -0.14\pt 8.43\pt + "d5" "\\dthirtysecondflag" -0.14\pt 3.76\pt -0.14\pt 10.77\pt + "d6" "\\dsixtyfourthflag" -0.14\pt 3.76\pt -0.14\pt 12.14\pt + } + "clefs" = \table { + "alto" "\\altoclef" -2.75\pt 10.24\pt -5.50\pt 5.50\pt + "alto_change" "\\caltoclef" -2.20\pt 8.19\pt -4.40\pt 4.40\pt + "bass" "\\bassclef" -1.38\pt 9.90\pt -6.88\pt 2.75\pt + "bass_change" "\\cbassclef" -1.10\pt 7.92\pt -5.50\pt 2.20\pt + "violin" "\\violinclef" -2.40\pt 10.28\pt -8.25\pt 13.75\pt + "violin_change" "\\cviolinclef" -2.08\pt 8.06\pt -6.60\pt 11.00\pt + } + % } % $name diff --git a/init/feta13.ly b/init/feta13.ly new file mode 100644 index 0000000000..13a530df76 --- /dev/null +++ b/init/feta13.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta13.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.88\pt -2.03\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.88\pt 0.00\pt 2.03\pt + "0o" "\\outsidewholerest" -2.03\pt 6.91\pt -2.03\pt 0.33\pt + "1o" "\\outsidehalfrest" -2.03\pt 6.91\pt -0.33\pt 2.03\pt + "2" "\\quartrest" 0.00\pt 3.51\pt 2.44\pt 11.70\pt + "3" "\\eighthrest" 0.00\pt 4.33\pt 3.25\pt 9.24\pt + "4" "\\sixteenthrest" 0.00\pt 5.04\pt 0.00\pt 9.24\pt + "5" "\\thirtysecondrest" 0.00\pt 5.69\pt 0.00\pt 12.49\pt + "6" "\\sixtyfourthrest" 0.00\pt 6.10\pt 0.00\pt 15.74\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 6.79\pt 0.00\pt 18.99\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.58\pt -4.88\pt 4.88\pt + "0" "\\natural" 0.00\pt 2.17\pt -4.88\pt 4.88\pt + "-1" "\\flat" -0.39\pt 2.60\pt -1.62\pt 6.50\pt + "-2" "\\flatflat" -0.39\pt 4.71\pt -1.62\pt 6.50\pt + "2" "\\sharpsharp" 0.00\pt 3.25\pt -1.62\pt 1.62\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.46\pt -0.73\pt 0.73\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.46\pt -1.62\pt 1.62\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-1l" "\\brevisledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "-2" "\\longaball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-2l" "\\longaledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "0" "\\wholeball" 0.00\pt 6.44\pt -1.79\pt 1.79\pt + "0l" "\\wholeledger" -1.61\pt 8.04\pt -0.33\pt 0.33\pt + "1" "\\halfball" 0.00\pt 4.48\pt -1.79\pt 1.79\pt + "1l" "\\halfledger" -1.12\pt 5.60\pt -0.33\pt 0.33\pt + "2" "\\quartball" 0.00\pt 4.29\pt -1.79\pt 1.79\pt + "2l" "\\quartledger" -1.07\pt 5.37\pt -0.33\pt 0.33\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -4.31\pt 4.31\pt -0.24\pt 4.71\pt + "dfermata" "\\dfermata" -4.31\pt 4.31\pt -4.71\pt 0.24\pt + "sforzato" "\\sforzatoaccent" -2.92\pt 2.92\pt -1.62\pt 1.62\pt + "staccato" "\\staccato" -0.49\pt 0.49\pt -0.49\pt 0.49\pt + "ustaccatissimo" "\\ustaccatissimo" -0.65\pt 0.65\pt -0.20\pt 3.25\pt + "dstaccatissimo" "\\dstaccatissimo" -0.65\pt 0.65\pt -3.25\pt 0.20\pt + "tenuto" "\\tenuto" -2.92\pt 2.92\pt -0.20\pt 0.20\pt + "umarcato" "\\umarcato" -1.62\pt 1.62\pt 0.00\pt 3.58\pt + "dmarcato" "\\dmarcato" -1.62\pt 1.62\pt -3.58\pt 0.00\pt + "open" "\\ouvert" -1.30\pt 1.30\pt -1.62\pt 1.62\pt + "stopped" "\\plusstop" -1.79\pt 1.79\pt -1.79\pt 1.79\pt + "upbow" "\\upbow" -2.11\pt 2.11\pt 0.00\pt 6.76\pt + "downbow" "\\downbow" -2.44\pt 2.44\pt 0.00\pt 4.33\pt + "turn" "\\turn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt + "trill" "\\trill" -3.25\pt 3.25\pt 0.00\pt 7.31\pt + "upedalheel" "\\upedalheel" -1.62\pt 1.62\pt -1.62\pt 2.17\pt + "dpedalheel" "\\dpedalheel" -1.62\pt 1.62\pt -2.17\pt 1.62\pt + "upedaltoe" "\\upedaltoe" -1.62\pt 1.62\pt 0.00\pt 4.88\pt + "dpedaltoe" "\\dpedaltoe" -1.62\pt 1.62\pt -4.88\pt 0.00\pt + "flageolet" "\\flageolet" -1.73\pt 1.73\pt -1.73\pt 1.73\pt + "trilelement" "\\trilelement" -2.17\pt 0.85\pt -1.62\pt 1.62\pt + "prall" "\\prall" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "mordent" "\\mordent" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "prallprall" "\\prallprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "prallmordent" "\\prallmordent" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "upprall" "\\upprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "downprall" "\\downprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.16\pt 4.01\pt -9.96\pt 0.16\pt + "u4" "\\sixteenthflag" -0.16\pt 4.01\pt -11.59\pt 0.16\pt + "u5" "\\thirtysecondflag" -0.16\pt 4.01\pt -14.02\pt 0.16\pt + "u6" "\\sixtyfourthflag" -0.16\pt 4.01\pt -17.27\pt 0.16\pt + "d3" "\\deighthflag" -0.16\pt 4.44\pt -0.16\pt 9.47\pt + "d4" "\\dsixteenthflag" -0.16\pt 4.44\pt -0.16\pt 9.96\pt + "d5" "\\dthirtysecondflag" -0.16\pt 4.44\pt -0.16\pt 12.72\pt + "d6" "\\dsixtyfourthflag" -0.16\pt 4.44\pt -0.16\pt 14.35\pt + } + "clefs" = \table { + "alto" "\\altoclef" -3.25\pt 12.10\pt -6.50\pt 6.50\pt + "alto_change" "\\caltoclef" -2.60\pt 9.68\pt -5.20\pt 5.20\pt + "bass" "\\bassclef" -1.62\pt 11.70\pt -8.12\pt 3.25\pt + "bass_change" "\\cbassclef" -1.30\pt 9.36\pt -6.50\pt 2.60\pt + "violin" "\\violinclef" -2.83\pt 12.15\pt -9.75\pt 16.25\pt + "violin_change" "\\cviolinclef" -2.46\pt 9.52\pt -7.80\pt 13.00\pt + } + % } % $name diff --git a/init/feta16.ly b/init/feta16.ly new file mode 100644 index 0000000000..0521352920 --- /dev/null +++ b/init/feta16.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta16.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 6.00\pt -2.50\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 6.00\pt 0.00\pt 2.50\pt + "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt + "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt + "2" "\\quartrest" 0.00\pt 4.32\pt 3.00\pt 14.40\pt + "3" "\\eighthrest" 0.00\pt 5.33\pt 4.00\pt 11.37\pt + "4" "\\sixteenthrest" 0.00\pt 6.21\pt 0.00\pt 11.37\pt + "5" "\\thirtysecondrest" 0.00\pt 7.00\pt 0.00\pt 15.37\pt + "6" "\\sixtyfourthrest" 0.00\pt 7.51\pt 0.00\pt 19.37\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 8.36\pt 0.00\pt 23.37\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 4.40\pt -6.00\pt 6.00\pt + "0" "\\natural" 0.00\pt 2.67\pt -6.00\pt 6.00\pt + "-1" "\\flat" -0.48\pt 3.20\pt -2.00\pt 8.00\pt + "-2" "\\flatflat" -0.48\pt 5.80\pt -2.00\pt 8.00\pt + "2" "\\sharpsharp" 0.00\pt 4.00\pt -2.00\pt 2.00\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.80\pt -0.90\pt 0.90\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.80\pt -2.00\pt 2.00\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-1l" "\\brevisledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "-2" "\\longaball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-2l" "\\longaledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "0" "\\wholeball" 0.00\pt 7.92\pt -2.20\pt 2.20\pt + "0l" "\\wholeledger" -1.98\pt 9.90\pt -0.40\pt 0.40\pt + "1" "\\halfball" 0.00\pt 5.51\pt -2.20\pt 2.20\pt + "1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt + "2" "\\quartball" 0.00\pt 5.28\pt -2.20\pt 2.20\pt + "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt + "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.30\pt + "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt + "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt + "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt + "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt + "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt + "umarcato" "\\umarcato" -2.00\pt 2.00\pt 0.00\pt 4.40\pt + "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt + "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt + "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt + "upbow" "\\upbow" -2.60\pt 2.60\pt 0.00\pt 8.32\pt + "downbow" "\\downbow" -3.00\pt 3.00\pt 0.00\pt 5.33\pt + "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "trill" "\\trill" -4.00\pt 4.00\pt 0.00\pt 9.00\pt + "upedalheel" "\\upedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt + "dpedalheel" "\\dpedalheel" -2.00\pt 2.00\pt -2.67\pt 2.00\pt + "upedaltoe" "\\upedaltoe" -2.00\pt 2.00\pt 0.00\pt 6.00\pt + "dpedaltoe" "\\dpedaltoe" -2.00\pt 2.00\pt -6.00\pt 0.00\pt + "flageolet" "\\flageolet" -2.13\pt 2.13\pt -2.13\pt 2.13\pt + "trilelement" "\\trilelement" -2.67\pt 1.05\pt -2.00\pt 2.00\pt + "prall" "\\prall" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "mordent" "\\mordent" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "prallprall" "\\prallprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "prallmordent" "\\prallmordent" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "upprall" "\\upprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "downprall" "\\downprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.20\pt 4.94\pt -12.26\pt 0.20\pt + "u4" "\\sixteenthflag" -0.20\pt 4.94\pt -14.26\pt 0.20\pt + "u5" "\\thirtysecondflag" -0.20\pt 4.94\pt -17.26\pt 0.20\pt + "u6" "\\sixtyfourthflag" -0.20\pt 4.94\pt -21.26\pt 0.20\pt + "d3" "\\deighthflag" -0.20\pt 5.46\pt -0.20\pt 11.66\pt + "d4" "\\dsixteenthflag" -0.20\pt 5.46\pt -0.20\pt 12.26\pt + "d5" "\\dthirtysecondflag" -0.20\pt 5.46\pt -0.20\pt 15.66\pt + "d6" "\\dsixtyfourthflag" -0.20\pt 5.46\pt -0.20\pt 17.66\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "alto_change" "\\caltoclef" -3.20\pt 11.91\pt -6.40\pt 6.40\pt + "bass" "\\bassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "bass_change" "\\cbassclef" -1.60\pt 11.52\pt -8.00\pt 3.20\pt + "violin" "\\violinclef" -3.49\pt 14.95\pt -12.00\pt 20.00\pt + "violin_change" "\\cviolinclef" -3.03\pt 11.72\pt -9.60\pt 16.00\pt + } + % } % $name diff --git a/init/feta19.ly b/init/feta19.ly new file mode 100644 index 0000000000..da3fb72d61 --- /dev/null +++ b/init/feta19.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta19.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.12\pt -2.97\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.12\pt 0.00\pt 2.97\pt + "0o" "\\outsidewholerest" -2.97\pt 10.09\pt -2.97\pt 0.48\pt + "1o" "\\outsidehalfrest" -2.97\pt 10.09\pt -0.48\pt 2.97\pt + "2" "\\quartrest" 0.00\pt 5.13\pt 3.56\pt 17.10\pt + "3" "\\eighthrest" 0.00\pt 6.33\pt 4.75\pt 13.50\pt + "4" "\\sixteenthrest" 0.00\pt 7.37\pt 0.00\pt 13.50\pt + "5" "\\thirtysecondrest" 0.00\pt 8.32\pt 0.00\pt 18.25\pt + "6" "\\sixtyfourthrest" 0.00\pt 8.92\pt 0.00\pt 23.00\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 9.93\pt 0.00\pt 27.75\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.23\pt -7.12\pt 7.12\pt + "0" "\\natural" 0.00\pt 3.17\pt -7.12\pt 7.12\pt + "-1" "\\flat" -0.57\pt 3.80\pt -2.38\pt 9.50\pt + "-2" "\\flatflat" -0.57\pt 6.89\pt -2.38\pt 9.50\pt + "2" "\\sharpsharp" 0.00\pt 4.75\pt -2.38\pt 2.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.14\pt -1.07\pt 1.07\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.14\pt -2.38\pt 2.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-1l" "\\brevisledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "-2" "\\longaball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-2l" "\\longaledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "0" "\\wholeball" 0.00\pt 9.41\pt -2.61\pt 2.61\pt + "0l" "\\wholeledger" -2.35\pt 11.76\pt -0.48\pt 0.48\pt + "1" "\\halfball" 0.00\pt 6.54\pt -2.61\pt 2.61\pt + "1l" "\\halfledger" -1.64\pt 8.18\pt -0.48\pt 0.48\pt + "2" "\\quartball" 0.00\pt 6.27\pt -2.61\pt 2.61\pt + "2l" "\\quartledger" -1.57\pt 7.84\pt -0.48\pt 0.48\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.29\pt 6.29\pt -0.36\pt 6.89\pt + "dfermata" "\\dfermata" -6.29\pt 6.29\pt -6.89\pt 0.36\pt + "sforzato" "\\sforzatoaccent" -4.27\pt 4.27\pt -2.38\pt 2.38\pt + "staccato" "\\staccato" -0.71\pt 0.71\pt -0.71\pt 0.71\pt + "ustaccatissimo" "\\ustaccatissimo" -0.95\pt 0.95\pt -0.20\pt 4.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.95\pt 0.95\pt -4.75\pt 0.20\pt + "tenuto" "\\tenuto" -4.27\pt 4.27\pt -0.29\pt 0.29\pt + "umarcato" "\\umarcato" -2.38\pt 2.38\pt 0.00\pt 5.23\pt + "dmarcato" "\\dmarcato" -2.38\pt 2.38\pt -5.23\pt 0.00\pt + "open" "\\ouvert" -1.90\pt 1.90\pt -2.38\pt 2.38\pt + "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt + "upbow" "\\upbow" -3.09\pt 3.09\pt 0.00\pt 9.88\pt + "downbow" "\\downbow" -3.56\pt 3.56\pt 0.00\pt 6.33\pt + "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "trill" "\\trill" -4.75\pt 4.75\pt 0.00\pt 10.69\pt + "upedalheel" "\\upedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt + "dpedalheel" "\\dpedalheel" -2.38\pt 2.38\pt -3.17\pt 2.38\pt + "upedaltoe" "\\upedaltoe" -2.38\pt 2.38\pt 0.00\pt 7.12\pt + "dpedaltoe" "\\dpedaltoe" -2.38\pt 2.38\pt -7.12\pt 0.00\pt + "flageolet" "\\flageolet" -2.53\pt 2.53\pt -2.53\pt 2.53\pt + "trilelement" "\\trilelement" -3.17\pt 1.24\pt -2.38\pt 2.38\pt + "prall" "\\prall" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "mordent" "\\mordent" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "prallprall" "\\prallprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "prallmordent" "\\prallmordent" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "upprall" "\\upprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "downprall" "\\downprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.24\pt 5.86\pt -14.56\pt 0.24\pt + "u4" "\\sixteenthflag" -0.24\pt 5.86\pt -16.93\pt 0.24\pt + "u5" "\\thirtysecondflag" -0.24\pt 5.86\pt -20.50\pt 0.24\pt + "u6" "\\sixtyfourthflag" -0.24\pt 5.86\pt -25.25\pt 0.24\pt + "d3" "\\deighthflag" -0.24\pt 6.49\pt -0.24\pt 13.85\pt + "d4" "\\dsixteenthflag" -0.24\pt 6.49\pt -0.24\pt 14.56\pt + "d5" "\\dthirtysecondflag" -0.24\pt 6.49\pt -0.24\pt 18.60\pt + "d6" "\\dsixtyfourthflag" -0.24\pt 6.49\pt -0.24\pt 20.97\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.75\pt 17.68\pt -9.50\pt 9.50\pt + "alto_change" "\\caltoclef" -3.80\pt 14.14\pt -7.60\pt 7.60\pt + "bass" "\\bassclef" -2.38\pt 17.10\pt -11.88\pt 4.75\pt + "bass_change" "\\cbassclef" -1.90\pt 13.68\pt -9.50\pt 3.80\pt + "violin" "\\violinclef" -4.14\pt 17.75\pt -14.25\pt 23.75\pt + "violin_change" "\\cviolinclef" -3.60\pt 13.92\pt -11.40\pt 19.00\pt + } + % } % $name diff --git a/init/feta20.ly b/init/feta20.ly new file mode 100644 index 0000000000..80eab9310b --- /dev/null +++ b/init/feta20.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta20.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.50\pt -3.12\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.50\pt 0.00\pt 3.12\pt + "0o" "\\outsidewholerest" -3.12\pt 10.62\pt -3.12\pt 0.50\pt + "1o" "\\outsidehalfrest" -3.12\pt 10.62\pt -0.50\pt 3.12\pt + "2" "\\quartrest" 0.00\pt 5.40\pt 3.75\pt 18.00\pt + "3" "\\eighthrest" 0.00\pt 6.67\pt 5.00\pt 14.21\pt + "4" "\\sixteenthrest" 0.00\pt 7.76\pt 0.00\pt 14.21\pt + "5" "\\thirtysecondrest" 0.00\pt 8.75\pt 0.00\pt 19.21\pt + "6" "\\sixtyfourthrest" 0.00\pt 9.38\pt 0.00\pt 24.21\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 10.45\pt 0.00\pt 29.21\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.50\pt -7.50\pt 7.50\pt + "0" "\\natural" 0.00\pt 3.33\pt -7.50\pt 7.50\pt + "-1" "\\flat" -0.60\pt 4.00\pt -2.50\pt 10.00\pt + "-2" "\\flatflat" -0.60\pt 7.25\pt -2.50\pt 10.00\pt + "2" "\\sharpsharp" 0.00\pt 5.00\pt -2.50\pt 2.50\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.25\pt -1.12\pt 1.12\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.25\pt -2.50\pt 2.50\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-1l" "\\brevisledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "-2" "\\longaball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-2l" "\\longaledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "0" "\\wholeball" 0.00\pt 9.90\pt -2.75\pt 2.75\pt + "0l" "\\wholeledger" -2.48\pt 12.38\pt -0.50\pt 0.50\pt + "1" "\\halfball" 0.00\pt 6.89\pt -2.75\pt 2.75\pt + "1l" "\\halfledger" -1.72\pt 8.61\pt -0.50\pt 0.50\pt + "2" "\\quartball" 0.00\pt 6.61\pt -2.75\pt 2.75\pt + "2l" "\\quartledger" -1.65\pt 8.26\pt -0.50\pt 0.50\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt + "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.38\pt + "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt + "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt + "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt + "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt + "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt + "umarcato" "\\umarcato" -2.50\pt 2.50\pt 0.00\pt 5.50\pt + "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt + "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt + "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt + "upbow" "\\upbow" -3.25\pt 3.25\pt 0.00\pt 10.40\pt + "downbow" "\\downbow" -3.75\pt 3.75\pt 0.00\pt 6.67\pt + "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "trill" "\\trill" -5.00\pt 5.00\pt 0.00\pt 11.25\pt + "upedalheel" "\\upedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt + "dpedalheel" "\\dpedalheel" -2.50\pt 2.50\pt -3.33\pt 2.50\pt + "upedaltoe" "\\upedaltoe" -2.50\pt 2.50\pt 0.00\pt 7.50\pt + "dpedaltoe" "\\dpedaltoe" -2.50\pt 2.50\pt -7.50\pt 0.00\pt + "flageolet" "\\flageolet" -2.67\pt 2.67\pt -2.67\pt 2.67\pt + "trilelement" "\\trilelement" -3.33\pt 1.31\pt -2.50\pt 2.50\pt + "prall" "\\prall" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "mordent" "\\mordent" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "prallprall" "\\prallprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "prallmordent" "\\prallmordent" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "upprall" "\\upprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "downprall" "\\downprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.25\pt 6.17\pt -15.33\pt 0.25\pt + "u4" "\\sixteenthflag" -0.25\pt 6.17\pt -17.83\pt 0.25\pt + "u5" "\\thirtysecondflag" -0.25\pt 6.17\pt -21.58\pt 0.25\pt + "u6" "\\sixtyfourthflag" -0.25\pt 6.17\pt -26.58\pt 0.25\pt + "d3" "\\deighthflag" -0.25\pt 6.83\pt -0.25\pt 14.58\pt + "d4" "\\dsixteenthflag" -0.25\pt 6.83\pt -0.25\pt 15.33\pt + "d5" "\\dthirtysecondflag" -0.25\pt 6.83\pt -0.25\pt 19.58\pt + "d6" "\\dsixtyfourthflag" -0.25\pt 6.83\pt -0.25\pt 22.08\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.00\pt 18.61\pt -10.00\pt 10.00\pt + "alto_change" "\\caltoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "bass" "\\bassclef" -2.50\pt 18.00\pt -12.50\pt 5.00\pt + "bass_change" "\\cbassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "violin" "\\violinclef" -4.36\pt 18.69\pt -15.00\pt 25.00\pt + "violin_change" "\\cviolinclef" -3.79\pt 14.65\pt -12.00\pt 20.00\pt + } + % } % $name diff --git a/init/feta23.ly b/init/feta23.ly new file mode 100644 index 0000000000..7cbe8810b5 --- /dev/null +++ b/init/feta23.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta23.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 8.44\pt -3.52\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 8.44\pt 0.00\pt 3.52\pt + "0o" "\\outsidewholerest" -3.52\pt 11.95\pt -3.52\pt 0.56\pt + "1o" "\\outsidehalfrest" -3.52\pt 11.95\pt -0.56\pt 3.52\pt + "2" "\\quartrest" 0.00\pt 6.08\pt 4.22\pt 20.25\pt + "3" "\\eighthrest" 0.00\pt 7.50\pt 5.62\pt 15.98\pt + "4" "\\sixteenthrest" 0.00\pt 8.73\pt 0.00\pt 15.98\pt + "5" "\\thirtysecondrest" 0.00\pt 9.85\pt 0.00\pt 21.61\pt + "6" "\\sixtyfourthrest" 0.00\pt 10.56\pt 0.00\pt 27.23\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 11.75\pt 0.00\pt 32.86\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 6.19\pt -8.44\pt 8.44\pt + "0" "\\natural" 0.00\pt 3.75\pt -8.44\pt 8.44\pt + "-1" "\\flat" -0.68\pt 4.50\pt -2.81\pt 11.25\pt + "-2" "\\flatflat" -0.68\pt 8.16\pt -2.81\pt 11.25\pt + "2" "\\sharpsharp" 0.00\pt 5.62\pt -2.81\pt 2.81\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.53\pt -1.27\pt 1.27\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.53\pt -2.81\pt 2.81\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-1l" "\\brevisledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "-2" "\\longaball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-2l" "\\longaledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "0" "\\wholeball" 0.00\pt 11.14\pt -3.09\pt 3.09\pt + "0l" "\\wholeledger" -2.78\pt 13.92\pt -0.56\pt 0.56\pt + "1" "\\halfball" 0.00\pt 7.75\pt -3.09\pt 3.09\pt + "1l" "\\halfledger" -1.94\pt 9.69\pt -0.56\pt 0.56\pt + "2" "\\quartball" 0.00\pt 7.43\pt -3.09\pt 3.09\pt + "2l" "\\quartledger" -1.86\pt 9.29\pt -0.56\pt 0.56\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -7.45\pt 7.45\pt -0.42\pt 8.16\pt + "dfermata" "\\dfermata" -7.45\pt 7.45\pt -8.16\pt 0.42\pt + "sforzato" "\\sforzatoaccent" -5.06\pt 5.06\pt -2.81\pt 2.81\pt + "staccato" "\\staccato" -0.84\pt 0.84\pt -0.84\pt 0.84\pt + "ustaccatissimo" "\\ustaccatissimo" -1.13\pt 1.13\pt -0.20\pt 5.63\pt + "dstaccatissimo" "\\dstaccatissimo" -1.13\pt 1.13\pt -5.63\pt 0.20\pt + "tenuto" "\\tenuto" -5.06\pt 5.06\pt -0.34\pt 0.34\pt + "umarcato" "\\umarcato" -2.81\pt 2.81\pt 0.00\pt 6.19\pt + "dmarcato" "\\dmarcato" -2.81\pt 2.81\pt -6.19\pt 0.00\pt + "open" "\\ouvert" -2.25\pt 2.25\pt -2.81\pt 2.81\pt + "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt + "upbow" "\\upbow" -3.66\pt 3.66\pt 0.00\pt 11.70\pt + "downbow" "\\downbow" -4.22\pt 4.22\pt 0.00\pt 7.50\pt + "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "trill" "\\trill" -5.62\pt 5.62\pt 0.00\pt 12.66\pt + "upedalheel" "\\upedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt + "dpedalheel" "\\dpedalheel" -2.81\pt 2.81\pt -3.75\pt 2.81\pt + "upedaltoe" "\\upedaltoe" -2.81\pt 2.81\pt 0.00\pt 8.44\pt + "dpedaltoe" "\\dpedaltoe" -2.81\pt 2.81\pt -8.44\pt 0.00\pt + "flageolet" "\\flageolet" -3.00\pt 3.00\pt -3.00\pt 3.00\pt + "trilelement" "\\trilelement" -3.75\pt 1.47\pt -2.81\pt 2.81\pt + "prall" "\\prall" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "mordent" "\\mordent" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "prallprall" "\\prallprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "prallmordent" "\\prallmordent" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "upprall" "\\upprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "downprall" "\\downprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.28\pt 6.94\pt -17.24\pt 0.28\pt + "u4" "\\sixteenthflag" -0.28\pt 6.94\pt -20.05\pt 0.28\pt + "u5" "\\thirtysecondflag" -0.28\pt 6.94\pt -24.27\pt 0.28\pt + "u6" "\\sixtyfourthflag" -0.28\pt 6.94\pt -29.90\pt 0.28\pt + "d3" "\\deighthflag" -0.28\pt 7.68\pt -0.28\pt 16.40\pt + "d4" "\\dsixteenthflag" -0.28\pt 7.68\pt -0.28\pt 17.24\pt + "d5" "\\dthirtysecondflag" -0.28\pt 7.68\pt -0.28\pt 22.02\pt + "d6" "\\dsixtyfourthflag" -0.28\pt 7.68\pt -0.28\pt 24.83\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.62\pt 20.94\pt -11.25\pt 11.25\pt + "alto_change" "\\caltoclef" -4.50\pt 16.75\pt -9.00\pt 9.00\pt + "bass" "\\bassclef" -2.81\pt 20.25\pt -14.06\pt 5.62\pt + "bass_change" "\\cbassclef" -2.25\pt 16.20\pt -11.25\pt 4.50\pt + "violin" "\\violinclef" -4.90\pt 21.02\pt -16.88\pt 28.12\pt + "violin_change" "\\cviolinclef" -4.26\pt 16.48\pt -13.50\pt 22.50\pt + } + % } % $name diff --git a/init/feta26.ly b/init/feta26.ly new file mode 100644 index 0000000000..79595c1a1a --- /dev/null +++ b/init/feta26.ly @@ -0,0 +1,88 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta26.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 9.75\pt -4.06\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 9.75\pt 0.00\pt 4.06\pt + "0o" "\\outsidewholerest" -4.06\pt 13.81\pt -4.06\pt 0.65\pt + "1o" "\\outsidehalfrest" -4.06\pt 13.81\pt -0.65\pt 4.06\pt + "2" "\\quartrest" 0.00\pt 7.02\pt 4.88\pt 23.40\pt + "3" "\\eighthrest" 0.00\pt 8.67\pt 6.50\pt 18.47\pt + "4" "\\sixteenthrest" 0.00\pt 10.08\pt 0.00\pt 18.47\pt + "5" "\\thirtysecondrest" 0.00\pt 11.38\pt 0.00\pt 24.97\pt + "6" "\\sixtyfourthrest" 0.00\pt 12.20\pt 0.00\pt 31.47\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 13.58\pt 0.00\pt 37.97\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 7.15\pt -9.75\pt 9.75\pt + "0" "\\natural" 0.00\pt 4.33\pt -9.75\pt 9.75\pt + "-1" "\\flat" -0.78\pt 5.20\pt -3.25\pt 13.00\pt + "-2" "\\flatflat" -0.78\pt 9.42\pt -3.25\pt 13.00\pt + "2" "\\sharpsharp" 0.00\pt 6.50\pt -3.25\pt 3.25\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.92\pt -1.46\pt 1.46\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.92\pt -3.25\pt 3.25\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-1l" "\\brevisledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "-2" "\\longaball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-2l" "\\longaledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "0" "\\wholeball" 0.00\pt 12.87\pt -3.58\pt 3.58\pt + "0l" "\\wholeledger" -3.22\pt 16.09\pt -0.65\pt 0.65\pt + "1" "\\halfball" 0.00\pt 8.95\pt -3.58\pt 3.58\pt + "1l" "\\halfledger" -2.24\pt 11.19\pt -0.65\pt 0.65\pt + "2" "\\quartball" 0.00\pt 8.59\pt -3.58\pt 3.58\pt + "2l" "\\quartledger" -2.15\pt 10.73\pt -0.65\pt 0.65\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -8.61\pt 8.61\pt -0.49\pt 9.43\pt + "dfermata" "\\dfermata" -8.61\pt 8.61\pt -9.43\pt 0.49\pt + "sforzato" "\\sforzatoaccent" -5.85\pt 5.85\pt -3.25\pt 3.25\pt + "staccato" "\\staccato" -0.98\pt 0.98\pt -0.98\pt 0.98\pt + "ustaccatissimo" "\\ustaccatissimo" -1.30\pt 1.30\pt -0.20\pt 6.50\pt + "dstaccatissimo" "\\dstaccatissimo" -1.30\pt 1.30\pt -6.50\pt 0.20\pt + "tenuto" "\\tenuto" -5.85\pt 5.85\pt -0.39\pt 0.39\pt + "umarcato" "\\umarcato" -3.25\pt 3.25\pt 0.00\pt 7.15\pt + "dmarcato" "\\dmarcato" -3.25\pt 3.25\pt -7.15\pt 0.00\pt + "open" "\\ouvert" -2.60\pt 2.60\pt -3.25\pt 3.25\pt + "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt + "upbow" "\\upbow" -4.23\pt 4.23\pt 0.00\pt 13.52\pt + "downbow" "\\downbow" -4.88\pt 4.88\pt 0.00\pt 8.67\pt + "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "trill" "\\trill" -6.50\pt 6.50\pt 0.00\pt 14.62\pt + "upedalheel" "\\upedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt + "dpedalheel" "\\dpedalheel" -3.25\pt 3.25\pt -4.33\pt 3.25\pt + "upedaltoe" "\\upedaltoe" -3.25\pt 3.25\pt 0.00\pt 9.75\pt + "dpedaltoe" "\\dpedaltoe" -3.25\pt 3.25\pt -9.75\pt 0.00\pt + "flageolet" "\\flageolet" -3.47\pt 3.47\pt -3.47\pt 3.47\pt + "trilelement" "\\trilelement" -4.33\pt 1.70\pt -3.25\pt 3.25\pt + "prall" "\\prall" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "mordent" "\\mordent" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "prallprall" "\\prallprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "prallmordent" "\\prallmordent" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "upprall" "\\upprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "downprall" "\\downprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.33\pt 8.02\pt -19.92\pt 0.33\pt + "u4" "\\sixteenthflag" -0.33\pt 8.02\pt -23.17\pt 0.33\pt + "u5" "\\thirtysecondflag" -0.33\pt 8.02\pt -28.05\pt 0.33\pt + "u6" "\\sixtyfourthflag" -0.33\pt 8.02\pt -34.55\pt 0.33\pt + "d3" "\\deighthflag" -0.33\pt 8.88\pt -0.33\pt 18.95\pt + "d4" "\\dsixteenthflag" -0.33\pt 8.88\pt -0.33\pt 19.92\pt + "d5" "\\dthirtysecondflag" -0.33\pt 8.88\pt -0.33\pt 25.45\pt + "d6" "\\dsixtyfourthflag" -0.33\pt 8.88\pt -0.33\pt 28.70\pt + } + "clefs" = \table { + "alto" "\\altoclef" -6.50\pt 24.19\pt -13.00\pt 13.00\pt + "alto_change" "\\caltoclef" -5.20\pt 19.36\pt -10.40\pt 10.40\pt + "bass" "\\bassclef" -3.25\pt 23.40\pt -16.25\pt 6.50\pt + "bass_change" "\\cbassclef" -2.60\pt 18.72\pt -13.00\pt 5.20\pt + "violin" "\\violinclef" -5.66\pt 24.29\pt -19.50\pt 32.50\pt + "violin_change" "\\cviolinclef" -4.92\pt 19.04\pt -15.60\pt 26.00\pt + } + % } % $name diff --git a/init/table16.ly b/init/table16.ly index 83f0e3c9bb..b0fd33ef0a 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 0.0\pt 0.0\pt 8.0\pt + "italic" "\setitalic{%}" 0.0\pt 7.5\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 7.50\pt 0.0\pt 8.0\pt } @@ -64,13 +64,14 @@ table_sixteen= "param" = \table { % "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 32.0\pt 80.0\pt + "bracket" "\staffbracket{%}" 0.0\pt 4.0\pt 16.0\pt 128.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt "rule" "\rulesym{%}{%}" "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8pt - "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -2.0\pt 2.0\pt - "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt + "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -5.0\pt 5.0\pt + "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -5.0\pt 5.0\pt } diff --git a/init/table20.ly b/init/table20.ly index 597cbe0ef3..eee1669ee8 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -15,7 +15,7 @@ table_twenty = "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 10.0\pt "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 5.0\pt - "italic" "\setitalic{%}" 0.0\pt 0.0\pt 0.0\pt 10.0\pt + "italic" "\setitalic{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt "large" "\setlarge{%}" 0.0\pt 9.50\pt 0.0\pt 12.0\pt "roman" "\settext{%}" 0.0\pt 7.5\pt 0.0\pt 10.0\pt } @@ -67,14 +67,15 @@ table_twenty = % dims ignored for this table "param" = \table { % "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt + "bracket" "\staffbracket{%}" 0.0\pt 0.0\pt 20.0\pt 160.0\pt "rule" "\rulesym{%}{%}" "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 40.0\pt 100.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8\pt - "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt - "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt + "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -6.25\pt 6.25\pt + "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -6.25\pt 6.25\pt } "beamslopes" = \table { diff --git a/input/Makefile.in b/input/Makefile.in index 3870bea6b4..aff9bc9d13 100644 --- a/input/Makefile.in +++ b/input/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # input/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -164,26 +158,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/input/scripts.ly b/input/scripts.ly index 7e9bc76163..042ec2216f 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -34,6 +34,16 @@ blah = \melodic { d' _>_._\fermata _"text" d'' _>_._\fermata _"text" + \stemup + 'b-. c-. d-. e-. f-. g-. a-. b-. c'-. + \stemdown + a-. b-. c'-. d'-. e'-. f'-. g'-. a'-. b'-. + \stemup + 'b-> c-> d-> e-> f-> g-> a-> b-> c'-> + \stemup + 'b---. c---. d---. e---. f---. g---. a---. b---. c'---. + \stemboth + \meter 4/4; \duration 8; \octave c'; diff --git a/input/sleur.ly b/input/sleur.ly index 0f53a82adc..964e05a0ca 100644 --- a/input/sleur.ly +++ b/input/sleur.ly @@ -32,14 +32,15 @@ beum = \melodic{ } extend = \melodic{ - c8(( c c )c c c c )c | - \[4/5c8( c c' c )c\]1/1 c c c c | - \[4/5c8( c c c c'\]1/1 c c c )c | - \[4/5c8( c c c c''\]1/1 c c c )c' | - \[4/5c8( c c c c'\]1/1 c c c )'c | - \[4/5c8( c c' c c\]1/1 c c c )c | - \[4/5c8( c c c ''c\]1/1 c c c )c | - \[4/5c8( c ''c c c\]1/1 c c c )c | + \octave c; + c8(( c c )c c c c )c | + \[4/5c8( c c' c )c\]1/1 c c c c | + \[4/5c8( c c c c'\]1/1 c c c )c | + \[4/5c8( c c c c''\]1/1 c c c )c' | + \[4/5c8( c c c c'\]1/1 c c c )'c | + \[4/5c8( c c' c c\]1/1 c c c )c | + \[4/5c8( c c c ''c\]1/1 c c c )c | + \[4/5c8( c ''c c c\]1/1 c c c )c | } extendbug = \melodic{ @@ -49,10 +50,36 @@ extendbug = \melodic{ [c'8( b g a] [c' d' e' c'] [c' d' e' )c'] c( c' c' )c e( g' g' )e + +} + +blend = \melodic{ + \octave c; + \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 | + \octave c'; + \stemdown; + c( c'' c'' )c + \stemboth; + e( g' g' )e + e( g' g' )e + e( g' g' )e + e( g' g' )e } \score{ \melodic{ + \blend \shortlong \dirs \complex diff --git a/input/test-lyrics.ly b/input/test-lyrics.ly index c1a8a944b8..4d42f97030 100644 --- a/input/test-lyrics.ly +++ b/input/test-lyrics.ly @@ -56,7 +56,7 @@ $melodic_staff = \type Staff = mel < \$melodic_staff \$somewhat_long_lyrics_staff % \$rather_long_lyrics_staff -% \$quite_long_lyrics_staff + \$quite_long_lyrics_staff > \paper{ % castingalgorithm = \Wordwrap; diff --git a/lib/Makefile.in b/lib/Makefile.in index 38f347f9ae..a5c2996924 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -59,12 +53,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -145,7 +139,7 @@ OBJECTS = $(liblily_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .s +.SUFFIXES: .c .cc .lo .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile @@ -157,7 +151,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) distclean-libLTLIBRARIES: @@ -168,13 +162,13 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) $(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; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done @@ -182,36 +176,24 @@ uninstall-libLTLIBRARIES: .c.o: $(COMPILE) -c $< -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + rm -f *.lo clean-libtool: - -rm -rf .libs _libs + rm -rf .libs distclean-libtool: @@ -237,7 +219,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -247,9 +229,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -263,29 +243,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -300,15 +275,15 @@ distdir: $(DISTFILES) || 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; \ + 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 \ +binary-source-file.o binary-source-file.lo: 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 \ @@ -322,7 +297,7 @@ binary-source-file.lo binary-source-file.o: binary-source-file.cc \ ../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 \ +duration-convert.o duration-convert.lo: 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 \ @@ -331,7 +306,7 @@ duration-convert.lo duration-convert.o: duration-convert.cc \ ../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 \ +duration.o duration.lo: 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 \ @@ -346,7 +321,7 @@ duration.lo duration.o: duration.cc include/proto.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 \ +input.o input.lo: 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 \ @@ -358,18 +333,18 @@ input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.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 \ +mapped-file-storage.o mapped-file-storage.lo: mapped-file-storage.cc +moment.o moment.lo: 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 \ +plet.o plet.lo: 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 \ +simple-file-storage.o simple-file-storage.lo: 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 \ @@ -378,7 +353,7 @@ simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \ ../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 \ +source-file.o source-file.lo: 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 \ @@ -392,7 +367,7 @@ source-file.lo source-file.o: source-file.cc ../flower/include/string.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 \ +source.o source.lo: 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 \ @@ -406,7 +381,7 @@ source.lo source.o: source.cc include/binary-source-file.hh \ ../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 \ +template.o template.lo: 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 \ @@ -419,12 +394,12 @@ template.lo template.o: template.cc include/source-file.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 \ +warn.o warn.lo: 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.o windhoos-suck-suck-suck-thank-you-cygnus.lo: \ windhoos-suck-suck-suck-thank-you-cygnus.cc info: info-recursive @@ -458,19 +433,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -492,8 +467,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index aa411ca030..8f63692c46 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # lib/include/Makefile @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -127,26 +121,21 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -185,26 +174,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/lily/Makefile.am b/lily/Makefile.am index 9090377055..4a703de2ce 100644 --- a/lily/Makefile.am +++ b/lily/Makefile.am @@ -14,7 +14,7 @@ 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 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 +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 diff --git a/lily/Makefile.in b/lily/Makefile.in index 61f8faa088..0e3396cc36 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for lilypond @@ -58,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -113,7 +107,7 @@ 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 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 +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 @@ -143,48 +137,48 @@ 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 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 +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@ @@ -192,10 +186,6 @@ 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 @@ -210,7 +200,7 @@ OBJECTS = $(lilypond_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .cc .ll .lo .o .s .yy +.SUFFIXES: .c .cc .h .ll .lo .o .yy $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/Makefile @@ -222,7 +212,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -239,7 +229,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -247,36 +237,24 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + rm -f *.lo clean-libtool: - -rm -rf .libs _libs + rm -rf .libs distclean-libtool: @@ -286,12 +264,15 @@ 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 + $(YACC) $(YFLAGS) $< && mv y.tab.c $@ + 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 +.yy.h: + $(YACC) $(YFLAGS) $< && mv y.tab.c $@ 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: @@ -312,7 +293,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -322,9 +303,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -338,29 +317,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -375,18 +349,19 @@ distdir: $(DISTFILES) || 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; \ + 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 \ +abbrev.o abbrev.lo: 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 \ @@ -409,7 +384,8 @@ abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.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 \ +abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \ + 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 \ @@ -440,8 +416,8 @@ abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \ 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 \ +abbreviation-beam.o abbreviation-beam.lo: 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 \ @@ -474,7 +450,7 @@ abbreviation-beam.o: abbreviation-beam.cc include/p-col.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 \ +atom.o atom.lo: 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 \ @@ -485,7 +461,7 @@ atom.o: atom.cc include/atom.hh ../flower/include/string.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 \ +audio-column.o audio-column.lo: 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 \ @@ -501,16 +477,17 @@ audio-column.o: audio-column.cc include/audio-column.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 \ +audio-element.o audio-element.lo: 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 \ +audio-item.o audio-item.lo: 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 \ @@ -529,7 +506,7 @@ audio-item.o: audio-item.cc include/debug.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 \ +audio-staff.o audio-staff.lo: 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 \ @@ -546,9 +523,10 @@ audio-staff.o: audio-staff.cc include/audio-staff.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 \ +axis-group-administration.o axis-group-administration.lo: \ + 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 \ @@ -560,7 +538,7 @@ axis-group-administration.o: axis-group-administration.cc \ ../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 \ +axis-group-element.o axis-group-element.lo: 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 \ @@ -574,9 +552,10 @@ axis-group-element.o: axis-group-element.cc \ 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 \ +axis-group-item.o axis-group-item.lo: 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 \ @@ -596,7 +575,7 @@ axis-group-item.o: axis-group-item.cc include/axis-group-item.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 \ +axis-group-spanner.o axis-group-spanner.lo: 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 \ @@ -621,16 +600,17 @@ axis-group-spanner.o: axis-group-spanner.cc \ ../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 \ +axis.o axis.lo: 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 \ +bar-column-grav.o bar-column-grav.lo: 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 \ @@ -652,7 +632,7 @@ bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.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 \ +bar-column.o bar-column.lo: 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 \ @@ -672,11 +652,11 @@ bar-column.o: bar-column.cc include/bar.hh include/item.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 \ +bar-grav.o bar-grav.lo: 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 \ @@ -699,11 +679,12 @@ bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.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 \ +bar-number-grav.o bar-number-grav.lo: 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 \ @@ -723,7 +704,7 @@ bar-number-grav.o: bar-number-grav.cc include/bar-number-grav.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 \ +bar.o bar.lo: 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 \ @@ -747,10 +728,11 @@ bar.o: bar.cc include/bar.hh include/item.hh include/boxes.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 \ +beam-grav.o beam-grav.lo: 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 \ @@ -779,7 +761,7 @@ beam-grav.o: beam-grav.cc ../lib/include/duration-convert.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 \ +beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -796,7 +778,8 @@ beam-swallow-trans.o: beam-swallow-trans.cc \ 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 \ +beam.o beam.lo: 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 \ @@ -829,7 +812,24 @@ beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/lookup.hh \ include/stem-info.hh include/main.hh -bow.o: bow.cc include/bow.hh include/directional-spanner.hh \ +bezier.o bezier.lo: bezier.cc include/bezier.hh include/lily-proto.hh \ + ../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/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.lo: 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 \ @@ -852,16 +852,16 @@ bow.o: bow.cc include/bow.hh include/directional-spanner.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 \ +boxes.o boxes.lo: 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 \ +break-align-item.o break-align-item.lo: 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 \ @@ -874,7 +874,7 @@ break-align-item.o: break-align-item.cc include/break-align-item.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 \ +break.o break.lo: 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 \ @@ -904,17 +904,17 @@ break.o: break.cc include/score-column.hh include/lily-proto.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 \ +change-iterator.o change-iterator.lo: 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 \ @@ -926,19 +926,19 @@ change-iterator.o: change-iterator.cc include/change-iterator.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 \ +change-translator.o change-translator.lo: 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 \ +chord-iterator.o chord-iterator.lo: 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 \ @@ -959,7 +959,7 @@ chord-iterator.o: chord-iterator.cc include/translator-group.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 \ +clef-grav.o clef-grav.lo: 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 \ @@ -984,8 +984,8 @@ clef-grav.o: clef-grav.cc include/bar.hh include/item.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 \ +clef-item.o clef-item.lo: 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 \ @@ -1011,7 +1011,7 @@ clef-item.o: clef-item.cc include/clef-item.hh include/item.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 \ +col-info.o col-info.lo: 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 \ @@ -1037,21 +1037,21 @@ col-info.o: col-info.cc include/p-col.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 \ +colhpos.o colhpos.lo: 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 \ +collision-grav.o collision-grav.lo: 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 \ @@ -1074,8 +1074,8 @@ collision-grav.o: collision-grav.cc include/note-column.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 \ +collision.o collision.lo: 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 \ @@ -1104,8 +1104,9 @@ collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \ ../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 \ +command-request.o command-request.lo: 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 \ @@ -1118,16 +1119,17 @@ command-request.o: command-request.cc include/command-request.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 \ +crescendo.o crescendo.lo: 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 \ @@ -1148,7 +1150,7 @@ crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.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 \ +debug.o debug.lo: 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 \ @@ -1158,7 +1160,7 @@ debug.o: debug.cc include/debug.hh ../flower/include/dstream.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 \ +dimen.o dimen.lo: 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 \ @@ -1166,7 +1168,7 @@ dimen.o: dimen.cc include/dimen.hh ../flower/include/real.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 \ +directional-spanner.o directional-spanner.lo: 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 \ @@ -1181,9 +1183,9 @@ directional-spanner.o: directional-spanner.cc \ ../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 \ +dot-column-grav.o dot-column-grav.lo: dot-column-grav.cc +dot-column.o dot-column.lo: 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 \ @@ -1200,7 +1202,7 @@ dot-column.o: dot-column.cc include/dots.hh include/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 \ +dots.o dots.lo: 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 \ @@ -1222,7 +1224,7 @@ dots.o: dots.cc include/dots.hh include/item.hh include/boxes.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 \ +dynamic-grav.o dynamic-grav.lo: 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 \ @@ -1261,17 +1263,18 @@ dynamic-grav.o: dynamic-grav.cc include/debug.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 \ +engraver-group.o engraver-group.lo: 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 \ @@ -1287,12 +1290,13 @@ engraver-group.o: engraver-group.cc ../lib/include/proto.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 \ +engraver.o engraver.lo: 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 \ @@ -1310,7 +1314,7 @@ engraver.o: engraver.cc include/music-list.hh include/music.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 \ +general-script-def.o general-script-def.lo: 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 \ @@ -1322,8 +1326,9 @@ general-script-def.o: general-script-def.cc \ ../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 \ +global-translator.o global-translator.lo: 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 \ @@ -1339,21 +1344,21 @@ global-translator.o: global-translator.cc include/global-translator.hh \ ../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 \ +gourlay-breaking.o gourlay-breaking.lo: 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 \ @@ -1369,8 +1374,9 @@ gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.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 \ +graphical-element.o graphical-element.lo: 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 \ @@ -1383,8 +1389,8 @@ graphical-element.o: graphical-element.cc include/graphical-element.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 \ +grouping.o grouping.lo: 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 \ @@ -1393,11 +1399,11 @@ grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.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 \ +head-grav.o head-grav.lo: 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 \ @@ -1421,7 +1427,7 @@ head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.hh \ ../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 \ +header.o header.lo: header.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1430,9 +1436,9 @@ header.o: header.cc ../flower/include/string.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 \ +horizontal-align-item.o horizontal-align-item.lo: \ + 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 \ @@ -1446,10 +1452,10 @@ horizontal-align-item.o: horizontal-align-item.cc \ ../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 \ +horizontal-group-elem.o horizontal-group-elem.lo: \ + 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 \ @@ -1464,7 +1470,8 @@ horizontal-group-elem.o: horizontal-group-elem.cc \ 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 \ +horizontal-group-item.o horizontal-group-item.lo: \ + 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 \ @@ -1487,7 +1494,8 @@ horizontal-group-item.o: horizontal-group-item.cc include/p-col.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 \ +horizontal-vertical-group-elem.o horizontal-vertical-group-elem.lo: \ + 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 \ @@ -1507,7 +1515,8 @@ horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \ 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 \ +horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \ + 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 \ @@ -1533,7 +1542,7 @@ horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ ../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 \ +idealspacing.o idealspacing.lo: 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 \ @@ -1558,9 +1567,10 @@ idealspacing.o: idealspacing.cc include/idealspacing.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 \ +identifier.o identifier.lo: 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 \ @@ -1585,8 +1595,8 @@ identifier.o: identifier.cc include/midi-def.hh include/lily-proto.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 \ +includable-lexer.o includable-lexer.lo: 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 \ @@ -1598,7 +1608,7 @@ includable-lexer.o: includable-lexer.cc include/includable-lexer.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 \ +ineq-constrained-qp.o ineq-constrained-qp.lo: 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 \ @@ -1610,7 +1620,7 @@ ineq-constrained-qp.o: ineq-constrained-qp.cc \ ../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 \ +item.o item.lo: 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 \ @@ -1635,11 +1645,11 @@ item.o: item.cc include/p-score.hh include/colhpos.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 \ +key-grav.o key-grav.lo: 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 \ @@ -1659,7 +1669,7 @@ key-grav.o: key-grav.cc include/key-grav.hh include/engraver.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 \ +key-item.o key-item.lo: 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 \ @@ -1688,11 +1698,12 @@ key-item.o: key-item.cc include/key-item.hh include/item.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 \ +key-performer.o key-performer.lo: 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 \ @@ -1706,7 +1717,7 @@ key-performer.o: key-performer.cc include/key-performer.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 \ +key.o key.lo: 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 \ @@ -1715,15 +1726,15 @@ key.o: key.cc include/key.hh ../flower/include/varray.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 \ +keyword.o keyword.lo: keyword.cc include/keyword.hh +leastsquares.o leastsquares.lo: 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 \ +lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1737,7 +1748,7 @@ lexer.o: lexer.cc ../flower/include/string.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 \ +lexerinit.o lexerinit.lo: 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 \ @@ -1755,9 +1766,9 @@ lexerinit.o: lexerinit.cc ../lib/include/proto.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 \ +lily-version.o lily-version.lo: lily-version.cc ../flower/config.hh +line-group-grav.o line-group-grav.lo: 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 \ @@ -1792,16 +1803,17 @@ line-group-grav.o: line-group-grav.cc include/staff-sym.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 \ +line-spacer.o line-spacer.lo: 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 \ +linear-programming.o linear-programming.lo: linear-programming.cc +local-key-grav.o local-key-grav.lo: 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 \ @@ -1832,7 +1844,7 @@ local-key-grav.o: local-key-grav.cc include/musical-request.hh \ ../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 \ +local-key-item.o local-key-item.lo: 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 \ @@ -1860,7 +1872,7 @@ local-key-item.o: local-key-item.cc include/dimen.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 \ +lookup.o lookup.lo: 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 \ @@ -1882,7 +1894,7 @@ lookup.o: lookup.cc include/lookup.hh include/atom.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 \ +lyric-grav.o lyric-grav.lo: 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 \ @@ -1911,11 +1923,12 @@ lyric-grav.o: lyric-grav.cc include/lyric-engraver.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 \ +lyric-performer.o lyric-performer.lo: 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 \ @@ -1930,15 +1943,15 @@ lyric-performer.o: lyric-performer.cc include/lyric-performer.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 \ +main.o main.lo: 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 \ @@ -1951,11 +1964,11 @@ main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.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 \ +meter-grav.o meter-grav.lo: 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 \ @@ -1980,11 +1993,12 @@ meter-grav.o: meter-grav.cc include/meter-grav.hh include/engraver.hh \ ../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 \ +meter-performer.o meter-performer.lo: 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 \ @@ -1998,7 +2012,7 @@ meter-performer.o: meter-performer.cc include/meter-performer.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 \ +meter.o meter.lo: meter.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2022,10 +2036,11 @@ meter.o: meter.cc ../flower/include/scalar.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 \ +midi-def.o midi-def.lo: 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 \ @@ -2049,7 +2064,7 @@ midi-def.o: midi-def.cc include/misc.hh include/lily-proto.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 \ +midi-item.o midi-item.lo: 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 \ @@ -2072,7 +2087,7 @@ midi-item.o: midi-item.cc ../lib/include/proto.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 \ +midi-stream.o midi-stream.lo: 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 \ @@ -2091,7 +2106,7 @@ midi-stream.o: midi-stream.cc ../flower/include/string.hh \ ../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 \ +midi-walker.o midi-walker.lo: 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 \ @@ -2109,7 +2124,7 @@ midi-walker.o: midi-walker.cc include/midi-walker.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 \ +misc.o misc.lo: 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 \ @@ -2124,7 +2139,7 @@ misc.o: misc.cc include/item.hh include/boxes.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 \ +molecule.o molecule.lo: 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 \ @@ -2141,7 +2156,7 @@ molecule.o: molecule.cc ../flower/include/interval.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 \ +music-iterator.o music-iterator.lo: 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 \ @@ -2165,7 +2180,7 @@ music-iterator.o: music-iterator.cc include/debug.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 \ +music-list.o music-list.lo: 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 \ @@ -2181,8 +2196,9 @@ music-list.o: music-list.cc include/music.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 \ +music-output-def.o music-output-def.lo: 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 \ @@ -2202,12 +2218,12 @@ music-output-def.o: music-output-def.cc include/debug.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 \ +music.o music.lo: 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 \ @@ -2218,10 +2234,11 @@ music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \ ../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 \ +musical-request.o musical-request.lo: 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 \ @@ -2240,8 +2257,9 @@ musical-request.o: musical-request.cc include/musical-request.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 \ +my-lily-lexer.o my-lily-lexer.lo: 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 \ @@ -2258,11 +2276,12 @@ my-lily-lexer.o: my-lily-lexer.cc include/notename-table.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 \ +my-lily-parser.o my-lily-parser.lo: 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 \ @@ -2280,7 +2299,7 @@ my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.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 \ +note-column.o note-column.lo: 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 \ @@ -2312,10 +2331,11 @@ note-column.o: note-column.cc include/dot-column.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 \ +note-head.o note-head.lo: 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 \ @@ -2341,11 +2361,12 @@ note-head.o: note-head.cc include/misc.hh include/lily-proto.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 \ +note-performer.o note-performer.lo: 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 \ @@ -2360,7 +2381,7 @@ note-performer.o: note-performer.cc include/note-performer.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 \ +note.o note.lo: 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 \ @@ -2383,8 +2404,9 @@ note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ ../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 \ +notename-table.o notename-table.lo: 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 \ @@ -2398,16 +2420,16 @@ notename-table.o: notename-table.cc include/notename-table.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 \ +offset.o offset.lo: 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 \ +outputter.o outputter.lo: 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 \ @@ -2420,7 +2442,8 @@ outputter.o: outputter.cc include/outputter.hh include/lily-proto.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 \ +p-col.o p-col.lo: 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 \ @@ -2444,7 +2467,7 @@ p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.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 \ +p-score.o p-score.lo: 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 \ @@ -2478,7 +2501,7 @@ p-score.o: p-score.cc include/main.hh include/lily-proto.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 \ +paper-def.o paper-def.lo: 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 \ @@ -2507,7 +2530,7 @@ paper-def.o: paper-def.cc ../flower/include/string.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 \ +parser.o parser.lo: parser.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2542,7 +2565,7 @@ parser.o: parser.cc ../flower/include/scalar.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 \ +performance.o performance.lo: 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 \ @@ -2564,7 +2587,8 @@ performance.o: performance.cc include/debug.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 \ +performer-group-performer.o performer-group-performer.lo: \ + 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 \ @@ -2588,17 +2612,18 @@ performer-group-performer.o: performer-group-performer.cc \ ../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 \ +performer.o performer.lo: 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 \ @@ -2611,11 +2636,12 @@ performer.o: performer.cc include/performer-group-performer.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 \ +pitch-squash-grav.o pitch-squash-grav.lo: 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 \ @@ -2631,10 +2657,11 @@ pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-grav.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 \ +plet-engraver.o plet-engraver.lo: 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 \ @@ -2665,7 +2692,7 @@ plet-engraver.o: plet-engraver.cc ../lib/include/proto.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 \ +plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2698,11 +2725,11 @@ plet-spanner.o: plet-spanner.cc include/atom.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 \ +plet-swallow-engraver.o plet-swallow-engraver.lo: \ + 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 \ @@ -2717,11 +2744,11 @@ plet-swallow-engraver.o: plet-swallow-engraver.cc \ 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 \ +priority-halign-grav.o priority-halign-grav.lo: 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 \ @@ -2740,17 +2767,17 @@ priority-halign-grav.o: priority-halign-grav.cc include/bar.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 \ +property-iterator.o property-iterator.lo: 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 \ @@ -2761,7 +2788,7 @@ property-iterator.o: property-iterator.cc include/property-iterator.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 \ +ps-plet.o ps-plet.lo: 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 \ @@ -2785,7 +2812,7 @@ ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.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 \ +qlp.o qlp.lo: 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 \ @@ -2797,7 +2824,7 @@ qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.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 \ +qlpsolve.o qlpsolve.lo: 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 \ @@ -2809,8 +2836,8 @@ qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.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 \ +request-iterator.o request-iterator.lo: 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 \ @@ -2832,7 +2859,8 @@ request-iterator.o: request-iterator.cc include/translator-group.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 \ +request.o request.lo: 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 \ @@ -2843,8 +2871,9 @@ request.o: request.cc include/request.hh ../flower/include/string.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 \ +rest-collision-grav.o rest-collision-grav.lo: 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 \ @@ -2870,7 +2899,7 @@ rest-collision-grav.o: rest-collision-grav.cc include/debug.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 \ +rest-collision.o rest-collision.lo: 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 \ @@ -2902,11 +2931,11 @@ rest-collision.o: rest-collision.cc include/debug.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 \ +rest-grav.o rest-grav.lo: 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 \ @@ -2924,7 +2953,7 @@ rest-grav.o: rest-grav.cc include/rest-grav.hh include/engraver.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 \ +rest.o rest.lo: 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 \ @@ -2950,7 +2979,7 @@ rest.o: rest.cc include/molecule.hh include/lily-proto.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 \ +rhythmic-column-grav.o rhythmic-column-grav.lo: 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 \ @@ -2985,11 +3014,11 @@ rhythmic-column-grav.o: rhythmic-column-grav.cc \ 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 \ +rhythmic-head.o rhythmic-head.lo: 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 \ @@ -3013,7 +3042,7 @@ rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.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 \ +rod.o rod.lo: 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 \ @@ -3038,11 +3067,11 @@ rod.o: rod.cc include/rod.hh include/lily-proto.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 \ +score-bar.o score-bar.lo: 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 \ @@ -3052,7 +3081,7 @@ score-bar.o: score-bar.cc include/score-bar.hh include/bar.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 \ +score-column.o score-column.lo: 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 \ @@ -3078,8 +3107,9 @@ score-column.o: score-column.cc include/debug.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 \ +score-elem-info.o score-elem-info.lo: 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 \ @@ -3090,9 +3120,10 @@ score-elem-info.o: score-elem-info.cc include/score-elem-info.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 \ +score-elem.o score-elem.lo: 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 \ @@ -3120,8 +3151,9 @@ score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.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 \ +score-grav.o score-grav.lo: 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 \ @@ -3157,18 +3189,18 @@ score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.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 \ +score-performer.o score-performer.lo: 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 \ @@ -3189,7 +3221,7 @@ score-performer.o: score-performer.cc include/score-performer.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 \ +score-priority-grav.o score-priority-grav.lo: 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 \ @@ -3215,7 +3247,7 @@ score-priority-grav.o: score-priority-grav.cc \ ../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 \ +score.o score.lo: 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 \ @@ -3241,11 +3273,12 @@ score.o: score.cc include/score.hh ../flower/include/varray.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 \ +scoreline.o scoreline.lo: 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 \ @@ -3268,7 +3301,7 @@ scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.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 \ +scores.o scores.lo: 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 \ @@ -3288,7 +3321,8 @@ scores.o: scores.cc include/main.hh include/lily-proto.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 \ +script-column.o script-column.lo: 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 \ @@ -3318,7 +3352,7 @@ script-column.o: script-column.cc include/script-column.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 \ +script-def.o script-def.lo: 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 \ @@ -3339,11 +3373,11 @@ script-def.o: script-def.cc include/debug.hh \ ../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 \ +script-grav.o script-grav.lo: 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 \ @@ -3368,7 +3402,8 @@ script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \ ../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 \ +script.o script.lo: 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 \ @@ -3394,8 +3429,8 @@ script.o: script.cc include/script-def.hh ../flower/include/string.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 \ +separating-group-spanner.o separating-group-spanner.lo: \ + 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 \ @@ -3422,7 +3457,8 @@ separating-group-spanner.o: separating-group-spanner.cc \ ../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 \ +separating-line-group-grav.o separating-line-group-grav.lo: \ + 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 \ @@ -3457,7 +3493,8 @@ separating-line-group-grav.o: separating-line-group-grav.cc \ ../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 \ +single-malt-grouping-item.o single-malt-grouping-item.lo: \ + 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 \ @@ -3482,7 +3519,7 @@ single-malt-grouping-item.o: single-malt-grouping-item.cc \ ../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 \ +slur-grav.o slur-grav.lo: 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 \ @@ -3518,7 +3555,7 @@ slur-grav.o: slur-grav.cc ../lib/include/proto.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 \ +slur.o slur.lo: 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 \ @@ -3549,12 +3586,13 @@ slur.o: slur.cc include/slur.hh include/directional-spanner.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 -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/dstream.hh ../lib/include/warn.hh \ + include/bezier.hh +span-bar-grav.o span-bar-grav.lo: 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 \ @@ -3572,8 +3610,8 @@ span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.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 \ +span-bar.o span-bar.lo: 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 \ @@ -3596,9 +3634,9 @@ span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.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 \ +span-score-bar-grav.o span-score-bar-grav.lo: 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 \ @@ -3618,9 +3656,9 @@ span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.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 \ +span-score-bar.o span-score-bar.lo: 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 \ @@ -3642,8 +3680,8 @@ span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \ ../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 \ +spanner.o spanner.lo: 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 \ @@ -3666,20 +3704,20 @@ spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.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 \ +spring-spacer.o spring-spacer.lo: 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 \ @@ -3700,7 +3738,7 @@ spring-spacer.o: spring-spacer.cc include/spring-spacer.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 \ +staff-info.o staff-info.lo: 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 \ @@ -3724,18 +3762,18 @@ staff-info.o: staff-info.cc ../lib/include/proto.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 \ +staff-performer.o staff-performer.lo: 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 \ @@ -3750,7 +3788,7 @@ staff-performer.o: staff-performer.cc include/staff-performer.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 \ +staff-side.o staff-side.lo: 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 \ @@ -3772,11 +3810,12 @@ staff-side.o: staff-side.cc ../flower/include/interval.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 \ +staff-sym-grav.o staff-sym-grav.lo: 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 \ @@ -3801,11 +3840,11 @@ staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.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 \ +staff-sym.o staff-sym.lo: 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 \ @@ -3827,11 +3866,11 @@ staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.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 \ +stem-grav.o stem-grav.lo: 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 \ @@ -3856,7 +3895,7 @@ stem-grav.o: stem-grav.cc include/stem-grav.hh include/engraver.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 \ +stem-info.o stem-info.lo: 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 \ @@ -3883,7 +3922,7 @@ stem-info.o: stem-info.cc ../lib/include/proto.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 -stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \ +stem.o stem.lo: 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 \ @@ -3915,8 +3954,9 @@ stem.o: stem.cc include/stem.hh include/item.hh include/boxes.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 \ +super-elem.o super-elem.lo: 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 \ @@ -3935,7 +3975,7 @@ super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ ../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 \ +swallow-grav.o swallow-grav.lo: 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 \ @@ -3951,7 +3991,7 @@ swallow-grav.o: swallow-grav.cc include/swallow-grav.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 \ +swallow-perf.o swallow-perf.lo: 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 \ @@ -3967,10 +4007,11 @@ swallow-perf.o: swallow-perf.cc include/swallow-perf.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 \ +symtable.o symtable.lo: 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 \ @@ -3982,7 +4023,7 @@ symtable.o: symtable.cc include/misc.hh include/lily-proto.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 \ +template1.o template1.lo: 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 \ @@ -4012,18 +4053,19 @@ template1.o: template1.cc ../lib/include/proto.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 \ +template2.o template2.lo: 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.lo: 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 \ @@ -4038,7 +4080,7 @@ template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ ../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 \ +template4.o template4.lo: 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 \ @@ -4067,7 +4109,7 @@ template4.o: template4.cc ../lib/include/proto.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 \ +template5.o template5.lo: template5.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -4076,15 +4118,16 @@ template5.o: template5.cc ../lib/include/proto.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 \ +template6.o template6.lo: template6.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.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/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../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 \ - include/translator.hh ../flower/include/string.hh \ + ../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 \ @@ -4092,14 +4135,14 @@ template6.o: template6.cc ../lib/include/proto.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 \ +template7.o template7.lo: 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/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/pcursor.tcc \ + ../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 \ @@ -4109,7 +4152,7 @@ template7.o: template7.cc ../lib/include/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 \ +template8.o template8.lo: 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 \ @@ -4125,7 +4168,8 @@ template8.o: template8.cc ../lib/include/proto.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 \ +tex-beam.o tex-beam.lo: 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 \ @@ -4148,11 +4192,11 @@ tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.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 \ +tex-slur.o tex-slur.lo: 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 \ @@ -4172,7 +4216,8 @@ tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.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 \ +tex-stream.o tex-stream.lo: 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 \ @@ -4182,7 +4227,7 @@ tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.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 \ +tex.o tex.lo: 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 \ @@ -4191,8 +4236,8 @@ tex.o: tex.cc include/dimen.hh ../flower/include/real.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 \ +text-def.o text-def.lo: 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 \ @@ -4213,7 +4258,7 @@ text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.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 \ +text-item.o text-item.lo: 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 \ @@ -4242,7 +4287,7 @@ text-item.o: text-item.cc include/musical-request.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 \ +text-spanner.o text-spanner.lo: 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 \ @@ -4269,11 +4314,11 @@ text-spanner.o: text-spanner.cc include/molecule.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 \ +tie-grav.o tie-grav.lo: 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 \ @@ -4297,7 +4342,7 @@ tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.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 \ +tie.o tie.lo: 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 \ @@ -4325,9 +4370,9 @@ tie.o: tie.cc include/paper-def.hh include/lily-proto.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 \ +time-description.o time-description.lo: 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 \ @@ -4335,7 +4380,7 @@ time-description.o: time-description.cc include/time-description.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 \ +timing-grav.o timing-grav.lo: 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 \ @@ -4362,8 +4407,9 @@ timing-grav.o: timing-grav.cc include/score-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 \ +timing-translator.o timing-translator.lo: 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 \ @@ -4385,7 +4431,7 @@ timing-translator.o: timing-translator.cc include/timing-translator.hh \ ../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 \ +translation-property.o translation-property.lo: 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 \ @@ -4397,15 +4443,15 @@ translation-property.o: translation-property.cc \ ../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 \ +translator-ctors.o translator-ctors.lo: 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 \ @@ -4415,8 +4461,8 @@ translator-ctors.o: translator-ctors.cc ../lib/include/proto.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 \ +translator-group.o translator-group.lo: 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 \ @@ -4434,7 +4480,7 @@ translator-group.o: translator-group.cc include/music-output-def.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 \ +translator.o translator.lo: translator.cc include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -4454,7 +4500,7 @@ translator.o: translator.cc include/translator.hh \ ../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 \ +type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -4471,13 +4517,13 @@ type-swallow-trans.o: type-swallow-trans.cc \ 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 \ +version.o version.lo: 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 \ +vertical-align-elem.o vertical-align-elem.lo: 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 \ @@ -4490,8 +4536,8 @@ vertical-align-elem.o: vertical-align-elem.cc \ ../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 \ +vertical-align-grav.o vertical-align-grav.lo: 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 \ @@ -4522,12 +4568,12 @@ vertical-align-grav.o: vertical-align-grav.cc include/p-col.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 \ +vertical-align-spanner.o vertical-align-spanner.lo: \ + 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 \ @@ -4538,7 +4584,7 @@ vertical-align-spanner.o: vertical-align-spanner.cc \ ../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 \ +vertical-group-elem.o vertical-group-elem.lo: 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 \ @@ -4556,12 +4602,13 @@ vertical-group-elem.o: vertical-group-elem.cc \ 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 \ +vertical-group-spanner.o vertical-group-spanner.lo: \ + 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 \ @@ -4581,8 +4628,8 @@ vertical-group-spanner.o: vertical-group-spanner.cc \ ../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 \ +voice-iterator.o voice-iterator.lo: 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 \ @@ -4603,15 +4650,15 @@ voice-iterator.o: voice-iterator.cc include/translator-group.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 \ +warn.o warn.lo: 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 \ @@ -4622,11 +4669,12 @@ warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.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 \ +word-wrap.o word-wrap.lo: 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 \ @@ -4683,19 +4731,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -4716,8 +4764,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/lily/bar.cc b/lily/bar.cc index 87a654100e..0a699a26ab 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -53,6 +53,7 @@ static char const *bar_breaks[][3] ={ {"", "|:", "|:"}, {"||.", "||.", ""}, {":|", ":|", ""}, + {"||", "||", ""}, {0,0,0} }; diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am index d63384fc77..84a3da5924 100644 --- a/lily/include/Makefile.am +++ b/lily/include/Makefile.am @@ -1,7 +1,7 @@ # 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 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 +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 diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index aa34b176c9..0c08cc256f 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # lily/include/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -100,7 +94,7 @@ 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 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 +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 @@ -127,26 +121,21 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -185,26 +174,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index c290cbd64f..9f7bb3f023 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -39,6 +39,7 @@ struct Lookup { Atom streepje (int type) const; Atom vbrace (Real &dy) const; + Atom vbracket (Real &dy) const; Atom meter (Array) const; Atom stem (Real y1_pos, Real y2_pos) const; Atom rule_symbol (Real height, Real width) const; diff --git a/lily/include/span-score-bar-grav.hh b/lily/include/span-score-bar-grav.hh index fbdb2fb131..dee2a30db3 100644 --- a/lily/include/span-score-bar-grav.hh +++ b/lily/include/span-score-bar-grav.hh @@ -22,9 +22,9 @@ class Span_score_bar_engraver : public Span_bar_engraver { public: - TRANSLATOR_CLONE(Span_score_bar_engraver); + TRANSLATOR_CLONE (Span_score_bar_engraver); DECLARE_MY_RUNTIME_TYPEINFO; - virtual Span_bar* get_span_bar_p() const; + virtual Span_bar* get_span_bar_p () const; }; /** @@ -33,9 +33,20 @@ public: class Piano_bar_engraver : public Span_score_bar_engraver { public: - TRANSLATOR_CLONE(Piano_bar_engraver); + TRANSLATOR_CLONE (Piano_bar_engraver); DECLARE_MY_RUNTIME_TYPEINFO; - virtual Span_bar * get_span_bar_p() const; + virtual Span_bar * get_span_bar_p () const; +}; + +/** + + */ +class Staff_group_bar_engraver : public Span_score_bar_engraver +{ +public: + TRANSLATOR_CLONE (Staff_group_bar_engraver); + DECLARE_MY_RUNTIME_TYPEINFO; + virtual Span_bar * get_span_bar_p () const; }; #endif // SPAN_SCORE_BAR_GRAV_HH diff --git a/lily/include/span-score-bar.hh b/lily/include/span-score-bar.hh index 4afe8c9d8d..193dc8c1d0 100644 --- a/lily/include/span-score-bar.hh +++ b/lily/include/span-score-bar.hh @@ -34,4 +34,14 @@ protected: virtual Atom get_bar_sym (Real) const; }; +class Staff_bracket : public Span_score_bar +{ +public: + DECLARE_MY_RUNTIME_TYPEINFO; + SCORE_ELEM_CLONE(Staff_bracket); +protected: + virtual Interval do_width() const; + virtual Atom get_bar_sym (Real) const; +}; + #endif // SPAN_SCORE_BAR_HH diff --git a/lily/lookup.cc b/lily/lookup.cc index da4083afe6..1ee100caa9 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -162,9 +162,9 @@ Lookup::hairpin (Real &wid, bool decresc, bool continued) const bool embedded_b = postscript_global_b; String embed; Atom ret; + Real height = paper_l_->get_var ("barsize") / 6; if (embedded_b) { - Real height = paper_l_->get_var ("barsize") / 6; embed = "\\embeddedps{\n" ; embed += String (wid) + " " + String (height) + " " @@ -191,8 +191,9 @@ Lookup::hairpin (Real &wid, bool decresc, bool continued) const ret.tex_ = substitute_args (ret.tex_, a); } - ret.dim_.x() = Interval (0,wid); - // ret.translate_axis (-ret.dim_[Y_AXIS][DOWN], Y_AXIS); + ret.dim_.x () = Interval (0,wid); + ret.dim_.y () = Interval (-2*height,2*height); +// ret.translate_axis (ret.dim_[Y_AXIS][DOWN], Y_AXIS); return ret; } @@ -263,3 +264,38 @@ Lookup::vbrace (Real &y) const return brace; } + +Atom +Lookup::vbracket (Real &y) const +{ + Atom bracket = (*symtables_p_)("param")->lookup ("bracket"); + Interval ydims = bracket.dim_[Y_AXIS]; + Real min_y = ydims[LEFT]; + Real max_y = ydims[RIGHT]; + Real step = 1.0 PT; + + if (y < min_y) + { + warning (_("bracket too small (") + print_dimen (y)+ ")"); + y = min_y; + } + if (y > max_y) + { + warning (_("bracket too big (") + print_dimen (y)+ ")"); + y = max_y; + } + + + int idx = int (rint ((y- min_y)/step)) + 1; + + { + Array a; + a.push (idx); + bracket.tex_ = substitute_args (bracket.tex_,a); + bracket.dim_[Y_AXIS] = Interval (-y/2,y/2); + } + + return bracket; +} + + diff --git a/lily/script.cc b/lily/script.cc index 4e57c3ddf5..491e6d655f 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -99,7 +99,9 @@ Script::brew_molecule_p() const Real dx = paper()->note_width()/2; Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_)); - out->translate_axis (y_, Y_AXIS); + // ugh, staccato dots are not centred between stafflines (how?)? + Real correct = - (Real)dir_ * 2.0 * paper ()->rule_thickness (); + out->translate_axis (y_ + correct, Y_AXIS); out->translate_axis (dx, X_AXIS); // FIXME! ugh return out; } diff --git a/lily/slur.cc b/lily/slur.cc index e1a8cf926b..8ec8633b5d 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -22,6 +22,7 @@ #include "molecule.hh" #include "debug.hh" #include "boxes.hh" +#include "bezier.hh" void Slur::add (Note_column*n) @@ -130,48 +131,116 @@ Slur::do_post_processing () while (flip(&d) != LEFT); } +static Real +pos_correct (Real x, Real dx, Real dy) +{ + /* + guess how much we can safely increase 'h' + parameter of bow without taking too large + or too many steps. + empiric computer science + */ +// return (1.0 + 2.0 * x / dx) / 4.0; + return 1.0; +} + Real Slur::height_f () const { + Real interline = paper ()->interline_f (); + Real notewidth = paper ()->note_width (); + Real internote = interline / 2; + /* - rather braindead way that of adjusting slur height - for heads/stems that extend beyond default slur - works quite good + having the correct (i.e. exactly the same as the ps stuff) + x,y coordinates is essential. + getting them is quite a mess, currently. */ - Real interline_f = paper ()->interline_f (); - Real nh_f = interline_f / 2; - Real h = 0; + 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]) * nh_f; Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]); - Stem* stem = encompass_arr_[0]->stem_l_; - Real lx = stem->hpos_f (); - Real centre = (width ().min () + width ().max ()) / 2 + lx; - Real ly = stem->dir_ == dir_ ? stem->stem_end_f () : stem->stem_begin_f () - + dir_ * 0.5; - ly *= nh_f; - for (int i = 0; i < encompass_arr_.size (); i++) + Real centre_x = dx / 2; + + + // ugh, need staffheight for bow damping + Bezier_bow b (paper ()); + + if (check_debug && !monitor->silent_b ("Slur")) { - Stem* s = encompass_arr_[i]->stem_l_; - Real sx = abs (centre - s->hpos_f ()); - Real stemy = s->dir_ == dir_ ? s->stem_end_f () : s->stem_begin_f () + dir_ * 0.5; - stemy *= nh_f; - Real sy = dir_ * (stemy - (ly + ((s->hpos_f () - lx) / dx) * dy)); - /* - uhm, correct for guess bezier curve (more if further from centre) - forget the cos alpha... - */ - if (sy > 0.5 * nh_f) - h = h >? (sy * (1 + 2 * sx / dx))*(1 + abs (dy)/32); + 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; } - if ( h < nh_f ) - return 0; - h *= h/(dx*dx*dx); -// h *= 32; -// h *= h; - h *= 40000; - return h; + 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 (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; + } + + if (shift > 0.1 * internote) + dh = dh >? shift * pos_correct (abs (centre_x - x), dx, dy); + } + } while (dh); + + return height; } IMPLEMENT_IS_TYPE_B1(Slur,Spanner); diff --git a/lily/span-score-bar-grav.cc b/lily/span-score-bar-grav.cc index dabe4ee746..4d5f57190e 100644 --- a/lily/span-score-bar-grav.cc +++ b/lily/span-score-bar-grav.cc @@ -1,5 +1,6 @@ /* - span-score-bar-grav.cc -- implement Span_score_bar_engraver and Piano_bar_engraver + span-score-bar-grav.cc -- implement Span_score_bar_engraver, + Piano_bar_engraver and Staff_group_bar_engraver source file of the GNU LilyPond music typesetter @@ -11,7 +12,7 @@ Span_bar* -Span_score_bar_engraver::get_span_bar_p() const +Span_score_bar_engraver::get_span_bar_p () const { Span_bar*s = new Span_score_bar; s->break_priority_i_ = -4; @@ -21,16 +22,27 @@ Span_score_bar_engraver::get_span_bar_p() const } -IMPLEMENT_IS_TYPE_B1(Span_score_bar_engraver, Span_bar_engraver); -IMPLEMENT_IS_TYPE_B1(Piano_bar_engraver, Span_score_bar_engraver); +IMPLEMENT_IS_TYPE_B1 (Span_score_bar_engraver, Span_bar_engraver); +IMPLEMENT_IS_TYPE_B1 (Piano_bar_engraver, Span_score_bar_engraver); +IMPLEMENT_IS_TYPE_B1 (Staff_group_bar_engraver, Span_score_bar_engraver); Span_bar* -Piano_bar_engraver::get_span_bar_p() const +Piano_bar_engraver::get_span_bar_p () const { Span_bar *s= new Piano_brace; s->break_priority_i_ = -4; return s; } -ADD_THIS_TRANSLATOR(Piano_bar_engraver); -ADD_THIS_TRANSLATOR(Span_score_bar_engraver); +Span_bar* +Staff_group_bar_engraver::get_span_bar_p () const +{ + Span_bar *s= new Staff_bracket; + s->break_priority_i_ = -4; + return s; +} + +ADD_THIS_TRANSLATOR (Piano_bar_engraver); +ADD_THIS_TRANSLATOR (Staff_group_bar_engraver); +ADD_THIS_TRANSLATOR (Span_score_bar_engraver); + diff --git a/lily/span-score-bar.cc b/lily/span-score-bar.cc index 52b3e15333..ffd7ce0763 100644 --- a/lily/span-score-bar.cc +++ b/lily/span-score-bar.cc @@ -48,8 +48,21 @@ Piano_brace::do_width() const return Interval (0,0); } +Atom +Staff_bracket::get_bar_sym (Real dy) const +{ + return paper()->lookup_l ()->vbracket (dy); +} + +Interval +Staff_bracket::do_width() const +{ + return Interval (0,0); +} + IMPLEMENT_IS_TYPE_B2(Span_score_bar, Span_bar, Score_bar); IMPLEMENT_IS_TYPE_B1(Piano_brace, Span_score_bar); +IMPLEMENT_IS_TYPE_B1(Staff_bracket, Span_score_bar); diff --git a/lily/staff-side.cc b/lily/staff-side.cc index b380e1feb8..0e8b9c7cde 100644 --- a/lily/staff-side.cc +++ b/lily/staff-side.cc @@ -63,11 +63,18 @@ Staff_side::get_position_f () const } - Real y=0; + Real y = 0; Real inter_f = paper()-> internote_f (); - Interval v= support_height(); - y = v[dir_] + 1 * dir_ * inter_f; // ugh + Interval v = support_height(); + + // ugh, dim[y] = PT over here + y = v[dir_] + 1 * dir_ * inter_f; + + int y_i = (int)rint (y / inter_f); + // ugh: 5 -> staff_lines + if ((abs (y_i) < 5) && !(abs (y_i) % 2)) + y += (Real)dir_ * inter_f; return y; } diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc index e51f1d37c5..b22a36592f 100644 --- a/lily/staff-sym.cc +++ b/lily/staff-sym.cc @@ -35,7 +35,8 @@ Interval Staff_symbol::do_height() const { int n = no_lines_i_ -1; - return 2* inter_note_f () * Interval (-n, n); +// return 2* inter_note_f () * Interval (-n, n); + return inter_note_f () * Interval (-n, n); } Molecule* diff --git a/lily/template6.cc b/lily/template6.cc index 4f7a1ed1ab..3785014d69 100644 --- a/lily/template6.cc +++ b/lily/template6.cc @@ -1,4 +1,5 @@ #include "proto.hh" +#include "pcursor.tcc" #include "plist.tcc" #include "translator.hh" diff --git a/lily/template7.cc b/lily/template7.cc index 7b5d8142ed..868573a374 100644 --- a/lily/template7.cc +++ b/lily/template7.cc @@ -7,8 +7,8 @@ */ #include "proto.hh" -#include "plist.hh" #include "pcursor.tcc" +#include "plist.hh" #include "plist.tcc" #include "music-list.hh" diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc index 9e116df08e..90f8860c71 100644 --- a/lily/tex-slur.cc +++ b/lily/tex-slur.cc @@ -150,8 +150,9 @@ Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const */ String dx_str = String_convert::precision_str (dx, 4); String dy_str = String_convert::precision_str (dy, 3); + String ht_str = String_convert::precision_str (ht, 3); String dir_str = String_convert::int_str ((int)dir); - String name = "feta-sleur-" + dx_str + "-" + dy_str + "-" + dir_str; + String name = "feta-sleur-" + dx_str + "-" + dy_str + "-" + ht_str + "-" + dir_str; int i = name.index_i ('.'); while (i != -1) { @@ -167,7 +168,7 @@ Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const mf += "interline#:=staffsize#/4;\n"; mf += "stafflinethickness#:=0.1interline#;\n"; mf += "input feta-sleur;\n"; - mf += "slurchar(" + dx_str + "," + dy_str + "," + dir_str + ");\n"; + mf += "slurchar(" + dx_str + "," + dy_str + "," + ht_str + "," + dir_str + ");\n"; mf += "end.\n"; mf += "}\n"; diff --git a/make/Makefile.in b/make/Makefile.in index 43102d5709..5126ad5c6f 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -59,12 +53,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -181,26 +175,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 0b5ff9a877..025f37f376 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 07APR98 +Inschrijf datum: 09APR98 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: diff --git a/make/lilypond.lsm b/make/lilypond.lsm index cc3ea8fb09..de64d0effd 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 07APR98 +Entered-date: 09APR98 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 diff --git a/mf/Makefile.am b/mf/Makefile.am index ad5e26321d..c5026972b0 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -11,11 +11,11 @@ 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-din10.mf feta-eindelijk.mf feta-generic.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 +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 README -FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.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 +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 diff --git a/mf/Makefile.in b/mf/Makefile.in index 1805d4e789..c098564bee 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild @@ -55,12 +49,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -111,11 +105,11 @@ 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-din10.mf feta-eindelijk.mf feta-generic.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 +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 README -FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.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 +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 @@ -181,26 +175,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf index a3a3d6c6b7..5ee256430f 100644 --- a/mf/feta-braces20.mf +++ b/mf/feta-braces20.mf @@ -6,7 +6,7 @@ % (c) 1997 Han-Wen Nienhuys % -font_identifier:="feta-braces16"; +font_identifier:="feta-braces20"; font_size 20; mode_setup; diff --git a/mf/feta-brackets16.mf b/mf/feta-brackets16.mf new file mode 100644 index 0000000000..8231f1dc3e --- /dev/null +++ b/mf/feta-brackets16.mf @@ -0,0 +1,18 @@ + +% +% feta-brackets16.mf -- implement +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997 Han-Wen Nienhuys +% Jan Nieuwenhuizen +% + +font_identifier:="feta-brackets16"; +font_size 16; +mode_setup; + +staffsize#:=16pt#; +input feta-haak; +end. + diff --git a/mf/feta-brackets20.mf b/mf/feta-brackets20.mf new file mode 100644 index 0000000000..2884ce5da7 --- /dev/null +++ b/mf/feta-brackets20.mf @@ -0,0 +1,16 @@ +% +% feta-brackets20.mf -- implement +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997 Han-Wen Nienhuys +% Jan Nieuwenhuizen +% + +font_identifier:="feta-brackets20"; +font_size 20; +mode_setup; + +staffsize#:=20pt#; +input feta-haak; +end. diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index de55a13d30..ea9fa54c65 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -38,6 +38,6 @@ else: % input feta-eindelijk; % input feta-klef; % input feta-toevallig; -% input feta-schrift; - input feta-slag; + input feta-schrift; +% input feta-slag; fi diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf new file mode 100644 index 0000000000..186a9ddeac --- /dev/null +++ b/mf/feta-haak.mf @@ -0,0 +1,52 @@ +input feta-macros; +input feta-params; + +save code; +code :=0; + + +def draw_bracket( expr height_sharp, width_sharp) = + save alpha, height, p, width, thin, thick; + height# := height_sharp; + width# := width_sharp; + + beginchar(incr code, width#, height#/2, height#/2); + + define_pixels (height, width); + thin = 2 stafflinethickness; + thick = .5 interline; + + pickup pencircle scaled thin; + lft x1 = 0; + top y1 = height/2 + thick + thin; + + x2 = x1; + z2 = (x1, 0); + rt x3 = thick; + y3 = y2; + + x4 = x3; + bot y4 = y1 - thick + thin/2; + + alpha = 50; + z5 = z1 + (width, 3/4interline); + + % need silly z6? + % strange turning path when invoked via MakeTeXTFM...? + % mf "\\mode:=ljfour; mag:=1; scrollmode; input feta-brackets16" + z6 = z5 - (0, thin/16); + + filldraw z5{dir(180+alpha)}..{left}z1--z2--z3..{up}z4{right} + ..{dir(alpha)}z6..cycle; + + labels(1,2,3,4,5,6); + addto currentpicture also currentpicture yscaled -1; +endchar; +enddef; + + +% for h := staffsize# step 1 pt# until (2 * staffsize#): +for h := staffsize# step 1 pt# until (7 * staffsize#): + draw_bracket(h, 2interline# ); +endfor + diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 2f0e762b4d..7d8f1d52ac 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -10,11 +10,14 @@ % this file is included by feta-scripts.mf tfat := 1/2; -twidth# := 0.5interline#; -theight# := 0.55interline#; +%twidth# := 0.5interline#; +%theight# := 0.55interline#; % tthin# := stafflinethickness#; tthin# := 1.6stafflinethickness#; +twidth# := 2/3interline#; +theight# := 1/2interline#; + % uhg/ uhuh? % toverlap# := tfat*twidth#+tthin#; toverlap# := tfat*twidth#+0.45tthin#; @@ -121,10 +124,11 @@ fet_beginchar("upprall", "upprall", "upprall") % trills := 4; trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); -% draw_slur(-2twidth#,-2theight#,-1); +% draw_slur(-2twidth#,-2theight#,0,-1); % currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); - draw_slur(0,-2theight#,-1); - currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin); + draw_slur(0,-2theight#,0,-1); +% currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin); + currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin); % draw_trill_four; draw_trill_three; fet_endchar; @@ -132,9 +136,10 @@ fet_endchar; fet_beginchar("downprall", "downprall", "downprall") trills := 3; set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#); -% draw_slur(-2twidth#,2theight#,1); - draw_slur(0,2theight#,1); - currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); +% draw_slur(-2twidth#,2theight#,0,1); + draw_slur(0,2theight#,0,1); +% currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin); + currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin); draw_trill_three; fet_endchar; diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 02f984975c..a1385857af 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -48,17 +48,18 @@ sluralpha:=slurheightlimit#*pi/2; slurratio:=0.3333; slurbeta:=3/4*pi*slurratio/sluralpha; -def draw_slur(expr dxs,dys,d) = +def draw_slur(expr dxs,dys,hs,d) = save x, y; - save b, dx, dy, indent; + save b, dx, dy, h, indent; dx#:=dxs*1pt#; dy#:=dys*1pt#; + h#:=hs*1pt#; define_pixels(dx,dy); b#:=length(dx#,dy#); % ugh: huh? 2/5 indent#:=2/5*sluralpha*atan(slurbeta*b#); - define_pixels(b,indent); - height:=indent*d; + define_pixels(b,h,indent); + height:=(indent+h)*d; z1=(0,0); z2=(b,0); z3=(indent,height); @@ -78,11 +79,11 @@ def draw_slur(expr dxs,dys,d) = show z6; enddef; -def slurchar(expr dxs,dys,d) = +def slurchar(expr dxs,dys,hs,d) = beginchar(0,0,0,0) "Embedded mf"; - draw_slur(dxs,dys,d); + draw_slur(dxs,dys,hs,d); endchar; enddef; -% drawslur(10,10,1); +% drawslur(10,10,0,1); diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index 053e0de379..024ca140ba 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -58,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -151,7 +145,7 @@ OBJECTS = $(mi2mu_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .s +.SUFFIXES: .c .cc .lo .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/Makefile @@ -163,7 +157,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -180,7 +174,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) + $(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -188,36 +182,24 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + 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 + rm -f *.lo clean-libtool: - -rm -rf .libs _libs + rm -rf .libs distclean-libtool: @@ -244,7 +226,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -254,9 +236,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -270,29 +250,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -307,15 +282,15 @@ distdir: $(DISTFILES) || 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; \ + 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 \ +main.o main.lo: main.cc ../flower/include/string-convert.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -335,10 +310,10 @@ main.o: main.cc ../flower/include/string-convert.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 \ +mi2mu-version.o mi2mu-version.lo: mi2mu-version.cc ../flower/config.hh +midi-parser.o midi-parser.lo: 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 \ @@ -346,8 +321,9 @@ midi-parser.o: midi-parser.cc ../flower/include/string-convert.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 \ +midi-score-parser.o midi-score-parser.lo: 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 \ @@ -364,7 +340,7 @@ midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.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 \ +midi-track-parser.o midi-track-parser.lo: 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 \ @@ -383,18 +359,18 @@ midi-track-parser.o: midi-track-parser.cc \ ../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 \ +mudela-column.o mudela-column.lo: 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 \ +mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -412,7 +388,7 @@ mudela-item.o: mudela-item.cc include/mi2mu-global.hh \ ../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 \ +mudela-score.o mudela-score.lo: 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 \ @@ -431,7 +407,7 @@ mudela-score.o: mudela-score.cc ../lib/include/moment.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 \ +mudela-staff.o mudela-staff.lo: 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 \ @@ -450,8 +426,8 @@ mudela-staff.o: mudela-staff.cc ../lib/include/moment.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 \ +mudela-stream.o mudela-stream.lo: 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 \ @@ -460,9 +436,9 @@ mudela-stream.o: mudela-stream.cc include/mi2mu-global.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 \ +mudela-voice.o mudela-voice.lo: 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 \ @@ -477,7 +453,7 @@ mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \ 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 \ +template9.o template9.lo: 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 \ @@ -496,7 +472,7 @@ template9.o: template9.cc ../lib/include/proto.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 \ +version.o version.lo: version.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -534,19 +510,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -567,8 +543,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in index e323017787..36d23b7e0d 100644 --- a/mi2mu/include/Makefile.in +++ b/mi2mu/include/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # mi2mu/include/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -127,26 +121,21 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -185,26 +174,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/mutopia/Coriolan/Makefile.in b/mutopia/Coriolan/Makefile.in index 86470d93f7..c21714a381 100644 --- a/mutopia/Coriolan/Makefile.in +++ b/mutopia/Coriolan/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # mutopia/Coriolan/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -164,26 +158,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index f55fe473bf..f3ccd57cbb 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -60,6 +60,7 @@ strijkers = \type Staff_group = strijkers_group < \score{ < + \textstyle "italic"; \$legno \$koper \$timpani_g diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index ef9808fd89..5a88fe6cd0 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # mutopia/J.S.Bach/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -167,26 +161,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly index 651e0c8bb7..a248586c76 100644 --- a/mutopia/J.S.Bach/preludes-1.ly +++ b/mutopia/J.S.Bach/preludes-1.ly @@ -65,13 +65,13 @@ one = \melodic{ two = \melodic{ \octave c; \textstyle "roman"; - c4-5 e-3 g-\mordent-"(\\textsharp)" 'g4 | - d-\mordent-5 f-3 a-\mordent-"(\\textsharp)" 'a4 | + c4-5 e-3 g-\mordent^"(\\textsharp)" 'g4 | + d-\mordent-5 f-3 a-\mordent^"(\\textsharp)" 'a4 | e-5 e'-\mordent-1 a-4 b-\upprall | c'4 e-4 fis gis-\downprall | a4 c-4 d e-\upprall | f4-1 e d-3-\prall c | - g-\mordent-"(\\textsharp)" 'g g-\mordent 'g | + g-\mordent^"(\\textsharp)" 'g g-\mordent 'g | g-\mordent 'g g-\mordent 'g | % ugh, f should be at upper staff g-\mordent r r16 ['g-5( 'b-4 d] )f-1 s s s | diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly index d0446ef4ba..4753fdc05c 100644 --- a/mutopia/J.S.Bach/preludes-5.ly +++ b/mutopia/J.S.Bach/preludes-5.ly @@ -24,8 +24,10 @@ one = \melodic{ < { \voiceone; - c'4-\mordent-"(\\textsharp)"\p r r | - c'4-\mordent-"(\\textsharp)" r r + \textstyle "roman"; + c'4-\mordent^"(\\textsharp)"\p r r | + c'4-\mordent^"(\\textsharp)" r r + \textstyle "italic"; } { \voicetwo; a4 r r | a4 r r } > | @@ -94,7 +96,8 @@ one = \melodic{ two = \melodic{ \clef "bass"; \octave c; - [d32( cis )d8.] r4 r | +% [d32( cis )d8.] r4 r | + d4-\mordent r r | 'd4 r r | d-\mordent r r | 'd4 r r | @@ -109,7 +112,9 @@ two = \melodic{ [g!-5 es'-1 c'-1 g-5 es'-1 c'-1 ] | fis4-5 r r d-4( ) fis d-5 | - g4-\mordent-"(\\textsharp)" r r f!8 | + \textstyle "roman"; + g4-\mordent^"(\\textsharp)" r r8 f!8 | + \textstyle "italic"; e4-\prall r r | f4-\mordent r r8 e | d4 r8 [f-1 e d] | diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index c03acaf8c4..942a5ae6ec 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # mutopia/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -141,7 +135,7 @@ 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 \ + for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -151,9 +145,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: 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; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -167,29 +159,24 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) 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) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: @@ -204,11 +191,11 @@ distdir: $(DISTFILES) || 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; \ + 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 @@ -238,19 +225,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 @@ -265,8 +252,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 86774fc1ba..e213b38dfc 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -93,13 +93,13 @@ hoboonemid = \melodic{ % ugh % d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant" -% d'4(\<^"Un peu plus lent" - d'4(\< +% d'4(\^"Un peu plus lent et \\'el\\'egant"< \textstyle "italic"; - [e'8_"tr\\`es \\'el\\'egant" \!f'8] | + d'4(\< + [e'8 \!f'8] | % [)b'-. a'-.] [g16( fis' e' )d'] | \textstyle "bold"; - [)b'-.^"Un peu plus lent" a'-.] [g16( fis' e' )d'] | + [)b'-.^"Un peu plus lent et \\'el\\'egant" a'-.] [g16( fis' e' )d'] | \textstyle "italic"; [d'( c' b\< c'] [)\!f'8-. e'-.] | d4-> ~ [d16 e( fis g] | @@ -177,10 +177,12 @@ 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...) - r2-"Un peu plus lent et \\'el\\'egant" - \textstyle "italic"; + \textstyle "bold"; +% r2^"Un peu plus lent et \\'el\\'egant" + r2 r4 r8\p bes | - g2-> ~ | + g2->^"Un peu plus lent et \\'el\\'egant" ~ | + \textstyle "italic"; g8 r r c' | c'2-> ~ | c'8 r r bes'\f | @@ -280,12 +282,55 @@ $staff_hoboone = \type Staff = hoboonestaff < a4 = \paper{ \paper_twenty - linewidth= 195.\mm; + 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"; + + + \accepts "Staff_group"; + \accepts "Staff"; + \accepts "Rhythmic_staff"; + \accepts "Lyrics"; + \accepts "Grandstaff"; + } +} + +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"; + + + \accepts "Staff_group"; + \accepts "Staff"; + \accepts "Rhythmic_staff"; + \accepts "Lyrics"; + \accepts "Grandstaff"; + } } \score{ \$staff_hoboone \paper{ \a4 } +% \paper{ \a4sixteen } \midi{ \tempo 4 = 80; } diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly index a3d90b25de..bf860c4126 100644 --- a/mutopia/standchen.ly +++ b/mutopia/standchen.ly @@ -503,8 +503,8 @@ themusic = < % 20pt music uses whole pagewidth % ja Vette Pech. Koop maar een A3 printer % huh? [jcn] - linewidth= 195.\mm; - arithmetic_multiplier = 7.\pt; + linewidth= 193.\mm; +% arithmetic_multiplier = 7.\pt; gourlay_maxmeasures = 9.; \output "standchen-20.out"; @@ -512,8 +512,8 @@ themusic = < \paper{ % 16pt mustn't use whole page width linewidth= 160.\mm; - arithmetic_multiplier = 6.\pt; - gourlay_maxmeasures = 9.; +% arithmetic_multiplier = 6.\pt; +% gourlay_maxmeasures = 9.; \output "standchen-16.out"; } } diff --git a/mutopia/standje.ly b/mutopia/standje.ly index d191707165..7a10d0e0f4 100644 --- a/mutopia/standje.ly +++ b/mutopia/standje.ly @@ -301,7 +301,7 @@ $grand_staff = \type Grandstaff< \paper{ % how does this work? % previously we had the clear 'ideal whole note space' setting? - arithmetic_multiplier = 6.\pt; +% arithmetic_multiplier = 6.\pt; % ugh: the *first* (intro) line may only have four measures... gourlay_maxmeasures = 4.; } diff --git a/test/Makefile.in b/test/Makefile.in index 3c032b6410..4139ce858f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -54,12 +48,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -195,26 +189,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/test/check-lily-midi.sh b/test/check-lily-midi.sh old mode 100644 new mode 100755 diff --git a/test/check-lily-paper.sh b/test/check-lily-paper.sh old mode 100644 new mode 100755 diff --git a/test/check-mi2mu.sh b/test/check-mi2mu.sh old mode 100644 new mode 100755 diff --git a/tex/Makefile.am b/tex/Makefile.am index 03be784a5b..45f390982f 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -1,10 +1,10 @@ # Generated automatically by wild-perl 0.1 # tex/Makefile.am.wild -TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +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 = +CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex install-data-local: $(INSTALL) -d $(TEXDIR)/lilypond diff --git a/tex/Makefile.in b/tex/Makefile.in index c18e463893..57bd6cbce4 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -1,14 +1,8 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 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. +# gives unlimited permission to copy, distribute and modify it. # Generated automatically by wild-perl 0.1 # tex/Makefile.am.wild @@ -52,12 +46,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -100,10 +94,10 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex +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 = +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 = @@ -162,26 +156,26 @@ installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + 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) + 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) + 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 + rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/tex/feta11.tex b/tex/feta11.tex new file mode 100644 index 0000000000..85b527d241 --- /dev/null +++ b/tex/feta11.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta11.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta13.tex b/tex/feta13.tex new file mode 100644 index 0000000000..36ddfd16bb --- /dev/null +++ b/tex/feta13.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta13.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta16.tex b/tex/feta16.tex new file mode 100644 index 0000000000..75ec2c0d0d --- /dev/null +++ b/tex/feta16.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta16.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta19.tex b/tex/feta19.tex new file mode 100644 index 0000000000..9b2e912425 --- /dev/null +++ b/tex/feta19.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta19.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta20.tex b/tex/feta20.tex new file mode 100644 index 0000000000..dd4c4c5340 --- /dev/null +++ b/tex/feta20.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta20.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta23.tex b/tex/feta23.tex new file mode 100644 index 0000000000..38b341eb46 --- /dev/null +++ b/tex/feta23.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta23.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/feta26.tex b/tex/feta26.tex new file mode 100644 index 0000000000..c51172933a --- /dev/null +++ b/tex/feta26.tex @@ -0,0 +1,87 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from ../mf/feta26.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\upedalheel{42} +\fetdef\dpedalheel{43} +\fetdef\upedaltoe{44} +\fetdef\dpedaltoe{45} +\fetdef\flageolet{46} +\fetdef\trilelement{47} +\fetdef\prall{48} +\fetdef\mordent{49} +\fetdef\prallprall{50} +\fetdef\prallmordent{51} +\fetdef\upprall{52} +\fetdef\downprall{53} + +% flags +\fetdef\eighthflag{54} +\fetdef\sixteenthflag{55} +\fetdef\thirtysecondflag{56} +\fetdef\sixtyfourthflag{57} +\fetdef\deighthflag{58} +\fetdef\dsixteenthflag{59} +\fetdef\dthirtysecondflag{60} +\fetdef\dsixtyfourthflag{61} + +% clefs +\fetdef\altoclef{62} +\fetdef\caltoclef{63} +\fetdef\bassclef{64} +\fetdef\cbassclef{65} +\fetdef\violinclef{66} +\fetdef\cviolinclef{67} + diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index d8e63ccbab..1616ccc9f3 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -7,6 +7,7 @@ \font\fetanummer = feta-nummer8 \font\dynfont = feta-din10 scaled \magstep 1 \font\bracefont = feta-braces16 + \font\bracketfont = feta-brackets16 \font\fingerfont = feta-nummer4 } @@ -16,6 +17,7 @@ \font\fetanummer = feta-nummer10 \font\dynfont = feta-din10 scaled \magstep 2 \font\bracefont = feta-braces20 + \font\bracketfont = feta-brackets20 \font\fingerfont = feta-nummer5 } @@ -25,6 +27,7 @@ \font\fetanummer = feta-nummer12 \font\dynfont = feta-din10 scaled \magstep 3 \font\bracefont = feta-braces16 + \font\bracketfont = feta-brackets20 \font\fingerfont = feta-nummer7 } @@ -34,6 +37,7 @@ \font\fetanummer = feta-nummer5 \font\dynfont = feta-din10 scaled \magstep 0 \font\bracefont = feta-braces16 + \font\bracketfont = feta-brackets16 \font\fingerfont = feta-nummer3 } @@ -43,6 +47,7 @@ \font\fetanummer = feta-nummer5 \font\dynfont = feta-din10 % scaled \magstep-1 \font\bracefont = feta-braces16 + \font\bracketfont = feta-brackets16 \font\fingerfont = feta-nummer3 } @@ -95,6 +100,7 @@ \fi} \def\pianobrace#1{{\bracefont\char #1}} +\def\staffbracket#1{{\bracketfont\char #1}} \def\embeddedtex#1{} \def\embeddedps#1{} diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index 78933d0c4b..d8b40c22fe 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -123,8 +123,7 @@ def % (b*ratio)/(1 + b / htlimit) /getslurcontrol { - slurhtlimit add /slurheight exch def - slurheight 90 div /slur_alpha exch def + slurhtlimit 90 div /slur_alpha exch def slurratio 60 div slur_alpha div /slur_beta exch def slur_beta mul 1 atan slur_alpha mul } bind def @@ -138,9 +137,9 @@ def /slur_dy exch def /slur_dx exch def slur_dy slur_dx lily_distance /slur_b exch def - slur_b slur_height getslurcontrol + slur_b getslurcontrol slur_height add slur_dir mul /slur_ht exch def - slur_b slur_height getslurcontrol /slur_indent exch def + slur_b getslurcontrol /slur_indent exch def % slur_dy slur_dx atan rotate slur_indent slur_ht -- 2.39.5